T160: nat64: Implement Jool-based NAT64 translator #1993

frebib · 2023-05-10T18:40:03Z

Change Summary

Implement NAT64 using jool following existing nat44 syntax

# https://nicmx.github.io/Jool/en/config-atomic.html#nat64 minimal example
set nat64 source rule 10 description "blah blah"
set nat64 source rule 10 source prefix '64:ffb9::/96'
# TODO global options are not implemented yet
set nat64 source rule 10 option lowest-mtu 1500
# https://nicmx.github.io/Jool/en/usr-flags-pool4.html#options
set nat64 source rule 10 translation pool 1 address '192.168.0.0/24'
set nat64 source rule 10 translation pool 1 port '1-65535'
set nat64 source rule 10 translation pool 1 protocol tcp
set nat64 source rule 10 translation pool 1 protocol udp
set nat64 source rule 10 translation pool 1 protocol icmp
# bib (4->6 DNAT mapping)
# TODO decide config structure

Types of changes

Bug fix (non-breaking change which fixes an issue)
New feature (non-breaking change which adds functionality)
Code style update (formatting, renaming)
Refactoring (no functional changes)
Migration from an old Vyatta component to vyos-1x, please link to related PR inside obsoleted component
Other (please describe):

Related Task(s)

https://vyos.dev/T160

Component(s) name

nat64

Proposed changes

How to test

Checklist:

I have read the CONTRIBUTING document
I have linked this PR to one or more Phabricator Task(s)
I have run the components SMOKETESTS if applicable
My commit headlines contain a valid Task id
My change requires a change to the documentation
I have updated the documentation accordingly

interface-definitions/nat64.xml.in

src/conf_mode/nat64.py

frebib · 2023-05-13T17:01:19Z

Still to do is:

op mode
documentation
nat46 (bib) translation
~~maximum 1 per namespace check~~

Opening this up for review with what there is before I add anything else. I think this works correctly as it is

interface-definitions/include/nat64-protocol.xml.i

src/conf_mode/nat64.py

jack9603301 · 2023-08-20T13:24:32Z

Welcome and look forward to the merger

c-po · 2023-08-20T13:22:01Z

src/conf_mode/nat64.py

+                    config["pool4"] = pool4
+
+            # pylint: disable=invalid-name
+            with open(f"{JOOL_CONFIG_DIR}/{name}.json", "w", encoding="utf-8") as f:


Can you please use vyos.utils.file.read_file() instead?

This is writing a file. I see vyos.utils.file.read_json() but no write_json(). Should I create a write_json() and use that?

Oh sorry, then please use: vyos.utils.file.write_file() instead. Example: https://github.com/vyos/vyos-1x/blob/current/src/conf_mode/container.py#L364

interface-definitions/nat64.xml.in

src/conf_mode/nat64.py

c-po · 2023-08-20T13:27:28Z

src/conf_mode/nat64.py

+from vyos.config import Config
+from vyos.configdict import dict_merge, is_node_changed
+from vyos.util import check_kmod, cmd, dict_search, run
+from vyos.xml import defaults


Why import defaults? I see no reference to <defaultValue> node in your XML definitions.

Almost certainly a copy-paste and me not understanding

Actually, it looks like it's being used here https://github.com/vyos/vyos-1x/pull/1993/files#diff-301b6d4ad94f8356451b06c8710ea3b527e8dba33dc9727cdcb83997c05d8966R49

Should I just remove that defaults block entirely?

If you do not consume any defaults, please drop it

c-po · 2023-08-20T13:28:01Z

Can you please also rebase this code to the latest current HEAD? Other then that it looks like a good start.

Signed-off-by: Joe Groocock <[email protected]>

dmbaturin · 2023-08-31T15:24:43Z

Need to add nftables support and re-evaluate after 1.4 is branched off.

frebib · 2023-08-31T18:23:02Z

jool upstream doesn't support nftables (yet). NICMx/Jool#273 (comment). Netfilter mode is probably the best we can do

I do think it's worth holding on this until nftables support is available. I don't like the current implementation at all. The only reason I didn't just use a container for this is because setting up the routing is hard

github-actions · 2023-10-09T17:30:02Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

sever-sever · 2023-12-02T04:03:01Z

@frebib could you re-base?

Add NAT64 The original PR vyos#1993 There are no responces from the author of PR and PR had conflicts Write fixed for JSON write files and update the base Deleted unused default values Simple changes Example: ``` set nat64 source rule 100 source prefix '64:ff9b::/96' set nat64 source rule 100 translation pool 10 address '192.168.122.10' set nat64 source rule 100 translation pool 10 port '1-65535' ```

sever-sever · 2023-12-05T09:51:24Z

I created a new PR #2573 with the required changes and updated the base.

Add NAT64 The original PR vyos#1993 There are no responces from the author of PR and PR had conflicts Write fixed for JSON write files and update the base Deleted unused default values Simple changes Example: ``` set nat64 source rule 100 source prefix '64:ff9b::/96' set nat64 source rule 100 translation pool 10 address '192.168.122.10' set nat64 source rule 100 translation pool 10 port '1-65535' ```

frebib · 2023-12-05T13:40:52Z

Apologies for the radio silence here, it's a busy time of the year. I probably won't have much time to work on this for the next couple of weeks if you'd still like me to pick anything up here. Alternatively I'm happy for someone else to pick this up. I do feel like my crude implementation needs a lot of work, even if it does work just fine

sever-sever · 2023-12-06T07:38:36Z

I created a new PR #2573 with the required changes and updated the base.

Updated PR #2578

sever-sever · 2023-12-07T07:47:38Z

