X-Git-Url: https://git.distorted.org.uk/~mdw/tripe/blobdiff_plain/7949d1098cb5fa411ce76297d4b9e43be8438a0d..89640f3f83c29967e524d754bf130bc452bdefe2:/mon/tripemon.in

diff --git a/mon/tripemon.in b/mon/tripemon.in
index 15fff2c8..593b2e8b 100644
--- a/mon/tripemon.in
+++ b/mon/tripemon.in
@@ -40,7 +40,7 @@ import re as RX
 from cStringIO import StringIO
 
 try:
-  if OS.getenv('TRIPEMON_FORCE_GI'): raise ImportError
+  if OS.getenv('TRIPEMON_FORCE_GI'): raise ImportError()
   import pygtk
   pygtk.require('2.0')
   import gtk as G
@@ -324,12 +324,14 @@ class Peer (MonitorObject):
   def _setaddr(me, addr):
     """Set the peer's address."""
     if addr[0] == 'INET':
-      ipaddr, port = addr[1:]
+      af, ipaddr, port = addr
       try:
-        name = S.gethostbyaddr(ipaddr)[0]
-        me.addr = 'INET %s:%s [%s]' % (name, port, ipaddr)
-      except S.herror:
-        me.addr = 'INET %s:%s' % (ipaddr, port)
+        name, _ = S.getnameinfo((ipaddr, int(port)),
+                                S.NI_NUMERICSERV | S.NI_NAMEREQD)
+      except S.gaierror:
+        me.addr = '%s %s:%s' % (af, ipaddr, port)
+      else:
+        me.addr = '%s %s:%s [%s]' % (af, name, port, ipaddr)
     else:
       me.addr = ' '.join(addr)
 
@@ -773,7 +775,7 @@ class ValidatingEntry (G.Entry):
     ValidationError.
     """
     if not me.validp:
-      raise ValidationError
+      raise ValidationError()
     return G.Entry.get_text(me)
 
 def numericvalidate(min = None, max = None):
@@ -1075,12 +1077,17 @@ class AddPeerDialog (MyDialog):
       tickybox.connect('toggled',
                        lambda t: target.set_sensitive (t.get_active()))
 
-    me.c_keepalive = G.CheckButton('Keepalives')
-    table.pack(me.c_keepalive, newlinep = True, xopt = G.FILL)
-    me.e_keepalive = ValidatingEntry(r'^\d+[hms]?$', '', 5)
-    me.e_keepalive.set_sensitive(False)
-    tickybox_sensitivity(me.c_keepalive, me.e_keepalive)
-    table.pack(me.e_keepalive, width = 3)
+    def optional_entry(label, rx_valid, width):
+      c = G.CheckButton(label)
+      table.pack(c, newlinep = True, xopt = G.FILL)
+      e = ValidatingEntry(rx_valid, '', width)
+      e.set_sensitive(False)
+      tickybox_sensitivity(c, e)
+      table.pack(e, width = 3)
+      return c, e
+
+    me.c_keepalive, me.e_keepalive = \
+      optional_entry('Keepalives', r'^\d+[hms]?$', 5)
 
     me.c_cork = G.CheckButton('Cork')
     table.pack(me.c_cork, newlinep = True, width = 4, xopt = G.FILL)
@@ -1088,19 +1095,10 @@ class AddPeerDialog (MyDialog):
     me.c_mobile = G.CheckButton('Mobile')
     table.pack(me.c_mobile, newlinep = True, width = 4, xopt = G.FILL)
 
-    me.c_peerkey = G.CheckButton('Peer key tag')
-    table.pack(me.c_peerkey, newlinep = True, xopt = G.FILL)
-    me.e_peerkey = ValidatingEntry(r'^[^.:\s]+$', '', 16)
-    me.e_peerkey.set_sensitive(False)
-    tickybox_sensitivity(me.c_peerkey, me.e_peerkey)
-    table.pack(me.e_peerkey, width = 3)
-
-    me.c_privkey = G.CheckButton('Private key tag')
-    table.pack(me.c_privkey, newlinep = True, xopt = G.FILL)
-    me.e_privkey = ValidatingEntry(r'^[^.:\s]+$', '', 16)
-    me.e_privkey.set_sensitive(False)
-    tickybox_sensitivity(me.c_privkey, me.e_privkey)
-    table.pack(me.e_privkey, width = 3)
+    me.c_peerkey, me.e_peerkey = \
+      optional_entry('Peer key tag', r'^[^.:\s]+$', 16)
+    me.c_privkey, me.e_privkey = \
+      optional_entry('Private key tag', r'^[^.:\s]+$', 16)
 
     me.show_all()