From 225e32303311cbcaf2296182c1593f10fd2fa082 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Thu, 2 Jan 2020 22:12:21 +0900 Subject: [PATCH 1/6] coova-chilli: cosmetic changes for Config.in - simplify configuration menu definition - fix indent Signed-off-by: Sungbo Eo --- net/coova-chilli/Config.in | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/net/coova-chilli/Config.in b/net/coova-chilli/Config.in index 423a0e848..29db4f070 100644 --- a/net/coova-chilli/Config.in +++ b/net/coova-chilli/Config.in @@ -1,11 +1,10 @@ # CoovaChilli advanced configuration -menu "Configuration" - depends on PACKAGE_coova-chilli +if PACKAGE_coova-chilli config COOVACHILLI_PROXY - bool "Enable support for chilli proxy. Required for AAA Proxy through http" - default n + bool "Enable support for chilli proxy. Required for AAA Proxy through http" + default n config COOVACHILLI_REDIR bool "Enable support for redir server. Required for uamregex" @@ -46,4 +45,4 @@ config COOVACHILLI_OPENSSL endchoice -endmenu +endif From 95954b84f5f4b4fc114da5d96a04e704946cc9ea Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Thu, 2 Jan 2020 22:14:11 +0900 Subject: [PATCH 2/6] coova-chilli: remove dnslog option dnslog feature has been removed since v1.4. Signed-off-by: Sungbo Eo --- net/coova-chilli/Config.in | 4 ---- net/coova-chilli/Makefile | 2 -- 2 files changed, 6 deletions(-) diff --git a/net/coova-chilli/Config.in b/net/coova-chilli/Config.in index 29db4f070..9202ab7ae 100644 --- a/net/coova-chilli/Config.in +++ b/net/coova-chilli/Config.in @@ -18,10 +18,6 @@ config COOVACHILLI_USERAGENT bool "Enable recording user-agent" default n -config COOVACHILLI_DNSLOG - bool "Enable support to log DNS name queries" - default n - config COOVACHILLI_UAMDOMAINFILE bool "Enable loading of mass uamdomains from file" default n diff --git a/net/coova-chilli/Makefile b/net/coova-chilli/Makefile index 04ec18b70..ef360c3ac 100644 --- a/net/coova-chilli/Makefile +++ b/net/coova-chilli/Makefile @@ -27,7 +27,6 @@ PKG_CONFIG_DEPENDS:= \ COOVACHILLI_MINIPORTAL \ COOVACHILLI_REDIR \ COOVACHILLI_USERAGENT \ - COOVACHILLI_DNSLOG \ COOVACHILLI_UAMDOMAINFILE \ COOVACHILLI_LARGELIMITS \ COOVACHILLI_NOSSL \ @@ -106,7 +105,6 @@ define Build/Configure $(call Build/Configure/Default, \ $(if $(CONFIG_COOVACHILLI_PROXY),--enable,--disable)-chilliproxy \ $(if $(CONFIG_COOVACHILLI_REDIR),--enable,--disable)-chilliredir \ - $(if $(CONFIG_COOVACHILLI_DNSLOG),--enable,--disable)-dnslog \ $(if $(CONFIG_COOVACHILLI_MINIPORTAL),--enable,--disable)-miniportal \ $(if $(CONFIG_COOVACHILLI_USERAGENT),--enable,--disable)-useragent \ $(if $(CONFIG_COOVACHILLI_LARGELIMITS),--enable,--disable)-largelimits \ From 2c71fb2065fdefdaca301943da48e93b59e54d82 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Thu, 2 Jan 2020 22:17:13 +0900 Subject: [PATCH 3/6] coova-chilli: clean up Makefile - add missing configs to PKG_CONFIG_DEPENDS and sort it - remove redundant INSTALL_DIR Signed-off-by: Sungbo Eo --- net/coova-chilli/Makefile | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/net/coova-chilli/Makefile b/net/coova-chilli/Makefile index ef360c3ac..1b23c63bf 100644 --- a/net/coova-chilli/Makefile +++ b/net/coova-chilli/Makefile @@ -24,14 +24,16 @@ PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=0 PKG_CONFIG_DEPENDS:= \ - COOVACHILLI_MINIPORTAL \ - COOVACHILLI_REDIR \ - COOVACHILLI_USERAGENT \ - COOVACHILLI_UAMDOMAINFILE \ COOVACHILLI_LARGELIMITS \ + COOVACHILLI_MINIPORTAL \ COOVACHILLI_NOSSL \ + COOVACHILLI_OPENSSL \ + COOVACHILLI_PROXY \ + COOVACHILLI_REDIR \ + COOVACHILLI_UAMDOMAINFILE \ + COOVACHILLI_USERAGENT \ COOVACHILLI_WOLFSSL \ - COOVACHILLI_OPENSSL + IPV6 include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk @@ -139,7 +141,6 @@ define Package/coova-chilli/install $(INSTALL_BIN) files/chilli.init $(1)/etc/init.d/chilli $(INSTALL_DIR) $(1)/etc/config $(INSTALL_DATA) files/chilli.config $(1)/etc/config/chilli - $(INSTALL_DIR) $(1)/lib/firewall endef $(eval $(call BuildPackage,coova-chilli)) From 532088818af2eb2b1481420b93b649a10d14c724 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Thu, 2 Jan 2020 22:19:41 +0900 Subject: [PATCH 4/6] coova-chilli: add dependency for miniportal If miniportal option is enabled, some haserl scripts are provided which present a simple login web page. To make it functional haserl is required. Signed-off-by: Sungbo Eo --- net/coova-chilli/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/coova-chilli/Makefile b/net/coova-chilli/Makefile index 1b23c63bf..45e763e87 100644 --- a/net/coova-chilli/Makefile +++ b/net/coova-chilli/Makefile @@ -42,7 +42,8 @@ define Package/coova-chilli SUBMENU:=Captive Portals SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-tun +librt +COOVACHILLI_WOLFSSL:libwolfssl +COOVACHILLI_OPENSSL:libopenssl + DEPENDS:=+kmod-tun +librt +COOVACHILLI_MINIPORTAL:haserl \ + +COOVACHILLI_WOLFSSL:libwolfssl +COOVACHILLI_OPENSSL:libopenssl TITLE:=Wireless LAN HotSpot controller (Coova Chilli Version) URL:=https://coova.github.io/ MENU:=1 From 2ce311209db3260f02022eb5562b1d7dbcb867a2 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Thu, 2 Jan 2020 22:20:27 +0900 Subject: [PATCH 5/6] coova-chilli: remove redundant options from config file "fg" and "pidfile" parameters are already used in the init script, so they are not controllable by config file anyway. Signed-off-by: Sungbo Eo --- net/coova-chilli/files/chilli.config | 7 ------- 1 file changed, 7 deletions(-) diff --git a/net/coova-chilli/files/chilli.config b/net/coova-chilli/files/chilli.config index 997560368..11286c7b1 100644 --- a/net/coova-chilli/files/chilli.config +++ b/net/coova-chilli/files/chilli.config @@ -12,9 +12,6 @@ config chilli # name of network interface option network '' - # Include this flag if process is to run in the foreground - #option fg - # Include this flag to include debug information. #option debug 1 @@ -22,10 +19,6 @@ config chilli # name lookups to be performed. Value is given in seconds. #option interval 3600 - # File to store information about the process id of the program. - # The program must have write access to this file/directory. - #option pidfile /var/run/chilli.pid - # Directory to use for nonvolatile storage. # The program must have write access to this directory. # this option is currently ignored From 23a44aab2aba6a7fb93dc10941d8bc311bec5559 Mon Sep 17 00:00:00 2001 From: Sungbo Eo Date: Thu, 2 Jan 2020 22:21:28 +0900 Subject: [PATCH 6/6] coova-chilli: enable service by default If "disabled" option does not exist, service should be enabled. Fixes: #10392 Signed-off-by: Sungbo Eo --- net/coova-chilli/files/chilli.init | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/coova-chilli/files/chilli.init b/net/coova-chilli/files/chilli.init index b1015f388..ab6ce7130 100644 --- a/net/coova-chilli/files/chilli.init +++ b/net/coova-chilli/files/chilli.init @@ -49,7 +49,7 @@ start_chilli() { local cfg="$1" local base="/var/run/chilli_${cfg}" - config_get_bool disabled "$1" 'disabled' 1 + config_get_bool disabled "$1" 'disabled' 0 [ $disabled = 1 ] && return procd_open_instance "$cfg"