# SVN changeset patch # User imanay # Date 2013-02-27 22:50:45.216202 # Revision 103 Testing frame without semicolon. Index: trunk/absroot/source/abspy/test/tcp/client.py =================================================================== diff --git a/trunk/absroot/source/abspy/test/tcp/client.py b/trunk/absroot/source/abspy/test/tcp/client.py --- a/trunk/absroot/source/abspy/test/tcp/client.py (revision 102) +++ b/trunk/absroot/source/abspy/test/tcp/client.py (revision 103) @@ -1,6 +1,5 @@ import socket import string -#import time def int2bin(n): n_hex = "%x" %n @@ -40,53 +39,31 @@ elif l_n == 5: str_n = "0" + str_n return str_n - - -#ini = time.time() -#sum = 0 -#for i in range(11,15): -i=117 -#ini1 = time.time() +i=1 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM) host = "192.168.1." + str(i) s.connect((host, 5500)) -fd = open("experimento2.abs","r") +fd = open("input2.txt","r") FileList = fd.readlines() data = "".join(FileList) +cmd = "ANST" + dfl = 0 -#lng = int2bin(dfl) lng = int2str(dfl) -msg = "jro" + "abs" + "src" + "cm1" + lng + "cmd" + data + "crc" # -print len(msg) -print msg - +msg = "jro" + "abs" + "clnt_01" + "clnt_02" + lng + cmd + data + "0" # lmsg = len(msg) -#lng = int2bin(lmsg) lng = int2str(lmsg) -msg = "jro" + "abs" + "src" + "cm1" + lng + "cmd" + data + "crc" # -print len(msg) -#print msg +msg = "jro" + "abs" + "clnt_01" + "clnt_02" + lng + cmd + data + "0" # +s.send(msg) +print "Enviado " + str(len(msg)) + " bytes." +recibido = s.recv(512) -s.send(msg) -#recibido = s.recv(512) - -#print recibido +print "Recibido: " + recibido s.close() - - -# delay = time.time() - ini1 -# sum += delay -# print delay -# time.sleep(0.1) - -#print sum - - - \ No newline at end of file Index: trunk/absroot/source/abspy/test/tcp/server.py =================================================================== diff --git a/trunk/absroot/source/abspy/test/tcp/server.py b/trunk/absroot/source/abspy/test/tcp/server.py --- a/trunk/absroot/source/abspy/test/tcp/server.py (revision 102) +++ b/trunk/absroot/source/abspy/test/tcp/server.py (revision 103) @@ -1,5 +1,20 @@ import socket import time + +def int2str(n): + str_n = str(n) + l_n = len(str_n) + if l_n == 1: + str_n = "00000" + str_n + elif l_n == 2: + str_n = "0000" + str_n + elif l_n == 3: + str_n = "000" + str_n + elif l_n == 4: + str_n = "00" + str_n + elif l_n == 5: + str_n = "0" + str_n + return str_n host = "192.168.1.117" s = socket.socket() @@ -22,19 +37,26 @@ cnt = len(all) if first == 0: first = 1; - lng = int(all[12:18]) # 6 bytes to get the frame size + lng = int(all[21:27]) # 6 bytes to get the frame size # i = i + 1 # if cnt == lng or i == 30: if cnt == lng: break - - - + print "\nSize of frame:" + str(lng) print "\nNumber of bytes received:" + str(cnt) + + data = "ok" + dfl = 0 + lng = int2str(dfl) + msg = "jro" + "abs" + "src" + "cm1" + lng + "cmd" + data + "crc" # + lmsg = len(msg) + lng = int2str(lmsg) + + msg = "jro" + "abs" + "src" + "cm1" + lng + "cmd" + data + "crc" # + sc.send(msg) + print "Enviando respuesta en " + str(len(msg)) + " bytes." sc.close() -s.close() - -#print len(recibido) \ No newline at end of file +s.close() \ No newline at end of file