From c4e9ba925ffd758aaa3feee2ccfc0b76f26fe207 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Sat, 5 Oct 2019 15:09:28 +0200 Subject: global reindent, now with uncrustify hook enabled --- .../gnunet-service-transport_manipulation.c | 478 +++++++++++---------- 1 file changed, 240 insertions(+), 238 deletions(-) (limited to 'src/transport/gnunet-service-transport_manipulation.c') diff --git a/src/transport/gnunet-service-transport_manipulation.c b/src/transport/gnunet-service-transport_manipulation.c index 07f7eb618..47ae5b981 100644 --- a/src/transport/gnunet-service-transport_manipulation.c +++ b/src/transport/gnunet-service-transport_manipulation.c @@ -36,7 +36,8 @@ /** * Struct containing information about manipulations to a specific peer */ -struct TM_Peer { +struct TM_Peer +{ /** * Peer ID */ @@ -77,7 +78,8 @@ struct TM_Peer { /** * Entry in the delay queue for an outbound delayed message */ -struct DelayQueueEntry { +struct DelayQueueEntry +{ /** * Next in DLL */ @@ -169,39 +171,39 @@ static struct GNUNET_SCHEDULER_Task *generic_send_delay_task; * @param message containing information */ void -GST_manipulation_set_metric(const struct TrafficMetricMessage *tm) +GST_manipulation_set_metric (const struct TrafficMetricMessage *tm) { static struct GNUNET_PeerIdentity zero; struct TM_Peer *tmp; - if (0 == memcmp(&tm->peer, - &zero, - sizeof(struct GNUNET_PeerIdentity))) - { - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "Received traffic metrics for all peers\n"); - delay_in = GNUNET_TIME_relative_ntoh(tm->delay_in); - delay_out = GNUNET_TIME_relative_ntoh(tm->delay_out); - return; - } - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "Received traffic metrics for peer `%s'\n", - GNUNET_i2s(&tm->peer)); + if (0 == memcmp (&tm->peer, + &zero, + sizeof(struct GNUNET_PeerIdentity))) + { + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received traffic metrics for all peers\n"); + delay_in = GNUNET_TIME_relative_ntoh (tm->delay_in); + delay_out = GNUNET_TIME_relative_ntoh (tm->delay_out); + return; + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Received traffic metrics for peer `%s'\n", + GNUNET_i2s (&tm->peer)); if (NULL == - (tmp = GNUNET_CONTAINER_multipeermap_get(peers, - &tm->peer))) - { - tmp = GNUNET_new(struct TM_Peer); - tmp->peer = tm->peer; - GNUNET_CONTAINER_multipeermap_put(peers, - &tm->peer, - tmp, - GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); - } - GNUNET_ATS_properties_ntoh(&tmp->properties, - &tm->properties); - tmp->delay_in = GNUNET_TIME_relative_ntoh(tm->delay_in); - tmp->delay_out = GNUNET_TIME_relative_ntoh(tm->delay_out); + (tmp = GNUNET_CONTAINER_multipeermap_get (peers, + &tm->peer))) + { + tmp = GNUNET_new (struct TM_Peer); + tmp->peer = tm->peer; + GNUNET_CONTAINER_multipeermap_put (peers, + &tm->peer, + tmp, + GNUNET_CONTAINER_MULTIHASHMAPOPTION_UNIQUE_FAST); + } + GNUNET_ATS_properties_ntoh (&tmp->properties, + &tm->properties); + tmp->delay_in = GNUNET_TIME_relative_ntoh (tm->delay_in); + tmp->delay_out = GNUNET_TIME_relative_ntoh (tm->delay_out); } @@ -212,52 +214,52 @@ GST_manipulation_set_metric(const struct TrafficMetricMessage *tm) * @param cls the `struct DelayQueueEntry` to transmit */ static void -send_delayed(void *cls) +send_delayed (void *cls) { struct DelayQueueEntry *dqe = cls; struct DelayQueueEntry *next; struct TM_Peer *tmp = dqe->tmp; - GNUNET_break(GNUNET_YES == - GST_neighbours_test_connected(&dqe->id)); + GNUNET_break (GNUNET_YES == + GST_neighbours_test_connected (&dqe->id)); if (NULL != tmp) + { + tmp->send_delay_task = NULL; + GNUNET_CONTAINER_DLL_remove (tmp->send_head, + tmp->send_tail, + dqe); + next = tmp->send_head; + if (NULL != next) { - tmp->send_delay_task = NULL; - GNUNET_CONTAINER_DLL_remove(tmp->send_head, - tmp->send_tail, - dqe); - next = tmp->send_head; - if (NULL != next) - { - /* More delayed messages */ - tmp->send_delay_task = GNUNET_SCHEDULER_add_at(next->sent_at, - &send_delayed, - next); - } + /* More delayed messages */ + tmp->send_delay_task = GNUNET_SCHEDULER_add_at (next->sent_at, + &send_delayed, + next); } + } else + { + /* Remove from generic queue */ + generic_send_delay_task = NULL; + GNUNET_CONTAINER_DLL_remove (generic_dqe_head, + generic_dqe_tail, + dqe); + next = generic_dqe_head; + if (NULL != next) { - /* Remove from generic queue */ - generic_send_delay_task = NULL; - GNUNET_CONTAINER_DLL_remove(generic_dqe_head, - generic_dqe_tail, - dqe); - next = generic_dqe_head; - if (NULL != next) - { - /* More delayed messages */ - generic_send_delay_task = GNUNET_SCHEDULER_add_at(next->sent_at, - &send_delayed, - next); - } + /* More delayed messages */ + generic_send_delay_task = GNUNET_SCHEDULER_add_at (next->sent_at, + &send_delayed, + next); } - GST_neighbours_send(&dqe->id, - dqe->msg, - dqe->msg_size, - dqe->timeout, - dqe->cont, - dqe->cont_cls); - GNUNET_free(dqe); + } + GST_neighbours_send (&dqe->id, + dqe->msg, + dqe->msg_size, + dqe->timeout, + dqe->cont, + dqe->cont_cls); + GNUNET_free (dqe); } @@ -273,71 +275,71 @@ send_delayed(void *cls) * @param cont_cls cls for @a cont */ void -GST_manipulation_send(const struct GNUNET_PeerIdentity *target, - const void *msg, - size_t msg_size, - struct GNUNET_TIME_Relative timeout, - GST_NeighbourSendContinuation cont, - void *cont_cls) +GST_manipulation_send (const struct GNUNET_PeerIdentity *target, + const void *msg, + size_t msg_size, + struct GNUNET_TIME_Relative timeout, + GST_NeighbourSendContinuation cont, + void *cont_cls) { struct TM_Peer *tmp; struct DelayQueueEntry *dqe; struct GNUNET_TIME_Relative delay; if (NULL != (tmp = - GNUNET_CONTAINER_multipeermap_get(peers, - target))) + GNUNET_CONTAINER_multipeermap_get (peers, + target))) delay = tmp->delay_out; else delay = delay_out; if (0 == delay.rel_value_us) - { - /* Normal sending */ - GST_neighbours_send(target, - msg, - msg_size, - timeout, - cont, cont_cls); - return; - } - dqe = GNUNET_malloc(sizeof(struct DelayQueueEntry) + msg_size); + { + /* Normal sending */ + GST_neighbours_send (target, + msg, + msg_size, + timeout, + cont, cont_cls); + return; + } + dqe = GNUNET_malloc (sizeof(struct DelayQueueEntry) + msg_size); dqe->id = *target; dqe->tmp = tmp; - dqe->sent_at = GNUNET_TIME_relative_to_absolute(delay); + dqe->sent_at = GNUNET_TIME_relative_to_absolute (delay); dqe->cont = cont; dqe->cont_cls = cont_cls; dqe->msg = &dqe[1]; dqe->msg_size = msg_size; dqe->timeout = timeout; - GNUNET_memcpy(dqe->msg, - msg, - msg_size); + GNUNET_memcpy (dqe->msg, + msg, + msg_size); if (NULL == tmp) - { - GNUNET_CONTAINER_DLL_insert_tail(generic_dqe_head, - generic_dqe_tail, - dqe); - if (NULL == generic_send_delay_task) - generic_send_delay_task = GNUNET_SCHEDULER_add_delayed(delay, - &send_delayed, - dqe); - } + { + GNUNET_CONTAINER_DLL_insert_tail (generic_dqe_head, + generic_dqe_tail, + dqe); + if (NULL == generic_send_delay_task) + generic_send_delay_task = GNUNET_SCHEDULER_add_delayed (delay, + &send_delayed, + dqe); + } else - { - GNUNET_CONTAINER_DLL_insert_tail(tmp->send_head, - tmp->send_tail, - dqe); - if (NULL == tmp->send_delay_task) - tmp->send_delay_task = GNUNET_SCHEDULER_add_delayed(delay, - &send_delayed, - dqe); - } - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "Delaying %u byte message to peer `%s' with peer specific delay for %s\n", - (unsigned int)msg_size, - GNUNET_i2s(target), - GNUNET_STRINGS_relative_time_to_string(delay, - GNUNET_YES)); + { + GNUNET_CONTAINER_DLL_insert_tail (tmp->send_head, + tmp->send_tail, + dqe); + if (NULL == tmp->send_delay_task) + tmp->send_delay_task = GNUNET_SCHEDULER_add_delayed (delay, + &send_delayed, + dqe); + } + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Delaying %u byte message to peer `%s' with peer specific delay for %s\n", + (unsigned int) msg_size, + GNUNET_i2s (target), + GNUNET_STRINGS_relative_time_to_string (delay, + GNUNET_YES)); } @@ -350,15 +352,15 @@ GST_manipulation_send(const struct GNUNET_PeerIdentity *target, * @param prop[IN|OUT] metrics to modify */ void -GST_manipulation_manipulate_metrics(const struct GNUNET_HELLO_Address *address, - struct GNUNET_ATS_Session *session, - struct GNUNET_ATS_Properties *prop) +GST_manipulation_manipulate_metrics (const struct GNUNET_HELLO_Address *address, + struct GNUNET_ATS_Session *session, + struct GNUNET_ATS_Properties *prop) { const struct GNUNET_PeerIdentity *peer = &address->peer; struct TM_Peer *tmp; - tmp = GNUNET_CONTAINER_multipeermap_get(peers, - peer); + tmp = GNUNET_CONTAINER_multipeermap_get (peers, + peer); if (NULL != tmp) *prop = tmp->properties; } @@ -375,33 +377,33 @@ GST_manipulation_manipulate_metrics(const struct GNUNET_HELLO_Address *address, * @return manipulated delay for next receive */ struct GNUNET_TIME_Relative -GST_manipulation_recv(void *cls, - const struct GNUNET_HELLO_Address *address, - struct GNUNET_ATS_Session *session, - const struct GNUNET_MessageHeader *message) +GST_manipulation_recv (void *cls, + const struct GNUNET_HELLO_Address *address, + struct GNUNET_ATS_Session *session, + const struct GNUNET_MessageHeader *message) { struct TM_Peer *tmp; struct GNUNET_TIME_Relative quota_delay; struct GNUNET_TIME_Relative m_delay; if (NULL != - (tmp = GNUNET_CONTAINER_multipeermap_get(peers, - &address->peer))) + (tmp = GNUNET_CONTAINER_multipeermap_get (peers, + &address->peer))) m_delay = tmp->delay_in; else m_delay = delay_in; - quota_delay = GST_receive_callback(cls, - address, - session, - message); - m_delay = GNUNET_TIME_relative_max(m_delay, - quota_delay); - GNUNET_log(GNUNET_ERROR_TYPE_DEBUG, - "Delaying next receive for peer `%s' for %s\n", - GNUNET_i2s(&address->peer), - GNUNET_STRINGS_relative_time_to_string(m_delay, - GNUNET_YES)); + quota_delay = GST_receive_callback (cls, + address, + session, + message); + m_delay = GNUNET_TIME_relative_max (m_delay, + quota_delay); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, + "Delaying next receive for peer `%s' for %s\n", + GNUNET_i2s (&address->peer), + GNUNET_STRINGS_relative_time_to_string (m_delay, + GNUNET_YES)); return m_delay; } @@ -410,38 +412,38 @@ GST_manipulation_recv(void *cls, * Initialize traffic manipulation */ void -GST_manipulation_init() +GST_manipulation_init () { struct GNUNET_TIME_Relative delay; if ((GNUNET_OK == - GNUNET_CONFIGURATION_get_value_time(GST_cfg, - "transport", - "MANIPULATE_DELAY_IN", - &delay)) && + GNUNET_CONFIGURATION_get_value_time (GST_cfg, + "transport", + "MANIPULATE_DELAY_IN", + &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_log (GNUNET_ERROR_TYPE_INFO, + "Delaying inbound traffic for %s\n", + GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES)); - delay_in = delay; - } + delay_in = delay; + } if ((GNUNET_OK == - GNUNET_CONFIGURATION_get_value_time(GST_cfg, - "transport", - "MANIPULATE_DELAY_OUT", - &delay)) && + GNUNET_CONFIGURATION_get_value_time (GST_cfg, + "transport", + "MANIPULATE_DELAY_OUT", + &delay)) && (delay.rel_value_us > 0)) - { - GNUNET_log(GNUNET_ERROR_TYPE_INFO, - "Delaying outbound traffic for %s\n", - GNUNET_STRINGS_relative_time_to_string(delay, + { + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Delaying outbound traffic for %s\n", + GNUNET_STRINGS_relative_time_to_string (delay, GNUNET_YES)); - delay_out = delay; - } - peers = GNUNET_CONTAINER_multipeermap_create(4, - GNUNET_NO); + delay_out = delay; + } + peers = GNUNET_CONTAINER_multipeermap_create (4, + GNUNET_NO); } @@ -451,58 +453,58 @@ GST_manipulation_init() * @param peer the disconnecting peer */ void -GST_manipulation_peer_disconnect(const struct GNUNET_PeerIdentity *peer) +GST_manipulation_peer_disconnect (const struct GNUNET_PeerIdentity *peer) { struct TM_Peer *tmp; struct DelayQueueEntry *dqe; struct DelayQueueEntry *next; - tmp = GNUNET_CONTAINER_multipeermap_get(peers, - peer); + tmp = GNUNET_CONTAINER_multipeermap_get (peers, + peer); if (NULL != tmp) + { + while (NULL != (dqe = tmp->send_head)) { - while (NULL != (dqe = tmp->send_head)) - { - GNUNET_CONTAINER_DLL_remove(tmp->send_head, - tmp->send_tail, - dqe); - if (NULL != dqe->cont) - dqe->cont(dqe->cont_cls, - GNUNET_SYSERR, - dqe->msg_size, - 0); - GNUNET_free(dqe); - } + GNUNET_CONTAINER_DLL_remove (tmp->send_head, + tmp->send_tail, + dqe); + if (NULL != dqe->cont) + dqe->cont (dqe->cont_cls, + GNUNET_SYSERR, + dqe->msg_size, + 0); + GNUNET_free (dqe); } + } next = generic_dqe_head; while (NULL != (dqe = next)) + { + next = dqe->next; + if (0 == memcmp (peer, + &dqe->id, + sizeof(dqe->id))) { - next = dqe->next; - if (0 == memcmp(peer, - &dqe->id, - sizeof(dqe->id))) - { - GNUNET_CONTAINER_DLL_remove(generic_dqe_head, - generic_dqe_tail, - dqe); - if (NULL != dqe->cont) - dqe->cont(dqe->cont_cls, - GNUNET_SYSERR, - dqe->msg_size, - 0); - GNUNET_free(dqe); - } + GNUNET_CONTAINER_DLL_remove (generic_dqe_head, + generic_dqe_tail, + dqe); + if (NULL != dqe->cont) + dqe->cont (dqe->cont_cls, + GNUNET_SYSERR, + dqe->msg_size, + 0); + GNUNET_free (dqe); } + } if (NULL != generic_send_delay_task) - { - GNUNET_SCHEDULER_cancel(generic_send_delay_task); - generic_send_delay_task = NULL; - if (NULL != generic_dqe_head) - generic_send_delay_task - = GNUNET_SCHEDULER_add_at(generic_dqe_head->sent_at, - &send_delayed, - generic_dqe_head); - } + { + GNUNET_SCHEDULER_cancel (generic_send_delay_task); + generic_send_delay_task = NULL; + if (NULL != generic_dqe_head) + generic_send_delay_task + = GNUNET_SCHEDULER_add_at (generic_dqe_head->sent_at, + &send_delayed, + generic_dqe_head); + } } @@ -515,35 +517,35 @@ GST_manipulation_peer_disconnect(const struct GNUNET_PeerIdentity *peer) * @return #GNUNET_OK (continue to iterate) */ static int -free_tmps(void *cls, - const struct GNUNET_PeerIdentity *key, - void *value) +free_tmps (void *cls, + const struct GNUNET_PeerIdentity *key, + void *value) { struct TM_Peer *tmp = value; struct DelayQueueEntry *dqe; - GNUNET_break(GNUNET_YES == - GNUNET_CONTAINER_multipeermap_remove(peers, - key, - value)); + GNUNET_break (GNUNET_YES == + GNUNET_CONTAINER_multipeermap_remove (peers, + key, + value)); while (NULL != (dqe = tmp->send_head)) - { - GNUNET_CONTAINER_DLL_remove(tmp->send_head, - tmp->send_tail, - dqe); - if (NULL != dqe->cont) - dqe->cont(dqe->cont_cls, - GNUNET_SYSERR, - dqe->msg_size, - 0); - GNUNET_free(dqe); - } + { + GNUNET_CONTAINER_DLL_remove (tmp->send_head, + tmp->send_tail, + dqe); + if (NULL != dqe->cont) + dqe->cont (dqe->cont_cls, + GNUNET_SYSERR, + dqe->msg_size, + 0); + GNUNET_free (dqe); + } if (NULL != tmp->send_delay_task) - { - GNUNET_SCHEDULER_cancel(tmp->send_delay_task); - tmp->send_delay_task = NULL; - } - GNUNET_free(tmp); + { + GNUNET_SCHEDULER_cancel (tmp->send_delay_task); + tmp->send_delay_task = NULL; + } + GNUNET_free (tmp); return GNUNET_OK; } @@ -552,32 +554,32 @@ free_tmps(void *cls, * Stop traffic manipulation */ void -GST_manipulation_stop() +GST_manipulation_stop () { struct DelayQueueEntry *cur; - GNUNET_CONTAINER_multipeermap_iterate(peers, - &free_tmps, - NULL); - GNUNET_CONTAINER_multipeermap_destroy(peers); + GNUNET_CONTAINER_multipeermap_iterate (peers, + &free_tmps, + NULL); + GNUNET_CONTAINER_multipeermap_destroy (peers); peers = NULL; while (NULL != (cur = generic_dqe_head)) - { - GNUNET_CONTAINER_DLL_remove(generic_dqe_head, - generic_dqe_tail, - cur); - if (NULL != cur->cont) - cur->cont(cur->cont_cls, - GNUNET_SYSERR, - cur->msg_size, - 0); - GNUNET_free(cur); - } + { + GNUNET_CONTAINER_DLL_remove (generic_dqe_head, + generic_dqe_tail, + cur); + if (NULL != cur->cont) + cur->cont (cur->cont_cls, + GNUNET_SYSERR, + cur->msg_size, + 0); + GNUNET_free (cur); + } if (NULL != generic_send_delay_task) - { - GNUNET_SCHEDULER_cancel(generic_send_delay_task); - generic_send_delay_task = NULL; - } + { + GNUNET_SCHEDULER_cancel (generic_send_delay_task); + generic_send_delay_task = NULL; + } } /* end of file gnunet-service-transport_manipulation.c */ -- cgit v1.2.3