comparison src/protocols/msn/httpconn.h @ 13914:3ae8a3935406

[gaim-migrate @ 16414] First stab at trying to fix the MSN http connect method. It still doesn't work, and I'm not sure why, but it gets a lot farther in the signon process now. For those unfamiliar with the issue, the MSN http connect method stopped working after all the non-blocking I/O changes. The http connect method is apparently used by lots of people behind silly firewalls and stuff, and therefore we really shouldn't release Gaim 2.0.0 without it working, because people will complain. The two main problems were 1. The outgoing message queue was removed in favor of buffering all data to one large buffer. This sounds good in theory... but apparently each message sent to and from the server has a "SessionID" in the HTTP header. Every message we send should use the same SessionID as the last packet we received from the server. So basically you can't put two messages into the outgoing buffer at the same time because you don't have the correct SessionID to use for the second message. You have to wait until you get the reply from the server. 2. There were some strange buffer problems with using the wrong variable when trying to combine the header+body into one buffer before sending the message. I also fixed a small memleak or two, added some comments, and tried to clean up the code a little. committer: Tailor Script <tailor@pidgin.im>
author Mark Doliner <mark@kingant.net>
date Mon, 03 Jul 2006 20:39:04 +0000
parents 8754a0fe2297
children 614c56622453
comparison
equal deleted inserted replaced
13913:4661eefa0840 13914:3ae8a3935406
42 42
43 int timer; /**< The timer for polling. */ 43 int timer; /**< The timer for polling. */
44 44
45 gboolean waiting_response; /**< The flag that states if we are waiting 45 gboolean waiting_response; /**< The flag that states if we are waiting
46 a response from the server. */ 46 a response from the server. */
47 gboolean dirty; /**< The flag that states if we should poll. */
48 gboolean connected; /**< The flag that states if the connection is on. */ 47 gboolean connected; /**< The flag that states if the connection is on. */
49 gboolean virgin; /**< The flag that states if this connection 48 gboolean virgin; /**< The flag that states if this connection
50 should specify the host (not gateway) to 49 should specify the host (not gateway) to
51 connect to. */ 50 connect to. */
52 51
53 char *host; /**< The HTTP gateway host. */ 52 char *host; /**< The HTTP gateway host. */
53 GList *queue; /**< The queue of data chunks to write. */
54 54
55 int fd; /**< The connection's file descriptor. */ 55 int fd; /**< The connection's file descriptor. */
56 guint inpa; /**< The connection's input handler. */ 56 guint inpa; /**< The connection's input handler. */
57 57
58 char *rx_buf; /**< The receive buffer. */ 58 char *rx_buf; /**< The receive buffer. */
81 /** 81 /**
82 * Writes a chunk of data to the HTTP connection. 82 * Writes a chunk of data to the HTTP connection.
83 * 83 *
84 * @param servconn The server connection. 84 * @param servconn The server connection.
85 * @param data The data to write. 85 * @param data The data to write.
86 * @param size The size of the data to write. 86 * @param data_len The size of the data to write.
87 * 87 *
88 * @return The number of bytes written. 88 * @return The number of bytes written.
89 */ 89 */
90 ssize_t msn_httpconn_write(MsnHttpConn *httpconn, const char *data, size_t size); 90 ssize_t msn_httpconn_write(MsnHttpConn *httpconn, const char *data, size_t data_len);
91 91
92 /** 92 /**
93 * Connects the HTTP connection object to a host. 93 * Connects the HTTP connection object to a host.
94 * 94 *
95 * @param httpconn The HTTP connection object. 95 * @param httpconn The HTTP connection object.