diff options
| author | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2025-04-14 14:56:09 +0200 |
|---|---|---|
| committer | Joakim Hulthe <joakim.hulthe@mullvad.net> | 2025-04-14 14:56:09 +0200 |
| commit | b2b32ed88cb50e73bc9c6f97b0705391c882c480 (patch) | |
| tree | 3cb435f6503be151759ce9f296b1222797280358 | |
| parent | 104b9638077d9ae2696c56c31ec90d8bb253fb70 (diff) | |
| parent | a5732fbd377a2157f04195c24d7d0da765098003 (diff) | |
| download | mullvadvpn-b2b32ed88cb50e73bc9c6f97b0705391c882c480.tar.xz mullvadvpn-b2b32ed88cb50e73bc9c6f97b0705391c882c480.zip | |
Merge branch 'masque-overflow'
| -rw-r--r-- | mullvad-masque-proxy/src/client/mod.rs | 2 | ||||
| -rw-r--r-- | mullvad-masque-proxy/src/server/mod.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mullvad-masque-proxy/src/client/mod.rs b/mullvad-masque-proxy/src/client/mod.rs index f913318595..ea34ea2fab 100644 --- a/mullvad-masque-proxy/src/client/mod.rs +++ b/mullvad-masque-proxy/src/client/mod.rs @@ -340,7 +340,7 @@ async fn server_socket_task( mut client_rx: mpsc::Receiver<Bytes>, stats: Arc<Stats>, ) -> Result<()> { - let mut fragment_id = 1u16; + let mut fragment_id = 0u16; let stream_id_size = VarInt::from(stream_id).size() as u16; loop { diff --git a/mullvad-masque-proxy/src/server/mod.rs b/mullvad-masque-proxy/src/server/mod.rs index 7e73ad9bfa..30a43b6872 100644 --- a/mullvad-masque-proxy/src/server/mod.rs +++ b/mullvad-masque-proxy/src/server/mod.rs @@ -330,7 +330,7 @@ async fn proxy_rx_task( else { continue; }; - fragment_id += 1; + fragment_id = fragment_id.wrapping_add(1); for payload in fragments { if send_tx.send(payload).await.is_err() { break; |