unkin/tomswall
4
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

Agent: translate the NAT tier into native config #4

Merged
benvin merged 1 commits from benvin/agent-nat into main 2026-07-21 22:30:10 +10:00
Conversation 0 Commits 1 Files Changed 3
+113
unkinben commented 2026-07-21 22:21:25 +10:00
Owner
Copy Link
Copy Source

Why

tomswallapi now renders the NAT tier (snat/masquerade, netmap, 1:1 nat) into per-device configs. The agent must map those rendered sections into native tomswall config so they are actually applied.

Changes

  • Add RenderedSNAT/RenderedNetmap/RenderedNAT to the agent's rendered-config types.
  • Translate them in the agent: snat/masquerade → config.SNAT (expanding the egress-interface list and source CIDRs into one native rule per (egress, source) pair, since a native SNAT rule takes a single dest; carries address/probability); netmap → config.Netmap; 1:1 nat → config.StaticNAT.
  • Unit test covering the full RenderedConfig → config.Config mapping for all three.

Pairs with

tomswallapi #6 (compiler renders the NAT tier).

## Why tomswallapi now renders the NAT tier (snat/masquerade, netmap, 1:1 nat) into per-device configs. The agent must map those rendered sections into native tomswall config so they are actually applied. ## Changes - Add RenderedSNAT/RenderedNetmap/RenderedNAT to the agent's rendered-config types. - Translate them in the agent: snat/masquerade → config.SNAT (expanding the egress-interface list and source CIDRs into one native rule per (egress, source) pair, since a native SNAT rule takes a single dest; carries address/probability); netmap → config.Netmap; 1:1 nat → config.StaticNAT. - Unit test covering the full RenderedConfig → config.Config mapping for all three. ## Pairs with tomswallapi #6 (compiler renders the NAT tier).
unkinben added 1 commit 2026-07-21 22:21:25 +10:00
Agent: translate the NAT tier into native config
ci/woodpecker/pr/build Pipeline was successful
Details
ci/woodpecker/pr/test Pipeline was successful
Details
ci/woodpecker/pr/pre-commit Pipeline was successful
Details
06928bc150 
The agent now maps the rendered NAT sections into native tomswall config:
- snat/masquerade -> config.SNAT, expanding a rendered rule's egress interface
  list and source CIDRs into one native rule per (egress, source) pair (a native
  SNAT rule takes a single dest interface); carries address/probability.
- netmap -> config.Netmap (from_net/to_net -> net1/net2 on the resolved interface).
- 1:1 nat -> config.StaticNAT.
Unit-tested end to end from RenderedConfig to config.Config.
benvin merged commit 17b2130047 into main 2026-07-21 22:30:10 +10:00
benvin deleted branch benvin/agent-nat 2026-07-21 22:30:10 +10:00
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
Clear labels
bug
Something is not working
 duplicate
This issue or pull request already exists
 enhancement
New feature
 help wanted
Need some help
 invalid
Something is wrong
 question
More information is needed
 wontfix
This won't be fixed
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
benvin (BenVincent) unkin-agent (Unkin Agent) unkinben (Ben Vincent)
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: unkin/tomswall#4
Delete Branch "benvin/agent-nat"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?