projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-fix #3870
[oweals/gnunet.git]
/
src
/
util
/
test_client.c
diff --git
a/src/util/test_client.c
b/src/util/test_client.c
index 9c2abb016129087df138111d88ef91861e74ef85..ae3bfdb953c119ae69f404dd8b00e43d7540901a 100644
(file)
--- a/
src/util/test_client.c
+++ b/
src/util/test_client.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- (C) 2009 Christian Grothoff (and other contributing authors)
+
Copyright
(C) 2009 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
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-22,14
+22,8
@@
* @brief tests for client.c
*/
#include "platform.h"
* @brief tests for client.c
*/
#include "platform.h"
-#include "gnunet_common.h"
-#include "gnunet_client_lib.h"
-#include "gnunet_configuration_lib.h"
-#include "gnunet_scheduler_lib.h"
-#include "gnunet_server_lib.h"
-#include "gnunet_time_lib.h"
+#include "gnunet_util_lib.h"
-#define VERBOSE GNUNET_NO
#define PORT 14325
#define PORT 14325
@@
-70,8
+64,7
@@
copy_msg (void *cls, size_t size, void *buf)
* Callback that just bounces the message back to the sender.
*/
static void
* Callback that just bounces the message back to the sender.
*/
static void
-echo_cb (void *cls,
- struct GNUNET_SERVER_Client *client,
+echo_cb (void *cls, struct GNUNET_SERVER_Client *client,
const struct GNUNET_MessageHeader *message)
{
struct CopyContext *cc;
const struct GNUNET_MessageHeader *message)
{
struct CopyContext *cc;
@@
-80,7
+73,7
@@
echo_cb (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Receiving message from client, bouncing back\n");
GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size));
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Receiving message from client, bouncing back\n");
GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size));
- cc = GNUNET_
malloc (sizeof (struct CopyContext)
);
+ cc = GNUNET_
new (struct CopyContext
);
cc->client = client;
cpy = GNUNET_malloc (ntohs (message->size));
memcpy (cpy, message, ntohs (message->size));
cc->client = client;
cpy = GNUNET_malloc (ntohs (message->size));
memcpy (cpy, message, ntohs (message->size));
@@
-110,7
+103,7
@@
recv_bounce (void *cls, const struct GNUNET_MessageHeader *got)
msg.type = htons (MY_TYPE);
msg.size = htons (sizeof (struct GNUNET_MessageHeader));
GNUNET_assert (0 == memcmp (got, &msg, sizeof (struct GNUNET_MessageHeader)));
msg.type = htons (MY_TYPE);
msg.size = htons (sizeof (struct GNUNET_MessageHeader));
GNUNET_assert (0 == memcmp (got, &msg, sizeof (struct GNUNET_MessageHeader)));
- GNUNET_CLIENT_disconnect (client
, GNUNET_YES
);
+ GNUNET_CLIENT_disconnect (client);
client = NULL;
GNUNET_SERVER_destroy (server);
server = NULL;
client = NULL;
GNUNET_SERVER_destroy (server);
server = NULL;
@@
-138,6
+131,10
@@
task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
struct sockaddr *sap[2];
socklen_t slens[2];
struct sockaddr *sap[2];
socklen_t slens[2];
+ /* test that ill-configured client fails instantly */
+ GNUNET_assert (NULL == GNUNET_CLIENT_connect ("invalid-service", cfg));
+
+ /* test IPC between client and server */
sap[0] = (struct sockaddr *) &sa;
slens[0] = sizeof (sa);
sap[1] = NULL;
sap[0] = (struct sockaddr *) &sa;
slens[0] = sizeof (sa);
sap[1] = NULL;
@@
-148,13
+145,10
@@
task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
#endif
sa.sin_family = AF_INET;
sa.sin_port = htons (PORT);
#endif
sa.sin_family = AF_INET;
sa.sin_port = htons (PORT);
- server = GNUNET_SERVER_create (NULL,
- NULL,
- sap,
- slens,
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_MILLISECONDS, 10000),
- GNUNET_NO);
+ server =
+ GNUNET_SERVER_create (NULL, NULL, sap, slens,
+ GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_MILLISECONDS, 10000), GNUNET_NO);
GNUNET_assert (server != NULL);
handlers[0].callback_cls = cls;
handlers[1].callback_cls = cls;
GNUNET_assert (server != NULL);
handlers[0].callback_cls = cls;
handlers[1].callback_cls = cls;
@@
-166,49
+160,31
@@
task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
sizeof (struct
GNUNET_MessageHeader),
GNUNET_TIME_UNIT_SECONDS,
sizeof (struct
GNUNET_MessageHeader),
GNUNET_TIME_UNIT_SECONDS,
- GNUNET_NO,
-
&make_msg,
NULL));
+ GNUNET_NO,
&make_msg,
+ NULL));
GNUNET_CLIENT_receive (client, &recv_bounce, cls,
GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 10000));
}
GNUNET_CLIENT_receive (client, &recv_bounce, cls,
GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 10000));
}
-/**
- * Main method, starts scheduler with task1,
- * checks that "ok" is correct at the end.
- */
-static int
-check ()
+int
+main (int argc, char *argv[])
{
int ok;
{
int ok;
+ GNUNET_log_setup ("test_client",
+ "WARNING",
+ NULL);
cfg = GNUNET_CONFIGURATION_create ();
GNUNET_CONFIGURATION_set_value_number (cfg, MYNAME, "PORT", PORT);
GNUNET_CONFIGURATION_set_value_string (cfg, MYNAME, "HOSTNAME", "localhost");
cfg = GNUNET_CONFIGURATION_create ();
GNUNET_CONFIGURATION_set_value_number (cfg, MYNAME, "PORT", PORT);
GNUNET_CONFIGURATION_set_value_string (cfg, MYNAME, "HOSTNAME", "localhost");
- GNUNET_CONFIGURATION_set_value_string (cfg,
- "
resolver", "HOSTNAME", "
localhost");
+ GNUNET_CONFIGURATION_set_value_string (cfg,
"resolver", "HOSTNAME",
+ "localhost");
ok = 1;
GNUNET_SCHEDULER_run (&task, &ok);
GNUNET_CONFIGURATION_destroy (cfg);
return ok;
}
ok = 1;
GNUNET_SCHEDULER_run (&task, &ok);
GNUNET_CONFIGURATION_destroy (cfg);
return ok;
}
-int
-main (int argc, char *argv[])
-{
- int ret = 0;
-
- GNUNET_log_setup ("test_client",
-#if VERBOSE
- "DEBUG",
-#else
- "WARNING",
-#endif
- NULL);
- ret += check ();
-
- return ret;
-}
-
/* end of test_client.c */
/* end of test_client.c */