/*
This file is part of GNUnet.
- Copyright (C) 2009 Christian Grothoff Jeff Burdges, and other contributing authors
+ Copyright (C) 2015, 2016 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
#define MYNAME "test_sockst"
-static struct GNUNET_CLIENT_Connection *client;
+static struct GNUNET_MQ_Handle *mq;
static struct GNUNET_SERVER_Handle *server;
GNUNET_assert (sizeof (struct GNUNET_MessageHeader) == ntohs (cpy->size));
GNUNET_assert (size >= ntohs (cpy->size));
- memcpy (buf, cpy, ntohs (cpy->size));
+ GNUNET_memcpy (buf, cpy, ntohs (cpy->size));
GNUNET_SERVER_receive_done (ctx->client, GNUNET_OK);
GNUNET_free (cpy);
GNUNET_free (ctx);
cc = GNUNET_new (struct CopyContext);
cc->client = client;
cpy = GNUNET_malloc (ntohs (message->size));
- memcpy (cpy, message, ntohs (message->size));
+ GNUNET_memcpy (cpy, message, ntohs (message->size));
cc->cpy = cpy;
GNUNET_assert (NULL !=
GNUNET_SERVER_notify_transmit_ready (client,
static void
-recv_bounce (void *cls, const struct GNUNET_MessageHeader *got)
+handle_bounce (void *cls,
+ const struct GNUNET_MessageHeader *got)
{
int *ok = cls;
- struct GNUNET_MessageHeader msg;
-
- GNUNET_assert (got != NULL); /* timeout */
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Receiving bounce, checking content\n");
- 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);
- client = NULL;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Receiving bounce, checking content\n");
+ GNUNET_assert (NULL != got);
+ GNUNET_MQ_destroy (mq);
+ mq = NULL;
GNUNET_SERVER_destroy (server);
server = NULL;
*ok = 0;
}
-static size_t
-make_msg (void *cls, size_t size, void *buf)
+/**
+ * Generic error handler, called with the appropriate error code and
+ * the same closure specified at the creation of the message queue.
+ * Not every message queue implementation supports an error handler.
+ *
+ * @param cls closure with the `struct GNUNET_STATISTICS_Handle *`
+ * @param error error code
+ */
+static void
+mq_error_handler (void *cls,
+ enum GNUNET_MQ_Error error)
{
- 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_log (GNUNET_ERROR_TYPE_DEBUG, "Creating message for transmission\n");
- return sizeof (struct GNUNET_MessageHeader);
+ GNUNET_assert (0); /* should never happen */
}
static void
-task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
+task (void *cls)
{
struct sockaddr_in sa;
struct sockaddr *sap[2];
socklen_t slens[2];
-
- /* test that ill-configured client fails instantly */
- GNUNET_assert (NULL == GNUNET_CLIENT_connect ("invalid-service", cfg));
+ struct GNUNET_MQ_Envelope *env;
+ struct GNUNET_MessageHeader *msg;
+ struct GNUNET_MQ_MessageHandler chandlers[] = {
+ GNUNET_MQ_hd_fixed_size (bounce,
+ MY_TYPE,
+ struct GNUNET_MessageHeader,
+ cls),
+ GNUNET_MQ_handler_end ()
+ };
/* test IPC between client and server */
sap[0] = (struct sockaddr *) &sa;
handlers[0].callback_cls = cls;
handlers[1].callback_cls = cls;
GNUNET_SERVER_add_handlers (server, handlers);
- client = GNUNET_CLIENT_connect (MYNAME, cfg);
- GNUNET_assert (client != NULL);
- GNUNET_assert (NULL !=
- GNUNET_CLIENT_notify_transmit_ready (client,
- sizeof (struct
- GNUNET_MessageHeader),
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_SECONDS,5),
- GNUNET_NO, &make_msg,
- NULL));
- GNUNET_CLIENT_receive (client, &recv_bounce, cls,
- GNUNET_TIME_relative_multiply
- (GNUNET_TIME_UNIT_MILLISECONDS, 10000));
+ mq = GNUNET_CLIENT_connect (cfg,
+ MYNAME,
+ chandlers,
+ &mq_error_handler,
+ NULL);
+ GNUNET_assert (NULL != mq);
+ env = GNUNET_MQ_msg (msg,
+ MY_TYPE);
+ GNUNET_MQ_send (mq,
+ env);
}
main (int argc, char *argv[])
{
int ok;
- char * socksport = "1081";
+ int status;
+ const char *socksport = "1081";
GNUNET_log_setup ("test_client",
"WARNING",
NULL);
pid_t pid = fork();
- if (pid < 0)
- abort();
- if (pid == 0) {
- execlp ("ssh","ssh","-D",socksport,"127.0.0.1","-N",(char*)NULL);
- perror ("execlp(\"ssh\",\"ssh\",\"-D\",\"1081\",\"127.0.0.1\",\"-N\") ");
+ GNUNET_assert (pid >= 0);
+ if (pid == 0)
+ {
+ execlp ("ssh",
+ "ssh","-D",socksport,
+ "-o","BatchMode yes",
+ "-o","UserKnownHostsFile /tmp/gnunet_test_socks_ssh_garbage",
+ "-o","StrictHostKeyChecking no",
+ "127.0.0.1","-N",(char*)NULL);
+ perror ("execlp (\"ssh\",\"ssh\",...,\"-D\",\"1081\",\"127.0.0.1\",\"-N\") ");
printf (""
"Please ensure you have ssh installed and have sshd installed and running :\n"
"\tsudo apt-get install openssh-client openssh-server\n"
"\t CheckHostIP no\n"
"\t Protocol 2\n"
"\t ProxyCommand nc 127.0.0.1 22\n");
- kill (getppid(), SIGTERM);
+ kill (getppid(), SIGALRM);
return 1;
}
- sleep(1);
+ if (0 != sleep (1))
+ {
+ /* sleep interrupted, likely SIGALRM, failure to
+ launch child, terminate */
+ printf (""
+"Please ensure you have ssh installed and have sshd installed and running :\n"
+"\tsudo apt-get install openssh-client openssh-server\n"
+"If you run Tor as a network proxy then Tor might prevent ssh from connecting\n"
+"to localhost. Please either run make check from an unproxied user, or else\n"
+"add these lines to the beginning of your ~/.ssh/config file :"
+"\tHost 127.0.0.1 localhost\n"
+"\t CheckHostIP no\n"
+"\t Protocol 2\n"
+"\t ProxyCommand nc 127.0.0.1 22\n");
+ return 77;
+ }
+ /* check if child exec()ed but died */
+ if (0 != waitpid (pid, &status, WNOHANG))
+ {
+ printf (""
+"If you run Tor as a network proxy then Tor might prevent ssh from connecting\n"
+"to localhost. Please either run make check from an unproxied user, or else\n"
+"add these lines to the beginning of your ~/.ssh/config file :"
+"\tHost 127.0.0.1 localhost\n"
+"\t CheckHostIP no\n"
+"\t Protocol 2\n"
+"\t ProxyCommand nc 127.0.0.1 22\n");
+ return 77;
+ }
cfg = GNUNET_CONFIGURATION_create ();
GNUNET_CONFIGURATION_set_value_string (cfg, MYNAME, "SOCKSHOST", "127.0.0.1");
GNUNET_SCHEDULER_run (&task, &ok);
GNUNET_CONFIGURATION_destroy (cfg);
- kill (pid,SIGTERM);
+ GNUNET_break (0 == kill (pid, SIGTERM));
+ GNUNET_break (pid == waitpid (pid, &status, 0));
return ok;
}
-/* end of test_client.c */
+/* end of test_socks.c */
projects / oweals / gnunet.git / blobdiff