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.

Sign up for GitHub

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

Jump to bottom

[dhcp6relay] Check interface address is not NULL #11359

Merged
merged 2 commits into from
Jul 8, 2022
Merged

[dhcp6relay] Check interface address is not NULL #11359

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
960c9f6
Check interface address exists
jimmyzhai Jul 6, 2022
1b8496d
Should check ifa_addr in if condition
jimmyzhai Jul 7, 2022
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
4 changes: 2 additions & 2 deletions src/dhcp6relay/src/relay.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ void prepare_relay_config(relay_config *interface_config, int *local_sock, int f
}

ifa_tmp = ifa;
while (ifa_tmp) {
while (ifa_tmp && ifa_tmp->ifa_addr) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If the mdio interface(no address interface) is the first node of interface list, all other normal ports will also be skipped. Is this logic correct?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You are right. Fix it by checking it in if condition.

if (ifa_tmp->ifa_addr->sa_family == AF_INET6) {
struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
if((strcmp(ifa_tmp->ifa_name, interface_config->interface.c_str()) == 0) && !IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {
Expand Down Expand Up @@ -401,7 +401,7 @@ void prepare_socket(int *local_sock, int *server_sock, relay_config *config, int
}
else {
ifa_tmp = ifa;
while (ifa_tmp) {
while (ifa_tmp && ifa_tmp->ifa_addr) {
if ((ifa_tmp->ifa_addr->sa_family == AF_INET6) && (strcmp(ifa_tmp->ifa_name, config->interface.c_str()) == 0)) {
struct sockaddr_in6 *in6 = (struct sockaddr_in6*) ifa_tmp->ifa_addr;
if(!IN6_IS_ADDR_LINKLOCAL(&in6->sin6_addr)) {
Expand Down