Browse Source

*: nuke ^L (page feed)

Quagga sources have inherited a slew of Page Feed (^L, \xC) characters
from ancient history.  Among other things, these break patchwork's
XML-RPC API because \xC is not a valid character in XML documents.

Nuke them from high orbit.

Patches can be adapted simply by:
	sed -e 's%^L%%' -i filename.patch
(you can type page feeds in some environments with Ctrl-V Ctrl-L)

Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
David Lamparter 5 years ago
parent
commit
6b0655a251
100 changed files with 609 additions and 609 deletions
  1. 5 5
      COPYING
  2. 9 9
      COPYING.LIB
  3. 42 42
      NEWS
  4. 5 5
      bgpd/bgp_advertise.c
  5. 6 6
      bgpd/bgp_aspath.c
  6. 5 5
      bgpd/bgp_attr.c
  7. 4 4
      bgpd/bgp_clist.c
  8. 2 2
      bgpd/bgp_damp.c
  9. 1 1
      bgpd/bgp_debug.c
  10. 4 4
      bgpd/bgp_dump.c
  11. 2 2
      bgpd/bgp_ecommunity.c
  12. 3 3
      bgpd/bgp_filter.c
  13. 2 2
      bgpd/bgp_fsm.c
  14. 2 2
      bgpd/bgp_main.c
  15. 1 1
      bgpd/bgp_network.c
  16. 6 6
      bgpd/bgp_nexthop.c
  17. 3 3
      bgpd/bgp_packet.c
  18. 34 34
      bgpd/bgp_route.c
  19. 34 34
      bgpd/bgp_routemap.c
  20. 4 4
      bgpd/bgp_snmp.c
  21. 84 84
      bgpd/bgp_vty.c
  22. 4 4
      bgpd/bgp_zebra.c
  23. 37 37
      bgpd/bgpd.c
  24. 1 1
      bgpd/bgpd.h
  25. 4 4
      doc/mpls/opaque_lsa.txt
  26. 1 1
      lib/command.c
  27. 2 2
      lib/distribute.c
  28. 3 3
      lib/filter.c
  29. 5 5
      lib/getopt.c
  30. 2 2
      lib/getopt1.c
  31. 5 5
      lib/if.c
  32. 3 3
      lib/if_rmap.c
  33. 4 4
      lib/keychain.c
  34. 4 4
      lib/linklist.c
  35. 4 4
      lib/log.c
  36. 5 5
      lib/memory.c
  37. 5 5
      lib/plist.c
  38. 3 3
      lib/prefix.c
  39. 5 5
      lib/privs.c
  40. 6 6
      lib/regex-gnu.h
  41. 23 23
      lib/regex.c
  42. 4 4
      lib/routemap.c
  43. 5 5
      lib/smux.c
  44. 5 5
      lib/stream.c
  45. 1 1
      lib/table.c
  46. 6 6
      lib/thread.c
  47. 5 5
      lib/vty.c
  48. 4 4
      lib/zclient.c
  49. 1 1
      ospf6d/ospf6_abr.c
  50. 1 1
      ospf6d/ospf6_area.c
  51. 4 4
      ospf6d/ospf6_asbr.c
  52. 3 3
      ospf6d/ospf6_interface.c
  53. 1 1
      ospf6d/ospf6_interface.h
  54. 1 1
      ospf6d/ospf6_intra.h
  55. 3 3
      ospf6d/ospf6_lsa.c
  56. 1 1
      ospf6d/ospf6_lsa.h
  57. 2 2
      ospf6d/ospf6_message.c
  58. 1 1
      ospf6d/ospf6_neighbor.c
  59. 1 1
      ospf6d/ospf6_neighbor.h
  60. 1 1
      ospf6d/ospf6_network.h
  61. 1 1
      ospf6d/ospf6_route.c
  62. 2 2
      ospf6d/ospf6_zebra.c
  63. 1 1
      ospf6d/ospf6d.c
  64. 1 1
      ospf6d/ospf6d.h
  65. 5 5
      ospfclient/COPYING
  66. 1 1
      ospfd/ospf_abr.c
  67. 3 3
      ospfd/ospf_asbr.c
  68. 9 9
      ospfd/ospf_dump.c
  69. 4 4
      ospfd/ospf_flood.c
  70. 1 1
      ospfd/ospf_ia.c
  71. 6 6
      ospfd/ospf_interface.c
  72. 2 2
      ospfd/ospf_ism.c
  73. 17 17
      ospfd/ospf_lsa.c
  74. 1 1
      ospfd/ospf_lsdb.c
  75. 2 2
      ospfd/ospf_main.c
  76. 3 3
      ospfd/ospf_nsm.c
  77. 3 3
      ospfd/ospf_packet.c
  78. 10 10
      ospfd/ospf_snmp.c
  79. 6 6
      ospfd/ospf_spf.c
  80. 25 25
      ospfd/ospf_vty.c
  81. 1 1
      ospfd/ospf_zebra.c
  82. 10 10
      ospfd/ospfd.c
  83. 1 1
      ripd/rip_debug.c
  84. 8 8
      ripd/rip_interface.c
  85. 2 2
      ripd/rip_main.c
  86. 1 1
      ripd/rip_peer.c
  87. 7 7
      ripd/rip_routemap.c
  88. 3 3
      ripd/rip_snmp.c
  89. 4 4
      ripd/rip_zebra.c
  90. 10 10
      ripd/ripd.c
  91. 1 1
      ripngd/ripng_debug.c
  92. 5 5
      ripngd/ripng_interface.c
  93. 2 2
      ripngd/ripng_main.c
  94. 1 1
      ripngd/ripng_peer.c
  95. 6 6
      ripngd/ripng_routemap.c
  96. 2 2
      ripngd/ripng_zebra.c
  97. 4 4
      ripngd/ripngd.c
  98. 2 2
      tests/main.c
  99. 2 2
      tests/test-checksum.c
  100. 0 0
      tests/test-privs.c

+ 5 - 5
COPYING

@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	Appendix: How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest

+ 9 - 9
COPYING.LIB

@@ -51,7 +51,7 @@ library.  If the library is modified by someone else and passed on, we
 want its recipients to know that what they have is not the original
 version, so that any problems introduced by others will not reflect on
 the original authors' reputations.
-
+
   Finally, any free program is threatened constantly by software
 patents.  We wish to avoid the danger that companies distributing free
 software will individually obtain patent licenses, thus in effect
@@ -98,7 +98,7 @@ works together with the library.
 
   Note that it is possible for a library to be covered by the ordinary
 General Public License rather than by this special one.
-
+
 		  GNU LIBRARY GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -145,7 +145,7 @@ Library.
   You may charge a fee for the physical act of transferring a copy,
 and you may at your option offer warranty protection in exchange for a
 fee.
-
+
   2. You may modify your copy or copies of the Library or any portion
 of it, thus forming a work based on the Library, and copy and
 distribute such modifications or work under the terms of Section 1
@@ -203,7 +203,7 @@ instead of to this License.  (If a newer version than version 2 of the
 ordinary GNU General Public License has appeared, then you can specify
 that version instead if you wish.)  Do not make any other change in
 these notices.
-
+
   Once this change is made in a given copy, it is irreversible for
 that copy, so the ordinary GNU General Public License applies to all
 subsequent copies and derivative works made from that copy.
@@ -254,7 +254,7 @@ Library will still fall under Section 6.)
 distribute the object code for the work under the terms of Section 6.
 Any executables containing that work also fall under Section 6,
 whether or not they are linked directly with the Library itself.
-
+
   6. As an exception to the Sections above, you may also compile or
 link a "work that uses the Library" with the Library to produce a
 work containing portions of the Library, and distribute that work
@@ -308,7 +308,7 @@ restrictions of other proprietary libraries that do not normally
 accompany the operating system.  Such a contradiction means you cannot
 use both them and the Library together in an executable that you
 distribute.
-
+
   7. You may place library facilities that are a work based on the
 Library side-by-side in a single library together with other library
 facilities not covered by this License, and distribute such a combined
@@ -349,7 +349,7 @@ subject to these terms and conditions.  You may not impose any further
 restrictions on the recipients' exercise of the rights granted herein.
 You are not responsible for enforcing compliance by third parties to
 this License.
