diff options
author | Christian Grothoff <christian@grothoff.org> | 2018-01-13 14:47:16 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2018-01-13 14:47:16 +0100 |
commit | 801c75f9134547f7fb9b19a881ce96e4c37450ea (patch) | |
tree | bf0ae172a6d0955ea27c6e9e49d76d7c6b6f22ab /src/cadet | |
parent | 58e2f8eadb20e527ebcefc04a906fb1f0e856e31 (diff) | |
download | gnunet-801c75f9134547f7fb9b19a881ce96e4c37450ea.tar.gz gnunet-801c75f9134547f7fb9b19a881ce96e4c37450ea.zip |
use assert to guard better against double-close on client side
Diffstat (limited to 'src/cadet')
-rw-r--r-- | src/cadet/cadet_api.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/cadet/cadet_api.c b/src/cadet/cadet_api.c index 6b07ab7b7..3c142a95c 100644 --- a/src/cadet/cadet_api.c +++ b/src/cadet/cadet_api.c | |||
@@ -1276,15 +1276,15 @@ GNUNET_CADET_close_port (struct GNUNET_CADET_Port *p) | |||
1276 | struct GNUNET_CADET_PortMessage *msg; | 1276 | struct GNUNET_CADET_PortMessage *msg; |
1277 | struct GNUNET_MQ_Envelope *env; | 1277 | struct GNUNET_MQ_Envelope *env; |
1278 | 1278 | ||
1279 | GNUNET_assert (GNUNET_YES == | ||
1280 | GNUNET_CONTAINER_multihashmap_remove (p->cadet->ports, | ||
1281 | &p->id, | ||
1282 | p)); | ||
1279 | env = GNUNET_MQ_msg (msg, | 1283 | env = GNUNET_MQ_msg (msg, |
1280 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_CLOSE); | 1284 | GNUNET_MESSAGE_TYPE_CADET_LOCAL_PORT_CLOSE); |
1281 | msg->port = p->id; | 1285 | msg->port = p->id; |
1282 | GNUNET_MQ_send (p->cadet->mq, | 1286 | GNUNET_MQ_send (p->cadet->mq, |
1283 | env); | 1287 | env); |
1284 | GNUNET_assert (GNUNET_YES == | ||
1285 | GNUNET_CONTAINER_multihashmap_remove (p->cadet->ports, | ||
1286 | &p->id, | ||
1287 | p)); | ||
1288 | GNUNET_free_non_null (p->handlers); | 1288 | GNUNET_free_non_null (p->handlers); |
1289 | GNUNET_free (p); | 1289 | GNUNET_free (p); |
1290 | } | 1290 | } |
@@ -1673,7 +1673,7 @@ GNUNET_CADET_open_port (struct GNUNET_CADET_Handle *h, | |||
1673 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, | 1673 | GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, |
1674 | "Listening to CADET port %s\n", | 1674 | "Listening to CADET port %s\n", |
1675 | GNUNET_h2s (port)); | 1675 | GNUNET_h2s (port)); |
1676 | 1676 | ||
1677 | p = GNUNET_new (struct GNUNET_CADET_Port); | 1677 | p = GNUNET_new (struct GNUNET_CADET_Port); |
1678 | p->cadet = h; | 1678 | p->cadet = h; |
1679 | p->id = *port; | 1679 | p->id = *port; |