proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 07:21:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

*: nuke ^L (page feed)

Browse Source 
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>
This commit is contained in:
David Lamparter 2014-06-04 06:53:35 +02:00
parent fdb913aedb
commit 6b0655a251
115 changed files with 658 additions and 658 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
COPYING
View File

@ -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 The precise terms and conditions for copying, distribution and
modification follow. modification follow.
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 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 License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on does not normally print such an announcement, your work based on
the Program is not required to print an announcement.) the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program, identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in 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 access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not distribution of the source code, even though third parties are not
compelled to copy the source along with the object code. compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program 4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is 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 This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License. be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in 8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License 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. POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
Appendix: How to Apply These Terms to Your New Programs 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 If you develop a new program, and you want it to be of the greatest

18
COPYING.LIB
View File

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

84
NEWS
View File

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

10
bgpd/bgp_advertise.c
View File

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

12
bgpd/bgp_aspath.c
View File

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

10
bgpd/bgp_attr.c
View File

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

8
bgpd/bgp_clist.c
View File

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

4
bgpd/bgp_damp.c
View File

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

2
bgpd/bgp_debug.c
View File

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

8
bgpd/bgp_dump.c
View File

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

4
bgpd/bgp_ecommunity.c
View File

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

6
bgpd/bgp_filter.c
View File

@ -84,7 +84,7 @@ struct as_list
struct as_filter *head; struct as_filter *head;
struct as_filter *tail; struct as_filter *tail;
}; };
/* ip as-path access-list 10 permit AS1. */ /* ip as-path access-list 10 permit AS1. */
static struct as_list_master as_list_master = 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) if (as_list_master.delete_hook)
(*as_list_master.delete_hook) (); (*as_list_master.delete_hook) ();
} }
static int static int
as_filter_match (struct as_filter *asfilter, struct aspath *aspath) 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; as_list_master.delete_hook = func;
} }
static int static int
as_list_dup_check (struct as_list *aslist, struct as_filter *new) as_list_dup_check (struct as_list *aslist, struct as_filter *new)
{ {

4
bgpd/bgp_fsm.c
View File

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

4
bgpd/bgp_main.c
View File

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

2
bgpd/bgp_network.c
View File

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

12
bgpd/bgp_nexthop.c
View File

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

6
bgpd/bgp_packet.c
View File

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

68
bgpd/bgp_route.c
View File

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

68
bgpd/bgp_routemap.c
View File

@ -100,7 +100,7 @@ o Local extention
set as-path exclude : Done set as-path exclude : Done
*/ */
/* 'match peer (A.B.C.D|X:X::X:X)' */ /* 'match peer (A.B.C.D|X:X::X:X)' */
/* Compares the peer specified in the 'match peer' clause with the peer /* 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_compile,
route_match_ip_address_free route_match_ip_address_free
}; };
/* `match ip next-hop IP_ADDRESS' */ /* `match ip next-hop IP_ADDRESS' */
/* Match function return 1 if match is success else return zero. */ /* 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_compile,
route_match_ip_next_hop_free route_match_ip_next_hop_free
}; };
/* `match ip route-source ACCESS-LIST' */ /* `match ip route-source ACCESS-LIST' */
/* Match function return 1 if match is success else return zero. */ /* 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_compile,
route_match_ip_route_source_free route_match_ip_route_source_free
}; };
/* `match ip address prefix-list PREFIX_LIST' */ /* `match ip address prefix-list PREFIX_LIST' */
static route_map_result_t 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_compile,
route_match_ip_address_prefix_list_free route_match_ip_address_prefix_list_free
}; };
/* `match ip next-hop prefix-list PREFIX_LIST' */ /* `match ip next-hop prefix-list PREFIX_LIST' */
static route_map_result_t 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_compile,
route_match_ip_next_hop_prefix_list_free route_match_ip_next_hop_prefix_list_free
}; };
/* `match ip route-source prefix-list PREFIX_LIST' */ /* `match ip route-source prefix-list PREFIX_LIST' */
static route_map_result_t 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_compile,
route_match_ip_route_source_prefix_list_free route_match_ip_route_source_prefix_list_free
}; };
/* `match metric METRIC' */ /* `match metric METRIC' */
/* Match function return 1 if match is success else return zero. */ /* 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_compile,
route_match_metric_free route_match_metric_free
}; };
/* `match as-path ASPATH' */ /* `match as-path ASPATH' */
/* Match function for as-path match. I assume given object is */ /* 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_compile,
route_match_aspath_free route_match_aspath_free
}; };
/* `match community COMMUNIY' */ /* `match community COMMUNIY' */
struct rmap_community struct rmap_community
{ {
@ -687,7 +687,7 @@ struct route_map_rule_cmd route_match_community_cmd =
route_match_community_compile, route_match_community_compile,
route_match_community_free route_match_community_free
}; };
/* Match function for extcommunity match. */ /* Match function for extcommunity match. */
static route_map_result_t static route_map_result_t
route_match_ecommunity (void *rule, struct prefix *prefix, 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_compile,
route_match_ecommunity_free route_match_ecommunity_free
}; };
/* `match nlri` and `set nlri` are replaced by `address-family ipv4` /* `match nlri` and `set nlri` are replaced by `address-family ipv4`
and `address-family vpnv4'. */ and `address-family vpnv4'. */
/* `match origin' */ /* `match origin' */
static route_map_result_t static route_map_result_t
route_match_origin (void *rule, struct prefix *prefix, 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_compile,
route_set_ip_nexthop_free route_set_ip_nexthop_free
}; };
/* `set local-preference LOCAL_PREF' */ /* `set local-preference LOCAL_PREF' */
/* Set local preference. */ /* 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_compile,
route_set_local_pref_free, route_set_local_pref_free,
}; };
/* `set weight WEIGHT' */ /* `set weight WEIGHT' */
/* Set weight. */ /* Set weight. */
@ -1100,7 +1100,7 @@ struct route_map_rule_cmd route_set_weight_cmd =
route_set_weight_compile, route_set_weight_compile,
route_set_weight_free, route_set_weight_free,
}; };
/* `set metric METRIC' */ /* `set metric METRIC' */
/* Set metric to attribute. */ /* Set metric to attribute. */
@ -1200,7 +1200,7 @@ struct route_map_rule_cmd route_set_metric_cmd =
route_set_metric_compile, route_set_metric_compile,
route_set_metric_free, route_set_metric_free,
}; };
/* `set as-path prepend ASPATH' */ /* `set as-path prepend ASPATH' */
/* For AS path prepend mechanism. */ /* 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_compile,
route_set_aspath_prepend_free, route_set_aspath_prepend_free,
}; };
/* `set as-path exclude ASn' */ /* `set as-path exclude ASn' */
/* For ASN exclude mechanism. /* 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_compile,
route_set_aspath_exclude_free, route_set_aspath_exclude_free,
}; };
/* `set community COMMUNITY' */ /* `set community COMMUNITY' */
struct rmap_com_set struct rmap_com_set
{ {
@ -1438,7 +1438,7 @@ struct route_map_rule_cmd route_set_community_cmd =
route_set_community_compile, route_set_community_compile,
route_set_community_free, route_set_community_free,
}; };
/* `set comm-list (<1-99>|<100-500>|WORD) delete' */ /* `set comm-list (<1-99>|<100-500>|WORD) delete' */
/* For community set mechanism. */ /* 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_compile,
route_set_community_delete_free, route_set_community_delete_free,
}; };
/* `set extcommunity rt COMMUNITY' */ /* `set extcommunity rt COMMUNITY' */
/* For community set mechanism. */ /* 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_compile,
route_set_ecommunity_soo_free, route_set_ecommunity_soo_free,
}; };
/* `set origin ORIGIN' */ /* `set origin ORIGIN' */
/* For origin set. */ /* For origin set. */
@ -1713,7 +1713,7 @@ struct route_map_rule_cmd route_set_origin_cmd =
route_set_origin_compile, route_set_origin_compile,
route_set_origin_free, route_set_origin_free,
}; };
/* `set atomic-aggregate' */ /* `set atomic-aggregate' */
/* For atomic aggregate set. */ /* 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_compile,
route_set_atomic_aggregate_free, route_set_atomic_aggregate_free,
}; };
/* `set aggregator as AS A.B.C.D' */ /* `set aggregator as AS A.B.C.D' */
struct aggregator 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_compile,
route_set_aggregator_as_free, route_set_aggregator_as_free,
}; };
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
/* `match ipv6 address IP_ACCESS_LIST' */ /* `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_compile,
route_match_ipv6_address_free route_match_ipv6_address_free
}; };
/* `match ipv6 next-hop IP_ADDRESS' */ /* `match ipv6 next-hop IP_ADDRESS' */
static route_map_result_t 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_compile,
route_match_ipv6_next_hop_free route_match_ipv6_next_hop_free
}; };
/* `match ipv6 address prefix-list PREFIX_LIST' */ /* `match ipv6 address prefix-list PREFIX_LIST' */
static route_map_result_t 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_compile,
route_match_ipv6_address_prefix_list_free route_match_ipv6_address_prefix_list_free
}; };
/* `set ipv6 nexthop global IP_ADDRESS' */ /* `set ipv6 nexthop global IP_ADDRESS' */
/* Set nexthop to object. ojbect must be pointer to struct attr. */ /* 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_compile,
route_set_ipv6_nexthop_global_free route_set_ipv6_nexthop_global_free
}; };
/* `set ipv6 nexthop local IP_ADDRESS' */ /* `set ipv6 nexthop local IP_ADDRESS' */
/* Set nexthop to object. ojbect must be pointer to struct attr. */ /* 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 route_set_ipv6_nexthop_local_free
}; };
#endif /* HAVE_IPV6 */ #endif /* HAVE_IPV6 */
/* `set vpnv4 nexthop A.B.C.D' */ /* `set vpnv4 nexthop A.B.C.D' */
static route_map_result_t 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_compile,
route_set_vpnv4_nexthop_free route_set_vpnv4_nexthop_free
}; };
/* `set originator-id' */ /* `set originator-id' */
/* For origin set. */ /* 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_compile,
route_set_originator_id_free, route_set_originator_id_free,
}; };
/* Add bgp route map rule. */ /* Add bgp route map rule. */
static int static int
bgp_route_match_add (struct vty *vty, struct route_map_index *index, 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, DEFUN (match_peer,
match_peer_cmd, match_peer_cmd,
"match peer (A.B.C.D|X:X::X:X)", "match peer (A.B.C.D|X:X::X:X)",
@ -3562,7 +3562,7 @@ ALIAS (no_set_aggregator_as,
"AS number\n" "AS number\n"
"IP address of aggregator\n") "IP address of aggregator\n")
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
DEFUN (match_ipv6_address, DEFUN (match_ipv6_address,
match_ipv6_address_cmd, match_ipv6_address_cmd,
@ -3833,7 +3833,7 @@ ALIAS (no_match_pathlimit_as,
"BGP AS-Pathlimit attribute\n" "BGP AS-Pathlimit attribute\n"
"Match Pathlimit ASN\n") "Match Pathlimit ASN\n")
/* Initialization of route map. */ /* Initialization of route map. */
void void
bgp_route_map_init (void) bgp_route_map_init (void)

8
bgpd/bgp_snmp.c
View File

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

168
bgpd/bgp_vty.c
View File

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

8
bgpd/bgp_zebra.c
View File

@ -38,7 +38,7 @@ Boston, MA 02111-1307, USA. */
#include "bgpd/bgp_fsm.h" #include "bgpd/bgp_fsm.h"
#include "bgpd/bgp_debug.h" #include "bgpd/bgp_debug.h"
#include "bgpd/bgp_mpath.h" #include "bgpd/bgp_mpath.h"
/* All information about zebra. */ /* All information about zebra. */
struct zclient *zclient = NULL; struct zclient *zclient = NULL;
struct in_addr router_id_zebra; struct in_addr router_id_zebra;
@ -381,7 +381,7 @@ zebra_read_ipv6 (int command, struct zclient *zclient, zebra_size_t length)
return 0; return 0;
} }
#endif /* HAVE_IPV6 */ #endif /* HAVE_IPV6 */
struct interface * struct interface *
if_lookup_by_ipv4 (struct in_addr *addr) 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 */ #endif /* HAVE_IPV6 */
} }
/* Other routes redistribution into BGP. */ /* Other routes redistribution into BGP. */
int int
bgp_redistribute_set (struct bgp *bgp, afi_t afi, int type) 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; return 1;
} }
void void
bgp_zclient_reset (void) bgp_zclient_reset (void)
{ {

74
bgpd/bgpd.c
View File

@ -61,7 +61,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#ifdef HAVE_SNMP #ifdef HAVE_SNMP
#include "bgpd/bgp_snmp.h" #include "bgpd/bgp_snmp.h"
#endif /* HAVE_SNMP */ #endif /* HAVE_SNMP */
/* BGP process wide configuration. */ /* BGP process wide configuration. */
static struct bgp_master bgp_master; static struct bgp_master bgp_master;
@ -72,7 +72,7 @@ struct bgp_master *bm;
/* BGP community-list. */ /* BGP community-list. */
struct community_list_handler *bgp_clist; struct community_list_handler *bgp_clist;
/* BGP global flag manipulation. */ /* BGP global flag manipulation. */
int int
bgp_option_set (int flag) bgp_option_set (int flag)
@ -115,7 +115,7 @@ bgp_option_check (int flag)
{ {
return CHECK_FLAG (bm->options, flag); return CHECK_FLAG (bm->options, flag);
} }
/* BGP flag manipulation. */ /* BGP flag manipulation. */
int int
bgp_flag_set (struct bgp *bgp, int flag) 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); return CHECK_FLAG (bgp->flags, flag);
} }
/* Internal function to set BGP structure configureation flag. */ /* Internal function to set BGP structure configureation flag. */
static void static void
bgp_config_set (struct bgp *bgp, int config) 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); return CHECK_FLAG (bgp->config, config);
} }
/* Set BGP router identifier. */ /* Set BGP router identifier. */
int int
bgp_router_id_set (struct bgp *bgp, struct in_addr *id) bgp_router_id_set (struct bgp *bgp, struct in_addr *id)
@ -242,7 +242,7 @@ bgp_cluster_id_unset (struct bgp *bgp)
} }
return 0; return 0;
} }
/* time_t value that is monotonicly increasing /* time_t value that is monotonicly increasing
* and uneffected by adjustments to system clock * and uneffected by adjustments to system clock
*/ */
@ -273,7 +273,7 @@ bgp_timers_unset (struct bgp *bgp)
return 0; return 0;
} }
/* BGP confederation configuration. */ /* BGP confederation configuration. */
int int
bgp_confederation_id_set (struct bgp *bgp, as_t as) 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; return 0;
} }
/* Local preference configuration. */ /* Local preference configuration. */
int int
bgp_default_local_preference_set (struct bgp *bgp, u_int32_t local_pref) 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; return 0;
} }
/* If peer is RSERVER_CLIENT in at least one address family and is not member /* If peer is RSERVER_CLIENT in at least one address family and is not member
of a peer_group for that family, return 1. of a peer_group for that family, return 1.
Used to check wether the peer is included in list bgp->rsclient. */ Used to check wether the peer is included in list bgp->rsclient. */
@ -1325,7 +1325,7 @@ peer_delete (struct peer *peer)
return 0; return 0;
} }
static int static int
peer_group_cmp (struct peer_group *g1, struct peer_group *g2) 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; return 0;
} }
/* BGP instance creation by `router bgp' commands. */ /* BGP instance creation by `router bgp' commands. */
static struct bgp * static struct bgp *
bgp_create (as_t *as, const char *name) bgp_create (as_t *as, const char *name)
@ -2181,7 +2181,7 @@ bgp_free (struct bgp *bgp)
} }
XFREE (MTYPE_BGP, bgp); XFREE (MTYPE_BGP, bgp);
} }
struct peer * struct peer *
peer_lookup (struct bgp *bgp, union sockunion *su) 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; return NULL;
} }
/* If peer is configured at least one address family return 1. */ /* If peer is configured at least one address family return 1. */
int int
peer_active (struct peer *peer) peer_active (struct peer *peer)
@ -2276,7 +2276,7 @@ peer_active_nego (struct peer *peer)
return 1; return 1;
return 0; return 0;
} }
/* peer_flag_change_type. */ /* peer_flag_change_type. */
enum peer_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); return peer_af_flag_modify (peer, afi, safi, flag, 0);
} }
/* EBGP multihop configuration. */ /* EBGP multihop configuration. */
int int
peer_ebgp_multihop_set (struct peer *peer, int ttl) peer_ebgp_multihop_set (struct peer *peer, int ttl)
@ -2794,7 +2794,7 @@ peer_ebgp_multihop_unset (struct peer *peer)
} }
return 0; return 0;
} }
/* Neighbor description. */ /* Neighbor description. */
int int
peer_description_set (struct peer *peer, char *desc) peer_description_set (struct peer *peer, char *desc)
@ -2817,7 +2817,7 @@ peer_description_unset (struct peer *peer)
return 0; return 0;
} }
/* Neighbor update-source. */ /* Neighbor update-source. */
int int
peer_update_source_if_set (struct peer *peer, const char *ifname) peer_update_source_if_set (struct peer *peer, const char *ifname)
@ -3037,7 +3037,7 @@ peer_update_source_unset (struct peer *peer)
} }
return 0; return 0;
} }
int int
peer_default_originate_set (struct peer *peer, afi_t afi, safi_t safi, peer_default_originate_set (struct peer *peer, afi_t afi, safi_t safi,
const char *rmap) const char *rmap)
@ -3142,7 +3142,7 @@ peer_default_originate_unset (struct peer *peer, afi_t afi, safi_t safi)
} }
return 0; return 0;
} }
int int
peer_port_set (struct peer *peer, u_int16_t port) 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; peer->port = BGP_PORT_DEFAULT;
return 0; return 0;
} }
/* neighbor weight. */ /* neighbor weight. */
int int
peer_weight_set (struct peer *peer, u_int16_t weight) peer_weight_set (struct peer *peer, u_int16_t weight)
@ -3204,7 +3204,7 @@ peer_weight_unset (struct peer *peer)
} }
return 0; return 0;
} }
int int
peer_timers_set (struct peer *peer, u_int32_t keepalive, u_int32_t holdtime) 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; return 0;
} }
int int
peer_timers_connect_set (struct peer *peer, u_int32_t connect) peer_timers_connect_set (struct peer *peer, u_int32_t connect)
{ {
@ -3309,7 +3309,7 @@ peer_timers_connect_unset (struct peer *peer)
return 0; return 0;
} }
int int
peer_advertise_interval_set (struct peer *peer, u_int32_t routeadv) peer_advertise_interval_set (struct peer *peer, u_int32_t routeadv)
{ {
@ -3342,7 +3342,7 @@ peer_advertise_interval_unset (struct peer *peer)
return 0; return 0;
} }
/* neighbor interface */ /* neighbor interface */
int int
peer_interface_set (struct peer *peer, const char *str) peer_interface_set (struct peer *peer, const char *str)
@ -3363,7 +3363,7 @@ peer_interface_unset (struct peer *peer)
return 0; return 0;
} }
/* Allow-as in. */ /* Allow-as in. */
int int
peer_allowas_in_set (struct peer *peer, afi_t afi, safi_t safi, int allow_num) peer_allowas_in_set (struct peer *peer, afi_t afi, safi_t safi, int allow_num)
@ -3424,7 +3424,7 @@ peer_allowas_in_unset (struct peer *peer, afi_t afi, safi_t safi)
} }
return 0; return 0;
} }
int int
peer_local_as_set (struct peer *peer, as_t as, int no_prepend, int replace_as) peer_local_as_set (struct peer *peer, as_t as, int no_prepend, int replace_as)
{ {
@ -3552,7 +3552,7 @@ peer_local_as_unset (struct peer *peer)
} }
return 0; return 0;
} }
/* Set password for authenticating with the peer. */ /* Set password for authenticating with the peer. */
int int
peer_password_set (struct peer *peer, const char *password) peer_password_set (struct peer *peer, const char *password)
@ -3657,7 +3657,7 @@ peer_password_unset (struct peer *peer)
return 0; return 0;
} }
/* Set distribute list to the peer. */ /* Set distribute list to the peer. */
int int
peer_distribute_set (struct peer *peer, afi_t afi, safi_t safi, int direct, peer_distribute_set (struct peer *peer, afi_t afi, safi_t safi, int direct,
@ -3817,7 +3817,7 @@ peer_distribute_update (struct access_list *access)
} }
} }
} }
/* Set prefix list to the peer. */ /* Set prefix list to the peer. */
int int
peer_prefix_list_set (struct peer *peer, afi_t afi, safi_t safi, int direct, peer_prefix_list_set (struct peer *peer, afi_t afi, safi_t safi, int direct,
@ -3976,7 +3976,7 @@ peer_prefix_list_update (struct prefix_list *plist)
} }
} }
} }
int int
peer_aslist_set (struct peer *peer, afi_t afi, safi_t safi, int direct, peer_aslist_set (struct peer *peer, afi_t afi, safi_t safi, int direct,
const char *name) const char *name)
@ -4130,7 +4130,7 @@ peer_aslist_update (void)
} }
} }
} }
/* Set route-map to the peer. */ /* Set route-map to the peer. */
int int
peer_route_map_set (struct peer *peer, afi_t afi, safi_t safi, int direct, peer_route_map_set (struct peer *peer, afi_t afi, safi_t safi, int direct,
@ -4238,7 +4238,7 @@ peer_route_map_unset (struct peer *peer, afi_t afi, safi_t safi, int direct)
} }
return 0; return 0;
} }
/* Set unsuppress-map to the peer. */ /* Set unsuppress-map to the peer. */
int int
peer_unsuppress_map_set (struct peer *peer, afi_t afi, safi_t safi, peer_unsuppress_map_set (struct peer *peer, afi_t afi, safi_t safi,
@ -4320,7 +4320,7 @@ peer_unsuppress_map_unset (struct peer *peer, afi_t afi, safi_t safi)
} }
return 0; return 0;
} }
int int
peer_maximum_prefix_set (struct peer *peer, afi_t afi, safi_t safi, peer_maximum_prefix_set (struct peer *peer, afi_t afi, safi_t safi,
u_int32_t max, u_char threshold, u_int32_t max, u_char threshold,
@ -4547,7 +4547,7 @@ peer_ttl_security_hops_unset (struct peer *peer)
return peer_ebgp_multihop_unset (opeer); return peer_ebgp_multihop_unset (opeer);
} }
int int
peer_clear (struct peer *peer) peer_clear (struct peer *peer)
{ {
@ -4652,7 +4652,7 @@ peer_clear_soft (struct peer *peer, afi_t afi, safi_t safi,
} }
return 0; return 0;
} }
/* Display peer uptime.*/ /* Display peer uptime.*/
/* XXX: why does this function return char * when it takes buffer? */ /* XXX: why does this function return char * when it takes buffer? */
char * char *
@ -4697,7 +4697,7 @@ peer_uptime (time_t uptime2, char *buf, size_t len)
tm->tm_yday/7, tm->tm_yday - ((tm->tm_yday/7) * 7), tm->tm_hour); tm->tm_yday/7, tm->tm_yday - ((tm->tm_yday/7) * 7), tm->tm_hour);
return buf; return buf;
} }
static void static void
bgp_config_write_filter (struct vty *vty, struct peer *peer, bgp_config_write_filter (struct vty *vty, struct peer *peer,
afi_t afi, safi_t safi) afi_t afi, safi_t safi)
@ -5394,7 +5394,7 @@ bgp_master_init (void)
bm->start_time = bgp_clock (); bm->start_time = bgp_clock ();
} }
void void
bgp_init (void) bgp_init (void)
{ {

2
bgpd/bgpd.h
View File

@ -854,7 +854,7 @@ extern struct peer *peer_create_accept (struct bgp *);
extern char *peer_uptime (time_t, char *, size_t); extern char *peer_uptime (time_t, char *, size_t);
extern int bgp_config_write (struct vty *); extern int bgp_config_write (struct vty *);
extern void bgp_config_write_family_header (struct vty *, afi_t, safi_t, int *); extern void bgp_config_write_family_header (struct vty *, afi_t, safi_t, int *);
extern void bgp_master_init (void); extern void bgp_master_init (void);
extern void bgp_init (void); extern void bgp_init (void);

8
doc/mpls/opaque_lsa.txt
View File

@ -20,7 +20,7 @@
| (Callback functions) | | (Callback functions) |
+----------------------+ +----------------------+
2. Self-originated Opaque-LSAs per LSA-type. 2. Self-originated Opaque-LSAs per LSA-type.
2.1 Type-11 (AS-external) Opaque-LSAs 2.1 Type-11 (AS-external) Opaque-LSAs
@ -110,7 +110,7 @@
: | +-------------+ : : | +-------------+ :
: --- : : --- :
:..........................................................................: :..........................................................................:
2.2 Type-10 (area-local) Opaque-LSAs 2.2 Type-10 (area-local) Opaque-LSAs
struct struct
@ -204,7 +204,7 @@
: | +-------------+ : : | +-------------+ :
: --- : : --- :
:..........................................................................: :..........................................................................:
2.3 Type-9 (link-local) Opaque-LSAs 2.3 Type-9 (link-local) Opaque-LSAs
struct struct
@ -300,7 +300,7 @@
: +-------------+ : : +-------------+ :
:..........................................................................: :..........................................................................:
3. Internal structures for MPLS-TE parameter management. 3. Internal structures for MPLS-TE parameter management.
struct struct

2
lib/command.c
View File

@ -183,7 +183,7 @@ print_version (const char *progname)
printf ("%s\n", QUAGGA_COPYRIGHT); printf ("%s\n", QUAGGA_COPYRIGHT);
} }
/* Utility function to concatenate argv argument into a single string /* Utility function to concatenate argv argument into a single string
with inserting ' ' character between each argument. */ with inserting ' ' character between each argument. */
char * char *

