Commit Graph

147 Commits

Author SHA1 Message Date
Pascal Quantin aa0ebee47c From Alexander via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7361 :
Add BSS supported Codec list dissection to Assigment Complete message

svn path=/trunk/; revision=43215
2012-06-11 20:28:31 +00:00
Pascal Quantin 653f74bfcf From Alexander via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7360 :
Service handover IE is not correctly dissected

svn path=/trunk/; revision=43214
2012-06-11 20:12:17 +00:00
pascal 0ba1ab2909 Display Element ID in hexadecimal (like in 3GPP specs)
Display EPS bearer ID in decimal

svn path=/trunk/; revision=42755
2012-05-21 19:27:38 +00:00
Bill Meier d53320919a Remove unneeded #includes (stdlib, stdio, ctypes, time);
In a few cases: do some whitespace, indentation cleanup & reformatting.

svn path=/trunk/; revision=42632
2012-05-15 19:23:35 +00:00
Bill Meier c055ca8c7e General minor cleanup including:
- remove unneeded #includes;
- use val_to_str_const() as appropriate;
- reformat hf[] entries;
- reformat long lines;
- use #if 0/#endif to coment out code instead of /* ... */;
- remove boilerplate comments;
- whitespace & indentation


svn path=/trunk/; revision=42487
2012-05-07 22:11:34 +00:00
pascal 5df9055044 Fix a few clang warnings
svn path=/trunk/; revision=42343
2012-04-30 08:38:26 +00:00
Anders Broman eb97cbb088 Set up RTP conversations from BSS MAP.
svn path=/trunk/; revision=42142
2012-04-19 13:59:55 +00:00
Jeff Morriss e41643f34a Avoid false-positive CID 621: if str is non-NULL, idx should be positive
(so idx won't be negative when used in the else statement).  To avoid
this false positive, add a check if idx is negative to the if(str) check.

Also remove some trailing commas.

svn path=/trunk/; revision=41925
2012-04-04 14:42:25 +00:00
Anders Broman 7bfeada4bf Fix dissecton of speech codec list
svn path=/trunk/; revision=41429
2012-03-08 10:23:04 +00:00
Bill Meier 126aa85393 Convert proto_tree_add_item() 'encoding' arg for field types FT_STRING, FT_STRINGZ, FT_UINT_STRING as follows:
1. If there's no character encoding (ENC_ASCII, ...) specified
    then use ENC_ASCII.
 2. For all but FT_UINT_STRING, always use ENC_NA
    (replacing any existing True/1/FALSE/0
    /ENC_BIG_ENDIAN/ENC_LITTLE_ENDIAN).



svn path=/trunk/; revision=39426
2011-10-15 18:46:26 +00:00
Bill Meier 67ee5049d4 Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/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_BOOLEAN
     FT_IPv4
     FT_EUI64
     FT_GUID
     FT_UINT_STRING

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

svn path=/trunk/; revision=39328
2011-10-10 00:39:31 +00:00
Bill Meier 4e57694d4a Convert 'encoding' parameter of certain proto_tree_add_item() calls in non-autogenerated epan/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=39288
2011-10-06 03:35:44 +00:00
Bill Meier c67363e4de Fix gcc 4.6 "set but not used [-Wunused-but-set-variable]" warnings.
svn path=/trunk/; revision=38170
2011-07-22 18:33:44 +00:00
Jeff Morriss 4380cad67d Finish removing tabs and fix up some indentation.
Add a break after decoding CSData Codec Type.

svn path=/trunk/; revision=37247
2011-05-18 17:31:48 +00:00
Jeff Morriss 7b3bd3e8a9 Add a default (else) case in the default case for cause values to avoid passing
a NULL string pointer to format routines.

While we're there, update the cause list from 48.008 v10.1.0.

svn path=/trunk/; revision=37244
2011-05-18 17:09:55 +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 72b69aeaf5 Change the msg_fcn() signature to include pinfo.
svn path=/trunk/; revision=36441
2011-04-04 07:45:34 +00:00
Anders Broman 691c566900 CID 453,454
Missing break

svn path=/trunk/; revision=36277
2011-03-23 05:48:58 +00:00
Anders Broman b4941ca580 Prepare to remove old bssgp code by changing exports.
svn path=/trunk/; revision=36142
2011-03-06 09:42:41 +00:00
Anders Broman f9b379bab5 Advance offsets in the "default" branch to avoid infinite loops.
** (tshark.exe:4392): WARNING **: Dissector bug, protocol GSM BSSMAP, in packet
194520: More than 1000000 items in the tree -- possible infinite loop
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5688

svn path=/trunk/; revision=35939
2011-02-13 15:43:17 +00:00
Anders Broman 35bde0d589 Update dissection of
3.2.2.103 Speech Codec List
3.2.2.104 Speech Codec
to 3GPP TS 48.008 version 9.4.0 Release 9.

svn path=/trunk/; revision=35935
2011-02-12 20:17:47 +00:00
Anders Broman 211e3a1eef - Use ENC_BIG_ENDIAN.
- GSM_A_PDU_TYPE_BSSMAP.

svn path=/trunk/; revision=35879
2011-02-08 12:32:34 +00:00
Anders Broman 7a78a180c7 Dissect more IE's in PERFORM-LOCATION-REQUEST.
svn path=/trunk/; revision=35721
2011-01-31 15:16:45 +00:00
Stig Bjørlykke 64dab4f576 Removed duplicate hf_gsm_a_bssmap_lsa_only registry.
svn path=/trunk/; revision=35676
2011-01-27 07:45:31 +00:00
Anders Broman 68f4f61017 Dissect PS-HANDOVER-REQUEST.
svn path=/trunk/; revision=35666
2011-01-26 19:44:23 +00:00
Anders Broman a78e5d7900 Use value_string_ext and friends.
svn path=/trunk/; revision=35484
2011-01-11 20:15:04 +00:00
Anders Broman f108c58805 Complement to
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=35477

svn path=/trunk/; revision=35483
2011-01-11 20:02:30 +00:00
Anders Broman f23d884631 Try to fix:
packet-gtpv2.c:2648: warning: return type defaults to 'int'
packet-gtpv2.c: In function 'dissect_udp_s_port_nr':
packet-gtpv2.c:2690: warning: unused parameter 'length'
packet-gtpv2.c: In function 'dissect_gtpv2_fq_csid':
packet-gtpv2.c:2845: warning: unused parameter 'length'
packet-gtpv2.c: In function 'dissect_gtpv2_emlpp_pri':
packet-gtpv2.c:2927: warning: implicit declaration of function 'be_emlpp_prio'
packet-gtpv2.c: At top level:
packet-gtpv2.c:3056: warning: initialization from incompatible pointer type

svn path=/trunk/; revision=35431
2011-01-08 20:26:35 +00:00
Jeff Morriss 8535524c6a Remove a duplicate return.
svn path=/trunk/; revision=35389
2011-01-05 22:27:41 +00:00
Anders Broman d20be4e050 Fix the Message numbering.
svn path=/trunk/; revision=35271
2010-12-27 09:33:39 +00:00
Anders Broman df66b02972 Correct:
RESET IP RESOURCE
RESET IP RESOURCE ACKNOWLEDGE
Tags

svn path=/trunk/; revision=35267
2010-12-26 21:23:06 +00:00
Anders Broman 356aced5bf Start of a SGSAP (TS 29.118) dissector for LTE.
svn path=/trunk/; revision=35266
2010-12-26 21:06:08 +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
Anders Broman 8bc65842e0 From Mike Morrin:
In bssmap, track L3 handover target (GSM or UMTS) between PDUs
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5294

svn path=/trunk/; revision=35009
2010-11-22 20:24:12 +00:00
Anders Broman 348e0bc54b Use value_string_ext for gsm_a_rr_rxlev_vals.
svn path=/trunk/; revision=34818
2010-11-09 07:28:04 +00:00
Gerasimos Dimitriadis fe34e9a3fb Support for eMLPP Priority IE in BSSMAP
svn path=/trunk/; revision=33971
2010-08-27 21:30:12 +00:00
Gerald Combs 9afeb63b49 Make sure we don't dereference an invalid function pointer. Fixes bug 4949.
svn path=/trunk/; revision=33362
2010-06-29 00:08:24 +00:00
Jeff Morriss 3dce901718 Avoid passing a NULL pointer to a string to proto_tree_add_uint_format()
svn path=/trunk/; revision=32878
2010-05-18 14:17:11 +00:00
Bill Meier 0fc9115705 Use consistent indentation; Whitesapce & formatting cleanup.
svn path=/trunk/; revision=32755
2010-05-11 16:54:55 +00:00
Anders Broman 447faa6082 From Mike Morrin:
Dissection of BSSMAP IEs: Old BSS to New BSS Info and New BSS to Old BSS Info
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4712

svn path=/trunk/; revision=32606
2010-04-29 20:45:53 +00:00
Bill Meier 69df32fb11 #include <string.h> not needed.
svn path=/trunk/; revision=32411
2010-04-06 22:09:47 +00:00
Bill Meier 09764dd969 Remove unneeded #include <stdio.h>
svn path=/trunk/; revision=32367
2010-04-03 21:55:23 +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
Anders Broman 2c41750861 Bug on bssmap SAI not decoded.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4415

svn path=/trunk/; revision=31678
2010-01-26 12:22:03 +00:00
Bill Meier de4c6ff515 Fix a number of gcc _Wshadow warnings
svn path=/trunk/; revision=31557
2010-01-18 21:49:47 +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
Anders Broman 9ca6c5518c If SourceRNC-ToTargetRNC-TransparentContainer is called trough dissect_ranap_SourceRNC_ToTargetRNC_TransparentContainer_PDU ProtocolIE_ID may be unset
svn path=/trunk/; revision=31073
2009-11-25 17:15:10 +00:00
Anders Broman 4187652696 Add dissection of Source RNC to target RNC transparent information in BSSAP.
Fix RRC container dissection in RANAP.

svn path=/trunk/; revision=31058
2009-11-23 22:02:05 +00:00
Gerasimos Dimitriadis 029f3641ae Basic support for the DTAP User-User IE; print bitfields in a way more
similar to proto_tree_add_bits_item(); Minor comment edits

svn path=/trunk/; revision=31057
2009-11-23 20:23:30 +00:00
Gerasimos Dimitriadis d07a4dd389 When decoding a Cell Identifier, curr_offset is not increased after
reading rnc-id

svn path=/trunk/; revision=31032
2009-11-20 16:23:18 +00:00
Anders Broman 1a79f3ead4 Fix Layer 3 Message Contents(?)
At least the trace at http://openbsc.gnumonks.org/trac/attachment/wiki/OpenBSCWithSCCP/bssmap_clean.pcap dissects correctly now.

svn path=/trunk/; revision=30799
2009-11-01 20:00:08 +00:00
Anders Broman 3da9d8fc41 From Holger Freyther:
GSM BSSMAP ChanType permitted indicator extension bit decoded wrongly.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4185

svn path=/trunk/; revision=30797
2009-11-01 19:11:13 +00:00
Kovarththanan Rajaratnam 65c53fedb6 Don't guard col_append_str with check_col
svn path=/trunk/; revision=30125
2009-09-24 20:00:21 +00:00
Bill Meier 6c545e0d79 Save some memory: Don't statically allocate ett[] arrays used "dynamically".
svn path=/trunk/; revision=29929
2009-09-15 17:37:54 +00:00
Anders Broman d41058065f From Mike Morrin:
The GSM L3 part of the BSSMAP CipherModeComplete message is not being decoded.
Sligtly modified.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3983

svn path=/trunk/; revision=29776
2009-09-07 17:17:07 +00:00
Anders Broman 99c24a8eb4 From Mike Morrin:
Patch adding BSSMAP dissectors MSC Invoke Trace and BSS Invoke Trace.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3985

svn path=/trunk/; revision=29774
2009-09-07 17:08:34 +00:00
Jaap Keuter c9e3f66d14 Optimize empty strings to NULL pointers.
svn path=/trunk/; revision=29298
2009-08-04 21:05:38 +00:00
Anders Broman 04b77f8437 APDU incorrectly dissected(BSSLAP Protocol Not Decoded In BSSMAP-LE Messages).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3711

svn path=/trunk/; revision=29077
2009-07-13 08:35:30 +00:00
Jörg Mayer 6270137b07 Fix my 'fix': guint8 > 0 is always true
svn path=/trunk/; revision=28807
2009-06-22 07:27:14 +00:00
Jörg Mayer cf0746df92 Fix warning: always evaluates to true/false
svn path=/trunk/; revision=28805
2009-06-22 06:29:32 +00:00
Anders Broman 757a6bf29a Wrong tree used, add Codec list dissection.
svn path=/trunk/; revision=27957
2009-04-04 15:19:45 +00:00
Anders Broman 13282b7a7c Add value strings and code clenup.
svn path=/trunk/; revision=27944
2009-04-03 16:19:12 +00:00
Anders Broman 0d2fb53b74 - Fix APDU dissection.
- NAS EPS bugfixes and enhancements.

svn path=/trunk/; revision=27778
2009-03-18 19:40:54 +00:00
Jeff Morriss ed96ef8e03 From Michael Lum via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3281 :
The LCS Client Type parameter in a BSSMAP Perform Location Request is not being
dissected (1.1 trunk).

The LCS Priority and LCS QoS are fine.

svn path=/trunk/; revision=27565
2009-02-28 04:27:43 +00:00
Anders Broman b631b88d61 Implement TLV-E and LV-E type IE dissection (2 byte length value).
svn path=/trunk/; revision=27100
2008-12-23 20:49:15 +00:00
Guy Harris 880180dd6b Don't use fancy quote characters that don't fit in ASCII; just use
Boring Old ASCII Quotes.  That way, you don't have to worry about which
character set a program reading the file is expecting.  Fixes bug 3157.

Fix some typoes in comments while we're at it.

svn path=/trunk/; revision=27091
2008-12-23 00:22:07 +00:00
Bill Meier ba7be20b74 Revert queueing --> queuing spelling changes made in SVN #27050
svn path=/trunk/; revision=27058
2008-12-19 04:41:54 +00:00
Bill Meier c544c20956 Fix various typos and spelling errors (mostly in text strings)
svn path=/trunk/; revision=27050
2008-12-18 19:08:49 +00:00
Bill Meier 33c99f44fd Fix typos and spelling (mostly in text strings)
svn path=/trunk/; revision=27028
2008-12-17 00:08:38 +00:00
Anders Broman 85bfdec24b Correct the bit position for a couple of hf fields.
svn path=/trunk/; revision=26968
2008-12-11 20:34:23 +00:00
Anders Broman 8957c53871 Add codec list dissection.
svn path=/trunk/; revision=26896
2008-12-01 22:30:13 +00:00
Stig Bjørlykke 14029e4803 Initialize consumed in be_speech_codec_lst().
svn path=/trunk/; revision=26858
2008-11-26 23:36:22 +00:00
Anders Broman 7c82d14ab0 Fix selected codecs list and a number of typos.
svn path=/trunk/; revision=26855
2008-11-26 21:03:53 +00:00
Anders Broman ad41b9667f Move some of the BSSMAP LE stuff to packet-gsm_bssmap_le.c
svn path=/trunk/; revision=26832
2008-11-23 21:08:46 +00:00
Anders Broman f42db62a55 From Johnny Mitrevski:
Add new Bssap dissectors for the Lb interface.

svn path=/trunk/; revision=26814
2008-11-20 07:57:24 +00:00
Anders Broman 05fa33881c From Pascal Quantin:
Improve 3GPP 44.018 RR dissection.

svn path=/trunk/; revision=26779
2008-11-15 11:36:49 +00:00
Bill Meier 25aee02122 From SUZUKI Shinsuke: Fix some non-ascii characters: Bug #3057
svn path=/trunk/; revision=26775
2008-11-13 22:50:05 +00:00
Anders Broman 5128a0dafe From Johnny Mitrevski:
Add dissecton of some LCS related IE:s.
( Removed C++ type comments, changed (*8 to <<3), changed some add uint's to add_item
renamed value strings etc.)

svn path=/trunk/; revision=26762
2008-11-12 17:43:32 +00:00
Stig Bjørlykke 4e9a58bd3c Removed some unused variables and fixed some true_false_string's.
svn path=/trunk/; revision=26691
2008-11-04 20:27:22 +00:00
Anders Broman 2888252e85 Update towards 48.008 8.4.0
svn path=/trunk/; revision=26689
2008-11-04 20:11:06 +00:00
Anders Broman c83c448173 Add dissection of some IE:s
svn path=/trunk/; revision=26625
2008-10-30 19:32:35 +00:00
Anders Broman dd18d39f92 Move dissect_geographical_description() from gsm_map to gsm_a_common to make it easier to use it in other dissectors including it from gsm_map makes in neccesarry to include asn1.h.
Fix some bugs in the code, use it from bssmap.

svn path=/trunk/; revision=26603
2008-10-28 19:16:10 +00:00
Anders Broman 38e28295cd Update towards 48.008 8.4.0
svn path=/trunk/; revision=26589
2008-10-27 21:07:52 +00:00
Anders Broman 799b8635f3 Update towards 48.008 8.4.0
svn path=/trunk/; revision=26558
2008-10-26 19:44:06 +00:00
Stephen Fisher ede39bfe1f Take out extra */ to fix compile.
svn path=/trunk/; revision=26534
2008-10-23 21:26:19 +00:00
Anders Broman 607de79a7b Update towards 48.008 8.4.0
svn path=/trunk/; revision=26530
2008-10-23 20:39:43 +00:00
Anders Broman 6e901dc4fe Mark len as unused.
svn path=/trunk/; revision=26518
2008-10-22 21:10:45 +00:00
Anders Broman 41b70e3a96 Some further updates.
svn path=/trunk/; revision=26517
2008-10-22 20:56:26 +00:00
Stig Bjørlykke 1d5478595c Mark some unused variables.
svn path=/trunk/; revision=26516
2008-10-22 18:55:58 +00:00
Guy Harris 03a81916d8 Get rid of /* inside comment.
svn path=/trunk/; revision=26515
2008-10-22 17:50:07 +00:00
Anders Broman a4c3055bbb Update bssap le and BSS MAP.
svn path=/trunk/; revision=26514
2008-10-22 16:32:24 +00:00
Bill Meier 97e7747d42 Small cleanup of proto_reg_handoff & etc
- 'once-only' not req'd in some cases
- use find_dissector as appropriate
- remove unneeded code

svn path=/trunk/; revision=26284
2008-09-27 13:38:59 +00:00
Anders Broman ebc8f1f8bf From Niel Percy:
Much as I hate white space changes, I got fed up of the huge variation of styles within these files, and tried to get to a much smaller range of variation. Also a few comment tidies, and use of _U_ for unused args rather than "arg = arg" lines.

svn path=/trunk/; revision=26140
2008-09-05 05:49:39 +00:00
Bill Meier 77b81b391b #include <prefs.h> not req'd
svn path=/trunk/; revision=26089
2008-08-25 22:06:20 +00:00
Anders Broman 2226bccd44 From Neil Piercy:
1 new split file (GMM & SM in one file) and diff patches for the others. The RR, RP and BSSMAP patches are really a tidy-up: now they are split it becomes clear what was redundant code.

svn path=/trunk/; revision=26064
2008-08-24 17:42:30 +00:00
Anders Broman bafcc127f8 From Neil Piercy:
RR has been split from DTAP, with common stuff going to the common files (plus a few minor knock-on consequences).
Fix the broken tap:
I had not realised that the register_tap call in the dissector registration actually _created_ the tap entry (not the register_tap_listener), and not just associated the tap_id returned with the tap registered by the listener. The use of separate statics by the split lead to 3 taps called "gsm_a", but only the first of which was ever found in the tap_queue_packet. Added (yet another) global for now to cope.

Also attached is a patch to tap.c which simply returns the same tap_id if the register_tap is called twice with the same name - I can't see any downside to this, can you? Anyway it seemed to work with deliberately keeping multiple calls.

svn path=/trunk/; revision=26039
2008-08-19 08:05:04 +00:00
Anders Broman 082a5aec04 From Neil Piercy:
All I've done in these is to split the 3 obviously distinct protocols (BSSMAP & RP) from the still-large (and wrongly-named) DTAP (really the whole of layer 3 - it includes RR and packet parts too).

So far I've only split in a "minimum change" manner - there is clearly some tidying and structure enhancement of how the common bits are used, removing the globals just added, and great scope for consistency of white space, improved naming etc. - but I thought it best to keep it very close to the original initially to establish the split.

With some changes to make it compile on Windows.

svn path=/trunk/; revision=25917
2008-08-04 19:44:03 +00:00