Rooba
/
scapy
mirror of https://github.com/secdev/scapy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: clean-up arch specific module

This commit is contained in:
Pierre LALET 2018-01-07 18:04:43 +01:00
parent 13aa80c87e
commit 2d20e15289
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
scapy/arch/linux.py
View File

@ -8,10 +8,18 @@ Linux specific functions.
""" """
from __future__ import absolute_import from __future__ import absolute_import
import sys, os, struct, socket, time
from select import select
import array
import ctypes
from fcntl import ioctl from fcntl import ioctl
import array, ctypes import os
from select import select
import socket
import struct
import sys
import time
from scapy.compat import * from scapy.compat import *
from scapy.consts import LOOPBACK_NAME, IS_64BITS from scapy.consts import LOOPBACK_NAME, IS_64BITS
@ -408,8 +416,7 @@ class L3PacketSocket(SuperSocket):
if self.promisc: if self.promisc:
if iface is None: if iface is None:
self.iff = get_if_list() self.iff = get_if_list()
else: elif isinstance(iface, list):
if iface.__class__ is list:
self.iff = iface self.iff = iface
else: else:
self.iff = [iface] self.iff = [iface]
@ -566,8 +573,7 @@ class L2ListenSocket(SuperSocket):
self.promisc = promisc self.promisc = promisc
if iface is None: if iface is None:
self.iff = get_if_list() self.iff = get_if_list()
else: elif isinstance(iface, list):
if iface.__class__ is list:
self.iff = iface self.iff = iface
else: else:
self.iff = [iface] self.iff = [iface]