X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=src%2Futil%2Ftest_server_with_client_unix.c;h=1d6f5dbed92956eebafe1a93ca4f552440a10e8f;hb=0ed9622f1a7adf7b7e429b29c1245f0fa6420004;hp=4f80f188cc17f5fa59945c365abc9e9ced21da9e;hpb=83b19539f4d322b43683f5838b72e9ec2c8e6073;p=oweals%2Fgnunet.git

diff --git a/src/util/test_server_with_client_unix.c b/src/util/test_server_with_client_unix.c
index 4f80f188c..1d6f5dbed 100644
--- a/src/util/test_server_with_client_unix.c
+++ b/src/util/test_server_with_client_unix.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet.
-     (C) 2009 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2009 GNUnet e.V.
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      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.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file util/test_server_with_client_unix.c
@@ -24,13 +24,7 @@
  *       client_get_address and receive_done (resume processing)
  */
 #include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_client_lib.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_time_lib.h"
-
-#define VERBOSE GNUNET_EXTRA_LOGGING
+#include "gnunet_util_lib.h"
 
 #define MY_TYPE 128
 
@@ -43,6 +37,7 @@ static struct GNUNET_CONFIGURATION_Handle *cfg;
 
 static int ok;
 
+
 static void
 send_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
@@ -68,7 +63,7 @@ recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient,
     break;
   case 4:
     ok++;
-    GNUNET_CLIENT_disconnect (client, GNUNET_YES);
+    GNUNET_CLIENT_disconnect (client);
     GNUNET_SERVER_receive_done (argclient, GNUNET_OK);
     break;
   default:
@@ -135,21 +130,15 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   struct sockaddr_un un;
   const char *unixpath = "/tmp/testsock";
-  size_t slen = strlen (unixpath);
   struct sockaddr *sap[2];
   socklen_t slens[2];
 
   memset (&un, 0, sizeof (un));
   un.sun_family = AF_UNIX;
-  memcpy (un.sun_path, unixpath, slen);
-  un.sun_path[slen] = '\0';
+  strncpy(un.sun_path, unixpath, sizeof (un.sun_path) - 1);
 #if HAVE_SOCKADDR_IN_SIN_LEN
   un.sun_len = (u_char) sizeof (un);
 #endif
-#if LINUX
-  un.sun_path[0] = '\0';
-#endif
-
 
   sap[0] = (struct sockaddr *) &un;
   slens[0] = sizeof (un);
@@ -178,35 +167,15 @@ task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 }
 
 
-/**
- * Main method, starts scheduler with task1,
- * checks that "ok" is correct at the end.
- */
-static int
-check ()
-{
-
-  ok = 1;
-  GNUNET_SCHEDULER_run (&task, NULL);
-  return ok;
-}
-
-
 int
 main (int argc, char *argv[])
 {
-  int ret = 0;
-
   GNUNET_log_setup ("test_server_with_client_unix",
-#if VERBOSE
-                    "DEBUG",
-#else
                     "WARNING",
-#endif
                     NULL);
-  ret += check ();
-
-  return ret;
+  ok = 1;
+  GNUNET_SCHEDULER_run (&task, NULL);
+  return ok;
 }
 
 /* end of test_server_with_client_unix.c */