More DHCP -> BOOTP.

diff --git a/dhcp.c b/dhcp.c
index 2579495dafe5ca5f1e913b82197cd8c74ab24661..cdfbc94127eee59c9cfc0cd5d8b04eb0bc06425b 100644 (file)
--- 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 5d4ccf47ecba479410dba3c051def954a4b8ce5b..388fcec47f8112810564439e3d46757ff24d1ead 100644 (file)
--- 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