/**
* Hashmap contain all peers currently manipulated
*/
- struct GNUNET_CONTAINER_MultiHashMap *peers;
+ struct GNUNET_CONTAINER_MultiPeerMap *peers;
/**
* Peer containing information for general manipulation
GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "Received traffic metrics for peer `%s'\n",
GNUNET_i2s(&tm->peer));
- if (NULL == (tmp = GNUNET_CONTAINER_multihashmap_get (man_handle.peers, &tm->peer.hashPubKey)))
+ if (NULL == (tmp = GNUNET_CONTAINER_multipeermap_get (man_handle.peers, &tm->peer)))
{
tmp = GNUNET_malloc (sizeof (struct TM_Peer));
tmp->peer = (tm->peer);
tmp->metrics[c][c2] = UINT32_MAX;
}
}
- GNUNET_CONTAINER_multihashmap_put (man_handle.peers, &tm->peer.hashPubKey, tmp, GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
+ GNUNET_CONTAINER_multipeermap_put (man_handle.peers,
+ &tm->peer, tmp,
+ GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST);
}
ats = (struct GNUNET_ATS_Information *) &tm[1];
struct DelayQueueEntry *dqe;
struct GNUNET_TIME_Relative delay;
- if (NULL != (tmp = GNUNET_CONTAINER_multihashmap_get (man_handle.peers, &target->hashPubKey)))
+ if (NULL != (tmp = GNUNET_CONTAINER_multipeermap_get (man_handle.peers, target)))
{
GNUNET_break (GNUNET_YES == GST_neighbours_test_connected(target));
/* Manipulate here */
uint32_t m_tmp;
uint32_t g_tmp;
int d;
- tmp = GNUNET_CONTAINER_multihashmap_get (man_handle.peers, &peer->hashPubKey);
+ tmp = GNUNET_CONTAINER_multipeermap_get (man_handle.peers, peer);
for (d = 0; d < ats_count; d++)
{
else
m_delay = GNUNET_TIME_UNIT_ZERO;
- if (NULL != (tmp = GNUNET_CONTAINER_multihashmap_get (man_handle.peers, &peer->hashPubKey)))
+ if (NULL != (tmp = GNUNET_CONTAINER_multipeermap_get (man_handle.peers, peer)))
{
/* Manipulate receive delay */
p_recv_delay = find_metric (tmp, GNUNET_ATS_QUALITY_NET_DELAY, TM_RECEIVE);
{
unsigned long long tmp;
struct GNUNET_TIME_Relative delay;
-
+
if ( (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (GST_cfg,
"transport",
"MANIPULATE_DISTANCE_IN",
- &tmp)) &&
+ &tmp)) &&
(tmp > 0) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Setting inbound distance_in to %llu\n",
(unsigned long long) tmp);
set_metric (&man_handle.general, TM_RECEIVE, GNUNET_ATS_QUALITY_NET_DISTANCE, tmp);
}
-
+
if ( (GNUNET_OK == GNUNET_CONFIGURATION_get_value_number (GST_cfg,
- "transport",
+ "transport",
"MANIPULATE_DISTANCE_OUT",
&tmp)) &&
(tmp > 0) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Setting outbound distance_in to %llu\n",
(unsigned long long) tmp);
- set_metric (&man_handle.general, TM_SEND,
+ set_metric (&man_handle.general, TM_SEND,
GNUNET_ATS_QUALITY_NET_DISTANCE, tmp);
}
-
+
if ( (GNUNET_OK == GNUNET_CONFIGURATION_get_value_time (GST_cfg,
"transport",
"MANIPULATE_DELAY_IN",
- &delay)) &&
+ &delay)) &&
(delay.rel_value_us > 0) )
{
GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Delaying inbound traffic for %s\n",
GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
set_metric (&man_handle.general, TM_RECEIVE,
- GNUNET_ATS_QUALITY_NET_DELAY,
+ GNUNET_ATS_QUALITY_NET_DELAY,
delay.rel_value_us);
}
if ( (GNUNET_OK == GNUNET_CONFIGURATION_get_value_time (GST_cfg,
"transport",
"MANIPULATE_DELAY_OUT",
- &delay)) &&
+ &delay)) &&
(delay.rel_value_us > 0) )
{
- GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
"Delaying outbound traffic for %s\n",
GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES));
- set_metric (&man_handle.general,
+ set_metric (&man_handle.general,
TM_SEND,
- GNUNET_ATS_QUALITY_NET_DELAY,
+ GNUNET_ATS_QUALITY_NET_DELAY,
delay.rel_value_us);
- }
- man_handle.peers = GNUNET_CONTAINER_multihashmap_create (10, GNUNET_NO);
+ }
+ man_handle.peers = GNUNET_CONTAINER_multipeermap_create (10, GNUNET_NO);
}
-static int
+static int
free_tmps (void *cls,
- const struct GNUNET_HashCode * key,
+ const struct GNUNET_PeerIdentity *key,
void *value)
{
struct DelayQueueEntry *dqe;
{
struct TM_Peer *tmp = (struct TM_Peer *) value;
- if (GNUNET_YES != GNUNET_CONTAINER_multihashmap_remove (man_handle.peers, key, value))
+ if (GNUNET_YES != GNUNET_CONTAINER_multipeermap_remove (man_handle.peers, key, value))
GNUNET_break (0);
free_metric (tmp);
next = tmp->send_head;
struct DelayQueueEntry *dqe;
struct DelayQueueEntry *next;
- if (NULL != (tmp = GNUNET_CONTAINER_multihashmap_get (man_handle.peers, &peer->hashPubKey)))
+ if (NULL != (tmp = GNUNET_CONTAINER_multipeermap_get (man_handle.peers, peer)))
{
next = tmp->send_head;
while (NULL != (dqe = next))
{
struct DelayQueueEntry *cur;
struct DelayQueueEntry *next;
- GNUNET_CONTAINER_multihashmap_iterate (man_handle.peers, &free_tmps,NULL);
- GNUNET_CONTAINER_multihashmap_destroy (man_handle.peers);
+ GNUNET_CONTAINER_multipeermap_iterate (man_handle.peers, &free_tmps,NULL);
+ GNUNET_CONTAINER_multipeermap_destroy (man_handle.peers);
next = generic_dqe_head;
while (NULL != (cur = next))