Ipv4 connectivity #262
Open
Ipv4 connectivity #262
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
- Numeric values have been replaced in the code with the use of this constant. - It would be nice to add the ability to set AS in the configuration file, but this is also used in the cli.
In this commit, only the definition of a new tunnel type has been added, the behavior is still the same as for MPLS over UDP. The implementation of the new behavior is done in the next commit.
In controlplane.conf, it was possible to set static routes for route. Added the ability to also set routes for route tunnel, to do this, set the route: "tunnel": true One can also set the path_information and label parameters. If these parameters are not set, the default values will be used.
- Added comments to some type fields. - Formatting of long function definitions has been changed. - Replaced std::tuple<std::string, uint32_t> with rib:: vrf_priority_t.
When route tunnel is enabled, tunneling will be used for all subnets. But this does not need to be done for local subnets. To do this, the subnet must be set in the localPrefixes section.
The old autotest for ipv4/ipv6 MPLS over UDP has also been simplified.
A similar feature was available in tun64 and balancer. The ipv6 src address from 65 to 96 bits is written to the ipv4 src of the original packet.
stal76
force-pushed
the
ipv4_connectivity
branch
from
f9c068e to
7b034c7
Compare
ol-imorozko
requested changes
Dec 16, 2024
Comment on lines
+122
to
+124
| #define YANET_DEFAULT_BGP_AS ((uint32_t)13238) | ||
| #define YANET_DEFAULT_ROUTE_TUNNEL_LABEL ((uint32_t)3199) | ||
| #define YANET_DEFAULT_ROUTE_TUNNEL_PATH_INFORMATION "127.0.0.1:10000" |
There was a problem hiding this comment.
Suggested change
| #define YANET_DEFAULT_BGP_AS ((uint32_t)13238) | |
| #define YANET_DEFAULT_ROUTE_TUNNEL_LABEL ((uint32_t)3199) | |
| #define YANET_DEFAULT_ROUTE_TUNNEL_PATH_INFORMATION "127.0.0.1:10000" | |
| inline constexpr uint32_t YANET_DEFAULT_BGP_AS = 13238; | |
| inline constexpr uint32_t YANET_DEFAULT_ROUTE_TUNNEL_LABEL = 3199; | |
| inline constexpr auto YANET_DEFAULT_ROUTE_TUNNEL_PATH_INFORMATION = "127.0.0.1:10000"; |
Comment on lines
-5832
to
5835
| else if (flow.type == common::globalBase::eFlowType::route_tunnel) | ||
| else if (flow.type == common::globalBase::eFlowType::route_tunnel || flow.type == common::globalBase::eFlowType::route_tunnel_ipip) | ||
| { | ||
| route_tunnel_entry(mbuf); | ||
| } |
There was a problem hiding this comment.
To be honest, these functions can be greatly simplified if we'll just use switch instead of if-else.
It might even be better from performance point and we can utilize fallthrough instead of else if (a || b)
YANET_NEVER_INLINE void cWorker::slowWorkerFlow(rte_mbuf* mbuf,
const common::globalBase::tFlow& flow)
{
using common::globalBase::eFlowType;
dataplane::metadata* metadata = YADECAP_METADATA(mbuf);
metadata->flow = flow;
switch (flow.type)
{
case eFlowType::acl_ingress:
acl_ingress_entry(mbuf);
break;
case eFlowType::tun64_ipv4_checked:
tun64_ipv4_checked(mbuf);
break;
case eFlowType::tun64_ipv6_checked:
tun64_ipv6_checked(mbuf);
break;
case eFlowType::decap_checked:
decap_entry_checked(mbuf);
break;
case eFlowType::nat64stateless_ingress_checked:
nat64stateless_ingress_entry_checked(mbuf);
break;
case eFlowType::nat64stateless_ingress_icmp:
nat64stateless_ingress_entry_icmp(mbuf);
break;
case eFlowType::nat64stateless_ingress_fragmentation:
nat64stateless_ingress_entry_fragmentation(mbuf);
break;
case eFlowType::nat64stateless_egress_checked:
nat64stateless_egress_entry_checked(mbuf);
break;
case eFlowType::nat64stateless_egress_icmp:
nat64stateless_egress_entry_icmp(mbuf);
break;
case eFlowType::nat64stateless_egress_fragmentation:
nat64stateless_egress_entry_fragmentation(mbuf);
break;
case eFlowType::nat64stateless_egress_farm:
slowWorkerFarmHandleFragment(mbuf);
break;
case eFlowType::route:
route_entry(mbuf);
break;
case eFlowType::route_tunnel:
case eFlowType::route_tunnel_ipip:
route_tunnel_entry(mbuf);
break;
case eFlowType::logicalPort_egress:
logicalPort_egress_entry(mbuf);
break;
case eFlowType::controlPlane:
controlPlane(mbuf);
break;
default:
drop(mbuf);
break;
}
}And same with similar functions
Comment on lines
+1903
to
+1908
| base_rib.is_tunnel = (exist(json_rib_item, "tunnel") && json_rib_item["tunnel"].get<bool>()); | ||
| if (base_rib.is_tunnel) | ||
| { | ||
| base_rib.path_information = (exist(json_rib_item, "path_information") ? json_rib_item["path_information"].get<std::string>() : YANET_DEFAULT_ROUTE_TUNNEL_PATH_INFORMATION); | ||
| base_rib.label = (exist(json_rib_item, "label") ? json_rib_item["label"].get<uint32_t>() : YANET_DEFAULT_ROUTE_TUNNEL_LABEL); | ||
| } |
There was a problem hiding this comment.
nlohman lib has value method for this purpose, to extract value if it exists, or set default value if it does not:
base_rib.is_tunnel = json_rib_item.value("tunnel", false);
if (base_rib.is_tunnel)
{
base_rib.path_information = json_rib_item.value("path_information", YANET_DEFAULT_ROUTE_TUNNEL_PATH_INFORMATION);
base_rib.label = json_rib_item.value("label", YANET_DEFAULT_ROUTE_TUNNEL_LABEL);
}
Comment on lines
+370
to
+373
| if (exist(moduleJson, "random_source")) | ||
| { | ||
| route.random_source = moduleJson["random_source"].get<bool>(); | ||
| } |
There was a problem hiding this comment.
Suggested change
| if (exist(moduleJson, "random_source")) | |
| { | |
| route.random_source = moduleJson["random_source"].get<bool>(); | |
| } | |
| route.random_source = moduleJson.value("random_source", false); |
|
overall LGTM |
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.
The following functionality has been added to this PR: