iptunnel: add support to ipip, ipip6 and ip6ip6 tunnels #167
Conversation
This file contains hidden or 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
Contributor
liangwen12year
commented
May 19, 2025
liangwen12year
commented
liangwen12year
force-pushed
the
ipip_support
branch
4 times, most recently
from
669f960 to
24fa311
Compare
cathay4t
requested changes
May 19, 2025
| )?, | ||
| ))) | ||
| } | ||
| _ => { |
There was a problem hiding this comment.
There is no default in kernel for parsing this:
net/ipv4/ip_tunnel_core.c
1158: if (data[IFLA_IPTUN_FLAGS]) {
1161: flags = nla_get_be16(data[IFLA_IPTUN_FLAGS]);
net/ipv6/ip6_tunnel.c
1992: if (data[IFLA_IPTUN_FLAGS])
1993: parms->flags = nla_get_u32(data[IFLA_IPTUN_FLAGS]);
2104: /* IFLA_IPTUN_FLAGS */
2134: nla_put_u32(skb, IFLA_IPTUN_FLAGS, parm->flags) ||
2170: [IFLA_IPTUN_FLAGS] = { .type = NLA_U32 },
net/ipv6/sit.c
1668: /* IFLA_IPTUN_FLAGS */
1708: nla_put_be16(skb, IFLA_IPTUN_FLAGS,
1748: [IFLA_IPTUN_FLAGS] = { .type = NLA_U16 },
Always do explicit kind matching and fail for unknown kind.
src/link/link_info/iptunnel.rs
Outdated
| Flags(TunnelFlags::from_bits_retain(u32::from( | ||
| parse_u16(payload).context( | ||
| "invalid IFLA_IPTUN_FLAGS value for SIT", | ||
| )?, |
There was a problem hiding this comment.
Instead of storing u16 into u32.
I prefer InfoIpTunnel::Ipv6SitFlags(u16), InfoIpTunnel::Ipv6Flags(u32), InfoIpTunnel::Ipv4Flags(u16).
src/link/link_info/iptunnel.rs
Outdated
| | Ipv6RdRelayPrefixLen(value) => { | ||
| NativeEndian::write_u16(buffer, *value) | ||
| } | ||
| Protocol(value) => buffer[0] = i32::from(*value) as u8, |
There was a problem hiding this comment.
The as is dangerous keyword because it discard data silently.
According to https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml , it is always u8.
So implement From<u8> for IpProtocol there instead of using as. When you do that, please fix src/rule/attribute.rs also.
cathay4t
requested changes
May 19, 2025
All these tunnels use the IFLA_IPTUN_* netlink API. Therefore, both IFLAN_INFO_KIND "ipip" and "ip6tnl" data is serialized using the IpTunnel struct. Unit tests added. Signed-off-by: Fernando Fernandez Mancera <[email protected]>
According to the IANA protocol number specification (https://www.iana.org/assignments/protocol-numbers/protocol-numbers.xhtml), protocol numbers are always within the u8 range. Using `as` for type conversion is dangerous because it can silently discard higher-order data, leading to bugs that are hard to detect. This change ensures all protocol number conversions are type-safe and explicit, avoiding accidental data loss and aligning the code with the protocol specification.
liangwen12year
force-pushed
the
ipip_support
branch
from
24fa311 to
a75e419
Compare
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.