diff options
| author |   Dave Wallace <dwallacelf@gmail.com> | 2019-11-15 18:18:59 -0500 |
|---|---|---|
| committer |   Dave Barach <openvpp@barachs.net> | 2019-11-16 14:23:38 +0000 |
| commit | 504d023d3bfdd91374a41fda34cd7be3f8340f7d (patch) | |
| tree | aaca35c47480a4a89f9ab86d8146f805cd65643f /build | |
| parent | 47e092733cc049e736abf3f125d144c7922cda81 (diff) | |
quic: replace quicly patch with upstreamed fix
- Replace the solution to the quicly time skew assert
with h2o/quicly PR#222 which was merged upstream
after verification that it resolved the vpp issue.
Type: refactor
Change-Id: I26df08e4108b054a28f50c964ddff1c80a592339
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/external/patches/quicly_0.0.5-vpp/0002-quicly-rtt-time-skew.patch | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/build/external/patches/quicly_0.0.5-vpp/0002-quicly-rtt-time-skew.patch b/build/external/patches/quicly_0.0.5-vpp/0002-quicly-rtt-time-skew.patch index 40ac0276977..589d8cde125 100644 --- a/build/external/patches/quicly_0.0.5-vpp/0002-quicly-rtt-time-skew.patch +++ b/build/external/patches/quicly_0.0.5-vpp/0002-quicly-rtt-time-skew.patch @@ -1,15 +1,16 @@ diff --git a/lib/quicly.c b/lib/quicly.c -index 95d5f13..200515f 100644 +index 95d5f13..3f4fd18 100644 --- a/lib/quicly.c +++ b/lib/quicly.c -@@ -3551,6 +3551,10 @@ static int handle_ack_frame(quicly_conn_t *conn, struct st_quicly_handle_payload +@@ -351,7 +351,10 @@ static __thread int64_t now; - QUICLY_PROBE(QUICTRACE_RECV_ACK_DELAY, conn, probe_now(), frame.ack_delay); - -+ /* Detect and fix time skew */ -+ if (now < largest_newly_acked.sent_at) -+ now = largest_newly_acked.sent_at; + static void update_now(quicly_context_t *ctx) + { +- now = ctx->now->cb(ctx->now); ++ int64_t newval = ctx->now->cb(ctx->now); + - /* Update loss detection engine on ack. The function uses ack_delay only when the largest_newly_acked is also the largest acked - * so far. So, it does not matter if the ack_delay being passed in does not apply to the largest_newly_acked. */ - quicly_loss_on_ack_received(&conn->egress.loss, largest_newly_acked.packet_number, now, largest_newly_acked.sent_at, ++ if (now < newval) ++ now = newval; + } + + /** |