projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-more libexec fixes for OpenSUSE
[oweals/gnunet.git]
/
src
/
util
/
test_server_with_client_unix.c
diff --git
a/src/util/test_server_with_client_unix.c
b/src/util/test_server_with_client_unix.c
index 4f80f188cc17f5fa59945c365abc9e9ced21da9e..57a67d3f4517a0f7bbd2df590b0f263e689a5d4e 100644
(file)
--- a/
src/util/test_server_with_client_unix.c
+++ b/
src/util/test_server_with_client_unix.c
@@
-30,8
+30,6
@@
#include "gnunet_server_lib.h"
#include "gnunet_time_lib.h"
#include "gnunet_server_lib.h"
#include "gnunet_time_lib.h"
-#define VERBOSE GNUNET_EXTRA_LOGGING
-
#define MY_TYPE 128
#define MY_TYPE 128
@@
-43,6
+41,7
@@
static struct GNUNET_CONFIGURATION_Handle *cfg;
static int ok;
static int ok;
+
static void
send_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
send_done (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
@@
-68,7
+67,7
@@
recv_cb (void *cls, struct GNUNET_SERVER_Client *argclient,
break;
case 4:
ok++;
break;
case 4:
ok++;
- GNUNET_CLIENT_disconnect (client
, GNUNET_YES
);
+ GNUNET_CLIENT_disconnect (client);
GNUNET_SERVER_receive_done (argclient, GNUNET_OK);
break;
default:
GNUNET_SERVER_receive_done (argclient, GNUNET_OK);
break;
default:
@@
-150,7
+149,6
@@
task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
un.sun_path[0] = '\0';
#endif
un.sun_path[0] = '\0';
#endif
-
sap[0] = (struct sockaddr *) &un;
slens[0] = sizeof (un);
sap[1] = NULL;
sap[0] = (struct sockaddr *) &un;
slens[0] = sizeof (un);
sap[1] = NULL;
@@
-178,35
+176,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
main (int argc, char *argv[])
{
- int ret = 0;
-
GNUNET_log_setup ("test_server_with_client_unix",
GNUNET_log_setup ("test_server_with_client_unix",
-#if VERBOSE
- "DEBUG",
-#else
"WARNING",
"WARNING",
-#endif
NULL);
NULL);
-
ret += check ()
;
-
- return
ret
;
+
ok = 1
;
+ GNUNET_SCHEDULER_run (&task, NULL);
+ return
ok
;
}
/* end of test_server_with_client_unix.c */
}
/* end of test_server_with_client_unix.c */