/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: 2010-06-19 00:37:04 UTC
  • mto: (24.1.149 mandos)
  • mto: This revision was merged to the branch mainline in revision 417.
  • Revision ID: teddy@fukt.bsnet.se-20100619003704-vpicvssvv1ktg2om
* mandos (ClientHandler.handle): Set up the GnuTLS session object
                                 before reading the protocol number.
 (ClientHandler.handle/ProxyObject): New.

Show diffs side-by-side

added added

removed removed

Lines of Context:
193
193
        self.group.Commit()
194
194
    def entry_group_state_changed(self, state, error):
195
195
        """Derived from the Avahi example code"""
196
 
        logger.debug(u"Avahi entry group state change: %i", state)
 
196
        logger.debug(u"Avahi state change: %i", state)
197
197
        
198
198
        if state == avahi.ENTRY_GROUP_ESTABLISHED:
199
199
            logger.debug(u"Zeroconf service established.")
212
212
            self.group = None
213
213
    def server_state_changed(self, state):
214
214
        """Derived from the Avahi example code"""
215
 
        logger.debug(u"Avahi server state change: %i", state)
216
215
        if state == avahi.SERVER_COLLISION:
217
216
            logger.error(u"Zeroconf server name collision")
218
217
            self.remove()