Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4301 from billsq/ifname_addr_fix

Browse source 
ocserv: Correctly get runtime LAN ifname and addresses
This commit is contained in:
Nikos Mavrogiannopoulos 2017-04-27 07:14:42 +02:00 committed by GitHub
commit b1c73c93a3
2 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/ocserv/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ocserv PKG_NAME:=ocserv
PKG_VERSION:=0.11.7 PKG_VERSION:=0.11.7
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR :=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

25
net/ocserv/files/ocserv.init Normal file → Executable file
View file

@ -3,6 +3,8 @@
START=50 START=50
USE_PROCD=1 USE_PROCD=1
. $IPKG_INSTROOT/lib/functions/network.sh
setup_config() { setup_config() {
config_get port $1 port "4443" config_get port $1 port "4443"
config_get max_clients $1 max_clients "8" config_get max_clients $1 max_clients "8"
@ -33,26 +35,27 @@ setup_config() {
uci set dhcp.lan.start=100 uci set dhcp.lan.start=100
uci set dhcp.lan.limit=91 uci set dhcp.lan.limit=91
fi fi
ip=$(uci get network.lan.ipaddr) network_get_ipaddr ip lan
ipaddr="$(echo $ip|cut -d . -f1,2,3).192" ipaddr="$(echo $ip|cut -d . -f1,2,3).192"
netmask="255.255.255.192" netmask="255.255.255.192"
uci set ocserv.config.ipaddr="$ipaddr"
uci set ocserv.config.netmask="$netmask"
uci commit
fi fi
if test -z "$ip6addr";then if test -z "$ip6addr";then
ip6addr=$(uci get network.lan.ip6addr 2>/dev/null) network_get_ipaddr6 ip6addr lan
test -n "$ip6addr" && uci set ocserv.config.ip6addr="$ip6addr" # Append ipv6 prefix
uci commit test -n "$ip6addr" && ip6addr="$ip6addr/96"
fi fi
ping_leases=1 ping_leases=1
test -n "$ipaddr" && sysctl -w "net.ipv4.conf.$(uci get network.lan.ifname).proxy_arp"=1 >/dev/null local ifname
test -n "$ip6addr" && sysctl -w "net.ipv6.conf.$(uci get network.lan.ifname).proxy_ndp"=1 >/dev/null network_get_device ifname lan
if test -n "ifname";then
test -n "$ipaddr" && sysctl -w "net.ipv4.conf.$ifname.proxy_arp"=1 >/dev/null
test -n "$ip6addr" && sysctl -w "net.ipv6.conf.$ifname.proxy_ndp"=1 >/dev/null
fi
else else
test "$ipaddr" = "" && ipaddr="192.168.100.0" test -z "$ipaddr" && ipaddr="192.168.100.0"
test "$netmask" = "" && ipaddr="255.255.255.0" test -z "$netmask" && netmask="255.255.255.0"
fi fi
enable_default_domain="#" enable_default_domain="#"