[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r36530 - in gnunet/src: ats include transport
From: |
gnunet |
Subject: |
[GNUnet-SVN] r36530 - in gnunet/src: ats include transport |
Date: |
Sun, 18 Oct 2015 14:49:23 +0200 |
Author: grothoff
Date: 2015-10-18 14:49:23 +0200 (Sun, 18 Oct 2015)
New Revision: 36530
Modified:
gnunet/src/ats/ats.h
gnunet/src/ats/ats_api_connectivity.c
gnunet/src/ats/ats_api_scheduling.c
gnunet/src/ats/gnunet-service-ats_connectivity.c
gnunet/src/include/gnunet_ats_service.h
gnunet/src/transport/gnunet-service-transport_neighbours.c
Log:
add 'strength' argument to address suggestion request for ATS
Modified: gnunet/src/ats/ats.h
===================================================================
--- gnunet/src/ats/ats.h 2015-10-18 12:33:21 UTC (rev 36529)
+++ gnunet/src/ats/ats.h 2015-10-18 12:49:23 UTC (rev 36530)
@@ -82,7 +82,7 @@
/**
- * Scheduling client to ATS service: we would like to have
+ * Connectivity client to ATS service: we would like to have
* address suggestions for this peer.
*/
struct RequestAddressMessage
@@ -95,9 +95,9 @@
struct GNUNET_MessageHeader header;
/**
- * Always zero.
+ * How "strong" is our need for an address for this peer?
*/
- uint32_t reserved GNUNET_PACKED;
+ uint32_t strength GNUNET_PACKED;
/**
* Peer to get address suggestions for.
@@ -107,7 +107,7 @@
/**
- * ATS client to ATS service: here is another address you can use.
+ * Scheduling client to ATS service: here is another address you can use.
*/
struct AddressAddMessage
{
Modified: gnunet/src/ats/ats_api_connectivity.c
===================================================================
--- gnunet/src/ats/ats_api_connectivity.c 2015-10-18 12:33:21 UTC (rev
36529)
+++ gnunet/src/ats/ats_api_connectivity.c 2015-10-18 12:49:23 UTC (rev
36530)
@@ -45,6 +45,11 @@
* Connecitivity handle this suggestion handle belongs to.
*/
struct GNUNET_ATS_ConnectivityHandle *ch;
+
+ /**
+ * How urgent is the request.
+ */
+ uint32_t strength;
};
@@ -174,6 +179,7 @@
void *value)
{
struct GNUNET_ATS_ConnectivityHandle *ch = cls;
+ struct GNUNET_ATS_ConnectivitySuggestHandle *sh = value;
struct GNUNET_MQ_Envelope *ev;
struct RequestAddressMessage *m;
@@ -180,7 +186,7 @@
if (NULL == ch->mq)
return GNUNET_SYSERR;
ev = GNUNET_MQ_msg (m, GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS);
- m->reserved = htonl (0);
+ m->strength = htonl (sh->strength);
m->peer = *peer;
GNUNET_MQ_send (ch->mq, ev);
return GNUNET_OK;
@@ -244,7 +250,7 @@
/**
- * Function called to free all `struct GNUNET_ATS_SuggestHandles`
+ * Function called to free all `struct GNUNET_ATS_ConnectivitySuggestHandle`s
* in the map.
*
* @param cls NULL
@@ -303,11 +309,13 @@
*
* @param ch handle
* @param peer identity of the peer we need an address for
+ * @param strength how urgent is the need for such a suggestion
* @return suggest handle, NULL if a request is already pending
*/
struct GNUNET_ATS_ConnectivitySuggestHandle *
GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch,
- const struct GNUNET_PeerIdentity *peer)
+ const struct GNUNET_PeerIdentity *peer,
+ uint32_t strength)
{
struct GNUNET_ATS_ConnectivitySuggestHandle *s;
@@ -317,6 +325,7 @@
s = GNUNET_new (struct GNUNET_ATS_ConnectivitySuggestHandle);
s->ch = ch;
s->id = *peer;
+ s->strength = strength;
if (GNUNET_OK !=
GNUNET_CONTAINER_multipeermap_put (ch->sug_requests,
&s->id,
@@ -360,7 +369,7 @@
return;
}
ev = GNUNET_MQ_msg (m, GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS_CANCEL);
- m->reserved = htonl (0);
+ m->strength = htonl (0);
m->peer = sh->id;
GNUNET_MQ_send (ch->mq, ev);
GNUNET_free (sh);
Modified: gnunet/src/ats/ats_api_scheduling.c
===================================================================
--- gnunet/src/ats/ats_api_scheduling.c 2015-10-18 12:33:21 UTC (rev 36529)
+++ gnunet/src/ats/ats_api_scheduling.c 2015-10-18 12:49:23 UTC (rev 36530)
@@ -247,7 +247,6 @@
sizeof (struct GNUNET_PeerIdentity)))
{
GNUNET_break (0);
- force_reconnect (sh);
return NULL;
}
return ar;
Modified: gnunet/src/ats/gnunet-service-ats_connectivity.c
===================================================================
--- gnunet/src/ats/gnunet-service-ats_connectivity.c 2015-10-18 12:33:21 UTC
(rev 36529)
+++ gnunet/src/ats/gnunet-service-ats_connectivity.c 2015-10-18 12:49:23 UTC
(rev 36530)
@@ -73,7 +73,7 @@
/**
- * Handle 'request address' messages from clients.
+ * Handle #GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS messages from clients.
*
* @param cls unused, NULL
* @param client client that sent the request
@@ -90,8 +90,8 @@
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
"Received `%s' message\n",
- "REQUEST_ADDRESS");
- GNUNET_break (0 == ntohl (msg->reserved));
+ "GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS");
+ /* FIXME: should not ignore "msg->strength" */
cr = GNUNET_new (struct ConnectionRequest);
cr->client = client;
(void) GNUNET_CONTAINER_multipeermap_put (connection_requests,
@@ -137,7 +137,8 @@
/**
- * Handle 'request address cancel' messages from clients.
+ * Handle #GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS_CANCEL messages
+ * from clients.
*
* @param cls unused, NULL
* @param client client that sent the request
@@ -152,9 +153,9 @@
(const struct RequestAddressMessage *) message;
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
- "Received REQUEST_ADDRESS_CANCEL message for peer %s\n",
+ "Received GNUNET_MESSAGE_TYPE_ATS_REQUEST_ADDRESS_CANCEL message
for peer %s\n",
GNUNET_i2s (&msg->peer));
- GNUNET_break (0 == ntohl (msg->reserved));
+ GNUNET_break (0 == ntohl (msg->strength));
GNUNET_CONTAINER_multipeermap_get_multiple (connection_requests,
&msg->peer,
&free_matching_requests,
Modified: gnunet/src/include/gnunet_ats_service.h
===================================================================
--- gnunet/src/include/gnunet_ats_service.h 2015-10-18 12:33:21 UTC (rev
36529)
+++ gnunet/src/include/gnunet_ats_service.h 2015-10-18 12:49:23 UTC (rev
36530)
@@ -302,12 +302,13 @@
*
* @param ch handle
* @param peer identity of the peer we need an address for
- * TODO: add argument to allow client to express 'strength's of request
+ * @param strength how urgent is the need for such a suggestion
* @return suggestion handle, NULL if request is already pending
*/
struct GNUNET_ATS_ConnectivitySuggestHandle *
GNUNET_ATS_connectivity_suggest (struct GNUNET_ATS_ConnectivityHandle *ch,
- const struct GNUNET_PeerIdentity *peer);
+ const struct GNUNET_PeerIdentity *peer,
+ uint32_t strength);
/**
Modified: gnunet/src/transport/gnunet-service-transport_neighbours.c
===================================================================
--- gnunet/src/transport/gnunet-service-transport_neighbours.c 2015-10-18
12:33:21 UTC (rev 36529)
+++ gnunet/src/transport/gnunet-service-transport_neighbours.c 2015-10-18
12:49:23 UTC (rev 36530)
@@ -2213,7 +2213,8 @@
n,
GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_ONLY));
n->suggest_handle = GNUNET_ATS_connectivity_suggest (GST_ats_connect,
- peer);
+ peer,
+ 0);
return n;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r36530 - in gnunet/src: ats include transport,
gnunet <=