Skip to content

add Ether check in macsec_dp_poll #6828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kevinskwang merged 1 commit into from
Dec 6, 2022
Merged

add Ether check in macsec_dp_poll #6828

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions tests/macsec/macsec_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,11 +401,15 @@ def macsec_dp_poll(test, device_number=0, port_number=None, timeout=None, exp_pk
or exp_pkt is None:
return ret
pkt = scapy.Ether(ret.packet)
if pkt[scapy.Ether].type != 0x88e5:
if ptf.dataplane.match_exp_pkt(exp_pkt, pkt):
return ret
else:
continue
if pkt.haslayer(scapy.Ether):
if pkt[scapy.Ether].type != 0x88e5:
if ptf.dataplane.match_exp_pkt(exp_pkt, pkt):
return ret
else:
continue
else:
continue

macsec_info = load_macsec_info(test.duthost, find_portname_from_ptf_id(test.mg_facts, ret.port), force_reload[ret.port])
if macsec_info:
encrypt, send_sci, xpn_en, sci, an, sak, ssci, salt = macsec_info
Expand Down