From: Roy Marples <roy@marples.name>
Date: Mon, 16 May 2016 15:19:28 +0000 (+0000)
Subject: More DHCP -> BOOTP.
X-Git-Tag: v6.11.1~46
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f346c6f99e49e4c80963f27044d5b39ba42dd529;p=thirdparty%2Fdhcpcd.git

More DHCP -> BOOTP.
---

diff --git a/dhcp.c b/dhcp.c
index 2579495d..cdfbc941 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -771,7 +771,7 @@ make_message(struct bootp **bootpm, const struct interface *ifp, uint8_t type)
 			bootp->ciaddr = state->addr.s_addr;
 	}
 
-	bootp->op = DHCP_BOOTREQUEST;
+	bootp->op = BOOTREQUEST;
 	bootp->htype = (uint8_t)ifp->family;
 	switch (ifp->family) {
 	case ARPHRD_ETHER:
diff --git a/dhcp.h b/dhcp.h
index 5d4ccf47..388fcec4 100644
--- a/dhcp.h
+++ b/dhcp.h
@@ -38,16 +38,16 @@
 #include "auth.h"
 #include "dhcp-common.h"
 
-/* UDP port numbers for DHCP */
+/* UDP port numbers for BOOTP */
 #define BOOTPS			67
 #define BOOTPC			68
 
 #define MAGIC_COOKIE		0x63825363
 #define BROADCAST_FLAG		0x8000
 
-/* DHCP message OP code */
-#define DHCP_BOOTREQUEST	1
-#define DHCP_BOOTREPLY		2
+/* BOOTP message OP code */
+#define BOOTREQUEST		1
+#define BOOTREPLY		2
 
 /* DHCP message type */
 #define DHCP_DISCOVER		1