*: nuke ^L (page feed)
Quagga sources have inherited a slew of Page Feed (^L, \xC) characters
from ancient history. Among other things, these break patchwork's
XML-RPC API because \xC is not a valid character in XML documents.
Nuke them from high orbit.
Patches can be adapted simply by:
sed -e 's%^L%%' -i filename.patch
(you can type page feeds in some environments with Ctrl-V Ctrl-L)
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
diff --git a/bgpd/bgp_advertise.c b/bgpd/bgp_advertise.c
index 666218f..e0fa58d 100644
--- a/bgpd/bgp_advertise.c
+++ b/bgpd/bgp_advertise.c
@@ -35,7 +35,7 @@
#include "bgpd/bgp_packet.h"
#include "bgpd/bgp_fsm.h"
#include "bgpd/bgp_mplsvpn.h"
-
+
/* BGP advertise attribute is used for pack same attribute update into
one packet. To do that we maintain attribute hash in struct
peer. */
@@ -79,7 +79,7 @@
return attrhash_cmp (baa1->attr, baa2->attr);
}
-
+
/* BGP update and withdraw information is stored in BGP advertise
structure. This structure is referred from BGP adjacency
information. */
@@ -151,7 +151,7 @@
baa_free (baa);
}
}
-
+
/* BGP adjacency keeps minimal advertisement information. */
static void
bgp_adj_out_free (struct bgp_adj_out *adj)
@@ -327,7 +327,7 @@
BGP_ADJ_OUT_DEL (rn, adj);
bgp_adj_out_free (adj);
}
-
+
void
bgp_adj_in_set (struct bgp_node *rn, struct peer *peer, struct attr *attr)
{
@@ -376,7 +376,7 @@
bgp_adj_in_remove (rn, adj);
bgp_unlock_node (rn);
}
-
+
void
bgp_sync_init (struct peer *peer)
{
diff --git a/bgpd/bgp_aspath.c b/bgpd/bgp_aspath.c
index a8b078f..e8559be 100644
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -34,7 +34,7 @@
#include "bgpd/bgp_aspath.h"
#include "bgpd/bgp_debug.h"
#include "bgpd/bgp_attr.h"
-
+
/* Attr. Flags and Attr. Type Code. */
#define AS_HEADER_SIZE 2
@@ -90,7 +90,7 @@
/* Stream for SNMP. See aspath_snmp_pathseg */
static struct stream *snmp_stream;
-
+
/* Callers are required to initialize the memory */
static as_t *
assegment_data_new (int num)
@@ -308,7 +308,7 @@
}
return head;
}
-
+
static struct aspath *
aspath_new (void)
{
@@ -1657,7 +1657,7 @@
{
return ashash->count;
}
-
+
/*
Theoretically, one as path can have:
@@ -1811,7 +1811,7 @@
return aspath;
}
-
+
/* Make hash value by raw aspath data. */
unsigned int
aspath_key_make (void *p)
@@ -1868,7 +1868,7 @@
if (snmp_stream)
stream_free (snmp_stream);
}
-
+
/* return and as path value */
const char *
aspath_print (struct aspath *as)
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index f284758..a1fd165 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -38,7 +38,7 @@
#include "bgpd/bgp_debug.h"
#include "bgpd/bgp_packet.h"
#include "bgpd/bgp_ecommunity.h"
-
+
/* Attribute strings for logging. */
static const struct message attr_str [] =
{
@@ -73,7 +73,7 @@
{ BGP_ATTR_FLAG_EXTLEN, "Extended Length" },
};
static const size_t attr_flag_str_max = array_size(attr_flag_str);
-
+
static struct hash *cluster_hash;
static void *
@@ -207,7 +207,7 @@
hash_free (cluster_hash);
cluster_hash = NULL;
}
-
+
/* Unknown transit attribute. */
static struct hash *transit_hash;
@@ -283,7 +283,7 @@
hash_free (transit_hash);
transit_hash = NULL;
}
-
+
/* Attribute hash routines. */
static struct hash *attrhash;
@@ -2055,7 +2055,7 @@
}
return BGP_ATTR_PARSE_PROCEED;
}
-
+
int stream_put_prefix (struct stream *, struct prefix *);
size_t
diff --git a/bgpd/bgp_clist.c b/bgpd/bgp_clist.c
index 6c9976e..b91ab81 100644
--- a/bgpd/bgp_clist.c
+++ b/bgpd/bgp_clist.c
@@ -30,7 +30,7 @@
#include "bgpd/bgp_aspath.h"
#include "bgpd/bgp_regex.h"
#include "bgpd/bgp_clist.h"
-
+
/* Lookup master structure for community-list or
extcommunity-list. */
struct community_list_master *
@@ -262,7 +262,7 @@
{
return (list->head == NULL && list->tail == NULL) ? 1 : 0;
}
-
+
/* Add community-list entry to the list. */
static void
community_list_entry_add (struct community_list *list,
@@ -329,7 +329,7 @@
}
return NULL;
}
-
+
/* Internal function to perform regular expression match for community
attribute. */
static int
@@ -590,7 +590,7 @@
}
return 0;
}
-
+
/* Set community-list. */
int
community_list_set (struct community_list_handler *ch,
diff --git a/bgpd/bgp_damp.c b/bgpd/bgp_damp.c
index 2820f17..0ffafb7 100644
--- a/bgpd/bgp_damp.c
+++ b/bgpd/bgp_damp.c
@@ -42,7 +42,7 @@
used list. */
#define BGP_DAMP_LIST_ADD(N,A) BGP_INFO_ADD(N,A,no_reuse_list)
#define BGP_DAMP_LIST_DEL(N,A) BGP_INFO_DEL(N,A,no_reuse_list)
-
+
/* Calculate reuse list index by penalty value. */
static int
bgp_reuse_index (int penalty)
@@ -86,7 +86,7 @@
else
damp->reuse_list[bdi->index] = bdi->next;
}
-
+
/* Return decayed penalty value. */
int
bgp_damp_decay (time_t tdiff, int penalty)
diff --git a/bgpd/bgp_debug.c b/bgpd/bgp_debug.c
index 726dd86..1d09769 100644
--- a/bgpd/bgp_debug.c
+++ b/bgpd/bgp_debug.c
@@ -290,7 +290,7 @@
code_str, subcode_str, bgp_notify->length,
bgp_notify->data ? bgp_notify->data : "");
}
-
+
/* Debug option setting interface. */
unsigned long bgp_debug_option = 0;
diff --git a/bgpd/bgp_dump.c b/bgpd/bgp_dump.c
index edb725a..a3c9526 100644
--- a/bgpd/bgp_dump.c
+++ b/bgpd/bgp_dump.c
@@ -33,7 +33,7 @@
#include "bgpd/bgp_route.h"
#include "bgpd/bgp_attr.h"
#include "bgpd/bgp_dump.h"
-
+
enum bgp_dump_type
{
BGP_DUMP_ALL,
@@ -89,7 +89,7 @@
/* Dump whole BGP table is very heavy process. */
struct thread *t_bgp_dump_routes;
-
+
/* Some define for BGP packet dump. */
static FILE *
bgp_dump_open_file (struct bgp_dump *bgp_dump)
@@ -535,7 +535,7 @@
if (type == BGP_MSG_UPDATE)
bgp_dump_packet_func (&bgp_dump_updates, peer, packet);
}
-
+
static unsigned int
bgp_dump_parse_time (const char *str)
{
@@ -845,7 +845,7 @@
}
return 0;
}
-
+
/* Initialize BGP packet dump functionality. */
void
bgp_dump_init (void)
diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
index 5722425..8a326a8 100644
--- a/bgpd/bgp_ecommunity.c
+++ b/bgpd/bgp_ecommunity.c
@@ -31,7 +31,7 @@
/* Hash of community attribute. */
static struct hash *ecomhash;
-
+
/* Allocate a new ecommunities. */
static struct ecommunity *
ecommunity_new (void)
@@ -277,7 +277,7 @@
hash_free (ecomhash);
ecomhash = NULL;
}
-
+
/* Extended Communities token enum. */
enum ecommunity_token
{
diff --git a/bgpd/bgp_filter.c b/bgpd/bgp_filter.c
index 8ee62b0..fd8ece6 100644
--- a/bgpd/bgp_filter.c
+++ b/bgpd/bgp_filter.c
@@ -84,7 +84,7 @@
struct as_filter *head;
struct as_filter *tail;
};
-
+
/* ip as-path access-list 10 permit AS1. */
static struct as_list_master as_list_master =
@@ -370,7 +370,7 @@
if (as_list_master.delete_hook)
(*as_list_master.delete_hook) ();
}
-
+
static int
as_filter_match (struct as_filter *asfilter, struct aspath *aspath)
{
@@ -412,7 +412,7 @@
{
as_list_master.delete_hook = func;
}
-
+
static int
as_list_dup_check (struct as_list *aslist, struct as_filter *new)
{
diff --git a/bgpd/bgp_fsm.c b/bgpd/bgp_fsm.c
index fba9427..112c34a 100644
--- a/bgpd/bgp_fsm.c
+++ b/bgpd/bgp_fsm.c
@@ -43,7 +43,7 @@
#ifdef HAVE_SNMP
#include "bgpd/bgp_snmp.h"
#endif /* HAVE_SNMP */
-
+
/* BGP FSM (finite state machine) has three types of functions. Type
one is thread functions. Type two is event functions. Type three
is FSM functions. Timer functions are set by bgp_timer_set
@@ -928,7 +928,7 @@
zlog (peer->log, LOG_DEBUG, "%s [FSM] bgp_ignore called", peer->host);
return 0;
}
-
+
/* Finite State Machine structure */
static const struct {
int (*func) (struct peer *);
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 1be6504..5026b5e 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -171,7 +171,7 @@
exit (status);
}
-
+
/* SIGHUP handler. */
void
sighup (void)
@@ -314,7 +314,7 @@
exit (status);
}
-
+
/* Main routine of bgpd. Treatment of argument and start bgp finite
state machine is handled at here. */
int
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index 6c7cf54..c052744 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -47,7 +47,7 @@
union sockunion su;
struct thread *thread;
};
-
+
/*
* Set MD5 key for the socket, for the given IPv4 peer address.
* If the password is NULL or zero-length, the option will be disabled.
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index e23155c..5b1d13a 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -45,7 +45,7 @@
#ifdef HAVE_IPV6
struct bgp_nexthop_cache *zlookup_query_ipv6 (struct in6_addr *);
#endif /* HAVE_IPV6 */
-
+
/* Only one BGP scan thread are activated at the same time. */
static struct thread *bgp_scan_thread = NULL;
@@ -68,7 +68,7 @@
/* BGP nexthop lookup query client. */
struct zclient *zlookup = NULL;
-
+
/* Add nexthop to the end of the list. */
static void
bnc_nexthop_add (struct bgp_nexthop_cache *bnc, struct nexthop *nexthop)
@@ -109,7 +109,7 @@
bnc_nexthop_free (bnc);
XFREE (MTYPE_BGP_NEXTHOP_CACHE, bnc);
}
-
+
static int
bgp_nexthop_same (struct nexthop *next1, struct nexthop *next2)
{
@@ -623,7 +623,7 @@
}
}
-
+
struct bgp_connected_ref
{
unsigned int refcnt;
@@ -781,7 +781,7 @@
return 0;
}
-
+
static struct bgp_nexthop_cache *
zlookup_read (void)
{
@@ -1243,7 +1243,7 @@
return 0;
}
-
+
DEFUN (bgp_scan_time,
bgp_scan_time_cmd,
"bgp scan-time <5-60>",
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c
index d5f2417..80651f1 100644
--- a/bgpd/bgp_packet.c
+++ b/bgpd/bgp_packet.c
@@ -49,7 +49,7 @@
#include "bgpd/bgp_vty.h"
int stream_put_prefix (struct stream *, struct prefix *);
-
+
/* Set up BGP packet marker and packet type. */
static int
bgp_packet_set_marker (struct stream *s, u_char type)
@@ -1166,7 +1166,7 @@
BGP_WRITE_ON (peer->t_write, bgp_write, peer->fd);
}
-
+
/* RFC1771 6.8 Connection collision detection. */
static int
bgp_collision_detect (struct peer *new, struct in_addr remote_id)
@@ -2381,7 +2381,7 @@
/* Parse packet. */
return bgp_capability_msg_parse (peer, pnt, size);
}
-
+
/* BGP read utility function. */
static int
bgp_read_packet (struct peer *peer)
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index a919b54..f421ca5 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -59,7 +59,7 @@
/* Extern from bgp_dump.c */
extern const char *bgp_origin_str[];
extern const char *bgp_origin_long_str[];
-
+
static struct bgp_node *
bgp_afi_node_get (struct bgp_table *table, afi_t afi, safi_t safi, struct prefix *p,
struct prefix_rd *prd)
@@ -89,7 +89,7 @@
return rn;
}
-
+
/* Allocate bgp_info_extra */
static struct bgp_info_extra *
bgp_info_extra_new (void)
@@ -683,7 +683,7 @@
}
return 0;
}
-
+
static int
bgp_input_modifier (struct peer *peer, struct prefix *p, struct attr *attr,
afi_t afi, safi_t safi)
@@ -721,7 +721,7 @@
}
return RMAP_PERMIT;
}
-
+
static int
bgp_export_modifier (struct peer *rsclient, struct peer *peer,
struct prefix *p, struct attr *attr, afi_t afi, safi_t safi)
@@ -793,7 +793,7 @@
}
return RMAP_PERMIT;
}
-
+
static int
bgp_announce_check (struct bgp_info *ri, struct peer *peer, struct prefix *p,
struct attr *attr, afi_t afi, safi_t safi)
@@ -2468,7 +2468,7 @@
return 0;
}
-
+
void
bgp_default_originate (struct peer *peer, afi_t afi, safi_t safi, int withdraw)
{
@@ -2571,7 +2571,7 @@
bgp_attr_extra_free (&attr);
aspath_unintern (&aspath);
}
-
+
static void
bgp_announce_table (struct peer *peer, afi_t afi, safi_t safi,
struct bgp_table *table, int rsclient)
@@ -2642,7 +2642,7 @@
for (safi = SAFI_UNICAST; safi < SAFI_MAX; safi++)
bgp_announce_route (peer, afi, safi);
}
-
+
static void
bgp_soft_reconfig_table_rsclient (struct peer *rsclient, afi_t afi,
safi_t safi, struct bgp_table *table, struct prefix_rd *prd)
@@ -2686,7 +2686,7 @@
bgp_soft_reconfig_table_rsclient (rsclient, afi, safi, table, &prd);
}
}
-
+
static void
bgp_soft_reconfig_table (struct peer *peer, afi_t afi, safi_t safi,
struct bgp_table *table, struct prefix_rd *prd)
@@ -2744,7 +2744,7 @@
bgp_soft_reconfig_table (peer, afi, safi, table, &prd);
}
}
-
+
struct bgp_clear_node_queue
{
@@ -3038,7 +3038,7 @@
}
}
}
-
+
/* Delete all kernel routes. */
void
bgp_cleanup_routes (void)
@@ -3079,7 +3079,7 @@
access_list_reset ();
prefix_list_reset ();
}
-
+
/* Parse NLRI stream. Withdraw NLRI is recognized by NULL attr
value. */
int
@@ -3242,7 +3242,7 @@
}
return 0;
}
-
+
static struct bgp_static *
bgp_static_new (void)
{
@@ -4009,7 +4009,7 @@
return CMD_SUCCESS;
}
-
+
DEFUN (bgp_network,
bgp_network_cmd,
"network A.B.C.D/M",
@@ -4467,7 +4467,7 @@
"AS-Path hopcount limit attribute\n"
"AS-Pathlimit TTL, in number of AS-Path hops\n")
#endif /* HAVE_IPV6 */
-
+
/* Aggreagete address:
advertise-map Set condition to advertise attribute
@@ -5378,7 +5378,7 @@
"Aggregate prefix\n"
"Filter more specific routes from updates\n")
#endif /* HAVE_IPV6 */
-
+
/* Redistribute route treatment. */
void
bgp_redistribute_add (struct prefix *p, const struct in_addr *nexthop,
@@ -5578,7 +5578,7 @@
}
}
}
-
+
/* Static function to display route. */
static void
route_vty_out_route (struct prefix *p, struct vty *vty)
@@ -7103,7 +7103,7 @@
return bgp_show_route (vty, NULL, argv[0], AFI_IP6, SAFI_MULTICAST, NULL, 1);
}
#endif
-
+
static int
bgp_show_regexp (struct vty *vty, int argc, const char **argv, afi_t afi,
@@ -7247,7 +7247,7 @@
bgp_show_type_regexp);
}
#endif /* HAVE_IPV6 */
-
+
static int
bgp_show_prefix_list (struct vty *vty, const char *prefix_list_str, afi_t afi,
safi_t safi, enum bgp_show_type type)
@@ -7362,7 +7362,7 @@
bgp_show_type_prefix_list);
}
#endif /* HAVE_IPV6 */
-
+
static int
bgp_show_filter_list (struct vty *vty, const char *filter, afi_t afi,
safi_t safi, enum bgp_show_type type)
@@ -7476,7 +7476,7 @@
bgp_show_type_filter_list);
}
#endif /* HAVE_IPV6 */
-
+
static int
bgp_show_route_map (struct vty *vty, const char *rmap_str, afi_t afi,
safi_t safi, enum bgp_show_type type)
@@ -7561,7 +7561,7 @@
"Address family\n"
"Display routes matching the route-map\n"
"A route-map to match on\n")
-
+
DEFUN (show_ip_bgp_cidr_only,
show_ip_bgp_cidr_only_cmd,
"show ip bgp cidr-only",
@@ -7605,7 +7605,7 @@
return bgp_show (vty, NULL, AFI_IP, SAFI_UNICAST,
bgp_show_type_cidr_only, NULL);
}
-
+
DEFUN (show_ip_bgp_community_all,
show_ip_bgp_community_all_cmd,
"show ip bgp community",
@@ -7683,7 +7683,7 @@
bgp_show_type_community_all, NULL);
}
#endif /* HAVE_IPV6 */
-
+
static int
bgp_show_community (struct vty *vty, const char *view_name, int argc,
const char **argv, int exact, afi_t afi, safi_t safi)
@@ -8875,7 +8875,7 @@
"Do not export to next AS (well-known community)\n"
"Exact match of the communities")
#endif /* HAVE_IPV6 */
-
+
static int
bgp_show_community_list (struct vty *vty, const char *com, int exact,
afi_t afi, safi_t safi)
@@ -9062,7 +9062,7 @@
return bgp_show_community_list (vty, argv[0], 1, AFI_IP6, SAFI_MULTICAST);
}
#endif /* HAVE_IPV6 */
-
+
static int
bgp_show_prefix_longer (struct vty *vty, const char *prefix, afi_t afi,
safi_t safi, enum bgp_show_type type)
@@ -9254,7 +9254,7 @@
return peer;
}
-
+
enum bgp_stats
{
BGP_STATS_MAXBITLEN = 0,
@@ -9602,7 +9602,7 @@
"Address family\n"
"Address Family modifier\n"
"BGP RIB advertisement statistics\n")
-
+
enum bgp_pcounts
{
PCOUNT_ADJ_IN = 0,
@@ -10142,7 +10142,7 @@
return peer_adj_routes (vty, peer, AFI_IP6, SAFI_MULTICAST, 0);
}
#endif /* HAVE_IPV6 */
-
+
DEFUN (show_ip_bgp_view_neighbor_received_routes,
show_ip_bgp_view_neighbor_received_routes_cmd,
"show ip bgp view WORD neighbors (A.B.C.D|X:X::X:X) received-routes",
@@ -10519,7 +10519,7 @@
"Display information received from a BGP neighbor\n"
"Display the prefixlist filter\n")
#endif /* HAVE_IPV6 */
-
+
static int
bgp_show_neighbor_route (struct vty *vty, struct peer *peer, afi_t afi,
safi_t safi, enum bgp_show_type type)
@@ -11671,7 +11671,7 @@
"IP prefix <network>/<length>, e.g., 3ffe::/16\n")
#endif /* HAVE_IPV6 */
-
+
struct bgp_table *bgp_distance_table;
struct bgp_distance
@@ -11948,7 +11948,7 @@
bgp_distance_unset (vty, argv[0], argv[1], argv[2]);
return CMD_SUCCESS;
}
-
+
DEFUN (bgp_damp_set,
bgp_damp_set_cmd,
"bgp dampening <1-45> <1-20000> <1-20000> <1-255>",
@@ -12043,7 +12043,7 @@
return bgp_show (vty, NULL, AFI_IP, SAFI_UNICAST,
bgp_show_type_flap_statistics, NULL);
}
-
+
/* Display specified route of BGP table. */
static int
bgp_clear_damp_route (struct vty *vty, const char *view_name,
@@ -12207,7 +12207,7 @@
return bgp_clear_damp_route (vty, NULL, prefix_str, AFI_IP,
SAFI_UNICAST, NULL, 0);
}
-
+
static int
bgp_config_write_network_vpnv4 (struct vty *vty, struct bgp *bgp,
afi_t afi, safi_t safi, int *write)
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index 40f2076..6dc88b3 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -100,7 +100,7 @@
set as-path exclude : Done
*/
-
+
/* 'match peer (A.B.C.D|X:X::X:X)' */
/* Compares the peer specified in the 'match peer' clause with the peer
@@ -240,7 +240,7 @@
route_match_ip_address_compile,
route_match_ip_address_free
};
-
+
/* `match ip next-hop IP_ADDRESS' */
/* Match function return 1 if match is success else return zero. */
@@ -292,7 +292,7 @@
route_match_ip_next_hop_compile,
route_match_ip_next_hop_free
};
-
+
/* `match ip route-source ACCESS-LIST' */
/* Match function return 1 if match is success else return zero. */
@@ -350,7 +350,7 @@
route_match_ip_route_source_compile,
route_match_ip_route_source_free
};
-
+
/* `match ip address prefix-list PREFIX_LIST' */
static route_map_result_t
@@ -390,7 +390,7 @@
route_match_ip_address_prefix_list_compile,
route_match_ip_address_prefix_list_free
};
-
+
/* `match ip next-hop prefix-list PREFIX_LIST' */
static route_map_result_t
@@ -437,7 +437,7 @@
route_match_ip_next_hop_prefix_list_compile,
route_match_ip_next_hop_prefix_list_free
};
-
+
/* `match ip route-source prefix-list PREFIX_LIST' */
static route_map_result_t
@@ -490,7 +490,7 @@
route_match_ip_route_source_prefix_list_compile,
route_match_ip_route_source_prefix_list_free
};
-
+
/* `match metric METRIC' */
/* Match function return 1 if match is success else return zero. */
@@ -555,7 +555,7 @@
route_match_metric_compile,
route_match_metric_free
};
-
+
/* `match as-path ASPATH' */
/* Match function for as-path match. I assume given object is */
@@ -603,7 +603,7 @@
route_match_aspath_compile,
route_match_aspath_free
};
-
+
/* `match community COMMUNIY' */
struct rmap_community
{
@@ -687,7 +687,7 @@
route_match_community_compile,
route_match_community_free
};
-
+
/* Match function for extcommunity match. */
static route_map_result_t
route_match_ecommunity (void *rule, struct prefix *prefix,
@@ -736,10 +736,10 @@
route_match_ecommunity_compile,
route_match_ecommunity_free
};
-
+
/* `match nlri` and `set nlri` are replaced by `address-family ipv4`
and `address-family vpnv4'. */
-
+
/* `match origin' */
static route_map_result_t
route_match_origin (void *rule, struct prefix *prefix,
@@ -964,7 +964,7 @@
route_set_ip_nexthop_compile,
route_set_ip_nexthop_free
};
-
+
/* `set local-preference LOCAL_PREF' */
/* Set local preference. */
@@ -1031,7 +1031,7 @@
route_set_local_pref_compile,
route_set_local_pref_free,
};
-
+
/* `set weight WEIGHT' */
/* Set weight. */
@@ -1100,7 +1100,7 @@
route_set_weight_compile,
route_set_weight_free,
};
-
+
/* `set metric METRIC' */
/* Set metric to attribute. */
@@ -1200,7 +1200,7 @@
route_set_metric_compile,
route_set_metric_free,
};
-
+
/* `set as-path prepend ASPATH' */
/* For AS path prepend mechanism. */
@@ -1256,7 +1256,7 @@
route_set_aspath_prepend_compile,
route_set_aspath_prepend_free,
};
-
+
/* `set as-path exclude ASn' */
/* For ASN exclude mechanism.
@@ -1314,7 +1314,7 @@
route_set_aspath_exclude_compile,
route_set_aspath_exclude_free,
};
-
+
/* `set community COMMUNITY' */
struct rmap_com_set
{
@@ -1438,7 +1438,7 @@
route_set_community_compile,
route_set_community_free,
};
-
+
/* `set comm-list (<1-99>|<100-500>|WORD) delete' */
/* For community set mechanism. */
@@ -1527,7 +1527,7 @@
route_set_community_delete_compile,
route_set_community_delete_free,
};
-
+
/* `set extcommunity rt COMMUNITY' */
/* For community set mechanism. */
@@ -1659,7 +1659,7 @@
route_set_ecommunity_soo_compile,
route_set_ecommunity_soo_free,
};
-
+
/* `set origin ORIGIN' */
/* For origin set. */
@@ -1713,7 +1713,7 @@
route_set_origin_compile,
route_set_origin_free,
};
-
+
/* `set atomic-aggregate' */
/* For atomic aggregate set. */
@@ -1754,7 +1754,7 @@
route_set_atomic_aggregate_compile,
route_set_atomic_aggregate_free,
};
-
+
/* `set aggregator as AS A.B.C.D' */
struct aggregator
{
@@ -1813,7 +1813,7 @@
route_set_aggregator_as_compile,
route_set_aggregator_as_free,
};
-
+
#ifdef HAVE_IPV6
/* `match ipv6 address IP_ACCESS_LIST' */
@@ -1855,7 +1855,7 @@
route_match_ipv6_address_compile,
route_match_ipv6_address_free
};
-
+
/* `match ipv6 next-hop IP_ADDRESS' */
static route_map_result_t
@@ -1917,7 +1917,7 @@
route_match_ipv6_next_hop_compile,
route_match_ipv6_next_hop_free
};
-
+
/* `match ipv6 address prefix-list PREFIX_LIST' */
static route_map_result_t
@@ -1957,7 +1957,7 @@
route_match_ipv6_address_prefix_list_compile,
route_match_ipv6_address_prefix_list_free
};
-
+
/* `set ipv6 nexthop global IP_ADDRESS' */
/* Set nexthop to object. ojbect must be pointer to struct attr. */
@@ -2021,7 +2021,7 @@
route_set_ipv6_nexthop_global_compile,
route_set_ipv6_nexthop_global_free
};
-
+
/* `set ipv6 nexthop local IP_ADDRESS' */
/* Set nexthop to object. ojbect must be pointer to struct attr. */
@@ -2086,7 +2086,7 @@
route_set_ipv6_nexthop_local_free
};
#endif /* HAVE_IPV6 */
-
+
/* `set vpnv4 nexthop A.B.C.D' */
static route_map_result_t
@@ -2142,7 +2142,7 @@
route_set_vpnv4_nexthop_compile,
route_set_vpnv4_nexthop_free
};
-
+
/* `set originator-id' */
/* For origin set. */
@@ -2199,7 +2199,7 @@
route_set_originator_id_compile,
route_set_originator_id_free,
};
-
+
/* Add bgp route map rule. */
static int
bgp_route_match_add (struct vty *vty, struct route_map_index *index,
@@ -2408,7 +2408,7 @@
}
}
}
-
+
DEFUN (match_peer,
match_peer_cmd,
"match peer (A.B.C.D|X:X::X:X)",
@@ -3562,7 +3562,7 @@
"AS number\n"
"IP address of aggregator\n")
-
+
#ifdef HAVE_IPV6
DEFUN (match_ipv6_address,
match_ipv6_address_cmd,
@@ -3833,7 +3833,7 @@
"BGP AS-Pathlimit attribute\n"
"Match Pathlimit ASN\n")
-
+
/* Initialization of route map. */
void
bgp_route_map_init (void)
diff --git a/bgpd/bgp_snmp.c b/bgpd/bgp_snmp.c
index c8f2aa5..79aaa03 100644
--- a/bgpd/bgp_snmp.c
+++ b/bgpd/bgp_snmp.c
@@ -38,7 +38,7 @@
#include "bgpd/bgp_route.h"
#include "bgpd/bgp_fsm.h"
#include "bgpd/bgp_snmp.h"
-
+
/* BGP4-MIB described in RFC1657. */
#define BGP4MIB 1,3,6,1,2,1,15
@@ -112,7 +112,7 @@
#define OCTET_STRING ASN_OCTET_STR
#define IPADDRESS ASN_IPADDRESS
#define GAUGE32 ASN_UNSIGNED
-
+
/* Declare static local variables for convenience. */
SNMP_LOCAL_VARIABLES
@@ -242,7 +242,7 @@
3, {6, 1, 14}},
};
-
+
static u_char *
bgpVersion (struct variable *v, oid name[], size_t *length, int exact,
size_t *var_len, WriteMethod **write_method)
@@ -835,7 +835,7 @@
}
return NULL;
}
-
+
/* BGP Traps. */
struct trap_object bgpTrapList[] =
{
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index b4d765a..3c6973b 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -314,7 +314,7 @@
{
return CMD_SUCCESS;
}
-
+
/* "router bgp" commands. */
DEFUN (router_bgp,
router_bgp_cmd,
@@ -364,7 +364,7 @@
AS_STR
"BGP view\n"
"view name\n")
-
+
/* "no router bgp" commands. */
DEFUN (no_router_bgp,
no_router_bgp_cmd,
@@ -405,7 +405,7 @@
AS_STR
"BGP view\n"
"view name\n")
-
+
/* BGP router-id. */
DEFUN (bgp_router_id,
@@ -476,7 +476,7 @@
BGP_STR
"Override configured router identifier\n"
"Manually configured router identifier\n")
-
+
/* BGP Cluster ID. */
DEFUN (bgp_cluster_id,
@@ -546,7 +546,7 @@
BGP_STR
"Configure Route-Reflector Cluster-id\n"
"Route-Reflector Cluster-id in IP address format\n")
-
+
DEFUN (bgp_confederation_identifier,
bgp_confederation_identifier_cmd,
"bgp confederation identifier " CMD_AS_RANGE,
@@ -596,7 +596,7 @@
"AS confederation parameters\n"
"AS number\n"
"Set routing domain confederation AS\n")
-
+
DEFUN (bgp_confederation_peers,
bgp_confederation_peers_cmd,
"bgp confederation peers ." CMD_AS_RANGE,
@@ -650,7 +650,7 @@
}
return CMD_SUCCESS;
}
-
+
/* Maximum-paths configuration */
DEFUN (bgp_maxpaths,
bgp_maxpaths_cmd,
@@ -793,7 +793,7 @@
return 0;
}
-
+
/* BGP timers. */
DEFUN (bgp_timers,
@@ -849,7 +849,7 @@
"BGP timers\n"
"Keepalive interval\n"
"Holdtime\n")
-
+
DEFUN (bgp_client_to_client_reflection,
bgp_client_to_client_reflection_cmd,
"bgp client-to-client reflection",
@@ -906,7 +906,7 @@
bgp_flag_unset (bgp, BGP_FLAG_ALWAYS_COMPARE_MED);
return CMD_SUCCESS;
}
-
+
/* "bgp deterministic-med" configuration. */
DEFUN (bgp_deterministic_med,
bgp_deterministic_med_cmd,
@@ -1037,7 +1037,7 @@
bgp_flag_set (bgp, BGP_FLAG_NO_FAST_EXT_FAILOVER);
return CMD_SUCCESS;
}
-
+
/* "bgp enforce-first-as" configuration. */
DEFUN (bgp_enforce_first_as,
bgp_enforce_first_as_cmd,
@@ -1065,7 +1065,7 @@
bgp_flag_unset (bgp, BGP_FLAG_ENFORCE_FIRST_AS);
return CMD_SUCCESS;
}
-
+
/* "bgp bestpath compare-routerid" configuration. */
DEFUN (bgp_bestpath_compare_router_id,
bgp_bestpath_compare_router_id_cmd,
@@ -1095,7 +1095,7 @@
bgp_flag_unset (bgp, BGP_FLAG_COMPARE_ROUTER_ID);
return CMD_SUCCESS;
}
-
+
/* "bgp bestpath as-path ignore" configuration. */
DEFUN (bgp_bestpath_aspath_ignore,
bgp_bestpath_aspath_ignore_cmd,
@@ -1127,7 +1127,7 @@
bgp_flag_unset (bgp, BGP_FLAG_ASPATH_IGNORE);
return CMD_SUCCESS;
}
-
+
/* "bgp bestpath as-path confed" configuration. */
DEFUN (bgp_bestpath_aspath_confed,
bgp_bestpath_aspath_confed_cmd,
@@ -1159,7 +1159,7 @@
bgp_flag_unset (bgp, BGP_FLAG_ASPATH_CONFED);
return CMD_SUCCESS;
}
-
+
/* "bgp bestpath as-path multipath-relax" configuration. */
DEFUN (bgp_bestpath_aspath_multipath_relax,
bgp_bestpath_aspath_multipath_relax_cmd,
@@ -1191,7 +1191,7 @@
bgp_flag_unset (bgp, BGP_FLAG_ASPATH_MULTIPATH_RELAX);
return CMD_SUCCESS;
}
-
+
/* "bgp log-neighbor-changes" configuration. */
DEFUN (bgp_log_neighbor_changes,
bgp_log_neighbor_changes_cmd,
@@ -1219,7 +1219,7 @@
bgp_flag_unset (bgp, BGP_FLAG_LOG_NEIGHBOR_CHANGES);
return CMD_SUCCESS;
}
-
+
/* "bgp bestpath med" configuration. */
DEFUN (bgp_bestpath_med,
bgp_bestpath_med_cmd,
@@ -1317,7 +1317,7 @@
"MED attribute\n"
"Treat missing MED as the least preferred one\n"
"Compare MED among confederation paths\n")
-
+
/* "no bgp default ipv4-unicast". */
DEFUN (no_bgp_default_ipv4_unicast,
no_bgp_default_ipv4_unicast_cmd,
@@ -1347,7 +1347,7 @@
bgp_flag_unset (bgp, BGP_FLAG_NO_DEFAULT_IPV4);
return CMD_SUCCESS;
}
-
+
/* "bgp import-check" configuration. */
DEFUN (bgp_network_import_check,
bgp_network_import_check_cmd,
@@ -1377,7 +1377,7 @@
bgp_flag_unset (bgp, BGP_FLAG_IMPORT_CHECK);
return CMD_SUCCESS;
}
-
+
DEFUN (bgp_default_local_preference,
bgp_default_local_preference_cmd,
"bgp default local-preference <0-4294967295>",
@@ -1421,7 +1421,7 @@
"Configure BGP defaults\n"
"local preference (higher=more preferred)\n"
"Configure default local preference value\n")
-
+
static int
peer_remote_as_vty (struct vty *vty, const char *peer_str,
const char *as_str, afi_t afi, safi_t safi)
@@ -1481,7 +1481,7 @@
{
return peer_remote_as_vty (vty, argv[0], argv[1], AFI_IP, SAFI_UNICAST);
}
-
+
DEFUN (neighbor_peer_group,
neighbor_peer_group_cmd,
"neighbor WORD peer-group",
@@ -1586,7 +1586,7 @@
}
return CMD_SUCCESS;
}
-
+
DEFUN (neighbor_local_as,
neighbor_local_as_cmd,
NEIGHBOR_CMD2 "local-as " CMD_AS_RANGE,
@@ -1696,7 +1696,7 @@
"AS number used as local AS\n"
"Do not prepend local-as to updates from ebgp peers\n"
"Do not prepend local-as to updates from ibgp peers\n")
-
+
DEFUN (neighbor_password,
neighbor_password_cmd,
NEIGHBOR_CMD2 "password LINE",
@@ -1734,7 +1734,7 @@
ret = peer_password_unset (peer);
return bgp_vty_return (vty, ret);
}
-
+
DEFUN (neighbor_activate,
neighbor_activate_cmd,
NEIGHBOR_CMD2 "activate",
@@ -1773,7 +1773,7 @@
return bgp_vty_return (vty, ret);
}
-
+
DEFUN (neighbor_set_peer_group,
neighbor_set_peer_group_cmd,
NEIGHBOR_CMD "peer-group WORD",
@@ -1855,7 +1855,7 @@
return bgp_vty_return (vty, ret);
}
-
+
static int
peer_flag_modify_vty (struct vty *vty, const char *ip_str,
u_int16_t flag, int set)
@@ -1908,7 +1908,7 @@
{
return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_PASSIVE);
}
-
+
/* neighbor shutdown. */
DEFUN (neighbor_shutdown,
neighbor_shutdown_cmd,
@@ -1930,7 +1930,7 @@
{
return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_SHUTDOWN);
}
-
+
/* Deprecated neighbor capability route-refresh. */
DEFUN_DEPRECATED (neighbor_capability_route_refresh,
neighbor_capability_route_refresh_cmd,
@@ -1954,7 +1954,7 @@
{
return CMD_SUCCESS;
}
-
+
/* neighbor capability dynamic. */
DEFUN (neighbor_capability_dynamic,
neighbor_capability_dynamic_cmd,
@@ -1978,7 +1978,7 @@
{
return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_DYNAMIC_CAPABILITY);
}
-
+
/* neighbor dont-capability-negotiate */
DEFUN (neighbor_dont_capability_negotiate,
neighbor_dont_capability_negotiate_cmd,
@@ -2000,7 +2000,7 @@
{
return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_DONT_CAPABILITY);
}
-
+
static int
peer_af_flag_modify_vty (struct vty *vty, const char *peer_str, afi_t afi,
safi_t safi, u_int32_t flag, int set)
@@ -2033,7 +2033,7 @@
{
return peer_af_flag_modify_vty (vty, peer_str, afi, safi, flag, 0);
}
-
+
/* neighbor capability orf prefix-list. */
DEFUN (neighbor_capability_orf_prefix,
neighbor_capability_orf_prefix_cmd,
@@ -2089,7 +2089,7 @@
return peer_af_flag_unset_vty (vty, argv[0], bgp_node_afi (vty),
bgp_node_safi (vty), flag);
}
-
+
/* neighbor next-hop-self. */
DEFUN (neighbor_nexthop_self,
neighbor_nexthop_self_cmd,
@@ -2113,7 +2113,7 @@
return peer_af_flag_unset_vty (vty, argv[0], bgp_node_afi (vty),
bgp_node_safi (vty), PEER_FLAG_NEXTHOP_SELF);
}
-
+
/* neighbor remove-private-AS. */
DEFUN (neighbor_remove_private_as,
neighbor_remove_private_as_cmd,
@@ -2139,7 +2139,7 @@
bgp_node_safi (vty),
PEER_FLAG_REMOVE_PRIVATE_AS);
}
-
+
/* neighbor send-community. */
DEFUN (neighbor_send_community,
neighbor_send_community_cmd,
@@ -2165,7 +2165,7 @@
bgp_node_safi (vty),
PEER_FLAG_SEND_COMMUNITY);
}
-
+
/* neighbor send-community extended. */
DEFUN (neighbor_send_community_type,
neighbor_send_community_type_cmd,
@@ -2217,7 +2217,7 @@
(PEER_FLAG_SEND_COMMUNITY |
PEER_FLAG_SEND_EXT_COMMUNITY));
}
-
+
/* neighbor soft-reconfig. */
DEFUN (neighbor_soft_reconfiguration,
neighbor_soft_reconfiguration_cmd,
@@ -2245,7 +2245,7 @@
bgp_node_afi (vty), bgp_node_safi (vty),
PEER_FLAG_SOFT_RECONFIG);
}
-
+
DEFUN (neighbor_route_reflector_client,
neighbor_route_reflector_client_cmd,
NEIGHBOR_CMD2 "route-reflector-client",
@@ -2277,7 +2277,7 @@
bgp_node_safi (vty),
PEER_FLAG_REFLECTOR_CLIENT);
}
-
+
static int
peer_rsclient_set_vty (struct vty *vty, const char *peer_str,
int afi, int safi)
@@ -2425,7 +2425,7 @@
return CMD_SUCCESS;
}
-
+
/* neighbor route-server-client. */
DEFUN (neighbor_route_server_client,
neighbor_route_server_client_cmd,
@@ -2449,7 +2449,7 @@
return peer_rsclient_unset_vty (vty, argv[0], bgp_node_afi(vty),
bgp_node_safi(vty));
}
-
+
DEFUN (neighbor_nexthop_local_unchanged,
neighbor_nexthop_local_unchanged_cmd,
NEIGHBOR_CMD2 "nexthop-local unchanged",
@@ -2462,7 +2462,7 @@
bgp_node_safi (vty),
PEER_FLAG_NEXTHOP_LOCAL_UNCHANGED );
}
-
+
DEFUN (no_neighbor_nexthop_local_unchanged,
no_neighbor_nexthop_local_unchanged_cmd,
NO_NEIGHBOR_CMD2 "nexthop-local unchanged",
@@ -2476,7 +2476,7 @@
bgp_node_safi (vty),
PEER_FLAG_NEXTHOP_LOCAL_UNCHANGED );
}
-
+
DEFUN (neighbor_attr_unchanged,
neighbor_attr_unchanged_cmd,
NEIGHBOR_CMD2 "attribute-unchanged",
@@ -2833,7 +2833,7 @@
bgp_node_safi (vty),
PEER_FLAG_NEXTHOP_UNCHANGED);
}
-
+
/* EBGP multihop configuration. */
static int
peer_ebgp_multihop_set_vty (struct vty *vty, const char *ip_str,
@@ -2907,7 +2907,7 @@
NEIGHBOR_ADDR_STR2
"Allow EBGP neighbors not on directly connected networks\n"
"maximum hop count\n")
-
+
/* disable-connected-check */
DEFUN (neighbor_disable_connected_check,
neighbor_disable_connected_check_cmd,
@@ -2946,7 +2946,7 @@
NEIGHBOR_STR
NEIGHBOR_ADDR_STR2
"Enforce EBGP neighbors perform multihop\n")
-
+
DEFUN (neighbor_description,
neighbor_description_cmd,
NEIGHBOR_CMD2 "description .LINE",
@@ -3001,7 +3001,7 @@
NEIGHBOR_ADDR_STR2
"Neighbor specific description\n"
"Up to 80 characters describing this neighbor\n")
-
+
/* Neighbor update-source. */
static int
peer_update_source_vty (struct vty *vty, const char *peer_str,
@@ -3056,7 +3056,7 @@
{
return peer_update_source_vty (vty, argv[0], NULL);
}
-
+
static int
peer_default_originate_set_vty (struct vty *vty, const char *peer_str,
afi_t afi, safi_t safi,
@@ -3123,7 +3123,7 @@
"Originate default route to this neighbor\n"
"Route-map to specify criteria to originate default\n"
"route-map name\n")
-
+
/* Set neighbor's BGP port. */
static int
peer_port_vty (struct vty *vty, const char *ip_str, int afi,
@@ -3183,7 +3183,7 @@
NEIGHBOR_ADDR_STR
"Neighbor's BGP port\n"
"TCP port number\n")
-
+
/* neighbor weight. */
static int
peer_weight_set_vty (struct vty *vty, const char *ip_str,
@@ -3248,7 +3248,7 @@
NEIGHBOR_ADDR_STR2
"Set default weight for routes from this neighbor\n"
"default weight\n")
-
+
/* Override capability negotiation. */
DEFUN (neighbor_override_capability,
neighbor_override_capability_cmd,
@@ -3270,7 +3270,7 @@
{
return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_OVERRIDE_CAPABILITY);
}
-
+
DEFUN (neighbor_strict_capability,
neighbor_strict_capability_cmd,
NEIGHBOR_CMD "strict-capability-match",
@@ -3291,7 +3291,7 @@
{
return peer_flag_unset_vty (vty, argv[0], PEER_FLAG_STRICT_CAP_MATCH);
}
-
+
static int
peer_timers_set_vty (struct vty *vty, const char *ip_str,
const char *keep_str, const char *hold_str)
@@ -3312,7 +3312,7 @@
return bgp_vty_return (vty, ret);
}
-
+
static int
peer_timers_unset_vty (struct vty *vty, const char *ip_str)
{
@@ -3350,7 +3350,7 @@
{
return peer_timers_unset_vty (vty, argv[0]);
}
-
+
static int
peer_timers_connect_set_vty (struct vty *vty, const char *ip_str,
const char *time_str)
@@ -3418,7 +3418,7 @@
"BGP per neighbor timers\n"
"BGP connect timer\n"
"Connect timer\n")
-
+
static int
peer_advertise_interval_vty (struct vty *vty, const char *ip_str,
const char *time_str, int set)
@@ -3472,7 +3472,7 @@
NEIGHBOR_ADDR_STR
"Minimum interval between sending BGP routing updates\n"
"time in seconds\n")
-
+
/* neighbor interface */
static int
peer_interface_vty (struct vty *vty, const char *ip_str, const char *str)
@@ -3514,7 +3514,7 @@
{
return peer_interface_vty (vty, argv[0], NULL);
}
-
+
/* Set distribute list to the peer. */
static int
peer_distribute_set_vty (struct vty *vty, const char *ip_str,
@@ -3595,7 +3595,7 @@
return peer_distribute_unset_vty (vty, argv[0], bgp_node_afi (vty),
bgp_node_safi (vty), argv[2]);
}
-
+
/* Set prefix list to the peer. */
static int
peer_prefix_list_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
@@ -3672,7 +3672,7 @@
return peer_prefix_list_unset_vty (vty, argv[0], bgp_node_afi (vty),
bgp_node_safi (vty), argv[2]);
}
-
+
static int
peer_aslist_set_vty (struct vty *vty, const char *ip_str,
afi_t afi, safi_t safi,
@@ -3749,7 +3749,7 @@
return peer_aslist_unset_vty (vty, argv[0], bgp_node_afi (vty),
bgp_node_safi (vty), argv[2]);
}
-
+
/* Set route-map to the peer. */
static int
peer_route_map_set_vty (struct vty *vty, const char *ip_str,
@@ -3838,7 +3838,7 @@
return peer_route_map_unset_vty (vty, argv[0], bgp_node_afi (vty),
bgp_node_safi (vty), argv[2]);
}
-
+
/* Set unsuppress-map to the peer. */
static int
peer_unsuppress_map_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
@@ -3897,7 +3897,7 @@
return peer_unsuppress_map_unset_vty (vty, argv[0], bgp_node_afi (vty),
bgp_node_safi (vty));
}
-
+
static int
peer_maximum_prefix_set_vty (struct vty *vty, const char *ip_str, afi_t afi,
safi_t safi, const char *num_str,
@@ -4107,7 +4107,7 @@
"Threshold value (%) at which to generate a warning msg\n"
"Restart bgp connection after limit is exceeded\n"
"Restart interval in minutes")
-
+
/* "neighbor allowas-in" */
DEFUN (neighbor_allowas_in,
neighbor_allowas_in_cmd,
@@ -4162,7 +4162,7 @@
return bgp_vty_return (vty, ret);
}
-
+
DEFUN (neighbor_ttl_security,
neighbor_ttl_security_cmd,
NEIGHBOR_CMD2 "ttl-security hops <1-254>",
@@ -4198,7 +4198,7 @@
return bgp_vty_return (vty, peer_ttl_security_hops_unset (peer));
}
-
+
/* Address family configuration. */
DEFUN (address_family_ipv4,
address_family_ipv4_cmd,
@@ -4282,7 +4282,7 @@
vty->node = BGP_NODE;
return CMD_SUCCESS;
}
-
+
/* BGP clear sort. */
enum clear_sort
{
@@ -4636,7 +4636,7 @@
BGP_STR
"Address family\n"
"Clear peers with the AS number\n")
-
+
/* Outbound soft-reconfiguration */
DEFUN (clear_ip_bgp_all_soft_out,
clear_ip_bgp_all_soft_out_cmd,
@@ -5263,7 +5263,7 @@
"Address family\n"
"Clear peers with the AS number\n"
"Soft reconfig outbound update\n")
-
+
/* Inbound soft-reconfiguration */
DEFUN (clear_ip_bgp_all_soft_in,
clear_ip_bgp_all_soft_in_cmd,
@@ -6225,7 +6225,7 @@
"Clear peers with the AS number\n"
"Soft reconfig inbound update\n"
"Push out prefix-list ORF and do inbound soft reconfig\n")
-
+
/* Both soft-reconfiguration */
DEFUN (clear_ip_bgp_all_soft,
clear_ip_bgp_all_soft_cmd,
@@ -6599,7 +6599,7 @@
"Address family\n"
"Clear peers with the AS number\n"
"Soft reconfig\n")
-
+
/* RS-client soft reconfiguration. */
#ifdef HAVE_IPV6
DEFUN (clear_bgp_all_rsclient,
@@ -7278,7 +7278,7 @@
return bgp_show_summary_vty (vty, NULL, AFI_IP6, SAFI_MULTICAST);
}
#endif /* HAVE_IPV6 */
-
+
const char *
afi_safi_print (afi_t afi, safi_t safi)
{
@@ -8188,7 +8188,7 @@
"Detailed information on TCP and BGP neighbor connections\n"
"Neighbor to display information about\n"
"Neighbor to display information about\n")
-
+
/* Show BGP's AS paths internal data. There are both `show ip bgp
paths' and `show ip mbgp paths'. Those functions results are the
same.*/
@@ -8221,7 +8221,7 @@
return CMD_SUCCESS;
}
-
+
#include "hash.h"
static void
@@ -8264,7 +8264,7 @@
attr_show_all (vty);
return CMD_SUCCESS;
}
-
+
static int
bgp_write_rsclient_summary (struct vty *vty, struct peer *rsclient,
afi_t afi, safi_t safi)
@@ -8585,7 +8585,7 @@
"Summary of all Route Server Clients\n")
#endif /* HAVE IPV6 */
-
+
/* Redistribute VTY commands. */
DEFUN (bgp_redistribute_ipv4,
@@ -8799,7 +8799,7 @@
"Default metric\n"
"Route map reference\n"
"Pointer to route-map entries\n")
-
+
#ifdef HAVE_IPV6
DEFUN (bgp_redistribute_ipv6,
bgp_redistribute_ipv6_cmd,
@@ -9014,7 +9014,7 @@
"Route map reference\n"
"Pointer to route-map entries\n")
#endif /* HAVE_IPV6 */
-
+
int
bgp_config_write_redistribute (struct vty *vty, struct bgp *bgp, afi_t afi,
safi_t safi, int *write)
@@ -9047,7 +9047,7 @@
}
return *write;
}
-
+
/* BGP node structure. */
static struct cmd_node bgp_node =
{
@@ -9090,7 +9090,7 @@
"%s(config-router-af)# ",
1
};
-
+
static void community_list_vty (void);
void
@@ -10231,7 +10231,7 @@
/* Community-list. */
community_list_vty ();
}
-
+
#include "memory.h"
#include "bgp_regex.h"
#include "bgp_clist.h"
@@ -10630,7 +10630,7 @@
return CMD_SUCCESS;
}
-
+
static int
extcommunity_list_set_vty (struct vty *vty, int argc, const char **argv,
int style, int reject_all_digit_name)
@@ -10980,7 +10980,7 @@
return CMD_SUCCESS;
}
-
+
/* Return configuration string of community-list entry. */
static const char *
community_list_config_str (struct community_entry *entry)
diff --git a/bgpd/bgp_zebra.c b/bgpd/bgp_zebra.c
index 0f21232..f18d916 100644
--- a/bgpd/bgp_zebra.c
+++ b/bgpd/bgp_zebra.c
@@ -38,7 +38,7 @@
#include "bgpd/bgp_fsm.h"
#include "bgpd/bgp_debug.h"
#include "bgpd/bgp_mpath.h"
-
+
/* All information about zebra. */
struct zclient *zclient = NULL;
struct in_addr router_id_zebra;
@@ -381,7 +381,7 @@
return 0;
}
#endif /* HAVE_IPV6 */
-
+
struct interface *
if_lookup_by_ipv4 (struct in_addr *addr)
{
@@ -943,7 +943,7 @@
}
#endif /* HAVE_IPV6 */
}
-
+
/* Other routes redistribution into BGP. */
int
bgp_redistribute_set (struct bgp *bgp, afi_t afi, int type)
@@ -1069,7 +1069,7 @@
return 1;
}
-
+
void
bgp_zclient_reset (void)
{
diff --git a/bgpd/bgpd.c b/bgpd/bgpd.c
index 2fe300c..19b96fa 100644
--- a/bgpd/bgpd.c
+++ b/bgpd/bgpd.c
@@ -61,7 +61,7 @@
#ifdef HAVE_SNMP
#include "bgpd/bgp_snmp.h"
#endif /* HAVE_SNMP */
-
+
/* BGP process wide configuration. */
static struct bgp_master bgp_master;
@@ -72,7 +72,7 @@
/* BGP community-list. */
struct community_list_handler *bgp_clist;
-
+
/* BGP global flag manipulation. */
int
bgp_option_set (int flag)
@@ -115,7 +115,7 @@
{
return CHECK_FLAG (bm->options, flag);
}
-
+
/* BGP flag manipulation. */
int
bgp_flag_set (struct bgp *bgp, int flag)
@@ -136,7 +136,7 @@
{
return CHECK_FLAG (bgp->flags, flag);
}
-
+
/* Internal function to set BGP structure configureation flag. */
static void
bgp_config_set (struct bgp *bgp, int config)
@@ -155,7 +155,7 @@
{
return CHECK_FLAG (bgp->config, config);
}
-
+
/* Set BGP router identifier. */
int
bgp_router_id_set (struct bgp *bgp, struct in_addr *id)
@@ -242,7 +242,7 @@
}
return 0;
}
-
+
/* time_t value that is monotonicly increasing
* and uneffected by adjustments to system clock
*/
@@ -273,7 +273,7 @@
return 0;
}
-
+
/* BGP confederation configuration. */
int
bgp_confederation_id_set (struct bgp *bgp, as_t as)
@@ -485,7 +485,7 @@
return 0;
}
-
+
/* Local preference configuration. */
int
bgp_default_local_preference_set (struct bgp *bgp, u_int32_t local_pref)
@@ -508,7 +508,7 @@
return 0;
}
-
+
/* If peer is RSERVER_CLIENT in at least one address family and is not member
of a peer_group for that family, return 1.
Used to check wether the peer is included in list bgp->rsclient. */
@@ -1325,7 +1325,7 @@
return 0;
}
-
+
static int
peer_group_cmp (struct peer_group *g1, struct peer_group *g2)
{
@@ -1926,7 +1926,7 @@
return 0;
}
-
+
/* BGP instance creation by `router bgp' commands. */
static struct bgp *
bgp_create (as_t *as, const char *name)
@@ -2181,7 +2181,7 @@
}
XFREE (MTYPE_BGP, bgp);
}
-
+
struct peer *
peer_lookup (struct bgp *bgp, union sockunion *su)
{
@@ -2250,7 +2250,7 @@
}
return NULL;
}
-
+
/* If peer is configured at least one address family return 1. */
int
peer_active (struct peer *peer)
@@ -2276,7 +2276,7 @@
return 1;
return 0;
}
-
+
/* peer_flag_change_type. */
enum peer_change_type
{
@@ -2695,7 +2695,7 @@
{
return peer_af_flag_modify (peer, afi, safi, flag, 0);
}
-
+
/* EBGP multihop configuration. */
int
peer_ebgp_multihop_set (struct peer *peer, int ttl)
@@ -2794,7 +2794,7 @@
}
return 0;
}
-
+
/* Neighbor description. */
int
peer_description_set (struct peer *peer, char *desc)
@@ -2817,7 +2817,7 @@
return 0;
}
-
+
/* Neighbor update-source. */
int
peer_update_source_if_set (struct peer *peer, const char *ifname)
@@ -3037,7 +3037,7 @@
}
return 0;
}
-
+
int
peer_default_originate_set (struct peer *peer, afi_t afi, safi_t safi,
const char *rmap)
@@ -3142,7 +3142,7 @@
}
return 0;
}
-
+
int
peer_port_set (struct peer *peer, u_int16_t port)
{
@@ -3156,7 +3156,7 @@
peer->port = BGP_PORT_DEFAULT;
return 0;
}
-
+
/* neighbor weight. */
int
peer_weight_set (struct peer *peer, u_int16_t weight)
@@ -3204,7 +3204,7 @@
}
return 0;
}
-
+
int
peer_timers_set (struct peer *peer, u_int32_t keepalive, u_int32_t holdtime)
{
@@ -3274,7 +3274,7 @@
return 0;
}
-
+
int
peer_timers_connect_set (struct peer *peer, u_int32_t connect)
{
@@ -3309,7 +3309,7 @@
return 0;
}
-
+
int
peer_advertise_interval_set (struct peer *peer, u_int32_t routeadv)
{
@@ -3342,7 +3342,7 @@
return 0;
}
-
+
/* neighbor interface */
int
peer_interface_set (struct peer *peer, const char *str)
@@ -3363,7 +3363,7 @@
return 0;
}
-
+
/* Allow-as in. */
int
peer_allowas_in_set (struct peer *peer, afi_t afi, safi_t safi, int allow_num)
@@ -3424,7 +3424,7 @@
}
return 0;
}
-
+
int
peer_local_as_set (struct peer *peer, as_t as, int no_prepend, int replace_as)
{
@@ -3552,7 +3552,7 @@
}
return 0;
}
-
+
/* Set password for authenticating with the peer. */
int
peer_password_set (struct peer *peer, const char *password)
@@ -3657,7 +3657,7 @@
return 0;
}
-
+
/* Set distribute list to the peer. */
int
peer_distribute_set (struct peer *peer, afi_t afi, safi_t safi, int direct,
@@ -3817,7 +3817,7 @@
}
}
}
-
+
/* Set prefix list to the peer. */
int
peer_prefix_list_set (struct peer *peer, afi_t afi, safi_t safi, int direct,
@@ -3976,7 +3976,7 @@
}
}
}
-
+
int
peer_aslist_set (struct peer *peer, afi_t afi, safi_t safi, int direct,
const char *name)
@@ -4130,7 +4130,7 @@
}
}
}
-
+
/* Set route-map to the peer. */
int
peer_route_map_set (struct peer *peer, afi_t afi, safi_t safi, int direct,
@@ -4238,7 +4238,7 @@
}
return 0;
}
-
+
/* Set unsuppress-map to the peer. */
int
peer_unsuppress_map_set (struct peer *peer, afi_t afi, safi_t safi,
@@ -4320,7 +4320,7 @@
}
return 0;
}
-
+
int
peer_maximum_prefix_set (struct peer *peer, afi_t afi, safi_t safi,
u_int32_t max, u_char threshold,
@@ -4547,7 +4547,7 @@
return peer_ebgp_multihop_unset (opeer);
}
-
+
int
peer_clear (struct peer *peer)
{
@@ -4652,7 +4652,7 @@
}
return 0;
}
-
+
/* Display peer uptime.*/
/* XXX: why does this function return char * when it takes buffer? */
char *
@@ -4697,7 +4697,7 @@
tm->tm_yday/7, tm->tm_yday - ((tm->tm_yday/7) * 7), tm->tm_hour);
return buf;
}
-
+
static void
bgp_config_write_filter (struct vty *vty, struct peer *peer,
afi_t afi, safi_t safi)
@@ -5394,7 +5394,7 @@
bm->start_time = bgp_clock ();
}
-
+
void
bgp_init (void)
{
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 688f459..a1b1273 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -854,7 +854,7 @@
extern char *peer_uptime (time_t, char *, size_t);
extern int bgp_config_write (struct vty *);
extern void bgp_config_write_family_header (struct vty *, afi_t, safi_t, int *);
-
+
extern void bgp_master_init (void);
extern void bgp_init (void);