summaryrefslogtreecommitdiff
path: root/src/openvpn/dhcp.h
diff options
context:
space:
mode:
authorAlberto Gonzalez Iniesta <agi@inittab.org>2016-12-27 18:25:47 +0100
committerAlberto Gonzalez Iniesta <agi@inittab.org>2016-12-27 18:25:47 +0100
commit79f3537f69e125f19f59c36aa090120a63186a54 (patch)
tree2089a3b7dac990841dbc2e4d9b2f535b82dbb0af /src/openvpn/dhcp.h
parentf2137fedb30cb87448eb03b2f288920df6187571 (diff)
parent3a2bbdb05ca6a6996e424c9fb225cb0d53804125 (diff)
Merge tag 'upstream/2.4.0'
Upstream version 2.4.0
Diffstat (limited to 'src/openvpn/dhcp.h')
-rw-r--r--src/openvpn/dhcp.h50
1 files changed, 25 insertions, 25 deletions
diff --git a/src/openvpn/dhcp.h b/src/openvpn/dhcp.h
index e823a4a..d406870 100644
--- a/src/openvpn/dhcp.h
+++ b/src/openvpn/dhcp.h
@@ -5,7 +5,7 @@
* packet encryption, packet authentication, and
* packet compression.
*
- * Copyright (C) 2002-2010 OpenVPN Technologies, Inc. <sales@openvpn.net>
+ * Copyright (C) 2002-2017 OpenVPN Technologies, Inc. <sales@openvpn.net>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2
@@ -52,36 +52,36 @@
#define BOOTPC_PORT 68
struct dhcp {
-# define BOOTREQUEST 1
-# define BOOTREPLY 2
- uint8_t op; /* message op */
+#define BOOTREQUEST 1
+#define BOOTREPLY 2
+ uint8_t op; /* message op */
- uint8_t htype; /* hardware address type (e.g. '1' = 10Mb Ethernet) */
- uint8_t hlen; /* hardware address length (e.g. '6' for 10Mb Ethernet) */
- uint8_t hops; /* client sets to 0, may be used by relay agents */
- uint32_t xid; /* transaction ID, chosen by client */
- uint16_t secs; /* seconds since request process began, set by client */
- uint16_t flags;
- uint32_t ciaddr; /* client IP address, client sets if known */
- uint32_t yiaddr; /* 'your' IP address -- server's response to client */
- uint32_t siaddr; /* server IP address */
- uint32_t giaddr; /* relay agent IP address */
- uint8_t chaddr[16]; /* client hardware address */
- uint8_t sname[64]; /* optional server host name */
- uint8_t file[128]; /* boot file name */
- uint32_t magic; /* must be 0x63825363 (network order) */
+ uint8_t htype; /* hardware address type (e.g. '1' = 10Mb Ethernet) */
+ uint8_t hlen; /* hardware address length (e.g. '6' for 10Mb Ethernet) */
+ uint8_t hops; /* client sets to 0, may be used by relay agents */
+ uint32_t xid; /* transaction ID, chosen by client */
+ uint16_t secs; /* seconds since request process began, set by client */
+ uint16_t flags;
+ uint32_t ciaddr; /* client IP address, client sets if known */
+ uint32_t yiaddr; /* 'your' IP address -- server's response to client */
+ uint32_t siaddr; /* server IP address */
+ uint32_t giaddr; /* relay agent IP address */
+ uint8_t chaddr[16]; /* client hardware address */
+ uint8_t sname[64]; /* optional server host name */
+ uint8_t file[128]; /* boot file name */
+ uint32_t magic; /* must be 0x63825363 (network order) */
};
struct dhcp_full {
- struct openvpn_iphdr ip;
- struct openvpn_udphdr udp;
- struct dhcp dhcp;
-# define DHCP_OPTIONS_BUFFER_SIZE 256
- uint8_t options[DHCP_OPTIONS_BUFFER_SIZE];
+ struct openvpn_iphdr ip;
+ struct openvpn_udphdr udp;
+ struct dhcp dhcp;
+#define DHCP_OPTIONS_BUFFER_SIZE 256
+ uint8_t options[DHCP_OPTIONS_BUFFER_SIZE];
};
#pragma pack()
-in_addr_t dhcp_extract_router_msg (struct buffer *ipbuf);
+in_addr_t dhcp_extract_router_msg(struct buffer *ipbuf);
-#endif
+#endif /* ifndef DHCP_H */