4
lib/distribute.c
View File

@ -34,7 +34,7 @@ struct hash *disthash;
/* Hook functions. */ /* Hook functions. */
void (*distribute_add_hook) (struct distribute *); void (*distribute_add_hook) (struct distribute *);
void (*distribute_delete_hook) (struct distribute *); void (*distribute_delete_hook) (struct distribute *);
static struct distribute * static struct distribute *
distribute_new (void) distribute_new (void)
{ {
@ -133,7 +133,7 @@ distribute_cmp (const struct distribute *dist1, const struct distribute *dist2)
return 1; return 1;
return 0; return 0;
} }
/* Set access-list name to the distribute list. */ /* Set access-list name to the distribute list. */
static struct distribute * static struct distribute *
distribute_list_set (const char *ifname, enum distribute_type type, distribute_list_set (const char *ifname, enum distribute_type type,

6
lib/filter.c
View File

@ -110,7 +110,7 @@ static struct access_master access_master_ipv6 =
NULL, NULL,
}; };
#endif /* HAVE_IPV6 */ #endif /* HAVE_IPV6 */
static struct access_master * static struct access_master *
access_master_get (afi_t afi) access_master_get (afi_t afi)
{ {
@ -208,7 +208,7 @@ filter_match_zebra (struct filter *mfilter, struct prefix *p)
else else
return 0; return 0;
} }
/* Allocate new access list structure. */ /* Allocate new access list structure. */
static struct access_list * static struct access_list *
access_list_new (void) access_list_new (void)
@ -501,7 +501,7 @@ access_list_filter_delete (struct access_list *access, struct filter *filter)
if (master->delete_hook) if (master->delete_hook)
(*master->delete_hook) (access); (*master->delete_hook) (access);
} }
/* /*
deny Specify packets to reject deny Specify packets to reject
permit Specify packets to forward permit Specify packets to forward

10
lib/getopt.c
View File

@ -23,7 +23,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. */ USA. */
/* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>.
Ditto for AIX 3.2 and <stdlib.h>. */ Ditto for AIX 3.2 and <stdlib.h>. */
#ifndef _NO_PROTO #ifndef _NO_PROTO
@ -193,7 +193,7 @@ static enum
/* Value of POSIXLY_CORRECT environment variable. */ /* Value of POSIXLY_CORRECT environment variable. */
static char *posixly_correct; static char *posixly_correct;
#ifdef __GNU_LIBRARY__ #ifdef __GNU_LIBRARY__
/* We want to avoid inclusion of string.h with non-GNU libraries /* We want to avoid inclusion of string.h with non-GNU libraries
because there are many ways it can cause trouble. because there are many ways it can cause trouble.
@ -243,7 +243,7 @@ extern int strlen (const char *);
#endif /* __GNUC__ */ #endif /* __GNUC__ */
#endif /* not __GNU_LIBRARY__ */ #endif /* not __GNU_LIBRARY__ */
/* Handle permutation of arguments. */ /* Handle permutation of arguments. */
/* Describe the part of ARGV that contains non-options that have /* Describe the part of ARGV that contains non-options that have
@ -456,7 +456,7 @@ _getopt_initialize (argc, argv, optstring)
return optstring; return optstring;
} }
/* Scan elements of ARGV (whose length is ARGC) for option characters /* Scan elements of ARGV (whose length is ARGC) for option characters
given in OPTSTRING. given in OPTSTRING.
@ -986,7 +986,7 @@ getopt (argc, argv, optstring)
#endif /* REALLY_NEED_PLAIN_GETOPT */ #endif /* REALLY_NEED_PLAIN_GETOPT */
#endif /* Not ELIDE_CODE. */ #endif /* Not ELIDE_CODE. */
#ifdef TEST #ifdef TEST
/* Compile with -DTEST to make an executable for use in testing /* Compile with -DTEST to make an executable for use in testing

4
lib/getopt1.c
View File

@ -19,7 +19,7 @@
along with this program; if not, write to the Free Software along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. */ USA. */
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif #endif
@ -95,7 +95,7 @@ getopt_long_only (argc, argv, options, long_options, opt_index)
#endif /* Not ELIDE_CODE. */ #endif /* Not ELIDE_CODE. */
#ifdef TEST #ifdef TEST
#include <stdio.h> #include <stdio.h>

10
lib/if.c
View File

@ -35,7 +35,7 @@
#include "buffer.h" #include "buffer.h"
#include "str.h" #include "str.h"
#include "log.h" #include "log.h"
/* Master list of interfaces. */ /* Master list of interfaces. */
struct list *iflist; struct list *iflist;
@ -45,7 +45,7 @@ struct if_master
int (*if_new_hook) (struct interface *); int (*if_new_hook) (struct interface *);
int (*if_delete_hook) (struct interface *); int (*if_delete_hook) (struct interface *);
} if_master; } if_master;
/* Compare interface names, returning an integer greater than, equal to, or /* Compare interface names, returning an integer greater than, equal to, or
* less than 0, (following the strcmp convention), according to the * less than 0, (following the strcmp convention), according to the
* relationship between ifp1 and ifp2. Interface names consist of an * relationship between ifp1 and ifp2. Interface names consist of an
@ -513,7 +513,7 @@ DEFUN (no_interface_desc,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
#ifdef SUNOS_5 #ifdef SUNOS_5
/* Need to handle upgrade from SUNWzebra to Quagga. SUNWzebra created /* Need to handle upgrade from SUNWzebra to Quagga. SUNWzebra created
* a seperate struct interface for each logical interface, so config * a seperate struct interface for each logical interface, so config
@ -555,7 +555,7 @@ if_sunwzebra_get (const char *name, size_t nlen)
return if_get_by_name_len (name, nlen); return if_get_by_name_len (name, nlen);
} }
#endif /* SUNOS_5 */ #endif /* SUNOS_5 */
DEFUN (interface, DEFUN (interface,
interface_cmd, interface_cmd,
"interface IFNAME", "interface IFNAME",
@ -806,7 +806,7 @@ if_indextoname (unsigned int ifindex, char *name)
return ifp->name; return ifp->name;
} }
#endif #endif
#if 0 /* this route_table of struct connected's is unused #if 0 /* this route_table of struct connected's is unused
* however, it would be good to use a route_table rather than * however, it would be good to use a route_table rather than
* a list.. * a list..

6
lib/if_rmap.c
View File

@ -32,7 +32,7 @@ struct hash *ifrmaphash;
/* Hook functions. */ /* Hook functions. */
static void (*if_rmap_add_hook) (struct if_rmap *) = NULL; static void (*if_rmap_add_hook) (struct if_rmap *) = NULL;
static void (*if_rmap_delete_hook) (struct if_rmap *) = NULL; static void (*if_rmap_delete_hook) (struct if_rmap *) = NULL;
static struct if_rmap * static struct if_rmap *
if_rmap_new (void) if_rmap_new (void)
{ {
@ -122,7 +122,7 @@ if_rmap_hash_cmp (const void *arg1, const void* arg2)
return strcmp (if_rmap1->ifname, if_rmap2->ifname) == 0; return strcmp (if_rmap1->ifname, if_rmap2->ifname) == 0;
} }
static struct if_rmap * static struct if_rmap *
if_rmap_set (const char *ifname, enum if_rmap_type type, if_rmap_set (const char *ifname, enum if_rmap_type type,
const char *routemap_name) const char *routemap_name)
@ -273,7 +273,7 @@ ALIAS (no_if_rmap,
"Route map for input filtering\n" "Route map for input filtering\n"
"Route map for output filtering\n" "Route map for output filtering\n"
"Route map interface name\n") "Route map interface name\n")
/* Configuration write function. */ /* Configuration write function. */
int int
config_write_if_rmap (struct vty *vty) config_write_if_rmap (struct vty *vty)

8
lib/keychain.c
View File

@ -226,7 +226,7 @@ key_delete (struct keychain *keychain, struct key *key)
free (key->string); free (key->string);
key_free (key); key_free (key);
} }
DEFUN (key_chain, DEFUN (key_chain,
key_chain_cmd, key_chain_cmd,
"key chain WORD", "key chain WORD",
@ -531,7 +531,7 @@ key_lifetime_infinite_set (struct vty *vty, struct key_range *krange,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (accept_lifetime_day_month_day_month, DEFUN (accept_lifetime_day_month_day_month,
accept_lifetime_day_month_day_month_cmd, accept_lifetime_day_month_day_month_cmd,
"accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", "accept-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>",
@ -689,7 +689,7 @@ DEFUN (accept_lifetime_duration_month_day,
return key_lifetime_duration_set (vty, &key->accept, argv[0], argv[2], return key_lifetime_duration_set (vty, &key->accept, argv[0], argv[2],
argv[1], argv[3], argv[4]); argv[1], argv[3], argv[4]);
} }
DEFUN (send_lifetime_day_month_day_month, DEFUN (send_lifetime_day_month_day_month,
send_lifetime_day_month_day_month_cmd, send_lifetime_day_month_day_month_cmd,
"send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>", "send-lifetime HH:MM:SS <1-31> MONTH <1993-2035> HH:MM:SS <1-31> MONTH <1993-2035>",
@ -847,7 +847,7 @@ DEFUN (send_lifetime_duration_month_day,
return key_lifetime_duration_set (vty, &key->send, argv[0], argv[2], argv[1], return key_lifetime_duration_set (vty, &key->send, argv[0], argv[2], argv[1],
argv[3], argv[4]); argv[3], argv[4]);
} }
static struct cmd_node keychain_node = static struct cmd_node keychain_node =
{ {
KEYCHAIN_NODE, KEYCHAIN_NODE,

8
lib/linklist.c
View File

@ -23,7 +23,7 @@
#include "linklist.h" #include "linklist.h"
#include "memory.h" #include "memory.h"
/* Allocate new list. */ /* Allocate new list. */
struct list * struct list *
list_new (void) list_new (void)
@ -51,7 +51,7 @@ listnode_free (struct listnode *node)
{ {
XFREE (MTYPE_LINK_NODE, node); XFREE (MTYPE_LINK_NODE, node);
} }
/* Add new data to the list. */ /* Add new data to the list. */
void void
listnode_add (struct list *list, void *val) listnode_add (struct list *list, void *val)
@ -242,7 +242,7 @@ listnode_lookup (struct list *list, void *data)
return node; return node;
return NULL; return NULL;
} }
/* Delete the node from list. For ospfd and ospf6d. */ /* Delete the node from list. For ospfd and ospf6d. */
void void
list_delete_node (struct list *list, struct listnode *node) list_delete_node (struct list *list, struct listnode *node)
@ -258,7 +258,7 @@ list_delete_node (struct list *list, struct listnode *node)
list->count--; list->count--;
listnode_free (node); listnode_free (node);
} }
/* ospf_spf.c */ /* ospf_spf.c */
void void
list_add_node_prev (struct list *list, struct listnode *current, void *val) list_add_node_prev (struct list *list, struct listnode *current, void *val)

8
lib/log.c
View File

@ -69,7 +69,7 @@ const char *zlog_priority[] =
}; };
/* For time string format. */ /* For time string format. */
size_t size_t
@ -145,7 +145,7 @@ time_print(FILE *fp, struct timestamp_control *ctl)
fprintf(fp, "%s ", ctl->buf); fprintf(fp, "%s ", ctl->buf);
} }
/* va_list version of zlog. */ /* va_list version of zlog. */
static void static void
vzlog (struct zlog *zl, int priority, const char *format, va_list args) vzlog (struct zlog *zl, int priority, const char *format, va_list args)
@ -619,7 +619,7 @@ _zlog_assert_failed (const char *assertion, const char *file,
abort(); abort();
} }
/* Open log stream */ /* Open log stream */
struct zlog * struct zlog *
openzlog (const char *progname, zlog_proto_t protocol, openzlog (const char *progname, zlog_proto_t protocol,
@ -756,7 +756,7 @@ zlog_rotate (struct zlog *zl)
return 1; return 1;
} }
/* Message lookup function. */ /* Message lookup function. */
const char * const char *
lookup (const struct message *mes, int key) lookup (const struct message *mes, int key)

