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

renewTime, rebindTime should be unsigned long long.

Browse Source 
While we're at it, rearrange the client state struct to
save some space lost to padding.
This commit is contained in:
Nicholas J. Kain 2015-05-27 13:11:23 -04:00
parent abb1b54bfe
commit e02d30dcc5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ndhc.h
View File

@ -35,20 +35,20 @@
#include "nk/random.h" #include "nk/random.h"
struct client_state_t { struct client_state_t {
unsigned long long leaseStartTime; struct nk_random_state_u32 rnd32_state;
unsigned long long leaseStartTime, renewTime, rebindTime;
long long dhcp_wake_ts;
int ifsPrevState; int ifsPrevState;
int ifDeconfig; // Set if the interface has already been deconfigured. int ifDeconfig; // Set if the interface has already been deconfigured.
int epollFd, signalFd, listenFd, arpFd, nlFd, rfkillFd; int epollFd, signalFd, listenFd, arpFd, nlFd, rfkillFd;
int nlPortId; int nlPortId;
unsigned int num_dhcp_requests; unsigned int num_dhcp_requests;
uint32_t clientAddr, serverAddr, srcAddr, routerAddr; uint32_t clientAddr, serverAddr, srcAddr, routerAddr;
uint32_t lease, renewTime, rebindTime, xid; uint32_t lease, xid;
struct nk_random_state_u32 rnd32_state;
uint8_t routerArp[6], serverArp[6]; uint8_t routerArp[6], serverArp[6];
uint8_t using_dhcp_bpf, init, got_router_arp, got_server_arp, uint8_t using_dhcp_bpf, init, got_router_arp, got_server_arp,
check_fingerprint; check_fingerprint;
bool arp_is_defense; bool arp_is_defense;
long long dhcp_wake_ts;
}; };
struct client_config_t { struct client_config_t {