Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[packages] quagga: refresh patches

Browse source 
git-svn-id: svn+ssh://svn.openwrt.org/openwrt@16399 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acinonyx 2009-06-10 12:32:35 +00:00
parent 9dc3de800e
commit 7704199cde
7 changed files with 97 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
patches/001-quagga_cross.patch
View file

@ -1,6 +1,6 @@
--- quagga-0.98.4/configure.orig Mon Jun 27 19:05:31 2005
+++ quagga-0.98.4/configure Mon Jul 11 20:32:07 2005
@@ -12623,69 +12623,6 @@
--- a/configure
+++ b/configure
@@ -12675,69 +12675,6 @@ fi
@ -70,7 +70,7 @@
echo "$as_me:$LINENO: checking route read method check" >&5
echo $ECHO_N "checking route read method check... $ECHO_C" >&6
if test "${zebra_rtread+set}" = set; then
@@ -12783,10 +12720,7 @@
@@ -12835,10 +12772,7 @@ echo $ECHO_N "checking ipforward method
if test "${zebra_ipforward_path+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else

16
patches/001-quagga_readline.patch
View file

@ -1,6 +1,6 @@
--- quagga-0.98.4/configure.orig Mon Jun 27 19:05:31 2005
+++ quagga-0.98.4/configure Thu Jul 28 07:02:12 2005
@@ -10937,7 +10937,7 @@
--- a/configure
+++ b/configure
@@ -10972,7 +10972,7 @@ if test "${ac_cv_lib_curses_tputs+set}"
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -9,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11071,7 +11071,8 @@
@@ -11108,7 +11108,8 @@ if test $ac_cv_lib_ncurses_tputs = yes;
#define HAVE_LIBNCURSES 1
_ACEOF
@ -19,7 +19,7 @@
fi
@@ -11088,7 +11089,7 @@
@@ -11125,7 +11126,7 @@ if test "${ac_cv_lib_readline_main+set}"
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -28,7 +28,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11144,7 +11145,8 @@
@@ -11182,7 +11183,8 @@ if test $ac_cv_lib_readline_main = yes;
#define HAVE_LIBREADLINE 1
_ACEOF
@ -38,7 +38,7 @@
fi
@@ -11303,7 +11305,7 @@
@@ -11342,7 +11344,7 @@ if test "${ac_cv_lib_readline_rl_complet
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -47,7 +47,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -11365,7 +11367,7 @@
@@ -11405,7 +11407,7 @@ if test $ac_cv_lib_readline_rl_completio
#define HAVE_LIBREADLINE 1
_ACEOF

143
patches/002-quagga_manet.patch
View file