10
lib/memory.c
View File

@ -32,7 +32,7 @@
static void alloc_inc (int); static void alloc_inc (int);
static void alloc_dec (int); static void alloc_dec (int);
static void log_memstats(int log_priority); static void log_memstats(int log_priority);
static const struct message mstr [] = static const struct message mstr [] =
{ {
{ MTYPE_THREAD, "thread" }, { MTYPE_THREAD, "thread" },
@ -42,7 +42,7 @@ static const struct message mstr [] =
{ MTYPE_IF, "interface" }, { MTYPE_IF, "interface" },
{ 0, NULL }, { 0, NULL },
}; };
/* Fatal memory allocation error occured. */ /* Fatal memory allocation error occured. */
static void __attribute__ ((noreturn)) static void __attribute__ ((noreturn))
zerror (const char *fname, int type, size_t size) zerror (const char *fname, int type, size_t size)
@ -150,7 +150,7 @@ zstrdup (int type, const char *str)
alloc_inc (type); alloc_inc (type);
return dup; return dup;
} }
#ifdef MEMORY_LOG #ifdef MEMORY_LOG
static struct static struct
{ {
@ -259,7 +259,7 @@ alloc_dec (int type)
{ {
mstat[type].alloc--; mstat[type].alloc--;
} }
/* Looking up memory status from vty interface. */ /* Looking up memory status from vty interface. */
#include "vector.h" #include "vector.h"
#include "vty.h" #include "vty.h"
@ -558,7 +558,7 @@ memory_init (void)
install_element (ENABLE_NODE, &show_memory_ospf6_cmd); install_element (ENABLE_NODE, &show_memory_ospf6_cmd);
install_element (ENABLE_NODE, &show_memory_isis_cmd); install_element (ENABLE_NODE, &show_memory_isis_cmd);
} }
/* Stats querying from users */ /* Stats querying from users */
/* Return a pointer to a human friendly string describing /* Return a pointer to a human friendly string describing
* the byte count passed in. E.g: * the byte count passed in. E.g:

10
lib/plist.c
View File

@ -110,7 +110,7 @@ static struct prefix_master prefix_master_orf =
NULL, NULL,
NULL, NULL,
}; };
static struct prefix_master * static struct prefix_master *
prefix_master_get (afi_t afi) prefix_master_get (afi_t afi)
{ {
@ -621,7 +621,7 @@ prefix_list_print (struct prefix_list *plist)
} }
} }
} }
/* Retrun 1 when plist already include pentry policy. */ /* Retrun 1 when plist already include pentry policy. */
static struct prefix_list_entry * static struct prefix_list_entry *
prefix_entry_dup_check (struct prefix_list *plist, prefix_entry_dup_check (struct prefix_list *plist,
@ -1165,7 +1165,7 @@ vty_clear_prefix_list (struct vty *vty, afi_t afi, const char *name,
} }
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (ip_prefix_list, DEFUN (ip_prefix_list,
ip_prefix_list_cmd, ip_prefix_list_cmd,
"ip prefix-list WORD (deny|permit) (A.B.C.D/M|any)", "ip prefix-list WORD (deny|permit) (A.B.C.D/M|any)",
@ -1759,7 +1759,7 @@ DEFUN (clear_ip_prefix_list_name_prefix,
{ {
return vty_clear_prefix_list (vty, AFI_IP, argv[0], argv[1]); return vty_clear_prefix_list (vty, AFI_IP, argv[0], argv[1]);
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
DEFUN (ipv6_prefix_list, DEFUN (ipv6_prefix_list,
ipv6_prefix_list_cmd, ipv6_prefix_list_cmd,
@ -2355,7 +2355,7 @@ DEFUN (clear_ipv6_prefix_list_name_prefix,
return vty_clear_prefix_list (vty, AFI_IP6, argv[0], argv[1]); return vty_clear_prefix_list (vty, AFI_IP6, argv[0], argv[1]);
} }
#endif /* HAVE_IPV6 */ #endif /* HAVE_IPV6 */
/* Configuration write function. */ /* Configuration write function. */
static int static int
config_write_prefix_afi (afi_t afi, struct vty *vty) config_write_prefix_afi (afi_t afi, struct vty *vty)

6
lib/prefix.c
View File

@ -27,7 +27,7 @@
#include "sockunion.h" #include "sockunion.h"
#include "memory.h" #include "memory.h"
#include "log.h" #include "log.h"
/* Maskbit. */ /* Maskbit. */
static const u_char maskbit[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0, static const u_char maskbit[] = {0x00, 0x80, 0xc0, 0xe0, 0xf0,
0xf8, 0xfc, 0xfe, 0xff}; 0xf8, 0xfc, 0xfe, 0xff};
@ -186,7 +186,7 @@ prefix6_bit (const struct in6_addr *prefix, const u_char prefixlen)
{ {
return prefix_bit((const u_char *) &prefix->s6_addr, prefixlen); return prefix_bit((const u_char *) &prefix->s6_addr, prefixlen);
} }
/* Address Famiy Identifier to Address Family converter. */ /* Address Famiy Identifier to Address Family converter. */
int int
afi2family (afi_t afi) afi2family (afi_t afi)
@ -494,7 +494,7 @@ prefix_ipv4_any (const struct prefix_ipv4 *p)
{ {
return (p->prefix.s_addr == 0 && p->prefixlen == 0); return (p->prefix.s_addr == 0 && p->prefixlen == 0);
} }
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
/* Allocate a new ip version 6 route */ /* Allocate a new ip version 6 route */

10
lib/privs.c
View File

@ -47,7 +47,7 @@ struct _pset {
typedef cap_value_t pvalue_t; typedef cap_value_t pvalue_t;
typedef struct _pset pset_t; typedef struct _pset pset_t;
typedef cap_t pstorage_t; typedef cap_t pstorage_t;
#elif defined (HAVE_SOLARIS_CAPABILITIES) #elif defined (HAVE_SOLARIS_CAPABILITIES)
typedef priv_t pvalue_t; typedef priv_t pvalue_t;
typedef priv_set_t pset_t; typedef priv_set_t pset_t;
@ -56,7 +56,7 @@ typedef priv_set_t *pstorage_t;
#error "HAVE_CAPABILITIES defined, but neither LCAPS nor Solaris Capabilties!" #error "HAVE_CAPABILITIES defined, but neither LCAPS nor Solaris Capabilties!"
#endif /* HAVE_LCAPS */ #endif /* HAVE_LCAPS */
#endif /* HAVE_CAPABILITIES */ #endif /* HAVE_CAPABILITIES */
/* the default NULL state we report is RAISED, but could be LOWERED if /* the default NULL state we report is RAISED, but could be LOWERED if
* zprivs_terminate is called and the NULL handler is installed. * zprivs_terminate is called and the NULL handler is installed.
*/ */
@ -139,7 +139,7 @@ static struct
[ZCAP_FOWNER] = { 1, (pvalue_t []) { PRIV_FILE_OWNER }, }, [ZCAP_FOWNER] = { 1, (pvalue_t []) { PRIV_FILE_OWNER }, },
#endif /* HAVE_SOLARIS_CAPABILITIES */ #endif /* HAVE_SOLARIS_CAPABILITIES */
}; };
#ifdef HAVE_LCAPS #ifdef HAVE_LCAPS
/* Linux forms of capabilities methods */ /* Linux forms of capabilities methods */
/* convert zebras privileges to system capabilities */ /* convert zebras privileges to system capabilities */
@ -339,7 +339,7 @@ zprivs_caps_terminate (void)
cap_free (zprivs_state.caps); cap_free (zprivs_state.caps);
} }
#elif defined (HAVE_SOLARIS_CAPABILITIES) /* !HAVE_LCAPS */ #elif defined (HAVE_SOLARIS_CAPABILITIES) /* !HAVE_LCAPS */
/* Solaris specific capability/privilege methods /* Solaris specific capability/privilege methods
* *
* Resources: * Resources:
@ -556,7 +556,7 @@ zprivs_caps_terminate (void)
#error "Neither Solaris nor Linux capabilities, dazed and confused..." #error "Neither Solaris nor Linux capabilities, dazed and confused..."
#endif /* HAVE_LCAPS */ #endif /* HAVE_LCAPS */
#endif /* HAVE_CAPABILITIES */ #endif /* HAVE_CAPABILITIES */
int int
zprivs_change_uid (zebra_privs_ops_t op) zprivs_change_uid (zebra_privs_ops_t op)
{ {

12
lib/regex-gnu.h
View File

@ -165,7 +165,7 @@ typedef unsigned long int reg_syntax_t;
stored in the pattern buffer, so changing this does not affect stored in the pattern buffer, so changing this does not affect
already-compiled regexps. */ already-compiled regexps. */
extern reg_syntax_t re_syntax_options; extern reg_syntax_t re_syntax_options;
/* Define combinations of the above bits for the standard possibilities. /* Define combinations of the above bits for the standard possibilities.
(The [[[ comments delimit what gets put into the Texinfo file, so (The [[[ comments delimit what gets put into the Texinfo file, so
don't delete them!) */ don't delete them!) */
@ -234,7 +234,7 @@ extern reg_syntax_t re_syntax_options;
| RE_NO_BK_PARENS | RE_NO_BK_REFS \ | RE_NO_BK_PARENS | RE_NO_BK_REFS \
| RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD) | RE_NO_BK_VBAR | RE_UNMATCHED_RIGHT_PAREN_ORD)
/* [[[end syntaxes]]] */ /* [[[end syntaxes]]] */
/* Maximum number of duplicates an interval can allow. Some systems /* Maximum number of duplicates an interval can allow. Some systems
(erroneously) define this in other header files, but we want our (erroneously) define this in other header files, but we want our
value, so remove any previous define. */ value, so remove any previous define. */
@ -309,7 +309,7 @@ typedef enum
REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */ REG_ESIZE, /* Compiled pattern bigger than 2^16 bytes. */
REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */ REG_ERPAREN /* Unmatched ) or \); not returned from regcomp. */
} reg_errcode_t; } reg_errcode_t;
/* This data structure represents a compiled pattern. Before calling /* This data structure represents a compiled pattern. Before calling
the pattern compiler, the fields `buffer', `allocated', `fastmap', the pattern compiler, the fields `buffer', `allocated', `fastmap',
`translate', and `no_sub' can be set. After the pattern has been `translate', and `no_sub' can be set. After the pattern has been
@ -389,7 +389,7 @@ struct re_pattern_buffer
}; };
typedef struct re_pattern_buffer regex_t; typedef struct re_pattern_buffer regex_t;
/* Type for byte offsets within the string. POSIX mandates this. */ /* Type for byte offsets within the string. POSIX mandates this. */
typedef int regoff_t; typedef int regoff_t;
@ -420,7 +420,7 @@ typedef struct
regoff_t rm_so; /* Byte offset from string's start to substring's start. */ regoff_t rm_so; /* Byte offset from string's start to substring's start. */
regoff_t rm_eo; /* Byte offset from string's start to substring's end. */ regoff_t rm_eo; /* Byte offset from string's start to substring's end. */
} regmatch_t; } regmatch_t;
/* Declarations for routines. */ /* Declarations for routines. */
/* To avoid duplicating every routine declaration -- once with a /* To avoid duplicating every routine declaration -- once with a
@ -532,7 +532,7 @@ extern void regfree _RE_ARGS ((regex_t *__preg));
#endif /* C++ */ #endif /* C++ */
#endif /* regex.h */ #endif /* regex.h */
/* /*
Local variables: Local variables:
make-backup-files: t make-backup-files: t

46
lib/regex.c
View File

@ -209,7 +209,7 @@ init_syntax_once ()
# define SYNTAX(c) re_syntax_table[c] # define SYNTAX(c) re_syntax_table[c]
#endif /* not emacs */ #endif /* not emacs */
/* Get the interface, including the syntax bits. */ /* Get the interface, including the syntax bits. */
#include <regex-gnu.h> #include <regex-gnu.h>
@ -279,7 +279,7 @@ init_syntax_once ()
/* As in Harbison and Steele. */ /* As in Harbison and Steele. */
# define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128) # define SIGN_EXTEND_CHAR(c) ((((unsigned char) (c)) ^ 128) - 128)
#endif #endif
/* Should we use malloc or alloca? If REGEX_MALLOC is not defined, we /* Should we use malloc or alloca? If REGEX_MALLOC is not defined, we
use `alloca' instead of `malloc'. This is because using malloc in use `alloca' instead of `malloc'. This is because using malloc in
re_search* or re_match* could cause memory leaks when C-g is used in re_search* or re_match* could cause memory leaks when C-g is used in
@ -388,7 +388,7 @@ static int re_match_2_internal PARAMS ((struct re_pattern_buffer *bufp,
int pos, int pos,
struct re_registers *regs, struct re_registers *regs,
int stop)); int stop));
/* These are the command codes that appear in compiled regular /* These are the command codes that appear in compiled regular
expressions. Some opcodes are followed by argument bytes. A expressions. Some opcodes are followed by argument bytes. A
command code can specify any interpretation whatsoever for its command code can specify any interpretation whatsoever for its
@ -527,7 +527,7 @@ typedef enum
notsyntaxspec notsyntaxspec
#endif /* emacs */ #endif /* emacs */
} re_opcode_t; } re_opcode_t;
/* Common operations on the compiled pattern. */ /* Common operations on the compiled pattern. */
/* Store NUMBER in two contiguous bytes starting at DESTINATION. */ /* Store NUMBER in two contiguous bytes starting at DESTINATION. */
@ -604,7 +604,7 @@ extract_number_and_incr (destination, source)
# endif /* not EXTRACT_MACROS */ # endif /* not EXTRACT_MACROS */
#endif /* DEBUG */ #endif /* DEBUG */
/* If DEBUG is defined, Regex prints many voluminous messages about what /* If DEBUG is defined, Regex prints many voluminous messages about what
it is doing (if the variable `debug' is nonzero). If linked with the it is doing (if the variable `debug' is nonzero). If linked with the
main program in `iregex.c', you can enter patterns and strings main program in `iregex.c', you can enter patterns and strings
@ -977,7 +977,7 @@ printchar (c)
# define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2) # define DEBUG_PRINT_DOUBLE_STRING(w, s1, sz1, s2, sz2)
#endif /* not DEBUG */ #endif /* not DEBUG */
/* Set by `re_set_syntax' to the current regexp syntax to recognize. Can /* Set by `re_set_syntax' to the current regexp syntax to recognize. Can
also be assigned to arbitrarily: each pattern buffer stores its own also be assigned to arbitrarily: each pattern buffer stores its own
syntax, so it can be changed between regex compilations. */ syntax, so it can be changed between regex compilations. */
@ -1011,7 +1011,7 @@ re_set_syntax (syntax)
#ifdef _LIBC #ifdef _LIBC
weak_alias (__re_set_syntax, re_set_syntax) weak_alias (__re_set_syntax, re_set_syntax)
#endif #endif
/* This table gives an error message for each of the error codes listed /* This table gives an error message for each of the error codes listed
in regex.h. Obviously the order here has to be same as there. in regex.h. Obviously the order here has to be same as there.
POSIX doesn't require that we do anything for REG_NOERROR, POSIX doesn't require that we do anything for REG_NOERROR,
@ -1091,7 +1091,7 @@ static const size_t re_error_msgid_idx[] =
REG_ESIZE_IDX, REG_ESIZE_IDX,
REG_ERPAREN_IDX REG_ERPAREN_IDX
}; };
/* Avoiding alloca during matching, to placate r_alloc. */ /* Avoiding alloca during matching, to placate r_alloc. */
/* Define MATCH_MAY_ALLOCATE unless we need to make sure that the /* Define MATCH_MAY_ALLOCATE unless we need to make sure that the
@ -1129,7 +1129,7 @@ static const size_t re_error_msgid_idx[] =
# undef MATCH_MAY_ALLOCATE # undef MATCH_MAY_ALLOCATE
#endif #endif
/* Failure stack declarations and macros; both re_compile_fastmap and /* Failure stack declarations and macros; both re_compile_fastmap and
re_match_2 use a failure stack. These have to be macros because of re_match_2 use a failure stack. These have to be macros because of
REGEX_ALLOCATE_STACK. */ REGEX_ALLOCATE_STACK. */
@ -1495,7 +1495,7 @@ typedef struct
} /* POP_FAILURE_POINT */ } /* POP_FAILURE_POINT */
/* Structure for per-register (a.k.a. per-group) information. /* Structure for per-register (a.k.a. per-group) information.
Other register information, such as the Other register information, such as the
starting and ending positions (which are addresses), and the list of starting and ending positions (which are addresses), and the list of
@ -1555,7 +1555,7 @@ typedef union
static char reg_unset_dummy; static char reg_unset_dummy;
#define REG_UNSET_VALUE (&reg_unset_dummy) #define REG_UNSET_VALUE (&reg_unset_dummy)
#define REG_UNSET(e) ((e) == REG_UNSET_VALUE) #define REG_UNSET(e) ((e) == REG_UNSET_VALUE)
/* Subroutine declarations and macros for regex_compile. */ /* Subroutine declarations and macros for regex_compile. */
static reg_errcode_t regex_compile _RE_ARGS ((const char *pattern, size_t size, static reg_errcode_t regex_compile _RE_ARGS ((const char *pattern, size_t size,
@ -1809,7 +1809,7 @@ typedef struct
|| STREQ (string, "punct") || STREQ (string, "graph") \ || STREQ (string, "punct") || STREQ (string, "graph") \
|| STREQ (string, "cntrl") || STREQ (string, "blank")) || STREQ (string, "cntrl") || STREQ (string, "blank"))
#endif #endif
#ifndef MATCH_MAY_ALLOCATE #ifndef MATCH_MAY_ALLOCATE
/* If we cannot allocate large objects within re_match_2_internal, /* If we cannot allocate large objects within re_match_2_internal,
@ -1857,7 +1857,7 @@ regex_grow_registers (num_regs)
} }
#endif /* not MATCH_MAY_ALLOCATE */ #endif /* not MATCH_MAY_ALLOCATE */
static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type static boolean group_in_compile_stack _RE_ARGS ((compile_stack_type
compile_stack, compile_stack,
regnum_t regnum)); regnum_t regnum));
@ -2991,7 +2991,7 @@ regex_compile (pattern, size, syntax, bufp)
return REG_NOERROR; return REG_NOERROR;
} /* regex_compile */ } /* regex_compile */
/* Subroutines for `regex_compile'. */ /* Subroutines for `regex_compile'. */
/* Store OP at LOC followed by two-byte integer parameter ARG. */ /* Store OP at LOC followed by two-byte integer parameter ARG. */
@ -3178,7 +3178,7 @@ compile_range (p_ptr, pend, translate, syntax, b)
return REG_NOERROR; return REG_NOERROR;
} }
/* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in /* re_compile_fastmap computes a ``fastmap'' for the compiled pattern in
BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible BUFP. A fastmap records which of the (1 << BYTEWIDTH) possible
characters can start a string that matches the pattern. This fastmap characters can start a string that matches the pattern. This fastmap
@ -3484,7 +3484,7 @@ re_compile_fastmap (bufp)
#ifdef _LIBC #ifdef _LIBC
weak_alias (__re_compile_fastmap, re_compile_fastmap) weak_alias (__re_compile_fastmap, re_compile_fastmap)
#endif #endif
/* Set REGS to hold NUM_REGS registers, storing them in STARTS and /* Set REGS to hold NUM_REGS registers, storing them in STARTS and
ENDS. Subsequent matches using PATTERN_BUFFER and REGS will use ENDS. Subsequent matches using PATTERN_BUFFER and REGS will use
this memory for recording register information. STARTS and ENDS this memory for recording register information. STARTS and ENDS
@ -3522,7 +3522,7 @@ re_set_registers (bufp, regs, num_regs, starts, ends)
#ifdef _LIBC #ifdef _LIBC
weak_alias (__re_set_registers, re_set_registers) weak_alias (__re_set_registers, re_set_registers)
#endif #endif
/* Searching routines. */ /* Searching routines. */
/* Like re_search_2, below, but only one string is specified, and /* Like re_search_2, below, but only one string is specified, and
@ -3704,7 +3704,7 @@ re_search_2 (bufp, string1, size1, string2, size2, startpos, range, regs, stop)
#ifdef _LIBC #ifdef _LIBC
weak_alias (__re_search_2, re_search_2) weak_alias (__re_search_2, re_search_2)
#endif #endif
/* This converts PTR, a pointer into one of the search strings `string1' /* This converts PTR, a pointer into one of the search strings `string1'
and `string2' into an offset from the beginning of that string. */ and `string2' into an offset from the beginning of that string. */
#define POINTER_TO_OFFSET(ptr) \ #define POINTER_TO_OFFSET(ptr) \
@ -3783,7 +3783,7 @@ weak_alias (__re_search_2, re_search_2)
to actually save any registers when none are active. */ to actually save any registers when none are active. */
#define NO_HIGHEST_ACTIVE_REG (1 << BYTEWIDTH) #define NO_HIGHEST_ACTIVE_REG (1 << BYTEWIDTH)
#define NO_LOWEST_ACTIVE_REG (NO_HIGHEST_ACTIVE_REG + 1) #define NO_LOWEST_ACTIVE_REG (NO_HIGHEST_ACTIVE_REG + 1)
/* Matching routines. */ /* Matching routines. */
#ifndef emacs /* Emacs never uses this. */ #ifndef emacs /* Emacs never uses this. */
@ -5248,7 +5248,7 @@ re_match_2_internal (bufp, string1, size1, string2, size2, pos, regs, stop)
return -1; /* Failure to match. */ return -1; /* Failure to match. */
} /* re_match_2 */ } /* re_match_2 */
/* Subroutine definitions for re_match_2. */ /* Subroutine definitions for re_match_2. */
@ -5511,7 +5511,7 @@ bcmp_translate (s1, s2, len, translate)
} }
return 0; return 0;
} }
/* Entry points for GNU code. */ /* Entry points for GNU code. */
/* re_compile_pattern is the GNU regular expression compiler: it /* re_compile_pattern is the GNU regular expression compiler: it
@ -5552,7 +5552,7 @@ re_compile_pattern (pattern, length, bufp)
#ifdef _LIBC #ifdef _LIBC
weak_alias (__re_compile_pattern, re_compile_pattern) weak_alias (__re_compile_pattern, re_compile_pattern)
#endif #endif
/* Entry points compatible with 4.2 BSD regex library. We don't define /* Entry points compatible with 4.2 BSD regex library. We don't define
them unless specifically requested. */ them unless specifically requested. */
@ -5623,7 +5623,7 @@ re_exec (s)
} }
#endif /* _REGEX_RE_COMP */ #endif /* _REGEX_RE_COMP */
/* POSIX.2 functions. Don't define these for Emacs. */ /* POSIX.2 functions. Don't define these for Emacs. */
#ifndef emacs #ifndef emacs

8
lib/routemap.c
View File

@ -28,7 +28,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#include "command.h" #include "command.h"
#include "vty.h" #include "vty.h"
#include "log.h" #include "log.h"
/* Vector for route match rules. */ /* Vector for route match rules. */
static vector route_match_vec; static vector route_match_vec;
@ -72,7 +72,7 @@ route_map_rule_delete (struct route_map_rule_list *,
static void static void
route_map_index_delete (struct route_map_index *, int); route_map_index_delete (struct route_map_index *, int);
/* New route map allocation. Please note route map's name must be /* New route map allocation. Please note route map's name must be
specified. */ specified. */
static struct route_map * static struct route_map *
@ -420,7 +420,7 @@ route_map_rule_new (void)
new = XCALLOC (MTYPE_ROUTE_MAP_RULE, sizeof (struct route_map_rule)); new = XCALLOC (MTYPE_ROUTE_MAP_RULE, sizeof (struct route_map_rule));
return new; return new;
} }
/* Install rule command to the match list. */ /* Install rule command to the match list. */
void void
route_map_install_match (struct route_map_rule_cmd *cmd) route_map_install_match (struct route_map_rule_cmd *cmd)
@ -898,7 +898,7 @@ route_map_finish (void)
vector_free (route_set_vec); vector_free (route_set_vec);
route_set_vec = NULL; route_set_vec = NULL;
} }
/* VTY related functions. */ /* VTY related functions. */
DEFUN (route_map, DEFUN (route_map,
route_map_cmd, route_map_cmd,

10
lib/smux.c
View File

@ -78,7 +78,7 @@ struct subtree
enum smux_event {SMUX_SCHEDULE, SMUX_CONNECT, SMUX_READ}; enum smux_event {SMUX_SCHEDULE, SMUX_CONNECT, SMUX_READ};
void smux_event (enum smux_event, int); void smux_event (enum smux_event, int);
/* SMUX socket. */ /* SMUX socket. */
int smux_sock = -1; int smux_sock = -1;
@ -114,7 +114,7 @@ static struct cmd_node smux_node =
/* thread master */ /* thread master */
static struct thread_master *master; static struct thread_master *master;
static int static int
oid_compare_part (oid *o1, int o1_len, oid *o2, int o2_len) oid_compare_part (oid *o1, int o1_len, oid *o2, int o2_len)
{ {
@ -132,7 +132,7 @@ oid_compare_part (oid *o1, int o1_len, oid *o2, int o2_len)
return 0; return 0;
} }
static void static void
smux_oid_dump (const char *prefix, const oid *oid, size_t oid_len) smux_oid_dump (const char *prefix, const oid *oid, size_t oid_len)
{ {
@ -1230,7 +1230,7 @@ smux_stop (void)
smux_sock = -1; smux_sock = -1;
} }
} }
void void
@ -1251,7 +1251,7 @@ smux_event (enum smux_event event, int sock)
break; break;
} }
} }
static int static int
smux_str2oid (const char *str, oid *oid, size_t *oid_len) smux_str2oid (const char *str, oid *oid, size_t *oid_len)
{ {

10
lib/stream.c
View File

@ -196,7 +196,7 @@ stream_resize (struct stream *s, size_t newsize)
return s->size; return s->size;
} }
size_t size_t
stream_get_getp (struct stream *s) stream_get_getp (struct stream *s)
{ {
@ -285,7 +285,7 @@ stream_forward_endp (struct stream *s, size_t size)
s->endp += size; s->endp += size;
} }
/* Copy from stream to destination. */ /* Copy from stream to destination. */
void void
stream_get (void *dst, struct stream *s, size_t size) stream_get (void *dst, struct stream *s, size_t size)
@ -492,7 +492,7 @@ stream_get_ipv4 (struct stream *s)
return l; return l;
} }
/* Copy to source to stream. /* Copy to source to stream.
* *
* XXX: This uses CHECK_SIZE and hence has funny semantics -> Size will wrap * XXX: This uses CHECK_SIZE and hence has funny semantics -> Size will wrap
@ -731,7 +731,7 @@ stream_put_prefix (struct stream *s, struct prefix *p)
return psize; return psize;
} }
/* Read size from fd. */ /* Read size from fd. */
int int
stream_read (struct stream *s, int fd, size_t size) stream_read (struct stream *s, int fd, size_t size)
@ -937,7 +937,7 @@ stream_flush (struct stream *s, int fd)
return nbytes; return nbytes;
} }
/* Stream first in first out queue. */ /* Stream first in first out queue. */
struct stream_fifo * struct stream_fifo *

2
lib/table.c
View File

@ -29,7 +29,7 @@
static void route_node_delete (struct route_node *); static void route_node_delete (struct route_node *);
static void route_table_free (struct route_table *); static void route_table_free (struct route_table *);
/* /*
* route_table_init_with_delegate * route_table_init_with_delegate

12
lib/thread.c
View File

@ -45,7 +45,7 @@ extern int agentx_enabled;
#include <mach/mach_time.h> #include <mach/mach_time.h>
#endif #endif
/* Recent absolute time of day */ /* Recent absolute time of day */
struct timeval recent_time; struct timeval recent_time;
static struct timeval last_recent_time; static struct timeval last_recent_time;
@ -54,9 +54,9 @@ static struct timeval relative_time;
static struct timeval relative_time_base; static struct timeval relative_time_base;
/* init flag */ /* init flag */
static unsigned short timers_inited; static unsigned short timers_inited;
static struct hash *cpu_record = NULL; static struct hash *cpu_record = NULL;
/* Struct timeval's tv_usec one second value. */ /* Struct timeval's tv_usec one second value. */
#define TIMER_SECOND_MICRO 1000000L #define TIMER_SECOND_MICRO 1000000L
@ -108,7 +108,7 @@ timeval_elapsed (struct timeval a, struct timeval b)
return (((a.tv_sec - b.tv_sec) * TIMER_SECOND_MICRO) return (((a.tv_sec - b.tv_sec) * TIMER_SECOND_MICRO)
+ (a.tv_usec - b.tv_usec)); + (a.tv_usec - b.tv_usec));
} }
#if !defined(HAVE_CLOCK_MONOTONIC) && !defined(__APPLE__) #if !defined(HAVE_CLOCK_MONOTONIC) && !defined(__APPLE__)
static void static void
quagga_gettimeofday_relative_adjust (void) quagga_gettimeofday_relative_adjust (void)
@ -247,7 +247,7 @@ recent_relative_time (void)
{ {
return relative_time; return relative_time;
} }
static unsigned int static unsigned int
cpu_record_hash_key (struct cpu_thread_history *a) cpu_record_hash_key (struct cpu_thread_history *a)
{ {
@ -496,7 +496,7 @@ DEFUN(clear_thread_cpu,
cpu_record_clear (filter); cpu_record_clear (filter);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
static int static int
thread_timer_cmp(void *a, void *b) thread_timer_cmp(void *a, void *b)
{ {

10
lib/vty.c
View File

@ -57,7 +57,7 @@ static void vty_event (enum event, int, struct vty *);
/* Extern host structure from command.c */ /* Extern host structure from command.c */
extern struct host host; extern struct host host;
/* Vector which store each vty structure. */ /* Vector which store each vty structure. */
static vector vtyvec; static vector vtyvec;
@ -89,7 +89,7 @@ static u_char restricted_mode = 0;
/* Integrated configuration file path */ /* Integrated configuration file path */
char integrate_default[] = SYSCONFDIR INTEGRATE_DEFAULT_CONFIG; char integrate_default[] = SYSCONFDIR INTEGRATE_DEFAULT_CONFIG;
/* VTY standard output function. */ /* VTY standard output function. */
int int
vty_out (struct vty *vty, const char *format, ...) vty_out (struct vty *vty, const char *format, ...)
@ -455,7 +455,7 @@ vty_command (struct vty *vty, char *buf)
return ret; return ret;
} }
static const char telnet_backward_char = 0x08; static const char telnet_backward_char = 0x08;
static const char telnet_space_char = ' '; static const char telnet_space_char = ' ';
@ -2494,7 +2494,7 @@ vty_config_unlock (struct vty *vty)
} }
return vty->config; return vty->config;
} }
/* Master of the threads. */ /* Master of the threads. */
static struct thread_master *master; static struct thread_master *master;
@ -2551,7 +2551,7 @@ vty_event (enum event event, int sock, struct vty *vty)
break; break;
} }
} }
DEFUN (config_who, DEFUN (config_who,
config_who_cmd, config_who_cmd,
"who", "who",

8
lib/zclient.c
View File

@ -32,7 +32,7 @@
#include "zclient.h" #include "zclient.h"
#include "memory.h" #include "memory.h"
#include "table.h" #include "table.h"
/* Zebra client events. */ /* Zebra client events. */
enum event {ZCLIENT_SCHEDULE, ZCLIENT_READ, ZCLIENT_CONNECT}; enum event {ZCLIENT_SCHEDULE, ZCLIENT_READ, ZCLIENT_CONNECT};
@ -45,7 +45,7 @@ char *zclient_serv_path = NULL;
/* This file local debug flag. */ /* This file local debug flag. */
int zclient_debug = 0; int zclient_debug = 0;
/* Allocate zclient structure. */ /* Allocate zclient structure. */
struct zclient * struct zclient *
zclient_new () zclient_new ()
@ -413,7 +413,7 @@ zclient_connect (struct thread *t)
return zclient_start (zclient); return zclient_start (zclient);
} }
/* /*
* "xdr_encode"-like interface that allows daemon (client) to send * "xdr_encode"-like interface that allows daemon (client) to send
* a message to zebra server for a route that needs to be * a message to zebra server for a route that needs to be
@ -816,7 +816,7 @@ zebra_interface_address_read (int type, struct stream *s)
return ifc; return ifc;
} }
/* Zebra client message read function. */ /* Zebra client message read function. */
static int static int
zclient_read (struct thread *thread) zclient_read (struct thread *thread)

2
ospf6d/ospf6_abr.c
View File

@ -787,7 +787,7 @@ ospf6_abr_reimport (struct ospf6_area *oa)
} }
/* Display functions */ /* Display functions */
static char * static char *
ospf6_inter_area_prefix_lsa_get_prefix_str (struct ospf6_lsa *lsa, char *buf, ospf6_inter_area_prefix_lsa_get_prefix_str (struct ospf6_lsa *lsa, char *buf,

2
ospf6d/ospf6_area.c
View File

@ -288,7 +288,7 @@ ospf6_area_disable (struct ospf6_area *oa)
THREAD_OFF (oa->thread_intra_prefix_lsa); THREAD_OFF (oa->thread_intra_prefix_lsa);
} }
void void
ospf6_area_show (struct vty *vty, struct ospf6_area *oa) ospf6_area_show (struct vty *vty, struct ospf6_area *oa)
{ {

8
ospf6d/ospf6_asbr.c
View File

@ -151,7 +151,7 @@ ospf6_as_external_lsa_originate (struct ospf6_route *route)
ospf6_lsa_originate_process (lsa, ospf6); ospf6_lsa_originate_process (lsa, ospf6);
} }
void void
ospf6_asbr_lsa_add (struct ospf6_lsa *lsa) ospf6_asbr_lsa_add (struct ospf6_lsa *lsa)
{ {
@ -342,7 +342,7 @@ ospf6_asbr_lsentry_remove (struct ospf6_route *asbr_entry)
} }
/* redistribute function */ /* redistribute function */
static void static void
@ -748,7 +748,7 @@ ospf6_redistribute_show_config (struct vty *vty)
} }
/* Routemap Functions */ /* Routemap Functions */
static route_map_result_t static route_map_result_t
ospf6_routemap_rule_match_address_prefixlist (void *rule, ospf6_routemap_rule_match_address_prefixlist (void *rule,
@ -1168,7 +1168,7 @@ ospf6_routemap_init (void)
install_element (RMAP_NODE, &ospf6_routemap_no_set_forwarding_cmd); install_element (RMAP_NODE, &ospf6_routemap_no_set_forwarding_cmd);
} }
/* Display functions */ /* Display functions */
static char * static char *
ospf6_as_external_lsa_get_prefix_str (struct ospf6_lsa *lsa, char *buf, ospf6_as_external_lsa_get_prefix_str (struct ospf6_lsa *lsa, char *buf,

6
ospf6d/ospf6_interface.c
View File

@ -516,7 +516,7 @@ ospf6_interface_state_change (u_char next_state, struct ospf6_interface *oi)
} }
/* DR Election, RFC2328 section 9.4 */ /* DR Election, RFC2328 section 9.4 */
#define IS_ELIGIBLE(n) \ #define IS_ELIGIBLE(n) \
@ -673,7 +673,7 @@ dr_election (struct ospf6_interface *oi)
return next_state; return next_state;
} }
/* Interface State Machine */ /* Interface State Machine */
int int
interface_up (struct thread *thread) interface_up (struct thread *thread)
@ -843,7 +843,7 @@ interface_down (struct thread *thread)
return 0; return 0;
} }
/* show specified interface structure */ /* show specified interface structure */
static int static int
ospf6_interface_show (struct vty *vty, struct interface *ifp) ospf6_interface_show (struct vty *vty, struct interface *ifp)

2
ospf6d/ospf6_interface.h
View File

@ -142,7 +142,7 @@ extern const char *ospf6_interface_state_str[];
#define OSPF6_REFERENCE_BANDWIDTH 100000 /* Kbps */ #define OSPF6_REFERENCE_BANDWIDTH 100000 /* Kbps */
/* Function Prototypes */ /* Function Prototypes */
extern struct ospf6_interface *ospf6_interface_lookup_by_ifindex (int); extern struct ospf6_interface *ospf6_interface_lookup_by_ifindex (int);

2
ospf6d/ospf6_intra.h
View File

@ -153,7 +153,7 @@ struct ospf6_intra_prefix_lsa
/* followed by ospf6 prefix(es) */ /* followed by ospf6 prefix(es) */
}; };
#define OSPF6_ROUTER_LSA_SCHEDULE(oa) \ #define OSPF6_ROUTER_LSA_SCHEDULE(oa) \
do { \ do { \
if (! (oa)->thread_router_lsa \ if (! (oa)->thread_router_lsa \

6
ospf6d/ospf6_lsa.c
View File

@ -658,7 +658,7 @@ ospf6_lsa_unlock (struct ospf6_lsa *lsa)
ospf6_lsa_delete (lsa); ospf6_lsa_delete (lsa);
} }
/* ospf6 lsa expiry */ /* ospf6 lsa expiry */
int int
ospf6_lsa_expire (struct thread *thread) ospf6_lsa_expire (struct thread *thread)
@ -744,7 +744,7 @@ ospf6_lsa_refresh (struct thread *thread)
return 0; return 0;
} }
/* Fletcher Checksum -- Refer to RFC1008. */ /* Fletcher Checksum -- Refer to RFC1008. */
@ -790,7 +790,7 @@ ospf6_lsa_terminate (void)
{ {
vector_free (ospf6_lsa_handler_vector); vector_free (ospf6_lsa_handler_vector);
} }
static char * static char *
ospf6_lsa_handler_name (struct ospf6_lsa_handler *h) ospf6_lsa_handler_name (struct ospf6_lsa_handler *h)
{ {

2
ospf6d/ospf6_lsa.h
View File

@ -209,7 +209,7 @@ extern struct ospf6_lsa_handler unknown_handler;
continue; \ continue; \
} }
/* Function Prototypes */ /* Function Prototypes */
extern const char *ospf6_lstype_name (u_int16_t type); extern const char *ospf6_lstype_name (u_int16_t type);
extern const char *ospf6_lstype_short_name (u_int16_t type); extern const char *ospf6_lstype_short_name (u_int16_t type);

4
ospf6d/ospf6_message.c
View File

@ -2326,7 +2326,7 @@ ospf6_lsack_send_interface (struct thread *thread)
return 0; return 0;
} }
/* Commands */ /* Commands */
DEFUN (debug_ospf6_message, DEFUN (debug_ospf6_message,
debug_ospf6_message_cmd, debug_ospf6_message_cmd,
@ -2400,7 +2400,7 @@ ALIAS (debug_ospf6_message,
"Debug only receiving message\n" "Debug only receiving message\n"
) )
DEFUN (no_debug_ospf6_message, DEFUN (no_debug_ospf6_message,
no_debug_ospf6_message_cmd, no_debug_ospf6_message_cmd,
"no debug ospf6 message (unknown|hello|dbdesc|lsreq|lsupdate|lsack|all)", "no debug ospf6 message (unknown|hello|dbdesc|lsreq|lsupdate|lsack|all)",

2
ospf6d/ospf6_neighbor.c
View File

@ -615,7 +615,7 @@ inactivity_timer (struct thread *thread)
} }
/* vty functions */ /* vty functions */
/* show neighbor structure */ /* show neighbor structure */
static void static void

2
ospf6d/ospf6_neighbor.h
View File

@ -148,7 +148,7 @@ static const char *ospf6_neighbor_event_string (int event)
extern const char *ospf6_neighbor_state_str[]; extern const char *ospf6_neighbor_state_str[];
/* Function Prototypes */ /* Function Prototypes */
int ospf6_neighbor_cmp (void *va, void *vb); int ospf6_neighbor_cmp (void *va, void *vb);
void ospf6_neighbor_dbex_init (struct ospf6_neighbor *on); void ospf6_neighbor_dbex_init (struct ospf6_neighbor *on);

2
ospf6d/ospf6_network.h
View File

@ -22,7 +22,7 @@
#ifndef OSPF6_NETWORK_H #ifndef OSPF6_NETWORK_H
#define OSPF6_NETWORK_H #define OSPF6_NETWORK_H
extern int ospf6_sock; extern int ospf6_sock;
extern struct in6_addr allspfrouters6; extern struct in6_addr allspfrouters6;

2
ospf6d/ospf6_route.c
View File

@ -780,7 +780,7 @@ ospf6_route_table_delete (struct ospf6_route_table *table)
XFREE (MTYPE_OSPF6_ROUTE, table); XFREE (MTYPE_OSPF6_ROUTE, table);
} }
/* VTY commands */ /* VTY commands */
void void
ospf6_route_show (struct vty *vty, struct ospf6_route *route) ospf6_route_show (struct vty *vty, struct ospf6_route *route)

4
ospf6d/ospf6_zebra.c
View File

@ -274,7 +274,7 @@ ospf6_zebra_read_ipv6 (int command, struct zclient *zclient,
DEFUN (show_zebra, DEFUN (show_zebra,
show_zebra_cmd, show_zebra_cmd,
"show zebra", "show zebra",
@ -602,7 +602,7 @@ ospf6_zebra_init (void)
} }
/* Debug */ /* Debug */
DEFUN (debug_ospf6_zebra_sendrecv, DEFUN (debug_ospf6_zebra_sendrecv,
debug_ospf6_zebra_sendrecv_cmd, debug_ospf6_zebra_sendrecv_cmd,
"debug ospf6 zebra (send|recv)", "debug ospf6 zebra (send|recv)",

2
ospf6d/ospf6d.c
View File

@ -77,7 +77,7 @@ route_prev (struct route_node *node)
return prev; return prev;
} }
/* show database functions */ /* show database functions */
DEFUN (show_version_ospf6, DEFUN (show_version_ospf6,
show_version_ospf6_cmd, show_version_ospf6_cmd,

2
ospf6d/ospf6d.h
View File

@ -127,7 +127,7 @@ extern struct thread_master *master;
return CMD_SUCCESS; \ return CMD_SUCCESS; \
} }
/* Function Prototypes */ /* Function Prototypes */
extern struct route_node *route_prev (struct route_node *node); extern struct route_node *route_prev (struct route_node *node);

10
ospfclient/COPYING
View File

@ -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 The precise terms and conditions for copying, distribution and
modification follow. modification follow.
GNU GENERAL PUBLIC LICENSE GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 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 License. (Exception: if the Program itself is interactive but
does not normally print such an announcement, your work based on does not normally print such an announcement, your work based on
the Program is not required to print an announcement.) the Program is not required to print an announcement.)
These requirements apply to the modified work as a whole. If These requirements apply to the modified work as a whole. If
identifiable sections of that work are not derived from the Program, identifiable sections of that work are not derived from the Program,
and can be reasonably considered independent and separate works in 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 access to copy the source code from the same place counts as
distribution of the source code, even though third parties are not distribution of the source code, even though third parties are not
compelled to copy the source along with the object code. compelled to copy the source along with the object code.
4. You may not copy, modify, sublicense, or distribute the Program 4. You may not copy, modify, sublicense, or distribute the Program
except as expressly provided under this License. Any attempt except as expressly provided under this License. Any attempt
otherwise to copy, modify, sublicense or distribute the Program is 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 This section is intended to make thoroughly clear what is believed to
be a consequence of the rest of this License. be a consequence of the rest of this License.
8. If the distribution and/or use of the Program is restricted in 8. If the distribution and/or use of the Program is restricted in
certain countries either by patents or by copyrighted interfaces, the certain countries either by patents or by copyrighted interfaces, the
original copyright holder who places the Program under this License 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. POSSIBILITY OF SUCH DAMAGES.
END OF TERMS AND CONDITIONS END OF TERMS AND CONDITIONS
Appendix: How to Apply These Terms to Your New Programs 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 If you develop a new program, and you want it to be of the greatest

2
ospfd/ospf_abr.c
View File

@ -50,7 +50,7 @@
#include "ospfd/ospf_ase.h" #include "ospfd/ospf_ase.h"
#include "ospfd/ospf_zebra.h" #include "ospfd/ospf_zebra.h"
#include "ospfd/ospf_dump.h" #include "ospfd/ospf_dump.h"
static struct ospf_area_range * static struct ospf_area_range *
ospf_area_range_new (struct prefix_ipv4 *p) ospf_area_range_new (struct prefix_ipv4 *p)
{ {

6
ospfd/ospf_asbr.c
View File

@ -44,7 +44,7 @@
#include "ospfd/ospf_zebra.h" #include "ospfd/ospf_zebra.h"
#include "ospfd/ospf_dump.h" #include "ospfd/ospf_dump.h"
/* Remove external route. */ /* Remove external route. */
void void
ospf_external_route_remove (struct ospf *ospf, struct prefix_ipv4 *p) ospf_external_route_remove (struct ospf *ospf, struct prefix_ipv4 *p)
@ -96,7 +96,7 @@ ospf_external_route_lookup (struct ospf *ospf,
return NULL; return NULL;
} }
/* Add an External info for AS-external-LSA. */ /* Add an External info for AS-external-LSA. */
struct external_info * struct external_info *
ospf_external_info_new (u_char type) ospf_external_info_new (u_char type)
@ -234,7 +234,7 @@ ospf_external_info_find_lsa (struct ospf *ospf,
return lsa; return lsa;
} }
/* Update ASBR status. */ /* Update ASBR status. */
void void
ospf_asbr_status_update (struct ospf *ospf, u_char status) ospf_asbr_status_update (struct ospf *ospf, u_char status)

18
ospfd/ospf_dump.c
View File

@ -143,7 +143,7 @@ unsigned long term_debug_ospf_lsa = 0;
unsigned long term_debug_ospf_zebra = 0; unsigned long term_debug_ospf_zebra = 0;
unsigned long term_debug_ospf_nssa = 0; unsigned long term_debug_ospf_nssa = 0;
const char * const char *
ospf_redist_string(u_int route_type) ospf_redist_string(u_int route_type)
@ -218,7 +218,7 @@ ospf_if_name_string (struct ospf_interface *oi)
return buf; return buf;
} }
void void
ospf_nbr_state_message (struct ospf_neighbor *nbr, char *buf, size_t size) ospf_nbr_state_message (struct ospf_neighbor *nbr, char *buf, size_t size)
{ {
@ -746,7 +746,7 @@ ospf_packet_dump (struct stream *s)
stream_set_getp (s, gp); stream_set_getp (s, gp);
} }
/* /*
[no] debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all) [no] debug ospf packet (hello|dd|ls-request|ls-update|ls-ack|all)
[send|recv [detail]] [send|recv [detail]]
@ -956,7 +956,7 @@ ALIAS (no_debug_ospf_packet,
"Packet received\n" "Packet received\n"
"Detail Information\n") "Detail Information\n")
DEFUN (debug_ospf_ism, DEFUN (debug_ospf_ism,
debug_ospf_ism_cmd, debug_ospf_ism_cmd,
"debug ospf ism", "debug ospf ism",
@ -1058,7 +1058,7 @@ ALIAS (no_debug_ospf_ism,
"ISM Event Information\n" "ISM Event Information\n"
"ISM Timer Information\n") "ISM Timer Information\n")
DEFUN (debug_ospf_nsm, DEFUN (debug_ospf_nsm,
debug_ospf_nsm_cmd, debug_ospf_nsm_cmd,
"debug ospf nsm", "debug ospf nsm",
@ -1161,7 +1161,7 @@ ALIAS (no_debug_ospf_nsm,
"NSM Event Information\n" "NSM Event Information\n"
"NSM Timer Information\n") "NSM Timer Information\n")
DEFUN (debug_ospf_lsa, DEFUN (debug_ospf_lsa,
debug_ospf_lsa_cmd, debug_ospf_lsa_cmd,
"debug ospf lsa", "debug ospf lsa",
@ -1274,7 +1274,7 @@ ALIAS (no_debug_ospf_lsa,
"LSA Install/Delete\n" "LSA Install/Delete\n"
"LSA Refres\n") "LSA Refres\n")
DEFUN (debug_ospf_zebra, DEFUN (debug_ospf_zebra,
debug_ospf_zebra_cmd, debug_ospf_zebra_cmd,
"debug ospf zebra", "debug ospf zebra",
@ -1366,7 +1366,7 @@ ALIAS (no_debug_ospf_zebra,
"OSPF Zebra information\n" "OSPF Zebra information\n"
"Zebra interface\n" "Zebra interface\n"
"Zebra redistribute\n") "Zebra redistribute\n")
DEFUN (debug_ospf_event, DEFUN (debug_ospf_event,
debug_ospf_event_cmd, debug_ospf_event_cmd,
"debug ospf event", "debug ospf event",
@ -1421,7 +1421,7 @@ DEFUN (no_debug_ospf_nssa,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (show_debugging_ospf, DEFUN (show_debugging_ospf,
show_debugging_ospf_cmd, show_debugging_ospf_cmd,
"show debugging ospf", "show debugging ospf",

8
ospfd/ospf_flood.c
View File

@ -49,7 +49,7 @@
#include "ospfd/ospf_dump.h" #include "ospfd/ospf_dump.h"
extern struct zclient *zclient; extern struct zclient *zclient;
/* Do the LSA acking specified in table 19, Section 13.5, row 2 /* Do the LSA acking specified in table 19, Section 13.5, row 2
* This get called from ospf_flood_out_interface. Declared inline * This get called from ospf_flood_out_interface. Declared inline
* for speed. */ * for speed. */
@ -757,7 +757,7 @@ ospf_flood_through (struct ospf *ospf,
return (lsa_ack_flag); return (lsa_ack_flag);
} }
/* Management functions for neighbor's Link State Request list. */ /* Management functions for neighbor's Link State Request list. */
void void
@ -835,7 +835,7 @@ ospf_ls_request_new (struct lsa_header *lsah)
return new; return new;
} }
/* Management functions for neighbor's ls-retransmit list. */ /* Management functions for neighbor's ls-retransmit list. */
unsigned long unsigned long
ospf_ls_retransmit_count (struct ospf_neighbor *nbr) ospf_ls_retransmit_count (struct ospf_neighbor *nbr)
@ -973,7 +973,7 @@ ospf_ls_retransmit_delete_nbr_as (struct ospf *ospf, struct ospf_lsa *lsa)
ospf_ls_retransmit_delete_nbr_if (oi, lsa); ospf_ls_retransmit_delete_nbr_if (oi, lsa);
} }
/* Sets ls_age to MaxAge and floods throu the area. /* Sets ls_age to MaxAge and floods throu the area.
When we implement ASE routing, there will be anothe function When we implement ASE routing, there will be anothe function
flushing an LSA from the whole domain. */ flushing an LSA from the whole domain. */

2
ospfd/ospf_ia.c
View File

@ -193,7 +193,7 @@ ospf_ia_router_route (struct ospf *ospf, struct route_table *rtrs,
listnode_add (rn->info, new_or); listnode_add (rn->info, new_or);
} }
static int static int
process_summary_lsa (struct ospf_area *area, struct route_table *rt, process_summary_lsa (struct ospf_area *area, struct route_table *rt,
struct route_table *rtrs, struct ospf_lsa *lsa) struct route_table *rtrs, struct ospf_lsa *lsa)

12
ospfd/ospf_interface.c
View File

@ -49,7 +49,7 @@
#include "ospfd/ospf_snmp.h" #include "ospfd/ospf_snmp.h"
#endif /* HAVE_SNMP */ #endif /* HAVE_SNMP */
int int
ospf_if_get_output_cost (struct ospf_interface *oi) ospf_if_get_output_cost (struct ospf_interface *oi)
{ {
@ -334,7 +334,7 @@ ospf_if_free (struct ospf_interface *oi)
XFREE (MTYPE_OSPF_IF, oi); XFREE (MTYPE_OSPF_IF, oi);
} }
/* /*
* check if interface with given address is configured and * check if interface with given address is configured and
* return it if yes. special treatment for PtP networks. * return it if yes. special treatment for PtP networks.
@ -489,7 +489,7 @@ ospf_if_lookup_recv_if (struct ospf *ospf, struct in_addr src,
return match; return match;
} }
void void
ospf_if_stream_set (struct ospf_interface *oi) ospf_if_stream_set (struct ospf_interface *oi)
{ {
@ -518,7 +518,7 @@ ospf_if_stream_unset (struct ospf_interface *oi)
} }
} }
static struct ospf_if_params * static struct ospf_if_params *
ospf_new_if_params (void) ospf_new_if_params (void)
{ {
@ -825,7 +825,7 @@ ospf_if_down (struct ospf_interface *oi)
return 1; return 1;
} }
/* Virtual Link related functions. */ /* Virtual Link related functions. */
struct ospf_vl_data * struct ospf_vl_data *
@ -1194,7 +1194,7 @@ ospf_vls_in_area (struct ospf_area *area)
return c; return c;
} }
struct crypt_key * struct crypt_key *
ospf_crypt_key_new () ospf_crypt_key_new ()
{ {

4
ospfd/ospf_ism.c
View File

@ -44,7 +44,7 @@
#include "ospfd/ospf_flood.h" #include "ospfd/ospf_flood.h"
#include "ospfd/ospf_abr.h" #include "ospfd/ospf_abr.h"
#include "ospfd/ospf_snmp.h" #include "ospfd/ospf_snmp.h"
/* elect DR and BDR. Refer to RFC2319 section 9.4 */ /* elect DR and BDR. Refer to RFC2319 section 9.4 */
static struct ospf_neighbor * static struct ospf_neighbor *
ospf_dr_election_sub (struct list *routers) ospf_dr_election_sub (struct list *routers)
@ -245,7 +245,7 @@ ospf_dr_election (struct ospf_interface *oi)
return new_state; return new_state;
} }
int int
ospf_hello_timer (struct thread *thread) ospf_hello_timer (struct thread *thread)
{ {

34
ospfd/ospf_lsa.c
View File

@ -50,7 +50,7 @@
#include "ospfd/ospf_ase.h" #include "ospfd/ospf_ase.h"
#include "ospfd/ospf_zebra.h" #include "ospfd/ospf_zebra.h"
u_int32_t u_int32_t
get_metric (u_char *metric) get_metric (u_char *metric)
{ {
@ -61,7 +61,7 @@ get_metric (u_char *metric)
return m; return m;
} }
struct timeval struct timeval
tv_adjust (struct timeval a) tv_adjust (struct timeval a)
{ {
@ -159,7 +159,7 @@ ospf_lsa_refresh_delay (struct ospf_lsa *lsa)
return delay; return delay;
} }
int int
get_age (struct ospf_lsa *lsa) get_age (struct ospf_lsa *lsa)
{ {
@ -171,7 +171,7 @@ get_age (struct ospf_lsa *lsa)
return age; return age;
} }
/* Fletcher Checksum -- Refer to RFC1008. */ /* Fletcher Checksum -- Refer to RFC1008. */
/* All the offsets are zero-based. The offsets in the RFC1008 are /* All the offsets are zero-based. The offsets in the RFC1008 are
@ -205,7 +205,7 @@ ospf_lsa_checksum_valid (struct lsa_header *lsa)
} }
/* Create OSPF LSA. */ /* Create OSPF LSA. */
struct ospf_lsa * struct ospf_lsa *
ospf_lsa_new () ospf_lsa_new ()
@ -341,7 +341,7 @@ ospf_lsa_data_free (struct lsa_header *lsah)
XFREE (MTYPE_OSPF_LSA_DATA, lsah); XFREE (MTYPE_OSPF_LSA_DATA, lsah);
} }
/* LSA general functions. */ /* LSA general functions. */
const char * const char *
@ -393,7 +393,7 @@ lsa_header_set (struct stream *s, u_char options,
stream_forward_endp (s, OSPF_LSA_HEADER_SIZE); stream_forward_endp (s, OSPF_LSA_HEADER_SIZE);
} }
/* router-LSA related functions. */ /* router-LSA related functions. */
/* Get router-LSA flags. */ /* Get router-LSA flags. */
@ -746,7 +746,7 @@ ospf_router_lsa_body_set (struct stream *s, struct ospf_area *area)
/* Set # of links here. */ /* Set # of links here. */
stream_putw_at (s, putp, cnt); stream_putw_at (s, putp, cnt);
} }
static int static int
ospf_stub_router_timer (struct thread *t) ospf_stub_router_timer (struct thread *t)
{ {
@ -803,7 +803,7 @@ ospf_stub_router_check (struct ospf_area *area)
OSPF_AREA_TIMER_ON (area->t_stub_router, ospf_stub_router_timer, OSPF_AREA_TIMER_ON (area->t_stub_router, ospf_stub_router_timer,
area->ospf->stub_router_startup_time); area->ospf->stub_router_startup_time);
} }
/* Create new router-LSA. */ /* Create new router-LSA. */
static struct ospf_lsa * static struct ospf_lsa *
ospf_router_lsa_new (struct ospf_area *area) ospf_router_lsa_new (struct ospf_area *area)
@ -1005,7 +1005,7 @@ ospf_router_lsa_update (struct ospf *ospf)
return 0; return 0;
} }
/* network-LSA related functions. */ /* network-LSA related functions. */
/* Originate Network-LSA. */ /* Originate Network-LSA. */
static void static void
@ -1184,7 +1184,7 @@ ospf_network_lsa_refresh (struct ospf_lsa *lsa)
return new; return new;
} }
static void static void
stream_put_ospf_metric (struct stream *s, u_int32_t metric_value) stream_put_ospf_metric (struct stream *s, u_int32_t metric_value)
{ {
@ -1343,7 +1343,7 @@ ospf_summary_lsa_refresh (struct ospf *ospf, struct ospf_lsa *lsa)
return new; return new;
} }
/* summary-ASBR-LSA related functions. */ /* summary-ASBR-LSA related functions. */
static void static void
ospf_summary_asbr_lsa_body_set (struct stream *s, struct prefix *p, ospf_summary_asbr_lsa_body_set (struct stream *s, struct prefix *p,
@ -2377,7 +2377,7 @@ ospf_external_lsa_refresh (struct ospf *ospf, struct ospf_lsa *lsa,
return new; return new;
} }
/* LSA installation functions. */ /* LSA installation functions. */
/* Install router-LSA to an area. */ /* Install router-LSA to an area. */
@ -2802,7 +2802,7 @@ ospf_lsa_install (struct ospf *ospf, struct ospf_interface *oi,
return new; return new;
} }
int int
ospf_check_nbr_status (struct ospf *ospf) ospf_check_nbr_status (struct ospf *ospf)
{ {
@ -2827,7 +2827,7 @@ ospf_check_nbr_status (struct ospf *ospf)
return 1; return 1;
} }
static int static int
ospf_maxage_lsa_remover (struct thread *thread) ospf_maxage_lsa_remover (struct thread *thread)
@ -3539,7 +3539,7 @@ ospf_lsa_unique_id (struct ospf *ospf,
return id; return id;
} }
#define LSA_ACTION_FLOOD_AREA 1 #define LSA_ACTION_FLOOD_AREA 1
#define LSA_ACTION_FLUSH_AREA 2 #define LSA_ACTION_FLUSH_AREA 2
@ -3602,7 +3602,7 @@ ospf_schedule_lsa_flush_area (struct ospf_area *area, struct ospf_lsa *lsa)
thread_add_event (master, ospf_lsa_action, data, 0); thread_add_event (master, ospf_lsa_action, data, 0);
} }
/* LSA Refreshment functions. */ /* LSA Refreshment functions. */
struct ospf_lsa * struct ospf_lsa *
ospf_lsa_refresh (struct ospf *ospf, struct ospf_lsa *lsa) ospf_lsa_refresh (struct ospf *ospf, struct ospf_lsa *lsa)

2
ospfd/ospf_lsdb.c
View File

@ -31,7 +31,7 @@
#include "ospfd/ospf_asbr.h" #include "ospfd/ospf_asbr.h"
#include "ospfd/ospf_lsa.h" #include "ospfd/ospf_lsa.h"
#include "ospfd/ospf_lsdb.h" #include "ospfd/ospf_lsdb.h"
struct ospf_lsdb * struct ospf_lsdb *
ospf_lsdb_new () ospf_lsdb_new ()
{ {

4
ospfd/ospf_main.c
View File

@ -132,7 +132,7 @@ Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
} }
exit (status); exit (status);
} }
/* SIGHUP handler. */ /* SIGHUP handler. */
static void static void
sighup (void) sighup (void)
@ -174,7 +174,7 @@ struct quagga_signal_t ospf_signals[] =
.handler = &sigint, .handler = &sigint,
}, },
}; };
/* OSPFd main routine. */ /* OSPFd main routine. */
int int
main (int argc, char **argv) main (int argc, char **argv)

6
ospfd/ospf_nsm.c
View File

@ -50,7 +50,7 @@
#include "ospfd/ospf_snmp.h" #include "ospfd/ospf_snmp.h"
static void nsm_clear_adj (struct ospf_neighbor *); static void nsm_clear_adj (struct ospf_neighbor *);
/* OSPF NSM Timer functions. */ /* OSPF NSM Timer functions. */
static int static int
ospf_inactivity_timer (struct thread *thread) ospf_inactivity_timer (struct thread *thread)
@ -156,7 +156,7 @@ nsm_should_adj (struct ospf_neighbor *nbr)
return 0; return 0;
} }
/* OSPF NSM functions. */ /* OSPF NSM functions. */
static int static int
nsm_packet_received (struct ospf_neighbor *nbr) nsm_packet_received (struct ospf_neighbor *nbr)
@ -258,7 +258,7 @@ ospf_db_summary_clear (struct ospf_neighbor *nbr)
} }
} }
/* The area link state database consists of the router-LSAs, /* The area link state database consists of the router-LSAs,
network-LSAs and summary-LSAs contained in the area structure, network-LSAs and summary-LSAs contained in the area structure,

6
ospfd/ospf_packet.c
View File

@ -323,7 +323,7 @@ ospf_packet_max (struct ospf_interface *oi)
return max; return max;
} }
static int static int
ospf_check_md5_digest (struct ospf_interface *oi, struct ospf_header *ospfh) ospf_check_md5_digest (struct ospf_interface *oi, struct ospf_header *ospfh)
{ {
@ -438,7 +438,7 @@ ospf_make_md5_digest (struct ospf_interface *oi, struct ospf_packet *op)
return OSPF_AUTH_MD5_SIZE; return OSPF_AUTH_MD5_SIZE;
} }
static int static int
ospf_ls_req_timer (struct thread *thread) ospf_ls_req_timer (struct thread *thread)
{ {
@ -2136,7 +2136,7 @@ ospf_ls_ack (struct ip *iph, struct ospf_header *ospfh,
return; return;
} }
static struct stream * static struct stream *
ospf_recv_packet (int fd, struct interface **ifp, struct stream *ibuf) ospf_recv_packet (int fd, struct interface **ifp, struct stream *ibuf)
{ {

20
ospfd/ospf_snmp.c
View File

@ -48,7 +48,7 @@
#include "ospfd/ospf_ism.h" #include "ospfd/ospf_ism.h"
#include "ospfd/ospf_dump.h" #include "ospfd/ospf_dump.h"
#include "ospfd/ospf_snmp.h" #include "ospfd/ospf_snmp.h"
/* OSPF2-MIB. */ /* OSPF2-MIB. */
#define OSPF2MIB 1,3,6,1,2,1,14 #define OSPF2MIB 1,3,6,1,2,1,14
@ -204,7 +204,7 @@
#define TIMETICKS ASN_TIMETICKS #define TIMETICKS ASN_TIMETICKS
#define IPADDRESS ASN_IPADDRESS #define IPADDRESS ASN_IPADDRESS
#define STRING ASN_OCTET_STR #define STRING ASN_OCTET_STR
/* Declare static local variables for convenience. */ /* Declare static local variables for convenience. */
SNMP_LOCAL_VARIABLES SNMP_LOCAL_VARIABLES
@ -501,7 +501,7 @@ struct variable ospf_variables[] =
{OSPFAREAAGGREGATEEFFECT, INTEGER, RWRITE, ospfAreaAggregateEntry, {OSPFAREAAGGREGATEEFFECT, INTEGER, RWRITE, ospfAreaAggregateEntry,
3, {14, 1, 6}} 3, {14, 1, 6}}
}; };
/* The administrative status of OSPF. When OSPF is enbled on at least /* The administrative status of OSPF. When OSPF is enbled on at least
one interface return 1. */ one interface return 1. */
static int static int
@ -1407,7 +1407,7 @@ ospfHostEntry (struct variable *v, oid *name, size_t *length, int exact,
} }
return NULL; return NULL;
} }
struct list *ospf_snmp_iflist; struct list *ospf_snmp_iflist;
struct ospf_snmp_if struct ospf_snmp_if
@ -1911,7 +1911,7 @@ ospfIfMetricEntry (struct variable *v, oid *name, size_t *length, int exact,
} }
return NULL; return NULL;
} }
struct route_table *ospf_snmp_vl_table; struct route_table *ospf_snmp_vl_table;
void void
@ -2127,7 +2127,7 @@ ospfVirtIfEntry (struct variable *v, oid *name, size_t *length, int exact,
} }
return NULL; return NULL;
} }
static struct ospf_neighbor * static struct ospf_neighbor *
ospf_snmp_nbr_lookup (struct ospf *ospf, struct in_addr *nbr_addr, ospf_snmp_nbr_lookup (struct ospf *ospf, struct in_addr *nbr_addr,
unsigned int *ifindex) unsigned int *ifindex)
@ -2360,7 +2360,7 @@ ospfNbrEntry (struct variable *v, oid *name, size_t *length, int exact,
} }
return NULL; return NULL;
} }
static u_char * static u_char *
ospfVirtNbrEntry (struct variable *v, oid *name, size_t *length, int exact, ospfVirtNbrEntry (struct variable *v, oid *name, size_t *length, int exact,
size_t *var_len, WriteMethod **write_method) size_t *var_len, WriteMethod **write_method)
@ -2419,7 +2419,7 @@ ospfVirtNbrEntry (struct variable *v, oid *name, size_t *length, int exact,
} }
return NULL; return NULL;
} }
static struct ospf_lsa * static struct ospf_lsa *
ospfExtLsdbLookup (struct variable *v, oid *name, size_t *length, u_char *type, ospfExtLsdbLookup (struct variable *v, oid *name, size_t *length, u_char *type,
struct in_addr *ls_id, struct in_addr *router_id, int exact) struct in_addr *ls_id, struct in_addr *router_id, int exact)
@ -2572,7 +2572,7 @@ ospfExtLsdbEntry (struct variable *v, oid *name, size_t *length, int exact,
} }
return NULL; return NULL;
} }
static u_char * static u_char *
ospfAreaAggregateEntry (struct variable *v, oid *name, size_t *length, ospfAreaAggregateEntry (struct variable *v, oid *name, size_t *length,
int exact, size_t *var_len, WriteMethod **write_method) int exact, size_t *var_len, WriteMethod **write_method)
@ -2608,7 +2608,7 @@ ospfAreaAggregateEntry (struct variable *v, oid *name, size_t *length,
} }
return NULL; return NULL;
} }
/* OSPF Traps. */ /* OSPF Traps. */
#define IFSTATECHANGE 16 #define IFSTATECHANGE 16
#define VIRTIFSTATECHANGE 1 #define VIRTIFSTATECHANGE 1

12
ospfd/ospf_spf.c
View File

@ -52,7 +52,7 @@ static void ospf_vertex_free (void *);
* dynamically allocated at begin of ospf_spf_calculate * dynamically allocated at begin of ospf_spf_calculate
*/ */
static struct list vertex_list = { .del = ospf_vertex_free }; static struct list vertex_list = { .del = ospf_vertex_free };
/* Heap related functions, for the managment of the candidates, to /* Heap related functions, for the managment of the candidates, to
* be used with pqueue. */ * be used with pqueue. */
static int static int
@ -90,7 +90,7 @@ update_stat (void *node , int position)
/* Set the status of the vertex, when its position changes. */ /* Set the status of the vertex, when its position changes. */
*(v->stat) = position; *(v->stat) = position;
} }
static struct vertex_nexthop * static struct vertex_nexthop *
vertex_nexthop_new (void) vertex_nexthop_new (void)
{ {
@ -134,7 +134,7 @@ ospf_canonical_nexthops_free (struct vertex *root)
vertex_nexthop_free (vp->nexthop); vertex_nexthop_free (vp->nexthop);
} }
} }
/* TODO: Parent list should be excised, in favour of maintaining only /* TODO: Parent list should be excised, in favour of maintaining only
* vertex_nexthop, with refcounts. * vertex_nexthop, with refcounts.
*/ */
@ -159,7 +159,7 @@ vertex_parent_free (void *p)
{ {
XFREE (MTYPE_OSPF_VERTEX_PARENT, p); XFREE (MTYPE_OSPF_VERTEX_PARENT, p);
} }
static struct vertex * static struct vertex *
ospf_vertex_new (struct ospf_lsa *lsa) ospf_vertex_new (struct ospf_lsa *lsa)
{ {
@ -276,7 +276,7 @@ ospf_vertex_add_parent (struct vertex *v)
listnode_add (vp->parent->children, v); listnode_add (vp->parent->children, v);
} }
} }
static void static void
ospf_spf_init (struct ospf_area *area) ospf_spf_init (struct ospf_area *area)
{ {
@ -1254,7 +1254,7 @@ ospf_spf_calculate (struct ospf_area *area, struct route_table *new_table,
zlog_debug ("ospf_spf_calculate: Stop. %ld vertices", zlog_debug ("ospf_spf_calculate: Stop. %ld vertices",
mtype_stats_alloc(MTYPE_OSPF_VERTEX)); mtype_stats_alloc(MTYPE_OSPF_VERTEX));
} }
/* Timer for SPF calculation. */ /* Timer for SPF calculation. */
static int static int
ospf_spf_calculate_timer (struct thread *thread) ospf_spf_calculate_timer (struct thread *thread)

50
ospfd/ospf_vty.c
View File

@ -49,7 +49,7 @@
#include "ospfd/ospf_vty.h" #include "ospfd/ospf_vty.h"
#include "ospfd/ospf_dump.h" #include "ospfd/ospf_dump.h"
static const char *ospf_network_type_str[] = static const char *ospf_network_type_str[] =
{ {
"Null", "Null",
@ -61,7 +61,7 @@ static const char *ospf_network_type_str[] =
"LOOPBACK" "LOOPBACK"
}; };
/* Utility functions. */ /* Utility functions. */
static int static int
ospf_str2area_id (const char *str, struct in_addr *area_id, int *format) ospf_str2area_id (const char *str, struct in_addr *area_id, int *format)
@ -94,7 +94,7 @@ ospf_str2area_id (const char *str, struct in_addr *area_id, int *format)
return 0; return 0;
} }
static int static int
str2metric (const char *str, int *metric) str2metric (const char *str, int *metric)
{ {
@ -142,7 +142,7 @@ ospf_oi_count (struct interface *ifp)
return i; return i;
} }
DEFUN (router_ospf, DEFUN (router_ospf,
router_ospf_cmd, router_ospf_cmd,
"router ospf", "router ospf",
@ -490,7 +490,7 @@ DEFUN (no_ospf_network_area,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (ospf_area_range, DEFUN (ospf_area_range,
ospf_area_range_cmd, ospf_area_range_cmd,
"area (A.B.C.D|<0-4294967295>) range A.B.C.D/M", "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M",
@ -634,7 +634,7 @@ ALIAS (no_ospf_area_range,
"Advertise this range (default)\n" "Advertise this range (default)\n"
"User specified metric for this range\n" "User specified metric for this range\n"
"Advertised metric for this range\n") "Advertised metric for this range\n")
DEFUN (ospf_area_range_substitute, DEFUN (ospf_area_range_substitute,
ospf_area_range_substitute_cmd, ospf_area_range_substitute_cmd,
"area (A.B.C.D|<0-4294967295>) range A.B.C.D/M substitute A.B.C.D/M", "area (A.B.C.D|<0-4294967295>) range A.B.C.D/M substitute A.B.C.D/M",
@ -686,7 +686,7 @@ DEFUN (no_ospf_area_range_substitute,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
/* Command Handler Logic in VLink stuff is delicate!! /* Command Handler Logic in VLink stuff is delicate!!
ALTER AT YOUR OWN RISK!!!! ALTER AT YOUR OWN RISK!!!!
@ -1382,7 +1382,7 @@ ALIAS (no_ospf_area_vlink,
VLINK_HELPSTR_AUTHTYPE_SIMPLE VLINK_HELPSTR_AUTHTYPE_SIMPLE
VLINK_HELPSTR_AUTH_MD5) VLINK_HELPSTR_AUTH_MD5)
DEFUN (ospf_area_shortcut, DEFUN (ospf_area_shortcut,
ospf_area_shortcut_cmd, ospf_area_shortcut_cmd,
"area (A.B.C.D|<0-4294967295>) shortcut (default|enable|disable)", "area (A.B.C.D|<0-4294967295>) shortcut (default|enable|disable)",
@ -1450,7 +1450,7 @@ DEFUN (no_ospf_area_shortcut,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (ospf_area_stub, DEFUN (ospf_area_stub,
ospf_area_stub_cmd, ospf_area_stub_cmd,
"area (A.B.C.D|<0-4294967295>) stub", "area (A.B.C.D|<0-4294967295>) stub",
@ -1971,7 +1971,7 @@ DEFUN (no_ospf_area_filter_list,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (ospf_area_authentication_message_digest, DEFUN (ospf_area_authentication_message_digest,
ospf_area_authentication_message_digest_cmd, ospf_area_authentication_message_digest_cmd,
"area (A.B.C.D|<0-4294967295>) authentication message-digest", "area (A.B.C.D|<0-4294967295>) authentication message-digest",
@ -2042,7 +2042,7 @@ DEFUN (no_ospf_area_authentication,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (ospf_abr_type, DEFUN (ospf_abr_type,
ospf_abr_type_cmd, ospf_abr_type_cmd,
"ospf abr-type (cisco|ibm|shortcut|standard)", "ospf abr-type (cisco|ibm|shortcut|standard)",
@ -2206,7 +2206,7 @@ ALIAS (no_ospf_compatible_rfc1583,
NO_STR NO_STR
"OSPF specific commands\n" "OSPF specific commands\n"
"Disable the RFC1583Compatibility flag\n") "Disable the RFC1583Compatibility flag\n")
static int static int
ospf_timers_spf_set (struct vty *vty, unsigned int delay, ospf_timers_spf_set (struct vty *vty, unsigned int delay,
unsigned int hold, unsigned int hold,
@ -2297,7 +2297,7 @@ ALIAS_DEPRECATED (no_ospf_timers_throttle_spf,
NO_STR NO_STR
"Adjust routing timers\n" "Adjust routing timers\n"
"OSPF SPF timers\n") "OSPF SPF timers\n")
DEFUN (ospf_neighbor, DEFUN (ospf_neighbor,
ospf_neighbor_cmd, ospf_neighbor_cmd,
"neighbor A.B.C.D", "neighbor A.B.C.D",
@ -2430,7 +2430,7 @@ ALIAS (no_ospf_neighbor,
"Dead Neighbor Polling interval\n" "Dead Neighbor Polling interval\n"
"Seconds\n") "Seconds\n")
DEFUN (ospf_refresh_timer, ospf_refresh_timer_cmd, DEFUN (ospf_refresh_timer, ospf_refresh_timer_cmd,
"refresh timer <10-1800>", "refresh timer <10-1800>",
"Adjust refresh parameters\n" "Adjust refresh parameters\n"
@ -2548,7 +2548,7 @@ const char *ospf_shortcut_mode_descr_str[] =
}; };
static void static void
show_ip_ospf_area (struct vty *vty, struct ospf_area *area) show_ip_ospf_area (struct vty *vty, struct ospf_area *area)
{ {
@ -2800,7 +2800,7 @@ DEFUN (show_ip_ospf,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
static void static void
show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf, show_ip_ospf_interface_sub (struct vty *vty, struct ospf *ospf,
struct interface *ifp) struct interface *ifp)
@ -3429,7 +3429,7 @@ DEFUN (show_ip_ospf_neighbor_int_detail,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
/* Show functions */ /* Show functions */
static int static int
show_lsa_summary (struct vty *vty, struct ospf_lsa *lsa, int self) show_lsa_summary (struct vty *vty, struct ospf_lsa *lsa, int self)
@ -4302,7 +4302,7 @@ ALIAS (show_ip_ospf_database_type_adv_router,
OSPF_LSA_TYPES_DESC OSPF_LSA_TYPES_DESC
"Self-originated link states\n") "Self-originated link states\n")
DEFUN (ip_ospf_authentication_args, DEFUN (ip_ospf_authentication_args,
ip_ospf_authentication_args_addr_cmd, ip_ospf_authentication_args_addr_cmd,
"ip ospf authentication (null|message-digest) A.B.C.D", "ip ospf authentication (null|message-digest) A.B.C.D",
@ -6262,7 +6262,7 @@ ALIAS (no_ip_ospf_mtu_ignore,
"IP Information\n" "IP Information\n"
"OSPF interface commands\n" "OSPF interface commands\n"
"Disable mtu mismatch detection\n") "Disable mtu mismatch detection\n")
DEFUN (ospf_max_metric_router_lsa_admin, DEFUN (ospf_max_metric_router_lsa_admin,
ospf_max_metric_router_lsa_admin_cmd, ospf_max_metric_router_lsa_admin_cmd,
"max-metric router-lsa administrative", "max-metric router-lsa administrative",
@ -6431,7 +6431,7 @@ config_write_stub_router (struct vty *vty, struct ospf *ospf)
} }
return; return;
} }
static void static void
show_ip_ospf_route_network (struct vty *vty, struct route_table *rt) show_ip_ospf_route_network (struct vty *vty, struct route_table *rt)
{ {
@ -6650,7 +6650,7 @@ DEFUN (show_ip_ospf_route,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
const char *ospf_abr_type_str[] = const char *ospf_abr_type_str[] =
{ {
"unknown", "unknown",
@ -6679,7 +6679,7 @@ area_id2str (char *buf, int length, struct ospf_area *area)
sprintf (buf, "%lu", (unsigned long) ntohl (area->area_id.s_addr)); sprintf (buf, "%lu", (unsigned long) ntohl (area->area_id.s_addr));
} }
const char *ospf_int_type_str[] = const char *ospf_int_type_str[] =
{ {
"unknown", /* should never be used. */ "unknown", /* should never be used. */
@ -7113,7 +7113,7 @@ config_write_virtual_link (struct vty *vty, struct ospf *ospf)
return 0; return 0;
} }
static int static int
config_write_ospf_redistribute (struct vty *vty, struct ospf *ospf) config_write_ospf_redistribute (struct vty *vty, struct ospf *ospf)
{ {
@ -7406,7 +7406,7 @@ ospf_vty_show_init (void)
install_element (ENABLE_NODE, &show_ip_ospf_border_routers_cmd); install_element (ENABLE_NODE, &show_ip_ospf_border_routers_cmd);
} }
/* ospfd's interface node. */ /* ospfd's interface node. */
static struct cmd_node interface_node = static struct cmd_node interface_node =
{ {
@ -7558,7 +7558,7 @@ static struct cmd_node ospf_node =
1 1
}; };
/* Install OSPF related vty commands. */ /* Install OSPF related vty commands. */
void void
ospf_vty_init (void) ospf_vty_init (void)

2
ospfd/ospf_zebra.c
View File

@ -918,7 +918,7 @@ ospf_zebra_read_ipv4 (int command, struct zclient *zclient,
return 0; return 0;
} }
int int
ospf_distribute_list_out_set (struct ospf *ospf, int type, const char *name) ospf_distribute_list_out_set (struct ospf *ospf, int type, const char *name)

20
ospfd/ospfd.c
View File

@ -53,7 +53,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
#include "ospfd/ospf_route.h" #include "ospfd/ospf_route.h"
#include "ospfd/ospf_ase.h" #include "ospfd/ospf_ase.h"
/* OSPF process wide configuration. */ /* OSPF process wide configuration. */
static struct ospf_master ospf_master; static struct ospf_master ospf_master;
@ -64,7 +64,7 @@ struct ospf_master *om;
extern struct zclient *zclient; extern struct zclient *zclient;
extern struct in_addr router_id_zebra; extern struct in_addr router_id_zebra;
static void ospf_remove_vls_through_area (struct ospf *, struct ospf_area *); static void ospf_remove_vls_through_area (struct ospf *, struct ospf_area *);
static void ospf_network_free (struct ospf *, struct ospf_network *); static void ospf_network_free (struct ospf *, struct ospf_network *);
static void ospf_area_free (struct ospf_area *); static void ospf_area_free (struct ospf_area *);
@ -76,7 +76,7 @@ static int ospf_network_match_iface (const struct connected *,
static void ospf_finish_final (struct ospf *); static void ospf_finish_final (struct ospf *);
#define OSPF_EXTERNAL_LSA_ORIGINATE_DELAY 1 #define OSPF_EXTERNAL_LSA_ORIGINATE_DELAY 1
void void
ospf_router_id_update (struct ospf *ospf) ospf_router_id_update (struct ospf *ospf)
{ {
@ -139,7 +139,7 @@ ospf_router_id_update (struct ospf *ospf)
ospf_if_update (ospf, ifp); ospf_if_update (ospf, ifp);
} }
} }
/* For OSPF area sort by area id. */ /* For OSPF area sort by area id. */
static int static int
ospf_area_id_cmp (struct ospf_area *a1, struct ospf_area *a2) ospf_area_id_cmp (struct ospf_area *a1, struct ospf_area *a2)
@ -279,7 +279,7 @@ ospf_get ()
return ospf; return ospf;
} }
/* Handle the second half of deferred shutdown. This is called either /* Handle the second half of deferred shutdown. This is called either
* from the deferred-shutdown timer thread, or directly through * from the deferred-shutdown timer thread, or directly through
* ospf_deferred_shutdown_check. * ospf_deferred_shutdown_check.
@ -354,7 +354,7 @@ ospf_deferred_shutdown_check (struct ospf *ospf)
timeout); timeout);
return; return;
} }
/* Shut down the entire process */ /* Shut down the entire process */
void void
ospf_terminate (void) ospf_terminate (void)
@ -563,7 +563,7 @@ ospf_finish_final (struct ospf *ospf)
XFREE (MTYPE_OSPF_TOP, ospf); XFREE (MTYPE_OSPF_TOP, ospf);
} }
/* allocate new OSPF Area object */ /* allocate new OSPF Area object */
static struct ospf_area * static struct ospf_area *
ospf_area_new (struct ospf *ospf, struct in_addr area_id) ospf_area_new (struct ospf *ospf, struct in_addr area_id)
@ -719,7 +719,7 @@ ospf_area_del_if (struct ospf_area *area, struct ospf_interface *oi)
listnode_delete (area->oiflist, oi); listnode_delete (area->oiflist, oi);
} }
/* Config network statement related functions. */ /* Config network statement related functions. */
static struct ospf_network * static struct ospf_network *
ospf_network_new (struct in_addr area_id, int format) ospf_network_new (struct in_addr area_id, int format)
@ -987,7 +987,7 @@ ospf_remove_vls_through_area (struct ospf *ospf, struct ospf_area *area)
ospf_vl_delete (ospf, vl_data); ospf_vl_delete (ospf, vl_data);
} }
static const struct message ospf_area_type_msg[] = static const struct message ospf_area_type_msg[] =
{ {
{ OSPF_AREA_DEFAULT, "Default" }, { OSPF_AREA_DEFAULT, "Default" },
@ -1350,7 +1350,7 @@ ospf_timers_refresh_unset (struct ospf *ospf)
return 1; return 1;
} }
static struct ospf_nbr_nbma * static struct ospf_nbr_nbma *
ospf_nbr_nbma_new (void) ospf_nbr_nbma_new (void)
{ {

2
ripd/rip_debug.c
View File

@ -27,7 +27,7 @@
unsigned long rip_debug_event = 0; unsigned long rip_debug_event = 0;
unsigned long rip_debug_packet = 0; unsigned long rip_debug_packet = 0;
unsigned long rip_debug_zebra = 0; unsigned long rip_debug_zebra = 0;
DEFUN (show_debugging_rip, DEFUN (show_debugging_rip,
show_debugging_rip_cmd, show_debugging_rip_cmd,
"show debugging rip", "show debugging rip",

16
ripd/rip_interface.c
View File

@ -41,7 +41,7 @@
#include "ripd/ripd.h" #include "ripd/ripd.h"
#include "ripd/rip_debug.h" #include "ripd/rip_debug.h"
#include "ripd/rip_interface.h" #include "ripd/rip_interface.h"
/* static prototypes */ /* static prototypes */
static void rip_enable_apply (struct interface *); static void rip_enable_apply (struct interface *);
static void rip_passive_interface_apply (struct interface *); static void rip_passive_interface_apply (struct interface *);
@ -49,7 +49,7 @@ static int rip_if_down(struct interface *ifp);
static int rip_enable_if_lookup (const char *ifname); static int rip_enable_if_lookup (const char *ifname);
static int rip_enable_network_lookup2 (struct connected *connected); static int rip_enable_network_lookup2 (struct connected *connected);
static void rip_enable_apply_all (void); static void rip_enable_apply_all (void);
struct message ri_version_msg[] = struct message ri_version_msg[] =
{ {
{RI_RIP_VERSION_1, "1"}, {RI_RIP_VERSION_1, "1"},
@ -68,7 +68,7 @@ struct route_table *rip_enable_network;
/* Vector to store passive-interface name. */ /* Vector to store passive-interface name. */
static int passive_default; /* are we in passive-interface default mode? */ static int passive_default; /* are we in passive-interface default mode? */
vector Vrip_passive_nondefault; vector Vrip_passive_nondefault;
/* Join to the RIP version 2 multicast group. */ /* Join to the RIP version 2 multicast group. */
static int static int
ipv4_multicast_join (int sock, ipv4_multicast_join (int sock,
@ -109,7 +109,7 @@ ipv4_multicast_leave (int sock,
return ret; return ret;
} }
/* Allocate new RIP's interface configuration. */ /* Allocate new RIP's interface configuration. */
static struct rip_interface * static struct rip_interface *
rip_interface_new (void) rip_interface_new (void)
@ -754,7 +754,7 @@ rip_interface_address_delete (int command, struct zclient *zclient,
return 0; return 0;
} }
/* Check interface is enabled by network statement. */ /* Check interface is enabled by network statement. */
/* Check wether the interface has at least a connected prefix that /* Check wether the interface has at least a connected prefix that
* is within the ripng_enable_network table. */ * is within the ripng_enable_network table. */
@ -1142,7 +1142,7 @@ rip_clean_network ()
vector_slot (rip_enable_interface, i) = NULL; vector_slot (rip_enable_interface, i) = NULL;
} }
} }
/* Utility function for looking up passive interface settings. */ /* Utility function for looking up passive interface settings. */
static int static int
rip_passive_nondefault_lookup (const char *ifname) rip_passive_nondefault_lookup (const char *ifname)
@ -1229,7 +1229,7 @@ rip_passive_nondefault_clean (void)
} }
rip_passive_interface_apply_all (); rip_passive_interface_apply_all ();
} }
/* RIP enable network or interface configuration. */ /* RIP enable network or interface configuration. */
DEFUN (rip_network, DEFUN (rip_network,
rip_network_cmd, rip_network_cmd,
@ -1913,7 +1913,7 @@ DEFUN (no_rip_passive_interface,
else else
return rip_passive_nondefault_unset (vty, ifname); return rip_passive_nondefault_unset (vty, ifname);
} }
/* Write rip configuration of each interface. */ /* Write rip configuration of each interface. */
static int static int
rip_interface_config_write (struct vty *vty) rip_interface_config_write (struct vty *vty)

4
ripd/rip_main.c
View File

@ -126,7 +126,7 @@ Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
exit (status); exit (status);
} }
/* SIGHUP handler. */ /* SIGHUP handler. */
static void static void
sighup (void) sighup (void)
@ -183,7 +183,7 @@ static struct quagga_signal_t ripd_signals[] =
.handler = &sigint, .handler = &sigint,
}, },
}; };
/* Main routine of ripd. */ /* Main routine of ripd. */
int int
main (int argc, char **argv) main (int argc, char **argv)

2
ripd/rip_peer.c
View File

@ -32,7 +32,7 @@
/* Linked list of RIP peer. */ /* Linked list of RIP peer. */
struct list *peer_list; struct list *peer_list;
static struct rip_peer * static struct rip_peer *
rip_peer_new (void) rip_peer_new (void)
{ {

14
ripd/rip_routemap.c
View File

@ -32,7 +32,7 @@
#include "plist.h" #include "plist.h"
#include "ripd/ripd.h" #include "ripd/ripd.h"
struct rip_metric_modifier struct rip_metric_modifier
{ {
enum enum
@ -160,7 +160,7 @@ rip_route_map_update (const char *notused)
} }
} }
} }
/* `match metric METRIC' */ /* `match metric METRIC' */
/* Match function return 1 if match is success else return zero. */ /* Match function return 1 if match is success else return zero. */
static route_map_result_t static route_map_result_t
@ -323,7 +323,7 @@ static struct route_map_rule_cmd route_match_ip_next_hop_cmd =
route_match_ip_next_hop_compile, route_match_ip_next_hop_compile,
route_match_ip_next_hop_free route_match_ip_next_hop_free
}; };
/* `match ip next-hop prefix-list PREFIX_LIST' */ /* `match ip next-hop prefix-list PREFIX_LIST' */
static route_map_result_t static route_map_result_t
@ -370,7 +370,7 @@ static 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_compile,
route_match_ip_next_hop_prefix_list_free route_match_ip_next_hop_prefix_list_free
}; };
/* `match ip address IP_ACCESS_LIST' */ /* `match ip address IP_ACCESS_LIST' */
/* Match function should return 1 if match is success else return /* Match function should return 1 if match is success else return
@ -416,7 +416,7 @@ static struct route_map_rule_cmd route_match_ip_address_cmd =
route_match_ip_address_compile, route_match_ip_address_compile,
route_match_ip_address_free route_match_ip_address_free
}; };
/* `match ip address prefix-list PREFIX_LIST' */ /* `match ip address prefix-list PREFIX_LIST' */
static route_map_result_t static route_map_result_t
@ -507,7 +507,7 @@ struct route_map_rule_cmd route_match_tag_cmd =
route_match_tag_compile, route_match_tag_compile,
route_match_tag_free route_match_tag_free
}; };
/* `set metric METRIC' */ /* `set metric METRIC' */
/* Set metric to attribute. */ /* Set metric to attribute. */
@ -718,7 +718,7 @@ static struct route_map_rule_cmd route_set_tag_cmd =
route_set_tag_compile, route_set_tag_compile,
route_set_tag_free route_set_tag_free
}; };
#define MATCH_STR "Match values from routing table\n" #define MATCH_STR "Match values from routing table\n"
#define SET_STR "Set values in destination routing protocol\n" #define SET_STR "Set values in destination routing protocol\n"

