chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: fix hello ioctl buffer size calculation
[elogind.git]
/
src
/
libsystemd-dhcp
/
dhcp-protocol.h
diff --git
a/src/libsystemd-dhcp/dhcp-protocol.h
b/src/libsystemd-dhcp/dhcp-protocol.h
index fa077fbf4061cbcfc4bf3ffce4b87b4bf2ceb37a..76621f541ba6160be50c64fb8bee4cc142fa9664 100644
(file)
--- a/
src/libsystemd-dhcp/dhcp-protocol.h
+++ b/
src/libsystemd-dhcp/dhcp-protocol.h
@@
-36,10
+36,10
@@
struct DHCPMessage {
be32_t xid;
be16_t secs;
be16_t flags;
be32_t xid;
be16_t secs;
be16_t flags;
-
uint
32_t ciaddr;
-
uint
32_t yiaddr;
-
uint
32_t siaddr;
-
uint
32_t giaddr;
+
be
32_t ciaddr;
+
be
32_t yiaddr;
+
be
32_t siaddr;
+
be
32_t giaddr;
uint8_t chaddr[16];
uint8_t sname[64];
uint8_t file[128];
uint8_t chaddr[16];
uint8_t sname[64];
uint8_t file[128];
@@
-55,6
+55,10
@@
struct DHCPPacket {
typedef struct DHCPPacket DHCPPacket;
typedef struct DHCPPacket DHCPPacket;
+#define DHCP_IP_SIZE (int32_t)(sizeof(struct iphdr))
+#define DHCP_IP_UDP_SIZE (int32_t)(sizeof(struct udphdr) + DHCP_IP_SIZE)
+#define DHCP_MESSAGE_SIZE (int32_t)(sizeof(DHCPMessage))
+
enum {
DHCP_PORT_SERVER = 67,
DHCP_PORT_CLIENT = 68,
enum {
DHCP_PORT_SERVER = 67,
DHCP_PORT_CLIENT = 68,
@@
-102,9
+106,14
@@
enum {
DHCP_OPTION_DOMAIN_NAME = 15,
DHCP_OPTION_NTP_SERVER = 42,
DHCP_OPTION_REQUESTED_IP_ADDRESS = 50,
DHCP_OPTION_DOMAIN_NAME = 15,
DHCP_OPTION_NTP_SERVER = 42,
DHCP_OPTION_REQUESTED_IP_ADDRESS = 50,
+ DHCP_OPTION_IP_ADDRESS_LEASE_TIME = 51,
DHCP_OPTION_OVERLOAD = 52,
DHCP_OPTION_MESSAGE_TYPE = 53,
DHCP_OPTION_OVERLOAD = 52,
DHCP_OPTION_MESSAGE_TYPE = 53,
+ DHCP_OPTION_SERVER_IDENTIFIER = 54,
DHCP_OPTION_PARAMETER_REQUEST_LIST = 55,
DHCP_OPTION_PARAMETER_REQUEST_LIST = 55,
+ DHCP_OPTION_MAXIMUM_MESSAGE_SIZE = 57,
+ DHCP_OPTION_RENEWAL_T1_TIME = 58,
+ DHCP_OPTION_REBINDING_T2_TIME = 59,
DHCP_OPTION_CLIENT_IDENTIFIER = 61,
DHCP_OPTION_END = 255,
};
DHCP_OPTION_CLIENT_IDENTIFIER = 61,
DHCP_OPTION_END = 255,
};