|
@@ -378,7 +378,6 @@ CJDNS_PORT=
|
378
|
378
|
|
379
|
379
|
# B.A.T.M.A.N settings
|
380
|
380
|
ENABLE_BATMAN="no"
|
381
|
|
-BATMAN_IPV6=
|
382
|
381
|
BATMAN_CELLID='02:BA:00:00:03:01'
|
383
|
382
|
ESSID='mesh'
|
384
|
383
|
|
|
@@ -872,9 +871,6 @@ function read_configuration {
|
872
|
871
|
if grep -q "ENABLE_BATMAN" $CONFIGURATION_FILE; then
|
873
|
872
|
ENABLE_BATMAN=$(grep "ENABLE_BATMAN" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
874
|
873
|
fi
|
875
|
|
- if grep -q "BATMAN_IPV6" $CONFIGURATION_FILE; then
|
876
|
|
- BATMAN_IPV6=$(grep "BATMAN_IPV6" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
877
|
|
- fi
|
878
|
874
|
if grep -q "ENABLE_CJDNS" $CONFIGURATION_FILE; then
|
879
|
875
|
ENABLE_CJDNS=$(grep "ENABLE_CJDNS" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
880
|
876
|
fi
|
|
@@ -1579,16 +1575,6 @@ function mesh_cjdns_tools {
|
1579
|
1575
|
echo 'mesh_cjdns_tools' >> $COMPLETION_FILE
|
1580
|
1576
|
}
|
1581
|
1577
|
|
1582
|
|
-function get_batman_ipv6_address {
|
1583
|
|
- if [ -f /home/$MY_USERNAME/README ]; then
|
1584
|
|
- if grep -q "Mesh internet bridge IP address" /home/$MY_USERNAME/README; then
|
1585
|
|
- if [ ! $BATMAN_IPV6 ]; then
|
1586
|
|
- BATMAN_IPV6=$(cat /home/$MY_USERNAME/README | grep "Mesh internet bridge IP address" | awk -F ':' '{print $2}' | sed 's/^ *//')
|
1587
|
|
- fi
|
1588
|
|
- fi
|
1589
|
|
- fi
|
1590
|
|
-}
|
1591
|
|
-
|
1592
|
1578
|
function install_vpn_tunnel {
|
1593
|
1579
|
if ! grep -q "repo.universe-factory.net" /etc/apt/sources.list; then
|
1594
|
1580
|
echo 'deb http://repo.universe-factory.net/debian/ sid main' >> /etc/apt/sources.list
|
|
@@ -1727,17 +1713,6 @@ function mesh_batman_bridge {
|
1727
|
1713
|
fi
|
1728
|
1714
|
|
1729
|
1715
|
enable_ipv6
|
1730
|
|
- get_batman_ipv6_address
|
1731
|
|
-
|
1732
|
|
- # If no address has been given then create a ramdom one
|
1733
|
|
- if [ ! $BATMAN_IPV6 ]; then
|
1734
|
|
- hexarray=( 1 2 3 4 5 6 7 8 9 0 a b c d e f )
|
1735
|
|
- a=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
|
1736
|
|
- b=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
|
1737
|
|
- c=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
|
1738
|
|
- d=${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}${hexarray[$RANDOM%16]}
|
1739
|
|
- BATMAN_IPV6="$IPV6_NETWORK:$a:$b:$c:$d"
|
1740
|
|
- fi
|
1741
|
1716
|
|
1742
|
1717
|
batman_script=/var/lib/batman
|
1743
|
1718
|
|