Skip to content

Commit cd7a9d8

Browse files
authored
fix: emit PathNewConnectionId frame in qlog (#363)
1 parent bf4c648 commit cd7a9d8

File tree

1 file changed

+28
-10
lines changed

1 file changed

+28
-10
lines changed

quinn-proto/src/connection/qlog.rs

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -727,13 +727,24 @@ impl ToQlog for frame::MaxStreams {
727727
#[cfg(feature = "qlog")]
728728
impl ToQlog for frame::NewConnectionId {
729729
fn to_qlog(&self) -> QuicFrame {
730-
QuicFrame::NewConnectionId {
731-
sequence_number: self.sequence,
732-
retire_prior_to: self.retire_prior_to,
733-
connection_id_length: Some(self.id.len() as u8),
734-
connection_id: self.id.to_string(),
735-
stateless_reset_token: Some(self.reset_token.to_string()),
736-
raw: None,
730+
match self.path_id {
731+
None => QuicFrame::NewConnectionId {
732+
sequence_number: self.sequence,
733+
retire_prior_to: self.retire_prior_to,
734+
connection_id_length: Some(self.id.len() as u8),
735+
connection_id: self.id.to_string(),
736+
stateless_reset_token: Some(self.reset_token.to_string()),
737+
raw: None,
738+
},
739+
Some(path_id) => QuicFrame::PathNewConnectionId {
740+
path_id: path_id.0 as u64,
741+
sequence_number: self.sequence,
742+
retire_prior_to: self.retire_prior_to,
743+
connection_id_length: Some(self.id.len() as u8),
744+
connection_id: self.id.to_string(),
745+
stateless_reset_token: Some(self.reset_token.to_string()),
746+
raw: None,
747+
},
737748
}
738749
}
739750
}
@@ -923,9 +934,16 @@ impl ToQlog for frame::StopSending {
923934
#[cfg(feature = "qlog")]
924935
impl ToQlog for frame::RetireConnectionId {
925936
fn to_qlog(&self) -> QuicFrame {
926-
QuicFrame::RetireConnectionId {
927-
sequence_number: self.sequence,
928-
raw: None,
937+
match self.path_id {
938+
None => QuicFrame::RetireConnectionId {
939+
sequence_number: self.sequence,
940+
raw: None,
941+
},
942+
Some(path_id) => QuicFrame::PathRetireConnectionId {
943+
path_id: path_id.0 as u64,
944+
sequence_number: self.sequence,
945+
raw: None,
946+
},
929947
}
930948
}
931949
}

0 commit comments

Comments
 (0)