Robin_Jadoul/testing - Change J4ZEHJHG4NGTGJPU5YMBW7IRTVZ7WOHIWI45FGM3Q3A7JHDTTXQAC

Flush pending packets after a key re-exchange

This bug was introduced with the semi-recent changes separating the control part from the connection-handling part. After these changes, packets can now be held in a queue while waiting for a window extension or a key re-exchange, but they weren't sent after a rekeying.

Created by pmeunier on July 5, 2021

J4ZEHJHG4NGTGJPU5YMBW7IRTVZ7WOHIWI45FGM3Q3A7JHDTTXQAC

Dependencies

In channels

main

Change contents

Insertion in thrussh/src/session.rs at line 196 [3.171602]

[3.178479]

    pub fn flush_all_pending(&mut self) {
        for (_, channel) in self.channels.iter_mut() {
            while let Some((buf, a, from)) = channel.pending_data.pop_front() {
                let size = Self::data_noqueue(&mut self.write, channel, &buf, from);
                if from + size < buf.len() {
                    channel.pending_data.push_front((buf, a, from + size));
                    break;
                }
            }
        }
    }

Replacement in thrussh/src/session.rs at line 255 [3.171602]

B:BD[3.179943] → [3.179943:179993]

            if !channel.pending_data.is_empty() {

[3.179943]

[3.179993]

            if !channel.pending_data.is_empty() || self.rekey.is_some() {

Replacement in thrussh/src/server/encrypted.rs at line 36 [3.230083]

B:BD[3.231313] → [3.231313:231347]

        debug!("read_encrypted");

[3.231313]

[3.231347]

        debug!(
            "server_read_encrypted, buf = {:?}",
            &buf[..buf.len().min(20)]
        );

Insertion in thrussh/src/server/encrypted.rs at line 67 [3.230083]
[3.232563]
[3.232563]
```
            self.flush()?;
```
Insertion in thrussh/src/server/encrypted.rs at line 79 [3.230083]
[3.232910]
[3.232910]
```
                self.flush()?;
```
Insertion in thrussh/src/server/encrypted.rs at line 88 [3.230083]
[2.112]
[3.233115]
Insertion in thrussh/src/server/encrypted.rs at line 90 [3.230083]
[3.233171]
[3.233171]
```
                enc.flush_all_pending();
```
Insertion in thrussh/src/server/encrypted.rs at line 92 [3.230083]
[3.233217]
[3.233217]
```
                self.flush()?;
```
Replacement in thrussh/src/client/encrypted.rs at line 40 [3.383877]
B:BD[3.385187] → [3.385187:385226]
```
            &buf[..buf.len().min(100)]
```
[3.385187]
[3.385226]
```
            &buf[..buf.len().min(20)]
```
Insertion in thrussh/src/client/encrypted.rs at line 71 [3.383877]
[3.386650]
[3.386650]
```
            self.flush()?;
```
Insertion in thrussh/src/client/encrypted.rs at line 104 [3.383877]
[3.388084]
[3.388084]
```
                    enc.flush_all_pending();
```
Insertion in thrussh/src/client/encrypted.rs at line 106 [3.383877]
[3.388134]
[3.388134]
```
                    self.flush()?;
```

Flush pending packets after a key re-exchange

Dependencies

In channels

Change contents

Insertion in thrussh/src/session.rs at line 196 [3.171602]

Replacement in thrussh/src/session.rs at line 255 [3.171602]

Replacement in thrussh/src/server/encrypted.rs at line 36 [3.230083]

Insertion in thrussh/src/server/encrypted.rs at line 67 [3.230083]

Insertion in thrussh/src/server/encrypted.rs at line 79 [3.230083]

Insertion in thrussh/src/server/encrypted.rs at line 88 [3.230083]

Insertion in thrussh/src/server/encrypted.rs at line 90 [3.230083]

Insertion in thrussh/src/server/encrypted.rs at line 92 [3.230083]

Replacement in thrussh/src/client/encrypted.rs at line 40 [3.383877]

Insertion in thrussh/src/client/encrypted.rs at line 71 [3.383877]

Insertion in thrussh/src/client/encrypted.rs at line 104 [3.383877]

Insertion in thrussh/src/client/encrypted.rs at line 106 [3.383877]