*: 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/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)
{