Merge branch 'master' into android

diff --cc ImmaeEu-down
index 8a0ef220f5d7d18a2f7ba7fec933dc05f238d08b,84597783374431eda2d94cd6940c886792e741d6..1b6260e21b800c00813dabaa078701c89a63c57a
mode 100644,100755..100644
--- 1/ImmaeEu-down
--- 2/ImmaeEu-down
+++ b/ImmaeEu-down
@@@ -1,16 -1,12 +1,16 @@@
 -#!/bin/sh
 +#!/system/xbin/sh
  # This file closes down the tap device.
  
 -[ -e /tmp/tinc_$NETNAME ] && . /tmp/tinc_$NETNAME
 -[ -e /run/tinc_$NETNAME.vars ] && . /run/tinc_$NETNAME.vars
 -rm -f /tmp/tinc_$NETNAME /run/tinc_$NETNAME.vars
 -[ -n "$GWIP" ] && ip -6 route del default via $GWIP
 +source /sdcard/.tinc/vars
 +rm /sdcard/.tinc/vars
 +
 +ip -6 rule del from all lookup 100
 +ip route del table 100 $REMOTEADDRESS
 +ip -6 route del table 100 $GWIP dev vpn6
 +ip -6 route del table 100 ::/1 via $GWIP dev vpn6
  for MYIP in $MYIPS; do
-       ip -6 addr del $MYIP/96 dev vpn6
 -  ip -6 addr del $MYIP/96 dev $INTERFACE
++  ip -6 addr del $MYIP/96 dev vpn6
  done
 -ip -6 link set $INTERFACE down
 +ip -6 link set vpn6 down
 +
  

diff --cc ImmaeEu-up
index 09210464827a5440419242c13f54bac921fc7eba,c2dc93adca69af7d45e5089e9a632361a802e0e4..b24eed86a5c01d2a2d6d8c699d48c05ead8d7f60
mode 100644,100755..100644
--- 1/ImmaeEu-up
--- 2/ImmaeEu-up
+++ b/ImmaeEu-up
@@@ -1,18 -1,24 +1,19 @@@
 -#!/bin/sh
 -# This file sets up the tap device.
 -# It gives you the freedom to do anything you want with it.
 -# Use the correct name for the tap device:
 -# The environment variable $INTERFACE is set to the right name
 -# on most platforms, but if it doesn't work try to set it manually.
 +#!/system/xbin/sh
  
- SUBDOMAIN=$(cat /sdcard/.tinc/tinc_domaine | tr -c -d "[a-zA-Z0-9.]")
 -# Give it the right ip and netmask. Remember, the subnet of the
 -# tap device must be larger than that of the individual Subnets
 -# as defined in the host configuration file!
 -SUBDOMAIN=$(echo "$NAME" | sed -e "s/\([A-Z][a-z0-9]*\)/\L\1 /g;" | awk '{ for (i=NF; i>1; i--) printf("%s.",$i); print $1; }')
 -while [ -z "$MYIPS" -o -z "$GWIP" ]; do
 -  MYIPS=`getent hosts ${SUBDOMAIN}.immae.eu | cut -d' ' -f1 | tr "\\n" ' '`
 -  GWIP=`getent hosts gw.vpn.immae.eu | head -n1 | cut -d' ' -f1`
 -  sleep 5
 -done
 -rm -f /run/tinc_$NETNAME.vars
 -echo -e "MYIPS=\"$MYIPS\"\nGWIP=\"$GWIP\"" > /run/tinc_$NETNAME.vars
 -ip -6 link set $INTERFACE up mtu 1280
++# Cannot expect awk to be present
++SUBDOMAIN=$(echo "$NAME" | sed -e "s/\([A-Z][a-z0-9]*\)\([A-Z][a-z0-9]*\)/\L\2.\L\1/;")
 +
 +MYIPS=$(nslookup $SUBDOMAIN.immae.eu |sed -n "/$SUBDOMAIN.immae.eu/"',$p' | grep ^Address | sed -e "s/^[^:]*:[^0-9]*//" | tr '\n' ' ')
 +GWIP=$(nslookup gw.vpn.immae.eu |sed -n "/gw.vpn.immae.eu/"',$p' | grep ^Address | head -n1 | sed -e "s/^[^:]*:[^0-9]*//" | tr '\n' ' ')
 +
 +echo -e "MYIPS=\"$MYIPS\"\nGWIP=\"$GWIP\"" > /sdcard/.tinc/vars
 +ip -6 link set vpn6 up mtu 1280
  for MYIP in $MYIPS; do
-       ip -6 addr add $MYIP/96 dev vpn6
 -  ip -6 addr add $MYIP/96 dev $INTERFACE
++  ip -6 addr add $MYIP/96 dev vpn6
  done
 -ip -6 route add default via $GWIP
 -(cd /etc/tinc/$NETNAME/hosts && git pull -q origin master) || true
 +ORIGINAL_GATEWAY=$(for a in $(ip rule show | grep lookup | sed -r 's/.* lookup ([^ ]+).*/\1/'); do ip route show table $a | grep ^default | cut -d ' ' -f 2-5; done | head -1)
 +
 +ip -6 rule add prio 100 from all lookup 100
 +ip route add table 100 $REMOTEADDRESS $ORIGINAL_GATEWAY 
 +ip -6 route add table 100 $GWIP dev vpn6
 +ip -6 route add table 100 ::/1 via $GWIP dev vpn6