projects
/
project
/
firewall3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
firewall3: add UBUS support for redirect sections
[project/firewall3.git]
/
main.c
diff --git
a/main.c
b/main.c
index
b953020
..
5888ab5
100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-1,7
+1,7
@@
/*
* firewall3 - 3rd OpenWrt UCI firewall implementation
*
/*
* firewall3 - 3rd OpenWrt UCI firewall implementation
*
- * Copyright (C) 2013-2014 Jo-Philipp Wich <jo
w@openwrt.org
>
+ * Copyright (C) 2013-2014 Jo-Philipp Wich <jo
@mein.io
>
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@
-79,7
+79,7
@@
build_state(bool runtime)
else
{
if (!fw3_ubus_connect())
else
{
if (!fw3_ubus_connect())
-
error
("Failed to connect to ubus");
+
warn
("Failed to connect to ubus");
if (uci_load(state->uci, "firewall", &p))
{
if (uci_load(state->uci, "firewall", &p))
{
@@
-104,7
+104,7
@@
build_state(bool runtime)
fw3_load_ipsets(state, p);
fw3_load_zones(state, p);
fw3_load_rules(state, p, b.head);
fw3_load_ipsets(state, p);
fw3_load_zones(state, p);
fw3_load_rules(state, p, b.head);
- fw3_load_redirects(state, p);
+ fw3_load_redirects(state, p
, b.head
);
fw3_load_snats(state, p, b.head);
fw3_load_forwards(state, p);
fw3_load_includes(state, p);
fw3_load_snats(state, p, b.head);
fw3_load_forwards(state, p);
fw3_load_includes(state, p);
@@
-546,7
+546,6
@@
int main(int argc, char **argv)
}
build_state(false);
}
build_state(false);
- build_state(true);
defs = &cfg_state->defaults;
if (optind >= argc)
defs = &cfg_state->defaults;
if (optind >= argc)
@@
-577,12
+576,18
@@
int main(int argc, char **argv)
print_family = family;
fw3_pr_debug = true;
print_family = family;
fw3_pr_debug = true;
- rv = start();
+ if (fw3_lock())
+ {
+ build_state(true);
+ rv = start();
+ fw3_unlock();
+ }
}
else if (!strcmp(argv[optind], "start"))
{
if (fw3_lock())
{
}
else if (!strcmp(argv[optind], "start"))
{
if (fw3_lock())
{
+ build_state(true);
rv = start();
fw3_unlock();
}
rv = start();
fw3_unlock();
}
@@
-591,6
+596,7
@@
int main(int argc, char **argv)
{
if (fw3_lock())
{
{
if (fw3_lock())
{
+ build_state(true);
rv = stop(false);
fw3_unlock();
}
rv = stop(false);
fw3_unlock();
}
@@
-599,6
+605,7
@@
int main(int argc, char **argv)
{
if (fw3_lock())
{
{
if (fw3_lock())
{
+ build_state(true);
rv = stop(true);
fw3_unlock();
}
rv = stop(true);
fw3_unlock();
}
@@
-607,6
+614,7
@@
int main(int argc, char **argv)
{
if (fw3_lock())
{
{
if (fw3_lock())
{
+ build_state(true);
stop(true);
rv = start();
fw3_unlock();
stop(true);
rv = start();
fw3_unlock();
@@
-616,6
+624,7
@@
int main(int argc, char **argv)
{
if (fw3_lock())
{
{
if (fw3_lock())
{
+ build_state(true);
rv = reload();
fw3_unlock();
}
rv = reload();
fw3_unlock();
}