Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[202311] Backport commit from master into 202311 #49

Merged
merged 2 commits into from
May 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .azure-pipelines/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ jobs:
libnl-nf-3-dev \
libnl-genl-3-dev \
libgmock-dev \
libjsoncpp-dev \
dh-exec \
swig3.0 \
uuid-dev \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion lgtm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ extraction:
- "libnl-nf-3-dev"
- "libnl-genl-3-dev"
- "libgmock-dev"
- "libjsoncpp-dev"
- "dh-exec"
- "swig3.0"
- "uuid-dev"
Expand Down
4 changes: 4 additions & 0 deletions src/config_interface.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading
Loading