6
ripd/rip_snmp.c
View File

@ -33,7 +33,7 @@
#include "smux.h" #include "smux.h"
#include "ripd/ripd.h" #include "ripd/ripd.h"
/* RIPv2-MIB. */ /* RIPv2-MIB. */
#define RIPV2MIB 1,3,6,1,2,1,23 #define RIPV2MIB 1,3,6,1,2,1,23
@ -76,7 +76,7 @@
#define TIMETICKS ASN_TIMETICKS #define TIMETICKS ASN_TIMETICKS
#define IPADDRESS ASN_IPADDRESS #define IPADDRESS ASN_IPADDRESS
#define STRING ASN_OCTET_STR #define STRING ASN_OCTET_STR
/* Define SNMP local variables. */ /* Define SNMP local variables. */
SNMP_LOCAL_VARIABLES SNMP_LOCAL_VARIABLES
@ -149,7 +149,7 @@ struct variable rip_variables[] =
}; };
extern struct thread_master *master; extern struct thread_master *master;
static u_char * static u_char *
rip2Globals (struct variable *v, oid name[], size_t *length, rip2Globals (struct variable *v, oid name[], size_t *length,
int exact, size_t *var_len, WriteMethod **write_method) int exact, size_t *var_len, WriteMethod **write_method)

