aboutsummaryrefslogtreecommitdiff
path: root/src/vpn
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2013-06-12 11:30:21 +0000
committerChristian Grothoff <christian@grothoff.org>2013-06-12 11:30:21 +0000
commitb75ad0b3a6864d104647ddfd47e9304ea2a86ae0 (patch)
tree3d98c3595afdd6d0bdcd1dacc8b480e843f2d842 /src/vpn
parente4e523c97e73a1f4bb9ee582392fc67c44099b9b (diff)
downloadgnunet-b75ad0b3a6864d104647ddfd47e9304ea2a86ae0.tar.gz
gnunet-b75ad0b3a6864d104647ddfd47e9304ea2a86ae0.zip
-keep and drop are not needed here as we watch for disconnects
Diffstat (limited to 'src/vpn')
-rw-r--r--src/vpn/gnunet-service-vpn.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/src/vpn/gnunet-service-vpn.c b/src/vpn/gnunet-service-vpn.c
index a223e746e..2ab53047b 100644
--- a/src/vpn/gnunet-service-vpn.c
+++ b/src/vpn/gnunet-service-vpn.c
@@ -539,11 +539,6 @@ free_tunnel_state (struct TunnelState *ts)
539 GNUNET_free (tnq); 539 GNUNET_free (tnq);
540 } 540 }
541 GNUNET_assert (0 == ts->tmq_length); 541 GNUNET_assert (0 == ts->tmq_length);
542 if (NULL != ts->client)
543 {
544 GNUNET_SERVER_client_drop (ts->client);
545 ts->client = NULL;
546 }
547 if (NULL != ts->th) 542 if (NULL != ts->th)
548 { 543 {
549 GNUNET_MESH_notify_transmit_ready_cancel (ts->th); 544 GNUNET_MESH_notify_transmit_ready_cancel (ts->th);
@@ -675,7 +670,6 @@ tunnel_peer_connect_handler (void *cls,
675 ts->request_id, 670 ts->request_id,
676 ts->af, 671 ts->af,
677 &ts->destination_ip); 672 &ts->destination_ip);
678 GNUNET_SERVER_client_drop (ts->client);
679 ts->client = NULL; 673 ts->client = NULL;
680} 674}
681 675
@@ -945,7 +939,6 @@ create_tunnel_to_destination (struct DestinationEntry *de,
945 { 939 {
946 ts->request_id = request_id; 940 ts->request_id = request_id;
947 ts->client = client; 941 ts->client = client;
948 GNUNET_SERVER_client_keep (client);
949 } 942 }
950 ts->destination = *de; 943 ts->destination = *de;
951 ts->destination.heap_node = NULL; /* copy is NOT in destination heap */ 944 ts->destination.heap_node = NULL; /* copy is NOT in destination heap */
@@ -962,8 +955,6 @@ create_tunnel_to_destination (struct DestinationEntry *de,
962 { 955 {
963 GNUNET_log (GNUNET_ERROR_TYPE_ERROR, 956 GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
964 _("Failed to setup mesh tunnel!\n")); 957 _("Failed to setup mesh tunnel!\n"));
965 if (NULL != client)
966 GNUNET_SERVER_client_drop (client);
967 GNUNET_free (ts); 958 GNUNET_free (ts);
968 return NULL; 959 return NULL;
969 } 960 }
@@ -3135,10 +3126,7 @@ cleanup_tunnel_client (void *cls,
3135 struct TunnelState *ts = value; 3126 struct TunnelState *ts = value;
3136 3127
3137 if (client == ts->client) 3128 if (client == ts->client)
3138 {
3139 GNUNET_SERVER_client_drop (ts->client);
3140 ts->client = NULL; 3129 ts->client = NULL;
3141 }
3142 return GNUNET_OK; 3130 return GNUNET_OK;
3143} 3131}
3144 3132
@@ -3163,10 +3151,7 @@ cleanup_destination_client (void *cls,
3163 if (NULL == (ts = de->ts)) 3151 if (NULL == (ts = de->ts))
3164 return GNUNET_OK; 3152 return GNUNET_OK;
3165 if (client == ts->client) 3153 if (client == ts->client)
3166 {
3167 GNUNET_SERVER_client_drop (ts->client);
3168 ts->client = NULL; 3154 ts->client = NULL;
3169 }
3170 return GNUNET_OK; 3155 return GNUNET_OK;
3171} 3156}
3172 3157