@@ -139,11 +139,12 @@ async fn ws_loop(
139139 let mut socket = if ws_url. secure {
140140 let mut tls = TlsConnection :: new ( socket, ssl_rx_buf, ssl_tx_buf) ;
141141
142- let config: TlsConfig < ' _ , Aes128GcmSha256 > =
143- TlsConfig :: new ( ) . with_server_name ( ws_url. host ) ;
142+ let config: TlsConfig < ' _ , Aes128GcmSha256 > = TlsConfig :: new ( ) . enable_rsa_signatures ( ) ;
144143 tls. open :: < OsRng , NoVerify > ( TlsContext :: new ( & config, & mut OsRng ) )
145144 . await
146- . map_err ( |_| ( ) ) ?;
145+ . map_err ( |e| {
146+ log:: error!( "tls open error: {e:?}" ) ;
147+ } ) ?;
147148
148149 WsSocket :: Tls ( Box :: new ( tls) )
149150 } else {
@@ -263,7 +264,7 @@ async fn ws_rw(
263264 let read_fut = socket. read ( framer_rx. mut_buf ( ) ) ;
264265 let write_fut = recv. receive ( ) ;
265266
266- let n = match embassy_futures:: select:: select ( read_fut, write_fut) . await {
267+ let Ok ( n ) = ( match embassy_futures:: select:: select ( read_fut, write_fut) . await {
267268 embassy_futures:: select:: Either :: First ( read_res) => {
268269 read_res. map_err ( |_| WsRwError :: SocketReadError )
269270 }
@@ -286,7 +287,9 @@ async fn ws_rw(
286287
287288 continue ;
288289 }
289- } ?;
290+ } ) else {
291+ continue ;
292+ } ;
290293
291294 if n == 0 {
292295 log:: warn!( "read_n: 0" ) ;
@@ -551,7 +554,9 @@ enum WsSocket<'a, 'b> {
551554impl WsSocket < ' _ , ' _ > {
552555 pub async fn read ( & mut self , buf : & mut [ u8 ] ) -> Result < usize , ( ) > {
553556 match self {
554- WsSocket :: Tls ( tls_connection) => tls_connection. read ( buf) . await . map_err ( |_| ( ) ) ,
557+ WsSocket :: Tls ( tls_connection) => tls_connection. read ( buf) . await . map_err ( |e| {
558+ log:: error!( "tls read error: {e:?}" ) ;
559+ } ) ,
555560 WsSocket :: Raw ( tcp_socket) => tcp_socket. read ( buf) . await . map_err ( |_| ( ) ) ,
556561 }
557562 }
0 commit comments