matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bugfix: Fix incorrect IPv4 pseudo-header checksum calculation for a stream with incrementing/decrementing packet length (regression bug caused by variable fields feature introduced in 0.7)

Browse Source
This commit is contained in:
Srivats P 2016-01-27 18:26:49 +05:30
parent 4f6195b8ba
commit ad866e3025
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/ip4.cpp
View File

@ -819,7 +819,8 @@ quint32 Ip4Protocol::protocolFrameCksum(int streamIndex,
sum += *((quint16*)(p + 14)); // src-ip lo sum += *((quint16*)(p + 14)); // src-ip lo
sum += *((quint16*)(p + 16)); // dst-ip hi sum += *((quint16*)(p + 16)); // dst-ip hi
sum += *((quint16*)(p + 18)); // dst-ip lo sum += *((quint16*)(p + 18)); // dst-ip lo
sum += qToBigEndian((quint16) protocolFramePayloadSize()); // len sum += qToBigEndian((quint16)
protocolFramePayloadSize(streamIndex)); // len
sum += qToBigEndian((quint16) *(p + 9)); // proto sum += qToBigEndian((quint16) *(p + 9)); // proto
while(sum>>16) while(sum>>16)

9
test/pktlentest.py
View File

@ -105,6 +105,10 @@ def ports(request, drone):
ports.rx = ost_pb.PortIdList() ports.rx = ost_pb.PortIdList()
ports.rx.port_id.add().id = rx_number; ports.rx.port_id.add().id = rx_number;
# stop transmit/capture on ports, if any
drone.stopTransmit(ports.tx)
drone.stopCapture(ports.rx)
# delete existing streams, if any, on tx port # delete existing streams, if any, on tx port
sid_list = drone.getStreamIdList(ports.tx.port_id[0]) sid_list = drone.getStreamIdList(ports.tx.port_id[0])
drone.deleteStream(sid_list) drone.deleteStream(sid_list)
@ -181,12 +185,13 @@ def test_packet_length(drone, ports, stream, mode):
buff = drone.getCaptureBuffer(ports.rx.port_id[0]) buff = drone.getCaptureBuffer(ports.rx.port_id[0])
drone.saveCaptureBuffer(buff, 'capture.pcap') drone.saveCaptureBuffer(buff, 'capture.pcap')
log.info('dumping Rx capture buffer') log.info('dumping Rx capture buffer')
cap_pkts = subprocess.check_output([tshark, '-n', '-r', 'capture.pcap', cap_pkts = subprocess.check_output([tshark, '-n', '-r', 'capture.pcap'])
'-R', 'udp']) print(cap_pkts)
cap_pkts = subprocess.check_output([tshark, '-n', '-r', 'capture.pcap', cap_pkts = subprocess.check_output([tshark, '-n', '-r', 'capture.pcap',
'-R', 'udp', '-o', fmt]) '-R', 'udp', '-o', fmt])
print(cap_pkts) print(cap_pkts)
result = extract_column(cap_pkts, fmt_col) result = extract_column(cap_pkts, fmt_col)
print(result)
diffSum = 0 diffSum = 0
for i in range(len(result)): for i in range(len(result)):
l = int(result[i]) + 4 # add FCS to length l = int(result[i]) + 4 # add FCS to length