From f7dca26bd3019b2f50294fdee9b36062b077338c Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sat, 13 Jan 2018 10:11:10 +0000
Subject: [PATCH] utils should only contain functions
---
src/freedombone-mesh-batman | 1 +
src/freedombone-mesh-bmx6 | 1 +
src/freedombone-utils-mesh | 88 +++++++++++++++++++------------------
3 files changed, 47 insertions(+), 43 deletions(-)
diff --git a/src/freedombone-mesh-batman b/src/freedombone-mesh-batman
index 7a01f57b2..4507af494 100755
--- a/src/freedombone-mesh-batman
+++ b/src/freedombone-mesh-batman
@@ -37,6 +37,7 @@ HOTSPOT_PASSPHRASE="${PROJECT_NAME}"
source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-wifi
source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-mesh
+mesh_protocol_init
update_wifi_adaptors
if [ ! $IFACE ]; then
diff --git a/src/freedombone-mesh-bmx6 b/src/freedombone-mesh-bmx6
index 2a4a17930..7b34c568e 100755
--- a/src/freedombone-mesh-bmx6
+++ b/src/freedombone-mesh-bmx6
@@ -37,6 +37,7 @@ HOTSPOT_PASSPHRASE="${PROJECT_NAME}"
source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-wifi
source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-mesh
+mesh_protocol_init
update_wifi_adaptors
if [ ! $IFACE ]; then
diff --git a/src/freedombone-utils-mesh b/src/freedombone-utils-mesh
index abcdbf1e5..9fb168cde 100755
--- a/src/freedombone-utils-mesh
+++ b/src/freedombone-utils-mesh
@@ -28,56 +28,58 @@
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-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|#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
+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|#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
-# Mesh definition
-WIFI_SSID='mesh'
-if [ -f $COMPLETION_FILE ]; then
- if grep -q "WIFI_SSID:" $COMPLETION_FILE; then
- WIFI_SSID=$(cat $COMPLETION_FILE | grep "WIFI_SSID:" | awk -F ':' '{print $2}')
+ # Mesh definition
+ WIFI_SSID='mesh'
+ if [ -f $COMPLETION_FILE ]; then
+ if grep -q "WIFI_SSID:" $COMPLETION_FILE; then
+ WIFI_SSID=$(cat $COMPLETION_FILE | grep "WIFI_SSID:" | awk -F ':' '{print $2}')
+ fi
+ sed -i "s|WIFI_SSID:.*|WIFI_SSID:${WIFI_SSID}|g" $COMPLETION_FILE
fi
- sed -i "s|WIFI_SSID:.*|WIFI_SSID:${WIFI_SSID}|g" $COMPLETION_FILE
-fi
-CELLID='any'
+ CELLID='any'
-CHANNEL=2
-HOTSPOT_CHANNEL=6
-if [ -f $COMPLETION_FILE ]; then
- if grep -q "Wifi channel:" $COMPLETION_FILE; then
- CHANNEL=$(cat $COMPLETION_FILE | grep "Wifi channel:" | awk -F ':' '{print $2}')
+ CHANNEL=2
+ HOTSPOT_CHANNEL=6
+ if [ -f $COMPLETION_FILE ]; then
+ if grep -q "Wifi channel:" $COMPLETION_FILE; then
+ CHANNEL=$(cat $COMPLETION_FILE | grep "Wifi channel:" | awk -F ':' '{print $2}')
+ fi
+ sed -i "s|Wifi channel:.*|Wifi channel:${CHANNEL}|g" $COMPLETION_FILE
fi
- sed -i "s|Wifi channel:.*|Wifi channel:${CHANNEL}|g" $COMPLETION_FILE
-fi
-ZERONET_PORT=15441
-IPFS_PORT=4001
-TOX_PORT=33445
-TRACKER_PORT=6969
-LIBREVAULT_PORT=42345
-TAHOELAFS_PORT=50213
-GIT_SSB_PORT=7718
-NGINX_GIT_SSB_PORT=7719
+ ZERONET_PORT=15441
+ IPFS_PORT=4001
+ TOX_PORT=33445
+ TRACKER_PORT=6969
+ LIBREVAULT_PORT=42345
+ TAHOELAFS_PORT=50213
+ GIT_SSB_PORT=7718
+ NGINX_GIT_SSB_PORT=7719
-# Ethernet bridge definition (bridged to bat0)
-BRIDGE=br-mesh
-BRIDGE_HOTSPOT=br-hotspot
-IFACE=
-IFACE_SECONDARY=
-EIFACE=eth0
-WLAN_ADAPTORS=$(count_wlan)
+ # Ethernet bridge definition (bridged to bat0)
+ BRIDGE=br-mesh
+ BRIDGE_HOTSPOT=br-hotspot
+ IFACE=
+ IFACE_SECONDARY=
+ EIFACE=eth0
+ WLAN_ADAPTORS=$(count_wlan)
-if [ $WLAN_ADAPTORS -eq 0 ]; then
- echo $'No wlan adaptors found'
- exit 0
-fi
+ if [ $WLAN_ADAPTORS -eq 0 ]; then
+ echo $'No wlan adaptors found'
+ exit 0
+ fi
+}
function get_ipv4_wlan {
echo $(ip -o -f inet addr show dev "$IFACE" | awk '{print $4}' | awk 'END {print}' | awk -F '/' '{print $1}')
--
GitLab