Mercurial > pidgin.yaz
annotate libpurple/protocols/jabber/bosh.c @ 26534:5172ebcc8673
Reorder functions to remove prototypes
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 04 Apr 2009 05:15:18 +0000 |
parents | 345165fc51b6 |
children | 43cfca2eab64 |
rev | line source |
---|---|
25596
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
1 /* |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
2 * purple - Jabber Protocol Plugin |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
3 * |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
4 * Copyright (C) 2008, Tobias Markmann <tmarkmann@googlemail.com> |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
5 * |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
6 * This program is free software; you can redistribute it and/or modify |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
7 * it under the terms of the GNU General Public License as published by |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
8 * the Free Software Foundation; either version 2 of the License, or |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
9 * (at your option) any later version. |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
10 * |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
11 * This program is distributed in the hope that it will be useful, |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
14 * GNU General Public License for more details. |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
15 * |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
16 * You should have received a copy of the GNU General Public License |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
17 * along with this program; if not, write to the Free Software |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
18 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
19 * |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
20 */ |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
21 #include "internal.h" |
25999
c605e5f2fc99
Use a PurpleCircBuffer for the queued stanzas
Paul Aurich <paul@darkrain42.org>
parents:
25998
diff
changeset
|
22 #include "circbuffer.h" |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
23 #include "core.h" |
25596
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
24 #include "cipher.h" |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
25 #include "debug.h" |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
26 #include "prpl.h" |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
27 #include "util.h" |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
28 #include "xmlnode.h" |
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
29 |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
30 #include "bosh.h" |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
31 |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
32 #define MAX_HTTP_CONNECTIONS 2 |
26355
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
33 #define MAX_FAILED_CONNECTIONS 3 |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
34 |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
35 typedef struct _PurpleHTTPConnection PurpleHTTPConnection; |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
36 |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
37 typedef void (*PurpleBOSHConnectionConnectFunction)(PurpleBOSHConnection *conn); |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
38 typedef void (*PurpleBOSHConnectionReceiveFunction)(PurpleBOSHConnection *conn, xmlnode *node); |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
39 |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
40 static char *bosh_useragent = NULL; |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
41 |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
42 typedef enum { |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
43 PACKET_TERMINATE, |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
44 PACKET_STREAM_RESTART, |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
45 PACKET_NORMAL, |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
46 } PurpleBOSHPacketType; |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
47 |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
48 struct _PurpleBOSHConnection { |
25998
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
49 JabberStream *js; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
50 gboolean pipelining; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
51 PurpleHTTPConnection *connections[MAX_HTTP_CONNECTIONS]; |
26355
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
52 unsigned short failed_connections; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
53 |
25998
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
54 gboolean ready; |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
55 gboolean ssl; |
25998
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
56 |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
57 /* decoded URL */ |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
58 char *host; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
59 int port; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
60 char *path; |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
61 |
25998
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
62 /* Must be big enough to hold 2^53 - 1 */ |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
63 guint64 rid; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
64 char *sid; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
65 |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
66 unsigned int inactivity_timer; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
67 int max_inactivity; |
25998
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
68 int wait; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
69 |
25999
c605e5f2fc99
Use a PurpleCircBuffer for the queued stanzas
Paul Aurich <paul@darkrain42.org>
parents:
25998
diff
changeset
|
70 PurpleCircBuffer *pending; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
71 int max_requests; |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
72 int requests; |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
73 |
25998
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
74 PurpleBOSHConnectionConnectFunction connect_cb; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
75 PurpleBOSHConnectionReceiveFunction receive_cb; |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
76 }; |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
77 |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
78 struct _PurpleHTTPConnection { |
25998
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
79 PurpleBOSHConnection *bosh; |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
80 PurpleSslConnection *psc; |
25998
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
81 int fd; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
82 int ie_handle; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
83 |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
84 gboolean ready; |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
85 int requests; /* number of outstanding HTTP requests */ |
25813
828640306e31
Don't track a cb-per-POST and remove the PurpleHTTPResponse structure.
Paul Aurich <paul@darkrain42.org>
parents:
25812
diff
changeset
|
86 |
25998
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
87 GString *buf; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
88 gboolean headers_done; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
89 gsize handled_len; |
349e411da2ce
Rearrange the structs and fix the indentation. No functional changes.
Paul Aurich <paul@darkrain42.org>
parents:
25997
diff
changeset
|
90 gsize body_len; |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
91 |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
92 }; |
25596
7768cad83127
* looking for alternative connection methods if direct connection fails
Tobias Markmann <tfar@soc.pidgin.im>
parents:
diff
changeset
|
93 |
25993
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
94 static void http_connection_connect(PurpleHTTPConnection *conn); |
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
95 static void http_connection_send_request(PurpleHTTPConnection *conn, const GString *req); |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
96 |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
97 void jabber_bosh_init(void) |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
98 { |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
99 GHashTable *ui_info = purple_core_get_ui_info(); |
25812
8c58f31f41eb
The BOSH User Agent should include the client name (and optionally version),
Paul Aurich <paul@darkrain42.org>
parents:
25811
diff
changeset
|
100 const char *ui_name = NULL; |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
101 const char *ui_version = NULL; |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
102 |
25812
8c58f31f41eb
The BOSH User Agent should include the client name (and optionally version),
Paul Aurich <paul@darkrain42.org>
parents:
25811
diff
changeset
|
103 if (ui_info) { |
8c58f31f41eb
The BOSH User Agent should include the client name (and optionally version),
Paul Aurich <paul@darkrain42.org>
parents:
25811
diff
changeset
|
104 ui_name = g_hash_table_lookup(ui_info, "name"); |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
105 ui_version = g_hash_table_lookup(ui_info, "version"); |
25812
8c58f31f41eb
The BOSH User Agent should include the client name (and optionally version),
Paul Aurich <paul@darkrain42.org>
parents:
25811
diff
changeset
|
106 } |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
107 |
25812
8c58f31f41eb
The BOSH User Agent should include the client name (and optionally version),
Paul Aurich <paul@darkrain42.org>
parents:
25811
diff
changeset
|
108 if (ui_name) |
8c58f31f41eb
The BOSH User Agent should include the client name (and optionally version),
Paul Aurich <paul@darkrain42.org>
parents:
25811
diff
changeset
|
109 bosh_useragent = g_strdup_printf("%s%s%s (libpurple " VERSION ")", |
8c58f31f41eb
The BOSH User Agent should include the client name (and optionally version),
Paul Aurich <paul@darkrain42.org>
parents:
25811
diff
changeset
|
110 ui_name, ui_version ? " " : "", |
8c58f31f41eb
The BOSH User Agent should include the client name (and optionally version),
Paul Aurich <paul@darkrain42.org>
parents:
25811
diff
changeset
|
111 ui_version ? ui_version : ""); |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
112 else |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
113 bosh_useragent = g_strdup("libpurple " VERSION); |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
114 } |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
115 |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
116 void jabber_bosh_uninit(void) |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
117 { |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
118 g_free(bosh_useragent); |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
119 bosh_useragent = NULL; |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
120 } |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
121 |
25778
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
122 static PurpleHTTPConnection* |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
123 jabber_bosh_http_connection_init(PurpleBOSHConnection *bosh) |
25778
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
124 { |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
125 PurpleHTTPConnection *conn = g_new0(PurpleHTTPConnection, 1); |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
126 conn->bosh = bosh; |
25778
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
127 conn->fd = -1; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
128 conn->ready = FALSE; |
25778
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
129 |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
130 return conn; |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
131 } |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
132 |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
133 static void |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
134 jabber_bosh_http_connection_destroy(PurpleHTTPConnection *conn) |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
135 { |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
136 if (conn->buf) |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
137 g_string_free(conn->buf, TRUE); |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
138 |
25778
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
139 if (conn->ie_handle) |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
140 purple_input_remove(conn->ie_handle); |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
141 if (conn->psc) |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
142 purple_ssl_close(conn->psc); |
25813
828640306e31
Don't track a cb-per-POST and remove the PurpleHTTPResponse structure.
Paul Aurich <paul@darkrain42.org>
parents:
25812
diff
changeset
|
143 if (conn->fd >= 0) |
25778
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
144 close(conn->fd); |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
145 |
25994
c3c2e8b64539
Close a small race with disconnecting while establishing a connection and
Paul Aurich <paul@darkrain42.org>
parents:
25993
diff
changeset
|
146 purple_proxy_connect_cancel_with_handle(conn); |
c3c2e8b64539
Close a small race with disconnecting while establishing a connection and
Paul Aurich <paul@darkrain42.org>
parents:
25993
diff
changeset
|
147 |
25778
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
148 g_free(conn); |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
149 } |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
150 |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
151 PurpleBOSHConnection* |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
152 jabber_bosh_connection_init(JabberStream *js, const char *url) |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
153 { |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
154 PurpleBOSHConnection *conn; |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
155 char *host, *path, *user, *passwd; |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
156 int port; |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
157 |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
158 if (!purple_url_parse(url, &host, &port, &path, &user, &passwd)) { |
25600
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
159 purple_debug_info("jabber", "Unable to parse given URL.\n"); |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
160 return NULL; |
25600
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
161 } |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
162 |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
163 conn = g_new0(PurpleBOSHConnection, 1); |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
164 conn->host = host; |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
165 conn->port = port; |
25787
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
166 conn->path = g_strdup_printf("/%s", path); |
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
167 g_free(path); |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
168 conn->pipelining = TRUE; |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
169 |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
170 if ((user && user[0] != '\0') || (passwd && passwd[0] != '\0')) { |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
171 purple_debug_info("jabber", "Ignoring unexpected username and password " |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
172 "in BOSH URL.\n"); |
25600
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
173 } |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
174 |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
175 g_free(user); |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
176 g_free(passwd); |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
177 |
25602
f9322be084c4
* doing HTTP requests
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25601
diff
changeset
|
178 conn->js = js; |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
179 /* FIXME: This doesn't seem very random */ |
25602
f9322be084c4
* doing HTTP requests
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25601
diff
changeset
|
180 conn->rid = rand() % 100000 + 1728679472; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
181 |
25999
c605e5f2fc99
Use a PurpleCircBuffer for the queued stanzas
Paul Aurich <paul@darkrain42.org>
parents:
25998
diff
changeset
|
182 conn->pending = purple_circ_buffer_new(0 /* default grow size */); |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
183 |
25610
0a8484372312
* sending empty <body> requests if there are not othere requests to be answered to keep a CM -> client channel open
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25609
diff
changeset
|
184 conn->ready = FALSE; |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
185 if (purple_strcasestr(url, "https://") != NULL) |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
186 conn->ssl = TRUE; |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
187 else |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
188 conn->ssl = FALSE; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
189 |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
190 conn->connections[0] = jabber_bosh_http_connection_init(conn); |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
191 |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
192 return conn; |
25600
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
193 } |
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
194 |
25778
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
195 void |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
196 jabber_bosh_connection_destroy(PurpleBOSHConnection *conn) |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
197 { |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
198 int i; |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
199 |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
200 g_free(conn->host); |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
201 g_free(conn->path); |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
202 |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
203 if (conn->inactivity_timer) |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
204 purple_timeout_remove(conn->inactivity_timer); |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
205 |
25999
c605e5f2fc99
Use a PurpleCircBuffer for the queued stanzas
Paul Aurich <paul@darkrain42.org>
parents:
25998
diff
changeset
|
206 purple_circ_buffer_destroy(conn->pending); |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
207 |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
208 for (i = 0; i < MAX_HTTP_CONNECTIONS; ++i) { |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
209 if (conn->connections[i]) |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
210 jabber_bosh_http_connection_destroy(conn->connections[i]); |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
211 } |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
212 |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
213 g_free(conn); |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
214 } |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
215 |
26354
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
216 gboolean jabber_bosh_connection_is_ssl(PurpleBOSHConnection *conn) |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
217 { |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
218 return conn->ssl; |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
219 } |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
220 |
26534
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
221 static PurpleHTTPConnection * |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
222 find_available_http_connection(PurpleBOSHConnection *conn) |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
223 { |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
224 int i; |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
225 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
226 /* Easy solution: Does everyone involved support pipelining? Hooray! Just use |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
227 * one TCP connection! */ |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
228 if (conn->pipelining) |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
229 return conn->connections[0]; |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
230 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
231 /* First loop, look for a connection that's ready */ |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
232 for (i = 0; i < MAX_HTTP_CONNECTIONS; ++i) { |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
233 if (conn->connections[i] && conn->connections[i]->ready && |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
234 conn->connections[i]->requests == 0) |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
235 return conn->connections[i]; |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
236 } |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
237 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
238 /* Second loop, look for one that's NULL and create a new connection */ |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
239 for (i = 0; i < MAX_HTTP_CONNECTIONS; ++i) { |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
240 if (!conn->connections[i]) { |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
241 conn->connections[i] = jabber_bosh_http_connection_init(conn); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
242 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
243 http_connection_connect(conn->connections[i]); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
244 return NULL; |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
245 } |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
246 } |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
247 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
248 /* None available. */ |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
249 return NULL; |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
250 } |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
251 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
252 static void |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
253 jabber_bosh_connection_send(PurpleBOSHConnection *conn, PurpleBOSHPacketType type, |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
254 const char *data) |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
255 { |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
256 PurpleHTTPConnection *chosen; |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
257 GString *packet = NULL; |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
258 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
259 chosen = find_available_http_connection(conn); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
260 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
261 if (type != PACKET_NORMAL && !chosen) { |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
262 /* |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
263 * For non-ordinary traffic, we don't want to 'buffer' it, so use the first |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
264 * connection. |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
265 */ |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
266 chosen = conn->connections[0]; |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
267 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
268 if (!chosen->ready) |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
269 purple_debug_warning("jabber", "First BOSH connection wasn't ready. Bad " |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
270 "things may happen.\n"); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
271 } |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
272 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
273 if (type == PACKET_NORMAL && (!chosen || |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
274 (conn->max_requests > 0 && conn->requests == conn->max_requests))) { |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
275 /* |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
276 * For normal data, send up to max_requests requests at a time or there is no |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
277 * connection ready (likely, we're currently opening a second connection and |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
278 * will send these packets when connected). |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
279 */ |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
280 if (data) { |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
281 int len = data ? strlen(data) : 0; |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
282 purple_circ_buffer_append(conn->pending, data, len); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
283 } |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
284 return; |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
285 } |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
286 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
287 packet = g_string_new(""); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
288 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
289 g_string_printf(packet, "<body " |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
290 "rid='%" G_GUINT64_FORMAT "' " |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
291 "sid='%s' " |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
292 "to='%s' " |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
293 "xml:lang='en' " |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
294 "xmlns='http://jabber.org/protocol/httpbind' " |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
295 "xmlns:xmpp='urn:xmpp:xbosh'", |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
296 ++conn->rid, |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
297 conn->sid, |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
298 conn->js->user->domain); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
299 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
300 if (type == PACKET_STREAM_RESTART) |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
301 packet = g_string_append(packet, " xmpp:restart='true'/>"); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
302 else { |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
303 gsize read_amt; |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
304 if (type == PACKET_TERMINATE) |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
305 packet = g_string_append(packet, " type='terminate'"); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
306 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
307 packet = g_string_append_c(packet, '>'); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
308 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
309 while ((read_amt = purple_circ_buffer_get_max_read(conn->pending)) > 0) { |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
310 packet = g_string_append_len(packet, conn->pending->outptr, read_amt); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
311 purple_circ_buffer_mark_read(conn->pending, read_amt); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
312 } |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
313 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
314 if (data) |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
315 packet = g_string_append(packet, data); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
316 packet = g_string_append(packet, "</body>"); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
317 } |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
318 |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
319 http_connection_send_request(chosen, packet); |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
320 } |
5172ebcc8673
Reorder functions to remove prototypes
Paul Aurich <paul@darkrain42.org>
parents:
26531
diff
changeset
|
321 |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
322 void jabber_bosh_connection_close(PurpleBOSHConnection *conn) |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
323 { |
26530
d4af753e0e33
Pass all messages to BOSH as text, so they pass through the sending-text
Paul Aurich <paul@darkrain42.org>
parents:
26355
diff
changeset
|
324 jabber_bosh_connection_send(conn, PACKET_TERMINATE, NULL); |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
325 } |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
326 |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
327 static void jabber_bosh_connection_stream_restart(PurpleBOSHConnection *conn) { |
26530
d4af753e0e33
Pass all messages to BOSH as text, so they pass through the sending-text
Paul Aurich <paul@darkrain42.org>
parents:
26355
diff
changeset
|
328 jabber_bosh_connection_send(conn, PACKET_STREAM_RESTART, NULL); |
25608
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
329 } |
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
330 |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
331 static gboolean jabber_bosh_connection_error_check(PurpleBOSHConnection *conn, xmlnode *node) { |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
332 const char *type; |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
333 |
25612
8badac6cc7c9
* fixing a bug in jabber_bosh_http_connection_receive_parse_header()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25610
diff
changeset
|
334 type = xmlnode_get_attrib(node, "type"); |
8badac6cc7c9
* fixing a bug in jabber_bosh_http_connection_receive_parse_header()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25610
diff
changeset
|
335 |
8badac6cc7c9
* fixing a bug in jabber_bosh_http_connection_receive_parse_header()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25610
diff
changeset
|
336 if (type != NULL && !strcmp(type, "terminate")) { |
8badac6cc7c9
* fixing a bug in jabber_bosh_http_connection_receive_parse_header()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25610
diff
changeset
|
337 conn->ready = FALSE; |
25613
480736bfcf45
* removing some comment with XML example
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25612
diff
changeset
|
338 purple_connection_error_reason (conn->js->gc, |
480736bfcf45
* removing some comment with XML example
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25612
diff
changeset
|
339 PURPLE_CONNECTION_ERROR_OTHER_ERROR, |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
340 _("The BOSH connection manager terminated your session.")); |
25612
8badac6cc7c9
* fixing a bug in jabber_bosh_http_connection_receive_parse_header()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25610
diff
changeset
|
341 return TRUE; |
8badac6cc7c9
* fixing a bug in jabber_bosh_http_connection_receive_parse_header()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25610
diff
changeset
|
342 } |
8badac6cc7c9
* fixing a bug in jabber_bosh_http_connection_receive_parse_header()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25610
diff
changeset
|
343 return FALSE; |
8badac6cc7c9
* fixing a bug in jabber_bosh_http_connection_receive_parse_header()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25610
diff
changeset
|
344 } |
8badac6cc7c9
* fixing a bug in jabber_bosh_http_connection_receive_parse_header()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25610
diff
changeset
|
345 |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
346 static gboolean |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
347 bosh_inactivity_cb(gpointer data) |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
348 { |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
349 PurpleBOSHConnection *bosh = data; |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
350 |
26530
d4af753e0e33
Pass all messages to BOSH as text, so they pass through the sending-text
Paul Aurich <paul@darkrain42.org>
parents:
26355
diff
changeset
|
351 jabber_bosh_connection_send(bosh, PACKET_NORMAL, NULL); |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
352 return TRUE; |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
353 } |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
354 |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
355 static void jabber_bosh_connection_received(PurpleBOSHConnection *conn, xmlnode *node) { |
25609
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
356 xmlnode *child; |
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
357 JabberStream *js = conn->js; |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
358 |
25810
7856dccb02fb
BOSH: Another g_return_if_fail that is backward
Paul Aurich <paul@darkrain42.org>
parents:
25809
diff
changeset
|
359 g_return_if_fail(node != NULL); |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
360 if (jabber_bosh_connection_error_check(conn, node)) |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
361 return; |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
362 |
25609
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
363 child = node->child; |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
364 while (child != NULL) { |
25790
4e624cc0c4a5
Jabber BOSH: memory management fixes
Paul Aurich <paul@darkrain42.org>
parents:
25789
diff
changeset
|
365 /* jabber_process_packet might free child */ |
4e624cc0c4a5
Jabber BOSH: memory management fixes
Paul Aurich <paul@darkrain42.org>
parents:
25789
diff
changeset
|
366 xmlnode *next = child->next; |
25609
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
367 if (child->type == XMLNODE_TYPE_TAG) { |
25790
4e624cc0c4a5
Jabber BOSH: memory management fixes
Paul Aurich <paul@darkrain42.org>
parents:
25789
diff
changeset
|
368 if (!strcmp(child->name, "iq")) { |
4e624cc0c4a5
Jabber BOSH: memory management fixes
Paul Aurich <paul@darkrain42.org>
parents:
25789
diff
changeset
|
369 if (xmlnode_get_child(child, "session")) |
4e624cc0c4a5
Jabber BOSH: memory management fixes
Paul Aurich <paul@darkrain42.org>
parents:
25789
diff
changeset
|
370 conn->ready = TRUE; |
25612
8badac6cc7c9
* fixing a bug in jabber_bosh_http_connection_receive_parse_header()
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25610
diff
changeset
|
371 } |
25790
4e624cc0c4a5
Jabber BOSH: memory management fixes
Paul Aurich <paul@darkrain42.org>
parents:
25789
diff
changeset
|
372 |
25609
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
373 jabber_process_packet(js, &child); |
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
374 } |
25790
4e624cc0c4a5
Jabber BOSH: memory management fixes
Paul Aurich <paul@darkrain42.org>
parents:
25789
diff
changeset
|
375 |
4e624cc0c4a5
Jabber BOSH: memory management fixes
Paul Aurich <paul@darkrain42.org>
parents:
25789
diff
changeset
|
376 child = next; |
25609
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
377 } |
25608
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
378 } |
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
379 |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
380 static void auth_response_cb(PurpleBOSHConnection *conn, xmlnode *node) { |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
381 xmlnode *child; |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
382 |
25790
4e624cc0c4a5
Jabber BOSH: memory management fixes
Paul Aurich <paul@darkrain42.org>
parents:
25789
diff
changeset
|
383 g_return_if_fail(node != NULL); |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
384 if (jabber_bosh_connection_error_check(conn, node)) |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
385 return; |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
386 |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
387 child = node->child; |
25608
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
388 while(child != NULL && child->type != XMLNODE_TYPE_TAG) { |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
389 child = child->next; |
25608
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
390 } |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
391 |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
392 /* We're only expecting one XML node here, so only process the first one */ |
25608
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
393 if (child != NULL && child->type == XMLNODE_TYPE_TAG) { |
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
394 JabberStream *js = conn->js; |
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
395 if (!strcmp(child->name, "success")) { |
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
396 jabber_bosh_connection_stream_restart(conn); |
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
397 jabber_process_packet(js, &child); |
25609
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
398 conn->receive_cb = jabber_bosh_connection_received; |
25608
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
399 } else { |
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
400 js->state = JABBER_STREAM_AUTHENTICATING; |
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
401 jabber_process_packet(js, &child); |
a03a953ba63d
* moving BOSH interfacing from jabber_send to jabber_send_raw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25607
diff
changeset
|
402 } |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
403 } else { |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
404 purple_debug_warning("jabber", "Received unexepcted empty BOSH packet.\n"); |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
405 } |
25607
f775f6021654
* using libpurple's internal SASL mechanisms during BOSH authentication phase
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25606
diff
changeset
|
406 } |
f775f6021654
* using libpurple's internal SASL mechanisms during BOSH authentication phase
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25606
diff
changeset
|
407 |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
408 static void boot_response_cb(PurpleBOSHConnection *conn, xmlnode *node) { |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
409 const char *sid, *version; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
410 const char *inactivity, *requests; |
25789
b78c8ab5de2b
Jabber BOSH: Try to continue with no BOSH version attribute
Paul Aurich <paul@darkrain42.org>
parents:
25788
diff
changeset
|
411 xmlnode *packet; |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
412 |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
413 g_return_if_fail(node != NULL); |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
414 if (jabber_bosh_connection_error_check(conn, node)) |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
415 return; |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
416 |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
417 sid = xmlnode_get_attrib(node, "sid"); |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
418 version = xmlnode_get_attrib(node, "ver"); |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
419 |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
420 inactivity = xmlnode_get_attrib(node, "inactivity"); |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
421 requests = xmlnode_get_attrib(node, "requests"); |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
422 |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
423 if (sid) { |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
424 conn->sid = g_strdup(sid); |
25607
f775f6021654
* using libpurple's internal SASL mechanisms during BOSH authentication phase
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25606
diff
changeset
|
425 } else { |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
426 purple_connection_error_reason(conn->js->gc, |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
427 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
428 _("No session ID given")); |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
429 return; |
25607
f775f6021654
* using libpurple's internal SASL mechanisms during BOSH authentication phase
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25606
diff
changeset
|
430 } |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
431 |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
432 if (version) { |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
433 const char *dot = strstr(version, "."); |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
434 int major = atoi(version); |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
435 int minor = atoi(dot + 1); |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
436 |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
437 purple_debug_info("jabber", "BOSH connection manager version %s\n", version); |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
438 |
25789
b78c8ab5de2b
Jabber BOSH: Try to continue with no BOSH version attribute
Paul Aurich <paul@darkrain42.org>
parents:
25788
diff
changeset
|
439 if (major != 1 || minor < 6) { |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
440 purple_connection_error_reason(conn->js->gc, |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
441 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, |
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
442 _("Unsupported version of BOSH protocol")); |
25789
b78c8ab5de2b
Jabber BOSH: Try to continue with no BOSH version attribute
Paul Aurich <paul@darkrain42.org>
parents:
25788
diff
changeset
|
443 return; |
25607
f775f6021654
* using libpurple's internal SASL mechanisms during BOSH authentication phase
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25606
diff
changeset
|
444 } |
f775f6021654
* using libpurple's internal SASL mechanisms during BOSH authentication phase
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25606
diff
changeset
|
445 } else { |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
446 purple_debug_info("jabber", "Missing version in BOSH initiation\n"); |
25607
f775f6021654
* using libpurple's internal SASL mechanisms during BOSH authentication phase
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25606
diff
changeset
|
447 } |
25789
b78c8ab5de2b
Jabber BOSH: Try to continue with no BOSH version attribute
Paul Aurich <paul@darkrain42.org>
parents:
25788
diff
changeset
|
448 |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
449 if (inactivity) { |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
450 conn->max_inactivity = atoi(inactivity); |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
451 if (conn->max_inactivity <= 2) { |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
452 purple_debug_warning("jabber", "Ignoring bogusly small inactivity: %s\n", |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
453 inactivity); |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
454 conn->max_inactivity = 0; |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
455 } else { |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
456 /* TODO: Integrate this with jabber.c keepalive checks... */ |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
457 conn->inactivity_timer = purple_timeout_add_seconds( |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
458 conn->max_inactivity - 2 /* rounding */, bosh_inactivity_cb, |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
459 conn); |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
460 } |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
461 } |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
462 |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
463 if (requests) |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
464 conn->max_requests = atoi(requests); |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
465 |
25789
b78c8ab5de2b
Jabber BOSH: Try to continue with no BOSH version attribute
Paul Aurich <paul@darkrain42.org>
parents:
25788
diff
changeset
|
466 /* FIXME: Depending on receiving features might break with some hosts */ |
b78c8ab5de2b
Jabber BOSH: Try to continue with no BOSH version attribute
Paul Aurich <paul@darkrain42.org>
parents:
25788
diff
changeset
|
467 packet = xmlnode_get_child(node, "features"); |
b78c8ab5de2b
Jabber BOSH: Try to continue with no BOSH version attribute
Paul Aurich <paul@darkrain42.org>
parents:
25788
diff
changeset
|
468 conn->js->use_bosh = TRUE; |
b78c8ab5de2b
Jabber BOSH: Try to continue with no BOSH version attribute
Paul Aurich <paul@darkrain42.org>
parents:
25788
diff
changeset
|
469 conn->receive_cb = auth_response_cb; |
b78c8ab5de2b
Jabber BOSH: Try to continue with no BOSH version attribute
Paul Aurich <paul@darkrain42.org>
parents:
25788
diff
changeset
|
470 jabber_stream_features_parse(conn->js, packet); |
25605
f747c682a0d9
* calling PurpleBOSHConnection's receive_cb
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25604
diff
changeset
|
471 } |
f747c682a0d9
* calling PurpleBOSHConnection's receive_cb
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25604
diff
changeset
|
472 |
25601
15d9825a5621
* adding receive callback; preparing receiving and boot code
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25600
diff
changeset
|
473 static void jabber_bosh_connection_boot(PurpleBOSHConnection *conn) { |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
474 GString *buf = g_string_new(""); |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
475 |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
476 g_string_printf(buf, "<body content='text/xml; charset=utf-8' " |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
477 "secure='true' " |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
478 "to='%s' " |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
479 "xml:lang='en' " |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
480 "xmpp:version='1.0' " |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
481 "ver='1.6' " |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
482 "xmlns:xmpp='urn:xmpp:bosh' " |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
483 "rid='%" G_GUINT64_FORMAT "' " |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
484 /* TODO: This should be adjusted/adjustable automatically according to |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
485 * realtime network behavior */ |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
486 "wait='60' " |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
487 "hold='1' " |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
488 "xmlns='http://jabber.org/protocol/httpbind'/>", |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
489 conn->js->user->domain, |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
490 ++conn->rid); |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
491 |
25779
1ce32c6752fc
Make the Request ID a long long (fit in 2^53-1)
Paul Aurich <paul@darkrain42.org>
parents:
25778
diff
changeset
|
492 conn->receive_cb = boot_response_cb; |
25993
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
493 http_connection_send_request(conn->connections[0], buf); |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
494 g_string_free(buf, TRUE); |
25602
f9322be084c4
* doing HTTP requests
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25601
diff
changeset
|
495 } |
f9322be084c4
* doing HTTP requests
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25601
diff
changeset
|
496 |
25813
828640306e31
Don't track a cb-per-POST and remove the PurpleHTTPResponse structure.
Paul Aurich <paul@darkrain42.org>
parents:
25812
diff
changeset
|
497 static void |
25814
c11c14dde641
Store PurpleBOSHConnection* instead of void* userdata
Paul Aurich <paul@darkrain42.org>
parents:
25813
diff
changeset
|
498 http_received_cb(const char *data, int len, PurpleBOSHConnection *conn) |
25813
828640306e31
Don't track a cb-per-POST and remove the PurpleHTTPResponse structure.
Paul Aurich <paul@darkrain42.org>
parents:
25812
diff
changeset
|
499 { |
26355
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
500 if (conn->failed_connections) |
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
501 /* We've got some data, so reset the number of failed connections */ |
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
502 conn->failed_connections = 0; |
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
503 |
25605
f747c682a0d9
* calling PurpleBOSHConnection's receive_cb
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25604
diff
changeset
|
504 if (conn->receive_cb) { |
25813
828640306e31
Don't track a cb-per-POST and remove the PurpleHTTPResponse structure.
Paul Aurich <paul@darkrain42.org>
parents:
25812
diff
changeset
|
505 xmlnode *node = xmlnode_from_str(data, len); |
26531
345165fc51b6
BOSH: Print out the received data (similar to the standard XMPP method,
Paul Aurich <paul@darkrain42.org>
parents:
26530
diff
changeset
|
506 |
345165fc51b6
BOSH: Print out the received data (similar to the standard XMPP method,
Paul Aurich <paul@darkrain42.org>
parents:
26530
diff
changeset
|
507 purple_debug_info("jabber", "RecvBOSH %s(%d): %s\n", |
345165fc51b6
BOSH: Print out the received data (similar to the standard XMPP method,
Paul Aurich <paul@darkrain42.org>
parents:
26530
diff
changeset
|
508 conn->ssl ? "(ssl)" : "", len, data); |
345165fc51b6
BOSH: Print out the received data (similar to the standard XMPP method,
Paul Aurich <paul@darkrain42.org>
parents:
26530
diff
changeset
|
509 |
25609
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
510 if (node) { |
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
511 conn->receive_cb(conn, node); |
25614
94ccccab4e98
* free xmlnodes after bosh receive callback is called
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25613
diff
changeset
|
512 xmlnode_free(node); |
25609
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
513 } else { |
25811
bf7338765863
BOSH: Fix an off-by-one g_memdup that was missing the null terminator.
Paul Aurich <paul@darkrain42.org>
parents:
25810
diff
changeset
|
514 purple_debug_warning("jabber", "BOSH: Received invalid XML\n"); |
25609
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
515 } |
25811
bf7338765863
BOSH: Fix an off-by-one g_memdup that was missing the null terminator.
Paul Aurich <paul@darkrain42.org>
parents:
25810
diff
changeset
|
516 } else { |
bf7338765863
BOSH: Fix an off-by-one g_memdup that was missing the null terminator.
Paul Aurich <paul@darkrain42.org>
parents:
25810
diff
changeset
|
517 g_return_if_reached(); |
bf7338765863
BOSH: Fix an off-by-one g_memdup that was missing the null terminator.
Paul Aurich <paul@darkrain42.org>
parents:
25810
diff
changeset
|
518 } |
25601
15d9825a5621
* adding receive callback; preparing receiving and boot code
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25600
diff
changeset
|
519 } |
15d9825a5621
* adding receive callback; preparing receiving and boot code
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25600
diff
changeset
|
520 |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
521 void jabber_bosh_connection_send_raw(PurpleBOSHConnection *conn, |
26530
d4af753e0e33
Pass all messages to BOSH as text, so they pass through the sending-text
Paul Aurich <paul@darkrain42.org>
parents:
26355
diff
changeset
|
522 const char *data) |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
523 { |
26530
d4af753e0e33
Pass all messages to BOSH as text, so they pass through the sending-text
Paul Aurich <paul@darkrain42.org>
parents:
26355
diff
changeset
|
524 jabber_bosh_connection_send(conn, PACKET_NORMAL, data); |
25607
f775f6021654
* using libpurple's internal SASL mechanisms during BOSH authentication phase
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25606
diff
changeset
|
525 } |
f775f6021654
* using libpurple's internal SASL mechanisms during BOSH authentication phase
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25606
diff
changeset
|
526 |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
527 static void |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
528 connection_common_established_cb(PurpleHTTPConnection *conn) |
25993
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
529 { |
25996
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
530 /* Indicate we're ready and reset some variables */ |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
531 conn->ready = TRUE; |
25996
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
532 conn->requests = 0; |
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
533 if (conn->buf) { |
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
534 g_string_free(conn->buf, TRUE); |
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
535 conn->buf = NULL; |
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
536 } |
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
537 conn->headers_done = FALSE; |
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
538 conn->handled_len = conn->body_len = 0; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
539 |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
540 if (conn->bosh->ready) { |
25610
0a8484372312
* sending empty <body> requests if there are not othere requests to be answered to keep a CM -> client channel open
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25609
diff
changeset
|
541 purple_debug_info("jabber", "BOSH session already exists. Trying to reuse it.\n"); |
25999
c605e5f2fc99
Use a PurpleCircBuffer for the queued stanzas
Paul Aurich <paul@darkrain42.org>
parents:
25998
diff
changeset
|
542 if (conn->bosh->pending->bufused > 0) { |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
543 /* Send the pending data */ |
26530
d4af753e0e33
Pass all messages to BOSH as text, so they pass through the sending-text
Paul Aurich <paul@darkrain42.org>
parents:
26355
diff
changeset
|
544 jabber_bosh_connection_send(conn->bosh, PACKET_NORMAL, NULL); |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
545 } |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
546 #if 0 |
25814
c11c14dde641
Store PurpleBOSHConnection* instead of void* userdata
Paul Aurich <paul@darkrain42.org>
parents:
25813
diff
changeset
|
547 conn->bosh->receive_cb = jabber_bosh_connection_received; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
548 if (conn->bosh->connect_cb) |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
549 conn->bosh->connect_cb(conn->bosh); |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
550 #endif |
25814
c11c14dde641
Store PurpleBOSHConnection* instead of void* userdata
Paul Aurich <paul@darkrain42.org>
parents:
25813
diff
changeset
|
551 } else |
c11c14dde641
Store PurpleBOSHConnection* instead of void* userdata
Paul Aurich <paul@darkrain42.org>
parents:
25813
diff
changeset
|
552 jabber_bosh_connection_boot(conn->bosh); |
25610
0a8484372312
* sending empty <body> requests if there are not othere requests to be answered to keep a CM -> client channel open
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25609
diff
changeset
|
553 } |
0a8484372312
* sending empty <body> requests if there are not othere requests to be answered to keep a CM -> client channel open
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25609
diff
changeset
|
554 |
25778
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
555 void jabber_bosh_connection_refresh(PurpleBOSHConnection *conn) |
62d9bce9ff74
Reorder some functions to eliminate prototypes and
Paul Aurich <paul@darkrain42.org>
parents:
25777
diff
changeset
|
556 { |
26530
d4af753e0e33
Pass all messages to BOSH as text, so they pass through the sending-text
Paul Aurich <paul@darkrain42.org>
parents:
26355
diff
changeset
|
557 jabber_bosh_connection_send(conn, PACKET_NORMAL, NULL); |
25610
0a8484372312
* sending empty <body> requests if there are not othere requests to be answered to keep a CM -> client channel open
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25609
diff
changeset
|
558 } |
0a8484372312
* sending empty <body> requests if there are not othere requests to be answered to keep a CM -> client channel open
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25609
diff
changeset
|
559 |
25993
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
560 static void http_connection_disconnected(PurpleHTTPConnection *conn) |
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
561 { |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
562 /* |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
563 * Well, then. Fine! I never liked you anyway, server! I was cheating on you |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
564 * with AIM! |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
565 */ |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
566 conn->ready = FALSE; |
26354
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
567 if (conn->psc) { |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
568 purple_ssl_close(conn->psc); |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
569 conn->psc = NULL; |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
570 } else if (conn->fd >= 0) { |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
571 close(conn->fd); |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
572 conn->fd = -1; |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
573 } |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
574 |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
575 if (conn->ie_handle) { |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
576 purple_input_remove(conn->ie_handle); |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
577 conn->ie_handle = 0; |
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
578 } |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
579 |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
580 if (conn->bosh->pipelining) |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
581 /* Hmmmm, fall back to multiple connections */ |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
582 conn->bosh->pipelining = FALSE; |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
583 |
26355
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
584 if (++conn->bosh->failed_connections == MAX_FAILED_CONNECTIONS) { |
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
585 purple_connection_error_reason(conn->bosh->js->gc, |
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
586 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, |
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
587 _("Unable to establish a connection with the server")); |
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
588 } else { |
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
589 /* No! Please! Take me back. It was me, not you! I was weak! */ |
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
590 http_connection_connect(conn); |
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
591 } |
25600
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
592 } |
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
593 |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
594 void jabber_bosh_connection_connect(PurpleBOSHConnection *bosh) { |
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
595 PurpleHTTPConnection *conn = bosh->connections[0]; |
25993
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
596 http_connection_connect(conn); |
25600
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
597 } |
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
598 |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
599 static void |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
600 jabber_bosh_http_connection_process(PurpleHTTPConnection *conn) |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
601 { |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
602 const char *cursor; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
603 |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
604 cursor = conn->buf->str + conn->handled_len; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
605 |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
606 if (!conn->headers_done) { |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
607 const char *content_length = purple_strcasestr(cursor, "\r\nContent-Length"); |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
608 const char *end_of_headers = purple_strcasestr(cursor, "\r\n\r\n"); |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
609 |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
610 /* Make sure Content-Length is in headers, not body */ |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
611 if (content_length && content_length < end_of_headers) { |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
612 char *sep = strstr(content_length, ": "); |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
613 int len = atoi(sep + 2); |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
614 if (len == 0) |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
615 purple_debug_warning("jabber", "Found mangled Content-Length header.\n"); |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
616 |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
617 conn->body_len = len; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
618 } |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
619 |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
620 if (end_of_headers) { |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
621 conn->headers_done = TRUE; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
622 conn->handled_len = end_of_headers - conn->buf->str + 4; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
623 cursor = end_of_headers + 4; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
624 } else { |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
625 conn->handled_len = conn->buf->len; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
626 return; |
25609
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
627 } |
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
628 } |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
629 |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
630 /* Have we handled everything in the buffer? */ |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
631 if (conn->handled_len >= conn->buf->len) |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
632 return; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
633 |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
634 /* Have we read all that the Content-Length promised us? */ |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
635 if (conn->buf->len - conn->handled_len < conn->body_len) |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
636 return; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
637 |
25813
828640306e31
Don't track a cb-per-POST and remove the PurpleHTTPResponse structure.
Paul Aurich <paul@darkrain42.org>
parents:
25812
diff
changeset
|
638 --conn->requests; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
639 --conn->bosh->requests; |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
640 |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
641 http_received_cb(conn->buf->str + conn->handled_len, conn->body_len, |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
642 conn->bosh); |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
643 |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
644 if (conn->bosh->ready && |
25999
c605e5f2fc99
Use a PurpleCircBuffer for the queued stanzas
Paul Aurich <paul@darkrain42.org>
parents:
25998
diff
changeset
|
645 (conn->bosh->requests == 0 || conn->bosh->pending->bufused > 0)) { |
26530
d4af753e0e33
Pass all messages to BOSH as text, so they pass through the sending-text
Paul Aurich <paul@darkrain42.org>
parents:
26355
diff
changeset
|
646 jabber_bosh_connection_send(conn->bosh, PACKET_NORMAL, NULL); |
25811
bf7338765863
BOSH: Fix an off-by-one g_memdup that was missing the null terminator.
Paul Aurich <paul@darkrain42.org>
parents:
25810
diff
changeset
|
647 purple_debug_misc("jabber", "BOSH: Sending an empty request\n"); |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
648 } |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
649 |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
650 g_string_free(conn->buf, TRUE); |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
651 conn->buf = NULL; |
25813
828640306e31
Don't track a cb-per-POST and remove the PurpleHTTPResponse structure.
Paul Aurich <paul@darkrain42.org>
parents:
25812
diff
changeset
|
652 conn->headers_done = FALSE; |
828640306e31
Don't track a cb-per-POST and remove the PurpleHTTPResponse structure.
Paul Aurich <paul@darkrain42.org>
parents:
25812
diff
changeset
|
653 conn->handled_len = conn->body_len = 0; |
25609
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
654 } |
5f70e13db5cc
* data buffer for received data. Support for any HTTP resonse size now.
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25608
diff
changeset
|
655 |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
656 /* |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
657 * Common code for reading, called from http_connection_read_cb_ssl and |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
658 * http_connection_read_cb. |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
659 */ |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
660 static void |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
661 http_connection_read(PurpleHTTPConnection *conn) |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
662 { |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
663 char buffer[1025]; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
664 int cnt, count = 0; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
665 |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
666 if (!conn->buf) |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
667 conn->buf = g_string_new(""); |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
668 |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
669 /* Read once to prime cnt before the loop */ |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
670 if (conn->psc) |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
671 cnt = purple_ssl_read(conn->psc, buffer, sizeof(buffer)); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
672 else |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
673 cnt = read(conn->fd, buffer, sizeof(buffer)); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
674 while (cnt > 0) { |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
675 count += cnt; |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
676 g_string_append_len(conn->buf, buffer, cnt); |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
677 |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
678 if (conn->psc) |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
679 cnt = purple_ssl_read(conn->psc, buffer, sizeof(buffer)); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
680 else |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
681 cnt = read(conn->fd, buffer, sizeof(buffer)); |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
682 } |
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
683 |
25996
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
684 if (cnt == 0 || (cnt < 0 && errno != EAGAIN)) { |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
685 if (cnt < 0) |
25996
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
686 purple_debug_info("jabber", "bosh read=%d, errno=%d\n", cnt, errno); |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
687 else |
26354
fcee93c74230
BOSH: For authentication purposes, HTTPS is equivalent to a secured JabberStream.
Paul Aurich <paul@darkrain42.org>
parents:
26000
diff
changeset
|
688 purple_debug_info("jabber", "bosh server closed the connection\n"); |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
689 |
25996
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
690 /* |
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
691 * If the socket is closed, the processing really needs to know about |
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
692 * it. Handle that now (it will be handled again post-processing). |
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
693 */ |
25993
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
694 http_connection_disconnected(conn); |
25996
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
695 |
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
696 /* Process what we do have */ |
25603
24b97b8359ff
* preparing handling of multiple requests for pipelining support
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25602
diff
changeset
|
697 } |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
698 |
26355
79ca1cf55d9d
Because BOSH works over connections that may die non-fatally, we need to
Paul Aurich <paul@darkrain42.org>
parents:
26354
diff
changeset
|
699 |
25788
e7f20c859519
Jabber BOSH: Model the parsing on the SOAP stuff
Paul Aurich <paul@darkrain42.org>
parents:
25787
diff
changeset
|
700 jabber_bosh_http_connection_process(conn); |
25601
15d9825a5621
* adding receive callback; preparing receiving and boot code
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25600
diff
changeset
|
701 } |
25600
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
702 |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
703 static void |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
704 http_connection_read_cb(gpointer data, gint fd, PurpleInputCondition condition) |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
705 { |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
706 PurpleHTTPConnection *conn = data; |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
707 |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
708 http_connection_read(conn); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
709 } |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
710 |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
711 static void |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
712 http_connection_read_cb_ssl(gpointer data, PurpleSslConnection *psc, |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
713 PurpleInputCondition cond) |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
714 { |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
715 PurpleHTTPConnection *conn = data; |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
716 |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
717 http_connection_read(conn); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
718 } |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
719 |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
720 static void |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
721 ssl_connection_established_cb(gpointer data, PurpleSslConnection *psc, |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
722 PurpleInputCondition cond) |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
723 { |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
724 PurpleHTTPConnection *conn = data; |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
725 |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
726 purple_ssl_input_add(psc, http_connection_read_cb_ssl, conn); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
727 connection_common_established_cb(conn); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
728 } |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
729 |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
730 static void |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
731 ssl_connection_error_cb(PurpleSslConnection *gsc, PurpleSslErrorType error, |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
732 gpointer data) |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
733 { |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
734 PurpleHTTPConnection *conn = data; |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
735 |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
736 /* sslconn frees the connection on error */ |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
737 conn->psc = NULL; |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
738 |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
739 purple_connection_ssl_error(conn->bosh->js->gc, error); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
740 } |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
741 |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
742 static void |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
743 connection_established_cb(gpointer data, gint source, const gchar *error) |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
744 { |
25600
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
745 PurpleHTTPConnection *conn = data; |
25814
c11c14dde641
Store PurpleBOSHConnection* instead of void* userdata
Paul Aurich <paul@darkrain42.org>
parents:
25813
diff
changeset
|
746 PurpleConnection *gc = conn->bosh->js->gc; |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
747 |
25600
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
748 if (source < 0) { |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
749 gchar *tmp; |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
750 tmp = g_strdup_printf(_("Could not establish a connection with the server:\n%s"), |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
751 error); |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
752 purple_connection_error_reason(gc, PURPLE_CONNECTION_ERROR_NETWORK_ERROR, tmp); |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
753 g_free(tmp); |
25600
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
754 return; |
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
755 } |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
756 |
25600
1cbe5a9f6efb
* adding bosh files to Makefile.am & .mingw
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25598
diff
changeset
|
757 conn->fd = source; |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
758 conn->ie_handle = purple_input_add(conn->fd, PURPLE_INPUT_READ, |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
759 http_connection_read_cb, conn); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
760 connection_common_established_cb(conn); |
25598 | 761 } |
762 | |
25993
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
763 static void http_connection_connect(PurpleHTTPConnection *conn) |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
764 { |
25993
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
765 PurpleBOSHConnection *bosh = conn->bosh; |
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
766 PurpleConnection *gc = bosh->js->gc; |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
767 PurpleAccount *account = purple_connection_get_account(gc); |
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
768 |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
769 if (bosh->ssl) { |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
770 if (purple_ssl_is_supported()) { |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
771 conn->psc = purple_ssl_connect(account, bosh->host, bosh->port, |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
772 ssl_connection_established_cb, |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
773 ssl_connection_error_cb, |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
774 conn); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
775 if (!conn->psc) { |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
776 purple_connection_error_reason(gc, |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
777 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
778 _("Unable to establish SSL connection")); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
779 } |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
780 } else { |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
781 purple_connection_error_reason(gc, |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
782 PURPLE_CONNECTION_ERROR_NO_SSL_SUPPORT, |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
783 _("SSL support unavailable")); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
784 } |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
785 } else if (purple_proxy_connect(conn, account, bosh->host, bosh->port, |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
786 connection_established_cb, conn) == NULL) { |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
787 purple_connection_error_reason(gc, |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
788 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, |
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
789 _("Unable to create socket")); |
25776
7de1f124f95a
Jabber BOSH: Many fixes
Paul Aurich <paul@darkrain42.org>
parents:
25614
diff
changeset
|
790 } |
25602
f9322be084c4
* doing HTTP requests
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25601
diff
changeset
|
791 } |
f9322be084c4
* doing HTTP requests
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25601
diff
changeset
|
792 |
25787
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
793 static void |
25993
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
794 http_connection_send_request(PurpleHTTPConnection *conn, const GString *req) |
25777
17b60b844803
Jabber BOSH: more fixes.
Paul Aurich <paul@darkrain42.org>
parents:
25776
diff
changeset
|
795 { |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
796 char *packet; |
25787
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
797 int ret; |
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
798 |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
799 packet = g_strdup_printf("POST %s HTTP/1.1\r\n" |
25787
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
800 "Host: %s\r\n" |
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
801 "User-Agent: %s\r\n" |
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
802 "Content-Encoding: text/xml; charset=utf-8\r\n" |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
803 "Content-Length: %" G_GSIZE_FORMAT "\r\n\r\n" |
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
804 "%s", |
25993
71835e00c0fc
Rename a few functions and drop some data members.
Paul Aurich <paul@darkrain42.org>
parents:
25990
diff
changeset
|
805 conn->bosh->path, conn->bosh->host, bosh_useragent, |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
806 req->len, req->str); |
25808
26259ee81c5b
BOSH: Fix the HTTP Post to include the actual payload.
Paul Aurich <paul@darkrain42.org>
parents:
25790
diff
changeset
|
807 |
25787
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
808 /* TODO: Better error handling, circbuffer or possible integration with |
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
809 * low-level code in jabber.c */ |
26000
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
810 if (conn->psc) |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
811 ret = purple_ssl_write(conn->psc, packet, strlen(packet)); |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
812 else |
31bb0d6e7f7e
BOSH: Support HTTPS connections to the connection manager
Paul Aurich <paul@darkrain42.org>
parents:
25999
diff
changeset
|
813 ret = write(conn->fd, packet, strlen(packet)); |
25787
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
814 |
25813
828640306e31
Don't track a cb-per-POST and remove the PurpleHTTPResponse structure.
Paul Aurich <paul@darkrain42.org>
parents:
25812
diff
changeset
|
815 ++conn->requests; |
25990
f36a94f19db3
Restore BOSH to a more-or-less working state.
Paul Aurich <paul@darkrain42.org>
parents:
25814
diff
changeset
|
816 ++conn->bosh->requests; |
25997
e995540378f0
Obey the 'inactivity' attribute and send blank updates often enough. Also,
Paul Aurich <paul@darkrain42.org>
parents:
25996
diff
changeset
|
817 g_free(packet); |
25787
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
818 |
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
819 if (ret < 0 && errno == EAGAIN) |
25996
a94b28023bf6
Clean up BOSH reading and disconnection handling.
Paul Aurich <paul@darkrain42.org>
parents:
25994
diff
changeset
|
820 purple_debug_error("jabber", "BOSH write would have blocked\n"); |
25787
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
821 |
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
822 if (ret <= 0) { |
25814
c11c14dde641
Store PurpleBOSHConnection* instead of void* userdata
Paul Aurich <paul@darkrain42.org>
parents:
25813
diff
changeset
|
823 purple_connection_error_reason(conn->bosh->js->gc, |
25787
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
824 PURPLE_CONNECTION_ERROR_NETWORK_ERROR, |
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
825 _("Write error")); |
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
826 return; |
592c2cf00fea
Jabber BOSH: Store less for each Request/Response
Paul Aurich <paul@darkrain42.org>
parents:
25779
diff
changeset
|
827 } |
25602
f9322be084c4
* doing HTTP requests
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25601
diff
changeset
|
828 } |
f9322be084c4
* doing HTTP requests
Tobias Markmann <tfar@soc.pidgin.im>
parents:
25601
diff
changeset
|
829 |