File tree 2 files changed +8
-6
lines changed
2 files changed +8
-6
lines changed Original file line number Diff line number Diff line change @@ -2833,12 +2833,13 @@ impl Connection {
2833
2833
}
2834
2834
}
2835
2835
2836
- fn confirm_version ( & mut self , v : Version ) {
2836
+ fn confirm_version ( & mut self , v : Version ) -> Res < ( ) > {
2837
2837
if self . version != v {
2838
2838
qdebug ! ( "[{self}] Compatible upgrade {:?} ==> {v:?}" , self . version) ;
2839
2839
}
2840
- self . crypto . confirm_version ( v) ;
2840
+ self . crypto . confirm_version ( v) ? ;
2841
2841
self . version = v;
2842
+ Ok ( ( ) )
2842
2843
}
2843
2844
2844
2845
fn compatible_upgrade ( & mut self , packet_version : Version ) -> Res < ( ) > {
@@ -2847,15 +2848,15 @@ impl Connection {
2847
2848
}
2848
2849
2849
2850
if self . role == Role :: Client {
2850
- self . confirm_version ( packet_version) ;
2851
+ self . confirm_version ( packet_version) ? ;
2851
2852
} else if self . tps . borrow ( ) . remote . is_some ( ) {
2852
2853
let version = self . tps . borrow ( ) . version ( ) ;
2853
2854
let dcid = self
2854
2855
. original_destination_cid
2855
2856
. as_ref ( )
2856
2857
. ok_or ( Error :: ProtocolViolation ) ?;
2857
2858
self . crypto . states . init_server ( version, dcid) ?;
2858
- self . confirm_version ( version) ;
2859
+ self . confirm_version ( version) ? ;
2859
2860
}
2860
2861
Ok ( ( ) )
2861
2862
}
Original file line number Diff line number Diff line change @@ -242,9 +242,10 @@ impl Crypto {
242
242
}
243
243
244
244
/// Lock in a compatible upgrade.
245
- pub fn confirm_version ( & mut self , confirmed : Version ) {
246
- _ = self . states . confirm_version ( self . version , confirmed) ;
245
+ pub fn confirm_version ( & mut self , confirmed : Version ) -> Res < ( ) > {
246
+ self . states . confirm_version ( self . version , confirmed) ? ;
247
247
self . version = confirmed;
248
+ Ok ( ( ) )
248
249
}
249
250
250
251
/// Returns true if new handshake keys were installed.
You can’t perform that action at this time.
0 commit comments