osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Q.933 dissector. (Not complete.) 

svn path=/trunk/; revision=8350
This commit is contained in:
Guy Harris 2003-09-03 05:39:21 +00:00
parent 48e75dda62
commit e076cb925f
5 changed files with 2190 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
# $Id: Makefile.am,v 1.617 2003/09/02 22:47:56 guy Exp $
# $Id: Makefile.am,v 1.618 2003/09/03 05:39:21 guy Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@ -330,6 +330,7 @@ DISSECTOR_SRC = \
packet-prism.c \
packet-q2931.c \
packet-q931.c \
packet-q933.c \
packet-qllc.c \
packet-quake.c \
packet-quake2.c \

3
Makefile.nmake
View File

@ -1,7 +1,7 @@
## Makefile for building ethereal.exe with Microsoft C and nmake
## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
#
# $Id: Makefile.nmake,v 1.330 2003/09/02 22:47:56 guy Exp $
# $Id: Makefile.nmake,v 1.331 2003/09/03 05:39:21 guy Exp $
include config.nmake
include <win32.mak>
@ -271,6 +271,7 @@ DISSECTOR_SRC = \
packet-prism.c \
packet-q2931.c \
packet-q931.c \
packet-q933.c \
packet-qllc.c \
packet-quake.c \
packet-quake2.c \

5
nlpid.h
View File

@ -2,7 +2,7 @@
* Definitions of OSI NLPIDs (Network Layer Protocol IDs)
* Laurent Deniel <laurent.deniel@free.fr>
*
* $Id: nlpid.h,v 1.13 2003/02/24 19:49:03 guy Exp $
* $Id: nlpid.h,v 1.14 2003/09/03 05:39:21 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -32,7 +32,8 @@
#define NLPID_IPI_T_70 0x01 /* T.70, when an IPI */
#define NLPID_SPI_X_29 0x01 /* X.29, when an SPI */
#define NLPID_X_633 0x03 /* X.633 */
#define NLPID_Q_931 0x08 /* Q.931, Q.932, Q.933, X.36, ISO 11572, ISO 11582 */
#define NLPID_Q_931 0x08 /* Q.931, Q.932, X.36, ISO 11572, ISO 11582 */
#define NLPID_Q_933 0x08 /* Q.933, on Frame Relay */
#define NLPID_Q_2931 0x09 /* Q.2931 */
#define NLPID_Q_2119 0x0c /* Q.2119 */
#define NLPID_SNAP 0x80

11
packet-fr.c
View File

@ -3,7 +3,7 @@
*
* Copyright 2001, Paul Ionescu <paul@acorp.ro>
*
* $Id: packet-fr.c,v 1.40 2003/09/02 23:42:01 guy Exp $
* $Id: packet-fr.c,v 1.41 2003/09/03 05:39:21 guy Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@ -142,6 +142,7 @@ static const value_string fr_nlpid_vals[] = {
};
static dissector_table_t fr_subdissector_table;
static dissector_table_t fr_osinl_subdissector_table;
static void dissect_fr_nlpid(tvbuff_t *tvb, int offset, packet_info *pinfo,
proto_tree *tree, proto_item *ti,
@ -411,9 +412,15 @@ static void dissect_fr_nlpid(tvbuff_t *tvb, int offset, packet_info *pinfo,
* OSI network layer protocols consider the NLPID to be part
* of the frame, so we'll pass it as part of the payload and,
* if the protocol is one of those, add it as a hidden item here.
* We check both the generic OSI NLPID dissector table and
* the Frame Relay OSI NLPID dissector table - the latter is for
* NLPID's such as 0x08, which is Q.933 in Frame Relay but
* other protocols (e.g., Q.931) on other network layers.
*/
next_tvb = tvb_new_subset(tvb,offset,-1,-1);
if (dissector_try_port(osinl_subdissector_table, fr_nlpid, next_tvb,
pinfo, tree) ||
dissector_try_port(fr_osinl_subdissector_table, fr_nlpid, next_tvb,
pinfo, tree)) {
/*
* Yes, we got a match. Add the NLPID as a hidden item,
@ -575,6 +582,8 @@ void proto_register_fr(void)
fr_subdissector_table = register_dissector_table("fr.ietf",
"Frame Relay NLPID", FT_UINT8, BASE_HEX);
fr_osinl_subdissector_table = register_dissector_table("fr.osinl",
"Frame Relay OSI NLPID", FT_UINT8, BASE_HEX);
register_dissector("fr_uncompressed", dissect_fr_uncompressed, proto_fr);
register_dissector("fr", dissect_fr, proto_fr);

2173
packet-q933.c Normal file
View File

File diff suppressed because it is too large Load Diff