Author: tom
Date: Mon Nov 17 13:28:20 2008
New Revision: 3394
URL: http://svn.slimdevices.com?rev=3394&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 -
simplified code, fixed minor arp calling bug
Modified:
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/net/NetworkThread.lua
7.3/trunk/squeezeplay/src/squeezeplay/share/jive/slim/SlimServer.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=3394&root=Jive&r1=3393&r2=3394&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:28:20 2008
@@ -399,6 +399,10 @@
=cut
--]]
function arp(self, host, sink)
+ if not self:isArpEnabled() then
+ return sink(nil, "Arp disabled")
+ end
+
local arp = ""
local cmd = "arp " .. host
@@ -409,7 +413,7 @@
local proc = Process(self, cmd)
proc:read(function(chunk, err)
if err then
- return sink(err)
+ return sink(nil, err)
end
if chunk then
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=3394&root=Jive&r1=3393&r2=3394&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:28:20 2008
@@ -525,17 +525,15 @@
self.netstate = 'connected'
self.jnt:notify('serverConnected', self)
- 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
+ -- 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
-- comet is disconnected from SC
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
