--- experimental/host/vb_net_test/nettest.frm	2001/02/23 17:37:04	1.17
+++ experimental/host/vb_net_test/nettest.frm	2001/02/26 09:23:34	1.21
@@ -8,6 +8,7 @@ Begin VB.Form Form1 
    ClientLeft      =   45
    ClientTop       =   330
    ClientWidth     =   4710
+   Icon            =   "nettest.frx":0000
    LinkTopic       =   "Form1"
    MaxButton       =   0   'False
    MinButton       =   0   'False
@@ -41,7 +42,7 @@ Begin VB.Form Form1 
       MultiLine       =   -1  'True
       ScrollBars      =   2  'Vertical
       TabIndex        =   1
-      Text            =   "nettest.frx":0000
+      Text            =   "nettest.frx":0742
       Top             =   3000
       Width           =   3975
    End
@@ -125,10 +126,10 @@ Begin VB.Form Form1 
       Alignment       =   2  'Center
       Caption         =   "Status:"
       Height          =   255
-      Left            =   120
+      Left            =   0
       TabIndex        =   2
       Top             =   1320
-      Width           =   4455
+      Width           =   4695
    End
 End
 Attribute VB_Name = "Form1"
@@ -141,7 +142,7 @@ Private Declare Function GetPrivateProfileString Lib "
 Private Declare Function GetPrivateProfileInt Lib "kernel32" Alias "GetPrivateProfileIntA" (ByVal lpApplicationName As String, ByVal lpKeyName As String, ByVal nDefault As Long, ByVal lpFileName As String) As Long
 
 Dim filterManagerHostname As String
-Dim filterManagerTCPPort As Integer
+Dim filterManagerTCPPort As Long
 
 Dim seqNo As Long
 Dim machineName As String
@@ -158,7 +159,7 @@ Dim TCPUpdateTime As Integer
 Dim protocolVersion As String
 Dim connected As Boolean
 
-'Dim CUpTime As New CUpTime
+Dim CUpTime As New CUpTime
 
 Dim responseNumber As Integer
 
@@ -167,34 +168,44 @@ Private Sub Form_Load()
     protocolVersion = "1.1"
     
     Status.Caption = "Loading"
-    'Form1.Caption = "i-scream Winhost " & protocolVersion & " for " & GetVersion()
+    Form1.Caption = "i-scream Winhost " & protocolVersion
     
+    Form1.Show
+    
+    CUpTime.Init
+    
+    If CUpTime.isWin9x Then
+        x = MsgBox("Sorry, the i-scream host can only be used to monitor servers (i.e. not Win9x)", 48, "Not a server.")
+        End
+    End If
+    
     ''''TEMP
-    filterManagerHostname = "killigrew.ukc.ac.uk"
-    filterManagerTCPPort = 4567
+    'filterManagerHostname = "killigrew.ukc.ac.uk"
+    'filterManagerTCPPort = 4567
     ''''' END TEMP
     
-    GoTo skip
+    'GoTo skip
     On Error GoTo iniError
     Dim buf As String * 256
     Dim length As Long
-    length = GetPrivateProfileString("i-scream Winhost", "FilterManager", "<no value>", buf, Len(buf), App.Path & "winhost.ini")
+    length = GetPrivateProfileString("i-scream Winhost", "FilterManager", "<no value>", buf, Len(buf), App.Path & "/winhost.ini")
     filterManagerHostname = Left$(buf, length)
-    length = GetPrivateProfileString("i-scream Winhost", "FilterManagerPort", "<no value>", buf, Len(buf), App.Path & "winhost.ini")
-    filterManagerTCPPort = Left$(buf, length)
+    length = GetPrivateProfileInt("i-scream Winhost", "FilterManagerPort", 0, App.Path & "/winhost.ini")
+    filterManagerTCPPort = length
+    On Error GoTo 0
 skip:
 
-    Status.Caption = "Connecting to Filter Manager"
+    Status.Caption = "Connecting to Filter Manager " & filterManagerHostname & ":" & filterManagerTCPPort
     Reconfigure_Click
     
-    Form1.Show
+    SystemTray.Icon = Val(Form1.Icon)
     SystemTray.Action = 0
     
     
     Exit Sub
     
 iniError:
-    x = MsgBox("The i-scream Winhost could not read the correct settings from the winhost.ini file.  Please correct these and try again.", 48, "Configuration not found")
+    x = MsgBox("The i-scream Winhost could not read the correct settings from the winhost.ini file.  Please correct these and try again.  " & Err.Description, 48, "Configuration not found")
     End
     
 End Sub
@@ -368,7 +379,7 @@ Private Sub Timer1_Timer()
             End
         End If
           
-        osName = getVersion()
+        osName = GetVersion()
         osVersionMajor = verinfo.dwMajorVersion
         osVersionMinor = verinfo.dwMinorVersion
         osBuild = verinfo.dwBuildNumber
@@ -402,6 +413,8 @@ Private Sub Timer1_Timer()
         memory& = memsts.dwAvailVirtual
         swapFree = memory& \ 1024
         
+        uptime = GetTickCount \ 1000
+        
         ' build the contents of the XML packet
         xml = "<packet seq_no=""" & seqNo & """ machine_name=""" & machineName & """ date=""" & packetDate & """ type=""data"" ip=""" & LocalIP & """>" & _
               "<os>" & _
@@ -411,6 +424,7 @@ Private Sub Timer1_Timer()
                 "<platform>" & osName & "</platform>" & _
                 "<minor_version>" & osVersionMinor & "</minor_version>" & _
                 "<processor>" & processorType & "</processor>" & _
+                "<uptime>" & uptime & "</uptime>" & _
               "</os>" & _
               "<memory><total>" & memTotal & "</total><free>" & memFree & "</free></memory>" & _
               "<swap><total>" & swapTotal & "</total><free>" & swapFree & "</free></swap>" & _