Support range format in IP(v6) fields (#4284)

scapy/fields.py

@@ -853,6 +853,10 @@ def h2i(self, pkt, x):
                 inet_aton(x)
             except socket.error:
                 return Net(x)
+        elif isinstance(x, tuple):
+            if len(x) != 2:
+                raise ValueError("Invalid IP format")
+            return Net(*x)
         elif isinstance(x, list):
             return [self.h2i(pkt, n) for n in x]
         return x
@@ -949,6 +953,10 @@ def h2i(self, pkt, x):
                 x = in6_ptop(x)
             except socket.error:
                 return Net6(x)  # type: ignore
+        elif isinstance(x, tuple):
+            if len(x) != 2:
+                raise ValueError("Invalid IPv6 format")
+            return Net6(*x)
         elif isinstance(x, list):
             x = [self.h2i(pkt, n) for n in x]
         return x  # type: ignore

test/regression.uts

@@ -3890,6 +3890,10 @@ n1 = ip.dst
 assert isinstance(n1, Net)
 ip.show()
 
+= Net using implicit format in IP
+
+assert len(list(IP(dst=("192.168.0.100", "192.168.0.199")))) == 100
+
 = Multiple IP addresses test
 ~ netaccess
 
@@ -3945,6 +3949,10 @@ ip.show()
 ip = IPv6(dst="www.yahoo.com")
 assert IPv6(raw(ip)).dst == [p.dst for p in ip][0]
 
+= Net6 using implicit format in IPv6
+
+assert len(list(IPv6(dst=("fe80::1", "fe80::1f")))) == 31
+
 = Multiple IPv6 addresses test
 ~ netaccess ipv6