fix isakmp version # field handling.

[tcpdump] / isakmp.h

diff --git a/isakmp.h b/isakmp.h
index da793e1ff1749b6ada605c08da63fa8c2900537c..3dfee757197ef97812869eef5a1fe2259aa6ff7d 100644 (file)
--- a/isakmp.h
+++ b/isakmp.h
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
-/* YIPS @(#)$Id: isakmp.h,v 1.4 1999-12-22 06:27:20 itojun Exp $ */
+/* YIPS @(#)$Id: isakmp.h,v 1.5 2000-01-07 14:09:02 itojun Exp $ */
 
 /* refer to RFC 2408 */
 
@@ -101,13 +101,11 @@ struct isakmp {
        cookie_t i_ck;          /* Initiator Cookie */
        cookie_t r_ck;          /* Responder Cookie */
        u_int8_t np;            /* Next Payload Type */
-#if defined(WORDS_BIGENDIAN) || (defined(BYTE_ORDER) && (BYTE_ORDER == BIG_ENDIAN))
-       u_int v_maj:4,          /* MnVer */
-               v_min:4;        /* MjVer */
-#else
-       u_int v_min:4,          /* MnVer */
-               v_maj:4;        /* MjVer */
-#endif
+       u_int8_t vers;
+#define ISAKMP_VERS_MAJOR      0xf0
+#define ISAKMP_VERS_MAJOR_SHIFT        4
+#define ISAKMP_VERS_MINOR      0x0f
+#define ISAKMP_VERS_MINOR_SHIFT        0
        u_int8_t etype;         /* Exchange Type */
        u_int8_t flags;         /* Flags */
        msgid_t msgid;