The ngx_quic_frame_len() function is not really needed.

diff --git a/src/event/ngx_event_quic.c b/src/event/ngx_event_quic.c
index 8ef6ab2131949ac93a9f0aa6e3851196fc3069c1..6f83bfd519b7d49dd3173ae8c10ea9f473c248ad 100644 (file)
--- a/src/event/ngx_event_quic.c
+++ b/src/event/ngx_event_quic.c
@@ -997,7 +997,7 @@ ngx_quic_output(ngx_connection_t *c)
         do {
             /* process same-level group of frames */
 
-            len += ngx_quic_frame_len(f);// TODO: handle overflow, max size
+            len += ngx_quic_create_frame(NULL, NULL, f);// TODO: handle overflow, max size
 
             f = f->next;
         } while (f && f->level == lvl);

diff --git a/src/event/ngx_event_quic_transport.c b/src/event/ngx_event_quic_transport.c
index c3b4b8bc65ecbec81ee3bc65cd174eed32e54d52..ffcc7d5c121d3994385be471bb6ba5f59d637dc7 100644 (file)
--- a/src/event/ngx_event_quic_transport.c
+++ b/src/event/ngx_event_quic_transport.c
@@ -823,33 +823,6 @@ ngx_quic_create_frame(u_char *p, u_char *end, ngx_quic_frame_t *f)
 }
 
 
-size_t
-ngx_quic_frame_len(ngx_quic_frame_t *frame)
-{
-     switch (frame->type) {
-        case NGX_QUIC_FT_ACK:
-            return ngx_quic_create_ack(NULL, &frame->u.ack);
-        case NGX_QUIC_FT_CRYPTO:
-            return ngx_quic_create_crypto(NULL, &frame->u.crypto);
-
-        case NGX_QUIC_FT_STREAM0:
-        case NGX_QUIC_FT_STREAM1:
-        case NGX_QUIC_FT_STREAM2:
-        case NGX_QUIC_FT_STREAM3:
-        case NGX_QUIC_FT_STREAM4:
-        case NGX_QUIC_FT_STREAM5:
-        case NGX_QUIC_FT_STREAM6:
-        case NGX_QUIC_FT_STREAM7:
-            return ngx_quic_create_stream(NULL, &frame->u.stream);
-        case NGX_QUIC_FT_CONNECTION_CLOSE:
-            return ngx_quic_create_close(NULL, &frame->u.close);
-        default:
-            /* BUG: unsupported frame type generated */
-            return 0;
-     }
-}
-
-
 static size_t
 ngx_quic_create_ack(u_char *p, ngx_quic_ack_frame_t *ack)
 {

diff --git a/src/event/ngx_event_quic_transport.h b/src/event/ngx_event_quic_transport.h
index 51f03f39f15d92d82e6430f1d78fa2c7e096a1f5..311ff94411dc9433ef26fe3a8885f415e1c84840 100644 (file)
--- a/src/event/ngx_event_quic_transport.h
+++ b/src/event/ngx_event_quic_transport.h
@@ -200,6 +200,5 @@ ngx_int_t ngx_quic_parse_handshake_header(ngx_quic_header_t *pkt);
 ssize_t ngx_quic_parse_frame(ngx_quic_header_t *pkt, u_char *start, u_char *end,
     ngx_quic_frame_t *frame);
 ssize_t ngx_quic_create_frame(u_char *p, u_char *end, ngx_quic_frame_t *f);
-size_t ngx_quic_frame_len(ngx_quic_frame_t *frame);
 
 #endif /* _NGX_EVENT_QUIC_WIRE_H_INCLUDED_ */