Mercurial > pidgin

diff libpurple/media/backend-fs2.c @ 31625:8b434ffd4efc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add support for using TCP relaying with TURN
author Marcus Lundblad <ml@update.uu.se>
date Mon, 06 Jun 2011 20:13:30 +0000
parents 4ad7ff6bdc4e
children a15e0b0e5b6c
line wrap: on
line diff
--- a/libpurple/media/backend-fs2.c	Mon Jun 06 16:25:21 2011 +0000
+++ b/libpurple/media/backend-fs2.c	Mon Jun 06 20:13:30 2011 +0000
@@ -1818,9 +1818,16 @@
 			relay_info = append_relay_info(relay_info, turn_ip, port, username,
 				password, "udp");
 		}
+		
+		/* TCP */
+		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");
+		}
 
-		/* should add TCP and perhaps TLS relaying options when these are
-		 supported by libnice using non-google mode */
+		/* TURN over SSL is only supported by libnice for Google's "psuedo" SSL mode
+			at this time */
 
 		purple_debug_info("backend-fs2",
 			"Setting relay-info on new stream\n");