From 552bd5f9675dbc25c42fc8dc2ebe045899abb8b4 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 26 Jul 2015 13:42:32 +0100
Subject: [PATCH] Remove batman ipv6 address

---
 src/freedombone        | 25 -------------------------
 src/freedombone-config |  7 -------
 2 files changed, 32 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index 01c69fc1..49286d34 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -378,7 +378,6 @@ CJDNS_PORT=
 
 # B.A.T.M.A.N settings
 ENABLE_BATMAN="no"
-BATMAN_IPV6=
 BATMAN_CELLID='02:BA:00:00:03:01'
 ESSID='mesh'
 
@@ -872,9 +871,6 @@ function read_configuration {
       if grep -q "ENABLE_BATMAN" $CONFIGURATION_FILE; then
           ENABLE_BATMAN=$(grep "ENABLE_BATMAN" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
       fi
-      if grep -q "BATMAN_IPV6" $CONFIGURATION_FILE; then
-          BATMAN_IPV6=$(grep "BATMAN_IPV6" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-      fi
       if grep -q "ENABLE_CJDNS" $CONFIGURATION_FILE; then
           ENABLE_CJDNS=$(grep "ENABLE_CJDNS" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
       fi
@@ -1579,16 +1575,6 @@ function mesh_cjdns_tools {
   echo 'mesh_cjdns_tools' >> $COMPLETION_FILE
 }
 
-function get_batman_ipv6_address {
-  if [ -f /home/$MY_USERNAME/README ]; then
-      if grep -q "Mesh internet bridge IP address" /home/$MY_USERNAME/README; then
-          if [ ! $BATMAN_IPV6 ]; then
-              BATMAN_IPV6=$(cat /home/$MY_USERNAME/README | grep "Mesh internet bridge IP address" | awk -F ':' '{print $2}' | sed 's/^ *//')
-          fi
-      fi
-  fi
-}
-
 function install_vpn_tunnel {
   if ! grep -q "repo.universe-factory.net" /etc/apt/sources.list; then
       echo 'deb http://repo.universe-factory.net/debian/ sid main' >> /etc/apt/sources.list
@@ -1727,17 +1713,6 @@ function mesh_batman_bridge {
   fi
 
   enable_ipv6
-  get_batman_ipv6_address
-
-  # If no address has been given then create a ramdom one
-  if [ ! $BATMAN_IPV6 ]; then
-      hexarray=( 1 2 3 4 5 6 7 8 9 0 a b c d e f )
-      a=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
-      b=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
-      c=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
-      d=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
-      BATMAN_IPV6="$IPV6_NETWORK:$a:$b:$c:$d"
-  fi
 
   batman_script=/var/lib/batman
 
diff --git a/src/freedombone-config b/src/freedombone-config
index 1ae1cb0b..979c95bb 100755
--- a/src/freedombone-config
+++ b/src/freedombone-config
@@ -90,7 +90,6 @@ MEDIAGOBLIN_CODE=
 USB_DRIVE=/dev/sdb1
 HWRNG_TYPE=
 ENABLE_SOCIAL_KEY_MANAGEMENT=
-BATMAN_IPV6=
 
 CONFIGURATION_FILE=
 
@@ -232,9 +231,6 @@ function save_configuration_file {
   if [ $ENABLE_SOCIAL_KEY_MANAGEMENT ]; then
       echo "ENABLE_SOCIAL_KEY_MANAGEMENT=$ENABLE_SOCIAL_KEY_MANAGEMENT" >> $CONFIGURATION_FILE
   fi
-  if [ $BATMAN_IPV6 ]; then
-      echo "BATMAN_IPV6=$BATMAN_IPV6" >> $CONFIGURATION_FILE
-  fi
 }
 
 # test a domain name to see if it's valid
@@ -1411,9 +1407,6 @@ function read_configuration {
       if grep -q "ENABLE_BABEL" $CONFIGURATION_FILE; then
           ENABLE_BABEL=$(grep "ENABLE_BABEL" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
       fi
-      if grep -q "BATMAN_IPV6" $CONFIGURATION_FILE; then
-          BATMAN_IPV6=$(grep "BATMAN_IPV6" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
-      fi
       if grep -q "ROUTER_IP_ADDRESS" $CONFIGURATION_FILE; then
           ROUTER_IP_ADDRESS=$(grep "ROUTER_IP_ADDRESS" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
       fi