Author: titmuss
Date: Tue Nov 11 06:51:44 2008
New Revision: 3324
URL: http://svn.slimdevices.com?rev=3324&root=Jive&view=rev
Log:
Bug: 9918
Description:
Normalize to lower case mac addresses for the player id's.
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
7.3/trunk/squeezeplay/src/squeezeplay_jive/share/jive/net/Wireless.lua
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua?rev=3324&root=Jive&r1=3323&r2=3324&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay/share/applets/SetupSqueezebox/SetupSqueezeboxApplet.lua
Tue Nov 11 06:51:44 2008
@@ -227,7 +227,7 @@
return
end
- local mac = string.upper(pkt.source)
+ local mac = string.lower(pkt.source)
if not self.scanResults[mac] then
local item = {
@@ -263,8 +263,6 @@
log:debug("ether=", ether, " mac=", mac)
if mac ~= nil then
- mac = string.upper(string.gsub(mac, ":", ""))
-
seen[mac] = true
if not self.scanResults[mac] then
@@ -894,7 +892,8 @@
local request, response, id
-- connect to squeezebox ah-hoc network
- local ssid = 'logitech' .. self.ether .. 'squeezebox' .. self.ether ..
self.mac
+ -- Note we must use upper case mac addresses in the ad-hoc ssid
+ local ssid = 'logitech' .. self.ether .. 'squeezebox' .. self.ether ..
string.upper(self.mac)
local option = {
ibss = true,
encryption = "none"
@@ -1332,7 +1331,7 @@
function notify_playerNew(self, player)
local playerId = string.gsub(player:getId(), ":", "")
- if string.lower(playerId) == string.lower(self.mac) then
+ if playerId == self.mac then
-- wait until the player is connected before continuing
if not player:isConnected() then
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua?rev=3324&root=Jive&r1=3323&r2=3324&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua Tue
Nov 11 06:51:44 2008
@@ -362,7 +362,7 @@
--]]
function setUUID(self, uuid, mac)
self.uuid = uuid
- self.mac = mac
+ self.mac = string.lower(mac)
end
--[[
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua?rev=3324&root=Jive&r1=3323&r2=3324&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua (original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/Player.lua Tue Nov 11
06:51:44 2008
@@ -402,6 +402,7 @@
if mac then
mac = string.gsub(mac, "(%x%x)(%x%x)(%x%x)(%x%x)(%x%x)(%x%x)",
"%1:%2:%3:%4:%5:%6")
+ mac = string.lower(mac)
end
return mac, hasEthernet
Modified: 7.3/trunk/squeezeplay/src/squeezeplay_jive/share/jive/net/Wireless.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_jive/share/jive/net/Wireless.lua?rev=3324&root=Jive&r1=3323&r2=3324&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay_jive/share/jive/net/Wireless.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay_jive/share/jive/net/Wireless.lua Tue
Nov 11 06:51:44 2008
@@ -206,7 +206,7 @@
end
_scanResults[ssid] = {
- bssid = bssid,
+ bssid = string.lower(bssid),
flags = flags,
level = level,
quality = quality,
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
