--- experimental/host/vb_net_test/nettest.frm	2001/02/26 09:23:34	1.21
+++ experimental/host/vb_net_test/nettest.frm	2001/02/28 08:19:00	1.25
@@ -4,7 +4,7 @@ Object = "{33155A3D-0CE0-11D1-A6B4-444553540000}#1.0#0
 Begin VB.Form Form1 
    BorderStyle     =   3  'Fixed Dialog
    Caption         =   "i-scream Winhost"
-   ClientHeight    =   5655
+   ClientHeight    =   1275
    ClientLeft      =   45
    ClientTop       =   330
    ClientWidth     =   4710
@@ -12,16 +12,17 @@ Begin VB.Form Form1 
    LinkTopic       =   "Form1"
    MaxButton       =   0   'False
    MinButton       =   0   'False
-   ScaleHeight     =   5655
+   ScaleHeight     =   1275
    ScaleWidth      =   4710
    ShowInTaskbar   =   0   'False
-   StartUpPosition =   3  'Windows Default
+   StartUpPosition =   2  'CenterScreen
+   Visible         =   0   'False
    Begin VB.CommandButton Hide 
       Caption         =   "Hide Window"
       Height          =   375
       Left            =   3120
-      TabIndex        =   7
-      Top             =   840
+      TabIndex        =   6
+      Top             =   480
       Width           =   1455
    End
    Begin SysTray.SystemTray SystemTray 
@@ -36,22 +37,12 @@ Begin VB.Form Form1 
       Left            =   2760
       Top             =   1800
    End
-   Begin VB.TextBox Text4 
-      Height          =   1575
-      Left            =   240
-      MultiLine       =   -1  'True
-      ScrollBars      =   2  'Vertical
-      TabIndex        =   1
-      Text            =   "nettest.frx":0742
-      Top             =   3000
-      Width           =   3975
-   End
    Begin VB.CommandButton Reconfigure 
       Caption         =   "Reconfigure with FilterManager"
       Height          =   375
       Left            =   120
       TabIndex        =   0
-      Top             =   840
+      Top             =   480
       Width           =   2895
    End
    Begin MSWinsockLib.Winsock TCPSock 
@@ -69,38 +60,21 @@ Begin VB.Form Form1 
       _Version        =   393216
       Protocol        =   1
    End
-   Begin VB.Label Label5 
-      Caption         =   "b e t a"
-      BeginProperty Font 
-         Name            =   "MS Sans Serif"
-         Size            =   24
-         Charset         =   0
-         Weight          =   700
-         Underline       =   0   'False
-         Italic          =   0   'False
-         Strikethrough   =   0   'False
-      EndProperty
-      Height          =   615
-      Left            =   240
-      TabIndex        =   8
-      Top             =   120
-      Width           =   1815
-   End
    Begin VB.Label Label2 
       Alignment       =   1  'Right Justify
       Caption         =   "Next heartbeat:"
       Height          =   255
       Left            =   2400
-      TabIndex        =   6
-      Top             =   480
+      TabIndex        =   5
+      Top             =   120
       Width           =   1455
    End
    Begin VB.Label Label1 
       Alignment       =   1  'Right Justify
       Caption         =   "Next UDP packet:"
       Height          =   255
-      Left            =   2400
-      TabIndex        =   5
+      Left            =   120
+      TabIndex        =   4
       Top             =   120
       Width           =   1455
    End
@@ -109,16 +83,16 @@ Begin VB.Form Form1 
       Caption         =   "0"
       Height          =   255
       Left            =   3960
-      TabIndex        =   4
-      Top             =   480
+      TabIndex        =   3
+      Top             =   120
       Width           =   615
    End
    Begin VB.Label Label3 
       BorderStyle     =   1  'Fixed Single
       Caption         =   "0"
       Height          =   255
-      Left            =   3960
-      TabIndex        =   3
+      Left            =   1680
+      TabIndex        =   2
       Top             =   120
       Width           =   615
    End
