X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/956ead6283ec6c97bab30957ef73a843d73b68fc..f0d4fb1e2fa6cc9e81e9c65a1a433951e54bb8ed:/print-tcp.c?ds=sidebyside

diff --git a/print-tcp.c b/print-tcp.c
index 532d7bd8..895be3bf 100644
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -21,7 +21,11 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.58 1999-11-21 03:50:02 assar Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.61 1999-11-22 04:27:10 fenner Exp $ (LBL)";
+#endif
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
 
 #include <sys/param.h>
@@ -104,6 +108,8 @@ struct tcp_seq_hash {
 static struct tcp_seq_hash tcp_seq_hash[TSEQ_HASHSIZE];
 
 
+#define NETBIOS_SSN_PORT 139
+
 void
 tcp_print(register const u_char *bp, register u_int length,
 	  register const u_char *bp2)
@@ -129,18 +135,15 @@ tcp_print(register const u_char *bp, register u_int length,
 		ip6 = NULL;
 #endif /*INET6*/
 	ch = '\0';
-	TCHECK(*tp);
-	if (length < sizeof(*tp)) {
-		(void)printf("truncated-tcp %d", length);
+	if (!TTEST(tp->th_dport)) {
+		(void)printf("%s > %s: [|tcp]",
+			ipaddr_string(&ip->ip_src),
+			ipaddr_string(&ip->ip_dst));
 		return;
 	}
 
 	sport = ntohs(tp->th_sport);
 	dport = ntohs(tp->th_dport);
-	seq = ntohl(tp->th_seq);
-	ack = ntohl(tp->th_ack);
-	win = ntohs(tp->th_win);
-	urp = ntohs(tp->th_urp);
 
 #ifdef INET6
 	if (ip6) {
@@ -169,6 +172,13 @@ tcp_print(register const u_char *bp, register u_int length,
 		}
 	}
 
+	TCHECK(*tp);
+
+	seq = ntohl(tp->th_seq);
+	ack = ntohl(tp->th_ack);
+	win = ntohs(tp->th_win);
+	urp = ntohs(tp->th_urp);
+
 	if (qflag) {
 		(void)printf("tcp %d", length - tp->th_off * 4);
 		return;
@@ -305,7 +315,7 @@ tcp_print(register const u_char *bp, register u_int length,
 		return;
 	}
 	length -= hlen;
-	if (length > 0 || flags & (TH_SYN | TH_FIN | TH_RST))
+	if (vflag > 1 || length > 0 || flags & (TH_SYN | TH_FIN | TH_RST))
 		(void)printf(" %u:%u(%d)", seq, seq + length, length);
 	if (flags & TH_ACK)
 		(void)printf(" ack %u", ack);
@@ -479,6 +489,8 @@ tcp_print(register const u_char *bp, register u_int length,
 	bp += (tp->th_off * 4);
 	if (sport == 179 || dport == 179)
 		bgp_print(bp, length);
+	if (sport == NETBIOS_SSN_PORT || dport == NETBIOS_SSN_PORT)
+		nbt_tcp_print(bp, length);
 	return;
 bad:
 	fputs("[bad opt]", stdout);