X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FPacketVerifier.py;h=45fab6a7c6bc6298d54a360feb410e57dc597919;hp=19d6aaf53ff72b3f4f5a7538ee9fe0b5e88e661a;hb=3121b691debad27fcea1c6e2031e4a2544e42fbf;hpb=8f285166faf13156a4f7c70adac9a7e20549268f diff --git a/resources/libraries/python/PacketVerifier.py b/resources/libraries/python/PacketVerifier.py index 19d6aaf53f..45fab6a7c6 100644 --- a/resources/libraries/python/PacketVerifier.py +++ b/resources/libraries/python/PacketVerifier.py @@ -73,7 +73,7 @@ from scapy.all import Ether, ARP, Packet from scapy.layers.inet6 import IPv6 __all__ = ['RxQueue', 'TxQueue', 'Interface', 'create_gratuitous_arp_request', - 'auto_pad'] + 'auto_pad', 'checksum_equal'] # TODO: http://stackoverflow.com/questions/320232/ensuring-subprocesses-are-dead-on-exiting-python-program @@ -291,10 +291,6 @@ class Interface(object): def recv_pkt(self, timeout=3): return self.rxq.recv(timeout, self.sent_packets) - def close(self): - #self.rxq._proc.terminate() - pass - def create_gratuitous_arp_request(src_mac, src_ip): """Creates scapy representation of gratuitous ARP request""" @@ -309,3 +305,25 @@ def auto_pad(packet): padded += ('\0' * (60 - len(padded))) return padded + +def checksum_equal(chksum1, chksum2): + """Compares two checksums in one's complement notation. + + Checksums to be compared are calculated as 16 bit one's complement of the + one's complement sum of 16 bit words of some buffer. + In one's complement notation 0x0000 (positive zero) and 0xFFFF + (negative zero) are equivalent. + + :param chksum1: First checksum. + :param chksum2: Second checksum. + :type chksum1: uint16 + :type chksum2: uint16 + + :return: True if checksums are equivalent, False otherwise. + :rtype: boolean + """ + if chksum1 == 0xFFFF: + chksum1 = 0 + if chksum2 == 0xFFFF: + chksum2 = 0 + return chksum1 == chksum2