Skip to content

Rename DAITA concepts padding and blocking#80

Merged
Serock3 merged 5 commits intomainfrom
rename-daita-concepts-padding-and-blocking-des-2694
Feb 4, 2026
Merged

Rename DAITA concepts padding and blocking#80
Serock3 merged 5 commits intomainfrom
rename-daita-concepts-padding-and-blocking-des-2694

Conversation

@Serock3
Copy link
Contributor

@Serock3 Serock3 commented Feb 4, 2026

Rename the term "blocking" to "delay" and "padding packet" to "decoy packet". Note that the same change will be made upstream in the next release of maybenot.

The term "padding" was also used to refer to padding added to data packets to make them constant size. In this scenario, we keep the term "padding".


This change is Reviewable

Copy link

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Renames DAITA terminology across the implementation and UAPI surface, replacing “blocking” with “delay” and “padding packet” with “decoy packet” to align with upcoming maybenot changes.

Changes:

  • Renamed DAITA settings/UAPI keys from blocking/padding to delay/decoy (including parsing + display).
  • Updated DAITA internals (types, hooks, action handling) to use Delay* and Decoy* naming.
  • Updated docs and exported stats structures to reflect the new terminology.

Reviewed changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated 10 comments.

Show a summary per file
File Description
gotatun/src/device/uapi/mod.rs Emits renamed DAITA overhead fields (*_decoy_packet_bytes) in get responses.
gotatun/src/device/uapi/command.rs Renames GetPeer fields and DAITA config keys; updates display/parsing logic.
gotatun/src/device/mod.rs Updates commented reference from blocking_lock() to delay_lock().
gotatun/src/device/daita/types.rs Renames wire types and state/action enums to Decoy* / Delay*.
gotatun/src/device/daita/mod.rs Renames DaitaSettings fields to max_decoy_frac, max_delay_frac, etc.
gotatun/src/device/daita/hooks.rs Renames overhead struct + queue watcher; updates decoy detection and accounting.
gotatun/src/device/daita/events.rs Switches timer scheduling call from schedule_block to schedule_delay.
gotatun/src/device/daita/actions.rs Renames action handlers and queue/state terminology to decoy/delay.
gotatun/src/device/configure.rs Renames exported DAITA stats fields to *_decoy_packet_bytes and updates collection.
UAPI.md Updates documented DAITA UAPI keys and descriptions to delay/decoy terminology.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@Serock3 Serock3 force-pushed the rename-daita-concepts-padding-and-blocking-des-2694 branch from 047396a to 5d16275 Compare February 4, 2026 14:56
Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MarkusPettersson98 reviewed 10 files and all commit messages, and made 1 comment.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @Serock3).


gotatun/src/device/daita/hooks.rs line 222 at r2 (raw file):

        // as described in section 5.4.6 of the wg whitepaper, then this would count that too.
        // When done, just round `ip_len` up to the next multiple of 16.
        // self.padding_overhead.rx_padding_bytes += packet.len() - ip_len.next_multiple_of(16);

Relevant: #79

Code quote:

        // TODO: If we start padding all wg payloads to be multiples of 16 bytes in length
        // as described in section 5.4.6 of the wg whitepaper, then this would count that too.
        // When done, just round `ip_len` up to the next multiple of 16.
        // self.padding_overhead.rx_padding_bytes += packet.len() - ip_len.next_multiple_of(16);

Copy link
Contributor Author

@Serock3 Serock3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Serock3 made 1 comment and resolved 1 discussion.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @Serock3).


gotatun/src/device/daita/hooks.rs line 222 at r2 (raw file):

Previously, MarkusPettersson98 (Markus Pettersson) wrote…

Relevant: #79

Yes, we should make this change in the PR you linked.

Copy link
Contributor

@MarkusPettersson98 MarkusPettersson98 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MarkusPettersson98 reviewed 1 file and all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @Serock3).

@Serock3 Serock3 merged commit d7df781 into main Feb 4, 2026
26 checks passed
@Serock3 Serock3 deleted the rename-daita-concepts-padding-and-blocking-des-2694 branch February 4, 2026 15:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants