hotspot - testing

Author: winemug

scripts/hotspot.sh

@@ -12,67 +12,58 @@
 #Other setup required find out more at
 #http://www.raspberryconnect.com
 
-CreateHotSpot()
+CleanUp()
 {
-    echo "Killing wifi client"
+    systemctl stop hostapd
+    systemctl stop dnsmasq
     wpa_cli terminate ${WLAN_INTERFACE} >/dev/null 2>&1
-    echo "Creating HotSpot"
-    systemctl stop dnsmasq > /dev/null 2>&1
-    systemctl stop hostapd  > /dev/null 2>&1
+    ip addr flush ${WLAN_INTERFACE}
     ifconfig ${WLAN_INTERFACE} down
-    ifconfig ${WLAN_INTERFACE} up
     ip link set dev ${WLAN_INTERFACE} down
+    rm -r /var/run/wpa_supplicant >/dev/null 2>&1
+}
+
+CreateHotSpot()
+{
+    CleanUp
+    echo "Creating HotSpot"
     ip a add 10.0.34.1/24 brd + dev ${WLAN_INTERFACE}
     ip link set dev ${WLAN_INTERFACE} up
     dhcpcd -k ${WLAN_INTERFACE} >/dev/null 2>&1
     systemctl start dnsmasq
     systemctl start hostapd
 }
 
-KillHotSpot()
+ConnectToWifi()
 {
-    echo "Shutting Down HotSpot"
-    ip link set dev ${WLAN_INTERFACE} down
-    ifconfig ${WLAN_INTERFACE} down
+    CleanUp
+    echo "Starting WiFi connection"
     ifconfig ${WLAN_INTERFACE} up
-
-    systemctl stop hostapd
-    systemctl stop dnsmasq
-    ip addr flush dev ${WLAN_INTERFACE}
     ip link set dev ${WLAN_INTERFACE} up
     dhcpcd  -n ${WLAN_INTERFACE} >/dev/null 2>&1
-}
-
-CreateWifiClient()
-{
-    echo "Starting WiFi connection"
     wpa_supplicant -B -i ${WLAN_INTERFACE} -c /etc/wpa_supplicant/wpa_supplicant.conf >/dev/null 2>&1
 	echo "Waiting 20 seconds"
     sleep 20 #give time for connection to be completed to router
+    return IsWifiConnected
 }
 
-IsWifiDisconnected()
+IsWifiConnected()
 {
 	wpa_cli -i ${WLAN_INTERFACE} status | grep 'ip_address' >/dev/null 2>&1
 	return $?
 }
 
 areKnownNetworksNearBy()
 {
-SSID_LIST=$(awk '/ssid="/{ print $0 }' /etc/wpa_supplicant/wpa_supplicant.conf | awk -F'ssid=' '{ print $2 }' ORS=',' | sed 's/\"/''/g' | sed 's/,$//')
-IFS=","
+SSID_REGISTERED=$(awk '/ssid="/{ print $0 }' /etc/wpa_supplicant/wpa_supplicant.conf | awk -F'ssid=' '{ print $2 }' ORS=',' | sed 's/\"/''/g' | sed 's/,$//')
 
-SSID_REPLY=`iw dev "$wifidev" scan ap-force | egrep "^BSS|SSID:"`
+SSID_AVAILABLE=`iw dev ${WLAN_INTERFACE} scan ap-force | grep "SSID:" | cut -d ' ' -f 2`
 
-for SSID in ${SSID_LIST}
+for SSID in ${SSID_REGISTERED};
 do
-     SSID_CLEAN=$(echo ${SSID} | tr -d '\r')
-     echo ${SSID_REPLY} | grep ${SSID_CLEAN} > /dev/null 2>&1
-     if [[ $? ]]
-     then
-        return 0
-     fi
+     [[ $SSID_AVAILABLE =~ (^|[[:space:]])$SSID($|[[:space:]]) ]] && return 0
 done
+
 return 1
 }
 
@@ -82,55 +73,61 @@ ACTIVE_MODE=
 while true;
 do
     if [[ ${ACTIVE_MODE} == "ap" ]]; then
-        echo "Running in access point mode, next check in 300 seconds"
         sleep 300
-        if [[ areKnownNetworksNearBy ]]; then
+        if areKnownNetworksNearBy; then
+              systemctl stop omnipy-beacon.service
               systemctl stop omnipy.service
