@@ -104,8 +104,8 | |||||
104 | if first == 0: |
|
104 | if first == 0: | |
105 | first = 1 |
|
105 | first = 1 | |
106 | lng = int(trama_rx[20:26]) |
|
106 | lng = int(trama_rx[20:26]) | |
107 | print str(lng) |
|
107 | frm_lng= lng + 31 # 31 bytes are fixed and added to the data size to get the frame size | |
108 | if cnt == lng: |
|
108 | if cnt == frm_lng: | |
109 | break |
|
109 | break | |
110 |
|
110 | |||
111 | print "\nThis socket has received some data from: " + str(self.answer) |
|
111 | print "\nThis socket has received some data from: " + str(self.answer) | |
@@ -117,7 +117,6 | |||||
117 | # Short data through ethernet |
|
117 | # Short data through ethernet | |
118 | trama_rx = self.socket_c.recv(nbytes) |
|
118 | trama_rx = self.socket_c.recv(nbytes) | |
119 | lng = int(trama_rx[20:26]) |
|
119 | lng = int(trama_rx[20:26]) | |
120 | print str(lng) |
|
|||
121 | print "\nThis socket has received this data: " + str(trama_rx) |
|
120 | print "\nThis socket has received this data: " + str(trama_rx) | |
122 |
|
121 | |||
123 | return trama_rx, lng |
|
122 | return trama_rx, lng | |
@@ -137,12 +136,10 | |||||
137 | trama_tx = self.__HEADER + self.__TYPE + self.iDSource + \ |
|
136 | trama_tx = self.__HEADER + self.__TYPE + self.iDSource + \ | |
138 | self.iDDestino + self.len + str(cmd) + str(data) + self.crc |
|
137 | self.iDDestino + self.len + str(cmd) + str(data) + self.crc | |
139 |
|
138 | |||
140 |
self.len = self.int2str(len( |
|
139 | self.len = self.int2str(len(data)) | |
141 |
|
140 | |||
142 | trama_tx = self.__HEADER + self.__TYPE + self.iDSource + \ |
|
141 | trama_tx = self.__HEADER + self.__TYPE + self.iDSource + \ | |
143 | self.iDDestino + self.len + str(cmd) + str(data) + self.crc |
|
142 | self.iDDestino + self.len + str(cmd) + str(data) + self.crc | |
144 |
|
||||
145 | print trama_tx |
|
|||
146 |
|
143 | |||
147 | if self.asServer == True: |
|
144 | if self.asServer == True: | |
148 | self.SendAsServer(trama_tx) |
|
145 | self.SendAsServer(trama_tx) | |
@@ -185,9 +182,8 | |||||
185 | ipDestino = trama[13:20] |
|
182 | ipDestino = trama[13:20] | |
186 | len = trama[20:26] |
|
183 | len = trama[20:26] | |
187 | cmd = trama[26:30] |
|
184 | cmd = trama[26:30] | |
188 | ldata = l-31 |
|
185 | data = trama[30:30+int(l)] | |
189 |
|
|
186 | crc = trama[30+ int(l):] | |
190 | crc = trama[30+ldata:] |
|
|||
191 |
|
187 | |||
192 | return ipSource, ipDestino, cmd, data |
|
188 | return ipSource, ipDestino, cmd, data | |
193 |
|
189 |
General Comments 0
You need to be logged in to leave comments.
Login now