filter, action: Add support for tunnel_key #499
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
LGTM |
zhiyuan0x
force-pushed
the
feature/tunnel_key
branch
2 times, most recently
from
af98a13
to
0677801
Compare
|
@vishvananda @aboch can this PR be merged? thanks. |
aboch
reviewed
Nov 27, 2019
filter_linux.go
Outdated
| if v4 := action.SrcAddr.To4(); v4 != nil { | ||
| aopts.AddRtAttr(nl.TCA_TUNNEL_KEY_ENC_IPV4_SRC, v4[:]) | ||
| } else { | ||
| aopts.AddRtAttr(nl.TCA_TUNNEL_KEY_ENC_IPV6_SRC, action.SrcAddr.To16()[:]) |
There was a problem hiding this comment.
Why To16() if you already know it is a IPv6 address?
https://golang.org/src/net/ip.go?s=5477:5499#L199
There was a problem hiding this comment.
I have fixed it. thanks.
Signed-off-by: Zhiyuan Hou <[email protected]>
zhiyuan0x
force-pushed
the
feature/tunnel_key
branch
from
0677801
to
1857744
Compare
|
@aboch fixed it. thanks. |
aboch
reviewed
Dec 2, 2019
| aopts.AddRtAttr(nl.TCA_TUNNEL_KEY_ENC_KEY_ID, htonl(action.KeyID)) | ||
| if v4 := action.SrcAddr.To4(); v4 != nil { | ||
| aopts.AddRtAttr(nl.TCA_TUNNEL_KEY_ENC_IPV4_SRC, v4[:]) | ||
| } else if v6 := action.SrcAddr.To16(); v6 != nil { |
There was a problem hiding this comment.
@aboch In golang, ip address is a simple slice and does not have an address family flag. So if IP.To4() return a nil and IP.To16() reutrn a not nil, It should be ipv6 address.
This is a similar code: https://golang.org/src/net/ip.go#L420 .
|
LGTM |
zhiyuan0x
pushed a commit
to zhiyuan0x/terway
that referenced
this pull request
Dec 9, 2019
The PR vishvananda/netlink#499 has been merged, update vendor to point new commit. Signed-off-by: Zhiyuan Hou <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Add support for tunnel_key