[PATCH] osmo-gsm-tester[master]: nitb: Filter ssh packets in pcap

[Pau Espin Pedrol]

Review at  https://gerrit.osmocom.org/2586

nitb: Filter ssh packets in pcap

Change-Id: I62a6ae7bd3a84baceb684c26727d2269c86ed023
---
M src/osmo_gsm_tester/osmo_nitb.py
M src/osmo_gsm_tester/pcaprecorder.py
2 files changed, 8 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-gsm-tester refs/changes/86/2586/1

diff --git a/src/osmo_gsm_tester/osmo_nitb.py b/src/osmo_gsm_tester/osmo_nitb.py
index b81d612..9eb7813 100644
--- a/src/osmo_gsm_tester/osmo_nitb.py
+++ b/src/osmo_gsm_tester/osmo_nitb.py
@@ -53,7 +53,7 @@
 
         iface = util.ip_to_iface(self.addr())
         pcaprecorder.PcapRecorder(self.suite_run, self.run_dir.new_dir('pcap'),
-                                  iface, self.addr())
+                                  iface, self.addr(), 'port not 22')
 
         env = { 'LD_LIBRARY_PATH': util.prepend_library_path(lib) }
 
diff --git a/src/osmo_gsm_tester/pcaprecorder.py b/src/osmo_gsm_tester/pcaprecorder.py
index 8a63b30..08bc813 100644
--- a/src/osmo_gsm_tester/pcaprecorder.py
+++ b/src/osmo_gsm_tester/pcaprecorder.py
@@ -26,13 +26,14 @@
 
 class PcapRecorder(log.Origin):
 
-    def __init__(self, suite_run, run_dir, iface=None, addr=None):
+    def __init__(self, suite_run, run_dir, iface=None, addr=None, filter=''):
         self.suite_run = suite_run
         self.run_dir = run_dir
         self.iface = iface
         if not self.iface:
             self.iface = "any"
         self.addr = addr
+        self.extra_filter = filter
         self.set_log_category(log.C_RUN)
         self.set_name('pcap-recorder_%s' % self.iface)
         self.start()
@@ -50,9 +51,13 @@
         self.process.launch()
 
     def gen_filter(self):
-        filter = ""
+        filter = ''
         if self.addr:
             filter += 'host ' + self.addr
+        if self.extra_filter:
+            if self.addr:
+                filter += ' and '
+            filter += self.extra_filter
         return filter
 
     def running(self):

-- 
To view, visit https://gerrit.osmocom.org/2586
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I62a6ae7bd3a84baceb684c26727d2269c86ed023
Gerrit-PatchSet: 1
Gerrit-Project: osmo-gsm-tester
Gerrit-Branch: master
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>