The get_bool() functionality was already merged to lib/functions.sh, so
it is redundant in the init script. Remove it.
Signed-off-by: Oldřich Jedlička <oldium.pro@gmail.com>
* Change KEY/HMAC_KEY to __CHANGEME__, which is rejected by fwknopd
during start-up. The value CHANGEME is used only by LuCI package
luci-app-fwknopd - pull request for generating keys directly from
LuCI has been created already.
* Add sensible defaults for ENABLE_IPT_FORWARDING and ENABLE_NAT_DNS,
which both are/were set by luci-app-fwknopd. Move the defaults here.
Signed-off-by: Oldřich Jedlička <oldium.pro@gmail.com>
* Log with pid instead of placeholder.
* Make sure directory for config files generated from uci config exists.
* Remove forced defaults.
* Simplify compares.
Signed-off-by: Kimmo Vuorinen <kimmo.vuorinen@gmail.com>
Two issues:
1. The fwknopd init script did not handle unprepared logical networks.
This is fixed by A) not defining instance for procd when the physical
interface is unknown, and B) by watching the logical network for
changes.
2. When using PPPoE, there are two physical interfaces -- one for raw
PPPoE communication and one for wrapped communication. The function
network_get_physdev returns the physical device, while the function
network_get_device returns the wrapped one -- we shall use the
wrapped interface. Usually (for non-wrapped interfaces) the physdev
and device are the same, also other network scripts use the latter
function.
Both issues found by and thanks are going to @lucize.
Signed-off-by: Oldřich Jedlička <oldium.pro@gmail.com>
An unneccesary include in the init file was causing problems when using the package builder.
Signed-off-by: Jonathan Bennett <JBennett@incomsystems.biz>
Added new "network" section with option "network", which takes network
interface name.
The start-up is migrated to use procd and depend either on the "network"
interface (after resolving it to a physical device), or on the PCAP_INTF
option from "config" section (usual place for raw interface name for
fwknopd). When the uci_enabled option is disabled, the value of PCAP_INTF
is taken from the user-provided fwknopd.conf.
Also fixed UCI_ENABLED variable evaluation.
Signed-off-by: Oldřich Jedlička <oldium.pro@gmail.com>
Adds configuration option for NFQ capture, moves often written
configuration files to /var/etc.
Signed-off-by: Jonathan Bennett <JBennett@incomsystems.biz>
A typo in the init file was causing a certain setting to be overwritten on every daemon start.
Signed-off-by: Jonathan Bennett <JBennett@incomsystems.biz>