Commit Graph

107 Commits

Author SHA1 Message Date
Gerald Combs 3f765b3ef9 Add a CF_FUNC macro for casting BASE_CUSTOM functions.
Add a CF_FUNC macro to match VALS, TFS, etc. This should help us to avoid
the following warning:

    warning: ISO C forbids initialization between function pointer and 'void *' [-Wpedantic]

We could start adding DIAG_OFF+DIAG_ON everywhere but this seems to be
more consistent with the other macros in proto.h. Update each instance
of BASE_CUSTOM to use CF_FUNC.

Adjust a dummy variable name generated by asn2wrs.py that was triggering
an invalid error in checkhf.pl.

Fix an encoding arguement in packet-elasticsearch.c found by
fix-encoding-args.pl.

Change-Id: Id0e75076c2d71736639d486f47b87bab84e07d22
Reviewed-on: https://code.wireshark.org/review/7150
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-02-18 00:05:38 +00:00
Pascal Quantin 9f4bf6abf3 LTE RRC: only display band mapping for the initial supportedBandListEUTRA IE
Handling bands > 64 would require to store the mapping in file scope and current code is broken for the Carrier Aggregation band combination list

Change-Id: I9f10022a50520ca9bc16a33f2c16361729f1b01b
Reviewed-on: https://code.wireshark.org/review/6917
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-02-02 16:32:41 +00:00
Pascal Quantin e7593ea19d asn2wrs: autodetect if 64 bits variant is required for constrained integers
It does not work with defines, but is already a great step forward

Change-Id: I346d4124690ec46a2299d4eae8031bbb19a3db8e
Reviewed-on: https://code.wireshark.org/review/6617
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-18 13:30:56 +00:00
Pascal Quantin 25f010b269 MAC LTE: upgrade dissector to v12.4.0
Change-Id: Ieb5395a6ae7a1d7625fe645d0caf14008993d3d9
Reviewed-on: https://code.wireshark.org/review/6521
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-13 20:57:01 +00:00
Pascal Quantin aa9376e0b4 LTE RRC: upgrade dissector to v12.4.0
Change-Id: I0bd6c124bd3aa0efe09db81135adc690751e08ae
Reviewed-on: https://code.wireshark.org/review/6477
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11 09:43:02 +00:00
Pascal Quantin 34cd063ae8 LTE RRC: upgrade dissector to v12.3.0
Change-Id: Iac974bf505bed270fc1f9409a7d61c80ebca17a5
Reviewed-on: https://code.wireshark.org/review/5691
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-09 22:48:23 +00:00
Pascal Quantin 74172aee0b LTE: Update MAC and RLC dissectors to Release 12
Change-Id: I036a0d1180b6481e8cc27210ed44eda4ba078a27
Reviewed-on: https://code.wireshark.org/review/5659
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-09 09:49:49 +00:00
Martin Mathieson 64225639be Show RRC Release cause in the Info column
Change-Id: I138859ce735a9ff6541d6852dec29a13c1034c36
Reviewed-on: https://code.wireshark.org/review/4114
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-15 17:19:58 +00:00
Martin Mathieson 806981d156 Show band info for inter-freq entries in UE capabilities. Addresses Pascal's comments.
Change-Id: Ie60dc73e40a2ac1d80197fa712075ccff83cf797
Reviewed-on: https://code.wireshark.org/review/4032
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-09-08 14:12:28 +00:00
Pascal Quantin ddeac70a5a LTE RRC: fix dissection of CDMA System Time broken in gcd02af5
Also put back initial text indentation

Change-Id: I6fe207086018a806a258b1de2888ac0b9310aac6
Reviewed-on: https://code.wireshark.org/review/3524
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-09 16:26:44 +00:00
Michael Mann cd02af56a1 Eliminate (almost all) proto_tree_add_text calls from ASN.1 dissectors.
This mostly involved adding expert info capabilities to many of the dissectors so that they could correctly flag error conditions.

Only remaining proto_tree_add_text calls are in H248.cnf, which has a convoluted way of using hf_ data to make its tree.