-
+
   11. If, as a consequence of a court judgment or allegation of patent
 infringement or for any other reason (not limited to patent issues),
 conditions are imposed on you (whether by court order, agreement or
@@ -401,7 +401,7 @@ conditions either of that version or of any later version published by
 the Free Software Foundation.  If the Library does not specify a
 license version number, you may choose any version ever published by
 the Free Software Foundation.
-
+
   14. If you wish to incorporate parts of the Library into other free
 programs whose distribution conditions are incompatible with these,
 write to the author to ask for permission.  For software which is
@@ -435,7 +435,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
      Appendix: How to Apply These Terms to Your New Libraries
 
   If you develop a new library, and you want it to be of the greatest

+ 42 - 42
NEWS

@@ -198,7 +198,7 @@ which the PtP patch introduced.
 * Chages in ospf6d
 
 ** Many bugs are fixed.
-
+
 * Changes in zebra-0.92a
 
 * Changes in bgpd
@@ -215,7 +215,7 @@ which the PtP patch introduced.
 * Changes in zebra
 
 ** Treat kernel type routes as EGP routes.
-
+
 * Changes in zebra-0.92
 
 ** Overall security is improved.  Default umask is 0077.
@@ -272,7 +272,7 @@ router bgp 7675
 multiple IP address for an interface.
 
 ** Redistribution of loopback interface's address works fine.
-
+
 * Changes in zebra-0.91
 
 ** --enable-oldrib configure option is removed.
@@ -324,7 +324,7 @@ only supported on GNU/Linux with netlink interface.
 ** Fix bug of LSA MaxAge flood.
 
 ** Fix bug of NSSA codes.
-
+
 * Changes in zebra-0.90
 
 ** From this beta release, --enable-unixdomain and --enable-newrib
@@ -660,7 +660,7 @@ zebrastart.sh
 /usr/local/sbin/ospfd -d
 /usr/local/sbin/bgpd -d
 /usr/local/bin/vtysh -b
-
+
 * Changes in zebra-0.89
 
 * Changes in lib
@@ -754,7 +754,7 @@ value.
 it is available.
 
 ** Reflect IPv6 interface's address change to protocol daemons.
-
+
 * Changes in zebra-0.88
 
 * Changes in lib
@@ -875,7 +875,7 @@ generating MRT compatible dump output.
 * Changes in vtysh
 
 ** VTY shell is now included into the distribution.
-
+
 * Changes in zebra-0.87
 
 * Changes in lib
@@ -968,7 +968,7 @@ bgp ASN.
 * Changes in zebra
 
 ** Better interface up/down event handle.
-
+
 * Changes in zebra-0.86
 
 * Changes in lib
@@ -1052,7 +1052,7 @@ fixed.
 ** Remove client structure when client dies.
 
 ** Take care static route when interface goes up/down.
-
+
 * Changes in zebra-0.85
 
 * Changes in bgpd
@@ -1075,7 +1075,7 @@ drastically improved.
 * Changes in ripd
 
 ** RIPv1 update is done by class-full manner.
-
+
 * Changes in zebra-0.84b
 
 * Changes in lib
@@ -1094,14 +1094,14 @@ consume only one screen size memory.
 ** Fix debug output string.
 
 ** Add RIP peer handling.  RIP peer are shown by "show ip protocols".
-
+
 * Changes in zebra-0.84a
 
 * Changes in bgpd
 
 ** Fix serious bug of BGP-4+ peering under IPv6 link-local address.
    Due to the bug BGP-4+ peering may not be established.
-
+
 * Changes in zebra-0.84
 
 * Changes in lib
@@ -1180,7 +1180,7 @@ consume only one screen size memory.
    this command, you have to configure neighbor with
    "neighbor A.B.C.D soft-reconfiguration inbound" beforehand.
    
-
+
 * Changes in zebra-0.83
 
 * bgpd
@@ -1192,7 +1192,7 @@ introduced in zebra-0.82.
 
 ** When bgpd send Notify message, don't use thread manager.  It is now
 send to neighbor immediately.
-
+
 * Changes in zebra-0.82
 
 ** Solaris 2.6 support is added by Michael Handler
@@ -1243,7 +1243,7 @@ draft-ietf-idr-bgp4-cap-neg-04.txt.
 * Changes in ospf6d
 
 ** Many debug feature is added.
-
+
 * Changes in zebra-0.81
 
 ** SNMP support is disabled in default.--enable-snmp option is added
@@ -1252,7 +1252,7 @@ to configure script.
 * Changes in bgpd
 
 ** Fix FSM bug which introduced in zebra-0.80.
-
+
 * Changes in zebra-0.80
 
 * access-list
@@ -1515,7 +1515,7 @@ to configure script.
   From zebra-0.80, ripd will reload it's configuration file when ripd
   receives HUP signal.  Other daemon such as bgpd, ospfd will support
   HUP signal treatment soon.
-
+
 * Changes in zebra-0.79
 
 * Changes in zebra
@@ -1551,7 +1551,7 @@ not work for NetBSD-currnet on SparcStation 10.
 * Changes in ospf6d
 
 ** Enclosed KAME specific part with #ifdef #endif
-
+
 * Changes in zebra-0.78
 
 * Changes in lib
@@ -1596,7 +1596,7 @@ RIP_METRIC_INFINITY with network byte order using htonl ().
 * Changes in ospf6d
 
 ** `ip6' statement in configuration is changed to `ipv6'.
-
+
 * Changes in zebra-0.77
 
 * Changes in lib
@@ -1667,7 +1667,7 @@ timeout, garbage timer.
 * Changes in ospf6d
 
 ** Redistribute route works.
-
+
 * Changes in zebra-0.76
 
 * Changes in lib
@@ -1677,7 +1677,7 @@ timeout, garbage timer.
 ** Include SERVICES file to the distribution
 
 ** Update zebra.texi to zebra-0.76.
-
+
 * Changes in zebra-0.75
 
 * Changes in lib
@@ -1724,7 +1724,7 @@ used when `next-hop-self'.
 
 ** Never include a neighbor in Hello packet, when the neighbor goes
 down.
-
+
 * Changes in zebra-0.74
 
 * Changes in lib
@@ -1785,7 +1785,7 @@ router.
 ** LSA data structure is changed.
 
 ** Call of log_rotate() is removed.
-
+
 * Changes in zebra-0.73
 
 * Changes in lib
@@ -1847,7 +1847,7 @@ DEFAULT_LOCAL_PREF(100).
 ** Clean up logging message.
 
 ** Reflect routing information to zebra daemon.
-
+
 * Changes in zebra-0.72
 
 * Changes in lib
@@ -1868,7 +1868,7 @@ set ipv6 nexthop local  -> set ipv6 next-hop local
 * Changes in ospfd
 
 ** Fix bug of multiple `network area' directive crashes.
-
+
 * Changes in zebra-0.71
 
 * Changes in lib
@@ -1919,7 +1919,7 @@ NOTIFY Malformed AS path is send to the peer.
 * Chanegs in ospf6d
 
 ** Routing table code is rewritten.
-
+
 * Changes in zebra-0.70
 
 * Changes in zebra
@@ -1940,7 +1940,7 @@ nexthop is calculated by looking up IGP routing table.
 * Changes in ospfd
 
 ** DD null pointer bug is fixed.
-
+
 * Changes in zebra-0.69
 
 * Changes in zebra
@@ -1990,7 +1990,7 @@ peer.
 * Changes in ospfd
 
 ** LS request and LS update can be send and received.
-
+
 * Changes in zebra-0.68
 
 * Changes in lib
@@ -2023,7 +2023,7 @@ summary-only mode.
 * Changes in ospf6d
 
 ** router zebra related bug is fixed.
-
+
 * Changes in zebra-0.67
 
 * Changes in lib
@@ -2065,7 +2065,7 @@ it is fixed.
 * Changes in ospf6d
 
 ** `router zebra' is default behavior.
-
+
 * Changes in zebra-0.66
 
 * Changes in zebra
@@ -2109,7 +2109,7 @@ routes to the kernel, please configure like below:
 router zebra
  no redistribute ripng
 !
-
+
 * Changes in zebra-0.65
 
 * Changes in lib
@@ -2161,7 +2161,7 @@ zebra.
 * Changes in ospf6d
 
 ** Bug fix about network vertex.
-
+
 * Changes in zebra-0.64.1.
 
 This is bug fix release.
@@ -2199,7 +2199,7 @@ not work with previous version, sorry.
 ** Fix bug of no network IPV6_NETWORK.
 
 ** Important bug fix about intra-area-prefix-lsa.
-
+
 * Changes in zebra-0.64.
 
 * Changes in lib
@@ -2238,7 +2238,7 @@ Barcenilla.
 
 ** There are many changes.  If you have interested in ospf6d please
 visit ospf6d/README file.
-
+
 * Changes in zebra-0.63 first beta package.
 
 * Changes in lib
@@ -2257,7 +2257,7 @@ visit ospf6d/README file.
 * Changes in ospf6d
 
 ** Now ospf6d can be compiled on both Linux and *BSD system.
-
+
 * Changes in zebra-19990420 snapshot
 
 ** `make dist' at top directory works now.
@@ -2300,7 +2300,7 @@ router bgp ASN
 ** configure --enable-guile turns on zebra-guile build.
 
 ** (router-bgp ASN) allocates real bgp structre.
-
+
 * Changes in zebra-19990416 snapshot
 
 ** Set version to 0.60 for preparation of beta release.
@@ -2331,7 +2331,7 @@ Bligh <amb@gxn.net>.
 * Changes in ospfd
 
 ** DR and BDR information is shown by `show ip ospf interface' command.
-
+
 * Changes in zebra-19990408 snapshot
 
 * Changes in bgpd
@@ -2358,7 +2358,7 @@ kad@gibson.skif.net.
 
 ** With KAME stack, terminal interface is now bind AF_INET socket
 instead of AF_INET6 one.
-
+
 * Changes in zebra-19990403 snapshot
 
 * Changes in bgpd
@@ -2377,7 +2377,7 @@ segment.  This change is for announcement to gated under iBGP.
 
 ** Yasuhiro Ohara's ospf6d codes is imported.  It is under development
 and can't be compiled on any platform.
-
+
 * Changes in zebra-19990327 snapshot
 
 * Changes in bgpd
@@ -2422,7 +2422,7 @@ buffer when the address family is not supported and the length is big
 * Changes in ospfd
 
 ** Now ospfd receive OSPF packet.
-
+
 * Changes in zebra-19990319 snapshot
 
 * Changes in configuration and libraries
@@ -2513,8 +2513,8 @@ several files are included in ospfd directory.
 ** ospf6d codes are merged from Yasuhiro Ohara <yasu@sfc.wide.ad.jp>'s
 ospfd work.  Now codes are located in ospf6d directory.
 
-
+
 Local variables:
 mode: outline
-paragraph-separate: "[ 	]*$"
+paragraph-separate: "[ 	]*$"
 end:

+ 5 - 5
bgpd/bgp_advertise.c

@@ -35,7 +35,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "bgpd/bgp_packet.h"
 #include "bgpd/bgp_fsm.h"
 #include "bgpd/bgp_mplsvpn.h"
-
+
 /* BGP advertise attribute is used for pack same attribute update into
    one packet.  To do that we maintain attribute hash in struct
    peer.  */
@@ -79,7 +79,7 @@ baa_hash_cmp (const void *p1, const void *p2)
 
   return attrhash_cmp (baa1->attr, baa2->attr);
 }
-
+
 /* BGP update and withdraw information is stored in BGP advertise
    structure.  This structure is referred from BGP adjacency
    information.  */
@@ -151,7 +151,7 @@ bgp_advertise_unintern (struct hash *hash, struct bgp_advertise_attr *baa)
       baa_free (baa);
     }
 }
-
+
 /* BGP adjacency keeps minimal advertisement information.  */
 static void
 bgp_adj_out_free (struct bgp_adj_out *adj)
@@ -327,7 +327,7 @@ bgp_adj_out_remove (struct bgp_node *rn, struct bgp_adj_out *adj,
   BGP_ADJ_OUT_DEL (rn, adj);
   bgp_adj_out_free (adj);
 }
-
+
 void
 bgp_adj_in_set (struct bgp_node *rn, struct peer *peer, struct attr *attr)
 {
@@ -376,7 +376,7 @@ bgp_adj_in_unset (struct bgp_node *rn, struct peer *peer)
   bgp_adj_in_remove (rn, adj);
   bgp_unlock_node (rn);
 }
-
+
 void
 bgp_sync_init (struct peer *peer)
 {

+ 6 - 6
bgpd/bgp_aspath.c

@@ -34,7 +34,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "bgpd/bgp_aspath.h"
 #include "bgpd/bgp_debug.h"
 #include "bgpd/bgp_attr.h"
-
+
 /* Attr. Flags and Attr. Type Code. */
 #define AS_HEADER_SIZE        2	 
 
@@ -90,7 +90,7 @@ static struct hash *ashash;
 
 /* Stream for SNMP. See aspath_snmp_pathseg */
 static struct stream *snmp_stream;
-
+
 /* Callers are required to initialize the memory */
 static as_t *
 assegment_data_new (int num)
@@ -308,7 +308,7 @@ assegment_normalise (struct assegment *head)
     }
   return head;
 }
-
+
 static struct aspath *
 aspath_new (void)
 {
@@ -1657,7 +1657,7 @@ aspath_count (void)
 {
   return ashash->count;
 }     
-
+
 /* 
    Theoretically, one as path can have:
 
@@ -1811,7 +1811,7 @@ aspath_str2aspath (const char *str)
 
   return aspath;
 }
-
+
 /* Make hash value by raw aspath data. */
 unsigned int
 aspath_key_make (void *p)
@@ -1868,7 +1868,7 @@ aspath_finish (void)
   if (snmp_stream)
     stream_free (snmp_stream);
 }
-
+
 /* return and as path value */
 const char *
 aspath_print (struct aspath *as)

+ 5 - 5
bgpd/bgp_attr.c

@@ -38,7 +38,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "bgpd/bgp_debug.h"
 #include "bgpd/bgp_packet.h"
 #include "bgpd/bgp_ecommunity.h"
-
+
 /* Attribute strings for logging. */
 static const struct message attr_str [] = 
 {
@@ -73,7 +73,7 @@ static const struct message attr_flag_str[] =
   { BGP_ATTR_FLAG_EXTLEN,   "Extended Length" },
 };
 static const size_t attr_flag_str_max = array_size(attr_flag_str);
-
+
 static struct hash *cluster_hash;
 
 static void *
@@ -207,7 +207,7 @@ cluster_finish (void)
   hash_free (cluster_hash);
   cluster_hash = NULL;
 }
-
+
 /* Unknown transit attribute. */
 static struct hash *transit_hash;
 
@@ -283,7 +283,7 @@ transit_finish (void)
   hash_free (transit_hash);
   transit_hash = NULL;
 }
-
+
 /* Attribute hash routines. */
 static struct hash *attrhash;
 
@@ -2055,7 +2055,7 @@ bgp_attr_check (struct peer *peer, struct attr *attr)
     }
   return BGP_ATTR_PARSE_PROCEED;
 }
-
+
 int stream_put_prefix (struct stream *, struct prefix *);
 
 size_t

+ 4 - 4
bgpd/bgp_clist.c

@@ -30,7 +30,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "bgpd/bgp_aspath.h"
 #include "bgpd/bgp_regex.h"
 #include "bgpd/bgp_clist.h"
-
+
 /* Lookup master structure for community-list or
    extcommunity-list.  */
 struct community_list_master *
@@ -262,7 +262,7 @@ community_list_empty_p (struct community_list *list)
 {
   return (list->head == NULL && list->tail == NULL) ? 1 : 0;
 }
-
+
 /* Add community-list entry to the list.  */
 static void
 community_list_entry_add (struct community_list *list,
@@ -329,7 +329,7 @@ community_list_entry_lookup (struct community_list *list, const void *arg,
     }
   return NULL;
 }
-
+
 /* Internal function to perform regular expression match for community
    attribute.  */
 static int
@@ -590,7 +590,7 @@ community_list_dup_check (struct community_list *list,
     }
   return 0;
 }
-
+
 /* Set community-list.  */
 int
 community_list_set (struct community_list_handler *ch,

+ 2 - 2
bgpd/bgp_damp.c

@@ -42,7 +42,7 @@ static struct bgp_damp_config *damp = &bgp_damp_cfg;
    used list.  */
 #define BGP_DAMP_LIST_ADD(N,A)  BGP_INFO_ADD(N,A,no_reuse_list)
 #define BGP_DAMP_LIST_DEL(N,A)  BGP_INFO_DEL(N,A,no_reuse_list)
-
+
 /* Calculate reuse list index by penalty value.  */
 static int
 bgp_reuse_index (int penalty)
@@ -86,7 +86,7 @@ bgp_reuse_list_delete (struct bgp_damp_info *bdi)
   else
     damp->reuse_list[bdi->index] = bdi->next;
 }   
-
+
 /* Return decayed penalty value.  */
 int 
 bgp_damp_decay (time_t tdiff, int penalty)

+ 1 - 1
bgpd/bgp_debug.c

@@ -290,7 +290,7 @@ bgp_notify_print(struct peer *peer, struct bgp_notify *bgp_notify,
 	       code_str, subcode_str, bgp_notify->length,
 	       bgp_notify->data ? bgp_notify->data : "");
 }
-
+
 /* Debug option setting interface. */
 unsigned long bgp_debug_option = 0;
 

+ 4 - 4
bgpd/bgp_dump.c

@@ -33,7 +33,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "bgpd/bgp_route.h"
 #include "bgpd/bgp_attr.h"
 #include "bgpd/bgp_dump.h"
-
+
 enum bgp_dump_type
 {
   BGP_DUMP_ALL,
@@ -89,7 +89,7 @@ struct bgp_dump bgp_dump_routes;
 
 /* Dump whole BGP table is very heavy process.  */
 struct thread *t_bgp_dump_routes;
-
+
 /* Some define for BGP packet dump. */
 static FILE *
 bgp_dump_open_file (struct bgp_dump *bgp_dump)
@@ -535,7 +535,7 @@ bgp_dump_packet (struct peer *peer, int type, struct stream *packet)
   if (type == BGP_MSG_UPDATE)
     bgp_dump_packet_func (&bgp_dump_updates, peer, packet);
 }
-
+
 static unsigned int
 bgp_dump_parse_time (const char *str)
 {
@@ -845,7 +845,7 @@ config_write_bgp_dump (struct vty *vty)
     }
   return 0;
 }
-
+
 /* Initialize BGP packet dump functionality. */
 void
 bgp_dump_init (void)

+ 2 - 2
bgpd/bgp_ecommunity.c

@@ -31,7 +31,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 /* Hash of community attribute. */
 static struct hash *ecomhash;
-
+
 /* Allocate a new ecommunities.  */
 static struct ecommunity *
 ecommunity_new (void)
@@ -277,7 +277,7 @@ ecommunity_finish (void)
   hash_free (ecomhash);
   ecomhash = NULL;
 }
-
+
 /* Extended Communities token enum. */
 enum ecommunity_token
 {

+ 3 - 3
bgpd/bgp_filter.c

@@ -84,7 +84,7 @@ struct as_list
   struct as_filter *head;
   struct as_filter *tail;
 };
-
+
 /* ip as-path access-list 10 permit AS1. */
 
 static struct as_list_master as_list_master =
@@ -370,7 +370,7 @@ as_list_filter_delete (struct as_list *aslist, struct as_filter *asfilter)
   if (as_list_master.delete_hook)
     (*as_list_master.delete_hook) ();
 }
-
+
 static int
 as_filter_match (struct as_filter *asfilter, struct aspath *aspath)
 {
@@ -412,7 +412,7 @@ as_list_delete_hook (void (*func) (void))
 {
   as_list_master.delete_hook = func;
 }
-
+
 static int
 as_list_dup_check (struct as_list *aslist, struct as_filter *new)
 {

+ 2 - 2
bgpd/bgp_fsm.c

@@ -43,7 +43,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #ifdef HAVE_SNMP
 #include "bgpd/bgp_snmp.h"
 #endif /* HAVE_SNMP */
-
+
 /* BGP FSM (finite state machine) has three types of functions.  Type
    one is thread functions.  Type two is event functions.  Type three
    is FSM functions.  Timer functions are set by bgp_timer_set
@@ -928,7 +928,7 @@ bgp_ignore (struct peer *peer)
     zlog (peer->log, LOG_DEBUG, "%s [FSM] bgp_ignore called", peer->host);
   return 0;
 }
-
+
 /* Finite State Machine structure */
 static const struct {
   int (*func) (struct peer *);

+ 2 - 2
bgpd/bgp_main.c

@@ -171,7 +171,7 @@ Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
 
   exit (status);
 }
-
+
 /* SIGHUP handler. */
 void 
 sighup (void)
@@ -314,7 +314,7 @@ bgp_exit (int status)
 
   exit (status);
 }
-
+
 /* Main routine of bgpd. Treatment of argument and start bgp finite
    state machine is handled at here. */
 int

+ 1 - 1
bgpd/bgp_network.c

@@ -47,7 +47,7 @@ struct bgp_listener
   union sockunion su;
   struct thread *thread;
 };
-
+
 /*
  * Set MD5 key for the socket, for the given IPv4 peer address.
  * If the password is NULL or zero-length, the option will be disabled.

+ 6 - 6
bgpd/bgp_nexthop.c

@@ -45,7 +45,7 @@ struct bgp_nexthop_cache *zlookup_query (struct in_addr);
 #ifdef HAVE_IPV6
 struct bgp_nexthop_cache *zlookup_query_ipv6 (struct in6_addr *);
 #endif /* HAVE_IPV6 */
-
+
 /* Only one BGP scan thread are activated at the same time. */
 static struct thread *bgp_scan_thread = NULL;
 
@@ -68,7 +68,7 @@ static struct bgp_table *bgp_connected_table[AFI_MAX];
 
 /* BGP nexthop lookup query client. */
 struct zclient *zlookup = NULL;
-
+
 /* Add nexthop to the end of the list.  */
 static void
 bnc_nexthop_add (struct bgp_nexthop_cache *bnc, struct nexthop *nexthop)
@@ -109,7 +109,7 @@ bnc_free (struct bgp_nexthop_cache *bnc)
   bnc_nexthop_free (bnc);
   XFREE (MTYPE_BGP_NEXTHOP_CACHE, bnc);
 }
-
+
 static int
 bgp_nexthop_same (struct nexthop *next1, struct nexthop *next2)
 {
@@ -623,7 +623,7 @@ bgp_address_del (struct prefix *p)
     }
 }
 
-
+
 struct bgp_connected_ref
 {
   unsigned int refcnt;
@@ -781,7 +781,7 @@ bgp_nexthop_self (struct attr *attr)
 
   return 0;
 }
-
+
 static struct bgp_nexthop_cache *
 zlookup_read (void)
 {
@@ -1243,7 +1243,7 @@ bgp_multiaccess_check_v4 (struct in_addr nexthop, char *peer)
 
   return 0;
 }
-
+
 DEFUN (bgp_scan_time,
        bgp_scan_time_cmd,
        "bgp scan-time <5-60>",

+ 3 - 3
bgpd/bgp_packet.c

@@ -49,7 +49,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "bgpd/bgp_vty.h"
 
 int stream_put_prefix (struct stream *, struct prefix *);
-
+
 /* Set up BGP packet marker and packet type. */
 static int
 bgp_packet_set_marker (struct stream *s, u_char type)
@@ -1166,7 +1166,7 @@ bgp_capability_send (struct peer *peer, afi_t afi, safi_t safi,
 
   BGP_WRITE_ON (peer->t_write, bgp_write, peer->fd);
 }
-
+
 /* RFC1771 6.8 Connection collision detection. */
 static int
 bgp_collision_detect (struct peer *new, struct in_addr remote_id)
@@ -2381,7 +2381,7 @@ bgp_capability_receive (struct peer *peer, bgp_size_t size)
   /* Parse packet. */
   return bgp_capability_msg_parse (peer, pnt, size);
 }
-
+
 /* BGP read utility function. */
 static int
 bgp_read_packet (struct peer *peer)

+ 34 - 34
bgpd/bgp_route.c

@@ -59,7 +59,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 /* Extern from bgp_dump.c */
 extern const char *bgp_origin_str[];
 extern const char *bgp_origin_long_str[];
-
+
 static struct bgp_node *
 bgp_afi_node_get (struct bgp_table *table, afi_t afi, safi_t safi, struct prefix *p,
 		  struct prefix_rd *prd)
@@ -89,7 +89,7 @@ bgp_afi_node_get (struct bgp_table *table, afi_t afi, safi_t safi, struct prefix
 
   return rn;
 }
-
+
 /* Allocate bgp_info_extra */
 static struct bgp_info_extra *
 bgp_info_extra_new (void)
@@ -683,7 +683,7 @@ bgp_cluster_filter (struct peer *peer, struct attr *attr)
     }
   return 0;
 }
-
+
 static int
 bgp_input_modifier (struct peer *peer, struct prefix *p, struct attr *attr,
 		    afi_t afi, safi_t safi)
@@ -721,7 +721,7 @@ bgp_input_modifier (struct peer *peer, struct prefix *p, struct attr *attr,
     }
   return RMAP_PERMIT;
 }
-
+
 static int
 bgp_export_modifier (struct peer *rsclient, struct peer *peer,
         struct prefix *p, struct attr *attr, afi_t afi, safi_t safi)
@@ -793,7 +793,7 @@ bgp_import_modifier (struct peer *rsclient, struct peer *peer,
     }
   return RMAP_PERMIT;
 }
-
+
 static int
 bgp_announce_check (struct bgp_info *ri, struct peer *peer, struct prefix *p,
 		    struct attr *attr, afi_t afi, safi_t safi)
@@ -2468,7 +2468,7 @@ bgp_withdraw (struct peer *peer, struct prefix *p, struct attr *attr,
 
   return 0;
 }
-
+
 void
 bgp_default_originate (struct peer *peer, afi_t afi, safi_t safi, int withdraw)
 {
@@ -2571,7 +2571,7 @@ bgp_default_originate (struct peer *peer, afi_t afi, safi_t safi, int withdraw)
   bgp_attr_extra_free (&attr);
   aspath_unintern (&aspath);
 }
-
+
 static void
 bgp_announce_table (struct peer *peer, afi_t afi, safi_t safi,
                    struct bgp_table *table, int rsclient)
@@ -2642,7 +2642,7 @@ bgp_announce_route_all (struct peer *peer)
     for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++)
       bgp_announce_route (peer, afi, safi);
 }
-
+
 static void
 bgp_soft_reconfig_table_rsclient (struct peer *rsclient, afi_t afi,
         safi_t safi, struct bgp_table *table, struct prefix_rd *prd)
@@ -2686,7 +2686,7 @@ bgp_soft_reconfig_rsclient (struct peer *rsclient, afi_t afi, safi_t safi)
           bgp_soft_reconfig_table_rsclient (rsclient, afi, safi, table, &prd);
         }
 }
-
+
 static void
 bgp_soft_reconfig_table (struct peer *peer, afi_t afi, safi_t safi,
 			 struct bgp_table *table, struct prefix_rd *prd)
@@ -2744,7 +2744,7 @@ bgp_soft_reconfig_in (struct peer *peer, afi_t afi, safi_t safi)
           bgp_soft_reconfig_table (peer, afi, safi, table, &prd);
         }
 }
-
+
 
 struct bgp_clear_node_queue
 {
@@ -3038,7 +3038,7 @@ bgp_clear_stale_route (struct peer *peer, afi_t afi, safi_t safi)
 	  }
     }
 }
-
+
 /* Delete all kernel routes. */
 void
 bgp_cleanup_routes (void)
@@ -3079,7 +3079,7 @@ bgp_reset (void)
   access_list_reset ();
   prefix_list_reset ();
 }
-
+
 /* Parse NLRI stream.  Withdraw NLRI is recognized by NULL attr
    value. */
 int
@@ -3242,7 +3242,7 @@ bgp_nlri_sanity_check (struct peer *peer, int afi, u_char *pnt,
     }
   return 0;
 }
-
+
 static struct bgp_static *
 bgp_static_new (void)
 {
@@ -4009,7 +4009,7 @@ bgp_static_unset_vpnv4 (struct vty *vty, const char *ip_str,
 
   return CMD_SUCCESS;
 }
-
+
 DEFUN (bgp_network,
        bgp_network_cmd,
        "network A.B.C.D/M",
@@ -4467,7 +4467,7 @@ ALIAS_DEPRECATED (no_ipv6_bgp_network,
        "AS-Path hopcount limit attribute\n"
        "AS-Pathlimit TTL, in number of AS-Path hops\n")
 #endif /* HAVE_IPV6 */
-
+
 /* Aggreagete address:
 
   advertise-map  Set condition to advertise attribute
@@ -5378,7 +5378,7 @@ ALIAS (no_ipv6_aggregate_address_summary_only,
        "Aggregate prefix\n"
        "Filter more specific routes from updates\n")
 #endif /* HAVE_IPV6 */
-
+
 /* Redistribute route treatment. */
 void
 bgp_redistribute_add (struct prefix *p, const struct in_addr *nexthop,
@@ -5578,7 +5578,7 @@ bgp_redistribute_withdraw (struct bgp *bgp, afi_t afi, int type)
 	}
     }
 }
-
+
 /* Static function to display route. */
 static void
 route_vty_out_route (struct prefix *p, struct vty *vty)
@@ -7103,7 +7103,7 @@ DEFUN (show_ipv6_mbgp_prefix,
   return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_MULTICAST, NULL, 1);
 }
 #endif
-
+
 
 static int
 bgp_show_regexp (struct vty *vty, int argc, const char **argv, afi_t afi,
@@ -7247,7 +7247,7 @@ DEFUN (show_ipv6_mbgp_regexp,
 			  bgp_show_type_regexp);
 }
 #endif /* HAVE_IPV6 */
-
+
 static int
 bgp_show_prefix_list (struct vty *vty, const char *prefix_list_str, afi_t afi,
 		      safi_t safi, enum bgp_show_type type)
@@ -7362,7 +7362,7 @@ DEFUN (show_ipv6_mbgp_prefix_list,
 			       bgp_show_type_prefix_list);
 }
 #endif /* HAVE_IPV6 */
-
+
 static int
 bgp_show_filter_list (struct vty *vty, const char *filter, afi_t afi,
 		      safi_t safi, enum bgp_show_type type)
@@ -7476,7 +7476,7 @@ DEFUN (show_ipv6_mbgp_filter_list,
 			       bgp_show_type_filter_list);
 }
 #endif /* HAVE_IPV6 */
-
+
 static int
 bgp_show_route_map (struct vty *vty, const char *rmap_str, afi_t afi,
 		    safi_t safi, enum bgp_show_type type)
@@ -7561,7 +7561,7 @@ ALIAS (show_bgp_route_map,
        "Address family\n"
        "Display routes matching the route-map\n"
        "A route-map to match on\n")
-
+
 DEFUN (show_ip_bgp_cidr_only,
        show_ip_bgp_cidr_only_cmd,
        "show ip bgp cidr-only",
@@ -7605,7 +7605,7 @@ DEFUN (show_ip_bgp_ipv4_cidr_only,
   return bgp_show (vty, NULL, AFI_IP, SAFI_UNICAST,
 		     bgp_show_type_cidr_only, NULL);
 }
-
+
 DEFUN (show_ip_bgp_community_all,
        show_ip_bgp_community_all_cmd,
        "show ip bgp community",
@@ -7683,7 +7683,7 @@ DEFUN (show_ipv6_mbgp_community_all,
 		   bgp_show_type_community_all, NULL);
 }
 #endif /* HAVE_IPV6 */
-
+
 static int
 bgp_show_community (struct vty *vty, const char *view_name, int argc,
 		    const char **argv, int exact, afi_t afi, safi_t safi)
@@ -8875,7 +8875,7 @@ ALIAS (show_ipv6_mbgp_community_exact,
        "Do not export to next AS (well-known community)\n"
        "Exact match of the communities")
 #endif /* HAVE_IPV6 */
-
+
 static int
 bgp_show_community_list (struct vty *vty, const char *com, int exact,
 			 afi_t afi, safi_t safi)
@@ -9062,7 +9062,7 @@ DEFUN (show_ipv6_mbgp_community_list_exact,
   return bgp_show_community_list (vty, argv[0], 1, AFI_IP6, SAFI_MULTICAST);
 }
 #endif /* HAVE_IPV6 */
-
+
 static int
 bgp_show_prefix_longer (struct vty *vty, const char *prefix, afi_t afi,
 			safi_t safi, enum bgp_show_type type)
@@ -9254,7 +9254,7 @@ peer_lookup_in_view (struct vty *vty, const char *view_name,
   
   return peer;
 }
-
+
 enum bgp_stats
 {
   BGP_STATS_MAXBITLEN = 0,
@@ -9602,7 +9602,7 @@ ALIAS (show_bgp_statistics_view,
        "Address family\n"
        "Address Family modifier\n"
        "BGP RIB advertisement statistics\n")
-
+
 enum bgp_pcounts
 {
   PCOUNT_ADJ_IN = 0,
@@ -10142,7 +10142,7 @@ DEFUN (ipv6_mbgp_neighbor_advertised_route,
   return peer_adj_routes (vty, peer, AFI_IP6, SAFI_MULTICAST, 0);
 }
 #endif /* HAVE_IPV6 */
-
+
 DEFUN (show_ip_bgp_view_neighbor_received_routes,
        show_ip_bgp_view_neighbor_received_routes_cmd,
        "show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X) received-routes",
@@ -10519,7 +10519,7 @@ ALIAS (show_bgp_view_neighbor_received_prefix_filter,
        "Display information received from a BGP neighbor\n"
        "Display the prefixlist filter\n")
 #endif /* HAVE_IPV6 */
-
+
 static int
 bgp_show_neighbor_route (struct vty *vty, struct peer *peer, afi_t afi,
 			 safi_t safi, enum bgp_show_type type)
@@ -11671,7 +11671,7 @@ ALIAS (show_bgp_view_ipv6_safi_rsclient_prefix,
        "IP prefix <network>/<length>, e.g., 3ffe::/16\n")
 
 #endif /* HAVE_IPV6 */
-
+
 struct bgp_table *bgp_distance_table;
 
 struct bgp_distance
@@ -11948,7 +11948,7 @@ DEFUN (no_bgp_distance_source_access_list,
   bgp_distance_unset (vty, argv[0], argv[1], argv[2]);
   return CMD_SUCCESS;
 }
-
+
 DEFUN (bgp_damp_set,
        bgp_damp_set_cmd,
        "bgp dampening <1-45> <1-20000> <1-20000> <1-255>",
@@ -12043,7 +12043,7 @@ DEFUN (show_ip_bgp_flap_statistics,
   return bgp_show (vty, NULL, AFI_IP, SAFI_UNICAST,
                    bgp_show_type_flap_statistics, NULL);
 }
-
+
 /* Display specified route of BGP table. */
 static int
 bgp_clear_damp_route (struct vty *vty, const char *view_name, 
@@ -12207,7 +12207,7 @@ DEFUN (clear_ip_bgp_dampening_address_mask,
   return bgp_clear_damp_route (vty, NULL, prefix_str, AFI_IP,
 			       SAFI_UNICAST, NULL, 0);
 }
-
+
 static int
 bgp_config_write_network_vpnv4 (struct vty *vty, struct bgp *bgp,
 				afi_t afi, safi_t safi, int *write)

+ 34 - 34
bgpd/bgp_routemap.c

@@ -100,7 +100,7 @@ o Local extention
   set as-path exclude     : Done
 
 */ 
-
+
  /* 'match peer (A.B.C.D|X:X::X:X)' */
 
 /* Compares the peer specified in the 'match peer' clause with the peer
@@ -240,7 +240,7 @@ struct route_map_rule_cmd route_match_ip_address_cmd =
   route_match_ip_address_compile,
   route_match_ip_address_free
 };
-
+
 /* `match ip next-hop IP_ADDRESS' */
 
 /* Match function return 1 if match is success else return zero. */
@@ -292,7 +292,7 @@ struct route_map_rule_cmd route_match_ip_next_hop_cmd =
   route_match_ip_next_hop_compile,
   route_match_ip_next_hop_free
 };
