Mercurial > pidgin.yaz

comparison libpurple/protocols/jabber/oob.c @ 32795:fb5b5f6cf111

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Jabber: Use file-transfer accessor functions
author andrew.victor@mxit.com
date Sun, 30 Oct 2011 15:52:45 +0000
parents 2ec94166be43
children
comparison
equal deleted inserted replaced
32794:1f56d5102483 32795:fb5b5f6cf111
117 "GET /%s HTTP/1.1\r\nHost: %s\r\n\r\n", 117 "GET /%s HTTP/1.1\r\nHost: %s\r\n\r\n",
118 jox->page, jox->address); 118 jox->page, jox->address);
119 jox->written_len = 0; 119 jox->written_len = 0;
120 } 120 }
121 121
122 jox->writeh = purple_input_add(xfer->fd, PURPLE_INPUT_WRITE, 122 jox->writeh = purple_input_add(purple_xfer_get_fd(xfer), PURPLE_INPUT_WRITE,
123 jabber_oob_xfer_request_send, xfer); 123 jabber_oob_xfer_request_send, xfer);
124 124
125 jabber_oob_xfer_request_send(xfer, xfer->fd, PURPLE_INPUT_WRITE); 125 jabber_oob_xfer_request_send(xfer, purple_xfer_get_fd(xfer), PURPLE_INPUT_WRITE);
126 } 126 }
127 127
128 static gssize jabber_oob_xfer_read(guchar **buffer, PurpleXfer *xfer) { 128 static gssize jabber_oob_xfer_read(guchar **buffer, PurpleXfer *xfer) {
129 JabberOOBXfer *jox = purple_xfer_get_protocol_data(xfer); 129 JabberOOBXfer *jox = purple_xfer_get_protocol_data(xfer);
130 char test[2048]; 130 char test[2048];
131 char *tmp, *lenstr; 131 char *tmp, *lenstr;
132 int len; 132 int len;
133 133
134 if((len = read(xfer->fd, test, sizeof(test))) > 0) { 134 if((len = read(purple_xfer_get_fd(xfer), test, sizeof(test))) > 0) {
135 jox->headers = g_string_append_len(jox->headers, test, len); 135 jox->headers = g_string_append_len(jox->headers, test, len);
136 if((tmp = strstr(jox->headers->str, "\r\n\r\n"))) { 136 if((tmp = strstr(jox->headers->str, "\r\n\r\n"))) {
137 *tmp = '\0'; 137 *tmp = '\0';
138 lenstr = strstr(jox->headers->str, "Content-Length: "); 138 lenstr = strstr(jox->headers->str, "Content-Length: ");
139 if(lenstr) { 139 if(lenstr) {