--- projects/cms/source/host/winhost/nettest.frm	2001/02/28 11:59:54	1.30
+++ projects/cms/source/host/winhost/nettest.frm	2001/03/01 09:30:55	1.32
@@ -139,12 +139,16 @@ Dim filterManagerTCPPort As Long
 Dim seqNo As Long
 Dim machineName As String
 
+Dim secondsRunning As Long
+
 Dim filterHostname As String
 Dim filterTCPPort As Integer
 Dim filterUDPPort As Integer
 Dim fileList As String
 Dim lastModified As String
 
+Dim fourtySevenDays As Integer
+
 Dim UDPUpdateTime As Integer
 Dim TCPUpdateTime As Integer
 
@@ -179,6 +183,9 @@ Private Sub Form_Load()
         End
     End If
     
+    ' Assume the host is run within the first 47 days of the machine starting.
+    fourtySevenDays = 0
+    
     protocolVersion = "1.1"
     
     Status.Caption = "Loading"
@@ -407,8 +414,7 @@ Private Sub Timer1_Timer()
         ' prepare the contents of the XML packet.
         seqNo = seqNo + 1
         
-        ' Comment this line in the next protocol
-        'machineName = TCPSock.LocalHostName
+        netbiosName = TCPSock.LocalHostName
         
         LocalIP = TCPSock.LocalIP
         packetDate = Date2Num()
@@ -456,17 +462,25 @@ Private Sub Timer1_Timer()
         memory& = memsts.dwAvailVirtual
         swapFree = memory& \ 1048576
         
-        uptime = CUpTime.MilliSecs \ 1000
-        
         CUpTime.Capture
         cpu_time = CUpTime.CPUTime
         percent_idle = CUpTime.PercentIdle
         
+        '' Causes numbers to be too big :-/
+        'uptime = CUpTime.MilliSecs \ 1000
+        
+        '' Doesn't work after 47 days :-/
+        'uptime = GetTickCount \ 1000
+        
+        secondsRunning = secondsRunning + UDPUpdateTime
+        uptime = secondsRunning
+        
         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>" & _
+                "<netbios_name>" & netbiosName & "</netbios_name>" & _
                 "<name>" & osName & "</name>" & _
                 "<version>" & osVersionMajor & "</version>" & _
                 "<release>" & osBuild & "</release>" & _