bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] quagga: Fix OLSR recursive nexthop selection

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@32526 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
acinonyx 2012-06-29 15:31:27 +00:00
parent d00eb2225a
commit ab5e6e0883
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
net/quagga/patches/120-quagga_manet.patch
View File

@ -129,9 +129,9 @@
[ZEBRA_ROUTE_BABEL] = {ZEBRA_ROUTE_BABEL, 95}, [ZEBRA_ROUTE_BABEL] = {ZEBRA_ROUTE_BABEL, 95},
/* no entry/default: 150 */ /* no entry/default: 150 */
}; };
@@ -381,6 +384,18 @@ nexthop_active_ipv4 (struct rib *rib, st @@ -403,6 +406,18 @@ nexthop_active_ipv4 (struct rib *rib, st
}
return 1; return 0;
} }
+ else if (match->type == ZEBRA_ROUTE_OLSR) + else if (match->type == ZEBRA_ROUTE_OLSR)
+ { + {
@ -145,12 +145,12 @@
+ } + }
+ return 0; + return 0;
+ } + }
else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL)) else
{ {
for (newhop = match->nexthop; newhop; newhop = newhop->next) return 0;
@@ -483,6 +498,18 @@ nexthop_active_ipv6 (struct rib *rib, st @@ -507,6 +522,18 @@ nexthop_active_ipv6 (struct rib *rib, st
}
return 1; return 0;
} }
+ else if (match->type == ZEBRA_ROUTE_OLSR) + else if (match->type == ZEBRA_ROUTE_OLSR)
+ { + {
@ -164,9 +164,9 @@
+ } + }
+ return 0; + return 0;
+ } + }
else if (CHECK_FLAG (rib->flags, ZEBRA_FLAG_INTERNAL)) else
{ {
for (newhop = match->nexthop; newhop; newhop = newhop->next) return 0;
@@ -1236,6 +1263,8 @@ static const u_char meta_queue_map[ZEBRA @@ -1236,6 +1263,8 @@ static const u_char meta_queue_map[ZEBRA
[ZEBRA_ROUTE_ISIS] = 2, [ZEBRA_ROUTE_ISIS] = 2,
[ZEBRA_ROUTE_BGP] = 3, [ZEBRA_ROUTE_BGP] = 3,