Commits July 2009

commits@gajim.org

5 participants
169 discussions

gajim: when sending file, try to bind ipv6 first. see #1969
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 8e8c571c93a3 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8e8c571c93a3 description: when sending file, try to bind ipv6 first. see #1969 diffstat: src/common/socks5.py | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diffs (11 lines): diff -r 55add7495c03 -r 8e8c571c93a3 src/common/socks5.py --- a/src/common/socks5.py Mon Jun 29 07:57:10 2009 +0200 +++ b/src/common/socks5.py Sun Jul 05 11:57:12 2009 +0200 @@ -792,6 +792,7 @@ self.port = port self.ais = socket.getaddrinfo(None, port, socket.AF_UNSPEC, socket.SOCK_STREAM, socket.SOL_TCP, socket.AI_PASSIVE) + self.ais.sort(reverse=True) # Try IPv6 first self.queue_idx = -1 self.idlequeue = idlequeue self.queue = None

1 0

gajim: ignore <iq> without an ID. They are required by RFC. Fixe...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 55add7495c03 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=55add7495c03 description: ignore <iq> without an ID. They are required by RFC. Fixes #5122 diffstat: src/common/connection_handlers.py | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diffs (13 lines): diff -r 0e358a669575 -r 55add7495c03 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Mon Jun 29 06:31:36 2009 +0200 +++ b/src/common/connection_handlers.py Mon Jun 29 07:57:10 2009 +0200 @@ -840,6 +840,9 @@ gajim.transport_type[jid] = transport_type gajim.logger.save_transport_type(jid, transport_type) id = iq_obj.getID() + if id is None: + log.warn('Invalid IQ received without an ID. Ignoring it: %s' % iq_obj) + return if not identities: # ejabberd doesn't send identities when we browse online users #FIXME: see http://www.jabber.ru/bugzilla/show_bug.cgi?id=225 identities = [{'category': 'server', 'type': 'im', 'name': node}]

1 0

gajim: Fixed bug when national character (non-ASCII) was entered...
by vardo＠lagaule.org 21 Jul '09

21 Jul '09

changeset 0e358a669575 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=0e358a669575 description: Fixed bug when national character (non-ASCII) was entered which search string in ACE (comparison with descriptions, which are unicode, was not possible). It seems that this was Win32 specific (tested on Vista64). diffstat: src/advanced.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 5cbc539bbe61 -r 0e358a669575 src/advanced.py --- a/src/advanced.py Sun Jun 28 16:01:43 2009 +0200 +++ b/src/advanced.py Mon Jun 29 06:31:36 2009 +0200 @@ -267,7 +267,7 @@ self.model.append(parent, [name, value, type_]) def visible_func(self, model, treeiter): - search_string = self.entry.get_text().lower() + search_string = self.entry.get_text().decode('utf-8').lower() for it in tree_model_pre_order(model,treeiter): if model[it][C_TYPE] != '': opt_path = self.get_option_path(model, it)

1 0

gajim: add missing facebook icon
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 5cbc539bbe61 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=5cbc539bbe61 description: add missing facebook icon diffstat: data/pixmaps/agents/facebook.png | 1 files changed, 0 insertions(+), 0 deletions(-) diffs (2 lines): diff -r 3db0e9f71ac4 -r 5cbc539bbe61 data/pixmaps/agents/facebook.png Binary file data/pixmaps/agents/facebook.png has changed

1 0

