Mercurial > pidgin
annotate libpurple/protocols/msn/soap.c @ 24530:113e95371d3c
I don't believe message should ever be null
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Tue, 25 Nov 2008 02:08:22 +0000 |
parents | 01e8334101df |
children | faff4870f99d |
rev | line source |
---|---|
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
1 /** |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22822
diff
changeset
|
2 * @file soap.c |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
3 * Functions relating to SOAP connections. |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
4 * |
20401
4ddc27c18781
Fix up some gaim -> purple issues.
Richard Laager <rlaager@wiktel.com>
parents:
20394
diff
changeset
|
5 * purple |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
6 * |
20401
4ddc27c18781
Fix up some gaim -> purple issues.
Richard Laager <rlaager@wiktel.com>
parents:
20394
diff
changeset
|
7 * Purple is the legal property of its developers, whose names are too numerous |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
8 * to list here. Please refer to the COPYRIGHT file distributed with this |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
9 * source distribution. |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
10 * |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
11 * This program is free software; you can redistribute it and/or modify |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
12 * it under the terms of the GNU General Public License as published by |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
13 * the Free Software Foundation; either version 2 of the License, or |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
14 * (at your option) any later version. |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
15 * |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
16 * This program is distributed in the hope that it will be useful, |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
19 * GNU General Public License for more details. |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
20 * |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
21 * You should have received a copy of the GNU General Public License |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
22 * along with this program; if not, write to the Free Software |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
24 */ |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
25 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
26 #include "internal.h" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
27 |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
28 #include "soap.h" |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
29 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
30 #include "session.h" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
31 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
32 #include "debug.h" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
33 #include "xmlnode.h" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
34 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
35 #include <glib.h> |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
36 #if !defined(_WIN32) || !defined(_WINERROR_) |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
37 #include <error.h> |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
38 #endif |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
39 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
40 #define SOAP_TIMEOUT (5 * 60) |
23743
29180633f672
I seem to have accidentally turned on those "unsafe" SOAP debug messages.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23713
diff
changeset
|
41 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
42 typedef struct _MsnSoapRequest { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
43 char *path; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
44 MsnSoapMessage *message; |
23613
860e5e210fc9
Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23521
diff
changeset
|
45 gboolean secure; |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
46 MsnSoapCallback cb; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
47 gpointer cb_data; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
48 } MsnSoapRequest; |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
49 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
50 typedef struct _MsnSoapConnection { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
51 MsnSession *session; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
52 char *host; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
53 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
54 time_t last_used; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
55 PurpleSslConnection *ssl; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
56 gboolean connected; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
57 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
58 guint event_handle; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
59 GString *buf; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
60 gsize handled_len; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
61 gsize body_len; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
62 int response_code; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
63 gboolean headers_done; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
64 gboolean close_when_done; |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
65 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
66 MsnSoapMessage *message; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
67 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
68 GQueue *queue; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
69 MsnSoapRequest *current_request; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
70 } MsnSoapConnection; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
71 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
72 static gboolean msn_soap_connection_run(gpointer data); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
73 |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
74 static MsnSoapConnection * |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
75 msn_soap_connection_new(MsnSession *session, const char *host) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
76 { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
77 MsnSoapConnection *conn = g_new0(MsnSoapConnection, 1); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
78 conn->session = session; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
79 conn->host = g_strdup(host); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
80 conn->queue = g_queue_new(); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
81 return conn; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
82 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
83 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
84 static void |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
85 msn_soap_message_destroy(MsnSoapMessage *message) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
86 { |
24530
113e95371d3c
I don't believe message should ever be null
Mark Doliner <mark@kingant.net>
parents:
24529
diff
changeset
|
87 g_slist_foreach(message->headers, (GFunc)g_free, NULL); |
113e95371d3c
I don't believe message should ever be null
Mark Doliner <mark@kingant.net>
parents:
24529
diff
changeset
|
88 g_slist_free(message->headers); |
113e95371d3c
I don't believe message should ever be null
Mark Doliner <mark@kingant.net>
parents:
24529
diff
changeset
|
89 g_free(message->action); |
113e95371d3c
I don't believe message should ever be null
Mark Doliner <mark@kingant.net>
parents:
24529
diff
changeset
|
90 if (message->xml) |
113e95371d3c
I don't believe message should ever be null
Mark Doliner <mark@kingant.net>
parents:
24529
diff
changeset
|
91 xmlnode_free(message->xml); |
113e95371d3c
I don't believe message should ever be null
Mark Doliner <mark@kingant.net>
parents:
24529
diff
changeset
|
92 g_free(message); |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
93 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
94 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
95 static void |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
96 msn_soap_request_destroy(MsnSoapRequest *req, gboolean keep_message) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
97 { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
98 g_free(req->path); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
99 if (!keep_message) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
100 msn_soap_message_destroy(req->message); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
101 g_free(req); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
102 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
103 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
104 static void |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
105 msn_soap_connection_sanitize(MsnSoapConnection *conn, gboolean disconnect) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
106 { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
107 if (conn->event_handle) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
108 purple_input_remove(conn->event_handle); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
109 conn->event_handle = 0; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
110 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
111 |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
112 if (conn->message) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
113 msn_soap_message_destroy(conn->message); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
114 conn->message = NULL; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
115 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
116 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
117 if (conn->buf) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
118 g_string_free(conn->buf, TRUE); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
119 conn->buf = NULL; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
120 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
121 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
122 if (conn->ssl && (disconnect || conn->close_when_done)) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
123 purple_ssl_close(conn->ssl); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
124 conn->ssl = NULL; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
125 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
126 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
127 if (conn->current_request) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
128 msn_soap_request_destroy(conn->current_request, FALSE); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
129 conn->current_request = NULL; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
130 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
131 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
132 |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
133 static void |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
134 msn_soap_connection_destroy_foreach_cb(gpointer item, gpointer data) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
135 { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
136 MsnSoapRequest *req = item; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
137 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
138 if (req->cb) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
139 req->cb(req->message, NULL, req->cb_data); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
140 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
141 msn_soap_request_destroy(req, FALSE); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
142 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
143 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
144 static void |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
145 msn_soap_connection_destroy(MsnSoapConnection *conn) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
146 { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
147 if (conn->current_request) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
148 MsnSoapRequest *req = conn->current_request; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
149 conn->current_request = NULL; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
150 msn_soap_connection_destroy_foreach_cb(req, conn); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
151 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
152 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
153 msn_soap_connection_sanitize(conn, TRUE); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
154 g_queue_foreach(conn->queue, msn_soap_connection_destroy_foreach_cb, conn); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
155 g_queue_free(conn->queue); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
156 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
157 g_free(conn->host); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
158 g_free(conn); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
159 } |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
160 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
161 static gboolean |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
162 msn_soap_cleanup_each(gpointer key, gpointer value, gpointer data) |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
163 { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
164 MsnSoapConnection *conn = value; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
165 time_t *t = data; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
166 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
167 if ((*t - conn->last_used) > SOAP_TIMEOUT * 2) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
168 purple_debug_info("soap", "cleaning up soap conn %p\n", conn); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
169 return TRUE; |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
170 } |
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
171 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
172 return FALSE; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
173 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
174 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
175 static gboolean |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
176 msn_soap_cleanup_for_session(gpointer data) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
177 { |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
178 MsnSession *sess = data; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
179 time_t t = time(NULL); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
180 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
181 purple_debug_info("soap", "session cleanup timeout\n"); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
182 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
183 if (sess->soap_table) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
184 g_hash_table_foreach_remove(sess->soap_table, msn_soap_cleanup_each, |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
185 &t); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
186 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
187 if (g_hash_table_size(sess->soap_table) == 0) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
188 sess->soap_cleanup_handle = 0; |
24479
b68a672b645d
Is it valid to use purple_timeout_remove() to remove a timer when
Mark Doliner <mark@kingant.net>
parents:
24399
diff
changeset
|
189 return FALSE; |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
190 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
191 } |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
192 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
193 return TRUE; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
194 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
195 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
196 static MsnSoapConnection * |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
197 msn_soap_get_connection(MsnSession *session, const char *host) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
198 { |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
199 MsnSoapConnection *conn = NULL; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
200 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
201 if (session->soap_table) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
202 conn = g_hash_table_lookup(session->soap_table, host); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
203 } else { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
204 session->soap_table = g_hash_table_new_full(g_str_hash, g_str_equal, |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
205 NULL, (GDestroyNotify)msn_soap_connection_destroy); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
206 } |
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
207 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
208 if (session->soap_cleanup_handle == 0) |
24399
9bdaf273c0ff
Use purple_timeout_add_seconds() instead of purple_timeout_add() in a
Mark Doliner <mark@kingant.net>
parents:
24087
diff
changeset
|
209 session->soap_cleanup_handle = purple_timeout_add_seconds(SOAP_TIMEOUT, |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
210 msn_soap_cleanup_for_session, session); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
211 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
212 if (conn == NULL) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
213 conn = msn_soap_connection_new(session, host); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
214 g_hash_table_insert(session->soap_table, conn->host, conn); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
215 } |
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
216 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
217 conn->last_used = time(NULL); |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22822
diff
changeset
|
218 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
219 return conn; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
220 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
221 |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
222 static void |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
223 msn_soap_connection_handle_next(MsnSoapConnection *conn) |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
224 { |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
225 msn_soap_connection_sanitize(conn, FALSE); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
226 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
227 conn->event_handle = purple_timeout_add(0, msn_soap_connection_run, conn); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
228 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
229 if (conn->current_request) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
230 MsnSoapRequest *req = conn->current_request; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
231 conn->current_request = NULL; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
232 msn_soap_connection_destroy_foreach_cb(req, conn); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
233 } |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
234 } |
20479
6a8463be5b23
Improve MSN_SOAP_DEBUG and workaround a Win32 bug which would case Pidgin to consume insane amounts of memory when printing a large string to the Debug Window.
Carlos Silva <typ0@pidgin.im>
parents:
20478
diff
changeset
|
235 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
236 static void |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
237 msn_soap_message_send_internal(MsnSession *session, MsnSoapMessage *message, |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
238 const char *host, const char *path, gboolean secure, |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
239 MsnSoapCallback cb, gpointer cb_data, gboolean first) |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
240 { |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
241 MsnSoapConnection *conn = msn_soap_get_connection(session, host); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
242 MsnSoapRequest *req = g_new0(MsnSoapRequest, 1); |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
243 |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
244 req->path = g_strdup(path); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
245 req->message = message; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
246 req->secure = secure; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
247 req->cb = cb; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
248 req->cb_data = cb_data; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
249 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
250 if (first) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
251 g_queue_push_head(conn->queue, req); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
252 } else { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
253 g_queue_push_tail(conn->queue, req); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
254 } |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22822
diff
changeset
|
255 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
256 if (conn->event_handle == 0) |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
257 conn->event_handle = purple_timeout_add(0, msn_soap_connection_run, |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
258 conn); |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
259 } |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
260 |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
261 void |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
262 msn_soap_message_send(MsnSession *session, MsnSoapMessage *message, |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
263 const char *host, const char *path, gboolean secure, |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
264 MsnSoapCallback cb, gpointer cb_data) |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
265 { |
24530
113e95371d3c
I don't believe message should ever be null
Mark Doliner <mark@kingant.net>
parents:
24529
diff
changeset
|
266 g_return_if_fail(message != NULL); |
113e95371d3c
I don't believe message should ever be null
Mark Doliner <mark@kingant.net>
parents:
24529
diff
changeset
|
267 |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
268 msn_soap_message_send_internal(session, message, host, path, secure, |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
269 cb, cb_data, FALSE); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
270 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
271 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
272 static gboolean |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
273 msn_soap_handle_redirect(MsnSoapConnection *conn, const char *url) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
274 { |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
275 char *host; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
276 char *path; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
277 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
278 if (purple_url_parse(url, &host, NULL, &path, NULL, NULL)) { |
23613
860e5e210fc9
Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23521
diff
changeset
|
279 msn_soap_message_send_internal(conn->session, conn->current_request->message, |
860e5e210fc9
Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23521
diff
changeset
|
280 host, path, conn->current_request->secure, |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
281 conn->current_request->cb, conn->current_request->cb_data, TRUE); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
282 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
283 msn_soap_request_destroy(conn->current_request, TRUE); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
284 conn->current_request = NULL; |
23298
5cdd93dac7a2
Delete trailing whitespace
Mark Doliner <mark@kingant.net>
parents:
22822
diff
changeset
|
285 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
286 g_free(host); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
287 g_free(path); |
20477
9a2a4a0c0003
Add the possibility to create an Address Book, useful for newly registered MSN users.
Carlos Silva <typ0@pidgin.im>
parents:
20471
diff
changeset
|
288 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
289 return TRUE; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
290 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
291 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
292 return FALSE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
293 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
294 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
295 static gboolean |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
296 msn_soap_handle_body(MsnSoapConnection *conn, MsnSoapMessage *response) |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
297 { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
298 xmlnode *body = xmlnode_get_child(response->xml, "Body"); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
299 xmlnode *fault = xmlnode_get_child(response->xml, "Fault"); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
300 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
301 if (fault) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
302 xmlnode *faultcode = xmlnode_get_child(fault, "faultcode"); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
303 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
304 if (faultcode != NULL) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
305 char *faultdata = xmlnode_get_data(faultcode); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
306 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
307 if (g_str_equal(faultdata, "psf:Redirect")) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
308 xmlnode *url = xmlnode_get_child(fault, "redirectUrl"); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
309 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
310 if (url) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
311 char *urldata = xmlnode_get_data(url); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
312 msn_soap_handle_redirect(conn, urldata); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
313 g_free(urldata); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
314 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
315 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
316 g_free(faultdata); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
317 msn_soap_message_destroy(response); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
318 return TRUE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
319 } else if (g_str_equal(faultdata, "wsse:FailedAuthentication")) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
320 xmlnode *reason = xmlnode_get_child(fault, "faultstring"); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
321 char *reasondata = xmlnode_get_data(reason); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
322 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
323 msn_soap_connection_sanitize(conn, TRUE); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
324 msn_session_set_error(conn->session, MSN_ERROR_AUTH, |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
325 reasondata); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
326 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
327 g_free(reasondata); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
328 g_free(faultdata); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
329 msn_soap_message_destroy(response); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
330 return FALSE; |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
331 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
332 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
333 g_free(faultdata); |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
334 } |
20416
4c5d68e93ef8
Handles SOAP redirects, thanks Sebasti«¡n E. Peyrott
Ka-Hing Cheung <khc@hxbc.us>
parents:
20404
diff
changeset
|
335 } |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
336 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
337 if (fault || body) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
338 MsnSoapRequest *request = conn->current_request; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
339 conn->current_request = NULL; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
340 request->cb(request->message, response, |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
341 request->cb_data); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
342 msn_soap_message_destroy(response); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
343 msn_soap_request_destroy(request, FALSE); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
344 } |
20479
6a8463be5b23
Improve MSN_SOAP_DEBUG and workaround a Win32 bug which would case Pidgin to consume insane amounts of memory when printing a large string to the Debug Window.
Carlos Silva <typ0@pidgin.im>
parents:
20478
diff
changeset
|
345 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
346 return TRUE; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
347 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
348 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
349 static void |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
350 msn_soap_message_add_header(MsnSoapMessage *message, |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
351 const char *name, const char *value) |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
352 { |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
353 char *header = g_strdup_printf("%s: %s\r\n", name, value); |
24087
40a4e02027f4
shuffle some code around to make sure are using the right errno,
Ka-Hing Cheung <khc@hxbc.us>
parents:
24019
diff
changeset
|
354 |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
355 message->headers = g_slist_prepend(message->headers, header); |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
356 } |
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
357 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
358 static void |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
359 msn_soap_process(MsnSoapConnection *conn) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
360 { |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
361 gboolean handled = FALSE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
362 char *cursor; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
363 char *linebreak; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
364 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
365 cursor = conn->buf->str + conn->handled_len; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
366 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
367 if (!conn->headers_done) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
368 while ((linebreak = strstr(cursor, "\r\n")) != NULL) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
369 conn->handled_len = linebreak - conn->buf->str + 2; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
370 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
371 if (conn->response_code == 0) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
372 if (sscanf(cursor, "HTTP/1.1 %d", &conn->response_code) != 1) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
373 /* something horribly wrong */ |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
374 purple_ssl_close(conn->ssl); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
375 conn->ssl = NULL; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
376 msn_soap_connection_handle_next(conn); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
377 handled = TRUE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
378 break; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
379 } else if (conn->response_code == 503) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
380 msn_soap_connection_sanitize(conn, TRUE); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
381 msn_session_set_error(conn->session, MSN_ERROR_SERV_UNAVAILABLE, NULL); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
382 return; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
383 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
384 } else if (cursor == linebreak) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
385 /* blank line */ |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
386 conn->headers_done = TRUE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
387 cursor = conn->buf->str + conn->handled_len; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
388 break; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
389 } else { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
390 char *line = g_strndup(cursor, linebreak - cursor); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
391 char *sep = strstr(line, ": "); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
392 char *key = line; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
393 char *value; |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
394 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
395 if (sep == NULL) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
396 purple_debug_info("soap", "ignoring malformed line: %s\n", line); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
397 g_free(line); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
398 goto loop_end; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
399 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
400 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
401 value = sep + 2; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
402 *sep = '\0'; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
403 msn_soap_message_add_header(conn->message, key, value); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
404 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
405 if ((conn->response_code == 301 || conn->response_code == 300) |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
406 && strcmp(key, "Location") == 0) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
407 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
408 msn_soap_handle_redirect(conn, value); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
409 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
410 handled = TRUE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
411 g_free(line); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
412 break; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
413 } else if (conn->response_code == 401 && |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
414 strcmp(key, "WWW-Authenticate") == 0) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
415 char *error = strstr(value, "cbtxt="); |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
416 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
417 if (error) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
418 error += strlen("cbtxt="); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
419 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
420 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
421 msn_soap_connection_sanitize(conn, TRUE); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
422 msn_session_set_error(conn->session, MSN_ERROR_AUTH, |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
423 error ? purple_url_decode(error) : NULL); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
424 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
425 g_free(line); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
426 return; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
427 } else if (strcmp(key, "Content-Length") == 0) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
428 conn->body_len = atoi(value); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
429 } else if (strcmp(key, "Connection") == 0) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
430 if (strcmp(value, "close") == 0) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
431 conn->close_when_done = TRUE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
432 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
433 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
434 g_free(line); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
435 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
436 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
437 loop_end: |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
438 cursor = conn->buf->str + conn->handled_len; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
439 } |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
440 } |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
441 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
442 if (!handled && conn->headers_done) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
443 if (conn->buf->len - conn->handled_len >= |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
444 conn->body_len) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
445 xmlnode *node = xmlnode_from_str(cursor, conn->body_len); |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
446 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
447 if (node == NULL) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
448 purple_debug_info("soap", "Malformed SOAP response: %s\n", |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
449 cursor); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
450 } else { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
451 MsnSoapMessage *message = conn->message; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
452 conn->message = NULL; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
453 message->xml = node; |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
454 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
455 if (!msn_soap_handle_body(conn, message)) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
456 return; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
457 } |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
458 } |
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
459 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
460 msn_soap_connection_handle_next(conn); |
20539
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
461 } |
2c8c6d77f12c
Make use of the GQueue in MsnSoapConn to manage the SOAP requests, allowing them to work perfectly even when dispatching multiple requests at once.
Carlos Silva <typ0@pidgin.im>
parents:
20501
diff
changeset
|
462 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
463 return; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
464 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
465 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
466 if (handled) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
467 msn_soap_connection_handle_next(conn); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
468 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
469 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
470 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
471 static void |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
472 msn_soap_read_cb(gpointer data, gint fd, PurpleInputCondition cond) |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
473 { |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
474 MsnSoapConnection *conn = data; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
475 int count = 0, cnt, perrno; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
476 /* This buffer needs to be larger than any packets received from |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
477 login.live.com or Adium will fail to receive the packet |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
478 (something weird with the login.live.com server). With NSS it works |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
479 fine, so I believe it's some bug with OS X */ |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
480 char buf[16 * 1024]; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
481 gsize cursor; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
482 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
483 if (conn->message == NULL) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
484 conn->message = msn_soap_message_new(NULL, NULL); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
485 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
486 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
487 if (conn->buf == NULL) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
488 conn->buf = g_string_new_len(buf, 0); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
489 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
490 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
491 cursor = conn->buf->len; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
492 while ((cnt = purple_ssl_read(conn->ssl, buf, sizeof(buf))) > 0) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
493 purple_debug_info("soap", "read %d bytes\n", cnt); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
494 count += cnt; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
495 g_string_append_len(conn->buf, buf, cnt); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
496 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
497 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
498 perrno = errno; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
499 if (cnt < 0 && perrno != EAGAIN) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
500 purple_debug_info("soap", "read: %s\n", g_strerror(perrno)); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
501 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
502 #ifndef MSN_UNSAFE_DEBUG |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
503 if (conn->current_request->secure) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
504 purple_debug_misc("soap", "Received secure request.\n"); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
505 else |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
506 #endif |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
507 if (count != 0) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
508 purple_debug_misc("soap", "current %s\n", conn->buf->str + cursor); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
509 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
510 /* && count is necessary for Adium, on OS X the last read always |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
511 return an error, so we want to proceed anyway. See #5212 for |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
512 discussion on this and the above buffer size issues */ |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
513 if(cnt < 0 && errno == EAGAIN && count == 0) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
514 return; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
515 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
516 /* msn_soap_process could alter errno */ |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
517 msn_soap_process(conn); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
518 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
519 if (cnt < 0 && perrno != EAGAIN) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
520 /* It's possible msn_soap_process closed the ssl connection */ |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
521 if (conn->ssl) { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
522 purple_ssl_close(conn->ssl); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
523 conn->ssl = NULL; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
524 msn_soap_connection_handle_next(conn); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
525 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
526 } |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
527 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
528 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
529 static gboolean |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
530 msn_soap_write_cb_internal(gpointer data, gint fd, PurpleInputCondition cond, |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
531 gboolean initial) |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
532 { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
533 MsnSoapConnection *conn = data; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
534 int written; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
535 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
536 if (cond != PURPLE_INPUT_WRITE) return TRUE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
537 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
538 written = purple_ssl_write(conn->ssl, conn->buf->str + conn->handled_len, |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
539 conn->buf->len - conn->handled_len); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
540 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
541 if (written < 0 && errno == EAGAIN) |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
542 return TRUE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
543 else if (written <= 0) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
544 purple_ssl_close(conn->ssl); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
545 conn->ssl = NULL; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
546 if (!initial) msn_soap_connection_handle_next(conn); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
547 return FALSE; |
20394
4a099e4d0d09
propagate from branch 'im.pidgin.pidgin' (head 98b6b547b29ea1192b73cc4e1de1e674edef4328)
Richard Laager <rlaager@wiktel.com>
parents:
diff
changeset
|
548 } |
20770
58ce69a8582d
Correctly remove a buddy from the Pending list after it is accepted.
Carlos Silva <typ0@pidgin.im>
parents:
20759
diff
changeset
|
549 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
550 conn->handled_len += written; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
551 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
552 if (conn->handled_len < conn->buf->len) |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
553 return TRUE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
554 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
555 /* we are done! */ |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
556 g_string_free(conn->buf, TRUE); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
557 conn->buf = NULL; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
558 conn->handled_len = 0; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
559 conn->body_len = 0; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
560 conn->response_code = 0; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
561 conn->headers_done = FALSE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
562 conn->close_when_done = FALSE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
563 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
564 purple_input_remove(conn->event_handle); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
565 conn->event_handle = purple_input_add(conn->ssl->fd, PURPLE_INPUT_READ, |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
566 msn_soap_read_cb, conn); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
567 return TRUE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
568 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
569 |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
570 static void |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
571 msn_soap_write_cb(gpointer data, gint fd, PurpleInputCondition cond) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
572 { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
573 msn_soap_write_cb_internal(data, fd, cond, FALSE); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
574 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
575 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
576 static void |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
577 msn_soap_error_cb(PurpleSslConnection *ssl, PurpleSslErrorType error, |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
578 gpointer data) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
579 { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
580 MsnSoapConnection *conn = data; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
581 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
582 /* sslconn already frees the connection in case of error */ |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
583 conn->ssl = NULL; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
584 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
585 g_hash_table_remove(conn->session->soap_table, conn->host); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
586 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
587 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
588 static void |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
589 msn_soap_connected_cb(gpointer data, PurpleSslConnection *ssl, |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
590 PurpleInputCondition cond) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
591 { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
592 MsnSoapConnection *conn = data; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
593 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
594 conn->connected = TRUE; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
595 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
596 if (conn->event_handle == 0) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
597 conn->event_handle = purple_timeout_add(0, msn_soap_connection_run, conn); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
598 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
599 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
600 MsnSoapMessage * |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
601 msn_soap_message_new(const char *action, xmlnode *xml) |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
602 { |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
603 MsnSoapMessage *message = g_new0(MsnSoapMessage, 1); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
604 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
605 message->action = g_strdup(action); |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
606 message->xml = xml; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
607 |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
608 return message; |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
609 } |
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
610 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
611 static gboolean |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
612 msn_soap_connection_run(gpointer data) |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
613 { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
614 MsnSoapConnection *conn = data; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
615 MsnSoapRequest *req = g_queue_peek_head(conn->queue); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
616 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
617 conn->event_handle = 0; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
618 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
619 if (req) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
620 if (conn->ssl == NULL) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
621 conn->ssl = purple_ssl_connect(conn->session->account, conn->host, |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
622 443, msn_soap_connected_cb, msn_soap_error_cb, conn); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
623 } else if (conn->connected) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
624 int len = -1; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
625 char *body = xmlnode_to_str(req->message->xml, &len); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
626 GSList *iter; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
627 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
628 g_queue_pop_head(conn->queue); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
629 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
630 conn->buf = g_string_new(""); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
631 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
632 g_string_append_printf(conn->buf, |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
633 "POST /%s HTTP/1.1\r\n" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
634 "SOAPAction: %s\r\n" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
635 "Content-Type:text/xml; charset=utf-8\r\n" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
636 "User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)\r\n" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
637 "Accept: */*\r\n" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
638 "Host: %s\r\n" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
639 "Content-Length: %d\r\n" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
640 "Connection: Keep-Alive\r\n" |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
641 "Cache-Control: no-cache\r\n", |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
642 req->path, req->message->action ? req->message->action : "", |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
643 conn->host, len); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
644 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
645 for (iter = req->message->headers; iter; iter = iter->next) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
646 g_string_append(conn->buf, (char *)iter->data); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
647 g_string_append(conn->buf, "\r\n"); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
648 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
649 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
650 g_string_append(conn->buf, "\r\n"); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
651 g_string_append(conn->buf, body); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
652 |
23613
860e5e210fc9
Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23521
diff
changeset
|
653 #ifndef MSN_UNSAFE_DEBUG |
860e5e210fc9
Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23521
diff
changeset
|
654 if (req->secure) |
23713
92d0151e907b
Relegate XML dumped by msn's SOAP code to MISC from INFO.
Will Thompson <will.thompson@collabora.co.uk>
parents:
23626
diff
changeset
|
655 purple_debug_misc("soap", "Sending secure request.\n"); |
23613
860e5e210fc9
Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23521
diff
changeset
|
656 else |
860e5e210fc9
Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23521
diff
changeset
|
657 #endif |
23713
92d0151e907b
Relegate XML dumped by msn's SOAP code to MISC from INFO.
Will Thompson <will.thompson@collabora.co.uk>
parents:
23626
diff
changeset
|
658 purple_debug_misc("soap", "%s\n", conn->buf->str); |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
659 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
660 conn->handled_len = 0; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
661 conn->current_request = req; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
662 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
663 conn->event_handle = purple_input_add(conn->ssl->fd, |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
664 PURPLE_INPUT_WRITE, msn_soap_write_cb, conn); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
665 if (!msn_soap_write_cb_internal(conn, conn->ssl->fd, PURPLE_INPUT_WRITE, TRUE)) { |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
666 /* Not connected => reconnect and retry */ |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
667 purple_debug_info("soap", "not connected, reconnecting\n"); |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
668 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
669 conn->connected = FALSE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
670 conn->current_request = NULL; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
671 msn_soap_connection_sanitize(conn, FALSE); |
24529
01e8334101df
Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <mark@kingant.net>
parents:
24479
diff
changeset
|
672 |
23507
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
673 g_queue_push_head(conn->queue, req); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
674 conn->event_handle = purple_timeout_add(0, msn_soap_connection_run, conn); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
675 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
676 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
677 g_free(body); |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
678 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
679 } |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
680 |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
681 return FALSE; |
711773577380
Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents:
23464
diff
changeset
|
682 } |