/[cvs]/joko/ToolBox/Windows/VpnDial/src/Module_Main.bas

Diff of /joko/ToolBox/Windows/VpnDial/src/Module_Main.bas

Parent Directory | Revision Log | View Patch Patch

-revision 1.8 by joko,
Sun Oct  9 18:42:25 2005 UTC
+revision 1.9 by joko,
Tue Nov 22 22:20:11 2005 UTC
 Line 52 
 Sub Main()
      '    Form_Main.Show
      'Else
-     ' dial command
-     If cmdline.hasSwitch("dial") Then
-         conName = cmdline.getArgument("dial")
-         On Error Resume Next
-         Set rasItem = RasEntries(conName)
-         If Err.Number = 0 Then
-             success = RasConnect(rasItem.entryname, rasItem.PhonebookPath)
-         Else
-             MsgBox "Unkown RAS-Connection """ & conName & """."
-         End If
-         On Error GoTo 0
-     ' hangup command
-     ElseIf cmdline.hasSwitch("hangup") Then
-         conName = cmdline.getArgument("hangup")
-         success = RasDisconnect(conName)
-         'MsgBox success
-     'End If
      ' run script
-     ElseIf cmdline.hasSwitch("script") And success = True Then
+     If cmdline.hasSwitch("script") And success = True Then
          script_name = cmdline.getArgument("script")
          If script_name <> "" Then
              script_args = Chr(34) & DetermineClientIP(conName) & Chr(34) & " " & Chr(34) & DetermineServerIP(conName) & Chr(34)
-Line 141 
 Sub Main()
+Line 120 
 Sub Main()
                  ShowTrayIcon Form_Main, getTrayIconTipText(ConnectionName, ConnectionOnline)
              End If
+             ' dial command
+             If cmdline.hasSwitch("dial") Then
+                 doDial conName
+             End If
+             ' monitor ras connection
              MonitorRASStatusAsync
          End If
+     ' dial command
+     ElseIf cmdline.hasSwitch("dial") Then
+         conName = cmdline.getArgument("dial")
+         doDial conName
+     ' hangup command
+     ElseIf cmdline.hasSwitch("hangup") Then
+         conName = cmdline.getArgument("hangup")
+         success = RasDisconnect(conName)
+         'MsgBox success
      End If
      'End If
-Line 173 
 Private Sub ReadRasEntries()
+Line 170 
 Private Sub ReadRasEntries()
          On Error Resume Next
          RasEntries.add rasItem, rasItem.entryname
          If Err.Number = 457 Then
-             MsgBox "Error: Duplicate RAS entry. Don't know what to dial. This error should not occour."
+             'MsgBox "Error: Duplicate RAS entry. Don't know what to dial. This error should not occour."
          End If
          On Error GoTo 0
      Next i
-Line 243 
 Private Function getTrayIconTipText(conN
+Line 240 
 Private Function getTrayIconTipText(conN
      End If
      getTrayIconTipText = TipText
  End Function
+ Private Function doDial(conName As String)
+     Dim rasItem As RasEntryData
+     Dim success As Boolean
+     On Error Resume Next
+     Set rasItem = RasEntries(conName)
+     If Err.Number = 0 Then
+         success = RasConnect(rasItem.entryname, rasItem.PhonebookPath)
+     Else
+         MsgBox "Unknown RAS-Connection """ & conName & """."
+     End If
+     On Error GoTo 0
+ End Function

 Legend:



Removed from v.1.8
 


changed lines


 
Added in v.1.9
 Legend:



Removed from v.1.8
 


changed lines


 
Added in v.1.9
-Removed from v.1.8
+Added in v.1.9

MailToCvsAdmin">MailToCvsAdmin	ViewVC Help
Powered by ViewVC 1.1.26