gajim: [Spike411] Facebook iconset for Gajim. A great thanks to ...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 3db0e9f71ac4 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=3db0e9f71ac4 description: [Spike411] Facebook iconset for Gajim. A great thanks to Jakub Szypulka for is iconset: http://cubestuff.wordpress.com/2008/05/21/facebook-goes-tango/ diffstat: THANKS.artists | 1 + data/iconsets/transports/facebook/16x16/away.png | data/iconsets/transports/facebook/16x16/chat.png | data/iconsets/transports/facebook/16x16/dnd.png | data/iconsets/transports/facebook/16x16/not_in_roster.png | data/iconsets/transports/facebook/16x16/offline.png | data/iconsets/transports/facebook/16x16/online.png | data/iconsets/transports/facebook/16x16/xa.png | data/iconsets/transports/facebook/32x32/away.png | data/iconsets/transports/facebook/32x32/chat.png | data/iconsets/transports/facebook/32x32/dnd.png | data/iconsets/transports/facebook/32x32/not_in_roster.png | data/iconsets/transports/facebook/32x32/offline.png | data/iconsets/transports/facebook/32x32/online.png | data/iconsets/transports/facebook/32x32/xa.png | data/iconsets/transports/facebook/48x48/offline.png | data/iconsets/transports/facebook/48x48/online.png | src/common/gajim.py | 6 ++++-- src/disco.py | 2 ++ 19 files changed, 7 insertions(+), 2 deletions(-) diffs (80 lines): diff -r add7de82daaf -r 3db0e9f71ac4 THANKS.artists --- a/THANKS.artists Fri Jun 26 19:33:22 2009 +0200 +++ b/THANKS.artists Sat Jun 27 09:50:50 2009 +0200 @@ -5,3 +5,4 @@ Josef Vybíral Membris Khan Rederick Asher +Jakub Szypulka diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/16x16/away.png Binary file data/iconsets/transports/facebook/16x16/away.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/16x16/chat.png Binary file data/iconsets/transports/facebook/16x16/chat.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/16x16/dnd.png Binary file data/iconsets/transports/facebook/16x16/dnd.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/16x16/not_in_roster.png Binary file data/iconsets/transports/facebook/16x16/not_in_roster.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/16x16/offline.png Binary file data/iconsets/transports/facebook/16x16/offline.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/16x16/online.png Binary file data/iconsets/transports/facebook/16x16/online.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/16x16/xa.png Binary file data/iconsets/transports/facebook/16x16/xa.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/32x32/away.png Binary file data/iconsets/transports/facebook/32x32/away.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/32x32/chat.png Binary file data/iconsets/transports/facebook/32x32/chat.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/32x32/dnd.png Binary file data/iconsets/transports/facebook/32x32/dnd.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/32x32/not_in_roster.png Binary file data/iconsets/transports/facebook/32x32/not_in_roster.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/32x32/offline.png Binary file data/iconsets/transports/facebook/32x32/offline.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/32x32/online.png Binary file data/iconsets/transports/facebook/32x32/online.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/32x32/xa.png Binary file data/iconsets/transports/facebook/32x32/xa.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/48x48/offline.png Binary file data/iconsets/transports/facebook/48x48/offline.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 data/iconsets/transports/facebook/48x48/online.png Binary file data/iconsets/transports/facebook/48x48/online.png has changed diff -r add7de82daaf -r 3db0e9f71ac4 src/common/gajim.py --- a/src/common/gajim.py Fri Jun 26 19:33:22 2009 +0200 +++ b/src/common/gajim.py Sat Jun 27 09:50:50 2009 +0200 @@ -345,12 +345,14 @@ host = host_splitted[0] if host in ('aim', 'irc', 'icq', 'msn', 'sms', 'tlen', 'weather', 'yahoo', - 'mrim'): + 'mrim', 'facebook'): return host elif host == 'gg': return 'gadu-gadu' elif host == 'jit': return 'icq' + elif host == 'facebook': + return 'facebook' else: return None @@ -385,7 +387,7 @@ def get_notification_image_prefix(jid): '''returns the prefix for the notification images''' transport_name = get_transport_name_from_jid(jid) - if transport_name in ('aim', 'icq', 'msn', 'yahoo'): + if transport_name in ('aim', 'icq', 'msn', 'yahoo', 'facebook'): prefix = transport_name else: prefix = 'jabber' diff -r add7de82daaf -r 3db0e9f71ac4 src/disco.py --- a/src/disco.py Fri Jun 26 19:33:22 2009 +0200 +++ b/src/disco.py Sat Jun 27 09:50:50 2009 +0200 @@ -109,6 +109,8 @@ ('_jid', 'yahoo'): (False, 'yahoo.png'), ('gateway', 'mrim'): (False, 'mrim.png'), ('_jid', 'mrim'): (False, 'mrim.png'), + ('gateway', 'facebook'): (False, 'facebook.png'), + ('_jid', 'facebook'): (False, 'facebook.png'), } # Category type to "human-readable" description string, and sort priority

1 0

gajim: do not request XEP-0012 when there are several resources
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset add7de82daaf in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=add7de82daaf description: do not request XEP-0012 when there are several resources diffstat: src/vcard.py | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diffs (12 lines): diff -r 8e7b127abbc1 -r add7de82daaf src/vcard.py --- a/src/vcard.py Thu Jun 25 19:28:23 2009 +0200 +++ b/src/vcard.py Fri Jun 26 19:33:22 2009 +0200 @@ -379,8 +379,6 @@ gobject.idle_add( gajim.connections[self.account].request_os_info, c.jid, c.resource) - gajim.connections[self.account].request_last_status_time(c.jid, - c.resource) self.os_info[i] = {'resource': c.resource, 'client': '', 'os': ''} i += 1

1 0

gajim: enable / disable ping_alives_enable too when (un)checking...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 8e7b127abbc1 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8e7b127abbc1 description: enable / disable ping_alives_enable too when (un)checking send keep alives in account modification window. Fixes #5100 diffstat: src/config.py | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diffs (12 lines): diff -r 8a51cf2917b9 -r 8e7b127abbc1 src/config.py --- a/src/config.py Tue Jul 21 19:29:11 2009 +0200 +++ b/src/config.py Thu Jun 25 19:28:23 2009 +0200 @@ -2041,6 +2041,8 @@ return self.on_checkbutton_toggled(widget, 'keep_alives_enabled', account=self.current_account) + gajim.config.set_per('accounts', self.current_account, + 'ping_alives_enabled', widget.get_active()) def on_custom_host_port_checkbutton1_toggled(self, widget): if self.option_changed('use_custom_host', widget.get_active()):

1 0

gajim: fix typo that prevent file transfer proxy discovering at ...
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 8a51cf2917b9 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=8a51cf2917b9 description: fix typo that prevent file transfer proxy discovering at startup. Fixes #4424 diffstat: src/common/connection_handlers.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diffs (12 lines): diff -r 9b4423fafd6b -r 8a51cf2917b9 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Sat Jun 27 11:28:43 2009 +0200 +++ b/src/common/connection_handlers.py Tue Jul 21 19:29:11 2009 +0200 @@ -737,7 +737,7 @@ hostname = gajim.config.get_per('accounts', self.name, 'hostname') id = iq_obj.getID() - if jid == hostname and id[0] == 'Gajim_': + if jid == hostname and id[:6] == 'Gajim_': for item in items: self.discoverInfo(item['jid'], id_prefix='Gajim_') else:

1 0

