Skip to content
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

Jump to bottom

Fix for CP state machine issues #33

Merged
merged 1 commit into from
Mar 15, 2021
Merged

Fix for CP state machine issues #33

merged 1 commit into from
Mar 15, 2021

Conversation

qbdwlr
Copy link
Contributor

@qbdwlr qbdwlr commented Mar 2, 2021

This PR is to fix issues with CP state machine found during testing AN rollover.
It was seen that when MACsec live peer timeout coincides with AN rollover on Key server, there can be two valid state machine transitions from CP Receiving state: Abandon and Transmit. This results in both Abandon and Transmit handling being executed by CP state machine, Key server will remain stuck in invalid Transmit state, and CP state machine will not recover without manual intervention.
Changes update CP state machine so that multiple transition paths cannot be executed from any given CP state.

@lguohan
Copy link
Contributor

lguohan commented Mar 4, 2021

is this upstreamed?

@Pterosaur
Copy link
Collaborator

is this upstreamed?

I check the spec, IEEE 802.1X 2010 MACsec, this fix looks correct.
image
So I think it's a upstream issue

@qbdwlr
Copy link
Contributor Author

qbdwlr commented Mar 10, 2021 •
edited
Loading

So I think it's a upstream issue

It is definitely an upstream issue. Does this mean you would prefer not to merge this pull request? I was not able to find the wpa-supplicant project on github.com to submit this fix directly to that project.

@Pterosaur
Copy link
Collaborator

So I think it's a upstream issue

It is definitely an upstream issue. Does this mean you would prefer not to merge this pull request? I was not able to find the wpa-supplicant project on github.com to submit this fix directly to that project.

wpa-supplicant belongs to hostap project https://w1.fi/hostapd/ . Its community maintains or contributes the repository by mail-list https://w1.fi/cgit/hostap/plain/CONTRIBUTIONS.

But I think we should merge this PR into our repo, because we don't always follow the latest commit of upstream.
@lguohan Do you have any concern about merging this PR?

@Pterosaur Pterosaur merged commit 1bbc8f1 into sonic-net:master Mar 15, 2021
@Pterosaur Pterosaur mentioned this pull request Oct 25, 2021
Merged
5 tasks
Pterosaur added a commit to sonic-net/sonic-buildimage that referenced this pull request Oct 25, 2021
@Pterosaur
Update wpa supplicant (#8998)
d051bc4 
Signed-off-by: Ze Gan <ganze718@gmail.com>

986a835153b3df3a37492fbd3a83fc8e38a40c10 Proactively rekey sonic-net/sonic-wpa-supplicant#36
b84dd21ac7b76686caf53f2e9a2c8eb80519ab31 Fix azurepieline download sonic swss common deb pakcage sonic-net/sonic-wpa-supplicant#37
66002de9d5e3165ccdbed40451db86ae0a8b3944 [macsec_sonic] driver support for macsec_include_sci sonic-net/sonic-wpa-supplicant#35
dae8f59cb54c90bc9011bd675806a75dd0808d27 MACsec XPN changes sonic-net/sonic-wpa-supplicant#34
c2271b2879ed157718edb51e842a3e33debeab7f Move SSCI from SC to SA and change packet number field name to adapt sai 1.7.1 sonic-net/sonic-wpa-supplicant#26
1bbc8f1ef463dd21428ce80b72da107f3bd2f3f0 Fix for CP state machine issues sonic-net/sonic-wpa-supplicant#33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Pterosaur Pterosaur Pterosaur approved these changes

@lguohan lguohan Awaiting requested review from lguohan

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@qbdwlr @lguohan @Pterosaur