From 4c8836f13985f2e3cfe26398de86065f8bcb3be3 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Sun, 26 Feb 2017 12:18:29 +0200 Subject: [PATCH] FILS: Fix fils_hlp.c build with older netinet/udp.h definitions The __FAVOR_BSD macro was previously used in netinet/udp.h to select between two different names of the variables in struct udphdr. Define that to force the versions with the uh_ prefix. In addition, use the same style consistently within fils_hlp.c. Signed-off-by: Jouni Malinen --- src/ap/fils_hlp.c | 4 ++-- src/common/dhcp.h | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/ap/fils_hlp.c b/src/ap/fils_hlp.c index 40d9be145..3fc872139 100644 --- a/src/ap/fils_hlp.c +++ b/src/ap/fils_hlp.c @@ -269,8 +269,8 @@ static void fils_dhcp_handler(int sd, void *eloop_ctx, void *sock_ctx) udph = wpabuf_put(resp, sizeof(*udph)); udph->uh_sport = htons(DHCP_SERVER_PORT); udph->uh_dport = htons(DHCP_CLIENT_PORT); - udph->len = htons(sizeof(*udph) + (end - pos)); - udph->check = htons(0x0000); /* TODO: calculate checksum */ + udph->uh_ulen = htons(sizeof(*udph) + (end - pos)); + udph->uh_sum = htons(0x0000); /* TODO: calculate checksum */ if (hapd->conf->dhcp_rapid_commit_proxy && msgtype == DHCPACK && !rapid_commit && sta->fils_dhcp_rapid_commit_proxy && end_opt) { /* Add rapid commit option */ diff --git a/src/common/dhcp.h b/src/common/dhcp.h index f2ef61eca..e38512c24 100644 --- a/src/common/dhcp.h +++ b/src/common/dhcp.h @@ -10,7 +10,13 @@ #define DHCP_H #include +#if __FAVOR_BSD #include +#else +#define __FAVOR_BSD 1 +#include +#undef __FAVOR_BSD +#endif #define DHCP_SERVER_PORT 67 #define DHCP_CLIENT_PORT 68