masscheckin ganz viel kram

NetMonitorUtils/NetworkSetter.cs

@@ -248,5 +248,9 @@ namespace NetMonitorUtils
             }
             return ret;
         }
+
+        public List<string> getAdapters() {
+          return this.serviceController.NetworkGetAdapters();
+        }
     }
 }

NetMonitorUtils/OpenVpnSetter.cs

@@ -37,10 +37,10 @@ namespace NetMonitorUtils {
         String data = this.serviceController.VpnGetStatus(vpn);
         if(data == "unknown") {
           ret.Add(vpn, "unknown");
-        } else if(data == "disconnected") {
-          ret.Add(vpn, "disconnected");
+        } else if(data.StartsWith("[connected")) {
+          ret.Add(vpn, "connected");
         } else {
-          
+          ret.Add(vpn, "disconnected");
         }
       }
       return ret;

NetMonitorUtils/ServiceControl.cs

@@ -236,5 +236,17 @@ namespace NetMonitorUtils {
       }
       return this.sendMessage("OPENVPN", "STOP " + name);
     }
+
+    internal List<string> NetworkGetAdapters() {
+      String adapters = "";
+      try {
+        this.sendMessage("NET", "ADAPTERS");
+      } catch(ServiceControlException e) {
+        if(e.Message.ToLower().Substring(0, 1) == "[") {
+          adapters = e.Message.Substring(0, e.Message.Length - 1).Substring(1);
+        }
+      }
+      return adapters.Split('|').ToList<string>();
+    }
   }
 }

NetMonitorUtils/config.ini

@@ -4,4 +4,6 @@ client_from=54330
 client_to=54340
 
 [program]
-openvpn=C:\Program Files\OpenVPN
+openvpn=C:\Program Files\OpenVPN
+logfolder=E:\Programme\NetMonitor\logs
+loglevel=Debug

NetMonitorUtils/network.ini

@@ -7,7 +7,7 @@ Adapter=LAN-Verbindung
 
 [network2]
 Name=FHG
-Ip=129.26.164.188
+Ip=129.26.164.222
 Subnet=255.255.248.0
 Gateway=129.26.160.1
 Dns=129.26.165.177
@@ -19,8 +19,8 @@ Name=Test
 Ip=10.15.20.25
 Subnet=255.255.255.0
 Gateway=0.0.0.0
-Dns=none
-Wins=none
+Dns=0.0.0.0
+Wins=0.0.0.0
 Adapter=LAN-Verbindung
 
 [network4]