[packages] tinc: The tinc init script needs to know all valid options used in /etc/conf/tinc.

Author: Moritz Warning <moritzwarning@web.de>
This patch updates that list to tinc 0.18 (current version).



git-svn-id: svn://svn.openwrt.org/openwrt/packages@31837 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
zioproto 2012-05-21 16:45:40 +00:00
parent 9eaf46c2b9
commit b8f4ed473a
2 changed files with 14 additions and 10 deletions

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tinc PKG_NAME:=tinc
PKG_VERSION:=1.0.18 PKG_VERSION:=1.0.18
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages PKG_SOURCE_URL:=http://www.tinc-vpn.org/packages

View File

@ -98,11 +98,12 @@ prepare_host() {
# append flags # append flags
append_conf_bools "$s" "$TMP_TINC/$n/hosts/$s" \ append_conf_bools "$s" "$TMP_TINC/$n/hosts/$s" \
ClampMSS IndirectData PMTUDiscovery ClampMSS IndirectData PMTUDiscovery TCPOnly
# append params # append params
append_conf_params "$s" "$TMP_TINC/$n/hosts/$s" \ append_conf_params "$s" "$TMP_TINC/$n/hosts/$s" \
Address Cipher Compression Digest MACLength PMTU Port Subnet Address Cipher Compression Digest MACLength PMTU \
Port PublicKey PublicKeyFile Subnet
} }
check_gen_own_key() { check_gen_own_key() {
@ -139,17 +140,20 @@ prepare_net() {
# append flags # append flags
append_conf_bools "$s" "$TMP_TINC/$s/tinc.conf" \ append_conf_bools "$s" "$TMP_TINC/$s/tinc.conf" \
DirectOnly Hostnames IffOneQueue PriorityInheritance \ DecrementTTL DirectOnly Hostnames IffOneQueue \
StrictSubnets TunnelServer \ LocalDiscovery PriorityInheritance StrictSubnets TunnelServer \
ClampMSS IndirectData PMTUDiscovery ClampMSS IndirectData PMTUDiscovery TCPOnly
# append params # append params
append_conf_params "$s" "$TMP_TINC/$s/tinc.conf" \ append_conf_params "$s" "$TMP_TINC/$s/tinc.conf" \
AddressFamily BindToAddress ConnectTo BindToInterface \ AddressFamily BindToAddress ConnectTo BindToInterface \
Forwarding GraphDumpFile Interface KeyExpire MACExpire \ Broadcast Device DeviceType Forwarding \
MaxTimeout Mode Name PingInterval PingTimeout PrivateKeyFile \ GraphDumpFile Interface KeyExpire MACExpire \
ProcessPriority ReplayWindow UDPRcvBuf UDPSndBuf \ MaxTimeout Mode Name PingInterval PingTimeout \
Address Cipher Compression Digest MACLength PMTU Port Subnet PrivateKey PrivateKeyFile ProcessPriority ReplayWindow \
UDPRcvBuf UDPSndBuf \
Address Cipher Compression Digest MACLength PMTU \
Port PublicKey PublicKeyFile Subnet
check_gen_own_key "$s" && return 0 check_gen_own_key "$s" && return 0
} }