die_task = GNUNET_SCHEDULER_NO_TASK;
if (core != NULL)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Disconnecting core.\n");
- GNUNET_CORE_disconnect (core);
- core = NULL;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Disconnecting core.\n");
+ GNUNET_CORE_disconnect (core);
+ core = NULL;
+ }
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Stopping peer\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Stopping peer\n");
if (0 != GNUNET_OS_process_kill (arm_proc, SIGTERM))
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "kill");
- if (GNUNET_OS_process_wait(arm_proc) != GNUNET_OK)
+ if (GNUNET_OS_process_wait (arm_proc) != GNUNET_OK)
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "ARM process %u stopped\n", GNUNET_OS_process_get_pid (arm_proc));
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "ARM process %u stopped\n",
+ GNUNET_OS_process_get_pid (arm_proc));
GNUNET_OS_process_close (arm_proc);
arm_proc = NULL;
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n");
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Ending test.\n");
}
static int
-receive(void* cls, const struct GNUNET_PeerIdentity* other, const struct GNUNET_MessageHeader* message, const struct GNUNET_TRANSPORT_ATS_Information* atsi)
+receive (void *cls, const struct GNUNET_PeerIdentity *other,
+ const struct GNUNET_MessageHeader *message,
+ const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count)
{
if (die_task != GNUNET_SCHEDULER_NO_TASK)
- GNUNET_SCHEDULER_cancel(die_task);
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Received message from peer %s\n", GNUNET_i2s(other));
- GNUNET_SCHEDULER_add_now(&cleanup, NULL);
+ GNUNET_SCHEDULER_cancel (die_task);
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received message from peer %s\n",
+ GNUNET_i2s (other));
+ GNUNET_SCHEDULER_add_now (&cleanup, NULL);
ret = 0;
return GNUNET_OK;
}
static size_t
-send_message (void* cls, size_t size, void* buf)
+send_message (void *cls, size_t size, void *buf)
{
if (size == 0 || buf == NULL)
- {
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Could not send; got 0 buffer\n");
- return 0;
- }
- GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, "Sending!\n");
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could not send; got 0 buffer\n");
+ return 0;
+ }
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Sending!\n");
struct GNUNET_MessageHeader *hdr = buf;
- hdr->size = htons(sizeof(struct GNUNET_MessageHeader));
- hdr->type = htons(GNUNET_MESSAGE_TYPE_SERVICE_UDP);
- return ntohs(hdr->size);
+
+ hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
+ hdr->type = htons (GNUNET_MESSAGE_TYPE_VPN_UDP_TO_SERVICE);
+ return ntohs (hdr->size);
}
static void
init (void *cls, struct GNUNET_CORE_Handle *core,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *pk)
+ const struct GNUNET_PeerIdentity *my_identity)
{
if (core == NULL)
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could NOT connect to CORE;\n");
- return;
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Could NOT connect to CORE;\n");
+ return;
+ }
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Correctly connected to CORE; we are the peer %s.\n",
- GNUNET_i2s (my_identity));
+ "Correctly connected to CORE; we are the peer %s.\n",
+ GNUNET_i2s (my_identity));
memcpy (&myself, my_identity, sizeof (struct GNUNET_PeerIdentity));
}
static void
connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi, unsigned int atsi_count)
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %s.\n",
- GNUNET_i2s (peer));
+ GNUNET_i2s (peer));
if (0 == memcmp (peer, &myself, sizeof (struct GNUNET_PeerIdentity)))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Connected to myself; sending message!\n");
- GNUNET_CORE_notify_transmit_ready (core,
- 0, GNUNET_TIME_UNIT_FOREVER_REL,
- peer,
- sizeof (struct GNUNET_MessageHeader),
- send_message, NULL);
- }
+ {
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "Connected to myself; sending message!\n");
+ GNUNET_CORE_notify_transmit_ready (core, GNUNET_YES, 0,
+ GNUNET_TIME_UNIT_FOREVER_REL, peer,
+ sizeof (struct GNUNET_MessageHeader),
+ send_message, NULL);
+ }
}
* @param cfg configuration
*/
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile,
+run (void *cls, char *const *args, const char *cfgfile,
const struct GNUNET_CONFIGURATION_Handle *cfg)
{
const static struct GNUNET_CORE_MessageHandler handlers[] = {
- {&receive, GNUNET_MESSAGE_TYPE_SERVICE_UDP, 0},
+ {&receive, GNUNET_MESSAGE_TYPE_VPN_UDP_TO_SERVICE, 0},
{NULL, 0, 0}
};
core_cfg = GNUNET_CONFIGURATION_create ();
- arm_proc = GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
- "gnunet-service-arm",
+ arm_proc =
+ GNUNET_OS_start_process (NULL, NULL, "gnunet-service-arm",
+ "gnunet-service-arm",
#if VERBOSE
- "-L", "DEBUG",
+ "-L", "DEBUG",
#endif
- "-c", "test_core_api_peer1.conf", NULL);
+ "-c", "test_core_api_peer1.conf", NULL);
- GNUNET_assert(GNUNET_OK == GNUNET_CONFIGURATION_load (core_cfg, "test_core_api_peer1.conf"));
+ GNUNET_assert (GNUNET_OK ==
+ GNUNET_CONFIGURATION_load (core_cfg,
+ "test_core_api_peer1.conf"));
- core = GNUNET_CORE_connect (core_cfg,
- 42,
- NULL,
- &init,
- &connect_cb,
- NULL, NULL, NULL, 0, NULL, 0, handlers);
+ core =
+ GNUNET_CORE_connect (core_cfg, 42, NULL, &init, &connect_cb, NULL, NULL,
+ 0, NULL, 0, handlers);
- die_task = GNUNET_SCHEDULER_add_delayed(GNUNET_TIME_relative_multiply(GNUNET_TIME_UNIT_SECONDS, 60), &cleanup, cls);
+ die_task =
+ GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
+ (GNUNET_TIME_UNIT_SECONDS, 60), &cleanup,
+ cls);
}
ret = 1;
return (GNUNET_OK ==
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv,
- "test_core_api_send_to_self",
- gettext_noop ("help text"),
- options, &run, NULL)) ? ret : 1;
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
+ "test_core_api_send_to_self",
+ gettext_noop ("help text"), options, &run,
+ NULL)) ? ret : 1;
}
/**
projects / oweals / gnunet.git / blobdiff