cpw.darkrain42.xmpp.bosh: 3bb4c03e: Rearrange the structs and fix the indent...
paul at darkrain42.org
paul at darkrain42.org
Sun Mar 22 23:10:44 EDT 2009
-----------------------------------------------------------------
Revision: 3bb4c03ed5e29b0445ca80c36589dc39e0a7c451
Ancestor: 9900ca1ceb2075d4056575e40cfe7317e2e7eee9
Author: paul at darkrain42.org
Date: 2009-03-16T06:38:24
Branch: im.pidgin.cpw.darkrain42.xmpp.bosh
URL: http://d.pidgin.im/viewmtn/revision/info/3bb4c03ed5e29b0445ca80c36589dc39e0a7c451
Modified files:
libpurple/protocols/jabber/bosh.c
ChangeLog:
Rearrange the structs and fix the indentation. No functional changes.
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/bosh.c 76a639109ba11a3f1ae217a0020c1632ef64388e
+++ libpurple/protocols/jabber/bosh.c fba5b785dde57993e393fb9960e58e53daad46c9
@@ -44,44 +44,46 @@ struct _PurpleBOSHConnection {
} PurpleBOSHPacketType;
struct _PurpleBOSHConnection {
- /* decoded URL */
- char *host;
- int port;
- char *path;
+ JabberStream *js;
+ gboolean pipelining;
+ PurpleHTTPConnection *connections[MAX_HTTP_CONNECTIONS];
- /* Must be big enough to hold 2^53 - 1 */
- guint64 rid;
- char *sid;
- int wait;
+ gboolean ready;
- JabberStream *js;
- gboolean pipelining;
- PurpleHTTPConnection *connections[MAX_HTTP_CONNECTIONS];
+ /* decoded URL */
+ char *host;
+ int port;
+ char *path;
+ /* Must be big enough to hold 2^53 - 1 */
+ guint64 rid;
+ char *sid;
+
unsigned int inactivity_timer;
+ int max_inactivity;
+ int wait;
- int max_inactivity;
+ GString *pending;
int max_requests;
int requests;
- GString *pending;
- gboolean ready;
- PurpleBOSHConnectionConnectFunction connect_cb;
- PurpleBOSHConnectionReceiveFunction receive_cb;
+ PurpleBOSHConnectionConnectFunction connect_cb;
+ PurpleBOSHConnectionReceiveFunction receive_cb;
};
struct _PurpleHTTPConnection {
- int fd;
+ PurpleBOSHConnection *bosh;
+ int fd;
+ int ie_handle;
+
gboolean ready;
- int ie_handle;
int requests; /* number of outstanding HTTP requests */
- GString *buf;
- gboolean headers_done;
- gsize handled_len;
- gsize body_len;
+ GString *buf;
+ gboolean headers_done;
+ gsize handled_len;
+ gsize body_len;
- PurpleBOSHConnection *bosh;
};
static void jabber_bosh_connection_stream_restart(PurpleBOSHConnection *conn);
More information about the Commits
mailing list