You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
24 lines
911 B
Diff
24 lines
911 B
Diff
From 7673013d2323834b555052ddbd87381bb5cd7bac Mon Sep 17 00:00:00 2001
|
|
From: Simon Kelley <simon@thekelleys.org.uk>
|
|
Date: Thu, 28 Mar 2019 22:04:10 +0000
|
|
Subject: [PATCH 49/57] Apply fix from c6cc455dd191fbea56ee14a0ef88a7d655a6fe9a
|
|
in DHCP code.
|
|
|
|
Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
|
|
---
|
|
src/dhcp.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/src/dhcp.c
|
|
+++ b/src/dhcp.c
|
|
@@ -401,7 +401,8 @@ void dhcp_packet(time_t now, int pxe_fd)
|
|
pkt = (struct in_pktinfo *)CMSG_DATA(cmptr);
|
|
pkt->ipi_ifindex = rcvd_iface_index;
|
|
pkt->ipi_spec_dst.s_addr = 0;
|
|
- msg.msg_controllen = cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
|
|
+ msg.msg_controllen = CMSG_SPACE(sizeof(struct in_pktinfo));
|
|
+ cmptr->cmsg_len = CMSG_LEN(sizeof(struct in_pktinfo));
|
|
cmptr->cmsg_level = IPPROTO_IP;
|
|
cmptr->cmsg_type = IP_PKTINFO;
|
|
|