diff options
| author | Guy Harris <guy@alum.mit.edu> | 2004-02-02 17:57:21 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2004-02-02 17:57:21 +0000 |
| commit | dfa57848581a06fe6e16660e77b9401416cdcf11 (patch) | |
| tree | 1d5bb42910ba02a239f50167bc51cd8e2bd72740 | |
| parent | 66f9313113d18876136ff3776ab32a39ca6164af (diff) | |
From Jonathan Perkins; the in ANSI MTP3, the SLC field of SLTM/SLTA
messages is in a different place from where it is in ITU MTP3.
svn path=/trunk/; revision=9957
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | doc/ethereal.pod | 1 | ||||
| -rw-r--r-- | packet-mtp3mg.c | 17 |
3 files changed, 16 insertions, 3 deletions
@@ -2051,6 +2051,7 @@ And assorted fixes and enhancements by the people listed above and by: Pierre Juhen <pierre.juhen [AT] wanadoo.fr> David Richards <drichards [AT] alum.mit.edu> Shusaku Ueda <ueda [AT] sra.co.jp> + Jonathan Perkins <jonathan.perkins [AT] ipaccess.com> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/doc/ethereal.pod b/doc/ethereal.pod index 9a58ef015e..3ddd96d1aa 100644 --- a/doc/ethereal.pod +++ b/doc/ethereal.pod @@ -2120,6 +2120,7 @@ B<http://www.ethereal.com>. Pierre Juhen <pierre.juhen [AT] wanadoo.fr> David Richards <drichards [AT] alum.mit.edu> Shusaku Ueda <ueda [AT] sra.co.jp> + Jonathan Perkins <jonathan.perkins [AT] ipaccess.com> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/packet-mtp3mg.c b/packet-mtp3mg.c index eeb8b2cfe3..bec2cf11fe 100644 --- a/packet-mtp3mg.c +++ b/packet-mtp3mg.c @@ -10,7 +10,7 @@ * * Copyright 2003, Jeff Morriss <jeff.morriss[AT]ulticom.com> * - * $Id: packet-mtp3mg.c,v 1.11 2003/12/06 19:14:30 jmayer Exp $ + * $Id: packet-mtp3mg.c,v 1.12 2004/02/02 17:57:20 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -271,7 +271,6 @@ static const value_string test_h1_message_type_acro_values[] = { { TEST_H1_SLTA, "SLTA" }, { 0, NULL } }; - #define COO_LENGTH 2 #define ANSI_COO_SLC_MASK 0x000f #define ANSI_COO_FSN_MASK 0x07f0 @@ -313,6 +312,7 @@ static const value_string test_h1_message_type_acro_values[] = { #define TEST_LENGTH_MASK 0xf0 #define TEST_LENGTH_SHIFT 4 #define TEST_PATTERN_OFFSET TEST_LENGTH +#define ANSI_TEST_SLC_MASK 0x000f /* This list is slightly different from that in packet-mtp3.c */ static const value_string service_indicator_code_vals[] = { @@ -391,6 +391,7 @@ static int hf_mtp3mg_upu_user = -1; static int hf_mtp3mg_upu_cause = -1; static int hf_mtp3test_h0 = -1; static int hf_mtp3mg_test_h1 = -1; +static int hf_mtp3mg_test_ansi_slc = -1; static int hf_mtp3mg_test_length = -1; /* Initialize the subtree pointers */ @@ -821,6 +822,12 @@ dissect_mtp3mg_test(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, { case TEST_H1_SLTM: case TEST_H1_SLTA: + if (mtp3_standard == ANSI_STANDARD) + { + proto_tree_add_item(tree, hf_mtp3mg_test_ansi_slc, tvb, 0, + TEST_LENGTH, TRUE); + } + proto_tree_add_item(tree, hf_mtp3mg_test_length, tvb, 0, TEST_LENGTH, TRUE); @@ -1192,7 +1199,11 @@ proto_register_mtp3mg(void) { &hf_mtp3mg_test_length, { "Test length", "mtp3mg.test.length", FT_UINT8, BASE_DEC, NULL, H1_MASK, - "Signalling link test pattern length", HFILL }} + "Signalling link test pattern length", HFILL }}, + { &hf_mtp3mg_test_ansi_slc, + { "Signalling Link Code", "mtp3mg.slc", + FT_UINT8, BASE_DEC, NULL, ANSI_TEST_SLC_MASK, + "SLC of affected link", HFILL }} }; /* Setup protocol subtree array */ |