Merge pull request #10 from crogers1/oxt-1011

[network] Implement method to see if vif connected

Author: eric-ch

nwd/Main.hs

@@ -546,6 +546,7 @@ implementNWDServer = do
     , comCitrixXenclientNetworkdaemonList = runApp appState $ listNetworks
     , comCitrixXenclientNetworkdaemonListBackends = runApp appState $ listNetworkBackends
     , comCitrixXenclientNetworkdaemonIsInitialized = return True 
+    , comCitrixXenclientNetworkdaemonVifConnected = \vif domid -> vifConnected vif domid
     , comCitrixXenclientNetworkdaemonNdvmStatus = \uuid domid status -> runApp appState $ ndvmStatusUpdate uuid domid status
     , comCitrixXenclientNetworkdaemonCreateNetwork = createNetwork
     , comCitrixXenclientNetworkdaemonGetNetworkBackend = \nw -> runApp appState $ getNetworkBackend nw
@@ -581,6 +582,10 @@ listNetworkBackends = do
                                         then (networkSlaveObj slaveObj):[]
                                         else [] 
 
+vifConnected :: String -> Int32 -> Rpc Bool
+vifConnected vif domid = do
+    withNetworkSlave (fromIntegral domid) $ NWS.comCitrixXenclientNetworkslaveVifAdded slaveService slaveRootObj (vif)
+
 getNetworkBackend :: String -> App String
 getNetworkBackend nw = do
     appState <- getAppState

nws/Main.hs

@@ -35,12 +35,13 @@ import Data.Word
 import qualified Data.Map as M
 import qualified Data.Text.Lazy as TL
 import Data.Maybe
+import Data.List
 
 import Text.Printf
 import Text.Regex.Posix
 import System.FilePath.Posix
 import System.Posix.Syslog
-import System.Process (system)
+import System.Process (system, readProcessWithExitCode)
 
 import Control.Monad.Trans
 import Control.Monad.Error
@@ -172,6 +173,7 @@ implementNetworkSlaveInterfaces = do
         , comCitrixXenclientNetworkslaveNwConnectivity = runApp appState networkConnectivity
         , comCitrixXenclientNetworkslaveGetIcavmNetwork = runApp appState getIcavmNetwork 
         , comCitrixXenclientNetworkslaveNmState = runApp appState $ liftRpc $ nmState
+        , comCitrixXenclientNetworkslaveVifAdded = \vif -> runApp appState $ vifAdded vif
     }
 
 createInternalNetworks :: Int -> App ()
@@ -230,3 +232,8 @@ listNetworks = do
         internalNws <- readMVar (internalNetworks appState)
         anyNw <- readMVar (anyNetwork appState)
         return ((M.keys wiredNws) ++ (M.keys wirelessNws) ++ (M.keys mobileNws) ++ (M.keys internalNws) ++ (anyNw:[]))
+
+vifAdded :: String -> App (Bool)
+vifAdded vif = do
+    (exitCode,stdout,_) <- liftIO $ readProcessWithExitCode "brctl" ["show"] []
+    return $ isInfixOf vif stdout

nws/NetworkInterface.hs

@@ -80,7 +80,7 @@ isWired :: NetworkObj -> Bool
 isWired network = network =~ "wired" :: Bool
 
 isWireless :: NetworkObj -> Bool
-isWireless network = network =~ "wireless" :: Bool
+isWireless network = network =~ "wifi" :: Bool
 
 isInternal :: NetworkObj -> Bool
 isInternal network = network =~ "internal" :: Bool
@@ -307,7 +307,7 @@ initWirelessNetwork iface = do
 
     let index =  1 + getMaxIndex existingNws
         indexStr = show index
-        nwId = "/wireless/" ++ indexStr
+        nwId = "/wifi/" ++ indexStr
         sharedNw = nwId ++ "/shared"
         --brshared = "brwireless" ++ ifindex
         brshared = bridgeForWireless newNwConf index ifindex