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

implement legacy pep protocol (v1.3). Fixes #4146

Browse source
This commit is contained in:
Yann Leboulanger 2008-08-04 22:06:54 +00:00
parent ebe0f96e5c
commit e13c472e2c
1 changed files with 39 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/common/caps.py
View file

@ -171,12 +171,18 @@ class CapsCache(object):
''' Preload data about (node, ver, exts) caps using disco ''' Preload data about (node, ver, exts) caps using disco
query to jid using proper connection. Don't query if query to jid using proper connection. Don't query if
the data is already in cache. ''' the data is already in cache. '''
if hash_method == 'old':
q = self[(hash_method, node + '#' + hash)]
else:
q = self[(hash_method, hash)] q = self[(hash_method, hash)]
if q.queried==0: if q.queried==0:
# do query for bare node+hash pair # do query for bare node+hash pair
# this will create proper object # this will create proper object
q.queried=1 q.queried=1
if hash_method == 'old':
con.discoverInfo(jid)
else:
con.discoverInfo(jid, '%s#%s' % (node, hash)) con.discoverInfo(jid, '%s#%s' % (node, hash))
def is_supported(self, contact, feature): def is_supported(self, contact, feature):
@ -195,8 +201,11 @@ class CapsCache(object):
# This is the "Asterix way", after 0.12 release, I will # This is the "Asterix way", after 0.12 release, I will
# likely implement a fallback to disco (could be disabled # likely implement a fallback to disco (could be disabled
# for mobile users who pay for traffic) # for mobile users who pay for traffic)
features = self[(contact.caps_hash_method, if contact.caps_hash_method == 'old':
features = self[(contact.caps_hash_method, contact.caps_node + '#' + \
contact.caps_hash)].features contact.caps_hash)].features
else:
features = self[(contact.caps_hash_method, contact.caps_hash)].features
if feature in features or features == []: if feature in features or features == []:
return True return True
@ -214,8 +223,7 @@ class ConnectionCaps(object):
# for disco... so that disco will learn how to interpret # for disco... so that disco will learn how to interpret
# these caps # these caps
jid = helpers.get_full_jid_from_iq(presence) jid = helpers.get_full_jid_from_iq(presence)
contact = gajim.contacts.get_contact_from_full_jid( contact = gajim.contacts.get_contact_from_full_jid(self.name, jid)
self.name, jid)
if contact is None: if contact is None:
room_jid, nick = gajim.get_room_and_nick_from_fjid(jid) room_jid, nick = gajim.get_room_and_nick_from_fjid(jid)
contact = gajim.contacts.get_gc_contact( contact = gajim.contacts.get_gc_contact(
@ -233,8 +241,11 @@ class ConnectionCaps(object):
contact.hash_method = None contact.hash_method = None
return return
hash_method, node, hash = \ hash_method, node, hash = caps['hash'], caps['node'], caps['ver']
caps['hash'], caps['node'], caps['ver']
if hash_method is None and node and hash:
# Old XEP-115 implentation
hash_method = 'old'
if hash_method is None or node is None or hash is None: if hash_method is None or node is None or hash is None:
# improper caps in stanza, ignoring # improper caps in stanza, ignoring
@ -260,8 +271,10 @@ class ConnectionCaps(object):
return return
if not contact.caps_node: if not contact.caps_node:
return # we didn't asked for that? return # we didn't asked for that?
if not node.startswith(contact.caps_node + '#'): if contact.caps_hash_method != 'old' and not node.startswith(
contact.caps_node + '#'):
return return
if contact.caps_hash_method != 'old':
node, hash = node.split('#', 1) node, hash = node.split('#', 1)
computed_hash = helpers.compute_caps_hash(identities, features, computed_hash = helpers.compute_caps_hash(identities, features,
dataforms=dataforms, hash_method=contact.caps_hash_method) dataforms=dataforms, hash_method=contact.caps_hash_method)
@ -271,9 +284,12 @@ class ConnectionCaps(object):
contact.caps_hash_method = '' contact.caps_hash_method = ''
contact.caps_hash = '' contact.caps_hash = ''
return return
# if we don't have this info already... # if we don't have this info already...
caps = gajim.capscache[(contact.caps_hash_method, hash)] caps = gajim.capscache[(contact.caps_hash_method, contact.caps_hash)]
else:
# if we don't have this info already...
caps = gajim.capscache[(contact.caps_hash_method, contact.caps_node + \
'#' + contact.caps_hash)]
if caps.queried == 2: if caps.queried == 2:
return return