commit 585ec8784c4dc07da0aff86f8b17956d3647eeeb Author: Arturo Filastò art@fuffa.org Date: Fri Dec 7 01:49:11 2012 +0100

Make scapy a soft depedency in the daphn3 kit --- ooni/kit/daphn3.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/kit/daphn3.py b/ooni/kit/daphn3.py index 36de664..ffe04f6 100644 --- a/ooni/kit/daphn3.py +++ b/ooni/kit/daphn3.py @@ -4,8 +4,6 @@ import yaml from twisted.internet import protocol, defer from twisted.internet.error import ConnectionDone

-from scapy.all import IP, Raw, rdpcap - from ooni.utils import log

def read_pcap(filename): @@ -15,6 +13,8 @@ def read_pcap(filename): Returns: [{"client": "\x17\x52\x15"}, {"server": "\x17\x15\x13"}] """ + from scapy.all import IP, Raw, rdpcap + packets = rdpcap(filename)

checking_first_packet = True