X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/tripe/blobdiff_plain/f40cd7f1993f1afb3e24986773b14afd7d24555d..171206b508a85f9e9fd5cdba18145b18285bc7ef:/mon/tripemon.in diff --git a/mon/tripemon.in b/mon/tripemon.in index 6b7076b5..24709344 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 @@ -773,7 +773,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): @@ -1066,7 +1066,7 @@ class AddPeerDialog (MyDialog): 5)) me.l_tunnel = table.labelled('Tunnel', combo_box_text(), newlinep = True, width = 3) - me.tuns = conn.tunnels() + me.tuns = ['(Default)'] + conn.tunnels() for t in me.tuns: me.l_tunnel.append_text(t) me.l_tunnel.set_active(0) @@ -1075,29 +1075,28 @@ 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) 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() @@ -1111,6 +1110,7 @@ class AddPeerDialog (MyDialog): keepalive = (me.c_keepalive.get_active() and me.e_keepalive.get_text() or None), tunnel = t and me.tuns[t] or None, + cork = me.c_cork.get_active() or None, mobile = me.c_mobile.get_active() or None, key = (me.c_peerkey.get_active() and me.e_peerkey.get_text() or None), @@ -1230,7 +1230,7 @@ def xlate_time(t): return '%04d:%02d:%02d %02d:%02d:%02d (%.1f %s ago)' % \ (YY, MM, DD, hh, mm, ss, ago, unit) def xlate_bytes(b): - """Translate a number of bytes into something a human might want to read.""" + """Translate a raw byte count into something a human might want to read.""" suff = 'B' b = int(b) for s in 'KMG': @@ -1252,21 +1252,40 @@ statsxlate = \ ('ip-bytes-in', xlate_bytes), ('ip-bytes-out', xlate_bytes)] +def format_stat(format, dict): + if callable(format): return format(dict) + else: return format % dict + ## How to lay out the stats dialog. Format is (LABEL, FORMAT): LABEL is ## the label to give the entry box; FORMAT is the format string to write into ## the entry. -statslayout = \ - [('Start time', '%(start-time)s'), - ('Private key', '%(current-key)s'), - ('Diffie-Hellman group', +cryptolayout = \ + [('Diffie-Hellman group', '%(kx-group)s ' '(%(kx-group-order-bits)s-bit order, ' '%(kx-group-elt-bits)s-bit elements)'), - ('Cipher', - '%(cipher)s (%(cipher-keysz)s-bit key, %(cipher-blksz)s-bit block)'), - ('Mac', '%(mac)s (%(mac-keysz)s-bit key, %(mac-tagsz)s-bit tag)'), - ('Hash', '%(hash)s (%(hash-sz)s-bit output)'), - ('Last key-exchange', '%(last-keyexch-time)s'), + ('Bulk crypto transform', + '%(bulk-transform)s (%(bulk-overhead)s byte overhead)'), + ('Data encryption', lambda d: '%s (%s; %s)' % ( + d['cipher'], + '%d-bit key' % (8*int(d['cipher-keysz'])), + d.get('cipher-blksz', '0') == '0' + and 'stream cipher' + or '%d-bit block' % (8*int(d['cipher-blksz'])))), + ('Message authentication', lambda d: '%s (%s; %s)' % ( + d['mac'], + d.get('mac-keysz') is None + and 'one-time MAC' + or '%d-bit key' % (8*int(d['mac-keysz'])), + '%d-bit tag' % (8*int(d['mac-tagsz'])))), + ('Hash', lambda d: '%s (%d-bit output)' % + (d['hash'], 8*int(d['hash-sz'])))] + +statslayout = \ + [('Start time', '%(start-time)s'), + ('Private key', '%(current-key)s')] + \ + cryptolayout + \ + [('Last key-exchange', '%(last-keyexch-time)s'), ('Last packet', '%(last-packet-time)s'), ('Packets in/out', '%(packets-in)s (%(bytes-in)s) / %(packets-out)s (%(bytes-out)s)'), @@ -1341,6 +1360,7 @@ class PeerWindow (TrivialWindow): def change(me): """Update the display in response to a notification.""" me.e['Interface'].set_text(me.peer.ifname) + me.e['Address'].set_text(me.peer.addr) def _update(me): """ @@ -1355,7 +1375,7 @@ class PeerWindow (TrivialWindow): stat[s] = trans(stat[s]) stat.update(me.peer.__dict__) for label, format in statslayout: - me.e[label].set_text(format % stat) + me.e[label].set_text(format_stat(format, stat)) GL.timeout_add(1000, lambda: me.cr.switch() and False) me.cr.parent.switch() me.cr = None @@ -1400,31 +1420,11 @@ class CryptoInfo (TrivialWindow): me.add(table) crypto = conn.algs() - table.info('Diffie-Hellman group', - '%s (%d-bit order, %d-bit elements)' % - (crypto['kx-group'], - int(crypto['kx-group-order-bits']), - int(crypto['kx-group-elt-bits'])), - len = 32) - table.info('Data encryption', - '%s (%d-bit key; %s)' % - (crypto['cipher'], - int(crypto['cipher-keysz']) * 8, - crypto['cipher-blksz'] == '0' - and 'stream cipher' - or '%d-bit block' % (int(crypto['cipher-blksz']) * 8)), - newlinep = True) - table.info('Message authentication', - '%s (%d-bit key; %d-bit tag)' % - (crypto['mac'], - int(crypto['mac-keysz']) * 8, - int(crypto['mac-tagsz']) * 8), - newlinep = True) - table.info('Hash function', - '%s (%d-bit output)' % - (crypto['hash'], - int(crypto['hash-sz']) * 8), - newlinep = True) + firstp = True + for label, format in cryptolayout: + table.info(label, format_stat(format, crypto), + len = 42, newlinep = not firstp) + firstp = False me.show_all() @@ -1612,6 +1612,7 @@ class MonitorWindow (MyWindow): '???', 'green', '???', 'green']) peer.win = WindowSlot(lambda: PeerWindow(peer)) me.hook(peer.pinghook, me._ping) + me.hook(peer.changehook, lambda: me._change(peer)) me.apchange() def delpeer(me, peer): @@ -1752,6 +1753,10 @@ class MonitorWindow (MyWindow): me.listmodel[p.i][textcol] = '%.1f ms' % ps.tlast me.listmodel[p.i][colourcol] = 'black' + def _change(me, p): + """Hook: notified when the peer changes state.""" + me.listmodel[p.i][1] = p.addr + def setstatus(me, status): """Update the message in the status bar.""" me.status.pop(0)