copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

define pubkey callbacks

This commit is contained in:
Zhenchao Li 2010-08-08 16:42:30 +08:00
parent a3e5e42375
commit 4fa60f9b3d
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/common/connection_handlers.py
View File

@ -183,7 +183,9 @@ class ConnectionDisco:
query.setAttr('node', 'http://gajim.org#' + gajim.version.split('-', 1)[0]) query.setAttr('node', 'http://gajim.org#' + gajim.version.split('-', 1)[0])
for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI, for f in (common.xmpp.NS_BYTESTREAM, common.xmpp.NS_SI,
common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS, common.xmpp.NS_FILE, common.xmpp.NS_COMMANDS,
common.xmpp.NS_JINGLE_FILE_TRANSFER, common.xmpp.NS_JINGLE_XTLS): common.xmpp.NS_JINGLE_FILE_TRANSFER, common.xmpp.NS_JINGLE_XTLS,
common.xmpp.NS_PUBKEY_PUBKEY, common.xmpp.NS_PUBKEY_REVOKE,
common.xmpp.NS_PUBKEY_ATTEST):
feature = common.xmpp.Node('feature') feature = common.xmpp.Node('feature')
feature.setAttr('var', f) feature.setAttr('var', f)
query.addChild(node=feature) query.addChild(node=feature)
@ -2239,6 +2241,12 @@ ConnectionCaps, ConnectionHandlersBase, ConnectionJingle):
df[i.getName()] = i.getData() df[i.getName()] = i.getData()
self.dispatch('SEARCH_FORM', (jid, df, False)) self.dispatch('SEARCH_FORM', (jid, df, False))
def _PubkeyGetCB(self, con, obj):
log.info('PubkeyGetCB')
def _PubkeyResultCB(self, con, obj):
log.info('PubkeyResultCB')
def _StreamCB(self, con, obj): def _StreamCB(self, con, obj):
if obj.getTag('conflict'): if obj.getTag('conflict'):
# disconnected because of a resource conflict # disconnected because of a resource conflict
@ -2334,3 +2342,6 @@ ConnectionCaps, ConnectionHandlersBase, ConnectionJingle):
con.RegisterHandler('presence', self._StanzaArrivedCB) con.RegisterHandler('presence', self._StanzaArrivedCB)
con.RegisterHandler('message', self._StanzaArrivedCB) con.RegisterHandler('message', self._StanzaArrivedCB)
con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams') con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams')
con.RegisterHandler('iq', self._PubkeyGetCB, 'get', common.xmpp.NS_PUBKEY_PUBKEY)
con.RegisterHandler('iq', self._PubkeyResultCB, 'result', common.xmpp.NS_PUBKEY_PUBKEY)

4
src/common/xmpp/protocol.py
View File

@ -131,6 +131,10 @@ NS_DATA_LAYOUT ='http://jabber.org/protocol/xdata-layout'
NS_DATA_VALIDATE='http://jabber.org/protocol/xdata-validate' # XEP-0122 NS_DATA_VALIDATE='http://jabber.org/protocol/xdata-validate' # XEP-0122
NS_XMPP_STREAMS ='urn:ietf:params:xml:ns:xmpp-streams' NS_XMPP_STREAMS ='urn:ietf:params:xml:ns:xmpp-streams'
NS_RECEIPTS ='urn:xmpp:receipts' NS_RECEIPTS ='urn:xmpp:receipts'
NS_PUBKEY_PUBKEY='urn:xmpp:pubkey:2' # XEP-0189
NS_PUBKEY_REVOKE='urn:xmpp:revoke:2'
NS_PUBKEY_ATTEST='urn:xmpp:attest:2'
xmpp_stream_error_conditions = ''' xmpp_stream_error_conditions = '''
bad-format -- -- -- The entity has sent XML that cannot be processed. bad-format -- -- -- The entity has sent XML that cannot be processed.