tomeshnet / meshstream

Live video stream with a distributed file system over a physical mesh network
GNU General Public License v3.0
22 stars 4 forks source link

MeshPoint config in LuCI broken in Factory iamge #10

Open darkdrgn2k opened 6 years ago

darkdrgn2k commented 6 years ago

Factory LEDE/OpenWRT is broken for mesh point

Fixes as such

sed -i 's#iw dev "$ifname" mesh join "$mesh_id" freq $freq $mesh_htmode \\#iw dev "$ifname" mesh join "$ssid" freq $freq $mesh_htmode \\#' /lib/netifd/wireless/mac80211.sh
sed -i 's#htmode:value\("HT40", "40MHz"\)#htmode:value\("HT40+", "40MHz+"\)#' /usr/lib/lua/luci/model/cbi/admin_network/wifi.lua
sed -i "s#'HT40', '40 MHz', htmodes.HT40#'HT40+', '40 MHz', htmodes.HT40#"  /usr/lib/lua/luci/view/cbi/wireless_modefreq.htm

Patch files for the same

--- /lib/netifd/wireless/mac80211.sh.orig   2018-06-22 23:47:52.000000000 +0000
+++ /lib/netifd/wireless/mac80211.sh    2018-06-23 00:00:18.000000000 +0000
@@ -674,7 +674,7 @@
                esac

                freq="$(get_freq "$phy" "$channel")"
-               iw dev "$ifname" mesh join "$mesh_id" freq $freq $mesh_htmode \
+               iw dev "$ifname" mesh join "$ssid" freq $freq $mesh_htmode \
                    ${mcval:+mcast-rate $mcval} \
                    beacon-interval $beacon_int
            fi

--- /usr/lib/lua/luci/model/cbi/admin_network/wifi.lua.orig 2017-07-26 22:50:23.000000000 +0000
+++ /usr/lib/lua/luci/model/cbi/admin_network/wifi.lua  2017-07-26 22:51:02.000000000 +0000
@@ -295,7 +295,7 @@
        htmode:depends("hwmode", "11na")
        htmode:depends("hwmode", "11n")
        htmode:value("HT20", "20MHz")
-       htmode:value("HT40", "40MHz")
+       htmode:value("HT40+", "40MHz +")
    end

    ant1 = s:taboption("advanced", ListValue, "txantenna", translate("Transmitter Antenna"))

--- /usr/lib/lua/luci/view/cbi/wireless_modefreq.htm.orig   2018-06-23 00:08:25.000000000 +0000
+++ /usr/lib/lua/luci/view/cbi/wireless_modefreq.htm    2018-06-23 00:08:32.000000000 +0000
@@ -33,7 +33,7 @@
        ],
        'n':  [
            'HT20', '20 MHz', htmodes.HT20,
-           'HT40', '40 MHz', htmodes.HT40
+           'HT40+', '40 MHz', htmodes.HT40
        ],
        'ac': [
            'VHT20', '20 MHz', htmodes.VHT20,