[ViewVC] Diff of: i-scream/experimental/host/vb_net

Comparing experimental/host/vb_net_test/nettest.frm (file contents):
Revision 1.17 by pjm2, Fri Feb 23 17:37:04 2001 UTC vs.
Revision 1.24 by pjm2, Mon Feb 26 10:13:10 2001 UTC

#	Line 4 \| Line 4 \| Object = "{33155A3D-0CE0-11D1-A6B4-444553540000}#1.0#0
4		Begin VB.Form Form1
5		BorderStyle = 3 'Fixed Dialog
6		Caption = "i-scream Winhost"
7	<	ClientHeight = 5655
7	>	ClientHeight = 1275
8		ClientLeft = 45
9		ClientTop = 330
10		ClientWidth = 4710
11	+	Icon = "nettest.frx":0000
12		LinkTopic = "Form1"
13		MaxButton = 0 'False
14		MinButton = 0 'False
15	<	ScaleHeight = 5655
15	>	ScaleHeight = 1275
16		ScaleWidth = 4710
17		ShowInTaskbar = 0 'False
18	<	StartUpPosition = 3 'Windows Default
18	>	StartUpPosition = 2 'CenterScreen
19	>	Visible = 0 'False
20		Begin VB.CommandButton Hide
21		Caption = "Hide Window"
22		Height = 375
23		Left = 3120
24	<	TabIndex = 7
25	<	Top = 840
24	>	TabIndex = 6
25	>	Top = 480
26		Width = 1455
27		End
28		Begin SysTray.SystemTray SystemTray
#	Line 35 \| Line 37 \| Begin VB.Form Form1
37		Left = 2760
38		Top = 1800
39		End
38	–	Begin VB.TextBox Text4
39	–	Height = 1575
40	–	Left = 240
41	–	MultiLine = -1 'True
42	–	ScrollBars = 2 'Vertical
43	–	TabIndex = 1
44	–	Text = "nettest.frx":0000
45	–	Top = 3000
46	–	Width = 3975
47	–	End
40		Begin VB.CommandButton Reconfigure
41		Caption = "Reconfigure with FilterManager"
42		Height = 375
43		Left = 120
44		TabIndex = 0
45	<	Top = 840
45	>	Top = 480
46		Width = 2895
47		End
48		Begin MSWinsockLib.Winsock TCPSock
#	Line 68 \| Line 60 \| Begin VB.Form Form1
60		_Version = 393216
61		Protocol = 1
62		End
71	–	Begin VB.Label Label5
72	–	Caption = "b e t a"
73	–	BeginProperty Font
74	–	Name = "MS Sans Serif"
75	–	Size = 24
76	–	Charset = 0
77	–	Weight = 700
78	–	Underline = 0 'False
79	–	Italic = 0 'False
80	–	Strikethrough = 0 'False
81	–	EndProperty
82	–	Height = 615
83	–	Left = 240
84	–	TabIndex = 8
85	–	Top = 120
86	–	Width = 1815
87	–	End
63		Begin VB.Label Label2
64		Alignment = 1 'Right Justify
65		Caption = "Next heartbeat:"
66		Height = 255
67		Left = 2400
68	<	TabIndex = 6
69	<	Top = 480
68	>	TabIndex = 5
69	>	Top = 120
70		Width = 1455
71		End
72		Begin VB.Label Label1
73		Alignment = 1 'Right Justify
74		Caption = "Next UDP packet:"
75		Height = 255
76	<	Left = 2400
77	<	TabIndex = 5
76	>	Left = 120
77	>	TabIndex = 4
78		Top = 120
79		Width = 1455
80		End
#	Line 108 \| Line 83 \| Begin VB.Form Form1
83		Caption = "0"
84		Height = 255
85		Left = 3960
86	<	TabIndex = 4
87	<	Top = 480
86	>	TabIndex = 3
87	>	Top = 120
88		Width = 615
89		End
90		Begin VB.Label Label3
91		BorderStyle = 1 'Fixed Single
92		Caption = "0"
93		Height = 255
94	<	Left = 3960
95	<	TabIndex = 3
94	>	Left = 1680
95	>	TabIndex = 2
96		Top = 120
97		Width = 615
98		End
#	Line 125 \| Line 100 \| Begin VB.Form Form1
100		Alignment = 2 'Center
101		Caption = "Status:"
102		Height = 255
103	<	Left = 120
104	<	TabIndex = 2
105	<	Top = 1320
106	<	Width = 4455
103	>	Left = 0
104	>	TabIndex = 1
105	>	Top = 960
106	>	Width = 4695
107		End
108		End
109		Attribute VB_Name = "Form1"
#	Line 141 \| Line 116 \| Private Declare Function GetPrivateProfileString Lib "
116		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
117
118		Dim filterManagerHostname As String
119	<	Dim filterManagerTCPPort As Integer
119	>	Dim filterManagerTCPPort As Long
120
121		Dim seqNo As Long
122		Dim machineName As String
#	Line 158 \| Line 133 \| Dim TCPUpdateTime As Integer
133		Dim protocolVersion As String
134		Dim connected As Boolean
135
136	<	'Dim CUpTime As New CUpTime
136	>	Dim CUpTime As New CUpTime
137
138		Dim responseNumber As Integer
139
140		Private Sub Form_Load()
141
142	+	If App.PrevInstance Then
143	+	x = MsgBox("There is already an i-scream Winhost running on this machine.", 48, "i-scream host already running")
144	+	End If
145	+
146		protocolVersion = "1.1"
147
148		Status.Caption = "Loading"
149	<	'Form1.Caption = "i-scream Winhost " & protocolVersion & " for " & GetVersion()
149	>	Form1.Caption = "i-scream Winhost " & protocolVersion
150
151	+	CUpTime.Init
152	+
153	+	If CUpTime.isWin9x Then
154	+	x = MsgBox("Sorry, the i-scream host can only be used to monitor servers (i.e. not Win9x)", 48, "Not a server.")
155	+	End
156	+	End If
157	+
158		''''TEMP
159	<	filterManagerHostname = "killigrew.ukc.ac.uk"
160	<	filterManagerTCPPort = 4567
159	>	'filterManagerHostname = "killigrew.ukc.ac.uk"
160	>	'filterManagerTCPPort = 4567
161		''''' END TEMP
162
163	<	GoTo skip
163	>	'GoTo skip
164		On Error GoTo iniError
165		Dim buf As String * 256
166		Dim length As Long
167	<	length = GetPrivateProfileString("i-scream Winhost", "FilterManager", "<no value>", buf, Len(buf), App.Path & "winhost.ini")
167	>	length = GetPrivateProfileString("i-scream Winhost", "FilterManager", "<no value>", buf, Len(buf), App.Path & "/winhost.ini")
168		filterManagerHostname = Left$(buf, length)
169	<	length = GetPrivateProfileString("i-scream Winhost", "FilterManagerPort", "<no value>", buf, Len(buf), App.Path & "winhost.ini")
170	<	filterManagerTCPPort = Left$(buf, length)
169	>	length = GetPrivateProfileInt("i-scream Winhost", "FilterManagerPort", 0, App.Path & "/winhost.ini")
170	>	filterManagerTCPPort = length
171	>	On Error GoTo 0
172		skip:
173
174	<	Status.Caption = "Connecting to Filter Manager"
174	>	Status.Caption = "Connecting to Filter Manager " & filterManagerHostname & ":" & filterManagerTCPPort
175		Reconfigure_Click
176
177	<	Form1.Show
177	>	SystemTray.Icon = Val(Form1.Icon)
178		SystemTray.Action = 0
179
180
181		Exit Sub
182
183		iniError:
184	<	x = MsgBox("The i-scream Winhost could not read the correct settings from the winhost.ini file. Please correct these and try again.", 48, "Configuration not found")
184	>	x = MsgBox("The i-scream Winhost could not read the correct settings from the winhost.ini file. Please correct these and try again. " & Err.Description, 48, "Configuration not found")
185		End
186
187		End Sub
#	Line 227 \| Line 214 \| Private Sub SystemTray_MouseDblClk(ByVal Button As Int
214
215		Form1.Visible = True
216		Form1.SetFocus
230	–
217
218		End Sub
219
#	Line 256 \| Line 242 \| Private Sub TCPSock_DataArrival(ByVal bytesTotal As Lo
242		' Remove linefeeds and returns from the line.
243		response = Replace(response, Chr(13), "")
244		response = Replace(response, Chr(10), "")
245	<	Text4.Text = Text4.Text & vbCrLf & response
245	>	'Text4.Text = Text4.Text & vbCrLf & response
246
247		If connected = False Then
248		' Perform TCP configuration (1.1)
#	Line 303 \| Line 289 \| Private Sub TCPSock_DataArrival(ByVal bytesTotal As Lo
289		connected = True
290		responseNumber = 0
291		TCPSock.Close
292	<	Text4.Text = Text4.Text & vbCrLf & " <closed>"
292	>	'Text4.Text = Text4.Text & vbCrLf & " <closed>"
293		Status.Caption = "Configuration successful"
294		Label3.Caption = UDPUpdateTime
295		Label4.Caption = TCPUpdateTime
#	Line 368 \| Line 354 \| Private Sub Timer1_Timer()
354		End
355		End If
356
357	<	osName = getVersion()
357	>	osName = GetVersion()
358		osVersionMajor = verinfo.dwMajorVersion
359		osVersionMinor = verinfo.dwMinorVersion
360		osBuild = verinfo.dwBuildNumber
#	Line 402 \| Line 388 \| Private Sub Timer1_Timer()
388		memory& = memsts.dwAvailVirtual
389		swapFree = memory& \ 1024
390
391	+	uptime = GetTickCount \ 1000
392	+
393	+	CUpTime.Capture
394	+	cpu_time = CUpTime.CPUTime
395	+	percent_idle = CUpTime.PercentIdle
396	+
397		' build the contents of the XML packet
398		xml = "<packet seq_no=""" & seqNo & """ machine_name=""" & machineName & """ date=""" & packetDate & """ type=""data"" ip=""" & LocalIP & """>" & _
399		"<os>" & _
#	Line 411 \| Line 403 \| Private Sub Timer1_Timer()
403		"<platform>" & osName & "</platform>" & _
404		"<minor_version>" & osVersionMinor & "</minor_version>" & _
405		"<processor>" & processorType & "</processor>" & _
406	+	"<uptime>" & uptime & "</uptime>" & _
407		"</os>" & _
408	+	"<cpu><idle>" & percent_idle & "</idle><user>" & cpu_time & "</user></cpu>" & _
409		"<memory><total>" & memTotal & "</total><free>" & memFree & "</free></memory>" & _
410		"<swap><total>" & swapTotal & "</total><free>" & swapFree & "</free></swap>" & _
411		"</packet>"
412	<	Text4.Text = Text4.Text + xml
412	>	'Text4.Text = Text4.Text + xml
413
414		' Use the first winsock control to send a UDP packet.
415		UDPSock.RemoteHost = filterHostname

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing experimental/host/vb_net_test/nettest.frm (file contents): Revision 1.17 by pjm2, Fri Feb 23 17:37:04 2001 UTC vs. Revision 1.24 by pjm2, Mon Feb 26 10:13:10 2001 UTC

Diff Legend

Comparing experimental/host/vb_net_test/nettest.frm (file contents):
Revision 1.17 by pjm2, Fri Feb 23 17:37:04 2001 UTC vs.
Revision 1.24 by pjm2, Mon Feb 26 10:13:10 2001 UTC