pimd: The PIM_OIF_FLAG_PROTO_SRC flag was never used

Nor should it be.  So remove from system.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index 778819145458ed231f6770c365e96ebad5fda71a..c8a9bf5520fb0cae7ce44db7faa440a46a28f7bf 100644 (file)
--- 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 57930e3418bca245ec26e0159e9e7249250b6de8..d097da6b3eb761959bf521f000533b288c6eacd8 100644 (file)
--- 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.