projects
/
project
/
netifd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
97542f0
)
interface-ip: Remove table specific nw rules for IPv4/6 addresses
author
Hans Dedecker
<dedeckeh@gmail.com>
Mon, 28 Sep 2015 06:51:07 +0000
(08:51 +0200)
committer
Steven Barth
<steven@midlink.org>
Tue, 29 Sep 2015 06:27:16 +0000
(08:27 +0200)
interface-ip.c
patch
|
blob
|
history
diff --git
a/interface-ip.c
b/interface-ip.c
index
51a44ac
..
c4514b0
100644
(file)
--- a/
interface-ip.c
+++ b/
interface-ip.c
@@
-531,15
+531,10
@@
interface_update_proto_addr(struct vlist_tree *tree,
//has two connections to a network using the same subnet, adding
//only the network-rule will cause packets to be routed through the
//first matching network (source IP matches both masks).
//has two connections to a network using the same subnet, adding
//only the network-rule will cause packets to be routed through the
//first matching network (source IP matches both masks).
- if (a_old->policy_table)
{
+ if (a_old->policy_table)
set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr,
(v6) ? 128 : 32, a_old->policy_table, NULL, NULL);
set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &a_old->addr,
(v6) ? 128 : 32, a_old->policy_table, NULL, NULL);
- if (a_old->mask != ((v6) ? 128 : 32))
- set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &a_old->addr,
- a_old->mask, a_old->policy_table, NULL, NULL);
- }
-
if (!(a_old->flags & DEVADDR_EXTERNAL)) {
interface_handle_subnet_route(iface, a_old, false);
system_del_address(dev, a_old);
if (!(a_old->flags & DEVADDR_EXTERNAL)) {
interface_handle_subnet_route(iface, a_old, false);
system_del_address(dev, a_old);
@@
-567,14
+562,9
@@
interface_update_proto_addr(struct vlist_tree *tree,
}
if (!keep) {
}
if (!keep) {
- if (a_new->policy_table)
{
+ if (a_new->policy_table)
set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
(v6) ? 128 : 32, a_new->policy_table, NULL, NULL);
set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &a_new->addr,
(v6) ? 128 : 32, a_new->policy_table, NULL, NULL);
-
- if (a_new->mask != ((v6) ? 128 : 32))
- set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &a_new->addr,
- a_new->mask, a_new->policy_table, NULL, NULL);
- }
}
}
}
}
}
}
@@
-1240,26
+1230,16
@@
void interface_ip_set_enabled(struct interface_ip_settings *ip, bool enabled)
interface_handle_subnet_route(iface, addr, true);
addr->policy_table = (v6) ? iface->ip6table : iface->ip4table;
interface_handle_subnet_route(iface, addr, true);
addr->policy_table = (v6) ? iface->ip6table : iface->ip4table;
- if (addr->policy_table)
{
+ if (addr->policy_table)
set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
(v6) ? 128 : 32, addr->policy_table, NULL, NULL);
set_ip_source_policy(true, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
(v6) ? 128 : 32, addr->policy_table, NULL, NULL);
-
- if (addr->mask != ((v6) ? 128 : 32))
- set_ip_source_policy(true, v6, IPRULE_PRIORITY_NW, &addr->addr,
- addr->mask, addr->policy_table, NULL, NULL);
- }
} else {
interface_handle_subnet_route(iface, addr, false);
system_del_address(dev, addr);
} else {
interface_handle_subnet_route(iface, addr, false);
system_del_address(dev, addr);
- if (addr->policy_table)
{
+ if (addr->policy_table)
set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
(v6) ? 128 : 32, addr->policy_table, NULL, NULL);
set_ip_source_policy(false, v6, IPRULE_PRIORITY_ADDR, &addr->addr,
(v6) ? 128 : 32, addr->policy_table, NULL, NULL);
-
- if (addr->mask != ((v6) ? 128 : 32))
- set_ip_source_policy(false, v6, IPRULE_PRIORITY_NW, &addr->addr,
- addr->mask, addr->policy_table, NULL, NULL);
- }
}
addr->enabled = enabled;
}
}
addr->enabled = enabled;
}