Skip to content
Snippets Groups Projects
Commit a6d44434 authored by Phil's avatar Phil
Browse files

Fix arch/linux.py supersockets

parent 9ba3d3d8
No related branches found
No related tags found
No related merge requests found
......@@ -226,7 +226,7 @@ class L3PacketSocket(SuperSocket):
else:
filter = "not (%s)" % conf.except_filter
if filter is not None:
arch.attach_filter(self.ins, filter)
attach_filter(self.ins, filter)
self.ins.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 2**30)
self.outs = socket.socket(socket.AF_PACKET, socket.SOCK_RAW, socket.htons(type))
self.outs.setsockopt(socket.SOL_SOCKET, socket.SO_SNDBUF, 2**30)
......@@ -235,21 +235,21 @@ class L3PacketSocket(SuperSocket):
self.promisc = promisc
if self.promisc:
if iface is None:
self.iff = arch.get_if_list()
self.iff = get_if_list()
else:
if iface.__class__ is list:
self.iff = iface
else:
self.iff = [iface]
for i in self.iff:
arch.set_promisc(self.ins, i)
set_promisc(self.ins, i)
def close(self):
if self.closed:
return
self.closed=1
if self.promisc:
for i in self.iff:
arch.set_promisc(self.ins, i, 0)
set_promisc(self.ins, i, 0)
SuperSocket.close(self)
def recv(self, x):
pkt, sa_ll = self.ins.recvfrom(x)
......@@ -278,7 +278,7 @@ class L3PacketSocket(SuperSocket):
pkt = pkt.payload
if pkt is not None:
pkt.time = arch.get_last_packet_timestamp(self.ins)
pkt.time = get_last_packet_timestamp(self.ins)
return pkt
def send(self, x):
......@@ -323,7 +323,7 @@ class L2Socket(SuperSocket):
else:
filter = "not (%s)" % conf.except_filter
if filter is not None:
arch.attach_filter(self.ins, filter)
attach_filter(self.ins, filter)
self.ins.bind((iface, type))
self.ins.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 2**30)
self.outs = self.ins
......@@ -370,12 +370,12 @@ class L2ListenSocket(SuperSocket):
else:
filter = "not (%s)" % conf.except_filter
if filter is not None:
arch.attach_filter(self.ins, filter)
attach_filter(self.ins, filter)
if promisc is None:
promisc = conf.sniff_promisc
self.promisc = promisc
if iface is None:
self.iff = arch.get_if_list()
self.iff = get_if_list()
else:
if iface.__class__ is list:
self.iff = iface
......@@ -383,12 +383,12 @@ class L2ListenSocket(SuperSocket):
self.iff = [iface]
if self.promisc:
for i in self.iff:
arch.set_promisc(self.ins, i)
set_promisc(self.ins, i)
self.ins.setsockopt(socket.SOL_SOCKET, socket.SO_RCVBUF, 2**30)
def close(self):
if self.promisc:
for i in self.iff:
arch.set_promisc(self.ins, i, 0)
set_promisc(self.ins, i, 0)
SuperSocket.close(self)
def recv(self, x):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment