telepathy-gabble: jingle-info: don't discard google:jingleinfo pushes.

Will Thompson wjt at kemper.freedesktop.org
Thu Dec 6 04:29:03 PST 2012


Module: telepathy-gabble
Branch: master
Commit: 286eadd02129048ec5c7ee7c693358db5916cf9a
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=286eadd02129048ec5c7ee7c693358db5916cf9a

Author: Will Thompson <will.thompson at collabora.co.uk>
Date:   Fri Nov 23 14:17:51 2012 +0000

jingle-info: don't discard google:jingleinfo pushes.

Previously, Google's reply to our original google:jingleinfo query would
be used correctly, but the act of passing it to
gabble_jingle_info_take_stun_server would set get_stun_from_jingle to
FALSE, causing any later calls to got_jingle_info_stanza() to ignore the
updated STUN server information.

We address this by distinguishing between user-set and server-provided
STUN servers, as opposed to just between fallback or not.

---

 src/Makefile.am                     |    2 +
 src/jingle-info-internal.h          |   29 ++++++++++++++++
 src/jingle-info.c                   |   47 +++++++++++++++++++++------
 tests/twisted/jingle/stun-server.py |   61 +++++++++++++++++++++++++----------
 4 files changed, 112 insertions(+), 27 deletions(-)

Diff:   http://cgit.freedesktop.org/telepathy/telepathy-gabble/diff/?id=286eadd02129048ec5c7ee7c693358db5916cf9a


More information about the telepathy-commits mailing list