Introduced eapol receive to use scapy with packet lambda filters.
Changed the tls/pap tests to use the eapol scapy receive functions.
diff --git a/src/test/utils/EapolAAA.py b/src/test/utils/EapolAAA.py
index 6c477f0..31be259 100644
--- a/src/test/utils/EapolAAA.py
+++ b/src/test/utils/EapolAAA.py
@@ -43,6 +43,7 @@
self.s.bind((self.intf, ETHERTYPE_PAE))
self.mymac = self.s.getsockname()[4]
self.llheader = Ether(dst = PAE_GROUP_ADDR, src = self.mymac, type = ETHERTYPE_PAE)
+ self.recv_sock = L2Socket(iface = self.intf, type = ETHERTYPE_PAE)
def cleanup(self):
if self.s is not None:
@@ -76,6 +77,12 @@
assert_equal(pkt_type, EAPOL_EAPPACKET)
return p[4:]
+ def eapol_scapy_recv(self, cb = None, lfilter = None, count = 1):
+ def eapol_default_cb(pkt): pass
+ if cb is None:
+ cb = eapol_default_cb
+ sniff(prn = cb, lfilter = lfilter, count = count, opened_socket = self.recv_sock)
+
def eapol_start(self):
eap_payload = self.eap(EAPOL_START, 2)
return self.eapol_send(EAPOL_START, eap_payload)