Centralized some python code parts to make future modifications easier.

Signed-off-by: Toni Uhlig <matzeton@googlemail.com>

3 files changed, 15 insertions, 33 deletions

diff --git a/examples/py-flow-info/flow-info.py b/examples/py-flow-info/flow-info.py
index ff513023e..ca3249a3e 100755
--- a/examples/py-flow-info/flow-info.py
+++ b/examples/py-flow-info/flow-info.py
@@ -61,21 +61,15 @@ def parse_json_str(json_str):
 
 
 if __name__ == '__main__':
-    host = nDPIsrvd.DEFAULT_HOST
-    port = nDPIsrvd.DEFAULT_PORT
-
-    if len(sys.argv) == 1:
-        sys.stderr.write('usage: {} [host] [port]\n'.format(sys.argv[0]))
-    if len(sys.argv) > 1:
-        host = sys.argv[1]
-    if len(sys.argv) > 2:
-        port = int(sys.argv[2])
+    argparser = nDPIsrvd.defaultArgumentParser()
+    args = argparser.parse_args()
+    address = nDPIsrvd.validateAddress(args)
 
     sys.stderr.write('Recv buffer size: {}\n'.format(nDPIsrvd.NETWORK_BUFFER_MAX_SIZE))
-    sys.stderr.write('Connecting to {}:{} ..\n'.format(host, port))
+    sys.stderr.write('Connecting to {} ..\n'.format(address[0]+':'+str(address[1]) if type(address) is tuple else address))
 
     nsock = nDPIsrvdSocket()
-    nsock.connect(host, port)
+    nsock.connect(address)
 
     while True:
         received = nsock.receive()
diff --git a/examples/py-flow-undetected-to-pcap/flow-undetected-to-pcap.py b/examples/py-flow-undetected-to-pcap/flow-undetected-to-pcap.py
index 26eac3ff5..fc0737288 100755
--- a/examples/py-flow-undetected-to-pcap/flow-undetected-to-pcap.py
+++ b/examples/py-flow-undetected-to-pcap/flow-undetected-to-pcap.py
@@ -60,21 +60,15 @@ def parse_json_str(json_str):
 
 
 if __name__ == '__main__':
-    host = nDPIsrvd.DEFAULT_HOST
-    port = nDPIsrvd.DEFAULT_PORT
-
-    if len(sys.argv) == 1:
-        sys.stderr.write('usage: {} [host] [port]\n'.format(sys.argv[0]))
-    if len(sys.argv) > 1:
-        host = sys.argv[1]
-    if len(sys.argv) > 2:
-        port = int(sys.argv[2])
+    argparser = nDPIsrvd.defaultArgumentParser()
+    args = argparser.parse_args()
+    address = nDPIsrvd.validateAddress(args)
 
     sys.stderr.write('Recv buffer size: {}\n'.format(nDPIsrvd.NETWORK_BUFFER_MAX_SIZE))
-    sys.stderr.write('Connecting to {}:{} ..\n'.format(host, port))
+    sys.stderr.write('Connecting to {} ..\n'.format(address[0]+':'+str(address[1]) if type(address) is tuple else address))
 
     nsock = nDPIsrvdSocket()
-    nsock.connect(host, port)
+    nsock.connect(address)
 
     while True:
         received = nsock.receive()
diff --git a/examples/py-risky-flow-to-pcap/risky-flow-to-pcap.py b/examples/py-risky-flow-to-pcap/risky-flow-to-pcap.py
index f3348e9a1..a57c37496 100755
--- a/examples/py-risky-flow-to-pcap/risky-flow-to-pcap.py
+++ b/examples/py-risky-flow-to-pcap/risky-flow-to-pcap.py
@@ -56,21 +56,15 @@ def parse_json_str(json_str):
 
 
 if __name__ == '__main__':
-    host = nDPIsrvd.DEFAULT_HOST
-    port = nDPIsrvd.DEFAULT_PORT
-
-    if len(sys.argv) == 1:
-        sys.stderr.write('usage: {} [host] [port]\n'.format(sys.argv[0]))
-    if len(sys.argv) > 1:
-        host = sys.argv[1]
-    if len(sys.argv) > 2:
-        port = int(sys.argv[2])
+    argparser = nDPIsrvd.defaultArgumentParser()
+    args = argparser.parse_args()
+    address = nDPIsrvd.validateAddress(args)
 
     sys.stderr.write('Recv buffer size: {}\n'.format(nDPIsrvd.NETWORK_BUFFER_MAX_SIZE))
-    sys.stderr.write('Connecting to {}:{} ..\n'.format(host, port))
+    sys.stderr.write('Connecting to {} ..\n'.format(address[0]+':'+str(address[1]) if type(address) is tuple else address))
 
     nsock = nDPIsrvdSocket()
-    nsock.connect(host, port)
+    nsock.connect(address)
 
     while True:
         received = nsock.receive()