Changeset 8524 for branches/jingle

Timestamp:

08/21/07 01:14:57 (16 months ago)

Author:

liori

Message:

Jingle: wrongly decoded connection parameters from transport-info

Location:

branches/jingle/src/common

Files:

• jingle.py (modified) (2 diffs)
• xmpp/simplexml.py (modified) (1 diff)

branches/jingle/src/common/jingle.py

@@ -432 +432 @@
                 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)
@@ -541 +544 @@
                         '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']

branches/jingle/src/common/xmpp/simplexml.py

@@ -256 +256 @@
         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. """