Mercurial > pidgin.yaz
view src/socket.c @ 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 | 61852117568f |
children | 8bda65b88e49 |
line wrap: on
line source
/* * gaim-remote * * Gaim is the legal property of its developers, whose names are too numerous * to list here. Please refer to the COPYRIGHT file distributed with this * source distribution. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * */ /* Somewhat inspired by XMMS*/ /* This provides code for connecting to a Gaim socket and communicating with * it. It will eventually be made a library once the core and ui are split. */ #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> #include <unistd.h> #include "gaim-socket.h" void cui_send_packet (int fd, struct gaim_cui_packet *p) { int len = sizeof(p->type) + sizeof(p->subtype) + sizeof(p->length) + p->length; char *pack = g_malloc(len); char *a = pack; memcpy (a, &(p->type), sizeof(p->type)); a = a + sizeof(p->type); memcpy (a, &(p->subtype), sizeof(p->subtype)); a = a + sizeof(p->subtype); memcpy (a, &(p->length), sizeof(p->length)); a = a + sizeof(p->length); memcpy (a, p->data, p->length); write(fd, pack, len); g_free(pack); } void cui_packet_append_string(struct gaim_cui_packet *p, char *str) { int len = p->length + strlen(str); char *k = g_malloc(len); memcpy(k, p->data, p->length); memcpy(k + p->length, str, strlen(str)); if (p->data) g_free(p->data); p->data = k; p->length = len; } void cui_packet_append_char(struct gaim_cui_packet *p, char c) { int len = p->length + sizeof(char); char *k = g_malloc(len); memcpy(k, p->data, p->length); k[p->length] = c; if (p->data) g_free(p->data); p->data = k; p->length = len; } void cui_packet_append_raw(struct gaim_cui_packet *p, char *str, int len) { int lent = p->length + len; char *k = g_malloc(lent); memcpy(k, p->data, p->length); memcpy(k + p->length, str, len); if (p->data) g_free(p->data); p->data = k; p->length = lent; } struct gaim_cui_packet *cui_packet_new(guchar type, guchar subtype) { struct gaim_cui_packet *p = g_new0(struct gaim_cui_packet, 1); p->type = type; p->subtype = subtype; p->length = 0; p->data = NULL; return p; } void cui_packet_free(struct gaim_cui_packet *p) { if (p->data) g_free(p->data); g_free(p); } struct gaim_cui_packet *cui_read_packet(int fd) { struct gaim_cui_packet *p = g_new0(struct gaim_cui_packet, 1); char *data = NULL; if (!(read(fd, &p->type, sizeof(p->type)))) { g_free(p); return NULL; } if (!(read(fd, &p->subtype, sizeof(p->subtype)))) { g_free(p); return NULL; } if (!(read(fd, &p->length, sizeof(p->length)))) { g_free(p); return NULL; } if (p->length) { data = g_malloc(p->length); if (!(read(fd, data, p->length))) { g_free(p); return NULL; } } p->data = data; return p; } /* copied directly from xmms_connect_to_session */ gint gaim_connect_to_session(gint session) { gint fd; uid_t stored_uid, euid; struct sockaddr_un saddr; if ((fd = socket(AF_UNIX, SOCK_STREAM, 0)) != -1) { saddr.sun_family = AF_UNIX; stored_uid = getuid(); euid = geteuid(); setuid(euid); sprintf(saddr.sun_path, "%s/gaim_%s.%d", g_get_tmp_dir(), g_get_user_name(), session); setreuid(stored_uid, euid); if (connect(fd, (struct sockaddr *) &saddr, sizeof (saddr)) != -1) return fd; } close(fd); return -1; } gboolean gaim_session_exists(int sess) { struct gaim_cui_packet *pack = NULL; int fd = gaim_connect_to_session(sess); if (fd > 0) { pack = cui_packet_new(CUI_TYPE_META, CUI_META_PING); cui_send_packet(fd, pack); cui_packet_free(pack); close(fd); } else { return FALSE; } return TRUE; }