Developing lightweight computation at the DSG edge

Commit 33ea01af authored by p4u's avatar p4u
Browse files

Merge branch 'testing' of ssh://qmp.cat:221/qmp into testing

parents c92398cb 70af928e
......@@ -228,7 +228,7 @@ qmp_configure_wifi_device() {
-e s/"#QMP_RADIO"/"$radio"/ \
-e s/"#QMP_DEVICE"/"$device"/ \
-e s/"#QMP_IFNAME"/"$device"/ \
-e s/"#QMP_SSID"/"$name"/ \
-e s/"#QMP_SSID"/"$(echo "${name:0:32}" | sed -e 's|/|\\/|g')"/ \
-e s/"#QMP_BSSID"/"$bssid"/ \
-e s/"#QMP_NETWORK"/"$network"/ \
-e s/"#QMP_ENC"/"$encrypt"/ \
......
......@@ -81,7 +81,11 @@ for _,wdev in ipairs(wdevs) do
mode:value("none","Not used")
-- Name
s_wireless:option(Value,"name","ESSID", translate("Name of the WiFi network"))
local essid = s_wireless:option(Value,"name","ESSID", translate("Name of the WiFi network"))
-- maxlength is documented but not implemented
-- http://luci.subsignal.org/trac/wiki/Documentation/CBI#a.maxlengthnil
-- http://luci.subsignal.org/trac/browser/luci/trunk/libs/web/luasrc/cbi.lua?rev=9834#L1463
essid.maxlength = 32
-- Channel
channel = s_wireless:option(ListValue,"channel","Channel",translate("WiFi channel to be used in this device.<br/>Select +/- for 40MHz channel. Select b for 802.11b only"))
......
......@@ -159,7 +159,7 @@ PRIVATE_NETWORKS="$IPLOCAL 10.0.0.0/8 172.16.0.0/12 192.168.0.0/16"
stop)
iptables -t nat -D PREROUTING -i br-lan -j captive-portal
iptables -t nat -F captive-portal
iptables -t nat -X cpative-portal
iptables -t nat -X captive-portal
;;
start)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment