![Jeff Morriss](/assets/img/avatar_default.png)
(as referenced in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2907 ) and https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3411 : Write a new convenience routine for finding a conversation and, if it is not found, create it. The frame number and addresses are taken from pinfo (as is the common case). Use this function in a bunch of dissectors. svn path=/trunk/; revision=32790
345 lines
9.5 KiB
C
345 lines
9.5 KiB
C
/* packet-ziop.c
|
|
* Routines for CORBA ZIOP packet disassembly
|
|
* Significantly based on packet-giop.c
|
|
* Copyright 2009 Alvaro Vega Garcia <avega at tid dot es>
|
|
*
|
|
* According with GIOP Compression RFP revised submission
|
|
* OMG mars/2008-12-20
|
|
* http://www.omg.org/docs/ptc/09-01-03.pdf
|
|
*
|
|
* $Id$
|
|
*
|
|
* Wireshark - Network traffic analyzer
|
|
* By Gerald Combs <gerald@wireshark.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
|
|
|
|
#include <errno.h>
|
|
#include <ctype.h>
|
|
#include <glib.h>
|
|
#include <math.h>
|
|
|
|
#include "isprint.h"
|
|
|
|
#include <epan/packet.h>
|
|
#include <epan/conversation.h>
|
|
|
|
#include "packet-ziop.h"
|
|
#include "packet-giop.h"
|
|
#include "packet-tcp.h"
|
|
|
|
/*
|
|
* Set to 1 for DEBUG output - TODO make this a runtime option
|
|
*/
|
|
|
|
#define DEBUG 0
|
|
|
|
/*
|
|
* ------------------------------------------------------------------------------------------+
|
|
* Data/Variables/Structs
|
|
* ------------------------------------------------------------------------------------------+
|
|
*/
|
|
|
|
static int proto_ziop = -1;
|
|
|
|
/*
|
|
* (sub)Tree declares
|
|
*/
|
|
|
|
static gint hf_ziop_magic = -1;
|
|
static gint hf_ziop_giop_version_major = -1;
|
|
static gint hf_ziop_giop_version_minor = -1;
|
|
static gint hf_ziop_flags = -1;
|
|
static gint hf_ziop_message_type = -1;
|
|
static gint hf_ziop_message_size = -1;
|
|
static gint hf_ziop_compressor_id = -1;
|
|
static gint hf_ziop_original_length = -1;
|
|
|
|
static gint ett_ziop = -1;
|
|
|
|
|
|
static dissector_handle_t data_handle;
|
|
static dissector_handle_t ziop_tcp_handle;
|
|
|
|
|
|
static const value_string ziop_compressor_ids[] = {
|
|
{ 0, "None" },
|
|
{ 1, "GZIP"},
|
|
{ 2, "PKZIP"},
|
|
{ 3, "BZIP2"},
|
|
{ 4, "ZLIB"},
|
|
{ 5, "LZMA"},
|
|
{ 6, "LZOP"},
|
|
{ 7, "RZIP"},
|
|
{ 8, "7X"},
|
|
{ 9, "XAR"},
|
|
{ 0, NULL}
|
|
};
|
|
|
|
|
|
static const value_string giop_message_types[] = {
|
|
{ 0x0, "Request" },
|
|
{ 0x1, "Reply"},
|
|
{ 0x2, "CancelRequest"},
|
|
{ 0x3, "LocateRequest"},
|
|
{ 0x4, "LocateReply"},
|
|
{ 0x5, "CloseConnection"},
|
|
{ 0x6, "MessageError"},
|
|
{ 0x7, "Fragment"},
|
|
{ 0, NULL}
|
|
};
|
|
|
|
|
|
gboolean ziop_desegment = TRUE;
|
|
|
|
static void dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree);
|
|
|
|
static guint
|
|
get_ziop_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
|
|
{
|
|
guint8 flags;
|
|
guint message_size;
|
|
gboolean stream_is_big_endian;
|
|
|
|
if ( tvb_memeql(tvb, 0, ZIOP_MAGIC, 4) != 0)
|
|
return 0;
|
|
|
|
flags = tvb_get_guint8(tvb, offset + 6);
|
|
|
|
stream_is_big_endian = ((flags & 0x1) == 0);
|
|
|
|
if (stream_is_big_endian)
|
|
message_size = tvb_get_ntohl(tvb, offset + 8);
|
|
else
|
|
message_size = tvb_get_letohl(tvb, offset + 8);
|
|
|
|
return message_size + ZIOP_HEADER_SIZE;
|
|
}
|
|
|
|
|
|
static void
|
|
dissect_ziop_tcp (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
|
|
|
|
if ( tvb_memeql(tvb, 0, ZIOP_MAGIC ,4) != 0) {
|
|
|
|
if ( tvb_memeql(tvb, 0, GIOP_MAGIC ,4) == 0)
|
|
dissect_giop(tvb, pinfo, tree);
|
|
|
|
return;
|
|
}
|
|
|
|
tcp_dissect_pdus(tvb, pinfo, tree, ziop_desegment, ZIOP_HEADER_SIZE,
|
|
get_ziop_pdu_len, dissect_ziop);
|
|
}
|
|
|
|
|
|
gboolean
|
|
dissect_ziop_heur (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
|
|
|
|
guint tot_len;
|
|
|
|
conversation_t *conversation;
|
|
/* check magic number and version */
|
|
|
|
|
|
tot_len = tvb_length(tvb);
|
|
|
|
|
|
if (tot_len < ZIOP_HEADER_SIZE) /* tot_len < 12 */
|
|
{
|
|
/* Not enough data captured to hold the ZIOP header; don't try
|
|
to interpret it as GIOP. */
|
|
return FALSE;
|
|
}
|
|
if ( tvb_memeql(tvb, 0, ZIOP_MAGIC, 4) != 0) {
|
|
return FALSE;
|
|
}
|
|
|
|
if ( pinfo->ptype == PT_TCP )
|
|
{
|
|
/*
|
|
* Make the ZIOP dissector the dissector for this conversation.
|
|
*
|
|
* If this isn't the first time this packet has been processed,
|
|
* we've already done this work, so we don't need to do it
|
|
* again.
|
|
*/
|
|
if (!pinfo->fd->flags.visited)
|
|
{
|
|
conversation = find_or_create_conversation(pinfo);
|
|
|
|
/* Set dissector */
|
|
conversation_set_dissector(conversation, ziop_tcp_handle);
|
|
}
|
|
dissect_ziop_tcp (tvb, pinfo, tree);
|
|
}
|
|
else
|
|
{
|
|
dissect_ziop (tvb, pinfo, tree);
|
|
}
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
/* Main entry point */
|
|
static void
|
|
dissect_ziop (tvbuff_t * tvb, packet_info * pinfo, proto_tree * tree) {
|
|
guint offset = 0;
|
|
guint8 giop_version_major, giop_version_minor, message_type;
|
|
|
|
proto_tree *ziop_tree = NULL;
|
|
proto_item *ti;
|
|
|
|
col_set_str (pinfo->cinfo, COL_PROTOCOL, ZIOP_MAGIC);
|
|
|
|
/* Clear out stuff in the info column */
|
|
col_clear(pinfo->cinfo, COL_INFO);
|
|
|
|
giop_version_major = tvb_get_guint8(tvb, 4);
|
|
giop_version_minor = tvb_get_guint8(tvb, 5);
|
|
message_type = tvb_get_guint8(tvb, 7);
|
|
|
|
if ( (giop_version_major < 1) ||
|
|
(giop_version_minor < 2) ) /* earlier than GIOP 1.2 */
|
|
{
|
|
col_add_fstr (pinfo->cinfo, COL_INFO, "Version %u.%u",
|
|
giop_version_major, giop_version_minor);
|
|
if (tree)
|
|
{
|
|
ti = proto_tree_add_item (tree, proto_ziop, tvb, 0, -1, FALSE);
|
|
ziop_tree = proto_item_add_subtree (ti, ett_ziop);
|
|
proto_tree_add_text (ziop_tree, tvb, 4, 2,
|
|
"Version %u.%u not supported",
|
|
giop_version_major,
|
|
giop_version_minor);
|
|
}
|
|
call_dissector(data_handle, tvb, pinfo, tree);
|
|
return;
|
|
}
|
|
|
|
col_add_fstr (pinfo->cinfo, COL_INFO, "ZIOP %u.%u %s",
|
|
giop_version_major,
|
|
giop_version_minor,
|
|
val_to_str(message_type, giop_message_types,
|
|
"Unknown message type (0x%02x)")
|
|
);
|
|
|
|
if (tree)
|
|
{
|
|
guint8 flags;
|
|
gboolean little_endian;
|
|
emem_strbuf_t *flags_strbuf = ep_strbuf_new_label("none");
|
|
|
|
ti = proto_tree_add_item (tree, proto_ziop, tvb, 0, -1, FALSE);
|
|
ziop_tree = proto_item_add_subtree (ti, ett_ziop);
|
|
|
|
proto_tree_add_item(ziop_tree, hf_ziop_magic, tvb, offset, 4, FALSE);
|
|
offset += 4;
|
|
proto_tree_add_item(ziop_tree, hf_ziop_giop_version_major, tvb, offset, 1, FALSE);
|
|
offset++;
|
|
proto_tree_add_item(ziop_tree, hf_ziop_giop_version_minor, tvb, offset, 1, FALSE);
|
|
offset++;
|
|
|
|
flags = tvb_get_guint8(tvb, offset);
|
|
little_endian = flags & 0x01;
|
|
|
|
if (flags & 0x01) {
|
|
ep_strbuf_printf(flags_strbuf, "little-endian");
|
|
}
|
|
ti = proto_tree_add_uint_format_value(ziop_tree, hf_ziop_flags, tvb, offset, 1,
|
|
flags, "0x%02x (%s)", flags, flags_strbuf->str);
|
|
offset++;
|
|
|
|
proto_tree_add_item(ziop_tree, hf_ziop_message_type, tvb, offset, 1, FALSE);
|
|
offset++;
|
|
|
|
proto_tree_add_item(ziop_tree, hf_ziop_message_size, tvb, offset, 4, little_endian);
|
|
offset += 4;
|
|
proto_tree_add_item(ziop_tree, hf_ziop_compressor_id, tvb, offset, 2, little_endian);
|
|
offset += 4;
|
|
proto_tree_add_item(ziop_tree, hf_ziop_original_length, tvb, offset, 4, little_endian);
|
|
}
|
|
}
|
|
|
|
|
|
void proto_register_ziop (void) {
|
|
|
|
|
|
/* A header field is something you can search/filter on.
|
|
*
|
|
* We create a structure to register our fields. It consists of an
|
|
* array of hf_register_info structures, each of which are of the format
|
|
* {&(field id), {name, abbrev, type, display, strings, bitmask, blurb, HFILL}}.
|
|
*/
|
|
static hf_register_info hf[] = {
|
|
{ &hf_ziop_magic,
|
|
{ "Header magic", "ziop.magic", FT_STRING, BASE_NONE, NULL, 0x0,
|
|
"ZIOPHeader magic", HFILL }},
|
|
{ &hf_ziop_giop_version_major,
|
|
{ "Header major version", "ziop.giop_version_major", FT_UINT8, BASE_OCT, NULL, 0x0,
|
|
"ZIOPHeader giop_major_version", HFILL }},
|
|
{ &hf_ziop_giop_version_minor,
|
|
{ "Header minor version", "ziop.giop_version_minor", FT_UINT8, BASE_OCT, NULL, 0x0,
|
|
"ZIOPHeader giop_minor_version", HFILL }},
|
|
{ &hf_ziop_flags,
|
|
{ "Header flags", "ziop.flags", FT_UINT8, BASE_OCT, NULL, 0x0,
|
|
"ZIOPHeader flags", HFILL }},
|
|
{ &hf_ziop_message_type,
|
|
{ "Header type", "ziop.message_type", FT_UINT8, BASE_OCT, VALS(giop_message_types), 0x0,
|
|
"ZIOPHeader message_type", HFILL }},
|
|
{ &hf_ziop_message_size,
|
|
{ "Header size", "ziop.message_size", FT_UINT32, BASE_DEC, NULL, 0x0,
|
|
"ZIOPHeader message_size", HFILL }},
|
|
{ &hf_ziop_compressor_id,
|
|
{ "Header compressor id", "ziop.compressor_id", FT_UINT16, BASE_DEC, VALS(ziop_compressor_ids), 0x0,
|
|
"ZIOPHeader compressor_id", HFILL }},
|
|
{ &hf_ziop_original_length,
|
|
{ "Header original length", "ziop.original_length", FT_UINT32, BASE_DEC, NULL, 0x0,
|
|
"ZIOP original_length", HFILL }},
|
|
};
|
|
|
|
|
|
static gint *ett[] = {
|
|
&ett_ziop,
|
|
};
|
|
|
|
proto_ziop = proto_register_protocol("Zipped Inter-ORB Protocol", "ZIOP",
|
|
"ziop");
|
|
proto_register_field_array (proto_ziop, hf, array_length (hf));
|
|
proto_register_subtree_array (ett, array_length (ett));
|
|
|
|
register_dissector("ziop", dissect_ziop, proto_ziop);
|
|
|
|
}
|
|
|
|
|
|
void proto_reg_handoff_ziop (void) {
|
|
|
|
ziop_tcp_handle = create_dissector_handle(dissect_ziop_tcp, proto_ziop);
|
|
dissector_add_handle("udp.port", ziop_tcp_handle); /* For 'Decode As' */
|
|
|
|
heur_dissector_add("tcp", dissect_ziop_heur, proto_ziop);
|
|
|
|
data_handle = find_dissector("data");
|
|
}
|