/*
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
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 transport/test_plugin_transport.c
/**
* Timeout task
*/
-static GNUNET_SCHEDULER_TaskIdentifier timeout_endbadly;
+static struct GNUNET_SCHEDULER_Task * timeout_endbadly;
/**
* Timeout task
*/
-static GNUNET_SCHEDULER_TaskIdentifier timeout_wait;
+static struct GNUNET_SCHEDULER_Task * timeout_wait;
/**
* Library name
struct GNUNET_HELLO_Address *address;
char *addrstring;
+
+ struct GNUNET_SCHEDULER_Task *test_task;
+
};
+
static void
end ()
{
int c = 0;
ok = 0;
- if (GNUNET_SCHEDULER_NO_TASK != timeout_endbadly)
+ if (NULL != timeout_endbadly)
{
GNUNET_SCHEDULER_cancel (timeout_endbadly);
- timeout_endbadly = GNUNET_SCHEDULER_NO_TASK;
+ timeout_endbadly = NULL;
}
if (NULL != api)
GNUNET_PLUGIN_unload (libname, api);
while (NULL != head)
{
w = head;
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Plugin did not remove address `%s'\n",
- w->addrstring);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Plugin did not remove address `%s'\n",
+ w->addrstring);
GNUNET_CONTAINER_DLL_remove(head, tail, w);
c++;
GNUNET_HELLO_address_free(w->address);
}
}
+
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
struct AddressWrapper *w;
int c = 0;
- timeout_endbadly = GNUNET_SCHEDULER_NO_TASK;
- if (GNUNET_SCHEDULER_NO_TASK != timeout_wait)
+ timeout_endbadly = NULL;
+ if (NULL != timeout_wait)
{
GNUNET_SCHEDULER_cancel (timeout_wait);
- timeout_wait = GNUNET_SCHEDULER_NO_TASK;
+ timeout_wait = NULL;
}
if (pretty_printers_running > 0)
GNUNET_CONTAINER_DLL_remove(head, tail, w);
c++;
GNUNET_HELLO_address_free(w->address);
+ if (NULL != w->test_task)
+ GNUNET_SCHEDULER_cancel (w->test_task);
GNUNET_free(w->addrstring);
GNUNET_free(w);
}
static void
wait_end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- timeout_wait = GNUNET_SCHEDULER_NO_TASK;
+ timeout_wait = NULL;
if (0 == addresses_reported)
GNUNET_log(GNUNET_ERROR_TYPE_WARNING,
"Plugin did not report any addresses, could not check address conversion functions\n");
end ();
}
+
static void
end_badly_now ()
{
- if (GNUNET_SCHEDULER_NO_TASK != timeout_wait)
+ if (NULL != timeout_wait)
{
GNUNET_SCHEDULER_cancel (timeout_wait);
- timeout_wait = GNUNET_SCHEDULER_NO_TASK;
+ timeout_wait = NULL;
}
- if (GNUNET_SCHEDULER_NO_TASK != timeout_endbadly)
+ if (NULL != timeout_endbadly)
{
GNUNET_SCHEDULER_cancel (timeout_endbadly);
- timeout_endbadly = GNUNET_SCHEDULER_NO_TASK;
+ timeout_endbadly = NULL;
}
timeout_endbadly = GNUNET_SCHEDULER_add_now (&end_badly, NULL );
}
+
static struct GNUNET_TIME_Relative
env_receive (void *cls,
- const struct GNUNET_HELLO_Address *address,
- struct Session *session,
- const struct GNUNET_MessageHeader *message)
+ const struct GNUNET_HELLO_Address *address,
+ struct Session *session,
+ const struct GNUNET_MessageHeader *message)
{
/* do nothing */
return GNUNET_TIME_relative_get_zero_ ();
static int got_reply;
+
/**
* Take the given address and append it to the set of results sent back to
* the client.
*
- * @param cls the transmission context used ('struct GNUNET_SERVER_TransmitContext*')
- * @param buf text to transmit
+ * @param cls closure
+ * @param address the address to print
+ * @param res result code
*/
static void
-address_pretty_printer_cb (void *cls, const char *buf)
+address_pretty_printer_cb (void *cls, const char *address, int res)
{
- if (NULL != buf)
+ if (NULL != address)
{
got_reply = GNUNET_YES;
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Pretty address : `%s'\n", buf);
+ GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Pretty address : `%s'\n", address);
pretty_printers_running--;
}
else
}
}
+
static void
-env_notify_address (void *cls, int add_remove,
- const struct GNUNET_HELLO_Address *address)
+test_addr_string (void *cls,
+ const struct GNUNET_SCHEDULER_TaskContext *tc)
{
- struct AddressWrapper *w;
- struct AddressWrapper *wtmp;
+ struct AddressWrapper *w = cls;
void *s2a;
size_t s2a_len;
+ w->test_task = NULL;
+
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Testing: address_to_string \n");
+ w->addrstring = GNUNET_strdup (api->address_to_string (api,
+ w->address->address,
+ w->address->address_length));
+ if (NULL == w->addrstring)
+ {
+ GNUNET_break(0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Plugin cannot convert address to string!\n");
+ end_badly_now ();
+ return;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Plugin added address `%s'\n",
+ w->addrstring);
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Testing address_to_string: OK\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Testing: string_to_address \n");
+ s2a = NULL;
+ s2a_len = 0;
+ if ((GNUNET_OK !=
+ api->string_to_address (api, w->addrstring,
+ strlen (w->addrstring) + 1,
+ &s2a, &s2a_len)) ||
+ (NULL == s2a))
+ {
+ GNUNET_break(0);
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Plugin cannot convert string to address!\n");
+ end_badly_now ();
+ return;
+ }
+
+ /*
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Plugin creates `%s' %u\n",api->address_to_string (api, s2a, s2a_len), s2a_len);
+
+ int c1;
+ for (c1 = 0; c1 < s2a_len; c1++ )
+ fprintf (stderr, "%u == %u\n", ((char *) s2a)[c1], ((char *) w->addr)[c1]);
+ */
+ if (s2a_len != w->address->address_length)
+ {
+ GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
+ "Plugin creates different address length when converting address->string->address: %u != %u\n",
+ w->address->address_length, s2a_len);
+ }
+ else if (0 != memcmp (s2a, w->address->address, s2a_len))
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Plugin creates different address length when converting back and forth %i!\n",
+ memcmp (s2a,
+ w->address->address,
+ s2a_len));
+ }
+ else
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Testing string_to_address: OK\n");
+ }
+ GNUNET_free(s2a);
+
+ pretty_printers_running++;
+ api->address_pretty_printer (api->cls,
+ w->address->transport_name,
+ w->address->address,
+ w->address->address_length,
+ GNUNET_YES,
+ GNUNET_TIME_UNIT_MINUTES,
+ &address_pretty_printer_cb, w);
+
+ if (GNUNET_OK !=
+ api->check_address (api->cls,
+ w->address->address,
+ w->address->address_length))
+ {
+ GNUNET_break (0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Plugin refuses added address!\n");
+ end_badly_now ();
+ return;
+ }
+ if (NULL != timeout_wait)
+ {
+ GNUNET_SCHEDULER_cancel (timeout_wait);
+ timeout_wait = NULL;
+ }
+ timeout_wait = GNUNET_SCHEDULER_add_delayed (WAIT, &wait_end, NULL);
+}
+
+
+static void
+env_notify_address (void *cls,
+ int add_remove,
+ const struct GNUNET_HELLO_Address *address)
+{
+ struct AddressWrapper *w;
+ struct AddressWrapper *wtmp;
+
if (GNUNET_YES == add_remove)
{
addresses_reported++;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Adding address of length %u\n",
- address->address_length);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Adding address of length %u\n",
+ address->address_length);
for (wtmp = head; NULL != wtmp; wtmp = wtmp->next)
{
(0 == memcmp (address->address, wtmp->address->address, address->address_length)))
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Duplicate address notification .... \n");
+ "Duplicate address notification .... \n");
return;
}
}
w = GNUNET_new (struct AddressWrapper);
w->address = GNUNET_HELLO_address_copy (address);
- GNUNET_CONTAINER_DLL_insert(head, tail, w);
+ GNUNET_CONTAINER_DLL_insert (head, tail, w);
got_reply = GNUNET_NO;
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Testing: address_to_string \n");
- w->addrstring = strdup (
- api->address_to_string (api, w->address->address,
- w->address->address_length));
- if (NULL == w->addrstring)
- {
- GNUNET_break(0);
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Plugin cannot convert address to string!\n");
- end_badly_now ();
- return;
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Plugin added address `%s'\n",
- w->addrstring);
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Testing address_to_string: OK\n");
- }
-
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Testing: string_to_address \n");
- s2a = NULL;
- s2a_len = 0;
- if ((GNUNET_OK
- != api->string_to_address (api, w->addrstring,
- strlen (w->addrstring) + 1, &s2a, &s2a_len)) || (NULL == s2a))
- {
- GNUNET_break(0);
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Plugin cannot convert string to address!\n");
- end_badly_now ();
- return;
- }
-
- /*
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
- "Plugin creates `%s' %u\n",api->address_to_string (api, s2a, s2a_len), s2a_len);
-
- int c1;
- for (c1 = 0; c1 < s2a_len; c1++ )
- fprintf (stderr, "%u == %u\n", ((char *) s2a)[c1], ((char *) w->addr)[c1]);
- */
- if (s2a_len != w->address->address_length)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Plugin creates different address length when converting address->string->address: %u != %u\n",
- w->address->address_length, s2a_len);
- }
- else if (0 != memcmp (s2a, w->address->address, s2a_len))
- {
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
- "Plugin creates different address length when converting back and forth %i!\n",
- memcmp (s2a, w->address->address, s2a_len));
- }
- else
- {
- GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Testing string_to_address: OK\n");
- }
- GNUNET_free(s2a);
-
- pretty_printers_running++;
- api->address_pretty_printer (api->cls, address->transport_name, address->address, address->address_length, GNUNET_YES,
- GNUNET_TIME_UNIT_MINUTES, &address_pretty_printer_cb, w);
-
- if (GNUNET_OK != api->check_address (api->cls, w->address->address, w->address->address_length))
- {
- GNUNET_break(0);
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Plugin refuses added address!\n");
- end_badly_now ();
- return;
- }
- if (GNUNET_SCHEDULER_NO_TASK != timeout_wait)
- {
- GNUNET_SCHEDULER_cancel (timeout_wait);
- timeout_wait = GNUNET_SCHEDULER_NO_TASK;
- }
-
- timeout_wait = GNUNET_SCHEDULER_add_delayed (WAIT, &wait_end, NULL );
-
+ w->test_task = GNUNET_SCHEDULER_add_now (&test_addr_string,
+ w);
+ return;
}
- else if (GNUNET_NO == add_remove)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Removing address of length %u\n",
- address->address_length);
+ if (GNUNET_NO == add_remove)
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Removing address of length %u\n",
+ address->address_length);
w = head;
while (NULL != w)
{
w = w->next;
}
- if (w == NULL )
+ if (w == NULL)
{
GNUNET_break(0);
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
GNUNET_HELLO_address_free (w->address);
GNUNET_free(w->addrstring);
GNUNET_free(w);
- }
- else
- {
- GNUNET_break(0);
- GNUNET_log(GNUNET_ERROR_TYPE_ERROR, "Invalid operation: %u\n", add_remove);
- end_badly_now ();
return;
}
+ GNUNET_break(0);
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ "Invalid operation: %u\n",
+ add_remove);
+ end_badly_now ();
}
-static struct GNUNET_ATS_Information
-env_get_address_type (void *cls, const struct sockaddr *addr, size_t addrlen)
+
+static enum GNUNET_ATS_Network_Type
+env_get_address_type (void *cls,
+ const struct sockaddr *addr,
+ size_t addrlen)
{
- struct GNUNET_ATS_Information ats;
- ats.type = htonl (GNUNET_ATS_NETWORK_TYPE);
- ats.value = htonl (GNUNET_ATS_NET_LOOPBACK);
- return ats;
+ return GNUNET_ATS_NET_LOOPBACK;
}
+
static const struct GNUNET_MessageHeader *
env_get_our_hello ()
{
return (const struct GNUNET_MessageHeader *) hello;
}
+
static void
-env_session_end (void *cls, const struct GNUNET_PeerIdentity *peer,
- struct Session * session)
+env_session_end (void *cls,
+ const struct GNUNET_HELLO_Address *address,
+ struct Session *session)
{
+
}
+
static void
-env_update_metrics (void *cls,
- const struct GNUNET_HELLO_Address *address,
- struct Session *session,
- const struct GNUNET_ATS_Information *ats,
- uint32_t ats_count)
+env_update_distance (void *cls,
+ const struct GNUNET_HELLO_Address *address,
+ uint32_t distance)
{
}
+
static void
setup_plugin_environment ()
{
env.receive = &env_receive;
env.notify_address = &env_notify_address;
env.get_address_type = &env_get_address_type;
- env.update_address_metrics = &env_update_metrics;
+ env.update_address_distance = &env_update_distance;
env.get_our_hello = &env_get_our_hello;
env.session_end = &env_session_end;
}
+
static int
handle_helper_message (void *cls, void *client,
- const struct GNUNET_MessageHeader *hdr)
+ const struct GNUNET_MessageHeader *hdr)
{
return GNUNET_OK;
}
+
/**
* Runs the test.
*
GNUNET_log(GNUNET_ERROR_TYPE_INFO, "Loading transport plugin %s\n", plugin);
GNUNET_asprintf (&libname, "libgnunet_plugin_transport_%s", plugin);
api = GNUNET_PLUGIN_load (libname, &env);
- if (api == NULL )
+ if (NULL == api)
{
GNUNET_log(GNUNET_ERROR_TYPE_ERROR,
"Failed to load transport plugin for %s\n", plugin);
projects / oweals / gnunet.git / blobdiff