Merge branch 'master' into android

diff --cc ImmaeEu-up
index f57c2e37c9300ea34f4a6261e7906818deb422f8,56710a195556d9bf3f6451ff8c5d5ca25f2410eb..09210464827a5440419242c13f54bac921fc7eba
mode 100644,100755..100644
--- 1/ImmaeEu-up
--- 2/ImmaeEu-up
+++ b/ImmaeEu-up
@@@ -1,18 -1,24 +1,18 @@@
 -#!/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
  
 -# 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=`cat /etc/tinc/$NETNAME/tinc_domaine`
 -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 /tmp/tinc_$NETNAME
 -echo -e "MYIPS=\"$MYIPS\"\nGWIP=\"$GWIP\"" > /tmp/tinc_$NETNAME
 -ip -6 link set $INTERFACE up mtu 1280
 +SUBDOMAIN=$(cat /sdcard/.tinc/tinc_domaine | tr -c -d "[a-zA-Z0-9.]")
 +
 +MYIPS=$(nslookup $SUBDOMAIN.immae.eu |sed -n "/$SUBDOMAIN.immae.eu/"',$p' | grep ^Address | sed -e "s/^[^:]*:[^0-9]*//" | tr '\n' ' ')
- GWIP=$(nslookup vpn.immae.eu |sed -n "/vpn.immae.eu/"',$p' | grep ^Address | head -n1 | 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 $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