[202311] Backport commit from master into 202311 (#49)

* Skip vlans with no dhcpv6 server configured (#46) * Revert DHCPv6 Counter (#48) * Revert "[counter] Clear counter table when init (#45)" This reverts commit 5ae186f. * Revert "dhcpv6 per interface counter support (#43)" This reverts commit 2b33d76. * Update buster to bullseye libyang deb --------- Co-authored-by: kellyyeh <[email protected]>
sonic-net · May 31, 2024 · c605cd4 · c605cd4
1 parent 5ae186f
commit c605cd4
Show file tree

Hide file tree

Showing 8 changed files with 158 additions and 648 deletions.
diff --git a/.azure-pipelines/build.yml b/.azure-pipelines/build.yml
@@ -44,7 +44,6 @@ jobs:
           libnl-route-3-dev \
           libnl-genl-3-dev \
           libnl-nf-3-dev \
-          libjsoncpp-dev \
           redis-server
       sudo sed -ri 's/^# unixsocket/unixsocket/' /etc/redis/redis.conf
       sudo sed -ri 's/^unixsocketperm .../unixsocketperm 777/' /etc/redis/redis.conf

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -50,7 +50,6 @@ jobs:
             libnl-nf-3-dev \
             libnl-genl-3-dev \
             libgmock-dev \
-            libjsoncpp-dev \
             dh-exec \
             swig3.0 \
             uuid-dev \

diff --git a/Makefile b/Makefile
@@ -11,7 +11,7 @@ MKDIR := mkdir
 MV := mv
 FIND := find
 GCOVR := gcovr
-override LDLIBS += -levent -lhiredis -lswsscommon -pthread -lboost_thread -lboost_system -ljsoncpp
+override LDLIBS += -levent -lhiredis -lswsscommon -pthread -lboost_thread -lboost_system
 override CPPFLAGS += -Wall -std=c++17 -fPIE -I/usr/include/swss
 override CPPFLAGS += -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@)"
 CPPFLAGS_TEST := --coverage -fprofile-arcs -ftest-coverage -fprofile-generate -fsanitize=address

diff --git a/lgtm.yml b/lgtm.yml
@@ -11,7 +11,6 @@ extraction:
       - "libnl-nf-3-dev"
       - "libnl-genl-3-dev"
       - "libgmock-dev"
-      - "libjsoncpp-dev"
       - "dh-exec"
       - "swig3.0"
       - "uuid-dev"

diff --git a/src/config_interface.cpp b/src/config_interface.cpp
@@ -145,6 +145,10 @@ void processRelayNotification(std::deque<swss::KeyOpFieldsValuesTuple> &entries,
                 intf.is_interface_id = true;
             }
         }
+        if (intf.servers.empty()) {
+            syslog(LOG_WARNING, "No servers found for VLAN %s, skipping configuration.", vlan.c_str());
+            continue;
+        }
         syslog(LOG_INFO, "add %s relay config, option79 %s interface-id %s\n", vlan.c_str(),
                intf.is_option_79 ? "enable" : "disable", intf.is_interface_id ? "enable" : "disable");
         vlans[vlan] = intf;