projects
/
project
/
netifd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
dc7ba66
)
Reuse automatic ip6table value
author
Steven Barth
<steven@midlink.org>
Mon, 10 Jun 2013 08:01:20 +0000
(10:01 +0200)
committer
Steven Barth
<steven@midlink.org>
Mon, 10 Jun 2013 08:01:20 +0000
(10:01 +0200)
interface.c
patch
|
blob
|
history
diff --git
a/interface.c
b/interface.c
index
a697326
..
30e48cf
100644
(file)
--- a/
interface.c
+++ b/
interface.c
@@
-588,8
+588,12
@@
interface_init(struct interface *iface, const char *name,
}
// Set a default exteranl routing table for IPv6 to do source-based-filtering
}
// Set a default exteranl routing table for IPv6 to do source-based-filtering
+ struct interface *iface_old = vlist_find(&interfaces, name, iface_old, node);
+ if (iface_old && iface_old->ip6table > 1000 && iface_old->ip6table < 2000)
+ iface->ip6table = iface_old->ip6table;
+ else
+ iface->ip6table = 1000 + ++interface_serial;
- iface->ip6table = 1000 + ++interface_serial;
if ((cur = tb[IFACE_ATTR_IP6TABLE])) {
if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip6table))
DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
if ((cur = tb[IFACE_ATTR_IP6TABLE])) {
if (!system_resolve_rt_table(blobmsg_data(cur), &iface->ip6table))
DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));