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

Add igmp proxy support #16861

Merged
merged 6 commits into from
Sep 24, 2024
Merged

Add igmp proxy support #16861

merged 6 commits into from
Sep 24, 2024

Conversation

btrent98
Copy link

This PR adds the ability to proxy igmp joins received on downstream interfaces to one or more upstream interfaces

@frrbot frrbot bot added documentation pim tests Topotests, make check, etc yang labels Sep 18, 2024
@btrent98 btrent98 force-pushed the igmp-proxy2 branch 4 times, most recently from fe1768e to 7adb219 Compare September 19, 2024 16:06

DEFUN (show_ip_igmp_proxy,
show_ip_igmp_proxy_cmd,
"show ip igmp [vrf NAME] proxy [json]",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could easily be combined with show_ip_igmp_join_cmd since they both do the same thing, just passing a different type.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I talked to Jafar about this and he prefers to leave them separate, both for clarity and also because the proxy command may expand in the future. If it does, we'll just have to pull them apart again.

}

DEFUN (show_ip_igmp_proxy_vrf_all,
show_ip_igmp_proxy_vrf_all_cmd,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same, merge with the other show that does basically the same thing.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

pimd/pim_cmd.c Outdated
interface_ip_igmp_proxy_cmd,
"[no] ip igmp proxy",
NO_STR
IP_STR
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix indentation

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

Barry A. Trent added 2 commits September 20, 2024 13:44
Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
@btrent98
Copy link
Author

ci:rerun Strange Ubuntu18 build failure?

pimd/pim_iface.c Outdated
@@ -1418,6 +1423,18 @@ int pim_if_gm_join_del(struct interface *ifp, pim_addr group_addr,
" group %pPAs source %pPAs on interface %s",
__func__, &group_addr, &source_addr, ifp->name);
return -3;
} else if (ij->join_type != join_type) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we have if (!ij)… that always returns. Why do we need an elseif ? There is no need for it.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

Barry A. Trent added 4 commits September 23, 2024 11:43
Use existing igmp static join infrastructure.
Add an enum to distinguish static from proxy joins.

Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
Signed-off-by: Barry A. Trent <barry.trent@atcorp.com>
@donaldsharp donaldsharp merged commit 269d63a into FRRouting:master Sep 24, 2024
11 checks passed
Jafaral added a commit that referenced this pull request Nov 12, 2024
New Features Highlight:

- PIM candidate BSR/RP [#16438]
- Static IGMP join without an IGMP report [1#6450]
- PIM AutoRP discovery/announcements [#16634]
- IGMP proxy [#16861]
- SRv6 SID Manager [#15604]
- Add `bgp ipv6-auto-ra` command [#16354]
- Implement `neighbor x remote-as auto` for BGP [#16345]
- Implement `bgp dual-as` for BGP [#16816]
- Implement BGP-wide configuration for graceful restart [#16099]
- Handle kernel routes appropriately (should fix recent NOPREFIXROUTE issue) [#16300]
- Add `cisco-authentication` password support for NHRP [#16172]

Signed-off-by: Jafar Al-Gharaibeh <jafar@atcorp.com>
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.

4 participants