From 03a07c14b50f4581d9c61e9116dca78944b35911 Mon Sep 17 00:00:00 2001 From: pbi Date: Tue, 6 May 2003 08:45:27 +0000 Subject: [PATCH] - fixed a name overlap on "type" in L2ListenSocket and L3PacketSocket (thanks to E. M. Hopper) --- scapy.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scapy.py b/scapy.py index 3fc47c37a..7944a5abf 100755 --- a/scapy.py +++ b/scapy.py @@ -22,6 +22,9 @@ # # $Log: scapy.py,v $ +# Revision 0.9.12.3 2003/05/06 10:45:27 pbi +# - fixed a name overlap on "type" in L2ListenSocket and L3PacketSocket (thanks to E. M. Hopper) +# # Revision 0.9.12.2 2003/05/06 10:41:58 pbi # - externalized conversion from probes to signature with nmap_probes2sig() use probe results from, say, a pcap file # @@ -207,7 +210,7 @@ from __future__ import generators -RCSID="$Id: scapy.py,v 0.9.12.2 2003/05/06 10:41:58 pbi Exp $" +RCSID="$Id: scapy.py,v 0.9.12.3 2003/05/06 10:45:27 pbi Exp $" VERSION = RCSID.split()[2]+"beta" @@ -2436,7 +2439,7 @@ class L3PacketSocket(SuperSocket): if iface is None: self.iff = get_if_list() else: - if type(iface) is list: + if iface.__class__ is list: self.iff = iface else: self.iff = [iface] @@ -2527,7 +2530,7 @@ class L2ListenSocket(SuperSocket): if iface is None: self.iff = get_if_list() else: - if type(iface) is list: + if iface.__class__ is list: self.iff = iface else: self.iff = [iface]