gaim/gaim

Bits'n'pieces:
oldstatus
2005-05-05, Stu Tomlinson
3ace3198893b
Parents a488f8bbf0f0
Children 42c9014fadbd
Bits'n'pieces:
Don't allow gaim-remote "clones" to knock gaim out by specifying a big packet
length.
Correctly bound the point sizes in gtkimhtml & yahoo
Fix up some code in MSN that isn't actually being used, just in case someone
comes along and submits a patch that would use it.
Don't try writing to the server in MSN if you're not actually connected
Fix message flags in SILC
6 files changed, 225 insertions(+), 18 deletions(-)
  • +202 -0
    plugins/gaim-remote/remote-socket.c
  • +6 -10
    src/gtkimhtml.c
  • +13 -5
    src/protocols/msn/directconn.c
  • +2 -1
    src/protocols/msn/notification.c
  • +1 -1
    src/protocols/silc/silc.c
  • +1 -1
    src/protocols/yahoo/util.c
    • --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/plugins/gaim-remote/remote-socket.c Thu May 05 09:08:38 2005 -0400
    @@ -0,0 +1,202 @@
    +/*
    + * gaim-remote
    + *
    + * Copyright (C) 2002, Sean Egan <bj91704@binghamton.edu>
    + *
    + * 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:
    + * Copyright (C) 1998-2002 Peter Alm, Mikael Alm, Olle Hallnas,
    + * Thomas Nilsson and 4Front Technologies
    + * Copyright (C) 1999-2002 Haavard Kvaalen
    + */
    +
    +/* 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 "internal.h"
    +#include <sys/un.h>
    +#include <gaim-remote/remote.h>
    +#include <sys/types.h>
    +#include <unistd.h>
    +
    +void
    +gaim_remote_session_send_packet(int fd, GaimRemotePacket *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
    +gaim_remote_packet_append_string(GaimRemotePacket *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
    +gaim_remote_packet_append_char(GaimRemotePacket *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
    +gaim_remote_packet_append_raw(GaimRemotePacket *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;
    +}
    +
    +GaimRemotePacket *
    +gaim_remote_packet_new(guchar type, guchar subtype)
    +{
    + GaimRemotePacket *p = g_new0(GaimRemotePacket, 1);
    + p->type = type;
    + p->subtype = subtype;
    + p->length = 0;
    + p->data = NULL;
    + return p;
    +}
    +
    +void
    +gaim_remote_packet_free(GaimRemotePacket *p)
    +{
    + if (p->data)
    + g_free(p->data);
    + g_free(p);
    +}
    +
    +GaimRemotePacket *
    +gaim_remote_session_read_packet(int fd)
    +{
    + GaimRemotePacket *p = g_new0(GaimRemotePacket, 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_try_malloc(p->length);
    +
    + if ((data == NULL) || !(read(fd, data, p->length))) {
    + g_free(p);
    + return NULL;
    + }
    + }
    +
    + p->data = data;
    +
    + return p;
    +}
    +
    +/* copied directly from xmms_connect_to_session */
    +int
    +gaim_remote_session_connect(int 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_remote_session_exists(int sess)
    +{
    + GaimRemotePacket *pack = NULL;
    + int fd = gaim_remote_session_connect(sess);
    +
    + if (fd > 0) {
    + pack = gaim_remote_packet_new(CUI_TYPE_META, CUI_META_PING);
    + gaim_remote_session_send_packet(fd, pack);
    + gaim_remote_packet_free(pack);
    + close(fd);
    +
    + return TRUE;
    + }
    +
    + return FALSE;
    +}
    +
    --- a/src/gtkimhtml.c Wed May 04 21:26:27 2005 -0400
    +++ b/src/gtkimhtml.c Thu May 05 09:08:38 2005 -0400
    @@ -91,10 +91,9 @@
    static void paste_received_cb (GtkClipboard *clipboard, GtkSelectionData *selection_data, gpointer data);
    static void paste_plaintext_received_cb (GtkClipboard *clipboard, const gchar *text, gpointer data);
    -/* POINT_SIZE converts from AIM font sizes to point sizes. It probably should be redone in such a
    - * way that it base the sizes off the default font size rather than using arbitrary font sizes. */
    +/* POINT_SIZE converts from AIM font sizes to a point size scale factor. */
    #define MAX_FONT_SIZE 7
    -#define POINT_SIZE(x) (options & GTK_IMHTML_USE_POINTSIZE ? x : _point_sizes [MIN ((x), MAX_FONT_SIZE) - 1])
    +#define POINT_SIZE(x) (_point_sizes [MIN ((x > 0 ? x : 1), MAX_FONT_SIZE) - 1])
    static gdouble _point_sizes [] = { .69444444, .8333333, 1, 1.2, 1.44, 1.728, 2.0736};
    enum {
    @@ -3209,12 +3208,9 @@
    int size;
    size = strtol(tag->name + 10, NULL, 10);
    - if(size >= 0 && size < (sizeof(_point_sizes) / sizeof(_point_sizes[0])))
    - {
    - g_object_set(G_OBJECT(tag), "size",
    - (gint) (GTK_IMHTML(imhtml)->original_fsize *
    - ((double) _point_sizes[size-1] * GTK_IMHTML(imhtml)->zoom)), NULL);
    - }
    + g_object_set(G_OBJECT(tag), "size",
    + (gint) (GTK_IMHTML(imhtml)->original_fsize *
    + ((double) POINT_SIZE(size) * GTK_IMHTML(imhtml)->zoom)), NULL);
    }
    }
    @@ -3257,7 +3253,7 @@
    */
    tag = gtk_text_buffer_create_tag(imhtml->text_buffer, str, "size",
    (gint) (imhtml->original_fsize *
    - ((double) _point_sizes[size-1] * imhtml->zoom)), NULL);
    + ((double) POINT_SIZE(size) * imhtml->zoom)), NULL);
    }
    return tag;
    --- a/src/protocols/msn/directconn.c Wed May 04 21:26:27 2005 -0400
    +++ b/src/protocols/msn/directconn.c Thu May 05 09:08:38 2005 -0400
    @@ -317,12 +317,20 @@
    return;
    }
    - body = g_malloc(body_len);
    + body = g_try_malloc(body_len);
    +
    + if (body != NULL)
    + {
    + /* Let's read the data. */
    + len = read(directconn->fd, body, body_len);
    - /* Let's read the data. */
    - len = read(directconn->fd, body, body_len);
    -
    - gaim_debug_info("msn", "len=%d\n", len);
    + gaim_debug_info("msn", "len=%d\n", len);
    + }
    + else
    + {
    + gaim_debug_error("msn", "Failed to allocate memory for read\n");
    + len = 0;
    + }
    if (len > 0)
    {
    --- a/src/protocols/msn/notification.c Wed May 04 21:26:27 2005 -0400
    +++ b/src/protocols/msn/notification.c Thu May 05 09:08:38 2005 -0400
    @@ -349,7 +349,8 @@
    if (!notification->in_use)
    return;
    - msn_cmdproc_send_quick(notification->cmdproc, "OUT", NULL, NULL);
    + if (notification->session->connected)
    + msn_cmdproc_send_quick(notification->cmdproc, "OUT", NULL, NULL);
    msn_notification_disconnect(notification);
    }
    --- a/src/protocols/silc/silc.c Wed May 04 21:26:27 2005 -0400
    +++ b/src/protocols/silc/silc.c Thu May 05 09:08:38 2005 -0400
    @@ -865,7 +865,7 @@
    silc_client_send_private_message(client, conn, client_entry, im->flags,
    im->message, im->message_len, TRUE);
    gaim_conv_im_write(GAIM_CONV_IM(convo), conn->local_entry->nickname,
    - im->message, 0, time(NULL));
    + im->message, GAIM_MESSAGE_SEND, time(NULL));
    goto out;
    --- a/src/protocols/yahoo/util.c Wed May 04 21:26:27 2005 -0400
    +++ b/src/protocols/yahoo/util.c Thu May 05 09:08:38 2005 -0400
    @@ -347,7 +347,7 @@
    /* borrowed from gtkimhtml */
    #define MAX_FONT_SIZE 7
    -#define POINT_SIZE(x) (_point_sizes [MIN ((x), MAX_FONT_SIZE) - 1])
    +#define POINT_SIZE(x) (_point_sizes [MIN ((x > 0 ? x : 1), MAX_FONT_SIZE) - 1])
    static gint _point_sizes [] = { 8, 10, 12, 14, 20, 30, 40 };
    enum fatype { size, color, face, junk };