diff options
| author | Tim Foster <tim.foster@joyent.com> | 2019-10-25 13:00:51 +0000 |
|---|---|---|
| committer | Tim Foster <tim.foster@joyent.com> | 2019-10-25 13:00:51 +0000 |
| commit | d86c9e6d4e922c695bb2793dddf0ea48d61ca963 (patch) | |
| tree | 50a63b04f1ec2b82b50a21df278acff3f24b364e /usr/src/lib/libdhcpagent/common | |
| parent | 29de67cafe15bb9e2c61bd58e6183182a7735036 (diff) | |
| parent | 7284664a1faa361af4ff33ba5435d43d3ee07bf2 (diff) | |
| download | illumos-joyent-d86c9e6d4e922c695bb2793dddf0ea48d61ca963.tar.gz | |
[illumos-gate merge]
commit 7284664a1faa361af4ff33ba5435d43d3ee07bf2
11816 iscsi initiator gets confused if attached before root file system mount
commit 55908bd733fe029d49237b91c700655997242419
11843 update Intel microcode to 20190918
commit b9c9c3595312927fb362936529c5679117843b93
11826 Buffer overflow and memory leak in "libbsm"
commit 78a2e113edb6fe0a0382b403b55d92e8f0bba78f
9531 Want netstat -u to show PIDs associated with sockets
11707 provide 64-bit libdhcpagent
11708 netstat should be smatch and CERRWARN clean
Conflicts:
usr/src/data/ucode/Makefile
usr/src/data/ucode/README.ucode
usr/src/data/ucode/intel/000206D6-01
usr/src/data/ucode/intel/000206D7-01
usr/src/data/ucode/intel/000306D4-40
usr/src/data/ucode/intel/000306F4-80
usr/src/data/ucode/intel/00040671-02
usr/src/data/ucode/intel/000406F1-01
usr/src/data/ucode/intel/00050654-01
usr/src/data/ucode/intel/00050657-01
usr/src/data/ucode/intel/00050662-10
usr/src/data/ucode/intel/00050663-10
usr/src/data/ucode/intel/00050664-10
usr/src/data/ucode/intel/00050665-10
usr/src/data/ucode/intel/000506CA-01
Diffstat (limited to 'usr/src/lib/libdhcpagent/common')
| -rw-r--r-- | usr/src/lib/libdhcpagent/common/dhcpagent_ipc.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.h b/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.h index be2da33666..beed5b1ffc 100644 --- a/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.h +++ b/usr/src/lib/libdhcpagent/common/dhcpagent_ipc.h @@ -24,6 +24,7 @@ */ /* * Copyright (c) 2013, 2015 by Delphix. All rights reserved. + * Copyright 2019 OmniOS Community Edition (OmniOSce) Association. */ #ifndef _DHCPAGENT_IPC_H @@ -92,7 +93,7 @@ typedef enum { typedef enum { DHCP_DROP, DHCP_EXTEND, DHCP_PING, DHCP_RELEASE, - DHCP_START, DHCP_STATUS, DHCP_INFORM, DHCP_GET_TAG, + DHCP_START, DHCP_STATUS, DHCP_INFORM, DHCP_GET_TAG, DHCP_NIPC, /* number of supported requests */ DHCP_PRIMARY = 0x100, DHCP_V6 = 0x200 @@ -219,10 +220,16 @@ typedef struct dhcp_status { char if_name[LIFNAMSIZ]; DHCPSTATE if_state; /* state of interface; see above */ - time_t if_began; /* time lease began (absolute) */ - time_t if_t1; /* renewing time (absolute) */ - time_t if_t2; /* rebinding time (absolute) */ - time_t if_lease; /* lease expiration time (absolute) */ + /* + * We use int64_t here so that the structure is the same in both + * 32 and 64-bit, since it is passed via IPC. + * Once everything that uses this is 64-bit, these could be changed + * to time_t. + */ + int64_t if_began; /* time lease began (absolute) */ + int64_t if_t1; /* renewing time (absolute) */ + int64_t if_t2; /* rebinding time (absolute) */ + int64_t if_lease; /* lease expiration time (absolute) */ uint16_t if_dflags; /* DHCP flags on this if; see above */ |