Merge pull request #4494 from donaldsharp/no_src_for_you

pimd: The PIM_OIF_FLAG_PROTO_SRC flag was never used

diff --combined pimd/pim_cmd.c
index 6591bdc32e94271f79cd0c86ae75d37f851433e0,c8a9bf5520fb0cae7ce44db7faa440a46a28f7bf..18e84fef23c7b7863abc02888e8da120c5853540
--- 1/pimd/pim_cmd.c
--- 2/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@@ -1536,7 -1536,7 +1536,7 @@@ static void pim_show_interface_traffic(
                        json_object_object_add(json, ifp->name, json_row);
                } else {
                        vty_out(vty,
 -                              "%-16s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7lu/%-7lu \n",
 +                              "%-16s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7" PRIu64 "/%-7" PRIu64 "\n",
                                ifp->name, pim_ifp->pim_ifstat_hello_recv,
                                pim_ifp->pim_ifstat_hello_sent,
                                pim_ifp->pim_ifstat_join_recv,
@@@ -1629,7 -1629,7 +1629,7 @@@ static void pim_show_interface_traffic_
                        json_object_object_add(json, ifp->name, json_row);
                } else {
                        vty_out(vty,
 -                              "%-16s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7lu/%-7lu \n",
 +                              "%-16s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7" PRIu64 "/%-7" PRIu64 "\n",
                                ifp->name, pim_ifp->pim_ifstat_hello_recv,
                                pim_ifp->pim_ifstat_hello_sent,
                                pim_ifp->pim_ifstat_join_recv,
@@@ -2117,7 -2117,7 +2117,7 @@@ static void pim_show_state(struct pim_i
                        } 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 +2130,12 @@@
                                                 & 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 +2149,6 @@@
                                                 & 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)
                                                        ? '*'
@@@ -3238,11 -3230,9 +3230,11 @@@ static void pim_show_statistics(struct 
        } else {
                vty_out(vty, "BSM Statistics :\n");
                vty_out(vty, "----------------\n");
 -              vty_out(vty, "Number of Received BSMs : %ld\n", pim->bsm_rcvd);
 -              vty_out(vty, "Number of Forwared BSMs : %ld\n", pim->bsm_sent);
 -              vty_out(vty, "Number of Dropped BSMs  : %ld\n",
 +              vty_out(vty, "Number of Received BSMs : %" PRIu64 "\n",
 +                      pim->bsm_rcvd);
 +              vty_out(vty, "Number of Forwared BSMs : %" PRIu64 "\n",
 +                      pim->bsm_sent);
 +              vty_out(vty, "Number of Dropped BSMs  : %" PRIu64 "\n",
                        pim->bsm_dropped);
        }
  
@@@ -5333,11 -5323,6 +5325,6 @@@ static void show_mroute(struct pim_inst
                                        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(
@@@ -5380,11 -5365,6 +5367,6 @@@
                                        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));