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

Merge pull request #4308 from billsq/ocserv_udp_port

Browse source 
ocserv: split UDP and TCP port configs
This commit is contained in:
Nikos Mavrogiannopoulos 2017-04-29 12:13:00 +02:00 committed by GitHub
commit 3c14920123
3 changed files with 6 additions and 4 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:=2 PKG_RELEASE:=3
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)

2
net/ocserv/files/ocserv.conf.template
View file

@ -43,7 +43,7 @@ max-same-clients = |MAX_SAME|
# TCP and UDP port number # TCP and UDP port number
tcp-port = |PORT| tcp-port = |PORT|
|UDP|udp-port = |PORT| |UDP|udp-port = |UDP_PORT|
# Stats report time. The number of seconds after which each # Stats report time. The number of seconds after which each
# worker process will report its usage statistics (number of # worker process will report its usage statistics (number of

6
net/ocserv/files/ocserv.init
View file

@ -13,6 +13,7 @@ setup_config() {
config_get predictable_ips $1 predictable_ips "1" config_get predictable_ips $1 predictable_ips "1"
config_get compression $1 compression "0" config_get compression $1 compression "0"
config_get udp $1 udp "1" config_get udp $1 udp "1"
config_get udp_port $1 udp_port ""
config_get auth $1 auth "plain" config_get auth $1 auth "plain"
config_get cisco_compat $1 cisco_compat "1" config_get cisco_compat $1 cisco_compat "1"
config_get ipaddr $1 ipaddr "" config_get ipaddr $1 ipaddr ""
@ -48,8 +49,7 @@ setup_config() {
ping_leases=1 ping_leases=1
local ifname local ifname
network_get_device ifname lan if network_get_device ifname lan; then
if test -n "ifname";then
test -n "$ipaddr" && sysctl -w "net.ipv4.conf.$ifname.proxy_arp"=1 >/dev/null 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 test -n "$ip6addr" && sysctl -w "net.ipv6.conf.$ifname.proxy_ndp"=1 >/dev/null
fi fi
@ -72,6 +72,7 @@ setup_config() {
test $split_dns = "1" && enable_split_dns="" test $split_dns = "1" && enable_split_dns=""
test $compression = "1" && enable_compression="" test $compression = "1" && enable_compression=""
test -z $udp_port && udp_port="$port"
test -z $default_domain && default_domain=$(uci get dhcp.@dnsmasq[0].domain) test -z $default_domain && default_domain=$(uci get dhcp.@dnsmasq[0].domain)
test -n $default_domain && enable_default_domain="" test -n $default_domain && enable_default_domain=""
test -z $ip6addr && enable_ipv6="#" test -z $ip6addr && enable_ipv6="#"
@ -84,6 +85,7 @@ setup_config() {
mkdir -p /var/etc mkdir -p /var/etc
sed -e "s/|PORT|/$port/g" \ sed -e "s/|PORT|/$port/g" \
-e "s/|UDP_PORT|/$udp_port/g" \
-e "s/|MAX_CLIENTS|/$max_clients/g" \ -e "s/|MAX_CLIENTS|/$max_clients/g" \
-e "s/|MAX_SAME|/$max_same/g" \ -e "s/|MAX_SAME|/$max_same/g" \
-e "s/|DPD|/$dpd/g" \ -e "s/|DPD|/$dpd/g" \