56b989e0ad
dissectors to be registered as dissectors for particular ports, registered as heuristic dissectors, and registered as dissectors for conversations, and have routines to be used both by old-style and new-style dissectors to call registered dissectors. Have the code that calls those dissectors translate the arguments as necessary. (For conversation dissectors, replace "find_conversation_dissector()", which just returns a pointer to the dissector, with "old_try_conversation_dissector()" and "try_conversation_dissector()", which actually call the dissector, so that there's a single place at which we can do that translation. Also make "dissector_lookup()" static and, instead of calling it and, if it returns a non-null pointer, calling that dissector, just use "old_dissector_try_port()" or "dissector_try_port()", for the same reason.) This allows some dissectors that took old-style arguments and immediately translated them to new-style arguments to just take new-style arguments; make them do so. It also allows some new-style dissectors not to have to translate arguments before calling routines to look up and call dissectors; make them not do so. Get rid of checks for too-short frames in new-style dissectors - the tvbuff code does those checks for you. Give the routines to register old-style dissectors, and to call dissectors from old-style dissectors, names beginning with "old_", with the routines for new-style dissectors not having the "old_". Update the dissectors that use those routines appropriately. Rename "dissect_data()" to "old_dissect_data()", and "dissect_data_tvb()" to "dissect_data()". svn path=/trunk/; revision=2218
76 lines
2 KiB
C
76 lines
2 KiB
C
/* packet-data.c
|
|
* Routines for raw data (default case)
|
|
* Gilbert Ramirez <gram@xiexie.org>
|
|
*
|
|
* $Id: packet-data.c,v 1.19 2000/08/07 03:20:27 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.
|
|
*/
|
|
|
|
#ifdef HAVE_CONFIG_H
|
|
# include "config.h"
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
# include <sys/types.h>
|
|
#endif
|
|
|
|
#include <glib.h>
|
|
#include "packet.h"
|
|
|
|
/* proto_data cannot be static because it's referenced in the
|
|
* print routines
|
|
*/
|
|
int proto_data = -1;
|
|
|
|
/* Remove this once all dissectors are converted to use tvbuffs */
|
|
void
|
|
old_dissect_data(const u_char *pd, int offset, frame_data *fd, proto_tree *tree)
|
|
{
|
|
if (IS_DATA_IN_FRAME(offset) && tree) {
|
|
proto_tree_add_protocol_format(tree, proto_data, NullTVB, offset,
|
|
END_OF_FRAME, "Data (%d byte%s)", END_OF_FRAME,
|
|
plurality(END_OF_FRAME, "", "s"));
|
|
}
|
|
}
|
|
|
|
void
|
|
dissect_data(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
{
|
|
int bytes;
|
|
|
|
if (tree) {
|
|
bytes = tvb_length(tvb);
|
|
if (bytes > 0) {
|
|
proto_tree_add_protocol_format(tree, proto_data, tvb, 0,
|
|
bytes, "Data (%d byte%s)", bytes,
|
|
plurality(bytes, "", "s"));
|
|
}
|
|
}
|
|
}
|
|
|
|
void
|
|
proto_register_data(void)
|
|
{
|
|
proto_data = proto_register_protocol (
|
|
/* name */ "Data",
|
|
/* abbrev */ "data" );
|
|
}
|