From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Tue, 10 Mar 2009 09:24:17 +0000 (+0000)
Subject: [package] add ttl, mtu and set defautl route via gateway instead of interface, making... 
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=8425361d88c135ab38be9fe02af2861e94e5dfc6;p=packages.git

[package] add ttl, mtu and set defautl route via gateway instead of interface, making 6scripts work with SiXXs tunnels (#4696)

git-svn-id: svn://svn.openwrt.org/openwrt/packages@14833 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/ipv6/6scripts/Makefile b/ipv6/6scripts/Makefile
index 2b398d080..6a7f2492b 100644
--- a/ipv6/6scripts/Makefile
+++ b/ipv6/6scripts/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6scripts
 PKG_VERSION:=0.1
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/ipv6/6scripts/files/6tunnel.conf b/ipv6/6scripts/files/6tunnel.conf
index efd8f817c..7bf510fe5 100644
--- a/ipv6/6scripts/files/6tunnel.conf
+++ b/ipv6/6scripts/files/6tunnel.conf
@@ -1,6 +1,19 @@
 config 6tunnel
-        option tnlifname     'sixbone'
-        option remoteip4	''
+    option tnlifname    'sixbone'
+    # provide your tunnel providers' ipv4 address
+    option remoteip4	''
+    # provide your public ipv4 address
 	option localip4		''
+	# provide your local ipv6 address including prefix, 
+	# eg. 2001:610::2/64
 	option localip6		''
+	# provide your tunnel providers' ipv6 address excluding 
+	# prefix, eg. 2001:610::1
+	option remoteip6		''
+	# this should be a network prefix and gateway address 
+	# for your local lan eg 2001:610:1000:1/64
 	option prefix		'/64'
+    # this should provide an mtu for your tunnel interface
+    option mtu          '1280'
+    # this should provide a ttl for your tunnel interface
+    option ttl          '64'
diff --git a/ipv6/6scripts/files/6tunnel.init b/ipv6/6scripts/files/6tunnel.init
index 84ba32563..acd79bff2 100644
--- a/ipv6/6scripts/files/6tunnel.init
+++ b/ipv6/6scripts/files/6tunnel.init
@@ -14,13 +14,17 @@ start_service() {
 	config_get remoteip4 "$section" remoteip4
 	config_get localip4 "$section" localip4
 	config_get localip6 "$section" localip6
+	config_get remoteip6 "$section" remoteip6
 	config_get prefix "$section" prefix
+	config_get ttl "$section" ttl
+	config_get mtu "$section" mtu
 
 	ip tunnel add $tnlifname mode sit remote $remoteip4 local $localip4 ttl 255
 	ifconfig $tnlifname up
+	ip link set mtu $mtu dev $tnlifname
+	ip tunnel change $tnlifname ttl $ttl
 	ip addr add $localip6 dev $tnlifname
-	ip route add ::/0 dev $tnlifname
-	ip route add 2000::/3 dev $tnlifname
+	ip -6 route add 2000::/3 via $remoteip6
 	ip -6 addr add $prefix dev $LAN
 }
 
@@ -36,10 +40,13 @@ stop_service() {
 	config_get remoteip4 "$section" remoteip4
 	config_get localip4 "$section" localip4
 	config_get localip6 "$section" localip6
+	config_get remoteip6 "$section" remoteip6
 	config_get prefix "$section" prefix
+	config_get ttl "$section" ttl
+	config_get mtu "$section" mtu
 
 	ip -6 addr del $prefix dev $LAN
-	ip -6 ro del 2000::/3 dev $tnlifname
+	ip -6 ro del 2000::/3 via $remoteip6
 	ip -6 ro del ::/0 dev $tnlifname
 	ip addr del $localip6 dev $tnlifname
 	ifconfig $tnlifname down