Phil Techau's fix to BOOTP when client address not supplied.

Give Phil credit for the other stuff he added as well.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@2236 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/AUTHORS b/AUTHORS
index bc0a09c2c22f73a5731c7f2278bbee2689664b3e..6f9152cdaff17aea9e932095169fb5426df69281 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -365,6 +365,12 @@ Peter Kjellerstedt <pkj@axis.com> {
        ICQ enhancements
 }
 
+Phil Techau <phil_t@altavista.net> {
+       Added "col_append_str()"
+       Signed integer support in display filters and in the protocol tree
+       BOOTP fixes
+}
+
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to
 give his permission to use his version of snprintf.c.
 

diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template
index 0974d845b4f4cd6bd7d488cedb287a8c8fca487f..decb923aae8bf467688a71281bd3e488509d2a4b 100644 (file)
--- a/doc/ethereal.pod.template
+++ b/doc/ethereal.pod.template
@@ -911,6 +911,7 @@ B<http://ethereal.zing.org>.
   Jose Pedro Oliveira      <jpo@di.uminho.pt>
   David Frascone           <dave@frascone.com>
   Peter Kjellerstedt       <pkj@axis.com>
+  Phil Techau              <phil_t@altavista.net>
 
 Alain Magloire <alainm@rcsm.ece.mcgill.ca> was kind enough to give his
 permission to use his version of snprintf.c.

diff --git a/packet-bootp.c b/packet-bootp.c
index 87d140ab97dd61852e9a9ca70ab909b236df239b..4aca8ff8baa4d31ef02d49aa6b1db30b9146f95c 100644 (file)
--- a/packet-bootp.c
+++ b/packet-bootp.c
@@ -2,7 +2,7 @@
  * Routines for BOOTP/DHCP packet disassembly
  * Gilbert Ramirez <gram@xiexie.org>
  *
- * $Id: packet-bootp.c,v 1.38 2000/08/07 03:20:24 guy Exp $
+ * $Id: packet-bootp.c,v 1.39 2000/08/09 06:14:57 guy Exp $
  *
  * The information used comes from:
  * RFC  951: Bootstrap Protocol
@@ -686,8 +686,8 @@ dissect_bootp(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
                                                                     pd[offset+2], pd[offset+1]));
                }
                else {
-                       proto_tree_add_bytes(bp_tree, hf_bootp_hw_addr, NullTVB, 
-                                                  offset + 28, 0, NULL);
+                       proto_tree_add_text(bp_tree,  NullTVB, 
+                                                  offset + 28, 0, "Client address not given");
                }
 
                /* The server host name is optional */