diff --git a/prudpv1/src/executables/proxy_insecure.rs b/prudpv1/src/executables/proxy_insecure.rs index b9b974c..044aeed 100644 --- a/prudpv1/src/executables/proxy_insecure.rs +++ b/prudpv1/src/executables/proxy_insecure.rs @@ -1,12 +1,14 @@ use crate::prudp::router::Router; use crate::prudp::unsecure::Unsecure; -use log::error; +use tracing::error; +use tracing::warn; use proxy_common::{ProxyStartupParam, RNEX_ACCESS_KEY}; -use rnex_core::prudp::virtual_port::VirtualPort; -use rnex_core::reggie::UnitPacketRead; -use rnex_core::reggie::UnitPacketWrite; -use rnex_core::rmc::structures::RmcSerialize; +use rnex_core::executables::common::SECURE_SERVER_ACCOUNT; +use rnex_prudp::virtual_port::VirtualPort; +use rnex_util::{UnitPacketRead, UnitPacketWrite}; use rnex_core::rnex_proxy_common::ConnectionInitData; +use rnex_server::ConnectionInitData; +use rnex_util::{UnitPacketRead, UnitPacketWrite}; use std::time::Duration; use tokio::net::TcpStream; use tokio::task; diff --git a/prudpv1/src/executables/proxy_secure.rs b/prudpv1/src/executables/proxy_secure.rs index 222c1dd..a92791e 100644 --- a/prudpv1/src/executables/proxy_secure.rs +++ b/prudpv1/src/executables/proxy_secure.rs @@ -1,14 +1,14 @@ use crate::prudp::router::Router; use crate::prudp::secure::Secure; -use log::error; -use log::warn; +use tracing::error; +use tracing::warn; use proxy_common::{ProxyStartupParam, RNEX_ACCESS_KEY}; use rnex_core::executables::common::SECURE_SERVER_ACCOUNT; -use rnex_core::prudp::virtual_port::VirtualPort; -use rnex_core::reggie::UnitPacketRead; -use rnex_core::reggie::UnitPacketWrite; -use rnex_core::rmc::structures::RmcSerialize; +use rnex_prudp::virtual_port::VirtualPort; +use rnex_util::{UnitPacketRead, UnitPacketWrite}; use rnex_core::rnex_proxy_common::ConnectionInitData; +use rnex_server::ConnectionInitData; +use rnex_util::{UnitPacketRead, UnitPacketWrite}; use std::ops::Deref; use std::time::Duration; use tokio::net::TcpStream; diff --git a/prudpv1/src/prudp/packet.rs b/prudpv1/src/prudp/packet.rs index 027c0b4..fd8b540 100644 --- a/prudpv1/src/prudp/packet.rs +++ b/prudpv1/src/prudp/packet.rs @@ -8,12 +8,12 @@ use crate::prudp::packet::PacketOption::{ }; use bytemuck::{Pod, Zeroable}; use hmac::{Hmac, Mac}; -use log::{error, warn}; +use tracing::{error, warn}; use md5::{Digest, Md5}; -use rnex_core::prudp::socket_addr::PRUDPSockAddr; -use rnex_core::prudp::types_flags::TypesFlags; -use rnex_core::prudp::types_flags::flags::ACK; -use rnex_core::prudp::virtual_port::VirtualPort; +use rnex_prudp::socket_addr::PRUDPSockAddr; +use rnex_prudp::types_flags::TypesFlags; +use rnex_prudp::types_flags::flags::ACK; +use rnex_prudp::virtual_port::VirtualPort; use std::fmt::Debug; use std::io; use std::io::{Cursor, Read, Seek, Write}; @@ -396,7 +396,7 @@ impl PRUDPV1Packet { #[cfg(test)] mod test { use super::{OptionId, PRUDPV1Header, PacketOption, TypesFlags}; - use rnex_core::prudp::{ + use rnex_prudp::{ types_flags::{ flags::{NEED_ACK, RELIABLE}, types::DATA, diff --git a/prudpv1/src/prudp/router.rs b/prudpv1/src/prudp/router.rs index 180d90e..b600e19 100644 --- a/prudpv1/src/prudp/router.rs +++ b/prudpv1/src/prudp/router.rs @@ -1,7 +1,7 @@ use crate::prudp::packet::PRUDPV1Packet; use crate::prudp::router::Error::VirtualPortTaken; use crate::prudp::socket::{AnyInternalSocket, CryptoHandler, ExternalSocket, new_socket_pair}; -use log::{error, info}; +use tracing::{error, info}; use std::io; use std::io::Cursor; use std::marker::PhantomData; @@ -15,6 +15,7 @@ use tokio::select; use tokio::sync::RwLock; use tokio::task::JoinHandle; use tokio::time::sleep; +use rnex_prudp::virtual_port::VirtualPort; pub struct Router { endpoints: RwLock<[Option>; 16]>, diff --git a/prudpv1/src/prudp/secure.rs b/prudpv1/src/prudp/secure.rs index 001680f..21b5f54 100644 --- a/prudpv1/src/prudp/secure.rs +++ b/prudpv1/src/prudp/secure.rs @@ -4,6 +4,9 @@ use hmac::digest::consts::U32; use rc4::cipher::StreamCipherCoreWrapper; use rc4::{KeyInit, Rc4, Rc4Core, StreamCipher}; use typenum::U5; +use rnex_util::PID; +use rnex_prudp::ticket::read_secure_connection_data; +use serde_core::ser::Serialize; type Rc4U32 = StreamCipherCoreWrapper>; diff --git a/prudpv1/src/prudp/socket.rs b/prudpv1/src/prudp/socket.rs index b6def61..1c63185 100644 --- a/prudpv1/src/prudp/socket.rs +++ b/prudpv1/src/prudp/socket.rs @@ -3,8 +3,8 @@ use crate::prudp::packet::PacketOption::{ }; use crate::prudp::packet::{PRUDPV1Header, PRUDPV1Packet}; use async_trait::async_trait; -use log::error; -use log::{info, warn}; +use tracing::error; +use tracing::{info, warn}; use rc4::StreamCipher; use std::collections::{BTreeMap, HashMap}; use std::io::Cursor; @@ -14,6 +14,13 @@ use std::sync::{Arc, Weak}; use tokio::spawn; use v_byte_helpers::ReadExtensions; use v_byte_helpers::little_endian::read_u16; +use rnex_util::{PID, account::Account}; +use rnex_prudp::encryption::EncryptionPair; +use rnex_prudp::types_flags::types::{SYN, CONNECT, PING, DISCONNECT, DATA}; +use rnex_prudp::types_flags::flags::{ACK, HAS_SIZE, NEED_ACK, MULTI_ACK, RELIABLE}; +use rnex_prudp::types_flags::TypesFlags; +use rnex_prudp::socket_addr::PRUDPSockAddr; +use rnex_prudp::virtual_port::VirtualPort; use std::time::Duration; use tokio::net::UdpSocket; diff --git a/rnex-protocols/mm-protos/Cargo.toml b/rnex-protocols/mm-protos/Cargo.toml index 0113842..c721abf 100644 --- a/rnex-protocols/mm-protos/Cargo.toml +++ b/rnex-protocols/mm-protos/Cargo.toml @@ -8,6 +8,7 @@ ctor = "1.0.8" rnex-rmc = { path = "../../rnex-rmc" } cfg-if = "1.0.4" rnex-base-protos = { path = "../base-protos" } +rnex-util = {path = "../rnex-util"} [features] third-notif-param = [] diff --git a/rnex-protocols/mm-protos/src/matchmake.rs b/rnex-protocols/mm-protos/src/matchmake.rs index c9d25d9..2723ba6 100644 --- a/rnex-protocols/mm-protos/src/matchmake.rs +++ b/rnex-protocols/mm-protos/src/matchmake.rs @@ -34,7 +34,7 @@ pub struct MatchmakeParam { cfg_if! { if #[cfg(feature = "v3-5-0")]{ - use rnex_core::kerberos::KerberosDateTime; + use rnex_util::date_time::DateTime; #[derive(RmcSerialize, Debug, Clone, Default, PartialEq)] #[rmc_struct(3)] pub struct MatchmakeSession { @@ -52,7 +52,7 @@ cfg_if! { pub session_key: Vec, pub option0: u32, pub matchmake_param: MatchmakeParam, - pub datetime: KerberosDateTime, + pub datetime: DateTime, pub user_password: String, pub refer_gid: u32, pub user_password_enabled: bool,