8
ripd/rip_zebra.c
View File

@ -33,7 +33,7 @@
/* All information about zebra. */ /* All information about zebra. */
struct zclient *zclient = NULL; struct zclient *zclient = NULL;
/* RIPd to zebra command interface. */ /* RIPd to zebra command interface. */
void void
rip_zebra_ipv4_add (struct prefix_ipv4 *p, struct in_addr *nexthop, rip_zebra_ipv4_add (struct prefix_ipv4 *p, struct in_addr *nexthop,
@ -196,7 +196,7 @@ rip_routemap_unset (int type, const char *name)
return 0; return 0;
} }
/* Redistribution types */ /* Redistribution types */
static struct { static struct {
int type; int type;
@ -551,7 +551,7 @@ DEFUN (no_rip_redistribute_type_metric_routemap,
return CMD_WARNING; return CMD_WARNING;
} }
/* Default information originate. */ /* Default information originate. */
DEFUN (rip_default_information_originate, DEFUN (rip_default_information_originate,
@ -597,7 +597,7 @@ DEFUN (no_rip_default_information_originate,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
/* RIP configuration write function. */ /* RIP configuration write function. */
static int static int
config_write_zebra (struct vty *vty) config_write_zebra (struct vty *vty)

20
ripd/ripd.c
View File

@ -61,20 +61,20 @@ long rip_global_route_changes = 0;
/* RIP queries. */ /* RIP queries. */
long rip_global_queries = 0; long rip_global_queries = 0;
/* Prototypes. */ /* Prototypes. */
static void rip_event (enum rip_event, int); static void rip_event (enum rip_event, int);
static void rip_output_process (struct connected *, struct sockaddr_in *, int, u_char); static void rip_output_process (struct connected *, struct sockaddr_in *, int, u_char);
static int rip_triggered_update (struct thread *); static int rip_triggered_update (struct thread *);
static int rip_update_jitter (unsigned long); static int rip_update_jitter (unsigned long);
/* RIP output routes type. */ /* RIP output routes type. */
enum enum
{ {
rip_all_route, rip_all_route,
rip_changed_route rip_changed_route
}; };
/* RIP command strings. */ /* RIP command strings. */
static const struct message rip_msg[] = static const struct message rip_msg[] =
{ {
@ -86,7 +86,7 @@ static const struct message rip_msg[] =
{RIP_POLL_ENTRY, "POLL ENTRY"}, {RIP_POLL_ENTRY, "POLL ENTRY"},
{0, NULL}, {0, NULL},
}; };
/* Utility function to set boradcast option to the socket. */ /* Utility function to set boradcast option to the socket. */
static int static int
sockopt_broadcast (int sock) sockopt_broadcast (int sock)
@ -2774,7 +2774,7 @@ rip_request_send (struct sockaddr_in *to, struct interface *ifp,
} }
return sizeof (rip_packet); return sizeof (rip_packet);
} }
static int static int
rip_update_jitter (unsigned long time) rip_update_jitter (unsigned long time)
{ {
@ -2828,7 +2828,7 @@ rip_event (enum rip_event event, int sock)
break; break;
} }
} }
DEFUN (router_rip, DEFUN (router_rip,
router_rip_cmd, router_rip_cmd,
"router rip", "router rip",
@ -3104,7 +3104,7 @@ ALIAS (no_rip_timers,
"Routing information timeout timer. Default is 180.\n" "Routing information timeout timer. Default is 180.\n"
"Garbage collection timer. Default is 120.\n") "Garbage collection timer. Default is 120.\n")
struct route_table *rip_distance_table; struct route_table *rip_distance_table;
struct rip_distance struct rip_distance
@ -3372,7 +3372,7 @@ DEFUN (no_rip_distance_source_access_list,
rip_distance_unset (vty, argv[0], argv[1], argv[2]); rip_distance_unset (vty, argv[0], argv[1], argv[2]);
return CMD_SUCCESS; return CMD_SUCCESS;
} }
/* Print out routes update time. */ /* Print out routes update time. */
static void static void
rip_vty_out_uptime (struct vty *vty, struct rip_info *rinfo) rip_vty_out_uptime (struct vty *vty, struct rip_info *rinfo)
@ -3696,7 +3696,7 @@ static struct cmd_node rip_node =
"%s(config-router)# ", "%s(config-router)# ",
1 1
}; };
/* Distribute-list update functions. */ /* Distribute-list update functions. */
static void static void
rip_distribute_update (struct distribute *dist) rip_distribute_update (struct distribute *dist)
@ -3787,7 +3787,7 @@ rip_distribute_update_all_wrapper(struct access_list *notused)
{ {
rip_distribute_update_all(NULL); rip_distribute_update_all(NULL);
} }
/* Delete all added rip route. */ /* Delete all added rip route. */
void void
rip_clean (void) rip_clean (void)

