--- projects/cms/source/host/winhost/nettest.frm	2001/02/23 10:34:47	1.5
+++ projects/cms/source/host/winhost/nettest.frm	2001/02/23 10:58:00	1.7
@@ -14,20 +14,28 @@ Begin VB.Form Form1 
    ScaleWidth      =   5670
    ShowInTaskbar   =   0   'False
    StartUpPosition =   3  'Windows Default
+   Begin VB.Timer TCPTimer 
+      Left            =   3360
+      Top             =   120
+   End
+   Begin VB.Timer UDPTimer 
+      Left            =   3840
+      Top             =   120
+   End
    Begin VB.CommandButton Command3 
       Caption         =   "TCP to Filter"
       Height          =   375
       Left            =   3720
-      TabIndex        =   5
+      TabIndex        =   3
       Top             =   2520
       Width           =   1575
    End
    Begin VB.TextBox Text4 
-      Height          =   2535
+      Height          =   1575
       Left            =   240
       MultiLine       =   -1  'True
       ScrollBars      =   2  'Vertical
-      TabIndex        =   4
+      TabIndex        =   2
       Text            =   "nettest.frx":0000
       Top             =   3000
       Width           =   5055
@@ -36,7 +44,7 @@ Begin VB.Form Form1 
       Caption         =   "TCP to FilterManager"
       Height          =   375
       Left            =   3360
-      TabIndex        =   3
+      TabIndex        =   1
       Top             =   2040
       Width           =   1935
    End
@@ -51,18 +59,10 @@ Begin VB.Form Form1 
       Caption         =   "Send UDP"
       Height          =   375
       Left            =   4320
-      TabIndex        =   2
+      TabIndex        =   0
       Top             =   1560
       Width           =   975
    End
-   Begin VB.TextBox Text1 
-      Height          =   855
-      Left            =   360
-      TabIndex        =   0
-      Text            =   "<packet></packet>"
-      Top             =   600
-      Width           =   4935
-   End
    Begin MSWinsockLib.Winsock UDPSock 
       Left            =   4320
       Top             =   120
@@ -71,14 +71,30 @@ Begin VB.Form Form1 
       _Version        =   393216
       Protocol        =   1
    End
+   Begin VB.Label Label2 
+      Caption         =   "Label2"
+      Height          =   255
+      Left            =   120
+      TabIndex        =   6
+      Top             =   600
+      Width           =   3375
+   End
    Begin VB.Label Label1 
-      Caption         =   "Packet contents"
+      Caption         =   "Label1"
       Height          =   255
-      Left            =   360
-      TabIndex        =   1
-      Top             =   360
-      Width           =   2895
+      Left            =   120
+      TabIndex        =   5
+      Top             =   240
+      Width           =   3375
    End
+   Begin VB.Label Status 
+      Caption         =   "Status:"
+      Height          =   255
+      Left            =   120
+      TabIndex        =   4
+      Top             =   5280
+      Width           =   5415
+   End
 End
 Attribute VB_Name = "Form1"
 Attribute VB_GlobalNameSpace = False
@@ -97,6 +113,9 @@ Dim filterUDPPort As Integer
 Dim fileList As String
 Dim lastModified As String
 
+Dim UDPUpdateTime As Integer
+Dim TCPUpdateTime As Integer
+
 Dim protocolVersion As String
 Dim connected As Boolean
 Dim responseNumber As Integer
@@ -111,6 +130,7 @@ Private Sub Command1_Click()
     UDPSock.RemoteHost = filterHostname
     UDPSock.RemotePort = filterUDPPort
     UDPSock.SendData xml
+    Status.Caption = "i-scream Winhost " & protocolVersion & " - UDP packet sent."
 
 End Sub
 
@@ -131,6 +151,8 @@ End Sub
 Private Sub Form_Load()
     protocolVersion = "1.1"
     
+    Status.Caption = "i-scream Winhost " & protocolVersion
+    
     ''''TEMP
     filterManagerHostname = "killigrew.ukc.ac.uk"
     filterManagerTCPPort = 4567
@@ -145,6 +167,8 @@ Private Sub Form_Load()
     length = GetPrivateProfileString("i-scream Winhost", "FilterManagerPort", "<no value>", buf, Len(buf), App.Path & "winhost.ini")
     filterManagerTCPPort = Left$(buf, length)
     
+    Status.Caption = "i-scream Winhost " & protocolVersion & " connecting to Filter Manager"
+    
     Exit Sub
     
 iniError:
@@ -154,8 +178,8 @@ iniError:
 End Sub
 
 Private Sub TCPSock_Connect()
-      
-   responseNumber = 0
+    
+    responseNumber = 0
    
     ' Send something as soon as we connect to the server.
     If connected = False Then
@@ -197,9 +221,11 @@ Private Sub TCPSock_DataArrival(ByVal bytesTotal As Lo
                 TCPSock.SendData "UDPUpdateTime" & vbCrLf
             Case 4:
                 If response = "ERROR" Then GoTo configError
+                UDPUpdateTime = response
                 TCPSock.SendData "TCPUpdateTime" & vbCrLf
             Case 5:
                 If response = "ERROR" Then GoTo configError
+                TCPUpdateTime = response
                 TCPSock.SendData "ENDCONFIG" & vbCrLf
             Case 6:
                 If Not response = "OK" Then GoTo configError
@@ -224,7 +250,9 @@ Private Sub TCPSock_DataArrival(ByVal bytesTotal As Lo
                 responseNumber = 0
                 TCPSock.Close
                 Text4.Text = Text4.Text & vbCrLf & "  <closed>"
-                x = MsgBox("got config okay")
+                Label1.Caption = "TCP hearbeat interval: " & UDPUpdateTime
+                Label2.Caption = "UDP packet interval: " & TCPUpdateTime
+                Status.Caption = "i-scream Winhost " & protocolVersion & " - got config okay"
         End Select
     Else
         ' Perform a heartbeat (1.1)
@@ -245,7 +273,7 @@ Private Sub TCPSock_DataArrival(ByVal bytesTotal As Lo
             Case 5:
                 If Not response = "OK" Then GoTo heartbeatError
                 TCPSock.Close
-                x = MsgBox("heartbeat sent okay.")
+                Status.Caption = "i-scream Winhost " & protocolVersion & " - heartbeat sent okay."
         End Select
     
     End If
@@ -254,8 +282,8 @@ Private Sub TCPSock_DataArrival(ByVal bytesTotal As Lo
     Exit Sub
     
 configError:
-    x = MsgBox("error doing configuration")
+    Status.Caption = "i-scream Winhost " & protocolVersion & " - FAILED to get configuration"
 heartbeatError:
-    x = MsgBox("error doing configuration")
+    Status.Caption = "i-scream Winhost " & protocolVersion & " - Heatbeat FAILED"
 End Sub