/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-list

  • Committer: Teddy Hogeborn
  • Date: 2009-01-14 14:20:17 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090114142017-84t4kfw56bsftjlo
Fixes for sscanf usage:

* plugin-runner.c (main): Parse numbers correctly and portably using
                          an intermediate "intmax_t".  Cast "pid_t" to
                          "intmax_t" before passing it to "printf()".
* plugins.d/mandos-client.c (main): Parse numbers correctly and
                                    portably using an intermediate
                                    "intmax_t".  Bug fix: cast
                                    "AvahiIfIndex" to "intmax_t" and
                                    use "PRIdMAX" instead of using
                                    "PRIu16", and use "PRIu16" to
                                    format port number.
* plugins.d/splashy.c (main): Parse numbers correctly and portably
                              using an intermediate "intmax_t".
* plugins.d/usplash.c (main): - '' -

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
#!/usr/bin/python
 
2
# -*- mode: python; coding: utf-8 -*-
 
3
 
 
4
import dbus
 
5
from optparse import OptionParser
 
6
import locale
 
7
 
 
8
locale.setlocale(locale.LC_ALL, u'')
 
9
 
 
10
tablewords = {
 
11
    'name': u'Name',
 
12
    'enabled': u'Enabled',
 
13
    'timeout': u'Timeout',
 
14
    'last_checked_ok': u'Last Successful Check',
 
15
    'created': u'Created',
 
16
    'interval': u'Interval',
 
17
    'host': u'Host',
 
18
    'fingerprint': u'Fingerprint',
 
19
    'checker_running': u'Check Is Running',
 
20
    'last_enabled': u'Last Enabled',
 
21
    'checker': u'Checker',
 
22
    }
 
23
busname = 'org.mandos-system.Mandos'
 
24
object_path = '/Mandos'
 
25
interface = 'org.mandos_system.Mandos'
 
26
version = "1.0.2"
 
27
defaultkeywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
 
28
                   'checker')
 
29
 
 
30
parser = OptionParser(version = "%%prog %s" % version)
 
31
parser.add_option("-a", "--all", action="store_true", default=False,
 
32
                  help="Print all fields")
 
33
options = parser.parse_args()[0]
 
34
if options.all:
 
35
    keywords = ('name', 'enabled', 'timeout', 'last_checked_ok',
 
36
                'created', 'interval', 'host', 'fingerprint',
 
37
                'checker_running', 'last_enabled', 'checker')
 
38
else:
 
39
    keywords = defaultkeywords
 
40
 
 
41
 
 
42
bus = dbus.SystemBus()
 
43
mandos_dbus_objc = bus.get_object(busname, object_path)
 
44
mandos_serv = dbus.Interface(mandos_dbus_objc,
 
45
                             dbus_interface = interface)
 
46
mandos_clients = mandos_serv.GetAllClientsWithProperties()
 
47
 
 
48
def valuetostring(x):
 
49
    if type(x) is dbus.Boolean:
 
50
        return u"Yes" if x else u"No"
 
51
    else:
 
52
        return unicode(x)
 
53
 
 
54
format_string = u' '.join(u'%%-%ds'
 
55
                         % max(len(tablewords[key]),
 
56
                               max(len(valuetostring(client[key]))
 
57
                                   for client
 
58
                                   in mandos_clients.itervalues()))
 
59
                         for key in keywords)
 
60
print format_string % tuple(tablewords[key] for key in keywords) 
 
61
for client in mandos_clients.itervalues():
 
62
    print format_string % tuple(valuetostring(client[key])
 
63
                                for key in keywords)
 
64
 
 
65