-
+
 /* `match ip route-source ACCESS-LIST' */
 
 /* Match function return 1 if match is success else return zero. */
@@ -350,7 +350,7 @@ struct route_map_rule_cmd route_match_ip_route_source_cmd =
   route_match_ip_route_source_compile,
   route_match_ip_route_source_free
 };
-
+
 /* `match ip address prefix-list PREFIX_LIST' */
 
 static route_map_result_t
@@ -390,7 +390,7 @@ struct route_map_rule_cmd route_match_ip_address_prefix_list_cmd =
   route_match_ip_address_prefix_list_compile,
   route_match_ip_address_prefix_list_free
 };
-
+
 /* `match ip next-hop prefix-list PREFIX_LIST' */
 
 static route_map_result_t
@@ -437,7 +437,7 @@ struct route_map_rule_cmd route_match_ip_next_hop_prefix_list_cmd =
   route_match_ip_next_hop_prefix_list_compile,
   route_match_ip_next_hop_prefix_list_free
 };
-
+
 /* `match ip route-source prefix-list PREFIX_LIST' */
 
 static route_map_result_t
@@ -490,7 +490,7 @@ struct route_map_rule_cmd route_match_ip_route_source_prefix_list_cmd =
   route_match_ip_route_source_prefix_list_compile,
   route_match_ip_route_source_prefix_list_free
 };
