Avoiding conditional directives that break statements

[tcpdump] / tcp.h

diff --git a/tcp.h b/tcp.h
index 6b206feb81f728b26f0be28ad15e65bdead984a0..24739622aa16c7298b9b5b530970b5a6a592af7c 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.
 /*
  * 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
  */
 
  *     @(#)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 {
 /*
  * 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 */
        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)
 
 
 #define TH_OFF(th)     (((th)->th_offx2 & 0xf0) >> 4)
 


@@ -86,27 +85,72 @@ struct tcphdr {
 #define        TCPOPT_UTO              28      /* tcp user timeout (rfc5482) */
 #define           TCPOLEN_UTO                  4
 #define        TCPOPT_MPTCP            30      /* MPTCP options */
 #define        TCPOPT_UTO              28      /* tcp user timeout (rfc5482) */
 #define           TCPOLEN_UTO                  4
 #define        TCPOPT_MPTCP            30      /* MPTCP options */

+#define TCPOPT_FASTOPEN                34      /* TCP Fast Open (rfc7413) */
+#define TCPOPT_EXPERIMENT2     254     /* experimental headers (rfc4727) */

 
 #define TCPOPT_TSTAMP_HDR      \
     (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
 
 
 #define TCPOPT_TSTAMP_HDR      \
     (TCPOPT_NOP<<24|TCPOPT_NOP<<16|TCPOPT_TIMESTAMP<<8|TCPOLEN_TIMESTAMP)
 

+#ifndef FTP_PORT
+#define FTP_PORT               21
+#endif
+#ifndef SSH_PORT
+#define SSH_PORT               22
+#endif

 #ifndef TELNET_PORT
 #ifndef TELNET_PORT

-#define TELNET_PORT             23
+#define TELNET_PORT            23
+#endif
+#ifndef SMTP_PORT
+#define SMTP_PORT              25
+#endif
+#ifndef NAMESERVER_PORT
+#define NAMESERVER_PORT                53
+#endif
+#ifndef HTTP_PORT
+#define HTTP_PORT              80
+#endif
+#ifndef NETBIOS_NS_PORT
+#define NETBIOS_NS_PORT                137     /* RFC 1001, RFC 1002 */
+#endif
+#ifndef NETBIOS_SSN_PORT
+#define NETBIOS_SSN_PORT       139     /* RFC 1001, RFC 1002 */

 #endif
 #ifndef BGP_PORT
 #endif
 #ifndef BGP_PORT

-#define BGP_PORT                179
+#define BGP_PORT               179
+#endif
+#ifndef RPKI_RTR_PORT
+#define RPKI_RTR_PORT          323
+#endif
+#ifndef SMB_PORT
+#define SMB_PORT               445
+#endif
+#ifndef RTSP_PORT
+#define RTSP_PORT              554
+#endif
+#ifndef MSDP_PORT
+#define MSDP_PORT              639
+#endif
+#ifndef LDP_PORT
+#define LDP_PORT               646

 #endif
 #endif

-#define NETBIOS_SSN_PORT        139

 #ifndef PPTP_PORT
 #ifndef PPTP_PORT

-#define PPTP_PORT              1723
+#define PPTP_PORT              1723

 #endif
 #endif

-#define BEEP_PORT               10288

 #ifndef NFS_PORT
 #ifndef NFS_PORT

-#define NFS_PORT               2049
+#define NFS_PORT               2049

 #endif
 #endif

-#define MSDP_PORT              639
-#define RPKI_RTR_PORT          323
-#define LDP_PORT                646
-#ifndef SMB_PORT
-#define SMB_PORT                445
+#ifndef OPENFLOW_PORT_OLD
+#define OPENFLOW_PORT_OLD      6633
+#endif
+#ifndef OPENFLOW_PORT_IANA
+#define OPENFLOW_PORT_IANA     6653
+#endif
+#ifndef HTTP_PORT_ALT
+#define HTTP_PORT_ALT          8080
+#endif
+#ifndef RTSP_PORT_ALT
+#define RTSP_PORT_ALT          8554
+#endif
+#ifndef BEEP_PORT
+#define BEEP_PORT              10288

 #endif
 #endif