From 142673ad6cddf37286ab097c982b31f25c61358c Mon Sep 17 00:00:00 2001
From: Shuotian Cheng <stcheng_89@hotmail.com>
Date: Fri, 2 Sep 2016 14:24:02 -0700
Subject: [PATCH] fpmsyncd: Re-allocating link cache when interface name cannot
 be resolved (#61)

- This happens when the host interfaces change and then we need to update
  the link cache.
- Renaming variables
- Removing unnecessary m_link_cache check
---
 fpmsyncd/routesync.cpp | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/fpmsyncd/routesync.cpp b/fpmsyncd/routesync.cpp
index 1565bc7bf275..afe68bc76b62 100644
--- a/fpmsyncd/routesync.cpp
+++ b/fpmsyncd/routesync.cpp
@@ -25,7 +25,7 @@ void RouteSync::onMsg(int nlmsg_type, struct nl_object *obj)
 {
     struct rtnl_route *route_obj = (struct rtnl_route *)obj;
     struct nl_addr *dip;
-    char addrStr[MAX_ADDR_SIZE + 1] = {0};
+    char ifname[MAX_ADDR_SIZE + 1] = {0};
     uint32_t ipv4;
     int prefix;
 
@@ -33,9 +33,9 @@ void RouteSync::onMsg(int nlmsg_type, struct nl_object *obj)
     /* Supports IPv4 address only for now */
     if (rtnl_route_get_family(route_obj)  != AF_INET)
     {
-        nl_addr2str(dip, addrStr, MAX_ADDR_SIZE);
+        nl_addr2str(dip, ifname, MAX_ADDR_SIZE);
         SWSS_LOG_INFO("%s: Unknown route family support: %s (object: %s)\n",
-                      __FUNCTION__, addrStr, nl_object_get_type(obj));
+                      __FUNCTION__, ifname, nl_object_get_type(obj));
         return;
     }
 
@@ -50,9 +50,9 @@ void RouteSync::onMsg(int nlmsg_type, struct nl_object *obj)
     }
     else if (nlmsg_type != RTM_NEWROUTE)
     {
-        nl_addr2str(dip, addrStr, MAX_ADDR_SIZE);
+        nl_addr2str(dip, ifname, MAX_ADDR_SIZE);
         SWSS_LOG_INFO("%s: Unknown message-type: %d for %s\n",
-                      __FUNCTION__, nlmsg_type, addrStr);
+                      __FUNCTION__, nlmsg_type, ifname);
         return;
     }
 
@@ -72,9 +72,9 @@ void RouteSync::onMsg(int nlmsg_type, struct nl_object *obj)
         case RTN_MULTICAST:
         case RTN_BROADCAST:
         case RTN_LOCAL:
-            nl_addr2str(dip, addrStr, MAX_ADDR_SIZE);
+            nl_addr2str(dip, ifname, MAX_ADDR_SIZE);
             SWSS_LOG_INFO("%s: BUM routes aren't supported yet (%s)\n",
-                          __FUNCTION__, addrStr);
+                          __FUNCTION__, ifname);
             return;
 
         default:
@@ -83,14 +83,14 @@ void RouteSync::onMsg(int nlmsg_type, struct nl_object *obj)
 
     /* Geting nexthop lists */
     string nexthops;
-    string ifindexes;
+    string ifnames;
 
     struct nl_list_head *nhs = rtnl_route_get_nexthops(route_obj);
     if (!nhs)
     {
-        nl_addr2str(dip, addrStr, MAX_ADDR_SIZE);
+        nl_addr2str(dip, ifname, MAX_ADDR_SIZE);
         SWSS_LOG_INFO("%s: Nexthop list is empty for %s\n",
-                      __FUNCTION__, addrStr);
+                      __FUNCTION__, ifname);
         return;
     }
 
@@ -106,27 +106,27 @@ void RouteSync::onMsg(int nlmsg_type, struct nl_object *obj)
             nexthops += nh.to_string();
         }
 
-        /* 0 means no ifindex */
-        if (m_link_cache)
+        rtnl_link_i2name(m_link_cache, ifindex, ifname, MAX_ADDR_SIZE);
+        /* Cannot get ifname. Possibly interfaces get re-created. */
+        if (!strlen(ifname))
         {
-            rtnl_link_i2name(m_link_cache, ifindex, addrStr, MAX_ADDR_SIZE);
-            ifindexes += addrStr;
-        } else
-        {
-            ifindexes += to_string(ifindex);
+            rtnl_link_alloc_cache(m_nl_sock, AF_UNSPEC, &m_link_cache);
+            rtnl_link_i2name(m_link_cache, ifindex, ifname, MAX_ADDR_SIZE);
+            if (!strlen(ifname))
+                strcpy(ifname, "unknown");
         }
-
+        ifnames += ifname;
 
         if (i + 1 < rtnl_route_get_nnexthops(route_obj))
         {
             nexthops += string(",");
-            ifindexes += string(",");
+            ifnames += string(",");
         }
     }
 
     std::vector<FieldValueTuple> fvVector;
     FieldValueTuple nh("nexthop", nexthops);
-    FieldValueTuple idx("ifindex", ifindexes);
+    FieldValueTuple idx("ifname", ifnames);
     fvVector.push_back(nh);
     fvVector.push_back(idx);
     m_routeTable.set(destip.to_string(), fvVector);