Merge branch 'master' into add_devenv

sonic-net · Nov 17, 2024 · 45c85ac · 45c85ac
2 parents 155dd26 + 2e2d4e5
commit 45c85ac
Show file tree

Hide file tree

Showing 13 changed files with 4,326 additions and 18 deletions.
diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml
@@ -90,7 +90,7 @@ jobs:
         curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
         sudo apt-add-repository https://packages.microsoft.com/ubuntu/20.04/prod
         sudo apt-get update
-        sudo apt-get install -y dotnet-sdk-7.0
+        sudo apt-get install -y dotnet-sdk-8.0
         sudo dotnet tool install dotnet-reportgenerator-globaltool --tool-path /usr/bin 2>&1 | tee log.log || grep 'already installed' log.log
         rm log.log
     displayName: "Install .NET CORE"

diff --git a/fpmsyncd/fpmlink.cpp b/fpmsyncd/fpmlink.cpp
@@ -43,6 +43,11 @@ bool FpmLink::isRawProcessing(struct nlmsghdr *h)
 
     rtm = (struct rtmsg *)NLMSG_DATA(h);
 
+    if (h->nlmsg_type == RTM_NEWSRV6LOCALSID || h->nlmsg_type == RTM_DELSRV6LOCALSID)
+    {
+        return true;
+    }
+
     if (h->nlmsg_type != RTM_NEWROUTE && h->nlmsg_type != RTM_DELROUTE)
     {
         return false;

diff --git a/fpmsyncd/fpmlink.h b/fpmsyncd/fpmlink.h
@@ -15,6 +15,9 @@
 #include "fpmsyncd/fpminterface.h"
 #include "fpmsyncd/routesync.h"
 
+#define RTM_NEWSRV6LOCALSID		1000
+#define RTM_DELSRV6LOCALSID		1001
+
 namespace swss {
 
 class FpmLink : public FpmInterface {