--- projects/cms/source/host/winhost/nettest.frm	2001/02/23 11:56:43	1.11
+++ projects/cms/source/host/winhost/nettest.frm	2001/02/23 13:27:09	1.14
@@ -7,32 +7,32 @@ Begin VB.Form Form1 
    ClientHeight    =   5655
    ClientLeft      =   45
    ClientTop       =   285
-   ClientWidth     =   5670
+   ClientWidth     =   4710
    LinkTopic       =   "Form1"
    MaxButton       =   0   'False
    ScaleHeight     =   5655
-   ScaleWidth      =   5670
+   ScaleWidth      =   4710
    ShowInTaskbar   =   0   'False
    StartUpPosition =   3  'Windows Default
    Begin VB.CommandButton Hide 
-      Caption         =   "Hide"
-      Height          =   495
-      Left            =   1800
+      Caption         =   "Hide Window"
+      Height          =   375
+      Left            =   3120
       TabIndex        =   7
-      Top             =   2160
-      Width           =   1215
+      Top             =   840
+      Width           =   1455
    End
    Begin SysTray.SystemTray SystemTray 
-      Left            =   3600
-      Top             =   1200
+      Left            =   2160
+      Top             =   1800
       _ExtentX        =   847
       _ExtentY        =   847
       SysTrayText     =   "i-scream Winhost"
       IconFile        =   0
    End
    Begin VB.Timer Timer1 
-      Left            =   4200
-      Top             =   1200
+      Left            =   2760
+      Top             =   1800
    End
    Begin VB.TextBox Text4 
       Height          =   1575
@@ -42,26 +42,26 @@ Begin VB.Form Form1 
       TabIndex        =   1
       Text            =   "nettest.frx":0000
       Top             =   3000
-      Width           =   5055
+      Width           =   3975
    End
    Begin VB.CommandButton Reconfigure 
       Caption         =   "Reconfigure with FilterManager"
-      Height          =   495
+      Height          =   375
       Left            =   120
       TabIndex        =   0
-      Top             =   120
+      Top             =   840
       Width           =   2895
    End
    Begin MSWinsockLib.Winsock TCPSock 
-      Left            =   5160
-      Top             =   1200
+      Left            =   3720
+      Top             =   1800
       _ExtentX        =   741
       _ExtentY        =   741
       _Version        =   393216
    End
    Begin MSWinsockLib.Winsock UDPSock 
-      Left            =   4680
-      Top             =   1200
+      Left            =   3240
+      Top             =   1800
       _ExtentX        =   741
       _ExtentY        =   741
       _Version        =   393216
@@ -71,7 +71,7 @@ Begin VB.Form Form1 
       Alignment       =   1  'Right Justify
       Caption         =   "Next heartbeat:"
       Height          =   255
-      Left            =   3360
+      Left            =   2400
       TabIndex        =   6
       Top             =   480
       Width           =   1455
@@ -80,7 +80,7 @@ Begin VB.Form Form1 
       Alignment       =   1  'Right Justify
       Caption         =   "Next UDP packet:"
       Height          =   255
-      Left            =   3360
+      Left            =   2400
       TabIndex        =   5
       Top             =   120
       Width           =   1455
@@ -89,7 +89,7 @@ Begin VB.Form Form1 
       BorderStyle     =   1  'Fixed Single
       Caption         =   "0"
       Height          =   255
-      Left            =   4920
+      Left            =   3960
       TabIndex        =   4
       Top             =   480
       Width           =   615
@@ -98,18 +98,19 @@ Begin VB.Form Form1 
       BorderStyle     =   1  'Fixed Single
       Caption         =   "0"
       Height          =   255
-      Left            =   4920
+      Left            =   3960
       TabIndex        =   3
       Top             =   120
       Width           =   615
    End
    Begin VB.Label Status 
+      Alignment       =   2  'Center
       Caption         =   "Status:"
       Height          =   255
       Left            =   120
       TabIndex        =   2
-      Top             =   840
-      Width           =   5415
+      Top             =   1320
+      Width           =   4455
    End
 End
 Attribute VB_Name = "Form1"
@@ -123,6 +124,9 @@ Private Declare Function GetPrivateProfileInt Lib "ker
 Dim filterManagerHostname As String
 Dim filterManagerTCPPort As Integer
 
+Dim seqNo As Long
+Dim machineName As String
+
 Dim filterHostname As String
 Dim filterTCPPort As Integer
 Dim filterUDPPort As Integer
@@ -136,40 +140,19 @@ Dim protocolVersion As String
 Dim connected As Boolean
 Dim responseNumber As Integer
 
-
-Private Sub Command1_Click()
-
-    ' build the contents of the XML packet.
-    xml = "<packet></packet>"
-
-    ' Use the first winsock control to send a UDP packet.
-    UDPSock.RemoteHost = filterHostname
-    UDPSock.RemotePort = filterUDPPort
-    UDPSock.SendData xml
-    Status.Caption = "i-scream Winhost " & protocolVersion & " - UDP packet sent."
-
-End Sub
-
-
-Private Sub Command3_Click()
-    ' establish a TCP connection to a filter
-    TCPSock.Close
-    TCPSock.Connect filterHostname, filterTCPPort
-End Sub
-
 Private Sub Form_Load()
+    
     protocolVersion = "1.1"
-       
+    
     Status.Caption = "Loading"
     Form1.Caption = "i-scream Winhost " & protocolVersion
     
     ''''TEMP
     filterManagerHostname = "killigrew.ukc.ac.uk"
     filterManagerTCPPort = 4567
-    Reconfigure_Click
-    Exit Sub
-    ''' ENDTEMP
+    ''''' END TEMP
     
+    GoTo skip
     On Error GoTo iniError
     Dim buf As String * 256
     Dim length As Long
@@ -177,8 +160,10 @@ Private Sub Form_Load()
     filterManagerHostname = Left$(buf, length)
     length = GetPrivateProfileString("i-scream Winhost", "FilterManagerPort", "<no value>", buf, Len(buf), App.Path & "winhost.ini")
     filterManagerTCPPort = Left$(buf, length)
-    
+skip:
+
     Status.Caption = "Connecting to Filter Manager"
+    Reconfigure_Click
     
     Exit Sub
     
@@ -193,6 +178,7 @@ Private Sub Form_QueryUnload(Cancel As Integer, Unload
     If x = 7 Then
         Cancel = True
     End If
+    SystemTray.Action = 2
 
 End Sub
 
@@ -214,7 +200,9 @@ End Sub
 Private Sub SystemTray_MouseDblClk(ByVal Button As Integer)
 
     Form1.Visible = True
+    SystemTray.Action = 2
     Form1.SetFocus
+    
 
 End Sub
 
@@ -340,7 +328,27 @@ Private Sub Timer1_Timer()
     
     If Label3.Caption < 1 Then
         ' build the contents of the XML packet.
-        xml = "<packet></packet>"
+        localIP = TCPSock.localIP
+        machineName = TCPSock.LocalHostName
+        seqNo = seqNo + 1
+        packetDate = Date2Num()
+        xml = "<packet seq_no=""" & seqNo & """ machine_name=""" & machineName & """ date=""" & packetDate & """ type=""data"" ip=""" & localIP & """>" & _
+              "" & _
+              "" & _
+              "" & _
+              "" & _
+              "" & _
+              "" & _
+              "" & _
+              "" & _
+              "" & _
+              "" & _
+              "" & _
+              "" & _
+              "" & _
+              "" & _
+              ""
+        Text4.Text = Text4.Text + xml
 
         ' Use the first winsock control to send a UDP packet.
         UDPSock.RemoteHost = filterHostname
@@ -358,3 +366,9 @@ Private Sub Timer1_Timer()
     End If
 
 End Sub
+
+Function Date2Num() As Long
+    Dim x As Long
+    x = DateDiff("s", "1-1-1970", Now)
+    Date2Num = x
+End Function