diff --git a/editions.yaml b/editions.yaml index 4a495c5..1c025b0 100644 --- a/editions.yaml +++ b/editions.yaml @@ -11,7 +11,7 @@ friends: features: - friends settings: - AUTH_REPORT_VERSION: "branch:origin/project/wup-agmj build:3_8_15_2004_0" + AUTH_REPORT_VERSION: "branch:origin/feature/45925_FixAutoReconnect build:3_10_11_2006_0" RNEX_VIRTUAL_PORT_INSECURE: "1:10" RNEX_VIRTUAL_PORT_SECURE: "1:10" RNEX_DEFAULT_PORT: 6000 diff --git a/prudpv0/src/server.rs b/prudpv0/src/server.rs index a1e561c..19622ec 100644 --- a/prudpv0/src/server.rs +++ b/prudpv0/src/server.rs @@ -359,6 +359,7 @@ impl Server { } async fn handle_ping(self: Arc, mut packet: PRUDPV0Packet>, addr: PRUDPSockAddr) { + info!("got ping"); let header = packet.header().unwrap(); let Some(conn) = self.get_connection(addr).await else { @@ -385,6 +386,7 @@ impl Server { mut packet: PRUDPV0Packet>, addr: PRUDPSockAddr, ) { + info!("got disconnect"); let header = packet.header().unwrap(); let Some(conn) = self.get_connection(addr).await else { diff --git a/prudpv1/src/executables/proxy_secure.rs b/prudpv1/src/executables/proxy_secure.rs index 2045cfd..51677f8 100644 --- a/prudpv1/src/executables/proxy_secure.rs +++ b/prudpv1/src/executables/proxy_secure.rs @@ -35,7 +35,7 @@ pub async fn start() { .await .expect("unable to add socket"); - // let conn = socket_secure.connect(auth_sockaddr).await.unwrap(); + let conn = socket_secure.connect(auth_sockaddr).await.unwrap(); loop { let Some(mut conn) = socket_secure.accept().await else { diff --git a/rnex-core/src/nex/auth_handler.rs b/rnex-core/src/nex/auth_handler.rs index 89afd7f..21f67dc 100644 --- a/rnex-core/src/nex/auth_handler.rs +++ b/rnex-core/src/nex/auth_handler.rs @@ -1,7 +1,7 @@ use crate::grpc::account; use crate::reggie::{RemoteEdgeNodeHolder, RemoteEdgeNodeManagement}; use crate::{define_rmc_proto, kerberos}; -use log::warn; +use log::{info, warn}; use macros::rmc_struct; use rnex_core::kerberos::{KerberosDateTime, Ticket, derive_key}; use rnex_core::nex::account::Account; @@ -140,13 +140,16 @@ impl Auth for AuthHandler { special_protocols: Vec::new(), }; - Ok(( + let ret = ( result, pid, ticket.into(), connection_data, - self.build_name.to_string(), //format!("{}; Rust NEX Version {} by DJMrTV", self.build_name, env!("CARGO_PKG_VERSION")), - )) + self.build_name.to_string(), + ); + + info!("data: {:?}", ret); + Ok(ret) } async fn login_ex(