[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r21567 - in gnunet/src: include util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r21567 - in gnunet/src: include util |
Date: |
Thu, 24 May 2012 10:43:24 +0200 |
Author: wachs
Date: 2012-05-24 10:43:24 +0200 (Thu, 24 May 2012)
New Revision: 21567
Added:
gnunet/src/util/test_server_mst_interrupt.c
Modified:
gnunet/src/include/gnunet_server_lib.h
gnunet/src/util/Makefile.am
gnunet/src/util/server.c
gnunet/src/util/server_mst.c
Log:
- fix for 0002371, 0002343: mst freed in callback
Modified: gnunet/src/include/gnunet_server_lib.h
===================================================================
--- gnunet/src/include/gnunet_server_lib.h 2012-05-23 12:52:42 UTC (rev
21566)
+++ gnunet/src/include/gnunet_server_lib.h 2012-05-24 08:43:24 UTC (rev
21567)
@@ -607,11 +607,15 @@
* Functions with this signature are called whenever a
* complete message is received by the tokenizer.
*
+ * Do not call GNUNET_SERVER_mst_destroy in callback
+ *
* @param cls closure
* @param client identification of the client
* @param message the actual message
+ *
+ * @return GNUNET_OK on success, GNUNET_SYSERR to stop further processing
*/
-typedef void (*GNUNET_SERVER_MessageTokenizerCallback) (void *cls, void
*client,
+typedef int (*GNUNET_SERVER_MessageTokenizerCallback) (void *cls, void *client,
const struct
GNUNET_MessageHeader *
message);
Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2012-05-23 12:52:42 UTC (rev 21566)
+++ gnunet/src/util/Makefile.am 2012-05-24 08:43:24 UTC (rev 21567)
@@ -195,6 +195,7 @@
test_resolver_api \
test_scheduler \
test_scheduler_delay \
+ test_server_mst_interrupt \
test_server \
test_server_disconnect \
test_server_with_client \
@@ -402,6 +403,11 @@
test_scheduler_delay_LDADD = \
$(top_builddir)/src/util/libgnunetutil.la
+test_server_mst_interrupt_SOURCES = \
+ test_server_mst_interrupt.c
+test_server_mst_interrupt_LDADD = \
+ $(top_builddir)/src/util/libgnunetutil.la
+
test_server_SOURCES = \
test_server.c
test_server_LDADD = \
Modified: gnunet/src/util/server.c
===================================================================
--- gnunet/src/util/server.c 2012-05-23 12:52:42 UTC (rev 21566)
+++ gnunet/src/util/server.c 2012-05-24 08:43:24 UTC (rev 21567)
@@ -1104,8 +1104,10 @@
* @param cls closure (struct GNUNET_SERVER_Handle)
* @param client identification of the client (struct GNUNET_SERVER_Client*)
* @param message the actual message
+ *
+ * @return GNUNET_OK on success, GNUNET_SYSERR to stop further processing
*/
-static void
+static int
client_message_tokenizer_callback (void *cls, void *client,
const struct GNUNET_MessageHeader *message)
{
@@ -1120,7 +1122,11 @@
ret = GNUNET_SERVER_inject (server, sender, message);
sender->in_process_client_buffer = GNUNET_NO;
if ( (GNUNET_OK != ret) || (GNUNET_YES == sender->shutdown_now) )
+ {
GNUNET_SERVER_client_disconnect (sender);
+ return GNUNET_SYSERR;
+ }
+ return GNUNET_OK;
}
Modified: gnunet/src/util/server_mst.c
===================================================================
--- gnunet/src/util/server_mst.c 2012-05-23 12:52:42 UTC (rev 21566)
+++ gnunet/src/util/server_mst.c 2012-05-24 08:43:24 UTC (rev 21567)
@@ -221,7 +221,8 @@
if (one_shot == GNUNET_YES)
one_shot = GNUNET_SYSERR;
mst->off += want;
- mst->cb (mst->cb_cls, client_identity, hdr);
+ if (GNUNET_SYSERR == mst->cb (mst->cb_cls, client_identity, hdr))
+ return GNUNET_SYSERR;
if (mst->off == mst->pos)
{
/* reset to beginning of buffer, it's free right now! */
@@ -261,7 +262,8 @@
}
if (one_shot == GNUNET_YES)
one_shot = GNUNET_SYSERR;
- mst->cb (mst->cb_cls, client_identity, hdr);
+ if (GNUNET_SYSERR == mst->cb (mst->cb_cls, client_identity, hdr))
+ return GNUNET_SYSERR;
buf += want;
size -= want;
}
Added: gnunet/src/util/test_server_mst_interrupt.c
===================================================================
--- gnunet/src/util/test_server_mst_interrupt.c (rev 0)
+++ gnunet/src/util/test_server_mst_interrupt.c 2012-05-24 08:43:24 UTC (rev
21567)
@@ -0,0 +1,81 @@
+/*
+ This file is part of GNUnet.
+ (C) 2009, 2010 Christian Grothoff (and other contributing authors)
+
+ GNUnet 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 3, or (at your
+ option) any later version.
+
+ GNUnet 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 GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+/**
+ * @file util/test_server_mst_interrupt.c
+ * @brief test for interrupt message processing in server_mst.c
+ */
+#include "platform.h"
+#include "gnunet_common.h"
+#include "gnunet_protocols.h"
+#include "gnunet_client_lib.h"
+#include "gnunet_scheduler_lib.h"
+#include "gnunet_server_lib.h"
+#include "gnunet_time_lib.h"
+
+static struct GNUNET_SERVER_MessageStreamTokenizer * mst;
+static int ret;
+
+/* Callback destroying mst with data in buffer */
+static int
+mst_cb (void *cls, void *client,
+ const struct GNUNET_MessageHeader * message)
+{
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "MST gave me message, destroying\n");
+ GNUNET_SERVER_mst_destroy (mst);
+ return GNUNET_SYSERR;
+}
+
+/**
+ * Main method
+ */
+static int
+check ()
+{
+
+ struct GNUNET_PeerIdentity id;
+ struct GNUNET_MessageHeader msg[2];
+
+ /* Prepare */
+ memset (&id, sizeof (id), '\0');
+ msg[0].size = htons (sizeof (msg));
+ msg[0].type = htons (sizeof (GNUNET_MESSAGE_TYPE_DUMMY));
+
+ mst = GNUNET_SERVER_mst_create(mst_cb, NULL);
+
+ GNUNET_SERVER_mst_receive(mst, &id, (const char *) &msg, 2 * sizeof (msg),
GNUNET_NO, GNUNET_NO);
+
+ /* If we reach this line, it did not crash */
+ ret = 0;
+
+ return ret;
+}
+
+int
+main (int argc, char *argv[])
+{
+ ret = 1;
+
+ GNUNET_log_setup ("test_server", "WARNING", NULL);
+ check ();
+
+ return ret;
+}
+
+/* end of test_server_mst_interrupt.c */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r21567 - in gnunet/src: include util,
gnunet <=