From 11e0acfba5b5c2c40225ba1ea0a2683887081738 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sat, 8 Jun 2019 07:30:36 -0400 Subject: [PATCH] pimd: The PIM_OIF_FLAG_PROTO_SRC flag was never used Nor should it be. So remove from system. Signed-off-by: Donald Sharp --- pimd/pim_cmd.c | 22 ++-------------------- pimd/pim_oil.h | 8 +++----- 2 files changed, 5 insertions(+), 25 deletions(-) diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 7788191454..c8a9bf5520 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -2117,7 +2117,7 @@ static void pim_show_state(struct pim_instance *pim, struct vty *vty, } else { if (first_oif) { first_oif = 0; - vty_out(vty, "%s(%c%c%c%c%c)", out_ifname, + vty_out(vty, "%s(%c%c%c%c)", out_ifname, (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_IGMP) ? 'I' @@ -2130,16 +2130,12 @@ static void pim_show_state(struct pim_instance *pim, struct vty *vty, & PIM_OIF_FLAG_PROTO_VXLAN) ? 'V' : ' ', - (c_oil->oif_flags[oif_vif_index] - & PIM_OIF_FLAG_PROTO_SOURCE) - ? 'S' - : ' ', (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_STAR) ? '*' : ' '); } else - vty_out(vty, ", %s(%c%c%c%c%c)", + vty_out(vty, ", %s(%c%c%c%c)", out_ifname, (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_IGMP) @@ -2153,10 +2149,6 @@ static void pim_show_state(struct pim_instance *pim, struct vty *vty, & PIM_OIF_FLAG_PROTO_VXLAN) ? 'V' : ' ', - (c_oil->oif_flags[oif_vif_index] - & PIM_OIF_FLAG_PROTO_SOURCE) - ? 'S' - : ' ', (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_STAR) ? '*' @@ -5331,11 +5323,6 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, json_object_boolean_true_add( json_ifp_out, "protocolVxlan"); - if (c_oil->oif_flags[oif_vif_index] - & PIM_OIF_FLAG_PROTO_SOURCE) - json_object_boolean_true_add( - json_ifp_out, "protocolSource"); - if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_STAR) json_object_boolean_true_add( @@ -5378,11 +5365,6 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, strlcpy(proto, "VxLAN", sizeof(proto)); } - if (c_oil->oif_flags[oif_vif_index] - & PIM_OIF_FLAG_PROTO_SOURCE) { - strlcpy(proto, "SRC", sizeof(proto)); - } - if (c_oil->oif_flags[oif_vif_index] & PIM_OIF_FLAG_PROTO_STAR) { strlcpy(proto, "STAR", sizeof(proto)); diff --git a/pimd/pim_oil.h b/pimd/pim_oil.h index 57930e3418..d097da6b3e 100644 --- a/pimd/pim_oil.h +++ b/pimd/pim_oil.h @@ -32,13 +32,11 @@ */ #define PIM_OIF_FLAG_PROTO_IGMP (1 << 0) #define PIM_OIF_FLAG_PROTO_PIM (1 << 1) -#define PIM_OIF_FLAG_PROTO_SOURCE (1 << 2) -#define PIM_OIF_FLAG_PROTO_STAR (1 << 3) -#define PIM_OIF_FLAG_PROTO_VXLAN (1 << 4) +#define PIM_OIF_FLAG_PROTO_STAR (1 << 2) +#define PIM_OIF_FLAG_PROTO_VXLAN (1 << 3) #define PIM_OIF_FLAG_PROTO_ANY \ (PIM_OIF_FLAG_PROTO_IGMP | PIM_OIF_FLAG_PROTO_PIM \ - | PIM_OIF_FLAG_PROTO_SOURCE | PIM_OIF_FLAG_PROTO_STAR \ - | PIM_OIF_FLAG_PROTO_VXLAN) + | PIM_OIF_FLAG_PROTO_STAR | PIM_OIF_FLAG_PROTO_VXLAN) /* * We need a pimreg vif id from the kernel. -- 2.39.5