pidgin: 752daf02: Add support for using TCP relaying with ...

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 752daf02d2f9e9917b9b36fdecdb7719efe07391
Parent:   1081e17d573ff4d16ff4b96e4bfdebbcdccf9a76
Author:   malu at pidgin.im
Date:     06/06/11 16:13:30
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/752daf02d2f9e9917b9b36fdecdb7719efe07391

Changelog: 

Add support for using TCP relaying with TURN

Changes against parent 1081e17d573ff4d16ff4b96e4bfdebbcdccf9a76

  patched  ChangeLog
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/network.c
  patched  pidgin/gtkprefs.c

-------------- next part --------------
============================================================
--- ChangeLog	bbb93e35d288a7127264665ac2e91de6fd54d73e
+++ ChangeLog	1d2d08e8ca0fff3b4b95a2320bc99c81b0c6f03f
@@ -40,6 +40,8 @@ version 2.8.0 (??/??/????):
 	* proxy: Add new "Tor/Privacy" proxy type that can be used to
 	  restrict operations that could leak potentially sensitive data
 	  (e.g. DNS queries).  (#11110, #13928)
+	* media: Add support for using TCP relaying with TURN (will only work with
+	  libnice 0.1.0 and later).
 
 	AIM:
 	* Fix setting icons with dimensions greater than 64x64 pixels by scaling
============================================================
--- pidgin/gtkprefs.c	336216e3be94522ef88dece834f067410c057497
+++ pidgin/gtkprefs.c	fdaaf5541043689510936f07247c23cb61547170
@@ -1794,6 +1794,9 @@ network_page(void)
 	pidgin_prefs_labeled_spin_button(hbox, _("_UDP Port:"),
 		"/purple/network/turn_port", 0, 65535, NULL);
 
+	pidgin_prefs_labeled_spin_button(hbox, _("T_CP Port:"),
+		"/purple/network/turn_port_tcp", 0, 65535, NULL);
+
 	hbox = pidgin_prefs_labeled_entry(vbox, _("Use_rname:"),
 		"/purple/network/turn_username", sg);
 	pidgin_prefs_labeled_password(hbox, _("Pass_word:"),
============================================================
--- libpurple/network.c	1af5a26476244a4f69b919a99f8ac911da739a29
+++ libpurple/network.c	157a020a2d0f90e144a1de465be40848bb51df7c
@@ -1149,6 +1149,7 @@ purple_network_init(void)
 	purple_prefs_add_string("/purple/network/stun_server", "");
 	purple_prefs_add_string("/purple/network/turn_server", "");
 	purple_prefs_add_int   ("/purple/network/turn_port", 3478);
+	purple_prefs_add_int	 ("/purple/network/turn_port_tcp", 3478);
 	purple_prefs_add_string("/purple/network/turn_username", "");
 	purple_prefs_add_string("/purple/network/turn_password", "");
 	purple_prefs_add_bool  ("/purple/network/auto_ip", TRUE);
============================================================
--- libpurple/media/backend-fs2.c	bcf363e92e4d95d1c948cf4f1738758d649073c9
+++ libpurple/media/backend-fs2.c	bc032c93887ce3975c4241cb003861275a01b981
@@ -1818,9 +1818,16 @@ create_stream(PurpleMediaBackendFs2 *sel
 			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");