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_start_only.c
diff --git
a/src/core/test_core_api_start_only.c
b/src/core/test_core_api_start_only.c
index ff4b564bfe7bbebccca4842cb7888f53c985c5bb..75ba73ce357a7e8a42ca2a3a9b17add88d6b3bcc 100644
(file)
--- a/
src/core/test_core_api_start_only.c
+++ b/
src/core/test_core_api_start_only.c
@@
-58,7
+58,7
@@
static GNUNET_SCHEDULER_TaskIdentifier timeout_task_id;
static int ok;
#if VERBOSE
static int ok;
#if VERBOSE
-#define OKPP do { ok++;
fprintf
(stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
+#define OKPP do { ok++;
FPRINTF
(stderr, "Now at stage %u at %s:%u\n", ok, __FILE__, __LINE__); } while (0)
#else
#define OKPP do { ok++; } while (0)
#endif
#else
#define OKPP do { ok++; } while (0)
#endif
@@
-67,7
+67,8
@@
static int ok;
static void
connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
static void
connect_notify (void *cls, const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_TRANSPORT_ATS_Information *atsi)
+ const struct GNUNET_ATS_Information *atsi,
+ unsigned int atsi_count)
{
}
{
}
@@
-81,7
+82,8
@@
disconnect_notify (void *cls, const struct GNUNET_PeerIdentity *peer)
static int
inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
static int
inbound_notify (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)
{
return GNUNET_OK;
}
{
return GNUNET_OK;
}
@@
-90,7
+92,8
@@
inbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
static int
outbound_notify (void *cls, const struct GNUNET_PeerIdentity *other,
const struct GNUNET_MessageHeader *message,
static int
outbound_notify (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)
{
return GNUNET_OK;
}
{
return GNUNET_OK;
}
@@
-116,8
+119,7
@@
shutdown_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
static void
init_notify (void *cls, struct GNUNET_CORE_Handle *server,
static void
init_notify (void *cls, struct GNUNET_CORE_Handle *server,
- const struct GNUNET_PeerIdentity *my_identity,
- const struct GNUNET_CRYPTO_RsaPublicKeyBinaryEncoded *publicKey)
+ const struct GNUNET_PeerIdentity *my_identity)
{
struct PeerContext *p = cls;
{
struct PeerContext *p = cls;
@@
-128,9
+130,8
@@
init_notify (void *cls, struct GNUNET_CORE_Handle *server,
/* connect p2 */
p2.ch =
GNUNET_CORE_connect (p2.cfg, 1, &p2, &init_notify, &connect_notify,
/* connect p2 */
p2.ch =
GNUNET_CORE_connect (p2.cfg, 1, &p2, &init_notify, &connect_notify,
- &disconnect_notify, NULL, &inbound_notify,
- GNUNET_YES, &outbound_notify, GNUNET_YES,
- handlers);
+ &disconnect_notify, &inbound_notify, GNUNET_YES,
+ &outbound_notify, GNUNET_YES, handlers);
}
else
{
}
else
{
@@
-161,7
+162,7
@@
setup_peer (struct PeerContext *p, const char *cfgname)
static void
timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
static void
timeout_task (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
{
-
fprintf (stderr,
"Timeout.\n");
+
FPRINTF (stderr, "%s",
"Timeout.\n");
if (p1.ch != NULL)
{
GNUNET_CORE_disconnect (p1.ch);
if (p1.ch != NULL)
{
GNUNET_CORE_disconnect (p1.ch);
@@
-191,8
+192,8
@@
run (void *cls, char *const *args, const char *cfgfile,
&timeout_task, NULL);
p1.ch =
GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify,
&timeout_task, NULL);
p1.ch =
GNUNET_CORE_connect (p1.cfg, 1, &p1, &init_notify, &connect_notify,
- &disconnect_notify,
NULL, &inbound_notify
,
-
GNUNET_YES,
&outbound_notify, GNUNET_YES, handlers);
+ &disconnect_notify,
&inbound_notify, GNUNET_YES
,
+ &outbound_notify, GNUNET_YES, handlers);
}
}