projects
/
oweals
/
gnunet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- merge with master
[oweals/gnunet.git]
/
src
/
ats
/
test_ats_lib.c
diff --git
a/src/ats/test_ats_lib.c
b/src/ats/test_ats_lib.c
index 314f19007cefdab7d5fa97acbe8f2f4d7994b4fa..d02d257ad2f7e753d2442a575702e9daacd9cc90 100644
(file)
--- a/
src/ats/test_ats_lib.c
+++ b/
src/ats/test_ats_lib.c
@@
-1,6
+1,6
@@
/*
This file is part of GNUnet.
/*
This file is part of GNUnet.
- Copyright (C) 2010-2015
Christian Grothoff (and other contributing authors)
+ Copyright (C) 2010-2015
GNUnet e.V.
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
GNUnet is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published
@@
-36,7
+36,7
@@
struct AddressSuggestData
/**
* Which session were we given?
*/
/**
* Which session were we given?
*/
- struct Session *session;
+ struct
GNUNET_ATS_
Session *session;
/**
* What address was assigned?
/**
* What address was assigned?
@@
-279,11
+279,9
@@
find_address_information (const struct GNUNET_HELLO_Address *addr)
* Task run to terminate the testcase.
*
* @param cls NULL
* Task run to terminate the testcase.
*
* @param cls NULL
- * @param tc unused
*/
static void
*/
static void
-end (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+end (void *cls)
{
if (0 != ret)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
{
if (0 != ret)
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@
-335,11
+333,9
@@
end (void *cls,
* Main interpreter loop. Runs the steps of the test.
*
* @param cls NULL
* Main interpreter loop. Runs the steps of the test.
*
* @param cls NULL
- * @param tc unused
*/
static void
*/
static void
-interpreter (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc);
+interpreter (void *cls);
/**
/**
@@
-368,7
+364,7
@@
make_peer (uint32_t pid,
memset (pk,
(int) pid,
sizeof (struct GNUNET_PeerIdentity));
memset (pk,
(int) pid,
sizeof (struct GNUNET_PeerIdentity));
- memcpy (pk,
+
GNUNET_
memcpy (pk,
&pid,
sizeof (uint32_t));
}
&pid,
sizeof (uint32_t));
}
@@
-404,10
+400,10
@@
make_address (uint32_t pid,
/**
* Our dummy sessions.
*/
/**
* Our dummy sessions.
*/
-struct Session
+struct
GNUNET_ATS_
Session
{
/**
{
/**
- * Field to avoid `0 == sizeof(struct Session)`.
+ * Field to avoid `0 == sizeof(struct
GNUNET_ATS_
Session)`.
*/
unsigned int non_empty;
};
*/
unsigned int non_empty;
};
@@
-419,10
+415,10
@@
struct Session
* @param i which session number to return
* @return NULL if @a i is 0, otherwise a pointer unique to @a i
*/
* @param i which session number to return
* @return NULL if @a i is 0, otherwise a pointer unique to @a i
*/
-static struct Session *
+static struct
GNUNET_ATS_
Session *
make_session (unsigned int i)
{
make_session (unsigned int i)
{
- struct Session *baseptr = NULL;
+ struct
GNUNET_ATS_
Session *baseptr = NULL;
if (0 == i)
return NULL;
if (0 == i)
return NULL;
@@
-591,11
+587,9
@@
reservation_cb (void *cls,
* Main interpreter loop. Runs the steps of the test.
*
* @param cls NULL
* Main interpreter loop. Runs the steps of the test.
*
* @param cls NULL
- * @param tc unused
*/
static void
*/
static void
-interpreter (void *cls,
- const struct GNUNET_SCHEDULER_TaskContext *tc)
+interpreter (void *cls)
{
struct Command *cmd;
{
struct Command *cmd;
@@
-618,7
+612,7
@@
interpreter (void *cls,
case CMD_ADD_ADDRESS:
{
struct GNUNET_HELLO_Address *addr;
case CMD_ADD_ADDRESS:
{
struct GNUNET_HELLO_Address *addr;
- struct Session *session;
+ struct
GNUNET_ATS_
Session *session;
addr = make_address (cmd->details.add_address.pid,
cmd->details.add_address.addr_num,
addr = make_address (cmd->details.add_address.pid,
cmd->details.add_address.addr_num,
@@
-718,7
+712,8
@@
interpreter (void *cls,
&pid);
cmd->details.request_connection_start.csh
= GNUNET_ATS_connectivity_suggest (con_ats,
&pid);
cmd->details.request_connection_start.csh
= GNUNET_ATS_connectivity_suggest (con_ats,
- &pid);
+ &pid,
+ 1);
off++;
break;
}
off++;
break;
}
@@
-781,7
+776,7
@@
interpreter (void *cls,
case CMD_ADD_SESSION:
{
struct Command *add;
case CMD_ADD_SESSION:
{
struct Command *add;
- struct Session *session;
+ struct
GNUNET_ATS_
Session *session;
add = find_command (CMD_ADD_ADDRESS,
cmd->details.add_session.add_label);
add = find_command (CMD_ADD_ADDRESS,
cmd->details.add_session.add_label);
@@
-796,7
+791,7
@@
interpreter (void *cls,
{
struct Command *add_address;
struct Command *add_session;
{
struct Command *add_address;
struct Command *add_session;
- struct Session *session;
+ struct
GNUNET_ATS_
Session *session;
add_session = find_command (CMD_ADD_SESSION,
cmd->details.del_session.add_session_label);
add_session = find_command (CMD_ADD_SESSION,
cmd->details.del_session.add_session_label);
@@
-891,7
+886,7
@@
static void
address_suggest_cb (void *cls,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address,
address_suggest_cb (void *cls,
const struct GNUNET_PeerIdentity *peer,
const struct GNUNET_HELLO_Address *address,
- struct Session *session,
+ struct
GNUNET_ATS_
Session *session,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in)
{