Change-Id: I6412150c2ec1977d7fa38f3f0ed416680bdfb141
Reviewed-on: https://code.wireshark.org/review/3500
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-08-09 01:57:08 +00:00
Michael Mann 9356d5c689 convert to proto_tree_add_subtree[_format] for ASN.1 dissectors
Change-Id: I753ca95e2e1b38bad2c09955317e648c525e40ef
Reviewed-on: https://code.wireshark.org/review/2509
Tested-by: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-22 21:08:21 +00:00
Evan Huus de00c49bd8 Convert a bunch of time_to_str functions to wmem
Change-Id: I24fe3cc4a3589dadc4528a77fe7ff13d06b1a983
Reviewed-on: https://code.wireshark.org/review/2245
Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-06-16 17:26:25 +00:00
Pascal Quantin 4eaf1c82c5 MAC LTE: get extended BSR sizes configuration from RRC
Change-Id: I09afa7c17be5e0ed902a2c2f5ea9989df3380615
Reviewed-on: https://code.wireshark.org/review/1550
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-05-08 06:29:21 +00:00
Martin Mathieson 1ddce8bb4c Have RRC tell MAC about RAPID ranges so it can show for RAPIDs seen
Change-Id: Ie9adbe3015c63e53997068053b6f8ec224a5bf82
Reviewed-on: https://code.wireshark.org/review/1474
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2014-05-03 21:39:20 +00:00
Martin Mathieson bd6ffea1cd LTE RRC: break the sr-configIndex down into periodicity and subframe offset
Change-Id: I5e153ebba9957f3dc5551f540cf333a1d0ff89f7
Reviewed-on: https://code.wireshark.org/review/1141
Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-15 04:16:52 +00:00
Pascal Quantin 97ab466679 LTE RRC: add file forgotten in gb981173
Change-Id: I1727e56e678c32402f6331463c06c62072c954d8
Reviewed-on: https://code.wireshark.org/review/833
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-26 09:58:15 +00:00
Pascal Quantin 3626f860a6 Upgrade LTE RRC dissector to v11.7.0
Change-Id: If1f64241846cc18463c8c5e9da7dd2a5eaba6733
Reviewed-on: https://code.wireshark.org/review/752
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-20 15:41:44 +00:00
Bill Meier 1dff4e309d Remove trailing whitespace from asn1 .cnf & template.[hc] files. Regenerate dissectors.
Change-Id: I0e779b2ac2f608356649c5bbfca438141070dea4
Reviewed-on: https://code.wireshark.org/review/412
Reviewed-by: Bill Meier <wmeier@newsguy.com>
Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-26 19:38:21 +00:00
Jeff Morriss 8c608e6e82 Remove $Id$ from the ASN.1 dissectors and regenerate them.
Change-Id: Ie476c6f82f318188b41ed922b92c6fec119ea954
Reviewed-on: https://code.wireshark.org/review/244
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Tested-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-02-18 03:05:28 +00:00
Martin Mathieson f903141d65 Send news of SecurityModeFailure to PDCP dissector, which will attempt to roll back to previous setting
svn path=/trunk/; revision=54978
2014-01-27 12:06:46 +00:00
Pascal Quantin 771dc849f5 Update file forgotten in r54250
svn path=/trunk/; revision=54264
2013-12-19 18:58:31 +00:00
Pascal Quantin 93398e794e Use STR_UNICODE display instead of proto_tree_add_unicode_string() in the remaining dissectors
svn path=/trunk/; revision=53867
2013-12-08 20:03:15 +00:00
Pascal Quantin db7405bb13 Dissect UE Rx - Tx time difference field
svn path=/trunk/; revision=53557
2013-11-24 23:09:48 +00:00
Michael Mann 9b7fb8a811 Create the ability to have packet scoped "proto" data. Bug 9470 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9470)
I'm not sold on the name or module the proto_data functions live in, but I believe the function arguments are solid and gives us the most flexibility for the future.  And search/replace of a function name is easy enough to do.

The big driving force for getting this in sooner rather than later is the saved memory on ethernet packets (and IP packets soon), that used to have file_scope() proto data when all it needed was packet_scope() data (technically packet_info->pool scoped), strictly for Decode As.

All dissectors that use p_add_proto_data() only for Decode As functionality have been converted to using packet_scope().  All other dissectors were converted to using file_scope() which was the original scope for "proto" data.

