diff options
author | Elias Summermatter <elias.summermatter@seccom.ch> | 2021-02-17 17:26:35 +0100 |
---|---|---|
committer | Elias Summermatter <elias.summermatter@seccom.ch> | 2021-02-17 17:26:35 +0100 |
commit | d852cb5a67dd79e697779f3cb3d76ef9ff3a5d87 (patch) | |
tree | 0ce0d67eb9d1d1bc7b1786dea8e5e70570b5cf3d | |
parent | 2c4bf5674b7a65f69bb5abc0d2d1e9459ff14649 (diff) | |
download | gnunet-d852cb5a67dd79e697779f3cb3d76ef9ff3a5d87.tar.gz gnunet-d852cb5a67dd79e697779f3cb3d76ef9ff3a5d87.zip |
Renamed Phase Done -> Finished
-rw-r--r-- | src/setu/gnunet-service-setu.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c index 833d00257..ccb341620 100644 --- a/src/setu/gnunet-service-setu.c +++ b/src/setu/gnunet-service-setu.c | |||
@@ -131,7 +131,7 @@ enum UnionOperationPhase | |||
131 | * In the ultimate phase, we wait until our demands are satisfied and then | 131 | * In the ultimate phase, we wait until our demands are satisfied and then |
132 | * quit (sending another DONE message). | 132 | * quit (sending another DONE message). |
133 | */ | 133 | */ |
134 | PHASE_DONE, | 134 | PHASE_FINISHED, |
135 | 135 | ||
136 | /** | 136 | /** |
137 | * After sending the full set, wait for responses with the elements | 137 | * After sending the full set, wait for responses with the elements |
@@ -657,7 +657,7 @@ send_client_done (void *cls) | |||
657 | 657 | ||
658 | if (GNUNET_YES == op->client_done_sent) | 658 | if (GNUNET_YES == op->client_done_sent) |
659 | return; | 659 | return; |
660 | if (PHASE_DONE != op->phase) | 660 | if (PHASE_FINISHED != op->phase) |
661 | { | 661 | { |
662 | LOG (GNUNET_ERROR_TYPE_WARNING, | 662 | LOG (GNUNET_ERROR_TYPE_WARNING, |
663 | "Union operation failed\n"); | 663 | "Union operation failed\n"); |
@@ -1901,7 +1901,7 @@ maybe_finish (struct Operation *op) | |||
1901 | { | 1901 | { |
1902 | struct GNUNET_MQ_Envelope *ev; | 1902 | struct GNUNET_MQ_Envelope *ev; |
1903 | 1903 | ||
1904 | op->phase = PHASE_DONE; | 1904 | op->phase = PHASE_FINISHED; |
1905 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SETU_P2P_DONE); | 1905 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SETU_P2P_DONE); |
1906 | GNUNET_MQ_send (op->mq, | 1906 | GNUNET_MQ_send (op->mq, |
1907 | ev); | 1907 | ev); |
@@ -1916,7 +1916,7 @@ maybe_finish (struct Operation *op) | |||
1916 | num_demanded); | 1916 | num_demanded); |
1917 | if (0 == num_demanded) | 1917 | if (0 == num_demanded) |
1918 | { | 1918 | { |
1919 | op->phase = PHASE_DONE; | 1919 | op->phase = PHASE_FINISHED; |
1920 | send_client_done (op); | 1920 | send_client_done (op); |
1921 | _GSS_operation_destroy2 (op); | 1921 | _GSS_operation_destroy2 (op); |
1922 | } | 1922 | } |
@@ -2297,7 +2297,7 @@ handle_union_p2p_full_done (void *cls, | |||
2297 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SETU_P2P_FULL_DONE); | 2297 | ev = GNUNET_MQ_msg_header (GNUNET_MESSAGE_TYPE_SETU_P2P_FULL_DONE); |
2298 | GNUNET_MQ_send (op->mq, | 2298 | GNUNET_MQ_send (op->mq, |
2299 | ev); | 2299 | ev); |
2300 | op->phase = PHASE_DONE; | 2300 | op->phase = PHASE_FINISHED; |
2301 | /* we now wait until the other peer sends us the OVER message*/ | 2301 | /* we now wait until the other peer sends us the OVER message*/ |
2302 | } | 2302 | } |
2303 | break; | 2303 | break; |
@@ -2307,7 +2307,7 @@ handle_union_p2p_full_done (void *cls, | |||
2307 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2307 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2308 | "got FULL DONE, finishing\n"); | 2308 | "got FULL DONE, finishing\n"); |
2309 | /* We sent the full set, and got the response for that. We're done. */ | 2309 | /* We sent the full set, and got the response for that. We're done. */ |
2310 | op->phase = PHASE_DONE; | 2310 | op->phase = PHASE_FINISHED; |
2311 | GNUNET_CADET_receive_done (op->channel); | 2311 | GNUNET_CADET_receive_done (op->channel); |
2312 | send_client_done (op); | 2312 | send_client_done (op); |
2313 | _GSS_operation_destroy2 (op); | 2313 | _GSS_operation_destroy2 (op); |