From be8897e14c058a05a2286d2561ddce9ba5acd85a Mon Sep 17 00:00:00 2001
From: Elias Summermatter <elias.summermatter@seccom.ch>
Date: Wed, 17 Feb 2021 17:04:15 +0100
Subject: Renamed Phase inventory passive -> passive decoding

---
 .gitignore                     |  2 +-
 src/setu/gnunet-service-setu.c | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index fce94ea54..d51248502 100644
--- a/.gitignore
+++ b/.gitignore
@@ -74,5 +74,5 @@ build
 CMakeLists.txt
 CMakeFiles.txt
 
-# Prevent IDEA files from being pushed
+# Prevent cache files from IDEA from being commited
 .idea/
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
   /**
    * The other peer is decoding the IBF we just sent.
    */
-  PHASE_INVENTORY_PASSIVE,
+  PHASE_PASIVE_DECODING,
 
   /**
    * The protocol is almost finished, but we still have to flush our message
@@ -1225,7 +1225,7 @@ send_ibf (struct Operation *op,
 
   /* The other peer must decode the IBF, so
    * we're passive. */
-  op->phase = PHASE_INVENTORY_PASSIVE;
+  op->phase = PHASE_PASIVE_DECODING;
   return GNUNET_OK;
 }
 
@@ -1747,7 +1747,7 @@ check_union_p2p_ibf (void *cls,
       return GNUNET_SYSERR;
     }
   }
-  else if ((op->phase != PHASE_INVENTORY_PASSIVE) &&
+  else if ((op->phase != PHASE_PASIVE_DECODING) &&
            (op->phase != PHASE_EXPECT_IBF))
   {
     GNUNET_break_op (0);
@@ -1776,7 +1776,7 @@ handle_union_p2p_ibf (void *cls,
 
   buckets_in_message = (ntohs (msg->header.size) - sizeof *msg)
                        / IBF_BUCKET_SIZE;
-  if ((op->phase == PHASE_INVENTORY_PASSIVE) ||
+  if ((op->phase == PHASE_PASIVE_DECODING) ||
       (op->phase == PHASE_EXPECT_IBF))
   {
     op->phase = PHASE_EXPECT_IBF_CONT;
@@ -2154,7 +2154,7 @@ check_union_p2p_inquiry (void *cls,
   struct Operation *op = cls;
   unsigned int num_keys;
 
-  if (op->phase != PHASE_INVENTORY_PASSIVE)
+  if (op->phase != PHASE_PASIVE_DECODING)
   {
     GNUNET_break_op (0);
     return GNUNET_SYSERR;
@@ -2437,7 +2437,7 @@ check_union_p2p_offer (void *cls,
   unsigned int num_hashes;
 
   /* look up elements and send them */
-  if ((op->phase != PHASE_INVENTORY_PASSIVE) &&
+  if ((op->phase != PHASE_PASIVE_DECODING) &&
       (op->phase != PHASE_ACTIVE_DECODING))
   {
     GNUNET_break_op (0);
@@ -2531,7 +2531,7 @@ handle_union_p2p_done (void *cls,
 
   switch (op->phase)
   {
-  case PHASE_INVENTORY_PASSIVE:
+  case PHASE_PASIVE_DECODING:
     /* We got all requests, but still have to send our elements in response. */
     op->phase = PHASE_FINISH_WAITING;
     LOG (GNUNET_ERROR_TYPE_DEBUG,
-- 
cgit v1.2.3