changeset 31688:80b51b8460af

applied changes from 32a55bbc4f1e8d632d205d040fa3e814559e1c95 through 4beb86df935d5dfd7ce4107bcabe1944e59a63a2 Original commit message: Actually set the relay info for TCP
author Mark Doliner <mark@kingant.net>
date Mon, 20 Jun 2011 05:30:52 +0000
parents 6d6b4f2a5e69
children 855a539dcec7
files ChangeLog libpurple/media/backend-fs2.c
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jun 20 05:29:40 2011 +0000
+++ b/ChangeLog	Mon Jun 20 05:30:52 2011 +0000
@@ -1,5 +1,10 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.8.1 (MM/DD/YYYY):
+  libpurple:
+  * media: Actually use the specified TCP port from the TURN configuration to
+    create a TCP relay candidate.
+
 version 2.8.0 (06/07/2011):
 	General:
 	* Implement simple silence suppression for voice calls, preventing
--- a/libpurple/media/backend-fs2.c	Mon Jun 20 05:29:40 2011 +0000
+++ b/libpurple/media/backend-fs2.c	Mon Jun 20 05:30:52 2011 +0000
@@ -1823,7 +1823,7 @@
 		port = purple_prefs_get_int("/purple/network/turn_port_tcp");
 		if (port > 0) {
 			relay_info = append_relay_info(relay_info, turn_ip, port, username,
-				password, "udp");
+				password, "tcp");
 		}
 
 		/* TURN over SSL is only supported by libnice for Google's "psuedo" SSL mode