1998-09-16 02:39:15 +00:00
|
|
|
/* packet-ppp.c
|
|
|
|
* Routines for ppp packet disassembly
|
|
|
|
*
|
2001-06-18 02:18:27 +00:00
|
|
|
* $Id: packet-ppp.c,v 1.68 2001/06/18 02:17:50 guy Exp $
|
1998-09-16 03:22:19 +00:00
|
|
|
*
|
1998-09-16 02:39:15 +00:00
|
|
|
* Ethereal - Network traffic analyzer
|
2001-04-23 18:19:03 +00:00
|
|
|
* By Gerald Combs <gerald@ethereal.com>
|
1998-09-16 02:39:15 +00:00
|
|
|
*
|
|
|
|
* This file created and by Mike Hall <mlh@io.com>
|
|
|
|
* Copyright 1998
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
|
1998-10-10 03:32:20 +00:00
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
|
|
# include <sys/types.h>
|
|
|
|
#endif
|
|
|
|
|
1999-03-23 03:14:46 +00:00
|
|
|
#include <glib.h>
|
2000-12-14 08:20:31 +00:00
|
|
|
#include "prefs.h"
|
1998-09-27 22:12:47 +00:00
|
|
|
#include "packet.h"
|
2000-05-19 05:29:44 +00:00
|
|
|
#include "packet-ppp.h"
|
2000-04-16 21:37:07 +00:00
|
|
|
#include "ppptypes.h"
|
2001-01-10 09:07:35 +00:00
|
|
|
#include "etypes.h"
|
2001-03-22 16:24:16 +00:00
|
|
|
#include "atalk-utils.h"
|
Add a new Wiretap encapsulation type for Cisco HDLC. Map the NetBSD
DLT_HDLC to it.
Make a separate dissector for Cisco HDLC, and add a dissector for Cisco
SLARP. Have the PPP dissector call the Cisco HDLC dissector if the
address field is the Cisco HDLC unicast or multicast address. Use the
Cisco HDLC dissector for the Cisco HDLC Wiretap encapsulation type.
Add a new dissector table "chdlctype", for Cisco HDLC packet types
(they're *almost* the same as Ethernet types, but 0x8035 is SLARP, not
Reverse ARP, and 0x2000 is the Cisco Discovery protocol, for example),
replacing "fr.chdlc".
Have a "chdlctype()" routine, similar to "ethertype()", used both by the
Cisco HDLC and Frame Relay dissectors. Have a "chdlc_vals[]"
"value_string" table for Cisco HDLC types and protocol names. Split the
packet type field in the Frame Relay dissector into separate SNAP and
Cisco HDLC fields, and give them the Ethernet type and Cisco HDLC type
"value_string" tables, respectively.
svn path=/trunk/; revision=3133
2001-03-15 09:11:03 +00:00
|
|
|
#include "packet-chdlc.h"
|
1999-08-28 08:31:28 +00:00
|
|
|
#include "packet-ip.h"
|
2000-02-15 21:06:58 +00:00
|
|
|
#include "packet-ipx.h"
|
|
|
|
#include "packet-vines.h"
|
2001-01-10 09:07:35 +00:00
|
|
|
#include "nlpid.h"
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2001-06-15 20:35:08 +00:00
|
|
|
#define ppp_min(a, b) ((a<b) ? a : b)
|
|
|
|
|
1999-07-29 05:47:07 +00:00
|
|
|
static int proto_ppp = -1;
|
1999-11-16 11:44:20 +00:00
|
|
|
|
|
|
|
static gint ett_ppp = -1;
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
|
|
|
|
static int proto_lcp = -1;
|
|
|
|
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint ett_lcp = -1;
|
|
|
|
static gint ett_lcp_options = -1;
|
|
|
|
static gint ett_lcp_mru_opt = -1;
|
|
|
|
static gint ett_lcp_async_map_opt = -1;
|
|
|
|
static gint ett_lcp_authprot_opt = -1;
|
|
|
|
static gint ett_lcp_qualprot_opt = -1;
|
|
|
|
static gint ett_lcp_magicnum_opt = -1;
|
|
|
|
static gint ett_lcp_fcs_alternatives_opt = -1;
|
|
|
|
static gint ett_lcp_numbered_mode_opt = -1;
|
|
|
|
static gint ett_lcp_callback_opt = -1;
|
|
|
|
static gint ett_lcp_multilink_ep_disc_opt = -1;
|
|
|
|
static gint ett_lcp_internationalization_opt = -1;
|
|
|
|
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
static int proto_ipcp = -1;
|
|
|
|
|
|
|
|
static gint ett_ipcp = -1;
|
|
|
|
static gint ett_ipcp_options = -1;
|
|
|
|
static gint ett_ipcp_ipaddrs_opt = -1;
|
|
|
|
static gint ett_ipcp_compressprot_opt = -1;
|
2000-04-16 21:37:07 +00:00
|
|
|
|
1999-09-11 04:19:26 +00:00
|
|
|
static int proto_mp = -1;
|
1999-09-11 22:40:30 +00:00
|
|
|
static int hf_mp_frag_first = -1;
|
|
|
|
static int hf_mp_frag_last = -1;
|
|
|
|
static int hf_mp_sequence_num = -1;
|
1999-07-29 05:47:07 +00:00
|
|
|
|
1999-11-16 11:44:20 +00:00
|
|
|
static int ett_mp = -1;
|
|
|
|
static int ett_mp_flags = -1;
|
|
|
|
|
2001-06-15 20:35:08 +00:00
|
|
|
static int proto_pap = -1; /* PAP vars */
|
|
|
|
static gint ett_pap = -1;
|
|
|
|
static gint ett_pap_data = -1;
|
|
|
|
static gint ett_pap_peer_id = -1;
|
|
|
|
static gint ett_pap_password = -1;
|
|
|
|
static gint ett_pap_message = -1;
|
|
|
|
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
static dissector_table_t subdissector_table;
|
Add a new Wiretap encapsulation type for Cisco HDLC. Map the NetBSD
DLT_HDLC to it.
Make a separate dissector for Cisco HDLC, and add a dissector for Cisco
SLARP. Have the PPP dissector call the Cisco HDLC dissector if the
address field is the Cisco HDLC unicast or multicast address. Use the
Cisco HDLC dissector for the Cisco HDLC Wiretap encapsulation type.
Add a new dissector table "chdlctype", for Cisco HDLC packet types
(they're *almost* the same as Ethernet types, but 0x8035 is SLARP, not
Reverse ARP, and 0x2000 is the Cisco Discovery protocol, for example),
replacing "fr.chdlc".
Have a "chdlctype()" routine, similar to "ethertype()", used both by the
Cisco HDLC and Frame Relay dissectors. Have a "chdlc_vals[]"
"value_string" table for Cisco HDLC types and protocol names. Split the
packet type field in the Frame Relay dissector into separate SNAP and
Cisco HDLC fields, and give them the Ethernet type and Cisco HDLC type
"value_string" tables, respectively.
svn path=/trunk/; revision=3133
2001-03-15 09:11:03 +00:00
|
|
|
static dissector_handle_t chdlc_handle;
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
|
2000-12-14 08:20:31 +00:00
|
|
|
/* options */
|
|
|
|
static gint ppp_fcs_decode = 0; /* 0 = No FCS, 1 = 16 bit FCS, 2 = 32 bit FCS */
|
|
|
|
#define NO_FCS 0
|
|
|
|
#define FCS_16 1
|
|
|
|
#define FCS_32 2
|
|
|
|
|
2001-03-29 09:18:34 +00:00
|
|
|
/* PPP definitions */
|
1999-03-23 03:14:46 +00:00
|
|
|
|
1999-06-11 15:30:55 +00:00
|
|
|
static const value_string ppp_vals[] = {
|
|
|
|
{PPP_IP, "IP" },
|
2001-04-16 10:04:33 +00:00
|
|
|
{PPP_OSI, "OSI" },
|
1999-06-11 15:30:55 +00:00
|
|
|
{PPP_AT, "Appletalk" },
|
|
|
|
{PPP_IPX, "Netware IPX/SPX"},
|
|
|
|
{PPP_VJC_COMP, "VJ compressed TCP"},
|
2001-01-14 08:25:14 +00:00
|
|
|
{PPP_VJC_UNCOMP,"VJ uncompressed TCP"},
|
|
|
|
{PPP_BPDU, "Bridging PDU"},
|
1999-06-11 15:30:55 +00:00
|
|
|
{PPP_VINES, "Vines" },
|
1999-09-11 04:19:26 +00:00
|
|
|
{PPP_MP, "Multilink"},
|
1999-06-11 15:30:55 +00:00
|
|
|
{PPP_IPV6, "IPv6" },
|
1999-08-25 06:52:04 +00:00
|
|
|
{PPP_COMP, "compressed packet" },
|
2001-01-14 08:25:14 +00:00
|
|
|
{PPP_DEC_LB, "DEC LANBridge100 Spanning Tree"},
|
|
|
|
{PPP_MPLS_UNI, "MPLS Unicast"},
|
|
|
|
{PPP_MPLS_MULTI, "MPLS Multicast"},
|
1999-08-25 06:52:04 +00:00
|
|
|
{PPP_IPCP, "IP Control Protocol" },
|
2001-04-16 10:04:33 +00:00
|
|
|
{PPP_OSICP, "OSI Control Protocol" },
|
1999-08-25 06:52:04 +00:00
|
|
|
{PPP_ATCP, "AppleTalk Control Protocol" },
|
|
|
|
{PPP_IPXCP, "IPX Control Protocol" },
|
|
|
|
{PPP_CCP, "Compression Control Protocol" },
|
|
|
|
{PPP_LCP, "Link Control Protocol" },
|
|
|
|
{PPP_PAP, "Password Authentication Protocol" },
|
|
|
|
{PPP_LQR, "Link Quality Report protocol" },
|
|
|
|
{PPP_CHAP, "Cryptographic Handshake Auth. Protocol" },
|
|
|
|
{PPP_CBCP, "Callback Control Protocol" },
|
|
|
|
{0, NULL }
|
|
|
|
};
|
1999-06-11 15:30:55 +00:00
|
|
|
|
|
|
|
/* CP (LCP, IPCP, etc.) codes.
|
|
|
|
* from pppd fsm.h
|
|
|
|
*/
|
1999-08-25 07:32:46 +00:00
|
|
|
#define CONFREQ 1 /* Configuration Request */
|
|
|
|
#define CONFACK 2 /* Configuration Ack */
|
|
|
|
#define CONFNAK 3 /* Configuration Nak */
|
|
|
|
#define CONFREJ 4 /* Configuration Reject */
|
|
|
|
#define TERMREQ 5 /* Termination Request */
|
|
|
|
#define TERMACK 6 /* Termination Ack */
|
|
|
|
#define CODEREJ 7 /* Code Reject */
|
1999-06-11 15:30:55 +00:00
|
|
|
|
|
|
|
static const value_string cp_vals[] = {
|
1999-08-25 07:32:46 +00:00
|
|
|
{CONFREQ, "Configuration Request" },
|
|
|
|
{CONFACK, "Configuration Ack" },
|
|
|
|
{CONFNAK, "Configuration Nak" },
|
|
|
|
{CONFREJ, "Configuration Reject" },
|
|
|
|
{TERMREQ, "Termination Request" },
|
|
|
|
{TERMACK, "Termination Ack" },
|
|
|
|
{CODEREJ, "Code Reject" },
|
1999-08-25 06:52:04 +00:00
|
|
|
{0, NULL } };
|
1999-06-11 15:30:55 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* LCP-specific packet types.
|
|
|
|
*/
|
1999-08-25 07:32:46 +00:00
|
|
|
#define PROTREJ 8 /* Protocol Reject */
|
|
|
|
#define ECHOREQ 9 /* Echo Request */
|
|
|
|
#define ECHOREP 10 /* Echo Reply */
|
|
|
|
#define DISCREQ 11 /* Discard Request */
|
|
|
|
#define IDENT 12 /* Identification */
|
|
|
|
#define TIMEREMAIN 13 /* Time remaining */
|
|
|
|
|
1999-06-11 15:30:55 +00:00
|
|
|
#define CBCP_OPT 6 /* Use callback control protocol */
|
|
|
|
|
|
|
|
static const value_string lcp_vals[] = {
|
1999-08-25 07:32:46 +00:00
|
|
|
{CONFREQ, "Configuration Request" },
|
|
|
|
{CONFACK, "Configuration Ack" },
|
|
|
|
{CONFNAK, "Configuration Nak" },
|
|
|
|
{CONFREJ, "Configuration Reject" },
|
|
|
|
{TERMREQ, "Termination Request" },
|
|
|
|
{TERMACK, "Termination Ack" },
|
|
|
|
{CODEREJ, "Code Reject" },
|
|
|
|
{PROTREJ, "Protocol Reject" },
|
|
|
|
{ECHOREQ, "Echo Request" },
|
|
|
|
{ECHOREP, "Echo Reply" },
|
|
|
|
{DISCREQ, "Discard Request" },
|
|
|
|
{IDENT, "Identification" },
|
|
|
|
{TIMEREMAIN, "Time Remaining" },
|
|
|
|
{0, NULL }
|
|
|
|
};
|
1999-08-25 06:52:04 +00:00
|
|
|
|
1999-06-11 15:30:55 +00:00
|
|
|
/*
|
|
|
|
* Options. (LCP)
|
|
|
|
*/
|
1999-08-25 06:52:04 +00:00
|
|
|
#define CI_MRU 1 /* Maximum Receive Unit */
|
|
|
|
#define CI_ASYNCMAP 2 /* Async Control Character Map */
|
|
|
|
#define CI_AUTHTYPE 3 /* Authentication Type */
|
|
|
|
#define CI_QUALITY 4 /* Quality Protocol */
|
|
|
|
#define CI_MAGICNUMBER 5 /* Magic Number */
|
|
|
|
#define CI_PCOMPRESSION 7 /* Protocol Field Compression */
|
|
|
|
#define CI_ACCOMPRESSION 8 /* Address/Control Field Compression */
|
1999-08-28 08:31:28 +00:00
|
|
|
#define CI_FCS_ALTERNATIVES 9 /* FCS Alternatives (RFC 1570) */
|
1999-08-25 07:32:46 +00:00
|
|
|
#define CI_SELF_DESCRIBING_PAD 10 /* Self-Describing Pad (RFC 1570) */
|
|
|
|
#define CI_NUMBERED_MODE 11 /* Numbered Mode (RFC 1663) */
|
|
|
|
#define CI_CALLBACK 13 /* Callback (RFC 1570) */
|
1999-08-28 08:31:28 +00:00
|
|
|
#define CI_COMPOUND_FRAMES 15 /* Compound frames (RFC 1570) */
|
1999-08-25 07:32:46 +00:00
|
|
|
#define CI_MULTILINK_MRRU 17 /* Multilink MRRU (RFC 1717) */
|
|
|
|
#define CI_MULTILINK_SSNH 18 /* Multilink Short Sequence Number
|
|
|
|
Header (RFC 1717) */
|
|
|
|
#define CI_MULTILINK_EP_DISC 19 /* Multilink Endpoint Discriminator
|
|
|
|
(RFC 1717) */
|
|
|
|
#define CI_DCE_IDENTIFIER 21 /* DCE Identifier */
|
|
|
|
#define CI_MULTILINK_PLUS_PROC 22 /* Multilink Plus Procedure */
|
|
|
|
#define CI_LINK_DISC_FOR_BACP 23 /* Link Discriminator for BACP
|
|
|
|
(RFC 2125) */
|
|
|
|
#define CI_LCP_AUTHENTICATION 24 /* LCP Authentication Option */
|
|
|
|
#define CI_COBS 25 /* Consistent Overhead Byte
|
|
|
|
Stuffing */
|
|
|
|
#define CI_PREFIX_ELISION 26 /* Prefix elision */
|
|
|
|
#define CI_MULTILINK_HDR_FMT 27 /* Multilink header format */
|
|
|
|
#define CI_INTERNATIONALIZATION 28 /* Internationalization (RFC 2484) */
|
|
|
|
#define CI_SDL_ON_SONET_SDH 29 /* Simple Data Link on SONET/SDH */
|
1999-06-11 15:30:55 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
static void dissect_lcp_mru_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
static void dissect_lcp_async_map_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
static void dissect_lcp_protocol_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree);
|
1999-08-28 08:31:28 +00:00
|
|
|
static void dissect_lcp_magicnumber_opt(const ip_tcp_opt *optp,
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvbuff_t *tvb, int offset, guint length,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
frame_data *fd, proto_tree *tree);
|
1999-08-28 08:31:28 +00:00
|
|
|
static void dissect_lcp_fcs_alternatives_opt(const ip_tcp_opt *optp,
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvbuff_t *tvb, int offset, guint length,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
frame_data *fd, proto_tree *tree);
|
1999-08-28 08:31:28 +00:00
|
|
|
static void dissect_lcp_numbered_mode_opt(const ip_tcp_opt *optp,
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvbuff_t *tvb, int offset, guint length,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
frame_data *fd, proto_tree *tree);
|
1999-08-28 08:31:28 +00:00
|
|
|
static void dissect_lcp_self_describing_pad_opt(const ip_tcp_opt *optp,
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvbuff_t *tvb, int offset, guint length,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
frame_data *fd, proto_tree *tree);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
static void dissect_lcp_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree);
|
1999-08-28 08:31:28 +00:00
|
|
|
static void dissect_lcp_multilink_mrru_opt(const ip_tcp_opt *optp,
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvbuff_t *tvb, int offset, guint length,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
frame_data *fd, proto_tree *tree);
|
1999-08-28 08:31:28 +00:00
|
|
|
static void dissect_lcp_multilink_ep_disc_opt(const ip_tcp_opt *optp,
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvbuff_t *tvb, int offset, guint length,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
frame_data *fd, proto_tree *tree);
|
1999-08-28 08:31:28 +00:00
|
|
|
static void dissect_lcp_bap_link_discriminator_opt(const ip_tcp_opt *optp,
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvbuff_t *tvb, int offset, guint length,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
frame_data *fd, proto_tree *tree);
|
1999-08-28 08:31:28 +00:00
|
|
|
static void dissect_lcp_internationalization_opt(const ip_tcp_opt *optp,
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvbuff_t *tvb, int offset, guint length,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
frame_data *fd, proto_tree *tree);
|
2000-05-25 07:42:26 +00:00
|
|
|
static void dissect_mp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
|
1999-08-28 08:31:28 +00:00
|
|
|
|
|
|
|
static const ip_tcp_opt lcp_opts[] = {
|
|
|
|
{
|
|
|
|
CI_MRU,
|
|
|
|
"Maximum Receive Unit",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_lcp_mru_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
4,
|
|
|
|
dissect_lcp_mru_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_ASYNCMAP,
|
|
|
|
"Async Control Character Map",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_lcp_async_map_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
6,
|
|
|
|
dissect_lcp_async_map_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_AUTHTYPE,
|
|
|
|
"Authentication protocol",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_lcp_authprot_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
4,
|
|
|
|
dissect_lcp_protocol_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_QUALITY,
|
|
|
|
"Quality protocol",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_lcp_qualprot_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
4,
|
|
|
|
dissect_lcp_protocol_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_MAGICNUMBER,
|
|
|
|
NULL,
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_lcp_magicnum_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
6,
|
|
|
|
dissect_lcp_magicnumber_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_PCOMPRESSION,
|
|
|
|
"Protocol field compression",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
2,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_ACCOMPRESSION,
|
|
|
|
"Address/control field compression",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
2,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_FCS_ALTERNATIVES,
|
|
|
|
NULL,
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_lcp_fcs_alternatives_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
3,
|
|
|
|
dissect_lcp_fcs_alternatives_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_SELF_DESCRIBING_PAD,
|
|
|
|
NULL,
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
3,
|
|
|
|
dissect_lcp_self_describing_pad_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_NUMBERED_MODE,
|
|
|
|
"Numbered mode",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_lcp_numbered_mode_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
4,
|
|
|
|
dissect_lcp_numbered_mode_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_CALLBACK,
|
|
|
|
"Callback",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_lcp_callback_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
3,
|
|
|
|
dissect_lcp_callback_opt,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_COMPOUND_FRAMES,
|
|
|
|
"Compound frames",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
2,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_MULTILINK_MRRU,
|
|
|
|
NULL,
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
4,
|
|
|
|
dissect_lcp_multilink_mrru_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_MULTILINK_SSNH,
|
|
|
|
"Use short sequence number headers",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
2,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_MULTILINK_EP_DISC,
|
|
|
|
"Multilink endpoint discriminator",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_lcp_multilink_ep_disc_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
3,
|
|
|
|
dissect_lcp_multilink_ep_disc_opt,
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_DCE_IDENTIFIER,
|
|
|
|
"DCE identifier",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
2,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_MULTILINK_PLUS_PROC,
|
|
|
|
"Multilink Plus Procedure",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
2,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_LINK_DISC_FOR_BACP,
|
|
|
|
NULL,
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
4,
|
|
|
|
dissect_lcp_bap_link_discriminator_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_LCP_AUTHENTICATION,
|
|
|
|
"LCP authentication",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
2,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_COBS,
|
|
|
|
"Consistent Overhead Byte Stuffing",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
2,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_PREFIX_ELISION,
|
|
|
|
"Prefix elision",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
2,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_MULTILINK_HDR_FMT,
|
|
|
|
"Multilink header format",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
2,
|
|
|
|
NULL
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_INTERNATIONALIZATION,
|
|
|
|
"Internationalization",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_lcp_internationalization_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
7,
|
|
|
|
dissect_lcp_internationalization_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_SDL_ON_SONET_SDH,
|
|
|
|
"Simple data link on SONET/SDH",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
2,
|
|
|
|
NULL
|
|
|
|
}
|
1999-08-25 06:52:04 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#define N_LCP_OPTS (sizeof lcp_opts / sizeof lcp_opts[0])
|
1999-06-11 15:30:55 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Options. (IPCP)
|
|
|
|
*/
|
1999-08-28 08:31:28 +00:00
|
|
|
#define CI_ADDRS 1 /* IP Addresses (deprecated) (RFC 1172) */
|
1999-08-25 07:32:46 +00:00
|
|
|
#define CI_COMPRESSTYPE 2 /* Compression Type (RFC 1332) */
|
|
|
|
#define CI_ADDR 3 /* IP Address (RFC 1332) */
|
|
|
|
#define CI_MOBILE_IPv4 4 /* Mobile IPv4 (RFC 2290) */
|
|
|
|
#define CI_MS_DNS1 129 /* Primary DNS value (RFC 1877) */
|
|
|
|
#define CI_MS_WINS1 130 /* Primary WINS value (RFC 1877) */
|
|
|
|
#define CI_MS_DNS2 131 /* Secondary DNS value (RFC 1877) */
|
|
|
|
#define CI_MS_WINS2 132 /* Secondary WINS value (RFC 1877) */
|
1999-06-11 15:30:55 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
static void dissect_ipcp_addrs_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
static void dissect_ipcp_addr_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree);
|
1999-08-28 08:31:28 +00:00
|
|
|
|
|
|
|
static const ip_tcp_opt ipcp_opts[] = {
|
|
|
|
{
|
|
|
|
CI_ADDRS,
|
|
|
|
"IP addresses (deprecated)",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_ipcp_ipaddrs_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
10,
|
|
|
|
dissect_ipcp_addrs_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_COMPRESSTYPE,
|
|
|
|
"IP compression protocol",
|
1999-11-16 11:44:20 +00:00
|
|
|
&ett_ipcp_compressprot_opt,
|
1999-08-28 08:31:28 +00:00
|
|
|
VARIABLE_LENGTH,
|
|
|
|
4,
|
|
|
|
dissect_lcp_protocol_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_ADDR,
|
|
|
|
"IP address",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
6,
|
|
|
|
dissect_ipcp_addr_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_MOBILE_IPv4,
|
|
|
|
"Mobile node's home IP address",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
6,
|
|
|
|
dissect_ipcp_addr_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_MS_DNS1,
|
|
|
|
"Primary DNS server IP address",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
6,
|
|
|
|
dissect_ipcp_addr_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_MS_WINS1,
|
|
|
|
"Primary WINS server IP address",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
6,
|
|
|
|
dissect_ipcp_addr_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_MS_DNS2,
|
|
|
|
"Secondary DNS server IP address",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
6,
|
|
|
|
dissect_ipcp_addr_opt
|
|
|
|
},
|
|
|
|
{
|
|
|
|
CI_MS_WINS2,
|
|
|
|
"Secondary WINS server IP address",
|
1999-11-16 11:44:20 +00:00
|
|
|
NULL,
|
1999-08-28 08:31:28 +00:00
|
|
|
FIXED_LENGTH,
|
|
|
|
6,
|
|
|
|
dissect_ipcp_addr_opt
|
|
|
|
}
|
1999-08-25 06:52:04 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
#define N_IPCP_OPTS (sizeof ipcp_opts / sizeof ipcp_opts[0])
|
1999-06-11 15:30:55 +00:00
|
|
|
|
2001-03-30 06:10:54 +00:00
|
|
|
static void dissect_ppp(tvbuff_t *tvb, packet_info *pinfo,
|
2001-03-29 09:18:34 +00:00
|
|
|
proto_tree *tree);
|
|
|
|
|
2001-06-15 20:35:08 +00:00
|
|
|
static const value_string pap_vals[] = {
|
|
|
|
{CONFREQ, "Authenticate-Request" },
|
|
|
|
{CONFACK, "Authenticate-Ack" },
|
|
|
|
{CONFNAK, "Authenticate-Nak" },
|
|
|
|
{0, NULL } };
|
|
|
|
|
|
|
|
static void dissect_pap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
|
|
|
|
|
|
|
|
|
2000-12-14 08:20:31 +00:00
|
|
|
const unsigned int fcstab_32[256] =
|
|
|
|
{
|
|
|
|
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
|
|
|
|
0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
|
|
|
|
0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
|
|
|
|
0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
|
|
|
|
0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de,
|
|
|
|
0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
|
|
|
|
0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,
|
|
|
|
0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
|
|
|
|
0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
|
|
|
|
0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
|
|
|
|
0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940,
|
|
|
|
0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
|
|
|
|
0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116,
|
|
|
|
0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
|
|
|
|
0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
|
|
|
|
0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
|
|
|
|
0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a,
|
|
|
|
0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
|
|
|
|
0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818,
|
|
|
|
0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
|
|
|
|
0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
|
|
|
|
0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
|
|
|
|
0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c,
|
|
|
|
0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
|
|
|
|
0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2,
|
|
|
|
0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
|
|
|
|
0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
|
|
|
|
0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
|
|
|
|
0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086,
|
|
|
|
0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
|
|
|
|
0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4,
|
|
|
|
0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
|
|
|
|
0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
|
|
|
|
0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
|
|
|
|
0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8,
|
|
|
|
0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
|
|
|
|
0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe,
|
|
|
|
0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
|
|
|
|
0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
|
|
|
|
0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
|
|
|
|
0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252,
|
|
|
|
0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
|
|
|
|
0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60,
|
|
|
|
0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
|
|
|
|
0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
|
|
|
|
0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
|
|
|
|
0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04,
|
|
|
|
0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
|
|
|
|
0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a,
|
|
|
|
0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
|
|
|
|
0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
|
|
|
|
0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
|
|
|
|
0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e,
|
|
|
|
0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
|
|
|
|
0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c,
|
|
|
|
0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
|
|
|
|
0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
|
|
|
|
0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
|
|
|
|
0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0,
|
|
|
|
0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
|
|
|
|
0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6,
|
|
|
|
0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
|
|
|
|
0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
|
|
|
|
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
|
|
|
|
};
|
|
|
|
|
|
|
|
const unsigned short fcstab_16[256] = {
|
|
|
|
0x0000, 0x1189, 0x2312, 0x329b, 0x4624, 0x57ad, 0x6536, 0x74bf,
|
|
|
|
0x8c48, 0x9dc1, 0xaf5a, 0xbed3, 0xca6c, 0xdbe5, 0xe97e, 0xf8f7,
|
|
|
|
0x1081, 0x0108, 0x3393, 0x221a, 0x56a5, 0x472c, 0x75b7, 0x643e,
|
|
|
|
0x9cc9, 0x8d40, 0xbfdb, 0xae52, 0xdaed, 0xcb64, 0xf9ff, 0xe876,
|
|
|
|
0x2102, 0x308b, 0x0210, 0x1399, 0x6726, 0x76af, 0x4434, 0x55bd,
|
|
|
|
0xad4a, 0xbcc3, 0x8e58, 0x9fd1, 0xeb6e, 0xfae7, 0xc87c, 0xd9f5,
|
|
|
|
0x3183, 0x200a, 0x1291, 0x0318, 0x77a7, 0x662e, 0x54b5, 0x453c,
|
|
|
|
0xbdcb, 0xac42, 0x9ed9, 0x8f50, 0xfbef, 0xea66, 0xd8fd, 0xc974,
|
|
|
|
0x4204, 0x538d, 0x6116, 0x709f, 0x0420, 0x15a9, 0x2732, 0x36bb,
|
|
|
|
0xce4c, 0xdfc5, 0xed5e, 0xfcd7, 0x8868, 0x99e1, 0xab7a, 0xbaf3,
|
|
|
|
0x5285, 0x430c, 0x7197, 0x601e, 0x14a1, 0x0528, 0x37b3, 0x263a,
|
|
|
|
0xdecd, 0xcf44, 0xfddf, 0xec56, 0x98e9, 0x8960, 0xbbfb, 0xaa72,
|
|
|
|
0x6306, 0x728f, 0x4014, 0x519d, 0x2522, 0x34ab, 0x0630, 0x17b9,
|
|
|
|
0xef4e, 0xfec7, 0xcc5c, 0xddd5, 0xa96a, 0xb8e3, 0x8a78, 0x9bf1,
|
|
|
|
0x7387, 0x620e, 0x5095, 0x411c, 0x35a3, 0x242a, 0x16b1, 0x0738,
|
|
|
|
0xffcf, 0xee46, 0xdcdd, 0xcd54, 0xb9eb, 0xa862, 0x9af9, 0x8b70,
|
|
|
|
0x8408, 0x9581, 0xa71a, 0xb693, 0xc22c, 0xd3a5, 0xe13e, 0xf0b7,
|
|
|
|
0x0840, 0x19c9, 0x2b52, 0x3adb, 0x4e64, 0x5fed, 0x6d76, 0x7cff,
|
|
|
|
0x9489, 0x8500, 0xb79b, 0xa612, 0xd2ad, 0xc324, 0xf1bf, 0xe036,
|
|
|
|
0x18c1, 0x0948, 0x3bd3, 0x2a5a, 0x5ee5, 0x4f6c, 0x7df7, 0x6c7e,
|
|
|
|
0xa50a, 0xb483, 0x8618, 0x9791, 0xe32e, 0xf2a7, 0xc03c, 0xd1b5,
|
|
|
|
0x2942, 0x38cb, 0x0a50, 0x1bd9, 0x6f66, 0x7eef, 0x4c74, 0x5dfd,
|
|
|
|
0xb58b, 0xa402, 0x9699, 0x8710, 0xf3af, 0xe226, 0xd0bd, 0xc134,
|
|
|
|
0x39c3, 0x284a, 0x1ad1, 0x0b58, 0x7fe7, 0x6e6e, 0x5cf5, 0x4d7c,
|
|
|
|
0xc60c, 0xd785, 0xe51e, 0xf497, 0x8028, 0x91a1, 0xa33a, 0xb2b3,
|
|
|
|
0x4a44, 0x5bcd, 0x6956, 0x78df, 0x0c60, 0x1de9, 0x2f72, 0x3efb,
|
|
|
|
0xd68d, 0xc704, 0xf59f, 0xe416, 0x90a9, 0x8120, 0xb3bb, 0xa232,
|
|
|
|
0x5ac5, 0x4b4c, 0x79d7, 0x685e, 0x1ce1, 0x0d68, 0x3ff3, 0x2e7a,
|
|
|
|
0xe70e, 0xf687, 0xc41c, 0xd595, 0xa12a, 0xb0a3, 0x8238, 0x93b1,
|
|
|
|
0x6b46, 0x7acf, 0x4854, 0x59dd, 0x2d62, 0x3ceb, 0x0e70, 0x1ff9,
|
|
|
|
0xf78f, 0xe606, 0xd49d, 0xc514, 0xb1ab, 0xa022, 0x92b9, 0x8330,
|
|
|
|
0x7bc7, 0x6a4e, 0x58d5, 0x495c, 0x3de3, 0x2c6a, 0x1ef1, 0x0f78
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
*******************************************************************************
|
|
|
|
* DETAILS : Calculate a new FCS-16 given the current FCS-16 and the new data.
|
|
|
|
*******************************************************************************
|
|
|
|
*/
|
|
|
|
guint16
|
|
|
|
fcs16(register guint16 fcs,
|
|
|
|
tvbuff_t * tvbuff,
|
|
|
|
guint32 offset,
|
|
|
|
guint32 len)
|
|
|
|
{
|
|
|
|
guint8 val;
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
|
2000-12-14 08:20:31 +00:00
|
|
|
/* Check for Invalid Length */
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
if (len == 0)
|
|
|
|
return (0x0000);
|
2000-12-14 08:20:31 +00:00
|
|
|
while (len--) {
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
val = tvb_get_guint8(tvbuff, offset++);
|
|
|
|
fcs = (guint16)((fcs >> 8) & 0x00ff) ^
|
2000-12-14 08:20:31 +00:00
|
|
|
fcstab_16[((guint16)(fcs ^ (guint16)((val) & 0x00ff)) & 0x00ff)];
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
}
|
2000-12-14 08:20:31 +00:00
|
|
|
|
|
|
|
return (fcs ^ 0xffff);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
*******************************************************************************
|
|
|
|
* DETAILS : Calculate a new FCS-32 given the current FCS-32 and the new data.
|
|
|
|
*******************************************************************************
|
|
|
|
*/
|
|
|
|
guint32
|
|
|
|
fcs32(guint32 fcs,
|
|
|
|
tvbuff_t * tvbuff,
|
|
|
|
guint32 offset,
|
|
|
|
guint32 len)
|
|
|
|
{
|
|
|
|
guint8 val;
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
|
2000-12-14 08:20:31 +00:00
|
|
|
/* Check for invalid Length */
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
if (len == 0)
|
|
|
|
return (0x00000000);
|
2000-12-14 08:20:31 +00:00
|
|
|
|
|
|
|
while (len--) {
|
2001-01-10 09:07:35 +00:00
|
|
|
val = tvb_get_guint8(tvbuff, offset++);
|
|
|
|
fcs = (((fcs) >> 8) ^ fcstab_32[((fcs) ^ (val)) & 0xff]);
|
|
|
|
}
|
2000-12-14 08:20:31 +00:00
|
|
|
return (fcs ^ 0xffffffff);
|
|
|
|
}
|
|
|
|
|
1999-02-09 00:35:38 +00:00
|
|
|
void
|
2001-03-30 06:15:47 +00:00
|
|
|
capture_ppp_hdlc( const u_char *pd, int offset, packet_counts *ld ) {
|
Add a new Wiretap encapsulation type for Cisco HDLC. Map the NetBSD
DLT_HDLC to it.
Make a separate dissector for Cisco HDLC, and add a dissector for Cisco
SLARP. Have the PPP dissector call the Cisco HDLC dissector if the
address field is the Cisco HDLC unicast or multicast address. Use the
Cisco HDLC dissector for the Cisco HDLC Wiretap encapsulation type.
Add a new dissector table "chdlctype", for Cisco HDLC packet types
(they're *almost* the same as Ethernet types, but 0x8035 is SLARP, not
Reverse ARP, and 0x2000 is the Cisco Discovery protocol, for example),
replacing "fr.chdlc".
Have a "chdlctype()" routine, similar to "ethertype()", used both by the
Cisco HDLC and Frame Relay dissectors. Have a "chdlc_vals[]"
"value_string" table for Cisco HDLC types and protocol names. Split the
packet type field in the Frame Relay dissector into separate SNAP and
Cisco HDLC fields, and give them the Ethernet type and Cisco HDLC type
"value_string" tables, respectively.
svn path=/trunk/; revision=3133
2001-03-15 09:11:03 +00:00
|
|
|
if (pd[0] == CHDLC_ADDR_UNICAST || pd[0] == CHDLC_ADDR_MULTICAST) {
|
|
|
|
capture_chdlc(pd, offset, ld);
|
|
|
|
return;
|
|
|
|
}
|
2000-05-25 07:42:26 +00:00
|
|
|
switch (pntohs(&pd[offset + 2])) {
|
1999-02-09 00:35:38 +00:00
|
|
|
case PPP_IP:
|
2000-05-25 07:42:26 +00:00
|
|
|
capture_ip(pd, offset + 4, ld);
|
1999-02-09 00:35:38 +00:00
|
|
|
break;
|
1999-11-30 23:56:37 +00:00
|
|
|
case PPP_IPX:
|
2000-05-25 07:42:26 +00:00
|
|
|
capture_ipx(pd, offset + 4, ld);
|
1999-11-30 23:56:37 +00:00
|
|
|
break;
|
2000-01-20 21:34:16 +00:00
|
|
|
case PPP_VINES:
|
2000-05-25 07:42:26 +00:00
|
|
|
capture_vines(pd, offset + 4, ld);
|
2000-01-20 21:34:16 +00:00
|
|
|
break;
|
1999-02-09 00:35:38 +00:00
|
|
|
default:
|
|
|
|
ld->other++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-08-25 06:52:04 +00:00
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_mru_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
guint length, frame_data *fd, proto_tree *tree)
|
1999-08-25 06:52:04 +00:00
|
|
|
{
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(tree, tvb, offset, length, "MRU: %u",
|
|
|
|
tvb_get_ntohs(tvb, offset + 2));
|
1999-08-25 06:52:04 +00:00
|
|
|
}
|
1999-06-11 15:30:55 +00:00
|
|
|
|
1999-08-25 07:32:46 +00:00
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_async_map_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
guint length, frame_data *fd, proto_tree *tree)
|
1999-08-25 07:32:46 +00:00
|
|
|
{
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(tree, tvb, offset, length, "Async characters to map: 0x%08x",
|
|
|
|
tvb_get_ntohl(tvb, offset + 2));
|
1999-08-25 07:32:46 +00:00
|
|
|
}
|
|
|
|
|
1999-08-25 06:52:04 +00:00
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_protocol_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
guint length, frame_data *fd, proto_tree *tree)
|
1999-08-25 06:52:04 +00:00
|
|
|
{
|
|
|
|
guint16 protocol;
|
|
|
|
proto_item *tf;
|
|
|
|
proto_tree *field_tree = NULL;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
|
1999-08-25 07:32:46 +00:00
|
|
|
optp->name, length, plurality(length, "", "s"));
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
|
1999-08-25 06:52:04 +00:00
|
|
|
offset += 2;
|
|
|
|
length -= 2;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
protocol = tvb_get_ntohs(tvb, offset);
|
|
|
|
proto_tree_add_text(field_tree, tvb, offset, 2, "%s: %s (0x%02x)", optp->name,
|
1999-08-25 06:52:04 +00:00
|
|
|
val_to_str(protocol, ppp_vals, "Unknown"), protocol);
|
|
|
|
offset += 2;
|
|
|
|
length -= 2;
|
1999-08-25 07:32:46 +00:00
|
|
|
if (length > 0)
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length, "Data (%d byte%s)", length,
|
1999-08-25 07:32:46 +00:00
|
|
|
plurality(length, "", "s"));
|
1999-08-25 06:52:04 +00:00
|
|
|
}
|
1999-06-11 15:30:55 +00:00
|
|
|
|
1999-08-25 06:52:04 +00:00
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_magicnumber_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree)
|
1999-08-25 06:52:04 +00:00
|
|
|
{
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(tree, tvb, offset, length, "Magic number: 0x%08x",
|
|
|
|
tvb_get_ntohl(tvb, offset + 2));
|
1999-08-25 06:52:04 +00:00
|
|
|
}
|
1999-06-11 15:30:55 +00:00
|
|
|
|
1999-08-28 08:31:28 +00:00
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_fcs_alternatives_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree)
|
1999-08-25 06:52:04 +00:00
|
|
|
{
|
1999-08-28 08:31:28 +00:00
|
|
|
proto_item *tf;
|
|
|
|
proto_tree *field_tree = NULL;
|
|
|
|
guint8 alternatives;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
alternatives = tvb_get_guint8(tvb, offset + 2);
|
|
|
|
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: 0x%02x",
|
1999-08-28 08:31:28 +00:00
|
|
|
optp->name, alternatives);
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
|
1999-08-28 08:31:28 +00:00
|
|
|
offset += 2;
|
|
|
|
if (alternatives & 0x1)
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset + 2, 1, "%s",
|
1999-08-28 08:31:28 +00:00
|
|
|
decode_boolean_bitfield(alternatives, 0x1, 8, "Null FCS", NULL));
|
|
|
|
if (alternatives & 0x2)
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset + 2, 1, "%s",
|
1999-08-28 08:31:28 +00:00
|
|
|
decode_boolean_bitfield(alternatives, 0x2, 8, "CCITT 16-bit FCS", NULL));
|
|
|
|
if (alternatives & 0x4)
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset + 2, 1, "%s",
|
1999-08-28 08:31:28 +00:00
|
|
|
decode_boolean_bitfield(alternatives, 0x4, 8, "CCITT 32-bit FCS", NULL));
|
1999-08-25 06:52:04 +00:00
|
|
|
}
|
1999-06-11 15:30:55 +00:00
|
|
|
|
1999-08-25 06:52:04 +00:00
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_self_describing_pad_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree)
|
1999-08-25 06:52:04 +00:00
|
|
|
{
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Maximum octets of self-describing padding: %u",
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvb_get_guint8(tvb, offset + 2));
|
1999-08-28 08:31:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_numbered_mode_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree)
|
1999-08-28 08:31:28 +00:00
|
|
|
{
|
|
|
|
proto_item *tf;
|
|
|
|
proto_tree *field_tree = NULL;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
|
1999-08-28 08:31:28 +00:00
|
|
|
optp->name, length, plurality(length, "", "s"));
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
|
1999-08-28 08:31:28 +00:00
|
|
|
offset += 2;
|
|
|
|
length -= 2;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, 1, "Window: %u",
|
|
|
|
tvb_get_guint8(tvb, offset));
|
1999-08-28 08:31:28 +00:00
|
|
|
offset += 1;
|
|
|
|
length -= 1;
|
|
|
|
if (length > 0)
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length, "Address (%d byte%s)",
|
1999-08-28 08:31:28 +00:00
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
}
|
|
|
|
|
|
|
|
static const value_string callback_op_vals[] = {
|
|
|
|
{0, "Location is determined by user authentication" },
|
|
|
|
{1, "Message is dialing string" },
|
|
|
|
{2, "Message is location identifier" },
|
|
|
|
{3, "Message is E.164" },
|
|
|
|
{4, "Message is distinguished name" },
|
|
|
|
{0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
guint length, frame_data *fd, proto_tree *tree)
|
1999-08-28 08:31:28 +00:00
|
|
|
{
|
|
|
|
proto_item *tf;
|
|
|
|
proto_tree *field_tree = NULL;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
guint8 operation;
|
1999-08-28 08:31:28 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
|
1999-08-28 08:31:28 +00:00
|
|
|
optp->name, length, plurality(length, "", "s"));
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
|
1999-08-28 08:31:28 +00:00
|
|
|
offset += 2;
|
|
|
|
length -= 2;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
operation = tvb_get_guint8(tvb, offset);
|
|
|
|
proto_tree_add_text(field_tree, tvb, offset, 1, "Operation: %s (0x%02x)",
|
|
|
|
val_to_str(operation, callback_op_vals, "Unknown"),
|
|
|
|
operation);
|
1999-08-28 08:31:28 +00:00
|
|
|
offset += 1;
|
|
|
|
length -= 1;
|
|
|
|
if (length > 0)
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length, "Message (%d byte%s)",
|
1999-08-28 08:31:28 +00:00
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_multilink_mrru_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree)
|
1999-08-28 08:31:28 +00:00
|
|
|
{
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(tree, tvb, offset, length, "Multilink MRRU: %u",
|
|
|
|
tvb_get_ntohs(tvb, offset + 2));
|
1999-08-28 08:31:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#define CLASS_NULL 0
|
|
|
|
#define CLASS_LOCAL 1
|
|
|
|
#define CLASS_IP 2
|
|
|
|
#define CLASS_IEEE_802_1 3
|
|
|
|
#define CLASS_PPP_MAGIC_NUMBER 4
|
|
|
|
#define CLASS_PSDN_DIRECTORY_NUMBER 5
|
|
|
|
|
|
|
|
static const value_string multilink_ep_disc_class_vals[] = {
|
|
|
|
{CLASS_NULL, "Null" },
|
|
|
|
{CLASS_LOCAL, "Locally assigned address" },
|
|
|
|
{CLASS_IP, "IP address" },
|
|
|
|
{CLASS_IEEE_802_1, "IEEE 802.1 globally assigned MAC address" },
|
|
|
|
{CLASS_PPP_MAGIC_NUMBER, "PPP magic-number block" },
|
|
|
|
{CLASS_PSDN_DIRECTORY_NUMBER, "Public switched network directory number" },
|
|
|
|
{0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_multilink_ep_disc_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree)
|
1999-08-28 08:31:28 +00:00
|
|
|
{
|
|
|
|
proto_item *tf;
|
|
|
|
proto_tree *field_tree = NULL;
|
|
|
|
guint8 ep_disc_class;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
|
1999-08-28 08:31:28 +00:00
|
|
|
optp->name, length, plurality(length, "", "s"));
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
|
1999-08-28 08:31:28 +00:00
|
|
|
offset += 2;
|
|
|
|
length -= 2;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
ep_disc_class = tvb_get_guint8(tvb, offset);
|
|
|
|
proto_tree_add_text(field_tree, tvb, offset, 1, "Class: %s (%u)",
|
1999-08-28 08:31:28 +00:00
|
|
|
val_to_str(ep_disc_class, multilink_ep_disc_class_vals, "Unknown"),
|
|
|
|
ep_disc_class);
|
|
|
|
offset += 1;
|
|
|
|
length -= 1;
|
|
|
|
if (length > 0) {
|
|
|
|
switch (ep_disc_class) {
|
|
|
|
|
|
|
|
case CLASS_NULL:
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Address (%d byte%s), should have been empty",
|
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CLASS_LOCAL:
|
|
|
|
if (length > 20) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Address (%d byte%s), should have been <20",
|
|
|
|
length, plurality(length, "", "s"));
|
1999-08-25 06:52:04 +00:00
|
|
|
} else {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Address (%d byte%s)",
|
|
|
|
length, plurality(length, "", "s"));
|
1999-08-25 06:52:04 +00:00
|
|
|
}
|
1999-08-28 08:31:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CLASS_IP:
|
|
|
|
if (length != 4) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Address (%d byte%s), should have been 4",
|
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
} else {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
|
|
|
"Address: %s", ip_to_str(tvb_get_ptr(tvb, offset, 4)));
|
1999-08-28 08:31:28 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CLASS_IEEE_802_1:
|
|
|
|
if (length != 6) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Address (%d byte%s), should have been 6",
|
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
} else {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
|
|
|
"Address: %s", ether_to_str(tvb_get_ptr(tvb, offset, 6)));
|
1999-08-28 08:31:28 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CLASS_PPP_MAGIC_NUMBER:
|
|
|
|
/* XXX - dissect as 32-bit magic numbers */
|
|
|
|
if (length > 20) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Address (%d byte%s), should have been <20",
|
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
} else {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Address (%d byte%s)",
|
|
|
|
length, plurality(length, "", "s"));
|
1999-08-25 06:52:04 +00:00
|
|
|
}
|
1999-08-28 08:31:28 +00:00
|
|
|
break;
|
|
|
|
|
|
|
|
case CLASS_PSDN_DIRECTORY_NUMBER:
|
|
|
|
if (length > 15) {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Address (%d byte%s), should have been <20",
|
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
} else {
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Address (%d byte%s)",
|
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Address (%d byte%s)",
|
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
break;
|
1999-08-25 06:52:04 +00:00
|
|
|
}
|
1999-06-11 15:30:55 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-08-28 08:31:28 +00:00
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_bap_link_discriminator_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree)
|
1999-08-28 08:31:28 +00:00
|
|
|
{
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(tree, tvb, offset, length,
|
1999-08-28 08:31:28 +00:00
|
|
|
"Link discriminator for BAP: 0x%04x",
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tvb_get_ntohs(tvb, offset + 2));
|
1999-08-28 08:31:28 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Character set numbers from the IANA charset registry. */
|
|
|
|
static const value_string charset_num_vals[] = {
|
|
|
|
{105, "UTF-8" },
|
|
|
|
{0, NULL }
|
|
|
|
};
|
|
|
|
|
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_lcp_internationalization_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree)
|
1999-08-28 08:31:28 +00:00
|
|
|
{
|
|
|
|
proto_item *tf;
|
|
|
|
proto_tree *field_tree = NULL;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
guint32 charset;
|
1999-08-28 08:31:28 +00:00
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
|
1999-08-28 08:31:28 +00:00
|
|
|
optp->name, length, plurality(length, "", "s"));
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
|
1999-08-28 08:31:28 +00:00
|
|
|
offset += 2;
|
|
|
|
length -= 2;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
charset = tvb_get_ntohl(tvb, offset);
|
|
|
|
proto_tree_add_text(field_tree, tvb, offset, 4, "Character set: %s (0x%04x)",
|
|
|
|
val_to_str(charset, charset_num_vals, "Unknown"),
|
|
|
|
charset);
|
1999-08-28 08:31:28 +00:00
|
|
|
offset += 4;
|
|
|
|
length -= 4;
|
|
|
|
if (length > 0) {
|
|
|
|
/* XXX - should be displayed as an ASCII string */
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, length, "Language tag (%d byte%s)",
|
1999-08-28 08:31:28 +00:00
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_ipcp_addrs_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree)
|
1999-08-28 08:31:28 +00:00
|
|
|
{
|
|
|
|
proto_item *tf;
|
|
|
|
proto_tree *field_tree = NULL;
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
|
1999-08-28 08:31:28 +00:00
|
|
|
optp->name, length, plurality(length, "", "s"));
|
1999-11-16 11:44:20 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
|
1999-08-28 08:31:28 +00:00
|
|
|
offset += 2;
|
|
|
|
length -= 2;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, 4,
|
|
|
|
"Source IP address: %s",
|
|
|
|
ip_to_str(tvb_get_ptr(tvb, offset, 4)));
|
1999-08-28 08:31:28 +00:00
|
|
|
offset += 4;
|
|
|
|
length -= 4;
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(field_tree, tvb, offset, 4,
|
|
|
|
"Destination IP address: %s",
|
|
|
|
ip_to_str(tvb_get_ptr(tvb, offset, 4)));
|
1999-08-28 08:31:28 +00:00
|
|
|
}
|
|
|
|
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
static void dissect_ipcp_addr_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
int offset, guint length, frame_data *fd,
|
|
|
|
proto_tree *tree)
|
1999-08-28 08:31:28 +00:00
|
|
|
{
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
proto_tree_add_text(tree, tvb, offset, length, "%s: %s", optp->name,
|
|
|
|
ip_to_str(tvb_get_ptr(tvb, offset + 2, 4)));
|
1999-08-28 08:31:28 +00:00
|
|
|
}
|
|
|
|
|
1999-08-25 06:52:04 +00:00
|
|
|
static void
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
dissect_cp( tvbuff_t *tvb, int proto_id, int proto_subtree_index,
|
1999-08-25 06:52:04 +00:00
|
|
|
const value_string *proto_vals, int options_subtree_index,
|
2000-05-25 07:42:26 +00:00
|
|
|
const ip_tcp_opt *opts, int nopts, packet_info *pinfo, proto_tree *tree ) {
|
1999-06-11 15:30:55 +00:00
|
|
|
proto_item *ti;
|
1999-08-25 06:52:04 +00:00
|
|
|
proto_tree *fh_tree = NULL;
|
|
|
|
proto_item *tf;
|
|
|
|
proto_tree *field_tree;
|
1999-06-11 15:30:55 +00:00
|
|
|
|
1999-08-25 06:52:04 +00:00
|
|
|
guint8 code;
|
|
|
|
guint8 id;
|
2000-05-25 07:42:26 +00:00
|
|
|
int length, offset;
|
1999-08-25 06:52:04 +00:00
|
|
|
guint16 protocol;
|
1999-06-11 15:30:55 +00:00
|
|
|
|
2000-05-25 07:42:26 +00:00
|
|
|
code = tvb_get_guint8(tvb, 0);
|
|
|
|
id = tvb_get_guint8(tvb, 1);
|
|
|
|
length = tvb_get_ntohs(tvb, 2);
|
1999-08-25 06:52:04 +00:00
|
|
|
|
2001-06-16 00:51:45 +00:00
|
|
|
if(check_col(pinfo->fd, COL_PROTOCOL))
|
|
|
|
col_set_str(pinfo->fd, COL_PROTOCOL,
|
|
|
|
proto_get_protocol_short_name(proto_id));
|
|
|
|
|
2000-05-25 07:42:26 +00:00
|
|
|
if(check_col(pinfo->fd, COL_INFO))
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
col_add_fstr(pinfo->fd, COL_INFO, "%s %s",
|
|
|
|
proto_get_protocol_short_name(proto_id),
|
1999-08-25 06:52:04 +00:00
|
|
|
val_to_str(code, proto_vals, "Unknown"));
|
1999-06-11 15:30:55 +00:00
|
|
|
|
|
|
|
if(tree) {
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
ti = proto_tree_add_item(tree, proto_id, tvb, 0, length, FALSE);
|
1999-08-25 06:52:04 +00:00
|
|
|
fh_tree = proto_item_add_subtree(ti, proto_subtree_index);
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, 0, 1, "Code: %s (0x%02x)",
|
1999-08-25 06:52:04 +00:00
|
|
|
val_to_str(code, proto_vals, "Unknown"), code);
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, 1, 1, "Identifier: 0x%02x",
|
1999-08-25 06:52:04 +00:00
|
|
|
id);
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, 2, 2, "Length: %u",
|
1999-08-25 06:52:04 +00:00
|
|
|
length);
|
1999-06-11 15:30:55 +00:00
|
|
|
}
|
2000-05-25 07:42:26 +00:00
|
|
|
offset = 4;
|
1999-08-25 07:32:46 +00:00
|
|
|
length -= 4;
|
1999-08-25 06:52:04 +00:00
|
|
|
|
|
|
|
switch (code) {
|
|
|
|
case CONFREQ:
|
|
|
|
case CONFACK:
|
|
|
|
case CONFNAK:
|
|
|
|
case CONFREJ:
|
|
|
|
if(tree) {
|
1999-08-25 07:32:46 +00:00
|
|
|
if (length > 0) {
|
2000-05-25 07:42:26 +00:00
|
|
|
tf = proto_tree_add_text(fh_tree, tvb, offset, length,
|
1999-08-25 07:32:46 +00:00
|
|
|
"Options: (%d byte%s)", length, plurality(length, "", "s"));
|
1999-08-25 06:52:04 +00:00
|
|
|
field_tree = proto_item_add_subtree(tf, options_subtree_index);
|
Tvbuffify the IP, ICMP, TCP, UDP, OSI CLNP, OSI COTP, OSI CLTP, and OSI
ESIS dissectors.
Register the IP dissector and have dissectors that call it directly
(rather than through a port table) call it through a handle.
Add a routine "tvb_set_reported_length()" which a dissector can use if
it was handed a tvbuff that contains more data than is actually in its
part of the packet - for example, handing a padded Ethernet frame to IP;
the routine sets the reported length of the tvbuff (and also adjusts the
actual length, as appropriate). Then use it in IP.
Given that, "ethertype()" can determine how much of the Ethernet frame
was actually part of an IP datagram (and can do the same for other
protocols under Ethernet that use "tvb_set_reported_length()"; have it
return the actual length, and have "dissect_eth()" and "dissect_vlan()"
use that to mark trailer data in Ethernet II frames as well as in 802.3
frames.
svn path=/trunk/; revision=2658
2000-11-18 10:38:33 +00:00
|
|
|
dissect_ip_tcp_options(tvb, offset, length, opts, nopts, -1,
|
Add a "col_clear()" routine, to clear a column; it appears (and it
doesn't just seem to be a profiling artifact) that, at least on FreeBSD
3.4, it's significantly more efficient to clear out a column by stuffing
a '\0' into the first byte of the column data than to do so by copying a
null string (I guess when copying one byte, the fixed overhead of the
procedure call and of "strcpy()" is significant).
Have the TCP dissector set the Protocol column, and clear the Info
column, before doing anything that might cause an exception to be
thrown, so that if we *do* get an exception thrown, the frame at least
shows up as TCP.
Instead of, in the TCP dissector, constructing a string and then
stuffing it into the Info column, just append to the Info column, which
avoids one string copy.
Pass a "frame_data" pointer to dissectors for TCP and IP (and PPP)
options, so they can use it to append to the Info column.
svn path=/trunk/; revision=2744
2000-12-04 06:37:46 +00:00
|
|
|
pinfo->fd, field_tree);
|
1999-08-25 06:52:04 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
1999-06-11 15:30:55 +00:00
|
|
|
|
1999-08-25 06:52:04 +00:00
|
|
|
case ECHOREQ:
|
|
|
|
case ECHOREP:
|
|
|
|
case DISCREQ:
|
1999-08-25 07:32:46 +00:00
|
|
|
case IDENT:
|
1999-08-25 06:52:04 +00:00
|
|
|
if(tree) {
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, 4, "Magic number: 0x%08x",
|
|
|
|
tvb_get_ntohl(tvb, offset));
|
1999-08-25 06:52:04 +00:00
|
|
|
offset += 4;
|
1999-08-25 07:32:46 +00:00
|
|
|
length -= 4;
|
|
|
|
if (length > 0)
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, length, "Message (%d byte%s)",
|
1999-08-25 07:32:46 +00:00
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case TIMEREMAIN:
|
|
|
|
if(tree) {
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, 4, "Magic number: 0x%08x",
|
|
|
|
tvb_get_ntohl(tvb, offset));
|
1999-08-25 07:32:46 +00:00
|
|
|
offset += 4;
|
|
|
|
length -= 4;
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, 4, "Seconds remaining: %u",
|
|
|
|
tvb_get_ntohl(tvb, offset));
|
1999-08-25 07:32:46 +00:00
|
|
|
offset += 4;
|
|
|
|
length -= 4;
|
|
|
|
if (length > 0)
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, length, "Message (%d byte%s)",
|
1999-08-25 07:32:46 +00:00
|
|
|
length, plurality(length, "", "s"));
|
1999-08-25 06:52:04 +00:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case PROTREJ:
|
|
|
|
if(tree) {
|
2000-05-25 07:42:26 +00:00
|
|
|
protocol = tvb_get_ntohs(tvb, offset);
|
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, 2, "Rejected protocol: %s (0x%04x)",
|
1999-08-25 06:52:04 +00:00
|
|
|
val_to_str(protocol, ppp_vals, "Unknown"), protocol);
|
|
|
|
offset += 2;
|
1999-08-25 07:32:46 +00:00
|
|
|
length -= 2;
|
|
|
|
if (length > 0)
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, length, "Rejected packet (%d byte%s)",
|
1999-08-25 07:32:46 +00:00
|
|
|
length, plurality(length, "", "s"));
|
1999-08-25 06:52:04 +00:00
|
|
|
/* XXX - should be dissected as a PPP packet */
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CODEREJ:
|
|
|
|
/* decode the rejected LCP packet here. */
|
1999-08-25 07:32:46 +00:00
|
|
|
if (length > 0)
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, length, "Rejected packet (%d byte%s)",
|
1999-08-25 07:32:46 +00:00
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
break;
|
1999-08-25 06:52:04 +00:00
|
|
|
|
|
|
|
case TERMREQ:
|
|
|
|
case TERMACK:
|
1999-08-25 07:32:46 +00:00
|
|
|
if (length > 0)
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, length, "Data (%d byte%s)",
|
1999-08-25 07:32:46 +00:00
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
break;
|
|
|
|
|
1999-06-11 15:30:55 +00:00
|
|
|
default:
|
1999-08-25 07:32:46 +00:00
|
|
|
if (length > 0)
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, length, "Stuff (%d byte%s)",
|
1999-08-25 07:32:46 +00:00
|
|
|
length, plurality(length, "", "s"));
|
1999-06-11 15:30:55 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-09-11 04:19:26 +00:00
|
|
|
/* Protocol field compression */
|
|
|
|
#define PFC_BIT 0x01
|
|
|
|
|
2001-03-29 09:18:34 +00:00
|
|
|
static void
|
2001-03-30 06:10:54 +00:00
|
|
|
dissect_ppp_common( tvbuff_t *tvb, int offset, packet_info *pinfo,
|
2001-03-29 09:18:34 +00:00
|
|
|
proto_tree *tree, proto_tree *fh_tree,
|
|
|
|
proto_item *ti ) {
|
1999-08-25 03:56:07 +00:00
|
|
|
guint16 ppp_prot;
|
1999-09-11 04:19:26 +00:00
|
|
|
int proto_len;
|
2000-05-25 07:42:26 +00:00
|
|
|
tvbuff_t *next_tvb;
|
1999-09-11 04:19:26 +00:00
|
|
|
|
2001-03-30 06:10:54 +00:00
|
|
|
ppp_prot = tvb_get_guint8(tvb, offset);
|
2001-03-29 09:18:34 +00:00
|
|
|
if (ppp_prot & PFC_BIT) {
|
|
|
|
/* Compressed protocol field - just the byte we fetched. */
|
1999-09-11 04:19:26 +00:00
|
|
|
proto_len = 1;
|
|
|
|
} else {
|
2001-03-29 09:18:34 +00:00
|
|
|
/* Uncompressed protocol field - fetch all of it. */
|
2001-03-30 06:10:54 +00:00
|
|
|
ppp_prot = tvb_get_ntohs(tvb, offset);
|
1999-09-11 04:19:26 +00:00
|
|
|
proto_len = 2;
|
|
|
|
}
|
1999-08-25 03:56:07 +00:00
|
|
|
|
2001-03-29 09:18:34 +00:00
|
|
|
/* If "ti" is not null, it refers to the top-level "proto_ppp" item
|
|
|
|
for PPP, and was given a length equal to the length of any
|
|
|
|
stuff in the header preceding the protocol type, e.g. an HDLC
|
2001-03-31 10:35:54 +00:00
|
|
|
header, which is just "offset"; add the length of the protocol
|
|
|
|
type field to it. */
|
2001-03-29 09:18:34 +00:00
|
|
|
if (ti != NULL)
|
2001-03-31 10:35:54 +00:00
|
|
|
proto_item_set_len(ti, offset + proto_len);
|
2001-03-29 09:18:34 +00:00
|
|
|
|
1999-08-25 03:56:07 +00:00
|
|
|
if (tree) {
|
2001-03-30 06:10:54 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, proto_len, "Protocol: %s (0x%04x)",
|
1999-08-25 03:56:07 +00:00
|
|
|
val_to_str(ppp_prot, ppp_vals, "Unknown"), ppp_prot);
|
1999-06-11 15:30:55 +00:00
|
|
|
}
|
2000-05-25 07:42:26 +00:00
|
|
|
|
2001-03-30 06:10:54 +00:00
|
|
|
next_tvb = tvb_new_subset(tvb, offset + proto_len, -1, -1);
|
1999-06-11 15:30:55 +00:00
|
|
|
|
2000-04-16 21:37:07 +00:00
|
|
|
/* do lookup with the subdissector table */
|
2001-03-29 09:18:34 +00:00
|
|
|
if (!dissector_try_port(subdissector_table, ppp_prot, next_tvb, pinfo, tree)) {
|
|
|
|
if (check_col(pinfo->fd, COL_PROTOCOL))
|
|
|
|
col_add_fstr(pinfo->fd, COL_PROTOCOL, "0x%04x", ppp_prot);
|
|
|
|
if (check_col(pinfo->fd, COL_INFO))
|
|
|
|
col_add_fstr(pinfo->fd, COL_INFO, "PPP %s (0x%04x)",
|
|
|
|
val_to_str(ppp_prot, ppp_vals, "Unknown"), ppp_prot);
|
|
|
|
dissect_data(next_tvb, 0, pinfo, tree);
|
|
|
|
}
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_lcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
{
|
|
|
|
dissect_cp(tvb, proto_lcp, ett_lcp, lcp_vals, ett_lcp_options,
|
|
|
|
lcp_opts, N_LCP_OPTS, pinfo, tree);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
dissect_ipcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
|
|
|
{
|
|
|
|
dissect_cp(tvb, proto_ipcp, ett_ipcp, cp_vals, ett_ipcp_options,
|
|
|
|
ipcp_opts, N_IPCP_OPTS, pinfo, tree);
|
1999-08-25 03:56:07 +00:00
|
|
|
}
|
|
|
|
|
1999-09-11 04:19:26 +00:00
|
|
|
#define MP_FRAG_MASK 0xC0
|
|
|
|
#define MP_FRAG(bits) ((bits) & MP_FRAG_MASK)
|
|
|
|
#define MP_FRAG_FIRST 0x80
|
|
|
|
#define MP_FRAG_LAST 0x40
|
|
|
|
#define MP_FRAG_RESERVED 0x3f
|
|
|
|
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
static const true_false_string frag_truth = {
|
|
|
|
"Yes",
|
|
|
|
"No"
|
|
|
|
};
|
|
|
|
|
1999-09-11 04:19:26 +00:00
|
|
|
/* According to RFC 1717, the length the MP header isn't indicated anywhere
|
|
|
|
in the header itself. It starts out at four bytes and can be
|
|
|
|
negotiated down to two using LCP. We currently assume that all
|
|
|
|
headers are four bytes. - gcc
|
|
|
|
*/
|
|
|
|
static void
|
2000-05-25 07:42:26 +00:00
|
|
|
dissect_mp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
|
1999-09-11 04:19:26 +00:00
|
|
|
{
|
2001-03-29 09:18:34 +00:00
|
|
|
proto_tree *mp_tree, *hdr_tree;
|
|
|
|
proto_item *ti = NULL;
|
1999-09-11 04:19:26 +00:00
|
|
|
guint8 flags;
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
gchar *flag_str;
|
|
|
|
tvbuff_t *next_tvb;
|
Add the "Edit:Protocols..." feature which currently only implements
the following:
It is now possible to enable/disable a particular protocol decoding
(i.e. the protocol dissector is void or not). When a protocol
is disabled, it is displayed as Data and of course, all linked
sub-protocols are disabled as well.
Disabling a protocol could be interesting:
- in case of buggy dissectors
- in case of wrong heuristics
- for performance reasons
- to decode the data as another protocol (TODO)
Currently (if I am not wrong), all dissectors but NFS can be disabled
(and dissectors that do not register protocols :-)
I do not like the way the RPC sub-dissectors are disabled (in the
sub-dissectors) since this could be done in the RPC dissector itself,
knowing the sub-protocol hfinfo entry (this is why, I've not modified
the NFS one yet).
Two functions are added in proto.c :
gboolean proto_is_protocol_enabled(int n);
void proto_set_decoding(int n, gboolean enabled);
and two MACROs which can be used in dissectors:
OLD_CHECK_DISPLAY_AS_DATA(index, pd, offset, fd, tree)
CHECK_DISPLAY_AS_DATA(index, tvb, pinfo, tree)
See also the XXX in proto_dlg.c and proto.c around the new functions.
svn path=/trunk/; revision=2267
2000-08-13 14:09:15 +00:00
|
|
|
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
if (check_col(pinfo->fd, COL_PROTOCOL))
|
|
|
|
col_set_str(pinfo->fd, COL_PROTOCOL, "PPP MP");
|
1999-09-11 04:19:26 +00:00
|
|
|
|
2000-05-25 07:42:26 +00:00
|
|
|
if (check_col(pinfo->fd, COL_INFO))
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
col_set_str(pinfo->fd, COL_INFO, "PPP Multilink");
|
|
|
|
|
|
|
|
flags = tvb_get_guint8(tvb, 0);
|
1999-09-11 04:19:26 +00:00
|
|
|
|
|
|
|
if (tree) {
|
|
|
|
switch (flags) {
|
|
|
|
case MP_FRAG_FIRST:
|
2000-05-25 07:42:26 +00:00
|
|
|
flag_str = "First";
|
1999-09-11 04:19:26 +00:00
|
|
|
break;
|
|
|
|
case MP_FRAG_LAST:
|
2000-05-25 07:42:26 +00:00
|
|
|
flag_str = "Last";
|
1999-09-11 04:19:26 +00:00
|
|
|
break;
|
|
|
|
case MP_FRAG_FIRST|MP_FRAG_LAST:
|
2000-05-25 07:42:26 +00:00
|
|
|
flag_str = "First, Last";
|
1999-09-11 04:19:26 +00:00
|
|
|
break;
|
|
|
|
default:
|
2000-05-25 07:42:26 +00:00
|
|
|
flag_str = "Unknown";
|
1999-09-11 04:19:26 +00:00
|
|
|
break;
|
|
|
|
}
|
2000-05-31 05:09:07 +00:00
|
|
|
ti = proto_tree_add_item(tree, proto_mp, tvb, 0, 4, FALSE);
|
1999-11-16 11:44:20 +00:00
|
|
|
mp_tree = proto_item_add_subtree(ti, ett_mp);
|
2000-05-25 07:42:26 +00:00
|
|
|
ti = proto_tree_add_text(mp_tree, tvb, 0, 1, "Fragment: 0x%2X (%s)",
|
1999-09-11 04:19:26 +00:00
|
|
|
flags, flag_str);
|
1999-11-16 11:44:20 +00:00
|
|
|
hdr_tree = proto_item_add_subtree(ti, ett_mp_flags);
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
proto_tree_add_boolean(hdr_tree, hf_mp_frag_first, tvb, 0, 1, flags);
|
|
|
|
proto_tree_add_boolean(hdr_tree, hf_mp_frag_last, tvb, 0, 1, flags),
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_tree_add_text(hdr_tree, tvb, 0, 1, "%s",
|
1999-09-11 04:19:26 +00:00
|
|
|
decode_boolean_bitfield(flags, MP_FRAG_RESERVED, sizeof(flags) * 8,
|
|
|
|
"reserved", "reserved"));
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
proto_tree_add_item(mp_tree, hf_mp_sequence_num, tvb, 1, 3, FALSE);
|
|
|
|
}
|
1999-09-11 04:19:26 +00:00
|
|
|
|
2001-03-29 09:18:34 +00:00
|
|
|
if (tvb_reported_length_remaining(tvb, 4) > 0) {
|
|
|
|
next_tvb = tvb_new_subset(tvb, 4, -1, -1);
|
2001-03-30 06:10:54 +00:00
|
|
|
dissect_ppp(next_tvb, pinfo, tree);
|
1999-09-11 04:19:26 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2001-03-29 09:18:34 +00:00
|
|
|
/*
|
2001-03-30 06:10:54 +00:00
|
|
|
* Handles PPP without HDLC framing, just a protocol field (RFC 1661).
|
2001-03-29 09:18:34 +00:00
|
|
|
*/
|
2000-11-19 02:00:03 +00:00
|
|
|
static void
|
2001-03-30 06:10:54 +00:00
|
|
|
dissect_ppp( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) {
|
2001-03-29 09:18:34 +00:00
|
|
|
proto_item *ti = NULL;
|
1999-08-25 03:56:07 +00:00
|
|
|
proto_tree *fh_tree = NULL;
|
|
|
|
|
|
|
|
if(tree) {
|
2001-03-29 09:18:34 +00:00
|
|
|
ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, 0, FALSE);
|
1999-11-16 11:44:20 +00:00
|
|
|
fh_tree = proto_item_add_subtree(ti, ett_ppp);
|
1999-06-11 15:30:55 +00:00
|
|
|
}
|
1999-08-25 03:56:07 +00:00
|
|
|
|
2001-03-30 06:10:54 +00:00
|
|
|
dissect_ppp_common(tvb, 0, pinfo, tree, fh_tree, ti);
|
1999-06-11 15:30:55 +00:00
|
|
|
}
|
|
|
|
|
2001-03-29 09:18:34 +00:00
|
|
|
/*
|
2001-03-30 06:10:54 +00:00
|
|
|
* Handles link-layer encapsulations where the frame might be
|
|
|
|
* a PPP in HDLC-like Framing frame (RFC 1662) or a Cisco HDLC frame.
|
2001-03-29 09:18:34 +00:00
|
|
|
*/
|
2000-12-03 09:59:49 +00:00
|
|
|
static void
|
2001-03-30 06:10:54 +00:00
|
|
|
dissect_ppp_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) {
|
2001-03-29 09:18:34 +00:00
|
|
|
proto_item *ti = NULL;
|
1999-08-25 03:56:07 +00:00
|
|
|
proto_tree *fh_tree = NULL;
|
2001-03-29 09:18:34 +00:00
|
|
|
guint8 byte0;
|
2000-04-19 03:28:07 +00:00
|
|
|
int proto_offset;
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
int rx_fcs_offset;
|
2000-12-14 08:20:31 +00:00
|
|
|
guint32 rx_fcs_exp;
|
|
|
|
guint32 rx_fcs_got;
|
1998-09-16 02:39:15 +00:00
|
|
|
|
2000-05-25 07:42:26 +00:00
|
|
|
byte0 = tvb_get_guint8(tvb, 0);
|
Add a new Wiretap encapsulation type for Cisco HDLC. Map the NetBSD
DLT_HDLC to it.
Make a separate dissector for Cisco HDLC, and add a dissector for Cisco
SLARP. Have the PPP dissector call the Cisco HDLC dissector if the
address field is the Cisco HDLC unicast or multicast address. Use the
Cisco HDLC dissector for the Cisco HDLC Wiretap encapsulation type.
Add a new dissector table "chdlctype", for Cisco HDLC packet types
(they're *almost* the same as Ethernet types, but 0x8035 is SLARP, not
Reverse ARP, and 0x2000 is the Cisco Discovery protocol, for example),
replacing "fr.chdlc".
Have a "chdlctype()" routine, similar to "ethertype()", used both by the
Cisco HDLC and Frame Relay dissectors. Have a "chdlc_vals[]"
"value_string" table for Cisco HDLC types and protocol names. Split the
packet type field in the Frame Relay dissector into separate SNAP and
Cisco HDLC fields, and give them the Ethernet type and Cisco HDLC type
"value_string" tables, respectively.
svn path=/trunk/; revision=3133
2001-03-15 09:11:03 +00:00
|
|
|
if (byte0 == CHDLC_ADDR_UNICAST || byte0 == CHDLC_ADDR_MULTICAST) {
|
|
|
|
/* Cisco HDLC encapsulation */
|
|
|
|
call_dissector(chdlc_handle, tvb, pinfo, tree);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* XXX - should we have a routine that always dissects PPP, for use
|
|
|
|
* when we know the packets are PPP, not CHDLC?
|
|
|
|
*/
|
2000-05-25 07:42:26 +00:00
|
|
|
|
Add a new Wiretap encapsulation type for Cisco HDLC. Map the NetBSD
DLT_HDLC to it.
Make a separate dissector for Cisco HDLC, and add a dissector for Cisco
SLARP. Have the PPP dissector call the Cisco HDLC dissector if the
address field is the Cisco HDLC unicast or multicast address. Use the
Cisco HDLC dissector for the Cisco HDLC Wiretap encapsulation type.
Add a new dissector table "chdlctype", for Cisco HDLC packet types
(they're *almost* the same as Ethernet types, but 0x8035 is SLARP, not
Reverse ARP, and 0x2000 is the Cisco Discovery protocol, for example),
replacing "fr.chdlc".
Have a "chdlctype()" routine, similar to "ethertype()", used both by the
Cisco HDLC and Frame Relay dissectors. Have a "chdlc_vals[]"
"value_string" table for Cisco HDLC types and protocol names. Split the
packet type field in the Frame Relay dissector into separate SNAP and
Cisco HDLC fields, and give them the Ethernet type and Cisco HDLC type
"value_string" tables, respectively.
svn path=/trunk/; revision=3133
2001-03-15 09:11:03 +00:00
|
|
|
/* PPP HDLC encapsulation */
|
2001-03-29 09:18:34 +00:00
|
|
|
if (byte0 == 0xff)
|
|
|
|
proto_offset = 2;
|
2000-04-19 03:28:07 +00:00
|
|
|
else {
|
|
|
|
/* address and control are compressed (NULL) */
|
2000-05-25 07:42:26 +00:00
|
|
|
proto_offset = 0;
|
2000-04-19 03:28:07 +00:00
|
|
|
}
|
1998-09-16 02:39:15 +00:00
|
|
|
|
|
|
|
/* load the top pane info. This should be overwritten by
|
|
|
|
the next protocol in the stack */
|
1999-06-11 15:30:55 +00:00
|
|
|
|
2000-05-25 07:42:26 +00:00
|
|
|
if(check_col(pinfo->fd, COL_RES_DL_SRC))
|
2000-11-19 08:54:37 +00:00
|
|
|
col_set_str(pinfo->fd, COL_RES_DL_SRC, "N/A" );
|
2000-05-25 07:42:26 +00:00
|
|
|
if(check_col(pinfo->fd, COL_RES_DL_DST))
|
2000-11-19 08:54:37 +00:00
|
|
|
col_set_str(pinfo->fd, COL_RES_DL_DST, "N/A" );
|
2000-05-25 07:42:26 +00:00
|
|
|
if(check_col(pinfo->fd, COL_PROTOCOL))
|
2000-11-19 08:54:37 +00:00
|
|
|
col_set_str(pinfo->fd, COL_PROTOCOL, "PPP" );
|
1998-09-16 02:39:15 +00:00
|
|
|
|
|
|
|
if(tree) {
|
2001-03-29 09:18:34 +00:00
|
|
|
ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, proto_offset, FALSE);
|
1999-11-16 11:44:20 +00:00
|
|
|
fh_tree = proto_item_add_subtree(ti, ett_ppp);
|
2000-05-25 07:42:26 +00:00
|
|
|
if (byte0 == 0xff) {
|
2001-03-29 09:18:34 +00:00
|
|
|
proto_tree_add_text(fh_tree, tvb, 0, 1, "Address: %02x",
|
|
|
|
tvb_get_guint8(tvb, 0));
|
|
|
|
proto_tree_add_text(fh_tree, tvb, 1, 1, "Control: %02x",
|
|
|
|
tvb_get_guint8(tvb, 1));
|
2000-04-19 03:28:07 +00:00
|
|
|
}
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
|
|
|
|
2001-03-30 06:10:54 +00:00
|
|
|
dissect_ppp_common(tvb, proto_offset, pinfo, tree, fh_tree, ti);
|
2000-12-14 08:20:31 +00:00
|
|
|
|
|
|
|
/* Calculate the FCS check */
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
/* XXX - deal with packets cut off by the snapshot length */
|
2000-12-14 08:20:31 +00:00
|
|
|
if (ppp_fcs_decode == FCS_16) {
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
rx_fcs_offset = tvb_length(tvb) - 2;
|
|
|
|
rx_fcs_exp = fcs16(0xFFFF, tvb, 0, rx_fcs_offset);
|
|
|
|
rx_fcs_got = tvb_get_letohs(tvb, rx_fcs_offset);
|
|
|
|
if (rx_fcs_got != rx_fcs_exp) {
|
|
|
|
proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 2, "FCS 16: %04x (incorrect, should be %04x)", rx_fcs_got, rx_fcs_exp);
|
|
|
|
} else {
|
|
|
|
proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 2, "FCS 16: %04x (correct)", rx_fcs_got);
|
|
|
|
}
|
|
|
|
} else if (ppp_fcs_decode == FCS_32) {
|
|
|
|
rx_fcs_offset = tvb_length(tvb) - 4;
|
|
|
|
rx_fcs_exp = fcs32(0xFFFFFFFF, tvb, 0, rx_fcs_offset);
|
|
|
|
rx_fcs_got = tvb_get_letohl(tvb, rx_fcs_offset);
|
|
|
|
if (rx_fcs_got != rx_fcs_exp) {
|
|
|
|
proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 4, "FCS 32: %08x (incorrect, should be %08x) ", rx_fcs_got, rx_fcs_exp);
|
|
|
|
} else {
|
|
|
|
proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 4, "FCS 32: %08x (correct)", rx_fcs_got);
|
|
|
|
}
|
2000-12-14 08:20:31 +00:00
|
|
|
}
|
1998-09-16 02:39:15 +00:00
|
|
|
}
|
1999-07-29 05:47:07 +00:00
|
|
|
|
2001-06-15 20:35:08 +00:00
|
|
|
/*
|
|
|
|
* Handles PAP just as a protocol field
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
dissect_pap( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) {
|
|
|
|
proto_item *ti;
|
|
|
|
proto_tree *fh_tree = NULL;
|
|
|
|
proto_item *tf;
|
|
|
|
proto_tree *field_tree;
|
|
|
|
proto_item *tm;
|
|
|
|
proto_tree *message_tree;
|
|
|
|
proto_item *tp;
|
|
|
|
proto_tree *peer_id_tree;
|
|
|
|
proto_item *tpw;
|
|
|
|
proto_tree *passwd_tree;
|
|
|
|
|
|
|
|
guint8 code;
|
|
|
|
guint8 id, peer_id_length, password_length, msg_length;
|
|
|
|
int length, offset;
|
|
|
|
|
|
|
|
code = tvb_get_guint8(tvb, 0);
|
|
|
|
id = tvb_get_guint8(tvb, 1);
|
|
|
|
length = tvb_get_ntohs(tvb, 2);
|
|
|
|
|
2001-06-16 00:51:45 +00:00
|
|
|
if(check_col(pinfo->fd, COL_PROTOCOL))
|
|
|
|
col_set_str(pinfo->fd, COL_PROTOCOL,
|
|
|
|
proto_get_protocol_short_name(proto_pap));
|
|
|
|
|
2001-06-15 20:35:08 +00:00
|
|
|
if(check_col(pinfo->fd, COL_INFO))
|
|
|
|
col_add_fstr(pinfo->fd, COL_INFO, "%s %s",
|
|
|
|
proto_get_protocol_short_name(proto_pap),
|
|
|
|
val_to_str(code, pap_vals, "Unknown"));
|
|
|
|
|
|
|
|
if(tree) {
|
|
|
|
ti = proto_tree_add_item(tree, proto_pap, tvb, 0, length, FALSE);
|
|
|
|
fh_tree = proto_item_add_subtree(ti, ett_pap);
|
|
|
|
proto_tree_add_text(fh_tree, tvb, 0, 1, "Code: %s (0x%02x)",
|
|
|
|
val_to_str(code, pap_vals, "Unknown"), code);
|
|
|
|
proto_tree_add_text(fh_tree, tvb, 1, 1, "Identifier: 0x%02x",
|
|
|
|
id);
|
|
|
|
proto_tree_add_text(fh_tree, tvb, 2, 2, "Length: %u",
|
|
|
|
length);
|
|
|
|
}
|
|
|
|
offset = 4;
|
|
|
|
length -= 4;
|
|
|
|
|
|
|
|
switch (code) {
|
|
|
|
case CONFREQ:
|
|
|
|
if(tree) {
|
|
|
|
if (length > 0) {
|
|
|
|
tf = proto_tree_add_text(fh_tree, tvb, offset, length,
|
|
|
|
"Data: (%d byte%s)", length, plurality(length, "", "s"));
|
|
|
|
field_tree = proto_item_add_subtree(tf, ett_pap_data);
|
|
|
|
peer_id_length = tvb_get_guint8(tvb, offset);
|
|
|
|
tp = proto_tree_add_text(field_tree, tvb, offset, 1,
|
|
|
|
"Peer ID length: %d byte%s", peer_id_length, plurality(peer_id_length, "", "s"));
|
|
|
|
if (--length > 0) {
|
|
|
|
peer_id_tree = proto_item_add_subtree(tp, ett_pap_peer_id);
|
|
|
|
proto_tree_add_text(peer_id_tree, tvb, ++offset, ppp_min(peer_id_length, length),
|
|
|
|
"Peer-ID (%d byte%s)", peer_id_length, plurality(peer_id_length, "", "s"));
|
|
|
|
offset+=peer_id_length;
|
|
|
|
length-=peer_id_length;
|
|
|
|
if (length > 0) {
|
|
|
|
password_length = tvb_get_guint8(tvb, offset);
|
|
|
|
if (--length > 0) {
|
|
|
|
tpw = proto_tree_add_text(field_tree, tvb, offset, 1,
|
|
|
|
"Password length: %d byte%s", password_length, plurality(password_length, "", "s"));
|
|
|
|
passwd_tree = proto_item_add_subtree(tpw, ett_pap_password);
|
|
|
|
proto_tree_add_text(passwd_tree, tvb, ++offset, ppp_min(password_length, length),
|
|
|
|
"Password (%d byte%s)", password_length, plurality(password_length, "", "s"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
|
|
|
|
case CONFACK:
|
|
|
|
case CONFNAK:
|
|
|
|
if(tree) {
|
|
|
|
if (length > 0) {
|
|
|
|
tf = proto_tree_add_text(fh_tree, tvb, offset, length,
|
|
|
|
"Data: (%d byte%s)", length, plurality(length, "", "s"));
|
|
|
|
field_tree = proto_item_add_subtree(tf, ett_pap_data);
|
|
|
|
msg_length = tvb_get_guint8(tvb, offset);
|
|
|
|
tm = proto_tree_add_text(field_tree, tvb, offset, 1,
|
|
|
|
"Message length: %d byte%s", msg_length, plurality(msg_length, "", "s"));
|
|
|
|
if (--length > 0) {
|
|
|
|
message_tree = proto_item_add_subtree(tm, ett_pap_message);
|
|
|
|
proto_tree_add_text(message_tree, tvb, ++offset, ppp_min(msg_length, length),
|
|
|
|
"Message (%d byte%s)", msg_length, plurality(msg_length, "", "s"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
if (length > 0)
|
|
|
|
proto_tree_add_text(fh_tree, tvb, offset, length, "Stuff (%d byte%s)",
|
|
|
|
length, plurality(length, "", "s"));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-07-29 05:47:07 +00:00
|
|
|
void
|
|
|
|
proto_register_ppp(void)
|
|
|
|
{
|
|
|
|
/* static hf_register_info hf[] = {
|
|
|
|
{ &variable,
|
|
|
|
{ "Name", "ppp.abbreviation", TYPE, VALS_POINTER }},
|
|
|
|
};*/
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_ppp,
|
|
|
|
};
|
1999-07-29 05:47:07 +00:00
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
static enum_val_t ppp_options[] = {
|
2001-06-15 20:35:08 +00:00
|
|
|
{"None", 0},
|
|
|
|
{"16-Bit", 1},
|
2001-01-03 06:56:03 +00:00
|
|
|
{"32-Bit", 2},
|
|
|
|
{NULL, -1}
|
|
|
|
};
|
2001-06-15 20:35:08 +00:00
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
module_t *ppp_module;
|
2000-12-14 08:20:31 +00:00
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
proto_ppp = proto_register_protocol("Point-to-Point Protocol",
|
|
|
|
"PPP", "ppp");
|
1999-07-29 05:47:07 +00:00
|
|
|
/* proto_register_field_array(proto_ppp, hf, array_length(hf));*/
|
1999-11-16 11:44:20 +00:00
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
2000-04-16 21:37:07 +00:00
|
|
|
|
|
|
|
/* subdissector code */
|
|
|
|
subdissector_table = register_dissector_table("ppp.protocol");
|
2000-11-19 02:00:03 +00:00
|
|
|
|
2001-03-30 06:10:54 +00:00
|
|
|
register_dissector("ppp_hdlc", dissect_ppp_hdlc, proto_ppp);
|
2001-01-09 06:32:10 +00:00
|
|
|
register_dissector("ppp", dissect_ppp, proto_ppp);
|
2000-12-14 08:20:31 +00:00
|
|
|
|
|
|
|
/* Register the preferences for the ppp protocol */
|
2001-01-03 07:53:48 +00:00
|
|
|
ppp_module = prefs_register_protocol(proto_ppp, NULL);
|
2000-12-14 08:20:31 +00:00
|
|
|
|
2001-06-15 20:35:08 +00:00
|
|
|
prefs_register_enum_preference(ppp_module,
|
2001-01-03 06:56:03 +00:00
|
|
|
"ppp_fcs",
|
|
|
|
"PPP Frame Checksum",
|
2001-06-15 20:35:08 +00:00
|
|
|
"PPP Frame Checksum",
|
2001-01-03 06:56:03 +00:00
|
|
|
&ppp_fcs_decode,
|
|
|
|
ppp_options, FALSE);
|
1999-07-29 05:47:07 +00:00
|
|
|
}
|
1999-09-11 04:19:26 +00:00
|
|
|
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
void
|
|
|
|
proto_reg_handoff_ppp(void)
|
|
|
|
{
|
Add a new Wiretap encapsulation type for Cisco HDLC. Map the NetBSD
DLT_HDLC to it.
Make a separate dissector for Cisco HDLC, and add a dissector for Cisco
SLARP. Have the PPP dissector call the Cisco HDLC dissector if the
address field is the Cisco HDLC unicast or multicast address. Use the
Cisco HDLC dissector for the Cisco HDLC Wiretap encapsulation type.
Add a new dissector table "chdlctype", for Cisco HDLC packet types
(they're *almost* the same as Ethernet types, but 0x8035 is SLARP, not
Reverse ARP, and 0x2000 is the Cisco Discovery protocol, for example),
replacing "fr.chdlc".
Have a "chdlctype()" routine, similar to "ethertype()", used both by the
Cisco HDLC and Frame Relay dissectors. Have a "chdlc_vals[]"
"value_string" table for Cisco HDLC types and protocol names. Split the
packet type field in the Frame Relay dissector into separate SNAP and
Cisco HDLC fields, and give them the Ethernet type and Cisco HDLC type
"value_string" tables, respectively.
svn path=/trunk/; revision=3133
2001-03-15 09:11:03 +00:00
|
|
|
/*
|
|
|
|
* Get a handle for the CHDLC dissector.
|
|
|
|
*/
|
|
|
|
chdlc_handle = find_dissector("chdlc");
|
|
|
|
|
2001-03-30 06:10:54 +00:00
|
|
|
dissector_add("wtap_encap", WTAP_ENCAP_PPP, dissect_ppp_hdlc, proto_ppp);
|
|
|
|
dissector_add("wtap_encap", WTAP_ENCAP_PPP_WITH_PHDR, dissect_ppp_hdlc, proto_ppp);
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
dissector_add("fr.ietf", NLPID_PPP, dissect_ppp, proto_ppp);
|
2001-03-30 06:10:54 +00:00
|
|
|
dissector_add("gre.proto", ETHERTYPE_PPP, dissect_ppp_hdlc, proto_ppp);
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
}
|
|
|
|
|
1999-09-11 04:19:26 +00:00
|
|
|
void
|
|
|
|
proto_register_mp(void)
|
|
|
|
{
|
1999-09-11 22:40:30 +00:00
|
|
|
static hf_register_info hf[] = {
|
|
|
|
{ &hf_mp_frag_first,
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
{ "First fragment", "mp.first", FT_BOOLEAN, 8,
|
2001-06-18 02:18:27 +00:00
|
|
|
TFS(&frag_truth), MP_FRAG_FIRST, "", HFILL }},
|
1999-09-11 22:40:30 +00:00
|
|
|
|
|
|
|
{ &hf_mp_frag_last,
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
{ "Last fragment", "mp.last", FT_BOOLEAN, 8,
|
2001-06-18 02:18:27 +00:00
|
|
|
TFS(&frag_truth), MP_FRAG_LAST, "", HFILL }},
|
1999-09-11 22:40:30 +00:00
|
|
|
|
|
|
|
{ &hf_mp_sequence_num,
|
2000-01-29 04:47:34 +00:00
|
|
|
{ "Sequence number", "mp.seq", FT_UINT24, BASE_DEC, NULL, 0x0,
|
2001-06-18 02:18:27 +00:00
|
|
|
"", HFILL }}
|
1999-09-11 22:40:30 +00:00
|
|
|
};
|
1999-11-16 11:44:20 +00:00
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_mp,
|
|
|
|
&ett_mp_flags,
|
|
|
|
};
|
1999-09-11 22:40:30 +00:00
|
|
|
|
2001-01-03 06:56:03 +00:00
|
|
|
proto_mp = proto_register_protocol("PPP Multilink Protocol", "PPP MP", "mp");
|
1999-09-11 22:40:30 +00:00
|
|
|
proto_register_field_array(proto_mp, hf, array_length(hf));
|
1999-11-16 11:44:20 +00:00
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
1999-09-11 04:19:26 +00:00
|
|
|
}
|
2000-11-29 05:16:15 +00:00
|
|
|
|
|
|
|
void
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
proto_reg_handoff_mp(void)
|
2000-11-29 05:16:15 +00:00
|
|
|
{
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
dissector_add("ppp.protocol", PPP_MP, dissect_mp, proto_mp);
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_register_lcp(void)
|
|
|
|
{
|
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_lcp,
|
|
|
|
&ett_lcp_options,
|
|
|
|
&ett_lcp_mru_opt,
|
|
|
|
&ett_lcp_async_map_opt,
|
|
|
|
&ett_lcp_authprot_opt,
|
|
|
|
&ett_lcp_qualprot_opt,
|
|
|
|
&ett_lcp_magicnum_opt,
|
|
|
|
&ett_lcp_fcs_alternatives_opt,
|
|
|
|
&ett_lcp_numbered_mode_opt,
|
|
|
|
&ett_lcp_callback_opt,
|
|
|
|
&ett_lcp_multilink_ep_disc_opt,
|
|
|
|
&ett_lcp_internationalization_opt,
|
|
|
|
};
|
|
|
|
|
|
|
|
proto_lcp = proto_register_protocol("PPP Link Control Protocol", "PPP LCP",
|
|
|
|
"lcp");
|
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_reg_handoff_lcp(void)
|
|
|
|
{
|
|
|
|
dissector_add("ppp.protocol", PPP_LCP, dissect_lcp, proto_lcp);
|
2001-06-15 20:23:41 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* NDISWAN on Windows translates Ethernet frames from higher-level
|
|
|
|
* protocols into PPP frames to hand to the PPP driver, and translates
|
|
|
|
* PPP frames from the PPP driver to hand to the higher-level protocols.
|
|
|
|
*
|
|
|
|
* Apparently the PPP driver, on at least some versions of Windows,
|
|
|
|
* passes frames for internal-to-PPP protocols up through NDISWAN;
|
|
|
|
* the protocol type field appears to be passed through unchanged
|
|
|
|
* (unlike what's done with, for example, the protocol type field
|
|
|
|
* for IP, which is mapped from its PPP value to its Ethernet value).
|
|
|
|
*
|
|
|
|
* This means that we may see, on Ethernet captures, frames for
|
|
|
|
* protocols internal to PPP, so we register PPP_LCP with the
|
|
|
|
* "ethertype" dissector table as well as the PPP protocol dissector
|
|
|
|
* table.
|
|
|
|
*/
|
2001-06-14 20:05:13 +00:00
|
|
|
dissector_add("ethertype", PPP_LCP, dissect_lcp, proto_lcp);
|
Start removing "{OLD_}CHECK_DISPLAY_AS_DATA()" calls, and code to set
"pinfo->current_proto"; dissectors called only through dissector tables
and handles don't need to do either of those, as the dissector table and
handle code will do it for them. (Dissectors called directly, or
dissectors that can be attached to conversations, still have to do it
themselves.)
Register the PPP Multilink Protocol, PPP Link Control Protocol, and PPP
IP Control Protocol as official protocols, and register them in PPP's
dissector table rather than having PPP handle them specially; change
"dissect_cp()" to take a protocol ID, get the protocol short name
information from it, and use the protocol ID for the top-level protocol
tree item.
Set the Protocol column in the PPP Multilink Protocol dissector, and set
the Info column before extracting anything from the frame, so that if an
exception is thrown, the Info and Protocol columns will reflect that the
packet is supposed to be a PPP Multilink Protocol frame.
Make the "First fragment" and "Last fragment" flags in the PPP Multilink
Protocol header boolean bitfields, and let "proto_tree_add_boolean()" do
all the heavy lifting when displaying them, rather than doing it by
hand.
Don't extract the sequence number in the PPP Multilink Protocol until
you're ready to put it into the tree, just in case the captured packet
includes the flags but not the sequence number.
Clean up the code to check the FCS of PPP frames - extract it with
"tvb_get_letohs()" or "tvb_get_letohl()", don't extract it byte-by-byte
and then put it together yourself.
svn path=/trunk/; revision=2926
2001-01-21 22:10:22 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_register_ipcp(void)
|
|
|
|
{
|
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_ipcp,
|
|
|
|
&ett_ipcp_options,
|
|
|
|
&ett_ipcp_ipaddrs_opt,
|
|
|
|
&ett_ipcp_compressprot_opt,
|
|
|
|
};
|
|
|
|
|
|
|
|
proto_ipcp = proto_register_protocol("PPP IP Control Protocol", "PPP IPCP",
|
|
|
|
"ipcp");
|
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_reg_handoff_ipcp(void)
|
|
|
|
{
|
|
|
|
dissector_add("ppp.protocol", PPP_IPCP, dissect_ipcp, proto_ipcp);
|
2001-06-15 20:23:41 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* See above comment about NDISWAN for an explanation of why we're
|
|
|
|
* registering with the "ethertype" dissector table.
|
|
|
|
*/
|
2001-06-14 20:05:13 +00:00
|
|
|
dissector_add("ethertype", PPP_IPCP, dissect_ipcp, proto_ipcp);
|
2000-11-29 05:16:15 +00:00
|
|
|
}
|
2001-06-15 20:35:08 +00:00
|
|
|
|
|
|
|
void
|
|
|
|
proto_register_pap(void)
|
|
|
|
{
|
|
|
|
static gint *ett[] = {
|
|
|
|
&ett_pap,
|
|
|
|
&ett_pap_data,
|
|
|
|
&ett_pap_peer_id,
|
|
|
|
&ett_pap_password,
|
|
|
|
&ett_pap_message,
|
|
|
|
};
|
|
|
|
|
|
|
|
proto_pap = proto_register_protocol("PPP Password Authentication Protocol", "PPP PAP",
|
|
|
|
"pap");
|
|
|
|
proto_register_subtree_array(ett, array_length(ett));
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
proto_reg_handoff_pap(void)
|
|
|
|
{
|
|
|
|
dissector_add("ppp.protocol", PPP_PAP, dissect_pap, proto_pap);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* See above comment about NDISWAN for an explanation of why we're
|
|
|
|
* registering with the "ethertype" dissector table.
|
|
|
|
*/
|
|
|
|
dissector_add("ethertype", PPP_PAP, dissect_pap, proto_pap);
|
|
|
|
}
|