Commit graph

210 commits

Author SHA1 Message Date
Anders Broman
512e379901 Wireshark crashes in gsm_map dissector
For now use Jeff's fix:
"The REAL problem is that the GSM_MAP dissector is using this value_string_ext
in the hf without BASE_EXT_STRING:

    { &hf_gsm_old_localValue,
      { "localValue", "gsm_old.localValue",
        FT_INT32, BASE_DEC, &gsm_old_GSMMAPOperationLocalvalue_vals_ext, 0,
        "OperationLocalvalue", HFILL }},

This, in turn, appears to be caused because OperationLocalValue is an alias
for/of GSMMAPOperationLocalValue and only the latter is defined with
.USE_VALS_EXT.

I can fix it by doing:

Index: asn1/gsm_map/gsm_map.cnf
===================================================================
--- asn1/gsm_map/gsm_map.cnf    (revision 39628)
+++ asn1/gsm_map/gsm_map.cnf    (working copy)
@@ -54,6 +54,7 @@

 #.USE_VALS_EXT
 GSMMAPOperationLocalvalue
+OperationLocalvalue

 #.EXPORTS
 AddressString


But it seems to be that asn2wrs should arguably be figuring this out on its
own."

svn path=/trunk/; revision=40033
2011-11-29 07:03:31 +00:00
Anders Broman
7669c6affd Export NAEA-CIC to be used by Camel.
svn path=/trunk/; revision=39711
2011-11-02 06:38:46 +00:00
Bill Meier
24cf0aad06 Update generated ASN1 *.[hc] files after recent work done by Jeff Morriss;
The only change in each file is in a comment showing the asn2wrs cmd used to build that file.

