abc/lwip
1
0
Fork 0
mirror of https://git.savannah.nongnu.org/git/lwip.git synced 2025-08-04 13:34:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

pack the fields in dhcp_msg.This way DHCP works on non-byte aligned archs too.

Browse Source
This commit is contained in:
jani 2002-11-15 15:12:49 +00:00
parent 6ef24c4e48
commit 8b9a303e21
1 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/include/lwip/dhcp.h
View File

@ -51,32 +51,32 @@ PACK_STRUCT_BEGIN
// minimum set of fields of any DHCP message // minimum set of fields of any DHCP message
struct dhcp_msg struct dhcp_msg
{ {
u8_t op; PACK_STRUCT_FIELD(u8_t op);
u8_t htype; PACK_STRUCT_FIELD(u8_t htype);
u8_t hlen; PACK_STRUCT_FIELD(u8_t hlen);
u8_t hops; PACK_STRUCT_FIELD(u8_t hops);
u32_t xid; PACK_STRUCT_FIELD(u32_t xid);
u16_t secs; PACK_STRUCT_FIELD(u16_t secs);
u16_t flags; PACK_STRUCT_FIELD(u16_t flags);
u32_t ciaddr; PACK_STRUCT_FIELD(u32_t ciaddr);
u32_t yiaddr; PACK_STRUCT_FIELD(u32_t yiaddr);
u32_t siaddr; PACK_STRUCT_FIELD(u32_t siaddr);
u32_t giaddr; PACK_STRUCT_FIELD(u32_t giaddr);
#define DHCP_CHADDR_LEN 16U #define DHCP_CHADDR_LEN 16U
u8_t chaddr[DHCP_CHADDR_LEN]; PACK_STRUCT_FIELD(u8_t chaddr[DHCP_CHADDR_LEN]);
#define DHCP_SNAME_LEN 64U #define DHCP_SNAME_LEN 64U
u8_t sname[DHCP_SNAME_LEN]; PACK_STRUCT_FIELD(u8_t sname[DHCP_SNAME_LEN]);
#define DHCP_FILE_LEN 128U #define DHCP_FILE_LEN 128U
u8_t file[DHCP_FILE_LEN]; PACK_STRUCT_FIELD(u8_t file[DHCP_FILE_LEN]);
u32_t cookie; PACK_STRUCT_FIELD(u32_t cookie);
#define DHCP_MIN_OPTIONS_LEN 68U #define DHCP_MIN_OPTIONS_LEN 68U
// allow this to be configured in lwipopts.h, but not too small // allow this to be configured in lwipopts.h, but not too small
#if ((!defined(DHCP_OPTIONS_LEN)) || (DHCP_OPTIONS_LEN < DHCP_MIN_OPTIONS_LEN)) #if ((!defined(DHCP_OPTIONS_LEN)) || (DHCP_OPTIONS_LEN < DHCP_MIN_OPTIONS_LEN))
// set this to be sufficient for your options in outgoing DHCP msgs // set this to be sufficient for your options in outgoing DHCP msgs
# define DHCP_OPTIONS_LEN DHCP_MIN_OPTIONS_LEN # define DHCP_OPTIONS_LEN DHCP_MIN_OPTIONS_LEN
#endif #endif
u8_t options[DHCP_OPTIONS_LEN]; PACK_STRUCT_FIELD(u8_t options[DHCP_OPTIONS_LEN]);
}; } PACK_STRUCT_STRUCT;
PACK_STRUCT_END PACK_STRUCT_END
#ifdef PACK_STRUCT_USE_INCLUDES #ifdef PACK_STRUCT_USE_INCLUDES
# include "arch/epstruct.h" # include "arch/epstruct.h"
@ -97,13 +97,11 @@ void dhcp_inform(struct netif *netif);
#if DHCP_DOES_ARP_CHECK #if DHCP_DOES_ARP_CHECK
void dhcp_arp_reply(struct ip_addr *addr); void dhcp_arp_reply(struct ip_addr *addr);
#endif #endif
// to be called regularly
#if (DHCP_TIMER_CALLBACKS == 0)
// to be called every minute // to be called every minute
void dhcp_coarse_tmr(void); void dhcp_coarse_tmr(void);
// to be called every half second // to be called every half second
void dhcp_fine_tmr(void); void dhcp_fine_tmr(void);
#endif
// DHCP message item offsets and length // DHCP message item offsets and length
#define DHCP_MSG_OFS (UDP_DATA_OFS) #define DHCP_MSG_OFS (UDP_DATA_OFS)