From efe7d76fbcb7dabf79200e0ac387a8778c4cfe9e Mon Sep 17 00:00:00 2001
From: zedddie <rust@zedddie.rs>
Date: Wed, 25 Mar 2026 12:58:21 +0100
Subject: some merge conflicts

---
 src/geoparsers/v2ray/types.rs | 12 +++++++++++-
 src/sniffing/headers.rs       |  3 +++
 2 files changed, 14 insertions(+), 1 deletion(-)

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],
-- 
cgit v1.2.3