projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
indentation
[oweals/gnunet.git]
/
src
/
util
/
test_client.c
diff --git
a/src/util/test_client.c
b/src/util/test_client.c
index ead6751a406ba3751ed407f2bc242450e3a32880..9c2abb016129087df138111d88ef91861e74ef85 100644
(file)
--- a/
src/util/test_client.c
+++ b/
src/util/test_client.c
@@
-79,8
+79,7
@@
echo_cb (void *cls,
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Receiving message from client, bouncing back\n");
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Receiving message from client, bouncing back\n");
- GNUNET_assert (sizeof (struct GNUNET_MessageHeader) ==
- ntohs (message->size));
+ GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (message->size));
cc = GNUNET_malloc (sizeof (struct CopyContext));
cc->client = client;
cpy = GNUNET_malloc (ntohs (message->size));
cc = GNUNET_malloc (sizeof (struct CopyContext));
cc->client = client;
cpy = GNUNET_malloc (ntohs (message->size));
@@
-107,12
+106,10
@@
recv_bounce (void *cls, const struct GNUNET_MessageHeader *got)
struct GNUNET_MessageHeader msg;
GNUNET_assert (got != NULL); /* timeout */
struct GNUNET_MessageHeader msg;
GNUNET_assert (got != NULL); /* timeout */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Receiving bounce, checking content\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving bounce, checking content\n");
msg.type = htons (MY_TYPE);
msg.size = htons (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_assert (0 == memcmp (got, &msg, sizeof (struct GNUNET_MessageHeader)));
GNUNET_CLIENT_disconnect (client, GNUNET_YES);
client = NULL;
GNUNET_SERVER_destroy (server);
GNUNET_CLIENT_disconnect (client, GNUNET_YES);
client = NULL;
GNUNET_SERVER_destroy (server);
@@
-125,6
+122,7
@@
static size_t
make_msg (void *cls, size_t size, void *buf)
{
struct GNUNET_MessageHeader *msg = buf;
make_msg (void *cls, size_t size, void *buf)
{
struct GNUNET_MessageHeader *msg = buf;
+
GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
msg->type = htons (MY_TYPE);
msg->size = htons (sizeof (struct GNUNET_MessageHeader));
GNUNET_assert (size >= sizeof (struct GNUNET_MessageHeader));
msg->type = htons (MY_TYPE);
msg->size = htons (sizeof (struct GNUNET_MessageHeader));
@@
-137,10
+135,10
@@
static void
task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct sockaddr_in sa;
task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct sockaddr_in sa;
- struct sockaddr *
sap[2];
+ struct sockaddr *sap[2];
socklen_t slens[2];
socklen_t slens[2];
- sap[0] = (struct sockaddr*) &sa;
+ sap[0] = (struct sockaddr
*) &sa;
slens[0] = sizeof (sa);
sap[1] = NULL;
slens[1] = 0;
slens[0] = sizeof (sa);
sap[1] = NULL;
slens[1] = 0;
@@
-150,11
+148,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 (tc->sched,
- NULL,
+ server = GNUNET_SERVER_create (NULL,
NULL,
sap,
NULL,
sap,
- slens,
+
slens,
GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 10000),
GNUNET_NO);
GNUNET_TIME_relative_multiply
(GNUNET_TIME_UNIT_MILLISECONDS, 10000),
GNUNET_NO);
@@
-162,7
+159,7
@@
task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
handlers[0].callback_cls = cls;
handlers[1].callback_cls = cls;
GNUNET_SERVER_add_handlers (server, handlers);
handlers[0].callback_cls = cls;
handlers[1].callback_cls = cls;
GNUNET_SERVER_add_handlers (server, handlers);
- client = GNUNET_CLIENT_connect (
tc->sched,
MYNAME, cfg);
+ client = GNUNET_CLIENT_connect (MYNAME, cfg);
GNUNET_assert (client != NULL);
GNUNET_assert (NULL !=
GNUNET_CLIENT_notify_transmit_ready (client,
GNUNET_assert (client != NULL);
GNUNET_assert (NULL !=
GNUNET_CLIENT_notify_transmit_ready (client,
@@
-188,8
+185,7
@@
check ()
cfg = GNUNET_CONFIGURATION_create ();
GNUNET_CONFIGURATION_set_value_number (cfg, MYNAME, "PORT", PORT);
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, MYNAME, "HOSTNAME", "localhost");
GNUNET_CONFIGURATION_set_value_string (cfg,
"resolver", "HOSTNAME", "localhost");
ok = 1;
GNUNET_CONFIGURATION_set_value_string (cfg,
"resolver", "HOSTNAME", "localhost");
ok = 1;