Handle IPX socket 0x553, which is some kind of NetBIOS-over-IPX socket.

[tcpdump] / print-tcp.c

diff --git a/print-tcp.c b/print-tcp.c
index 0f684272f8acc676e62261ac4562d3d593830e97..9cc707fc9297ae89745ef0b95c8fe6f494850386 100644 (file)
--- 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.72 2000-08-01 17:35:05 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-tcp.c,v 1.81 2000-12-23 20:55:22 guy Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -34,10 +34,6 @@ static const char rcsid[] =
 #include <rpc/rpc.h>
 
 #include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_var.h>
-#include <netinet/tcp.h>
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -45,14 +41,17 @@ static const char rcsid[] =
 #include <ctype.h>
 #include <unistd.h>
 
-#ifdef INET6
-#include <netinet/ip6.h>
-#endif
-
 #include "interface.h"
 #include "addrtoname.h"
 #include "extract.h"
 
+#include "tcp.h"
+
+#include "ip.h"
+#ifdef INET6
+#include "ip6.h"
+#endif
+
 static void print_tcp_rst_data(register const u_char *sp, u_int length);
 
 #define MAX_RST_DATA_LEN       30
@@ -130,6 +129,7 @@ static struct tcp_seq_hash tcp_seq_hash[TSEQ_HASHSIZE];
 #define BGP_PORT       179
 #endif
 #define NETBIOS_SSN_PORT 139
+#define BXXP_PORT        10288
 #ifndef NFS_PORT
 #define NFS_PORT       2049
 #endif
@@ -169,7 +169,7 @@ static int tcp_cksum(register const struct ip *ip,
                sum += *sp++;
 
        if (tlen & 1) {
-               sum += htons( (*(const char *)sp) << 8);
+               sum += htons( (*(const u_int8_t *)sp) << 8);
        }
 
        while (sum > 0xffff)
@@ -217,7 +217,7 @@ static int tcp6_cksum(const struct ip6_hdr *ip6, const struct tcphdr *tp,
                sum += *sp++;
 
        if (tlen & 1)
-               sum += htons((*(const char *)sp) << 8);
+               sum += htons((*(const u_int8_t *)sp) << 8);
 
        while (sum > 0xffff)
                sum = (sum & 0xffff) + (sum >> 16);
@@ -229,7 +229,7 @@ static int tcp6_cksum(const struct ip6_hdr *ip6, const struct tcphdr *tp,
 
 void
 tcp_print(register const u_char *bp, register u_int length,
-         register const u_char *bp2)
+         register const u_char *bp2, int fragmented)
 {
        register const struct tcphdr *tp;
        register const struct ip *ip;
@@ -246,7 +246,7 @@ tcp_print(register const u_char *bp, register u_int length,
        tp = (struct tcphdr *)bp;
        ip = (struct ip *)bp2;
 #ifdef INET6
-       if (ip->ip_v == 6)
+       if (IP_V(ip) == 6)
                ip6 = (struct ip6_hdr *)bp2;
        else
                ip6 = NULL;
@@ -263,7 +263,7 @@ tcp_print(register const u_char *bp, register u_int length,
        dport = ntohs(tp->th_dport);
 
 
-       hlen = tp->th_off * 4;
+       hlen = TH_OFF(tp) * 4;
 
        /*
         * If data present and NFS port used, assume NFS.
@@ -319,7 +319,7 @@ tcp_print(register const u_char *bp, register u_int length,
        urp = ntohs(tp->th_urp);
 
        if (qflag) {
-               (void)printf("tcp %d", length - tp->th_off * 4);
+               (void)printf("tcp %d", length - TH_OFF(tp) * 4);
                return;
        }
        if ((flags = tp->th_flags) & (TH_SYN|TH_FIN|TH_RST|TH_PUSH|
@@ -444,7 +444,7 @@ tcp_print(register const u_char *bp, register u_int length,
                return;
        }
 
-       if (ip->ip_v == 4 && vflag) {
+       if (IP_V(ip) == 4 && vflag && !fragmented) {
                int sum;
                if (TTEST2(tp->th_sport, length)) {
                        sum = tcp_cksum(ip, tp, length);
@@ -455,7 +455,7 @@ tcp_print(register const u_char *bp, register u_int length,
                }
        }
 #ifdef INET6
-       if (ip->ip_v == 6 && ip6->ip6_plen && vflag) {
+       if (IP_V(ip) == 6 && ip6->ip6_plen && vflag && !fragmented) {
                int sum;
                if (TTEST2(tp->th_sport, length)) {
                        sum = tcp6_cksum(ip6, tp, length);
@@ -639,7 +639,7 @@ tcp_print(register const u_char *bp, register u_int length,
        /*
         * Decode payload if necessary.
         */
-       bp += (tp->th_off * 4);
+       bp += TH_OFF(tp) * 4;
        if (flags & TH_RST) {
                if (vflag)
                        print_tcp_rst_data(bp, length);
@@ -651,6 +651,8 @@ tcp_print(register const u_char *bp, register u_int length,
                        bgp_print(bp, length);
                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);
        }
        return;
 bad: