pidgin: bce9d68c: Disable direct connections when the acco...

[qulogic at pidgin.im]

-----------------------------------------------------------------
Revision: bce9d68c131147c0724ad3525a1a93e5d2a862ff
Ancestor: 8e588e5650f141a62fbbba35e3f6594317129cdf
Author: qulogic at pidgin.im
Date: 2010-05-21T04:05:14
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/bce9d68c131147c0724ad3525a1a93e5d2a862ff

Modified files:
        libpurple/protocols/msn/slp.c

ChangeLog: 

Disable direct connections when the account option is off.

-------------- next part --------------
============================================================
--- libpurple/protocols/msn/slp.c	6a4954174354acc81a0e677967d48bbce7b29f7a
+++ libpurple/protocols/msn/slp.c	c4690b789b6be8a35884cfb36d92f6dc8339a027
@@ -325,6 +325,10 @@ msn_slp_process_transresp(MsnSlpCall *sl
 
 	purple_debug_info("msn", "process_transresp\n");
 
+	/* Direct connections are disabled. */
+	if (!purple_account_get_bool(slpcall->slplink->session->account, "direct_connect", TRUE))
+		return FALSE;
+
 	g_return_val_if_fail(dc != NULL, FALSE);
 	g_return_val_if_fail(dc->state == DC_STATE_CLOSED, FALSE);
 
@@ -712,8 +716,21 @@ got_invite(MsnSlpCall *slpcall,
 
 		purple_debug_info("msn", "got_invite: transreqbody received\n");
 
+		/* Direct connections may be disabled. */
+		if (!purple_account_get_bool(slplink->session->account, "direct_connect", TRUE)) {
+			msn_slp_send_ok(slpcall, branch,
+				"application/x-msnmsgr-transrespbody",
+				"Bridge: TCPv1\r\n"
+				"Listening: false\r\n"
+				"Nonce: {00000000-0000-0000-0000-000000000000}\r\n"
+				"\r\n");
+			msn_slpcall_session_init(slpcall);
+
+			return;
+		}
+
 		/* Don't do anything if we already have a direct connection */
-		if (slpcall->slplink->dc != NULL)
+		if (slplink->dc != NULL)
 			return;
 
 		bridges = get_token(content, "Bridges: ", "\r\n");
@@ -806,10 +823,17 @@ got_ok(MsnSlpCall *slpcall,
 		char *content;
 		char *header;
 		char *nonce = NULL;
+		MsnSession *session = slpcall->slplink->session;
 		MsnSlpMessage *msg;
 		MsnDirectConn *dc;
 		MsnUser *user;
 
+		if (!purple_account_get_bool(session->account, "direct_connect", TRUE)) {
+			/* Don't attempt a direct connection if disabled. */
+			msn_slpcall_session_init(slpcall);
+			return;
+		}
+
 		if (slpcall->slplink->dc != NULL) {
 			/* If we already have an established direct connection
 			 * then just start the transfer.
@@ -818,7 +842,7 @@ got_ok(MsnSlpCall *slpcall,
 			return;
 		}
 
-		user = msn_userlist_find_user(slpcall->slplink->session->userlist,
+		user = msn_userlist_find_user(session->userlist,
 		                              slpcall->slplink->remote_user);
 		if (!user || !(user->clientid & 0xF0000000))	{
 			/* Just start a normal SB transfer. */