-              KillHotSpot
-              echo "Hotspot Deactivated, Bringing Wifi Up"
+              echo "Known networks are nearby, deactivating hotspot and connecting to wi-fi"
               CreateWifiClient
-              if [[ IsWifiDisconnected ]]; then
+              if ! IsWifiConnected; then
                     echo "Failed to connect to wifi, going back into hotspot mode"
                     CreateHotSpot
                     ACTIVE_MODE="ap"
               else
                     ACTIVE_MODE="client"
               fi
+              systemctl restart omnipy-beacon.service
+              systemctl stop omnipy.service
               systemctl start omnipy.service
+
         fi
     elif [[ ${ACTIVE_MODE} == "client" ]]; then
-        echo "Running in wi-fi client mode, next check in 60 seconds"
         sleep 60
-        if [[ IsWifiDisconnected ]]; then
-            systemctl stop omnipy.service
+        if ! IsWifiConnected; then
             echo "Wi-fi disconnected, retrying"
             CreateWifiClient
-            if [[ IsWifiDisconnected ]]; then
+            if ! IsWifiConnected; then
                     echo "No wi-fi connection, creating hot-spot"
                     CreateHotSpot
                     ACTIVE_MODE="ap"
             else
                 echo "Wi-fi connection re-established"
             fi
+            systemctl restart omnipy-beacon.service
+            systemctl stop omnipy.service
             systemctl start omnipy.service
+
         fi
     else
         echo "Checking current network state"
-        if [[ IsWifiDisconnected ]]; then
+        if ! IsWifiConnected; then
             echo "Wi-fi not connected, scanning"
-            if [[ areKnownNetworksNearBy ]]; then
+            if areKnownNetworksNearBy; then
                 echo "Found known networks, will try to connect"
-                KillHotSpot
                 CreateWifiClient
             fi
         fi
 
-        if [[ IsWifiDisconnected ]]; then
+        if ! IsWifiConnected; then
             echo "No wi-fi connection, creating hotspot"
             CreateHotSpot
+            systemctl restart omnipy-beacon.service
+            systemctl stop omnipy.service
+            systemctl start omnipy.service
             ACTIVE_MODE="ap"
         else
+            echo "Wi-fi is connected"
             ACTIVE_MODE="client"
         fi
     fi
-done
+done

scripts/omnipy.service

@@ -7,7 +7,7 @@ ExecStart=/usr/bin/python3 -u /home/pi/omnipy/restapi.py
 WorkingDirectory=/home/pi/omnipy
 StandardOutput=inherit
 StandardError=inherit
-TimeoutStopSec=90
+TimeoutStopSec=240
 Restart=on-abort
 User=pi
 

scripts/pi-update-finalize.sh

@@ -39,8 +39,7 @@ sudo cp /home/pi/omnipy/scripts/omnipy-hotspot.service /etc/systemd/system/
 sudo systemctl enable omnipy.service
 sudo systemctl enable omnipy-beacon.service
 sudo systemctl enable omnipy-pan.service
-sudo systemctl enable omnipy-hotspot.service
-sudo systemctl start omnipy-hotspot.service
+sudo systemctl disable omnipy-hotspot.service
 sudo systemctl start omnipy.service
 sudo systemctl start omnipy-beacon.service
 sudo systemctl start omnipy-pan.service

scripts/pi-update.sh

@@ -18,12 +18,10 @@ git pull
 
 echo
 echo "Stopping omnipy services"
-sudo systemctl disable omnipy.service
-sudo systemctl disable omnipy-beacon.service
-sudo systemctl disable omnipy-pan.service
 sudo systemctl stop omnipy.service
 sudo systemctl stop omnipy-beacon.service
 sudo systemctl stop omnipy-pan.service
+sudo systemctl stop omnipy-hotspot.service
 
 
 /bin/bash /home/pi/omnipy/scripts/pi-update-finalize.sh

scripts/recovery.sh

@@ -37,6 +37,10 @@ if [[ -f ${BT_RESET_FILE} ]]; then
         /bin/rm ${BT_RESET_FILE}
 fi
 
+if [[ -f ${HOT_SPOT_FILE} ]]; then
+    systemctl start omnipy-hotspot.service
+fi
+
 #if [[ -f ${HOT_SPOT_FILE} ]]; then
 #
 #    	mkdir -p /home/pi/omnipy/data