2
ripngd/ripng_debug.c
View File

@ -28,7 +28,7 @@
unsigned long ripng_debug_event = 0; unsigned long ripng_debug_event = 0;
unsigned long ripng_debug_packet = 0; unsigned long ripng_debug_packet = 0;
unsigned long ripng_debug_zebra = 0; unsigned long ripng_debug_zebra = 0;
DEFUN (show_debugging_ripng, DEFUN (show_debugging_ripng,
show_debugging_ripng_cmd, show_debugging_ripng_cmd,
"show debugging ripng", "show debugging ripng",

10
ripngd/ripng_interface.c
View File

@ -38,7 +38,7 @@
#include "ripngd/ripngd.h" #include "ripngd/ripngd.h"
#include "ripngd/ripng_debug.h" #include "ripngd/ripng_debug.h"
/* If RFC2133 definition is used. */ /* If RFC2133 definition is used. */
#ifndef IPV6_JOIN_GROUP #ifndef IPV6_JOIN_GROUP
#define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP #define IPV6_JOIN_GROUP IPV6_ADD_MEMBERSHIP
@ -505,7 +505,7 @@ ripng_interface_address_delete (int command, struct zclient *zclient,
return 0; return 0;
} }
/* RIPng enable interface vector. */ /* RIPng enable interface vector. */
vector ripng_enable_if; vector ripng_enable_if;
@ -812,7 +812,7 @@ ripng_enable_apply_all (void)
for (ALL_LIST_ELEMENTS_RO (iflist, node, ifp)) for (ALL_LIST_ELEMENTS_RO (iflist, node, ifp))
ripng_enable_apply (ifp); ripng_enable_apply (ifp);
} }
/* Clear all network and neighbor configuration */ /* Clear all network and neighbor configuration */
void void
ripng_clean_network () ripng_clean_network ()
@ -835,7 +835,7 @@ ripng_clean_network ()
vector_slot (ripng_enable_if, i) = NULL; vector_slot (ripng_enable_if, i) = NULL;
} }
} }
/* Vector to store passive-interface name. */ /* Vector to store passive-interface name. */
vector Vripng_passive_interface; vector Vripng_passive_interface;
@ -1103,7 +1103,7 @@ DEFUN (no_ripng_passive_interface,
{ {
return ripng_passive_interface_unset (vty, argv[0]); return ripng_passive_interface_unset (vty, argv[0]);
} }
static struct ripng_interface * static struct ripng_interface *
ri_new (void) ri_new (void)
{ {

4
ripngd/ripng_main.c
View File

@ -127,7 +127,7 @@ Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
} }
exit (status); exit (status);
} }
/* SIGHUP handler. */ /* SIGHUP handler. */
static void static void
sighup (void) sighup (void)
@ -182,7 +182,7 @@ struct quagga_signal_t ripng_signals[] =
.handler = &sigint, .handler = &sigint,
}, },
}; };
/* RIPngd main routine. */ /* RIPngd main routine. */
int int
main (int argc, char **argv) main (int argc, char **argv)

