update quicly and adapt client and server to new quicly_decode_packet…

… function signature
rbruenig · Apr 18, 2020 · 8e2d15b · 8e2d15b
1 parent 749ce3e
commit 8e2d15b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/client.c b/client.c
@@ -57,7 +57,7 @@ void client_read_cb(EV_P_ ev_io *w, int revents)
 
     while((bytes_received = recvfrom(w->fd, buf, sizeof(buf), MSG_DONTWAIT, &sa, &salen)) != -1) {
         for(ssize_t offset = 0; offset < bytes_received; ) {
-            size_t packet_len = quicly_decode_packet(&client_ctx, &packet, buf + offset, bytes_received - offset);
+            size_t packet_len = quicly_decode_packet(&client_ctx, &packet, buf, bytes_received, &offset);
             if(packet_len == SIZE_MAX) {
                 break;
             }
@@ -75,9 +75,6 @@ void client_read_cb(EV_P_ ev_io *w, int revents)
                 int64_t establish_time = connect_time - start_time;
                 printf("connection establishment time: %lums\n", establish_time);
             }
-            // ----------------------------------------------------------------
-
-            offset += packet_len;
         }
     }
 

diff --git a/extern/quicly b/extern/quicly
diff --git a/server.c b/server.c
@@ -136,12 +136,11 @@ static void server_read_cb(EV_P_ ev_io *w, int revents)
 
     while((bytes_received = recvfrom(w->fd, buf, sizeof(buf), MSG_DONTWAIT, &sa, &salen)) != -1) {
         for(ssize_t offset = 0; offset < bytes_received; ) {
-            size_t packet_len = quicly_decode_packet(&server_ctx, &packet, buf + offset, bytes_received - offset);
+            size_t packet_len = quicly_decode_packet(&server_ctx, &packet, buf, bytes_received, &offset);
             if(packet_len == SIZE_MAX) {
                 break;
             }
             server_handle_packet(&packet, &sa, salen);
-            offset += packet_len;
         }
     }
+1 −1		.travis.yml
+1 −1		deps/picotls
+4 −4		examples/echo.c
+29 −5		include/quicly.h
+10 −6		include/quicly/cc.h
+7 −4		include/quicly/constants.h
+56 −2		include/quicly/frame.h
+58 −43		include/quicly/loss.h
+97 −62		include/quicly/sentmap.h
+19 −16		lib/cc-reno.c
+20 −20		lib/defaults.c
+1 −1		lib/frame.c
+436 −223		lib/quicly.c
+102 −86		lib/sentmap.c
+17 −0		misc/find-cids.py
+57 −22		misc/quictrace-adapter.py
+6 −3		quicly-probes.d
+36 −18		src/cli.c
+1 −1		t/frame.c
+1 −1		t/loss.c
+1 −1		t/ranges.c
+17 −16		t/sentmap.c
+2 −2		t/simple.c
+35 −6		t/test.c