[tor-commits] [ooni-probe/master] Put a sane timeout default on txscapy

[art at torproject.org]

commit 144263051c84c45e29c6a4cd29e6c04e5a30ff47
Author: Arturo Filastò <art at fuffa.org>
Date:   Sat Nov 24 14:49:17 2012 +0100

    Put a sane timeout default on txscapy
---
 ooni/utils/txscapy.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ooni/utils/txscapy.py b/ooni/utils/txscapy.py
index d87a7a0..4341f68 100644
--- a/ooni/utils/txscapy.py
+++ b/ooni/utils/txscapy.py
@@ -32,7 +32,7 @@ class TXPcapWriter(PcapWriter):
 
 class ScapyProtocol(abstract.FileDescriptor):
     def __init__(self, super_socket=None, 
-            reactor=None, timeout=None, receive=True):
+            reactor=None, timeout=4, receive=True):
         abstract.FileDescriptor.__init__(self, reactor)
         # By default we use the conf.L3socket
         if not super_socket: