Commits August 2007

commits@gajim.org

7 participants
239 discussions

[commit-gajim] r8515 - trunk/src/common
by asterix＠gajim.org 20 Aug '07

20 Aug '07

Author: asterix Date: 2007-08-20 13:13:53 +0200 (Mon, 20 Aug 2007) New Revision: 8515 Modified: trunk/src/common/logger.py Log: re-read jids table from DB when another instance of Gajim added a jid in it. Fixes #3349 Modified: trunk/src/common/logger.py =================================================================== --- trunk/src/common/logger.py 2007-08-20 10:28:39 UTC (rev 8514) +++ trunk/src/common/logger.py 2007-08-20 11:13:53 UTC (rev 8515) @@ -181,8 +181,14 @@ typ = constants.JID_ROOM_TYPE else: typ = constants.JID_NORMAL_TYPE - self.cur.execute('INSERT INTO jids (jid, type) VALUES (?, ?)', (jid, typ)) try: + self.cur.execute('INSERT INTO jids (jid, type) VALUES (?, ?)', (jid, + typ)) + except sqlite.IntegrityError, e: + # Jid already in DB, maybe added by another instance. re-read DB + self.get_jids_already_in_db() + return self.get_jid_id(jid, typestr) + try: self.con.commit() except sqlite.OperationalError, e: print >> sys.stderr, str(e)

1 0

[commit-gajim] r8514 - trunk/src
by asterix＠gajim.org 20 Aug '07

20 Aug '07

Author: asterix Date: 2007-08-20 12:28:39 +0200 (Mon, 20 Aug 2007) New Revision: 8514 Modified: trunk/src/roster_window.py Log: make a string translatable Modified: trunk/src/roster_window.py =================================================================== --- trunk/src/roster_window.py 2007-08-20 10:26:51 UTC (rev 8513) +++ trunk/src/roster_window.py 2007-08-20 10:28:39 UTC (rev 8514) @@ -3348,8 +3348,7 @@ 'savegpgpass') keyid = gajim.config.get_per('accounts', account, 'keyid') if keyid and not gajim.config.get('usegpg'): - #TODO: make this string translatable - dialog = dialogs.WarningDialog('GPG is not usable', _('You will be connected to %s without OpenPGP.') % account) + dialog = dialogs.WarningDialog(_('GPG is not usable'), _('You will be connected to %s without OpenPGP.') % account) if keyid and gajim.connections[account].connected < 2 and \ gajim.config.get('usegpg'):

1 0

[commit-gajim] r8513 - trunk/src/common
by asterix＠gajim.org 20 Aug '07

20 Aug '07

Author: asterix Date: 2007-08-20 12:26:51 +0200 (Mon, 20 Aug 2007) New Revision: 8513 Modified: trunk/src/common/connection.py Log: always forget password when it's wrong so it's re-asked to user. fixes #3343 Modified: trunk/src/common/connection.py =================================================================== --- trunk/src/common/connection.py 2007-08-20 08:19:29 UTC (rev 8512) +++ trunk/src/common/connection.py 2007-08-20 10:26:51 UTC (rev 8513) @@ -526,9 +526,8 @@ self.on_connect_auth(con) self.on_connect_auth = None else: - # Forget password if needed - if not gajim.config.get_per('accounts', self.name, 'savepass'): - self.password = None + # Forget password, it's wrong + self.password = None gajim.log.debug("Couldn't authenticate to %s" % self._hostname) self.disconnect(on_purpose = True) self.dispatch('STATUS', 'offline')

1 0

[commit-gajim] r8512 - branches/e2e_encryption/src
by bct＠gajim.org 20 Aug '07

20 Aug '07

Author: bct Date: 2007-08-20 10:19:29 +0200 (Mon, 20 Aug 2007) New Revision: 8512 Modified: branches/e2e_encryption/src/gajim.py Log: removed buggy anti-presence-leak test Modified: branches/e2e_encryption/src/gajim.py =================================================================== --- branches/e2e_encryption/src/gajim.py 2007-08-20 08:16:48 UTC (rev 8511) +++ branches/e2e_encryption/src/gajim.py 2007-08-20 08:19:29 UTC (rev 8512) @@ -1770,20 +1770,8 @@ self.dialog.destroy() return - contact = gajim.contacts.get_contact(account, jid.getStripped(), jid.getResource()) + continue_with_negotiation() - # FIXME: shouldn't prompt if i don't have a subscription for remote but - # he has one for me. get_contact() returns None in this case? - if gajim.SHOW_LIST[gajim.connections[account].connected] == 'invisible' or not contact or\ - contact.sub not in ('from', 'both'): - self.dialog = dialogs.YesNoDialog(_('Start session?'), - _('''%s would like to start a session with you. Should I respond?''') % jid, - on_response_yes = continue_with_negotiation, - on_response_no = ignore_negotiation, - ) - else: - continue_with_negotiation() - return # alice accepts

1 0

[commit-gajim] r8511 - in branches/e2e_encryption/src: . common
by bct＠gajim.org 20 Aug '07

20 Aug '07

Author: bct Date: 2007-08-20 10:16:48 +0200 (Mon, 20 Aug 2007) New Revision: 8511 Modified: branches/e2e_encryption/src/chat_control.py branches/e2e_encryption/src/common/connection_handlers.py branches/e2e_encryption/src/common/stanza_session.py branches/e2e_encryption/src/gajim.py Log: esession bugfixes Modified: branches/e2e_encryption/src/chat_control.py =================================================================== --- branches/e2e_encryption/src/chat_control.py 2007-08-20 08:16:26 UTC (rev 8510) +++ branches/e2e_encryption/src/chat_control.py 2007-08-20 08:16:48 UTC (rev 8511) @@ -971,6 +971,9 @@ self.session = session + # does this window have an existing, active esession? + self.esessioned = False + self.status_tooltip = gtk.Tooltips() self.update_ui() # restore previous conversation @@ -1236,13 +1239,13 @@ contact = self.contact + encrypted = bool(self.session) and self.session.enable_encryption + keyID = '' - encrypted = False if self.xml.get_widget('gpg_togglebutton').get_active(): keyID = contact.keyID encrypted = True - chatstates_on = gajim.config.get('outgoing_chat_state_notifications') != \ 'disabled' composing_jep = contact.composing_jep @@ -1352,18 +1355,46 @@ kind = 'info' name = '' else: - ec = gajim.encrypted_chats[self.account] - if encrypted and jid not in ec: - msg = _('Encryption enabled') + # ESessions + if self.session.enable_encryption: + if not self.esessioned: + msg = _('Encryption enabled') + ChatControlBase.print_conversation_line(self, msg, + 'status', '', tim) + + if self.session.loggable: + msg = _('Session WILL be logged') + else: + msg = _('Session WILL NOT be logged') + + ChatControlBase.print_conversation_line(self, msg, + 'status', '', tim) + + self.esessioned = True + elif not encrypted: + msg = _('The following message was NOT encrypted') + ChatControlBase.print_conversation_line(self, msg, + 'status', '', tim) + elif self.esessioned: + msg = _('Encryption disabled') ChatControlBase.print_conversation_line(self, msg, 'status', '', tim) - ec.append(jid) - elif not encrypted and jid in ec: - msg = _('Encryption disabled') - ChatControlBase.print_conversation_line(self, msg, - 'status', '', tim) - ec.remove(jid) - self.xml.get_widget('gpg_togglebutton').set_active(encrypted) + self.esessioned = False + else: + # GPG encryption + ec = gajim.encrypted_chats[self.account] + if encrypted and jid not in ec: + msg = _('Encryption enabled') + ChatControlBase.print_conversation_line(self, msg, + 'status', '', tim) + ec.append(jid) + elif not encrypted and jid in ec: + msg = _('Encryption disabled') + ChatControlBase.print_conversation_line(self, msg, + 'status', '', tim) + ec.remove(jid) + self.xml.get_widget('gpg_togglebutton').set_active(encrypted) + if not frm: kind = 'incoming' name = contact.get_shown_name() @@ -1949,9 +1980,15 @@ if self.session and self.session.enable_encryption: self.session.terminate_e2e() + msg = _('Encryption disabled') + ChatControlBase.print_conversation_line(self, msg, + 'status', '', None) + self.esessioned = False + jid = str(self.session.jid) gajim.connections[self.account].delete_session(jid, self.session.thread_id) + self.session = gajim.connections[self.account].make_new_session(jid) else: if not self.session: Modified: branches/e2e_encryption/src/common/connection_handlers.py =================================================================== --- branches/e2e_encryption/src/common/connection_handlers.py 2007-08-20 08:16:26 UTC (rev 8510) +++ branches/e2e_encryption/src/common/connection_handlers.py 2007-08-20 08:16:48 UTC (rev 8511) @@ -1451,18 +1451,22 @@ self._InitE2ECB(con, msg, session) encrypted = False + tim = msg.getTimestamp() + tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') + tim = time.localtime(timegm(tim)) - e2eTag = msg.getTag('c', namespace = common.xmpp.NS_STANZA_CRYPTO) - if e2eTag: + e2e_tag = msg.getTag('c', namespace = common.xmpp.NS_STANZA_CRYPTO) + if e2e_tag: encrypted = True - msg = session.decrypt_stanza(msg) + try: + msg = session.decrypt_stanza(msg) + except: + self.dispatch('FAILED_DECRYPT', (frm, tim)) + msgtxt = msg.getBody() msghtml = msg.getXHTML() subject = msg.getSubject() # if not there, it's None - tim = msg.getTimestamp() - tim = time.strptime(tim, '%Y%m%dT%H:%M:%S') - tim = time.localtime(timegm(tim)) jid = helpers.get_jid_from_iq(msg) chatstate = None encTag = msg.getTag('x', namespace = common.xmpp.NS_ENCRYPTED) @@ -1573,6 +1577,8 @@ def get_session(self, jid, thread_id, type): '''returns an existing session between this connection and 'jid', returns a new one if none exist.''' + print repr(self.sessions) + session = self.find_session(jid, thread_id, type) if session: Modified: branches/e2e_encryption/src/common/stanza_session.py =================================================================== --- branches/e2e_encryption/src/common/stanza_session.py 2007-08-20 08:16:26 UTC (rev 8510) +++ branches/e2e_encryption/src/common/stanza_session.py 2007-08-20 08:16:48 UTC (rev 8511) @@ -289,7 +289,7 @@ calculated_mac = self.hmac(self.km_o, macable + self.encode_mpi_with_padding(self.c_o)) if not calculated_mac == received_mac: - raise 'bad signature (%s != %s)' % (repr(received_mac), repr(calculated_mac)) + raise exceptions.DecryptionError, 'bad signature' m_final = base64.b64decode(c.getTagData('data')) m_compressed = self.decrypt(m_final) @@ -298,7 +298,7 @@ try: parsed = xmpp.Node(node='<node>' + plaintext + '</node>') except: - raise exceptions.DecryptionError + raise exceptions.DecryptionError, 'decrypted <data/> not parseable as XML' for child in parsed.getChildren(): stanza.addChild(node=child) @@ -377,12 +377,12 @@ content += self.form_o + form_o2 mac_o_calculated = self.hmac(self.ks_o, content) - + if self.negotiated['recv_pubkey']: hash = self.sha256(mac_o_calculated) if not eir_pubkey.verify(hash, signature): - raise exceptions.NegotiationError, 'public key signature verification failed!' + raise exceptions.NegotiationError, 'public key signature verification failed!' elif mac_o_calculated != mac_o: raise exceptions.NegotiationError, 'calculated mac_%s differs from received mac_%s' % (i_o, i_o) @@ -589,7 +589,7 @@ self.n_o = base64.b64decode(form['my_nonce']) dhhashes = form.getField('dhhashes').getValues() - self.He = base64.b64decode(dhhashes[group_order].encode("utf8")) + self.negotiated['He'] = base64.b64decode(dhhashes[group_order].encode("utf8")) bytes = int(self.n / 8) @@ -741,7 +741,8 @@ e = self.decode_mpi(base64.b64decode(form['dhkeys'])) p = dh.primes[self.modp] - # XXX return <feature-not-implemented> if hash(e) != He + if self.sha256(self.encode_mpi(e)) != self.negotiated['He']: + raise exceptions.NegotiationError, 'SHA256(e) != He' k = self.get_shared_secret(e, self.y, p) @@ -903,11 +904,18 @@ def fail_bad_negotiation(self, reason): '''they've tried to feed us a bogus value, send an error and cancel everything.''' + err = xmpp.Error(xmpp.Message(), xmpp.ERR_FEATURE_NOT_IMPLEMENTED) err.T.error.T.text.setData(reason) self.send(err) + self.status = None + self.enable_encryption = False + # this prevents the MAC check on decryption from succeeding, + # preventing falsified messages from going through. + self.km_o = '' + def is_loggable(self): account = self.conn.name no_log_for = gajim.config.get_per('accounts', account, 'no_log_for') Modified: branches/e2e_encryption/src/gajim.py =================================================================== --- branches/e2e_encryption/src/gajim.py 2007-08-20 08:16:26 UTC (rev 8510) +++ branches/e2e_encryption/src/gajim.py 2007-08-20 08:16:48 UTC (rev 8511) @@ -1701,6 +1701,15 @@ atom_entry, = data AtomWindow.newAtomEntry(atom_entry) + def handle_event_failed_decrypt(self, account, data): + jid, tim = data + + ctrl = self.msg_win_mgr.get_control(jid, account) + if ctrl: + ctrl.print_conversation_line('Unable to decrypt message from %s\nIt may have been tampered with.' % (jid), 'status', '', tim) + else: + print 'failed decrypt, unable to find a control to notify you in.' + def handle_session_negotiation(self, account, data): jid, session, form = data @@ -1713,12 +1722,25 @@ # encrypted session states. these are described in stanza_session.py # bob responds - if form.getType() == 'form' and u'e2e' in \ - map(lambda x: x[1], form.getField('security').getOptions()): + if form.getType() == 'form' and 'security' in form.asDict(): def continue_with_negotiation(*args): if len(args): self.dialog.destroy() + # we don't support 3-message negotiation as the responder + if 'dhkeys' in form.asDict(): + err = xmpp.Error(xmpp.Message(), xmpp.ERR_FEATURE_NOT_IMPLEMENTED) + + feature = xmpp.Node(xmpp.NS_FEATURE + ' feature') + field = xmpp.Node('field') + field['var'] = 'dhkeys' + + feature.addChild(node=field) + err.addChild(node=feature) + + session.send(err) + return + negotiated, not_acceptable, ask_user = session.verify_options_bob(form) if ask_user: @@ -1776,8 +1798,11 @@ dialog.destroy() negotiated.update(ask_user) - - session.accept_e2e_alice(form, negotiated) + + try: + session.accept_e2e_alice(form, negotiated) + except exceptions.NegotiationError, details: + session.fail_bad_negotiation(details) def reject_nondefault_options(widget): session.reject_negotiation() @@ -1788,7 +1813,10 @@ on_response_yes = accept_nondefault_options, on_response_no = reject_nondefault_options) else: - session.accept_e2e_alice(form, negotiated) + try: + session.accept_e2e_alice(form, negotiated) + except exceptions.NegotiationError, details: + session.fail_bad_negotiation(details) return elif session.status == 'responded-e2e' and form.getType() == 'result': @@ -1802,7 +1830,7 @@ return elif session.status == 'identified-alice' and form.getType() == 'result': session.check_identity = lambda: negotiation.show_sas_dialog(jid, session.sas) - + try: session.final_steps_alice(form) except exceptions.NegotiationError, details: @@ -1819,7 +1847,7 @@ ctrl = gajim.interface.msg_win_mgr.get_control(str(jid), account) if ctrl: - ctrl.session = gajim.connections[self.account].make_new_session(str(jid)) + ctrl.session = gajim.connections[account].make_new_session(str(jid)) return @@ -2266,6 +2294,7 @@ 'SIGNED_IN': self.handle_event_signed_in, 'METACONTACTS': self.handle_event_metacontacts, 'ATOM_ENTRY': self.handle_atom_entry, + 'FAILED_DECRYPT': self.handle_event_failed_decrypt, 'PRIVACY_LISTS_RECEIVED': self.handle_event_privacy_lists_received, 'PRIVACY_LIST_RECEIVED': self.handle_event_privacy_list_received, 'PRIVACY_LISTS_ACTIVE_DEFAULT': \

1 0

[commit-gajim] r8510 - trunk/src
by asterix＠gajim.org 20 Aug '07

20 Aug '07

Author: asterix Date: 2007-08-20 10:16:26 +0200 (Mon, 20 Aug 2007) New Revision: 8510 Modified: trunk/src/vcard.py Log: order resources and status the same way in information window. fixes #3225 Modified: trunk/src/vcard.py =================================================================== --- trunk/src/vcard.py 2007-08-19 22:51:40 UTC (rev 8509) +++ trunk/src/vcard.py 2007-08-20 08:16:26 UTC (rev 8510) @@ -258,18 +258,24 @@ connected_contact_list = contact_list # stats holds show and status message stats = '' - one = True # Are we adding the first line ? if connected_contact_list: + # Start with self.contact, as with resources + stats = helpers.get_uf_show(self.contact.show) + if self.contact.status: + stats += ': ' + self.contact.status + if self.contact.last_status_time: + stats += '\n' + _('since %s') % time.strftime('%c', + self.contact.last_status_time).decode( + locale.getpreferredencoding()) for c in connected_contact_list: - if not one: + if c.resource != self.contact.resource: stats += '\n' - stats += helpers.get_uf_show(c.show) - if c.status: - stats += ': ' + c.status - if c.last_status_time: - stats += '\n' + _('since %s') % time.strftime('%c', - c.last_status_time).decode(locale.getpreferredencoding()) - one = False + stats += helpers.get_uf_show(c.show) + if c.status: + stats += ': ' + c.status + if c.last_status_time: + stats += '\n' + _('since %s') % time.strftime('%c', + c.last_status_time).decode(locale.getpreferredencoding()) else: # Maybe gc_vcard ? stats = helpers.get_uf_show(self.contact.show) if self.contact.status:

1 0

[commit-gajim] r8509 - in trunk/src: . common
by asterix＠gajim.org 19 Aug '07

19 Aug '07

Author: asterix Date: 2007-08-20 00:51:40 +0200 (Mon, 20 Aug 2007) New Revision: 8509 Modified: trunk/src/common/configpaths.py trunk/src/history_manager.py Log: fix history manager since configpath has changed (see [8434]). fixes #3378 Modified: trunk/src/common/configpaths.py =================================================================== --- trunk/src/common/configpaths.py 2007-08-19 21:45:35 UTC (rev 8508) +++ trunk/src/common/configpaths.py 2007-08-19 22:51:40 UTC (rev 8509) @@ -102,7 +102,7 @@ # for k, v in paths.iteritems(): # print "%s: %s" % (repr(k), repr(v)) - def init_profile(self, profile): + def init_profile(self, profile = ''): conffile = windowsify(u'config') pidfile = windowsify(u'gajim') Modified: trunk/src/history_manager.py =================================================================== --- trunk/src/history_manager.py 2007-08-19 21:45:35 UTC (rev 8508) +++ trunk/src/history_manager.py 2007-08-19 22:51:40 UTC (rev 8509) @@ -26,6 +26,9 @@ import locale from common import i18n +import common.configpaths +common.configpaths.gajimpaths.init() +common.configpaths.gajimpaths.init_profile() import exceptions import dialogs import gtkgui_helpers

1 0

[commit-gajim] r8508 - trunk/src
by asterix＠gajim.org 19 Aug '07

19 Aug '07

Author: asterix Date: 2007-08-19 23:45:35 +0200 (Sun, 19 Aug 2007) New Revision: 8508 Modified: trunk/src/dataforms_widget.py Log: show search results in correct columns if result is not in the same order as <reported> element. fixes #3379 Modified: trunk/src/dataforms_widget.py =================================================================== --- trunk/src/dataforms_widget.py 2007-08-19 20:01:38 UTC (rev 8507) +++ trunk/src/dataforms_widget.py 2007-08-19 21:45:35 UTC (rev 8508) @@ -141,20 +141,23 @@ # creating model for form... fieldtypes = [] + fieldvars = [] for field in self._data_form.reported.iter_fields(): # note: we store also text-private and hidden fields, # we just do not display them. # TODO: boolean fields #elif field.type=='boolean': fieldtypes.append(bool) fieldtypes.append(str) + fieldvars.append(field.var) self.multiplemodel = gtk.ListStore(*fieldtypes) # moving all data to model for item in self._data_form.iter_records(): - # TODO: probably wrong... (.value[s]?, fields not in the same order?) - # not checking multiple-item forms... - self.multiplemodel.append([field.value for field in item.iter_fields()]) + iter = self.multiplemodel.append() + for field in item.iter_fields(): + self.multiplemodel.set_value(iter, fieldvars.index(field.var), + field.value) # constructing columns... for field, counter in zip(self._data_form.reported.iter_fields(), itertools.count()):

1 0

[commit-gajim] r8507 - branches/jingle/src/common
by liori＠gajim.org 19 Aug '07

19 Aug '07

Author: liori Date: 2007-08-19 22:01:38 +0200 (Sun, 19 Aug 2007) New Revision: 8507 Modified: branches/jingle/src/common/jingle.py Log: Jingle: fix py2.5 construct Modified: branches/jingle/src/common/jingle.py =================================================================== --- branches/jingle/src/common/jingle.py 2007-08-19 19:07:49 UTC (rev 8506) +++ branches/jingle/src/common/jingle.py 2007-08-19 20:01:38 UTC (rev 8507) @@ -325,7 +325,10 @@ Codec('speex', clockrate='16000'), ] - other_l = other if other is not None else [] + if other is not None: + other_l = other + else: + other_l = [] our_l = supported_codecs[:] out = [] ids = range(128)

1 0

[commit-gajim] r8506 - branches/jingle/src/common
by liori＠gajim.org 19 Aug '07

19 Aug '07

