[tor-commits] [ooni-probe/master] Assume pcap if '--pcapfile' specified to close #521

[art at torproject.org]

commit 164c02931513cd43da3c8a3dc7258b2a4685f250
Author: Will Scott <willscott at gmail.com>
Date:   Sat Jul 2 21:59:25 2016 -0700

    Assume pcap if '--pcapfile' specified to close #521
---
 ooni/director.py | 2 +-
 ooni/oonicli.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/director.py b/ooni/director.py
index 02b6743..560fb0a 100644
--- a/ooni/director.py
+++ b/ooni/director.py
@@ -244,7 +244,7 @@ class Director(object):
         if self.allTestsDone.called:
             self.allTestsDone = defer.Deferred()
 
-        if config.privacy.includepcap:
+        if config.privacy.includepcap or config.global_options.get('pcapfile', None):
             self.startSniffing(test_details)
         report = Report(test_details, report_filename,
                         self.reportEntryManager,
diff --git a/ooni/oonicli.py b/ooni/oonicli.py
index 1a31e6d..2eb1d9f 100644
--- a/ooni/oonicli.py
+++ b/ooni/oonicli.py
@@ -199,7 +199,7 @@ def setupGlobalOptions(logging, start_tor, check_incoherences):
     if logging:
         log.start(global_options['logfile'])
 
-    if config.privacy.includepcap:
+    if config.privacy.includepcap or global_options['pcapfile']:
         from ooni.utils.net import hasRawSocketPermission
         if hasRawSocketPermission():
             from ooni.utils.txscapy import ScapyFactory