2000-10-06 10:11:40 +00:00
|
|
|
/* packet-frame.c
|
|
|
|
*
|
|
|
|
* Top-most dissector. Decides dissector based on Wiretap Encapsulation Type.
|
|
|
|
*
|
2002-01-17 09:28:22 +00:00
|
|
|
* $Id: packet-frame.c,v 1.19 2002/01/17 09:28:22 guy Exp $
|
2000-10-06 10:11:40 +00:00
|
|
|
*
|
|
|
|
* Ethereal - Network traffic analyzer
|
2001-12-08 21:03:41 +00:00
|
|
|
* By Gerald Combs <gerald@ethereal.com>
|
2000-10-06 10:11:40 +00:00
|
|
|
* Copyright 2000 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 <glib.h>
|
|
|
|
#include "packet.h"
|
|
|
|
#include "timestamp.h"
|
|
|
|
#include "tvbuff.h"
|
|
|
|
#include "packet-frame.h"
|
2001-11-01 04:00:56 +00:00
|
|
|
#include "prefs.h"
|
2000-10-06 10:11:40 +00:00
|
|
|
|
|
|
|
static int proto_frame = -1;
|
|
|
|
static int hf_frame_arrival_time = -1;
|
|
|
|
static int hf_frame_time_delta = -1;
|
2000-12-15 03:30:21 +00:00
|
|
|
static int hf_frame_time_relative = -1;
|
2000-10-06 10:11:40 +00:00
|
|
|
static int hf_frame_number = -1;
|
|
|
|
static int hf_frame_packet_len = -1;
|
|
|
|
static int hf_frame_capture_len = -1;
|
|
|
|
static int hf_frame_p2p_dir = -1;
|
2001-11-01 04:00:56 +00:00
|
|
|
static int hf_frame_file_off = -1;
|
2000-10-06 10:11:40 +00:00
|
|
|
static int proto_short = -1;
|
|
|
|
int proto_malformed = -1;
|
Use the "fragmented" field of the "packet_info" structure in
"dissect_frame()" to indicate whether a ReportedBoundsError was due to
the packet being malformed (i.e., the packet was shorter than it's
supposed to be, so the dissector went past the end trying to extract
fields that were supposed to be there) or due to it not being
reassembled (i.e., the packet was fragmented, and we didn't reassemble
it, but just treated the first fragment as the entire packet, so the
dissector went past the end trying to extract fields that were partially
or completely in fragments after that). Mark the latter as being
unreasembled rather than malformed.
Properly initialize, save, and restore that field, and properly set it,
so that works.
svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
|
|
|
static int proto_unreassembled = -1;
|
2000-10-06 10:11:40 +00:00
|
|
|
|
|
|
|
static gint ett_frame = -1;
|
|
|
|
|
2001-11-26 01:23:59 +00:00
|
|
|
static dissector_handle_t data_handle;
|
|
|
|
|
2001-11-01 04:00:56 +00:00
|
|
|
/* Preferences */
|
|
|
|
static gboolean show_file_off = FALSE;
|
|
|
|
|
2000-10-06 10:11:40 +00:00
|
|
|
static const value_string p2p_dirs[] = {
|
|
|
|
{ P2P_DIR_SENT, "Sent" },
|
|
|
|
{ P2P_DIR_RECV, "Received" },
|
|
|
|
{ 0, NULL }
|
|
|
|
};
|
2000-11-29 05:16:15 +00:00
|
|
|
|
|
|
|
static dissector_table_t wtap_encap_dissector_table;
|
2000-10-06 10:11:40 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
dissect_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
{
|
|
|
|
proto_tree *fh_tree;
|
|
|
|
proto_item *ti;
|
2001-09-14 07:10:13 +00:00
|
|
|
nstime_t ts;
|
2000-10-06 10:11:40 +00:00
|
|
|
int cap_len, pkt_len;
|
|
|
|
|
|
|
|
pinfo->current_proto = "Frame";
|
|
|
|
|
|
|
|
if (pinfo->fd->lnk_t == WTAP_ENCAP_LAPD ||
|
2001-12-24 17:06:53 +00:00
|
|
|
pinfo->fd->lnk_t == WTAP_ENCAP_CHDLC ||
|
2000-10-06 10:11:40 +00:00
|
|
|
pinfo->fd->lnk_t == WTAP_ENCAP_PPP_WITH_PHDR) {
|
|
|
|
|
|
|
|
pinfo->p2p_dir = pinfo->pseudo_header->p2p.sent ? P2P_DIR_SENT : P2P_DIR_RECV;
|
|
|
|
}
|
2001-12-24 17:06:53 +00:00
|
|
|
else if (pinfo->fd->lnk_t == WTAP_ENCAP_LAPB ||
|
|
|
|
pinfo->fd->lnk_t == WTAP_ENCAP_FRELAY) {
|
|
|
|
|
|
|
|
pinfo->p2p_dir = (pinfo->pseudo_header->x25.flags & 0x80) ? P2P_DIR_RECV : P2P_DIR_SENT;
|
|
|
|
}
|
2000-10-06 10:11:40 +00:00
|
|
|
|
|
|
|
/* Put in frame header information. */
|
|
|
|
if (tree) {
|
|
|
|
|
|
|
|
cap_len = tvb_length(tvb);
|
|
|
|
pkt_len = tvb_reported_length(tvb);
|
|
|
|
|
|
|
|
ti = proto_tree_add_protocol_format(tree, proto_frame, tvb, 0, tvb_length(tvb),
|
|
|
|
"Frame %u (%u on wire, %u captured)", pinfo->fd->num, pkt_len, cap_len);
|
|
|
|
|
|
|
|
fh_tree = proto_item_add_subtree(ti, ett_frame);
|
|
|
|
|
2001-09-14 07:10:13 +00:00
|
|
|
ts.secs = pinfo->fd->abs_secs;
|
|
|
|
ts.nsecs = pinfo->fd->abs_usecs*1000;
|
2000-10-06 10:11:40 +00:00
|
|
|
|
|
|
|
proto_tree_add_time(fh_tree, hf_frame_arrival_time, tvb,
|
2001-09-14 07:10:13 +00:00
|
|
|
0, 0, &ts);
|
2000-10-06 10:11:40 +00:00
|
|
|
|
2001-09-14 07:10:13 +00:00
|
|
|
ts.secs = pinfo->fd->del_secs;
|
|
|
|
ts.nsecs = pinfo->fd->del_usecs*1000;
|
2000-10-06 10:11:40 +00:00
|
|
|
|
|
|
|
proto_tree_add_time(fh_tree, hf_frame_time_delta, tvb,
|
2001-09-14 07:10:13 +00:00
|
|
|
0, 0, &ts);
|
2000-10-06 10:11:40 +00:00
|
|
|
|
2001-09-14 07:10:13 +00:00
|
|
|
ts.secs = pinfo->fd->rel_secs;
|
|
|
|
ts.nsecs = pinfo->fd->rel_usecs*1000;
|
2000-12-15 03:30:21 +00:00
|
|
|
|
|
|
|
proto_tree_add_time(fh_tree, hf_frame_time_relative, tvb,
|
2001-09-14 07:10:13 +00:00
|
|
|
0, 0, &ts);
|
2000-12-15 03:30:21 +00:00
|
|
|
|
2000-10-06 10:11:40 +00:00
|
|
|
proto_tree_add_uint(fh_tree, hf_frame_number, tvb,
|
|
|
|
0, 0, pinfo->fd->num);
|
|
|
|
|
|
|
|
proto_tree_add_uint_format(fh_tree, hf_frame_packet_len, tvb,
|
|
|
|
0, 0, pkt_len, "Packet Length: %d byte%s", pkt_len,
|
|
|
|
plurality(pkt_len, "", "s"));
|
|
|
|
|
|
|
|
proto_tree_add_uint_format(fh_tree, hf_frame_capture_len, tvb,
|
|
|
|
0, 0, cap_len, "Capture Length: %d byte%s", cap_len,
|
|
|
|
plurality(cap_len, "", "s"));
|
|
|
|
|
|
|
|
/* Check for existences of P2P pseudo header */
|
|
|
|
if (pinfo->p2p_dir != P2P_DIR_UNKNOWN) {
|
|
|
|
proto_tree_add_uint(fh_tree, hf_frame_p2p_dir, tvb,
|
|
|
|
0, 0, pinfo->p2p_dir);
|
|
|
|
}
|
2001-11-01 04:00:56 +00:00
|
|
|
|
2001-12-08 21:03:41 +00:00
|
|
|
if (show_file_off) {
|
|
|
|
proto_tree_add_int_format(fh_tree, hf_frame_file_off, tvb,
|
|
|
|
0, 0, pinfo->fd->file_off,
|
|
|
|
"File Offset: %ld (0x%lx)",
|
|
|
|
pinfo->fd->file_off, pinfo->fd->file_off);
|
|
|
|
}
|
2000-10-06 10:11:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
TRY {
|
2000-11-29 05:16:15 +00:00
|
|
|
if (!dissector_try_port(wtap_encap_dissector_table, pinfo->fd->lnk_t,
|
|
|
|
tvb, pinfo, tree)) {
|
|
|
|
|
2001-12-10 00:26:21 +00:00
|
|
|
if (check_col(pinfo->cinfo, COL_PROTOCOL))
|
|
|
|
col_set_str(pinfo->cinfo, COL_PROTOCOL, "UNKNOWN");
|
|
|
|
if (check_col(pinfo->cinfo, COL_INFO))
|
|
|
|
col_add_fstr(pinfo->cinfo, COL_INFO, "WTAP_ENCAP = %u",
|
|
|
|
pinfo->fd->lnk_t);
|
2001-11-26 01:23:59 +00:00
|
|
|
call_dissector(data_handle,tvb, pinfo, tree);
|
2000-10-06 10:11:40 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
CATCH(BoundsError) {
|
2001-12-10 00:26:21 +00:00
|
|
|
if (check_col(pinfo->cinfo, COL_INFO))
|
|
|
|
col_append_str(pinfo->cinfo, COL_INFO, "[Short Frame]");
|
2000-10-06 10:11:40 +00:00
|
|
|
proto_tree_add_protocol_format(tree, proto_short, tvb, 0, 0,
|
|
|
|
"[Short Frame: %s]", pinfo->current_proto );
|
|
|
|
}
|
|
|
|
CATCH(ReportedBoundsError) {
|
Use the "fragmented" field of the "packet_info" structure in
"dissect_frame()" to indicate whether a ReportedBoundsError was due to
the packet being malformed (i.e., the packet was shorter than it's
supposed to be, so the dissector went past the end trying to extract
fields that were supposed to be there) or due to it not being
reassembled (i.e., the packet was fragmented, and we didn't reassemble
it, but just treated the first fragment as the entire packet, so the
dissector went past the end trying to extract fields that were partially
or completely in fragments after that). Mark the latter as being
unreasembled rather than malformed.
Properly initialize, save, and restore that field, and properly set it,
so that works.
svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
|
|
|
if (pinfo->fragmented) {
|
|
|
|
/*
|
|
|
|
* We were dissecting an unreassembled fragmented
|
|
|
|
* packet when the exception was thrown, so the
|
|
|
|
* problem isn't that the dissector expected
|
|
|
|
* something but it wasn't in the packet, the
|
|
|
|
* problem is that the dissector expected something
|
|
|
|
* but it wasn't in the fragment we dissected.
|
|
|
|
*/
|
|
|
|
if (check_col(pinfo->cinfo, COL_INFO))
|
|
|
|
col_append_str(pinfo->cinfo, COL_INFO,
|
2002-01-17 09:28:22 +00:00
|
|
|
"[Unreassembled Packet]");
|
Use the "fragmented" field of the "packet_info" structure in
"dissect_frame()" to indicate whether a ReportedBoundsError was due to
the packet being malformed (i.e., the packet was shorter than it's
supposed to be, so the dissector went past the end trying to extract
fields that were supposed to be there) or due to it not being
reassembled (i.e., the packet was fragmented, and we didn't reassemble
it, but just treated the first fragment as the entire packet, so the
dissector went past the end trying to extract fields that were partially
or completely in fragments after that). Mark the latter as being
unreasembled rather than malformed.
Properly initialize, save, and restore that field, and properly set it,
so that works.
svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
|
|
|
proto_tree_add_protocol_format(tree, proto_unreassembled,
|
2002-01-17 09:28:22 +00:00
|
|
|
tvb, 0, 0, "[Unreassembled Packet: %s]",
|
Use the "fragmented" field of the "packet_info" structure in
"dissect_frame()" to indicate whether a ReportedBoundsError was due to
the packet being malformed (i.e., the packet was shorter than it's
supposed to be, so the dissector went past the end trying to extract
fields that were supposed to be there) or due to it not being
reassembled (i.e., the packet was fragmented, and we didn't reassemble
it, but just treated the first fragment as the entire packet, so the
dissector went past the end trying to extract fields that were partially
or completely in fragments after that). Mark the latter as being
unreasembled rather than malformed.
Properly initialize, save, and restore that field, and properly set it,
so that works.
svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
|
|
|
pinfo->current_proto );
|
|
|
|
} else {
|
|
|
|
if (check_col(pinfo->cinfo, COL_INFO))
|
|
|
|
col_append_str(pinfo->cinfo, COL_INFO,
|
|
|
|
"[Malformed Packet]");
|
|
|
|
proto_tree_add_protocol_format(tree, proto_malformed,
|
|
|
|
tvb, 0, 0, "[Malformed Packet: %s]",
|
|
|
|
pinfo->current_proto );
|
|
|
|
}
|
2000-10-06 10:11:40 +00:00
|
|
|
}
|
|
|
|
ENDTRY;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_register_frame(void)
|
|
|
|
{
|
|
|
|
static hf_register_info hf[] = {
|
|
|
|
{ &hf_frame_arrival_time,
|
|
|
|
{ "Arrival Time", "frame.time", FT_ABSOLUTE_TIME, BASE_NONE, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-10-06 10:11:40 +00:00
|
|
|
|
|
|
|
{ &hf_frame_time_delta,
|
|
|
|
{ "Time delta from previous packet", "frame.time_delta", FT_RELATIVE_TIME, BASE_NONE, NULL,
|
|
|
|
0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-10-06 10:11:40 +00:00
|
|
|
|
2000-12-15 03:30:21 +00:00
|
|
|
{ &hf_frame_time_relative,
|
|
|
|
{ "Time relative to first packet", "frame.time_relative", FT_RELATIVE_TIME, BASE_NONE, NULL,
|
|
|
|
0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-12-15 03:30:21 +00:00
|
|
|
|
2000-10-06 10:11:40 +00:00
|
|
|
{ &hf_frame_number,
|
|
|
|
{ "Frame Number", "frame.number", FT_UINT32, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-10-06 10:11:40 +00:00
|
|
|
|
|
|
|
{ &hf_frame_packet_len,
|
|
|
|
{ "Total Frame Length", "frame.pkt_len", FT_UINT32, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-10-06 10:11:40 +00:00
|
|
|
|
|
|
|
{ &hf_frame_capture_len,
|
|
|
|
{ "Capture Frame Length", "frame.cap_len", FT_UINT32, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2000-10-06 10:11:40 +00:00
|
|
|
|
|
|
|
{ &hf_frame_p2p_dir,
|
|
|
|
{ "Point-to-Point Direction", "frame.p2p_dir", FT_UINT8, BASE_DEC, VALS(p2p_dirs), 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }},
|
2001-11-01 04:00:56 +00:00
|
|
|
|
|
|
|
{ &hf_frame_file_off,
|
|
|
|
{ "File Offset", "frame.file_off", FT_INT32, BASE_DEC, NULL, 0x0,
|
|
|
|
"", HFILL }},
|
|
|
|
|
2000-10-06 10:11:40 +00:00
|
|
|
};
|
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_frame,
|
|
|
|
};
|
2001-12-08 21:03:41 +00:00
|
|
|
module_t *frame_module;
|
2000-10-06 10:11:40 +00:00
|
|
|
|
2001-12-08 06:41:48 +00:00
|
|
|
wtap_encap_dissector_table = register_dissector_table("wtap_encap",
|
|
|
|
"Wiretap encapsulation type", FT_UINT32, BASE_DEC);
|
2000-11-29 05:16:15 +00:00
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
proto_frame = proto_register_protocol("Frame", "Frame", "frame");
|
2000-10-06 10:11:40 +00:00
|
|
|
proto_register_field_array(proto_frame, hf, array_length(hf));
|
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
2001-04-01 21:12:05 +00:00
|
|
|
register_dissector("frame",dissect_frame,proto_frame);
|
2000-10-06 10:11:40 +00:00
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
/* You can't disable dissection of "Frame", as that would be
|
|
|
|
tantamount to not doing any dissection whatsoever. */
|
|
|
|
proto_set_cant_disable(proto_frame);
|
2000-10-06 10:11:40 +00:00
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
proto_short = proto_register_protocol("Short Frame", "Short frame", "short");
|
2002-01-08 07:17:55 +00:00
|
|
|
proto_malformed = proto_register_protocol("Malformed Packet",
|
|
|
|
"Malformed packet", "malformed");
|
Use the "fragmented" field of the "packet_info" structure in
"dissect_frame()" to indicate whether a ReportedBoundsError was due to
the packet being malformed (i.e., the packet was shorter than it's
supposed to be, so the dissector went past the end trying to extract
fields that were supposed to be there) or due to it not being
reassembled (i.e., the packet was fragmented, and we didn't reassemble
it, but just treated the first fragment as the entire packet, so the
dissector went past the end trying to extract fields that were partially
or completely in fragments after that). Mark the latter as being
unreasembled rather than malformed.
Properly initialize, save, and restore that field, and properly set it,
so that works.
svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
|
|
|
proto_unreassembled = proto_register_protocol(
|
|
|
|
"Unreassembled Fragmented Packet",
|
|
|
|
"Unreassembled fragmented packet", "unreassembled");
|
2001-01-03 06:56:03 +00:00
|
|
|
|
Use the "fragmented" field of the "packet_info" structure in
"dissect_frame()" to indicate whether a ReportedBoundsError was due to
the packet being malformed (i.e., the packet was shorter than it's
supposed to be, so the dissector went past the end trying to extract
fields that were supposed to be there) or due to it not being
reassembled (i.e., the packet was fragmented, and we didn't reassemble
it, but just treated the first fragment as the entire packet, so the
dissector went past the end trying to extract fields that were partially
or completely in fragments after that). Mark the latter as being
unreasembled rather than malformed.
Properly initialize, save, and restore that field, and properly set it,
so that works.
svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
|
|
|
/* "Short Frame", "Malformed Packet", and "Unreassembled Fragmented
|
|
|
|
Packet" aren't really protocols, they're error indications;
|
|
|
|
disabling them makes no sense. */
|
2001-01-03 06:56:03 +00:00
|
|
|
proto_set_cant_disable(proto_short);
|
|
|
|
proto_set_cant_disable(proto_malformed);
|
Use the "fragmented" field of the "packet_info" structure in
"dissect_frame()" to indicate whether a ReportedBoundsError was due to
the packet being malformed (i.e., the packet was shorter than it's
supposed to be, so the dissector went past the end trying to extract
fields that were supposed to be there) or due to it not being
reassembled (i.e., the packet was fragmented, and we didn't reassemble
it, but just treated the first fragment as the entire packet, so the
dissector went past the end trying to extract fields that were partially
or completely in fragments after that). Mark the latter as being
unreasembled rather than malformed.
Properly initialize, save, and restore that field, and properly set it,
so that works.
svn path=/trunk/; revision=4555
2002-01-17 06:29:20 +00:00
|
|
|
proto_set_cant_disable(proto_unreassembled);
|
2001-11-01 04:00:56 +00:00
|
|
|
|
2001-12-08 21:03:41 +00:00
|
|
|
/* Our preferences */
|
|
|
|
frame_module = prefs_register_protocol(proto_frame, NULL);
|
|
|
|
prefs_register_bool_preference(frame_module, "show_file_off",
|
|
|
|
"Show File Offset", "Show File Offset", &show_file_off);
|
2000-10-06 10:11:40 +00:00
|
|
|
}
|
2001-11-26 01:23:59 +00:00
|
|
|
|
|
|
|
void
|
2001-12-08 21:03:41 +00:00
|
|
|
proto_reg_handoff_frame(void)
|
|
|
|
{
|
|
|
|
data_handle = find_dissector("data");
|
2001-11-26 01:23:59 +00:00
|
|
|
}
|