add logging and make auth version report be edition specific
This commit is contained in:
parent
b956563255
commit
fd58995c4c
4 changed files with 11 additions and 6 deletions
|
|
@ -11,7 +11,7 @@ friends:
|
||||||
features:
|
features:
|
||||||
- friends
|
- friends
|
||||||
settings:
|
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_INSECURE: "1:10"
|
||||||
RNEX_VIRTUAL_PORT_SECURE: "1:10"
|
RNEX_VIRTUAL_PORT_SECURE: "1:10"
|
||||||
RNEX_DEFAULT_PORT: 6000
|
RNEX_DEFAULT_PORT: 6000
|
||||||
|
|
|
||||||
|
|
@ -359,6 +359,7 @@ impl<C: Crypto> Server<C> {
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn handle_ping(self: Arc<Self>, mut packet: PRUDPV0Packet<Vec<u8>>, addr: PRUDPSockAddr) {
|
async fn handle_ping(self: Arc<Self>, mut packet: PRUDPV0Packet<Vec<u8>>, addr: PRUDPSockAddr) {
|
||||||
|
info!("got ping");
|
||||||
let header = packet.header().unwrap();
|
let header = packet.header().unwrap();
|
||||||
|
|
||||||
let Some(conn) = self.get_connection(addr).await else {
|
let Some(conn) = self.get_connection(addr).await else {
|
||||||
|
|
@ -385,6 +386,7 @@ impl<C: Crypto> Server<C> {
|
||||||
mut packet: PRUDPV0Packet<Vec<u8>>,
|
mut packet: PRUDPV0Packet<Vec<u8>>,
|
||||||
addr: PRUDPSockAddr,
|
addr: PRUDPSockAddr,
|
||||||
) {
|
) {
|
||||||
|
info!("got disconnect");
|
||||||
let header = packet.header().unwrap();
|
let header = packet.header().unwrap();
|
||||||
|
|
||||||
let Some(conn) = self.get_connection(addr).await else {
|
let Some(conn) = self.get_connection(addr).await else {
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,7 @@ pub async fn start() {
|
||||||
.await
|
.await
|
||||||
.expect("unable to add socket");
|
.expect("unable to add socket");
|
||||||
|
|
||||||
// let conn = socket_secure.connect(auth_sockaddr).await.unwrap();
|
let conn = socket_secure.connect(auth_sockaddr).await.unwrap();
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
let Some(mut conn) = socket_secure.accept().await else {
|
let Some(mut conn) = socket_secure.accept().await else {
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
use crate::grpc::account;
|
use crate::grpc::account;
|
||||||
use crate::reggie::{RemoteEdgeNodeHolder, RemoteEdgeNodeManagement};
|
use crate::reggie::{RemoteEdgeNodeHolder, RemoteEdgeNodeManagement};
|
||||||
use crate::{define_rmc_proto, kerberos};
|
use crate::{define_rmc_proto, kerberos};
|
||||||
use log::warn;
|
use log::{info, warn};
|
||||||
use macros::rmc_struct;
|
use macros::rmc_struct;
|
||||||
use rnex_core::kerberos::{KerberosDateTime, Ticket, derive_key};
|
use rnex_core::kerberos::{KerberosDateTime, Ticket, derive_key};
|
||||||
use rnex_core::nex::account::Account;
|
use rnex_core::nex::account::Account;
|
||||||
|
|
@ -140,13 +140,16 @@ impl Auth for AuthHandler {
|
||||||
special_protocols: Vec::new(),
|
special_protocols: Vec::new(),
|
||||||
};
|
};
|
||||||
|
|
||||||
Ok((
|
let ret = (
|
||||||
result,
|
result,
|
||||||
pid,
|
pid,
|
||||||
ticket.into(),
|
ticket.into(),
|
||||||
connection_data,
|
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(
|
async fn login_ex(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue