Author: tom
Date: Mon Nov 17 13:11:24 2008
New Revision: 3393
URL: http://svn.slimdevices.com?rev=3393&root=Jive&view=rev
Log:
Bug: 9820
Description:
- (Desktop only) - disable arp to avoid os calls, which is problematic on
windows - popups, vista permissions - disabling disables WOL functionality
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
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=3393&root=Jive&r1=3392&r2=3393&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 Mon
Nov 17 13:11:24 2008
@@ -53,6 +53,8 @@
local EVENT_SERVICE_JNT = jive.ui.EVENT_SERVICE_JNT
local EVENT_CONSUME = jive.ui.EVENT_CONSUME
+--allow for not making arp calls
+local _isArpEnabled = true
-- jive.net.NetworkThread is a base class
module(..., oo.class)
@@ -363,6 +365,15 @@
function setUUID(self, uuid, mac)
self.uuid = uuid
self.mac = string.lower(mac)
+end
+
+
+function isArpEnabled(self)
+ return _isArpEnabled
+end
+
+function setArpEnabled(self, enabled)
+ _isArpEnabled = enabled
end
--[[
Modified: 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua?rev=3393&root=Jive&r1=3392&r2=3393&view=diff
==============================================================================
--- 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua
(original)
+++ 7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.lua Mon
Nov 17 13:11:24 2008
@@ -525,15 +525,17 @@
self.netstate = 'connected'
self.jnt:notify('serverConnected', self)
- -- auto discovery SqueezeCenter's mac address
- self.jnt:arp(self.ip,
- function(chunk, err)
- if err then
- log:warn("arp: " .. err)
- else
- self.mac = chunk
- end
- end)
+ if self.jnt:isArpEnabled() then
+ -- auto discovery SqueezeCenter's mac address
+ self.jnt:arp(self.ip,
+ function(chunk, err)
+ if err then
+ log:warn("arp: " .. err)
+ else
+ self.mac = chunk
+ end
+ end)
+ end
end
-- comet is disconnected from SC
Modified:
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
URL:
http://svn.slimdevices.com/7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua?rev=3393&root=Jive&r1=3392&r2=3393&view=diff
==============================================================================
---
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
(original)
+++
7.3/trunk/squeezeplay/src/squeezeplay_desktop/share/applets/DesktopJive/DesktopJiveMeta.lua
Mon Nov 17 13:11:24 2008
@@ -32,6 +32,9 @@
function registerApplet(meta)
+ --disable arp to avoid os calls, which is problematic on windows - popups,
vista permissions - disabling disables WOL functionality
+ jnt:setArpEnabled(false)
+
local settings = meta:getSettings()
local store = false
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
