[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r34913 - in gnunet/src: ats include transport
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r34913 - in gnunet/src: ats include transport |
|
Date: |
Sat, 17 Jan 2015 22:38:46 +0100 |
Author: grothoff
Date: 2015-01-17 22:38:46 +0100 (Sat, 17 Jan 2015)
New Revision: 34913
Modified:
gnunet/src/ats/ats_api_scheduling.c
gnunet/src/ats/test_ats_solver_add_address_and_request.c
gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c
gnunet/src/ats/test_ats_solver_convergence.c
gnunet/src/ats/test_ats_solver_preferences.c
gnunet/src/ats/test_ats_solver_request_and_add_address.c
gnunet/src/ats/test_ats_solver_request_and_delete_address.c
gnunet/src/include/gnunet_ats_service.h
gnunet/src/transport/gnunet-service-transport.c
gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
eliminating callback argument and its implementation which are never called in
the first place by ATS
Modified: gnunet/src/ats/ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/ats_api_scheduling.c 2015-01-17 21:31:48 UTC (rev 34912)
+++ gnunet/src/ats/ats_api_scheduling.c 2015-01-17 21:38:46 UTC (rev 34913)
@@ -90,17 +90,22 @@
struct ATS_Network * prev;
struct sockaddr *network;
+
struct sockaddr *netmask;
+
socklen_t length;
};
+
/**
* Handle for address suggestions
*/
struct GNUNET_ATS_SuggestHandle
{
struct GNUNET_ATS_SuggestHandle *prev;
+
struct GNUNET_ATS_SuggestHandle *next;
+
struct GNUNET_PeerIdentity id;
};
@@ -1104,15 +1109,11 @@
*
* @param sh handle
* @param peer identity of the peer we need an address for
- * @param cont the continuation to call with the address
- * @param cont_cls the cls for the @a cont
* @return suggest handle
*/
struct GNUNET_ATS_SuggestHandle *
GNUNET_ATS_suggest_address (struct GNUNET_ATS_SchedulingHandle *sh,
- const struct GNUNET_PeerIdentity *peer,
- GNUNET_ATS_AddressSuggestionCallback cont,
- void *cont_cls)
+ const struct GNUNET_PeerIdentity *peer)
{
struct PendingMessage *p;
struct RequestAddressMessage *m;
@@ -1123,17 +1124,20 @@
p = GNUNET_malloc (sizeof (struct PendingMessage) +
sizeof (struct RequestAddressMessage));
p->size = sizeof (struct RequestAddressMessage);
- p->is_init = GNUNET_NO;
m = (struct RequestAddressMessage *) &p[1];
m->header.type = htons (GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS);
m->header.size = htons (sizeof (struct RequestAddressMessage));
m->reserved = htonl (0);
m->peer = *peer;
- GNUNET_CONTAINER_DLL_insert_tail (sh->pending_head, sh->pending_tail, p);
+ GNUNET_CONTAINER_DLL_insert_tail (sh->pending_head,
+ sh->pending_tail,
+ p);
do_transmit (sh);
s = GNUNET_new (struct GNUNET_ATS_SuggestHandle);
- s->id = (*peer);
- GNUNET_CONTAINER_DLL_insert_tail (sh->sug_head, sh->sug_tail, s);
+ s->id = *peer;
+ GNUNET_CONTAINER_DLL_insert_tail (sh->sug_head,
+ sh->sug_tail,
+ s);
return s;
}
Modified: gnunet/src/ats/test_ats_solver_add_address_and_request.c
===================================================================
--- gnunet/src/ats/test_ats_solver_add_address_and_request.c 2015-01-17
21:31:48 UTC (rev 34912)
+++ gnunet/src/ats/test_ats_solver_add_address_and_request.c 2015-01-17
21:38:46 UTC (rev 34913)
@@ -159,7 +159,7 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
subsystem,name, value);
- GNUNET_ATS_suggest_address (sched_ats, &p.id, NULL, NULL);
+ GNUNET_ATS_suggest_address (sched_ats, &p.id);
return GNUNET_OK;
}
Modified: gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c
===================================================================
--- gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c
2015-01-17 21:31:48 UTC (rev 34912)
+++ gnunet/src/ats/test_ats_solver_alternative_after_delete_address.c
2015-01-17 21:38:46 UTC (rev 34913)
@@ -266,11 +266,12 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "All addresses added,
requesting....\n");
/* We have 2 addresses, so we can request */
addresses_added = GNUNET_YES;
- GNUNET_ATS_suggest_address (sched_ats, &p.id, NULL, NULL);
+ GNUNET_ATS_suggest_address (sched_ats, &p.id);
}
return GNUNET_OK;
}
+
static void
run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
struct GNUNET_TESTING_Peer *peer)
Modified: gnunet/src/ats/test_ats_solver_convergence.c
===================================================================
--- gnunet/src/ats/test_ats_solver_convergence.c 2015-01-17 21:31:48 UTC
(rev 34912)
+++ gnunet/src/ats/test_ats_solver_convergence.c 2015-01-17 21:38:46 UTC
(rev 34913)
@@ -219,7 +219,7 @@
"ATS statistics: `%s' `%s' %llu\n",
subsystem,name,
(unsigned long long) value);
- GNUNET_ATS_suggest_address (sched_ats, &p.id, NULL, NULL);
+ GNUNET_ATS_suggest_address (sched_ats, &p.id);
return GNUNET_OK;
}
Modified: gnunet/src/ats/test_ats_solver_preferences.c
===================================================================
--- gnunet/src/ats/test_ats_solver_preferences.c 2015-01-17 21:31:48 UTC
(rev 34912)
+++ gnunet/src/ats/test_ats_solver_preferences.c 2015-01-17 21:38:46 UTC
(rev 34913)
@@ -256,9 +256,10 @@
/* Adding address */
GNUNET_ATS_address_add (sched_ats, &test_hello_address, test_session,
test_ats_info, test_ats_count);
- GNUNET_ATS_suggest_address(sched_ats, &test_hello_address.peer, NULL, NULL);
+ GNUNET_ATS_suggest_address(sched_ats, &test_hello_address.peer);
}
+
int
main (int argc, char *argv[])
{
Modified: gnunet/src/ats/test_ats_solver_request_and_add_address.c
===================================================================
--- gnunet/src/ats/test_ats_solver_request_and_add_address.c 2015-01-17
21:31:48 UTC (rev 34912)
+++ gnunet/src/ats/test_ats_solver_request_and_add_address.c 2015-01-17
21:38:46 UTC (rev 34913)
@@ -199,7 +199,7 @@
test_hello_address.address_length = test_addr.addr_len;
/* Request */
- GNUNET_ATS_suggest_address (sched_ats, &p.id, NULL, NULL);
+ GNUNET_ATS_suggest_address (sched_ats, &p.id);
/* Adding address */
Modified: gnunet/src/ats/test_ats_solver_request_and_delete_address.c
===================================================================
--- gnunet/src/ats/test_ats_solver_request_and_delete_address.c 2015-01-17
21:31:48 UTC (rev 34912)
+++ gnunet/src/ats/test_ats_solver_request_and_delete_address.c 2015-01-17
21:38:46 UTC (rev 34913)
@@ -186,10 +186,11 @@
GNUNET_log (GNUNET_ERROR_TYPE_INFO, "ATS statistics: `%s' `%s' %llu\n",
subsystem,name, value);
if (GNUNET_NO == address_deleted)
- GNUNET_ATS_suggest_address (sched_ats, &p.id, NULL, NULL);
+ GNUNET_ATS_suggest_address (sched_ats, &p.id);
return GNUNET_OK;
}
+
static void
run (void *cls, const struct GNUNET_CONFIGURATION_Handle *mycfg,
struct GNUNET_TESTING_Peer *peer)
Modified: gnunet/src/include/gnunet_ats_service.h
===================================================================
--- gnunet/src/include/gnunet_ats_service.h 2015-01-17 21:31:48 UTC (rev
34912)
+++ gnunet/src/include/gnunet_ats_service.h 2015-01-17 21:38:46 UTC (rev
34913)
@@ -386,15 +386,11 @@
*
* @param sh handle
* @param peer identity of the peer we need an address for
- * @param cont the continuation to indicate success to call with the address
- * @param cont_cls the closure for the @a cont
* @return suggestion handle
*/
struct GNUNET_ATS_SuggestHandle *
GNUNET_ATS_suggest_address (struct GNUNET_ATS_SchedulingHandle *sh,
- const struct GNUNET_PeerIdentity *peer,
- GNUNET_ATS_AddressSuggestionCallback cont,
- void *cont_cls);
+ const struct GNUNET_PeerIdentity *peer);
/**
Modified: gnunet/src/transport/gnunet-service-transport.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport.c 2015-01-17 21:31:48 UTC
(rev 34912)
+++ gnunet/src/transport/gnunet-service-transport.c 2015-01-17 21:38:46 UTC
(rev 34913)
@@ -928,10 +928,14 @@
return;
}
- GST_neighbours_switch_to_address (&address->peer, address, session, ats,
- ats_count, bandwidth_in, bandwidth_out);
+ GST_neighbours_switch_to_address (&address->peer,
+ address,
+ session,
+ ats, ats_count,
+ bandwidth_in, bandwidth_out);
}
+
/**
* Function called to notify transport users that another
* peer connected to us.
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2015-01-17
21:31:48 UTC (rev 34912)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2015-01-17
21:38:46 UTC (rev 34913)
@@ -2143,22 +2143,7 @@
return n;
}
-/* We received a address suggestion after requesting an address in
- * try_connect or after receiving a connect, switch to address
- */
-static void
-address_suggest_cont (void *cls,
- const struct GNUNET_PeerIdentity *peer,
- const struct GNUNET_HELLO_Address *address, struct Session *session,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_out,
- struct GNUNET_BANDWIDTH_Value32NBO bandwidth_in,
- const struct GNUNET_ATS_Information *ats, uint32_t ats_count)
-{
- GST_neighbours_switch_to_address(peer, address, session, ats, ats_count,
- bandwidth_in, bandwidth_out);
-}
-
struct BlacklistCheckSwitchContext
{
struct BlacklistCheckSwitchContext *prev;
@@ -2217,8 +2202,7 @@
GNUNET_TIME_relative_to_absolute
(ATS_RESPONSE_TIMEOUT));
GNUNET_ATS_reset_backoff (GST_ats, peer);
n->suggest_handle = GNUNET_ATS_suggest_address (GST_ats,
- peer,
- &address_suggest_cont, n);
+ peer);
}
@@ -2361,7 +2345,7 @@
set_state_and_timeout (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS,
GNUNET_TIME_relative_to_absolute (ATS_RESPONSE_TIMEOUT));
if (NULL == n->suggest_handle)
- GNUNET_ATS_suggest_address (GST_ats, peer, address_suggest_cont, n);
+ GNUNET_ATS_suggest_address (GST_ats, peer);
break;
case GNUNET_TRANSPORT_PS_INIT_ATS:
/* SYN message takes priority over us asking ATS for address:
@@ -2415,7 +2399,7 @@
n->ack_state = ACK_SEND_SYN_ACK;
n->connect_ack_timestamp = ts;
/* Request an address for the peer */
- GNUNET_ATS_suggest_address (GST_ats, peer, address_suggest_cont, n);
+ GNUNET_ATS_suggest_address (GST_ats, peer);
GNUNET_ATS_reset_backoff (GST_ats, peer);
set_state (n, GNUNET_TRANSPORT_PS_SYN_RECV_ATS);
break;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r34913 - in gnunet/src: ats include transport,
gnunet <=