svn path=/trunk/; revision=39427
2011-10-15 19:27:27 +00:00
Anders Broman
59a363da40 Update the Camel and MAP ASN.1 files.
svn path=/trunk/; revision=39386
2011-10-12 16:41:42 +00:00
Bill Meier
6142dd287b Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1/*:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
  the encoding parameter for proto_tree_add_item() calls which directly reference
  an item in hf[] which has a type of:
     FT_BOOLEAN
     FT_IPv4
     FT_EUI64
     FT_GUID
     FT_UINT_STRING

 Also: For type FT_IPv6 use ENC_NA. (This was missed in SVN #39260)

svn path=/trunk/; revision=39332
2011-10-10 01:38:20 +00:00
Anders Broman
83b98f5e2c Add exports
svn path=/trunk/; revision=39296
2011-10-06 18:46:47 +00:00
Bill Meier
e2996ceabe Convert 'encoding' parameter of certain proto_tree_add_item() calls in asn1 dissectors:
Specifically:  Replace FALSE|0 and TRUE|1 by ENC_BIG_ENDIAN|ENC_LITTLE_ENDIAN as
 the encoding parameter for proto_tree_add_item() calls which directly reference
 an item in hf[] which has a type of:
    FT_UINT8
    FT_UINT16
    FT_UINT24
    FT_UINT32
    FT_UINT64
    FT_INT8
    FT_INT16
    FT_INT24
    FT_INT32
    FT_INT64
    FT_FLOAT
    FT_DOUBLE


svn path=/trunk/; revision=39294
2011-10-06 16:50:13 +00:00
Anders Broman
0007775464 Make it possible to dissect proprietarry Opcodes.
svn path=/trunk/; revision=39183
2011-09-29 15:23:23 +00:00
Anders Broman
a5839116d3 Pretyfy APN display and make it filterable as a string.
svn path=/trunk/; revision=37731
2011-06-20 10:29:46 +00:00
Jeff Morriss
7ad71a2d78 Treat TVBs as opaque: use the accessor functions instead of accessing the fields
directly.

svn path=/trunk/; revision=37420
2011-05-27 01:57:33 +00:00
Stig Bjørlykke
a7c5d642d5 Regenerate ASN.1 dissectors to update the #line directive.
svn path=/trunk/; revision=37118
2011-05-13 08:12:27 +00:00
Anders Broman
8d6ca293dc Change the signature of elem_fcn():ns to include pinfo.
svn path=/trunk/; revision=36443
2011-04-04 14:37:25 +00:00
Anders Broman
129f07a949 Added FALLTHRU comment to avoid a "missing break" warning.
svn path=/trunk/; revision=36365
2011-03-27 14:02:42 +00:00
Anders Broman
f9a0795e3a Export dissect_gsm_map_ISDN_AddressString_PDU();
svn path=/trunk/; revision=36079
2011-02-27 14:54:26 +00:00
Anders Broman
527942b05a Add exports.
svn path=/trunk/; revision=36049
2011-02-24 15:06:16 +00:00
Anders Broman
553cf70a68 Dissect V1 version , found in trace from:
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5637

svn path=/trunk/; revision=35843
2011-02-07 17:44:34 +00:00
Anders Broman
6d4964bb49 Export more functions.
svn path=/trunk/; revision=35757
2011-02-02 17:09:05 +00:00
Anders Broman
568605ae13 r35546 Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.
Make the change also in the .cnf file

svn path=/trunk/; revision=35551
2011-01-16 08:24:11 +00:00
Jeff Morriss
f36e2be287 Use tvb_memeql() and tvb_memcpy().
Use tvb_ip_to_str() and tvb_ip6_to_str().

There's no need to pass the result of tvb_get_ptr() as the 'value' in
proto_tree_add_*(): just use proto_tree_add_item().

Replace some tvb_get_ptr()s with tvb_get_ephemeral_string()s to ensure the
return string is NULL terminated.

svn path=/trunk/; revision=35546
2011-01-16 03:35:29 +00:00
Anders Broman
8326aa2db7 Use value_string_ext in a couple of places.
svn path=/trunk/; revision=35501
2011-01-12 07:36:55 +00:00
Anders Broman
5ebd7cb133 TCAP- Application context name not been decoded correctly
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5573

svn path=/trunk/; revision=35498
2011-01-12 07:18:57 +00:00
Jeff Morriss
fc2b1606cf Remove unreached statement.
svn path=/trunk/; revision=35387
2011-01-05 22:20:39 +00:00
Guy Harris
a8bc4a0d13 Rename the routines that handle dissector tables with unsigned integer
keys to have _uint in their names, to match the routines that handle
dissector tables with string keys.  (Using _port can confuse people into
thinking they're intended solely for use with TCP/UDP/etc. ports when,
in fact, they work better for things such as Ethernet types, where the
binding of particular values to particular protocols are a lot
stronger.)

svn path=/trunk/; revision=35224
2010-12-20 05:35:29 +00:00
Bill Meier
03b57df5a0 Fix various typos and spelling errors.
svn path=/trunk/; revision=35126
2010-12-06 01:34:58 +00:00
Anders Broman
2fb8971136 Update to 3GPP TS 29.002 V9.3.0 (2010-09)
svn path=/trunk/; revision=34814
2010-11-08 23:15:16 +00:00
Anders Broman
687eb5a2a6 Fix for Bug Packet details have errors when decode MAP V2 PRN_ACK msg
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5076

Use:
/*
 * Dissect Multiple Choice Message
 * This function is used to decode a message, when several encoding may be used.
 * For exemple, in the last MAP version, the Cancel Location is defined like this:
 * CancelLocationArg ::= [3] IMPLICIT SEQUENCE
 * But in the previous MAP version, it was a CHOICE between a SEQUENCE and an IMSI
 * As ASN1 encoders (or software) still uses the old encoding, this function allows
 * the decoding of both versions.
 * Moreover, some optimizations (or bad practice ?) in ASN1 encoder, removes the
 * SEQUENCE tag, when only one parameter is present in the SEQUENCE.
 * This explain why the function expects 3 parameters:
 * - a [3] SEQUENCE corresponding the recent ASN1 MAP encoding
 * - a SEQUENCE for old style
 * - and a single parameter, for old version or optimizations
 *
 * The analyze of the first ASN1 tag, indicate what kind of decoding should be used,
 * if the decoding function is provided (so not a NULL function)
 */

svn path=/trunk/; revision=34001
2010-08-29 17:34:44 +00:00
Jeff Morriss
a0c858efcd Add a little more code to avoid not-very-useful blurbs:
- Change spaces in the name to underscores before comparing it to the blurb.
  - Check if the type simply as T_ prepended to the name.
  - Don't put in a blurb of "NULL".

and regenerate the dissectors.

svn path=/trunk/; revision=32748
2010-05-11 03:53:31 +00:00
Jeff Morriss
e743c4e101 Try to avoid the user confusion reported in
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3477 by not using blurbs
that look like abbreviations (filter strings).

While we're at it try to avoid giving blurbs that are identical (or nearly so)
to the field name.

Regenerate a couple of dissectors like this to prove out the idea.

svn path=/trunk/; revision=32673
2010-05-05 14:29:55 +00:00
Anders Broman
456777d004 Update to V9.1.0 (2010-03).
svn path=/trunk/; revision=32509
2010-04-19 05:58:01 +00:00
Bill Meier
f8b92f8d0b #include <stdio.h> not needed.
svn path=/trunk/; revision=32405
2010-04-06 17:01:14 +00:00
Gerasimos Dimitriadis
dfde72f247 Fix for Bug 4588:
RANAP and friends want the MNC encoded in big endian form.

svn path=/trunk/; revision=32257
2010-03-20 23:53:22 +00:00
Guy Harris
b395a98305 Squelch a bunch of compiler warnings.
svn path=/trunk/; revision=31961
2010-02-23 04:35:23 +00:00
Gerasimos Dimitriadis
ba32bc6d54 Fix for Bug 3116
wrong decoding IMSI with GSM MAP protocol

svn path=/trunk/; revision=31764
2010-02-01 21:19:56 +00:00
Anders Broman
a255c08b66 Get rid of check_col();
svn path=/trunk/; revision=31546
2010-01-17 12:46:00 +00:00
Anders Broman
0aabfbf3f8 Update to V9.0.0 (2009-12)
svn path=/trunk/; revision=31413
2010-01-02 22:12:14 +00:00
Anders Broman
e356fd0faa Update to V9.0.0 (2009-12)
svn path=/trunk/; revision=31404
2010-01-01 22:29:28 +00:00
Guy Harris
68cf37f81b Replace gsm_sms_char_ascii_decode() with gsm_sms_chars_to_utf8(), which
returns an ep_allocated string (and whose name reflects that what you
get out is UTF-8, not just ASCII).

svn path=/trunk/; revision=31376
2009-12-28 21:58:43 +00:00
Gerasimos Dimitriadis
b7261fe2e4 Expert info when E.212 MCC/MNC contain non-decimal digits
svn path=/trunk/; revision=31102
2009-11-27 22:57:50 +00:00
Stig Bjørlykke
6d1dae6f28 Make all proto_* values static.
svn path=/trunk/; revision=30516
2009-10-11 16:24:29 +00:00
Kovarththanan Rajaratnam
124f16e826 Rename gsmmap -> gsm_map for consistency
svn path=/trunk/; revision=30453
2009-10-09 21:33:18 +00:00
Kovarththanan Rajaratnam
acb940488b Make a few variables static
svn path=/trunk/; revision=30451
2009-10-09 21:06:56 +00:00
Kovarththanan Rajaratnam
1ed0657e50 Remove unused variable
svn path=/trunk/; revision=30450
2009-10-09 21:03:07 +00:00
Stig Bjørlykke
b7d8cd1c6a Switch to using tvb_new_subset_remaining() in .cnf files.
svn path=/trunk/; revision=30386
2009-10-07 07:59:11 +00:00
Anders Broman
0f4d4344dd From Gerasimos Dimitriadis:
GSM MAP: an-APDU not decoded.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4095

svn path=/trunk/; revision=30375
2009-10-06 19:04:29 +00:00
Kovarththanan Rajaratnam
f352fa6d90 s/col_add_fstr/col_add_str
svn path=/trunk/; revision=29727
2009-09-06 05:29:51 +00:00
Kovarththanan Rajaratnam
6fe1060cd1 Don't pass ep_alloc()'ed strings to col_set_str().
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3984

svn path=/trunk/; revision=29726
2009-09-06 04:26:50 +00:00
Kovarththanan Rajaratnam
17c9803cac Sanitize epan includes
svn path=/trunk/; revision=29499
2009-08-21 20:25:24 +00:00
Kovarththanan Rajaratnam
8b515e9340 Switch a bunch of dissectors over to using tvb_new_subset_remaining()
svn path=/trunk/; revision=29446
2009-08-16 12:36:22 +00:00
Kovarththanan Rajaratnam
6110a96f68 Don't guard col_set_str (COL_INFO/COL_PROTOCOL) with col_check
svn path=/trunk/; revision=29345
2009-08-09 07:59:51 +00:00
Stig Bjørlykke
9733aadcfe Re-generate asn1 dissectors after hf_register_info cleanup.
svn path=/trunk/; revision=28848
2009-06-26 03:59:01 +00:00