From a3b808cc29ceed7e782a9cf53f70b06a1625ad69 Mon Sep 17 00:00:00 2001 From: asxalex Date: Wed, 21 Feb 2024 16:46:20 +0800 Subject: [PATCH] AF_INET --- src/packet/register_super.rs | 3 ++- src/peer.rs | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/packet/register_super.rs b/src/packet/register_super.rs index 9e792d6..58771a1 100644 --- a/src/packet/register_super.rs +++ b/src/packet/register_super.rs @@ -31,6 +31,7 @@ mod test { use crate::utils::gen_uuid; use self::peer::SdlanSock; + use crate::config::AF_INET; use crate::packet::Common; use crate::utils::Result; @@ -47,7 +48,7 @@ mod test { let pkt1 = RegisterSuper { pass: "encrypt!", sock: Some(SdlanSock { - family: 0, + family: AF_INET, port: 1, // has_v6: true, // v6_port: 2345, diff --git a/src/peer.rs b/src/peer.rs index 0e841c7..f624a85 100644 --- a/src/peer.rs +++ b/src/peer.rs @@ -222,6 +222,7 @@ impl PeerMap { #[cfg(test)] mod test { + use crate::config::AF_INET; use crate::utils::gen_uuid; use super::*; @@ -233,14 +234,14 @@ mod test { let mut p = Peer::new(); { let mut sl = p.sock.lock().unwrap(); - sl.family = 0; + sl.family = AF_INET; sl.v4 = [1; 4]; sl.port = 20; } pm.insert_peer(&id, Arc::new(p)); if let Some(p2) = pm.find_peer_by_id(&id) { let pl = p2.sock.lock().unwrap(); - assert_eq!(pl.family, 0); + assert_eq!(pl.family, crate::config::AF_INET); assert_eq!(pl.port, 20); assert_eq!(pl.v4, [1; 4]); } else { @@ -248,7 +249,7 @@ mod test { } if let Some(p3) = pm.find_peer_by_sock(&SdlanSock { - family: 0, + family: AF_INET, port: 20, // has_v6: true, // v6_port: 30, @@ -256,7 +257,7 @@ mod test { v6: [1; 16], }) { let pl = p3.sock.lock().unwrap(); - assert_eq!(pl.family, 0); + assert_eq!(pl.family, AF_INET); assert_eq!(pl.port, 20); assert_eq!(pl.v4, [1; 4]); } else {