diff options
| author | Marcus Lundblad <malu@pidgin.im> | 2010-08-31 18:26:04 +0000 |
|---|---|---|
| committer | Marcus Lundblad <malu@pidgin.im> | 2010-08-31 18:26:04 +0000 |
| commit | d96df2d0de45a2b4b0dc5e0dfddb2e13b3c8bb44 (patch) | |
| tree | ef69d43ec2b541c422a4d27e1f3fb0d33d5f9096 /libpurple | |
| parent | 079848a53a0387353f4b3c8ebee64ee73a268a20 (diff) | |
| download | pidgin-d96df2d0de45a2b4b0dc5e0dfddb2e13b3c8bb44.tar.gz | |
Removed the TCP and TLS TURN relaying options since libnice currently only supports these in Google mode. Added a note about this in fs-backend.c and changed the prefs label to read "UDP Port"
Diffstat (limited to 'libpurple')
| -rw-r--r-- | libpurple/media/backend-fs2.c | 17 | ||||
| -rw-r--r-- | libpurple/network.c | 2 |
2 files changed, 3 insertions, 16 deletions
diff --git a/libpurple/media/backend-fs2.c b/libpurple/media/backend-fs2.c index d6303bef04..84b1816577 100644 --- a/libpurple/media/backend-fs2.c +++ b/libpurple/media/backend-fs2.c @@ -1639,20 +1639,9 @@ create_stream(PurpleMediaBackendFs2 *self, 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, "tcp"); - } - - /* TLS */ - port = purple_prefs_get_int("/purple/network/turn_port_tls"); - if (port > 0) { - relay_info = append_relay_info(relay_info, turn_ip, port, username, - password, "tls"); - } - + /* should add TCP and perhaps TLS relaying options when these are + supported by libnice using non-google mode */ + purple_debug_info("backend-fs2", "Setting relay-info on new stream\n"); _params[_num_params].name = "relay-info"; diff --git a/libpurple/network.c b/libpurple/network.c index 82bcc97309..0ceff6509f 100644 --- a/libpurple/network.c +++ b/libpurple/network.c @@ -1140,8 +1140,6 @@ 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_int ("/purple/network/turn_port_tls", 443); 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); |