projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
netifd: Remove unnecessary default_config check in config_parse_interface
[project/netifd.git]
/
iprule.c
diff --git
a/iprule.c
b/iprule.c
index
c3fdcfc
..
4e3dd15
100644
(file)
--- a/
iprule.c
+++ b/
iprule.c
@@
-15,7
+15,6
@@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include <unistd.h>
#include <arpa/inet.h>
#include <arpa/inet.h>
@@
-60,7
+59,7
@@
static const struct blobmsg_policy rule_attr[__RULE_MAX] = {
[RULE_GOTO] = { .name = "goto", .type = BLOBMSG_TYPE_INT32 },
};
[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,
};
.n_params = __RULE_MAX,
.params = rule_attr,
};
@@
-199,13
+198,6
@@
iprule_add(struct blob_attr *attr, bool v6)
rule->flags |= IPRULE_GOTO;
}
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;
vlist_add(&iprules, &rule->node, &rule->flags);
return;
@@
-216,6
+208,11
@@
error:
void
iprule_update_start(void)
{
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);
iprules_counter[0] = 1;
iprules_counter[1] = 1;
vlist_update(&iprules);