libpurple/protocols/msn/soap.c

Thu, 18 Dec 2008 07:25:37 +0000

author
Ka-Hing Cheung <khc@pidgin.im>
date
Thu, 18 Dec 2008 07:25:37 +0000
changeset 25243
4b40877760c3
parent 25084
747c2d5608fb
child 25259
9e602f04ed84
permissions
-rw-r--r--

a patch from eperez that corrects EOF detection, Fixes #7726

21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
1 /**
23819
c3bbef4646b1 Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23798
diff changeset
2 * @file soap.c
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
3 * Functions relating to SOAP connections.
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
4 *
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
5 * purple
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
6 *
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
7 * Purple is the legal property of its developers, whose names are too numerous
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
8 * to list here. Please refer to the COPYRIGHT file distributed with this
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
9 * source distribution.
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
10 *
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
11 * This program is free software; you can redistribute it and/or modify
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
12 * it under the terms of the GNU General Public License as published by
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
13 * the Free Software Foundation; either version 2 of the License, or
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
14 * (at your option) any later version.
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
15 *
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
16 * This program is distributed in the hope that it will be useful,
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
17 * but WITHOUT ANY WARRANTY; without even the implied warranty of
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
18 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
19 * GNU General Public License for more details.
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
20 *
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
21 * You should have received a copy of the GNU General Public License
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
22 * along with this program; if not, write to the Free Software
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
23 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
24 */
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
25
21391
000024cbb022 #include "internal.h" to get a definition for G_GNUC_NULL_TERMINATED where
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21389
diff changeset
26 #include "internal.h"
000024cbb022 #include "internal.h" to get a definition for G_GNUC_NULL_TERMINATED where
Stu Tomlinson <nosnilmot@pidgin.im>
parents: 21389
diff changeset
27
23819
c3bbef4646b1 Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23798
diff changeset
28 #include "soap.h"
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
29
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
30 #include "session.h"
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
31
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
32 #include "debug.h"
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
33 #include "xmlnode.h"
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
34
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
35 #include <glib.h>
23078
4900794b4c3b Build fixes for MSVC
Daniel Atallah <datallah@pidgin.im>
parents: 22981
diff changeset
36 #if !defined(_WIN32) || !defined(_WINERROR_)
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
37 #include <error.h>
23078
4900794b4c3b Build fixes for MSVC
Daniel Atallah <datallah@pidgin.im>
parents: 22981
diff changeset
38 #endif
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
39
21361
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
40 #define SOAP_TIMEOUT (5 * 60)
24075
7c07336ce376 I seem to have accidentally turned on those "unsafe" SOAP debug messages.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 24045
diff changeset
41
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
42 typedef struct _MsnSoapRequest {
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
43 char *path;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
44 MsnSoapMessage *message;
23925
aa38fbc30cfb Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23846
diff changeset
45 gboolean secure;
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
46 MsnSoapCallback cb;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
47 gpointer cb_data;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
48 } MsnSoapRequest;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
49
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
50 typedef struct _MsnSoapConnection {
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
51 MsnSession *session;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
52 char *host;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
53
21360
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
54 time_t last_used;
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
55 PurpleSslConnection *ssl;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
56 gboolean connected;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
57
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
58 guint event_handle;
24794
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
59 guint run_timer;
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
60 GString *buf;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
61 gsize handled_len;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
62 gsize body_len;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
63 int response_code;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
64 gboolean headers_done;
21358
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
65 gboolean close_when_done;
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
66
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
67 MsnSoapMessage *message;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
68
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
69 GQueue *queue;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
70 MsnSoapRequest *current_request;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
71 } MsnSoapConnection;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
72
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
73 static gboolean msn_soap_connection_run(gpointer data);
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
74
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
75 static MsnSoapConnection *
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
76 msn_soap_connection_new(MsnSession *session, const char *host)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
77 {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
78 MsnSoapConnection *conn = g_new0(MsnSoapConnection, 1);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
79 conn->session = session;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
80 conn->host = g_strdup(host);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
81 conn->queue = g_queue_new();
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
82 return conn;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
83 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
84
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
85 static void
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
86 msn_soap_message_destroy(MsnSoapMessage *message)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
87 {
24792
22453f0066b4 I don't believe message should ever be null
Mark Doliner <markdoliner@pidgin.im>
parents: 24791
diff changeset
88 g_slist_foreach(message->headers, (GFunc)g_free, NULL);
22453f0066b4 I don't believe message should ever be null
Mark Doliner <markdoliner@pidgin.im>
parents: 24791
diff changeset
89 g_slist_free(message->headers);
22453f0066b4 I don't believe message should ever be null
Mark Doliner <markdoliner@pidgin.im>
parents: 24791
diff changeset
90 g_free(message->action);
22453f0066b4 I don't believe message should ever be null
Mark Doliner <markdoliner@pidgin.im>
parents: 24791
diff changeset
91 if (message->xml)
22453f0066b4 I don't believe message should ever be null
Mark Doliner <markdoliner@pidgin.im>
parents: 24791
diff changeset
92 xmlnode_free(message->xml);
22453f0066b4 I don't believe message should ever be null
Mark Doliner <markdoliner@pidgin.im>
parents: 24791
diff changeset
93 g_free(message);
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
94 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
95
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
96 static void
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
97 msn_soap_request_destroy(MsnSoapRequest *req, gboolean keep_message)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
98 {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
99 g_free(req->path);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
100 if (!keep_message)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
101 msn_soap_message_destroy(req->message);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
102 g_free(req);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
103 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
104
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
105 static void
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
106 msn_soap_connection_sanitize(MsnSoapConnection *conn, gboolean disconnect)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
107 {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
108 if (conn->event_handle) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
109 purple_input_remove(conn->event_handle);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
110 conn->event_handle = 0;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
111 }
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
112
24794
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
113 if (conn->run_timer) {
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
114 purple_timeout_remove(conn->run_timer);
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
115 conn->run_timer = 0;
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
116 }
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
117
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
118 if (conn->message) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
119 msn_soap_message_destroy(conn->message);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
120 conn->message = NULL;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
121 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
122
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
123 if (conn->buf) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
124 g_string_free(conn->buf, TRUE);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
125 conn->buf = NULL;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
126 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
127
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
128 if (conn->ssl && (disconnect || conn->close_when_done)) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
129 purple_ssl_close(conn->ssl);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
130 conn->ssl = NULL;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
131 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
132
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
133 if (conn->current_request) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
134 msn_soap_request_destroy(conn->current_request, FALSE);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
135 conn->current_request = NULL;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
136 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
137 }
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
138
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
139 static void
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
140 msn_soap_connection_destroy_foreach_cb(gpointer item, gpointer data)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
141 {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
142 MsnSoapRequest *req = item;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
143
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
144 if (req->cb)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
145 req->cb(req->message, NULL, req->cb_data);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
146
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
147 msn_soap_request_destroy(req, FALSE);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
148 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
149
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
150 static void
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
151 msn_soap_connection_destroy(MsnSoapConnection *conn)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
152 {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
153 if (conn->current_request) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
154 MsnSoapRequest *req = conn->current_request;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
155 conn->current_request = NULL;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
156 msn_soap_connection_destroy_foreach_cb(req, conn);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
157 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
158
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
159 msn_soap_connection_sanitize(conn, TRUE);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
160 g_queue_foreach(conn->queue, msn_soap_connection_destroy_foreach_cb, conn);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
161 g_queue_free(conn->queue);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
162
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
163 g_free(conn->host);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
164 g_free(conn);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
165 }
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
166
21360
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
167 static gboolean
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
168 msn_soap_cleanup_each(gpointer key, gpointer value, gpointer data)
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
169 {
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
170 MsnSoapConnection *conn = value;
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
171 time_t *t = data;
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
172
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
173 if ((*t - conn->last_used) > SOAP_TIMEOUT * 2) {
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
174 purple_debug_info("soap", "cleaning up soap conn %p\n", conn);
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
175 return TRUE;
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
176 }
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
177
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
178 return FALSE;
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
179 }
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
180
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
181 static gboolean
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
182 msn_soap_cleanup_for_session(gpointer data)
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
183 {
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
184 MsnSession *sess = data;
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
185 time_t t = time(NULL);
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
186
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
187 purple_debug_info("soap", "session cleanup timeout\n");
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
188
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
189 if (sess->soap_table) {
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
190 g_hash_table_foreach_remove(sess->soap_table, msn_soap_cleanup_each,
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
191 &t);
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
192
24797
5d78589aee74 Remove the timer if sess->soap_table is NULL. I don't think this ever
Mark Doliner <markdoliner@pidgin.im>
parents: 24794
diff changeset
193 if (g_hash_table_size(sess->soap_table) != 0)
5d78589aee74 Remove the timer if sess->soap_table is NULL. I don't think this ever
Mark Doliner <markdoliner@pidgin.im>
parents: 24794
diff changeset
194 return TRUE;
21360
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
195 }
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
196
24797
5d78589aee74 Remove the timer if sess->soap_table is NULL. I don't think this ever
Mark Doliner <markdoliner@pidgin.im>
parents: 24794
diff changeset
197 sess->soap_cleanup_handle = 0;
5d78589aee74 Remove the timer if sess->soap_table is NULL. I don't think this ever
Mark Doliner <markdoliner@pidgin.im>
parents: 24794
diff changeset
198 return FALSE;
21360
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
199 }
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
200
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
201 static MsnSoapConnection *
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
202 msn_soap_get_connection(MsnSession *session, const char *host)
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
203 {
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
204 MsnSoapConnection *conn = NULL;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
205
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
206 if (session->soap_table) {
21361
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
207 conn = g_hash_table_lookup(session->soap_table, host);
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
208 } else {
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
209 session->soap_table = g_hash_table_new_full(g_str_hash, g_str_equal,
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
210 NULL, (GDestroyNotify)msn_soap_connection_destroy);
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
211 }
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
212
21360
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
213 if (session->soap_cleanup_handle == 0)
24619
5ece4c87ea96 Use purple_timeout_add_seconds() instead of purple_timeout_add() in a
Mark Doliner <markdoliner@pidgin.im>
parents: 24289
diff changeset
214 session->soap_cleanup_handle = purple_timeout_add_seconds(SOAP_TIMEOUT,
21360
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
215 msn_soap_cleanup_for_session, session);
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
216
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
217 if (conn == NULL) {
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
218 conn = msn_soap_connection_new(session, host);
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
219 g_hash_table_insert(session->soap_table, conn->host, conn);
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
220 }
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
221
21360
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
222 conn->last_used = time(NULL);
92d5c6c58c85 cleanup soap connection with a timeout
Ka-Hing Cheung <khc@pidgin.im>
parents: 21358
diff changeset
223
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
224 return conn;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
225 }
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
226
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
227 static void
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
228 msn_soap_connection_handle_next(MsnSoapConnection *conn)
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
229 {
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
230 msn_soap_connection_sanitize(conn, FALSE);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
231
24794
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
232 conn->run_timer = purple_timeout_add(0, msn_soap_connection_run, conn);
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
233
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
234 if (conn->current_request) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
235 MsnSoapRequest *req = conn->current_request;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
236 conn->current_request = NULL;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
237 msn_soap_connection_destroy_foreach_cb(req, conn);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
238 }
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
239 }
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
240
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
241 static void
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
242 msn_soap_message_send_internal(MsnSession *session, MsnSoapMessage *message,
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
243 const char *host, const char *path, gboolean secure,
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
244 MsnSoapCallback cb, gpointer cb_data, gboolean first)
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
245 {
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
246 MsnSoapConnection *conn = msn_soap_get_connection(session, host);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
247 MsnSoapRequest *req = g_new0(MsnSoapRequest, 1);
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
248
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
249 req->path = g_strdup(path);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
250 req->message = message;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
251 req->secure = secure;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
252 req->cb = cb;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
253 req->cb_data = cb_data;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
254
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
255 if (first) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
256 g_queue_push_head(conn->queue, req);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
257 } else {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
258 g_queue_push_tail(conn->queue, req);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
259 }
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
260
24794
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
261 if (conn->run_timer == 0)
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
262 conn->run_timer = purple_timeout_add(0, msn_soap_connection_run,
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
263 conn);
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
264 }
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
265
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
266 void
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
267 msn_soap_message_send(MsnSession *session, MsnSoapMessage *message,
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
268 const char *host, const char *path, gboolean secure,
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
269 MsnSoapCallback cb, gpointer cb_data)
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
270 {
24792
22453f0066b4 I don't believe message should ever be null
Mark Doliner <markdoliner@pidgin.im>
parents: 24791
diff changeset
271 g_return_if_fail(message != NULL);
22453f0066b4 I don't believe message should ever be null
Mark Doliner <markdoliner@pidgin.im>
parents: 24791
diff changeset
272
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
273 msn_soap_message_send_internal(session, message, host, path, secure,
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
274 cb, cb_data, FALSE);
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
275 }
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
276
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
277 static gboolean
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
278 msn_soap_handle_redirect(MsnSoapConnection *conn, const char *url)
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
279 {
23797
be32acbae9ce Use purple_url_parse for splitting up the MSN SOAP redirect instead of
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23794
diff changeset
280 char *host;
be32acbae9ce Use purple_url_parse for splitting up the MSN SOAP redirect instead of
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23794
diff changeset
281 char *path;
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
282
23797
be32acbae9ce Use purple_url_parse for splitting up the MSN SOAP redirect instead of
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23794
diff changeset
283 if (purple_url_parse(url, &host, NULL, &path, NULL, NULL)) {
23925
aa38fbc30cfb Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23846
diff changeset
284 msn_soap_message_send_internal(conn->session, conn->current_request->message,
aa38fbc30cfb Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23846
diff changeset
285 host, path, conn->current_request->secure,
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
286 conn->current_request->cb, conn->current_request->cb_data, TRUE);
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
287
23798
604090d9bfb0 Don't free the SOAP message when we're still using it for a redirect.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23797
diff changeset
288 msn_soap_request_destroy(conn->current_request, TRUE);
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
289 conn->current_request = NULL;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
290
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
291 g_free(host);
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
292 g_free(path);
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
293
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
294 return TRUE;
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
295 }
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
296
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
297 return FALSE;
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
298 }
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
299
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
300 static gboolean
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
301 msn_soap_handle_body(MsnSoapConnection *conn, MsnSoapMessage *response)
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
302 {
21361
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
303 xmlnode *body = xmlnode_get_child(response->xml, "Body");
21672
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
304 xmlnode *fault = xmlnode_get_child(response->xml, "Fault");
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
305
21672
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
306 if (fault) {
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
307 xmlnode *faultcode = xmlnode_get_child(fault, "faultcode");
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
308
21672
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
309 if (faultcode != NULL) {
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
310 char *faultdata = xmlnode_get_data(faultcode);
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
311
21672
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
312 if (g_str_equal(faultdata, "psf:Redirect")) {
23794
3175e940fa12 Use the correct xmlnode when processing SOAP Faults.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23787
diff changeset
313 xmlnode *url = xmlnode_get_child(fault, "redirectUrl");
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
314
21672
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
315 if (url) {
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
316 char *urldata = xmlnode_get_data(url);
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
317 msn_soap_handle_redirect(conn, urldata);
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
318 g_free(urldata);
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
319 }
21358
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
320
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
321 g_free(faultdata);
23762
8bb3533742fd fixed a memleak or 3, or maybe 4, or 5. Some of these applies to the p14
Ka-Hing Cheung <khc@pidgin.im>
parents: 23760
diff changeset
322 msn_soap_message_destroy(response);
21672
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
323 return TRUE;
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
324 } else if (g_str_equal(faultdata, "wsse:FailedAuthentication")) {
23794
3175e940fa12 Use the correct xmlnode when processing SOAP Faults.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23787
diff changeset
325 xmlnode *reason = xmlnode_get_child(fault, "faultstring");
21672
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
326 char *reasondata = xmlnode_get_data(reason);
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
327
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
328 msn_soap_connection_sanitize(conn, TRUE);
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
329 msn_session_set_error(conn->session, MSN_ERROR_AUTH,
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
330 reasondata);
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
331
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
332 g_free(reasondata);
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
333 g_free(faultdata);
23762
8bb3533742fd fixed a memleak or 3, or maybe 4, or 5. Some of these applies to the p14
Ka-Hing Cheung <khc@pidgin.im>
parents: 23760
diff changeset
334 msn_soap_message_destroy(response);
21672
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
335 return FALSE;
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
336 }
21672
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
337
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
338 g_free(faultdata);
21358
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
339 }
21672
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
340 }
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
341
21672
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
342 if (fault || body) {
cb25ada4f6a0 soap faults are now properly handled
Ka-Hing Cheung <khc@pidgin.im>
parents: 21398
diff changeset
343 MsnSoapRequest *request = conn->current_request;
21358
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
344 conn->current_request = NULL;
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
345 request->cb(request->message, response,
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
346 request->cb_data);
23762
8bb3533742fd fixed a memleak or 3, or maybe 4, or 5. Some of these applies to the p14
Ka-Hing Cheung <khc@pidgin.im>
parents: 23760
diff changeset
347 msn_soap_message_destroy(response);
23798
604090d9bfb0 Don't free the SOAP message when we're still using it for a redirect.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23797
diff changeset
348 msn_soap_request_destroy(request, FALSE);
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
349 }
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
350
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
351 return TRUE;
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
352 }
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
353
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
354 static void
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
355 msn_soap_message_add_header(MsnSoapMessage *message,
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
356 const char *name, const char *value)
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
357 {
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
358 char *header = g_strdup_printf("%s: %s\r\n", name, value);
24289
eee560dd9d2c shuffle some code around to make sure are using the right errno,
Ka-Hing Cheung <khc@pidgin.im>
parents: 24216
diff changeset
359
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
360 message->headers = g_slist_prepend(message->headers, header);
23469
74429b4ad296 Patch from tomgr and Maiku that workarounds some OS X issue,
Ka-Hing Cheung <khc@pidgin.im>
parents: 23078
diff changeset
361 }
21398
a31c84608fcb read as much from the fd as possible if we get a read event, hopefully will
Ka-Hing Cheung <khc@pidgin.im>
parents: 21391
diff changeset
362
23469
74429b4ad296 Patch from tomgr and Maiku that workarounds some OS X issue,
Ka-Hing Cheung <khc@pidgin.im>
parents: 23078
diff changeset
363 static void
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
364 msn_soap_process(MsnSoapConnection *conn)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
365 {
23469
74429b4ad296 Patch from tomgr and Maiku that workarounds some OS X issue,
Ka-Hing Cheung <khc@pidgin.im>
parents: 23078
diff changeset
366 gboolean handled = FALSE;
74429b4ad296 Patch from tomgr and Maiku that workarounds some OS X issue,
Ka-Hing Cheung <khc@pidgin.im>
parents: 23078
diff changeset
367 char *cursor;
74429b4ad296 Patch from tomgr and Maiku that workarounds some OS X issue,
Ka-Hing Cheung <khc@pidgin.im>
parents: 23078
diff changeset
368 char *linebreak;
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
369
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
370 cursor = conn->buf->str + conn->handled_len;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
371
21361
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
372 if (!conn->headers_done) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
373 while ((linebreak = strstr(cursor, "\r\n")) != NULL) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
374 conn->handled_len = linebreak - conn->buf->str + 2;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
375
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
376 if (conn->response_code == 0) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
377 if (sscanf(cursor, "HTTP/1.1 %d", &conn->response_code) != 1) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
378 /* something horribly wrong */
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
379 purple_ssl_close(conn->ssl);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
380 conn->ssl = NULL;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
381 msn_soap_connection_handle_next(conn);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
382 handled = TRUE;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
383 break;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
384 } else if (conn->response_code == 503) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
385 msn_soap_connection_sanitize(conn, TRUE);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
386 msn_session_set_error(conn->session, MSN_ERROR_SERV_UNAVAILABLE, NULL);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
387 return;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
388 }
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
389 } else if (cursor == linebreak) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
390 /* blank line */
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
391 conn->headers_done = TRUE;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
392 cursor = conn->buf->str + conn->handled_len;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
393 break;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
394 } else {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
395 char *line = g_strndup(cursor, linebreak - cursor);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
396 char *sep = strstr(line, ": ");
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
397 char *key = line;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
398 char *value;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
399
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
400 if (sep == NULL) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
401 purple_debug_info("soap", "ignoring malformed line: %s\n", line);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
402 g_free(line);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
403 goto loop_end;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
404 }
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
405
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
406 value = sep + 2;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
407 *sep = '\0';
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
408 msn_soap_message_add_header(conn->message, key, value);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
409
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
410 if ((conn->response_code == 301 || conn->response_code == 300)
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
411 && strcmp(key, "Location") == 0) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
412
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
413 msn_soap_handle_redirect(conn, value);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
414
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
415 handled = TRUE;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
416 g_free(line);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
417 break;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
418 } else if (conn->response_code == 401 &&
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
419 strcmp(key, "WWW-Authenticate") == 0) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
420 char *error = strstr(value, "cbtxt=");
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
421
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
422 if (error) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
423 error += strlen("cbtxt=");
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
424 }
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
425
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
426 msn_soap_connection_sanitize(conn, TRUE);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
427 msn_session_set_error(conn->session, MSN_ERROR_AUTH,
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
428 error ? purple_url_decode(error) : NULL);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
429
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
430 g_free(line);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
431 return;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
432 } else if (strcmp(key, "Content-Length") == 0) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
433 conn->body_len = atoi(value);
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
434 } else if (strcmp(key, "Connection") == 0) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
435 if (strcmp(value, "close") == 0) {
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
436 conn->close_when_done = TRUE;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
437 }
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
438 }
21364
a701729fef5d fix a memleak or 2
Ka-Hing Cheung <khc@pidgin.im>
parents: 21361
diff changeset
439 g_free(line);
21361
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
440 }
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
441
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
442 loop_end:
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
443 cursor = conn->buf->str + conn->handled_len;
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
444 }
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
445 }
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
446
f890366c8ec6 oim migrated to new soap code, quadruply duplicated message!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21360
diff changeset
447 if (!handled && conn->headers_done) {
22981
b83a23981419 Fix a number of leaks. As far as I can tell, MSNP14 now logs in without
Daniel Atallah <datallah@pidgin.im>
parents: 22060
diff changeset
448 if (conn->buf->len - conn->handled_len >=
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
449 conn->body_len) {
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
450 xmlnode *node = xmlnode_from_str(cursor, conn->body_len);
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
451
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
452 if (node == NULL) {
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
453 purple_debug_info("soap", "Malformed SOAP response: %s\n",
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
454 cursor);
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
455 } else {
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
456 MsnSoapMessage *message = conn->message;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
457 conn->message = NULL;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
458 message->xml = node;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
459
22981
b83a23981419 Fix a number of leaks. As far as I can tell, MSNP14 now logs in without
Daniel Atallah <datallah@pidgin.im>
parents: 22060
diff changeset
460 if (!msn_soap_handle_body(conn, message)) {
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
461 return;
22981
b83a23981419 Fix a number of leaks. As far as I can tell, MSNP14 now logs in without
Daniel Atallah <datallah@pidgin.im>
parents: 22060
diff changeset
462 }
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
463 }
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
464
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
465 msn_soap_connection_handle_next(conn);
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
466 }
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
467
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
468 return;
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
469 }
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
470
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
471 if (handled) {
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
472 msn_soap_connection_handle_next(conn);
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
473 }
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
474 }
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
475
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
476 static void
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
477 msn_soap_read_cb(gpointer data, gint fd, PurpleInputCondition cond)
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
478 {
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
479 MsnSoapConnection *conn = data;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
480 int count = 0, cnt, perrno;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
481 /* This buffer needs to be larger than any packets received from
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
482 login.live.com or Adium will fail to receive the packet
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
483 (something weird with the login.live.com server). With NSS it works
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
484 fine, so I believe it's some bug with OS X */
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
485 char buf[16 * 1024];
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
486 gsize cursor;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
487
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
488 if (conn->message == NULL) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
489 conn->message = msn_soap_message_new(NULL, NULL);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
490 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
491
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
492 if (conn->buf == NULL) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
493 conn->buf = g_string_new_len(buf, 0);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
494 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
495
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
496 cursor = conn->buf->len;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
497 while ((cnt = purple_ssl_read(conn->ssl, buf, sizeof(buf))) > 0) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
498 purple_debug_info("soap", "read %d bytes\n", cnt);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
499 count += cnt;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
500 g_string_append_len(conn->buf, buf, cnt);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
501 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
502
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
503 perrno = errno;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
504 if (cnt < 0 && perrno != EAGAIN)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
505 purple_debug_info("soap", "read: %s\n", g_strerror(perrno));
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
506
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
507 #ifndef MSN_UNSAFE_DEBUG
25084
747c2d5608fb fixes a crash, I think I've seen this before somewhere else
Ka-Hing Cheung <khc@pidgin.im>
parents: 24797
diff changeset
508 if (conn->current_request && conn->current_request->secure)
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
509 purple_debug_misc("soap", "Received secure request.\n");
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
510 else
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
511 #endif
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
512 if (count != 0)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
513 purple_debug_misc("soap", "current %s\n", conn->buf->str + cursor);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
514
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
515 /* && count is necessary for Adium, on OS X the last read always
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
516 return an error, so we want to proceed anyway. See #5212 for
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
517 discussion on this and the above buffer size issues */
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
518 if(cnt < 0 && errno == EAGAIN && count == 0)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
519 return;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
520
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
521 /* msn_soap_process could alter errno */
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
522 msn_soap_process(conn);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
523
25243
4b40877760c3 a patch from eperez that corrects EOF detection, Fixes #7726
Ka-Hing Cheung <khc@pidgin.im>
parents: 25084
diff changeset
524 if (cnt < 0 && perrno != EAGAIN || cnt == 0) {
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
525 /* It's possible msn_soap_process closed the ssl connection */
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
526 if (conn->ssl) {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
527 purple_ssl_close(conn->ssl);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
528 conn->ssl = NULL;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
529 msn_soap_connection_handle_next(conn);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
530 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
531 }
23774
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
532 }
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
533
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
534 static gboolean
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
535 msn_soap_write_cb_internal(gpointer data, gint fd, PurpleInputCondition cond,
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
536 gboolean initial)
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
537 {
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
538 MsnSoapConnection *conn = data;
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
539 int written;
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
540
24793
11fa724fee55 Formatting change: Split these if statements on to two lines
Mark Doliner <markdoliner@pidgin.im>
parents: 24792
diff changeset
541 if (cond != PURPLE_INPUT_WRITE)
11fa724fee55 Formatting change: Split these if statements on to two lines
Mark Doliner <markdoliner@pidgin.im>
parents: 24792
diff changeset
542 return TRUE;
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
543
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
544 written = purple_ssl_write(conn->ssl, conn->buf->str + conn->handled_len,
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
545 conn->buf->len - conn->handled_len);
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
546
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
547 if (written < 0 && errno == EAGAIN)
23774
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
548 return TRUE;
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
549 else if (written <= 0) {
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
550 purple_ssl_close(conn->ssl);
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
551 conn->ssl = NULL;
24793
11fa724fee55 Formatting change: Split these if statements on to two lines
Mark Doliner <markdoliner@pidgin.im>
parents: 24792
diff changeset
552 if (!initial)
11fa724fee55 Formatting change: Split these if statements on to two lines
Mark Doliner <markdoliner@pidgin.im>
parents: 24792
diff changeset
553 msn_soap_connection_handle_next(conn);
23774
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
554 return FALSE;
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
555 }
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
556
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
557 conn->handled_len += written;
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
558
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
559 if (conn->handled_len < conn->buf->len)
23774
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
560 return TRUE;
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
561
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
562 /* we are done! */
21358
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
563 g_string_free(conn->buf, TRUE);
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
564 conn->buf = NULL;
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
565 conn->handled_len = 0;
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
566 conn->body_len = 0;
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
567 conn->response_code = 0;
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
568 conn->headers_done = FALSE;
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
569 conn->close_when_done = FALSE;
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
570
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
571 purple_input_remove(conn->event_handle);
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
572 conn->event_handle = purple_input_add(conn->ssl->fd, PURPLE_INPUT_READ,
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
573 msn_soap_read_cb, conn);
23774
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
574 return TRUE;
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
575 }
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
576
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
577 static void
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
578 msn_soap_write_cb(gpointer data, gint fd, PurpleInputCondition cond)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
579 {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
580 msn_soap_write_cb_internal(data, fd, cond, FALSE);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
581 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
582
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
583 static void
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
584 msn_soap_error_cb(PurpleSslConnection *ssl, PurpleSslErrorType error,
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
585 gpointer data)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
586 {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
587 MsnSoapConnection *conn = data;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
588
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
589 /* sslconn already frees the connection in case of error */
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
590 conn->ssl = NULL;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
591
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
592 g_hash_table_remove(conn->session->soap_table, conn->host);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
593 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
594
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
595 static void
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
596 msn_soap_connected_cb(gpointer data, PurpleSslConnection *ssl,
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
597 PurpleInputCondition cond)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
598 {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
599 MsnSoapConnection *conn = data;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
600
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
601 conn->connected = TRUE;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
602
24794
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
603 if (conn->run_timer == 0)
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
604 conn->run_timer = purple_timeout_add(0, msn_soap_connection_run, conn);
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
605 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
606
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
607 MsnSoapMessage *
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
608 msn_soap_message_new(const char *action, xmlnode *xml)
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
609 {
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
610 MsnSoapMessage *message = g_new0(MsnSoapMessage, 1);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
611
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
612 message->action = g_strdup(action);
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
613 message->xml = xml;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
614
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
615 return message;
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
616 }
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
617
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
618 static gboolean
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
619 msn_soap_connection_run(gpointer data)
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
620 {
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
621 MsnSoapConnection *conn = data;
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
622 MsnSoapRequest *req = g_queue_peek_head(conn->queue);
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
623
24794
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
624 conn->run_timer = 0;
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
625
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
626 if (req) {
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
627 if (conn->ssl == NULL) {
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
628 conn->ssl = purple_ssl_connect(conn->session->account, conn->host,
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
629 443, msn_soap_connected_cb, msn_soap_error_cb, conn);
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
630 } else if (conn->connected) {
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
631 int len = -1;
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
632 char *body = xmlnode_to_str(req->message->xml, &len);
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
633 GSList *iter;
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
634
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
635 g_queue_pop_head(conn->queue);
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
636
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
637 conn->buf = g_string_new("");
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
638
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
639 g_string_append_printf(conn->buf,
23798
604090d9bfb0 Don't free the SOAP message when we're still using it for a redirect.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23797
diff changeset
640 "POST /%s HTTP/1.1\r\n"
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
641 "SOAPAction: %s\r\n"
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
642 "Content-Type:text/xml; charset=utf-8\r\n"
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
643 "User-Agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1)\r\n"
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
644 "Accept: */*\r\n"
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
645 "Host: %s\r\n"
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
646 "Content-Length: %d\r\n"
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
647 "Connection: Keep-Alive\r\n"
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
648 "Cache-Control: no-cache\r\n",
21356
50afac513011 handle unauthenticated soap connection
Ka-Hing Cheung <khc@pidgin.im>
parents: 21355
diff changeset
649 req->path, req->message->action ? req->message->action : "",
23757
bf5c8c3d6374 Patch 3 from Qulogic, this one updates contact list actions to use ticket
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 21672
diff changeset
650 conn->host, len);
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
651
21354
5c6020f03f2d mostly done with soap level parsing, compiles
Ka-Hing Cheung <khc@pidgin.im>
parents: 21353
diff changeset
652 for (iter = req->message->headers; iter; iter = iter->next) {
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
653 g_string_append(conn->buf, (char *)iter->data);
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
654 g_string_append(conn->buf, "\r\n");
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
655 }
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
656
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
657 g_string_append(conn->buf, "\r\n");
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
658 g_string_append(conn->buf, body);
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
659
23925
aa38fbc30cfb Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23846
diff changeset
660 #ifndef MSN_UNSAFE_DEBUG
aa38fbc30cfb Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23846
diff changeset
661 if (req->secure)
24045
e0c6a01eca85 Relegate XML dumped by msn's SOAP code to MISC from INFO.
Will Thompson <resiak@pidgin.im>
parents: 23938
diff changeset
662 purple_debug_misc("soap", "Sending secure request.\n");
23925
aa38fbc30cfb Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23846
diff changeset
663 else
aa38fbc30cfb Don't print SOAP messages to debug log for "secure" requests. This is
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23846
diff changeset
664 #endif
24045
e0c6a01eca85 Relegate XML dumped by msn's SOAP code to MISC from INFO.
Will Thompson <resiak@pidgin.im>
parents: 23938
diff changeset
665 purple_debug_misc("soap", "%s\n", conn->buf->str);
21358
0e54f76775d4 signs on!
Ka-Hing Cheung <khc@pidgin.im>
parents: 21357
diff changeset
666
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
667 conn->handled_len = 0;
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
668 conn->current_request = req;
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
669
21355
500740852250 removes public handle to soap connection, instead a connection is looked up
Ka-Hing Cheung <khc@pidgin.im>
parents: 21354
diff changeset
670 conn->event_handle = purple_input_add(conn->ssl->fd,
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
671 PURPLE_INPUT_WRITE, msn_soap_write_cb, conn);
23774
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
672 if (!msn_soap_write_cb_internal(conn, conn->ssl->fd, PURPLE_INPUT_WRITE, TRUE)) {
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
673 /* Not connected => reconnect and retry */
23819
c3bbef4646b1 Clean up some MSN SOAP stuff.
Elliott Sales de Andrade <qulogic@pidgin.im>
parents: 23798
diff changeset
674 purple_debug_info("soap", "not connected, reconnecting\n");
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
675
23774
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
676 conn->connected = FALSE;
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
677 conn->current_request = NULL;
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
678 msn_soap_connection_sanitize(conn, FALSE);
24791
6e1d82706043 Minor whitespace changes and shuffle functions around to be in a more
Mark Doliner <markdoliner@pidgin.im>
parents: 24713
diff changeset
679
23774
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
680 g_queue_push_head(conn->queue, req);
24794
1f4f77e2e111 Use separate variables to keep track of the timer and the watcher.
Mark Doliner <markdoliner@pidgin.im>
parents: 24793
diff changeset
681 conn->run_timer = purple_timeout_add(0, msn_soap_connection_run, conn);
23774
032236e2eb9e Patch from tomgr to resend once if the connection is down, fixes #5379
Ka-Hing Cheung <khc@pidgin.im>
parents: 23773
diff changeset
682 }
21356
50afac513011 handle unauthenticated soap connection
Ka-Hing Cheung <khc@pidgin.im>
parents: 21355
diff changeset
683
21364
a701729fef5d fix a memleak or 2
Ka-Hing Cheung <khc@pidgin.im>
parents: 21361
diff changeset
684 g_free(body);
22981
b83a23981419 Fix a number of leaks. As far as I can tell, MSNP14 now logs in without
Daniel Atallah <datallah@pidgin.im>
parents: 22060
diff changeset
685 }
21353
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
686 }
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
687
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
688 return FALSE;
a70d31127cb6 beginning of soap layer rewrite, does that even compile?
Ka-Hing Cheung <khc@pidgin.im>
parents:
diff changeset
689 }

mercurial