gajim: re-organize whiteboard callbacks
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 33412ebb9476 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=33412ebb9476 description: re-organize whiteboard callbacks diffstat: src/chat_control.py | 2 +- src/common/connection_handlers.py | 13 ++---- src/common/jingle.py | 55 ++++++++++++++++++++++++--- src/gajim.py | 1 + 4 files changed, 56 insertions(+), 15 deletions(-) diffs (176 lines): diff -r 236a04e1fa69 -r 33412ebb9476 src/chat_control.py --- a/src/chat_control.py Tue Jul 21 16:23:34 2009 +0200 +++ b/src/chat_control.py Tue Jul 21 18:11:50 2009 +0200 @@ -2750,7 +2750,7 @@ def _on_whiteboard_button_clicked(self, widget): gajim.connections[self.account].startWhiteboard( - self.contact.get_full_jid()) + self.contact.get_full_jid(), self) def draw_whiteboard(self, session): hbox = self.xml.get_widget('chat_child_hbox') diff -r 236a04e1fa69 -r 33412ebb9476 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jul 21 16:23:34 2009 +0200 +++ b/src/common/connection_handlers.py Tue Jul 21 18:11:50 2009 +0200 @@ -1788,6 +1788,11 @@ self._HttpAuthCB(con, msg) return + # Whiteboard Handler + if msg.getTag('sxe', namespace='urn:xmpp:tmp:sxe'): + self._whiteboardCB(con, msg) + return + try: frm = helpers.get_full_jid_from_iq(msg) jid = helpers.get_jid_from_iq(msg) @@ -1933,10 +1938,6 @@ self._on_message_decrypted((msgtxt, encrypted), mtype, msg, session, frm, jid, invite, tim) - # Whiteboard Handler - if msg.getTag('sxe', namespace='urn:xmpp:tmp:sxe'): - self._whiteboardCB(con, msg) - def _on_message_decrypted(self, output, mtype, msg, session, frm, jid, invite, tim): msgtxt, encrypted = output @@ -2655,8 +2656,4 @@ con.RegisterHandler('message', self._StanzaArrivedCB) con.RegisterHandler('unknown', self._StreamCB, 'urn:ietf:params:xml:ns:xmpp-streams', xmlns='http://etherx.jabber.org/streams') - def _whiteboardCB(self, con, msg): - # Handles whiteboard messages - print 'got whiteboard message' - # vim: se ts=3: diff -r 236a04e1fa69 -r 33412ebb9476 src/common/jingle.py --- a/src/common/jingle.py Tue Jul 21 16:23:34 2009 +0200 +++ b/src/common/jingle.py Tue Jul 21 18:11:50 2009 +0200 @@ -20,6 +20,8 @@ import xmpp import urllib +from common import helpers + import logging log = logging.getLogger('gajim.c.jingle') @@ -327,10 +329,11 @@ class JingleWhiteboard(JingleContent): ''' Jingle Whiteboard sessions consist of xhtml content''' - def __init__(self, session, node=None): - JingleContent.__init__(self, session, node) + def __init__(self, session, control=None): + JingleContent.__init__(self, session) self.negotiated = True # there is nothing to negotiate self.last_rid = 0 + self.control = control def stanzaCB(self, stanza, content, error, action): ''' Called when something related to our content was sent by peer. ''' @@ -343,6 +346,7 @@ 'transport-info': [], 'iq-result': [], 'iq-error': [], + 'edit': [self.__editCB], # these are called when *we* sent these stanzas 'session-initiate-sent': [self.__sessionInitiateSentCB], 'session-accept-sent': [self.__sessionInitiateSentCB], @@ -351,6 +355,10 @@ for callback in callbacks: callback(stanza, content, error, action) + def __editCB(self, stanza, content, error, action): + log.debug('got a whiteboard edit') + #TODO: extract data, draw it. We have self.control which point to the ChatControl + def __sessionAcceptCB(self, stanza, content, error, action): log.debug('session accepted') self.session.connection.dispatch('WHITEBOARD_ACCEPTED', @@ -655,7 +663,11 @@ route it adequatelly.''' # get data - jid = stanza.getFrom() + try: + jid = helpers.get_full_jid_from_iq(stanza) + except helpers.InvalidFormat: + self.dispatch('ERROR', (_('Invalid Jabber ID'), + _('A message from a non-valid JID arrived, it has been ignored.'))) id = stanza.getID() if (jid, id) in self.__iq_responses.keys(): @@ -664,7 +676,8 @@ raise xmpp.NodeProcessed jingle = stanza.getTag('jingle') - if not jingle: return + if not jingle: + return sid = jingle.getAttr('sid') # do we need to create a new jingle object @@ -677,6 +690,36 @@ raise xmpp.NodeProcessed + def _whiteboardCB(self, con, msg): + # Handles whiteboard messages + log.debug('_whiteboardCB') + try: + jid = helpers.get_full_jid_from_iq(msg) + except helpers.InvalidFormat: + self.dispatch('ERROR', (_('Invalid Jabber ID'), + _('A message from a non-valid JID arrived, it has been ignored.'))) + + sxe = msg.getTag('sxe') + if not sxe: + return + sid = sxe.getAttr('session') + if (jid, sid) not in self.__sessions: + newjingle = JingleSession(con=self, weinitiate=False, jid=jid, sid=sid) + self.addJingle(newjingle) + + # we already have such session in dispatcher... + session = self.__sessions[(jid, sid)] + cn = session.contents[('initiator', 'xhtml')] + error = msg.getTag('error') + if error: + action = 'iq-error' + else: + action = 'edit' + + cn.stanzaCB(msg, sxe, error, action) + + raise xmpp.NodeProcessed + def addJingleIqCallback(self, jid, id, jingle): self.__iq_responses[(jid, id)]=jingle @@ -686,10 +729,10 @@ jingle.addContent('voice', JingleVoiP(jingle)) jingle.startSession() - def startWhiteboard(self, jid): + def startWhiteboard(self, jid, control): jingle = JingleSession(self, weinitiate=True, jid=jid) self.addJingle(jingle) - jingle.addContent('xhtml', JingleWhiteboard(jingle)) + jingle.addContent('xhtml', JingleWhiteboard(jingle, control)) jingle.startSession() def getJingleSession(self, jid, sid): diff -r 236a04e1fa69 -r 33412ebb9476 src/gajim.py --- a/src/gajim.py Tue Jul 21 16:23:34 2009 +0200 +++ b/src/gajim.py Tue Jul 21 18:11:50 2009 +0200 @@ -2265,6 +2265,7 @@ self.new_chat_from_jid(account, jid) ctrl = self.msg_win_mgr.get_control(jid, account) session = session.contents[('initiator', 'xhtml')] + session.control = ctrl ctrl.draw_whiteboard(session) def on_cancel():

