diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 931d1d039e91f53759f2cebc29732d6c9875ca91..dd3bf5c0df21ebb3606795972e9320b2bc855491 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -649,18 +649,7 @@ EOF
mesh_shutdown_script() {
mesh_shutdown_script=$rootdir/usr/bin/meshshutdown
echo '#!/bin/bash' > $mesh_shutdown_script
- echo '' >> $mesh_shutdown_script
- echo "if grep -q 'batman-adv' ${MESH_CURRENT_PROTOCOL}; then" >> $mesh_shutdown_script
- echo ' batman stop' >> $mesh_shutdown_script
- echo 'fi' >> $mesh_shutdown_script
- echo '' >> $mesh_shutdown_script
- echo "if grep -q 'bmx6' ${MESH_CURRENT_PROTOCOL}; then" >> $mesh_shutdown_script
- echo ' bmx stop' >> $mesh_shutdown_script
- echo 'fi' >> $mesh_shutdown_script
- echo '' >> $mesh_shutdown_script
- echo "if grep -q 'bmx7' ${MESH_CURRENT_PROTOCOL}; then" >> $mesh_shutdown_script
- echo ' bmxsec stop' >> $mesh_shutdown_script
- echo 'fi' >> $mesh_shutdown_script
+ echo 'batman stop' >> $mesh_shutdown_script
chroot "$rootdir" chmod +x /usr/bin/meshshutdown
echo '[Unit]' > $rootdir/etc/systemd/system/meshshutdown.service
@@ -848,7 +837,7 @@ initialise_mesh() {
chroot "$rootdir" apt-get -yq install traceroute
# set the default protocol to be used
- echo 'batman-adv' > $rootdir$MESH_DEFAULT_PROTOCOL
+ echo 'bmx7' > $rootdir$MESH_DEFAULT_PROTOCOL
sed -i 's|#net.ipv6.conf.all.forwarding.*|net.ipv6.conf.all.forwarding=1|g' $rootdir/etc/sysctl.conf
sed -i 's|net.ipv6.conf.all.forwarding.*|net.ipv6.conf.all.forwarding=1|g' $rootdir/etc/sysctl.conf
diff --git a/src/freedombone-mesh-batman b/src/freedombone-mesh-batman
index 8f52f1adaafe3a63d7d9c2bc0399793ae94eb7fd..3af6b73cfb78441908bd721fc6eca4da92e82835 100755
--- a/src/freedombone-mesh-batman
+++ b/src/freedombone-mesh-batman
@@ -54,11 +54,17 @@ function status {
}
function stop {
+ if [ ! -f $MESH_CURRENT_PROTOCOL ]; then
+ return
+ fi
+
if [ -z "$IFACE" ]; then
echo 'error: unable to find wifi interface, not enabling batman-adv mesh'
return
fi
+ systemctl stop bmx6
+ systemctl stop bmx7
systemctl stop dnsmasq
systemctl disable dnsmasq
@@ -154,8 +160,7 @@ function start {
fi
echo "info: enabling batman-adv mesh network $WIFI_SSID on $IFACE"
- mesh_protocol_stop
-
+ stop
systemctl stop network-manager
sleep 5
@@ -188,9 +193,8 @@ function start {
modprobe batman-adv
# avahi on ipv4
- sed -i 's|use-ipv4=.*|use-ipv4=yes|g' /etc/avahi/avahi-daemon.conf
- sed -i 's|use-ipv6=.*|use-ipv6=no|g' /etc/avahi/avahi-daemon.conf
- systemctl restart avahi-daemon
+ sed -i 's|use-ipv4=.*|use-ipv4=no|g' /etc/avahi/avahi-daemon.conf
+ sed -i 's|use-ipv6=.*|use-ipv6=yes|g' /etc/avahi/avahi-daemon.conf
add_wifi_interface $IFACE $WIFI_SSID ad-hoc $CHANNEL
@@ -221,8 +225,6 @@ function start {
enable_mesh_firewall
- systemctl restart avahi-daemon
-
enable_mesh_scuttlebot
enable_mesh_tor
@@ -230,9 +232,17 @@ function start {
systemctl restart nginx
+ if [[ "$MESH_DEFAULT_PROTOCOL" == 'bmx6' ]]; then
+ systemctl restart bmx6
+ else
+ systemctl restart bmx7
+ fi
+
+ systemctl restart avahi-daemon
+
verify
- echo "batman-adv" > $MESH_CURRENT_PROTOCOL
+ echo "$MESH_DEFAULT_PROTOCOL" > $MESH_CURRENT_PROTOCOL
}
function monitor {
diff --git a/src/freedombone-mesh-bmx6 b/src/freedombone-mesh-bmx6
index b253367274ef7d2899a60be83cdca44b5f4988e0..d8f10dcbd9770147cb5bb10407d30384e374e31e 100755
--- a/src/freedombone-mesh-bmx6
+++ b/src/freedombone-mesh-bmx6
@@ -137,8 +137,6 @@ function start {
fi
echo "info: enabling BMX6 mesh network $WIFI_SSID on $IFACE"
- mesh_protocol_stop
-
systemctl stop network-manager
sleep 5
diff --git a/src/freedombone-mesh-bmx7 b/src/freedombone-mesh-bmx7
index 72ad382f60cc20c148a46c759d4a372be2a727da..e30526ac058dd64e6ad65ab6f01d79e9d69567d7 100755
--- a/src/freedombone-mesh-bmx7
+++ b/src/freedombone-mesh-bmx7
@@ -135,8 +135,6 @@ function start {
fi
echo "info: enabling BMX7 mesh network $WIFI_SSID on $IFACE"
- mesh_protocol_stop
-
systemctl stop network-manager
sleep 5
diff --git a/src/freedombone-mesh-reset b/src/freedombone-mesh-reset
index 954277c201d61f04d7d492c11810942172ad3d62..87a5c601a83161e384463dc5a940717a2e10247f 100755
--- a/src/freedombone-mesh-reset
+++ b/src/freedombone-mesh-reset
@@ -31,28 +31,11 @@ PROJECT_NAME='freedombone'
export TEXTDOMAIN=${PROJECT_NAME}-mesh-reset
export TEXTDOMAINDIR="/usr/share/locale"
-MESH_CURRENT_PROTOCOL=/root/.mesh_protocol
MESH_INSTALL_COMPLETED=/root/.mesh_setup_completed
if ! zenity --question --title=$'New Identity' --text=$"Do you want to reset your identity? This will reset ALL data for this peer, and you will not be able to recover it." --ok-label=No --cancel-label=Yes --width=300; then
- curr_protocol='batman-adv'
- if grep -q "bmx6" $MESH_CURRENT_PROTOCOL; then
- curr_protocol='bmx6'
- fi
- if grep -q "bmx7" $MESH_CURRENT_PROTOCOL; then
- curr_protocol='bmx7'
- fi
-
- if [[ "$curr_protocol" == 'batman-adv' ]]; then
- sudo batman stop
- fi
- if [[ "$curr_protocol" == 'bmx6' ]]; then
- sudo bmx stop
- fi
- if [[ "$curr_protocol" == 'bmx7' ]]; then
- sudo bmxsec stop
- fi
+ sudo batman stop
sudo pkill qtox
sudo pkill firefox
@@ -62,15 +45,7 @@ if ! zenity --question --title=$'New Identity' --text=$"Do you want to reset you
sudo rm -f $MESH_INSTALL_COMPLETED
sudo ${PROJECT_NAME}-image-mesh $USER new
- if [[ "$curr_protocol" == 'batman-adv' ]]; then
- sudo batman start
- fi
- if [[ "$curr_protocol" == 'bmx6' ]]; then
- sudo bmx start
- fi
- if [[ "$curr_protocol" == 'bmx7' ]]; then
- sudo bmxsec start
- fi
+ sudo batman start
if [ -f $HOME/mesh-desktop.sh ]; then
$HOME/mesh-desktop.sh
diff --git a/src/freedombone-utils-mesh b/src/freedombone-utils-mesh
index 4949a07c12f2ac83806cfde02bd175e993c9010f..7457392ee1bf4469375bd397b61e5c93d4164bc3 100755
--- a/src/freedombone-utils-mesh
+++ b/src/freedombone-utils-mesh
@@ -32,33 +32,13 @@
MESH_CURRENT_PROTOCOL=/root/.mesh_protocol
MESH_DEFAULT_PROTOCOL=/root/.mesh_protocol_default
-function mesh_protocol_stop {
- if [ ! -f $MESH_CURRENT_PROTOCOL ]; then
- return
- fi
-
- if grep -q "bmx6" $MESH_CURRENT_PROTOCOL; then
- bmx stop
- fi
-
- if grep -q "bmx7" $MESH_CURRENT_PROTOCOL; then
- bmxsec stop
- fi
-
- if grep -q "batman-adv" $MESH_CURRENT_PROTOCOL; then
- batman stop
- fi
-
- rm $MESH_CURRENT_PROTOCOL
-}
-
function mesh_protocol_init {
if [[ $1 == "start" ]]; then
# install avahi
sed -i "s|#host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf
sed -i "s|host-name=.*|host-name=$(hostname)|g" /etc/avahi/avahi-daemon.conf
- sed -i "s|use-ipv4=.*|use-ipv4=yes|g" /etc/avahi/avahi-daemon.conf
- sed -i "s|use-ipv6=.*|use-ipv6=no|g" /etc/avahi/avahi-daemon.conf
+ sed -i "s|use-ipv4=.*|use-ipv4=no|g" /etc/avahi/avahi-daemon.conf
+ sed -i "s|use-ipv6=.*|use-ipv6=yes|g" /etc/avahi/avahi-daemon.conf
sed -i "s|#disallow-other-stacks=.*|disallow-other-stacks=yes|g" /etc/avahi/avahi-daemon.conf
sed -i "s|hosts:.*|hosts: files mdns4_minimal dns mdns4 mdns|g" /etc/nsswitch.conf
fi