-
+
 /* `match metric METRIC' */
 
 /* Match function return 1 if match is success else return zero. */
@@ -555,7 +555,7 @@ struct route_map_rule_cmd route_match_metric_cmd =
   route_match_metric_compile,
   route_match_metric_free
 };
-
+
 /* `match as-path ASPATH' */
 
 /* Match function for as-path match.  I assume given object is */
@@ -603,7 +603,7 @@ struct route_map_rule_cmd route_match_aspath_cmd =
   route_match_aspath_compile,
   route_match_aspath_free
 };
-
+
 /* `match community COMMUNIY' */
 struct rmap_community
 {
@@ -687,7 +687,7 @@ struct route_map_rule_cmd route_match_community_cmd =
   route_match_community_compile,
   route_match_community_free
 };
-
+
 /* Match function for extcommunity match. */
 static route_map_result_t
 route_match_ecommunity (void *rule, struct prefix *prefix, 
@@ -736,10 +736,10 @@ struct route_map_rule_cmd route_match_ecommunity_cmd =
   route_match_ecommunity_compile,
   route_match_ecommunity_free
 };
-
+
 /* `match nlri` and `set nlri` are replaced by `address-family ipv4`
    and `address-family vpnv4'.  */
-
+
 /* `match origin' */
 static route_map_result_t
 route_match_origin (void *rule, struct prefix *prefix, 
@@ -964,7 +964,7 @@ struct route_map_rule_cmd route_set_ip_nexthop_cmd =
   route_set_ip_nexthop_compile,
   route_set_ip_nexthop_free
 };
