X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/c0af6af3011d4c55bdadf3dd76cd5fc1115c50d0..refs/heads/coverity_scan:/tcp.h

diff --git a/tcp.h b/tcp.h
index e1318f83..6be42737 100644
--- a/tcp.h
+++ b/tcp.h
@@ -49,7 +49,9 @@ struct tcphdr {
 	nd_uint16_t	th_urp;			/* urgent pointer */
 };
 
-#define TH_OFF(th)	((EXTRACT_U_1((th)->th_offx2) & 0xf0) >> 4)
+#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
@@ -60,6 +62,8 @@ struct tcphdr {
 #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
@@ -94,6 +98,9 @@ struct tcphdr {
 #ifndef FTP_PORT
 #define FTP_PORT		21
 #endif
+#ifndef SSH_PORT
+#define SSH_PORT		22
+#endif
 #ifndef TELNET_PORT
 #define TELNET_PORT		23
 #endif
@@ -136,6 +143,9 @@ struct tcphdr {
 #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
@@ -151,6 +161,3 @@ struct tcphdr {
 #ifndef BEEP_PORT
 #define BEEP_PORT		10288
 #endif
-#ifndef REDIS_PORT
-#define REDIS_PORT		6379
-#endif