diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-26 21:01:23 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-26 21:01:23 +0100 |
commit | adf28e389d663529be51e41a96a867fe58f251c0 (patch) | |
tree | 429c420646790e39d350eeb984115f87ad8a20ea /src/cadet/cadet_protocol.h | |
parent | 6adc64ee122e9be37c6b83e9b745719b4d5940b8 (diff) | |
download | gnunet-adf28e389d663529be51e41a96a867fe58f251c0.tar.gz gnunet-adf28e389d663529be51e41a96a867fe58f251c0.zip |
use 'futures' bitfield in ACKs properly, revisit unbuffered/out-of-order transmission
Diffstat (limited to 'src/cadet/cadet_protocol.h')
-rw-r--r-- | src/cadet/cadet_protocol.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/cadet/cadet_protocol.h b/src/cadet/cadet_protocol.h index 5ec34f7d7..8fb260dfd 100644 --- a/src/cadet/cadet_protocol.h +++ b/src/cadet/cadet_protocol.h | |||
@@ -462,7 +462,7 @@ struct GNUNET_CADET_ChannelDataAckMessage | |||
462 | struct GNUNET_CADET_ChannelTunnelNumber ctn; | 462 | struct GNUNET_CADET_ChannelTunnelNumber ctn; |
463 | 463 | ||
464 | /** | 464 | /** |
465 | * Bitfield of already-received newer messages | 465 | * Bitfield of already-received messages past @e mid. |
466 | * pid + 1 @ LSB | 466 | * pid + 1 @ LSB |
467 | * pid + 64 @ MSB | 467 | * pid + 64 @ MSB |
468 | */ | 468 | */ |
@@ -532,14 +532,16 @@ struct GNUNET_CADET_ChannelDataAckMessage | |||
532 | struct GNUNET_CADET_ChannelTunnelNumber ctn; | 532 | struct GNUNET_CADET_ChannelTunnelNumber ctn; |
533 | 533 | ||
534 | /** | 534 | /** |
535 | * Bitfield of already-received messages past @e mid. | 535 | * Bitfield of already-received newer messages. Note that bit 0 |
536 | * pid + 1 @ LSB | 536 | * corresponds to @e mid + 1. |
537 | * pid + 64 @ MSB | 537 | * |
538 | * pid + 0 @ LSB | ||
539 | * pid + 63 @ MSB | ||
538 | */ | 540 | */ |
539 | uint64_t futures GNUNET_PACKED; | 541 | uint64_t futures GNUNET_PACKED; |
540 | 542 | ||
541 | /** | 543 | /** |
542 | * Last message ID received. | 544 | * Next message ID expected. |
543 | */ | 545 | */ |
544 | struct ChannelMessageIdentifier mid; | 546 | struct ChannelMessageIdentifier mid; |
545 | }; | 547 | }; |