Author: fmueller
Date: Wed Jul 7 08:06:32 2010
New Revision: 8935
URL: http://svn.slimdevices.com/jive?rev=8935&view=rev
Log:
Bug: n/a
Description: Fix in ifUp() and ifDown() to support ssids which already have
spaces replaced.
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua?rev=8935&r1=8934&r2=8935&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
Wed Jul 7 08:06:32 2010
@@ -1071,11 +1071,19 @@
id = nid
break
end
+
+ -- In wpa_supplicant.conf ssids do not have spaces
replaced
+ -- doublecheck with spaces replaced
+ nssid = string.gsub(nssid, "[ \t]", "_")
+ if nssid == ssid then
+ id = nid
+ break
+ end
end
-- Select network
if not id then
- log:warn("can't find network ", ssid)
+ log:warn("_ifUp - can't find network ", ssid)
return
end
@@ -1155,22 +1163,34 @@
id = nid
break
end
- end
-
- if id then
- -- Disconnect from existing network
- local request = 'DISCONNECT'
- assert(self:request(request) == "OK\n", "wpa_cli
failed:" .. request)
-
- -- Disable network
- local request = 'DISABLE_NETWORK ' .. id
- assert(self:request(request) == "OK\n", "wpa_cli
failed:" .. request)
-
- -- Save configuration
- request = 'SAVE_CONFIG'
- assert(self:request(request) == "OK\n", "wpa_cli
failed:" .. request)
-
- end
+
+ -- In wpa_supplicant.conf ssids do not have spaces
replaced
+ -- doublecheck with spaces replaced
+ nssid = string.gsub(nssid, "[ \t]", "_")
+ if nssid == active then
+ id = nid
+ break
+ end
+ end
+
+ -- Select network
+ if not id then
+ log:warn("_ifDown - can't find network ", active)
+ return
+ end
+
+ -- Disconnect from existing network
+ local request = 'DISCONNECT'
+ assert(self:request(request) == "OK\n", "wpa_cli failed:" ..
request)
+
+ -- Disable network
+ local request = 'DISABLE_NETWORK ' .. id
+ assert(self:request(request) == "OK\n", "wpa_cli failed:" ..
request)
+
+ -- Save configuration
+ request = 'SAVE_CONFIG'
+ assert(self:request(request) == "OK\n", "wpa_cli failed:" ..
request)
+
end
end
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
