Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

6 to 4 & 4 to 6 installs #91

Merged
merged 1 commit into from
May 1, 2020
Merged

6 to 4 & 4 to 6 installs #91

merged 1 commit into from
May 1, 2020

Conversation

zeeshanlakhani
Copy link
Member

Description

two pipelines for eth1 -> eth2 and eth2 -> eth1

Type of change

  • Bug fix

@codecov
Copy link

codecov bot commented May 1, 2020

Codecov Report

Merging #91 into master will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@           Coverage Diff           @@
##           master      #91   +/-   ##
=======================================
  Coverage   66.50%   66.50%           
=======================================
  Files          60       60           
  Lines        4621     4621           
=======================================
  Hits         3073     3073           
  Misses       1548     1548           

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 3d9b0db...5d199e9. Read the comment docs.

@@ -150,28 +150,20 @@ fn nat_6to4(ethernet: Ethernet) -> Fallible<Either<Ethernet>> {
}
}

fn install(qs: HashMap<String, PortQueue>) -> impl Pipeline {
fn install_6_to_4(qs: HashMap<String, PortQueue>) -> impl Pipeline {
Poll::new(qs["eth1"].clone())
.map(|packet| packet.parse::<Ethernet>())
Copy link
Contributor

Choose a reason for hiding this comment

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

this map can be moved into the nat fn. alternatively move the ipv6 parse out of that fn. it's a little inconsistent to be parsing in 2 different places like this.

Copy link
Member Author

Choose a reason for hiding this comment

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

+1

@@ -150,28 +150,20 @@ fn nat_6to4(ethernet: Ethernet) -> Fallible<Either<Ethernet>> {
}
}

fn install(qs: HashMap<String, PortQueue>) -> impl Pipeline {
fn install_6_to_4(qs: HashMap<String, PortQueue>) -> impl Pipeline {
Copy link
Contributor

Choose a reason for hiding this comment

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

name to 6to4 to stay consistent with the other name.

Copy link
Member Author

Choose a reason for hiding this comment

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

oh, yeah, derp.

@@ -53,7 +53,7 @@ The **NAT64** gateway is configured with two ports. `eth1` is the port connected
txd = 512
```

Because they are assigned the same core, we can install a pipeline that forwards packets received on `eth1` through `eth2` by using `add_pipeline_to_core`.
Because they are assigned the same core, we can install pipelines that forward packets received on `eth1` through `eth2` and `eth2` to `eth1` by using `add_pipeline_to_core`.
Copy link
Contributor

Choose a reason for hiding this comment

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

an extra space here in front of "and"

Copy link
Contributor

@drunkirishcoder drunkirishcoder left a comment

Choose a reason for hiding this comment

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

👍 once green

@zeeshanlakhani zeeshanlakhani merged commit aab33fe into master May 1, 2020
@zeeshanlakhani zeeshanlakhani deleted the zl/nat6to4-fix branch May 1, 2020 16:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants