--- experimental/host/vb_net_test/nettest.frm	2001/02/23 13:23:53	1.13
+++ experimental/host/vb_net_test/nettest.frm	2001/02/23 17:31:44	1.16
@@ -118,6 +118,7 @@ Attribute VB_GlobalNameSpace = False
 Attribute VB_Creatable = False
 Attribute VB_PredeclaredId = True
 Attribute VB_Exposed = False
+' For the system tray bits
 Private Declare Function GetPrivateProfileString Lib "kernel32" Alias "GetPrivateProfileStringA" (ByVal lpApplicationName As String, ByVal lpKeyName As String, ByVal lpDefault As String, ByVal lpReturnedString As String, ByVal nSize As Long, ByVal lpFileName As String) As Long
 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
 
@@ -138,15 +139,17 @@ Dim TCPUpdateTime As Integer
 
 Dim protocolVersion As String
 Dim connected As Boolean
+
+'Dim CUpTime As New CUpTime
+
 Dim responseNumber As Integer
 
 Private Sub Form_Load()
-    x = MsgBox(Date2Num())
     
     protocolVersion = "1.1"
     
     Status.Caption = "Loading"
-    Form1.Caption = "i-scream Winhost " & protocolVersion
+    'Form1.Caption = "i-scream Winhost " & protocolVersion & " for " & GetVersion()
     
     ''''TEMP
     filterManagerHostname = "killigrew.ukc.ac.uk"
@@ -166,6 +169,10 @@ skip:
     Status.Caption = "Connecting to Filter Manager"
     Reconfigure_Click
     
+    Form1.Show
+    SystemTray.Action = 0
+    
+    
     Exit Sub
     
 iniError:
@@ -178,15 +185,15 @@ Private Sub Form_QueryUnload(Cancel As Integer, Unload
     x = MsgBox("Are you sure you want to shut down the Winhost?  This will stop your computer sending information to the i-scream Central Monitoring System.", vbYesNo, "i-scream Winhost")
     If x = 7 Then
         Cancel = True
+    Else
+        SystemTray.Action = 2
     End If
-    SystemTray.Action = 2
 
 End Sub
 
 Private Sub Hide_Click()
     Form1.Visible = False
     SystemTray.Icon = Val(Form1.Icon)
-    SystemTray.Action = 0
 End Sub
 
 Private Sub Reconfigure_Click()
@@ -201,7 +208,6 @@ End Sub
 Private Sub SystemTray_MouseDblClk(ByVal Button As Integer)
 
     Form1.Visible = True
-    SystemTray.Action = 2
     Form1.SetFocus
     
 
@@ -328,26 +334,68 @@ Private Sub Timer1_Timer()
     Status.Caption = ""
     
     If Label3.Caption < 1 Then
-        ' build the contents of the XML packet.
-        localIP = TCPSock.localIP
-        machineName = TCPSock.LocalHostName
+        
+        ' prepare the contents of the XML packet.
         seqNo = seqNo + 1
-        packetDate = Now()
-        xml = "<packet seq_no=""" & seqNo & """ machine_name=""" & machineName & """ date=""" & packetDate & """ type=""data"" ip=""" & localIP & """>" & _
-              "" & _
-              "" & _
-              "" & _
-              "" & _
-              "" & _
-              "" & _
-              "" & _
-              "" & _
-              "" & _
-              "" & _
-              "" & _
-              "" & _
-              "" & _
-              "" & _
+        machineName = TCPSock.LocalHostName
+        LocalIP = TCPSock.LocalIP
+        packetDate = Date2Num()
+        
+        
+        Dim verinfo As OSVERSIONINFO
+        verinfo.dwOSVersionInfoSize = Len(verinfo)
+        ret% = GetVersionEx(verinfo)
+        If ret% = 0 Then
+            MsgBox "Error getting Windows version Information"
+            End
+        End If
+          
+        osName = getVersion()
+        osVersionMajor = verinfo.dwMajorVersion
+        osVersionMinor = verinfo.dwMinorVersion
+        osBuild = verinfo.dwBuildNumber
+        
+        Dim sysinfo As SYSTEM_INFO
+        GetSystemInfo sysinfo
+        Select Case sysinfo.dwProcessorType
+            Case PROCESSOR_INTEL_386
+                processorType = "Intel 386"
+            Case PROCESSOR_INTEL_486
+                processorType = "Intel 486"
+            Case PROCESSOR_INTEL_PENTIUM
+                processorType = "Intel Pentium variant"
+            Case PROCESSOR_MIPS_R4000
+                processorType = "MIPS R4000"
+            Case PROCESSOR_ALPHA_21064
+                processorType = "DEC Alpha 21064"
+            Case Else
+                processorType = "(unknown)"
+        End Select
+        
+        Dim memsts As MEMORYSTATUS
+        Dim memory&
+        GlobalMemoryStatus memsts
+        memory& = memsts.dwTotalPhys
+        memTotal = memory& \ 1024
+        memory& = memsts.dwAvailPhys
+        memFree = memory& \ 1024
+        memory& = memsts.dwTotalVirtual
+        swapTotal = memory& \ 1024
+        memory& = memsts.dwAvailVirtual
+        swapFree = memory& \ 1024
+        
+        ' build the contents of the XML packet
+        xml = "<packet seq_no=""" & seqNo & """ machine_name=""" & machineName & """ date=""" & packetDate & """ type=""data"" ip=""" & LocalIP & """>" & _
+              "<os>" & _
+                "<name>" & osName & "</name>" & _
+                "<version>" & osVersionMajor & "</version>" & _
+                "<release>" & osBuild & "</release>" & _
+                "<platform>" & osName & "</platform>" & _
+                "<minor_version>" & osVersionMinor & "</minor_version>" & _
+                "<processor>" & processorType & "</processor>" & _
+              "</os>" & _
+              "<memory><total>" & memTotal & "</total><free>" & memFree & "</free></memory>" & _
+              "<swap><total>" & swapTotal & "</total><free>" & swapFree & "</free></swap>" & _
               ""
         Text4.Text = Text4.Text + xml
 
@@ -369,5 +417,7 @@ Private Sub Timer1_Timer()
 End Sub
 
 Function Date2Num() As Long
-    Date2Num = DateDiff("s", "1-1-1970", Now)
+    Dim x As Long
+    x = DateDiff("s", "1-1-1970", Now)
+    Date2Num = x
 End Function