Avoid -E and -M options inconsistencies with no libcrypto

[tcpdump] / tcp.h

diff --git a/tcp.h b/tcp.h
index 487c166a3ab6f284312265e8ef42464ea6a66668..6be42737f5dda7613a6056683d24c2c0870c1879 100644 (file)
--- a/tcp.h
+++ b/tcp.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/tcp.h,v 1.4 2000-10-03 02:26:53 itojun 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,65 +33,131 @@
  *     @(#)tcp.h       8.1 (Berkeley) 6/10/93
  */
 
  *     @(#)tcp.h       8.1 (Berkeley) 6/10/93
  */
 

-#ifndef BYTE_ORDER
-#define        LITTLE_ENDIAN   1234    /* least-significant byte first (vax, pc) */
-#define        BIG_ENDIAN      4321    /* most-significant byte first (IBM, net) */
-#define        PDP_ENDIAN      3412    /* LSB first in word, MSW first in long (pdp)*/
-
-#ifdef WORDS_BIGENDIAN
-#define BYTE_ORDER     BIG_ENDIAN
-#else
-#define BYTE_ORDER     LITTLE_ENDIAN
-#endif /* WORDS_BIGENDIAN */
-#endif /* BYTE_ORDER */
-
-#if !defined(BYTE_ORDER) || \
-    (BYTE_ORDER != BIG_ENDIAN && BYTE_ORDER != LITTLE_ENDIAN && \
-    BYTE_ORDER != PDP_ENDIAN)
-       /* you must determine what the correct bit order is for
-        * your compiler - the next line is an intentional error
-        * which will force your compiles to bomb until you fix
-        * the above macros.
-        */
-  #error "Undefined or invalid BYTE_ORDER";
-#endif
-
-typedef        u_int   tcp_seq;

 /*
  * TCP header.
  * Per RFC 793, September, 1981.
  */
 struct tcphdr {
 /*
  * TCP header.
  * Per RFC 793, September, 1981.
  */
 struct tcphdr {

-       u_short th_sport;               /* source port */
-       u_short th_dport;               /* destination port */
-       tcp_seq th_seq;                 /* sequence number */
-       tcp_seq th_ack;                 /* acknowledgement number */
-       u_char  th_x2off;
-#define TH_OFF(th)     ((th)->th_x2off & 0x0f) /* data offset, th_off */
-       u_char  th_flags;
-#define        TH_FIN  0x01
-#define        TH_SYN  0x02
-#define        TH_RST  0x04
-#define        TH_PUSH 0x08
-#define        TH_ACK  0x10
-#define        TH_URG  0x20
-       u_short th_win;                 /* window */
-       u_short th_sum;                 /* checksum */
-       u_short th_urp;                 /* urgent pointer */
+       nd_uint16_t     th_sport;               /* source port */
+       nd_uint16_t     th_dport;               /* destination port */
+       nd_uint32_t     th_seq;                 /* sequence number */
+       nd_uint32_t     th_ack;                 /* acknowledgement number */
+       nd_uint8_t      th_offx2;               /* data offset, rsvd */
+       nd_uint8_t      th_flags;
+       nd_uint16_t     th_win;                 /* window */
+       nd_uint16_t     th_sum;                 /* checksum */
+       nd_uint16_t     th_urp;                 /* urgent pointer */

 };
 
 };
 

+#define TH_OFF(th)     ((GET_U_1((th)->th_offx2) & 0xf0) >> 4)
+#define tcp_get_flags(th)      ((GET_U_1((th)->th_flags)) | \
+                       ((GET_U_1((th)->th_offx2) & 0x0f) << 8))
+
+/* TCP flags */
+#define        TH_FIN     0x01
+#define        TH_SYN     0x02
+#define        TH_RST     0x04
+#define        TH_PUSH    0x08
+#define        TH_ACK     0x10
+#define        TH_URG     0x20
+#define TH_ECNECHO 0x40        /* ECN Echo */
+#define TH_CWR    0x80 /* ECN Cwnd Reduced */
+#define        TH_AE     0x100 /* AccECN (draft-ietf-tcpm-accurate-ecn;rfc7560) part of L4S (rfc9330) */
+extern const struct tok tcp_flag_values[];
+
+

 #define        TCPOPT_EOL              0
 #define        TCPOPT_NOP              1
 #define        TCPOPT_MAXSEG           2
 #define    TCPOLEN_MAXSEG              4
 #define        TCPOPT_EOL              0
 #define        TCPOPT_NOP              1
 #define        TCPOPT_MAXSEG           2
 #define    TCPOLEN_MAXSEG              4

-#define TCPOPT_WINDOW          3
-#define    TCPOLEN_WINDOW              3
-#define TCPOPT_SACK_PERMITTED  4               /* Experimental */
-#define    TCPOLEN_SACK_PERMITTED      2
-#define TCPOPT_SACK            5               /* Experimental */
-#define TCPOPT_TIMESTAMP       8
+#define        TCPOPT_WSCALE           3       /* window scale factor (rfc1323) */
+#define        TCPOPT_SACKOK           4       /* selective ack ok (rfc2018) */
+#define        TCPOPT_SACK             5       /* selective ack (rfc2018) */
+#define        TCPOPT_ECHO             6       /* echo (rfc1072) */
+#define        TCPOPT_ECHOREPLY        7       /* echo (rfc1072) */
+#define TCPOPT_TIMESTAMP       8       /* timestamp (rfc1323) */

 #define    TCPOLEN_TIMESTAMP           10
 #define    TCPOLEN_TSTAMP_APPA         (TCPOLEN_TIMESTAMP+2) /* appendix A */
 #define    TCPOLEN_TIMESTAMP           10
 #define    TCPOLEN_TSTAMP_APPA         (TCPOLEN_TIMESTAMP+2) /* appendix A */

+#define TCPOPT_CC              11      /* T/TCP CC options (rfc1644) */
+#define TCPOPT_CCNEW           12      /* T/TCP CC options (rfc1644) */
+#define TCPOPT_CCECHO          13      /* T/TCP CC options (rfc1644) */
+#define TCPOPT_SIGNATURE       19      /* Keyed MD5 (rfc2385) */
+#define    TCPOLEN_SIGNATURE           18
+#define TCP_SIGLEN 16                  /* length of an option 19 digest */
+#define TCPOPT_SCPS            20      /* SCPS-TP (CCSDS 714.0-B-2) */
+#define        TCPOPT_UTO              28      /* tcp user timeout (rfc5482) */
+#define           TCPOLEN_UTO                  4
+#define TCPOPT_TCPAO           29      /* TCP authentication option (rfc5925) */
+#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
+#define TELNET_PORT            23
+#endif
+#ifndef SMTP_PORT
+#define SMTP_PORT              25
+#endif
+#ifndef WHOIS_PORT
+#define WHOIS_PORT             43
+#endif
+#ifndef NAMESERVER_PORT
+#define NAMESERVER_PORT                53
+#endif
+#ifndef HTTP_PORT
+#define HTTP_PORT              80
+#endif
+#ifndef NETBIOS_SSN_PORT
+#define NETBIOS_SSN_PORT       139     /* RFC 1001, RFC 1002 */
+#endif
+#ifndef BGP_PORT
+#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
+#ifndef PPTP_PORT
+#define PPTP_PORT              1723
+#endif
+#ifndef NFS_PORT
+#define NFS_PORT               2049
+#endif
+#ifndef REDIS_PORT
+#define REDIS_PORT             6379
+#endif
+#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