Skip to content
Snippets Groups Projects
Commit 9372898a authored by Henrik Tjäder's avatar Henrik Tjäder
Browse files

Merge branch 'master' of git.assembla.com:d0020e

parents de91c2b6 bea02796
No related branches found
No related tags found
No related merge requests found
...@@ -44,13 +44,14 @@ def udp_client_receive(UDP_RECEIVE_IP, UDP_RECEIVE_PORT): ...@@ -44,13 +44,14 @@ def udp_client_receive(UDP_RECEIVE_IP, UDP_RECEIVE_PORT):
try: try:
rcv_sock.bind(ADDR) rcv_sock.bind(ADDR)
print 'Server Listening on', ADDR print('Server Listening on', ADDR)
except Exception: except Exception:
print '***ERROR: Server Port Binding Failed' print('***ERROR: Server Port Binding Failed')
#FIRE UP THE LISTENER ENGINES #FIRE UP THE LISTENER ENGINES
while True: while True:
data, addr = rcv_sock.recvfrom(BUFFER) data, addr = rcv_sock.recvfrom(BUFFER)
data = data.decode("utf-8")
splitdata = data.split(',') splitdata = data.split(',')
timecount = splitdata[0].strip("('") timecount = splitdata[0].strip("('")
rt_delay = (time.time() - float(timecount)) rt_delay = (time.time() - float(timecount))
...@@ -65,8 +66,8 @@ def udp_client_receive(UDP_RECEIVE_IP, UDP_RECEIVE_PORT): ...@@ -65,8 +66,8 @@ def udp_client_receive(UDP_RECEIVE_IP, UDP_RECEIVE_PORT):
rt_delay_array.append(rt_delay) rt_delay_array.append(rt_delay)
print (time.ctime() + ',' + 'received , ' + print((time.ctime() + ',' + 'received , ' +
packet_number + ' , ' + str(rt_delay)) packet_number + ' , ' + str(rt_delay)))
# Store minimum and maximum delay # Store minimum and maximum delay
if rt_delay > max_delay: if rt_delay > max_delay:
...@@ -87,10 +88,10 @@ def udp_client_send(UDP_DEST_IP, UDP_DEST_PORT, ...@@ -87,10 +88,10 @@ def udp_client_send(UDP_DEST_IP, UDP_DEST_PORT,
inter_departure_time = 1. / PACKETS_PER_SEC inter_departure_time = 1. / PACKETS_PER_SEC
packet_count_snd = 0 packet_count_snd = 0
print "UDP Client Started" print("UDP Client Started")
print "UDP target IP:", UDP_DEST_IP print("UDP target IP:", UDP_DEST_IP)
print "UDP target port:", UDP_DEST_PORT print("UDP target port:", UDP_DEST_PORT)
print "UDP Packets to Send:", NR_OF_PACKETS print("UDP Packets to Send:", NR_OF_PACKETS)
#IF IPv6 #IF IPv6
if ':' in UDP_DEST_IP: if ':' in UDP_DEST_IP:
...@@ -115,7 +116,7 @@ def udp_client_send(UDP_DEST_IP, UDP_DEST_PORT, ...@@ -115,7 +116,7 @@ def udp_client_send(UDP_DEST_IP, UDP_DEST_PORT,
time.sleep(inter_departure_time) time.sleep(inter_departure_time)
snd_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) snd_sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
snd_sock.sendto(str(("%.5f" % time.time(), str('%08d' % i), snd_sock.sendto(str(("%.5f" % time.time(), str('%08d' % i),
padding)), (UDP_DEST_IP, UDP_DEST_PORT)) padding)).encode("utf-8"), (UDP_DEST_IP, UDP_DEST_PORT))
packet_count_snd = packet_count_snd + 1 packet_count_snd = packet_count_snd + 1
#WAIT 5SEC FOR ALL PACKETS TO ARRIVE #WAIT 5SEC FOR ALL PACKETS TO ARRIVE
...@@ -126,18 +127,18 @@ def udp_client_send(UDP_DEST_IP, UDP_DEST_PORT, ...@@ -126,18 +127,18 @@ def udp_client_send(UDP_DEST_IP, UDP_DEST_PORT,
PLR = 100 - ((packet_count_rcvd * 100.) / packet_count_snd) PLR = 100 - ((packet_count_rcvd * 100.) / packet_count_snd)
print '\n', packet_count_snd, 'packets sent' print('\n', packet_count_snd, 'packets sent')
print packet_count_rcvd, 'packets received' print(packet_count_rcvd, 'packets received')
print 'packet loss ratio = ', round(PLR, 3), '%' print('packet loss ratio = ', round(PLR, 3), '%')
if (max_delay - min_delay != -100): if (max_delay - min_delay != -100):
print 'max_delay = ', max_delay print('max_delay = ', max_delay)
print 'min_delay = ', min_delay print('min_delay = ', min_delay)
print 'range = ', (max_delay - min_delay) print('range = ', (max_delay - min_delay))
#CALCULATE THE STANDARD DEVIATION #CALCULATE THE STANDARD DEVIATION
if rt_delay_array: if rt_delay_array:
print 'std.dev = ', np.std(rt_delay_array) print('std.dev = ', np.std(rt_delay_array))
#NETWORK STABILITY BASED ON PACKET LOSS AND DELAY, VALUE 0-100 #NETWORK STABILITY BASED ON PACKET LOSS AND DELAY, VALUE 0-100
network_stability = 0 network_stability = 0
...@@ -147,7 +148,7 @@ def udp_client_send(UDP_DEST_IP, UDP_DEST_PORT, ...@@ -147,7 +148,7 @@ def udp_client_send(UDP_DEST_IP, UDP_DEST_PORT,
avg_packet_delay = cumulative_delay / packet_count_rcvd avg_packet_delay = cumulative_delay / packet_count_rcvd
#CALCULATE STABILITY #CALCULATE STABILITY
network_stability = int(((packet_count_rcvd/packet_count_snd)*(avg_packet_delay/packet_wait_time)*100)+0.5) network_stability = int(((packet_count_rcvd/packet_count_snd)*(avg_packet_delay/packet_wait_time)*100)+0.5)
print 'avg.rtt = ', avg_packet_delay print('avg.rtt = ', avg_packet_delay)
#START THE THREADS FOR SENDER AND RECEIVER #START THE THREADS FOR SENDER AND RECEIVER
......
...@@ -22,16 +22,17 @@ else: ...@@ -22,16 +22,17 @@ else:
#BINDING, PROCESSING AND WRITING TO CSV #BINDING, PROCESSING AND WRITING TO CSV
try: try:
EchoServer.bind(ADDR) EchoServer.bind(ADDR)
print 'echo server started on port', ADDR print('echo server started on port', ADDR)
except Exception: except Exception:
print '***ERROR: Port Binding Failed' print('***ERROR: Port Binding Failed')
while True: while True:
data, addr = EchoServer.recvfrom(BUFFER) data, addr = EchoServer.recvfrom(BUFFER)
data = data.decode("utf-8")
addlst = addr[0], REMOTE_PORT addlst = addr[0], REMOTE_PORT
if REFLECT_SWITCH == 1: if REFLECT_SWITCH == 1:
EchoServer.sendto('%s' % (data), addlst) EchoServer.sendto(data.encode("utf-8"), addlst)
splitdata = data.split(',') splitdata = data.split(',')
timecount = splitdata[0].strip("('") timecount = splitdata[0].strip("('")
...@@ -44,8 +45,8 @@ while True: ...@@ -44,8 +45,8 @@ while True:
',' + 'received , ' + packet_number + ',' + 'received , ' + packet_number +
' , ' + str(one_way_delay) + '\n')) ' , ' + str(one_way_delay) + '\n'))
print (time.ctime() + ',' + 'received , ' + print((time.ctime() + ',' + 'received , ' +
packet_number + ' , ' + str(one_way_delay)) packet_number + ' , ' + str(one_way_delay)))
outfile.close() outfile.close()
EchoServer.close() EchoServer.close()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment