From 7e0cff2f98e468dfab8df21b8579f81c06878aa2 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Sat, 23 Jul 2016 04:12:05 -0400 Subject: [PATCH] pimd: Remove unnecessary QuaggaId Signed-off-by: Donald Sharp --- pimd/AUTHORS | 1 - pimd/CAVEATS | 2 -- pimd/COMMANDS | 2 -- pimd/DEBUG | 1 - pimd/LINUX_KERNEL_MROUTE_MFC | 2 -- pimd/README | 1 - pimd/TODO | 2 -- pimd/pim_assert.c | 1 - pimd/pim_assert.h | 1 - pimd/pim_cmd.c | 1 - pimd/pim_cmd.h | 1 - pimd/pim_hello.c | 1 - pimd/pim_hello.h | 1 - pimd/pim_iface.c | 1 - pimd/pim_iface.h | 1 - pimd/pim_ifchannel.c | 1 - pimd/pim_ifchannel.h | 1 - pimd/pim_igmp.c | 1 - pimd/pim_igmp.h | 1 - pimd/pim_igmp_join.h | 1 - pimd/pim_igmpv3.c | 1 - pimd/pim_igmpv3.h | 1 - pimd/pim_int.c | 1 - pimd/pim_int.h | 1 - pimd/pim_join.c | 1 - pimd/pim_join.h | 1 - pimd/pim_macro.c | 1 - pimd/pim_macro.h | 1 - pimd/pim_main.c | 3 +-- pimd/pim_mroute.c | 1 - pimd/pim_mroute.h | 1 - pimd/pim_msg.c | 1 - pimd/pim_msg.h | 1 - pimd/pim_neighbor.c | 1 - pimd/pim_neighbor.h | 1 - pimd/pim_oil.c | 1 - pimd/pim_oil.h | 1 - pimd/pim_pim.c | 1 - pimd/pim_pim.h | 1 - pimd/pim_register.c | 3 ++- pimd/pim_rpf.c | 1 - pimd/pim_rpf.h | 1 - pimd/pim_signals.c | 1 - pimd/pim_signals.h | 1 - pimd/pim_sock.c | 1 - pimd/pim_sock.h | 1 - pimd/pim_ssmpingd.c | 1 - pimd/pim_ssmpingd.h | 1 - pimd/pim_static.c | 1 - pimd/pim_static.h | 1 - pimd/pim_str.c | 1 - pimd/pim_str.h | 1 - pimd/pim_time.c | 1 - pimd/pim_time.h | 1 - pimd/pim_tlv.c | 1 - pimd/pim_tlv.h | 1 - pimd/pim_upstream.c | 1 - pimd/pim_upstream.h | 1 - pimd/pim_util.c | 1 - pimd/pim_util.h | 1 - pimd/pim_version.c | 1 - pimd/pim_version.h | 1 - pimd/pim_vty.c | 1 - pimd/pim_vty.h | 1 - pimd/pim_zebra.c | 1 - pimd/pim_zebra.h | 1 - pimd/pim_zlookup.c | 1 - pimd/pim_zlookup.h | 1 - pimd/pimd.c | 1 - pimd/pimd.conf.sample | 1 - pimd/pimd.h | 1 - pimd/test_igmpv3_join.c | 1 - 72 files changed, 3 insertions(+), 77 deletions(-) diff --git a/pimd/AUTHORS b/pimd/AUTHORS index f6135a410e..aa58d958e1 100644 --- a/pimd/AUTHORS +++ b/pimd/AUTHORS @@ -1,4 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ # Everton da Silva Marques $ more ~/.gitconfig diff --git a/pimd/CAVEATS b/pimd/CAVEATS index 9f07bda666..43dd823ae5 100644 --- a/pimd/CAVEATS +++ b/pimd/CAVEATS @@ -1,5 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ - C1 IGMPv3 backward compatibility with IGMPv1 and IGMPv2 is not implemented. See RFC 3376, 7.3. Multicast Router Behavior. That's because only Source-Specific Multicast is currently targeted. diff --git a/pimd/COMMANDS b/pimd/COMMANDS index 425ac82297..c545eca56e 100644 --- a/pimd/COMMANDS +++ b/pimd/COMMANDS @@ -1,5 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ - global configuration commands: pimd: ip multicast-routing Enable IP multicast forwarding diff --git a/pimd/DEBUG b/pimd/DEBUG index 72fb8264b9..ea1b14158d 100644 --- a/pimd/DEBUG +++ b/pimd/DEBUG @@ -1,4 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ DEBUG HINTS diff --git a/pimd/LINUX_KERNEL_MROUTE_MFC b/pimd/LINUX_KERNEL_MROUTE_MFC index e87e567f9d..3e482465f1 100644 --- a/pimd/LINUX_KERNEL_MROUTE_MFC +++ b/pimd/LINUX_KERNEL_MROUTE_MFC @@ -1,5 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ - # # The Linux Kernel MFC (Multicast Forwarding Cache) # diff --git a/pimd/README b/pimd/README index 1e3f72c838..9f7776fb45 100644 --- a/pimd/README +++ b/pimd/README @@ -1,5 +1,4 @@ # -# $QuaggaId: $Format:%an, %ai, %h$ $ # INTRODUCTION diff --git a/pimd/TODO b/pimd/TODO index 2308573b87..4c0f183100 100644 --- a/pimd/TODO +++ b/pimd/TODO @@ -1,5 +1,3 @@ -# $QuaggaId: $Format:%an, %ai, %h$ $ - T1 DONE Implement debug command test pim receive join diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c index e8e3549d24..07f49c6adf 100644 --- a/pimd/pim_assert.c +++ b/pimd/pim_assert.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_assert.h b/pimd/pim_assert.h index bd3fb3e253..c1f314f85b 100644 --- a/pimd/pim_assert.h +++ b/pimd/pim_assert.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_ASSERT_H diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c index 18957234cf..68899d8c7c 100644 --- a/pimd/pim_cmd.c +++ b/pimd/pim_cmd.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_cmd.h b/pimd/pim_cmd.h index 53df562ab9..6e6e80d4f2 100644 --- a/pimd/pim_cmd.h +++ b/pimd/pim_cmd.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_CMD_H diff --git a/pimd/pim_hello.c b/pimd/pim_hello.c index 21d0e5b85c..3502f4e962 100644 --- a/pimd/pim_hello.c +++ b/pimd/pim_hello.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_hello.h b/pimd/pim_hello.h index b5e272d5de..3ab83db5eb 100644 --- a/pimd/pim_hello.h +++ b/pimd/pim_hello.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_HELLO_H diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c index 584aebb1d4..fae11b674a 100644 --- a/pimd/pim_iface.c +++ b/pimd/pim_iface.c @@ -16,7 +16,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h index 790afabea1..75b85c306a 100644 --- a/pimd/pim_iface.h +++ b/pimd/pim_iface.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_IFACE_H diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c index 80a98ad4b9..f940c4d4ef 100644 --- a/pimd/pim_ifchannel.c +++ b/pimd/pim_ifchannel.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h index 2fd429ca04..e262944f03 100644 --- a/pimd/pim_ifchannel.h +++ b/pimd/pim_ifchannel.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_IFCHANNEL_H diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c index 0f141d4fc6..6624edca59 100644 --- a/pimd/pim_igmp.c +++ b/pimd/pim_igmp.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_igmp.h b/pimd/pim_igmp.h index c6685c2837..2067bb30aa 100644 --- a/pimd/pim_igmp.h +++ b/pimd/pim_igmp.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_IGMP_H diff --git a/pimd/pim_igmp_join.h b/pimd/pim_igmp_join.h index 1700276de8..2c72a4bea6 100644 --- a/pimd/pim_igmp_join.h +++ b/pimd/pim_igmp_join.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_IGMP_JOIN_H diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c index 2738a9ca5c..bf81c8d2c5 100644 --- a/pimd/pim_igmpv3.c +++ b/pimd/pim_igmpv3.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_igmpv3.h b/pimd/pim_igmpv3.h index bb7e92672a..37baca5c8d 100644 --- a/pimd/pim_igmpv3.h +++ b/pimd/pim_igmpv3.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_IGMPV3_H diff --git a/pimd/pim_int.c b/pimd/pim_int.c index 208075190f..e922620f0d 100644 --- a/pimd/pim_int.c +++ b/pimd/pim_int.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_int.h b/pimd/pim_int.h index d64b103277..a0f281ccd8 100644 --- a/pimd/pim_int.h +++ b/pimd/pim_int.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_INT_H diff --git a/pimd/pim_join.c b/pimd/pim_join.c index e0ad3e4399..b5ebfb5d9a 100644 --- a/pimd/pim_join.c +++ b/pimd/pim_join.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_join.h b/pimd/pim_join.h index 994b0e47e3..6777587c39 100644 --- a/pimd/pim_join.h +++ b/pimd/pim_join.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_JOIN_H diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c index ea9fc3b063..e6eb462b77 100644 --- a/pimd/pim_macro.c +++ b/pimd/pim_macro.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_macro.h b/pimd/pim_macro.h index 472fa9b4e7..6cb5d3822e 100644 --- a/pimd/pim_macro.h +++ b/pimd/pim_macro.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_MACRO_H diff --git a/pimd/pim_main.c b/pimd/pim_main.c index aa3db3d5b2..2fb4a22f07 100644 --- a/pimd/pim_main.c +++ b/pimd/pim_main.c @@ -16,8 +16,7 @@ along with this program; see the file COPYING; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - $QuaggaId: $Format:%an, %ai, %h$ $ + */ #include diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c index 796b8cf2db..361fee499c 100644 --- a/pimd/pim_mroute.c +++ b/pimd/pim_mroute.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_mroute.h b/pimd/pim_mroute.h index 176fb81cbc..a09c604486 100644 --- a/pimd/pim_mroute.h +++ b/pimd/pim_mroute.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_MROUTE_H diff --git a/pimd/pim_msg.c b/pimd/pim_msg.c index aa0433a2e2..92382ccc4d 100644 --- a/pimd/pim_msg.c +++ b/pimd/pim_msg.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_msg.h b/pimd/pim_msg.h index a884fc84d9..ece900db5f 100644 --- a/pimd/pim_msg.h +++ b/pimd/pim_msg.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_MSG_H diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c index 749390595a..2703b8fcf5 100644 --- a/pimd/pim_neighbor.c +++ b/pimd/pim_neighbor.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h index 5b2172dfc1..10d0cf3a68 100644 --- a/pimd/pim_neighbor.h +++ b/pimd/pim_neighbor.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_NEIGHBOR_H diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c index 2b26b54e08..a06b7937b6 100644 --- a/pimd/pim_oil.c +++ b/pimd/pim_oil.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_oil.h b/pimd/pim_oil.h index c16e42efdb..fc5188e327 100644 --- a/pimd/pim_oil.h +++ b/pimd/pim_oil.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_OIL_H diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c index 6b8478424b..382c9bc46d 100644 --- a/pimd/pim_pim.c +++ b/pimd/pim_pim.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_pim.h b/pimd/pim_pim.h index e3559a2d97..01c9044a26 100644 --- a/pimd/pim_pim.h +++ b/pimd/pim_pim.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_PIM_H diff --git a/pimd/pim_register.c b/pimd/pim_register.c index 0b78d08ce9..93483b8973 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -338,6 +338,7 @@ pim_register_recv (struct interface *ifp, if (!(upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) && !(*bits & PIM_REGISTER_NR_BIT)) { +#if 0 pim_rp_set_upstream_addr (&upstream->upstream_addr, sg.u.sg.src); pim_nexthop_lookup (&upstream->rpf.source_nexthop, upstream->upstream_addr, NULL); @@ -347,7 +348,7 @@ pim_register_recv (struct interface *ifp, upstream->channel_oil->oil.mfcc_origin = sg.u.sg.src; pim_scan_individual_oil (upstream->channel_oil); pim_upstream_send_join (upstream); - +#endif //decapsulate and forward the iner packet to //inherited_olist(S,G,rpt) } diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c index 6ba1b2e499..b610d91073 100644 --- a/pimd/pim_rpf.c +++ b/pimd/pim_rpf.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_rpf.h b/pimd/pim_rpf.h index 72cc7ba215..86c33c2e45 100644 --- a/pimd/pim_rpf.h +++ b/pimd/pim_rpf.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_RPF_H diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c index 0344aa81d4..8e14627e4d 100644 --- a/pimd/pim_signals.c +++ b/pimd/pim_signals.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_signals.h b/pimd/pim_signals.h index 62523c038b..b05dbb39cb 100644 --- a/pimd/pim_signals.h +++ b/pimd/pim_signals.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_SIGNALS_H diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c index 3eeda040b1..b100c37b46 100644 --- a/pimd/pim_sock.c +++ b/pimd/pim_sock.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_sock.h b/pimd/pim_sock.h index cd29543fa0..556049d9b0 100644 --- a/pimd/pim_sock.h +++ b/pimd/pim_sock.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_SOCK_H diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c index 0bab8b6586..40873ca69f 100644 --- a/pimd/pim_ssmpingd.c +++ b/pimd/pim_ssmpingd.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_ssmpingd.h b/pimd/pim_ssmpingd.h index 4bef20b209..ab3351cde1 100644 --- a/pimd/pim_ssmpingd.h +++ b/pimd/pim_ssmpingd.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_SSMPINGD_H diff --git a/pimd/pim_static.c b/pimd/pim_static.c index 98c74caab5..a24a3f92a8 100644 --- a/pimd/pim_static.c +++ b/pimd/pim_static.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_static.h b/pimd/pim_static.h index 07d31d59b7..33f700ea78 100644 --- a/pimd/pim_static.h +++ b/pimd/pim_static.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_STATIC_H_ diff --git a/pimd/pim_str.c b/pimd/pim_str.c index 2d647876f6..f02732426e 100644 --- a/pimd/pim_str.c +++ b/pimd/pim_str.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_str.h b/pimd/pim_str.h index ea84362699..ca20352504 100644 --- a/pimd/pim_str.h +++ b/pimd/pim_str.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_STR_H diff --git a/pimd/pim_time.c b/pimd/pim_time.c index 4e5832cc65..ab3ac7340a 100644 --- a/pimd/pim_time.c +++ b/pimd/pim_time.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_time.h b/pimd/pim_time.h index 2984d9a8df..0081b21bbb 100644 --- a/pimd/pim_time.h +++ b/pimd/pim_time.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_TIME_H diff --git a/pimd/pim_tlv.c b/pimd/pim_tlv.c index f441e043a7..5269bb5efe 100644 --- a/pimd/pim_tlv.c +++ b/pimd/pim_tlv.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_tlv.h b/pimd/pim_tlv.h index 586d989684..3f1b7a34e7 100644 --- a/pimd/pim_tlv.h +++ b/pimd/pim_tlv.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_TLV_H diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c index 3cbe371549..8fb51e2e82 100644 --- a/pimd/pim_upstream.c +++ b/pimd/pim_upstream.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h index 0049c64992..18f302183a 100644 --- a/pimd/pim_upstream.h +++ b/pimd/pim_upstream.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_UPSTREAM_H diff --git a/pimd/pim_util.c b/pimd/pim_util.c index 57a8488eca..daee941f8b 100644 --- a/pimd/pim_util.c +++ b/pimd/pim_util.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_util.h b/pimd/pim_util.h index a8613e2b97..23a9688647 100644 --- a/pimd/pim_util.h +++ b/pimd/pim_util.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_UTIL_H diff --git a/pimd/pim_version.c b/pimd/pim_version.c index f3a5ee3359..32020f6a83 100644 --- a/pimd/pim_version.c +++ b/pimd/pim_version.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_version.h b/pimd/pim_version.h index ef9f370c73..a4b34d1063 100644 --- a/pimd/pim_version.h +++ b/pimd/pim_version.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_VERSION_H diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c index 95792d5aa1..16ccd6f2b2 100644 --- a/pimd/pim_vty.c +++ b/pimd/pim_vty.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_vty.h b/pimd/pim_vty.h index 904ee55302..787af60c3b 100644 --- a/pimd/pim_vty.h +++ b/pimd/pim_vty.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_VTY_H diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c index 87e2258ad7..66550d9cb2 100644 --- a/pimd/pim_zebra.c +++ b/pimd/pim_zebra.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_zebra.h b/pimd/pim_zebra.h index 8e8f09551a..ae79ed815a 100644 --- a/pimd/pim_zebra.h +++ b/pimd/pim_zebra.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_ZEBRA_H diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c index 86d7edbd01..f38475b12c 100644 --- a/pimd/pim_zlookup.c +++ b/pimd/pim_zlookup.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pim_zlookup.h b/pimd/pim_zlookup.h index f2be6d4fa0..b32dfe2b7c 100644 --- a/pimd/pim_zlookup.h +++ b/pimd/pim_zlookup.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIM_ZLOOKUP_H diff --git a/pimd/pimd.c b/pimd/pimd.c index 4ec9023f0a..d4a0250a0e 100644 --- a/pimd/pimd.c +++ b/pimd/pimd.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include diff --git a/pimd/pimd.conf.sample b/pimd/pimd.conf.sample index 67530856b6..de1da6b838 100644 --- a/pimd/pimd.conf.sample +++ b/pimd/pimd.conf.sample @@ -1,6 +1,5 @@ ! ! pimd sample configuration file -! $QuaggaId: $Format:%an, %ai, %h$ $ ! hostname quagga-pimd-router password zebra diff --git a/pimd/pimd.h b/pimd/pimd.h index 8855a2ab3f..6ff36a2a51 100644 --- a/pimd/pimd.h +++ b/pimd/pimd.h @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #ifndef PIMD_H diff --git a/pimd/test_igmpv3_join.c b/pimd/test_igmpv3_join.c index 5c4574024b..a345945ea4 100644 --- a/pimd/test_igmpv3_join.c +++ b/pimd/test_igmpv3_join.c @@ -17,7 +17,6 @@ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - $QuaggaId: $Format:%an, %ai, %h$ $ */ #include