@@ -35,7 +35,10 @@ use rand::TryRngCore;
3535use rand_core:: OsRng ;
3636
3737use crate :: {
38- udp_server:: { management:: RemoteConnMeta , packet:: ManagementCommand } , utils:: update_charger_state_change, ws_udp_bridge:: open_connection, AppState , BridgeState
38+ udp_server:: { management:: RemoteConnMeta , packet:: ManagementCommand } ,
39+ utils:: update_charger_state_change,
40+ ws_udp_bridge:: open_connection,
41+ AppState , BridgeState ,
3942} ;
4043
4144use super :: { management:: try_port_discovery, socket:: ManagementSocket } ;
@@ -182,15 +185,22 @@ pub fn send_data(socket: &UdpSocket, addr: SocketAddr, data: &[u8]) {
182185 }
183186}
184187
185- pub async fn run_server ( bridge_state : web:: Data < BridgeState > , app_state : web:: Data < AppState > , arbiter : Arc < Arbiter > ) {
188+ pub async fn run_server (
189+ bridge_state : web:: Data < BridgeState > ,
190+ app_state : web:: Data < AppState > ,
191+ arbiter : Arc < Arbiter > ,
192+ ) {
186193 let mut buf = vec ! [ 0u8 ; 65535 ] ;
187194 loop {
188195 if let Ok ( ( s, addr) ) = bridge_state. socket . recv_from ( & mut buf) {
189196 let bridge_state = bridge_state. clone ( ) ;
190197 let buf = buf. clone ( ) ;
191198
192199 // Check if the packet is for port discovery
193- if try_port_discovery ( & bridge_state, & buf[ ..s] , addr) . await . is_ok ( ) {
200+ if try_port_discovery ( & bridge_state, & buf[ ..s] , addr)
201+ . await
202+ . is_ok ( )
203+ {
194204 continue ;
195205 }
196206
@@ -212,12 +222,13 @@ pub async fn run_server(bridge_state: web::Data<BridgeState>, app_state: web::Da
212222 match charger_map. entry ( addr) {
213223 Entry :: Occupied ( tunn) => tunn. into_mut ( ) . clone ( ) ,
214224 Entry :: Vacant ( v) => {
215- let ( id, tunn_data) = match create_tunn ( & bridge_state, addr, & buf[ ..s] ) . await {
216- Ok ( tunn) => tunn,
217- Err ( _err) => {
218- continue ;
219- }
220- } ;
225+ let ( id, tunn_data) =
226+ match create_tunn ( & bridge_state, addr, & buf[ ..s] ) . await {
227+ Ok ( tunn) => tunn,
228+ Err ( _err) => {
229+ continue ;
230+ }
231+ } ;
221232
222233 arbiter. spawn ( update_charger_state_change ( id, app_state. clone ( ) ) ) ;
223234
@@ -227,7 +238,8 @@ pub async fn run_server(bridge_state: web::Data<BridgeState>, app_state: web::Da
227238 v. insert ( tunn_data. clone ( ) ) ;
228239 let tunn = tunn_data. clone ( ) ;
229240 let mut lost_map = bridge_state. lost_connections . lock ( ) . await ;
230- let mut undiscovered_clients = bridge_state. undiscovered_clients . lock ( ) . await ;
241+ let mut undiscovered_clients =
242+ bridge_state. undiscovered_clients . lock ( ) . await ;
231243 if let Some ( conns) = lost_map. remove ( & id) {
232244 for ( conn_no, recipient) in conns. into_iter ( ) {
233245 let meta = RemoteConnMeta {
0 commit comments