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

Change ConnectionJingle.__sessions keys from (jid, sid) to sid.

This commit is contained in:
Thibaut GIRKA 2010-03-14 21:51:04 +01:00
parent d3e91d90a8
commit 6e5d8c4ce0
2 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/common/jingle.py
View File

@ -43,32 +43,23 @@ class ConnectionJingle(object):
""" """
def __init__(self): def __init__(self):
# dictionary: (jid, sessionid) => JingleSession object # dictionary: sessionid => JingleSession object
self.__sessions = {} self.__sessions = {}
# dictionary: (jid, iq stanza id) => JingleSession object, # dictionary: (jid, iq stanza id) => JingleSession object,
# one time callbacks # one time callbacks
self.__iq_responses = {} self.__iq_responses = {}
def add_jingle(self, jingle): def delete_jingle_session(self, sid):
"""
Add a jingle session to a jingle stanza dispatcher
jingle - a JingleSession object.
"""
self.__sessions[(jingle.peerjid, jingle.sid)] = jingle
def delete_jingle_session(self, peerjid, sid):
""" """
Remove a jingle session from a jingle stanza dispatcher Remove a jingle session from a jingle stanza dispatcher
""" """
key = (peerjid, sid) if sid in self.__sessions:
if key in self.__sessions:
#FIXME: Move this elsewhere? #FIXME: Move this elsewhere?
for content in self.__sessions[key].contents.values(): for content in self.__sessions[sid].contents.values():
content.destroy() content.destroy()
self.__sessions[key].callbacks = [] self.__sessions[sid].callbacks = []
del self.__sessions[key] del self.__sessions[sid]
def _JingleCB(self, con, stanza): def _JingleCB(self, con, stanza):
""" """
@ -94,13 +85,13 @@ class ConnectionJingle(object):
sid = jingle.getAttr('sid') sid = jingle.getAttr('sid')
# do we need to create a new jingle object # do we need to create a new jingle object
if (jid, sid) not in self.__sessions: if sid not in self.__sessions:
#TODO: tie-breaking and other things... #TODO: tie-breaking and other things...
newjingle = JingleSession(con=self, weinitiate=False, jid=jid, sid=sid) newjingle = JingleSession(con=self, weinitiate=False, jid=jid, sid=sid)
self.add_jingle(newjingle) self.__sessions[sid] = newjingle
# we already have such session in dispatcher... # we already have such session in dispatcher...
self.__sessions[(jid, sid)].on_stanza(stanza) self.__sessions[sid].on_stanza(stanza)
raise xmpp.NodeProcessed raise xmpp.NodeProcessed
@ -112,7 +103,7 @@ class ConnectionJingle(object):
jingle.add_content('voice', JingleAudio(jingle)) jingle.add_content('voice', JingleAudio(jingle))
else: else:
jingle = JingleSession(self, weinitiate=True, jid=jid) jingle = JingleSession(self, weinitiate=True, jid=jid)
self.add_jingle(jingle) self.__sessions[jingle.sid] = jingle
jingle.add_content('voice', JingleAudio(jingle)) jingle.add_content('voice', JingleAudio(jingle))
jingle.start_session() jingle.start_session()
return jingle.sid return jingle.sid
@ -125,15 +116,15 @@ class ConnectionJingle(object):
jingle.add_content('video', JingleVideo(jingle)) jingle.add_content('video', JingleVideo(jingle))
else: else:
jingle = JingleSession(self, weinitiate=True, jid=jid) jingle = JingleSession(self, weinitiate=True, jid=jid)
self.add_jingle(jingle) self.__sessions[jingle.sid] = jingle
jingle.add_content('video', JingleVideo(jingle)) jingle.add_content('video', JingleVideo(jingle))
jingle.start_session() jingle.start_session()
return jingle.sid return jingle.sid
def get_jingle_session(self, jid, sid=None, media=None): def get_jingle_session(self, jid, sid=None, media=None):
if sid: if sid:
if (jid, sid) in self.__sessions: if sid in self.__sessions:
return self.__sessions[(jid, sid)] return self.__sessions[sid]
else: else:
return None return None
elif media: elif media:

6
src/common/jingle_session.py
View File

@ -320,7 +320,7 @@ class JingleSession(object):
self.__dispatch_error(xmpp_error, jingle_error, text) self.__dispatch_error(xmpp_error, jingle_error, text)
# FIXME: Not sure when we would want to do that... # FIXME: Not sure when we would want to do that...
if xmpp_error == 'item-not-found': if xmpp_error == 'item-not-found':
self.connection.delete_jingle_session(self.peerjid, self.sid) self.connection.delete_jingle_session(self.sid)
def __on_transport_replace(self, stanza, jingle, error, action): def __on_transport_replace(self, stanza, jingle, error, action):
for content in jingle.iterTags('content'): for content in jingle.iterTags('content'):
@ -454,7 +454,7 @@ class JingleSession(object):
cn.on_stanza(stanza, content, error, action) cn.on_stanza(stanza, content, error, action)
def __on_session_terminate(self, stanza, jingle, error, action): def __on_session_terminate(self, stanza, jingle, error, action):
self.connection.delete_jingle_session(self.peerjid, self.sid) self.connection.delete_jingle_session(self.sid)
reason, text = self.__reason_from_stanza(jingle) reason, text = self.__reason_from_stanza(jingle)
if reason not in ('success', 'cancel', 'decline'): if reason not in ('success', 'cancel', 'decline'):
self.__dispatch_error(reason, reason, text) self.__dispatch_error(reason, reason, text)
@ -608,7 +608,7 @@ class JingleSession(object):
text = '%s (%s)' % (reason, text) text = '%s (%s)' % (reason, text)
else: else:
text = reason text = reason
self.connection.delete_jingle_session(self.peerjid, self.sid) self.connection.delete_jingle_session(self.sid)
self.connection.dispatch('JINGLE_DISCONNECTED', self.connection.dispatch('JINGLE_DISCONNECTED',
(self.peerjid, self.sid, None, text)) (self.peerjid, self.sid, None, text))