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

udhcp: remove struct packing attribute, eliminates gcc-9.x

Browse Source 
"error: taking address of packed member of 'struct ip_udp_dhcp_packet'
may result in an unaligned pointer value" here:

	udhcp_dump_packet(&packet.data);

and in other places.

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-10-01 23:49:16 +02:00
parent 689d0650ab
commit a90a54aead
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
networking/udhcp/common.h
View File

@ -46,7 +46,7 @@ struct dhcp_packet {
uint8_t file[128]; /* boot file name (ASCIZ) */ uint8_t file[128]; /* boot file name (ASCIZ) */
uint32_t cookie; /* fixed first four option bytes (99,130,83,99 dec) */ uint32_t cookie; /* fixed first four option bytes (99,130,83,99 dec) */
uint8_t options[DHCP_OPTIONS_BUFSIZE + CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS]; uint8_t options[DHCP_OPTIONS_BUFSIZE + CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS];
} PACKED; };
#define DHCP_PKT_SNAME_LEN 64 #define DHCP_PKT_SNAME_LEN 64
#define DHCP_PKT_FILE_LEN 128 #define DHCP_PKT_FILE_LEN 128
#define DHCP_PKT_SNAME_LEN_STR "64" #define DHCP_PKT_SNAME_LEN_STR "64"
@ -56,12 +56,12 @@ struct ip_udp_dhcp_packet {
struct iphdr ip; struct iphdr ip;
struct udphdr udp; struct udphdr udp;
struct dhcp_packet data; struct dhcp_packet data;
} PACKED; };
struct udp_dhcp_packet { struct udp_dhcp_packet {
struct udphdr udp; struct udphdr udp;
struct dhcp_packet data; struct dhcp_packet data;
} PACKED; };
enum { enum {
IP_UDP_DHCP_SIZE = sizeof(struct ip_udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS, IP_UDP_DHCP_SIZE = sizeof(struct ip_udp_dhcp_packet) - CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS,