CHANGES: Add/move change(s) backported to 4.99

[tcpdump] / tcp.h

diff --git a/tcp.h b/tcp.h
index e1318f8344b0281b7efd8319207155c2a3022b97..b1ee4aa95f36a0baf0c62fe2adb443045eb4df31 100644 (file)
--- a/tcp.h
+++ b/tcp.h
@@ -49,7 +49,7 @@ 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)
 
 /* TCP flags */
 #define        TH_FIN     0x01
@@ -94,6 +94,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 +139,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 +157,3 @@ struct tcphdr {
 #ifndef BEEP_PORT
 #define BEEP_PORT              10288
 #endif
-#ifndef REDIS_PORT
-#define REDIS_PORT             6379
-#endif