From 104b266ff78a5cb782cf976fe73b6dd9bc737a53 Mon Sep 17 00:00:00 2001
From: Simon Pamies <spamsch@gmail.com>
Date: Fri, 7 Jun 2013 15:28:31 +0200
Subject: [PATCH] Extended tcp,udp server and clients for tests

---
 configuration/udpsender.py | 29 ++++++++++++++++++++++-------
 configuration/udpserver.py | 36 +++++++++++++++++++++++++++++-------
 2 files changed, 51 insertions(+), 14 deletions(-)

diff --git a/configuration/udpsender.py b/configuration/udpsender.py
index a5372c06190..94a1f143122 100644
--- a/configuration/udpsender.py
+++ b/configuration/udpsender.py
@@ -1,13 +1,28 @@
-import socket
+import socket, sys
 
-UDP_IP = "195.227.44.85"
+if len(sys.argv) <= 2:
+    print "Please provide ip and mode (TCP, UDP)"
+    sys.exit(1)
+
+UDP_IP = sys.argv[1]
 UDP_PORT = 2013
+MODE = sys.argv[2]
 MESSAGE = "Hello, World!"
 
-print "UDP target IP:", UDP_IP
-print "UDP target port:", UDP_PORT
-print "message:", MESSAGE
+print "Target IP:", UDP_IP
+print "Target port:", UDP_PORT
+print "Message:", MESSAGE
+print "Mode: ", MODE
 
-sock = socket.socket(socket.AF_INET, # Internet
+if MODE == 'UDP':
+    sock = socket.socket(socket.AF_INET, # Internet
                      socket.SOCK_DGRAM) # UDP
-sock.sendto(MESSAGE, (UDP_IP, UDP_PORT))
+    sock.sendto(MESSAGE, (UDP_IP, UDP_PORT))
+
+else:
+    sock = socket.socket(socket.AF_INET, # Internet
+                     socket.SOCK_STREAM) # TCP
+    sock.connect((UDP_IP, UDP_PORT))
+    sock.send(MESSAGE)
+    data = sock.recv(1024)
+    sock.close()
diff --git a/configuration/udpserver.py b/configuration/udpserver.py
index fb9a29c94a0..ef480f4a323 100644
--- a/configuration/udpserver.py
+++ b/configuration/udpserver.py
@@ -1,13 +1,35 @@
 import socket
+import sys
 
-UDP_IP = "195.227.44.85"
+if len(sys.argv) <= 2:
+    print "Please provide an IP address and mode"
+    sys.exit(1)
+
+UDP_IP = sys.argv[1]
+MODE = sys.argv[2]
 UDP_PORT = 2013
 
-sock = socket.socket(socket.AF_INET, # Internet
+print "Listening on %s port %s (%s)" % (UDP_IP, UDP_PORT, MODE)
+if MODE == 'UDP':
+    sock = socket.socket(socket.AF_INET, # Internet
                      socket.SOCK_DGRAM) # UDP
-sock.bind((UDP_IP, UDP_PORT))
+    sock.bind((UDP_IP, UDP_PORT))
+
+    while True:
+        data, addr = sock.recvfrom(1024) # buffer size is 1024 bytes
+        print "received message:", data
+else:
+    sock = socket.socket(socket.AF_INET, # Internet
+                     socket.SOCK_STREAM) # TCP
+    sock.bind((UDP_IP, UDP_PORT))
+    sock.listen(1)
+    conn, addr = sock.accept()
+    while True:
+        data = conn.recv(1024)
+        if not data:
+            break
+        conn.send(data) # echo
+        print "received message:", data
+
+    conn.close()
 
-print "Listening on 195.227.44.85 port %s" % UDP_PORT
-while True:
-    data, addr = sock.recvfrom(1024) # buffer size is 1024 bytes
-    print "received message:", data