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