changed bootp decoder for multiline output, fixed segfault referencing NULL pointer

diff --git a/interface.h b/interface.h
index d115fec3f0f548fdb37994f400790dcce7643a84..439854f3889bf282224ef39923701b3a39327dde 100644 (file)
--- a/interface.h
+++ b/interface.h
@@ -18,7 +18,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/interface.h,v 1.197 2002-11-07 20:07:58 hannes Exp $ (LBL)
+ * @(#) $Header: /tcpdump/master/tcpdump/interface.h,v 1.198 2002-12-04 19:09:30 hannes Exp $ (LBL)

  */
 
 #ifndef tcpdump_interface_h
  */
 
 #ifndef tcpdump_interface_h


@@ -207,7 +207,7 @@ extern void atalk_print(const u_char *, u_int);
 extern void atm_print(u_int, u_int, u_int, const u_char *, u_int, u_int);
 extern void atm_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void sunatm_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void atm_print(u_int, u_int, u_int, const u_char *, u_int, u_int);
 extern void atm_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);
 extern void sunatm_if_print(u_char *, const struct pcap_pkthdr *, const u_char *);

-extern void bootp_print(const u_char *, u_short, u_short);
+extern void bootp_print(const u_char *, u_short, u_short, u_int);

 extern void bgp_print(const u_char *, int);
 extern void beep_print(const u_char *, u_int);
 extern void cnfp_print(const u_char *, const u_char *);
 extern void bgp_print(const u_char *, int);
 extern void beep_print(const u_char *, u_int);
 extern void cnfp_print(const u_char *, const u_char *);

diff --git a/print-bootp.c b/print-bootp.c
index daa69aadce18914c6a8ff7ac6faaeeaae2b5e3ea..cf8bdc9c74a289a2f1e8929ed2abadaf099e0277 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -22,7 +22,7 @@
  */
 #ifndef lint
 static const char rcsid[] =
  */
 #ifndef lint
 static const char rcsid[] =

-    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.66 2002-09-05 21:25:38 guy Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-bootp.c,v 1.67 2002-12-04 19:09:29 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -49,71 +49,77 @@ static char tstr[] = " [|bootp]";
  * Print bootp requests
  */
 void
  * Print bootp requests
  */
 void

