--- experimental/host/vb_net_test/nettest.frm	2001/02/28 09:18:26	1.27
+++ experimental/host/vb_net_test/nettest.frm	2001/02/28 11:59:54	1.30
@@ -242,6 +242,10 @@ Private Sub Hide_Click()
     SystemTray.Icon = Val(Form1.Icon)
 End Sub
 
+Private Sub Image1_Click()
+
+End Sub
+
 Private Sub Reconfigure_Click()
     ' establish a TCP connection to a filtermanager
     connected = False
@@ -283,7 +287,6 @@ 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
     
     If connected = False Then
         ' Perform TCP configuration (1.1)
@@ -299,34 +302,32 @@ Private Sub TCPSock_DataArrival(ByVal bytesTotal As Lo
                 lastModified = response
                 Text1.Text = Text1.Text & response & vbCrLf
                 TCPSock.SendData "FILELIST" & vbCrLf
-            ''' Uncomment this for new protocol release.
-            'Case 2a:
-                'If response = "ERROR" Then GoTo configError
-                'fileList = response
-                'Text1.Text = Text1.Text & response & vbCrLf
-                'TCPSock.SendData "FQDN" & vbCrLf
+            ' New addition to the protocol.
             Case 3:
                 If response = "ERROR" Then GoTo configError
                 fileList = response
                 Text1.Text = Text1.Text & response & vbCrLf
-                ' REMOVE above line, uncomment next
-                'machineName = response
-                TCPSock.SendData "UDPUpdateTime" & vbCrLf
+                TCPSock.SendData "FQDN" & vbCrLf
             Case 4:
                 If response = "ERROR" Then GoTo configError
+                Text1.Text = Text1.Text & response & vbCrLf
+                machineName = response
+                TCPSock.SendData "UDPUpdateTime" & vbCrLf
+            Case 5:
+                If response = "ERROR" Then GoTo configError
                 UDPUpdateTime = response
                 Text1.Text = Text1.Text & response & vbCrLf
                 TCPSock.SendData "TCPUpdateTime" & vbCrLf
-            Case 5:
+            Case 6:
                 If response = "ERROR" Then GoTo configError
                 TCPUpdateTime = response
                 Text1.Text = Text1.Text & response & vbCrLf
                 TCPSock.SendData "ENDCONFIG" & vbCrLf
-            Case 6:
+            Case 7:
                 If Not response = "OK" Then GoTo configError
                 Text1.Text = Text1.Text & response & vbCrLf
                 TCPSock.SendData "FILTER" & vbCrLf
-            Case 7:
+            Case 8:
                 Text1.Text = Text1.Text & response & vbCrLf
                 'we got a filter list here.
                 readTo = 0
@@ -341,7 +342,7 @@ Private Sub TCPSock_DataArrival(ByVal bytesTotal As Lo
                 ' get TCP Port number
                 filterTCPPort = response
                 TCPSock.SendData "END" & vbCrLf
-            Case 8:
+            Case 9:
                 If Not response = "OK" Then GoTo configError
                 connected = True
                 responseNumber = 0
@@ -407,7 +408,7 @@ Private Sub Timer1_Timer()
         seqNo = seqNo + 1
         
         ' Comment this line in the next protocol
-        machineName = TCPSock.LocalHostName
+        'machineName = TCPSock.LocalHostName
         
         LocalIP = TCPSock.LocalIP
         packetDate = Date2Num()
@@ -447,13 +448,13 @@ Private Sub Timer1_Timer()
         Dim memory&
         GlobalMemoryStatus memsts
         memory& = memsts.dwTotalPhys
-        memTotal = memory& \ 1024
+        memTotal = memory& \ 1048576
         memory& = memsts.dwAvailPhys
-        memFree = memory& \ 1024
+        memFree = memory& \ 1048576
         memory& = memsts.dwTotalVirtual
-        swapTotal = memory& \ 1024
+        swapTotal = memory& \ 1048576
         memory& = memsts.dwAvailVirtual
-        swapFree = memory& \ 1024
+        swapFree = memory& \ 1048576
         
         uptime = CUpTime.MilliSecs \ 1000
         
@@ -461,6 +462,8 @@ Private Sub Timer1_Timer()
         cpu_time = CUpTime.CPUTime
         percent_idle = CUpTime.PercentIdle
         
+        userCount = wksta.LoggedOnUsers
+        
         ' build the contents of the XML packet
         xml = "<packet seq_no=""" & seqNo & """ machine_name=""" & machineName & """ date=""" & packetDate & """ type=""data"" ip=""" & LocalIP & """>" & _
               "<os>" & _
@@ -472,6 +475,7 @@ Private Sub Timer1_Timer()
                 "<processor>" & processorType & "</processor>" & _
                 "<uptime>" & uptime & "</uptime>" & _
               "</os>" & _
+              "<users><count>" & userCount & "</count></users>" & _
               "<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>" & _