Commit Graph
77 Commits
Author SHA1 Message Date
Florian Eckert 40f66cf432 net/mwan3: update to version 2.6.10
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-02-05 10:29:30 +01:00
Florian Eckert 8fa2101ea3 net/mwan3: add mwan3_init function
Move all shell commands which are executed during /lib/mwan3/mwan3.sh
sourceing into a seperate init function which must be called at first.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-02-05 10:29:28 +01:00
Florian Eckert 7cf9d9ec20 net/mwan3: send SIGKILL to mwan3track
In some situation it is not enough to send a SIGTERM to mwan3track to
ask service to stop accurate. If this does not work send him a SIGKILL
to prevent mwan3track running more then once per interface.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-02-05 10:29:25 +01:00
Florian Eckert f9a787e8df net/mwan3: add init script to enable/disable mwan3 globally
Adding a init script to "/etc/init.d/" introduce the possibility to
enable/disable mwan3 globally.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-02-05 10:29:23 +01:00
Florian Eckert 3426baff06 net/stunnel: Remove abdicate maintainer
Update PKG_RELEASE version to 4.
Remove Daniel Engberg from PGK_MAINTANER list.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-01-23 14:37:02 +01:00
Florian Eckert 68f6fc25a0 net/stunnel: check if service section is configured to prevent crash loop
If a service section is not presented in the configuration then stunnel will
always start anyway. This ends in a crash loop because the configuration is not
valid.
Checking in "uci" mode if a service section is presented and only then
start the stunnel service will solve this issue.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-01-23 14:37:02 +01:00
Florian Eckert 66349b4cd9 net/stunnel: do always stop/start on config change
Do not send a SIGHUP on reload configuration let procd restart the
service with stop/start. This is saver.

Add uci generated stunnel file to procd "file" attribute to
reload/restart the stunnel service.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2018-01-23 11:53:47 +01:00
Florian Eckert 3fc880c2e9 net/stunnel: add enabled config option
Add an enabled option for the service section, so you could keep your
configuration in place without apply this section on startup or service reload.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-12-15 08:03:41 +01:00
Florian Eckert 5e0e6e0533 net/stunnel: add uci config support
Add uci config support.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-12-10 11:13:43 +01:00
Florian Eckert c33853dd6d net/mwan3: update to version 2.6.8
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-11-22 13:04:14 +01:00
Florian Eckert 3ee70a7001 net/mwan3: change usleep to sleep command
fix bug use sleep instead of usleep

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-11-16 09:15:28 +01:00
Florian Eckert 267c0eeaed net/mwan3: use uptime for ubus age info
If the date is changed by ntp the age value of mwan3 on ubus could jitter.
Use instead the uptime value from /proc/uptime which will not change during
system run.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-11-16 09:15:04 +01:00
Florian Eckert 738da3146c net/keepalived: add keepalived.user script handling
Add keepalived.user script handling which are also saved during sysupgrade.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-11-08 11:36:58 +01:00
Florian Eckert ff33ff463b net/keepalived: add notify hotplug-call script handling
During keepalived config generation for the vrrp_instance and vrrp_sync_group
the notify_* sections are automatic added to the runtime keepalived.conf.
This could be used for service which want to react on keepalived notifications.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-11-08 11:36:58 +01:00
Florian Eckert 4bd238e852 net/keepalived: comment alt_config_file
Comment alt_config_file option in default config

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-11-07 10:54:27 +01:00
Florian Eckert d4e1c96cc4 net/keepalived: move track_interface generation into own section
In a vrrp_instance the track_interface could not be referenced similar
to a track_script. The uci track_interface section must be always set
into every vrrp_instance.