2
ripngd/ripng_peer.c
View File

@ -38,7 +38,7 @@
/* Linked list of RIPng peer. */ /* Linked list of RIPng peer. */
struct list *peer_list; struct list *peer_list;
static struct ripng_peer * static struct ripng_peer *
ripng_peer_new (void) ripng_peer_new (void)
{ {

12
ripngd/ripng_routemap.c
View File

@ -29,7 +29,7 @@
#include "sockunion.h" #include "sockunion.h"
#include "ripngd/ripngd.h" #include "ripngd/ripngd.h"
struct rip_metric_modifier struct rip_metric_modifier
{ {
enum enum
@ -42,7 +42,7 @@ struct rip_metric_modifier
u_char metric; u_char metric;
}; };
static int static int
ripng_route_match_add (struct vty *vty, struct route_map_index *index, ripng_route_match_add (struct vty *vty, struct route_map_index *index,
const char *command, const char *arg) const char *command, const char *arg)
@ -130,7 +130,7 @@ ripng_route_set_delete (struct vty *vty, struct route_map_index *index,
} }
return CMD_SUCCESS; return CMD_SUCCESS;
} }
/* `match metric METRIC' */ /* `match metric METRIC' */
/* Match function return 1 if match is success else return zero. */ /* Match function return 1 if match is success else return zero. */
static route_map_result_t static route_map_result_t
@ -184,7 +184,7 @@ static struct route_map_rule_cmd route_match_metric_cmd =
route_match_metric_compile, route_match_metric_compile,
route_match_metric_free route_match_metric_free
}; };
/* `match interface IFNAME' */ /* `match interface IFNAME' */
/* Match function return 1 if match is success else return zero. */ /* Match function return 1 if match is success else return zero. */
static route_map_result_t static route_map_result_t
@ -284,7 +284,7 @@ static struct route_map_rule_cmd route_match_tag_cmd =
route_match_tag_compile, route_match_tag_compile,
route_match_tag_free route_match_tag_free
}; };
/* `set metric METRIC' */ /* `set metric METRIC' */
/* Set metric to attribute. */ /* Set metric to attribute. */
@ -496,7 +496,7 @@ static struct route_map_rule_cmd route_set_tag_cmd =
route_set_tag_compile, route_set_tag_compile,
route_set_tag_free route_set_tag_free
}; };
#define MATCH_STR "Match values from routing table\n" #define MATCH_STR "Match values from routing table\n"
#define SET_STR "Set values in destination routing protocol\n" #define SET_STR "Set values in destination routing protocol\n"

