[tor-commits] [ooni-probe/master] Use the non raw scapy super socket when using Mac OS X

[art@xxxxxxxxxxxxxx]

commit ce36a45700898c4b601b7c11bff5162896b78615
Author: Arturo Filastò <art@xxxxxxxxx>
Date:   Mon Dec 30 16:30:16 2013 +0100

    Use the non raw scapy super socket when using Mac OS X
---
 ooni/utils/txscapy.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py
index bcb0ca2..ae33365 100644
--- a/ooni/utils/txscapy.py
+++ b/ooni/utils/txscapy.py
@@ -129,7 +129,9 @@ class ScapyFactory(abstract.FileDescriptor):
         abstract.FileDescriptor.__init__(self, reactor)
         if interface == 'auto':
             interface = getDefaultIface()
-        if not super_socket:
+        if not super_socket and sys.platform == 'darwin':
+            super_socket = conf.L3socket(iface=interface, promisc=True, filter='')
+        elif not super_socket:
             super_socket = L3RawSocket(iface=interface, promisc=True)
 
         self.protocols = []



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits