X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b37cd5e2a6db1ce2ae26803e23afb12453c79a30..f72fe0d0de6eb91663b005b7d061ecebb555d667:/print-tcp.c diff --git a/print-tcp.c b/print-tcp.c index 241d5b0f..cd1299d9 100644 --- a/print-tcp.c +++ b/print-tcp.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] = - "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.89 2001-09-17 20:06:18 fenner Exp $ (LBL)"; + "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.95 2001-12-10 08:21:24 guy Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -95,7 +95,7 @@ static struct tcp_seq_hash tcp_seq_hash[TSEQ_HASHSIZE]; #ifndef PPTP_PORT #define PPTP_PORT 1723 #endif -#define BXXP_PORT 10288 +#define BEEP_PORT 10288 #ifndef NFS_PORT #define NFS_PORT 2049 #endif @@ -212,7 +212,6 @@ tcp_print(register const u_char *bp, register u_int length, sport = ntohs(tp->th_sport); dport = ntohs(tp->th_dport); - hlen = TH_OFF(tp) * 4; /* @@ -418,7 +417,7 @@ tcp_print(register const u_char *bp, register u_int length, length -= hlen; if (vflag > 1 || length > 0 || flags & (TH_SYN | TH_FIN | TH_RST)) - (void)printf(" %u:%u(%d)", seq, seq + length, length); + (void)printf(" %u:%u(%u)", seq, seq + length, length); if (flags & TH_ACK) (void)printf(" ack %u", ack); @@ -600,13 +599,18 @@ tcp_print(register const u_char *bp, register u_int length, bgp_print(bp, length); else if (sport == PPTP_PORT || dport == PPTP_PORT) pptp_print(bp, length); +#ifdef TCPDUMP_DO_SMB else if (sport == NETBIOS_SSN_PORT || dport == NETBIOS_SSN_PORT) nbt_tcp_print(bp, length); - else if (sport == BXXP_PORT || dport == BXXP_PORT) - bxxp_print(bp, length); +#endif + else if (sport == BEEP_PORT || dport == BEEP_PORT) + beep_print(bp, length); else if (length > 2 && (sport == NAMESERVER_PORT || dport == NAMESERVER_PORT)) { - /* TCP DNS query has 2byte length at the head */ + /* + * TCP DNS query has 2byte length at the head. + * XXX packet could be unaligned, it can go strange + */ ns_print(bp + 2, length - 2); } else if (sport == MSDP_PORT || dport == MSDP_PORT) { msdp_print(bp, length);