--- experimental/host/vb_net_test/nettest.frm	2001/02/23 10:29:16	1.4
+++ experimental/host/vb_net_test/nettest.frm	2001/02/23 10:34:47	1.5
@@ -40,7 +40,7 @@ Begin VB.Form Form1 
       Top             =   2040
       Width           =   1935
    End
-   Begin MSWinsockLib.Winsock Winsock2 
+   Begin MSWinsockLib.Winsock TCPSock 
       Left            =   4920
       Top             =   120
       _ExtentX        =   741
@@ -63,7 +63,7 @@ Begin VB.Form Form1 
       Top             =   600
       Width           =   4935
    End
-   Begin MSWinsockLib.Winsock Winsock1 
+   Begin MSWinsockLib.Winsock UDPSock 
       Left            =   4320
       Top             =   120
       _ExtentX        =   741
@@ -104,27 +104,28 @@ 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.
-    Winsock1.RemoteHost = filterHostname
-    Winsock1.RemotePort = filterUDPPort
-    Winsock1.SendData xml
+    UDPSock.RemoteHost = filterHostname
+    UDPSock.RemotePort = filterUDPPort
+    UDPSock.SendData xml
 
 End Sub
 
 Private Sub Command2_Click()
     
     ' establish a TCP connection to a filtermanager
-    Winsock2.Close
-    Winsock2.Connect filterManagerHostname, filterManagerTCPPort
+    TCPSock.Close
+    TCPSock.Connect filterManagerHostname, filterManagerTCPPort
 
 End Sub
 
 Private Sub Command3_Click()
     ' establish a TCP connection to a filter
-    Winsock2.Close
-    Winsock2.Connect filterHostname, filterTCPPort
+    TCPSock.Close
+    TCPSock.Connect filterHostname, filterTCPPort
 End Sub
 
 Private Sub Form_Load()
@@ -152,31 +153,27 @@ iniError:
     
 End Sub
 
-Private Sub Label2_Click()
-
-End Sub
-
-Private Sub Winsock2_Connect()
+Private Sub TCPSock_Connect()
       
    responseNumber = 0
    
     ' Send something as soon as we connect to the server.
     If connected = False Then
         ' contact the FilterManager
-        Winsock2.SendData "STARTCONFIG" & vbCrLf
+        TCPSock.SendData "STARTCONFIG" & vbCrLf
     Else
        ' Contact the Filter
-       Winsock2.SendData "HEARTBEAT" & vbCrLf
+       TCPSock.SendData "HEARTBEAT" & vbCrLf
     End If
    
 End Sub
 
-Private Sub Winsock2_DataArrival(ByVal bytesTotal As Long)
+Private Sub TCPSock_DataArrival(ByVal bytesTotal As Long)
     
     responseNumber = responseNumber + 1
     
     ' Get the line from the server.
-    Winsock2.GetData response, vbString, bytesTotal
+    TCPSock.GetData response, vbString, bytesTotal
     
     ' Remove linefeeds and returns from the line.
     response = Replace(response, Chr(13), "")
@@ -189,24 +186,24 @@ Private Sub Winsock2_DataArrival(ByVal bytesTotal As L
         Select Case responseNumber
             Case 1:
                 If Not response = "OK" Then GoTo configError
-                Winsock2.SendData "LASTMODIFIED" & vbCrLf
+                TCPSock.SendData "LASTMODIFIED" & vbCrLf
             Case 2:
                 If response = "ERROR" Then GoTo configError
                 lastModified = response
-                Winsock2.SendData "FILELIST" & vbCrLf
+                TCPSock.SendData "FILELIST" & vbCrLf
             Case 3:
                 If response = "ERROR" Then GoTo configError
                 fileList = response
-                Winsock2.SendData "UDPUpdateTime" & vbCrLf
+                TCPSock.SendData "UDPUpdateTime" & vbCrLf
             Case 4:
                 If response = "ERROR" Then GoTo configError
-                Winsock2.SendData "TCPUpdateTime" & vbCrLf
+                TCPSock.SendData "TCPUpdateTime" & vbCrLf
             Case 5:
                 If response = "ERROR" Then GoTo configError
-                Winsock2.SendData "ENDCONFIG" & vbCrLf
+                TCPSock.SendData "ENDCONFIG" & vbCrLf
             Case 6:
                 If Not response = "OK" Then GoTo configError
-                Winsock2.SendData "FILTER" & vbCrLf
+                TCPSock.SendData "FILTER" & vbCrLf
             Case 7:
                 'we got a filter list here.
                 readTo = 0
@@ -220,12 +217,12 @@ Private Sub Winsock2_DataArrival(ByVal bytesTotal As L
                 response = Mid(response, readTo + 1, Len(response))
                 ' get TCP Port number
                 filterTCPPort = response
-                Winsock2.SendData "END" & vbCrLf
+                TCPSock.SendData "END" & vbCrLf
             Case 8:
                 If Not response = "OK" Then GoTo configError
                 connected = True
                 responseNumber = 0
-                Winsock2.Close
+                TCPSock.Close
                 Text4.Text = Text4.Text & vbCrLf & "  <closed>"
                 x = MsgBox("got config okay")
         End Select
@@ -235,19 +232,19 @@ Private Sub Winsock2_DataArrival(ByVal bytesTotal As L
         Select Case responseNumber
             Case 1:
                 If Not response = "OK" Then GoTo heartbeatError
-                Winsock2.SendData "CONFIG" & vbCrLf
+                TCPSock.SendData "CONFIG" & vbCrLf
             Case 2:
                 If Not response = "OK" Then GoTo heartbeatError
-                Winsock2.SendData fileList & vbCrLf
+                TCPSock.SendData fileList & vbCrLf
             Case 3:
                 If Not response = "OK" Then GoTo heartbeatError
-                Winsock2.SendData lastModified & vbCrLf
+                TCPSock.SendData lastModified & vbCrLf
             Case 4:
                 If Not response = "OK" Then GoTo heartbeatError
-                Winsock2.SendData "ENDHEARTBEAT" & vbCrLf
+                TCPSock.SendData "ENDHEARTBEAT" & vbCrLf
             Case 5:
                 If Not response = "OK" Then GoTo heartbeatError
-                Winsock2.Close
+                TCPSock.Close
                 x = MsgBox("heartbeat sent okay.")
         End Select
     
@@ -261,3 +258,4 @@ configError:
 heartbeatError:
     x = MsgBox("error doing configuration")
 End Sub
+