Changes to read route tag value from Netlink Message and take appropriate action #3353
There are no files selected for viewing
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
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ | |
| #include "converter.h" | ||
| #include <string.h> | ||
| #include <arpa/inet.h> | ||
| #include <yaml-cpp/yaml.h> | ||
|
|
||
| using namespace std; | ||
| using namespace swss; | ||
|
|
@@ -149,6 +150,20 @@ RouteSync::RouteSync(RedisPipeline *pipeline) : | |
| m_nl_sock = nl_socket_alloc(); | ||
| nl_connect(m_nl_sock, NETLINK_ROUTE); | ||
| rtnl_link_alloc_cache(m_nl_sock, AF_UNSPEC, &m_link_cache); | ||
|
|
||
| YAML::Node root; | ||
| try | ||
| { | ||
| root = YAML::LoadFile("/etc/sonic/constants.yml"); | ||
| route_tag_not_to_appdb = root["constants"]["bgp"]["route_do_not_send_appdb_tag"].as<int>(); | ||
| route_tag_fallback_to_default_route = root["constants"]["bgp"]["route_eligible_for_fallback_to_default_tag"].as<int>(); | ||
| } | ||
| catch (const exception &e) | ||
| { | ||
| cout << "Exception \"" << e.what() << "\" had been thrown in daemon in loading constants.yml" << endl; | ||
| route_tag_not_to_appdb = 0xffffffff; | ||
| route_tag_fallback_to_default_route = 0xffffffff; | ||
| } | ||
| } | ||
|
|
||
| char *RouteSync::prefixMac2Str(char *mac, char *buf, int size) | ||
|
|
@@ -1548,6 +1563,8 @@ void RouteSync::onRouteMsg(int nlmsg_type, struct nl_object *obj, char *vrf) | |
| struct rtnl_route *route_obj = (struct rtnl_route *)obj; | ||
| struct nl_addr *dip; | ||
| char destipprefix[IFNAMSIZ + MAX_ADDR_SIZE + 2] = {0}; | ||
| uint32_t tag = 0; | ||
| bool route_eligible_for_fallback_to_default_route = false; | ||
|
|
||
| if (vrf) | ||
| { | ||
|
|
@@ -1574,6 +1591,13 @@ void RouteSync::onRouteMsg(int nlmsg_type, struct nl_object *obj, char *vrf) | |
| destipprefix[strlen(vrf)] = ':'; | ||
| } | ||
|
|
||
| tag = rtnl_route_get_priority(route_obj); | ||
|
|
||
| if (tag == route_tag_not_to_appdb) | ||
|
There was a problem hiding this comment. As I understand on pizza box, There was a problem hiding this comment. it should not be zero. It always reads from constants.yml. Only time this will be zero in case of fail condition of loading/reading the file. There was a problem hiding this comment.
|
||
| return; | ||
| else if (tag == route_tag_fallback_to_default_route) | ||
| route_eligible_for_fallback_to_default_route = true; | ||
|
|
||
| dip = rtnl_route_get_dst(route_obj); | ||
| nl_addr2str(dip, destipprefix + strlen(destipprefix), MAX_ADDR_SIZE); | ||
|
|
||
|
|
@@ -1714,6 +1738,12 @@ void RouteSync::onRouteMsg(int nlmsg_type, struct nl_object *obj, char *vrf) | |
| fvVector.push_back(wt); | ||
| } | ||
|
|
||
| if (route_eligible_for_fallback_to_default_route) | ||
| { | ||
| FieldValueTuple tag("fallback_to_default_route", "true"); | ||
|
There was a problem hiding this comment. Where is this field processed? There was a problem hiding this comment. @dgsudharsan : Here #3389 |
||
| fvVector.push_back(tag); | ||
| } | ||
|
|
||
| if (!warmRestartInProgress) | ||
| { | ||
| m_routeTable.set(destipprefix, fvVector); | ||
|
|
||
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
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
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please explain motivation for this change?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dgsudharsan : To resolve
lyaml-cppdependency of swss debian package. Asapt installtake care of resolve all dependency