Bug#673491: tayga: [patch] allow adding addresses to the TUN interface

[SamLT]

Hello,

Same idea, but I leave here the default file untouched, and find the
IPv4/IPv6 addresses from the tayga config(ipv4-addr/ipv6-addr), as for
the other parameters(prefix, dynamic-pool...).

patch attached and pasted below for completness.


Thanks for your work.

sam


--- debian/init 2012-06-11 14:43:36.902006173 +0200
+++ debian/init.new     2012-06-11 14:42:31.787831726 +0200
@@ -67,6 +67,8 @@
 TUN_DEVICE=$(sed -rn "/^[ \t]*tun-device/s/^[ \t]*tun-device[ \t]+//p" 
/etc/tayga.conf)
 IPV6_PREFIX=$(sed -rn "/^[ \t]*prefix/s/^[ \t]*prefix[ \t]+//p" 
/etc/tayga.conf)
 DYNAMIC_POOL=$(sed -rn "/^[ \t]*dynamic-pool/s/^[ \t]*dynamic-pool[ \t]+//p" 
/etc/tayga.conf)
+IPV4_TUN_ADDR=$(sed -rn "/^[ \t]*ipv4-addr/s/^[ \t]*ipv4-addr[ \t]+//p" 
/etc/tayga.conf)
+IPV6_TUN_ADDR=$(sed -rn "/^[ \t]*ipv6-addr/s/^[ \t]*ipv6-addr[ \t]+//p" 
/etc/tayga.conf)
 CONFIGURE_IFACE="no"
 CONFIGURE_NAT44="no"
 
@@ -109,6 +111,8 @@
                ip link set $TUN_DEVICE up
                ip route add $DYNAMIC_POOL dev nat64
                ip route add $IPV6_PREFIX dev nat64
+               [ -z "$IPV4_TUN_ADDR" ] || ip addr add $IPV4_TUN_ADDR dev 
$TUN_DEVICE
+               [ -z "$IPV6_TUN_ADDR" ] || ip addr add $IPV6_TUN_ADDR dev 
$TUN_DEVICE
     fi
     [ "x$CONFIGURE_NAT44" = "xyes" ] && iptables -t nat -A POSTROUTING -s 
$DYNAMIC_POOL -j MASQUERADE || true
 

--- debian/init 2012-06-11 14:43:36.902006173 +0200
+++ debian/init.new     2012-06-11 14:42:31.787831726 +0200
@@ -67,6 +67,8 @@
 TUN_DEVICE=$(sed -rn "/^[ \t]*tun-device/s/^[ \t]*tun-device[ \t]+//p" /etc/tayga.conf)
 IPV6_PREFIX=$(sed -rn "/^[ \t]*prefix/s/^[ \t]*prefix[ \t]+//p" /etc/tayga.conf)
 DYNAMIC_POOL=$(sed -rn "/^[ \t]*dynamic-pool/s/^[ \t]*dynamic-pool[ \t]+//p" /etc/tayga.conf)
+IPV4_TUN_ADDR=$(sed -rn "/^[ \t]*ipv4-addr/s/^[ \t]*ipv4-addr[ \t]+//p" /etc/tayga.conf)
+IPV6_TUN_ADDR=$(sed -rn "/^[ \t]*ipv6-addr/s/^[ \t]*ipv6-addr[ \t]+//p" /etc/tayga.conf)
 CONFIGURE_IFACE="no"
 CONFIGURE_NAT44="no"
 
@@ -109,6 +111,8 @@
                ip link set $TUN_DEVICE up
                ip route add $DYNAMIC_POOL dev nat64
                ip route add $IPV6_PREFIX dev nat64
+               [ -z "$IPV4_TUN_ADDR" ] || ip addr add $IPV4_TUN_ADDR dev $TUN_DEVICE
+               [ -z "$IPV6_TUN_ADDR" ] || ip addr add $IPV6_TUN_ADDR dev $TUN_DEVICE
     fi
     [ "x$CONFIGURE_NAT44" = "xyes" ] && iptables -t nat -A POSTROUTING -s $DYNAMIC_POOL -j MASQUERADE || true