Author: liori Date: 2007-08-19 21:07:49 +0200 (Sun, 19 Aug 2007) New Revision: 8506 Added: branches/jingle/src/common/jingle-handler.py branches/jingle/src/common/jingle.popen.py Log: Jingle: a try with popen()ing external file for p2p connection Added: branches/jingle/src/common/jingle-handler.py =================================================================== --- branches/jingle/src/common/jingle-handler.py (rev 0) +++ branches/jingle/src/common/jingle-handler.py 2007-08-19 19:07:49 UTC (rev 8506) @@ -0,0 +1,258 @@ +#!/usr/bin/python + +import sys, dl, gst, gobject +sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_GLOBAL) +import farsight +from socket import * + +TYPE_CANDIDATE=0 +TYPE_CODEC=1 +TYPE_READY_BYTE=2 + +MODE_DUPLEX=0 +MODE_AUDIO=1 +MODE_VIDEO=2 + +send_sock = 0 +recv_sock = 0 +serv_addr = None +audio_stream = None +video_stream = None + +def stream_error(stream, error, debug): + pass + #print "stream_error: stream=%r error=%s" % (stream, error) + +def session_error(session, error, debug): + pass + #print "session_error: session=%r error=%s" % (session, error) + +def new_active_candidate_pair(stream, native, remote): + pass + #print "new_active_candidate_pair: native %s, remote %s" % (native, remote) + #send_codecs(stream.get_local_codecs()) + +def codec_changed(stream, codec_id): + #print "codec_changed: codec_id=%d, stream=%r" % (codec_id, stream) + pass + +def native_candidates_prepared(stream): + return + print "native_candidates_prepared: stream=%r" % stream + for info in stream.get_native_candidate_list(): + print "Local transport candidate: %s %d %s %s %s %d pref %f" % ( + info['candidate_id'], info['component'], + (info['proto']==farsight.NETWORK_PROTOCOL_TCP) and "TCP" or "UDP", + info['proto_subtype'], info['ip'], info['port'], info['preference']); + +def show_element(e): + return + print 'element: ...' + +def state_changed(stream, state, dir): + if state==farsight.STREAM_STATE_DISCONNECTED: + #print "state_changed: disconnected" + pass + elif state==farsight.STREAM_STATE_CONNECTING: + #print "state_changed: connecting" + pass + elif state==farsight.STREAM_STATE_CONNECTED: + #print "state_changed: connectied" + #print "WW: stream.signal_native_candidates_prepared()" + #print "WW: stream.start()" + stream.signal_native_candidates_prepared() + stream.start() + +def send_codecs(codecs): + global send_sock, serv_addr + for codec in codecs: + if 'channels' not in codec: codec['channels']=1 + s="%d %d %s %d %d %d " % (TYPE_CODEC, codec['media_type'], + codec['encoding_name'], codec['id'], codec['clock_rate'], + codec['channels']) + print s + s="%d %d %s %d %d %d " % (TYPE_CODEC, codec['media_type'], 'LAST', 0, 0, 0) + print s + +def send_candidate(type, trans): + global send_sock, serv_addr + s="%d %d %s %s %d %s %s" % (TYPE_CANDIDATE, + type, trans['candidate_id'], trans['ip'], trans['port'], + trans['username'], trans['password']) + print s + +def new_native_candidate(stream, candidate_id): + candidate=stream.get_native_candidate(candidate_id) + trans=candidate[0] + + #print "New native candidate: <id: %s, component: %d, ip: %s port: %d proto: %d, proto_subtype: %s, proto_profile: %s, preference: %f, type: %d, username: %s, password: %s>" % ( + # trans['candidate_id'], trans['component'], trans['ip'], trans['port'], trans['proto'], + # trans['proto_subtype'], trans['proto_profile'], trans['preference'], trans['type'], + # trans['username'], trans['password']) + + type=stream.get_property("media-type") + + send_candidate(type, trans) + +remote_codecs_audio = [] +remote_codecs_video = [] +def add_remote_codec(stream, pt, encoding_name, media_type, clock_rate, channels): + global remote_codecs_audio, remote_codecs_video + if encoding_name=="LAST": + if media_type==farsight.MEDIA_TYPE_AUDIO: + #print "WW: set_remote_codecs(remote_codecs_audio), %r" % (remote_codecs_audio,) + stream.set_remote_codecs(remote_codecs_audio) + else: + stream.set_remote_codecs(remote_codecs_video) + else: + codec={'id': pt, 'encoding_name': encoding_name, 'media_type': media_type, + 'clock_rate': clock_rate, 'channels': channels} + if media_type==farsight.MEDIA_TYPE_AUDIO: + remote_codecs_audio.append(codec) + elif media_type==farsight.MEDIA_TYPE_VIDEO: + remote_codecs_video.append(codec) + + #for codec in remote_codecs_audio: + # print "added audio codec: %d: %s/%d found" % (codec['id'], codec['encoding_name'], codec['clock_rate']) + #for codec in remote_codecs_video: + # print "added video codec: %d: %s/%d found" % (codec['id'], codec['encoding_name'], codec['clock_rate']) + +def add_remote_candidate(stream, id, ip, port, username, password): + if not stream: return + + trans={'candidate_id': id, 'component': 1, 'ip': ip, 'port': port, 'proto': farsight.NETWORK_PROTOCOL_UDP, + 'proto_subtype': 'RTP', 'proto_profile': 'AVP', 'preference': 1.0, + 'type': farsight.CANDIDATE_TYPE_LOCAL, 'username': username, 'password': password} + + #print "WW: add_remote_candidate(%r)" % ([trans],) + stream.add_remote_candidate([trans]); + +def receive_loop(ch, cond, *data): + #print 'receive_loop called!' + global recv_sock, serv_addr, audio_stream, remote_stream + #print "waiting for msg from %r" % (serv_addr,) + buf=raw_input() + #buf,a = recv_sock.recvfrom(1500) + #print "got message! ",buf + msg = buf.split(' ') + type = int(msg.pop(0)) + #print msg + if type==TYPE_CANDIDATE: + media_type, id, ip, port, username, password = msg[:6] + media_type=int(media_type) + port=int(port) + #print "Received %d %s %s %d %s %s" % (media_type, id, ip, port, username, password) + if media_type==farsight.MEDIA_TYPE_AUDIO: + add_remote_candidate(audio_stream, id, ip, port, username, password) + elif media_type==farsight.MEDIA_TYPE_VIDEO: + add_remote_candidate(video_stream, id, ip, port, username, password) + elif type==TYPE_CODEC: + media_type, encoding_name, pt, clock_rate, channels=msg[:5] + media_type=int(media_type) + pt=int(pt) + clock_rate=int(clock_rate) + channels=int(channels) + + #print "Received %d %s %d %d %d" % (media_type, encoding_name, pt, clock_rate, channels) + + if media_type==farsight.MEDIA_TYPE_AUDIO: + add_remote_codec(audio_stream, pt, encoding_name, media_type, clock_rate, channels) + elif media_type==farsight.MEDIA_TYPE_VIDEO: + add_remote_codec(video_stream, pt, encoding_name, media_type, clock_rate, channels) + elif type==TYPE_READY_BYTE: + #print "got ready byte" + pass + return True + +def set_xoverlay(bus, message, xid): + print "set_xoverlay: called" + if message!=gst.MESSAGE_ELEMENT: return gst.BUS_PASS + + if not message.structure.has_name('prepare-xwindow-id'): return gst.BUS_PASS + + print "set_xoverlay: setting x overlay window id" + message.set_xwindow_id(xid) + + return gst.BUS_DROP + +def main(): + global audio_stream, remote_stream + #if len(sys.argv)<4 or len(sys.argv)>6: + # #print 'usage: %s remoteip remoteport localport [mode] [xid]' % sys.argv[0] + # return -1 + + #if len(sys.argv)>=5: + # mode = int(sys.argv[4]) + #else: + mode = MODE_DUPLEX + + #setup_send(sys.argv[1], int(sys.argv[2])) + #print "Sending to %s %d listening on port %d" % (sys.argv[1], int(sys.argv[2]), int(sys.argv[3])) + + #recv_chan=setup_recv(int(sys.argv[3])) + + #do_handshake(recv_chan) + + gobject.io_add_watch(0, gobject.IO_IN, receive_loop) + + session = setup_rtp_session() + + if mode==MODE_AUDIO or mode==MODE_VIDEO: + audio_stream = setup_rtp_stream(session, farsight.MEDIA_TYPE_AUDIO) + if mode==MODE_VIDEO or mode==MODE_DUPLEX: + video_stream = setup_rtp_stream(session, farsight.MEDIA_TYPE_VIDEO) + + if audio_stream: + audio_stream.set_active_codec(8) + + alsasrc = gst.element_factory_make('audiotestsrc', 'src') + alsasink= gst.element_factory_make('alsasink', 'alsasink') + + alsasink.set_property('sync', False) + alsasink.set_property('latency-time', 20000) + alsasink.set_property('buffer-time', 80000) + alsasrc.set_property('blocksize', 320) + #alsasrc.set_property('latency-time', 20000) + alsasrc.set_property('is-live', True) + + #print "WW: set_sink(%r)" % (alsasink,) + audio_stream.set_sink(alsasink) + #print "WW: set_source(%r)" % (alsasrc,) + audio_stream.set_source(alsasrc) + + #if video_stream: assert False + + gobject.MainLoop().run() + #print 'bu!' + +def setup_rtp_session(): + session = farsight.farsight_session_factory_make('rtp') + + session.connect('error', session_error) + return session + +def setup_rtp_stream(session, type): + stream = session.create_stream(type, farsight.STREAM_DIRECTION_BOTH) + + stream.set_property('transmitter', 'libjingle') + + stream.connect('error', stream_error) + stream.connect('new-active-candidate-pair', new_active_candidate_pair) + stream.connect('codec-changed', codec_changed) + stream.connect('native-candidates-prepared', native_candidates_prepared) + stream.connect('state-changed', state_changed) + stream.connect('new-native-candidate', new_native_candidate) + + possible_codecs = stream.get_local_codecs() + + #for codec in possible_codecs: + # print "codec: %d: %s/%d found" % (codec['id'], codec['encoding_name'], codec['clock_rate']) + + send_codecs(possible_codecs) + + stream.prepare_transports() + + return stream + + +main() Property changes on: branches/jingle/src/common/jingle-handler.py ___________________________________________________________________ Name: svn:executable + * Copied: branches/jingle/src/common/jingle.popen.py (from rev 8498, branches/jingle/src/common/jingle.py) =================================================================== --- branches/jingle/src/common/jingle.popen.py (rev 0) +++ branches/jingle/src/common/jingle.popen.py 2007-08-19 19:07:49 UTC (rev 8506) @@ -0,0 +1,666 @@ +## +## 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. ''' + +import gajim +import xmpp +import gobject + +import sys, dl, gst, gobject +sys.setdlopenflags(dl.RTLD_NOW | dl.RTLD_GLOBAL) +import farsight + + +import meta + +class JingleStates(object): + ''' States in which jingle session may exist. ''' + ended=0 + pending=1 + active=2 + +class Exception(object): pass +class WrongState(Exception): pass +class NoCommonCodec(Exception): pass + +class JingleSession(object): + ''' This represents one jingle session. ''' + __metaclass__=meta.VerboseClassType + 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 + + # 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.__defaultCB], + 'transport-info': [self.__broadcastCB, self.__defaultCB], + 'iq-result': [], + 'iq-error': [], + } + + ''' 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')''' + 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 + + ''' Middle-level function to do stanza exchange. ''' + def startSession(self): + ''' Start session. ''' + self.__sessionInitiate() + + def sendSessionInfo(self): pass + + ''' 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. ''' + self.initiator = jingle['initiator'] + self.responder = self.ourjid + self.peerjid = self.initiator + + fail = True + 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_AUDIO and tran_ns==xmpp.NS_JINGLE_ICE_UDP: + # we've got voip content + self.addContent(element['name'], JingleVoiP(self), 'peer') + fail = False + + if fail: + # TODO: we should send <unsupported-content/> inside too + self.connection.connection.send( + xmpp.Error(stanza, xmpp.NS_STANZAS + 'feature-not-implemented')) + self.connection.deleteJingle(self) + raise xmpp.NodeProcessed + + self.state = JingleStates.pending + + 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 on_p2psession_error(self, *anything): + print self.weinitiate, "Farsight session error!" + + ''' Methods that make/send proper pieces of XML. They check if the session + is in appropriate state. ''' + def __makeJingle(self, action): + stanza = xmpp.Iq(typ='set', to=xmpp.JID(self.peerjid)) + jingle = stanza.addChild('jingle', attrs={ + 'xmlns': 'http://www.xmpp.org/extensions/xep-0166.html#ns', + 'action': action, + 'initiator': self.initiator, + 'responder': self.responder, + 'sid': self.sid}) + return stanza, jingle + + def __appendContent(self, jingle, content, full=True): + ''' Append <content/> element to <jingle/> element, + with (full=True) or without (full=False) <content/> + children. ''' + if full: + jingle.addChild(node=content.toXML()) + else: + jingle.addChild('content', + attrs={'name': content.name, 'creator': content.creator}) + + def __appendContents(self, jingle, full=True): + ''' Append all <content/> elements to <jingle/>.''' + # TODO: integrate with __appendContent? + # TODO: parameters 'name', 'content'? + for content in self.contents.values(): + self.__appendContent(jingle, content, full=full) + + def __sessionInitiate(self): + assert self.state==JingleStates.ended + stanza, jingle = self.__makeJingle('session-initiate') + self.__appendContents(jingle) + self.connection.connection.send(stanza) + + def __sessionAccept(self): + assert self.state==JingleStates.pending + stanza, jingle = self.__jingle('session-accept') + self.__appendContents(jingle, False) + self.connection.connection.send(stanza) + self.state=JingleStates.active + + def __sessionInfo(self, payload=None): + assert self.state!=JingleStates.ended + stanza, jingle = self.__jingle('session-info') + if payload: + jingle.addChild(node=payload) + self.connection.connection.send(stanza) + + def __sessionTerminate(self): + assert self.state!=JingleStates.ended + stanza, jingle = self.__jingle('session-terminate') + self.connection.connection.send(stanza) + + def __contentAdd(self): + assert self.state==JingleStates.active + + def __contentAccept(self): + assert self.state!=JingleStates.ended + + def __contentModify(self): + assert self.state!=JingleStates.ended + + def __contentRemove(self): + assert self.state!=JingleStates.ended + + def sendTransportInfo(self, content): + assert self.state!=JingleStates.ended + stanza, jingle = self.__makeJingle('transport-info') + jingle.addChild(node=content) + self.connection.connection.send(stanza) + + '''Callbacks''' + def sessionTerminateCB(self, stanza): pass + +class Codec(object): + ''' This class keeps description of a single codec. ''' + def __init__(self, name, id=None, **params): + ''' Create new codec description. ''' + self.name = name + self.id = id + self.attrs = {'name': self.name, 'id': self.id, 'channels': 1} + for key in ('channels', 'clockrate', 'maxptime', 'ptime'): + if key in params: + self.attrs[key]=params[key] + del params[key] + self.params = params + + def __eq__(a, b): + ''' Compare two codec descriptions. ''' + # TODO: check out what should be tested... + if a.name!=b.name: return False + # ... + return True + + def toXML(self): + return xmpp.Node('payload-type', + attrs=self.attrs, + payload=(xmpp.Node('parameter', {'name': k, 'value': v}) for k,v in self.params)) + +class JingleAudioSession(object): +# __metaclass__=meta.VerboseClassType + def __init__(self, content, fromNode): + self.content = content + + self.initiator_codecs=[] + self.responder_codecs=[] + + if fromNode: + # read all codecs peer understand + for payload in fromNode.iterTags('payload-type'): + attrs = fromNode.getAttrs().copy() + for param in fromNode.iterTags('parameter'): + attrs[param['name']]=param['value'] + self.initiator_codecs.append(Codec(**attrs)) + + def sessionInitiateCB(self, stanza, ourcontent): + pass + + ''' "Negotiation" of codecs... simply presenting what *we* can do, nothing more... ''' + def getOurCodecs(self, other=None): + ''' Get a list of codecs we support. Try to get them in the same + order as the codecs of our peer. If other!=None, raise + a NoCommonCodec error if no codecs both sides support (None means + we are initiating the connection and we don't know the other + peer's codecs.) ''' + # for now we "understand" only one codec -- speex with clockrate 16000 + # so we have an easy job to do... (codecs sorted in order of preference) + supported_codecs=[ + Codec('speex', clockrate='16000'), + ] + + other_l = other if other is not None else [] + our_l = supported_codecs[:] + out = [] + ids = range(128) + for codec in other_l: + if codec in our_l: + out.append(codec) + our_l.remove(codec) + try: ids.remove(codec.id) + except ValueError: pass # when id is not a dynamic one + + if other is not None and len(out)==0: + raise NoCommonCodec + + for codec in our_l: + if not codec.id or codec.id not in ids: + codec.id = ids.pop() + out.append(codec) + + return out + + ''' Methods for making proper pieces of XML. ''' + def __codecsList(self, codecs): + ''' Prepares a description element with codecs given as a parameter. ''' + return xmpp.Node(xmpp.NS_JINGLE_AUDIO+' description', + payload=(codec.toXML() for codec in codecs)) + + def toXML(self): + if not self.initiator_codecs: + # we are the initiator, so just send our codecs + self.initiator_codecs = self.getOurCodecs() + return self.__codecsList(self.initiator_codecs) + else: + # we are the responder, we SHOULD adjust our codec list + self.responder_codecs = self.getOurCodecs(self.initiator_codecs) + return self.__codecsList(self.responder_codecs) + +class JingleContent(object): + ''' An abstraction of content in Jingle sessions. ''' + def __init__(self, session, node=None): + self.session = session + # will be filled by JingleSession.add_content() + # don't uncomment these lines, we will catch more buggy code then + # (a JingleContent not added to session shouldn't send anything) + #self.creator = None + #self.name = None + +class JingleVoiP(JingleContent): + ''' Jingle VoiP sessions consist of audio content transported + over an ICE UDP protocol. ''' +# __metaclass__=meta.VerboseClassType + def __init__(self, session, node=None): + JingleContent.__init__(self, session, node) + self.got_codecs = False + self.codecs = [] + + #if node is None: + # self.audio = JingleAudioSession(self) + #else: + # self.audio = JingleAudioSession(self, node.getTag('content')) + #self.transport = JingleICEUDPSession(self) + self.setupStream() + + def stanzaCB(self, stanza, content, error, action): + ''' Called when something related to our content was sent by peer. ''' + callbacks = { + 'content-accept': [self.__getRemoteCodecsCB], + 'content-add': [], + 'content-modify': [], + 'content-remove': [], + 'session-accept': [self.__getRemoteCodecsCB], + 'session-info': [], + 'session-initiate': [self.__getRemoteCodecsCB], + 'session-terminate': [], + 'transport-info': [self.__transportInfoCB], + 'iq-result': [], + 'iq-error': [], + }[action] + for callback in callbacks: + callback(stanza, content, error, action) + + def __getRemoteCodecsCB(self, stanza, content, error, action): + if self.got_codecs: return + + codecs = [] + for codec in content.getTag('description').iterTags('payload-type'): + c = {'id': int(codec['id']), + 'encoding_name': codec['name'], + 'media_type': farsight.MEDIA_TYPE_AUDIO, + 'channels': 1, + 'params': dict((p['name'], p['value']) for p in codec.iterTags('parameter'))} + if 'channels' in codec: c['channels']=codec['channels'] + codecs.append(c) + self.p2pin.write('%d %d %s %d %d %d\n' % (1, farsight.MEDIA_TYPE_AUDIO, + codec['encoding_name'], codec['id'], codec['clock_rate'], codec['channels'])) + if len(codecs)==0: return + + print self.session.weinitiate, "#farsight_stream_set_remote_codecs" + #self.p2pstream.set_remote_codecs(codecs) + self.p2pin.write('%d %d %s %d %d %d\n' % (1, farsight.MEDIA_TYPE_AUDIO, + 'LAST', 0, 0, 0)) + self.got_codecs=True + + def __transportInfoCB(self, stanza, content, error, action): + ''' Got a new transport candidate. ''' + 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']), + } + if 'ufrag' in candidate: cand['username']=candidate['ufrag'] + if 'pwd' in candidate: cand['password']=candidate['pwd'] + + self.p2pin.write('%d %d %s %s %d %s %s\n' % (0, int(candidate['type']), candidate['cid'], candidate['ip'], int(candidate['port']), candidate['ufrag'], candidate['pwd'])) + candidates.append(cand) + print self.session.weinitiate, "#add_remote_candidate" + #self.p2pstream.add_remote_candidate(candidates) + + def toXML(self): + ''' Return proper XML for <content/> element. ''' + return xmpp.Node('content', + attrs={'name': self.name, 'creator': self.creator, 'profile': 'RTP/AVP'}, + payload=[ + xmpp.Node(xmpp.NS_JINGLE_AUDIO+' description', payload=self.iterCodecs()), + xmpp.Node(xmpp.NS_JINGLE_ICE_UDP+' transport') + ]) + + def __content(self, payload=[]): + ''' Build a XML content-wrapper for our data. ''' + return xmpp.Node('content', + attrs={'name': self.name, 'creator': self.creator, 'profile': 'RTP/AVP'}, + payload=payload) + + def new_data(self, *things): + buf = self.p2pout.readline() + print "RECV: %r"%buf + msg = buf.split(' ') + try: + type = int(msg.pop(0)) + except: + return True + #print msg + if type==0: + media_type, id, ip, port, username, password = msg[:6] + media_type=int(media_type) + port=int(port) + #print "Received %d %s %s %d %s %s" % (media_type, id, ip, port, username, password) + self.send_candidate({'candidate_id': id, 'component': 1, 'ip': ip, + 'port': port, 'username': username, 'password': password, + 'proto': farsight.NETWORK_PROTOCOL_UDP, 'proto_subtype': 'RTP', + 'proto_profile': 'AVP', 'preference': 1.0, 'type': 0}) + elif type==1: + media_type, encoding_name, pt, clock_rate, channels=msg[:5] + media_type=int(media_type) + pt=int(pt) + clock_rate=int(clock_rate) + channels=int(channels) + + #print "Received %d %s %d %d %d" % (media_type, encoding_name, pt, clock_rate, channels) + if encoding_name!='LAST': + self.codecs.append((media_type, encoding_name, pt, clock_rate, channels)) + else: + self.got_codecs=True + return True + + def setupStream(self): + import popen2 + self.p2pout, self.p2pin = popen2.popen2('/home/liori/Projekty/SoC/trunk/src/common/jingle-handler.py') + gobject.io_add_watch(self.p2pout, gobject.IO_IN, self.new_data) + while not self.got_codecs: + self.new_data() + return + print self.session.weinitiate, "#farsight_session_create_stream" + self.p2pstream = self.session.p2psession.create_stream( + farsight.MEDIA_TYPE_AUDIO, farsight.STREAM_DIRECTION_BOTH) + self.p2pstream.set_property('transmitter', 'libjingle') + self.p2pstream.connect('error', self.on_p2pstream_error) + self.p2pstream.connect('new-active-candidate-pair', self.on_p2pstream_new_active_candidate_pair) + self.p2pstream.connect('codec-changed', self.on_p2pstream_codec_changed) + self.p2pstream.connect('native-candidates-prepared', self.on_p2pstream_native_candidates_prepared) + self.p2pstream.connect('state-changed', self.on_p2pstream_state_changed) + self.p2pstream.connect('new-native-candidate', self.on_p2pstream_new_native_candidate) + + self.p2pstream.set_remote_codecs(self.p2pstream.get_local_codecs()) + + print self.session.weinitiate, "#farsight_stream_prepare_transports" + self.p2pstream.prepare_transports() + + print self.session.weinitiate, "#farsight_stream_set_active_codec" + self.p2pstream.set_active_codec(8) #??? + + sink = gst.element_factory_make('alsasink') + sink.set_property('sync', False) + sink.set_property('latency-time', 20000) + sink.set_property('buffer-time', 80000) + + src = gst.element_factory_make('audiotestsrc') + src.set_property('blocksize', 320) + #src.set_property('latency-time', 20000) + src.set_property('is-live', True) + + print self.session.weinitiate, "#farsight_stream_set_sink" + self.p2pstream.set_sink(sink) + print self.session.weinitiate, "#farsight_stream_set_source" + self.p2pstream.set_source(src) + + def on_p2pstream_error(self, *whatever): pass + def on_p2pstream_new_active_candidate_pair(self, stream, native, remote): + print self.session.weinitiate, "##new_active_candidate_pair" + #print "New native candidate pair: %s, %s" % (native, remote) + def on_p2pstream_codec_changed(self, stream, codecid): + print self.session.weinitiate, "##codec_changed" + #print "Codec changed: %d" % codecid + def on_p2pstream_native_candidates_prepared(self, *whatever): + print self.session.weinitiate, "##native_candidates_prepared" + #print "Native candidates prepared: %r" % whatever + for candidate in self.p2pstream.get_native_candidate_list(): + self.send_candidate(candidate) + def on_p2pstream_state_changed(self, stream, state, dir): + print self.session.weinitiate, "##state_changed" + #print "State: %d, Dir: %d" % (state, dir) + if state==farsight.STREAM_STATE_CONNECTED: + print self.session.weinitiate, "#farsight_stream_signal_native_candidates_prepared" + stream.signal_native_candidates_prepared() + print self.session.weinitiate, "#farsight_stream_start" + stream.start() + def on_p2pstream_new_native_candidate(self, p2pstream, candidate_id): + print self.session.weinitiate, "##new_native_candidate" + print self.session.weinitiate, "#get_native_candidate" + candidates = p2pstream.get_native_candidate(candidate_id) + print self.session.weinitiate, "#!", repr(candidates) + + for candidate in candidates: + self.send_candidate(candidate) + def send_candidate(self, candidate): + attrs={ + 'cid': candidate['candidate_id'], + 'component': candidate['component'], + 'foundation': '1', # hack + 'generation': '0', + 'type': candidate['type'], + 'ip': candidate['ip'], + 'network': '0', + 'port': candidate['port'], + 'priority': int(100000*candidate['preference']), # hack + 'protocol': candidate['proto']==farsight.NETWORK_PROTOCOL_UDP and 'udp' or 'tcp', + } + if 'username' in candidate: attrs['ufrag']=candidate['username'] + if 'password' in candidate: attrs['pwd']=candidate['password'] + c=self.__content() + t=c.addChild(xmpp.NS_JINGLE_ICE_UDP+' transport') + t.addChild('candidate', attrs=attrs) + self.session.sendTransportInfo(c) + + def iterCodecs(self): + for codec in self.codecs: + media_type, encoding_name, pt, clock_rate, channels=codec + yield xmpp.Node('payload-type', { + 'name': encoding_name, + 'id': pt, + 'channels': channels, + 'clock_rate': clock_rate}) + +# print self.session.weinitiate, "#farsight_stream_get_local_codecs" +# codecs=self.p2pstream.get_local_codecs() +# for codec in codecs: +# a = {'name': codec['encoding_name'], +# 'id': codec['id'], +# 'channels': 1} +# if 'clock_rate' in codec: a['clockrate']=codec['clock_rate'] +# if 'optional_params' in codec: +# p = (xmpp.Node('parameter', {'name': name, 'value': value}) +# for name, value in codec['optional_params'].iteritems()) +# else: p = () +# yield xmpp.Node('payload-type', a, p) + +class ConnectionJingle(object): + ''' This object depends on that it is a part of Connection class. ''' + def __init__(self): + # dictionary: (jid, sessionid) => JingleSession object + self.__sessions = {} + + # dictionary: (jid, iq stanza id) => JingleSession object, + # one time callbacks + self.__iq_responses = {} + + def addJingle(self, jingle): + ''' Add a jingle session to a jingle stanza dispatcher + jingle - a JingleSession object. + ''' + self.__sessions[(jingle.peerjid, jingle.sid)]=jingle + + def deleteJingle(self, jingle): + ''' Remove a jingle session from a jingle stanza dispatcher ''' + del self.__session[(jingle.peerjid, jingle.sid)] + + def _JingleCB(self, con, stanza): + ''' The jingle stanza dispatcher. + Route jingle stanza to proper JingleSession object, + or create one if it is a new session. + TODO: Also check if the stanza isn't an error stanza, if so + route it adequatelly.''' + + # get data + jid = stanza.getFrom() + id = stanza.getID() + + if (jid, id) in self.__iq_responses.keys(): + self.__iq_responses[(jid, id)].stanzaCB(stanza) + del self.__iq_responses[(jid, id)] + raise xmpp.NodeProcessed + + jingle = stanza.getTag('jingle') + if not jingle: return + sid = jingle.getAttr('sid') + + # do we need to create a new jingle object + if (jid, sid) not in self.__sessions: + # TODO: we should check its type here... + newjingle = JingleSession(con=self, weinitiate=False, jid=jid, sid=sid) + self.addJingle(newjingle) + + # we already have such session in dispatcher... + self.__sessions[(jid, sid)].stanzaCB(stanza) + + raise xmpp.NodeProcessed + + def addJingleIqCallback(self, jid, id, jingle): + self.__iq_responses[(jid, id)]=jingle + + def startVoiP(self, jid): + jingle = JingleSession(self, weinitiate=True, jid=jid) + self.addJingle(jingle) + jingle.addContent('voice', JingleVoiP(jingle)) + jingle.startSession()

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
24
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 August 2007