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.

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

pim: Fix autorp group joins (backport #18225) #18245

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Feb 24, 2025

Group joining got broken when moving the autorp socket to open/close as needed. This fixes it so autorp group joining is properly handled as part of opening the socket.


This is an automatic backport of pull request #18225 done by Mergify.

Group joining got broken when moving the autorp socket to open/close
as needed. This fixes it so autorp group joining is properly handled
as part of opening the socket.

Signed-off-by: Nathan Bahr <nbahr@atcorp.com>
(cherry picked from commit d840560)

# Conflicts:
#	pimd/pim_autorp.c
#	tests/topotests/pim_autorp/test_pim_autorp.py
@mergify mergify bot added the conflicts label Feb 24, 2025
Copy link
Author

mergify bot commented Feb 24, 2025

Cherry-pick of d840560 has failed:

On branch mergify/bp/stable/10.2/pr-18225
Your branch is up to date with 'origin/stable/10.2'.

You are currently cherry-picking commit d840560b7.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   pimd/pim_iface.c

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   pimd/pim_autorp.c
	both modified:   tests/topotests/pim_autorp/test_pim_autorp.py

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants