Commits August 2007

commits@gajim.org

7 participants
239 discussions

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

07 Aug '07

Author: asterix Date: 2007-08-07 14:14:54 +0200 (Tue, 07 Aug 2007) New Revision: 8465 Modified: trunk/src/common/connection_handlers.py Log: fix TB: get room_jid var before using it Modified: trunk/src/common/connection_handlers.py =================================================================== --- trunk/src/common/connection_handlers.py 2007-08-07 12:02:51 UTC (rev 8464) +++ trunk/src/common/connection_handlers.py 2007-08-07 12:14:54 UTC (rev 8465) @@ -1690,11 +1690,11 @@ if ptype == 'error': errmsg = prs.getError() errcode = prs.getErrorCode() + room_jid, nick = gajim.get_room_and_nick_from_fjid(who) if errcode == '502': # Internal Timeout: self.dispatch('NOTIFY', (jid_stripped, 'error', errmsg, resource, prio, keyID, timestamp, None)) elif errcode == '401': # password required to join - room_jid, nick = gajim.get_room_and_nick_from_fjid(who) self.dispatch('GC_PASSWORD_REQUIRED', (room_jid, nick)) elif errcode == '403': # we are banned self.dispatch('ERROR', (_('Unable to join group chat'),

1 0

[commit-gajim] r8464 - www-website/locale/de_DE/LC_MESSAGES
by asterix＠gajim.org 07 Aug '07

07 Aug '07

Author: asterix Date: 2007-08-07 14:02:51 +0200 (Tue, 07 Aug 2007) New Revision: 8464 Modified: www-website/locale/de_DE/LC_MESSAGES/msg.po Log: [mirrakor] updated german website translation Modified: www-website/locale/de_DE/LC_MESSAGES/msg.po =================================================================== --- www-website/locale/de_DE/LC_MESSAGES/msg.po 2007-08-07 07:42:31 UTC (rev 8463) +++ www-website/locale/de_DE/LC_MESSAGES/msg.po 2007-08-07 12:02:51 UTC (rev 8464) @@ -10,7 +10,7 @@ "Project-Id-Version: msg\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2007-07-21 17:42+0200\n" -"PO-Revision-Date: 2007-08-03 00:25+0100\n" +"PO-Revision-Date: 2007-08-07 13:57+0200\n" "Last-Translator: Michael Skiba <michael(a)michael-skiba.de>\n" "Language-Team: Deutsch <kde-i18n-de(a)kde.org>\n" "MIME-Version: 1.0\n" @@ -129,14 +129,14 @@ #: Design.php:174 msgid " Site optimized for W3C Standards and realized with vim editor under GNU/Linux by Asterix (Jabber ID: asterix(a)jabber.lagaule.org)\n" -msgstr " Diese Seite wurde nach den W3C Standarts optimiert und mit dem vim Editor unter GNU/Linux von Asterix (Jabber ID: asterix(a)jabber.lagaule.org) realisiert\n" +msgstr " Diese Seite wurde nach den W3C Standards optimiert und mit dem vim Editor unter GNU/Linux von Asterix (Jabber ID: asterix(a)jabber.lagaule.org) realisiert\n" #: dev.php:5 #: downloads.php:5 #: index.php:7 #: screenshots.php:7 msgid "Gajim, a Jabber client" -msgstr "Gajim, ein Jabber client" +msgstr "Gajim, ein Jabber Client" #: dev.php:10 msgid " Our Room" @@ -693,7 +693,7 @@ #: downloads.php:197 msgid " Everyday on 01:00 (GMT+1 time) bz2balls are produced from svn. You can use them if svn is broken for you at the moment." -msgstr " Jeden Tag werden um 01:00 (GMT+1) bz2-Archive aus dem SVN-Reprositorium erstellt. Sie können sie entweder momentan für sich benutzen oder für den Fall das SVN mal nicht erreichbar sein sollte." +msgstr " Jeden Tag werden um 01:00 (GMT+1) bz2-Archive aus dem SVN-Quellcode erstellt. Sie können sie entweder momentan für sich benutzen oder für den Fall das SVN mal nicht erreichbar sein sollte." #: downloads.php:197 msgid "Here to get them" @@ -713,7 +713,7 @@ #: index.php:14 msgid "The goal of Gajim is to provide a full featured and easy to use Jabber client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas how Gajim can be better please send tickets" -msgstr "Das Ziel von Gajim ist einen voll funktionsfähigen und einfach zu handhabenden Jabber client zur verfügung zu stellen. Gajim funktioniert wunderbar unter GNOME, benötigt dieses aber nicht um zu laufen. Gajim wird unter der GNU General Public License veröffentlicht. Wenn Sie einen Fehler finden oder Ideen haben wie wir Gajim besser machen können senden Sie uns doch bitte ein Ticket, klicken Sie dazu" +msgstr "Das Ziel von Gajim ist einen voll funktionsfähigen und einfach zu handhabenden Jabber Client zur verfügung zu stellen. Gajim funktioniert wunderbar unter GNOME, benötigt dieses aber nicht zwingend. Gajim wird unter der GNU General Public License veröffentlicht. Wenn Sie einen Fehler finden oder Ideen haben wie wir Gajim besser machen können senden Sie uns doch bitte ein Ticket, klicken Sie dazu" #: index.php:22 msgid "FEATURES:" @@ -733,7 +733,7 @@ #: index.php:27 msgid "Metacontacts Support" -msgstr "Metacontacts Support" +msgstr "Unterstützung von Meta-Kontakten" #: index.php:28 msgid "Trayicon, Speller, extented chat history functionalities" @@ -769,11 +769,11 @@ #: index.php:35 msgid "XML Console" -msgstr "XML Console" +msgstr "XML Konsole" #: index.php:36 msgid "Gajim is available in 24 languages: Basque, Belarusian, Brasilian, Breton, British, Bulgarian, Chinese (simplified), Croatian, Czech, Dutch, English, Esperanto, French, German, Greek, Italian, Norwegian (Bokmål), Polish, Portugese, Russian, Serbian, Spanish, Slovak and Swedish" -msgstr "Gajim ist in 24 Sprachen verfügbar: Baskisch, Brasilianisch, Bretonisch, Britisch, Bulgarisch, Chinesisch (vereinfacht), Dänisch, Deutsch, Englisch, Esperanto, Französisch, Griechisch, Italienisch, Kroatisch, Norwegisch (Bokmål), Polnisch, Portugiesisch, Russisch, Serbisch, Spanisch, Slovakisch, Schwedisch, Tschechisch und Weißrussisch" +msgstr "Gajim ist in 24 Sprachen verfügbar: Baskisch, Brasilianisch, Bretonisch, Britisch, Bulgarisch, Chinesisch (vereinfacht), Dänisch, Deutsch, Englisch, Esperanto, Französisch, Griechisch, Italienisch, Kroatisch, Norwegisch (Bokmål), Polnisch, Portugiesisch, Russisch, Serbisch, Spanisch, Slowakisch, Schwedisch, Tschechisch und Weißrussisch" #: index.php:46 msgid "NEWS" @@ -824,7 +824,7 @@ #: index.php:66 #: index.php:78 msgid "Fix Idle and non-ascii languages under Windows" -msgstr "Probleme mit Idle und nicht-ascii Sprachen unter Windows wurden behoben." +msgstr "Probleme mit Idle und nicht-ASCII Sprachen unter Windows wurden behoben." #: index.php:67 #: index.php:79 @@ -858,21 +858,21 @@ #: index.php:83 #: index.php:95 msgid "Full ChangeLog" -msgstr "ist die volle Veränderungshistorie." +msgstr "Vollständige Veränderungshistorie." #: index.php:74 #: index.php:84 #: index.php:96 msgid "Bugs/Annoyances closed" -msgstr "Behobene Fehler/Störungen" +msgstr "Behobene Fehler" #: index.php:88 msgid "Support for link-local messaging via Zeroconf using Avahi" -msgstr "Support for link-local messaging via Zeroconf using Avahi" +msgstr "Unterstützung für lokale Nachrichten im LAN mit Zeroconf (Avahi)" #: index.php:89 msgid "Support for Network Manager" -msgstr "Ünterstützung für Netzwerk Manager" +msgstr "Unterstützung für Netzwerk Manager" #: index.php:90 msgid "IPv6 support to connect to server" @@ -892,7 +892,7 @@ #: index.php:94 msgid "GNOME Keyring support" -msgstr "Unterstützung für GNOME Keyring" +msgstr "Unterstützung für GNOME Schlüsselbund" #: screenshots.php:11 msgid "Here are some screenshots of Gajim:"

1 0

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

07 Aug '07

Author: bct Date: 2007-08-07 09:42:31 +0200 (Tue, 07 Aug 2007) New Revision: 8463 Modified: branches/e2e_encryption/src/chat_control.py branches/e2e_encryption/src/common/stanza_session.py branches/e2e_encryption/src/gajim.py Log: prompt with SAS during 3 message negotiation Modified: branches/e2e_encryption/src/chat_control.py =================================================================== --- branches/e2e_encryption/src/chat_control.py 2007-08-07 07:21:29 UTC (rev 8462) +++ branches/e2e_encryption/src/chat_control.py 2007-08-07 07:42:31 UTC (rev 8463) @@ -1957,7 +1957,8 @@ if not self.session: self.session = gajim.connections[self.account].make_new_session(self.contact.jid) - self.session.negotiate_e2e() + # XXX decide whether to use 4 or 3 message negotiation + self.session.negotiate_e2e(False) def got_connected(self): ChatControlBase.got_connected(self) Modified: branches/e2e_encryption/src/common/stanza_session.py =================================================================== --- branches/e2e_encryption/src/common/stanza_session.py 2007-08-07 07:21:29 UTC (rev 8462) +++ branches/e2e_encryption/src/common/stanza_session.py 2007-08-07 07:42:31 UTC (rev 8463) @@ -330,7 +330,7 @@ # if none exists, prompt the user with the SAS if self.sas_algs == 'sas28x5': self.sas = self.sas_28x5(m_a, self.form_b) - + mac_a = self.decrypt(id_a) form_a2 = self.c7lize_mac_id(form) @@ -357,8 +357,8 @@ content = self.n_s + self.n_o + self.encode_mpi(self.d) + pubkey_b if sigmai: - form_b = c7l_form - content += form_b + self.form_b = c7l_form + content += self.form_b else: form_b2 = c7l_form content += self.form_b + form_b2 @@ -383,6 +383,9 @@ # if none exists, prompt the user with the SAS if self.sas_algs == 'sas28x5': self.sas = self.sas_28x5(m_a, self.form_b) + + if self.sigmai: + self.check_identity() return (xmpp.DataField(name='identity', value=base64.b64encode(id_a)), \ xmpp.DataField(name='mac', value=base64.b64encode(m_a))) @@ -606,8 +609,6 @@ self.negotiated = negotiated - self.form_b = ''.join(map(lambda el: xmpp.c14n.c14n(el), form.getChildren())) - accept = xmpp.Message() feature = accept.NT.feature feature.setNamespace(xmpp.NS_FEATURE) @@ -647,7 +648,10 @@ rshashes = [base64.b64encode(rshash) for rshash in rshashes] result.addChild(node=xmpp.DataField(name='rshashes', value=rshashes)) result.addChild(node=xmpp.DataField(name='dhkeys', value=base64.b64encode(self.encode_mpi(e)))) + + self.form_b = ''.join(map(lambda el: xmpp.c14n.c14n(el), form.getChildren())) + # MUST securely destroy K unless it will be used later to generate the final shared secret for datafield in self.make_alices_identity(result, e): Modified: branches/e2e_encryption/src/gajim.py =================================================================== --- branches/e2e_encryption/src/gajim.py 2007-08-07 07:21:29 UTC (rev 8462) +++ branches/e2e_encryption/src/gajim.py 2007-08-07 07:42:31 UTC (rev 8463) @@ -1765,11 +1765,15 @@ elif session.status == 'requested-e2e' and form.getType() == 'submit': negotiated, not_acceptable, ask_user = session.verify_options_alice(form) + if session.sigmai: + session.check_identity = lambda: negotiation.show_sas_dialog(jid, session.sas) + if ask_user: def accept_nondefault_options(widget): dialog.destroy() negotiated.update(ask_user) + session.accept_e2e_alice(form, negotiated) def reject_nondefault_options(widget):

1 0

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

07 Aug '07

Author: bct Date: 2007-08-07 09:21:29 +0200 (Tue, 07 Aug 2007) New Revision: 8462 Modified: branches/e2e_encryption/src/common/stanza_session.py Log: three message negotiation Modified: branches/e2e_encryption/src/common/stanza_session.py =================================================================== --- branches/e2e_encryption/src/common/stanza_session.py 2007-08-06 23:19:57 UTC (rev 8461) +++ branches/e2e_encryption/src/common/stanza_session.py 2007-08-07 07:21:29 UTC (rev 8462) @@ -305,8 +305,104 @@ return ["may", "mustnot"] else: return ["mustnot", "may"] + + def get_shared_secret(self, e, y, p): + if (not 1 < e < (p - 1)): + raise exceptions.NegotiationError, "invalid DH value" - def negotiate_e2e(self): + return self.sha256(self.encode_mpi(self.powmod(e, y, p))) + + def c7lize_mac_id(self, form): + kids = form.getChildren() + macable = filter(lambda x: x.getVar() not in ('mac', 'identity'), kids) + return ''.join(map(lambda el: xmpp.c14n.c14n(el), macable)) + + def verify_alices_identity(self, form, e): + m_a = base64.b64decode(form['mac']) + id_a = base64.b64decode(form['identity']) + + m_a_calculated = self.hmac(self.km_o, self.encode_mpi(self.c_o) + id_a) + + if m_a_calculated != m_a: + raise exceptions.NegotiationError, 'calculated m_a differs from received m_a' + + # check for a retained secret + # if none exists, prompt the user with the SAS + if self.sas_algs == 'sas28x5': + self.sas = self.sas_28x5(m_a, self.form_b) + + mac_a = self.decrypt(id_a) + + form_a2 = self.c7lize_mac_id(form) + + mac_a_calculated = self.hmac(self.ks_o, self.n_s + self.n_o + self.encode_mpi(e) + self.form_a + form_a2) + + if mac_a_calculated != mac_a: + raise exceptions.NegotiationError, 'calculated mac_a differs from received mac_a' + + def verify_bobs_identity(self, form, sigmai): + m_b = base64.b64decode(form['mac']) + id_b = base64.b64decode(form['identity']) + + m_b_calculated = self.hmac(self.km_o, self.encode_mpi(self.c_o) + id_b) + + if m_b_calculated != m_b: + raise exceptions.NegotiationError, 'calculated m_b differs from received m_b' + + mac_b = self.decrypt(id_b) + pubkey_b = '' + + c7l_form = self.c7lize_mac_id(form) + + content = self.n_s + self.n_o + self.encode_mpi(self.d) + pubkey_b + + if sigmai: + form_b = c7l_form + content += form_b + else: + form_b2 = c7l_form + content += self.form_b + form_b2 + + mac_b_calculated = self.hmac(self.ks_o, content) + + if mac_b_calculated != mac_b: + raise exceptions.NegotiationError, 'calculated mac_b differs from received mac_b' + + def make_alices_identity(self, form, e): + form_a2 = ''.join(map(lambda el: xmpp.c14n.c14n(el), form.getChildren())) + + old_c_s = self.c_s + content = self.n_o + self.n_s + self.encode_mpi(e) + self.form_a + form_a2 + + mac_a = self.hmac(self.ks_s, content) + id_a = self.encrypt(mac_a) + + m_a = self.hmac(self.km_s, self.encode_mpi(old_c_s) + id_a) + + # check for a retained secret + # if none exists, prompt the user with the SAS + if self.sas_algs == 'sas28x5': + self.sas = self.sas_28x5(m_a, self.form_b) + + return (xmpp.DataField(name='identity', value=base64.b64encode(id_a)), \ + xmpp.DataField(name='mac', value=base64.b64encode(m_a))) + + def make_bobs_identity(self, form, d): + pubkey_b = '' + + form_b2 = ''.join(map(lambda el: c14n.c14n(el), form.getChildren())) + content = self.n_o + self.n_s + self.encode_mpi(d) + pubkey_b + self.form_b + form_b2 + + old_c_s = self.c_s + mac_b = self.hmac(self.ks_s, content) + id_b = self.encrypt(mac_b) + + m_b = self.hmac(self.km_s, self.encode_mpi(old_c_s) + id_b) + + return (xmpp.DataField(name='identity', value=base64.b64encode(id_b)), \ + xmpp.DataField(name='mac', value=base64.b64encode(m_b))) + + def negotiate_e2e(self, sigmai): self.negotiated = {} request = xmpp.Message() @@ -347,8 +443,8 @@ x.addChild(node=xmpp.DataField(name='modp', typ='list-single', options=map(lambda x: [ None, x ], modp_options))) - dhhashes = map(lambda x: self.make_dhhash(x), modp_options) - x.addChild(node=xmpp.DataField(name='dhhashes', typ='hidden', value=dhhashes)) + x.addChild(node=self.make_dhfield(modp_options, sigmai)) + self.sigmai = sigmai self.form_a = ''.join(map(lambda el: xmpp.c14n.c14n(el), x.getChildren())) @@ -413,7 +509,7 @@ if not 'logging' in ask_user: not_acceptable.append(name) else: - # some things are handled elsewhere, some things are not-implemented + # XXX some things are handled elsewhere, some things are not-implemented pass return (negotiated, not_acceptable, ask_user) @@ -487,8 +583,6 @@ # 'Alice Accepts' def verify_options_alice(self, form): -# 1. Verify that the ESession options selected by Bob are acceptable - negotiated = {} ask_user = {} not_acceptable = [] @@ -531,53 +625,43 @@ e = self.es[mod_p] self.d = self.decode_mpi(base64.b64decode(form['dhkeys'])) - - if (not 1 < self.d < (p - 1)): - raise exceptions.NegotiationError, "invalid DH value 'd'" - self.k = self.sha256(self.encode_mpi(self.powmod(self.d, x, p))) + self.k = self.get_shared_secret(self.d, x, p) result.addChild(node=xmpp.DataField(name='FORM_TYPE', value='urn:xmpp:ssn')) result.addChild(node=xmpp.DataField(name='accept', value='1')) result.addChild(node=xmpp.DataField(name='nonce', value=base64.b64encode(self.n_o))) - result.addChild(node=xmpp.DataField(name='dhkeys', value=base64.b64encode(self.encode_mpi(e)))) - secrets = gajim.interface.list_secrets(self.conn.name, self.jid.getStripped()) - rshashes = [self.hmac(self.n_s, rs) for rs in secrets] + self.kc_s, self.km_s, self.ks_s = self.generate_initiator_keys(self.k) - # XXX add some random fake rshashes here + if self.sigmai: + self.kc_o, self.km_o, self.ks_o = self.generate_responder_keys(self.k) + self.verify_bobs_identity(form, True) + else: + secrets = gajim.interface.list_secrets(self.conn.name, self.jid.getStripped()) + rshashes = [self.hmac(self.n_s, rs) for rs in secrets] - rshashes.sort() + # XXX add some random fake rshashes here + rshashes.sort() - rshashes = [base64.b64encode(rshash) for rshash in rshashes] - result.addChild(node=xmpp.DataField(name='rshashes', value=rshashes)) + rshashes = [base64.b64encode(rshash) for rshash in rshashes] + result.addChild(node=xmpp.DataField(name='rshashes', value=rshashes)) + result.addChild(node=xmpp.DataField(name='dhkeys', value=base64.b64encode(self.encode_mpi(e)))) - form_a2 = ''.join(map(lambda el: xmpp.c14n.c14n(el), result.getChildren())) - - self.kc_s, self.km_s, self.ks_s = self.generate_initiator_keys(self.k) - # MUST securely destroy K unless it will be used later to generate the final shared secret - old_c_s = self.c_s + for datafield in self.make_alices_identity(result, e): + result.addChild(node=datafield) - mac_a = self.hmac(self.ks_s, self.n_o + self.n_s + self.encode_mpi(e) + self.form_a + form_a2) - id_a = self.encrypt(mac_a) - - m_a = self.hmac(self.km_s, self.encode_mpi(old_c_s) + id_a) - - # check for a retained secret - # if none exists, prompt the user with the SAS - if self.sas_algs == 'sas28x5': - self.sas = self.sas_28x5(m_a, self.form_b) - - result.addChild(node=xmpp.DataField(name='identity', value=base64.b64encode(id_a))) - result.addChild(node=xmpp.DataField(name='mac', value=base64.b64encode(m_a))) - feature.addChild(node=result) self.send(accept) - - self.status = 'identified-alice' + if self.sigmai: + self.status = 'active' + self.enable_encryption = True + else: + self.status = 'identified-alice' + # 4.5 esession accept (bob) def accept_e2e_bob(self, form): response = xmpp.Message() @@ -594,32 +678,14 @@ e = self.decode_mpi(base64.b64decode(form['dhkeys'])) p = dh.primes[self.modp] - if (self.sha256(self.encode_mpi(e)) != self.He) or (not 1 < e < (p - 1)): - raise exceptions.NegotiationError, "invalid DH value 'e'" + k = self.get_shared_secret(e, self.y, p) - k = self.sha256(self.encode_mpi(self.powmod(e, self.y, p))) - self.kc_o, self.km_o, self.ks_o = self.generate_initiator_keys(k) # 4.5.2 verifying alice's identity - id_a = base64.b64decode(form['identity']) - m_a = base64.b64decode(form['mac']) - m_a_calculated = self.hmac(self.km_o, self.encode_mpi(self.c_o) + id_a) + self.verify_alices_identity(form) - if m_a_calculated != m_a: - raise exceptions.NegotiationError, 'calculated m_a differs from received m_a' - - mac_a = self.decrypt(id_a) - - macable_children = filter(lambda x: x.getVar() not in ('mac', 'identity'), form.getChildren()) - form_a2 = ''.join(map(lambda el: xmpp.c14n.c14n(el), macable_children)) - - mac_a_calculated = self.hmac(self.ks_o, self.n_s + self.n_o + self.encode_mpi(e) + self.form_a + form_a2) - - if mac_a_calculated != mac_a: - raise exceptions.NegotiationError, 'calculated mac_a differs from received mac_a' - # 4.5.4 generating bob's final session keys srs = '' @@ -635,11 +701,6 @@ # other shared secret, we haven't got one. oss = '' - # check for a retained secret - # if none exists, prompt the user with the SAS - if self.sas_algs == 'sas28x5': - self.sas = self.sas_28x5(m_a, self.form_b) - k = self.sha256(k + srs + oss) # XXX I can skip generating ks_o here @@ -704,24 +765,7 @@ # 4.6.2 Verifying Bob's Identity - m_b = base64.b64decode(form['mac']) - id_b = base64.b64decode(form['identity']) - - m_b_calculated = self.hmac(self.km_o, self.encode_mpi(self.c_o) + id_b) - - if m_b_calculated != m_b: - raise exceptions.NegotiationError, 'calculated m_b differs from received m_b' - - mac_b = self.decrypt(id_b) - - macable_children = filter(lambda x: x.getVar() not in ('mac', 'identity'), form.getChildren()) - form_b2 = ''.join(map(lambda el: xmpp.c14n.c14n(el), macable_children)) - - mac_b_calculated = self.hmac(self.ks_o, self.n_s + self.n_o + self.encode_mpi(self.d) + self.form_b + form_b2) - - if mac_b_calculated != mac_b: - raise exceptions.NegotiationError, 'calculated mac_b differs from received mac_b' - + self.verify_bobs_identity(form, False) # Note: If Alice discovers an error then she SHOULD ignore any encrypted content she received in the stanza. if self.negotiated['logging'] == 'mustnot': @@ -751,22 +795,31 @@ # in retrospect, this is horribly inadequate. return (self.decode_mpi(self.random_bytes(bytes)) % (top - bottom)) + bottom - def make_dhhash(self, modp): - p = dh.primes[modp] - g = dh.generators[modp] + def make_dhfield(self, modp_options, sigmai): + dhs = [] - x = self.srand(2 ** (2 * self.n - 1), p - 1) + for modp in modp_options: + p = dh.primes[modp] + g = dh.generators[modp] - # XXX this may be a source of performance issues - e = self.powmod(g, x, p) + x = self.srand(2 ** (2 * self.n - 1), p - 1) - self.xes[modp] = x - self.es[modp] = e + # XXX this may be a source of performance issues + e = self.powmod(g, x, p) - He = self.sha256(self.encode_mpi(e)) + self.xes[modp] = x + self.es[modp] = e - return base64.b64encode(He) + if sigmai: + dhs.append(base64.b64encode(self.encode_mpi(e))) + name = 'dhkeys' + else: + He = self.sha256(self.encode_mpi(e)) + dhs.append(base64.b64encode(He)) + name = 'dhhashes' + return xmpp.DataField(name=name, typ='hidden', value=dhs) + # a faster version of (base ** exp) % mod # taken from <http://lists.danga.com/pipermail/yadis/2005-September/001445.html> def powmod(self, base, exp, mod):

1 0

[commit-gajim] r8461 - in branches/jingle: data/glade src src/common src/common/xmpp
by liori＠gajim.org 06 Aug '07

06 Aug '07

Author: liori Date: 2007-08-07 01:19:57 +0200 (Tue, 07 Aug 2007) New Revision: 8461 Added: branches/jingle/src/common/meta.py Modified: branches/jingle/data/glade/chat_control_popup_menu.glade branches/jingle/src/chat_control.py branches/jingle/src/common/connection_handlers.py branches/jingle/src/common/jingle.py branches/jingle/src/common/xmpp/protocol.py Log: Jingle: UI entry point and lots of small changes. Modified: branches/jingle/data/glade/chat_control_popup_menu.glade =================================================================== --- branches/jingle/data/glade/chat_control_popup_menu.glade 2007-08-06 22:24:48 UTC (rev 8460) +++ branches/jingle/data/glade/chat_control_popup_menu.glade 2007-08-06 23:19:57 UTC (rev 8461) @@ -66,6 +66,15 @@ </child> <child> + <widget class="GtkMenuItem" id="start_voip_menuitem"> + <property name="visible">True</property> + <property name="label" translatable="yes">Start _Voice chat</property> + <property name="use_underline">True</property> + <signal name="activate" handler="_on_start_voip_menuitem_activate" last_modification_time="Tue, 03 Jan 2006 04:26:46 GMT"/> + </widget> + </child> + + <child> <widget class="GtkImageMenuItem" id="add_to_roster_menuitem"> <property name="visible">True</property> <property name="label" translatable="yes">_Add to Roster</property> Modified: branches/jingle/src/chat_control.py =================================================================== --- branches/jingle/src/chat_control.py 2007-08-06 22:24:48 UTC (rev 8460) +++ branches/jingle/src/chat_control.py 2007-08-06 23:19:57 UTC (rev 8461) @@ -1191,6 +1191,10 @@ gajim.config.set_per('contacts', self.contact.jid, 'gpg_enabled', widget.get_active()) + def _on_start_voip_menuitem_activate(self, *things): + print 'Start VoiP' + gajim.connections[self.account].startVoiP(self.contact.jid) + def _update_gpg(self): tb = self.xml.get_widget('gpg_togglebutton') # we can do gpg @@ -1533,6 +1537,7 @@ history_menuitem = xml.get_widget('history_menuitem') toggle_gpg_menuitem = xml.get_widget('toggle_gpg_menuitem') + start_voip_menuitem = xml.get_widget('start_voip_menuitem') add_to_roster_menuitem = xml.get_widget('add_to_roster_menuitem') send_file_menuitem = xml.get_widget('send_file_menuitem') information_menuitem = xml.get_widget('information_menuitem') @@ -1583,6 +1588,9 @@ id = toggle_gpg_menuitem.connect('activate', self._on_toggle_gpg_menuitem_activate) self.handlers[id] = toggle_gpg_menuitem + id = start_voip_menuitem.connect('activate', + self._on_start_voip_menuitem_activate) + self.handlers[id] = start_voip_menuitem id = information_menuitem.connect('activate', self._on_contact_information_menuitem_activate) self.handlers[id] = information_menuitem Modified: branches/jingle/src/common/connection_handlers.py =================================================================== --- branches/jingle/src/common/connection_handlers.py 2007-08-06 22:24:48 UTC (rev 8460) +++ branches/jingle/src/common/connection_handlers.py 2007-08-06 23:19:57 UTC (rev 8461) @@ -38,6 +38,7 @@ from common.commands import ConnectionCommands from common.pubsub import ConnectionPubSub from common.caps import ConnectionCaps +from common.jingle import ConnectionJingle STATUS_LIST = ['offline', 'connecting', 'online', 'chat', 'away', 'xa', 'dnd', 'invisible', 'error'] @@ -1174,12 +1175,13 @@ #('VCARD', {entry1: data, entry2: {entry21: data, ...}, ...}) self.dispatch('VCARD', vcard) -class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionCaps): +class ConnectionHandlers(ConnectionVcard, ConnectionBytestream, ConnectionDisco, ConnectionCommands, ConnectionPubSub, ConnectionCaps, ConnectionJingle): def __init__(self): ConnectionVcard.__init__(self) ConnectionBytestream.__init__(self) ConnectionCommands.__init__(self) ConnectionPubSub.__init__(self) + ConnectionJingle.__init__(self) self.gmail_url=None # List of IDs we are waiting answers for {id: (type_of_request, data), } self.awaiting_answers = {} @@ -2099,6 +2101,10 @@ con.RegisterHandler('iq', self._search_fields_received, 'result', common.xmpp.NS_SEARCH) 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) Modified: branches/jingle/src/common/jingle.py =================================================================== --- branches/jingle/src/common/jingle.py 2007-08-06 22:24:48 UTC (rev 8460) +++ branches/jingle/src/common/jingle.py 2007-08-06 23:19:57 UTC (rev 8461) @@ -12,19 +12,24 @@ ## ''' Handles the jingle signalling protocol. ''' +import gajim import xmpp +import meta + class JingleStates(object): ''' States in which jingle session may exist. ''' ended=0 pending=1 active=2 -class WrongState(exception): pass -class NoCommonCodec(exception): pass +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): ''' con -- connection object, weinitiate -- boolean, are we the initiator? @@ -32,48 +37,59 @@ self.contents={} # negotiated contents self.connection=con # connection to use # our full jid - self.ourjid=gajim.get_full_jid_from_account(self.connection.name) - self.jid=jid # jid we connect to + 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.jid + self.initiator=weinitiate and self.ourjid or self.peerjid # jid we use as the responder - self.responder=weinitiate and self.jid or self.ourjid + 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 - self.sid=con.getAnID() # sessionid + self.sid=con.connection.getAnID() # sessionid # callbacks to call on proper contents # use .prepend() to add new callbacks self.callbacks=dict((key, [self.__defaultCB]) for key in - ('content-accept', 'content-add', 'content-modify', + ('content-add', 'content-modify', 'content-remove', 'session-accept', 'session-info', 'session-initiate', 'session-terminate', 'transport-info')) self.callbacks['iq-result']=[] self.callbacks['iq-error']=[] + self.callbacks['content-accept']=[self.__contentAcceptCB, self.__defaultCB] + ''' Middle-level functions to manage contents. Handle local content cache and send change notifications. ''' - def addContent(self, name, description, transport, profile=None): + def addContent(self, name, content, initiator='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.''' + The protocol prohibits changing that when pending. + Initiator must be one of ('we', 'peer', 'initiator', 'responder')''' if self.state==JingleStates.pending: raise WrongState - content={'creator': 'initiator', - 'name': name, - 'description': description, - 'transport': transport} - if profile is not None: - content['profile']=profile - self.contents[('initiator', name)]=content + if (initiator=='we' and self.weinitiate) or (initiator=='peer' and not self.weinitiate): + initiator='initiator' + elif (initiator=='peer' and self.weinitiate) or (initiator=='we' and not self.weinitiate): + initiator='responder' + content.creator = initiator + content.name = name + self.contents[(initiator,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. ''' @@ -92,7 +108,7 @@ if error: # it's an iq-error stanza callables = 'iq-error' - else if jingle: + elif jingle: # it's a jingle action action = jingle.getAttr('action') callables = action @@ -115,11 +131,20 @@ self.connection.send(response) raise xmpp.NodeProcessed + def __contentAcceptCB(self, stanza, jingle, error): + ''' Called when we get content-accept stanza or equivalent one + (like session-accept).''' + # check which contents are accepted, call their callbacks + for content in jingle.iterTags('content'): + creator = content['creator'] + name = content['name'] + + ''' Methods that make/send proper pieces of XML. They check if the session is in appropriate state. ''' - def makeJingle(self, action): + def __makeJingle(self, action): stanza = xmpp.Iq(typ='set', to=xmpp.JID(self.jid)) - jingle = stanza.addChild('jingle', attrs= + jingle = stanza.addChild('jingle', attrs={ 'xmlns': 'http://www.xmpp.org/extensions/xep-0166.html#ns', 'action': action, 'initiator': self.initiator, @@ -127,21 +152,18 @@ 'sid': self.sid}) return stanza, jingle - def appendContent(self, jingle, content, full=True): + def __appendContent(self, jingle, content, full=True): ''' Append <content/> element to <jingle/> element, with (full=True) or without (full=False) <content/> children. ''' - c=jingle.addChild('content', attrs={ - 'creator': content['creator'], - 'name': content['name']}) - if 'profile' in content: - c['profile']=content['profile'] if full: - c.addChild(node=content['description']) - c.addChild(node=content['transport']) + jingle.addChild(node=content.toXML()) + else: + jingle.addChild('content', + attrs={'name': content.name, 'creator': content.creator}) return c - def appendContents(self, jingle, full=True): + def __appendContents(self, jingle, full=True): ''' Append all <content/> elements to <jingle/>.''' # TODO: integrate with __appendContent? # TODO: parameters 'name', 'content'? @@ -150,6 +172,9 @@ def __sessionInitiate(self): assert self.state==JingleStates.ended + stanza, jingle = self.__makeJingle('session-initiate') + self.__appendContents(jingle) + self.connection.send(jingle) def __sessionAccept(self): assert self.state==JingleStates.pending @@ -197,7 +222,7 @@ self.sid = jingle['sid'] for element in jingle.iterTags('content'): content={'creator': 'initiator', - 'name': element['name'] + 'name': element['name'], 'description': element.getTag('description'), 'transport': element.getTag('transport')} if element.has_attr('profile'): @@ -207,6 +232,7 @@ def sessionTerminateCB(self, stanza): pass class JingleAudioSession(object): + __metaclass__=meta.VerboseClassType class Codec(object): ''' This class keeps description of a single codec. ''' def __init__(self, name, id=None, **params): @@ -232,15 +258,15 @@ attrs=self.attrs, payload=(xmpp.Node('parameter', {'name': k, 'value': v}) for k,v in self.params)) - def __init__(self, con, weinitiate, jid): - JingleSession.__init__(self, con, weinitiate, jid) - if weinitiate: - pass #add voice content - self.callbacks['session-initiate'].prepend( + def __init__(self, content): + self.content = content self.initiator_codecs=[] self.responder_codecs=[] + 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 @@ -282,17 +308,47 @@ xmlns=xmpp.NS_JINGLE_AUDIO, 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 JingleICEUDPSession(object): - def __init__(self, con, weinitiate, jid): + __metaclass__=meta.VerboseClassType + def __init__(self, content): + self.content = content + + def _sessionInitiateCB(self): + ''' Called when we initiate the session. ''' pass -class JingleVoiP(JingleSession): + def toXML(self): + ''' ICE-UDP doesn't send much in its transport stanza... ''' + return xmpp.Node('transport', xmlns=xmpp.JINGLE_ICE_UDP) + +class JingleVoiP(object): ''' Jingle VoiP sessions consist of audio content transported over an ICE UDP protocol. ''' - def __init__(*data): - JingleAudioSession.__init__(*data) - JingleICEUDPSession.__init__(*data) + __metaclass__=meta.VerboseClassType + def __init__(self): + self.audio = JingleAudioSession(self) + self.transport = JingleICEUDPSession(self) + def toXML(self): + ''' Return proper XML for <content/> element. ''' + return xmpp.Node('content', + attrs={'name': self.name, 'creator': self.creator, 'profile': 'RTP/AVP'}, + childs=[self.audio.toXML(), self.transport.toXML()]) + + def _sessionInitiateCB(self): + ''' Called when we initiate the session. ''' + self.transport._sessionInitiateCB() + class ConnectionJingle(object): ''' This object depends on that it is a part of Connection class. ''' def __init__(self): @@ -307,13 +363,13 @@ ''' Add a jingle session to a jingle stanza dispatcher jingle - a JingleSession object. ''' - self.__sessions[(jingle.jid, jingle.sid)]=jingle + self.__sessions[(jingle.peerjid, jingle.sid)]=jingle def deleteJingle(self, jingle): ''' Remove a jingle session from a jingle stanza dispatcher ''' - del self.__session[(jingle.jid, jingle.sid)] + del self.__session[(jingle.peerjid, jingle.sid)] - def _jingleCB(self, con, stanza): + 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. @@ -330,6 +386,7 @@ raise xmpp.NodeProcessed jingle = stanza.getTag('jingle') + if not jingle: return sid = jingle.getAttr('sid') # do we need to create a new jingle object @@ -341,5 +398,11 @@ # we already have such session in dispatcher... return self.__sessions[(jid, sid)].stanzaCB(stanza) - def addJingleIqCallback(jid, id, jingle): + 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.startSession() Added: branches/jingle/src/common/meta.py =================================================================== --- branches/jingle/src/common/meta.py (rev 0) +++ branches/jingle/src/common/meta.py 2007-08-06 23:19:57 UTC (rev 8461) @@ -0,0 +1,36 @@ +#!/usr/bin/python + +import types + +class VerboseClassType(type): + indent = '' + + def __init__(cls, name, bases, dict): + super(VerboseClassType, cls).__init__(cls, name, bases, dict) + new = {} + print 'Initializing new class %s:' % cls + for fname, fun in dict.iteritems(): + wrap = hasattr(fun, '__call__') + print '%s%s is %s, we %s wrap it.' % \ + (cls.__class__.indent, fname, fun, wrap and 'will' or "won't") + if not wrap: continue + setattr(cls, fname, cls.wrap(name, fname, fun)) + + def wrap(cls, name, fname, fun): + def verbose(*a, **b): + args = ', '.join(map(repr, a)+map(lambda x:'%s=%r'%x, b.iteritems())) + print '%s%s.%s(%s):' % (cls.__class__.indent, name, fname, args) + cls.__class__.indent += '| ' + r = fun(*a, **b) + cls.__class__.indent = cls.__class__.indent[:-4] + print '%s+=%r' % (cls.__class__.indent, r) + return r + verbose.__name__ = fname + return verbose + +def nested_property(f): + ret = f() + p = {} + for v in ('fget', 'fset', 'fdel', 'doc'): + if v in ret: p[v]=ret[v] + return property(**p) Modified: branches/jingle/src/common/xmpp/protocol.py =================================================================== --- branches/jingle/src/common/xmpp/protocol.py 2007-08-06 22:24:48 UTC (rev 8460) +++ branches/jingle/src/common/xmpp/protocol.py 2007-08-06 23:19:57 UTC (rev 8461) @@ -55,6 +55,10 @@ NS_IBB ='http://jabber.org/protocol/ibb' NS_INVISIBLE ='presence-invisible' # Jabberd2 NS_IQ ='iq' # Jabberd2 +NS_JINGLE ='http://www.xmpp.org/extensions/xep-0166.html#ns' # XEP-0166 +NS_JINGLE_AUDIO ='http://www.xmpp.org/extensions/xep-0167.html#ns' # XEP-0167 +NS_JINGLE_RAW_UDP='http://www.xmpp.org/extensions/xep-0177.html#ns' # XEP-0177 +NS_JINGLE_ICE_UDP='http://www.xmpp.org/extensions/xep-0176.html#ns-udp' # XEP-0176 NS_LAST ='jabber:iq:last' NS_MESSAGE ='message' # Jabberd2 NS_MOOD ='http://jabber.org/protocol/mood' # XEP-0107

