More UNALIGNED_MEM{CPY,CMP} on IP addresses.

[tcpdump] / tcp.h

diff --git a/tcp.h b/tcp.h
index 92d505ae1404e6b4b5f84983b18c25a1ca601734..fbd2f452dc0c53590fc6e995122c331c2e96c482 100644 (file)
--- a/tcp.h
+++ b/tcp.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/tcp.h,v 1.14 2007-12-09 00:30:47 guy Exp $ (LBL) */
 /*
  * Copyright (c) 1982, 1986, 1993
  *     The Regents of the University of California.  All rights reserved.
@@ -49,7 +48,7 @@ struct tcphdr {
        u_int16_t       th_win;                 /* window */
        u_int16_t       th_sum;                 /* checksum */
        u_int16_t       th_urp;                 /* urgent pointer */
-};
+} UNALIGNED;
 
 #define TH_OFF(th)     (((th)->th_offx2 & 0xf0) >> 4)
 
@@ -85,7 +84,8 @@ struct tcphdr {
 #define TCPOPT_AUTH             20      /* Enhanced AUTH option */
 #define        TCPOPT_UTO              28      /* tcp user timeout (rfc5482) */
 #define           TCPOLEN_UTO                  4
-
+#define        TCPOPT_MPTCP            30      /* MPTCP options */
+#define TCPOPT_EXPERIMENT2     254     /* experimental headers (rfc4727) */
 
 #define TCPOPT_TSTAMP_HDR      \
     (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
@@ -97,6 +97,9 @@ struct tcphdr {
 #define BGP_PORT                179
 #endif
 #define NETBIOS_SSN_PORT        139
+#ifndef OPENFLOW_PORT
+#define OPENFLOW_PORT           6633
+#endif
 #ifndef PPTP_PORT
 #define PPTP_PORT              1723
 #endif