4
ripngd/ripng_zebra.c
View File

@ -41,7 +41,7 @@ int ripng_interface_add (int, struct zclient *, zebra_size_t);
int ripng_interface_delete (int, struct zclient *, zebra_size_t); int ripng_interface_delete (int, struct zclient *, zebra_size_t);
int ripng_interface_address_add (int, struct zclient *, zebra_size_t); int ripng_interface_address_add (int, struct zclient *, zebra_size_t);
int ripng_interface_address_delete (int, struct zclient *, zebra_size_t); int ripng_interface_address_delete (int, struct zclient *, zebra_size_t);
void void
ripng_zebra_ipv6_add (struct prefix_ipv6 *p, struct in6_addr *nexthop, ripng_zebra_ipv6_add (struct prefix_ipv6 *p, struct in6_addr *nexthop,
unsigned int ifindex, u_char metric) unsigned int ifindex, u_char metric)
@ -206,7 +206,7 @@ ripng_redistribute_routemap_unset (int type)
ripng->route_map[type].name = NULL; ripng->route_map[type].name = NULL;
ripng->route_map[type].map = NULL; ripng->route_map[type].map = NULL;
} }
/* Redistribution types */ /* Redistribution types */
static struct { static struct {
int type; int type;

8
ripngd/ripngd.c
View File

@ -95,7 +95,7 @@ ripng_info_free (struct ripng_info *rinfo)
{ {
XFREE (MTYPE_RIPNG_ROUTE, rinfo); XFREE (MTYPE_RIPNG_ROUTE, rinfo);
} }
/* Create ripng socket. */ /* Create ripng socket. */
static int static int
ripng_make_socket (void) ripng_make_socket (void)
@ -1886,7 +1886,7 @@ ripng_request (struct interface *ifp)
NULL, ifp); NULL, ifp);
} }
static int static int
ripng_update_jitter (int time) ripng_update_jitter (int time)
{ {
@ -1928,7 +1928,7 @@ ripng_event (enum ripng_event event, int sock)
break; break;
} }
} }
/* Print out routes update time. */ /* Print out routes update time. */
static void static void
@ -2767,7 +2767,7 @@ ripng_distribute_update_all_wrapper (struct access_list *notused)
{ {
ripng_distribute_update_all(NULL); ripng_distribute_update_all(NULL);
} }
/* delete all the added ripng routes. */ /* delete all the added ripng routes. */
void void
ripng_clean() ripng_clean()

4
tests/main.c
View File

@ -95,8 +95,8 @@ Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
} }
exit (status); exit (status);
} }
/* main routine. */ /* main routine. */
int int
main (int argc, char **argv) main (int argc, char **argv)

4
tests/test-checksum.c
View File

@ -24,7 +24,7 @@ typedef uint16_t testoff_t;
/* Fletcher Checksum -- Refer to RFC1008. */ /* Fletcher Checksum -- Refer to RFC1008. */
#define MODX 4102 #define MODX 4102
/* Accumulator phase of checksum */ /* Accumulator phase of checksum */
static static
struct acc_vals struct acc_vals
@ -263,7 +263,7 @@ struct reductions_t {
{ .name = "isisd-mody", .f = reduce_isisd_mody }, { .name = "isisd-mody", .f = reduce_isisd_mody },
{ NULL, NULL }, { NULL, NULL },
}; };
/* The original ospfd checksum */ /* The original ospfd checksum */
static u_int16_t static u_int16_t
ospfd_checksum (u_char *buffer, testsz_t len, testoff_t off) ospfd_checksum (u_char *buffer, testsz_t len, testoff_t off)

2
tests/test-privs.c
View File

@ -74,7 +74,7 @@ Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
} }
exit (status); exit (status);
} }
struct thread_master *master; struct thread_master *master;
/* main routine. */ /* main routine. */
int int

Some files were not shown because too many files have changed in this diff Show More