From aa6dfc5978226e6897559b1e4ffd0f722e2c8bd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Mon, 18 Mar 2019 11:16:20 +0100 Subject: [PATCH 1/3] coova-chilli: Wrap excessively long lines MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Štetiar --- net/coova-chilli/files/chilli.init | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/net/coova-chilli/files/chilli.init b/net/coova-chilli/files/chilli.init index e0f0a0b68..e30843876 100644 --- a/net/coova-chilli/files/chilli.init +++ b/net/coova-chilli/files/chilli.init @@ -32,7 +32,15 @@ option_cb() { [ "$(config_get_bool "$1")" = "1" ] && eval "start_chilli_$chilli_inst=0" ;; # boolean settings - debug|dhcpbroadcast|nodynip|vlanlocation|locationstopstart|locationcopycalled|locationimmediateupdate|locationopt82|coanoipcheck|noradallow|proxymacaccept|proxyonacct|dhcpmacset|dhcpradius|noc2c|eapolenable|uamanydns|uamanyip|uamnatanyip|nouamsuccess|nowispr1|nowispr2|domaindnslocal|radsec|macauth|macreauth|macauthdeny|macallowlocal|strictmacauth|strictdhcp|ieee8021q|only8021q|radiusoriginalurl|swapoctets|statusfilesave|wpaguests|openidauth|papalwaysok|mschapv2|chillixml|acctupdate|dnsparanoia|seskeepalive|usetap|noarpentries|framedservice|scalewin|redir|injectwispr|redirurl|routeonetone|nousergardendata|uamgardendata|uamotherdata|withunixipc|uamallowpost|redirssl|uamuissl|layer3|patricia|redirdnsreq|dhcpnotidle|ipv6|ipv6only) + debug|dhcpbroadcast|nodynip|vlanlocation|locationstopstart|locationcopycalled|\ + locationimmediateupdate|locationopt82|coanoipcheck|noradallow|proxymacaccept|\ + proxyonacct|dhcpmacset|dhcpradius|noc2c|eapolenable|uamanydns|uamanyip|uamnatanyip|\ + nouamsuccess|nowispr1|nowispr2|domaindnslocal|radsec|macauth|macreauth|macauthdeny|\ + macallowlocal|strictmacauth|strictdhcp|ieee8021q|only8021q|radiusoriginalurl|swapoctets|\ + statusfilesave|wpaguests|openidauth|papalwaysok|mschapv2|chillixml|acctupdate|dnsparanoia|\ + seskeepalive|usetap|noarpentries|framedservice|scalewin|redir|injectwispr|redirurl|\ + routeonetone|nousergardendata|uamgardendata|uamotherdata|withunixipc|uamallowpost|redirssl|\ + uamuissl|layer3|patricia|redirdnsreq|dhcpnotidle|ipv6|ipv6only) [ "$2" = "true" -o "$2" = "1" ] && echo "$1" >> "$chilli_conf" ;; *) @@ -50,7 +58,12 @@ start_chilli() { procd_open_instance "$cfg" procd_set_param command /usr/sbin/chilli procd_set_param file "${base}.conf" - procd_append_param command --fg --conf "${base}.conf" --pidfile "${base}.pid" --cmdsocket "${base}.sock" --unixipc "${base}.ipc" + procd_append_param command \ + --fg \ + --conf "${base}.conf" \ + --pidfile "${base}.pid" \ + --cmdsocket "${base}.sock" \ + --unixipc "${base}.ipc" procd_set_param respawn procd_set_param stdout 1 procd_set_param stderr 1 From 9d3a1a2a6359257f8b29202c149c5bce8b4e89e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Mon, 18 Mar 2019 11:53:23 +0100 Subject: [PATCH 2/3] coova-chilli: Fix unwanted startup of disabled instances MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Code in option_cb was referencing $chilli_inst variable which was declared as local, thus the instance startup logic in start_chilli was referencing variable which would always get value of 1, effectively making `disabled` config option useless. So I've fixed it with simpler config_get_bool and while at it, I've simplified the surrounding code little bit as well. Signed-off-by: Petr Štetiar --- net/coova-chilli/files/chilli.init | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/net/coova-chilli/files/chilli.init b/net/coova-chilli/files/chilli.init index e30843876..bf34cfc82 100644 --- a/net/coova-chilli/files/chilli.init +++ b/net/coova-chilli/files/chilli.init @@ -9,18 +9,15 @@ service_triggers() { } config_cb() { - local chilli_inst="$2" - if [ "$chilli_inst" != "" ]; then - chilli_conf="/var/run/chilli_${chilli_inst}.conf" - if [ -e "$chilli_conf" ]; then - rm -f "$chilli_conf" - fi - eval "start_chilli_$chilli_inst=1" - fi + chilli_conf="/var/run/chilli_${2}.conf" + [ -e "$chilli_conf" ] && rm -f "$chilli_conf" } option_cb() { case "$1" in + # ignored/internal settings + disabled) + ;; # UCI settings network) . /lib/functions/network.sh @@ -28,9 +25,6 @@ option_cb() { network_get_device ifname "$2" echo "dhcpif=\"$ifname\"" >> "$chilli_conf" ;; - disabled) - [ "$(config_get_bool "$1")" = "1" ] && eval "start_chilli_$chilli_inst=0" - ;; # boolean settings debug|dhcpbroadcast|nodynip|vlanlocation|locationstopstart|locationcopycalled|\ locationimmediateupdate|locationopt82|coanoipcheck|noradallow|proxymacaccept|\ @@ -51,13 +45,14 @@ option_cb() { start_chilli() { local cfg="$1" - local start_chilli=$(eval "echo \$start_chilli_$cfg") - [ "$start_chilli" = "0" ] && return local base="/var/run/chilli_${cfg}" + config_get_bool disabled "$1" 'disabled' 1 + [ $disabled = 1 ] && return + procd_open_instance "$cfg" procd_set_param command /usr/sbin/chilli - procd_set_param file "${base}.conf" + procd_set_param file "$chilli_conf" procd_append_param command \ --fg \ --conf "${base}.conf" \ From dd39acba55a5e7a0ffde08288e1ba0dc6a2c9051 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20=C5=A0tetiar?= Date: Mon, 18 Mar 2019 16:11:29 +0100 Subject: [PATCH 3/3] coova-chilli: Fix debug flag config example and synchronize bool options MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit debug is boolean option/flag so setting it to 9 doesn't work, while at it I've synchronized boolean options from source code and sorted it alphabeticaly with following command: grep flag src/cmdline.ggo | cut -d \" -f2 | sort | tr '\n' '|' Signed-off-by: Petr Štetiar --- net/coova-chilli/Makefile | 2 +- net/coova-chilli/files/chilli.config | 2 +- net/coova-chilli/files/chilli.init | 20 +++++++++++--------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/net/coova-chilli/Makefile b/net/coova-chilli/Makefile index 7d6259dd5..510c4a197 100644 --- a/net/coova-chilli/Makefile +++ b/net/coova-chilli/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coova-chilli PKG_VERSION:=1.4 -PKG_RELEASE:=10 +PKG_RELEASE:=11 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/coova/coova-chilli/tar.gz/$(PKG_VERSION)? diff --git a/net/coova-chilli/files/chilli.config b/net/coova-chilli/files/chilli.config index 41ee6cd26..997560368 100644 --- a/net/coova-chilli/files/chilli.config +++ b/net/coova-chilli/files/chilli.config @@ -16,7 +16,7 @@ config chilli #option fg # Include this flag to include debug information. - #option debug 9 + #option debug 1 # Re-read configuration file at this interval. Will also cause new domain # name lookups to be performed. Value is given in seconds. diff --git a/net/coova-chilli/files/chilli.init b/net/coova-chilli/files/chilli.init index bf34cfc82..b1015f388 100644 --- a/net/coova-chilli/files/chilli.init +++ b/net/coova-chilli/files/chilli.init @@ -26,15 +26,17 @@ option_cb() { echo "dhcpif=\"$ifname\"" >> "$chilli_conf" ;; # boolean settings - debug|dhcpbroadcast|nodynip|vlanlocation|locationstopstart|locationcopycalled|\ - locationimmediateupdate|locationopt82|coanoipcheck|noradallow|proxymacaccept|\ - proxyonacct|dhcpmacset|dhcpradius|noc2c|eapolenable|uamanydns|uamanyip|uamnatanyip|\ - nouamsuccess|nowispr1|nowispr2|domaindnslocal|radsec|macauth|macreauth|macauthdeny|\ - macallowlocal|strictmacauth|strictdhcp|ieee8021q|only8021q|radiusoriginalurl|swapoctets|\ - statusfilesave|wpaguests|openidauth|papalwaysok|mschapv2|chillixml|acctupdate|dnsparanoia|\ - seskeepalive|usetap|noarpentries|framedservice|scalewin|redir|injectwispr|redirurl|\ - routeonetone|nousergardendata|uamgardendata|uamotherdata|withunixipc|uamallowpost|redirssl|\ - uamuissl|layer3|patricia|redirdnsreq|dhcpnotidle|ipv6|ipv6only) + acctupdate|chillixml|coanoipcheck|debug|dhcpbroadcast|dhcpmacset|dhcpnotidle|\ + dhcpradius|dnsparanoia|domaindnslocal|eapolenable|fg|forgiving|framedservice|\ + ieee8021q|injectwispr|ipv6|ipv6only|layer3|locationcopycalled|\ + locationimmediateupdate|locationopt82|locationstopstart|macallowlocal|\ + macauth|macauthdeny|macreauth|mmapring|mschapv2|noarpentries|noc2c|nochallenge|\ + nodynip|noradallow|nosystemdns|nouamsuccess|nousergardendata|nowispr1|nowispr2|\ + only8021q|openidauth|papalwaysok|patricia|postauthproxyssl|proxymacaccept|\ + proxyonacct|radiusoriginalurl|radsec|redir|redirdnsreq|redirssl|redirurl|reload|\ + routeonetone|scalewin|seskeepalive|statusfilesave|strictdhcp|strictmacauth|\ + swapoctets|uamallowpost|uamanydns|uamanyip|uamauthedallowed|uamgardendata|\ + uamnatanyip|uamotherdata|uamuissl|usetap|vlanlocation|wpaguests) [ "$2" = "true" -o "$2" = "1" ] && echo "$1" >> "$chilli_conf" ;; *)