disable smb printing until we have boundary checks in *smb*.c (there's almost

no boundary check).

diff --git a/Makefile.in b/Makefile.in
index 5d514e917127ecb95b983b519255d79a3537994f..dcd8926ca06526114cd0c4ba0cf30d4beb15a015 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -17,7 +17,7 @@
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
 #  WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
 #  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #

-# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.257 2001-10-03 07:35:42 guy Exp $ (LBL)
+# @(#) $Header: /tcpdump/master/tcpdump/Makefile.in,v 1.258 2001-10-04 09:18:45 itojun Exp $ (LBL)

 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)
 
 #
 # Various configurable paths (remember to edit Makefile.in, not Makefile)


@@ -79,11 +79,12 @@ CSRC =      addrtoname.c gmt2local.c machdep.c parsenfsfh.c \
        print-ntp.c print-null.c print-ospf.c print-pim.c \
        print-ppp.c print-pppoe.c print-pptp.c print-radius.c \
        print-raw.c print-rip.c print-rx.c print-sctp.c \
        print-ntp.c print-null.c print-ospf.c print-pim.c \
        print-ppp.c print-pppoe.c print-pptp.c print-radius.c \
        print-raw.c print-rip.c print-rx.c print-sctp.c \

-       print-sl.c print-sll.c print-smb.c print-snmp.c \
+       print-sl.c print-sll.c print-snmp.c \

        print-stp.c print-sunrpc.c print-tcp.c \
        print-telnet.c print-tftp.c print-timed.c print-token.c \
        print-udp.c print-vjc.c print-vrrp.c print-wb.c print-zephyr.c \
        print-stp.c print-sunrpc.c print-tcp.c \
        print-telnet.c print-tftp.c print-timed.c print-token.c \
        print-udp.c print-vjc.c print-vrrp.c print-wb.c print-zephyr.c \

-       setsignal.c smbutil.c tcpdump.c util.c
+       setsignal.c tcpdump.c util.c
+#      print-smb.c smbutil.c

 
 LOCALSRC = @LOCALSRC@
 GENSRC = version.c
 
 LOCALSRC = @LOCALSRC@
 GENSRC = version.c

diff --git a/print-ipx.c b/print-ipx.c
index 413d6ba9c02bcd88227119392449a4d993021e07..7ec9b1b3bc64934062fa13976c28a9097be56b0b 100644 (file)
--- a/print-ipx.c
+++ b/print-ipx.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.30 2001-01-15 03:23:59 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-ipx.c,v 1.31 2001-10-04 09:18:46 itojun Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -108,14 +108,18 @@ ipx_decode(const struct ipxHdr *ipx, const u_char *datap, u_int length)
        break;
       case IPX_SKT_NETBIOS:
        (void)printf(" ipx-netbios %d", length);
        break;
       case IPX_SKT_NETBIOS:
        (void)printf(" ipx-netbios %d", length);

+#if 0

        ipx_netbios_print(datap, length);
        ipx_netbios_print(datap, length);

+#endif

        break;
       case IPX_SKT_DIAGNOSTICS:
        (void)printf(" ipx-diags %d", length);
        break;
       case IPX_SKT_NWLINK_DGM:
        (void)printf(" ipx-nwlink-dgm %d", length);
        break;
       case IPX_SKT_DIAGNOSTICS:
        (void)printf(" ipx-diags %d", length);
        break;
       case IPX_SKT_NWLINK_DGM:
        (void)printf(" ipx-nwlink-dgm %d", length);

+#if 0

        ipx_netbios_print(datap, length);
        ipx_netbios_print(datap, length);

+#endif

        break;
       case IPX_SKT_EIGRP:
        (void)printf(" ipx-eigrp %d", length);
        break;
       case IPX_SKT_EIGRP:
        (void)printf(" ipx-eigrp %d", length);

diff --git a/print-llc.c b/print-llc.c
index 84dbca208d3c9f2df54a94222ea344da818188c3..c70e9288a178b40343d8626d75d5ecb87d71dc5b 100644 (file)
--- a/print-llc.c
+++ b/print-llc.c
@@ -24,7 +24,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.41 2001-09-23 21:52:39 guy Exp $";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-llc.c,v 1.42 2001-10-04 09:18:46 itojun Exp $";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -121,6 +121,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                return (1);
        }
 
                return (1);
        }
 

