diff options
| author | Guy Harris <guy@alum.mit.edu> | 2000-11-13 07:19:37 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2000-11-13 07:19:37 +0000 |
| commit | 99c98f9e74d8d812e0e87c960970116bf149434b (patch) | |
| tree | d3b2949261e9970321c2a8fac4be3d2baaeb63c1 /packet-cdp.c | |
| parent | 796997a538eede8129af9fbb938b3b1cc8bc719d (diff) | |
Move "bytes_to_str()" to "strutil.c" from "packet.c" - it's just a
string formatter, like "format_text()", and, as "tvbuff.c" now calls it
(*vide infra*), we don't want to have to make "tvbuff.c" drag "packet.h"
in just to declare "bytes_to_str()". It's now declared in "strutil.h",
so include it in modules that use "bytes_to_str()" and weren't already
including it.
Add a "tvb_bytes_to_str()" wrapper that calls "tvb_get_ptr()" to get a
pointer to a chunk of N bytes at a given offset in a tvbuff and then
hands that chunk to "bytes_to_str()". Convert the code that was doing
that to use "tvb_bytes_to_str()" instead (which caught what I suspect is
a bug in the Q.2931 dissector, where it was handing an offset of 0 to
"tvb_get_ptr()" - a cut-and-pasteo, I think).
Tvbuffify the ARP dissector.
svn path=/trunk/; revision=2634
Diffstat (limited to 'packet-cdp.c')
| -rw-r--r-- | packet-cdp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packet-cdp.c b/packet-cdp.c index 70a02f22c2..79fa8196f1 100644 --- a/packet-cdp.c +++ b/packet-cdp.c @@ -2,7 +2,7 @@ * Routines for the disassembly of the "Cisco Discovery Protocol" * (c) Copyright Hannes R. Boehm <hannes@boehm.org> * - * $Id: packet-cdp.c,v 1.25 2000/08/13 14:08:04 deniel Exp $ + * $Id: packet-cdp.c,v 1.26 2000/11/13 07:18:44 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@zing.org> @@ -35,6 +35,7 @@ #include <glib.h> #include "packet.h" +#include "strutil.h" #include "nlpid.h" /* |