[fix] ws2pv1 must not panic at network problems

lib/modules/ws2p-v1-legacy/datas.rs

@@ -231,11 +231,16 @@ impl WS2PModuleDatas {
             self.connect_to_without_checking_quotas(&endpoint);
         }
     }
-    fn close_connection(&mut self, ws2p_full_id: &NodeFullId, reason: WS2PCloseConnectionReason) {
+    pub fn close_connection(
+        &mut self,
+        ws2p_full_id: &NodeFullId,
+        reason: WS2PCloseConnectionReason,
+    ) {
         match reason {
             WS2PCloseConnectionReason::NegociationTimeout => {}
             WS2PCloseConnectionReason::AuthMessInvalidSig
             | WS2PCloseConnectionReason::Timeout
+            | WS2PCloseConnectionReason::WsError
             | WS2PCloseConnectionReason::Unknow => {
                 self.ws2p_endpoints
                     .get_mut(ws2p_full_id)
@@ -285,28 +290,28 @@ impl WS2PModuleDatas {
                     .expect("Endpoint don't exist !")
                     .1 = WS2PConnectionState::ConnectMessOk;
                 debug!("Send: {:#?}", response);
-                self.websockets
-                    .get_mut(&ws2p_full_id)
-                    .unwrap_or_else(|| panic!("Fatal error : no websocket for {} !", ws2p_full_id))
-                    .0
-                    .send(Message::text(response))
-                    .expect("WS2P: Fail to send OK Message !");
+                if let Some(websocket) = self.websockets.get_mut(&ws2p_full_id) {
+                    if websocket.0.send(Message::text(response)).is_err() {
+                        return WS2PSignal::WSError(ws2p_full_id);
+                    }
+                } else {
+                    panic!("Fatal error : no websocket for {} !", ws2p_full_id);
+                }
             }
-            WS2PConnectionMessagePayload::ValidAckMessage(r, new_con_state) => {
+            WS2PConnectionMessagePayload::ValidAckMessage(response, new_con_state) => {
                 self.ws2p_endpoints
                     .get_mut(&ws2p_full_id)
                     .expect("WS2P: Fail to get mut ep !")
                     .1 = new_con_state;
                 if let WS2PConnectionState::AckMessOk = self.ws2p_endpoints[&ws2p_full_id].1 {
-                    trace!("Send: {:#?}", r);
-                    self.websockets
-                        .get_mut(&ws2p_full_id)
-                        .unwrap_or_else(|| {
-                            panic!("Fatal error : no websocket for {} !", ws2p_full_id)
-                        })
-                        .0
-                        .send(Message::text(r))
-                        .expect("WS2P: Fail to send Message in websocket !");
+                    debug!("Send: {:#?}", response);
+                    if let Some(websocket) = self.websockets.get_mut(&ws2p_full_id) {
+                        if websocket.0.send(Message::text(response)).is_err() {
+                            return WS2PSignal::WSError(ws2p_full_id);
+                        }
+                    } else {
+                        panic!("Fatal error : no websocket for {} !", ws2p_full_id);
+                    }
                 }
             }
             WS2PConnectionMessagePayload::ValidOk(new_con_state) => {

lib/modules/ws2p-v1-legacy/lib.rs

@@ -653,6 +653,10 @@ impl DursModule<DuRsConf, DursMsg> for WS2PModule {
                         }
                         WS2PSignal::WSError(ws2p_full_id) => {
                             endpoints_to_update_status.insert(ws2p_full_id, SystemTime::now());
+                            ws2p_module.close_connection(
+                                &ws2p_full_id,
+                                WS2PCloseConnectionReason::WsError,
+                            );
                             ws2p_module.send_network_event(&NetworkEvent::ConnectionStateChange(
                                 ws2p_full_id,
                                 WS2PConnectionState::WSError as u32,

lib/modules/ws2p-v1-legacy/ws2p_connection.rs

@@ -290,6 +290,7 @@ pub enum WS2PCloseConnectionReason {
     AuthMessInvalidSig,
     NegociationTimeout,
     Timeout,
+    WsError,
     Unknow,
 }