diff options
| author | zedddie <rust@zedddie.rs> | 2026-03-25 12:58:21 +0100 |
|---|---|---|
| committer | tuturuu <zedddiezxc@gmail.com> | 2026-03-25 12:58:21 +0100 |
| commit | efe7d76fbcb7dabf79200e0ac387a8778c4cfe9e (patch) | |
| tree | 7c32a2b1fb3d9770c0fc6eade781d3ee89150778 | |
| parent | a1be70b9cce00010f4c7a50852b8d67b5205a4d6 (diff) | |
some merge conflicts
| -rw-r--r-- | src/geoparsers/v2ray/types.rs | 12 | ||||
| -rw-r--r-- | src/sniffing/headers.rs | 3 |
2 files changed, 14 insertions, 1 deletions
diff --git a/src/geoparsers/v2ray/types.rs b/src/geoparsers/v2ray/types.rs index b82fbbf..d7c0436 100644 --- a/src/geoparsers/v2ray/types.rs +++ b/src/geoparsers/v2ray/types.rs @@ -33,7 +33,17 @@ pub mod domain { } } /// Type of domain value. - #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash, PartialOrd, Ord, ::prost::Enumeration)] + #[derive( + Clone, + Copy, + Debug, + PartialEq, + Eq, + Hash, + PartialOrd, + Ord, + ::prost::Enumeration + )] #[repr(i32)] pub enum Type { /// The value is used as is. diff --git a/src/sniffing/headers.rs b/src/sniffing/headers.rs index 1db0da6..bbe58de 100644 --- a/src/sniffing/headers.rs +++ b/src/sniffing/headers.rs @@ -69,6 +69,9 @@ impl fmt::Display for PacketInfo { // y:y:y:y:y:y:y:y = 8 hexademical; y = segment, pair of 2 u8 big endian write!( f, + // FIXME: fe80:0:0:0:93a:245e:daac:7a75 -> ff12:0:0:0:0:0:0:8384 + // we should drop zeroes in display: fe80::93a:245e:daac:7a75 -> ff12::8384 + // NOTE: fe80:0:0:93a:0:245e and fe80:0:93a:0:0:245e can NOT both be compressed to fe80::93a::245e by obvious reasons "{:x}:{:x}:{:x}:{:x}:{:x}:{:x}:{:x}:{:x} port:{} -> {:x}:{:x}:{:x}:{:x}:{:x}:{:x}:{:x}:{:x} port:{} {:?} is dns? {:?}", src_ip[0], src_ip[1], |