@ -1,6 +1,5 @@
diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
--- quagga-0.98.6/bgpd/bgp_vty.c 2006-03-30 18:12:25.000000000 +0200
+++ quagga-0.98.6.patched/bgpd/bgp_vty.c 2007-12-30 14:18:22.000000000 +0200
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -3,6 +3,9 @@
This file is part of GNU Zebra.
@ -11,7 +10,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
GNU Zebra is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
@@ -7793,8 +7796,12 @@
@@ -7793,8 +7796,12 @@ bgp_str2route_type (int afi, const char
return ZEBRA_ROUTE_STATIC;
else if (strncmp (str, "r", 1) == 0)
return ZEBRA_ROUTE_RIP;
@ -25,7 +24,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
}
if (afi == AFI_IP6)
{
@@ -7806,21 +7813,28 @@
@@ -7806,21 +7813,28 @@ bgp_str2route_type (int afi, const char
return ZEBRA_ROUTE_STATIC;
else if (strncmp (str, "r", 1) == 0)
return ZEBRA_ROUTE_RIPNG;
@ -57,7 +56,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
{
int type;
@@ -7835,13 +7849,15 @@
@@ -7835,13 +7849,15 @@ DEFUN (bgp_redistribute_ipv4,
DEFUN (bgp_redistribute_ipv4_rmap,
bgp_redistribute_ipv4_rmap_cmd,
@ -74,7 +73,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Route map reference\n"
"Pointer to route-map entries\n")
{
@@ -7860,13 +7876,15 @@
@@ -7860,13 +7876,15 @@ DEFUN (bgp_redistribute_ipv4_rmap,
DEFUN (bgp_redistribute_ipv4_metric,
bgp_redistribute_ipv4_metric_cmd,
@ -91,7 +90,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Metric for redistributed routes\n"
"Default metric\n")
{
@@ -7887,13 +7905,15 @@
@@ -7887,13 +7905,15 @@ DEFUN (bgp_redistribute_ipv4_metric,
DEFUN (bgp_redistribute_ipv4_rmap_metric,
bgp_redistribute_ipv4_rmap_metric_cmd,
@ -108,7 +107,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Route map reference\n"
"Pointer to route-map entries\n"
"Metric for redistributed routes\n"
@@ -7917,13 +7937,15 @@
@@ -7917,13 +7937,15 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric
DEFUN (bgp_redistribute_ipv4_metric_rmap,
bgp_redistribute_ipv4_metric_rmap_cmd,
@ -125,7 +124,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Metric for redistributed routes\n"
"Default metric\n"
"Route map reference\n"
@@ -7947,14 +7969,17 @@
@@ -7947,14 +7969,17 @@ DEFUN (bgp_redistribute_ipv4_metric_rmap
DEFUN (no_bgp_redistribute_ipv4,
no_bgp_redistribute_ipv4_cmd,
@ -145,7 +144,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
{
int type;
@@ -7970,7 +7995,7 @@
@@ -7970,7 +7995,7 @@ DEFUN (no_bgp_redistribute_ipv4,
DEFUN (no_bgp_redistribute_ipv4_rmap,
no_bgp_redistribute_ipv4_rmap_cmd,
@ -154,7 +153,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
NO_STR
"Redistribute information from another routing protocol\n"
"Connected\n"
@@ -7978,6 +8003,8 @@
@@ -7978,6 +8003,8 @@ DEFUN (no_bgp_redistribute_ipv4_rmap,
"Open Shurtest Path First (OSPF)\n"
"Routing Information Protocol (RIP)\n"
"Static routes\n"
@ -163,7 +162,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Route map reference\n"
"Pointer to route-map entries\n")
{
@@ -7996,7 +8023,7 @@
@@ -7996,7 +8023,7 @@ DEFUN (no_bgp_redistribute_ipv4_rmap,
DEFUN (no_bgp_redistribute_ipv4_metric,
no_bgp_redistribute_ipv4_metric_cmd,
@ -172,7 +171,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
NO_STR
"Redistribute information from another routing protocol\n"
"Connected\n"
@@ -8004,6 +8031,8 @@
@@ -8004,6 +8031,8 @@ DEFUN (no_bgp_redistribute_ipv4_metric,
"Open Shurtest Path First (OSPF)\n"
"Routing Information Protocol (RIP)\n"
"Static routes\n"
@ -181,7 +180,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Metric for redistributed routes\n"
"Default metric\n")
{
@@ -8022,7 +8051,7 @@
@@ -8022,7 +8051,7 @@ DEFUN (no_bgp_redistribute_ipv4_metric,
DEFUN (no_bgp_redistribute_ipv4_rmap_metric,
no_bgp_redistribute_ipv4_rmap_metric_cmd,
@ -190,7 +189,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
NO_STR
"Redistribute information from another routing protocol\n"
"Connected\n"
@@ -8030,6 +8059,8 @@
@@ -8030,6 +8059,8 @@ DEFUN (no_bgp_redistribute_ipv4_rmap_met
"Open Shurtest Path First (OSPF)\n"
"Routing Information Protocol (RIP)\n"
"Static routes\n"
@ -199,7 +198,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Route map reference\n"
"Pointer to route-map entries\n"
"Metric for redistributed routes\n"
@@ -8051,7 +8082,7 @@
@@ -8051,7 +8082,7 @@ DEFUN (no_bgp_redistribute_ipv4_rmap_met
ALIAS (no_bgp_redistribute_ipv4_rmap_metric,
no_bgp_redistribute_ipv4_metric_rmap_cmd,
@ -208,7 +207,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
NO_STR
"Redistribute information from another routing protocol\n"
"Connected\n"
@@ -8059,6 +8090,8 @@
@@ -8059,6 +8090,8 @@ ALIAS (no_bgp_redistribute_ipv4_rmap_met
"Open Shurtest Path First (OSPF)\n"
"Routing Information Protocol (RIP)\n"
"Static routes\n"
@ -217,7 +216,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Metric for redistributed routes\n"
"Default metric\n"
"Route map reference\n"
@@ -8067,13 +8100,16 @@
@@ -8067,13 +8100,16 @@ ALIAS (no_bgp_redistribute_ipv4_rmap_met
#ifdef HAVE_IPV6
DEFUN (bgp_redistribute_ipv6,
bgp_redistribute_ipv6_cmd,
@ -236,7 +235,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
{
int type;
@@ -8089,13 +8125,15 @@
@@ -8089,13 +8125,15 @@ DEFUN (bgp_redistribute_ipv6,
DEFUN (bgp_redistribute_ipv6_rmap,
bgp_redistribute_ipv6_rmap_cmd,
@ -253,7 +252,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Route map reference\n"
"Pointer to route-map entries\n")
{
@@ -8114,13 +8152,15 @@
@@ -8114,13 +8152,15 @@ DEFUN (bgp_redistribute_ipv6_rmap,
DEFUN (bgp_redistribute_ipv6_metric,
bgp_redistribute_ipv6_metric_cmd,
@ -270,7 +269,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Metric for redistributed routes\n"
"Default metric\n")
{
@@ -8141,13 +8181,15 @@
@@ -8141,13 +8181,15 @@ DEFUN (bgp_redistribute_ipv6_metric,
DEFUN (bgp_redistribute_ipv6_rmap_metric,
bgp_redistribute_ipv6_rmap_metric_cmd,
@ -287,7 +286,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Route map reference\n"
"Pointer to route-map entries\n"
"Metric for redistributed routes\n"
@@ -8171,13 +8213,15 @@
@@ -8171,13 +8213,15 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric
DEFUN (bgp_redistribute_ipv6_metric_rmap,
bgp_redistribute_ipv6_metric_rmap_cmd,
@ -304,7 +303,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Metric for redistributed routes\n"
"Default metric\n"
"Route map reference\n"
@@ -8201,14 +8245,17 @@
@@ -8201,14 +8245,17 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap
DEFUN (no_bgp_redistribute_ipv6,
no_bgp_redistribute_ipv6_cmd,
@ -324,7 +323,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
{
int type;
@@ -8224,7 +8271,7 @@
@@ -8224,7 +8271,7 @@ DEFUN (no_bgp_redistribute_ipv6,
DEFUN (no_bgp_redistribute_ipv6_rmap,
no_bgp_redistribute_ipv6_rmap_cmd,
@ -333,7 +332,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
NO_STR
"Redistribute information from another routing protocol\n"
"Connected\n"
@@ -8232,6 +8279,8 @@
@@ -8232,6 +8279,8 @@ DEFUN (no_bgp_redistribute_ipv6_rmap,
"Open Shurtest Path First (OSPFv3)\n"
"Routing Information Protocol (RIPng)\n"
"Static routes\n"
@ -342,7 +341,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Route map reference\n"
"Pointer to route-map entries\n")
{
@@ -8250,7 +8299,7 @@
@@ -8250,7 +8299,7 @@ DEFUN (no_bgp_redistribute_ipv6_rmap,
DEFUN (no_bgp_redistribute_ipv6_metric,
no_bgp_redistribute_ipv6_metric_cmd,
@ -351,7 +350,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
NO_STR
"Redistribute information from another routing protocol\n"
"Connected\n"
@@ -8258,6 +8307,8 @@
@@ -8258,6 +8307,8 @@ DEFUN (no_bgp_redistribute_ipv6_metric,
"Open Shurtest Path First (OSPFv3)\n"
"Routing Information Protocol (RIPng)\n"
"Static routes\n"
@ -360,7 +359,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Metric for redistributed routes\n"
"Default metric\n")
{
@@ -8276,7 +8327,7 @@
@@ -8276,7 +8327,7 @@ DEFUN (no_bgp_redistribute_ipv6_metric,
DEFUN (no_bgp_redistribute_ipv6_rmap_metric,
no_bgp_redistribute_ipv6_rmap_metric_cmd,
@ -369,7 +368,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
NO_STR
"Redistribute information from another routing protocol\n"
"Connected\n"
@@ -8284,6 +8335,8 @@
@@ -8284,6 +8335,8 @@ DEFUN (no_bgp_redistribute_ipv6_rmap_met
"Open Shurtest Path First (OSPFv3)\n"
"Routing Information Protocol (RIPng)\n"
"Static routes\n"
@ -378,7 +377,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Route map reference\n"
"Pointer to route-map entries\n"
"Metric for redistributed routes\n"
@@ -8305,7 +8358,7 @@
@@ -8305,7 +8358,7 @@ DEFUN (no_bgp_redistribute_ipv6_rmap_met
ALIAS (no_bgp_redistribute_ipv6_rmap_metric,
no_bgp_redistribute_ipv6_metric_rmap_cmd,
@ -387,7 +386,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
NO_STR
"Redistribute information from another routing protocol\n"
"Connected\n"
@@ -8313,6 +8366,8 @@
@@ -8313,6 +8366,8 @@ ALIAS (no_bgp_redistribute_ipv6_rmap_met
"Open Shurtest Path First (OSPFv3)\n"
"Routing Information Protocol (RIPng)\n"
"Static routes\n"
@ -396,7 +395,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
"Metric for redistributed routes\n"
"Default metric\n"
"Route map reference\n"
@@ -8325,7 +8380,7 @@
@@ -8325,7 +8380,7 @@ bgp_config_write_redistribute (struct vt
{
int i;
const char *str[] = { "system", "kernel", "connected", "static", "rip",
@ -405,9 +404,8 @@ diff -Nur quagga-0.98.6/bgpd/bgp_vty.c quagga-0.98.6.patched/bgpd/bgp_vty.c
/* Unicast redistribution only. */
if (safi != SAFI_UNICAST)
diff -Nur quagga-0.98.6/lib/zebra.h quagga-0.98.6.patched/lib/zebra.h
--- quagga-0.98.6/lib/zebra.h 2005-06-15 14:54:18.000000000 +0300
+++ quagga-0.98.6.patched/lib/zebra.h 2007-12-30 14:18:22.000000000 +0200
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -3,6 +3,9 @@
This file is part of GNU Zebra.
@ -418,7 +416,7 @@ diff -Nur quagga-0.98.6/lib/zebra.h quagga-0.98.6.patched/lib/zebra.h
GNU Zebra is free software; you can redistribute it and/or modify it
under the terms of the GNU General Public License as published by the
Free Software Foundation; either version 2, or (at your option) any
@@ -378,7 +381,9 @@
@@ -378,7 +381,9 @@ struct in_pktinfo
#define ZEBRA_ROUTE_ISIS 8
#define ZEBRA_ROUTE_BGP 9
#define ZEBRA_ROUTE_HSLS 10
@ -429,9 +427,8 @@ diff -Nur quagga-0.98.6/lib/zebra.h quagga-0.98.6.patched/lib/zebra.h
/* Zebra's family types. */
#define ZEBRA_FAMILY_IPV4 1
diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
--- quagga-0.98.6/ospfd/ospf_vty.c 2006-03-30 17:41:20.000000000 +0200
+++ quagga-0.98.6.patched/ospfd/ospf_vty.c 2007-12-30 14:18:22.000000000 +0200
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -3,6 +3,9 @@
*
* This file is part of GNU Zebra.
@ -442,7 +439,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
* GNU Zebra is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2, or (at your option) any
@@ -106,11 +109,15 @@
@@ -106,11 +109,15 @@ str2distribute_source (const char *str,
*source = ZEBRA_ROUTE_STATIC;
else if (strncmp (str, "r", 1) == 0)
*source = ZEBRA_ROUTE_RIP;
@ -460,7 +457,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
return 1;
}
@@ -5302,13 +5309,15 @@
@@ -5302,13 +5309,15 @@ ALIAS (no_ip_ospf_transmit_delay,
DEFUN (ospf_redistribute_source_metric_type,
ospf_redistribute_source_metric_type_routemap_cmd,
@ -477,7 +474,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
"Metric for redistributed routes\n"
"OSPF default metric\n"
"OSPF exterior metric type for redistributed routes\n"
@@ -5346,13 +5355,15 @@
@@ -5346,13 +5355,15 @@ DEFUN (ospf_redistribute_source_metric_t
ALIAS (ospf_redistribute_source_metric_type,
ospf_redistribute_source_metric_type_cmd,
@ -494,7 +491,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
"Metric for redistributed routes\n"
"OSPF default metric\n"
"OSPF exterior metric type for redistributed routes\n"
@@ -5361,25 +5372,29 @@
@@ -5361,25 +5372,29 @@ ALIAS (ospf_redistribute_source_metric_t
ALIAS (ospf_redistribute_source_metric_type,
ospf_redistribute_source_metric_cmd,
@ -526,7 +523,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
"OSPF exterior metric type for redistributed routes\n"
"Set OSPF External Type 1 metrics\n"
"Set OSPF External Type 2 metrics\n"
@@ -5417,13 +5432,15 @@
@@ -5417,13 +5432,15 @@ DEFUN (ospf_redistribute_source_type_met
ALIAS (ospf_redistribute_source_type_metric,
ospf_redistribute_source_type_metric_cmd,
@ -543,7 +540,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
"OSPF exterior metric type for redistributed routes\n"
"Set OSPF External Type 1 metrics\n"
"Set OSPF External Type 2 metrics\n"
@@ -5432,7 +5449,7 @@
@@ -5432,7 +5449,7 @@ ALIAS (ospf_redistribute_source_type_met
ALIAS (ospf_redistribute_source_type_metric,
ospf_redistribute_source_type_cmd,
@ -552,7 +549,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
"Redistribute information from another routing protocol\n"
"Kernel routes\n"
"Connected\n"
@@ -5440,28 +5457,35 @@
@@ -5440,28 +5457,35 @@ ALIAS (ospf_redistribute_source_type_met
"Routing Information Protocol (RIP)\n"
"Border Gateway Protocol (BGP)\n"
"OSPF exterior metric type for redistributed routes\n"
@ -591,7 +588,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
"Metric for redistributed routes\n"
"OSPF default metric\n"
"Route map reference\n"
@@ -5490,13 +5514,15 @@
@@ -5490,13 +5514,15 @@ DEFUN (ospf_redistribute_source_metric_r
DEFUN (ospf_redistribute_source_type_routemap,
ospf_redistribute_source_type_routemap_cmd,
@ -608,7 +605,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
"OSPF exterior metric type for redistributed routes\n"
"Set OSPF External Type 1 metrics\n"
"Set OSPF External Type 2 metrics\n"
@@ -5526,13 +5552,15 @@
@@ -5526,13 +5552,15 @@ DEFUN (ospf_redistribute_source_type_rou
DEFUN (ospf_redistribute_source_routemap,
ospf_redistribute_source_routemap_cmd,
@ -625,7 +622,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
"Route map reference\n"
"Pointer to route-map entries\n")
{
@@ -5553,14 +5581,17 @@
@@ -5553,14 +5581,17 @@ DEFUN (ospf_redistribute_source_routemap
DEFUN (no_ospf_redistribute_source,
no_ospf_redistribute_source_cmd,
@ -645,7 +642,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
{
struct ospf *ospf = vty->index;
int source;
@@ -5574,7 +5605,7 @@
@@ -5574,7 +5605,7 @@ DEFUN (no_ospf_redistribute_source,
DEFUN (ospf_distribute_list_out,
ospf_distribute_list_out_cmd,
@ -654,7 +651,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
"Filter networks in routing updates\n"
"Access-list name\n"
OUT_STR
@@ -5582,7 +5613,10 @@
@@ -5582,7 +5613,10 @@ DEFUN (ospf_distribute_list_out,
"Connected\n"
"Static routes\n"
"Routing Information Protocol (RIP)\n"
@ -666,7 +663,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
{
struct ospf *ospf = vty->index;
int source;
@@ -5596,7 +5630,7 @@
@@ -5596,7 +5630,7 @@ DEFUN (ospf_distribute_list_out,
DEFUN (no_ospf_distribute_list_out,
no_ospf_distribute_list_out_cmd,
@ -675,7 +672,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
NO_STR
"Filter networks in routing updates\n"
"Access-list name\n"
@@ -5605,7 +5639,10 @@
@@ -5605,7 +5639,10 @@ DEFUN (no_ospf_distribute_list_out,
"Connected\n"
"Static routes\n"
"Routing Information Protocol (RIP)\n"
@ -687,7 +684,7 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
{
struct ospf *ospf = vty->index;
int source;
@@ -7121,7 +7158,8 @@
@@ -7121,7 +7158,8 @@ config_write_virtual_link (struct vty *v
const char *distribute_str[] = { "system", "kernel", "connected", "static",
@ -697,9 +694,8 @@ diff -Nur quagga-0.98.6/ospfd/ospf_vty.c quagga-0.98.6.patched/ospfd/ospf_vty.c
int
config_write_ospf_redistribute (struct vty *vty, struct ospf *ospf)
{
diff -Nur quagga-0.98.6/zebra/redistribute.c quagga-0.98.6.patched/zebra/redistribute.c
--- quagga-0.98.6/zebra/redistribute.c 2005-06-15 14:54:51.000000000 +0300
+++ quagga-0.98.6.patched/zebra/redistribute.c 2007-12-30 14:18:22.000000000 +0200
--- a/zebra/redistribute.c
+++ b/zebra/redistribute.c
@@ -3,6 +3,9 @@
*
* This file is part of GNU Zebra.
@ -710,7 +706,7 @@ diff -Nur quagga-0.98.6/zebra/redistribute.c quagga-0.98.6.patched/zebra/redistr
* GNU Zebra is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2, or (at your option) any
@@ -253,6 +256,8 @@
@@ -253,6 +256,8 @@ zebra_redistribute_add (int command, str
case ZEBRA_ROUTE_OSPF:
case ZEBRA_ROUTE_OSPF6:
case ZEBRA_ROUTE_BGP:
@ -719,7 +715,7 @@ diff -Nur quagga-0.98.6/zebra/redistribute.c quagga-0.98.6.patched/zebra/redistr
if (! client->redist[type])
{
client->redist[type] = 1;
@@ -281,6 +286,8 @@
@@ -281,6 +286,8 @@ zebra_redistribute_delete (int command,
case ZEBRA_ROUTE_OSPF:
case ZEBRA_ROUTE_OSPF6:
case ZEBRA_ROUTE_BGP:
@ -728,10 +724,9 @@ diff -Nur quagga-0.98.6/zebra/redistribute.c quagga-0.98.6.patched/zebra/redistr
client->redist[type] = 0;
break;
default:
diff -Nur quagga-0.98.6/zebra/zebra_vty.c quagga-0.98.6.patched/zebra/zebra_vty.c
--- quagga-0.98.6/zebra/zebra_vty.c 2004-12-18 18:03:29.000000000 +0200
+++ quagga-0.98.6.patched/zebra/zebra_vty.c 2007-12-30 14:25:48.000000000 +0200
@@ -53,6 +53,10 @@
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -53,6 +53,10 @@ route_type_str (u_char type)
return "isis";
case ZEBRA_ROUTE_BGP:
return "bgp";
@ -742,7 +737,7 @@ diff -Nur quagga-0.98.6/zebra/zebra_vty.c quagga-0.98.6.patched/zebra/zebra_vty.
default:
return "unknown";
}
@@ -84,6 +88,12 @@
@@ -84,6 +88,12 @@ route_type_char (u_char type)
return 'I';
case ZEBRA_ROUTE_BGP:
return 'B';
@ -755,7 +750,7 @@ diff -Nur quagga-0.98.6/zebra/zebra_vty.c quagga-0.98.6.patched/zebra/zebra_vty.
default:
return '?';
}
@@ -755,8 +765,8 @@
@@ -755,8 +765,8 @@ vty_show_ip_route (struct vty *vty, stru
}
#define SHOW_ROUTE_V4_HEADER "Codes: K - kernel route, C - connected, " \
@ -766,7 +761,7 @@ diff -Nur quagga-0.98.6/zebra/zebra_vty.c quagga-0.98.6.patched/zebra/zebra_vty.
DEFUN (show_ip_route,
show_ip_route_cmd,
@@ -874,7 +884,7 @@
@@ -874,7 +884,7 @@ DEFUN (show_ip_route_supernets,
DEFUN (show_ip_route_protocol,
show_ip_route_protocol_cmd,
@ -775,7 +770,7 @@ diff -Nur quagga-0.98.6/zebra/zebra_vty.c quagga-0.98.6.patched/zebra/zebra_vty.
SHOW_STR
IP_STR
"IP routing table\n"
@@ -884,6 +894,8 @@
@@ -884,6 +894,8 @@ DEFUN (show_ip_route_protocol,
"Kernel\n"
"Open Shortest Path First (OSPF)\n"
"Routing Information Protocol (RIP)\n"
@ -784,7 +779,7 @@ diff -Nur quagga-0.98.6/zebra/zebra_vty.c quagga-0.98.6.patched/zebra/zebra_vty.
"Static routes\n")
{
int type;
@@ -892,13 +904,13 @@
@@ -892,13 +904,13 @@ DEFUN (show_ip_route_protocol,
struct rib *rib;
int first = 1;
@ -800,7 +795,7 @@ diff -Nur quagga-0.98.6/zebra/zebra_vty.c quagga-0.98.6.patched/zebra/zebra_vty.
type = ZEBRA_ROUTE_OSPF;
else if (strncmp (argv[0], "i", 1) == 0)
type = ZEBRA_ROUTE_ISIS;
@@ -906,6 +918,10 @@
@@ -906,6 +918,10 @@ DEFUN (show_ip_route_protocol,
type = ZEBRA_ROUTE_RIP;
else if (strncmp (argv[0], "s", 1) == 0)
type = ZEBRA_ROUTE_STATIC;
@ -811,7 +806,7 @@ diff -Nur quagga-0.98.6/zebra/zebra_vty.c quagga-0.98.6.patched/zebra/zebra_vty.
else
{
vty_out (vty, "Unknown route type%s", VTY_NEWLINE);
@@ -1732,7 +1748,7 @@
@@ -1732,7 +1748,7 @@ DEFUN (show_ipv6_route_prefix_longer,
DEFUN (show_ipv6_route_protocol,
show_ipv6_route_protocol_cmd,
@ -820,7 +815,7 @@ diff -Nur quagga-0.98.6/zebra/zebra_vty.c quagga-0.98.6.patched/zebra/zebra_vty.
SHOW_STR
IP_STR
"IP routing table\n"
@@ -1742,6 +1758,8 @@
@@ -1742,6 +1758,8 @@ DEFUN (show_ipv6_route_protocol,
"Kernel\n"
"Open Shortest Path First (OSPFv3)\n"
"Routing Information Protocol (RIPng)\n"
@ -829,7 +824,7 @@ diff -Nur quagga-0.98.6/zebra/zebra_vty.c quagga-0.98.6.patched/zebra/zebra_vty.
"Static routes\n")
{
int type;
@@ -1750,13 +1768,13 @@
@@ -1750,13 +1768,13 @@ DEFUN (show_ipv6_route_protocol,
struct rib *rib;
int first = 1;
@ -845,7 +840,7 @@ diff -Nur quagga-0.98.6/zebra/zebra_vty.c quagga-0.98.6.patched/zebra/zebra_vty.
type = ZEBRA_ROUTE_OSPF6;
else if (strncmp (argv[0], "i", 1) == 0)
type = ZEBRA_ROUTE_ISIS;
@@ -1764,7 +1782,11 @@
@@ -1764,7 +1782,11 @@ DEFUN (show_ipv6_route_protocol,
type = ZEBRA_ROUTE_RIPNG;
else if (strncmp (argv[0], "s", 1) == 0)
type = ZEBRA_ROUTE_STATIC;

9
patches/100-confederation.patch
View file

@ -1,7 +1,6 @@
diff -Nur quagga-0.98.6/bgpd/bgp_route.c quagga-0.98.6-patched/bgpd/bgp_route.c
--- quagga-0.98.6/bgpd/bgp_route.c 2006-05-08 18:03:25.000000000 +0300
+++ quagga-0.98.6-patched/bgpd/bgp_route.c 2006-12-08 23:10:37.000000000 +0200
@@ -1815,6 +1815,7 @@
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -1815,6 +1815,7 @@ bgp_update_main (struct peer *peer, stru
if ((afi == AFI_IP || afi == AFI_IP6)
&& safi == SAFI_UNICAST
&& (peer_sort (peer) == BGP_PEER_IBGP
@ -9,7 +8,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_route.c quagga-0.98.6-patched/bgpd/bgp_route.c
|| (peer_sort (peer) == BGP_PEER_EBGP && peer->ttl != 1)
|| CHECK_FLAG (peer->flags, PEER_FLAG_ENFORCE_MULTIHOP)))
{
@@ -1862,6 +1863,7 @@
@@ -1862,6 +1863,7 @@ bgp_update_main (struct peer *peer, stru
if ((afi == AFI_IP || afi == AFI_IP6)
&& safi == SAFI_UNICAST
&& (peer_sort (peer) == BGP_PEER_IBGP

23
patches/120-confed_errorhandle.patch
View file

@ -1,7 +1,6 @@
diff -Nur quagga-0.98.6/bgpd/bgp_aspath.c quagga-0.98.6-patched/bgpd/bgp_aspath.c
--- quagga-0.98.6/bgpd/bgp_aspath.c 2005-06-15 14:53:50.000000000 +0300
+++ quagga-0.98.6-patched/bgpd/bgp_aspath.c 2007-11-24 03:20:02.000000000 +0200
@@ -614,6 +614,47 @@
--- a/bgpd/bgp_aspath.c
+++ b/bgpd/bgp_aspath.c
@@ -614,6 +614,47 @@ aspath_private_as_check (struct aspath *
return 1;
}
@ -49,7 +48,7 @@ diff -Nur quagga-0.98.6/bgpd/bgp_aspath.c quagga-0.98.6-patched/bgpd/bgp_aspath.
/* Merge as1 to as2. as2 should be uninterned aspath. */
struct aspath *
aspath_merge (struct aspath *as1, struct aspath *as2)
@@ -671,6 +712,10 @@
@@ -671,6 +712,10 @@ aspath_prepend (struct aspath *as1, stru
if (seg1 == NULL)
return as2;
@ -60,20 +59,18 @@ diff -Nur quagga-0.98.6/bgpd/bgp_aspath.c quagga-0.98.6-patched/bgpd/bgp_aspath.
/* Compare last segment type of as1 and first segment type of as2. */
if (seg1->type != seg2->type)
return aspath_merge (as1, as2);
diff -Nur quagga-0.98.6/bgpd/bgp_aspath.h quagga-0.98.6-patched/bgpd/bgp_aspath.h
--- quagga-0.98.6/bgpd/bgp_aspath.h 2005-06-15 14:53:50.000000000 +0300
+++ quagga-0.98.6-patched/bgpd/bgp_aspath.h 2007-11-24 03:21:24.000000000 +0200
@@ -76,4 +76,6 @@
--- a/bgpd/bgp_aspath.h
+++ b/bgpd/bgp_aspath.h
@@ -76,4 +76,6 @@ unsigned int aspath_key_make (struct asp
int aspath_loop_check (struct aspath *, as_t);
int aspath_private_as_check (struct aspath *);
int aspath_firstas_check (struct aspath *, as_t);
+int aspath_confed_check (struct aspath *);
+int aspath_left_confed_check (struct aspath *);
unsigned long aspath_count ();
diff -Nur quagga-0.98.6/bgpd/bgp_attr.c quagga-0.98.6-patched/bgpd/bgp_attr.c
--- quagga-0.98.6/bgpd/bgp_attr.c 2006-05-03 01:37:47.000000000 +0300
+++ quagga-0.98.6-patched/bgpd/bgp_attr.c 2007-11-24 03:09:56.000000000 +0200
@@ -673,6 +673,17 @@
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -673,6 +673,17 @@ bgp_attr_aspath (struct peer *peer, bgp_
return -1;
}

6
patches/130-netlink_ignore_wireless.patch
View file

@ -1,8 +1,6 @@
diff --git a/zebra/rt_netlink.c b/zebra/rt_netlink.c
index 61b2505..e766259 100644
--- a/zebra/rt_netlink.c
+++ b/zebra/rt_netlink.c
@@ -487,6 +487,17 @@ netlink_interface (struct sockaddr_nl *snl, struct nlmsghdr *h)
@@ -487,6 +487,17 @@ netlink_interface (struct sockaddr_nl *s
/* Looking up interface name. */
memset (tb, 0, sizeof tb);
netlink_parse_rtattr (tb, IFLA_MAX, IFLA_RTA (ifi), len);
@ -20,7 +18,7 @@ index 61b2505..e766259 100644
if (tb[IFLA_IFNAME] == NULL)
return -1;
name = (char *) RTA_DATA (tb[IFLA_IFNAME]);
@@ -943,6 +954,17 @@ netlink_link_change (struct sockaddr_nl *snl, struct nlmsghdr *h)
@@ -943,6 +954,17 @@ netlink_link_change (struct sockaddr_nl
/* Looking up interface name. */
memset (tb, 0, sizeof tb);
netlink_parse_rtattr (tb, IFLA_MAX, IFLA_RTA (ifi), len);

4
patches/140-holdtimer-set.patch
View file

@ -1,5 +1,3 @@
diff --git a/bgpd/bgp_network.c b/bgpd/bgp_network.c
index df37783..c4d5a61 100644
--- a/bgpd/bgp_network.c
+++ b/bgpd/bgp_network.c
@@ -109,6 +109,7 @@ bgp_accept (struct thread *thread)
@ -10,8 +8,6 @@ index df37783..c4d5a61 100644
/* Make peer's address string. */
sockunion2str (&su, buf, SU_ADDRSTRLEN);
diff --git a/bgpd/bgpd.h b/bgpd/bgpd.h
index 4137baf..8615ac8 100644
--- a/bgpd/bgpd.h
+++ b/bgpd/bgpd.h
@@ -656,6 +656,7 @@ struct bgp_nlri