During config generation use the already prepared function
"print_track_elem_indent" to write the track_interface section into every
vrrp_instance which references this.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-30 15:40:25 +01:00
Florian Eckert b66372fb43 net/keepalived: add quoting for print_elems_indent function
If you add a notify_* script which is not only a path to a script or
to a bin file, it is necessary to quote to whole string. If you do not
quote this the config will not get accepted by keepalived and so will
not start. This will fix this issue.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-30 15:40:25 +01:00
Florian Eckert e58a068447 net/keepalived: preserve keepalived uci file over sysupgrade
Preserve keepalived uci file over sysupgrade.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-30 15:40:25 +01:00
Florian Eckert 2360f361f5 net/keepalived: update CONFIGURE_ARGS
Remove unused and unrecognized (outdated) configure options in Makefile.
--enable-vrrp
--enable-fwmark
--disable-debug
--disable-profile

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-30 15:40:25 +01:00
Florian Eckert b5104b0f62 net/keepalived: update version to 1.3.9
update keepalived to version 1.3.9

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-30 15:16:26 +01:00
Florian Eckert ebc64a2748 net/keepalived: remove patches for version 1.2.19
This patches are already upstream. Not needed anymore.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-30 15:15:54 +01:00
Florian Eckert 17743cd918 libs/libcap: add license tag
add license tag

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-30 14:51:56 +01:00
Florian Eckert ce62475be3 utils/cryptodev-linux: add license tag
add license tag

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-30 14:51:56 +01:00
Florian Eckert e8c7ec009b libs/libgpg-error: add license tag
add license tag

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-30 14:51:56 +01:00
Florian Eckert eb39775d76 libs/libgcrypt: add license tag
add license tag

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-30 14:51:56 +01:00
Florian Eckert 43d24da2bf libs/openldap: add license tag
add license tag

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-10-30 14:51:56 +01:00
Florian Eckert 2cf984c69e net/mwan3: fix track_ips order
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-09-12 16:14:32 +02:00
Florian Eckert 803f69546e net/mwan3: fix mwan3track STATUS if initial_state is offline
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-09-12 15:55:27 +02:00
Florian Eckert faa86fe0f4 net/mwan3: update version
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-09-01 11:13:57 +02:00
Florian Eckert a8ccaa1f0f net/mwan3: fix /var/state issue in 14-mwan3 hotplug
Use common function to toggle ip address in /var/state/mwan3.
Change also to use toggle function and not set function. If ip address
is often changed every change is saved to /var/state/mwan3.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-09-01 11:02:55 +02:00
Florian Eckert 0c678d39cc net/mwan3: if initial_state is offline set status to unknown
To show that the status of the interface is neither offline nor online
set the status to unknown.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-09-01 10:59:54 +02:00
Florian Eckert ec5542ab2b net/mwan3: mwan3track skip track ips if realibility is accomplished
If enough tracking ip are pinged skip the reset. They are not needed
anymore to mark the interface as up.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-09-01 10:59:49 +02:00
Florian Eckert 8319100914 net/mwan3: update version
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-16 14:37:06 +02:00
Florian Eckert 3607bac3af net/mwan3: make mwan3 mask configurable over uci
Add new global config option mmx_mask.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-16 14:35:06 +02:00
Florian Eckert a0e8010e7a net/mwan3: update version
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 12:36:21 +02:00
Florian Eckert c872189d66 net/mwan3: add hotplug script for hidden self interface generation
Add new globals config section with option local_source.

With this config option the self interface generation will be done now
automatically on hotplug event. You can specify which interface (ip)
sould be used for router traffic. To replace the self intereface in the
config set local_source to "lan".

The default option is none, so it will not change default behavior if a
"self" interface is configured in the network section.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 12:32:56 +02:00
Florian Eckert 44eb0a7c9d net/mwan3: add Makefile postinst and postrm for rpcd
Restart rpcd on package install/remove

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 11:30:47 +02:00
Florian Eckert a4fbc7eba6 net/mwan3: fix ipset generation in hotplug script with an lock
Fix critical section during hotplug events.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 11:30:47 +02:00
Florian Eckert a934a25f21 net/mwan3: fix ubus json datatyp
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 11:30:47 +02:00
Florian Eckert 929bec6402 net/mwan3: expand ubus to show when last mwan3track check was done
To know how old the ubus output is, add an age parameter which indicats
how old the check informations on the interface are.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 11:30:47 +02:00
Florian Eckert 815e83d461 net/mwan3: on startup mark interface online only if track_ip are reachable
Add new interface config option "inital_state".

