ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/cms/source/host/winhost/nettest.frm
(Generate patch)

Comparing projects/cms/source/host/winhost/nettest.frm (file contents):
Revision 1.15 by pjm2, Fri Feb 23 17:08:37 2001 UTC vs.
Revision 1.23 by pjm2, Mon Feb 26 09:54:25 2001 UTC

# Line 2 | Line 2 | VERSION 5.00
2   Object = "{248DD890-BB45-11CF-9ABC-0080C7E7B78D}#1.0#0"; "MSWINSCK.OCX"
3   Object = "{33155A3D-0CE0-11D1-A6B4-444553540000}#1.0#0"; "SysTray.ocx"
4   Begin VB.Form Form1
5 <   BorderStyle     =   4  'Fixed ToolWindow
5 >   BorderStyle     =   3  'Fixed Dialog
6     Caption         =   "i-scream Winhost"
7     ClientHeight    =   5655
8     ClientLeft      =   45
9 <   ClientTop       =   285
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
16     ScaleWidth      =   4710
17     ShowInTaskbar   =   0   'False
# Line 40 | Line 42 | Begin VB.Form Form1
42        MultiLine       =   -1  'True
43        ScrollBars      =   2  'Vertical
44        TabIndex        =   1
45 <      Text            =   "nettest.frx":0000
45 >      Text            =   "nettest.frx":0742
46        Top             =   3000
47        Width           =   3975
48     End
# Line 67 | Line 69 | Begin VB.Form Form1
69        _Version        =   393216
70        Protocol        =   1
71     End
72 +   Begin VB.Label Label5
73 +      Caption         =   "b e t a"
74 +      BeginProperty Font
75 +         Name            =   "MS Sans Serif"
76 +         Size            =   24
77 +         Charset         =   0
78 +         Weight          =   700
79 +         Underline       =   0   'False
80 +         Italic          =   0   'False
81 +         Strikethrough   =   0   'False
82 +      EndProperty
83 +      Height          =   615
84 +      Left            =   240
85 +      TabIndex        =   8
86 +      Top             =   120
87 +      Width           =   1815
88 +   End
89     Begin VB.Label Label2
90        Alignment       =   1  'Right Justify
91        Caption         =   "Next heartbeat:"
# Line 107 | Line 126 | Begin VB.Form Form1
126        Alignment       =   2  'Center
127        Caption         =   "Status:"
128        Height          =   255
129 <      Left            =   120
129 >      Left            =   0
130        TabIndex        =   2
131        Top             =   1320
132 <      Width           =   4455
132 >      Width           =   4695
133     End
134   End
135   Attribute VB_Name = "Form1"
# Line 123 | Line 142 | Private Declare Function GetPrivateProfileString Lib "
142   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
143  
144   Dim filterManagerHostname As String
145 < Dim filterManagerTCPPort As Integer
145 > Dim filterManagerTCPPort As Long
146  
147   Dim seqNo As Long
148   Dim machineName As String
# Line 139 | Line 158 | Dim TCPUpdateTime As Integer
158  
159   Dim protocolVersion As String
160   Dim connected As Boolean
161 +
162 + Dim CUpTime As New CUpTime
163 +
164   Dim responseNumber As Integer
165  
166   Private Sub Form_Load()
167      
168 +    If App.PrevInstance Then
169 +        x = MsgBox("There is already an i-scream Winhost running on this machine.", 48, "i-scream host already running")
170 +    End If
171 +    
172      protocolVersion = "1.1"
173      
174      Status.Caption = "Loading"
175 <    'Form1.Caption = "i-scream Winhost " & protocolVersion & " for " & GetVersion()
175 >    Form1.Caption = "i-scream Winhost " & protocolVersion
176      
177 +    Form1.Show
178 +    
179 +    CUpTime.Init
180 +    
181 +    If CUpTime.isWin9x Then
182 +        x = MsgBox("Sorry, the i-scream host can only be used to monitor servers (i.e. not Win9x)", 48, "Not a server.")
183 +        End
184 +    End If
185 +    
186      ''''TEMP
187 <    filterManagerHostname = "killigrew.ukc.ac.uk"
188 <    filterManagerTCPPort = 4567
187 >    'filterManagerHostname = "killigrew.ukc.ac.uk"
188 >    'filterManagerTCPPort = 4567
189      ''''' END TEMP
190      
191 <    GoTo skip
191 >    'GoTo skip
192      On Error GoTo iniError
193      Dim buf As String * 256
194      Dim length As Long
195 <    length = GetPrivateProfileString("i-scream Winhost", "FilterManager", "<no value>", buf, Len(buf), App.Path & "winhost.ini")
195 >    length = GetPrivateProfileString("i-scream Winhost", "FilterManager", "<no value>", buf, Len(buf), App.Path & "/winhost.ini")
196      filterManagerHostname = Left$(buf, length)
197 <    length = GetPrivateProfileString("i-scream Winhost", "FilterManagerPort", "<no value>", buf, Len(buf), App.Path & "winhost.ini")
198 <    filterManagerTCPPort = Left$(buf, length)
197 >    length = GetPrivateProfileInt("i-scream Winhost", "FilterManagerPort", 0, App.Path & "/winhost.ini")
198 >    filterManagerTCPPort = length
199 >    On Error GoTo 0
200   skip:
201  
202 <    Status.Caption = "Connecting to Filter Manager"
202 >    Status.Caption = "Connecting to Filter Manager " & filterManagerHostname & ":" & filterManagerTCPPort
203      Reconfigure_Click
204      
205 <    Form1.Show
205 >    SystemTray.Icon = Val(Form1.Icon)
206      SystemTray.Action = 0
207      
208      
209      Exit Sub
210      
211   iniError:
212 <    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")
212 >    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")
213      End
214      
215   End Sub
# Line 335 | Line 371 | Private Sub Timer1_Timer()
371          ' prepare the contents of the XML packet.
372          seqNo = seqNo + 1
373          machineName = TCPSock.LocalHostName
374 <        localIP = TCPSock.localIP
374 >        LocalIP = TCPSock.LocalIP
375          packetDate = Date2Num()
376          
377          
# Line 347 | Line 383 | Private Sub Timer1_Timer()
383              End
384          End If
385            
386 <        osName = getVersion()
386 >        osName = GetVersion()
387          osVersionMajor = verinfo.dwMajorVersion
388          osVersionMinor = verinfo.dwMinorVersion
389          osBuild = verinfo.dwBuildNumber
# Line 381 | Line 417 | Private Sub Timer1_Timer()
417          memory& = memsts.dwAvailVirtual
418          swapFree = memory& \ 1024
419          
420 +        uptime = GetTickCount \ 1000
421 +        
422 +        CUpTime.Capture
423 +        cpu_time = CUpTime.CPUTime
424 +        percent_idle = CUpTime.PercentIdle
425 +        
426          ' build the contents of the XML packet
427 <        xml = "<packet seq_no=""" & seqNo & """ machine_name=""" & machineName & """ date=""" & packetDate & """ type=""data"" ip=""" & localIP & """>" & _
427 >        xml = "<packet seq_no=""" & seqNo & """ machine_name=""" & machineName & """ date=""" & packetDate & """ type=""data"" ip=""" & LocalIP & """>" & _
428                "<os>" & _
429                  "<name>" & osName & "</name>" & _
430                  "<version>" & osVersionMajor & "</version>" & _
# Line 390 | Line 432 | Private Sub Timer1_Timer()
432                  "<platform>" & osName & "</platform>" & _
433                  "<minor_version>" & osVersionMinor & "</minor_version>" & _
434                  "<processor>" & processorType & "</processor>" & _
435 +                "<uptime>" & uptime & "</uptime>" & _
436                "</os>" & _
437 +              "<cpu><idle>" & percent_idle & "</idle><user>" & cpu_time & "</user></cpu>" & _
438                "<memory><total>" & memTotal & "</total><free>" & memFree & "</free></memory>" & _
439                "<swap><total>" & swapTotal & "</total><free>" & swapFree & "</free></swap>" & _
440 <              ""
440 >              "</packet>"
441          Text4.Text = Text4.Text + xml
442  
443          ' Use the first winsock control to send a UDP packet.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines