Author: fmueller
Date: Thu Aug 5 06:27:45 2010
New Revision: 9026
URL: http://svn.slimdevices.com/jive?rev=9026&view=rev
Log:
Bug: 16408
Description: Call network class instead of network object to allow check if
network object is valid within the function.
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/jive/net/Networking.lua
Modified:
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
URL:
http://svn.slimdevices.com/jive/7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua?rev=9026&r1=9025&r2=9026&view=diff
==============================================================================
---
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
(original)
+++
7.6/trunk/squeezeplay/src/squeezeplay_squeezeos/share/applets/Diagnostics/DiagnosticsApplet.lua
Thu Aug 5 06:27:45 2010
@@ -852,7 +852,9 @@
local ifObj = Networking:activeInterface()
- ifObj:checkNetworkHealth( function(continue, err, msg, msg_param)
+ Networking:checkNetworkHealth(
+ ifObj,
+ function(continue, err, msg, msg_param)
local message = self:string(msg, msg_param)
log:debug("checkNetworkHealth status: ", message)
-- TODO: remove
@@ -875,8 +877,8 @@
popup:hide()
end
end,
- full_check, -- true full check (includes arping, DNS
resolution and ping)
- server
+ full_check, -- true full check (includes arping,
DNS resolution and ping)
+ server
)
self:tieAndShowWindow(popup)
@@ -910,7 +912,9 @@
local ifObj = Networking:activeInterface()
- ifObj:repairNetwork( function(continue, err, msg, msg_param)
+ Networking:repairNetwork(
+ ifObj,
+ function(continue, err, msg, msg_param)
local message = self:string(msg, msg_param)
log:debug("repairNetwork status: ", message)
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=9026&r1=9025&r2=9026&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
Thu Aug 5 06:27:45 2010
@@ -1962,7 +1962,8 @@
- err: -1 or 0
- message: message according to what is happening or failed
-self - network object
+class - Networking class
+ifObj - network object
callback - callback function
full_check - includes ip check, DNS resolution, ping and ports test
server - server to ping and test ports
@@ -1970,17 +1971,17 @@
=cut
--]]
-function checkNetworkHealth(self, callback, full_check, server)
+function checkNetworkHealth(class, ifObj, callback, full_check, server)
assert(type(callback) == 'function', "No callback function provided")
- Task("checknetworkhealth", self, function()
+ Task("checknetworkhealth", ifObj, function()
log:info("checkNetworkHealth task started")
callback(true, -1, "NET_CONNECTION_NOK")
-- ------------------------------------------------------------
-- Check for valid network interface
- if self == nil then
+ if ifObj == nil then
callback(false, -1, "NET_INTERFACE_NOK")
return
end
@@ -1989,9 +1990,9 @@
-- Getting network status (link / no link)
callback(true, 0, "NET_LINK")
- local status = self:t_wpaStatus()
-
- if self:isWireless() then
+ local status = ifObj:t_wpaStatus()
+
+ if ifObj:isWireless() then
if status.wpa_state ~= "COMPLETED" then
callback(false, -1, "NET_LINK_WIRELESS_NOK")
return
@@ -2052,7 +2053,7 @@
-- Arping
local arpingOK = false
- local arpingProc = Process(jnt, "arping -I " .. self:getName()
.. " -f -c 2 -w 5 " .. status.ip_address .. " 2>&1")
+ local arpingProc = Process(jnt, "arping -I " .. ifObj:getName()
.. " -f -c 2 -w 5 " .. status.ip_address .. " 2>&1")
arpingProc:read(function(chunk)
if chunk then
if string.match(chunk, "Received 0 reply") then
@@ -2215,27 +2216,28 @@
- err: -1 or 0
- message: message according to what is happening or failed
-self - network object
+class - Networking class
+ifObj - network object
callback - callback function
=cut
--]]
-function repairNetwork(self, callback)
+function repairNetwork(class, ifObj, callback)
assert(type(callback) == 'function', "No callback function provided")
- Task("repairnetwork", self, function()
+ Task("repairnetwork", ifObj, function()
log:info("repairNetwork task started")
- local active = self:_ifstate()
+ local active = ifObj:_ifstate()
callback(true, 0, "NET_BRINGING_NETWORK_DOWN")
- self:_ifDown()
+ ifObj:_ifDown()
callback(true, 0, "NET_BRINGING_NETWORK_UP")
- self:_ifUp(active)
+ ifObj:_ifUp(active)
callback(false, 0, "NET_REPAIR_NETWORK_DONE")
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
