X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/0f328b4aa16b0b47f05a85c440ce1d07719e3cac..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/tcp.h diff --git a/tcp.h b/tcp.h index a6916052..491157b0 100644 --- 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