proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-17 15:02:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: Add New Source type for where a (S,G) mroute is learned

Browse Source 
Add Source type for (S,G) mroute.  This will allow us to know that
a (S,G) route came from an actual Source( ie the kernel called us
back with information about a multicast packet it received with
no mroute for it ).

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2015-10-28 10:14:06 -07:00 committed by Donald Sharp
parent ed66602c64
commit 0fba6e638a
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pimd/pim_cmd.c
View File

@ -2174,7 +2174,7 @@ static void show_mroute(struct vty *vty)
struct static_route *s_route; struct static_route *s_route;
time_t now; time_t now;
vty_out(vty, "Proto: I=IGMP P=PIM S=STATIC%s%s", VTY_NEWLINE, VTY_NEWLINE); vty_out(vty, "Proto: I=IGMP P=PIM S=STATIC O=SOURCE%s%s", VTY_NEWLINE, VTY_NEWLINE);
vty_out(vty, "Source Group Proto Input iVifI Output oVifI TTL Uptime %s", vty_out(vty, "Source Group Proto Input iVifI Output oVifI TTL Uptime %s",
VTY_NEWLINE); VTY_NEWLINE);
@ -2213,6 +2213,9 @@ static void show_mroute(struct vty *vty)
if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_IGMP) { if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_IGMP) {
strcat(proto, "I"); strcat(proto, "I");
} }
if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_SOURCE) {
strcat(proto, "O");
}
vty_out(vty, "%-15s %-15s %-5s %-5s %5d %-6s %5d %3d %8s %s", vty_out(vty, "%-15s %-15s %-5s %-5s %5d %-6s %5d %3d %8s %s",
source_str, source_str,

16
pimd/pim_oil.h
View File

@ -25,9 +25,19 @@
#include "pim_mroute.h" #include "pim_mroute.h"
#define PIM_OIF_FLAG_PROTO_IGMP (1 << 0) /* bitmask 1 */ /*
#define PIM_OIF_FLAG_PROTO_PIM (1 << 1) /* bitmask 2 */ * Where did we get this (S,G) from?
#define PIM_OIF_FLAG_PROTO_ANY (3) /* bitmask (1 | 2) */ *
* IGMP - Learned from IGMP
* PIM - Learned from PIM
* SOURCE - Learned from Source multicast packet received
*/
#define PIM_OIF_FLAG_PROTO_IGMP (1 << 0)
#define PIM_OIF_FLAG_PROTO_PIM (1 << 1)
#define PIM_OIF_FLAG_PROTO_SOURCE (2 << 1)
#define PIM_OIF_FLAG_PROTO_ANY (PIM_OIF_FLAG_PROTO_IGMP | \
PIM_OIF_FLAG_PROTO_PIM | \
PIM_OIF_FLAG_PROTO_SOURCE)
/* /*
qpim_channel_oil_list holds a list of struct channel_oil. qpim_channel_oil_list holds a list of struct channel_oil.