+#if 0

        if (llc.ssap == LLCSAP_NETBEUI && llc.dsap == LLCSAP_NETBEUI
            && (!(llc.llcu & LLC_S_FMT) || llc.llcu == LLC_U_FMT)) {
                /*
        if (llc.ssap == LLCSAP_NETBEUI && llc.dsap == LLCSAP_NETBEUI
            && (!(llc.llcu & LLC_S_FMT) || llc.llcu == LLC_U_FMT)) {
                /*


@@ -165,6 +166,7 @@ llc_print(const u_char *p, u_int length, u_int caplen,
                netbeui_print(control, p, length);
                return (1);
        }
                netbeui_print(control, p, length);
                return (1);
        }

+#endif

        if (llc.ssap == LLCSAP_ISONS && llc.dsap == LLCSAP_ISONS
            && llc.llcui == LLC_UI) {
                isoclns_print(p + 3, length - 3, caplen - 3, esrc, edst);
        if (llc.ssap == LLCSAP_ISONS && llc.dsap == LLCSAP_ISONS
            && llc.llcui == LLC_UI) {
                isoclns_print(p + 3, length - 3, caplen - 3, esrc, edst);

diff --git a/print-smb.c b/print-smb.c
index 37e54ca9f95580341ea2e8a7ff7a8867a59764ce..0a09e9ccfbd3b642874f800fb515cbcc05285a2f 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -12,7 +12,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-     "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.18 2001-09-17 21:58:04 fenner Exp $";
+     "@(#) $Header: /tcpdump/master/tcpdump/print-smb.c,v 1.19 2001-10-04 09:18:47 itojun Exp $";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -209,7 +209,7 @@ print_trans2(const u_char *words, const u_char *dat, ...)
     }
 
     if (fn->descript.fn)
     }
 
     if (fn->descript.fn)

-       fn->descript.fn(param, data, pcnt, dcnt);
+       (*fn->descript.fn)(param, data, pcnt, dcnt);

     else {
        smb_fdata(param, f1 ? f1 : (u_char *)"Paramaters=\n", param + pcnt);
        smb_fdata(data, f2 ? f2 : (u_char *)"Data=\n", data + dcnt);
     else {
        smb_fdata(param, f1 ? f1 : (u_char *)"Paramaters=\n", param + pcnt);
        smb_fdata(data, f2 ? f2 : (u_char *)"Data=\n", data + dcnt);


@@ -752,7 +752,7 @@ print_smb(const u_char *buf, const u_char *maxbuf)
        }
 
        if (fn->descript.fn)
        }
 
        if (fn->descript.fn)

-           fn->descript.fn(words, data, buf, maxbuf);
+           (*fn->descript.fn)(words, data, buf, maxbuf);

        else {
            if (f1) {
                printf("smbvwv[]=\n");
        else {
            if (f1) {
                printf("smbvwv[]=\n");

diff --git a/print-tcp.c b/print-tcp.c
index 241d5b0f30b4af45379b59d8e6a8b5516f5ae785..45bcd68e47b6008c5c3f0a3f94faa1fc5faad348 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #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.90 2001-10-04 09:18:47 itojun Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -600,8 +600,10 @@ 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);
                        bgp_print(bp, length);
                else if (sport == PPTP_PORT || dport == PPTP_PORT)
                        pptp_print(bp, length);

+#if 0

                else if (sport == NETBIOS_SSN_PORT || dport == NETBIOS_SSN_PORT)
                        nbt_tcp_print(bp, length);
                else if (sport == NETBIOS_SSN_PORT || dport == NETBIOS_SSN_PORT)
                        nbt_tcp_print(bp, length);

+#endif

                else if (sport == BXXP_PORT || dport == BXXP_PORT)
                        bxxp_print(bp, length);
                else if (length > 2 &&
                else if (sport == BXXP_PORT || dport == BXXP_PORT)
                        bxxp_print(bp, length);
                else if (length > 2 &&

diff --git a/print-udp.c b/print-udp.c
index ec2a9655ddffddc974c02d2b9098d54263afa373..82114fe65d7c38c7b57f695ce07dc2fcb04f634a 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -21,7 +21,7 @@
 
 #ifndef lint
 static const char rcsid[] =
 
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.99 2001-09-17 06:22:33 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.100 2001-10-04 09:18:47 itojun Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -630,10 +630,12 @@ udp_print(register const u_char *bp, u_int length,
                        krb_print((const void *)(up + 1), length);
                else if (ISPORT(L2TP_PORT))
                        l2tp_print((const u_char *)(up + 1), length);
                        krb_print((const void *)(up + 1), length);
                else if (ISPORT(L2TP_PORT))
                        l2tp_print((const u_char *)(up + 1), length);

+#if 0

                else if (ISPORT(NETBIOS_NS_PORT))
                        nbt_udp137_print((const u_char *)(up + 1), length);
                else if (ISPORT(NETBIOS_DGRAM_PORT))
                        nbt_udp138_print((const u_char *)(up + 1), length);
                else if (ISPORT(NETBIOS_NS_PORT))
                        nbt_udp137_print((const u_char *)(up + 1), length);
                else if (ISPORT(NETBIOS_DGRAM_PORT))
                        nbt_udp138_print((const u_char *)(up + 1), length);

+#endif

                else if (dport == 3456)
                        vat_print((const void *)(up + 1), length, up);
                else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))
                else if (dport == 3456)
                        vat_print((const void *)(up + 1), length, up);
                else if (ISPORT(ZEPHYR_SRV_PORT) || ISPORT(ZEPHYR_CLT_PORT))