@@ -127,8 +101,8 @@ Begin VB.Form Form1 
       Caption         =   "Status:"
       Height          =   255
       Left            =   0
-      TabIndex        =   2
-      Top             =   1320
+      TabIndex        =   1
+      Top             =   960
       Width           =   4695
    End
 End
@@ -160,22 +134,26 @@ Dim protocolVersion As String
 Dim connected As Boolean
 
 Dim CUpTime As New CUpTime
+Dim wksta As New CNetWksta
 
 Dim responseNumber As Integer
 
 Private Sub Form_Load()
     
+    If App.PrevInstance Then
+        x = MsgBox("There is already an i-scream Winhost running on this machine.", 48, "i-scream host already running")
+        End
+    End If
+    
     protocolVersion = "1.1"
     
     Status.Caption = "Loading"
     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.")
+        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
     
@@ -192,6 +170,9 @@ Private Sub Form_Load()
     filterManagerHostname = Left$(buf, length)
     length = GetPrivateProfileInt("i-scream Winhost", "FilterManagerPort", 0, App.Path & "/winhost.ini")
     filterManagerTCPPort = length
+    If filterManagerHostname = "" Then
+        GoTo iniError
+    End If
     On Error GoTo 0
 skip:
 
@@ -238,7 +219,6 @@ Private Sub SystemTray_MouseDblClk(ByVal Button As Int
 
     Form1.Visible = True
     Form1.SetFocus
-    
 
 End Sub
 
@@ -267,7 +247,7 @@ Private Sub TCPSock_DataArrival(ByVal bytesTotal As Lo
     ' Remove linefeeds and returns from the line.
     response = Replace(response, Chr(13), "")
     response = Replace(response, Chr(10), "")
-    Text4.Text = Text4.Text & vbCrLf & response
+    'Text4.Text = Text4.Text & vbCrLf & response
     
     If connected = False Then
         ' Perform TCP configuration (1.1)
@@ -314,7 +294,7 @@ Private Sub TCPSock_DataArrival(ByVal bytesTotal As Lo
                 connected = True
                 responseNumber = 0
                 TCPSock.Close
-                Text4.Text = Text4.Text & vbCrLf & "  <closed>"
+                'Text4.Text = Text4.Text & vbCrLf & "  <closed>"
                 Status.Caption = "Configuration successful"
                 Label3.Caption = UDPUpdateTime
                 Label4.Caption = TCPUpdateTime
@@ -413,8 +393,12 @@ Private Sub Timer1_Timer()
         memory& = memsts.dwAvailVirtual
         swapFree = memory& \ 1024
         
-        uptime = GetTickCount \ 1000
+        uptime = CUpTime.MilliSecs \ 1000
         
+        CUpTime.Capture
+        cpu_time = CUpTime.CPUTime
+        percent_idle = CUpTime.PercentIdle
+        
         ' build the contents of the XML packet
         xml = "<packet seq_no=""" & seqNo & """ machine_name=""" & machineName & """ date=""" & packetDate & """ type=""data"" ip=""" & LocalIP & """>" & _
               "<os>" & _
@@ -426,10 +410,11 @@ Private Sub Timer1_Timer()
                 "<processor>" & processorType & "</processor>" & _
                 "<uptime>" & uptime & "</uptime>" & _
               "</os>" & _
+              "<cpu><idle>" & percent_idle & "</idle><user>" & cpu_time & "</user></cpu>" & _
               "<memory><total>" & memTotal & "</total><free>" & memFree & "</free></memory>" & _
               "<swap><total>" & swapTotal & "</total><free>" & swapFree & "</free></swap>" & _
               "</packet>"
-        Text4.Text = Text4.Text + xml
+        'Text4.Text = Text4.Text + xml
 
         ' Use the first winsock control to send a UDP packet.
         UDPSock.RemoteHost = filterHostname