Mercurial > pidgin.yaz
view libgaim/circbuffer.c @ 14594:78f121689460
[gaim-migrate @ 17319]
Rest of SF Patch #1559532 from Mike Stoddard
Fixes SF Bug 1520965
Fixes SF Bug 1544012
"This is patch to fix connection problems in the Novell
protocol plugin. It should fix bugs 1520965 and 1544012."
"The two bugs are both connection problems. Unfortunately the
plugin is designed to be a little too synchronous so
non-blocking i/o causes problems for it. The fix is to retry
a little longer in nm_read_all and to not disconnect if
errno is EAGAIN after processing an incoming response or
event. When I get more time I will work on making the plugin
more asynchronous so that we don't have to block in
nm_read_all. For now however this patch will get people
working again. Any suggestions/comments are welcome."
I consulted with Daniel on this one, and I'm committing it as a temporary fix, since Mike says he's going to fix it for real later.
committer: Tailor Script <tailor@pidgin.im>
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Tue, 19 Sep 2006 01:01:20 +0000 |
parents | 60b1bc8dbf37 |
children | e3daf404bf2c |
line wrap: on
line source
/* * @file circbuffer.h Buffer Utility Functions * @ingroup core * * 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 */ #include "internal.h" #include "circbuffer.h" #define DEFAULT_BUF_SIZE 256 GaimCircBuffer * gaim_circ_buffer_new(gsize growsize) { GaimCircBuffer *buf = g_new0(GaimCircBuffer, 1); buf->growsize = growsize ? growsize : DEFAULT_BUF_SIZE; return buf; } void gaim_circ_buffer_destroy(GaimCircBuffer *buf) { g_return_if_fail(buf); g_free(buf->buffer); g_free(buf); } static void grow_circ_buffer(GaimCircBuffer *buf, gsize len) { int in_offset = 0, out_offset = 0; int start_buflen = buf->buflen; while ((buf->buflen - buf->bufused) < len) buf->buflen += buf->growsize; if (buf->inptr != NULL) { in_offset = buf->inptr - buf->buffer; out_offset = buf->outptr - buf->buffer; } buf->buffer = g_realloc(buf->buffer, buf->buflen); /* adjust the fill and remove pointer locations */ if (buf->inptr == NULL) { buf->inptr = buf->outptr = buf->buffer; } else { buf->inptr = buf->buffer + in_offset; buf->outptr = buf->buffer + out_offset; } /* If the fill pointer is wrapped to before the remove * pointer, we need to shift the data */ if (in_offset < out_offset) { int shift_n = MIN(buf->buflen - start_buflen, in_offset); memcpy(buf->buffer + start_buflen, buf->buffer, shift_n); /* If we couldn't fit the wrapped read buffer * at the end */ if (shift_n < in_offset) { memmove(buf->buffer, buf->buffer + shift_n, in_offset - shift_n); buf->inptr = buf->buffer + (in_offset - shift_n); } else { buf->inptr = buf->buffer + start_buflen + in_offset; } } } void gaim_circ_buffer_append(GaimCircBuffer *buf, gconstpointer src, gsize len) { int len_stored; /* Grow the buffer, if necessary */ if ((buf->buflen - buf->bufused) < len) grow_circ_buffer(buf, len); /* If there is not enough room to copy all of src before hitting * the end of the buffer then we will need to do two copies. * One copy from inptr to the end of the buffer, and the * second copy from the start of the buffer to the end of src. */ if (buf->inptr >= buf->outptr) len_stored = MIN(len, buf->buflen - (buf->inptr - buf->buffer)); else len_stored = len; memcpy(buf->inptr, src, len_stored); if (len_stored < len) { memcpy(buf->buffer, src + len_stored, len - len_stored); buf->inptr = buf->buffer + (len - len_stored); } else if ((buf->buffer - buf->inptr) == len_stored) { buf->inptr = buf->buffer; } else { buf->inptr += len_stored; } buf->bufused += len; } gsize gaim_circ_buffer_get_max_read(GaimCircBuffer *buf) { int max_read; if (buf->bufused == 0) max_read = 0; else if ((buf->outptr - buf->inptr) >= 0) max_read = buf->buflen - (buf->outptr - buf->buffer); else max_read = buf->inptr - buf->outptr; return max_read; } gboolean gaim_circ_buffer_mark_read(GaimCircBuffer *buf, gsize len) { g_return_val_if_fail(gaim_circ_buffer_get_max_read(buf) >= len, FALSE); buf->outptr += len; buf->bufused -= len; /* wrap to the start if we're at the end */ if ((buf->outptr - buf->buffer) == buf->buflen) buf->outptr = buf->buffer; return TRUE; }