-
+
 /* `set local-preference LOCAL_PREF' */
 
 /* Set local preference. */
@@ -1031,7 +1031,7 @@ struct route_map_rule_cmd route_set_local_pref_cmd =
   route_set_local_pref_compile,
   route_set_local_pref_free,
 };
-
+
 /* `set weight WEIGHT' */
 
 /* Set weight. */
@@ -1100,7 +1100,7 @@ struct route_map_rule_cmd route_set_weight_cmd =
   route_set_weight_compile,
   route_set_weight_free,
 };
-
+
 /* `set metric METRIC' */
 
 /* Set metric to attribute. */
@@ -1200,7 +1200,7 @@ struct route_map_rule_cmd route_set_metric_cmd =
   route_set_metric_compile,
   route_set_metric_free,
 };
-
+
 /* `set as-path prepend ASPATH' */
 
 /* For AS path prepend mechanism. */
@@ -1256,7 +1256,7 @@ struct route_map_rule_cmd route_set_aspath_prepend_cmd =
   route_set_aspath_prepend_compile,
   route_set_aspath_prepend_free,
 };
-
+
 /* `set as-path exclude ASn' */
 
 /* For ASN exclude mechanism.
@@ -1314,7 +1314,7 @@ struct route_map_rule_cmd route_set_aspath_exclude_cmd =
   route_set_aspath_exclude_compile,
   route_set_aspath_exclude_free,
 };
-
+
 /* `set community COMMUNITY' */
 struct rmap_com_set
 {
@@ -1438,7 +1438,7 @@ struct route_map_rule_cmd route_set_community_cmd =
   route_set_community_compile,
   route_set_community_free,
 };
-
+
 /* `set comm-list (<1-99>|<100-500>|WORD) delete' */
 
 /* For community set mechanism. */
@@ -1527,7 +1527,7 @@ struct route_map_rule_cmd route_set_community_delete_cmd =
   route_set_community_delete_compile,
   route_set_community_delete_free,
 };
-
+
 /* `set extcommunity rt COMMUNITY' */
 
 /* For community set mechanism. */
@@ -1659,7 +1659,7 @@ struct route_map_rule_cmd route_set_ecommunity_soo_cmd =
   route_set_ecommunity_soo_compile,
   route_set_ecommunity_soo_free,
 };
-
+
 /* `set origin ORIGIN' */
 
 /* For origin set. */
@@ -1713,7 +1713,7 @@ struct route_map_rule_cmd route_set_origin_cmd =
   route_set_origin_compile,
   route_set_origin_free,
 };
-
+
 /* `set atomic-aggregate' */
 
 /* For atomic aggregate set. */
@@ -1754,7 +1754,7 @@ struct route_map_rule_cmd route_set_atomic_aggregate_cmd =
   route_set_atomic_aggregate_compile,
   route_set_atomic_aggregate_free,
 };
-
+
 /* `set aggregator as AS A.B.C.D' */
 struct aggregator
 {
@@ -1813,7 +1813,7 @@ struct route_map_rule_cmd route_set_aggregator_as_cmd =
   route_set_aggregator_as_compile,
   route_set_aggregator_as_free,
 };
-
+
 #ifdef HAVE_IPV6
 /* `match ipv6 address IP_ACCESS_LIST' */
 
@@ -1855,7 +1855,7 @@ struct route_map_rule_cmd route_match_ipv6_address_cmd =
   route_match_ipv6_address_compile,
   route_match_ipv6_address_free
 };
-
+
 /* `match ipv6 next-hop IP_ADDRESS' */
 
 static route_map_result_t
@@ -1917,7 +1917,7 @@ struct route_map_rule_cmd route_match_ipv6_next_hop_cmd =
   route_match_ipv6_next_hop_compile,
   route_match_ipv6_next_hop_free
 };
-
+
 /* `match ipv6 address prefix-list PREFIX_LIST' */
 
 static route_map_result_t
@@ -1957,7 +1957,7 @@ struct route_map_rule_cmd route_match_ipv6_address_prefix_list_cmd =
   route_match_ipv6_address_prefix_list_compile,
   route_match_ipv6_address_prefix_list_free
 };
-
+
 /* `set ipv6 nexthop global IP_ADDRESS' */
 
 /* Set nexthop to object.  ojbect must be pointer to struct attr. */
@@ -2021,7 +2021,7 @@ struct route_map_rule_cmd route_set_ipv6_nexthop_global_cmd =
   route_set_ipv6_nexthop_global_compile,
   route_set_ipv6_nexthop_global_free
 };
-
+
 /* `set ipv6 nexthop local IP_ADDRESS' */
 
 /* Set nexthop to object.  ojbect must be pointer to struct attr. */
@@ -2086,7 +2086,7 @@ struct route_map_rule_cmd route_set_ipv6_nexthop_local_cmd =
   route_set_ipv6_nexthop_local_free
 };
 #endif /* HAVE_IPV6 */
-
+
 /* `set vpnv4 nexthop A.B.C.D' */
 
 static route_map_result_t
@@ -2142,7 +2142,7 @@ struct route_map_rule_cmd route_set_vpnv4_nexthop_cmd =
   route_set_vpnv4_nexthop_compile,
   route_set_vpnv4_nexthop_free
 };
-
+
 /* `set originator-id' */
 
 /* For origin set. */
@@ -2199,7 +2199,7 @@ struct route_map_rule_cmd route_set_originator_id_cmd =
   route_set_originator_id_compile,
   route_set_originator_id_free,
 };
-
+
 /* Add bgp route map rule. */
 static int
 bgp_route_match_add (struct vty *vty, struct route_map_index *index,
@@ -2408,7 +2408,7 @@ bgp_route_map_update (const char *unused)
 	}
     }
 }
-
+
 DEFUN (match_peer,
        match_peer_cmd,
        "match peer (A.B.C.D|X:X::X:X)",
@@ -3562,7 +3562,7 @@ ALIAS (no_set_aggregator_as,
        "AS number\n"
        "IP address of aggregator\n")
 
-
+
 #ifdef HAVE_IPV6
 DEFUN (match_ipv6_address, 
        match_ipv6_address_cmd,
@@ -3833,7 +3833,7 @@ ALIAS (no_match_pathlimit_as,
        "BGP AS-Pathlimit attribute\n"
        "Match Pathlimit ASN\n")
 
-
+
 /* Initialization of route map. */
 void
 bgp_route_map_init (void)

+ 4 - 4
bgpd/bgp_snmp.c

@@ -38,7 +38,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #include "bgpd/bgp_route.h"
 #include "bgpd/bgp_fsm.h"
 #include "bgpd/bgp_snmp.h"
-
+
 /* BGP4-MIB described in RFC1657. */
 #define BGP4MIB 1,3,6,1,2,1,15
 
@@ -112,7 +112,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #define OCTET_STRING ASN_OCTET_STR
 #define IPADDRESS ASN_IPADDRESS
 #define GAUGE32 ASN_UNSIGNED
-
+
 /* Declare static local variables for convenience. */
 SNMP_LOCAL_VARIABLES
 
@@ -242,7 +242,7 @@ struct variable bgp_variables[] =
    3, {6, 1, 14}},
 };
 
-
+
 static u_char *
 bgpVersion (struct variable *v, oid name[], size_t *length, int exact,
 	    size_t *var_len, WriteMethod **write_method)
@@ -835,7 +835,7 @@ bgp4PathAttrTable (struct variable *v, oid name[], size_t *length,
     }
   return NULL;
 }
