SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-dhcp-server: use CMSG_FIND_DATA() at one more place

Browse Source
This commit is contained in:
Yu Watanabe
2023-04-16 13:26:58 +09:00
parent 789f5c6f70
commit 1ebb0953f0
1 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/sd-dhcp-server.c
+4 -14
View File
@@ -1270,7 +1270,6 @@ static int server_receive_message(sd_event_source *s, int fd,
.msg_control = &control,
.msg_controllen = sizeof(control),
};
struct cmsghdr *cmsg;
ssize_t datagram_size, len;
int r;
@@ -1306,19 +1305,10 @@ static int server_receive_message(sd_event_source *s, int fd,
if ((size_t) len < sizeof(DHCPMessage))
return 0;
CMSG_FOREACH(cmsg, &msg)
if (cmsg->cmsg_level == IPPROTO_IP &&
cmsg->cmsg_type == IP_PKTINFO &&
cmsg->cmsg_len == CMSG_LEN(sizeof(struct in_pktinfo))) {
struct in_pktinfo *info = CMSG_TYPED_DATA(cmsg, struct in_pktinfo);
/* TODO figure out if this can be done as a filter on
* the socket, like for IPv6 */
if (server->ifindex != info->ipi_ifindex)
return 0;
break;
}
/* TODO figure out if this can be done as a filter on the socket, like for IPv6 */
struct in_pktinfo *info = CMSG_FIND_DATA(&msg, IPPROTO_IP, IP_PKTINFO, struct in_pktinfo);
if (info && info->ipi_ifindex != server->ifindex)
return 0;
if (sd_dhcp_server_is_in_relay_mode(server)) {
r = dhcp_server_relay_message(server, message, len - sizeof(DHCPMessage), buflen);