When checking for pcap_if_t, add $V_INCLS to CFLAGS, so we look at the

[tcpdump] / bootp.h

diff --git a/bootp.h b/bootp.h
index c8bc49a5b5939936d51914a95aa85a6dbe0b59af..d348379ba91394d6d2a1c523f0a8ea264b69d72d 100644 (file)
--- a/bootp.h
+++ b/bootp.h
@@ -1,4 +1,4 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/bootp.h,v 1.12 2002-11-09 17:19:17 itojun Exp $ (LBL) */
+/* @(#) $Header: /tcpdump/master/tcpdump/bootp.h,v 1.15 2003-07-01 19:16:06 guy Exp $ (LBL) */

 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1048.
  *
 /*
  * Bootstrap Protocol (BOOTP).  RFC951 and RFC1048.
  *


@@ -27,7 +27,7 @@ struct bootp {
        u_int8_t        bp_hops;        /* gateway hops */
        u_int32_t       bp_xid;         /* transaction ID */
        u_int16_t       bp_secs;        /* seconds since boot began */
        u_int8_t        bp_hops;        /* gateway hops */
        u_int32_t       bp_xid;         /* transaction ID */
        u_int16_t       bp_secs;        /* seconds since boot began */

-       u_int16_t       bp_flags;       /* flags: 0x8000 is broadcast */
+       u_int16_t       bp_flags;       /* flags - see bootp_flag_values[] in print-bootp.c */

        struct in_addr  bp_ciaddr;      /* client IP address */
        struct in_addr  bp_yiaddr;      /* 'your' IP address */
        struct in_addr  bp_siaddr;      /* server IP address */
        struct in_addr  bp_ciaddr;      /* client IP address */
        struct in_addr  bp_yiaddr;      /* 'your' IP address */
        struct in_addr  bp_siaddr;      /* server IP address */


@@ -36,7 +36,7 @@ struct bootp {
        u_int8_t        bp_sname[64];   /* server host name */
        u_int8_t        bp_file[128];   /* boot file name */
        u_int8_t        bp_vend[64];    /* vendor-specific area */
        u_int8_t        bp_sname[64];   /* server host name */
        u_int8_t        bp_file[128];   /* boot file name */
        u_int8_t        bp_vend[64];    /* vendor-specific area */

-} __attribute__((packed));
+};

 
 /*
  * UDP port numbers, server and client.
 
 /*
  * UDP port numbers, server and client.


@@ -44,9 +44,8 @@ struct bootp {
 #define        IPPORT_BOOTPS           67
 #define        IPPORT_BOOTPC           68
 
 #define        IPPORT_BOOTPS           67
 #define        IPPORT_BOOTPC           68
 

-#define BOOTREPLY              2
-#define BOOTREQUEST            1
-
+#define BOOTPREPLY             2
+#define BOOTPREQUEST           1

 
 /*
  * Vendor magic cookie (v_magic) for CMU
 
 /*
  * Vendor magic cookie (v_magic) for CMU


@@ -214,7 +213,7 @@ struct cmu_vend {
        struct in_addr  v_ins1, v_ins2; /* IEN-116 name servers */
        struct in_addr  v_ts1, v_ts2;   /* Time servers */
        u_int8_t        v_unused[24];   /* currently unused */
        struct in_addr  v_ins1, v_ins2; /* IEN-116 name servers */
        struct in_addr  v_ts1, v_ts2;   /* Time servers */
        u_int8_t        v_unused[24];   /* currently unused */

-} __attribute__((packed));
+};

 
 
 /* v_flags values */
 
 
 /* v_flags values */