char *addrstring;
};
+
static void
end ()
{
struct AddressWrapper *w;
int c = 0;
+ ok = 0;
if (GNUNET_SCHEDULER_NO_TASK != timeout_task)
{
GNUNET_break (0);
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Plugin did not remove %u addresses \n"), c);
+ ok = 1;
}
GNUNET_HELPER_stop (suid_helper);
suid_helper = NULL;
}
-
- ok = 0;
}
+
static void
end_badly (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
ok = 1;
}
+
static void
wait_end (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
}
+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
+ */
+static void
+address_pretty_printer_cb (void *cls, const char *buf)
+{
+ if (NULL != buf)
+ {
+ got_reply = GNUNET_YES;
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Pretty address : `%s'\n", buf);
+ }
+ else
+ {
+ if (GNUNET_NO == got_reply)
+ {
+ GNUNET_break (0);
+ end_badly_now ();
+ }
+ }
+}
+
+
static void
env_notify_address (void *cls,
int add_remove,
w->addrlen = addrlen;
memcpy (w->addr, addr, addrlen);
GNUNET_CONTAINER_DLL_insert(head, tail, w);
+ got_reply = GNUNET_NO;
+ api->address_pretty_printer (api->cls, plugin, addr, addrlen,
+ GNUNET_YES, GNUNET_TIME_UNIT_MINUTES,
+ &address_pretty_printer_cb,
+ w);
a2s = strdup (api->address_to_string (api, w->addr, w->addrlen));
if (NULL == a2s)
}
}
-struct GNUNET_ATS_Information
+
+static struct GNUNET_ATS_Information
env_get_address_type (void *cls,
const struct sockaddr *addr,
size_t addrlen)
return ats;
}
-const struct GNUNET_MessageHeader *
-env_get_our_hello (void)
+
+static const struct GNUNET_MessageHeader *
+env_get_our_hello ()
{
return (const struct GNUNET_MessageHeader *) hello;
}
-void env_session_end (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- struct Session * session)
-{
+static void
+env_session_end (void *cls,
+ const struct GNUNET_PeerIdentity *peer,
+ struct Session * session)
+{
}
+
static void
setup_plugin_environment ()
{
return GNUNET_OK;
}
+
/**
* Runs the test.
*
cfg = c;
/* parse configuration */
- if ((GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (c,
- "TRANSPORT",
- "NEIGHBOUR_LIMIT",
- &tneigh)) ||
- (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c,
- "GNUNETD", "HOSTKEY",
- &keyfile)))
+ if ( (GNUNET_OK != GNUNET_CONFIGURATION_get_value_number (c,
+ "TRANSPORT",
+ "NEIGHBOUR_LIMIT",
+ &tneigh)) ||
+ (GNUNET_OK != GNUNET_CONFIGURATION_get_value_filename (c,
+ "GNUNETD", "HOSTKEY",
+ &keyfile)))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Transport service is lacking key configuration settings. Exiting.\n"));
-
return;
}
- stats = GNUNET_STATISTICS_create ("transport", cfg);
- if (NULL == stats)
+ if (NULL == (stats = GNUNET_STATISTICS_create ("transport", cfg)))
{
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
- _("Could not create statistics. Exiting.\n"));
- end_badly_now ();
- return;
+ GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
+ _("Could not create statistics. Exiting.\n"));
+ end_badly_now ();
+ return;
}
max_connect_per_transport = (uint32_t) tneigh;
my_private_key = GNUNET_CRYPTO_rsa_key_create_from_file (keyfile);
GNUNET_free (keyfile);
- if (my_private_key == NULL)
+ if (NULL == my_private_key)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
_("Transport service could not access hostkey. Exiting.\n"));
/**
- * The main function for the transport service.
+ * The main function for the test
*
* @param argc number of arguments from the command line
* @param argv command line arguments
"test_plugin_transport",
"-c",
"test_plugin_transport_data.conf",
- "-L", "WARNING",
NULL
};
GNUNET_log_setup ("test-plugin-transport",
"WARNING",
NULL);
ok = 1; /* set to fail */
- ret = (GNUNET_OK == GNUNET_PROGRAM_run (5,
- argv_prog,
- "test-plugin-transport",
- "testcase",
- options,
- &run,
- (void *) argv)) ? ok : 1;
+ ret = (GNUNET_OK == GNUNET_PROGRAM_run (3,
+ argv_prog,
+ "test-plugin-transport",
+ "testcase",
+ options,
+ &run,
+ (void *) argv)) ? ok : 1;
GNUNET_DISK_directory_remove ("/tmp/test-gnunetd-plugin-transport");
return ret;
}