Shorten a status text description.

[tcpdump] / tcp.h

diff --git a/tcp.h b/tcp.h
index 6b206feb81f728b26f0be28ad15e65bdead984a0..3645486099cc73eb2c0ea3467d3365d5c1585806 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.
@@ -34,22 +33,22 @@
  *     @(#)tcp.h       8.1 (Berkeley) 6/10/93
  */
 
-typedef        u_int32_t       tcp_seq;
+typedef        uint32_t        tcp_seq;
 /*
  * TCP header.
  * Per RFC 793, September, 1981.
  */
 struct tcphdr {
-       u_int16_t       th_sport;               /* source port */
-       u_int16_t       th_dport;               /* destination port */
+       uint16_t        th_sport;               /* source port */
+       uint16_t        th_dport;               /* destination port */
        tcp_seq         th_seq;                 /* sequence number */
        tcp_seq         th_ack;                 /* acknowledgement number */
-       u_int8_t        th_offx2;               /* data offset, rsvd */
-       u_int8_t        th_flags;
-       u_int16_t       th_win;                 /* window */
-       u_int16_t       th_sum;                 /* checksum */
-       u_int16_t       th_urp;                 /* urgent pointer */
-};
+       uint8_t         th_offx2;               /* data offset, rsvd */
+       uint8_t         th_flags;
+       uint16_t        th_win;                 /* window */
+       uint16_t        th_sum;                 /* checksum */
+       uint16_t        th_urp;                 /* urgent pointer */
+} UNALIGNED;
 
 #define TH_OFF(th)     (((th)->th_offx2 & 0xf0) >> 4)
 
@@ -86,6 +85,7 @@ struct tcphdr {
 #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,12 @@ struct tcphdr {
 #define BGP_PORT                179
 #endif
 #define NETBIOS_SSN_PORT        139
+#ifndef OPENFLOW_PORT_OLD
+#define OPENFLOW_PORT_OLD       6633
+#endif
+#ifndef OPENFLOW_PORT_IANA
+#define OPENFLOW_PORT_IANA      6653
+#endif
 #ifndef PPTP_PORT
 #define PPTP_PORT              1723
 #endif