Browse Source

mwan3: move command definitions to common.sh

Signed-off-by: Florian Eckert <fe@dev.tdt.de>
lilik-openwrt-22.03
Florian Eckert 3 years ago
parent
commit
a49d0953dc
7 changed files with 7 additions and 13 deletions
  1. +0
    -1
      net/mwan3/files/etc/hotplug.d/iface/15-mwan3
  2. +0
    -1
      net/mwan3/files/etc/init.d/mwan3
  3. +6
    -0
      net/mwan3/files/lib/mwan3/common.sh
  4. +1
    -5
      net/mwan3/files/lib/mwan3/mwan3.sh
  5. +0
    -4
      net/mwan3/files/usr/libexec/rpcd/mwan3
  6. +0
    -1
      net/mwan3/files/usr/sbin/mwan3
  7. +0
    -1
      net/mwan3/files/usr/sbin/mwan3rtmon

+ 0
- 1
net/mwan3/files/etc/hotplug.d/iface/15-mwan3 View File

@ -3,7 +3,6 @@
. /lib/functions.sh
. /lib/functions/network.sh
. /lib/mwan3/mwan3.sh
. /lib/mwan3/common.sh
initscript=/etc/init.d/mwan3
. /lib/functions/procd.sh


+ 0
- 1
net/mwan3/files/etc/init.d/mwan3 View File

@ -1,6 +1,5 @@
#!/bin/sh /etc/rc.common
. "${IPKG_INSTROOT}/lib/mwan3/common.sh"
. "${IPKG_INSTROOT}/lib/functions/network.sh"
. "${IPKG_INSTROOT}/lib/mwan3/mwan3.sh"


+ 6
- 0
net/mwan3/files/lib/mwan3/common.sh View File

@ -21,6 +21,12 @@ MAX_SLEEP=$(((1<<31)-1))
command -v ip6tables > /dev/null
NO_IPV6=$?
IPS="ipset"
IPT4="iptables -t mangle -w"
IPT6="ip6tables -t mangle -w"
IPT4R="iptables-restore -T mangle -w -n"
IPT6R="ip6tables-restore -T mangle -w -n"
LOG()
{
local facility=$1; shift


+ 1
- 5
net/mwan3/files/lib/mwan3/mwan3.sh View File

@ -1,12 +1,8 @@
#!/bin/sh
. "${IPKG_INSTROOT}/usr/share/libubox/jshn.sh"
. "${IPKG_INSTROOT}/lib/mwan3/common.sh"
IPS="ipset"
IPT4="iptables -t mangle -w"
IPT6="ip6tables -t mangle -w"
IPT4R="iptables-restore -T mangle -w -n"
IPT6R="ip6tables-restore -T mangle -w -n"
CONNTRACK_FILE="/proc/net/nf_conntrack"
IPv6_REGEX="([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|"
IPv6_REGEX="${IPv6_REGEX}([0-9a-fA-F]{1,4}:){1,7}:|"


+ 0
- 4
net/mwan3/files/usr/libexec/rpcd/mwan3 View File

@ -5,10 +5,6 @@
. /usr/share/libubox/jshn.sh
. /lib/mwan3/common.sh
IPS="ipset"
IPT4="iptables -t mangle -w"
IPT6="ip6tables -t mangle -w"
report_connected_v4() {
local address


+ 0
- 1
net/mwan3/files/usr/sbin/mwan3 View File

@ -4,7 +4,6 @@
. /usr/share/libubox/jshn.sh
. /lib/functions/network.sh
. /lib/mwan3/mwan3.sh
. /lib/mwan3/common.sh
command_help() {
local cmd="$1"


+ 0
- 1
net/mwan3/files/usr/sbin/mwan3rtmon View File

@ -3,7 +3,6 @@
. /lib/functions.sh
. /lib/functions/network.sh
. /lib/mwan3/mwan3.sh
. /lib/mwan3/common.sh
trap_with_arg()
{


Loading…
Cancel
Save