diff options
author | Elias Summermatter <elias.summermatter@seccom.ch> | 2021-02-17 15:57:46 +0100 |
---|---|---|
committer | Elias Summermatter <elias.summermatter@seccom.ch> | 2021-02-17 15:57:46 +0100 |
commit | 3334592512312deacb8f2e76dc01acc497afac74 (patch) | |
tree | 3d2d4f98c2d80357fb718fb28aa82629d0accb00 | |
parent | 839bed7fad7e4b050eb4e4de106c360871a044d5 (diff) | |
download | gnunet-3334592512312deacb8f2e76dc01acc497afac74.tar.gz gnunet-3334592512312deacb8f2e76dc01acc497afac74.zip |
Renamed Phase inventory active -> active decoding & Added idea folder to git ignore
-rw-r--r-- | .gitignore | 3 | ||||
-rw-r--r-- | src/setu/gnunet-service-setu.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index b076501bc..fce94ea54 100644 --- a/.gitignore +++ b/.gitignore | |||
@@ -73,3 +73,6 @@ cmake/ | |||
73 | build | 73 | build |
74 | CMakeLists.txt | 74 | CMakeLists.txt |
75 | CMakeFiles.txt | 75 | CMakeFiles.txt |
76 | |||
77 | # Prevent IDEA files from being pushed | ||
78 | .idea/ | ||
diff --git a/src/setu/gnunet-service-setu.c b/src/setu/gnunet-service-setu.c index e5d8751f2..8e379bfda 100644 --- a/src/setu/gnunet-service-setu.c +++ b/src/setu/gnunet-service-setu.c | |||
@@ -108,7 +108,7 @@ enum UnionOperationPhase | |||
108 | /** | 108 | /** |
109 | * We are decoding an IBF. | 109 | * We are decoding an IBF. |
110 | */ | 110 | */ |
111 | PHASE_INVENTORY_ACTIVE, | 111 | PHASE_ACTIVE_DECODING, |
112 | 112 | ||
113 | /** | 113 | /** |
114 | * The other peer is decoding the IBF we just sent. | 114 | * The other peer is decoding the IBF we just sent. |
@@ -1552,7 +1552,7 @@ decode_and_send (struct Operation *op) | |||
1552 | unsigned int num_decoded; | 1552 | unsigned int num_decoded; |
1553 | struct InvertibleBloomFilter *diff_ibf; | 1553 | struct InvertibleBloomFilter *diff_ibf; |
1554 | 1554 | ||
1555 | GNUNET_assert (PHASE_INVENTORY_ACTIVE == op->phase); | 1555 | GNUNET_assert (PHASE_ACTIVE_DECODING == op->phase); |
1556 | 1556 | ||
1557 | if (GNUNET_OK != | 1557 | if (GNUNET_OK != |
1558 | prepare_ibf (op, | 1558 | prepare_ibf (op, |
@@ -1822,7 +1822,7 @@ handle_union_p2p_ibf (void *cls, | |||
1822 | { | 1822 | { |
1823 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 1823 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
1824 | "received full ibf\n"); | 1824 | "received full ibf\n"); |
1825 | op->phase = PHASE_INVENTORY_ACTIVE; | 1825 | op->phase = PHASE_ACTIVE_DECODING; |
1826 | if (GNUNET_OK != | 1826 | if (GNUNET_OK != |
1827 | decode_and_send (op)) | 1827 | decode_and_send (op)) |
1828 | { | 1828 | { |
@@ -2438,7 +2438,7 @@ check_union_p2p_offer (void *cls, | |||
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_INVENTORY_PASSIVE) && |
2441 | (op->phase != PHASE_INVENTORY_ACTIVE)) | 2441 | (op->phase != PHASE_ACTIVE_DECODING)) |
2442 | { | 2442 | { |
2443 | GNUNET_break_op (0); | 2443 | GNUNET_break_op (0); |
2444 | return GNUNET_SYSERR; | 2444 | return GNUNET_SYSERR; |
@@ -2547,7 +2547,7 @@ handle_union_p2p_done (void *cls, | |||
2547 | */GNUNET_CADET_receive_done (op->channel); | 2547 | */GNUNET_CADET_receive_done (op->channel); |
2548 | maybe_finish (op); | 2548 | maybe_finish (op); |
2549 | return; | 2549 | return; |
2550 | case PHASE_INVENTORY_ACTIVE: | 2550 | case PHASE_ACTIVE_DECODING: |
2551 | LOG (GNUNET_ERROR_TYPE_DEBUG, | 2551 | LOG (GNUNET_ERROR_TYPE_DEBUG, |
2552 | "got DONE (as active partner), waiting to finish\n"); | 2552 | "got DONE (as active partner), waiting to finish\n"); |
2553 | /* All demands of the other peer are satisfied, | 2553 | /* All demands of the other peer are satisfied, |