Add some more missing vty newlines
authorVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
Fri, 25 Jun 2010 14:17:28 +0000 (17:17 +0300)
committerVasilis Tsiligiannis <b_tsiligiannis@silverton.gr>
Fri, 25 Jun 2010 14:17:28 +0000 (17:17 +0300)
lib/quagga/patches/quagga-0.99.16.diff

index 216ee30..b9cbf68 100644 (file)
@@ -1,7 +1,8 @@
-diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
---- quagga-0.99.16/bgpd/bgp_vty.c      2009-12-14 15:41:13.000000000 +0200
-+++ quagga-0.99.16.patched/bgpd/bgp_vty.c      2010-03-12 18:12:28.000000000 +0200
-@@ -8228,8 +8228,14 @@
+diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
+index 88be52e..2028c9a 100644
+--- a/bgpd/bgp_vty.c
++++ b/bgpd/bgp_vty.c
+@@ -8228,8 +8228,14 @@ bgp_str2route_type (int afi, const char *str)
        return ZEBRA_ROUTE_STATIC;
        else if (strncmp (str, "r", 1) == 0)
        return ZEBRA_ROUTE_RIP;
@@ -17,7 +18,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
      }
    if (afi == AFI_IP6)
      {
-@@ -8241,21 +8247,30 @@
+@@ -8241,21 +8247,30 @@ bgp_str2route_type (int afi, const char *str)
        return ZEBRA_ROUTE_STATIC;
        else if (strncmp (str, "r", 1) == 0)
        return ZEBRA_ROUTE_RIPNG;
@@ -51,7 +52,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
  {
    int type;
  
-@@ -8270,13 +8285,16 @@
+@@ -8270,13 +8285,16 @@ DEFUN (bgp_redistribute_ipv4,
  
  DEFUN (bgp_redistribute_ipv4_rmap,
         bgp_redistribute_ipv4_rmap_cmd,
@@ -69,7 +70,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Route map reference\n"
         "Pointer to route-map entries\n")
  {
-@@ -8295,13 +8313,16 @@
+@@ -8295,13 +8313,16 @@ DEFUN (bgp_redistribute_ipv4_rmap,
  
  DEFUN (bgp_redistribute_ipv4_metric,
         bgp_redistribute_ipv4_metric_cmd,
@@ -87,7 +88,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Metric for redistributed routes\n"
         "Default metric\n")
  {
-@@ -8322,13 +8343,16 @@
+@@ -8322,13 +8343,16 @@ DEFUN (bgp_redistribute_ipv4_metric,
  
  DEFUN (bgp_redistribute_ipv4_rmap_metric,
         bgp_redistribute_ipv4_rmap_metric_cmd,
@@ -105,7 +106,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Route map reference\n"
         "Pointer to route-map entries\n"
         "Metric for redistributed routes\n"
-@@ -8352,13 +8376,16 @@
+@@ -8352,13 +8376,16 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric,
  
  DEFUN (bgp_redistribute_ipv4_metric_rmap,
         bgp_redistribute_ipv4_metric_rmap_cmd,
@@ -123,7 +124,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Metric for redistributed routes\n"
         "Default metric\n"
         "Route map reference\n"
-@@ -8382,14 +8409,17 @@
+@@ -8382,14 +8409,17 @@ DEFUN (bgp_redistribute_ipv4_metric_rmap,
  
  DEFUN (no_bgp_redistribute_ipv4,
         no_bgp_redistribute_ipv4_cmd,
@@ -143,7 +144,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
  {
    int type;
  
-@@ -8405,7 +8435,7 @@
+@@ -8405,7 +8435,7 @@ DEFUN (no_bgp_redistribute_ipv4,
  
  DEFUN (no_bgp_redistribute_ipv4_rmap,
         no_bgp_redistribute_ipv4_rmap_cmd,
@@ -152,7 +153,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         NO_STR
         "Redistribute information from another routing protocol\n"
         "Connected\n"
-@@ -8413,6 +8443,9 @@
+@@ -8413,6 +8443,9 @@ DEFUN (no_bgp_redistribute_ipv4_rmap,
         "Open Shurtest Path First (OSPF)\n"
         "Routing Information Protocol (RIP)\n"
         "Static routes\n"
@@ -162,7 +163,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Route map reference\n"
         "Pointer to route-map entries\n")
  {
-@@ -8431,7 +8464,7 @@
+@@ -8431,7 +8464,7 @@ DEFUN (no_bgp_redistribute_ipv4_rmap,
  
  DEFUN (no_bgp_redistribute_ipv4_metric,
         no_bgp_redistribute_ipv4_metric_cmd,
@@ -171,7 +172,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         NO_STR
         "Redistribute information from another routing protocol\n"
         "Connected\n"
-@@ -8439,6 +8472,9 @@
+@@ -8439,6 +8472,9 @@ DEFUN (no_bgp_redistribute_ipv4_metric,
         "Open Shurtest Path First (OSPF)\n"
         "Routing Information Protocol (RIP)\n"
         "Static routes\n"
@@ -181,7 +182,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Metric for redistributed routes\n"
         "Default metric\n")
  {
-@@ -8457,7 +8493,7 @@
+@@ -8457,7 +8493,7 @@ DEFUN (no_bgp_redistribute_ipv4_metric,
  
  DEFUN (no_bgp_redistribute_ipv4_rmap_metric,
         no_bgp_redistribute_ipv4_rmap_metric_cmd,
@@ -190,7 +191,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         NO_STR
         "Redistribute information from another routing protocol\n"
         "Connected\n"
-@@ -8465,6 +8501,9 @@
+@@ -8465,6 +8501,9 @@ DEFUN (no_bgp_redistribute_ipv4_rmap_metric,
         "Open Shurtest Path First (OSPF)\n"
         "Routing Information Protocol (RIP)\n"
         "Static routes\n"
@@ -200,7 +201,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Route map reference\n"
         "Pointer to route-map entries\n"
         "Metric for redistributed routes\n"
-@@ -8486,7 +8525,7 @@
+@@ -8486,7 +8525,7 @@ DEFUN (no_bgp_redistribute_ipv4_rmap_metric,
  
  ALIAS (no_bgp_redistribute_ipv4_rmap_metric,
         no_bgp_redistribute_ipv4_metric_rmap_cmd,
@@ -209,7 +210,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         NO_STR
         "Redistribute information from another routing protocol\n"
         "Connected\n"
-@@ -8494,6 +8533,9 @@
+@@ -8494,6 +8533,9 @@ ALIAS (no_bgp_redistribute_ipv4_rmap_metric,
         "Open Shurtest Path First (OSPF)\n"
         "Routing Information Protocol (RIP)\n"
         "Static routes\n"
@@ -219,7 +220,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Metric for redistributed routes\n"
         "Default metric\n"
         "Route map reference\n"
-@@ -8502,13 +8544,16 @@
+@@ -8502,13 +8544,16 @@ ALIAS (no_bgp_redistribute_ipv4_rmap_metric,
  #ifdef HAVE_IPV6
  DEFUN (bgp_redistribute_ipv6,
         bgp_redistribute_ipv6_cmd,
@@ -238,7 +239,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
  {
    int type;
  
-@@ -8524,13 +8569,16 @@
+@@ -8524,13 +8569,16 @@ DEFUN (bgp_redistribute_ipv6,
  
  DEFUN (bgp_redistribute_ipv6_rmap,
         bgp_redistribute_ipv6_rmap_cmd,
@@ -256,7 +257,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Route map reference\n"
         "Pointer to route-map entries\n")
  {
-@@ -8549,13 +8597,16 @@
+@@ -8549,13 +8597,16 @@ DEFUN (bgp_redistribute_ipv6_rmap,
  
  DEFUN (bgp_redistribute_ipv6_metric,
         bgp_redistribute_ipv6_metric_cmd,
@@ -274,7 +275,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Metric for redistributed routes\n"
         "Default metric\n")
  {
-@@ -8576,13 +8627,16 @@
+@@ -8576,13 +8627,16 @@ DEFUN (bgp_redistribute_ipv6_metric,
  
  DEFUN (bgp_redistribute_ipv6_rmap_metric,
         bgp_redistribute_ipv6_rmap_metric_cmd,
@@ -292,7 +293,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Route map reference\n"
         "Pointer to route-map entries\n"
         "Metric for redistributed routes\n"
-@@ -8606,13 +8660,16 @@
+@@ -8606,13 +8660,16 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric,
  
  DEFUN (bgp_redistribute_ipv6_metric_rmap,
         bgp_redistribute_ipv6_metric_rmap_cmd,
@@ -310,7 +311,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Metric for redistributed routes\n"
         "Default metric\n"
         "Route map reference\n"
-@@ -8636,14 +8693,17 @@
+@@ -8636,14 +8693,17 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap,
  
  DEFUN (no_bgp_redistribute_ipv6,
         no_bgp_redistribute_ipv6_cmd,
@@ -330,7 +331,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
  {
    int type;
  
-@@ -8659,7 +8719,7 @@
+@@ -8659,7 +8719,7 @@ DEFUN (no_bgp_redistribute_ipv6,
  
  DEFUN (no_bgp_redistribute_ipv6_rmap,
         no_bgp_redistribute_ipv6_rmap_cmd,
@@ -339,7 +340,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         NO_STR
         "Redistribute information from another routing protocol\n"
         "Connected\n"
-@@ -8667,6 +8727,9 @@
+@@ -8667,6 +8727,9 @@ DEFUN (no_bgp_redistribute_ipv6_rmap,
         "Open Shurtest Path First (OSPFv3)\n"
         "Routing Information Protocol (RIPng)\n"
         "Static routes\n"
@@ -349,7 +350,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Route map reference\n"
         "Pointer to route-map entries\n")
  {
-@@ -8685,7 +8748,7 @@
+@@ -8685,7 +8748,7 @@ DEFUN (no_bgp_redistribute_ipv6_rmap,
  
  DEFUN (no_bgp_redistribute_ipv6_metric,
         no_bgp_redistribute_ipv6_metric_cmd,
@@ -358,7 +359,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         NO_STR
         "Redistribute information from another routing protocol\n"
         "Connected\n"
-@@ -8693,6 +8756,9 @@
+@@ -8693,6 +8756,9 @@ DEFUN (no_bgp_redistribute_ipv6_metric,
         "Open Shurtest Path First (OSPFv3)\n"
         "Routing Information Protocol (RIPng)\n"
         "Static routes\n"
@@ -368,7 +369,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Metric for redistributed routes\n"
         "Default metric\n")
  {
-@@ -8711,7 +8777,7 @@
+@@ -8711,7 +8777,7 @@ DEFUN (no_bgp_redistribute_ipv6_metric,
  
  DEFUN (no_bgp_redistribute_ipv6_rmap_metric,
         no_bgp_redistribute_ipv6_rmap_metric_cmd,
@@ -377,7 +378,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         NO_STR
         "Redistribute information from another routing protocol\n"
         "Connected\n"
-@@ -8719,6 +8785,9 @@
+@@ -8719,6 +8785,9 @@ DEFUN (no_bgp_redistribute_ipv6_rmap_metric,
         "Open Shurtest Path First (OSPFv3)\n"
         "Routing Information Protocol (RIPng)\n"
         "Static routes\n"
@@ -387,7 +388,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Route map reference\n"
         "Pointer to route-map entries\n"
         "Metric for redistributed routes\n"
-@@ -8740,7 +8809,7 @@
+@@ -8740,7 +8809,7 @@ DEFUN (no_bgp_redistribute_ipv6_rmap_metric,
  
  ALIAS (no_bgp_redistribute_ipv6_rmap_metric,
         no_bgp_redistribute_ipv6_metric_rmap_cmd,
@@ -396,7 +397,7 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         NO_STR
         "Redistribute information from another routing protocol\n"
         "Connected\n"
-@@ -8748,6 +8817,9 @@
+@@ -8748,6 +8817,9 @@ ALIAS (no_bgp_redistribute_ipv6_rmap_metric,
         "Open Shurtest Path First (OSPFv3)\n"
         "Routing Information Protocol (RIPng)\n"
         "Static routes\n"
@@ -406,10 +407,11 @@ diff -Naur quagga-0.99.16/bgpd/bgp_vty.c quagga-0.99.16.patched/bgpd/bgp_vty.c
         "Metric for redistributed routes\n"
         "Default metric\n"
         "Route map reference\n"
-diff -Naur quagga-0.99.16/lib/log.c quagga-0.99.16.patched/lib/log.c
---- quagga-0.99.16/lib/log.c   2009-12-09 14:37:12.000000000 +0200
-+++ quagga-0.99.16.patched/lib/log.c   2010-03-12 18:12:28.000000000 +0200
-@@ -835,6 +835,8 @@
+diff --git a/lib/log.c b/lib/log.c
+index 0c2f655..7004d7b 100644
+--- a/lib/log.c
++++ b/lib/log.c
+@@ -835,6 +835,8 @@ static const struct zebra_desc_table route_types[] = {
    DESC_ENTRY  (ZEBRA_ROUTE_ISIS,      "isis",         'I' ),
    DESC_ENTRY  (ZEBRA_ROUTE_BGP,       "bgp",          'B' ),
    DESC_ENTRY  (ZEBRA_ROUTE_HSLS,      "hsls",         'H' ),
@@ -418,10 +420,11 @@ diff -Naur quagga-0.99.16/lib/log.c quagga-0.99.16.patched/lib/log.c
  };
  #undef DESC_ENTRY
  
-diff -Naur quagga-0.99.16/lib/route_types.txt quagga-0.99.16.patched/lib/route_types.txt
---- quagga-0.99.16/lib/route_types.txt 2009-12-09 14:37:12.000000000 +0200
-+++ quagga-0.99.16.patched/lib/route_types.txt 2010-03-12 18:12:28.000000000 +0200
-@@ -51,13 +51,9 @@
+diff --git a/lib/route_types.txt b/lib/route_types.txt
+index e99cacd..562c900 100644
+--- a/lib/route_types.txt
++++ b/lib/route_types.txt
+@@ -51,13 +51,9 @@ ZEBRA_ROUTE_OSPF,       ospf,      ospfd,  'O', 1, 0, "OSPF"
  ZEBRA_ROUTE_OSPF6,      ospf6,     ospf6d, 'O', 0, 1, "OSPF"
  ZEBRA_ROUTE_ISIS,       isis,      isisd,  'I', 1, 1, "IS-IS"
  ZEBRA_ROUTE_BGP,        bgp,       bgpd,   'B', 1, 1, "BGP"
@@ -438,17 +441,18 @@ diff -Naur quagga-0.99.16/lib/route_types.txt quagga-0.99.16.patched/lib/route_t
  
  ## help strings
  ZEBRA_ROUTE_SYSTEM, "Reserved route type, for internal use only"
-@@ -71,4 +67,5 @@
+@@ -71,4 +67,5 @@ ZEBRA_ROUTE_OSPF6,  "Open Shortest Path First (IPv6) (OSPFv3)"
  ZEBRA_ROUTE_ISIS,   "Intermediate System to Intermediate System (IS-IS)"
  ZEBRA_ROUTE_BGP,    "Border Gateway Protocol (BGP)"
  ZEBRA_ROUTE_HSLS,   "Hazy-Sighted Link State Protocol (HSLS)"
 -ZEBRA_ROUTE_OLSR,   "Optimised Link State Routing (OLSR)"
 +ZEBRA_ROUTE_OLSR,   "Optimized Link State Routing (OLSR)"
 +ZEBRA_ROUTE_BATMAN, "Better Approach to Mobile Ad-Hoc Networking (BATMAN)"
-diff -Naur quagga-0.99.16/lib/zebra.h quagga-0.99.16.patched/lib/zebra.h
---- quagga-0.99.16/lib/zebra.h 2009-12-09 14:37:12.000000000 +0200
-+++ quagga-0.99.16.patched/lib/zebra.h 2010-03-12 18:12:28.000000000 +0200
-@@ -441,7 +441,9 @@
+diff --git a/lib/zebra.h b/lib/zebra.h
+index 2dc8451..9846b6f 100644
+--- a/lib/zebra.h
++++ b/lib/zebra.h
+@@ -441,7 +441,9 @@ struct in_pktinfo
  #define ZEBRA_ROUTE_ISIS                 8
  #define ZEBRA_ROUTE_BGP                  9
  #define ZEBRA_ROUTE_HSLS               10
@@ -459,10 +463,11 @@ diff -Naur quagga-0.99.16/lib/zebra.h quagga-0.99.16.patched/lib/zebra.h
  
  /* Note: whenever a new route-type or zserv-command is added the
   * corresponding {command,route}_types[] table in lib/log.c MUST be
-diff -Naur quagga-0.99.16/ospf6d/ospf6_asbr.c quagga-0.99.16.patched/ospf6d/ospf6_asbr.c
---- quagga-0.99.16/ospf6d/ospf6_asbr.c 2009-12-09 14:37:12.000000000 +0200
-+++ quagga-0.99.16.patched/ospf6d/ospf6_asbr.c 2010-03-12 18:12:28.000000000 +0200
-@@ -616,13 +616,16 @@
+diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
+index 685b147..24b301a 100644
+--- a/ospf6d/ospf6_asbr.c
++++ b/ospf6d/ospf6_asbr.c
+@@ -616,13 +616,16 @@ ospf6_asbr_redistribute_remove (int type, int ifindex, struct prefix *prefix)
  
  DEFUN (ospf6_redistribute,
         ospf6_redistribute_cmd,
@@ -480,7 +485,7 @@ diff -Naur quagga-0.99.16/ospf6d/ospf6_asbr.c quagga-0.99.16.patched/ospf6d/ospf
        )
  {
    int type = 0;
-@@ -637,6 +640,12 @@
+@@ -637,6 +640,12 @@ DEFUN (ospf6_redistribute,
      type = ZEBRA_ROUTE_RIPNG;
    else if (strncmp (argv[0], "bgp", 3) == 0)
      type = ZEBRA_ROUTE_BGP;
@@ -493,7 +498,7 @@ diff -Naur quagga-0.99.16/ospf6d/ospf6_asbr.c quagga-0.99.16.patched/ospf6d/ospf
  
    ospf6_asbr_redistribute_unset (type);
    ospf6_asbr_routemap_unset (type);
-@@ -646,13 +655,16 @@
+@@ -646,13 +655,16 @@ DEFUN (ospf6_redistribute,
  
  DEFUN (ospf6_redistribute_routemap,
         ospf6_redistribute_routemap_cmd,
@@ -511,7 +516,7 @@ diff -Naur quagga-0.99.16/ospf6d/ospf6_asbr.c quagga-0.99.16.patched/ospf6d/ospf
         "Route map reference\n"
         "Route map name\n"
        )
-@@ -669,6 +681,12 @@
+@@ -669,6 +681,12 @@ DEFUN (ospf6_redistribute_routemap,
      type = ZEBRA_ROUTE_RIPNG;
    else if (strncmp (argv[0], "bgp", 3) == 0)
      type = ZEBRA_ROUTE_BGP;
@@ -524,7 +529,7 @@ diff -Naur quagga-0.99.16/ospf6d/ospf6_asbr.c quagga-0.99.16.patched/ospf6d/ospf
  
    ospf6_asbr_redistribute_unset (type);
    ospf6_asbr_routemap_set (type, argv[1]);
-@@ -678,7 +696,7 @@
+@@ -678,7 +696,7 @@ DEFUN (ospf6_redistribute_routemap,
  
  DEFUN (no_ospf6_redistribute,
         no_ospf6_redistribute_cmd,
@@ -533,7 +538,7 @@ diff -Naur quagga-0.99.16/ospf6d/ospf6_asbr.c quagga-0.99.16.patched/ospf6d/ospf
         NO_STR
         "Redistribute\n"
         "Static route\n"
-@@ -686,6 +704,9 @@
+@@ -686,6 +704,9 @@ DEFUN (no_ospf6_redistribute,
         "Connected route\n"
         "RIPng route\n"
         "BGP route\n"
@@ -543,7 +548,7 @@ diff -Naur quagga-0.99.16/ospf6d/ospf6_asbr.c quagga-0.99.16.patched/ospf6d/ospf
        )
  {
    int type = 0;
-@@ -700,6 +721,12 @@
+@@ -700,6 +721,12 @@ DEFUN (no_ospf6_redistribute,
      type = ZEBRA_ROUTE_RIPNG;
    else if (strncmp (argv[0], "bgp", 3) == 0)
      type = ZEBRA_ROUTE_BGP;
@@ -556,10 +561,11 @@ diff -Naur quagga-0.99.16/ospf6d/ospf6_asbr.c quagga-0.99.16.patched/ospf6d/ospf
  
    ospf6_asbr_redistribute_unset (type);
    ospf6_asbr_routemap_unset (type);
-diff -Naur quagga-0.99.16/ospfd/ospf_vty.c quagga-0.99.16.patched/ospfd/ospf_vty.c
---- quagga-0.99.16/ospfd/ospf_vty.c    2009-12-09 14:37:12.000000000 +0200
-+++ quagga-0.99.16.patched/ospfd/ospf_vty.c    2010-03-12 18:12:28.000000000 +0200
-@@ -107,8 +107,14 @@
+diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
+index adc822a..a71ebd1 100644
+--- a/ospfd/ospf_vty.c
++++ b/ospfd/ospf_vty.c
+@@ -107,8 +107,14 @@ str2distribute_source (const char *str, int *source)
      *source = ZEBRA_ROUTE_STATIC;
    else if (strncmp (str, "r", 1) == 0)
      *source = ZEBRA_ROUTE_RIP;
@@ -575,10 +581,11 @@ diff -Naur quagga-0.99.16/ospfd/ospf_vty.c quagga-0.99.16.patched/ospfd/ospf_vty
    else
      return 0;
  
-diff -Naur quagga-0.99.16/ripd/rip_zebra.c quagga-0.99.16.patched/ripd/rip_zebra.c
---- quagga-0.99.16/ripd/rip_zebra.c    2009-12-10 18:14:39.000000000 +0200
-+++ quagga-0.99.16.patched/ripd/rip_zebra.c    2010-03-12 18:12:28.000000000 +0200
-@@ -204,8 +204,11 @@
+diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c
+index c476d8f..4f22dbc 100644
+--- a/ripd/rip_zebra.c
++++ b/ripd/rip_zebra.c
+@@ -204,8 +204,11 @@ static struct {
    {ZEBRA_ROUTE_KERNEL,  1, "kernel"},
    {ZEBRA_ROUTE_CONNECT, 1, "connected"},
    {ZEBRA_ROUTE_STATIC,  1, "static"},
@@ -592,10 +599,11 @@ diff -Naur quagga-0.99.16/ripd/rip_zebra.c quagga-0.99.16.patched/ripd/rip_zebra
    {0, 0, NULL}
  };
  
-diff -Naur quagga-0.99.16/ripngd/ripng_zebra.c quagga-0.99.16.patched/ripngd/ripng_zebra.c
---- quagga-0.99.16/ripngd/ripng_zebra.c        2009-12-09 14:37:12.000000000 +0200
-+++ quagga-0.99.16.patched/ripngd/ripng_zebra.c        2010-03-12 18:12:28.000000000 +0200
-@@ -214,8 +214,11 @@
+diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c
+index 4c44455..f0623c8 100644
+--- a/ripngd/ripng_zebra.c
++++ b/ripngd/ripng_zebra.c
+@@ -214,8 +214,11 @@ static struct {
    {ZEBRA_ROUTE_KERNEL,  1, "kernel"},
    {ZEBRA_ROUTE_CONNECT, 1, "connected"},
    {ZEBRA_ROUTE_STATIC,  1, "static"},
@@ -609,10 +617,11 @@ diff -Naur quagga-0.99.16/ripngd/ripng_zebra.c quagga-0.99.16.patched/ripngd/rip
    {0, 0, NULL}
  };
  
-diff -Naur quagga-0.99.16/zebra/redistribute.c quagga-0.99.16.patched/zebra/redistribute.c
---- quagga-0.99.16/zebra/redistribute.c        2009-12-09 14:37:12.000000000 +0200
-+++ quagga-0.99.16.patched/zebra/redistribute.c        2010-03-12 18:12:28.000000000 +0200
-@@ -255,6 +255,9 @@
+diff --git a/zebra/redistribute.c b/zebra/redistribute.c
+index a8107ae..ec1e278 100644
+--- a/zebra/redistribute.c
++++ b/zebra/redistribute.c
+@@ -255,6 +255,9 @@ zebra_redistribute_add (int command, struct zserv *client, int length)
      case ZEBRA_ROUTE_OSPF:
      case ZEBRA_ROUTE_OSPF6:
      case ZEBRA_ROUTE_BGP:
@@ -622,7 +631,7 @@ diff -Naur quagga-0.99.16/zebra/redistribute.c quagga-0.99.16.patched/zebra/redi
        if (! client->redist[type])
        {
          client->redist[type] = 1;
-@@ -283,6 +286,9 @@
+@@ -283,6 +286,9 @@ zebra_redistribute_delete (int command, struct zserv *client, int length)
      case ZEBRA_ROUTE_OSPF:
      case ZEBRA_ROUTE_OSPF6:
      case ZEBRA_ROUTE_BGP:
@@ -632,10 +641,11 @@ diff -Naur quagga-0.99.16/zebra/redistribute.c quagga-0.99.16.patched/zebra/redi
        client->redist[type] = 0;
        break;
      default:
-diff -Naur quagga-0.99.16/zebra/zebra_rib.c quagga-0.99.16.patched/zebra/zebra_rib.c
---- quagga-0.99.16/zebra/zebra_rib.c   2009-12-21 12:40:24.000000000 +0200
-+++ quagga-0.99.16.patched/zebra/zebra_rib.c   2010-03-12 18:12:28.000000000 +0200
-@@ -66,7 +66,10 @@
+diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
+index 12f3fa5..3f0aa58 100644
+--- a/zebra/zebra_rib.c
++++ b/zebra/zebra_rib.c
+@@ -66,7 +66,10 @@ static const struct
    {ZEBRA_ROUTE_OSPF,    110},
    {ZEBRA_ROUTE_OSPF6,   110},
    {ZEBRA_ROUTE_ISIS,    115},
@@ -647,7 +657,7 @@ diff -Naur quagga-0.99.16/zebra/zebra_rib.c quagga-0.99.16.patched/zebra/zebra_r
  };
  \f
  /* Vector for routing table.  */
-@@ -1229,6 +1232,8 @@
+@@ -1229,6 +1232,8 @@ static const u_char meta_queue_map[ZEBRA_ROUTE_MAX] = {
    [ZEBRA_ROUTE_ISIS]    = 2,
    [ZEBRA_ROUTE_BGP]     = 3,
    [ZEBRA_ROUTE_HSLS]    = 4,
@@ -656,10 +666,11 @@ diff -Naur quagga-0.99.16/zebra/zebra_rib.c quagga-0.99.16.patched/zebra/zebra_r
  };
  
  /* Look into the RN and queue it into one or more priority queues,
-diff -Naur quagga-0.99.16/zebra/zebra_snmp.c quagga-0.99.16.patched/zebra/zebra_snmp.c
---- quagga-0.99.16/zebra/zebra_snmp.c  2009-12-09 14:37:12.000000000 +0200
-+++ quagga-0.99.16.patched/zebra/zebra_snmp.c  2010-03-12 18:12:28.000000000 +0200
-@@ -251,6 +251,12 @@
+diff --git a/zebra/zebra_snmp.c b/zebra/zebra_snmp.c
+index 0fde4bb..23222f4 100644
+--- a/zebra/zebra_snmp.c
++++ b/zebra/zebra_snmp.c
+@@ -251,6 +251,12 @@ proto_trans(int type)
        return 1; /* shouldn't happen */
      case ZEBRA_ROUTE_BGP:
        return 14; /* bgp */
@@ -672,10 +683,11 @@ diff -Naur quagga-0.99.16/zebra/zebra_snmp.c quagga-0.99.16.patched/zebra/zebra_
      default:
        return 1; /* other */
      }
-diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_vty.c
---- quagga-0.99.16/zebra/zebra_vty.c   2009-12-09 14:37:12.000000000 +0200
-+++ quagga-0.99.16.patched/zebra/zebra_vty.c   2010-03-12 19:00:32.000000000 +0200
-@@ -557,7 +557,10 @@
+diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
+index ecb5d10..98834d2 100644
+--- a/zebra/zebra_vty.c
++++ b/zebra/zebra_vty.c
+@@ -557,7 +557,10 @@ vty_show_ip_route_detail (struct vty *vty, struct route_node *rn)
        if (rib->type == ZEBRA_ROUTE_RIP
          || rib->type == ZEBRA_ROUTE_OSPF
          || rib->type == ZEBRA_ROUTE_ISIS
@@ -687,7 +699,7 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
        {
          time_t uptime;
          struct tm *tm;
-@@ -775,7 +778,10 @@
+@@ -775,7 +778,10 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn, struct rib *rib)
        if (rib->type == ZEBRA_ROUTE_RIP
          || rib->type == ZEBRA_ROUTE_OSPF
          || rib->type == ZEBRA_ROUTE_ISIS
@@ -699,7 +711,7 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
        {
          time_t uptime;
          struct tm *tm;
-@@ -803,8 +809,8 @@
+@@ -803,8 +809,8 @@ vty_show_ip_route (struct vty *vty, struct route_node *rn, struct rib *rib)
  }
  
  #define SHOW_ROUTE_V4_HEADER "Codes: K - kernel route, C - connected, " \
@@ -710,7 +722,7 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
  
  DEFUN (show_ip_route,
         show_ip_route_cmd,
-@@ -829,7 +835,7 @@
+@@ -829,7 +835,7 @@ DEFUN (show_ip_route,
        if (first)
          {
            vty_out (vty, SHOW_ROUTE_V4_HEADER, VTY_NEWLINE, VTY_NEWLINE,
@@ -719,7 +731,25 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
            first = 0;
          }
        vty_show_ip_route (vty, rn, rib);
-@@ -922,7 +928,7 @@
+@@ -872,7 +878,7 @@ DEFUN (show_ip_route_prefix_longer,
+         if (first)
+           {
+             vty_out (vty, SHOW_ROUTE_V4_HEADER, VTY_NEWLINE,
+-                     VTY_NEWLINE, VTY_NEWLINE);
++                     VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE);
+             first = 0;
+           }
+         vty_show_ip_route (vty, rn, rib);
+@@ -911,7 +917,7 @@ DEFUN (show_ip_route_supernets,
+           if (first)
+             {
+               vty_out (vty, SHOW_ROUTE_V4_HEADER, VTY_NEWLINE,
+-                       VTY_NEWLINE, VTY_NEWLINE);
++                       VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE);
+               first = 0;
+             }
+           vty_show_ip_route (vty, rn, rib);
+@@ -922,7 +928,7 @@ DEFUN (show_ip_route_supernets,
  
  DEFUN (show_ip_route_protocol,
         show_ip_route_protocol_cmd,
@@ -728,7 +758,7 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
         SHOW_STR
         IP_STR
         "IP routing table\n"
-@@ -940,13 +946,13 @@
+@@ -940,13 +946,13 @@ DEFUN (show_ip_route_protocol,
    struct rib *rib;
    int first = 1;
  
@@ -744,7 +774,7 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
      type = ZEBRA_ROUTE_OSPF;
    else if (strncmp (argv[0], "i", 1) == 0)
      type = ZEBRA_ROUTE_ISIS;
-@@ -954,6 +960,12 @@
+@@ -954,6 +960,12 @@ DEFUN (show_ip_route_protocol,
      type = ZEBRA_ROUTE_RIP;
    else if (strncmp (argv[0], "s", 1) == 0)
      type = ZEBRA_ROUTE_STATIC;
@@ -757,7 +787,16 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
    else 
      {
        vty_out (vty, "Unknown route type%s", VTY_NEWLINE);
-@@ -1560,7 +1572,10 @@
+@@ -971,7 +983,7 @@ DEFUN (show_ip_route_protocol,
+       {
+         if (first)
+           {
+-            vty_out (vty, SHOW_ROUTE_V4_HEADER,
++            vty_out (vty, SHOW_ROUTE_V4_HEADER, VTY_NEWLINE,
+                      VTY_NEWLINE, VTY_NEWLINE, VTY_NEWLINE);
+             first = 0;
+           }
+@@ -1560,7 +1572,10 @@ vty_show_ipv6_route_detail (struct vty *vty, struct route_node *rn)
        if (rib->type == ZEBRA_ROUTE_RIPNG
          || rib->type == ZEBRA_ROUTE_OSPF6
          || rib->type == ZEBRA_ROUTE_ISIS
@@ -769,7 +808,7 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
        {
          time_t uptime;
          struct tm *tm;
-@@ -1739,7 +1754,10 @@
+@@ -1739,7 +1754,10 @@ vty_show_ipv6_route (struct vty *vty, struct route_node *rn,
        if (rib->type == ZEBRA_ROUTE_RIPNG
          || rib->type == ZEBRA_ROUTE_OSPF6
          || rib->type == ZEBRA_ROUTE_ISIS
@@ -781,7 +820,7 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
        {
          time_t uptime;
          struct tm *tm;
-@@ -1766,7 +1784,7 @@
+@@ -1766,7 +1784,7 @@ vty_show_ipv6_route (struct vty *vty, struct route_node *rn,
      }
  }
  
@@ -790,7 +829,7 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
  
  DEFUN (show_ipv6_route,
         show_ipv6_route_cmd,
-@@ -1842,7 +1860,7 @@
+@@ -1842,7 +1860,7 @@ DEFUN (show_ipv6_route_prefix_longer,
  
  DEFUN (show_ipv6_route_protocol,
         show_ipv6_route_protocol_cmd,
@@ -799,7 +838,7 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
         SHOW_STR
         IP_STR
         "IP routing table\n"
-@@ -1860,13 +1878,13 @@
+@@ -1860,13 +1878,13 @@ DEFUN (show_ipv6_route_protocol,
    struct rib *rib;
    int first = 1;
  
@@ -815,7 +854,7 @@ diff -Naur quagga-0.99.16/zebra/zebra_vty.c quagga-0.99.16.patched/zebra/zebra_v
      type = ZEBRA_ROUTE_OSPF6;
    else if (strncmp (argv[0], "i", 1) == 0)
      type = ZEBRA_ROUTE_ISIS;
-@@ -1874,6 +1892,12 @@
+@@ -1874,6 +1892,12 @@ DEFUN (show_ipv6_route_protocol,
      type = ZEBRA_ROUTE_RIPNG;
    else if (strncmp (argv[0], "s", 1) == 0)
      type = ZEBRA_ROUTE_STATIC;