X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=iprule.c;h=4e3dd155cc9b4a92a021d6cfcad3a6c11cb24fd9;hp=c3fdcfce6e046d42ca75e989f01faebb170d4eb6;hb=500779b3750d8a7603401128f6eb4e942e684616;hpb=800e5e5f50b62af1b7054f41331a4cc0d7802f65 diff --git a/iprule.c b/iprule.c index c3fdcfc..4e3dd15 100644 --- a/iprule.c +++ b/iprule.c @@ -15,7 +15,6 @@ #include #include #include -#include #include @@ -60,7 +59,7 @@ static const struct blobmsg_policy rule_attr[__RULE_MAX] = { [RULE_GOTO] = { .name = "goto", .type = BLOBMSG_TYPE_INT32 }, }; -const struct config_param_list rule_attr_list = { +const struct uci_blob_param_list rule_attr_list = { .n_params = __RULE_MAX, .params = rule_attr, }; @@ -199,13 +198,6 @@ iprule_add(struct blob_attr *attr, bool v6) rule->flags |= IPRULE_GOTO; } - /* trigger flush of existing rules when adding first uci rule the first time */ - if (!iprules_flushed) - { - system_flush_iprules(); - iprules_flushed = true; - } - vlist_add(&iprules, &rule->node, &rule->flags); return; @@ -216,6 +208,11 @@ error: void iprule_update_start(void) { + if (!iprules_flushed) { + system_flush_iprules(); + iprules_flushed = true; + } + iprules_counter[0] = 1; iprules_counter[1] = 1; vlist_update(&iprules);