diff options
| author | Russ White <russ@riw.us> | 2019-06-11 14:13:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-11 14:13:04 +0200 |
| commit | 51e6f92ec6ee1b265873c56bc11e7ff915dff155 (patch) | |
| tree | d383f2c3aa6cb0d175b8212da03dfcb8a2195b62 | |
| parent | Merge pull request #4483 from donaldsharp/pim_mroute_debug_detail (diff) | |
| parent | pimd: The PIM_OIF_FLAG_PROTO_SRC flag was never used (diff) | |
| download | frr-51e6f92ec6ee1b265873c56bc11e7ff915dff155.tar.xz frr-51e6f92ec6ee1b265873c56bc11e7ff915dff155.zip | |
Merge pull request #4494 from donaldsharp/no_src_for_you
pimd: The PIM_OIF_FLAG_PROTO_SRC flag was never used
| -rw-r--r-- | pimd/pim_cmd.c | 22 | ||||
| -rw-r--r-- | 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 6591bdc32..18e84fef2 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' @@ -2131,15 +2131,11 @@ static void pim_show_state(struct pim_instance *pim, struct vty *vty, ? '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) @@ -2154,10 +2150,6 @@ static void pim_show_state(struct pim_instance *pim, struct vty *vty, ? '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) ? '*' : ' '); @@ -5334,11 +5326,6 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, 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( json_ifp_out, @@ -5381,11 +5368,6 @@ static void show_mroute(struct pim_instance *pim, struct vty *vty, } 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 57930e341..d097da6b3 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. |