soc.2008.xmpp: e1259758: * doing HTTP requests
tfar at soc.pidgin.im
tfar at soc.pidgin.im
Fri Aug 15 10:11:35 EDT 2008
-----------------------------------------------------------------
Revision: e1259758bc3194ab721de0264bde25c000993fc9
Ancestor: 03e8a74a25cb561cd1bb4963b3f71ad05e27afef
Author: tfar at soc.pidgin.im
Date: 2008-08-09T22:16:11
Branch: im.pidgin.soc.2008.xmpp
URL: http://d.pidgin.im/viewmtn/revision/info/e1259758bc3194ab721de0264bde25c000993fc9
Modified files:
libpurple/protocols/jabber/bosh.c
libpurple/protocols/jabber/bosh.h
libpurple/protocols/jabber/jabber.c
ChangeLog:
* doing HTTP requests
* pushing requests in the requests queue
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/bosh.c accdae9cf18f18dd8a3bdc07708bfa6dc2fe933c
+++ libpurple/protocols/jabber/bosh.c 2eb398c5f4febd3bb7d7cec90ec79ab44fc0005e
@@ -36,8 +36,9 @@
#include "xdata.h"
#include "pep.h"
#include "adhoccommands.h"
+#include "connection.h"
-void jabber_bosh_connection_init(PurpleBOSHConnection *conn, PurpleAccount *account, char *url) {
+void jabber_bosh_connection_init(PurpleBOSHConnection *conn, PurpleAccount *account, JabberStream *js, char *url) {
conn->pipelining = TRUE;
conn->account = account;
if (!purple_url_parse(url, &(conn->host), &(conn->port), &(conn->path), &(conn->user), &(conn->passwd))) {
@@ -47,33 +48,64 @@ void jabber_bosh_connection_init(PurpleB
if (conn->user || conn->passwd) {
purple_debug_info("jabber", "Sorry, HTTP Authentication isn't supported yet. Username and password in the BOSH URL will be ignored.\n");
}
+ conn->js = js;
+ conn->rid = rand() % 100000 + 1728679472;
+
conn->conn_a = g_new0(PurpleHTTPConnection, 1);
jabber_bosh_http_connection_init(conn->conn_a, conn->account, conn->host, conn->port);
conn->conn_a->userdata = conn;
}
static void jabber_bosh_connection_boot(PurpleBOSHConnection *conn) {
-
+ char *tmp;
+ xmlnode *init = xmlnode_new("body");
+ xmlnode_set_attrib(init, "content", "text/xml; charset=utf-8");
+ xmlnode_set_attrib(init, "secure", "true");
+ //xmlnode_set_attrib(init, "route", tmp = g_strdup_printf("xmpp:%s:5222", conn->js->user->domain));
+ //g_free(tmp);
+ xmlnode_set_attrib(init, "to", conn->js->user->domain);
+ xmlnode_set_attrib(init, "xml:lang", "en");
+ xmlnode_set_attrib(init, "xmpp:version", "1.0");
+ xmlnode_set_attrib(init, "ver", "1.6");
+ xmlnode_set_attrib(init, "xmlns:xmpp", "urn:xmpp:xbosh");
+ xmlnode_set_attrib(init, "rid", tmp = g_strdup_printf("%d", conn->rid));
+ g_free(tmp);
+ xmlnode_set_attrib(init, "wait", "60"); /* this should be adjusted automatically according to real time network behavior */
+ xmlnode_set_attrib(init, "ack", "0");
+ xmlnode_set_attrib(init, "xmlns", "http://jabber.org/protocol/httpbind");
+ xmlnode_set_attrib(init, "hold", "1");
+
+ jabber_bosh_connection_send(conn, init);
}
+void jabber_bosh_connection_login_cb(PurpleHTTPRequest *req, PurpleHTTPResponse *res, void *userdata) {
+ purple_debug_info("jabber", "RECEIVED FIRST HTTP RESPONSE\n");
+}
+
void jabber_bosh_connection_send(PurpleBOSHConnection *conn, xmlnode *node) {
-
+ PurpleHTTPRequest *request = g_new0(PurpleHTTPRequest, 1);
+ jabber_bosh_http_request_init(request, "POST", g_strdup_printf("/%s", conn->path), jabber_bosh_connection_login_cb, conn);
+ jabber_bosh_http_request_add_to_header(request, "Content-Encoding", "text/xml; charset=utf-8");
+ request->data = xmlnode_to_str(node, &(request->data_len));
+ jabber_bosh_http_request_add_to_header(request, "Content-Length", g_strdup_printf("%d", (int)strlen(request->data)));
+ jabber_bosh_http_connection_send_request(conn->conn_a, request);
}
static void jabber_bosh_connection_connected(PurpleHTTPConnection *conn) {
PurpleBOSHConnection *bosh_conn = conn->userdata;
- if (bosh->ready && bosh_conn->connect_cb) bosh_conn->connect_cb(bosh_conn);
- else jabber_bosh_connection_boot(conn);
+ if (bosh_conn->ready && bosh_conn->connect_cb) bosh_conn->connect_cb(bosh_conn);
+ else jabber_bosh_connection_boot(bosh_conn);
}
void jabber_bosh_connection_connect(PurpleBOSHConnection *conn) {
conn->conn_a->connect_cb = jabber_bosh_connection_connected;
- jabber_bosh_http_connection_connect(conn->conn_a);
+ jabber_bosh_http_connection_connect(conn->conn_a);
}
static void jabber_bosh_http_connection_receive(gpointer data, gint source, PurpleInputCondition condition) {
- PurpleHTTPConnection conn = data;
+ PurpleHTTPConnection *conn = data;
+ purple_debug_info("jabber", "jabber_bosh_http_connection_receive\n");
}
void jabber_bosh_http_connection_init(PurpleHTTPConnection *conn, PurpleAccount *account, char *host, int port) {
@@ -81,8 +113,13 @@ void jabber_bosh_http_connection_init(Pu
conn->host = host;
conn->port = port;
conn->connect_cb = NULL;
+ conn->requests = g_queue_new();
}
+void jabber_bosh_http_connection_clean(PurpleHTTPConnection *conn) {
+ g_queue_free(conn->requests);
+}
+
static void jabber_bosh_http_connection_callback(gpointer data, gint source, const gchar *error) {
PurpleHTTPConnection *conn = data;
if (source < 0) {
@@ -90,7 +127,7 @@ static void jabber_bosh_http_connection_
return;
}
conn->fd = source;
- conn->ie_handle = purple_input_add(conn->fd, jabber_bosh_http_connection_receive, PURPLE_INPUT_READ, cond);
+ conn->ie_handle = purple_input_add(conn->fd, PURPLE_INPUT_READ, jabber_bosh_http_connection_receive, conn);
if (conn->connect_cb) conn->connect_cb(conn);
}
@@ -99,3 +136,48 @@ void jabber_bosh_http_connection_connect
purple_debug_info("jabber", "Unable to connect to %s.\n", conn->host);
}
}
+
+static void jabber_bosh_http_connection_send_request_add_field_to_string(gpointer key, gpointer value, gpointer user_data) {
+ char **ppacket = user_data;
+ char *tmp = *ppacket;
+ char *field = key;
+ char *val = value;
+ *ppacket = g_strdup_printf("%s%s: %s\r\n", tmp, field, val);
+ g_free(tmp);
+}
+
+void jabber_bosh_http_connection_send_request(PurpleHTTPConnection *conn, PurpleHTTPRequest *req) {
+ char *packet;
+ char *tmp;
+ jabber_bosh_http_request_add_to_header(req, "Host", conn->host);
+
+ packet = tmp = g_strdup_printf("%s %s HTTP/1.1\r\n", req->method, req->path);
+ g_hash_table_foreach(req->header, jabber_bosh_http_connection_send_request_add_field_to_string, &packet);
+ tmp = packet;
+ packet = g_strdup_printf("%s\r\n%s", tmp, req->data);
+ g_free(tmp);
+ if (write(conn->fd, packet, strlen(packet)) == -1) purple_debug_info("jabber", "send error\n");
+ g_queue_push_tail(conn->requests, req);
+}
+
+void jabber_bosh_http_request_init(PurpleHTTPRequest *req, const char *method, const char *path, PurpleHTTPRequestCallback cb, void *userdata) {
+ req->method = g_strdup(method);
+ req->path = g_strdup(path);
+ req->cb = cb;
+ req->userdata = userdata;
+ req->header = g_hash_table_new(g_str_hash, g_str_equal);
+}
+
+void jabber_bosh_http_request_add_to_header(PurpleHTTPRequest *req, const char *field, const char *value) {
+ g_hash_table_replace(req->header, field, value);
+}
+
+void jabber_bosh_http_request_set_data(PurpleHTTPRequest *req, char *data, int len) {
+ req->data = data;
+ req->data_len = len;
+}
+
+void jabber_bosh_http_request_clean(PurpleHTTPRequest *req) {
+ g_free(req->method);
+ g_free(req->path);
+}
============================================================
--- libpurple/protocols/jabber/bosh.h 7fb48e2372eac6412601c492cf5cfe6d1e94a8d7
+++ libpurple/protocols/jabber/bosh.h 5ea02d3f878b0e3fcdb0107e78207487ad05ecfc
@@ -42,6 +42,9 @@ struct _PurpleBOSHConnection {
char *user;
char *passwd;
+ int rid;
+
+ JabberStream *js;
void *userdata;
PurpleAccount *account;
gboolean pipelining;
@@ -62,7 +65,7 @@ struct _PurpleHTTPConnection {
PurpleConnection *conn;
PurpleAccount *account;
GQueue *requests;
- int pih
+ int pih;
PurpleHTTPConnectionConnectFunction connect_cb;
void *userdata;
};
@@ -70,9 +73,10 @@ struct _PurpleHTTPRequest {
struct _PurpleHTTPRequest {
PurpleHTTPRequestCallback cb;
char *method;
- char *url;
- GList *header;
+ char *path;
+ GHashTable *header;
char *data;
+ int data_len;
void *userdata;
};
@@ -80,17 +84,20 @@ struct _PurpleHTTPResponse {
int status;
GHashTable *header;
char *data;
+ int data_len;
};
-void jabber_bosh_connection_init(PurpleBOSHConnection *conn, PurpleAccount *account, char *url);
+void jabber_bosh_connection_init(PurpleBOSHConnection *conn, PurpleAccount *account, JabberStream *js, char *url);
void jabber_bosh_connection_connect(PurpleBOSHConnection *conn);
void jabber_bosh_connection_send(PurpleBOSHConnection *conn, xmlnode *node);
void jabber_bosh_http_connection_init(PurpleHTTPConnection *conn, PurpleAccount *account, char *host, int port);
void jabber_bosh_http_connection_connect(PurpleHTTPConnection *conn);
-void jabber_bosh_http_send_request(PurpleHTTPConnection *conn, PurpleHTTPRequest *req);
+void jabber_bosh_http_connection_send_request(PurpleHTTPConnection *conn, PurpleHTTPRequest *req);
void jabber_bosh_http_connection_clean(PurpleHTTPConnection *conn);
void jabber_bosh_http_request_init(PurpleHTTPRequest *req, const char *method, const char *path, PurpleHTTPRequestCallback cb, void *userdata);
+void jabber_bosh_http_request_add_to_header(PurpleHTTPRequest *req, const char *field, const char *value);
+void jabber_bosh_http_request_set_data(PurpleHTTPRequest *req, char *data, int len);
void jabber_bosh_http_request_clean(PurpleHTTPRequest *req);
#endif /* _PURPLE_JABBER_BOSH_H_ */
============================================================
--- libpurple/protocols/jabber/jabber.c 057b47d8f56be167f44d06ad8094c7c30f62ce07
+++ libpurple/protocols/jabber/jabber.c 27719fb593c3228ba6f956a7e5aa78efb5f0c359
@@ -548,7 +548,7 @@ txt_resolved_cb(PurpleTxtResponse *resp,
token = g_strsplit(resp[n].content, "=", 2);
if (!strcmp(token[0], "_xmpp-client-xbosh")) {
purple_debug_info("jabber","Found alternative connection method using %s at %s.\n", token[0], token[1]);
- jabber_bosh_connection_init(&(js->bosh), gc->account, token[1]);
+ jabber_bosh_connection_init(&(js->bosh), gc->account, js, token[1]);
g_strfreev(token);
break;
}
More information about the Commits
mailing list