/mandos/trunk

To get this branch, use:
bzr branch http://bzr.recompile.se/loggerhead/mandos/trunk

« back to all changes in this revision

Viewing changes to mandos-monitor

  • Committer: Teddy Hogeborn
  • Date: 2011-04-03 00:46:51 UTC
  • Revision ID: teddy@fukt.bsnet.se-20110403004651-yyrzgwwkoq4ts2vi
* mandos: Never call .Reset() on a defunct Avahi entry group.
  (AvahiService.remove): Only do group.Reset(), as before.
  (AvahiService.add): Only create new group if necessary.
  (AvahiService.cleanup): Also do group.Free() if a group exists.
  (AvahiService.server_state_changed): Call .cleanup() on errors.
                                       Also log error parameter, if
                                       passed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos-monitor
3
3
# 
4
4
# Mandos Monitor - Control and monitor the Mandos server
5
5
# 
6
 
# Copyright © 2009,2010 Teddy Hogeborn
7
 
# Copyright © 2009,2010 Björn Påhlsson
 
6
# Copyright © 2009-2011 Teddy Hogeborn
 
7
# Copyright © 2009-2011 Björn Påhlsson
8
8
# 
9
9
# This program is free software: you can redistribute it and/or modify
10
10
# it under the terms of the GNU General Public License as published by
51
51
domain = 'se.bsnet.fukt'
52
52
server_interface = domain + '.Mandos'
53
53
client_interface = domain + '.Mandos.Client'
54
 
version = "1.2.3"
 
54
version = "1.3.0"
55
55
 
56
56
# Always run in monochrome mode
57
57
urwid.curses_display.curses.has_colors = lambda : False
358
358
        """Handle keys.
359
359
        This overrides the method from urwid.FlowWidget"""
360
360
        if key == "+":
361
 
            self.proxy.Enable(dbus_interface = client_interface)
 
361
            self.proxy.Enable(dbus_interface = client_interface,
 
362
                              ignore_reply=True)
362
363
        elif key == "-":
363
 
            self.proxy.Disable(dbus_interface = client_interface)
 
364
            self.proxy.Disable(dbus_interface = client_interface,
 
365
                               ignore_reply=True)
364
366
        elif key == "a":
365
367
            self.proxy.Approve(dbus.Boolean(True, variant_level=1),
366
 
                               dbus_interface = client_interface)
 
368
                               dbus_interface = client_interface,
 
369
                               ignore_reply=True)
367
370
        elif key == "d":
368
371
            self.proxy.Approve(dbus.Boolean(False, variant_level=1),
369
 
                                  dbus_interface = client_interface)
 
372
                                  dbus_interface = client_interface,
 
373
                               ignore_reply=True)
370
374
        elif key == "R" or key == "_" or key == "ctrl k":
371
375
            self.server_proxy_object.RemoveClient(self.proxy
372
 
                                                  .object_path)
 
376
                                                  .object_path,
 
377
                                                  ignore_reply=True)
373
378
        elif key == "s":
374
 
            self.proxy.StartChecker(dbus_interface = client_interface)
 
379
            self.proxy.StartChecker(dbus_interface = client_interface,
 
380
                                    ignore_reply=True)
375
381
        elif key == "S":
376
 
            self.proxy.StopChecker(dbus_interface = client_interface)
 
382
            self.proxy.StopChecker(dbus_interface = client_interface,
 
383
                                   ignore_reply=True)
377
384
        elif key == "C":
378
 
            self.proxy.CheckedOK(dbus_interface = client_interface)
 
385
            self.proxy.CheckedOK(dbus_interface = client_interface,
 
386
                                 ignore_reply=True)
379
387
        # xxx
380
388
#         elif key == "p" or key == "=":
381
389
#             self.proxy.pause()