aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorElias Summermatter <elias.summermatter@seccom.ch>2021-02-17 17:04:15 +0100
committerElias Summermatter <elias.summermatter@seccom.ch>2021-02-17 17:04:15 +0100
commitbe8897e14c058a05a2286d2561ddce9ba5acd85a (patch)
tree7c05c359fbf2cf3d9405d76de7d1b1b0824644b7 /src
parent3334592512312deacb8f2e76dc01acc497afac74 (diff)
downloadgnunet-be8897e14c058a05a2286d2561ddce9ba5acd85a.tar.gz
gnunet-be8897e14c058a05a2286d2561ddce9ba5acd85a.zip
Renamed Phase inventory passive -> passive decoding
Diffstat (limited to 'src')
-rw-r--r--src/setu/gnunet-service-setu.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c
index 8e379bfda..e7d9f10fe 100644
--- a/src/setu/gnunet-service-setu.c
+++ b/src/setu/gnunet-service-setu.c
@@ -113,7 +113,7 @@ enum UnionOperationPhase
113 /** 113 /**
114 * The other peer is decoding the IBF we just sent. 114 * The other peer is decoding the IBF we just sent.
115 */ 115 */
116 PHASE_INVENTORY_PASSIVE, 116 PHASE_PASIVE_DECODING,
117 117
118 /** 118 /**
119 * The protocol is almost finished, but we still have to flush our message 119 * The protocol is almost finished, but we still have to flush our message
@@ -1225,7 +1225,7 @@ send_ibf (struct Operation *op,
1225 1225
1226 /* The other peer must decode the IBF, so 1226 /* The other peer must decode the IBF, so
1227 * we're passive. */ 1227 * we're passive. */
1228 op->phase = PHASE_INVENTORY_PASSIVE; 1228 op->phase = PHASE_PASIVE_DECODING;
1229 return GNUNET_OK; 1229 return GNUNET_OK;
1230} 1230}
1231 1231
@@ -1747,7 +1747,7 @@ check_union_p2p_ibf (void *cls,
1747 return GNUNET_SYSERR; 1747 return GNUNET_SYSERR;
1748 } 1748 }
1749 } 1749 }
1750 else if ((op->phase != PHASE_INVENTORY_PASSIVE) && 1750 else if ((op->phase != PHASE_PASIVE_DECODING) &&
1751 (op->phase != PHASE_EXPECT_IBF)) 1751 (op->phase != PHASE_EXPECT_IBF))
1752 { 1752 {
1753 GNUNET_break_op (0); 1753 GNUNET_break_op (0);
@@ -1776,7 +1776,7 @@ handle_union_p2p_ibf (void *cls,
1776 1776
1777 buckets_in_message = (ntohs (msg->header.size) - sizeof *msg) 1777 buckets_in_message = (ntohs (msg->header.size) - sizeof *msg)
1778 / IBF_BUCKET_SIZE; 1778 / IBF_BUCKET_SIZE;
1779 if ((op->phase == PHASE_INVENTORY_PASSIVE) || 1779 if ((op->phase == PHASE_PASIVE_DECODING) ||
1780 (op->phase == PHASE_EXPECT_IBF)) 1780 (op->phase == PHASE_EXPECT_IBF))
1781 { 1781 {
1782 op->phase = PHASE_EXPECT_IBF_CONT; 1782 op->phase = PHASE_EXPECT_IBF_CONT;
@@ -2154,7 +2154,7 @@ check_union_p2p_inquiry (void *cls,
2154 struct Operation *op = cls; 2154 struct Operation *op = cls;
2155 unsigned int num_keys; 2155 unsigned int num_keys;
2156 2156
2157 if (op->phase != PHASE_INVENTORY_PASSIVE) 2157 if (op->phase != PHASE_PASIVE_DECODING)
2158 { 2158 {
2159 GNUNET_break_op (0); 2159 GNUNET_break_op (0);
2160 return GNUNET_SYSERR; 2160 return GNUNET_SYSERR;
@@ -2437,7 +2437,7 @@ check_union_p2p_offer (void *cls,
2437 unsigned int num_hashes; 2437 unsigned int num_hashes;
2438 2438
2439 /* look up elements and send them */ 2439 /* look up elements and send them */
2440 if ((op->phase != PHASE_INVENTORY_PASSIVE) && 2440 if ((op->phase != PHASE_PASIVE_DECODING) &&
2441 (op->phase != PHASE_ACTIVE_DECODING)) 2441 (op->phase != PHASE_ACTIVE_DECODING))
2442 { 2442 {
2443 GNUNET_break_op (0); 2443 GNUNET_break_op (0);
@@ -2531,7 +2531,7 @@ handle_union_p2p_done (void *cls,
2531 2531
2532 switch (op->phase) 2532 switch (op->phase)
2533 { 2533 {
2534 case PHASE_INVENTORY_PASSIVE: 2534 case PHASE_PASIVE_DECODING:
2535 /* We got all requests, but still have to send our elements in response. */ 2535 /* We got all requests, but still have to send our elements in response. */
2536 op->phase = PHASE_FINISH_WAITING; 2536 op->phase = PHASE_FINISH_WAITING;
2537 LOG (GNUNET_ERROR_TYPE_DEBUG, 2537 LOG (GNUNET_ERROR_TYPE_DEBUG,