-
+
 /* BGP Traps. */
 struct trap_object bgpTrapList[] =
 {

+ 84 - 84
bgpd/bgp_vty.c

@@ -314,7 +314,7 @@ DEFUN_DEPRECATED (neighbor_version,
 {
   return CMD_SUCCESS;
 }
-
+
 /* "router bgp" commands. */
 DEFUN (router_bgp, 
        router_bgp_cmd, 
@@ -364,7 +364,7 @@ ALIAS (router_bgp,
        AS_STR
        "BGP view\n"
        "view name\n")
-
+
 /* "no router bgp" commands. */
 DEFUN (no_router_bgp,
        no_router_bgp_cmd,
@@ -405,7 +405,7 @@ ALIAS (no_router_bgp,
        AS_STR
        "BGP view\n"
        "view name\n")
-
+
 /* BGP router-id.  */
 
 DEFUN (bgp_router_id,
@@ -476,7 +476,7 @@ ALIAS (no_bgp_router_id,
        BGP_STR
        "Override configured router identifier\n"
        "Manually configured router identifier\n")
-
+
 /* BGP Cluster ID.  */
 
 DEFUN (bgp_cluster_id,
@@ -546,7 +546,7 @@ ALIAS (no_bgp_cluster_id,
        BGP_STR
        "Configure Route-Reflector Cluster-id\n"
        "Route-Reflector Cluster-id in IP address format\n")
-
+
 DEFUN (bgp_confederation_identifier,
        bgp_confederation_identifier_cmd,
        "bgp confederation identifier " CMD_AS_RANGE,
@@ -596,7 +596,7 @@ ALIAS (no_bgp_confederation_identifier,
        "AS confederation parameters\n"
        "AS number\n"
        "Set routing domain confederation AS\n")
-
+
 DEFUN (bgp_confederation_peers,
        bgp_confederation_peers_cmd,
        "bgp confederation peers ." CMD_AS_RANGE,
@@ -650,7 +650,7 @@ DEFUN (no_bgp_confederation_peers,
     }
   return CMD_SUCCESS;
 }
-
+
 /* Maximum-paths configuration */
 DEFUN (bgp_maxpaths,
        bgp_maxpaths_cmd,
@@ -793,7 +793,7 @@ bgp_config_write_maxpaths (struct vty *vty, struct bgp *bgp, afi_t afi,
 
   return 0;
 }
-
+
 /* BGP timers.  */
 
 DEFUN (bgp_timers,
@@ -849,7 +849,7 @@ ALIAS (no_bgp_timers,
        "BGP timers\n"
        "Keepalive interval\n"
        "Holdtime\n")
-
+
 DEFUN (bgp_client_to_client_reflection,
        bgp_client_to_client_reflection_cmd,
        "bgp client-to-client reflection",
@@ -906,7 +906,7 @@ DEFUN (no_bgp_always_compare_med,
   bgp_flag_unset (bgp, BGP_FLAG_ALWAYS_COMPARE_MED);
   return CMD_SUCCESS;
 }
-
+
 /* "bgp deterministic-med" configuration. */
 DEFUN (bgp_deterministic_med,
        bgp_deterministic_med_cmd,
@@ -1037,7 +1037,7 @@ DEFUN (no_bgp_fast_external_failover,
   bgp_flag_set (bgp, BGP_FLAG_NO_FAST_EXT_FAILOVER);
   return CMD_SUCCESS;
 }
-
+
 /* "bgp enforce-first-as" configuration. */
 DEFUN (bgp_enforce_first_as,
        bgp_enforce_first_as_cmd,
@@ -1065,7 +1065,7 @@ DEFUN (no_bgp_enforce_first_as,
   bgp_flag_unset (bgp, BGP_FLAG_ENFORCE_FIRST_AS);
   return CMD_SUCCESS;
 }
-
+
 /* "bgp bestpath compare-routerid" configuration.  */
 DEFUN (bgp_bestpath_compare_router_id,
        bgp_bestpath_compare_router_id_cmd,
@@ -1095,7 +1095,7 @@ DEFUN (no_bgp_bestpath_compare_router_id,
   bgp_flag_unset (bgp, BGP_FLAG_COMPARE_ROUTER_ID);
   return CMD_SUCCESS;
 }
-
+
 /* "bgp bestpath as-path ignore" configuration.  */
 DEFUN (bgp_bestpath_aspath_ignore,
        bgp_bestpath_aspath_ignore_cmd,
@@ -1127,7 +1127,7 @@ DEFUN (no_bgp_bestpath_aspath_ignore,
   bgp_flag_unset (bgp, BGP_FLAG_ASPATH_IGNORE);
   return CMD_SUCCESS;
 }
-
+
 /* "bgp bestpath as-path confed" configuration.  */
 DEFUN (bgp_bestpath_aspath_confed,
        bgp_bestpath_aspath_confed_cmd,
@@ -1159,7 +1159,7 @@ DEFUN (no_bgp_bestpath_aspath_confed,
   bgp_flag_unset (bgp, BGP_FLAG_ASPATH_CONFED);
   return CMD_SUCCESS;
 }
-
+
 /* "bgp bestpath as-path multipath-relax" configuration.  */
 DEFUN (bgp_bestpath_aspath_multipath_relax,
        bgp_bestpath_aspath_multipath_relax_cmd,
@@ -1191,7 +1191,7 @@ DEFUN (no_bgp_bestpath_aspath_multipath_relax,
   bgp_flag_unset (bgp, BGP_FLAG_ASPATH_MULTIPATH_RELAX);
   return CMD_SUCCESS;
 }
-
+
 /* "bgp log-neighbor-changes" configuration.  */
 DEFUN (bgp_log_neighbor_changes,
        bgp_log_neighbor_changes_cmd,
@@ -1219,7 +1219,7 @@ DEFUN (no_bgp_log_neighbor_changes,
   bgp_flag_unset (bgp, BGP_FLAG_LOG_NEIGHBOR_CHANGES);
   return CMD_SUCCESS;
 }
-
+
 /* "bgp bestpath med" configuration. */
 DEFUN (bgp_bestpath_med,
        bgp_bestpath_med_cmd,
@@ -1317,7 +1317,7 @@ ALIAS (no_bgp_bestpath_med2,
        "MED attribute\n"
        "Treat missing MED as the least preferred one\n"
        "Compare MED among confederation paths\n")
-
+
 /* "no bgp default ipv4-unicast". */
 DEFUN (no_bgp_default_ipv4_unicast,
        no_bgp_default_ipv4_unicast_cmd,
@@ -1347,7 +1347,7 @@ DEFUN (bgp_default_ipv4_unicast,
   bgp_flag_unset (bgp, BGP_FLAG_NO_DEFAULT_IPV4);
   return CMD_SUCCESS;
 }
-
+
 /* "bgp import-check" configuration.  */
 DEFUN (bgp_network_import_check,
        bgp_network_import_check_cmd,
@@ -1377,7 +1377,7 @@ DEFUN (no_bgp_network_import_check,
   bgp_flag_unset (bgp, BGP_FLAG_IMPORT_CHECK);
   return CMD_SUCCESS;
 }
-
+
 DEFUN (bgp_default_local_preference,
        bgp_default_local_preference_cmd,
        "bgp default local-preference <0-4294967295>",
@@ -1421,7 +1421,7 @@ ALIAS (no_bgp_default_local_preference,
        "Configure BGP defaults\n"
        "local preference (higher=more preferred)\n"
        "Configure default local preference value\n")
-
+
 static int
 peer_remote_as_vty (struct vty *vty, const char *peer_str, 
                     const char *as_str, afi_t afi, safi_t safi)
@@ -1481,7 +1481,7 @@ DEFUN (neighbor_remote_as,
 {
   return peer_remote_as_vty (vty, argv[0], argv[1], AFI_IP, SAFI_UNICAST);
 }
-
+
 DEFUN (neighbor_peer_group,
        neighbor_peer_group_cmd,
        "neighbor WORD peer-group",
@@ -1586,7 +1586,7 @@ DEFUN (no_neighbor_peer_group_remote_as,
     }
   return CMD_SUCCESS;
 }
-
+
 DEFUN (neighbor_local_as,
        neighbor_local_as_cmd,
        NEIGHBOR_CMD2 "local-as " CMD_AS_RANGE,
@@ -1696,7 +1696,7 @@ ALIAS (no_neighbor_local_as,
        "AS number used as local AS\n"
        "Do not prepend local-as to updates from ebgp peers\n"
        "Do not prepend local-as to updates from ibgp peers\n")
-
+
 DEFUN (neighbor_password,
        neighbor_password_cmd,
        NEIGHBOR_CMD2 "password LINE",
@@ -1734,7 +1734,7 @@ DEFUN (no_neighbor_password,
   ret = peer_password_unset (peer);
   return bgp_vty_return (vty, ret);
 }
-
+
 DEFUN (neighbor_activate,
        neighbor_activate_cmd,
        NEIGHBOR_CMD2 "activate",
@@ -1773,7 +1773,7 @@ DEFUN (no_neighbor_activate,
 
   return bgp_vty_return (vty, ret);
 }
-
+
 DEFUN (neighbor_set_peer_group,
        neighbor_set_peer_group_cmd,
        NEIGHBOR_CMD "peer-group WORD",
@@ -1855,7 +1855,7 @@ DEFUN (no_neighbor_set_peer_group,
 
   return bgp_vty_return (vty, ret);
 }
-
+
 static int
 peer_flag_modify_vty (struct vty *vty, const char *ip_str, 
                       u_int16_t flag, int set)
@@ -1908,7 +1908,7 @@ DEFUN (no_neighbor_passive,
 {
   return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_PASSIVE);
 }
-
+
 /* neighbor shutdown. */
 DEFUN (neighbor_shutdown,
        neighbor_shutdown_cmd,
@@ -1930,7 +1930,7 @@ DEFUN (no_neighbor_shutdown,
 {
   return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_SHUTDOWN);
 }
-
+
 /* Deprecated neighbor capability route-refresh. */
 DEFUN_DEPRECATED (neighbor_capability_route_refresh,
 		  neighbor_capability_route_refresh_cmd,
@@ -1954,7 +1954,7 @@ DEFUN_DEPRECATED (no_neighbor_capability_route_refresh,
 {
   return CMD_SUCCESS;
 }
-
+
 /* neighbor capability dynamic. */
 DEFUN (neighbor_capability_dynamic,
        neighbor_capability_dynamic_cmd,
@@ -1978,7 +1978,7 @@ DEFUN (no_neighbor_capability_dynamic,
 {
   return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_DYNAMIC_CAPABILITY);
 }
-
+
 /* neighbor dont-capability-negotiate */
 DEFUN (neighbor_dont_capability_negotiate,
        neighbor_dont_capability_negotiate_cmd,
@@ -2000,7 +2000,7 @@ DEFUN (no_neighbor_dont_capability_negotiate,
 {
   return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_DONT_CAPABILITY);
 }
-
+
 static int
 peer_af_flag_modify_vty (struct vty *vty, const char *peer_str, afi_t afi,
 			 safi_t safi, u_int32_t flag, int set)
@@ -2033,7 +2033,7 @@ peer_af_flag_unset_vty (struct vty *vty, const char *peer_str, afi_t afi,
 {
   return peer_af_flag_modify_vty (vty, peer_str, afi, safi, flag, 0);
 }
-
+
 /* neighbor capability orf prefix-list. */
 DEFUN (neighbor_capability_orf_prefix,
        neighbor_capability_orf_prefix_cmd,
@@ -2089,7 +2089,7 @@ DEFUN (no_neighbor_capability_orf_prefix,
   return peer_af_flag_unset_vty (vty, argv[0], bgp_node_afi (vty),
 				 bgp_node_safi (vty), flag);
 }
-
+
 /* neighbor next-hop-self. */
 DEFUN (neighbor_nexthop_self,
        neighbor_nexthop_self_cmd,
@@ -2113,7 +2113,7 @@ DEFUN (no_neighbor_nexthop_self,
   return peer_af_flag_unset_vty (vty, argv[0], bgp_node_afi (vty),
 				 bgp_node_safi (vty), PEER_FLAG_NEXTHOP_SELF);
 }
-
+
 /* neighbor remove-private-AS. */
 DEFUN (neighbor_remove_private_as,
        neighbor_remove_private_as_cmd,
@@ -2139,7 +2139,7 @@ DEFUN (no_neighbor_remove_private_as,
 				 bgp_node_safi (vty),
 				 PEER_FLAG_REMOVE_PRIVATE_AS);
 }
-
+
 /* neighbor send-community. */
 DEFUN (neighbor_send_community,
        neighbor_send_community_cmd,
@@ -2165,7 +2165,7 @@ DEFUN (no_neighbor_send_community,
 				 bgp_node_safi (vty),
 				 PEER_FLAG_SEND_COMMUNITY);
 }
-
+
 /* neighbor send-community extended. */
 DEFUN (neighbor_send_community_type,
        neighbor_send_community_type_cmd,
@@ -2217,7 +2217,7 @@ DEFUN (no_neighbor_send_community_type,
 				 (PEER_FLAG_SEND_COMMUNITY |
 				  PEER_FLAG_SEND_EXT_COMMUNITY));
 }
-
+
 /* neighbor soft-reconfig. */
 DEFUN (neighbor_soft_reconfiguration,
        neighbor_soft_reconfiguration_cmd,
@@ -2245,7 +2245,7 @@ DEFUN (no_neighbor_soft_reconfiguration,
 				 bgp_node_afi (vty), bgp_node_safi (vty),
 				 PEER_FLAG_SOFT_RECONFIG);
 }
-
+
 DEFUN (neighbor_route_reflector_client,
        neighbor_route_reflector_client_cmd,
        NEIGHBOR_CMD2 "route-reflector-client",
@@ -2277,7 +2277,7 @@ DEFUN (no_neighbor_route_reflector_client,
 				 bgp_node_safi (vty),
 				 PEER_FLAG_REFLECTOR_CLIENT);
 }
-
+
 static int
 peer_rsclient_set_vty (struct vty *vty, const char *peer_str, 
                        int afi, int safi)
@@ -2425,7 +2425,7 @@ peer_rsclient_unset_vty (struct vty *vty, const char *peer_str,
 
   return CMD_SUCCESS;
 }
-
+
 /* neighbor route-server-client. */
 DEFUN (neighbor_route_server_client,
        neighbor_route_server_client_cmd,
@@ -2449,7 +2449,7 @@ DEFUN (no_neighbor_route_server_client,
   return peer_rsclient_unset_vty (vty, argv[0], bgp_node_afi(vty),
                   bgp_node_safi(vty));
 }
-
+
 DEFUN (neighbor_nexthop_local_unchanged,
        neighbor_nexthop_local_unchanged_cmd,
        NEIGHBOR_CMD2 "nexthop-local unchanged",
@@ -2462,7 +2462,7 @@ DEFUN (neighbor_nexthop_local_unchanged,
                                 bgp_node_safi (vty),
                                 PEER_FLAG_NEXTHOP_LOCAL_UNCHANGED );
 }
-
+
 DEFUN (no_neighbor_nexthop_local_unchanged,
        no_neighbor_nexthop_local_unchanged_cmd,
        NO_NEIGHBOR_CMD2 "nexthop-local unchanged",
@@ -2476,7 +2476,7 @@ DEFUN (no_neighbor_nexthop_local_unchanged,
 				 bgp_node_safi (vty),
                                 PEER_FLAG_NEXTHOP_LOCAL_UNCHANGED );
 }
-
+
 DEFUN (neighbor_attr_unchanged,
        neighbor_attr_unchanged_cmd,
        NEIGHBOR_CMD2 "attribute-unchanged",
@@ -2833,7 +2833,7 @@ DEFUN_DEPRECATED (neighbor_transparent_nexthop,
 			       bgp_node_safi (vty),
 			       PEER_FLAG_NEXTHOP_UNCHANGED);
 }
-
+
 /* EBGP multihop configuration. */
 static int
 peer_ebgp_multihop_set_vty (struct vty *vty, const char *ip_str, 
@@ -2907,7 +2907,7 @@ ALIAS (no_neighbor_ebgp_multihop,
        NEIGHBOR_ADDR_STR2
        "Allow EBGP neighbors not on directly connected networks\n"
        "maximum hop count\n")
-
+
 /* disable-connected-check */
 DEFUN (neighbor_disable_connected_check,
        neighbor_disable_connected_check_cmd,
@@ -2946,7 +2946,7 @@ ALIAS (no_neighbor_disable_connected_check,
        NEIGHBOR_STR
        NEIGHBOR_ADDR_STR2
        "Enforce EBGP neighbors perform multihop\n")
-
+
 DEFUN (neighbor_description,
        neighbor_description_cmd,
        NEIGHBOR_CMD2 "description .LINE",
@@ -3001,7 +3001,7 @@ ALIAS (no_neighbor_description,
        NEIGHBOR_ADDR_STR2
        "Neighbor specific description\n"
        "Up to 80 characters describing this neighbor\n")
-
+
 /* Neighbor update-source. */
 static int
 peer_update_source_vty (struct vty *vty, const char *peer_str, 
@@ -3056,7 +3056,7 @@ DEFUN (no_neighbor_update_source,
 {
   return peer_update_source_vty (vty, argv[0], NULL);
 }
-
+
 static int
 peer_default_originate_set_vty (struct vty *vty, const char *peer_str, 
                                 afi_t afi, safi_t safi, 
@@ -3123,7 +3123,7 @@ ALIAS (no_neighbor_default_originate,
        "Originate default route to this neighbor\n"
        "Route-map to specify criteria to originate default\n"
        "route-map name\n")
-
+
 /* Set neighbor's BGP port.  */
 static int
 peer_port_vty (struct vty *vty, const char *ip_str, int afi, 
@@ -3183,7 +3183,7 @@ ALIAS (no_neighbor_port,
        NEIGHBOR_ADDR_STR
        "Neighbor's BGP port\n"
        "TCP port number\n")
-
+
 /* neighbor weight. */
 static int
 peer_weight_set_vty (struct vty *vty, const char *ip_str, 
@@ -3248,7 +3248,7 @@ ALIAS (no_neighbor_weight,
        NEIGHBOR_ADDR_STR2
        "Set default weight for routes from this neighbor\n"
        "default weight\n")
-
+
 /* Override capability negotiation. */
 DEFUN (neighbor_override_capability,
        neighbor_override_capability_cmd,
@@ -3270,7 +3270,7 @@ DEFUN (no_neighbor_override_capability,
 {
   return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_OVERRIDE_CAPABILITY);
 }
-
+
 DEFUN (neighbor_strict_capability,
        neighbor_strict_capability_cmd,
        NEIGHBOR_CMD "strict-capability-match",
@@ -3291,7 +3291,7 @@ DEFUN (no_neighbor_strict_capability,
 {
   return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_STRICT_CAP_MATCH);
 }
-
+
 static int
 peer_timers_set_vty (struct vty *vty, const char *ip_str, 
                      const char *keep_str, const char *hold_str)
@@ -3312,7 +3312,7 @@ peer_timers_set_vty (struct vty *vty, const char *ip_str,
 
   return bgp_vty_return (vty, ret);
 }
-
+
 static int
 peer_timers_unset_vty (struct vty *vty, const char *ip_str)
 {
@@ -3350,7 +3350,7 @@ DEFUN (no_neighbor_timers,
 {
   return peer_timers_unset_vty (vty, argv[0]);
 }
-
+
 static int
 peer_timers_connect_set_vty (struct vty *vty, const char *ip_str, 
                              const char *time_str)
@@ -3418,7 +3418,7 @@ ALIAS (no_neighbor_timers_connect,
        "BGP per neighbor timers\n"
        "BGP connect timer\n"
        "Connect timer\n")
-
+
 static int
 peer_advertise_interval_vty (struct vty *vty, const char *ip_str, 
                              const char *time_str, int set)  
@@ -3472,7 +3472,7 @@ ALIAS (no_neighbor_advertise_interval,
        NEIGHBOR_ADDR_STR
        "Minimum interval between sending BGP routing updates\n"
        "time in seconds\n")
-
+
 /* neighbor interface */
 static int
 peer_interface_vty (struct vty *vty, const char *ip_str, const char *str)
@@ -3514,7 +3514,7 @@ DEFUN (no_neighbor_interface,
 {
   return peer_interface_vty (vty, argv[0], NULL);
 }
-
+
 /* Set distribute list to the peer. */
 static int
 peer_distribute_set_vty (struct vty *vty, const char *ip_str, 
@@ -3595,7 +3595,7 @@ DEFUN (no_neighbor_distribute_list,
   return peer_distribute_unset_vty (vty, argv[0], bgp_node_afi (vty),
 				    bgp_node_safi (vty), argv[2]);
 }
-
+
 /* Set prefix list to the peer. */
 static int
 peer_prefix_list_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
@@ -3672,7 +3672,7 @@ DEFUN (no_neighbor_prefix_list,
   return peer_prefix_list_unset_vty (vty, argv[0], bgp_node_afi (vty),
 				     bgp_node_safi (vty), argv[2]);
 }
-
+
 static int
 peer_aslist_set_vty (struct vty *vty, const char *ip_str, 
                      afi_t afi, safi_t safi,
@@ -3749,7 +3749,7 @@ DEFUN (no_neighbor_filter_list,
   return peer_aslist_unset_vty (vty, argv[0], bgp_node_afi (vty),
 				bgp_node_safi (vty), argv[2]);
 }
-
+
 /* Set route-map to the peer. */
 static int
 peer_route_map_set_vty (struct vty *vty, const char *ip_str, 
@@ -3838,7 +3838,7 @@ DEFUN (no_neighbor_route_map,
   return peer_route_map_unset_vty (vty, argv[0], bgp_node_afi (vty),
 				   bgp_node_safi (vty), argv[2]);
 }
-
+
 /* Set unsuppress-map to the peer. */
 static int
 peer_unsuppress_map_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
@@ -3897,7 +3897,7 @@ DEFUN (no_neighbor_unsuppress_map,
   return peer_unsuppress_map_unset_vty (vty, argv[0], bgp_node_afi (vty),
 					bgp_node_safi (vty));
 }
-
+
 static int
 peer_maximum_prefix_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
 			     safi_t safi, const char *num_str,  
@@ -4107,7 +4107,7 @@ ALIAS (no_neighbor_maximum_prefix,
        "Threshold value (%) at which to generate a warning msg\n"
        "Restart bgp connection after limit is exceeded\n"
        "Restart interval in minutes")
-
+
 /* "neighbor allowas-in" */
 DEFUN (neighbor_allowas_in,
        neighbor_allowas_in_cmd,
@@ -4162,7 +4162,7 @@ DEFUN (no_neighbor_allowas_in,
 
   return bgp_vty_return (vty, ret);
 }
-
+
 DEFUN (neighbor_ttl_security,
        neighbor_ttl_security_cmd,
        NEIGHBOR_CMD2 "ttl-security hops <1-254>",
@@ -4198,7 +4198,7 @@ DEFUN (no_neighbor_ttl_security,
 
   return bgp_vty_return (vty, peer_ttl_security_hops_unset (peer));
 }
-
+
 /* Address family configuration.  */
 DEFUN (address_family_ipv4,
        address_family_ipv4_cmd,
@@ -4282,7 +4282,7 @@ DEFUN (exit_address_family,
     vty->node = BGP_NODE;
   return CMD_SUCCESS;
 }
-
+
 /* BGP clear sort. */
 enum clear_sort
 {
@@ -4636,7 +4636,7 @@ ALIAS (clear_ip_bgp_as,
        BGP_STR
        "Address family\n"
        "Clear peers with the AS number\n")
-
+
 /* Outbound soft-reconfiguration */
 DEFUN (clear_ip_bgp_all_soft_out,
        clear_ip_bgp_all_soft_out_cmd,
@@ -5263,7 +5263,7 @@ ALIAS (clear_bgp_as_soft_out,
        "Address family\n"
        "Clear peers with the AS number\n"
        "Soft reconfig outbound update\n")
-
+
 /* Inbound soft-reconfiguration */
 DEFUN (clear_ip_bgp_all_soft_in,
        clear_ip_bgp_all_soft_in_cmd,
@@ -6225,7 +6225,7 @@ ALIAS (clear_bgp_as_in_prefix_filter,
        "Clear peers with the AS number\n"
        "Soft reconfig inbound update\n"
        "Push out prefix-list ORF and do inbound soft reconfig\n")
-
+
 /* Both soft-reconfiguration */
 DEFUN (clear_ip_bgp_all_soft,
        clear_ip_bgp_all_soft_cmd,
@@ -6599,7 +6599,7 @@ ALIAS (clear_bgp_as_soft,
        "Address family\n"
        "Clear peers with the AS number\n"
        "Soft reconfig\n")
-
+
 /* RS-client soft reconfiguration. */
 #ifdef HAVE_IPV6
 DEFUN (clear_bgp_all_rsclient,
@@ -7278,7 +7278,7 @@ DEFUN (show_ipv6_mbgp_summary,
   return bgp_show_summary_vty (vty, NULL, AFI_IP6, SAFI_MULTICAST);
 }
 #endif /* HAVE_IPV6 */
-
+
 const char *
 afi_safi_print (afi_t afi, safi_t safi)
 {
@@ -8188,7 +8188,7 @@ ALIAS (show_ip_bgp_instance_neighbors_peer,
        "Detailed information on TCP and BGP neighbor connections\n"
        "Neighbor to display information about\n"
        "Neighbor to display information about\n")
-       
+       
 /* Show BGP's AS paths internal data.  There are both `show ip bgp
    paths' and `show ip mbgp paths'.  Those functions results are the
    same.*/
@@ -8221,7 +8221,7 @@ DEFUN (show_ip_bgp_ipv4_paths,
 
   return CMD_SUCCESS;
 }
-
+
 #include "hash.h"
 
 static void
@@ -8264,7 +8264,7 @@ DEFUN (show_ip_bgp_attr_info,
   attr_show_all (vty);
   return CMD_SUCCESS;
 }
-
+
 static int
 bgp_write_rsclient_summary (struct vty *vty, struct peer *rsclient,
         afi_t afi, safi_t safi)
@@ -8585,7 +8585,7 @@ ALIAS (show_bgp_instance_ipv6_safi_rsclient_summary,
        "Summary of all Route Server Clients\n")
 
 #endif /* HAVE IPV6 */
-
+
 /* Redistribute VTY commands.  */
 
 DEFUN (bgp_redistribute_ipv4,
@@ -8799,7 +8799,7 @@ ALIAS (no_bgp_redistribute_ipv4_rmap_metric,
        "Default metric\n"
        "Route map reference\n"
        "Pointer to route-map entries\n")
-
+
 #ifdef HAVE_IPV6
 DEFUN (bgp_redistribute_ipv6,
        bgp_redistribute_ipv6_cmd,
@@ -9014,7 +9014,7 @@ ALIAS (no_bgp_redistribute_ipv6_rmap_metric,
        "Route map reference\n"
        "Pointer to route-map entries\n")
 #endif /* HAVE_IPV6 */
-
+
 int
 bgp_config_write_redistribute (struct vty *vty, struct bgp *bgp, afi_t afi,
 			       safi_t safi, int *write)
@@ -9047,7 +9047,7 @@ bgp_config_write_redistribute (struct vty *vty, struct bgp *bgp, afi_t afi,
     }
   return *write;
 }
-
+
 /* BGP node structure. */
 static struct cmd_node bgp_node =
 {
@@ -9090,7 +9090,7 @@ static struct cmd_node bgp_vpnv4_node =
   "%s(config-router-af)# ",
   1
 };
-
+
 static void community_list_vty (void);
 
 void
@@ -10231,7 +10231,7 @@ bgp_vty_init (void)
   /* Community-list. */
   community_list_vty ();
 }
-
+
 #include "memory.h"
 #include "bgp_regex.h"
 #include "bgp_clist.h"
@@ -10630,7 +10630,7 @@ DEFUN (show_ip_community_list_arg,
 
   return CMD_SUCCESS;
 }
-
+
 static int
 extcommunity_list_set_vty (struct vty *vty, int argc, const char **argv, 
                            int style, int reject_all_digit_name)
@@ -10980,7 +10980,7 @@ DEFUN (show_ip_extcommunity_list_arg,
 
   return CMD_SUCCESS;
 }
-
+
 /* Return configuration string of community-list entry.  */
 static const char *
 community_list_config_str (struct community_entry *entry)

+ 4 - 4
bgpd/bgp_zebra.c

@@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA.  */
 #include "bgpd/bgp_fsm.h"
 #include "bgpd/bgp_debug.h"
 #include "bgpd/bgp_mpath.h"
-
+
 /* All information about zebra. */
 struct zclient *zclient = NULL;
 struct in_addr router_id_zebra;
@@ -381,7 +381,7 @@ zebra_read_ipv6 (int command, struct zclient *zclient, zebra_size_t length)
   return 0;
 }
 #endif /* HAVE_IPV6 */
-
+
 struct interface *
 if_lookup_by_ipv4 (struct in_addr *addr)
 {
@@ -943,7 +943,7 @@ bgp_zebra_withdraw (struct prefix *p, struct bgp_info *info, safi_t safi)
     }
 #endif /* HAVE_IPV6 */
 }
-
+
 /* Other routes redistribution into BGP. */
 int
 bgp_redistribute_set (struct bgp *bgp, afi_t afi, int type)
@@ -1069,7 +1069,7 @@ bgp_redistribute_metric_unset (struct bgp *bgp, afi_t afi, int type)
 
   return 1;
 }
-
+
 void
 bgp_zclient_reset (void)
 {

+ 37 - 37
bgpd/bgpd.c

@@ -61,7 +61,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #ifdef HAVE_SNMP
 #include "bgpd/bgp_snmp.h"
 #endif /* HAVE_SNMP */
-
+
 /* BGP process wide configuration.  */
 static struct bgp_master bgp_master;
 
@@ -72,7 +72,7 @@ struct bgp_master *bm;
 
 /* BGP community-list.  */
 struct community_list_handler *bgp_clist;
-
+
 /* BGP global flag manipulation.  */
 int
 bgp_option_set (int flag)
@@ -115,7 +115,7 @@ bgp_option_check (int flag)
 {
   return CHECK_FLAG (bm->options, flag);
 }
-
+
 /* BGP flag manipulation.  */
 int
 bgp_flag_set (struct bgp *bgp, int flag)
@@ -136,7 +136,7 @@ bgp_flag_check (struct bgp *bgp, int flag)
 {
   return CHECK_FLAG (bgp->flags, flag);
 }
-
+
 /* Internal function to set BGP structure configureation flag.  */
 static void
 bgp_config_set (struct bgp *bgp, int config)
@@ -155,7 +155,7 @@ bgp_config_check (struct bgp *bgp, int config)
 {
   return CHECK_FLAG (bgp->config, config);
 }
-
+
 /* Set BGP router identifier. */
 int
 bgp_router_id_set (struct bgp *bgp, struct in_addr *id)
@@ -242,7 +242,7 @@ bgp_cluster_id_unset (struct bgp *bgp)
     }
   return 0;
 }
-
+
 /* time_t value that is monotonicly increasing
  * and uneffected by adjustments to system clock
  */
@@ -273,7 +273,7 @@ bgp_timers_unset (struct bgp *bgp)
 
   return 0;
 }
-
+
 /* BGP confederation configuration.  */
 int
 bgp_confederation_id_set (struct bgp *bgp, as_t as)
@@ -485,7 +485,7 @@ bgp_confederation_peers_remove (struct bgp *bgp, as_t as)
 
   return 0;
 }
-
+
 /* Local preference configuration.  */
 int
 bgp_default_local_preference_set (struct bgp *bgp, u_int32_t local_pref)
@@ -508,7 +508,7 @@ bgp_default_local_preference_unset (struct bgp *bgp)
 
   return 0;
 }
-
+
 /* If peer is RSERVER_CLIENT in at least one address family and is not member
     of a peer_group for that family, return 1.
     Used to check wether the peer is included in list bgp->rsclient. */
@@ -1325,7 +1325,7 @@ peer_delete (struct peer *peer)
 
   return 0;
 }
-
+
 static int
 peer_group_cmp (struct peer_group *g1, struct peer_group *g2)
 {
@@ -1926,7 +1926,7 @@ peer_group_unbind (struct bgp *bgp, struct peer *peer,
 
   return 0;
 }
-
+
 /* BGP instance creation by `router bgp' commands. */
 static struct bgp *
 bgp_create (as_t *as, const char *name)
@@ -2181,7 +2181,7 @@ bgp_free (struct bgp *bgp)
       }
   XFREE (MTYPE_BGP, bgp);
 }
-
+
 struct peer *
 peer_lookup (struct bgp *bgp, union sockunion *su)
 {
@@ -2250,7 +2250,7 @@ peer_lookup_with_open (union sockunion *su, as_t remote_as,
     }
   return NULL;
 }
-
+
 /* If peer is configured at least one address family return 1. */
 int
 peer_active (struct peer *peer)
@@ -2276,7 +2276,7 @@ peer_active_nego (struct peer *peer)
     return 1;
   return 0;
 }
-
+
 /* peer_flag_change_type. */
 enum peer_change_type
 {
@@ -2695,7 +2695,7 @@ peer_af_flag_unset (struct peer *peer, afi_t afi, safi_t safi, u_int32_t flag)
 {
   return peer_af_flag_modify (peer, afi, safi, flag, 0);
 }
-
+
 /* EBGP multihop configuration. */
 int
 peer_ebgp_multihop_set (struct peer *peer, int ttl)
@@ -2794,7 +2794,7 @@ peer_ebgp_multihop_unset (struct peer *peer)
     }
   return 0;
 }
-
+
 /* Neighbor description. */
 int
 peer_description_set (struct peer *peer, char *desc)
@@ -2817,7 +2817,7 @@ peer_description_unset (struct peer *peer)
 
   return 0;
 }
-
+
 /* Neighbor update-source. */
 int
 peer_update_source_if_set (struct peer *peer, const char *ifname)
@@ -3037,7 +3037,7 @@ peer_update_source_unset (struct peer *peer)
     }
   return 0;
 }
-
+
 int
 peer_default_originate_set (struct peer *peer, afi_t afi, safi_t safi,
 			    const char *rmap)
@@ -3142,7 +3142,7 @@ peer_default_originate_unset (struct peer *peer, afi_t afi, safi_t safi)
     }
   return 0;
 }
-
+
 int
 peer_port_set (struct peer *peer, u_int16_t port)
 {
@@ -3156,7 +3156,7 @@ peer_port_unset (struct peer *peer)
   peer->port = BGP_PORT_DEFAULT;
   return 0;
 }
-
+
 /* neighbor weight. */
 int
 peer_weight_set (struct peer *peer, u_int16_t weight)
@@ -3204,7 +3204,7 @@ peer_weight_unset (struct peer *peer)
     }
   return 0;
 }
-
+
 int
 peer_timers_set (struct peer *peer, u_int32_t keepalive, u_int32_t holdtime)
 {
@@ -3274,7 +3274,7 @@ peer_timers_unset (struct peer *peer)
 
   return 0;