/* packet-ppp.c
* Routines for ppp packet disassembly
*
- * $Id: packet-ppp.c,v 1.82 2001/12/19 21:14:49 guy Exp $
+ * $Id: packet-ppp.c,v 1.108 2003/02/07 20:09:33 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
*
* 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.
# include "config.h"
#endif
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
+#include <string.h>
#include <glib.h>
#include "prefs.h"
-#include "packet.h"
+#include <epan/packet.h>
#include "packet-ppp.h"
#include "ppptypes.h"
#include "etypes.h"
-#include "atalk-utils.h"
+#include <epan/atalk-utils.h>
#include "packet-chdlc.h"
#include "packet-ip.h"
#include "packet-ipx.h"
#define ppp_min(a, b) ((a<b) ? a : b)
static int proto_ppp = -1;
+static int hf_ppp_address = -1;
+static int hf_ppp_control = -1;
+static int hf_ppp_protocol = -1;
static gint ett_ppp = -1;
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_ccp_options = -1;
static gint ett_ccp_stac_opt = -1;
static gint ett_ccp_mppc_opt = -1;
+static gint ett_ccp_bsdcomp_opt = -1;
static gint ett_ccp_lzsdcp_opt = -1;
+static gint ett_ccp_mvrca_opt = -1;
+static gint ett_ccp_deflate_opt = -1;
static int proto_cbcp = -1;
static gint ett_cbcp = -1;
static gint ett_cbcp_options = -1;
-static gint ett_cbcp_no_callback_opt = -1;
static gint ett_cbcp_callback_opt = -1;
+static gint ett_cbcp_callback_opt_addr = -1;
static int proto_bacp = -1;
static gint ett_bap_options = -1;
static gint ett_bap_link_type_opt = -1;
static gint ett_bap_phone_delta_opt = -1;
-static gint ett_bap_reason_opt = -1;
-static gint ett_bap_link_disc_opt = -1;
+static gint ett_bap_phone_delta_subopt = -1;
static gint ett_bap_call_status_opt = -1;
static int proto_comp_data = -1;
static gint ett_comp_data = -1;
+static int proto_pppmuxcp = -1;
+
+static gint ett_pppmuxcp = -1;
+static gint ett_pppmuxcp_options = -1;
+
+static int proto_pppmux = -1;
+
+static gint ett_pppmux = -1;
+static gint ett_pppmux_subframe = -1;
+static gint ett_pppmux_subframe_hdr = -1;
+static gint ett_pppmux_subframe_flags = -1;
+static gint ett_pppmux_subframe_info = -1;
+
static int proto_mp = -1;
static int hf_mp_frag_first = -1;
static int hf_mp_frag_last = -1;
static int ett_mp = -1;
static int ett_mp_flags = -1;
+static int proto_mplscp = -1;
+static gint ett_mplscp = -1;
+static gint ett_mplscp_options = -1;
+
+static int proto_cdpcp = -1;
+static gint ett_cdpcp = -1;
+static gint ett_cdpcp_options = -1;
+
static int proto_pap = -1; /* PAP vars */
static gint ett_pap = -1;
static gint ett_pap_data = -1;
static gint ett_chap_name = -1;
static gint ett_chap_message = -1;
-static dissector_table_t subdissector_table;
+static int proto_ipv6cp = -1; /* IPv6CP vars */
+
+static gint ett_ipv6cp = -1;
+static gint ett_ipv6cp_options = -1;
+static gint ett_ipv6cp_if_id_opt = -1;
+static gint ett_ipv6cp_compressprot_opt = -1;
+
+/*
+ * Used by the GTP dissector as well.
+ */
+dissector_table_t ppp_subdissector_table;
static dissector_handle_t chdlc_handle;
static dissector_handle_t data_handle;
#define FCS_32 2
gboolean ppp_vj_decomp = TRUE; /* Default to VJ header decompression */
+/*
+ * For Default Protocol ID negotiated with PPPMuxCP. We need to
+ * this ID so that if the first subframe doesn't have protocol
+ * ID, we can use it
+ */
+
+static guint pppmux_def_prot_id = 0;
+
/* PPP definitions */
-static const value_string ppp_vals[] = {
+/*
+ * Used by the GTP dissector as well.
+ */
+const value_string ppp_vals[] = {
+ {PPP_PADDING, "Padding Protocol" },
+ {PPP_ROHC_SCID, "ROHC small-CID" },
+ {PPP_ROHC_LCID, "ROHC large-CID" },
{PPP_IP, "IP" },
{PPP_OSI, "OSI" },
+ {PPP_DEC4, "DECnet Phase IV" },
{PPP_AT, "Appletalk" },
{PPP_IPX, "Netware IPX/SPX"},
{PPP_VJC_COMP, "VJ compressed TCP"},
{PPP_VJC_UNCOMP,"VJ uncompressed TCP"},
{PPP_BPDU, "Bridging PDU"},
+ {PPP_ST, "Stream Protocol (ST-II)" },
{PPP_VINES, "Vines" },
- {PPP_MP, "Multilink"},
+ {PPP_AT_EDDP, "AppleTalk EDDP" },
+ {PPP_AT_SB, "AppleTalk SmartBuffered" },
+ {PPP_MP, "Multilink"},
+ {PPP_NB, "NETBIOS Framing" },
+ {PPP_CISCO, "Cisco Systems" },
+ {PPP_ASCOM, "Ascom Timeplex" },
+ {PPP_LBLB, "Fujitsu Link Backup and Load Balancing" },
+ {PPP_RL, "DCA Remote Lan" },
+ {PPP_SDTP, "Serial Data Transport Protocol" },
+ {PPP_LLC, "SNA over LLC" },
+ {PPP_SNA, "SNA" },
+ {PPP_IPV6HC, "IPv6 Header Compression " },
+ {PPP_KNX, "KNX Bridging Data" },
+ {PPP_ENCRYPT, "Encryption" },
+ {PPP_ILE, "Individual Link Encryption" },
{PPP_IPV6, "IPv6" },
+ {PPP_MUX, "PPP Multiplexing"},
+ {PPP_RTP_FH, "RTP IPHC Full Header" },
+ {PPP_RTP_CTCP, "RTP IPHC Compressed TCP" },
+ {PPP_RTP_CNTCP, "RTP IPHC Compressed Non TCP" },
+ {PPP_RTP_CUDP8, "RTP IPHC Compressed UDP 8" },
+ {PPP_RTP_CRTP8, "RTP IPHC Compressed RTP 8" },
+ {PPP_STAMPEDE, "Stampede Bridging" },
+ {PPP_MPPLUS, "MP+ Protocol" },
+ {PPP_NTCITS_IPI,"NTCITS IPI" },
+ {PPP_ML_SLCOMP, "single link compression in multilink" },
{PPP_COMP, "compressed packet" },
+ {PPP_STP_HELLO, "802.1d Hello Packet" },
+ {PPP_IBM_SR, "IBM Source Routing BPDU" },
{PPP_DEC_LB, "DEC LANBridge100 Spanning Tree"},
+ {PPP_CDP, "Cisco Discovery Protocol" },
+ {PPP_NETCS, "Netcs Twin Routing" },
+ {PPP_STP, "Scheduled Transfer Protocol" },
+ {PPP_EDP, "Extreme Discovery Protocol" },
+ {PPP_OSCP, "Optical Supervisory Channel Protocol" },
+ {PPP_OSCP2, "Optical Supervisory Channel Protocol" },
+ {PPP_LUXCOM, "Luxcom" },
+ {PPP_SIGMA, "Sigma Network Systems" },
+ {PPP_ACSP, "Apple Client Server Protocol" },
{PPP_MPLS_UNI, "MPLS Unicast"},
{PPP_MPLS_MULTI, "MPLS Multicast"},
+ {PPP_P12844, "IEEE p1284.4 standard - data packets" },
+ {PPP_ETSI, "ETSI TETRA Networks Procotol Type 1" },
+ {PPP_MFTP, "Multichannel Flow Treatment Protocol" },
+ {PPP_RTP_CTCPND,"RTP IPHC Compressed TCP No Delta" },
+ {PPP_RTP_CS, "RTP IPHC Context State" },
+ {PPP_RTP_CUDP16,"RTP IPHC Compressed UDP 16" },
+ {PPP_RTP_CRDP16,"RTP IPHC Compressed RTP 16" },
+ {PPP_CCCP, "Cray Communications Control Protocol" },
+ {PPP_CDPD_MNRP, "CDPD Mobile Network Registration Protocol" },
+ {PPP_EXPANDAP, "Expand accelarator protocol" },
+ {PPP_ODSICP, "ODSICP NCP" },
+ {PPP_DOCSIS, "DOCSIS DLL" },
+ {PPP_LZS, "Stacker LZS" },
+ {PPP_REFTEK, "RefTek Protocol" },
+ {PPP_FC, "Fibre Channel" },
+ {PPP_EMIT, "EMIT Protocols" },
{PPP_IPCP, "IP Control Protocol" },
{PPP_OSICP, "OSI Control Protocol" },
+ {PPP_XNSIDPCP, "Xerox NS IDP Control Protocol" },
+ {PPP_DECNETCP, "DECnet Phase IV Control Protocol" },
{PPP_ATCP, "AppleTalk Control Protocol" },
{PPP_IPXCP, "IPX Control Protocol" },
+ {PPP_BRIDGENCP, "Bridging NCP" },
+ {PPP_SPCP, "Stream Protocol Control Protocol" },
+ {PPP_BVCP, "Banyan Vines Control Protocol" },
+ {PPP_MLCP, "Multi-Link Control Protocol" },
+ {PPP_NBCP, "NETBIOS Framing Control Protocol" },
+ {PPP_CISCOCP, "Cisco Systems Control Protocol" },
+ {PPP_ASCOMCP, "Ascom Timeplex" },
+ {PPP_LBLBCP, "Fujitsu LBLB Control Protocol" },
+ {PPP_RLNCP, "DCA Remote Lan Network Control Protocol" },
+ {PPP_SDCP, "Serial Data Control Protocol" },
+ {PPP_LLCCP, "SNA over LLC Control Protocol" },
+ {PPP_SNACP, "SNA Control Protocol" },
+ {PPP_KNXCP, "KNX Bridging Control Protocol" },
+ {PPP_ECP, "Encryption Control Protocol" },
+ {PPP_ILECP, "Individual Encryption Control Protocol" },
+ {PPP_IPV6CP, "IPv6 Control Protocol" },
+ {PPP_MUXCP, "PPPMux Control Protocol"},
+ {PPP_STAMPEDECP,"Stampede Bridging Control Protocol" },
+ {PPP_MPPCP, "MP+ Contorol Protocol" },
+ {PPP_IPICP, "NTCITS IPI Control Protocol" },
+ {PPP_SLCC, "single link compression in multilink control" },
{PPP_CCP, "Compression Control Protocol" },
+ {PPP_CDPCP, "CDP Control Protocol" },
+ {PPP_NETCSCP, "Netcs Twin Routing" },
+ {PPP_STPCP, "STP - Control Protocol" },
+ {PPP_EDPCP, "EDP Control Protocol" },
+ {PPP_ACSPC, "Apple Client Server Protocol Control" },
+ {PPP_MPLSCP, "MPLS Control Protocol" },
+ {PPP_P12844CP, "IEEE p1284.4 standard - Protocol Control" },
+ {PPP_ETSICP, "ETSI TETRA TNP1 Control Protocol" },
+ {PPP_MFTPCP, "Multichannel Flow Treatment Protocol" },
{PPP_LCP, "Link Control Protocol" },
{PPP_PAP, "Password Authentication Protocol" },
{PPP_LQR, "Link Quality Report protocol" },
{PPP_SPAP, "Shiva Password Authentication Protocol" },
- {PPP_CHAP, "Cryptographic Handshake Auth. Protocol" },
- {PPP_EAP, "Extensible Authentication Protocol" },
{PPP_CBCP, "Callback Control Protocol" },
{PPP_BACP, "Bandwidth Allocation Control Protocol" },
{PPP_BAP, "Bandwitdh Allocation Protocol" },
+ {PPP_CONTCP, "Container Control Protocol" },
+ {PPP_CHAP, "Challenge Handshake Authentication Protocol" },
+ {PPP_RSAAP, "RSA Authentication Protocol" },
+ {PPP_EAP, "Extensible Authentication Protocol" },
+ {PPP_SIEP, "Mitsubishi Security Information Exchange Protocol"},
+ {PPP_SBAP, "Stampede Bridging Authorization Protocol" },
+ {PPP_PRPAP, "Proprietary Authentication Protocol" },
+ {PPP_PRPAP2, "Proprietary Authentication Protocol" },
+ {PPP_PRPNIAP, "Proprietary Node ID Authentication Protocol" },
{0, NULL }
};
/* CP (LCP, IPCP, etc.) codes.
- * from pppd fsm.h
+ * from pppd fsm.h
*/
#define CONFREQ 1 /* Configuration Request */
#define CONFACK 2 /* Configuration Ack */
#define IDENT 12 /* Identification */
#define TIMEREMAIN 13 /* Time remaining */
-/*
+/*
* CCP-specific packet types.
*/
#define RESETREQ 14 /* Reset Request */
{CODEREJ, "Code Reject" },
{RESETREQ, "Reset Request" },
{RESETACK, "Reset Ack" },
- {0, NULL }
+ {0, NULL }
};
static const value_string cbcp_vals[] = {
{CBREQ, "Callback Request" },
{CBRES, "Callback Response" },
{CBACK, "Callback Ack" },
- {0, NULL }
+ {0, NULL }
};
static const value_string bap_vals[] = {
/*
* Cause codes for Cause.
*
- * The following code table is taken from packet-q931.c but is slightly
+ * The following code table is taken from packet-q931.c but is slightly
* adapted to BAP protocol.
*/
static const value_string q931_cause_code_vals[] = {
{
CI_MRU,
"Maximum Receive Unit",
- &ett_lcp_mru_opt,
+ NULL,
FIXED_LENGTH,
4,
dissect_lcp_mru_opt
{
CI_ASYNCMAP,
"Async Control Character Map",
- &ett_lcp_async_map_opt,
+ NULL,
FIXED_LENGTH,
6,
dissect_lcp_async_map_opt
},
{
CI_MAGICNUMBER,
+ "Magic number",
NULL,
- &ett_lcp_magicnum_opt,
FIXED_LENGTH,
6,
dissect_lcp_magicnumber_opt
},
{
CI_FCS_ALTERNATIVES,
- NULL,
+ "FCS alternatives",
&ett_lcp_fcs_alternatives_opt,
FIXED_LENGTH,
3,
},
{
CI_SELF_DESCRIBING_PAD,
- NULL,
+ "Maximum octets of self-describing padding",
NULL,
FIXED_LENGTH,
3,
},
{
CI_MULTILINK_MRRU,
- NULL,
+ "Multilink MRRU",
NULL,
FIXED_LENGTH,
4,
},
{
CI_LINK_DISC_FOR_BACP,
- NULL,
+ "Link discriminator for BAP",
NULL,
FIXED_LENGTH,
4,
#define N_LCP_OPTS (sizeof lcp_opts / sizeof lcp_opts[0])
-/*
+/*
* CHAP Algorithms
*/
#define CHAP_ALG_MD5 0x05 /* CHAP with MD5 */
#define CI_CCP_HPPPC 16 /* Hewlett-Packard PPC (RFC1962) */
#define CI_CCP_STAC 17 /* stac Electronics LZS (RFC1974) */
#define CI_CCP_MPPC 18 /* Microsoft PPC (RFC2218/3078) */
-#define CI_CCP_GFZA 19 /* Gandalf FZA */
+#define CI_CCP_GFZA 19 /* Gandalf FZA (RFC1962) */
#define CI_CCP_V42BIS 20 /* V.42bis compression */
-#define CI_CCP_BSDLZW 21 /* BSD LZW Compress */
+#define CI_CCP_BSDLZW 21 /* BSD LZW Compress (RFC1977) */
#define CI_CCP_LZSDCP 23 /* LZS-DCP (RFC1967) */
#define CI_CCP_MVRCA 24 /* MVRCA (Magnalink) (RFC1975) */
#define CI_CCP_DEFLATE 26 /* Deflate (RFC1979) */
#define CI_CCP_RESERVED 255 /* Reserved (RFC1962) */
/*
- * Microsoft Point-To-Point Compression (MPPC) and Encryption (MPPE)
+ * Microsoft Point-To-Point Compression (MPPC) and Encryption (MPPE)
* supported bits.
*/
#define MPPC_SUPPORTED_BITS_C 0x00000001 /* MPPC negotiation */
int offset, guint length, packet_info *pinfo,
proto_tree *tree);
+static void dissect_ccp_bsdcomp_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
+ int offset, guint length, packet_info *pinfo,
+ proto_tree *tree);
+
static void dissect_ccp_lzsdcp_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
int offset, guint length, packet_info *pinfo,
proto_tree *tree);
+static void dissect_ccp_mvrca_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
+ int offset, guint length, packet_info *pinfo,
+ proto_tree *tree);
+
+static void dissect_ccp_deflate_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
+ int offset, guint length, packet_info *pinfo,
+ proto_tree *tree);
+
static const ip_tcp_opt ccp_opts[] = {
{
CI_CCP_STAC,
6,
dissect_ccp_mppc_opt
},
+ {
+ CI_CCP_BSDLZW,
+ "BSD Compress",
+ &ett_ccp_bsdcomp_opt,
+ FIXED_LENGTH,
+ 3,
+ dissect_ccp_bsdcomp_opt
+ },
{
CI_CCP_LZSDCP,
"LZS-DCP",
FIXED_LENGTH,
6,
dissect_ccp_lzsdcp_opt
- }
-
+ },
+ {
+ CI_CCP_MVRCA,
+ "MVRCA (Magnalink)",
+ &ett_ccp_mvrca_opt,
+ FIXED_LENGTH,
+ 4,
+ dissect_ccp_mvrca_opt
+ },
+ {
+ CI_CCP_DEFLATE,
+ "Deflate",
+ &ett_ccp_deflate_opt,
+ FIXED_LENGTH,
+ 4, /* RFC1979 says the length is 3 but it's actually 4. */
+ dissect_ccp_deflate_opt
+ },
};
#define N_CCP_OPTS (sizeof ccp_opts / sizeof ccp_opts[0])
*/
#define CI_CBCP_NO_CALLBACK 1 /* No callback */
#define CI_CBCP_CB_USER 2 /* Callback to a user-specified number */
-#define CI_CBCP_CB_PRE 3 /* Callback to a pre-specified or
+#define CI_CBCP_CB_PRE 3 /* Callback to a pre-specified or
administrator specified number */
#define CI_CBCP_CB_ANY 4 /* Callback to any of a list of numbers */
{
CI_CBCP_NO_CALLBACK,
"No callback",
- &ett_cbcp_no_callback_opt,
+ NULL,
FIXED_LENGTH,
2,
dissect_cbcp_no_callback_opt
{
CI_BAP_REASON,
"Reason",
- &ett_bap_reason_opt,
+ NULL,
VARIABLE_LENGTH,
2,
dissect_bap_reason_opt
{
CI_BAP_LINK_DISC,
"Link Discriminator",
- &ett_bap_link_disc_opt,
+ NULL,
FIXED_LENGTH,
4,
dissect_bap_link_disc_opt
#define N_BAP_OPTS (sizeof bap_opts / sizeof bap_opts[0])
-static void dissect_ppp(tvbuff_t *tvb, packet_info *pinfo,
+static void dissect_ppp(tvbuff_t *tvb, packet_info *pinfo,
proto_tree *tree);
static const value_string pap_vals[] = {
static void dissect_chap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree);
-const unsigned int fcstab_32[256] =
+static const value_string pppmuxcp_vals[] = {
+ {CONFREQ, "Configuration Request" },
+ {CONFACK, "Configuration Ack" },
+ {0, NULL}
+};
+
+/*
+ * PPPMuxCP options
+ */
+
+#define CI_DEFAULT_PID 1
+
+static void dissect_pppmuxcp_def_pid_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
+ int offset, guint length, packet_info *pinfo, proto_tree *tree);
+
+
+static const ip_tcp_opt pppmuxcp_opts[] = {
+ {
+ CI_DEFAULT_PID,
+ "Default Protocol ID",
+ NULL,
+ FIXED_LENGTH,
+ 4,
+ dissect_pppmuxcp_def_pid_opt
+ }
+};
+
+#define N_PPPMUXCP_OPTS (sizeof pppmuxcp_opts / sizeof pppmuxcp_opts[0])
+
+/*
+ * Options. (IPv6CP)
+ */
+#define CI_IPV6CP_IF_ID 1 /* Interface Identifier (RFC 2472) */
+#define CI_IPV6CP_COMPRESSTYPE 2 /* Compression Type (RFC 2472) */
+
+static void dissect_ipv6cp_if_id_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
+ int offset, guint length, packet_info *pinfo,
+ proto_tree *tree);
+
+static const ip_tcp_opt ipv6cp_opts[] = {
+ {
+ CI_IPV6CP_IF_ID,
+ "Interface Identifier",
+ &ett_ipv6cp_if_id_opt,
+ FIXED_LENGTH,
+ 10,
+ dissect_ipv6cp_if_id_opt
+ },
+ {
+ CI_COMPRESSTYPE,
+ "IPv6 compression protocol",
+ &ett_ipcp_compressprot_opt,
+ VARIABLE_LENGTH,
+ 4,
+ dissect_lcp_protocol_opt
+ },
+};
+
+#define N_IPV6CP_OPTS (sizeof ipv6cp_opts / sizeof ipv6cp_opts[0])
+
+
+static const unsigned int fcstab_32[256] =
{
0x00000000, 0x77073096, 0xee0e612c, 0x990951ba,
0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
};
-const unsigned short fcstab_16[256] = {
+static 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,
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)
+static guint16
+fcs16(register guint16 fcs, tvbuff_t * tvbuff)
{
+ int offset = 0;
+ guint len = tvb_length(tvbuff)-2;
guint8 val;
/* Check for Invalid Length */
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)
+static guint32
+fcs32(guint32 fcs, tvbuff_t * tvbuff)
{
+ int offset = 0;
+ guint len = tvb_length(tvbuff)-4;
guint8 val;
/* Check for invalid Length */
}
void
-capture_ppp_hdlc( const u_char *pd, int offset, int len, packet_counts *ld ) {
+capture_ppp_hdlc( const guchar *pd, int offset, int len, packet_counts *ld ) {
if (!BYTES_ARE_IN_FRAME(offset, len, 2)) {
ld->other++;
return;
capture_ip(pd, offset + 4, len, ld);
break;
case PPP_IPX:
- capture_ipx(pd, offset + 4, len, ld);
+ capture_ipx(ld);
break;
case PPP_VINES:
- capture_vines(pd, offset + 4, len, ld);
+ capture_vines(ld);
break;
default:
ld->other++;
static void
dissect_lcp_mru_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
- guint length, packet_info *pinfo, proto_tree *tree)
+ guint length, packet_info *pinfo _U_,
+ proto_tree *tree)
{
- proto_tree_add_text(tree, tvb, offset, length, "MRU: %u",
+ proto_tree_add_text(tree, tvb, offset, length, "%s: %u", optp->name,
tvb_get_ntohs(tvb, offset + 2));
}
static void
dissect_lcp_async_map_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
- guint length, packet_info *pinfo, proto_tree *tree)
+ guint length, packet_info *pinfo _U_,
+ proto_tree *tree)
{
- proto_tree_add_text(tree, tvb, offset, length, "Async characters to map: 0x%08x",
- tvb_get_ntohl(tvb, offset + 2));
+ guint32 map;
+ char *mapstr;
+ static const char *ctrlchars[32] = {
+ "NUL", "SOH", "STX", "ETX", "EOT", "ENQ", "ACK", "BEL",
+ "BS", "HT", "NL", "VT", "NP (FF)", "CR", "SO", "SI",
+ "DLE", "DC1 (XON)", "DC2", "DC3 (XOFF)", "DC4", "NAK", "SYN", "ETB",
+ "CAN", "EM", "SUB", "ESC", "FS", "GS", "RS", "US"
+ };
+ char mapbuf[32*(10+2)+1];
+ char *mapp;
+ int i;
+
+ /*
+ * XXX - walk through the map and show the characters to map?
+ * Put them in a subtree of this item, and have the top-level item
+ * either say "None", "All", or give a list of the characters?)
+ */
+ map = tvb_get_ntohl(tvb, offset + 2);
+ if (map == 0x00000000)
+ mapstr = "None"; /* don't map any control characters */
+ else if (map == 0xffffffff)
+ mapstr = "All"; /* map all control characters */
+ else {
+ /*
+ * Show the names of the control characters being mapped.
+ */
+ mapp = &mapbuf[0];
+ for (i = 0; i < 32; i++) {
+ if (map & (1 << i)) {
+ if (mapp != &mapbuf[0]) {
+ strcpy(mapp, ", ");
+ mapp += 2;
+ }
+ strcpy(mapp, ctrlchars[i]);
+ mapp += strlen(ctrlchars[i]);
+ }
+ }
+ mapstr = mapbuf;
+ }
+ proto_tree_add_text(tree, tvb, offset, length, "%s: 0x%08x (%s)", optp->name,
+ map, mapstr);
}
static void
dissect_lcp_protocol_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
- guint length, packet_info *pinfo, proto_tree *tree)
+ guint length, packet_info *pinfo _U_,
+ proto_tree *tree)
{
guint16 protocol;
proto_item *tf;
proto_tree *field_tree = NULL;
-
+
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
optp->name, length, plurality(length, "", "s"));
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
static void
dissect_lcp_authprot_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
- guint length, packet_info *pinfo, proto_tree *tree)
+ guint length, packet_info *pinfo _U_,
+ proto_tree *tree)
{
guint16 protocol;
guint8 algorithm;
proto_item *tf;
proto_tree *field_tree = NULL;
-
+
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
optp->name, length, plurality(length, "", "s"));
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
if (length > 0) {
if (protocol == PPP_CHAP) {
algorithm = tvb_get_guint8(tvb, offset);
- proto_tree_add_text(field_tree, tvb, offset, length,
- "Algorithm: %s (0x%02x)",
- val_to_str(algorithm, chap_alg_vals, "Unknown"),
+ proto_tree_add_text(field_tree, tvb, offset, length,
+ "Algorithm: %s (0x%02x)",
+ val_to_str(algorithm, chap_alg_vals, "Unknown"),
algorithm);
offset++;
} else {
static void
dissect_lcp_magicnumber_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
- proto_tree_add_text(tree, tvb, offset, length, "Magic number: 0x%08x",
+ proto_tree_add_text(tree, tvb, offset, length, "%s: 0x%08x", optp->name,
tvb_get_ntohl(tvb, offset + 2));
}
static void
dissect_lcp_fcs_alternatives_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
proto_tree *field_tree = NULL;
guint8 alternatives;
-
+
alternatives = tvb_get_guint8(tvb, offset + 2);
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: 0x%02x",
optp->name, alternatives);
static void
dissect_lcp_self_describing_pad_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
- proto_tree_add_text(tree, tvb, offset, length,
- "Maximum octets of self-describing padding: %u",
+ proto_tree_add_text(tree, tvb, offset, length, "%s: %u", optp->name,
tvb_get_guint8(tvb, offset + 2));
}
static void
dissect_lcp_numbered_mode_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
proto_tree *field_tree = NULL;
-
+
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
optp->name, length, plurality(length, "", "s"));
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
static void
dissect_lcp_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb, int offset,
- guint length, packet_info *pinfo, proto_tree *tree)
+ guint length, packet_info *pinfo _U_,
+ proto_tree *tree)
{
proto_item *tf;
proto_tree *field_tree = NULL;
guint8 operation;
-
+
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
optp->name, length, plurality(length, "", "s"));
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
static void
dissect_lcp_multilink_mrru_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
- proto_tree_add_text(tree, tvb, offset, length, "Multilink MRRU: %u",
+ proto_tree_add_text(tree, tvb, offset, length, "%s: %u", optp->name,
tvb_get_ntohs(tvb, offset + 2));
}
static void
dissect_lcp_multilink_ep_disc_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
static void
dissect_lcp_bap_link_discriminator_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_tree_add_text(tree, tvb, offset, length,
- "Link discriminator for BAP: 0x%04x",
+ "%s: 0x%04x", optp->name,
tvb_get_ntohs(tvb, offset + 2));
}
static void
dissect_lcp_internationalization_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
proto_tree *field_tree = NULL;
guint32 charset;
-
+
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
optp->name, length, plurality(length, "", "s"));
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
static void
dissect_ipcp_addrs_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
proto_tree *field_tree = NULL;
-
+
tf = proto_tree_add_text(tree, tvb, offset, length, "%s: %u byte%s",
optp->name, length, plurality(length, "", "s"));
field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
}
static void dissect_ipcp_addr_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_tree_add_text(tree, tvb, offset, length, "%s: %s", optp->name,
ip_to_str(tvb_get_ptr(tvb, offset + 2, 4)));
}
+static void dissect_pppmuxcp_def_pid_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
+ int offset, guint length, packet_info *pinfo _U_,
+ proto_tree *tree)
+{
+ pppmux_def_prot_id = tvb_get_ntohs(tvb, offset + 2);
+ proto_tree_add_text(tree, tvb, offset + 2, length - 2, "%s: %s (0x%02x)",optp->name,
+ val_to_str(pppmux_def_prot_id, ppp_vals, "Unknown"), pppmux_def_prot_id);
+}
+
+
static void
dissect_ccp_stac_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
+ proto_tree *field_tree;
guint8 check_mode;
if (length == 6) {
- proto_tree_add_text(tree, tvb, offset, length,
- "%s (Ascend Proprietary version)", optp->name);
- /* We don't know how to decode the following 4 octets, since
- there's no public document that describe their usage. */
- return;
+ proto_tree_add_text(tree, tvb, offset, length,
+ "%s (Ascend Proprietary version)", optp->name);
+ /* We don't know how to decode the following 4 octets, since
+ there's no public document that describe their usage. */
} else {
- tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
+ tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
+
+ proto_tree_add_text(field_tree, tvb, offset + 2, 2,
+ "History Count: %u", tvb_get_ntohs(tvb, offset + 2));
+ check_mode = tvb_get_guint8(tvb, offset + 4);
+ proto_tree_add_text(field_tree, tvb, offset + 4, 1,
+ "Check Mode: %s (0x%02X)",
+ val_to_str(check_mode, stac_checkmode_vals, "Unknown"),
+ check_mode);
}
-
- proto_tree_add_text(tf, tvb, offset + 2, 2,
- "History Count: %u", tvb_get_ntohs(tvb, offset + 2));
- check_mode = tvb_get_guint8(tvb, offset + 4);
- proto_tree_add_text(tf, tvb, offset + 4, 1, "Check Mode: %s (0x%02X)",
- val_to_str(check_mode, stac_checkmode_vals, "Unknown"), check_mode);
}
static void
dissect_ccp_mppc_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
guint32 supported_bits;
supported_bits = tvb_get_ntohl(tvb, offset + 2);
- tf = proto_tree_add_text(tree, tvb, offset, length,
+ tf = proto_tree_add_text(tree, tvb, offset, length,
"%s: Supported Bits: 0x%08X", optp->name, supported_bits);
- flags_tree = proto_item_add_subtree(tf, ett_ccp_mppc_opt);
+ flags_tree = proto_item_add_subtree(tf, *optp->subtree_index);
proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s",
- decode_boolean_bitfield(supported_bits, MPPC_SUPPORTED_BITS_C, 8*4,
- "Desire to negotiate MPPC", "NOT Desire to negotiate MPPC"));
+ decode_boolean_bitfield(supported_bits, MPPC_SUPPORTED_BITS_C, 8*4,
+ "Desire to negotiate MPPC", "NO Desire to negotiate MPPC"));
proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s",
- decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_D, 8*4,
+ decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_D, 8*4,
"Obsolete (should NOT be 1)", "Obsolete (should ALWAYS be 0)"));
proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s",
- decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_L, 8*4,
+ decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_L, 8*4,
"40-bit encryption ON", "40-bit encryption OFF"));
proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s",
- decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_S, 8*4,
+ decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_S, 8*4,
"128-bit encryption ON", "128-bit encryption OFF"));
proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s",
- decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_M, 8*4,
+ decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_M, 8*4,
"56-bit encryption ON", "56-bit encryption OFF"));
proto_tree_add_text(flags_tree, tvb, offset + 2, 4, "%s",
- decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_H, 8*4,
+ decode_boolean_bitfield(supported_bits, MPPE_SUPPORTED_BITS_H, 8*4,
"Stateless mode ON", "Stateless mode OFF"));
}
+static void
+dissect_ccp_bsdcomp_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
+ int offset, guint length, packet_info *pinfo _U_,
+ proto_tree *tree)
+{
+ proto_item *tf;
+ proto_tree *field_tree;
+
+ tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
+
+ proto_tree_add_text(field_tree, tvb, offset + 2, 1,
+ "Version: %u", tvb_get_guint8(tvb, offset + 2) >> 5);
+ proto_tree_add_text(field_tree, tvb, offset + 2, 1,
+ "Dict: %u bits",
+ tvb_get_guint8(tvb, offset + 2) & 0x1f);
+}
+
static void
dissect_ccp_lzsdcp_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
+ proto_tree *field_tree;
guint8 check_mode;
guint8 process_mode;
tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
- proto_tree_add_text(tf, tvb, offset + 2, 2,
+ proto_tree_add_text(field_tree, tvb, offset + 2, 2,
"History Count: %u", tvb_get_ntohs(tvb, offset + 2));
check_mode = tvb_get_guint8(tvb, offset + 4);
- proto_tree_add_text(tf, tvb, offset + 4, 1, "Check Mode: %s (0x%02X)",
- val_to_str(check_mode, lzsdcp_checkmode_vals, "Unknown"), check_mode);
+ proto_tree_add_text(field_tree, tvb, offset + 4, 1,
+ "Check Mode: %s (0x%02X)",
+ val_to_str(check_mode, lzsdcp_checkmode_vals, "Unknown"),
+ check_mode);
process_mode = tvb_get_guint8(tvb, offset + 5);
- proto_tree_add_text(tf, tvb, offset + 5, 1, "Process Mode: %s (0x%02X)",
- val_to_str(process_mode, lzsdcp_processmode_vals, "Unkown"), process_mode);
+ proto_tree_add_text(field_tree, tvb, offset + 5, 1,
+ "Process Mode: %s (0x%02X)",
+ val_to_str(process_mode, lzsdcp_processmode_vals, "Unkown"),
+ process_mode);
+}
+
+static void
+dissect_ccp_mvrca_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
+ int offset, guint length, packet_info *pinfo _U_,
+ proto_tree *tree)
+{
+ proto_item *tf;
+ proto_tree *field_tree;
+
+ tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
+
+ proto_tree_add_text(field_tree, tvb, offset + 2, 1,
+ "Features: %u", tvb_get_guint8(tvb, offset + 2) >> 5);
+ proto_tree_add_text(field_tree, tvb, offset + 2, 1,
+ "Packet by Packet flag: %s",
+ tvb_get_guint8(tvb, offset + 2) & 0x20 ? "true" : "false");
+ proto_tree_add_text(field_tree, tvb, offset + 2, 1,
+ "History: %u", tvb_get_guint8(tvb, offset + 2) & 0x20);
+ proto_tree_add_text(field_tree, tvb, offset + 3, 1,
+ "Number of contexts: %u", tvb_get_guint8(tvb, offset + 3));
+}
+
+static void
+dissect_ccp_deflate_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
+ int offset, guint length, packet_info *pinfo _U_,
+ proto_tree *tree)
+{
+ proto_item *tf;
+ proto_tree *field_tree;
+ guint8 method;
+
+ tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
+
+ proto_tree_add_text(field_tree, tvb, offset + 2, 1,
+ "Window: %u", hi_nibble(tvb_get_guint8(tvb, offset + 2)));
+ method = lo_nibble(tvb_get_guint8(tvb, offset + 2));
+ proto_tree_add_text(field_tree, tvb, offset + 2, 1,
+ "Method: %s (0x%02x)",
+ method == 0x08 ? "zlib compression" : "other", method);
+ proto_tree_add_text(field_tree, tvb, offset + 3, 1,
+ "Sequence number check method: %u",
+ tvb_get_guint8(tvb, offset + 2) & 0x03);
}
static void
dissect_cbcp_no_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
static void
dissect_cbcp_callback_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
+ proto_tree *field_tree;
proto_item *ta;
+ proto_tree *addr_tree;
guint8 addr_type;
gint addr_len;
guint8 buf[256]; /* Since length field in Callback Conf Option is
8 bits, 256-octet buf is large enough. */
-
+
tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
- proto_tree_add_text(tf, tvb, offset + 2, 1,
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
+
+ proto_tree_add_text(field_tree, tvb, offset + 2, 1,
"Callback delay: %u", tvb_get_guint8(tvb, offset + 2));
offset += 3;
length -= 3;
-
+
while (length > 0) {
- ta = proto_tree_add_text(tf, tvb, offset, length,
- "Callback Address");
- addr_type = tvb_get_guint8(tvb, offset);
- proto_tree_add_text(ta, tvb, offset, 1,
- "Address Type: %s (%u)",
- ((addr_type == 1) ? "PSTN/ISDN" : "Other"), addr_type);
- offset++;
- length--;
- addr_len = tvb_get_nstringz0(tvb, offset, sizeof(buf), buf);
- proto_tree_add_text(ta, tvb, offset, addr_len + 1,
- "Address: %s", buf);
- offset += (addr_len + 1);
- length -= (addr_len + 1);
+ ta = proto_tree_add_text(field_tree, tvb, offset, length,
+ "Callback Address");
+ addr_type = tvb_get_guint8(tvb, offset);
+ addr_tree = proto_item_add_subtree(tf, ett_cbcp_callback_opt_addr);
+ proto_tree_add_text(addr_tree, tvb, offset, 1,
+ "Address Type: %s (%u)",
+ ((addr_type == 1) ? "PSTN/ISDN" : "Other"), addr_type);
+ offset++;
+ length--;
+ addr_len = tvb_get_nstringz0(tvb, offset, sizeof(buf), buf);
+ proto_tree_add_text(addr_tree, tvb, offset, addr_len + 1,
+ "Address: %s", buf);
+ offset += (addr_len + 1);
+ length -= (addr_len + 1);
}
}
static void
dissect_bacp_favored_peer_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
+ proto_tree *field_tree;
tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
- proto_tree_add_text(tf, tvb, offset + 2, 4,
+ proto_tree_add_text(field_tree, tvb, offset + 2, 4,
"Magic number: 0x%08x", tvb_get_ntohl(tvb, offset + 2));
}
static void
dissect_bap_link_type_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
+ proto_tree *field_tree;
guint8 link_type;
tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
- proto_tree_add_text(tf, tvb, offset + 2, 2,
- "Link Speed : %u kbps", tvb_get_ntohs(tvb, offset + 2));
+ proto_tree_add_text(field_tree, tvb, offset + 2, 2,
+ "Link Speed: %u kbps", tvb_get_ntohs(tvb, offset + 2));
link_type = tvb_get_guint8(tvb, offset + 4);
- proto_tree_add_text(tf, tvb, offset + 4, 1,
- "Link Type : %s (%u)", val_to_str(link_type, bap_link_type_vals,
+ proto_tree_add_text(field_tree, tvb, offset + 4, 1,
+ "Link Type: %s (%u)", val_to_str(link_type, bap_link_type_vals,
"Unknown"), link_type);
}
static void
dissect_bap_phone_delta_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
- proto_item *ti;
proto_item *tf;
- guint8 link_type;
+ proto_tree *field_tree;
+ proto_item *ti;
+ proto_tree *suboption_tree;
guint8 subopt_type;
guint8 subopt_len;
guint8 buf[256]; /* Since Sub-Option length field in BAP Phone-Delta
Option is 8 bits, 256-octets buf is large enough */
- ti = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
+ tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
offset += 2;
length -= 2;
while (length > 0) {
subopt_type = tvb_get_guint8(tvb, offset);
subopt_len = tvb_get_guint8(tvb, offset + 1);
- tf = proto_tree_add_text(ti, tvb, offset, subopt_len,
+ ti = proto_tree_add_text(field_tree, tvb, offset, subopt_len,
"Sub-Option (%d byte%s)",
subopt_len, plurality(subopt_len, "", "s"));
+ suboption_tree = proto_item_add_subtree(ti, ett_bap_phone_delta_subopt);
- proto_tree_add_text(tf, tvb, offset, 1,
- "Sub-Option Type : %s (%u)",
+ proto_tree_add_text(suboption_tree, tvb, offset, 1,
+ "Sub-Option Type: %s (%u)",
val_to_str(subopt_type, bap_phone_delta_subopt_vals, "Unknown"),
subopt_type);
- proto_tree_add_text(tf, tvb, offset + 1, 1,
- "Sub-Option Length : %u", subopt_len);
+ proto_tree_add_text(suboption_tree, tvb, offset + 1, 1,
+ "Sub-Option Length: %u", subopt_len);
switch (subopt_type) {
case BAP_PHONE_DELTA_SUBOPT_UNIQ_DIGIT:
- proto_tree_add_text(tf, tvb, offset + 2, 1, "Uniq Digit: %u",
+ proto_tree_add_text(suboption_tree, tvb, offset + 2, 1, "Uniq Digit: %u",
tvb_get_guint8(tvb, offset + 2));
break;
case BAP_PHONE_DELTA_SUBOPT_SUBSC_NUM:
tvb_get_nstringz0(tvb, offset + 2, subopt_len - 2, buf);
- proto_tree_add_text(tf, tvb, offset + 2, subopt_len - 2,
+ proto_tree_add_text(suboption_tree, tvb, offset + 2, subopt_len - 2,
"Subscriber Number: %s", buf);
break;
case BAP_PHONE_DELTA_SUBOPT_PHONENUM_SUBADDR:
tvb_get_nstringz0(tvb, offset + 2, subopt_len - 2, buf);
- proto_tree_add_text(tf, tvb, offset + 2, subopt_len - 2,
+ proto_tree_add_text(suboption_tree, tvb, offset + 2, subopt_len - 2,
"Phone Number Sub Address: %s", buf);
break;
default:
- proto_tree_add_text(tf, tvb, offset + 2, subopt_len - 2, "Unknown");
+ proto_tree_add_text(suboption_tree, tvb, offset + 2, subopt_len - 2,
+ "Unknown");
break;
}
offset += subopt_len;
static void
dissect_bap_reason_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
- guint8 link_type;
guint8 buf[256]; /* Since length field in BAP Reason Option is
8 bits, 256-octets buf is large enough */
tvb_get_nstringz0(tvb, offset + 2, length - 2, buf);
- proto_tree_add_text(tree, tvb, offset, length, "%s : %s",
+ proto_tree_add_text(tree, tvb, offset, length, "%s: %s",
optp->name, buf);
}
static void
dissect_bap_link_disc_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
- guint8 link_type;
-
- proto_tree_add_text(tree, tvb, offset, length, "%s : 0x%04x",
+ proto_tree_add_text(tree, tvb, offset, length, "%s: 0x%04x",
optp->name, tvb_get_ntohs(tvb, offset + 2));
}
static void
dissect_bap_call_status_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
- int offset, guint length, packet_info *pinfo,
+ int offset, guint length, packet_info *pinfo _U_,
proto_tree *tree)
{
proto_item *tf;
- guint8 link_type;
+ proto_tree *field_tree;
guint8 status, action;
tf = proto_tree_add_text(tree, tvb, offset, length, "%s", optp->name);
+ field_tree = proto_item_add_subtree(tf, *optp->subtree_index);
status = tvb_get_guint8(tvb, offset + 2);
- proto_tree_add_text(tf, tvb, offset + 2, 1,
- "Status : %s (0x%02x)",
+ proto_tree_add_text(field_tree, tvb, offset + 2, 1,
+ "Status: %s (0x%02x)",
val_to_str(status, q931_cause_code_vals, "Unknown"), status);
action = tvb_get_guint8(tvb, offset + 3);
- proto_tree_add_text(tf, tvb, offset + 3, 1,
- "Action : %s (0x%02x)",
+ proto_tree_add_text(field_tree, tvb, offset + 3, 1,
+ "Action: %s (0x%02x)",
val_to_str(action, bap_call_status_opt_action_vals, "Unknown"), action);
}
static void
dissect_cp( tvbuff_t *tvb, int proto_id, int proto_subtree_index,
const value_string *proto_vals, int options_subtree_index,
- const ip_tcp_opt *opts, int nopts, packet_info *pinfo, proto_tree *tree ) {
+ const ip_tcp_opt *opts, int nopts, packet_info *pinfo,
+ proto_tree *tree )
+{
proto_item *ti;
proto_tree *fh_tree = NULL;
proto_item *tf;
case PROTREJ:
if(tree) {
- protocol = tvb_get_ntohs(tvb, offset);
- proto_tree_add_text(fh_tree, tvb, offset, 2, "Rejected protocol: %s (0x%04x)",
- val_to_str(protocol, ppp_vals, "Unknown"), protocol);
+ gboolean save_in_error_pkt;
+ tvbuff_t *next_tvb;
+
+ protocol = tvb_get_ntohs(tvb, offset);
+ proto_tree_add_text(fh_tree, tvb, offset, 2,
+ "Rejected protocol: %s (0x%04x)",
+ val_to_str(protocol, ppp_vals, "Unknown"),
+ protocol);
offset += 2;
length -= 2;
- if (length > 0)
- proto_tree_add_text(fh_tree, tvb, offset, length, "Rejected packet (%d byte%s)",
- length, plurality(length, "", "s"));
- /* XXX - should be dissected as a PPP packet */
+ if (length > 0) {
+ proto_tree_add_text(fh_tree, tvb, offset, length,
+ "Rejected packet (%d byte%s)",
+ length, plurality(length, "", "s"));
+
+ /* Save the current value of the "we're inside an error packet"
+ flag, and set that flag; subdissectors may treat packets
+ that are the payload of error packets differently from
+ "real" packets. */
+ save_in_error_pkt = pinfo->in_error_pkt;
+ pinfo->in_error_pkt = TRUE;
+
+ /* Decode the rejected packet. */
+ next_tvb = tvb_new_subset(tvb, offset, length, length);
+ if (!dissector_try_port(ppp_subdissector_table, protocol,
+ next_tvb, pinfo, fh_tree)) {
+ call_dissector(data_handle, next_tvb, pinfo, fh_tree);
+ }
+
+ /* Restore the "we're inside an error packet" flag. */
+ pinfo->in_error_pkt = save_in_error_pkt;
+ }
}
break;
#define PFC_BIT 0x01
static void
-dissect_ppp_common( tvbuff_t *tvb, int offset, packet_info *pinfo,
- proto_tree *tree, proto_tree *fh_tree,
- proto_item *ti ) {
+dissect_ppp_common( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
+ proto_tree *fh_tree, proto_item *ti )
+{
guint16 ppp_prot;
int proto_len;
tvbuff_t *next_tvb;
- ppp_prot = tvb_get_guint8(tvb, offset);
+ ppp_prot = tvb_get_guint8(tvb, 0);
if (ppp_prot & PFC_BIT) {
/* Compressed protocol field - just the byte we fetched. */
proto_len = 1;
} else {
/* Uncompressed protocol field - fetch all of it. */
- ppp_prot = tvb_get_ntohs(tvb, offset);
+ ppp_prot = tvb_get_ntohs(tvb, 0);
proto_len = 2;
}
/* 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
- header, which is just "offset"; add the length of the protocol
- type field to it. */
+ header; add the length of the protocol type field to it. */
if (ti != NULL)
- proto_item_set_len(ti, offset + proto_len);
+ proto_item_set_len(ti, proto_item_get_len(ti) + proto_len);
- if (tree) {
- proto_tree_add_text(fh_tree, tvb, offset, proto_len, "Protocol: %s (0x%04x)",
- val_to_str(ppp_prot, ppp_vals, "Unknown"), ppp_prot);
- }
+ if (tree)
+ proto_tree_add_uint(fh_tree, hf_ppp_protocol, tvb, 0, proto_len, ppp_prot);
- next_tvb = tvb_new_subset(tvb, offset + proto_len, -1, -1);
+ next_tvb = tvb_new_subset(tvb, proto_len, -1, -1);
/* do lookup with the subdissector table */
- if (!dissector_try_port(subdissector_table, ppp_prot, next_tvb, pinfo, tree)) {
+ if (!dissector_try_port(ppp_subdissector_table, ppp_prot, next_tvb, pinfo, tree)) {
if (check_col(pinfo->cinfo, COL_PROTOCOL))
col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "0x%04x", ppp_prot);
if (check_col(pinfo->cinfo, COL_INFO))
}
}
+static void
+dissect_lcp_options(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ dissect_ip_tcp_options(tvb, 0, tvb_reported_length(tvb), lcp_opts, N_LCP_OPTS,
+ -1, pinfo, tree);
+}
+
static void
dissect_lcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
static void
dissect_bap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
{
-
+
proto_item *ti;
proto_tree *fh_tree = NULL;
proto_item *tf;
offset = 4;
length -= 4;
- if (type == BAP_CRES || type == BAP_CBRES ||
+ if (type == BAP_CRES || type == BAP_CBRES ||
type == BAP_LDQRES || type == BAP_CSRES) {
resp_code = tvb_get_guint8(tvb, offset);
proto_tree_add_text(fh_tree, tvb, offset, 1, "Response Code: %s (0x%02x)",
proto_tree *comp_data_tree;
if (check_col(pinfo->cinfo, COL_PROTOCOL))
- col_set_str(pinfo->cinfo, COL_PROTOCOL,
+ col_set_str(pinfo->cinfo, COL_PROTOCOL,
proto_get_protocol_short_name(proto_comp_data));
if(check_col(pinfo->cinfo, COL_INFO))
val_to_str(PPP_COMP, ppp_vals, "Unknown"));
if (tree) {
- ti = proto_tree_add_item(tree, proto_comp_data, tvb, 0, tvb_length(tvb), FALSE);
+ ti = proto_tree_add_item(tree, proto_comp_data, tvb, 0, -1, FALSE);
comp_data_tree = proto_item_add_subtree(ti, ett_comp_data);
}
}
+static void
+dissect_pppmuxcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ dissect_cp(tvb,proto_pppmuxcp,ett_pppmuxcp,pppmuxcp_vals,
+ ett_pppmuxcp_options,pppmuxcp_opts,N_PPPMUXCP_OPTS,pinfo,tree);
+}
+
+#define PPPMUX_FLAGS_MASK 0xc0
+#define PPPMUX_PFF_BIT_SET 0x80
+#define PPPMUX_LXT_BIT_SET 0x40
+
+static void
+dissect_pppmux(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ proto_tree *mux_tree, *hdr_tree, *sub_tree, *flag_tree;
+ proto_tree *info_tree;
+ proto_item *ti = NULL,*sub_ti = NULL;
+ guint8 flags, byte;
+ guint16 length;
+ static guint16 pid;
+ tvbuff_t *next_tvb;
+ int offset = 0, length_remaining;
+ int length_field = 0, pid_field = 0,hdr_length = 0;
+
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo,COL_PROTOCOL, "PPP PPPMux");
+
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_set_str(pinfo->cinfo, COL_INFO, "PPP Multiplexing");
+
+ length_remaining = tvb_reported_length(tvb);
+
+ if (tree) {
+ ti = proto_tree_add_item(tree, proto_pppmux, tvb, 0, -1, FALSE);
+ mux_tree = proto_item_add_subtree(ti,ett_pppmux);
+
+ while (length_remaining > 0) {
+
+ flags = tvb_get_guint8(tvb,offset) & PPPMUX_FLAGS_MASK;
+
+ if (flags && PPPMUX_LXT_BIT_SET ) {
+ length = tvb_get_ntohs(tvb,offset) & 0x3fff;
+ length_field = 2;
+ } else {
+ length = tvb_get_guint8(tvb,offset) & 0x3f;
+ length_field = 1;
+ }
+
+ if (flags && PPPMUX_PFF_BIT_SET) {
+ byte = tvb_get_guint8(tvb,offset + length_field);
+ if (byte && PFC_BIT) { /* Compressed PID field*/
+ pid = byte;
+ pid_field = 1;
+ } else { /*PID field is 2 bytes*/
+ pid = tvb_get_ntohs(tvb,offset + length_field);
+ pid_field = 2;
+ }
+ } else {
+ if (!pid){ /*No Last PID, hence use the default */
+ if (pppmux_def_prot_id)
+ pid = pppmux_def_prot_id;
+ }
+ }
+
+ hdr_length = length_field + pid_field;
+
+ ti = proto_tree_add_text(mux_tree, tvb, offset, length + length_field,
+ "PPPMux Sub-frame");
+ sub_tree = proto_item_add_subtree(ti,ett_pppmux_subframe);
+ sub_ti = proto_tree_add_text(sub_tree, tvb, offset,
+ hdr_length,"Header field");
+
+ hdr_tree = proto_item_add_subtree(sub_ti,ett_pppmux_subframe_hdr);
+ ti = proto_tree_add_text(hdr_tree, tvb, offset, length_field, "PFF/LXT: 0x%02X",
+ flags);
+
+ flag_tree = proto_item_add_subtree(ti,ett_pppmux_subframe_flags);
+ proto_tree_add_text(flag_tree,tvb,offset,length_field,"%s",
+ decode_boolean_bitfield(flags,0x80,8,"PID Present","PID not present"));
+ proto_tree_add_text(flag_tree,tvb,offset,length_field,"%s",
+ decode_boolean_bitfield(flags,0x40,8,"2 bytes ength field ","1 byte length field"));
+
+ ti = proto_tree_add_text(hdr_tree,tvb,offset,length_field,"Sub-frame Length = %u",length);
+
+ if (flags && PPPMUX_PFF_BIT_SET)
+ proto_tree_add_text(hdr_tree,tvb,offset + length_field,pid_field,"%s: %s(0x%02x)",
+ "Protocol ID",val_to_str(pid,ppp_vals,"Unknown"), pid);
+
+ offset += hdr_length;
+ length_remaining -= hdr_length;
+ length -= pid_field;
+
+ sub_ti = proto_tree_add_text(sub_tree,tvb,offset,length,"Information Field");
+ info_tree = proto_item_add_subtree(sub_ti,ett_pppmux_subframe_info);
+
+ next_tvb = tvb_new_subset(tvb,offset,length,-1);
+
+ if (!dissector_try_port(ppp_subdissector_table, pid, next_tvb, pinfo, info_tree)) {
+ call_dissector(data_handle, next_tvb, pinfo, info_tree);
+ }
+ offset += length;
+ length_remaining -= length;
+ } /* While length_remaining */
+ pid = 0;
+ } /* if tree */
+}
+
+static void
+dissect_mplscp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ dissect_cp(tvb, proto_mplscp, ett_mplscp, cp_vals, ett_mplscp_options,
+ NULL, 0, pinfo, tree);
+}
+
+static void
+dissect_cdpcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ dissect_cp(tvb, proto_cdpcp, ett_cdpcp, cp_vals, ett_cdpcp_options,
+ NULL, 0, pinfo, tree);
+}
+
#define MP_FRAG_MASK 0xC0
#define MP_FRAG(bits) ((bits) & MP_FRAG_MASK)
#define MP_FRAG_FIRST 0x80
proto_tree *fh_tree = NULL;
if(tree) {
- ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, 0, FALSE);
+ ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, -1, FALSE);
fh_tree = proto_item_add_subtree(ti, ett_ppp);
}
- dissect_ppp_common(tvb, 0, pinfo, tree, fh_tree, ti);
+ dissect_ppp_common(tvb, pinfo, tree, fh_tree, ti);
}
/*
* a PPP in HDLC-like Framing frame (RFC 1662) or a Cisco HDLC frame.
*/
static void
-dissect_ppp_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree ) {
+dissect_ppp_hdlc( tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree )
+{
proto_item *ti = NULL;
proto_tree *fh_tree = NULL;
guint8 byte0;
int proto_offset;
+ gint len, reported_len;
+ tvbuff_t *next_tvb;
int rx_fcs_offset;
guint32 rx_fcs_exp;
guint32 rx_fcs_got;
if (byte0 == CHDLC_ADDR_UNICAST || byte0 == CHDLC_ADDR_MULTICAST) {
/* Cisco HDLC encapsulation */
call_dissector(chdlc_handle, tvb, pinfo, tree);
+ return;
}
/*
/* load the top pane info. This should be overwritten by
the next protocol in the stack */
- if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
- col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A" );
- if(check_col(pinfo->cinfo, COL_RES_DL_DST))
- col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A" );
if(check_col(pinfo->cinfo, COL_PROTOCOL))
col_set_str(pinfo->cinfo, COL_PROTOCOL, "PPP" );
+ switch (pinfo->p2p_dir) {
+
+ case P2P_DIR_SENT:
+ if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
+ col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DTE");
+ if(check_col(pinfo->cinfo, COL_RES_DL_DST))
+ col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DCE");
+ break;
+
+ case P2P_DIR_RECV:
+ if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
+ col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "DCE");
+ if(check_col(pinfo->cinfo, COL_RES_DL_DST))
+ col_set_str(pinfo->cinfo, COL_RES_DL_DST, "DTE");
+ break;
+
+ default:
+ if(check_col(pinfo->cinfo, COL_RES_DL_SRC))
+ col_set_str(pinfo->cinfo, COL_RES_DL_SRC, "N/A");
+ if(check_col(pinfo->cinfo, COL_RES_DL_DST))
+ col_set_str(pinfo->cinfo, COL_RES_DL_DST, "N/A");
+ break;
+ }
+
if(tree) {
ti = proto_tree_add_item(tree, proto_ppp, tvb, 0, proto_offset, FALSE);
fh_tree = proto_item_add_subtree(ti, ett_ppp);
if (byte0 == 0xff) {
- 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));
+ proto_tree_add_item(fh_tree, hf_ppp_address, tvb, 0, 1, FALSE);
+ proto_tree_add_item(fh_tree, hf_ppp_control, tvb, 1, 1, FALSE);
}
}
- dissect_ppp_common(tvb, proto_offset, pinfo, tree, fh_tree, ti);
-
- /* Calculate the FCS check */
- /* XXX - deal with packets cut off by the snapshot length */
- if (ppp_fcs_decode == FCS_16) {
- 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);
+ /*
+ * Remove the FCS, if any, from the packet data.
+ */
+ switch (ppp_fcs_decode) {
+
+ case NO_FCS:
+ next_tvb = tvb_new_subset(tvb, proto_offset, -1, -1);
+ break;
+
+ case FCS_16:
+ /*
+ * Do we have the entire packet, and does it include a 2-byte FCS?
+ */
+ len = tvb_length_remaining(tvb, proto_offset);
+ reported_len = tvb_reported_length_remaining(tvb, proto_offset);
+ if (reported_len < 2 || len < 0) {
+ /*
+ * The packet is claimed not to even have enough data for a 2-byte FCS,
+ * or we're already past the end of the captured data.
+ * Don't slice anything off.
+ */
+ next_tvb = tvb_new_subset(tvb, proto_offset, -1, -1);
+ } else if (len < reported_len) {
+ /*
+ * The packet is claimed to have enough data for a 2-byte FCS, but
+ * we didn't capture all of the packet.
+ * Slice off the 2-byte FCS from the reported length, and trim the
+ * captured length so it's no more than the reported length; that
+ * will slice off what of the FCS, if any, is in the captured
+ * length.
+ */
+ reported_len -= 2;
+ if (len > reported_len)
+ len = reported_len;
+ next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len);
} else {
- proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 2, "FCS 16: %04x (correct)", rx_fcs_got);
+ /*
+ * We have the entire packet, and it includes a 2-byte FCS.
+ * Slice it off.
+ */
+ len -= 2;
+ reported_len -= 2;
+ next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len);
+
+ /*
+ * Compute the FCS and put it into the tree.
+ */
+ rx_fcs_offset = proto_offset + len;
+ rx_fcs_exp = fcs16(0xFFFF, tvb);
+ 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: 0x%04x (incorrect, should be 0x%04x)",
+ rx_fcs_got, rx_fcs_exp);
+ } else {
+ proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 2,
+ "FCS 16: 0x%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);
+ break;
+
+ case FCS_32:
+ /*
+ * Do we have the entire packet, and does it include a 4-byte FCS?
+ */
+ len = tvb_length_remaining(tvb, proto_offset);
+ reported_len = tvb_reported_length_remaining(tvb, proto_offset);
+ if (reported_len < 4) {
+ /*
+ * The packet is claimed not to even have enough data for a 4-byte FCS.
+ * Just pass on the tvbuff as is.
+ */
+ next_tvb = tvb_new_subset(tvb, proto_offset, -1, -1);
+ } else if (len < reported_len) {
+ /*
+ * The packet is claimed to have enough data for a 4-byte FCS, but
+ * we didn't capture all of the packet.
+ * Slice off the 4-byte FCS from the reported length, and trim the
+ * captured length so it's no more than the reported length; that
+ * will slice off what of the FCS, if any, is in the captured
+ * length.
+ */
+ reported_len -= 4;
+ if (len > reported_len)
+ len = reported_len;
+ next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len);
} else {
- proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 4, "FCS 32: %08x (correct)", rx_fcs_got);
+ /*
+ * We have the entire packet, and it includes a 4-byte FCS.
+ * Slice it off.
+ */
+ len -= 4;
+ reported_len -= 4;
+ next_tvb = tvb_new_subset(tvb, proto_offset, len, reported_len);
+
+ /*
+ * Compute the FCS and put it into the tree.
+ */
+ rx_fcs_offset = proto_offset + len;
+ rx_fcs_exp = fcs32(0xFFFFFFFF, tvb);
+ 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: 0x%08x (incorrect, should be 0x%08x)",
+ rx_fcs_got, rx_fcs_exp);
+ } else {
+ proto_tree_add_text(fh_tree, tvb, rx_fcs_offset, 4,
+ "FCS 32: 0x%08x (correct)",
+ rx_fcs_got);
+ }
}
+ break;
+
+ default:
+ g_assert_not_reached();
+ next_tvb = NULL;
}
+
+ dissect_ppp_common(next_tvb, pinfo, tree, fh_tree, ti);
}
/*
if(tree) {
if (length > 0) {
tf = proto_tree_add_text(fh_tree, tvb, offset, length,
- "Data (%d byte%s)", length,
+ "Data (%d byte%s)", length,
plurality(length, "", "s"));
field_tree = proto_item_add_subtree(tf, ett_chap_data);
value_size = tvb_get_guint8(tvb, offset);
- name_length = length - value_size - 1;
+ name_length = length - value_size - 1;
tv = proto_tree_add_text(field_tree, tvb, offset, 1,
- "Value Size: %d byte%s",
+ "Value Size: %d byte%s",
value_size, plurality(value_size, "", "s"));
if (--length > 0) {
value_tree = proto_item_add_subtree(tv, ett_chap_value);
- proto_tree_add_text(value_tree, tvb, ++offset,
+ proto_tree_add_text(value_tree, tvb, ++offset,
ppp_min(value_size, length),
- "Value (%d byte%s)",
+ "Value (%d byte%s)",
value_size, plurality(value_size, "", "s"));
offset+=value_size;
length-=value_size;
if (length > 0) {
- proto_tree_add_text(field_tree, tvb, offset,
+ proto_tree_add_text(field_tree, tvb, offset,
ppp_min(name_length, length),
- "Name (%d byte%s)", name_length,
+ "Name (%d byte%s)", name_length,
plurality(name_length, "", "s"));
}
}
if(tree) {
if (length > 0) {
tf = proto_tree_add_text(fh_tree, tvb, offset, length,
- "Data (%d byte%s)", length,
+ "Data (%d byte%s)", length,
plurality(length, "", "s"));
field_tree = proto_item_add_subtree(tf, ett_chap_data);
tv = proto_tree_add_text(field_tree, tvb, offset, length,
- "Message: %d byte%s",
+ "Message: %d byte%s",
length, plurality(length, "", "s"));
}
}
}
}
+static void
+dissect_ipv6cp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+ dissect_cp(tvb, proto_ipv6cp, ett_ipv6cp, cp_vals, ett_ipv6cp_options,
+ ipv6cp_opts, N_IPV6CP_OPTS, pinfo, tree);
+}
+
+static void dissect_ipv6cp_if_id_opt(const ip_tcp_opt *optp, tvbuff_t *tvb,
+ int offset, guint length, packet_info *pinfo _U_,
+ proto_tree *tree)
+{
+ proto_tree_add_text(tree, tvb, offset, length, "%s: %02x%02x:%02x%02x:%02x%x:%02x%02x",
+ optp->name,
+ tvb_get_guint8(tvb, offset + 2),
+ tvb_get_guint8(tvb, offset + 3),
+ tvb_get_guint8(tvb, offset + 4),
+ tvb_get_guint8(tvb, offset + 5),
+ tvb_get_guint8(tvb, offset + 6),
+ tvb_get_guint8(tvb, offset + 7),
+ tvb_get_guint8(tvb, offset + 8),
+ tvb_get_guint8(tvb, offset + 9)
+ );
+}
void
proto_register_ppp(void)
{
-/* static hf_register_info hf[] = {
- { &variable,
- { "Name", "ppp.abbreviation", TYPE, VALS_POINTER }},
- };*/
- static gint *ett[] = {
- &ett_ppp,
- };
-
- static enum_val_t ppp_options[] = {
- {"None", 0},
- {"16-Bit", 1},
- {"32-Bit", 2},
- {NULL, -1}
- };
+ static hf_register_info hf[] = {
+ { &hf_ppp_address,
+ { "Address", "ppp.address", FT_UINT8, BASE_HEX,
+ NULL, 0x0, "", HFILL }},
- module_t *ppp_module;
+ { &hf_ppp_control,
+ { "Control", "ppp.control", FT_UINT8, BASE_HEX,
+ NULL, 0x0, "", HFILL }},
- proto_ppp = proto_register_protocol("Point-to-Point Protocol",
- "PPP", "ppp");
- /* proto_register_field_array(proto_ppp, hf, array_length(hf));*/
- proto_register_subtree_array(ett, array_length(ett));
+ { &hf_ppp_protocol,
+ { "Protocol", "ppp.protocol", FT_UINT16, BASE_HEX,
+ VALS(ppp_vals), 0x0, "", HFILL }},
+ };
+ static gint *ett[] = {
+ &ett_ppp,
+ };
-/* subdissector code */
- subdissector_table = register_dissector_table("ppp.protocol",
- "PPP protocol", FT_UINT16, BASE_HEX);
+ static enum_val_t ppp_options[] = {
+ {"None", 0},
+ {"16-Bit", 1},
+ {"32-Bit", 2},
+ {NULL, -1}
+ };
- register_dissector("ppp_hdlc", dissect_ppp_hdlc, proto_ppp);
- register_dissector("ppp", dissect_ppp, proto_ppp);
+ module_t *ppp_module;
- /* Register the preferences for the ppp protocol */
- ppp_module = prefs_register_protocol(proto_ppp, NULL);
+ proto_ppp = proto_register_protocol("Point-to-Point Protocol", "PPP", "ppp");
+ proto_register_field_array(proto_ppp, hf, array_length(hf));
+ proto_register_subtree_array(ett, array_length(ett));
- prefs_register_enum_preference(ppp_module,
- "ppp_fcs",
- "PPP Frame Checksum Type",
- "The type of PPP frame checksum (none, 16-bit, 32-bit)",
- &ppp_fcs_decode,
- ppp_options, FALSE);
- prefs_register_bool_preference(ppp_module,
- "ppp_vj",
- "PPP Van Jacobson Compression",
- "Whether Van Jacobson-compressed PPP frames should be decompressed",
- &ppp_vj_decomp);
+/* subdissector code */
+ ppp_subdissector_table = register_dissector_table("ppp.protocol",
+ "PPP protocol", FT_UINT16, BASE_HEX);
+
+ register_dissector("ppp_hdlc", dissect_ppp_hdlc, proto_ppp);
+ register_dissector("ppp_lcp_options", dissect_lcp_options, proto_ppp);
+ register_dissector("ppp", dissect_ppp, proto_ppp);
+
+ /* Register the preferences for the ppp protocol */
+ ppp_module = prefs_register_protocol(proto_ppp, NULL);
+
+ prefs_register_enum_preference(ppp_module,
+ "fcs_type",
+ "PPP Frame Checksum Type",
+ "The type of PPP frame checksum (none, 16-bit, 32-bit)",
+ &ppp_fcs_decode,
+ ppp_options, FALSE);
+ prefs_register_bool_preference(ppp_module,
+ "decompress_vj",
+ "Decompress Van Jacobson-compressed frames",
+ "Whether Van Jacobson-compressed PPP frames should be decompressed",
+ &ppp_vj_decomp);
+ prefs_register_uint_preference(ppp_module,
+ "default_proto_id",
+ "PPPMuxCP Default PID",
+ "Default Protocol ID to be used for PPPMuxCP",
+ 16, &pppmux_def_prot_id);
}
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_ccp_options,
&ett_ccp_stac_opt,
&ett_ccp_mppc_opt,
- &ett_ccp_lzsdcp_opt
+ &ett_ccp_bsdcomp_opt,
+ &ett_ccp_lzsdcp_opt,
+ &ett_ccp_mvrca_opt,
+ &ett_ccp_deflate_opt,
};
- proto_ccp = proto_register_protocol("PPP Compression Control Protocol",
+ proto_ccp = proto_register_protocol("PPP Compression Control Protocol",
"PPP CCP", "ccp");
proto_register_subtree_array(ett, array_length(ett));
}
static gint *ett[] = {
&ett_cbcp,
&ett_cbcp_options,
- &ett_cbcp_no_callback_opt,
- &ett_cbcp_callback_opt
+ &ett_cbcp_callback_opt,
+ &ett_cbcp_callback_opt_addr
};
- proto_cbcp = proto_register_protocol("PPP Callback Control Protocoll",
+ proto_cbcp = proto_register_protocol("PPP Callback Control Protocol",
"PPP CBCP", "cbcp");
proto_register_subtree_array(ett, array_length(ett));
}
&ett_bacp_favored_peer_opt
};
- proto_bacp = proto_register_protocol("PPP Bandwidth Allocation Control Protocol",
+ proto_bacp = proto_register_protocol("PPP Bandwidth Allocation Control Protocol",
"PPP BACP", "bacp");
proto_register_subtree_array(ett, array_length(ett));
}
&ett_bap_options,
&ett_bap_link_type_opt,
&ett_bap_phone_delta_opt,
- &ett_bap_reason_opt,
- &ett_bap_link_disc_opt,
+ &ett_bap_phone_delta_subopt,
&ett_bap_call_status_opt
};
- proto_bap = proto_register_protocol("PPP Bandwidth Allocation Protocol",
+ proto_bap = proto_register_protocol("PPP Bandwidth Allocation Protocol",
"PPP BAP", "bap");
proto_register_subtree_array(ett, array_length(ett));
}
{
static gint *ett[] = {
&ett_pap,
- &ett_pap_data,
- &ett_pap_peer_id,
- &ett_pap_password,
- &ett_pap_message,
+ &ett_pap_data,
+ &ett_pap_peer_id,
+ &ett_pap_password,
+ &ett_pap_message,
};
proto_pap = proto_register_protocol("PPP Password Authentication Protocol", "PPP PAP",
*/
dissector_add("ethertype", PPP_CHAP, chap_handle);
}
+
+void
+proto_register_pppmuxcp(void)
+{
+ static gint *ett[] = {
+ &ett_pppmuxcp,
+ &ett_pppmuxcp_options,
+ };
+
+ proto_pppmuxcp = proto_register_protocol("PPPMux Control Protocol",
+ "PPP PPPMuxCP",
+ "pppmuxcp");
+ proto_register_subtree_array(ett, array_length(ett));
+}
+
+
+void
+proto_reg_handoff_pppmuxcp(void)
+{
+ dissector_handle_t muxcp_handle;
+
+ muxcp_handle = create_dissector_handle(dissect_pppmuxcp, proto_pppmuxcp);
+ dissector_add("ppp.protocol", PPP_MUXCP, muxcp_handle);
+
+ /*
+ * See above comment about NDISWAN for an explanation of why we're
+ * registering with the "ethertype" dissector table.
+ */
+ dissector_add("ethertype", PPP_MUXCP, muxcp_handle);
+}
+
+
+void
+proto_register_pppmux(void)
+{
+ static gint *ett[] = {
+ &ett_pppmux,
+ &ett_pppmux_subframe,
+ &ett_pppmux_subframe_hdr,
+ &ett_pppmux_subframe_flags,
+ &ett_pppmux_subframe_info,
+ };
+
+ proto_pppmux = proto_register_protocol("PPP Multiplexing",
+ "PPP PPPMux",
+ "pppmux");
+ proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_pppmux(void)
+{
+ dissector_handle_t pppmux_handle;
+
+ pppmux_handle = create_dissector_handle(dissect_pppmux, proto_pppmux);
+ dissector_add("ppp.protocol", PPP_MUX, pppmux_handle);
+
+ /*
+ * See above comment about NDISWAN for an explanation of why we're
+ * registering with the "ethertype" dissector table.
+ */
+ dissector_add("ethertype", PPP_MUX, pppmux_handle);
+}
+
+void
+proto_register_mplscp(void)
+{
+ static gint *ett[] = {
+ &ett_mplscp,
+ &ett_mplscp_options,
+ };
+
+ proto_mplscp = proto_register_protocol("PPP MPLS Control Protocol",
+ "PPP MPLSCP", "mplscp");
+ proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_mplscp(void)
+{
+ dissector_handle_t mplscp_handle;
+
+ mplscp_handle = create_dissector_handle(dissect_mplscp, proto_mplscp);
+ dissector_add("ppp.protocol", PPP_MPLSCP, mplscp_handle);
+
+ /*
+ * See above comment about NDISWAN for an explanation of why we're
+ * registering with the "ethertype" dissector table.
+ */
+ dissector_add("ethertype", PPP_MPLSCP, mplscp_handle);
+}
+
+void
+proto_register_cdpcp(void)
+{
+ static gint *ett[] = {
+ &ett_cdpcp,
+ &ett_cdpcp_options,
+ };
+
+ proto_cdpcp = proto_register_protocol("PPP CDP Control Protocol",
+ "PPP CDPCP", "cdpcp");
+ proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_cdpcp(void)
+{
+ dissector_handle_t cdpcp_handle;
+
+ cdpcp_handle = create_dissector_handle(dissect_cdpcp, proto_cdpcp);
+ dissector_add("ppp.protocol", PPP_CDPCP, cdpcp_handle);
+
+ /*
+ * See above comment about NDISWAN for an explanation of why we're
+ * registering with the "ethertype" dissector table.
+ */
+ dissector_add("ethertype", PPP_CDPCP, cdpcp_handle);
+}
+
+void
+proto_register_ipv6cp(void)
+{
+ static gint *ett[] = {
+ &ett_ipv6cp,
+ &ett_ipv6cp_options,
+ &ett_ipv6cp_if_id_opt,
+ &ett_ipv6cp_compressprot_opt,
+ };
+
+ proto_ipv6cp = proto_register_protocol("PPP IPv6 Control Protocol",
+ "PPP IPV6CP", "ipv6cp");
+ proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_ipv6cp(void)
+{
+ dissector_handle_t ipv6cp_handle;
+
+ ipv6cp_handle = create_dissector_handle(dissect_ipv6cp, proto_ipv6cp);
+ dissector_add("ppp.protocol", PPP_IPV6CP, ipv6cp_handle);
+
+ /*
+ * See above comment about NDISWAN for an explanation of why we're
+ * registering with the "ethertype" dissector table.
+ */
+ dissector_add("ethertype", PPP_IPV6CP, ipv6cp_handle);
+}
git.samba.org / obnox / wireshark / wip.git / blobdiff