If interface comeing up the first time(mwan3 start, boot),
there are now two option for interface behaviour:

- online (default as is now)
  Set up interface regardless wether tracking ip are reachable or not.

- offline
  Set up interface first to ping tracking ip and if they are reachable set up
  the interface completely.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 11:30:47 +02:00
Florian Eckert 6d99b602fd net/mwan3: fix ping issue if last interface recovers from failure
Even though error was fixed the interface checks still fails, if last_resort
was set to blackhole or unreachable.

To fix this issue do not remove failure interface from iptables change on
down event.

Reported-by: Colby Whitney <colby.whitney@luxul.com>
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 10:48:40 +02:00
Florian Eckert 5e123852bc net/mwan3: move mwan3track clean up to mwan3 cmd
This is usefull to see the last state of the interface with ubus.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 10:48:27 +02:00
Florian Eckert 96760e66dd net/mwan3: remove unused global definition
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 10:48:22 +02:00
Florian Eckert 0b44ca505b net/mwan3: fix mwan3track kill execution
If two interface have the same prefix "wan" for example "wan" and "wan1"
pgrep returns the PID for wan1 also "pgrep -f mwan3track wan".

Before this fix "wan1" was also killed! This is not what we want.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 10:48:18 +02:00
Florian Eckert 487278dcd1 net/mwan3: fix ubus output for mwan3track running state
Fix ubus output for mwan3track running state

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 10:48:14 +02:00
Florian Eckert 9df6e9dd98 net/mwan3: change logging output on hotplug interface event
Change logging output on hotplug interface event

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 10:48:09 +02:00
Florian Eckert a7a2464d9e net/mwan3: add option keep_failure_interval on failure
Add new boolean interface config param to keep ping failure interval during
interface failure state.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 10:45:28 +02:00
Florian Eckert f942701b1a net/mwan3: add process PID to LOG output
Update log output macro to show PID during logging

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-08-10 09:06:48 +02:00
Florian Eckert 085a76bebf net/mwan3: update version
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-06-22 13:42:14 +02:00
Florian Eckert 99229475b7 net/mwan3: simplify tracking status statement command
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-06-22 13:42:14 +02:00
Florian Eckert b6e9debc1b net/mwan3: add lock for mwan3 hotplug script
If more then one interface get up/down at once mwan3 could be in a
undefined state, because more then one mwan3 hotplug script are running
and editing the iptables.

Lock the critical section should solve this issue.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-06-22 13:42:12 +02:00
Florian Eckert f35475c025 net/mwan3: update Makefile version
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-05-12 15:30:34 +02:00
Florian Eckert db5ea39c9b net/mwan3: generate mwan3track run path folder on every run
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-05-12 15:30:34 +02:00
Florian Eckert ef3261d0b4 net/mwan3: remove absolute path for bin files
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-05-12 15:28:12 +02:00
Florian Eckert 1fd3f85d4f net/mwan3: remove pid file use pgrep to get pid
If mwan3track will not stop immediately after sending the kill signal,
the clean_up handler will delete the pid file later while the new mwan3track is
already running.

This could result in a situation that mwan3track is running
more then once because the old mwan3track service could not be killed,
because the pid file is missing.

