X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FPacketVerifier.py;h=19d6aaf53ff72b3f4f5a7538ee9fe0b5e88e661a;hp=5c304dcc763b3a9f7af1019993981b9b3f8ed875;hb=8f285166faf13156a4f7c70adac9a7e20549268f;hpb=84c45de446b69f83df919a91bc684da910824d6f diff --git a/resources/libraries/python/PacketVerifier.py b/resources/libraries/python/PacketVerifier.py index 5c304dcc76..19d6aaf53f 100644 --- a/resources/libraries/python/PacketVerifier.py +++ b/resources/libraries/python/PacketVerifier.py @@ -86,6 +86,7 @@ class PacketVerifier(object): self._sock = socket.socket(socket.AF_PACKET, socket.SOCK_RAW, ETH_P_ALL) self._sock.bind((interface_name, ETH_P_ALL)) + self._ifname = interface_name def extract_one_packet(buf): @@ -231,13 +232,17 @@ class RxQueue(PacketVerifier): return None pkt = self._sock.recv(0x7fff) + pkt_pad = auto_pad(pkt) + print 'Received packet on {0} of len {1}'.format(self._ifname, len(pkt)) + Ether(pkt).show2() + print if ignore is not None: for i, ig_pkt in enumerate(ignore): # Auto pad all packets in ignore list ignore[i] = auto_pad(ig_pkt) for ig_pkt in ignore: - if ig_pkt == pkt: + if ig_pkt == pkt_pad: # Found the packet in ignore list, get another one # TODO: subtract timeout - time_spent in here ignore.remove(ig_pkt) @@ -263,6 +268,11 @@ class TxQueue(PacketVerifier): :param pkt: Packet to send. :type pkt: string or scapy Packet derivative. """ + print 'Sending packet out of {0} of len {1}'.format(self._ifname, + len(pkt)) + Ether(str(pkt)).show2() + print + pkt = auto_pad(str(pkt)) self._sock.send(pkt)