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

add an id to jingle ICE UDP transports

Browse source
This commit is contained in:
Yann Leboulanger 2012-08-31 13:42:44 +02:00
parent 3ec7e2eee4
commit b8adce541f
2 changed files with 8 additions and 1 deletions

6
src/common/gajim.py
View file

@ -222,6 +222,12 @@ caps_hash = {}
import caps_cache import caps_cache
caps_cache.initialize(logger) caps_cache.initialize(logger)
global_id = 0
def get_an_id():
global global_id
global_id += 1
return global_id
def get_nick_from_jid(jid): def get_nick_from_jid(jid):
pos = jid.find('@') pos = jid.find('@')
return jid[:pos] return jid[:pos]

3
src/common/jingle_transport.py
View file

@ -178,7 +178,7 @@ class JingleTransportSocks5(JingleTransport):
local_ip_cand = [] local_ip_cand = []
port = int(gajim.config.get('file_transfers_port')) port = int(gajim.config.get('file_transfers_port'))
#type preference of connection type. XEP-0260 section 2.2 #type preference of connection type. XEP-0260 section 2.2
type_preference = 126 type_preference = 126
c = {'host': self.connection.peerhost[0]} c = {'host': self.connection.peerhost[0]}
c['candidate_id'] = self.connection.connection.getAnID() c['candidate_id'] = self.connection.connection.getAnID()
c['port'] = port c['port'] = port
@ -351,6 +351,7 @@ class JingleTransportICEUDP(JingleTransport):
'network': '0', 'network': '0',
'port': candidate.port, 'port': candidate.port,
'priority': int(candidate.priority), # hack 'priority': int(candidate.priority), # hack
'id': gajim.get_an_id()
} }
if candidate.type in types: if candidate.type in types:
attrs['type'] = types[candidate.type] attrs['type'] = types[candidate.type]