emo/ndhc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check that the return message type is not NLMSG_ERROR when setting

Browse Source 
the ip and broadcast addresses.
This commit is contained in:
Nicholas J. Kain 2014-03-14 23:28:56 -04:00
parent 6a9e8c5a57
commit 8faae4a0fd
1 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
ndhc/ifset.c
View File

@ -113,6 +113,7 @@ void perform_ip_subnet_bcast(const char *str_ipaddr,
uint8_t request[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + uint8_t request[NLMSG_ALIGN(sizeof(struct nlmsghdr)) +
NLMSG_ALIGN(sizeof(struct ifaddrmsg)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg)) +
RTA_LENGTH(sizeof(struct in6_addr))]; RTA_LENGTH(sizeof(struct in6_addr))];
uint8_t response[NLMSG_ALIGN(sizeof(struct nlmsghdr)) + 64];
struct in_addr ipaddr, subnet, bcast; struct in_addr ipaddr, subnet, bcast;
struct sockaddr_nl nl_addr; struct sockaddr_nl nl_addr;
struct nlmsghdr *header; struct nlmsghdr *header;
@ -192,20 +193,44 @@ void perform_ip_subnet_bcast(const char *str_ipaddr,
memset(&nl_addr, 0, sizeof nl_addr); memset(&nl_addr, 0, sizeof nl_addr);
nl_addr.nl_family = AF_NETLINK; nl_addr.nl_family = AF_NETLINK;
retry_sendto: retry_sendto:
r = sendto(nls, request, header->nlmsg_len, 0, r = sendto(nls, request, header->nlmsg_len, 0,
(struct sockaddr *)&nl_addr, sizeof nl_addr); (struct sockaddr *)&nl_addr, sizeof nl_addr);
if (r < 0) { if (r < 0) {
if (errno == EINTR) if (errno == EINTR)
goto retry_sendto; goto retry_sendto;
else { else {
log_line("%s: (%s) netlink sendto socket failed: %s", log_line("%s: (%s) netlink sendto failed: %s",
client_config.interface, __func__, strerror(errno));
close(nls);
return;
}
}
retry_recv:
r = recv(nls, response, sizeof response, 0);
if (r < 0) {
if (errno == EINTR)
goto retry_recv;
else {
log_line("%s: (%s) netlink recv failed: %s",
client_config.interface, __func__, strerror(errno)); client_config.interface, __func__, strerror(errno));
close(nls); close(nls);
return; return;
} }
} }
close(nls); close(nls);
if ((size_t)r < sizeof(struct nlmsghdr)) {
log_line("%s: (%s) netlink recv returned a headerless response",
client_config.interface, __func__);
return;
}
uint32_t nr_type;
memcpy(&nr_type, response + 4, 2);
if (nr_type == NLMSG_ERROR) {
log_line("%s: (%s) netlink sendto returned NLMSG_ERROR",
client_config.interface, __func__);
return;
}
log_line("Interface IP set to: '%s'", str_ipaddr); log_line("Interface IP set to: '%s'", str_ipaddr);
log_line("Interface subnet set to: '%s'", str_subnet); log_line("Interface subnet set to: '%s'", str_subnet);
if (str_bcast) if (str_bcast)