pidgin: aa14b9a7: Jabber: Use file-transfer accessor funct...
andrew.victor at mxit.com
andrew.victor at mxit.com
Sun Oct 30 12:20:51 EDT 2011
----------------------------------------------------------------------
Revision: aa14b9a7d2d94920dba2766254792cde9b3f0dc6
Parent: 485ca7dffac7c2a3a2d05aaf9ca21a826cbc6ef0
Author: andrew.victor at mxit.com
Date: 10/30/11 11:52:45
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/aa14b9a7d2d94920dba2766254792cde9b3f0dc6
Changelog:
Jabber: Use file-transfer accessor functions
Changes against parent 485ca7dffac7c2a3a2d05aaf9ca21a826cbc6ef0
patched libpurple/protocols/jabber/oob.c
patched libpurple/protocols/jabber/si.c
-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/oob.c 06d22d012584880cb58411302fa00dc44be6d9dc
+++ libpurple/protocols/jabber/oob.c 4c47827f316dcc7798f97e2d4f66a04fe5e627c9
@@ -119,10 +119,10 @@ static void jabber_oob_xfer_start(Purple
jox->written_len = 0;
}
- jox->writeh = purple_input_add(xfer->fd, PURPLE_INPUT_WRITE,
+ jox->writeh = purple_input_add(purple_xfer_get_fd(xfer), PURPLE_INPUT_WRITE,
jabber_oob_xfer_request_send, xfer);
- jabber_oob_xfer_request_send(xfer, xfer->fd, PURPLE_INPUT_WRITE);
+ jabber_oob_xfer_request_send(xfer, purple_xfer_get_fd(xfer), PURPLE_INPUT_WRITE);
}
static gssize jabber_oob_xfer_read(guchar **buffer, PurpleXfer *xfer) {
@@ -131,7 +131,7 @@ static gssize jabber_oob_xfer_read(gucha
char *tmp, *lenstr;
int len;
- if((len = read(xfer->fd, test, sizeof(test))) > 0) {
+ if((len = read(purple_xfer_get_fd(xfer), test, sizeof(test))) > 0) {
jox->headers = g_string_append_len(jox->headers, test, len);
if((tmp = strstr(jox->headers->str, "\r\n\r\n"))) {
*tmp = '\0';
============================================================
--- libpurple/protocols/jabber/si.c 5edcba9e70297900bc076d1d4efbd47a9d3baf4d
+++ libpurple/protocols/jabber/si.c 144be1a222c0ede26fcd49cd85a1eecd9724533b
@@ -393,8 +393,8 @@ jabber_si_xfer_bytestreams_send_read_aga
if (jsx->rxlen < jsx->rxmaxlen)
return;
- purple_input_remove(xfer->watcher);
- xfer->watcher = 0;
+ purple_input_remove(purple_xfer_get_watcher(xfer));
+ purple_xfer_set_watcher(xfer, 0);
g_free(jsx->rxqueue);
jsx->rxqueue = NULL;
@@ -462,8 +462,8 @@ jabber_si_xfer_bytestreams_send_read_aga
if(jsx->rxlen - 5 < jsx->rxqueue[4] + 2)
return;
- purple_input_remove(xfer->watcher);
- xfer->watcher = 0;
+ purple_input_remove(purple_xfer_get_watcher(xfer));
+ purple_xfer_set_watcher(xfer, 0);
dstaddr = g_strdup_printf("%s%s@%s/%s%s", jsx->stream_id,
jsx->js->user->node, jsx->js->user->domain,
@@ -508,8 +508,8 @@ jabber_si_xfer_bytestreams_send_read_aga
jsx->rxqueue[5+strlen(host)] = 0x00;
jsx->rxqueue[6+strlen(host)] = 0x00;
- xfer->watcher = purple_input_add(source, PURPLE_INPUT_WRITE,
- jabber_si_xfer_bytestreams_send_read_again_resp_cb, xfer);
+ purple_xfer_set_watcher(xfer, purple_input_add(source, PURPLE_INPUT_WRITE,
+ jabber_si_xfer_bytestreams_send_read_again_resp_cb, xfer));
jabber_si_xfer_bytestreams_send_read_again_resp_cb(xfer, source,
PURPLE_INPUT_WRITE);
}
@@ -539,9 +539,9 @@ jabber_si_xfer_bytestreams_send_read_res
/* If we sent a "Success", wait for a response, otherwise give up and cancel */
if (jsx->rxqueue[1] == 0x00) {
- purple_input_remove(xfer->watcher);
- xfer->watcher = purple_input_add(source, PURPLE_INPUT_READ,
- jabber_si_xfer_bytestreams_send_read_again_cb, xfer);
+ purple_input_remove(purple_xfer_get_watcher(xfer));
+ purple_xfer_set_watcher(xfer, purple_input_add(source, PURPLE_INPUT_READ,
+ jabber_si_xfer_bytestreams_send_read_again_cb, xfer));
g_free(jsx->rxqueue);
jsx->rxqueue = NULL;
jsx->rxlen = 0;
@@ -563,7 +563,7 @@ jabber_si_xfer_bytestreams_send_read_cb(
purple_debug_info("jabber", "in jabber_si_xfer_bytestreams_send_read_cb\n");
- xfer->fd = source;
+ purple_xfer_set_fd(xfer, source);
/** Try to read the SOCKS5 header */
if(jsx->rxlen < 2) {
@@ -619,10 +619,10 @@ jabber_si_xfer_bytestreams_send_read_cb(
jsx->rxqueue = g_malloc(jsx->rxmaxlen);
jsx->rxqueue[0] = 0x05;
jsx->rxqueue[1] = 0x00;
- purple_input_remove(xfer->watcher);
- xfer->watcher = purple_input_add(source, PURPLE_INPUT_WRITE,
+ purple_input_remove(purple_xfer_get_watcher(xfer));
+ purple_xfer_set_watcher(xfer, purple_input_add(source, PURPLE_INPUT_WRITE,
jabber_si_xfer_bytestreams_send_read_response_cb,
- xfer);
+ xfer));
jabber_si_xfer_bytestreams_send_read_response_cb(xfer,
source, PURPLE_INPUT_WRITE);
jsx->rxqueue = NULL;
@@ -637,9 +637,9 @@ jabber_si_xfer_bytestreams_send_read_cb(
jsx->rxqueue = g_malloc(jsx->rxmaxlen);
jsx->rxqueue[0] = 0x05;
jsx->rxqueue[1] = 0xFF;
- purple_input_remove(xfer->watcher);
- xfer->watcher = purple_input_add(source, PURPLE_INPUT_WRITE,
- jabber_si_xfer_bytestreams_send_read_response_cb, xfer);
+ purple_input_remove(purple_xfer_get_watcher(xfer));
+ purple_xfer_set_watcher(xfer, purple_input_add(source, PURPLE_INPUT_WRITE,
+ jabber_si_xfer_bytestreams_send_read_response_cb, xfer));
jabber_si_xfer_bytestreams_send_read_response_cb(xfer,
source, PURPLE_INPUT_WRITE);
}
@@ -674,7 +674,7 @@ jabber_si_xfer_bytestreams_send_connecte
return;
}
- purple_input_remove(xfer->watcher);
+ purple_input_remove(purple_xfer_get_watcher(xfer));
close(source);
jsx->local_streamhost_fd = -1;
@@ -684,8 +684,8 @@ jabber_si_xfer_bytestreams_send_connecte
fcntl(acceptfd, F_SETFD, FD_CLOEXEC);
#endif
- xfer->watcher = purple_input_add(acceptfd, PURPLE_INPUT_READ,
- jabber_si_xfer_bytestreams_send_read_cb, xfer);
+ purple_xfer_set_watcher(xfer, purple_input_add(acceptfd, PURPLE_INPUT_READ,
+ jabber_si_xfer_bytestreams_send_read_cb, xfer));
}
static void
@@ -761,7 +761,7 @@ jabber_si_connect_proxy_cb(JabberStream
jsx->js->user->domain, jsx->js->user->resource);
if (!strcmp(jid, my_jid)) {
purple_debug_info("jabber", "Got local SOCKS5 streamhost-used.\n");
- purple_xfer_start(xfer, xfer->fd, NULL, -1);
+ purple_xfer_start(xfer, purple_xfer_get_fd(xfer), NULL, -1);
} else {
/* if available, try to revert to IBB... */
if (jsx->stream_method & STREAM_METHOD_IBB) {
@@ -785,9 +785,9 @@ jabber_si_connect_proxy_cb(JabberStream
}
/* Clean up the local streamhost - it isn't going to be used.*/
- if (xfer->watcher > 0) {
- purple_input_remove(xfer->watcher);
- xfer->watcher = 0;
+ if (purple_xfer_get_watcher(xfer) > 0) {
+ purple_input_remove(purple_xfer_get_watcher(xfer));
+ purple_xfer_set_watcher(xfer, 0);
}
if (jsx->local_streamhost_fd >= 0) {
close(jsx->local_streamhost_fd);
@@ -845,7 +845,7 @@ jabber_si_xfer_bytestreams_listen_cb(int
jid = g_strdup_printf("%s@%s/%s", jsx->js->user->node,
jsx->js->user->domain, jsx->js->user->resource);
- xfer->local_port = purple_network_get_port_from_fd(sock);
+ purple_xfer_set_local_port(xfer, purple_network_get_port_from_fd(sock));
g_snprintf(port, sizeof(port), "%hu", purple_xfer_get_local_port(xfer));
public_ip = purple_network_get_my_ip(jsx->js->fd);
@@ -876,8 +876,8 @@ jabber_si_xfer_bytestreams_listen_cb(int
g_free(jid);
/* The listener for the local proxy */
- xfer->watcher = purple_input_add(sock, PURPLE_INPUT_READ,
- jabber_si_xfer_bytestreams_send_connected_cb, xfer);
+ purple_xfer_set_watcher(xfer, purple_input_add(sock, PURPLE_INPUT_READ,
+ jabber_si_xfer_bytestreams_send_connected_cb, xfer));
}
for (tmp = jsx->js->bs_proxies; tmp; tmp = tmp->next) {
@@ -1304,9 +1304,9 @@ static void jabber_si_xfer_free(PurpleXf
jabber_iq_remove_callback_by_id(js, jsx->iq_id);
if (jsx->local_streamhost_fd >= 0)
close(jsx->local_streamhost_fd);
- if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && xfer->fd >= 0) {
+ if (purple_xfer_get_type(xfer) == PURPLE_XFER_SEND && purple_xfer_get_fd(xfer) >= 0) {
purple_debug_info("jabber", "remove port mapping\n");
- purple_network_remove_port_mapping(xfer->fd);
+ purple_network_remove_port_mapping(purple_xfer_get_fd(xfer));
}
if (jsx->connect_timeout > 0)
purple_timeout_remove(jsx->connect_timeout);
More information about the Commits
mailing list