/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

  • Committer: Teddy Hogeborn
  • Date: 2009-01-21 08:10:44 UTC
  • Revision ID: teddy@fukt.bsnet.se-20090121081044-u0dg96r3ethgr0ql
* mandos (Client.bump_timeout): Renamed to "checked_ok".  All callers
                                changed.
  (BumpTimeout): Renamed to "CheckedOK".

Show diffs side-by-side

added added

removed removed

Lines of Context:
mandos
329
329
            if exitstatus == 0:
330
330
                logger.info(u"Checker for %(name)s succeeded",
331
331
                            vars(self))
332
 
                self.bump_timeout()
 
332
                self.checked_ok()
333
333
            else:
334
334
                logger.info(u"Checker for %(name)s failed",
335
335
                            vars(self))
347
347
                                      dbus.Int64(condition),
348
348
                                      dbus.String(command))
349
349
    
350
 
    def bump_timeout(self):
 
350
    def checked_ok(self):
351
351
        """Bump up the timeout for this client.
352
352
        This should only be called when the client has been seen,
353
353
        alive and well.
451
451
    ## D-Bus methods & signals
452
452
    _interface = u"se.bsnet.fukt.Mandos.Client"
453
453
    
454
 
    # BumpTimeout - method
455
 
    BumpTimeout = dbus.service.method(_interface)(bump_timeout)
456
 
    BumpTimeout.__name__ = "BumpTimeout"
 
454
    # CheckedOK - method
 
455
    CheckedOK = dbus.service.method(_interface)(checked_ok)
 
456
    CheckedOK.__name__ = "CheckedOK"
457
457
    
458
458
    # CheckerCompleted - signal
459
459
    @dbus.service.signal(_interface, signature="nxs")
713
713
            session.bye()
714
714
            return
715
715
        ## This won't work here, since we're in a fork.
716
 
        # client.bump_timeout()
 
716
        # client.checked_ok()
717
717
        sent_size = 0
718
718
        while sent_size < len(client.secret):
719
719
            sent = session.send(client.secret[sent_size:])