![Guy Harris](/assets/img/avatar_default.png)
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
36 lines
1.2 KiB
C
36 lines
1.2 KiB
C
/* packet-arp.h
|
|
* Definitions of routines for ARP packet disassembly that are used
|
|
* elsewhere
|
|
*
|
|
* $Id: packet-arp.h,v 1.4 2000/11/13 07:18:40 guy Exp $
|
|
*
|
|
* Ethereal - Network traffic analyzer
|
|
* By Gerald Combs <gerald@zing.org>
|
|
* Copyright 1998 Gerald Combs
|
|
*
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#ifndef __PACKET_ARP_H__
|
|
#define __PACKET_ARP_H__
|
|
|
|
gchar *arphrdaddr_to_str(guint8 *ad, int ad_len, guint16 type);
|
|
gchar *arphrdtype_to_str(guint16 hwtype, const char *fmt);
|
|
|
|
void dissect_atm_nsap(tvbuff_t *tvb, int offset, int len, proto_tree *tree);
|
|
|
|
#endif /* packet-atm.h */
|