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

Jingle: wrongly decoded connection parameters from transport-info

This commit is contained in:
Tomasz Melcer 2007-08-20 23:14:57 +00:00
parent 6a6527e1f3
commit 7f57a9d2e8
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/common/jingle.py
View File

@ -431,21 +431,24 @@ class JingleVoiP(JingleContent):
candidates = []
for candidate in content.getTag('transport').iterTags('candidate'):
cand={
# 'candidate_id': str(self.session.connection.connection.getAnID()),
'candidate_id': candidate['cid'],
'component': int(candidate['component']),
'ip': candidate['ip'],
'port': int(candidate['port']),
'proto': candidate['protocol']=='udp' and farsight.NETWORK_PROTOCOL_UDP \
or farsight.NETWORK_PROTOCOL_TCP,
'proto_subtype':'RTP',
'proto_profile':'AVP',
'preference': float(candidate['priority'])/100000,
# 'type': farsight.CANDIDATE_TYPE_LOCAL,
'type': int(candidate['type']),
'type': farsight.CANDIDATE_TYPE_LOCAL,
}
if 'ufrag' in candidate: cand['username']=candidate['ufrag']
if 'pwd' in candidate: cand['password']=candidate['pwd']
if candidate['protocol']=='udp':
cand['proto']=farsight.NETWORK_PROTOCOL_UDP
else:
# we actually don't handle properly different tcp options in jingle
cand['proto']=farsight.NETWORK_PROTOCOL_TCP
if 'ufrag' in candidate:
cand['username']=candidate['ufrag']
if 'pwd' in candidate:
cand['password']=candidate['pwd']
candidates.append(cand)
print self.session.weinitiate, "#add_remote_candidate"
@ -540,8 +543,12 @@ class JingleVoiP(JingleContent):
'network': '0',
'port': candidate['port'],
'priority': int(100000*candidate['preference']), # hack
'protocol': candidate['proto']==farsight.NETWORK_PROTOCOL_UDP and 'udp' or 'tcp',
}
if candidate['proto']==farsight.NETWORK_PROTOCOL_UDP:
attrs['protocol']='udp'
else:
# we actually don't handle properly different tcp options in jingle
attrs['protocol']='tcp'
if 'username' in candidate: attrs['ufrag']=candidate['username']
if 'password' in candidate: attrs['pwd']=candidate['password']
c=self.__content()

2
src/common/xmpp/simplexml.py
View File

@ -255,7 +255,7 @@ class Node(object):
return self.delAttr(item)
def __contains__(self,item):
""" Checks if node has attribute "item" """
self.has_attr(item)
return self.has_attr(item)
def __getattr__(self,attr):
""" Reduce memory usage caused by T/NT classes - use memory only when needed. """
if attr=='T':