1 0

gajim: implement jingle negociation for whiteboard
by Yann Leboulanger 21 Jul '09

21 Jul '09

changeset 236a04e1fa69 in /home/hg/repos/gajim details:http://hg.gajim.org/gajim?cmd=changeset;node=236a04e1fa69 description: implement jingle negociation for whiteboard diffstat: src/chat_control.py | 8 +- src/common/connection_handlers.py | 10 +- src/common/jingle.py | 699 +++++++++++++++++++++++++++++++++++++++++++ src/common/xmpp/protocol.py | 6 + src/common/xmpp/simplexml.py | 3 + src/dialogs.py | 31 + src/gajim.py | 114 +++++++- src/whiteboardwidget.py | 44 +-- 8 files changed, 868 insertions(+), 47 deletions(-) diffs (truncated from 1045 to 300 lines): diff -r 77f805b84006 -r 236a04e1fa69 src/chat_control.py --- a/src/chat_control.py Tue Jul 21 15:58:30 2009 +0200 +++ b/src/chat_control.py Tue Jul 21 16:23:34 2009 +0200 @@ -2749,14 +2749,18 @@ self.print_conversation(')', 'status', simple=True) def _on_whiteboard_button_clicked(self, widget): + gajim.connections[self.account].startWhiteboard( + self.contact.get_full_jid()) + + def draw_whiteboard(self, session): hbox = self.xml.get_widget('chat_child_hbox') if len(hbox.get_children()) == 1: - whiteboard = Whiteboard(self.account, self.contact) + whiteboard = Whiteboard(self.account, self.contact, session) try: + # set minimum size whiteboard.hbox.set_size_request(300, 0) hbox.pack_start(whiteboard.hbox, expand=False, fill=False) whiteboard.hbox.show_all() - except: pass # TODO: Fix problem with groupchat? diff -r 77f805b84006 -r 236a04e1fa69 src/common/connection_handlers.py --- a/src/common/connection_handlers.py Tue Jul 21 15:58:30 2009 +0200 +++ b/src/common/connection_handlers.py Tue Jul 21 16:23:34 2009 +0200 @@ -51,6 +51,7 @@ from common.commands import ConnectionCommands from common.pubsub import ConnectionPubSub from common.caps import ConnectionCaps +from common.jingle import ConnectionJingle from common import dbus_support if dbus_support.supported: @@ -1413,13 +1414,16 @@ return sess -class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionCaps, ConnectionHandlersBase): +class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, +ConnectionCommands, ConnectionPubSub, ConnectionCaps, ConnectionHandlersBase, +ConnectionJingle): def __init__(self): ConnectionVcard.__init__(self) ConnectionBytestream.__init__(self) ConnectionCommands.__init__(self) ConnectionPubSub.__init__(self) ConnectionHandlersBase.__init__(self) + ConnectionJingle.__init__(self) self.gmail_url = None # keep the latest subscribed event for each jid to prevent loop when we @@ -2639,6 +2643,10 @@ con.RegisterHandler('iq', self._PrivacySetCB, 'set', common.xmpp.NS_PRIVACY) con.RegisterHandler('iq', self._PubSubCB, 'result') + con.RegisterHandler('iq', self._JingleCB, 'result') + con.RegisterHandler('iq', self._JingleCB, 'error') + con.RegisterHandler('iq', self._JingleCB, 'set', + common.xmpp.NS_JINGLE) con.RegisterHandler('iq', self._ErrorCB, 'error') con.RegisterHandler('iq', self._IqCB) con.RegisterHandler('iq', self._StanzaArrivedCB) diff -r 77f805b84006 -r 236a04e1fa69 src/common/jingle.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/common/jingle.py Tue Jul 21 16:23:34 2009 +0200 @@ -0,0 +1,699 @@ +## +## Copyright (C) 2006 Gajim Team +## +## This program is free software; you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published +## by the Free Software Foundation; version 2 only. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +''' Handles the jingle signalling protocol. ''' + +# note: if there will be more types of sessions (possibly file transfer, +# video...), split this file + +import gajim +import gobject +import xmpp +import urllib + +import logging +log = logging.getLogger('gajim.c.jingle') + +def timeout_add_and_call(timeout, callable, *args, **kwargs): + ''' Call a callback once. If it returns True, add a timeout handler to call it more times. + Helper function. ''' + if callable(*args, **kwargs): + return gobject.timeout_add(timeout, callable, *args, **kwargs) + return -1 # gobject.source_remove will not object + +class JingleStates(object): + ''' States in which jingle session may exist. ''' + ended=0 + pending=1 + active=2 + +class Error(Exception): pass +class WrongState(Error): pass +class NoSuchSession(Error): pass + +class JingleSession(object): + ''' This represents one jingle session. ''' + def __init__(self, con, weinitiate, jid, sid=None): + ''' con -- connection object, + weinitiate -- boolean, are we the initiator? + jid - jid of the other entity''' + self.contents={} # negotiated contents + self.connection=con # connection to use + # our full jid + self.ourjid=gajim.get_jid_from_account(self.connection.name)+'/'+con.server_resource + self.peerjid=jid # jid we connect to + # jid we use as the initiator + self.initiator=weinitiate and self.ourjid or self.peerjid + # jid we use as the responder + self.responder=weinitiate and self.peerjid or self.ourjid + # are we an initiator? + self.weinitiate=weinitiate + # what state is session in? (one from JingleStates) + self.state=JingleStates.ended + if not sid: + sid=con.connection.getAnID() + self.sid=sid # sessionid + + self.accepted=True # is this session accepted by user + + # callbacks to call on proper contents + # use .prepend() to add new callbacks, especially when you're going + # to send error instead of ack + self.callbacks={ + 'content-accept': [self.__contentAcceptCB, self.__broadcastCB, self.__defaultCB], + 'content-add': [self.__defaultCB], + 'content-modify': [self.__defaultCB], + 'content-remove': [self.__defaultCB], + 'session-accept': [self.__contentAcceptCB, self.__broadcastCB, self.__defaultCB], + 'session-info': [self.__defaultCB], + 'session-initiate': [self.__sessionInitiateCB, self.__broadcastCB, self.__defaultCB], + 'session-terminate': [self.__broadcastAllCB, self.__defaultCB], + 'transport-info': [self.__broadcastCB, self.__defaultCB], + 'iq-result': [], + 'iq-error': [], + } + + ''' Interaction with user ''' + def approveSession(self): + ''' Called when user accepts session in UI (when we aren't the initiator).''' + self.accepted=True + self.acceptSession() + + def declineSession(self): + ''' Called when user declines session in UI (when we aren't the initiator, + or when the user wants to stop session completly. ''' + self.__sessionTerminate() + + ''' Middle-level functions to manage contents. Handle local content + cache and send change notifications. ''' + def addContent(self, name, content, creator='we'): + ''' Add new content to session. If the session is active, + this will send proper stanza to update session. + The protocol prohibits changing that when pending. + Creator must be one of ('we', 'peer', 'initiator', 'responder')''' + assert creator in ('we', 'peer', 'initiator', 'responder') + + if self.state==JingleStates.pending: + raise WrongState + + if (creator=='we' and self.weinitiate) or (creator=='peer' and not self.weinitiate): + creator='initiator' + elif (creator=='peer' and self.weinitiate) or (creator=='we' and not self.weinitiate): + creator='responder' + content.creator = creator + content.name = name + self.contents[(creator,name)]=content + + if self.state==JingleStates.active: + pass # TODO: send proper stanza, shouldn't be needed now + + def removeContent(self, creator, name): + ''' We do not need this now ''' + pass + + def modifyContent(self, creator, name, *someother): + ''' We do not need this now ''' + pass + + def acceptSession(self): + ''' Check if all contents and user agreed to start session. ''' + if not self.weinitiate and self.accepted and \ + all(c.negotiated for c in self.contents.itervalues()): + self.__sessionAccept() + ''' Middle-level function to do stanza exchange. ''' + def startSession(self): + ''' Start session. ''' + self.__sessionInitiate() + + def sendSessionInfo(self): pass + + ''' Session callbacks. ''' + def stanzaCB(self, stanza): + ''' A callback for ConnectionJingle. It gets stanza, then + tries to send it to all internally registered callbacks. + First one to raise xmpp.NodeProcessed breaks function.''' + jingle = stanza.getTag('jingle') + error = stanza.getTag('error') + if error: + # it's an iq-error stanza + action = 'iq-error' + elif jingle: + # it's a jingle action + action = jingle.getAttr('action') + else: + # it's an iq-result (ack) stanza + action = 'iq-result' + + callables = self.callbacks[action] + + try: + for callable in callables: + callable(stanza=stanza, jingle=jingle, error=error, action=action) + except xmpp.NodeProcessed: + pass + + def __defaultCB(self, stanza, jingle, error, action): + ''' Default callback for action stanzas -- simple ack + and stop processing. ''' + response = stanza.buildReply('result') + self.connection.connection.send(response) + + def __contentAcceptCB(self, stanza, jingle, error, action): + ''' Called when we get content-accept stanza or equivalent one + (like session-accept).''' + # check which contents are accepted + for content in jingle.iterTags('content'): + creator = content['creator'] + name = content['name'] + + def __sessionInitiateCB(self, stanza, jingle, error, action): + ''' We got a jingle session request from other entity, + therefore we are the receiver... Unpack the data, + inform the user. ''' + self.initiator = jingle['initiator'] + self.responder = self.ourjid + self.peerjid = self.initiator + self.accepted = False # user did not accept this session yet + + # TODO: If the initiator is unknown to the receiver (e.g., via presence + # subscription) and the receiver has a policy of not communicating via + # Jingle with unknown entities, it SHOULD return a <service-unavailable/> + # error. + + # Lets check what kind of jingle session does the peer want + fail = True + contents = [] + for element in jingle.iterTags('content'): + # checking what kind of session this will be + desc_ns = element.getTag('description').getNamespace() + tran_ns = element.getTag('transport').getNamespace() + if desc_ns==xmpp.NS_JINGLE_RTP and tran_ns==xmpp.NS_JINGLE_ICE_UDP: + # we've got voip content + self.addContent(element['name'], JingleVoiP(self), 'peer') + contents.append(('VOIP',)) + fail = False + if desc_ns==xmpp.NS_JINGLE_XHTML and tran_ns==xmpp.NS_JINGLE_SXE: + # we've got whiteboard content + self.addContent(element['name'], JingleWhiteboard(self), 'peer') + contents.append(('WHITEBOARD',)) + fail = False + + # If there's no content we understand... + if fail: + # TODO: we should send <unsupported-content/> inside too + # TODO: delete this instance + self.connection.connection.send( + xmpp.Error(stanza, xmpp.NS_STANZAS + 'feature-not-implemented')) + self.connection.deleteJingle(self) + raise xmpp.NodeProcessed + + self.state = JingleStates.pending + + # Send event about starting a session + self.connection.dispatch('JINGLE_INCOMING', (self.initiator, self.sid, contents)) + + def __broadcastCB(self, stanza, jingle, error, action): + ''' Broadcast the stanza contents to proper content handlers. ''' + for content in jingle.iterTags('content'): + name = content['name'] + creator = content['creator'] + cn = self.contents[(creator, name)] + cn.stanzaCB(stanza, content, error, action) + + def __broadcastAllCB(self, stanza, jingle, error, action):

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
17
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2009