diff options
author | Christian Grothoff <christian@grothoff.org> | 2014-11-27 10:31:36 +0000 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2014-11-27 10:31:36 +0000 |
commit | 68ac96f244a53f6a5dcdd939183d3904f43e4984 (patch) | |
tree | 0722829255a4a83293f26a810524b7921cd88a84 /src/set/gnunet-service-set.h | |
parent | 47c52147dac6bc423b43aa8e2721585df893440b (diff) | |
download | gnunet-68ac96f244a53f6a5dcdd939183d3904f43e4984.tar.gz gnunet-68ac96f244a53f6a5dcdd939183d3904f43e4984.zip |
remove additional variant of operation state
Diffstat (limited to 'src/set/gnunet-service-set.h')
-rw-r--r-- | src/set/gnunet-service-set.h | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/src/set/gnunet-service-set.h b/src/set/gnunet-service-set.h index c226611ff..834f78780 100644 --- a/src/set/gnunet-service-set.h +++ b/src/set/gnunet-service-set.h | |||
@@ -326,7 +326,9 @@ struct Operation | |||
326 | struct OperationSpecification *spec; | 326 | struct OperationSpecification *spec; |
327 | 327 | ||
328 | /** | 328 | /** |
329 | * Operation-specific operation state. | 329 | * Operation-specific operation state. Note that the exact |
330 | * type depends on this being a union or intersection operation | ||
331 | * (and thus on @e vt). | ||
330 | */ | 332 | */ |
331 | struct OperationState *state; | 333 | struct OperationState *state; |
332 | 334 | ||
@@ -341,6 +343,25 @@ struct Operation | |||
341 | struct Operation *prev; | 343 | struct Operation *prev; |
342 | 344 | ||
343 | /** | 345 | /** |
346 | * The identity of the requesting peer. Needs to | ||
347 | * be stored here as the op spec might not have been created yet. | ||
348 | */ | ||
349 | struct GNUNET_PeerIdentity peer; | ||
350 | |||
351 | /** | ||
352 | * Timeout task, if the incoming peer has not been accepted | ||
353 | * after the timeout, it will be disconnected. | ||
354 | */ | ||
355 | GNUNET_SCHEDULER_TaskIdentifier timeout_task; | ||
356 | |||
357 | /** | ||
358 | * Unique request id for the request from a remote peer, sent to the | ||
359 | * client, which will accept or reject the request. Set to '0' iff | ||
360 | * the request has not been suggested yet. | ||
361 | */ | ||
362 | uint32_t suggest_id; | ||
363 | |||
364 | /** | ||
344 | * #GNUNET_YES if this is not a "real" set operation yet, and we still | 365 | * #GNUNET_YES if this is not a "real" set operation yet, and we still |
345 | * need to wait for the other peer to give us more details. | 366 | * need to wait for the other peer to give us more details. |
346 | */ | 367 | */ |