[tor-commits] [ooni-probe/master] Add some more fine grained matching on received answers

[art at torproject.org]

commit 0cf6a3d3bdc2ec847cd3834642cb3b8a4176ac5e
Author: Arturo Filastò <art at fuffa.org>
Date:   Thu Nov 22 11:21:27 2012 +0100

    Add some more fine grained matching on received answers
---
 ooni/templates/scapyt.py |   24 +++++++++++++++++++++++-
 1 files changed, 23 insertions(+), 1 deletions(-)

diff --git a/ooni/templates/scapyt.py b/ooni/templates/scapyt.py
index d137276..ca6d938 100644
--- a/ooni/templates/scapyt.py
+++ b/ooni/templates/scapyt.py
@@ -9,7 +9,7 @@ from twisted.python import usage
 from twisted.plugin import IPlugin
 from twisted.internet import protocol, defer, threads
 
-from scapy.all import send, sr, IP, TCP
+from scapy.all import send, sr, IP, TCP, config
 
 from ooni.nettest import NetTestCase
 from ooni.utils import log
@@ -43,6 +43,28 @@ class BaseScapyTest(NetTestCase):
     version = 0.1
 
     requiresRoot = True
+    baseFlags = [
+            ['ipsrc', 's', 'Check if IP src matches when processing answers'],
+            ['seqack', 'k', 'Check if TCP sequence number and ack matches when processing answers'],
+            ['ipid', 'i', 'Check if IP id matches when processing answers']
+            ]
+
+    def _setUp(self):
+        if self.localOptions['ipsrc']:
+            config.checkIPsrc = 1
+        else:
+            config.checkIPsrc = 0
+
+        if self.localOptions['ipid']:
+            config.checkIPID = 1
+        else:
+            config.checkIPID = 0
+        # XXX we don't support strict matching
+
+        if self.localOptions['seqack']:
+            config.check_TCPerror_seqack = 1
+        else:
+            config.check_TCPerror_seqack = 0
 
     def sr(self, packets, *arg, **kw):
         """