949888c04a
"ppp_hdlc" dissector, and call the dissector for "raw" PPP (just RFC 1661, no HDLC encapsulation) the "ppp" dissector. Have the common routine used by both those dissectors take the offset in the tvbuff of the PPP protocol field as an argument, rather than assuming that the protocol field begins at the beginning of the tvbuff, so we don't have to construct a new tvbuff in the PPP-in-HDLC-like-framing dissector. Use the PPP dissector, not the PPP-in-HDLC-like-framing dissector, for PPP over Frame Relay - there's no HDLC header in PPP over Frame Relay, at least according to http://www.cisco.com/univercd/cc/td/doc/product/software/ios120/120newft/120t/120t1/pppframe.htm svn path=/trunk/; revision=3208
158 lines
4.8 KiB
C
158 lines
4.8 KiB
C
/* packet-ascend.c
|
|
* Routines for decoding Lucent/Ascend packet traces
|
|
*
|
|
* $Id: packet-ascend.c,v 1.25 2001/03/30 06:10:54 guy Exp $
|
|
*
|
|
* Ethereal - Network traffic analyzer
|
|
* By Gerald Combs <gerald@zing.org>
|
|
*
|
|
* 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 <string.h>
|
|
#include "packet.h"
|
|
|
|
static int proto_ascend = -1;
|
|
static int hf_link_type = -1;
|
|
static int hf_session_id = -1;
|
|
static int hf_called_number = -1;
|
|
static int hf_chunk = -1;
|
|
static int hf_task = -1;
|
|
static int hf_user_name = -1;
|
|
|
|
static gint ett_raw = -1;
|
|
|
|
static const value_string encaps_vals[] = {
|
|
{ASCEND_PFX_WDS_X, "PPP Transmit"},
|
|
{ASCEND_PFX_WDS_R, "PPP Receive" },
|
|
{ASCEND_PFX_WDD, "Ethernet" },
|
|
{0, NULL } };
|
|
|
|
static dissector_handle_t eth_handle;
|
|
static dissector_handle_t ppp_hdlc_handle;
|
|
|
|
static void
|
|
dissect_ascend(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
{
|
|
proto_tree *fh_tree;
|
|
proto_item *ti;
|
|
union wtap_pseudo_header *pseudo_header = pinfo->pseudo_header;
|
|
|
|
/* load the top pane info. This should be overwritten by
|
|
the next protocol in the stack */
|
|
if(check_col(pinfo->fd, COL_RES_DL_SRC))
|
|
col_set_str(pinfo->fd, COL_RES_DL_SRC, "N/A" );
|
|
if(check_col(pinfo->fd, COL_RES_DL_DST))
|
|
col_set_str(pinfo->fd, COL_RES_DL_DST, "N/A" );
|
|
if(check_col(pinfo->fd, COL_PROTOCOL))
|
|
col_set_str(pinfo->fd, COL_PROTOCOL, "N/A" );
|
|
if(check_col(pinfo->fd, COL_INFO))
|
|
col_set_str(pinfo->fd, COL_INFO, "Lucent/Ascend packet trace" );
|
|
|
|
/* populate a tree in the second pane with the status of the link
|
|
layer (ie none) */
|
|
if(tree) {
|
|
ti = proto_tree_add_protocol_format(tree, proto_ascend, tvb, 0, 0,
|
|
"Lucent/Ascend packet trace");
|
|
fh_tree = proto_item_add_subtree(ti, ett_raw);
|
|
proto_tree_add_uint(fh_tree, hf_link_type, tvb, 0, 0,
|
|
pseudo_header->ascend.type);
|
|
if (pseudo_header->ascend.type == ASCEND_PFX_WDD) {
|
|
proto_tree_add_string(fh_tree, hf_called_number, tvb, 0, 0,
|
|
pseudo_header->ascend.call_num);
|
|
proto_tree_add_uint(fh_tree, hf_chunk, tvb, 0, 0,
|
|
pseudo_header->ascend.chunk);
|
|
proto_tree_add_uint_hidden(fh_tree, hf_session_id, tvb, 0, 0, 0);
|
|
} else { /* It's wandsession data */
|
|
proto_tree_add_string(fh_tree, hf_user_name, tvb, 0, 0,
|
|
pseudo_header->ascend.user);
|
|
proto_tree_add_uint(fh_tree, hf_session_id, tvb, 0, 0,
|
|
pseudo_header->ascend.sess);
|
|
proto_tree_add_uint_hidden(fh_tree, hf_chunk, tvb, 0, 0, 0);
|
|
}
|
|
proto_tree_add_uint(fh_tree, hf_task, tvb, 0, 0, pseudo_header->ascend.task);
|
|
}
|
|
|
|
switch (pseudo_header->ascend.type) {
|
|
case ASCEND_PFX_WDS_X:
|
|
case ASCEND_PFX_WDS_R:
|
|
call_dissector(ppp_hdlc_handle, tvb, pinfo, tree);
|
|
break;
|
|
case ASCEND_PFX_WDD:
|
|
call_dissector(eth_handle, tvb, pinfo, tree);
|
|
break;
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
void
|
|
proto_register_ascend(void)
|
|
{
|
|
static hf_register_info hf[] = {
|
|
{ &hf_link_type,
|
|
{ "Link type", "ascend.type", FT_UINT32, BASE_DEC, VALS(encaps_vals), 0x0,
|
|
"" }},
|
|
|
|
{ &hf_session_id,
|
|
{ "Session ID", "ascend.sess", FT_UINT32, BASE_DEC, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_called_number,
|
|
{ "Called number", "ascend.number", FT_STRING, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_chunk,
|
|
{ "WDD Chunk", "ascend.chunk", FT_UINT32, BASE_HEX, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_task,
|
|
{ "Task", "ascend.task", FT_UINT32, BASE_HEX, NULL, 0x0,
|
|
"" }},
|
|
|
|
{ &hf_user_name,
|
|
{ "User name", "ascend.user", FT_STRING, BASE_NONE, NULL, 0x0,
|
|
"" }},
|
|
};
|
|
static gint *ett[] = {
|
|
&ett_raw,
|
|
};
|
|
|
|
proto_ascend = proto_register_protocol("Lucent/Ascend debug output",
|
|
"Lucent/Ascend", "ascend");
|
|
proto_register_field_array(proto_ascend, hf, array_length(hf));
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
}
|
|
|
|
void
|
|
proto_reg_handoff_ascend(void)
|
|
{
|
|
/*
|
|
* Get handles for the Ethernet and PPP-in-HDLC-like-framing dissectors.
|
|
*/
|
|
eth_handle = find_dissector("eth");
|
|
ppp_hdlc_handle = find_dissector("ppp_hdlc");
|
|
dissector_add("wtap_encap", WTAP_ENCAP_ASCEND, dissect_ascend, proto_ascend);
|
|
}
|