Author: liori Date: 2007-08-21 01:14:57 +0200 (Tue, 21 Aug 2007) New Revision: 8524

Modified: branches/jingle/src/common/jingle.py branches/jingle/src/common/xmpp/simplexml.py Log: Jingle: wrongly decoded connection parameters from transport-info

Modified: branches/jingle/src/common/jingle.py =================================================================== --- branches/jingle/src/common/jingle.py 2007-08-20 23:06:08 UTC (rev 8523) +++ branches/jingle/src/common/jingle.py 2007-08-20 23:14:57 UTC (rev 8524) @@ -431,21 +431,24 @@ 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 @@ '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()

Modified: branches/jingle/src/common/xmpp/simplexml.py =================================================================== --- branches/jingle/src/common/xmpp/simplexml.py 2007-08-20 23:06:08 UTC (rev 8523) +++ branches/jingle/src/common/xmpp/simplexml.py 2007-08-20 23:14:57 UTC (rev 8524) @@ -255,7 +255,7 @@ 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':