1 0

[commit-gajim] r8460 - trunk/src
by sb＠gajim.org 06 Aug '07

06 Aug '07

Author: sb Date: 2007-08-07 00:24:48 +0200 (Tue, 07 Aug 2007) New Revision: 8460 Modified: trunk/src/features_window.py Log: typo: avahai->avahi Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-08-06 22:21:22 UTC (rev 8459) +++ trunk/src/features_window.py 2007-08-06 22:24:48 UTC (rev 8460) @@ -43,7 +43,7 @@ _('Requires python-pyopenssl.')), _('Bonjour / Zeroconf'): (self.zeroconf_available, _('Serverless chatting with autodetected clients in a local network.'), - _('Requires python-avahai.'), + _('Requires python-avahi.'), _('Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')), _('gajim-remote'): (self.dbus_available, _('A script to controle gajim via commandline.'),

1 0

[commit-gajim] r8459 - trunk/src/common/zeroconf
by asterix＠gajim.org 06 Aug '07

06 Aug '07

Author: asterix Date: 2007-08-07 00:21:22 +0200 (Tue, 07 Aug 2007) New Revision: 8459 Modified: trunk/src/common/zeroconf/zeroconf.py trunk/src/common/zeroconf/zeroconf_avahi.py Log: remove svn:executable to zeroconf files Property changes on: trunk/src/common/zeroconf/zeroconf.py ___________________________________________________________________ Name: svn:executable - * Property changes on: trunk/src/common/zeroconf/zeroconf_avahi.py ___________________________________________________________________ Name: svn:executable - *

1 0

[commit-gajim] r8458 - in trunk/src: . common/zeroconf
by asterix＠gajim.org 06 Aug '07

06 Aug '07

Author: asterix Date: 2007-08-06 23:46:51 +0200 (Mon, 06 Aug 2007) New Revision: 8458 Added: trunk/src/common/zeroconf/zeroconf_avahi.py Modified: trunk/src/common/zeroconf/client_zeroconf.py trunk/src/common/zeroconf/connection_zeroconf.py trunk/src/common/zeroconf/zeroconf.py trunk/src/common/zeroconf/zeroconf_bonjour.py trunk/src/features_window.py Log: integrate pybonjour support to Gajim. see #2883. need a fix when sending messages Modified: trunk/src/common/zeroconf/client_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/client_zeroconf.py 2007-08-06 19:13:22 UTC (rev 8457) +++ trunk/src/common/zeroconf/client_zeroconf.py 2007-08-06 21:46:51 UTC (rev 8458) @@ -523,13 +523,6 @@ self.listener = None self.number_of_awaiting_messages = {} - def test_avahi(self): - try: - import avahi - except ImportError: - return False - return True - def connect(self, show, msg): self.port = self.start_listener(self.caller.port) if not self.port: Modified: trunk/src/common/zeroconf/connection_zeroconf.py =================================================================== --- trunk/src/common/zeroconf/connection_zeroconf.py 2007-08-06 19:13:22 UTC (rev 8457) +++ trunk/src/common/zeroconf/connection_zeroconf.py 2007-08-06 21:46:51 UTC (rev 8458) @@ -41,6 +41,7 @@ from common import gajim from common import GnuPG from common.zeroconf import client_zeroconf +from common.zeroconf import zeroconf from connection_handlers_zeroconf import * USE_GPG = GnuPG.USE_GPG @@ -228,7 +229,7 @@ self.get_config_values_or_default() if not self.connection: self.connection = client_zeroconf.ClientZeroconf(self) - if not self.connection.test_avahi(): + if not zeroconf.test_zeroconf(): self.dispatch('STATUS', 'offline') self.status = 'offline' self.dispatch('CONNECTION_LOST', Modified: trunk/src/common/zeroconf/zeroconf.py =================================================================== --- trunk/src/common/zeroconf/zeroconf.py 2007-08-06 19:13:22 UTC (rev 8457) +++ trunk/src/common/zeroconf/zeroconf.py 2007-08-06 21:46:51 UTC (rev 8458) @@ -12,404 +12,29 @@ ## GNU General Public License for more details. ## -from common import gajim - -try: - import dbus.glib -except ImportError, e: - pass - - C_NAME, C_DOMAIN, C_INTERFACE, C_PROTOCOL, C_HOST, \ C_ADDRESS, C_PORT, C_BARE_NAME, C_TXT = range(9) -class Zeroconf: - def __init__(self, new_serviceCB, remove_serviceCB, name_conflictCB, - disconnected_CB, error_CB, name, host, port): - self.avahi = None - self.domain = None # specific domain to browse - self.stype = '_presence._tcp' - self.port = port # listening port that gets announced - self.username = name - self.host = host - self.txt = {} # service data - - #XXX these CBs should be set to None when we destroy the object - # (go offline), because they create a circular reference - self.new_serviceCB = new_serviceCB - self.remove_serviceCB = remove_serviceCB - self.name_conflictCB = name_conflictCB - self.disconnected_CB = disconnected_CB - self.error_CB = error_CB - - self.service_browser = None - self.domain_browser = None - self.bus = None - self.server = None - self.contacts = {} # all current local contacts with data - self.entrygroup = None - self.connected = False - self.announced = False - self.invalid_self_contact = {} +def test_avahi(): + try: + import avahi + except ImportError: + return False + return True +def test_bonjour(): + try: + import pybonjour + except ImportError: + return False + return True - ## handlers for dbus callbacks - def entrygroup_commit_error_CB(self, err): - # left blank for possible later usage - pass - - def error_callback1(self, err): - gajim.log.debug('Error while resolving: ' + str(err)) - - def error_callback(self, err): - gajim.log.debug(str(err)) - # timeouts are non-critical - if str(err) != 'Timeout reached': - self.disconnect() - self.disconnected_CB() +def test_zeroconf(): + return test_avahi() or test_bonjour() - def new_service_callback(self, interface, protocol, name, stype, domain, flags): - gajim.log.debug('Found service %s in domain %s on %i.%i.' % (name, domain, interface, protocol)) - if not self.connected: - return - - # synchronous resolving - self.server.ResolveService( int(interface), int(protocol), name, stype, \ - domain, self.avahi.PROTO_UNSPEC, dbus.UInt32(0), \ - reply_handler=self.service_resolved_callback, error_handler=self.error_callback1) - - def remove_service_callback(self, interface, protocol, name, stype, domain, flags): - gajim.log.debug('Service %s in domain %s on %i.%i disappeared.' % (name, domain, interface, protocol)) - if not self.connected: - return - if name != self.name: - for key in self.contacts.keys(): - if self.contacts[key][C_BARE_NAME] == name: - del self.contacts[key] - self.remove_serviceCB(key) - return - - def new_service_type(self, interface, protocol, stype, domain, flags): - # Are we already browsing this domain for this type? - if self.service_browser: - return - - object_path = self.server.ServiceBrowserNew(interface, protocol, \ - stype, domain, dbus.UInt32(0)) - - self.service_browser = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, \ - object_path) , self.avahi.DBUS_INTERFACE_SERVICE_BROWSER) - self.service_browser.connect_to_signal('ItemNew', self.new_service_callback) - self.service_browser.connect_to_signal('ItemRemove', self.remove_service_callback) - self.service_browser.connect_to_signal('Failure', self.error_callback) - - def new_domain_callback(self,interface, protocol, domain, flags): - if domain != "local": - self.browse_domain(interface, protocol, domain) - - def txt_array_to_dict(self, txt_array): - txt_dict = {} - for els in txt_array: - key, val = '', None - for c in els: - #FIXME: remove when outdated, this is for avahi < 0.6.14 - if c < 0 or c > 255: - c = '.' - else: - c = chr(c) - if val is None: - if c == '=': - val = '' - else: - key += c - else: - val += c - if val is None: # missing '=' - val = '' - txt_dict[key] = val.decode('utf-8') - return txt_dict - - def service_resolved_callback(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): - gajim.log.debug('Service data for service %s in domain %s on %i.%i:' - % (name, domain, interface, protocol)) - gajim.log.debug('Host %s (%s), port %i, TXT data: %s' % (host, address, port, - self.txt_array_to_dict(txt))) - if not self.connected: - return - bare_name = name - if name.find('@') == -1: - name = name + '@' + name - - # we don't want to see ourselves in the list - if name != self.name: - self.contacts[name] = (name, domain, interface, protocol, host, address, port, - bare_name, txt) - self.new_serviceCB(name) - else: - # remember data - # In case this is not our own record but of another - # gajim instance on the same machine, - # it will be used when we get a new name. - self.invalid_self_contact[name] = (name, domain, interface, protocol, host, address, port, bare_name, txt) - - - # different handler when resolving all contacts - def service_resolved_all_callback(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): - if not self.connected: - return - bare_name = name - if name.find('@') == -1: - name = name + '@' + name - self.contacts[name] = (name, domain, interface, protocol, host, address, port, bare_name, txt) - - def service_added_callback(self): - gajim.log.debug('Service successfully added') - - def service_committed_callback(self): - gajim.log.debug('Service successfully committed') - - def service_updated_callback(self): - gajim.log.debug('Service successfully updated') - - def service_add_fail_callback(self, err): - gajim.log.debug('Error while adding service. %s' % str(err)) - if str(err) == 'Local name collision': - alternative_name = self.server.GetAlternativeServiceName(self.username) - self.name_conflictCB(alternative_name) - return - self.error_CB(_('Error while adding service. %s') % str(err)) - self.disconnect() - - def server_state_changed_callback(self, state, error): - if state == self.avahi.SERVER_RUNNING: - self.create_service() - elif state == self.avahi.SERVER_COLLISION: - self.entrygroup.Reset() - elif state == self.avahi.CLIENT_FAILURE: - # does it ever go here? - gajim.log.debug('CLIENT FAILURE') - - def entrygroup_state_changed_callback(self, state, error): - # the name is already present, so recreate - if state == self.avahi.ENTRY_GROUP_COLLISION: - self.service_add_fail_callback('Local name collision') - elif state == self.avahi.ENTRY_GROUP_FAILURE: - gajim.log.debug('zeroconf.py: ENTRY_GROUP_FAILURE reached(that' - ' should not happen)') - - # make zeroconf-valid names - def replace_show(self, show): - if show in ['chat', 'online', '']: - return 'avail' - elif show == 'xa': - return 'away' - return show - - def avahi_txt(self): - utf8_dict = {} - for key in self.txt: - val = self.txt[key] - if isinstance(val, unicode): - utf8_dict[key] = val.encode('utf-8') - else: - utf8_dict[key] = val - return self.avahi.dict_to_txt_array(utf8_dict) - - def create_service(self): - try: - if not self.entrygroup: - # create an EntryGroup for publishing - self.entrygroup = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, self.server.EntryGroupNew()), self.avahi.DBUS_INTERFACE_ENTRY_GROUP) - self.entrygroup.connect_to_signal('StateChanged', self.entrygroup_state_changed_callback) - - txt = {} - - #remove empty keys - for key,val in self.txt.iteritems(): - if val: - txt[key] = val - - txt['port.p2pj'] = self.port - txt['version'] = 1 - txt['txtvers'] = 1 - - # replace gajim's show messages with compatible ones - if self.txt.has_key('status'): - txt['status'] = self.replace_show(self.txt['status']) - else: - txt['status'] = 'avail' - - self.txt = txt - gajim.log.debug('Publishing service %s of type %s' % (self.name, self.stype)) - self.entrygroup.AddService(self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, dbus.UInt32(0), self.name, self.stype, '', '', self.port, self.avahi_txt(), reply_handler=self.service_added_callback, error_handler=self.service_add_fail_callback) - - self.entrygroup.Commit(reply_handler=self.service_committed_callback, - error_handler=self.entrygroup_commit_error_CB) - - return True - - except dbus.DBusException, e: - gajim.log.debug(str(e)) - return False - - def announce(self): - if not self.connected: - return False - - state = self.server.GetState() - if state == self.avahi.SERVER_RUNNING: - self.create_service() - self.announced = True - return True - - def remove_announce(self): - if self.announced == False: - return False - try: - if self.entrygroup.GetState() != self.avahi.ENTRY_GROUP_FAILURE: - self.entrygroup.Reset() - self.entrygroup.Free() - # .Free() has mem leaks - obj = self.entrygroup._obj - obj._bus = None - self.entrygroup._obj = None - self.entrygroup = None - self.announced = False - - return True - else: - return False - except dbus.DBusException, e: - gajim.log.debug("Can't remove service. That should not happen") - - def browse_domain(self, interface, protocol, domain): - self.new_service_type(interface, protocol, self.stype, domain, '') - - def avahi_dbus_connect_cb(self, a, connect, disconnect): - if connect != "": - gajim.log.debug('Lost connection to avahi-daemon') - self.disconnect() - if self.disconnected_CB: - self.disconnected_CB() - else: - gajim.log.debug('We are connected to avahi-daemon') - - # connect to dbus - def connect_dbus(self): - try: - import dbus - except ImportError: - gajim.log.debug('Error: python-dbus needs to be installed. No zeroconf support.') - return False - if self.bus: - return True - try: - self.bus = dbus.SystemBus() - self.bus.add_signal_receiver(self.avahi_dbus_connect_cb, - "NameOwnerChanged", "org.freedesktop.DBus", - arg0="org.freedesktop.Avahi") - except Exception, e: - # System bus is not present - self.bus = None - gajim.log.debug(str(e)) - return False - else: - return True - - # connect to avahi - def connect_avahi(self): - if not self.connect_dbus(): - return False - try: - import avahi - self.avahi = avahi - except ImportError: - gajim.log.debug('Error: python-avahi needs to be installed. No zeroconf support.') - return False - - if self.server: - return True - try: - self.server = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, \ - self.avahi.DBUS_PATH_SERVER), self.avahi.DBUS_INTERFACE_SERVER) - self.server.connect_to_signal('StateChanged', - self.server_state_changed_callback) - except Exception, e: - # Avahi service is not present - self.server = None - gajim.log.debug(str(e)) - return False - else: - return True - - def connect(self): - self.name = self.username + '@' + self.host # service name - if not self.connect_avahi(): - return False - - self.connected = True - # start browsing - if self.domain is None: - # Explicitly browse .local - self.browse_domain(self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, "local") - - # Browse for other browsable domains - self.domain_browser = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, \ - self.server.DomainBrowserNew(self.avahi.IF_UNSPEC, \ - self.avahi.PROTO_UNSPEC, '', self.avahi.DOMAIN_BROWSER_BROWSE,\ - dbus.UInt32(0))), self.avahi.DBUS_INTERFACE_DOMAIN_BROWSER) - self.domain_browser.connect_to_signal('ItemNew', self.new_domain_callback) - self.domain_browser.connect_to_signal('Failure', self.error_callback) - else: - self.browse_domain(self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, self.domain) - - return True - - def disconnect(self): - if self.connected: - self.connected = False - if self.service_browser: - self.service_browser.Free() - self.service_browser._obj._bus = None - self.service_browser._obj = None - if self.domain_browser: - self.domain_browser.Free() - self.domain_browser._obj._bus = None - self.domain_browser._obj = None - self.remove_announce() - self.server._obj._bus = None - self.server._obj = None - self.server = None - self.service_browser = None - self.domain_browser = None - - # refresh txt data of all contacts manually (no callback available) - def resolve_all(self): - if not self.connected: - return - for val in self.contacts.values(): - self.server.ResolveService(int(val[C_INTERFACE]), int(val[C_PROTOCOL]), val[C_BARE_NAME], \ - self.stype, val[C_DOMAIN], self.avahi.PROTO_UNSPEC, dbus.UInt32(0),\ - reply_handler=self.service_resolved_all_callback, error_handler=self.error_callback) - - def get_contacts(self): - return self.contacts - - def get_contact(self, jid): - if not jid in self.contacts: - return None - return self.contacts[jid] - - def update_txt(self, show = None): - if show: - self.txt['status'] = self.replace_show(show) - - txt = self.avahi_txt() - if self.connected and self.entrygroup: - self.entrygroup.UpdateServiceTxt(self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, dbus.UInt32(0), self.name, self.stype,'', txt, reply_handler=self.service_updated_callback, error_handler=self.error_callback) - return True - else: - return False - - -# END Zeroconf +if test_avahi(): + from common.zeroconf import zeroconf_avahi + Zeroconf = zeroconf_avahi.Zeroconf +elif test_bonjour(): + from common.zeroconf import zeroconf_bonjour + Zeroconf = zeroconf_bonjour.Zeroconf Copied: trunk/src/common/zeroconf/zeroconf_avahi.py (from rev 8448, trunk/src/common/zeroconf/zeroconf.py) =================================================================== --- trunk/src/common/zeroconf/zeroconf_avahi.py (rev 0) +++ trunk/src/common/zeroconf/zeroconf_avahi.py 2007-08-06 21:46:51 UTC (rev 8458) @@ -0,0 +1,415 @@ +## common/zeroconf/zeroconf.py +## +## Copyright (C) 2006 Stefan Bethge <stefan(a)lanpartei.de> +## +## 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. +## + +from common import gajim + +try: + import dbus.glib +except ImportError, e: + pass + +from common.zeroconf.zeroconf import C_BARE_NAME, C_INTERFACE, C_PROTOCOL, C_DOMAIN + +class Zeroconf: + def __init__(self, new_serviceCB, remove_serviceCB, name_conflictCB, + disconnected_CB, error_CB, name, host, port): + self.avahi = None + self.domain = None # specific domain to browse + self.stype = '_presence._tcp' + self.port = port # listening port that gets announced + self.username = name + self.host = host + self.txt = {} # service data + + #XXX these CBs should be set to None when we destroy the object + # (go offline), because they create a circular reference + self.new_serviceCB = new_serviceCB + self.remove_serviceCB = remove_serviceCB + self.name_conflictCB = name_conflictCB + self.disconnected_CB = disconnected_CB + self.error_CB = error_CB + + self.service_browser = None + self.domain_browser = None + self.bus = None + self.server = None + self.contacts = {} # all current local contacts with data + self.entrygroup = None + self.connected = False + self.announced = False + self.invalid_self_contact = {} + + + ## handlers for dbus callbacks + def entrygroup_commit_error_CB(self, err): + # left blank for possible later usage + pass + + def error_callback1(self, err): + gajim.log.debug('Error while resolving: ' + str(err)) + + def error_callback(self, err): + gajim.log.debug(str(err)) + # timeouts are non-critical + if str(err) != 'Timeout reached': + self.disconnect() + self.disconnected_CB() + + def new_service_callback(self, interface, protocol, name, stype, domain, flags): + gajim.log.debug('Found service %s in domain %s on %i.%i.' % (name, domain, interface, protocol)) + if not self.connected: + return + + # synchronous resolving + self.server.ResolveService( int(interface), int(protocol), name, stype, \ + domain, self.avahi.PROTO_UNSPEC, dbus.UInt32(0), \ + reply_handler=self.service_resolved_callback, error_handler=self.error_callback1) + + def remove_service_callback(self, interface, protocol, name, stype, domain, flags): + gajim.log.debug('Service %s in domain %s on %i.%i disappeared.' % (name, domain, interface, protocol)) + if not self.connected: + return + if name != self.name: + for key in self.contacts.keys(): + if self.contacts[key][C_BARE_NAME] == name: + del self.contacts[key] + self.remove_serviceCB(key) + return + + def new_service_type(self, interface, protocol, stype, domain, flags): + # Are we already browsing this domain for this type? + if self.service_browser: + return + + object_path = self.server.ServiceBrowserNew(interface, protocol, \ + stype, domain, dbus.UInt32(0)) + + self.service_browser = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, \ + object_path) , self.avahi.DBUS_INTERFACE_SERVICE_BROWSER) + self.service_browser.connect_to_signal('ItemNew', self.new_service_callback) + self.service_browser.connect_to_signal('ItemRemove', self.remove_service_callback) + self.service_browser.connect_to_signal('Failure', self.error_callback) + + def new_domain_callback(self,interface, protocol, domain, flags): + if domain != "local": + self.browse_domain(interface, protocol, domain) + + def txt_array_to_dict(self, txt_array): + txt_dict = {} + for els in txt_array: + key, val = '', None + for c in els: + #FIXME: remove when outdated, this is for avahi < 0.6.14 + if c < 0 or c > 255: + c = '.' + else: + c = chr(c) + if val is None: + if c == '=': + val = '' + else: + key += c + else: + val += c + if val is None: # missing '=' + val = '' + txt_dict[key] = val.decode('utf-8') + return txt_dict + + def service_resolved_callback(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): + gajim.log.debug('Service data for service %s in domain %s on %i.%i:' + % (name, domain, interface, protocol)) + gajim.log.debug('Host %s (%s), port %i, TXT data: %s' % (host, address, port, + self.txt_array_to_dict(txt))) + if not self.connected: + return + bare_name = name + if name.find('@') == -1: + name = name + '@' + name + + # we don't want to see ourselves in the list + if name != self.name: + self.contacts[name] = (name, domain, interface, protocol, host, address, port, + bare_name, txt) + self.new_serviceCB(name) + else: + # remember data + # In case this is not our own record but of another + # gajim instance on the same machine, + # it will be used when we get a new name. + self.invalid_self_contact[name] = (name, domain, interface, protocol, host, address, port, bare_name, txt) + + + # different handler when resolving all contacts + def service_resolved_all_callback(self, interface, protocol, name, stype, domain, host, aprotocol, address, port, txt, flags): + if not self.connected: + return + bare_name = name + if name.find('@') == -1: + name = name + '@' + name + self.contacts[name] = (name, domain, interface, protocol, host, address, port, bare_name, txt) + + def service_added_callback(self): + gajim.log.debug('Service successfully added') + + def service_committed_callback(self): + gajim.log.debug('Service successfully committed') + + def service_updated_callback(self): + gajim.log.debug('Service successfully updated') + + def service_add_fail_callback(self, err): + gajim.log.debug('Error while adding service. %s' % str(err)) + if str(err) == 'Local name collision': + alternative_name = self.server.GetAlternativeServiceName(self.username) + self.name_conflictCB(alternative_name) + return + self.error_CB(_('Error while adding service. %s') % str(err)) + self.disconnect() + + def server_state_changed_callback(self, state, error): + if state == self.avahi.SERVER_RUNNING: + self.create_service() + elif state == self.avahi.SERVER_COLLISION: + self.entrygroup.Reset() + elif state == self.avahi.CLIENT_FAILURE: + # does it ever go here? + gajim.log.debug('CLIENT FAILURE') + + def entrygroup_state_changed_callback(self, state, error): + # the name is already present, so recreate + if state == self.avahi.ENTRY_GROUP_COLLISION: + self.service_add_fail_callback('Local name collision') + elif state == self.avahi.ENTRY_GROUP_FAILURE: + gajim.log.debug('zeroconf.py: ENTRY_GROUP_FAILURE reached(that' + ' should not happen)') + + # make zeroconf-valid names + def replace_show(self, show): + if show in ['chat', 'online', '']: + return 'avail' + elif show == 'xa': + return 'away' + return show + + def avahi_txt(self): + utf8_dict = {} + for key in self.txt: + val = self.txt[key] + if isinstance(val, unicode): + utf8_dict[key] = val.encode('utf-8') + else: + utf8_dict[key] = val + return self.avahi.dict_to_txt_array(utf8_dict) + + def create_service(self): + try: + if not self.entrygroup: + # create an EntryGroup for publishing + self.entrygroup = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, self.server.EntryGroupNew()), self.avahi.DBUS_INTERFACE_ENTRY_GROUP) + self.entrygroup.connect_to_signal('StateChanged', self.entrygroup_state_changed_callback) + + txt = {} + + #remove empty keys + for key,val in self.txt.iteritems(): + if val: + txt[key] = val + + txt['port.p2pj'] = self.port + txt['version'] = 1 + txt['txtvers'] = 1 + + # replace gajim's show messages with compatible ones + if self.txt.has_key('status'): + txt['status'] = self.replace_show(self.txt['status']) + else: + txt['status'] = 'avail' + + self.txt = txt + gajim.log.debug('Publishing service %s of type %s' % (self.name, self.stype)) + self.entrygroup.AddService(self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, dbus.UInt32(0), self.name, self.stype, '', '', self.port, self.avahi_txt(), reply_handler=self.service_added_callback, error_handler=self.service_add_fail_callback) + + self.entrygroup.Commit(reply_handler=self.service_committed_callback, + error_handler=self.entrygroup_commit_error_CB) + + return True + + except dbus.DBusException, e: + gajim.log.debug(str(e)) + return False + + def announce(self): + if not self.connected: + return False + + state = self.server.GetState() + if state == self.avahi.SERVER_RUNNING: + self.create_service() + self.announced = True + return True + + def remove_announce(self): + if self.announced == False: + return False + try: + if self.entrygroup.GetState() != self.avahi.ENTRY_GROUP_FAILURE: + self.entrygroup.Reset() + self.entrygroup.Free() + # .Free() has mem leaks + obj = self.entrygroup._obj + obj._bus = None + self.entrygroup._obj = None + self.entrygroup = None + self.announced = False + + return True + else: + return False + except dbus.DBusException, e: + gajim.log.debug("Can't remove service. That should not happen") + + def browse_domain(self, interface, protocol, domain): + self.new_service_type(interface, protocol, self.stype, domain, '') + + def avahi_dbus_connect_cb(self, a, connect, disconnect): + if connect != "": + gajim.log.debug('Lost connection to avahi-daemon') + self.disconnect() + if self.disconnected_CB: + self.disconnected_CB() + else: + gajim.log.debug('We are connected to avahi-daemon') + + # connect to dbus + def connect_dbus(self): + try: + import dbus + except ImportError: + gajim.log.debug('Error: python-dbus needs to be installed. No zeroconf support.') + return False + if self.bus: + return True + try: + self.bus = dbus.SystemBus() + self.bus.add_signal_receiver(self.avahi_dbus_connect_cb, + "NameOwnerChanged", "org.freedesktop.DBus", + arg0="org.freedesktop.Avahi") + except Exception, e: + # System bus is not present + self.bus = None + gajim.log.debug(str(e)) + return False + else: + return True + + # connect to avahi + def connect_avahi(self): + if not self.connect_dbus(): + return False + try: + import avahi + self.avahi = avahi + except ImportError: + gajim.log.debug('Error: python-avahi needs to be installed. No zeroconf support.') + return False + + if self.server: + return True + try: + self.server = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, \ + self.avahi.DBUS_PATH_SERVER), self.avahi.DBUS_INTERFACE_SERVER) + self.server.connect_to_signal('StateChanged', + self.server_state_changed_callback) + except Exception, e: + # Avahi service is not present + self.server = None + gajim.log.debug(str(e)) + return False + else: + return True + + def connect(self): + self.name = self.username + '@' + self.host # service name + if not self.connect_avahi(): + return False + + self.connected = True + # start browsing + if self.domain is None: + # Explicitly browse .local + self.browse_domain(self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, "local") + + # Browse for other browsable domains + self.domain_browser = dbus.Interface(self.bus.get_object(self.avahi.DBUS_NAME, \ + self.server.DomainBrowserNew(self.avahi.IF_UNSPEC, \ + self.avahi.PROTO_UNSPEC, '', self.avahi.DOMAIN_BROWSER_BROWSE,\ + dbus.UInt32(0))), self.avahi.DBUS_INTERFACE_DOMAIN_BROWSER) + self.domain_browser.connect_to_signal('ItemNew', self.new_domain_callback) + self.domain_browser.connect_to_signal('Failure', self.error_callback) + else: + self.browse_domain(self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, self.domain) + + return True + + def disconnect(self): + if self.connected: + self.connected = False + if self.service_browser: + self.service_browser.Free() + self.service_browser._obj._bus = None + self.service_browser._obj = None + if self.domain_browser: + self.domain_browser.Free() + self.domain_browser._obj._bus = None + self.domain_browser._obj = None + self.remove_announce() + self.server._obj._bus = None + self.server._obj = None + self.server = None + self.service_browser = None + self.domain_browser = None + + # refresh txt data of all contacts manually (no callback available) + def resolve_all(self): + if not self.connected: + return + for val in self.contacts.values(): + self.server.ResolveService(int(val[C_INTERFACE]), int(val[C_PROTOCOL]), + val[C_BARE_NAME], self.stype, val[C_DOMAIN], + self.avahi.PROTO_UNSPEC, dbus.UInt32(0), + reply_handler=self.service_resolved_all_callback, + error_handler=self.error_callback) + + def get_contacts(self): + return self.contacts + + def get_contact(self, jid): + if not jid in self.contacts: + return None + return self.contacts[jid] + + def update_txt(self, show = None): + if show: + self.txt['status'] = self.replace_show(show) + + txt = self.avahi_txt() + if self.connected and self.entrygroup: + self.entrygroup.UpdateServiceTxt(self.avahi.IF_UNSPEC, self.avahi.PROTO_UNSPEC, dbus.UInt32(0), self.name, self.stype,'', txt, reply_handler=self.service_updated_callback, error_handler=self.error_callback) + return True + else: + return False + + +# END Zeroconf Modified: trunk/src/common/zeroconf/zeroconf_bonjour.py =================================================================== --- trunk/src/common/zeroconf/zeroconf_bonjour.py 2007-08-06 19:13:22 UTC (rev 8457) +++ trunk/src/common/zeroconf/zeroconf_bonjour.py 2007-08-06 21:46:51 UTC (rev 8458) @@ -16,6 +16,7 @@ import sys import select from string import split +from common.zeroconf.zeroconf import C_BARE_NAME, C_DOMAIN try: import pybonjour @@ -23,9 +24,6 @@ pass -C_NAME, C_DOMAIN, C_INTERFACE, C_PROTOCOL, C_HOST, \ -C_ADDRESS, C_PORT, C_BARE_NAME, C_TXT = range(9) - resolve_timeout = 1 class Zeroconf: @@ -297,7 +295,10 @@ self.browse_loop() for val in self.contacts.values(): - resolve_sdRef = pybonjour.DNSServiceResolve(0, pybonjour.kDNSServiceInterfaceIndexAny, val[C_BARE_NAME], self.stype+'.', val[C_DOMAIN]+'.', self.service_resolved_all_callback) + resolve_sdRef = pybonjour.DNSServiceResolve(0, + pybonjour.kDNSServiceInterfaceIndexAny, val[C_BARE_NAME], + self.stype + '.', val[C_DOMAIN] + '.', + self.service_resolved_all_callback) try: ready = select.select([resolve_sdRef], [], [], resolve_timeout) Modified: trunk/src/features_window.py =================================================================== --- trunk/src/features_window.py 2007-08-06 19:13:22 UTC (rev 8457) +++ trunk/src/features_window.py 2007-08-06 21:46:51 UTC (rev 8458) @@ -44,7 +44,7 @@ _('Bonjour / Zeroconf'): (self.zeroconf_available, _('Serverless chatting with autodetected clients in a local network.'), _('Requires python-avahai.'), - _('Feature not available under Windows.')), + _('Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour).')), _('gajim-remote'): (self.dbus_available, _('A script to controle gajim via commandline.'), _('Requires python-dbus.'), @@ -141,12 +141,13 @@ return True def zeroconf_available(self): - if os.name == 'nt': - return False try: import avahi except: - return False + try: + import pybonjour + except: + return False return True def dbus_available(self): @@ -272,4 +273,4 @@ pass if exitcode == 0: return True - return False \ No newline at end of file + return False

1 0

[commit-gajim] r8457 - trunk/src/common/zeroconf
by asterix＠gajim.org 06 Aug '07

06 Aug '07

Author: asterix Date: 2007-08-06 21:13:22 +0200 (Mon, 06 Aug 2007) New Revision: 8457 Modified: trunk/src/common/zeroconf/zeroconf_bonjour.py Log: don't fail when there is a name conflict Modified: trunk/src/common/zeroconf/zeroconf_bonjour.py =================================================================== --- trunk/src/common/zeroconf/zeroconf_bonjour.py 2007-08-06 15:53:01 UTC (rev 8456) +++ trunk/src/common/zeroconf/zeroconf_bonjour.py 2007-08-06 19:13:22 UTC (rev 8457) @@ -224,12 +224,12 @@ self.service_sdRef = sdRef except pybonjour.BonjourError, e: self.service_add_fail_callback(e) - - gajim.log.debug('Publishing service %s of type %s' % (self.name, self.stype)) + else: + gajim.log.debug('Publishing service %s of type %s' % (self.name, self.stype)) - ready = select.select([sdRef], [], [], resolve_timeout) - if sdRef in ready[0]: - pybonjour.DNSServiceProcessResult(sdRef) + ready = select.select([sdRef], [], [], resolve_timeout) + if sdRef in ready[0]: + pybonjour.DNSServiceProcessResult(sdRef) def announce(self): if not self.connected: @@ -297,8 +297,6 @@ self.browse_loop() for val in self.contacts.values(): - print val[C_BARE_NAME] - print val[C_DOMAIN] resolve_sdRef = pybonjour.DNSServiceResolve(0, pybonjour.kDNSServiceInterfaceIndexAny, val[C_BARE_NAME], self.stype+'.', val[C_DOMAIN]+'.', self.service_resolved_all_callback) try:

1 0

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

06 Aug '07

Author: liori Date: 2007-08-06 17:53:01 +0200 (Mon, 06 Aug 2007) New Revision: 8456 Added: branches/jingle/src/common/jingle.py Log: Jingle: Initial support for jingle and jingle-audio. Code isn't linked with the connection code yet. Inside: * A basic form of jingle framework; the goal is to make code reusable for other jingle uses. * Codec "negotiation" for jingle-audio. Added: branches/jingle/src/common/jingle.py =================================================================== --- branches/jingle/src/common/jingle.py (rev 0) +++ branches/jingle/src/common/jingle.py 2007-08-06 15:53:01 UTC (rev 8456) @@ -0,0 +1,345 @@ +## +## 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 xmpp + +class JingleStates(object): + ''' States in which jingle session may exist. ''' + ended=0 + pending=1 + active=2 + +class WrongState(exception): pass +class NoCommonCodec(exception): pass + +class JingleSession(object): + ''' This represents one jingle session. ''' + def __init__(self, con, weinitiate, jid): + ''' 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_full_jid_from_account(self.connection.name) + self.jid=jid # jid we connect to + # jid we use as the initiator + self.initiator=weinitiate and self.ourjid or self.jid + # jid we use as the responder + self.responder=weinitiate and self.jid or self.ourjid + # are we an initiator? + self.weinitiate=weinitiate + # what state is session in? (one from JingleStates) + self.state=JingleStates.ended + self.sid=con.getAnID() # sessionid + + # callbacks to call on proper contents + # use .prepend() to add new callbacks + self.callbacks=dict((key, [self.__defaultCB]) for key in + ('content-accept', 'content-add', 'content-modify', + 'content-remove', 'session-accept', 'session-info', + 'session-initiate', 'session-terminate', + 'transport-info')) + self.callbacks['iq-result']=[] + self.callbacks['iq-error']=[] + + ''' Middle-level functions to manage contents. Handle local content + cache and send change notifications. ''' + def addContent(self, name, description, transport, profile=None): + ''' 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.''' + if self.state==JingleStates.pending: + raise WrongState + + content={'creator': 'initiator', + 'name': name, + 'description': description, + 'transport': transport} + if profile is not None: + content['profile']=profile + self.contents[('initiator', name)]=content + + if self.state==JingleStates.active: + pass # TODO: send proper stanza, shouldn't be needed now + + ''' Middle-level function to do stanza exchange. ''' + def startSession(self): + ''' Start session. ''' + self.__sessionInitiate(self) + + def sendSessionInfo(self): pass + def sendTransportInfo(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 + callables = 'iq-error' + else if jingle: + # it's a jingle action + action = jingle.getAttr('action') + callables = action + else: + # it's an iq-result (ack) stanza + callables = 'iq-result' + + callables = self.callbacks[callables] + + try: + for callable in callables: + callable(stanza=stanza, jingle=jingle, error=error) + except xmpp.NodeProcessed: + pass + + def __defaultCB(self, stanza, jingle, error): + ''' Default callback for action stanzas -- simple ack + and stop processing. ''' + response = stanza.buildReply('result') + self.connection.send(response) + raise xmpp.NodeProcessed + + ''' 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.jid)) + 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. ''' + c=jingle.addChild('content', attrs={ + 'creator': content['creator'], + 'name': content['name']}) + if 'profile' in content: + c['profile']=content['profile'] + if full: + c.addChild(node=content['description']) + c.addChild(node=content['transport']) + return c + + 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 + + def __sessionAccept(self): + assert self.state==JingleStates.pending + stanza, jingle = self.__jingle('session-accept') + self.__appendContents(jingle, False) + self.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.send(stanza) + + def __sessionTerminate(self): + assert self.state!=JingleStates.ended + stanza, jingle = self.__jingle('session-terminate') + self.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 __transportInfo(self): + assert self.state!=JingleStates.ended + + '''Callbacks''' + def sessionInitiateCB(self, stanza): + ''' We got a jingle session request from other entity, + therefore we are the receiver... Unpack the data. ''' + jingle = stanza.getTag('jingle') + self.initiator = jingle['initiator'] + self.responder = self.ourjid + self.jid = self.initiator + self.state = JingleStates.pending + self.sid = jingle['sid'] + for element in jingle.iterTags('content'): + content={'creator': 'initiator', + 'name': element['name'] + 'description': element.getTag('description'), + 'transport': element.getTag('transport')} + if element.has_attr('profile'): + content['profile']=element['profile'] + self.contents[('initiator', content['name'])]=content + + def sessionTerminateCB(self, stanza): pass + +class JingleAudioSession(object): + 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', + attrs=self.attrs, + payload=(xmpp.Node('parameter', {'name': k, 'value': v}) for k,v in self.params)) + + def __init__(self, con, weinitiate, jid): + JingleSession.__init__(self, con, weinitiate, jid) + if weinitiate: + pass #add voice content + self.callbacks['session-initiate'].prepend( + + self.initiator_codecs=[] + self.responder_codecs=[] + + ''' "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: + 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('description', + xmlns=xmpp.NS_JINGLE_AUDIO, + payload=(codec.toXML() for codec in codecs)) + +class JingleICEUDPSession(object): + def __init__(self, con, weinitiate, jid): + pass + +class JingleVoiP(JingleSession): + ''' Jingle VoiP sessions consist of audio content transported + over an ICE UDP protocol. ''' + def __init__(*data): + JingleAudioSession.__init__(*data) + JingleICEUDPSession.__init__(*data) + +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.jid, jingle.sid)]=jingle + + def deleteJingle(self, jingle): + ''' Remove a jingle session from a jingle stanza dispatcher ''' + del self.__session[(jingle.jid, 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') + sid = jingle.getAttr('sid') + + # do we need to create a new jingle object + if (jid, sid) not in self.__sessions: + # we should check its type here... + newjingle = JingleAudioSession(con=self, weinitiate=False, jid=jid) + self.addJingle(newjingle) + + # we already have such session in dispatcher... + return self.__sessions[(jid, sid)].stanzaCB(stanza) + + def addJingleIqCallback(jid, id, jingle): + self.__iq_responses[(jid, id)]=jingle

1 0

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