aboutsummaryrefslogtreecommitdiff
path: root/src/transport/plugin_transport_udp.c
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2017-01-16 11:24:30 +0100
committerChristian Grothoff <christian@grothoff.org>2017-01-16 11:24:30 +0100
commitd473582634ea55c2a412da1360b05a2898ed568d (patch)
tree39ca0098ac657e5dbc0960469ae05195e2506f60 /src/transport/plugin_transport_udp.c
parent301693904d07a063711bfc1ff4c5505c61eaf821 (diff)
downloadgnunet-d473582634ea55c2a412da1360b05a2898ed568d.tar.gz
gnunet-d473582634ea55c2a412da1360b05a2898ed568d.zip
simplify GNUNET_CONTAINER_heap_update_cost API
Diffstat (limited to 'src/transport/plugin_transport_udp.c')
-rw-r--r--src/transport/plugin_transport_udp.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 8281e48c5..fd8493e5f 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -1246,7 +1246,7 @@ udp_plugin_check_address (void *cls,
1246 if (sizeof(struct IPv4UdpAddress) == addrlen) 1246 if (sizeof(struct IPv4UdpAddress) == addrlen)
1247 { 1247 {
1248 struct sockaddr_in s4; 1248 struct sockaddr_in s4;
1249 1249
1250 v4 = (const struct IPv4UdpAddress *) addr; 1250 v4 = (const struct IPv4UdpAddress *) addr;
1251 if (GNUNET_OK != check_port (plugin, 1251 if (GNUNET_OK != check_port (plugin,
1252 ntohs (v4->u4_port))) 1252 ntohs (v4->u4_port)))
@@ -1258,7 +1258,7 @@ udp_plugin_check_address (void *cls,
1258#endif 1258#endif
1259 s4.sin_port = v4->u4_port; 1259 s4.sin_port = v4->u4_port;
1260 s4.sin_addr.s_addr = v4->ipv4_addr; 1260 s4.sin_addr.s_addr = v4->ipv4_addr;
1261 1261
1262 if (GNUNET_OK != 1262 if (GNUNET_OK !=
1263 GNUNET_NAT_test_address (plugin->nat, 1263 GNUNET_NAT_test_address (plugin->nat,
1264 &s4, 1264 &s4,
@@ -3052,8 +3052,7 @@ read_process_fragment (struct Plugin *plugin,
3052 msg)) 3052 msg))
3053 { 3053 {
3054 /* keep this 'rc' from expiring */ 3054 /* keep this 'rc' from expiring */
3055 GNUNET_CONTAINER_heap_update_cost (plugin->defrag_ctxs, 3055 GNUNET_CONTAINER_heap_update_cost (d_ctx->hnode,
3056 d_ctx->hnode,
3057 (GNUNET_CONTAINER_HeapCostType) now.abs_value_us); 3056 (GNUNET_CONTAINER_HeapCostType) now.abs_value_us);
3058 } 3057 }
3059 if (GNUNET_CONTAINER_heap_get_size (plugin->defrag_ctxs) > 3058 if (GNUNET_CONTAINER_heap_get_size (plugin->defrag_ctxs) >
@@ -3539,7 +3538,7 @@ udp_plugin_select_v4 (void *cls)
3539{ 3538{
3540 struct Plugin *plugin = cls; 3539 struct Plugin *plugin = cls;
3541 const struct GNUNET_SCHEDULER_TaskContext *tc; 3540 const struct GNUNET_SCHEDULER_TaskContext *tc;
3542 3541
3543 plugin->select_task_v4 = NULL; 3542 plugin->select_task_v4 = NULL;
3544 if (NULL == plugin->sockv4) 3543 if (NULL == plugin->sockv4)
3545 return; 3544 return;