projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- fixing compile error
[oweals/gnunet.git]
/
src
/
core
/
test_core_api_send_to_self.c
diff --git
a/src/core/test_core_api_send_to_self.c
b/src/core/test_core_api_send_to_self.c
index 09d6edacca8496cb4074ba5603ec5c6e4d9e974b..4346acbd78fbf057c5ce98793b9f9d670a158366 100644
(file)
--- a/
src/core/test_core_api_send_to_self.c
+++ b/
src/core/test_core_api_send_to_self.c
@@
-79,8
+79,8
@@
cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tskctx)
if (GNUNET_OS_process_wait (arm_proc) != GNUNET_OK)
GNUNET_log_strerror (GNUNET_ERROR_TYPE_WARNING, "waitpid");
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_OS_process_close (arm_proc);
arm_proc = NULL;
@@
-90,7
+90,7
@@
cleanup (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tskctx)
static int
receive (void *cls, const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
static int
receive (void *cls, const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
- const struct GNUNET_
TRANSPORT_ATS_Information *atsi
)
+ const struct GNUNET_
ATS_Information *atsi, unsigned int atsi_count
)
{
if (die_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (die_task);
{
if (die_task != GNUNET_SCHEDULER_NO_TASK)
GNUNET_SCHEDULER_cancel (die_task);
@@
-113,14
+113,13
@@
send_message (void *cls, size_t size, void *buf)
struct GNUNET_MessageHeader *hdr = buf;
hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
struct GNUNET_MessageHeader *hdr = buf;
hdr->size = htons (sizeof (struct GNUNET_MessageHeader));
- hdr->type = htons (GNUNET_MESSAGE_TYPE_VPN_
SERVICE_UDP
);
+ hdr->type = htons (GNUNET_MESSAGE_TYPE_VPN_
UDP_TO_SERVICE
);
return ntohs (hdr->size);
}
static void
init (void *cls, struct GNUNET_CORE_Handle *core,
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)
{
{
if (core == NULL)
{
@@
-135,7
+134,7
@@
init (void *cls, struct GNUNET_CORE_Handle *core,
static void
connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
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_log (GNUNET_ERROR_TYPE_DEBUG, "Connected to peer %s.\n",
GNUNET_i2s (peer));
@@
-143,10
+142,8
@@
connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
{
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Connected to myself; sending message!\n");
{
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,
+ GNUNET_CORE_notify_transmit_ready (core, GNUNET_YES, 0,
+ GNUNET_TIME_UNIT_FOREVER_REL, peer,
sizeof (struct GNUNET_MessageHeader),
send_message, NULL);
}
sizeof (struct GNUNET_MessageHeader),
send_message, NULL);
}
@@
-162,34
+159,31
@@
connect_cb (void *cls, const struct GNUNET_PeerIdentity *peer,
* @param cfg configuration
*/
static void
* @param cfg configuration
*/
static void
-run (void *cls,
- char *const *args,
- const char *cfgfile, const struct GNUNET_CONFIGURATION_Handle *cfg)
+run (void *cls, char *const *args, const char *cfgfile,
+ const struct GNUNET_CONFIGURATION_Handle *cfg)
{
const static struct GNUNET_CORE_MessageHandler handlers[] = {
{
const static struct GNUNET_CORE_MessageHandler handlers[] = {
- {&receive, GNUNET_MESSAGE_TYPE_VPN_
SERVICE_UDP
, 0},
+ {&receive, GNUNET_MESSAGE_TYPE_VPN_
UDP_TO_SERVICE
, 0},
{NULL, 0, 0}
};
core_cfg = GNUNET_CONFIGURATION_create ();
{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
#if VERBOSE
-
"-L", "DEBUG",
+ "-L", "DEBUG",
#endif
#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
die_task =
GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_relative_multiply
@@
-217,11
+211,10
@@
check ()
ret = 1;
return (GNUNET_OK ==
ret = 1;
return (GNUNET_OK ==
- GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1,
- argv,
+ GNUNET_PROGRAM_run ((sizeof (argv) / sizeof (char *)) - 1, argv,
"test_core_api_send_to_self",
"test_core_api_send_to_self",
- gettext_noop ("help text"),
-
options, &run,
NULL)) ? ret : 1;
+ gettext_noop ("help text"),
options, &run,
+ NULL)) ? ret : 1;
}
/**
}
/**