merged in PR #2578

frebib · 2023-12-07T08:03:43Z

Thanks for pushing this over the line @sever-sever

vyosbot requested review from a team, dmbaturin, sarthurdev, zdc, jestabro, sever-sever and c-po and removed request for a team May 10, 2023 18:41

frebib force-pushed the nat64 branch from 4566b92 to 8ccbfa5 Compare May 10, 2023 18:49

frebib commented May 10, 2023

View reviewed changes

interface-definitions/nat64.xml.in Outdated Show resolved Hide resolved

sever-sever requested changes May 11, 2023

View reviewed changes

interface-definitions/nat64.xml.in Outdated Show resolved Hide resolved

interface-definitions/nat64.xml.in Outdated Show resolved Hide resolved

interface-definitions/nat64.xml.in Outdated Show resolved Hide resolved

src/conf_mode/nat64.py Outdated Show resolved Hide resolved

frebib force-pushed the nat64 branch 2 times, most recently from 884d81e to 1fa6068 Compare May 13, 2023 15:06

frebib changed the title ~~[WIP] nat64: T160: Implement Jool-based NAT64 translator~~ [nat64: T160: Implement Jool-based NAT64 translator May 13, 2023

frebib changed the title ~~[nat64: T160: Implement Jool-based NAT64 translator~~ nat64: T160: Implement Jool-based NAT64 translator May 13, 2023

frebib force-pushed the nat64 branch from 1fa6068 to 2b10e35 Compare May 13, 2023 15:24

frebib marked this pull request as ready for review May 13, 2023 15:32

github-actions bot assigned frebib May 13, 2023

vyosbot requested a review from a team May 13, 2023 15:32

frebib force-pushed the nat64 branch from 2b10e35 to 5ec41a2 Compare May 14, 2023 11:22

frebib changed the title ~~nat64: T160: Implement Jool-based NAT64 translator~~ T160: nat64: Implement Jool-based NAT64 translator May 14, 2023

sever-sever requested changes May 16, 2023

View reviewed changes

interface-definitions/include/nat64-protocol.xml.i Outdated Show resolved Hide resolved

frebib force-pushed the nat64 branch from 5ec41a2 to 4077cc9 Compare May 23, 2023 13:07

c-po force-pushed the current branch from 6a6ea8e to 93724b5 Compare June 29, 2023 07:07

c-po reviewed Aug 20, 2023

View reviewed changes

src/conf_mode/nat64.py Outdated Show resolved Hide resolved

c-po requested changes Aug 20, 2023

View reviewed changes

frebib force-pushed the nat64 branch from 4077cc9 to 3812109 Compare August 20, 2023 13:29

nat64: T160: Implement Jool-based NAT64 translator

fb36b17

Signed-off-by: Joe Groocock <[email protected]>

frebib force-pushed the nat64 branch from 3812109 to fb36b17 Compare August 20, 2023 13:40

c-po added the current label Aug 25, 2023

github-actions bot added the state: conflict label Oct 9, 2023

sever-sever mentioned this pull request Dec 5, 2023

T160: Add NAT64 #2573

Closed

12 tasks

sever-sever closed this Dec 7, 2023

frebib deleted the nat64 branch December 7, 2023 08:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

T160: nat64: Implement Jool-based NAT64 translator #1993

T160: nat64: Implement Jool-based NAT64 translator #1993

frebib commented May 10, 2023 •

edited

Loading

frebib commented May 13, 2023 •

edited

Loading

jack9603301 commented Aug 20, 2023

c-po Aug 20, 2023

frebib Aug 20, 2023

c-po Aug 20, 2023

c-po Aug 20, 2023

frebib Aug 20, 2023

frebib Aug 20, 2023

c-po Aug 20, 2023

c-po commented Aug 20, 2023 •

edited

Loading

dmbaturin commented Aug 31, 2023

frebib commented Aug 31, 2023

github-actions bot commented Oct 9, 2023

sever-sever commented Dec 2, 2023

sever-sever commented Dec 5, 2023

frebib commented Dec 5, 2023

sever-sever commented Dec 6, 2023

sever-sever commented Dec 7, 2023

frebib commented Dec 7, 2023

T160: nat64: Implement Jool-based NAT64 translator #1993

T160: nat64: Implement Jool-based NAT64 translator #1993

Conversation

frebib commented May 10, 2023 • edited Loading

Change Summary

Types of changes

Related Task(s)

Component(s) name

Proposed changes

How to test

Checklist:

frebib commented May 13, 2023 • edited Loading

jack9603301 commented Aug 20, 2023

c-po Aug 20, 2023

Choose a reason for hiding this comment

frebib Aug 20, 2023

Choose a reason for hiding this comment

c-po Aug 20, 2023

Choose a reason for hiding this comment

c-po Aug 20, 2023

Choose a reason for hiding this comment

frebib Aug 20, 2023

Choose a reason for hiding this comment

frebib Aug 20, 2023

Choose a reason for hiding this comment

c-po Aug 20, 2023

Choose a reason for hiding this comment

c-po commented Aug 20, 2023 • edited Loading

dmbaturin commented Aug 31, 2023

frebib commented Aug 31, 2023

github-actions bot commented Oct 9, 2023

sever-sever commented Dec 2, 2023

sever-sever commented Dec 5, 2023

frebib commented Dec 5, 2023

sever-sever commented Dec 6, 2023

sever-sever commented Dec 7, 2023

frebib commented Dec 7, 2023

frebib commented May 10, 2023 •

edited

Loading

frebib commented May 13, 2023 •

edited

Loading

c-po commented Aug 20, 2023 •

edited

Loading