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

pimd: Close AutoRP socket when not needed (backport #17934) #17963

Open
wants to merge 1 commit into
base: stable/10.2
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 30, 2025

Don't leave the socket open if we are not enabled for discovery or announcements.
Properly disable autorp discovery by setting false rather than nb destroy.


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

Don't leave the socket open if we are not enabled for discovery
or announcements.

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

# Conflicts:
#	pimd/pim_autorp.c
Copy link
Author

mergify bot commented Jan 30, 2025

Cherry-pick of 5d102a0 has failed:

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

You are currently cherry-picking commit 5d102a0a7.
  (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_cmd_common.c

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

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.

1 participant