svn path=/trunk/; revision=53520
2013-11-23 02:20:13 +00:00
Martin Mathieson 66d64c686e Pass security command details (integrity and ciphering algorithms) to PDCP (which doesn't yet do much with them)
svn path=/trunk/; revision=52946
2013-10-29 13:49:14 +00:00
Pascal Quantin d74564d6cf Ensure to release an existing DRX configuration when receiving a RRC Connection Setup message
svn path=/trunk/; revision=52193
2013-09-23 21:21:58 +00:00
Pascal Quantin 102c452bcb More emem -> wmem conversion:
- tvb_get_g_stringz()/tvb_get_ephemeral_stringz()/tvb_get_seasonal_stringz() -> tvb_get_stringz()
- tvb_get_g_stringz_enc()/tvb_get_ephemeral_stringz_enc() -> tvb_get_stringz_enc()
- tvb_get_ephemeral_unicode_stringz() -> tvb_get_unicode_stringz()
- tvb_bcd_dig_to_ep_str() -> tvb_bcd_dig_to_wmem_packet_str()
- update docs accordingly

svn path=/trunk/; revision=52180
2013-09-22 20:04:35 +00:00
Pascal Quantin a0c53ffaa1 emem -> wmem conversion:
- ep_tvb_get_bits() -> wmem_packet_tvb_get_bits()
- tvb_g_memdup()/ep_tvb_memdup() -> tvb_memdup()
- tvb_fake_unicode()/tvb_get_ephemeral_faked_unicode() -> tvb_get_faked_unicode()
- tvb_get_g_string()/tvb_get_ephemeral_string()/tvb_get_seasonal_string() -> tvb_get_string()
- tvb_get_g_unicode_string()/tvb_get_ephemeral_unicode_string() -> tvb_get_unicode_string()
- tvb_get_ephemeral_string_enc() -> tvb_get_string_enc()
- update docs accordingly

svn path=/trunk/; revision=52172
2013-09-22 15:50:55 +00:00
Michael Mann 9e3f9b449f expert_add_info_format_text -> expert_add_info_format
svn path=/trunk/; revision=51852
2013-09-09 00:44:09 +00:00
Martin Mathieson a09ee6af03 The first step towards tracking and showing DRX info in MAC:
- send release from RRC
- show current DRX config from each frame, including a link back to the
  RRC config frame
- show simple DRX state for each frame (currently only offset into long
  cycle and whether within long cycle 'on' period)

TODO:
- simulate timers in response to new UL/DL transmissions or DL CRC
  errors
- maintain whether in long or short cycle
- show state of all timers

svn path=/trunk/; revision=51585
2013-08-30 04:08:57 +00:00
Guy Harris 0675ed7494 Clang, clang, clang went the warning....
Fix a memset (drb_mapping is a pointer, so its size is the size of a
pointer; we want the size of what it points to).

svn path=/trunk/; revision=51500
2013-08-23 23:51:52 +00:00
Pascal Quantin ae4f556630 Simplify logic a bit now that we do not use anymore GUINT_TO_POINTER macro
svn path=/trunk/; revision=51490
2013-08-23 12:51:07 +00:00
Pascal Quantin 483ee317f7 From Martin Mathieson:
Follow-up of r51429 that
- uses accessors to lazily allocate a private_data struct and returns the different parts based upon their use
- includes the v1130 DRX Config

svn path=/trunk/; revision=51489
2013-08-23 10:42:11 +00:00
Martin Mathieson 641032ea44 Gather together dedicated DRX configuration, and make sure that it
is internally consistent.

TODO: include r11 sequence that can overwrite some of these values.
TODO: actx->private_data gets reused for several purposes, need to
separate these uses out and avoid possible conflicts...

svn path=/trunk/; revision=51429
2013-08-19 17:06:42 +00:00
Pascal Quantin 24e7b8aefd Fix copy paste error and reinitialize actx->private_data to NULL once used
svn path=/trunk/; revision=51311
2013-08-12 09:26:24 +00:00
Martin Mathieson 237182ba42 Use proper macros to cast between uint and pointer
svn path=/trunk/; revision=51246
2013-08-10 17:09:12 +00:00
Martin Mathieson 11304a30ee Try again...
svn path=/trunk/; revision=51245
2013-08-10 16:53:05 +00:00
Martin Mathieson 8cddb7a24e Try using guint.
svn path=/trunk/; revision=51244
2013-08-10 16:34:19 +00:00
Martin Mathieson 0fb73abcc9 Add a malformed check to show if GroupA has more RAPIDs than A & B
combined.

svn path=/trunk/; revision=51243
2013-08-10 16:17:33 +00:00
Pascal Quantin 802e7bed77 Try to differentiate a non filled private_data (pointer set to NULL) from an enum with value = 0
svn path=/trunk/; revision=50837
2013-07-23 14:34:46 +00:00
Pascal Quantin b91b990a77 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8880 :
Check actx->private_data validity before using it

svn path=/trunk/; revision=50338
2013-07-03 08:53:47 +00:00
Pascal Quantin 830ebed406 Get rid of global variables
svn path=/trunk/; revision=50032
2013-06-19 06:44:39 +00:00
Martin Mathieson 2cf27a92a6 Set PDCP SN length for DRBs for separate RRC element.
svn path=/trunk/; revision=50021
2013-06-18 22:38:54 +00:00
Martin Mathieson 868f74d628 Also signal value of PDCP SN (only used if enabled by RLC preferences).
svn path=/trunk/; revision=50019
2013-06-18 21:44:48 +00:00
Martin Mathieson ece132a5ce Configure MAC LCID -> RLC channel settings from RRC.
svn path=/trunk/; revision=50016
2013-06-18 21:02:00 +00:00
Michael Mann 7fe5422c4b Convert ASN.1 dissectors to use filterable expert info.
NOTE: Kerberos ASN.1 template was updated, but not generated to source.

svn path=/trunk/; revision=49707
2013-06-03 03:42:36 +00:00
Pascal Quantin d7638de9b7 Also notify CMAS alerts
svn path=/trunk/; revision=49685
2013-06-01 23:27:16 +00:00
Martin Mathieson d41ce46c92 Make Earthquake and Tsunami Warning Sytem indications stand out a
bit more.

svn path=/trunk/; revision=49683
2013-06-01 22:26:47 +00:00
Martin Mathieson 3a80080fe9 Add some info to make it easier to see when SI config changes:
- show systemInfoModification in info column (and expert info), also
  show number of UEs paged
- add expert item when systemInfoValueTag changes
- for MIB, add SFN to info column

svn path=/trunk/; revision=49603
2013-05-28 22:11:56 +00:00