Testing Push

luasrc/model/cbi/easymesh.lua

@@ -154,7 +154,7 @@ o.default = "192.168.8.1"
 o.datatype = "ip4addr"
 o:depends("ap_mode", 1)
 
-so = s:option(Value, "netmask", translate("IPv4 netmask"))
+o = s:option(Value, "netmask", translate("IPv4 netmask"))
 o.default = "255.255.255.0"
 o.datatype = "ip4addr"
 o:depends("ap_mode", 1)

root/easymesh/easymesh.sh

@@ -19,6 +19,8 @@ load_easymesh_config() {
     backbone=$(uci get easymesh.@easymesh[0].backbone)
     apname=$(uci get easymesh.@easymesh[0].apname)
     appass=$(uci get easymesh.@easymesh[0].appass)
+    # On a single line, print all of the variables to a file
+    printf "enable: $enable\nmesh_bat0: $mesh_bat0\nap_mode: $ap_mode\nlan: $lan\nipaddr: $ipaddr\nnetmask: $netmask\ngateway: $gateway\ndns: $dns\nap_ipaddr: $ap_ipaddr\nap_ipaddr1: $ap_ipaddr1\napRadio: $apRadio\nkvr: $kvr\niapp: $iapp\nbrlan: $brlan\nrole: $role\nbackbone: $backbone\napname: $apname\nappass: $appass" > /root/.easymesh
 }
 
 ap_mode_stop() {
@@ -50,7 +52,7 @@ add_wifi_mesh() {
     key=$(uci -q get easymesh.config.key)
     encryption=$(uci -q get easymesh.config.encryption)
     # Print out all the variables
-    echo "mesh_nwi_mesh: $mesh_nwi_mesh\nmesh_apRadio: $mesh_apRadio\nmesh_mesh: $mesh_mesh\nmesh_id: $mesh_id\nmobility_domain: $mobility_domain\nkey: $key\nencryption: $encryption" > /root/.newmesh
+    printf "mesh_nwi_mesh: $mesh_nwi_mesh\nmesh_apRadio: $mesh_apRadio\nmesh_mesh: $mesh_mesh\nmesh_id: $mesh_id\nmobility_domain: $mobility_domain\nkey: $key\nencryption: $encryption" > /root/.newmesh
 
 
     if [ "$mesh_nwi_mesh" != "interface" ]; then
@@ -155,7 +157,7 @@ add_wifi_mesh() {
             uci set wireless.wifinet$apnum.device=$apall
             uci set wireless.wifinet$apnum.mode='ap'
             uci set wireless.wifinet$apnum.ssid=$mesh_id
-            uci set wireless.wifinet$apnum.encryption='psk2'
+            uci set wireless.wifinet$apnum.encryption='sae-mixed'
             uci set wireless.wifinet$apnum.key=$key
             uci set wireless.wifinet$apnum.ieee80211r='1'
             uci set wireless.wifinet$apnum.mobility_domain=$mobility_domain
@@ -239,7 +241,6 @@ set_easymesh() {
             uci set network.bat0.network_coding='0'
             uci set network.bat0.orig_interval='1000'
 
-
             if [ "$role" = "server" ]; then
                 uci set network.bat0.gw_mode='server'
             elif [ "$role" = "client" ]; then
@@ -258,14 +259,18 @@ set_easymesh() {
         fi # end [ "$mesh_bat0" != "interface" ]
 
         # When this is called, the add_wifi_mesh function does not load variables properly
-        # if [ "$apRadio" = "all" ]; then
+        if [ "$apRadio" = "all" ]; then
-        #     for apall in $(uci -X show wireless | grep wifi-device | awk -F'[.=]' '{print $2}'); do
+            for apall in $(uci -X show wireless | grep wifi-device | awk -F'[.=]' '{print $2}'); do
-        #         add_wifi_mesh
+                add_wifi_mesh
-        #     done
+                add_kvr
-        # else
+                add_dawn
-        #         apall=$apRadio
+            done
-        #         add_wifi_mesh
+        else
-        # fi
+            apall=$apRadio
+            add_wifi_mesh
+            add_kvr
+            add_dawn
+        fi
 
         add_kvr
         add_dawn
@@ -335,7 +340,7 @@ set_easymesh() {
         else
             ap_mode_stop
         fi # end if [ "$ap_mode" = 1 ]
-
+    else
         if [ "$mesh_bat0" = "interface" ]; then
                 uci -q delete network.bat0
                 if [ "$brlan" = "br-lan" ]; then
@@ -360,27 +365,15 @@ set_easymesh() {
                 uci commit wireless
             fi
         done
+    fi
 
-        add_kvr
+    if [ "$ap_mode" = 0 ]; then
-        add_dawn
-
-        if [ "$ap_mode" = 1 ]; then
             ap_mode_stop
     fi
-    fi
+
     /etc/init.d/network restart
 } # end set_easymesh()
 
 # Call our functions set above
 load_easymesh_config
 set_easymesh
-
-if [ "$apRadio" = "all" ]; then
-    for apall in $(uci -X show wireless | grep wifi-device | awk -F'[.=]' '{print $2}'); do
-        add_wifi_mesh
-    done
-else
-        apall=$apRadio
-        add_wifi_mesh
-fi
-