Using pgrep to kill all mwan3track for the tracked interface and not using
pid file should fix this issue.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-05-12 15:28:12 +02:00
Florian Eckert c8f8f77ed1 net/mwan3: update Makefile version
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-04-27 11:48:15 +02:00
Florian Eckert f94975b71f net/mwan3: add connected network regardless of mwan3 interface enable state
If netifd set an interface up/down which is not tracked by mwan3 the
connected network of that interface should regardless be added/removed to the
mwan3_connected ipset.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-04-27 11:44:49 +02:00
Florian Eckert 45437dc7c9 net/mwan3: update Makefile version
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-04-11 09:46:20 +02:00
Florian Eckert 7e80e83dfd net/mwan3: mwan3track interrupt sleep on signal (trap) event
Sleep will be aborted if a signal is send to this process.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-04-11 09:46:20 +02:00
Florian Eckert b216fd3642 net/mwan3: registrate SIGUSR1 trap on interface down event
If interface is getting down by netifd (unplug ethernet cable)
mwan3track will not recognize this change. It will also generate an
additional down event when he notice does his tracking interface is offline.

Mwan3track will now be informed by a signal (trap) USR1 during down event
that the interface is already down. An additional down event will not be
generated.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-04-11 09:46:20 +02:00
Florian Eckert 84df06e0dc net/mwan3: add status track ubus interface
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-04-11 09:46:20 +02:00
Florian Eckert 4d8d889ced net/mwan3: update Makefile version
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-04-05 07:29:45 +02:00
Florian Eckert 6bb84f69e7 net/mwan3: decrease parameter invocation of mwan3track
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-04-05 07:29:45 +02:00
Florian Eckert 5b55223d80 net/mwan3: add clean_up trap function for SIGINT SIGTERM
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-04-04 16:00:06 +02:00
Florian Eckert 51367883fc net/mwan3: unify logging in mwan3track
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-04-04 15:33:37 +02:00
Florian Eckert 23339d7ae1 net/mwan3: move global mwan3track into main function
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-04-04 15:01:34 +02:00
Florian Eckert ae335e7384 net/mwan3: add failure and recovery interval
If mwan3track detects a failure the interval check will change to
"failure_interval" value until this interface is declared "offline".
After interface gets "offline" normal "interval" value is used again.
If interface ping is successful again "recovery_interval" value is used until
interface is declared "online" again.

Using the different intervals will accelerate the wan line detections on
failure and recovery.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-27 08:45:13 +02:00
Florian Eckert 5cacfd34a6 net/mwan3: add ubus interface check
On interfaces with interface proto "qmi|ncm" and option dhcp
enabled the interface will be changed to $iface_4 | $iface_6. The
interface mapping in mwan3 will not recognize this interface. To fix
this issue an ubus call will check if an upper interface exists.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-21 08:59:31 +01:00
Florian Eckert 3f79fcb756 net/mwan3: pass environment variables to mwan3-user
User scripts conversion from luci-app-wan3 will be simplified if the variables
are passed by env instead of arguments.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-21 08:31:06 +01:00
Florian Eckert 415c405061 net/mwan3: change maintainer
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-20 08:48:16 +01:00
Florian Eckert 75a5237029 net/mwan3: fix track_ips count
fix track_ips generation introduced with commit
6d44a7679a

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-20 08:39:18 +01:00
Florian Eckert 43ca6ec481 net/mwan3: add mwan3.user hotplug script
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-17 12:33:45 +01:00
Florian Eckert 28c8b664e4 net/mwan3: fix hotplug on ACTION ifdown
On dynamic interface proto (dhcp/pppoe) the hotplug will not execude (exit 9)
because the gateway is already released. The check will now only be made
on a ifup ACTION event.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-17 11:06:29 +01:00
Florian Eckert 6d44a7679a net/mwan3: add ping size option to mwan3track
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-16 10:01:07 +01:00
Florian Eckert 3231736cab net/mwan3: reset conntrack table on iface up/down event
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-16 10:01:06 +01:00
Florian Eckert ec3349a8a4 net/mwan3: add me as co maintainer
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
2017-03-08 10:42:36 +01:00