X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/786989941b7b4504f0234c4a318f929802e981ad..c55f0b7ced2cc3112408f967a55556a0e525c2c7:/mon/tripemon.in

diff --git a/mon/tripemon.in b/mon/tripemon.in
index 0db07752..c71644aa 100644
--- a/mon/tripemon.in
+++ b/mon/tripemon.in
@@ -11,7 +11,7 @@ import math as M
 import sets as SET
 import getopt as O
 import time as T
-import sre as RX
+import re as RX
 from cStringIO import StringIO
 
 import pygtk
@@ -966,7 +966,7 @@ class AddPeerDialog (MyDialog):
                                newlinep = True)
     me.e_port = table.labelled('Port',
                                ValidatingEntry(numericvalidate(0, 65535),
-                                               '22003',
+                                               '4070',
                                                5))
     me.c_keepalive = G.CheckButton('Keepalives')
     me.l_tunnel = table.labelled('Tunnel',
@@ -1242,7 +1242,7 @@ class MonitorWindow (MyWindow):
     me.unping()
   def destroy(me):
     if me.pinger is not None:
-      GO.source_remove(me.pinger)    
+      GO.source_remove(me.pinger)
   def report(me, msg):
     moanbox(msg)
     return True
@@ -1261,7 +1261,7 @@ def main():
   global tripedir
   if 'TRIPEDIR' in environ:
     tripedir = environ['TRIPEDIR']
-  tripesock = '%s/%s' % (socketdir, 'tripesock')
+  tripesock = environ.get('TRIPESOCK', '%s/%s' % (socketdir, 'tripesock'))
 
   try:
     opts, args = O.getopt(argv[1:],
@@ -1282,12 +1282,12 @@ Graphical monitor for TrIPE VPN.
 
 Options supported:
 
--h, --help		Show this help message.
--v, --version		Show the version number.
--u, --usage		Show pointlessly short usage string.
+-h, --help              Show this help message.
+-v, --version           Show the version number.
+-u, --usage             Show pointlessly short usage string.
 
--d, --directory=DIR	Use TrIPE directory DIR.
--a, --admin-socket=FILE	Select socket to connect to."""
+-d, --directory=DIR     Use TrIPE directory DIR.
+-a, --admin-socket=FILE Select socket to connect to."""
       exit(0)
     elif o in ('-v', '--version'):
       version(stdout)