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