mirror/iopsys-feed
1
0
Fork 0
mirror of https://dev.iopsys.eu/feed/iopsys.git synced 2025-12-10 07:44:50 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

icwmp: Auto dual stack

Browse source 
Automatically select IPv6 or IPv4 based on defined
default_wan_interface and default_wan6_interface uci options
This commit is contained in:
Omar Kallel 2023-03-29 08:59:13 +01:00 • committed by Vivek Kumar Dutta
parent e9c4415255
commit 7b0eceb68a
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icwmp/Makefile
View file

@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=icwmp PKG_NAME:=icwmp
PKG_VERSION:=9.1.23 PKG_VERSION:=9.2.0
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
PKG_SOURCE_VERSION:=f0bb411fd1675110640946280fefe17ce6df5c09 PKG_SOURCE_VERSION:=6f5852133a503e58747191ea1c7912436013dbbf
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_MIRROR_HASH:=skip PKG_MIRROR_HASH:=skip

3
icwmp/files/etc/config/cwmp
View file

@ -11,12 +11,11 @@ config acs 'acs'
option retry_min_wait_interval '5' option retry_min_wait_interval '5'
#­ possible configs interval :[1000:65535] #­ possible configs interval :[1000:65535]
option retry_interval_multiplier '2000' option retry_interval_multiplier '2000'
option ipv6_enable '0'
option ip_version '4'
config cpe 'cpe' config cpe 'cpe'
option enable '1' option enable '1'
option default_wan_interface 'wan' option default_wan_interface 'wan'
option default_wan6_interface 'wan6'
option default_lan_interface 'lan' option default_lan_interface 'lan'
option log_to_console 'disable' option log_to_console 'disable'
option log_to_file 'disable' option log_to_file 'disable'

7
icwmp/files/etc/init.d/icwmpd
View file

@ -320,7 +320,6 @@ validate_acs_section()
'compression:or("GZIP","Deflate","Disabled")' \ 'compression:or("GZIP","Deflate","Disabled")' \
'retry_min_wait_interval:range(1, 65535)' \ 'retry_min_wait_interval:range(1, 65535)' \
'retry_interval_multiplier:range(1000, 65535)' \ 'retry_interval_multiplier:range(1000, 65535)' \
'ipv6_enable:bool' \
'ssl_capath:string' 'ssl_capath:string'
} }
@ -330,6 +329,7 @@ validate_cpe_section()
uci_validate_section cwmp cpe "cpe" \ uci_validate_section cwmp cpe "cpe" \
'interface:string' \ 'interface:string' \
'default_wan_interface:string' \ 'default_wan_interface:string' \
'default_wan6_interface:string' \
'log_to_console:or("enable","disable")' \ 'log_to_console:or("enable","disable")' \
'log_to_file:or("enable","disable")' \ 'log_to_file:or("enable","disable")' \
'log_severity:or("EMERG", "ALERT", "CRITIC" ,"ERROR", "WARNING", "NOTICE", "INFO", "DEBUG")' \ 'log_severity:or("EMERG", "ALERT", "CRITIC" ,"ERROR", "WARNING", "NOTICE", "INFO", "DEBUG")' \
@ -382,12 +382,15 @@ boot() {
config_load cwmp config_load cwmp
config_get_bool enable_cwmp cpe enable 1 config_get_bool enable_cwmp cpe enable 1
local wan_interface=""
config_get wan_interface cpe default_wan_interface "wan"
if [ "$enable_cwmp" = "0" ]; then if [ "$enable_cwmp" = "0" ]; then
return 0 return 0
fi fi
config_get dhcp_discovery acs dhcp_discovery "0" config_get dhcp_discovery acs dhcp_discovery "0"
config_get wan_interface cpe default_wan_interface "wan"
if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
# Set dhcp option 43 if not already configured # Set dhcp option 43 if not already configured