-bootp_print(register const u_char *cp, u_short sport, u_short dport)
+bootp_print(register const u_char *cp, u_short sport, u_short dport, u_int length)

 {
        register const struct bootp *bp;
        static const u_char vm_cmu[4] = VM_CMU;
        static const u_char vm_rfc1048[4] = VM_RFC1048;
 
 {
        register const struct bootp *bp;
        static const u_char vm_cmu[4] = VM_CMU;
        static const u_char vm_rfc1048[4] = VM_RFC1048;
 

+        printf("BOOTP/DHCP, length: %u",length);
+
+        if (!vflag)
+            return;
+

        bp = (const struct bootp *)cp;
        TCHECK(bp->bp_op);
        switch (bp->bp_op) {
 
        case BOOTREQUEST:
                /* Usually, a request goes from a client to a server */
        bp = (const struct bootp *)cp;
        TCHECK(bp->bp_op);
        switch (bp->bp_op) {
 
        case BOOTREQUEST:
                /* Usually, a request goes from a client to a server */

-               if (sport != IPPORT_BOOTPC || dport != IPPORT_BOOTPS)
-                       printf(" (request)");
+               if (sport == IPPORT_BOOTPC && dport == IPPORT_BOOTPS)
+                       printf("\n\tRequest");

                break;
 
        case BOOTREPLY:
                /* Usually, a reply goes from a server to a client */
                break;
 
        case BOOTREPLY:
                /* Usually, a reply goes from a server to a client */

-               if (sport != IPPORT_BOOTPS || dport != IPPORT_BOOTPC)
-                       printf(" (reply)");
+               if (sport == IPPORT_BOOTPS && dport == IPPORT_BOOTPC)
+                       printf("\n\tReply");

                break;
 
        default:
                break;
 
        default:

-               printf(" bootp-#%d", bp->bp_op);
+               printf("\n\tbootp-#%d", bp->bp_op);
+                break;

        }
 
        TCHECK(bp->bp_secs);
 
        /* The usual hardware address type is 1 (10Mb Ethernet) */
        if (bp->bp_htype != 1)
        }
 
        TCHECK(bp->bp_secs);
 
        /* The usual hardware address type is 1 (10Mb Ethernet) */
        if (bp->bp_htype != 1)

-               printf(" htype-#%d", bp->bp_htype);
+               printf(", htype-#%d", bp->bp_htype);

 
        /* The usual length for 10Mb Ethernet address is 6 bytes */
        if (bp->bp_htype != 1 || bp->bp_hlen != 6)
 
        /* The usual length for 10Mb Ethernet address is 6 bytes */
        if (bp->bp_htype != 1 || bp->bp_hlen != 6)

-               printf(" hlen:%d", bp->bp_hlen);
+               printf(", hlen:%d", bp->bp_hlen);

 
        /* Only print interesting fields */
        if (bp->bp_hops)
 
        /* Only print interesting fields */
        if (bp->bp_hops)

-               printf(" hops:%d", bp->bp_hops);
+               printf(", hops:%d", bp->bp_hops);

        if (bp->bp_xid)
        if (bp->bp_xid)

-               printf(" xid:0x%x", (u_int32_t)ntohl(bp->bp_xid));
+               printf(", xid:0x%x", (u_int32_t)ntohl(bp->bp_xid));

        if (bp->bp_secs)
        if (bp->bp_secs)

-               printf(" secs:%d", ntohs(bp->bp_secs));
+               printf(", secs:%d", ntohs(bp->bp_secs));

        if (bp->bp_flags)
        if (bp->bp_flags)

-               printf(" flags:0x%x", ntohs(bp->bp_flags));
+               printf(", flags:0x%x", ntohs(bp->bp_flags));

 
        /* Client's ip address */
        TCHECK(bp->bp_ciaddr);
        if (bp->bp_ciaddr.s_addr)
 
        /* Client's ip address */
        TCHECK(bp->bp_ciaddr);
        if (bp->bp_ciaddr.s_addr)

-               printf(" C:%s", ipaddr_string(&bp->bp_ciaddr));
+               printf("\n\t  Client IP: %s", ipaddr_string(&bp->bp_ciaddr));

 
        /* 'your' ip address (bootp client) */
        TCHECK(bp->bp_yiaddr);
        if (bp->bp_yiaddr.s_addr)
 
        /* 'your' ip address (bootp client) */
        TCHECK(bp->bp_yiaddr);
        if (bp->bp_yiaddr.s_addr)

-               printf(" Y:%s", ipaddr_string(&bp->bp_yiaddr));
+               printf("\n\t  Your IP: %s", ipaddr_string(&bp->bp_yiaddr));

 
        /* Server's ip address */
        TCHECK(bp->bp_siaddr);
        if (bp->bp_siaddr.s_addr)
 
        /* Server's ip address */
        TCHECK(bp->bp_siaddr);
        if (bp->bp_siaddr.s_addr)

-               printf(" S:%s", ipaddr_string(&bp->bp_siaddr));
+               printf("\n\t  Server IP: %s", ipaddr_string(&bp->bp_siaddr));

 
        /* Gateway's ip address */
        TCHECK(bp->bp_giaddr);
        if (bp->bp_giaddr.s_addr)
 
        /* Gateway's ip address */
        TCHECK(bp->bp_giaddr);
        if (bp->bp_giaddr.s_addr)

-               printf(" G:%s", ipaddr_string(&bp->bp_giaddr));
+               printf("\n\t  Gateway IP: %s", ipaddr_string(&bp->bp_giaddr));

 
        /* Client's Ethernet address */
        if (bp->bp_htype == 1 && bp->bp_hlen == 6) {
 
        /* Client's Ethernet address */
        if (bp->bp_htype == 1 && bp->bp_hlen == 6) {


@@ -127,14 +133,14 @@ bootp_print(register const u_char *cp, u_short sport, u_short dport)
                else if (bp->bp_op == BOOTREPLY)
                        e = (const char *)EDST(eh);
                else
                else if (bp->bp_op == BOOTREPLY)
                        e = (const char *)EDST(eh);
                else

-                       e = 0;
-               if (e == 0 || memcmp((const char *)bp->bp_chaddr, e, 6) != 0)
-                       printf(" ether %s", etheraddr_string(bp->bp_chaddr));
+                       e = NULL;
+               if ( bp->bp_chaddr != NULL )
+                    printf("\n\t  Client Ethernet Address: %s", etheraddr_string(bp->bp_chaddr));

        }
 
        TCHECK2(bp->bp_sname[0], 1);            /* check first char only */
        if (*bp->bp_sname) {
        }
 
        TCHECK2(bp->bp_sname[0], 1);            /* check first char only */
        if (*bp->bp_sname) {

-               printf(" sname \"");
+               printf("\n\t  sname \"");

                if (fn_print(bp->bp_sname, snapend)) {
                        putchar('"');
                        fputs(tstr + 1, stdout);
                if (fn_print(bp->bp_sname, snapend)) {
                        putchar('"');
                        fputs(tstr + 1, stdout);


@@ -144,7 +150,7 @@ bootp_print(register const u_char *cp, u_short sport, u_short dport)
        }
        TCHECK2(bp->bp_sname[0], 1);            /* check first char only */
        if (*bp->bp_file) {
        }
        TCHECK2(bp->bp_sname[0], 1);            /* check first char only */
        if (*bp->bp_file) {

-               printf(" file \"");
+               printf("\n\t  file \"");

                if (fn_print(bp->bp_file, snapend)) {
                        putchar('"');
                        fputs(tstr + 1, stdout);
                if (fn_print(bp->bp_file, snapend)) {
                        putchar('"');
                        fputs(tstr + 1, stdout);


@@ -166,7 +172,7 @@ bootp_print(register const u_char *cp, u_short sport, u_short dport)
 
                ul = EXTRACT_32BITS(&bp->bp_vend);
                if (ul != 0)
 
                ul = EXTRACT_32BITS(&bp->bp_vend);
                if (ul != 0)

-                       printf("vend-#0x%x", ul);
+                       printf("\n\t  Vendor-#0x%x", ul);

        }
 
        return;
        }
 
        return;


@@ -349,7 +355,7 @@ rfc1048_print(register const u_char *bp)
        u_int16_t us;
        u_int8_t uc;
 
        u_int16_t us;
        u_int8_t uc;
 

-       printf(" vend-rfc1048");
+       printf("\n\t  Vendor-rfc1048:");

 
        /* Step over magic cookie */
        bp += sizeof(int32_t);
 
        /* Step over magic cookie */
        bp += sizeof(int32_t);


@@ -372,7 +378,7 @@ rfc1048_print(register const u_char *bp)
                } else
                        cp = tok2str(tag2str, "?T%u", tag);
                c = *cp++;
                } else
                        cp = tok2str(tag2str, "?T%u", tag);
                c = *cp++;

-               printf(" %s:", cp);
+               printf("\n\t    %s:", cp);

 
                /* Get the length; check for truncation */
                if (bp + 1 >= snapend) {
 
                /* Get the length; check for truncation */
                if (bp + 1 >= snapend) {

diff --git a/print-udp.c b/print-udp.c
index 057cb141d2d8ddb15b2a2918f68f61436784dcdd..ffbe5d1ef3a278823e26a7e8608f5817418870ac 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.111 2002-11-09 17:19:30 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-udp.c,v 1.112 2002-12-04 19:09:30 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -602,7 +602,7 @@ udp_print(register const u_char *bp, u_int length,
                else if (ISPORT(TFTP_PORT))
                        tftp_print((const u_char *)(up + 1), length);
                else if (ISPORT(IPPORT_BOOTPC) || ISPORT(IPPORT_BOOTPS))
                else if (ISPORT(TFTP_PORT))
                        tftp_print((const u_char *)(up + 1), length);
                else if (ISPORT(IPPORT_BOOTPC) || ISPORT(IPPORT_BOOTPS))

-                       bootp_print((const u_char *)(up + 1), sport, dport);
+                       bootp_print((const u_char *)(up + 1), sport, dport, length);

                else if (ISPORT(RIP_PORT))
                        rip_print((const u_char *)(up + 1), length);
                else if (ISPORT(ISAKMP_PORT))
                else if (ISPORT(RIP_PORT))
                        rip_print((const u_char *)(up + 1), length);
                else if (ISPORT(ISAKMP_PORT))