Support NetworkInterface for tuntap

secdev · Aug 24, 2021 · 1de3e84 · 1de3e84
1 parent d3f84ff
commit 1de3e84
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/scapy/layers/tuntap.py b/scapy/layers/tuntap.py
@@ -24,6 +24,7 @@
 from scapy.data import ETHER_TYPES, MTU
 from scapy.error import warning, log_runtime
 from scapy.fields import Field, FlagsField, StrFixedLenField, XShortEnumField
+from scapy.interfaces import network_name
 from scapy.layers.inet import IP
 from scapy.layers.inet6 import IPv46, IPv6
 from scapy.layers.l2 import Ether
@@ -113,7 +114,9 @@ class TunTapInterface(SimpleSocket):
 
     def __init__(self, iface=None, mode_tun=None, default_read_size=MTU,
                  strip_packet_info=True, *args, **kwargs):
-        self.iface = bytes_encode(conf.iface if iface is None else iface)
+        self.iface = bytes_encode(
+            network_name(conf.iface if iface is None else iface)
+        )
 
         self.mode_tun = mode_tun
         if self.mode_tun is None:

diff --git a/test/tuntap.uts b/test/tuntap.uts
@@ -80,7 +80,8 @@ if not LINUX:
 
 import subprocess
 
-tun0 = TunTapInterface("tun0", strip_packet_info=False)
+iface = resolve_iface("tun0")  # test TunTapInterface on NetworkInterface
+tun0 = TunTapInterface(iface, strip_packet_info=False)
 
 assert subprocess.check_call(["ip", "link", "set", "tun0", "up"]) == 0
 assert subprocess.check_call([