diff options
author | Kristian Evensen <kristian.evensen@gmail.com> | 2016-01-07 14:46:04 +0100 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-17 11:50:44 +0100 |
commit | 49c8ab4ed307e4de016e92d3ffc84cd0ab50d56c (patch) | |
tree | d771c2732a09cced693c465abe0b95ac3fdab8ea /interface.h | |
parent | b8438154804c3fe105d41ecbd00a597315506f30 (diff) |
netifd: Do not add local/source policy rules multiple times
interface_ip_set_enabled() is usually called two times right after one another,
once to handle config_ip and once to handle proto_ip. As long as
ip->iface->l3_dev.dev is set, the local/source policy rules are updated.
This value is in several cases set on both config_ip and proto_ip, causing the
rules to be added multiple time. The reason is that the kernel does not respect
the NLM_F_* flag for rules. In other words, the rule state has to be managed by
the routing daemon.
Since the local/source policy rules are bound to iface, this commit solves the
problem by adding a flag to interface which stores the current rule state. The
flag follows the enabled-paramter passed to interface_ip_set_enabled(), similar
to route-> and addr->enabled. The flag breaks the alignment of the interface
struct, but based on earlier commits this seems to be ok.
I have tested the patch in different configurations and have not found any
regression.
Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
Diffstat (limited to 'interface.h')
-rw-r--r-- | interface.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/interface.h b/interface.h index c2049f1..73a3b55 100644 --- a/interface.h +++ b/interface.h @@ -112,6 +112,7 @@ struct interface { bool link_state; bool force_link; bool dynamic; + bool policy_rules_set; time_t start_time; enum interface_state state; |