Revert partially the commit 21b1273

[tcpdump] / tcp.h

diff --git a/tcp.h b/tcp.h
index a6916052c627fb298db4d865f7a0f14bee32e5aa..491157b0ae7d8920ff6dc152efeed726746504d3 100644 (file)
--- a/tcp.h
+++ b/tcp.h
@@ -47,9 +47,9 @@ struct tcphdr {
        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)
+#define TH_OFF(th)     ((GET_U_1((th)->th_offx2) & 0xf0) >> 4)
 
 /* TCP flags */
 #define        TH_FIN     0x01
@@ -112,9 +112,6 @@ struct tcphdr {
 #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