update nexthop group support

Signed-off-by: Kanji Nakano <[email protected]>
sonic-net · Nov 20, 2024 · b4472ee · b4472ee
1 parent 7a336d6
commit b4472ee
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/fpmsyncd/routesync.cpp b/fpmsyncd/routesync.cpp
@@ -1513,7 +1513,6 @@ void RouteSync::onMsgRaw(struct nlmsghdr *h)
     )
         return;
 
-
     if(h->nlmsg_type == RTM_NEWNEXTHOP || h->nlmsg_type == RTM_DELNEXTHOP)
     {
         len = (int)(h->nlmsg_len - NLMSG_LENGTH(sizeof(struct nhmsg)));
@@ -1893,8 +1892,12 @@ void RouteSync::onNextHopMsg(struct nlmsghdr *h, int len)
 
     nhm = (struct nhmsg *)NLMSG_DATA(h);
 
-    netlink_parse_rtattr(tb, NHA_MAX, ((struct rtattr *)(((char *)(nhm)) + NLMSG_ALIGN(sizeof(struct nhmsg)))), len);
+    struct rtattr* rta;
+    char* nhm_ptr = (char *)(nhm) + NLMSG_ALIGN(sizeof(struct nhmsg));
 
+    memcpy(&rta, nhm_ptr, sizeof(struct rtattr));
+    netlink_parse_rtattr(tb, NHA_MAX, rta, len);
+
     if (!tb[NHA_ID]) {
         SWSS_LOG_ERROR(
             "Nexthop group without an ID received from the zebra");

diff --git a/fpmsyncd/routesync.h b/fpmsyncd/routesync.h
@@ -183,7 +183,7 @@ class RouteSync : public NetMsg
     uint16_t getEncapType(struct nlmsghdr *h);
 
     const char *mySidAction2Str(uint32_t action);
-#ifdef HAVE_NEXTHOP_GROUP
+
     /* Handle Nexthop message */
     void onNextHopMsg(struct nlmsghdr *h, int len);
     /* Get next hop group key */