Use nd_ types, add EXTRACT_ calls.

[tcpdump] / tcp.h

diff --git a/tcp.h b/tcp.h
index 667948d9aa908f93e71589f3e78287c8598e7fa3..a6916052c627fb298db4d865f7a0f14bee32e5aa 100644 (file)
--- a/tcp.h
+++ b/tcp.h
@@ -1,4 +1,3 @@
-/* @(#) $Header: /tcpdump/master/tcpdump/tcp.h,v 1.9 2002-11-09 17:19:32 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,31 +33,34 @@
  *     @(#)tcp.h       8.1 (Berkeley) 6/10/93
  */
 
  *     @(#)tcp.h       8.1 (Berkeley) 6/10/93
  */
 

-typedef        u_int32_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 */
-       tcp_seq         th_seq;                 /* sequence number */
-       tcp_seq         th_ack;                 /* acknowledgement number */
-       u_int8_t        th_offx2;               /* data offset, rsvd */
-#define TH_OFF(th)     (((th)->th_offx2 & 0xf0) >> 4)
-       u_int8_t        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
-#define TH_ECNECHO     0x40    /* ECN Echo */
-#define TH_CWR         0x80    /* ECN Cwnd Reduced */
-       u_int16_t       th_win;                 /* window */
-       u_int16_t       th_sum;                 /* checksum */
-       u_int16_t       th_urp;                 /* urgent pointer */
-} __attribute__((packed));
+       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 */
+} UNALIGNED;
+
+#define TH_OFF(th)     ((EXTRACT_U_1((th)->th_offx2) & 0xf0) >> 4)
+
+/* 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        TCPOPT_EOL              0
 #define        TCPOPT_NOP              1
 
 #define        TCPOPT_EOL              0
 #define        TCPOPT_NOP              1


@@ -75,6 +77,86 @@ struct tcphdr {
 #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_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_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
+#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 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
+#ifndef REDIS_PORT
+#define REDIS_PORT             6379
+#endif