Commit Graph

2847 Commits

Author SHA1 Message Date
Michael Mann 9009944d51 Remove all global variables in P1 dissector. Bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8515)
Added a "subtree context" structure to asn1_ctx_t. This should allow other ASN.1 dissector global variables to be replaced when only used for transferring data between fields in a subtree.

svn path=/trunk/; revision=50208
2013-06-28 12:43:29 +00:00
Jeff Morriss a441793cba Move a couple of time-related modules into wsutil.
A bunch of files didn't really need to include these header files so remove
the include line rather than changing it.

svn path=/trunk/; revision=50154
2013-06-25 22:02:20 +00:00
Pascal Quantin d23f769c0d Add an option to dissect RRC-Container IE
svn path=/trunk/; revision=50130
2013-06-24 21:31:25 +00:00
Michael Mann 87eb22f464 More proper fix (per advice of bug 8515 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8515)) of global variables complained about in bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060). Not sure if algorithm_id of x509af dissector could also be a actx->external.direct_reference, so left it alone.
svn path=/trunk/; revision=50113
2013-06-22 15:08:18 +00:00
Pascal Quantin de10bc6b5e Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8799 :
Display certificate as UINT64 and add support for a 64bits unsigned value in BER dissector

svn path=/trunk/; revision=50096
2013-06-20 23:37:16 +00:00
Martin Mathieson 64e15853fc Fix for bug 8826.
The global variable 'address_item' was not always being set to NULL
before the dissection of a new frame.  Do more to set it in the general
case, and in the particular case of an MTSBindResult_PDU, which was
triggering an error in the supplied capture.

There may be other entry points where this still safely isn't being
set.

svn path=/trunk/; revision=50083
2013-06-20 18:54:58 +00:00
Evan Huus 7c8530539c Ldap still needs to include wmem.h since it uses wmem during normal dissection,
just not for UAT purposes.

svn path=/trunk/; revision=50074
2013-06-20 14:01:54 +00:00
Evan Huus d63bd5330f Back out some of the wmem conversions (r50063 and r50057).
These dissectors allocate ephemeral or seasonal memory in UAT callbacks, which
really makes no sense because UAT callbacks can occur when there is no packet or
file in scope, making this effectively a leak if the user is fiddling with their
UAT and never opens a capture.

Emem let you get away with this, wmem forces an assertion. Back out the changes
so that the UATs are usable until the code can be properly fixed to not use
out-of-scope allocators.

svn path=/trunk/; revision=50073
2013-06-20 06:26:03 +00:00
Evan Huus 0d3718b467 Add some missing wmem includes that apparently only show up on Windows.
svn path=/trunk/; revision=50071
2013-06-19 23:53:25 +00:00
Evan Huus 8b0f1addd9 Apparently one of our major global headers must include emem.h, because I just
found a bunch more asn1 dissectors using emem without ever directly including
the header. Convert those to wmem as well, which involves add a number of
#include directives since dissectors do *not* automatically pull in the wmem
headers.

svn path=/trunk/; revision=50066
2013-06-19 23:08:58 +00:00
Evan Huus b1e12ec925 Convert the rest of the ASN1 dissectors from emem to wmem.
svn path=/trunk/; revision=50063
2013-06-19 22:47:36 +00:00
Evan Huus 9fa4a8e6b6 Convert a batch of asn1 dissectors from emem to wmem.
svn path=/trunk/; revision=50057
2013-06-19 20:43:03 +00:00
Jörg Mayer b77119aca7 Remove traling whitespace.
svn path=/trunk/; revision=50048
2013-06-19 18:33:49 +00:00
Pascal Quantin 2eec913a4d Fet rid of a global variable
svn path=/trunk/; revision=50034
2013-06-19 07:16:14 +00:00
Pascal Quantin 830ebed406 Get rid of global variables
svn path=/trunk/; revision=50032
2013-06-19 06:44:39 +00:00
Jörg Mayer d9b5210c61 Fix CID 712341: Dereference null return value (NULL_RETURNS)
Well, not really. Just catch that case and error out.

svn path=/trunk/; revision=50029
2013-06-19 03:23:31 +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
Pascal Quantin 458dcb7ea2 Add ability to export decrypted SSL/DTLS PDUs
svn path=/trunk/; revision=50001
2013-06-18 01:13:07 +00:00
Michael Mann f42e5bc9c0 Remove check_col() and the occasional tree.
This leaves just the Pidl dissectors remaining for removal of check_col() in the dissectors directory.  A small handful of check_col() calls remain outside of the dissectors.

svn path=/trunk/; revision=49941
2013-06-14 19:46:54 +00:00
Jeff Morriss 9c26c32645 Add parentheses around assignment used as truth value.
svn path=/trunk/; revision=49929
2013-06-14 13:20:41 +00:00
Michael Mann 2dbf6c59a2 Remove check_col() from ASN.1 dissectors
svn path=/trunk/; revision=49927
2013-06-14 12:44:50 +00:00
Anders Broman 82e220f2bd Pretify dissection of date and Time.
svn path=/trunk/; revision=49905
2013-06-12 15:08:08 +00:00
Tomas Kukosa 822c02b5d0 Fix wrong offset in H.235 tokens causing malformed packet exception
svn path=/trunk/; revision=49899
2013-06-12 09:03:21 +00:00
Anders Broman 03a322661f Fix a crash when oid_info->value_typem is NULL
svn path=/trunk/; revision=49894
2013-06-12 04:21:40 +00:00
Michael Mann 93be0fb393 Batch of filterable expert infos with some minor cleanup I noticed while doing the filter conversions.
svn path=/trunk/; revision=49893
2013-06-12 03:33:44 +00:00
Anders Broman bbb5aacd42 Show DisplayString as a string.
svn path=/trunk/; revision=49887
2013-06-11 16:35:06 +00:00
Gerald Combs c891784de7 Quick fix for bug 8768. For now assume that only three logical channels
are valid. If we run into more add expert item and cap the channel
count.

svn path=/trunk/; revision=49787
2013-06-05 16:38:20 +00:00
Pascal Quantin 1bb2081fd2 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8746 :
Add procedure numbers to C12.22 dissection

svn path=/trunk/; revision=49775
2013-06-04 20:21:17 +00:00
Anders Broman 3bfeaff546 Add subdissection of:
- SNMPv2-MIB sysDescr
-  SNMPv2-MIB::sysName

svn path=/trunk/; revision=49774
2013-06-04 20:05:16 +00:00
Jeff Morriss 29d51623c2 From Ed Beroset via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8762 :
Remove dead code (condition can never happen).

svn path=/trunk/; revision=49743
2013-06-04 01:38:53 +00:00
Anders Broman 5e408534c8 cc1: warnings being treated as errors
../../asn1/nbap/packet-nbap-template.c: In function 'add_hsdsch_bind':
../../asn1/nbap/packet-nbap-template.c:349: warning: unused parameter 'tree'

svn path=/trunk/; revision=49708
2013-06-03 04:25:31 +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
Pascal Quantin c553280339 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8745 :
Upgrade AP-title ASN.1 description

svn path=/trunk/; revision=49684
2013-06-01 23:10:37 +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
Pascal Quantin c310bd7dcc Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8744 :
Display C12.22 Invocation Id as unsigned integer

svn path=/trunk/; revision=49682
2013-06-01 20:51:14 +00:00
Jeff Morriss 813dcf79a1 Don't intentionally use -1 as an hfindex: while only naughty before, with the
changes from r49644 you'll get complaints about the hf being unregistered...

Note that this code also intentionally passes -1 as an ett_index.  It doesn't
currently complain so I'm leaving it alone for now...

svn path=/trunk/; revision=49648
2013-05-31 02:27:40 +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
Pascal Quantin ec1ebf5dd8 From LI Hai via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8708 :
Add MAC-DATA support to TETRA dissector and other minor improvements

svn path=/trunk/; revision=49567
2013-05-24 20:55:42 +00:00
Anders Broman a68080a1c6 Don't access nbap_dch_chnl_info if the index is > maxNrOfDCHs
svn path=/trunk/; revision=49418
2013-05-19 15:21:33 +00:00
Pascal Quantin 4745ae8689 Revert r49406: it's not ready for prime time yet
svn path=/trunk/; revision=49410
2013-05-18 17:48:50 +00:00
Jörg Mayer 0531d214ad Move kerberos back from broken list to normal list
svn path=/trunk/; revision=49406
2013-05-18 09:25:45 +00:00
Pascal Quantin c080dd0474 More compilation fixes when having HAVE_KERBEROS
svn path=/trunk/; revision=49385
2013-05-17 19:31:44 +00:00
Pascal Quantin c3836c576e Fix link failure with Windows
svn path=/trunk/; revision=49349
2013-05-16 22:23:16 +00:00
Pascal Quantin 67c9aa88c7 Fix compilation for Linux (defined but not used errors, C++ incompatibilities, shadowed variables)
svn path=/trunk/; revision=49344
2013-05-16 21:16:45 +00:00
Pascal Quantin 3f2d89a64f Remove useless blurbs
svn path=/trunk/; revision=49340
2013-05-16 20:09:24 +00:00
Pascal Quantin 0ed32537c0 Remove useless exports and fix a compilation error
svn path=/trunk/; revision=49339
2013-05-16 19:55:16 +00:00
Michael Mann 7efa0fdb29 Updated the Kerberos ASN.1 dissector to the point I believe it can replace the "hand made" one. Bug 8649 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8649)
Letting the more experienced ASN.1 developers tweak it a little more before the "generated" dissector is accepted (which is why it's not included here)

svn path=/trunk/; revision=49328
2013-05-16 12:21:43 +00:00
Anders Broman 5b279569d2 Export CellGlobalIdOrServiceAreaIdOrLAI.
svn path=/trunk/; revision=49312
2013-05-15 16:48:49 +00:00
Anders Broman be8dbe75c5 Upate to spec. 11.0.0
- fix problem with extension dissection.

svn path=/trunk/; revision=49294
2013-05-14 19:00:53 +00:00
Anders Broman 85a8e304dd Add the posibillity to use a key for per-packet-data.
svn path=/trunk/; revision=49259
2013-05-12 18:11:02 +00:00
Jörg Mayer 59417deed4 I added EXPORT_FILES in too many places, remove them
(via "copy - modify too little - paste" cycle)

svn path=/trunk/; revision=49255
2013-05-11 22:02:33 +00:00
Jörg Mayer d266d38af0 Now all disectors requiring asn2wrs can be generated using
cmake.

svn path=/trunk/; revision=49254
2013-05-11 20:52:50 +00:00
Jörg Mayer 1c6784b8c5 Correct previous commit:
MCS-PROTOCOL.asn is needed after all, so include it using the correct
path and variable

svn path=/trunk/; revision=49244
2013-05-11 12:39:17 +00:00
Jörg Mayer 694d8d89b4 MCS-PROTOCOL.asn does not exists (in this directory) and does not
seem to be used.

svn path=/trunk/; revision=49243
2013-05-11 12:26:28 +00:00
Jörg Mayer 66eb2bed96 Small cleanups
svn path=/trunk/; revision=49242
2013-05-11 12:16:06 +00:00
Jörg Mayer 303e35a7db pkix1explicit_exp.cnf and pkix1implicit_exp.cnf are stored
in svn, so don't generate them.

svn path=/trunk/; revision=49234
2013-05-10 14:59:02 +00:00
Jörg Mayer b22ed68d8d Some more protocols can be generated via cmake
svn path=/trunk/; revision=49233
2013-05-10 14:55:15 +00:00
Guy Harris fa47c87e30 Distribute the kerberos and x721 subdirectories, even though we don't
build them.

svn path=/trunk/; revision=49224
2013-05-10 02:48:31 +00:00
Jörg Mayer 572d68a33b Small optical change
svn path=/trunk/; revision=49204
2013-05-07 17:52:51 +00:00
Jörg Mayer 5fa9c90ffd Some more
svn path=/trunk/; revision=49203
2013-05-07 16:26:35 +00:00
Jörg Mayer 7a58867626 x721 and kerberos: Use standard Makefile.am
idmp: remove an unused line
tetra, h460: Whitespace changes to be a "standard" Makefile.am
asn1/Makefile.am: don't try to build kerberos and x721 dissectors

svn path=/trunk/; revision=49201
2013-05-07 12:58:27 +00:00
Jörg Mayer 483d9d74ab Small formatting change
svn path=/trunk/; revision=49199
2013-05-07 11:55:50 +00:00
Jörg Mayer 84469a3216 Another hour gone, another set of protocols.
svn path=/trunk/; revision=49198
2013-05-07 11:31:26 +00:00
Jörg Mayer d18b094a55 Another set of asn1 protocols can now be generated with cmake
svn path=/trunk/; revision=49197
2013-05-07 10:50:47 +00:00
Jörg Mayer 369c7b75ee Allow generating some more dissectors with cmake.
svn path=/trunk/; revision=49196
2013-05-07 04:40:37 +00:00
Jörg Mayer 1d5891111e Make exports actaully work
Add ansi_map as first generated file that uses exports (from gsm_map in
  this case).

svn path=/trunk/; revision=49195
2013-05-07 03:59:29 +00:00
Jörg Mayer 5ba458916a Move common code into UseAsn2Wrs.cmake.
Include the new file.
Use the new file.
Add cmake support to rebuild the gsm_map dissector.

svn path=/trunk/; revision=49194
2013-05-07 03:25:49 +00:00
Jörg Mayer 1b6e8300a6 Build the first (and one of the easiest) of 99 asn1 dissectors with
cmake. Just do "make" inside either the asn1 directory to rebuild all
finished dissectors or inside the asn1/HI2Operations to just rebuild
the given dissector.

svn path=/trunk/; revision=49193
2013-05-07 02:02:19 +00:00
Jörg Mayer 243e9c0ba5 Just whitespace changes
svn path=/trunk/; revision=49167
2013-05-05 08:49:18 +00:00
Michael Mann 195e87f3ea Protect a "divide by zero" operation. Bug 7359 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7359). This seems to have been generated through a corrupted UAT file switching between 1.8 and 1.10, but it's a good check to have regardless.
svn path=/trunk/; revision=49128
2013-05-01 23:59:16 +00:00
Guy Harris 1fe16c1d6a Fix warning.
svn path=/trunk/; revision=49118
2013-05-01 21:15:47 +00:00
Michael Mann b787f03df3 Remove some global variables in favor of private_data member of asn1_ctx_t. Bug 7060 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7060). This should (mostly) passify the bug, but it appears like this could be done with a lot more ASN.1 dissectors.
svn path=/trunk/; revision=49117
2013-05-01 20:54:31 +00:00
Anders Broman e9f90d8c42 Make C12.22 work over UDP.
svn path=/trunk/; revision=49104
2013-05-01 08:34:40 +00:00
Evan Huus 5b8a3df249 From me: only sign-extend BER integers if the field is actually signed
From Guy: override two fields in the GOOSE ASN.1 dissector to be unsigned

Together these fix
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8250


svn path=/trunk/; revision=49055
2013-04-26 19:23:36 +00:00
Jörg Mayer 8faa262e90 Stub cmake support for generating the asn1 dissectors.
It doesn't do anything yet, it is just to make svn status
readable again.

svn path=/trunk/; revision=49007
2013-04-23 23:05:33 +00:00
Jörg Mayer 048b751c21 tiny whitespace change
svn path=/trunk/; revision=48993
2013-04-22 23:04:22 +00:00
Pascal Quantin 5312d37e93 Update ASN.1 conformance files with the changes from r48634
svn path=/trunk/; revision=48741
2013-04-04 21:01:27 +00:00
Chris Maynard e08b7c3a38 Fix encoding arg for proto_tree_add_item() and friends.
svn path=/trunk/; revision=48732
2013-04-04 15:33:14 +00:00
Anders Broman a54f786099 Sort LocalCode value string.
svn path=/trunk/; revision=48721
2013-04-03 16:53:53 +00:00
Evan Huus 37600a157b Rename value string (and similar) functions to use a consistent pattern. This
was done using textual search+replace, not anything syntax-aware, so presumably
it got most comments as well (except where there were typos).

Use a consistent coding style, and make proper use of the WS_DLL_* defines.

Group the functions appropriately in the header.

I ended up getting rid of most of the explanatory comments since many of them
duplicated what was in the value_string.c file (and were out of sync with the
recent updates I made to those in r48633). Presumably most of the comments
should be in the .h file not the .c file, but there's enough churn ahead that
it's not worth fixing yet.

Part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8467

svn path=/trunk/; revision=48634
2013-03-29 00:26:23 +00:00
Anders Broman dafdc19d9e -Wmissing-prototypes
svn path=/trunk/; revision=48609
2013-03-28 07:34:13 +00:00
Chris Maynard 186d0c2006 Fix another incorrectly duplicated display filter, this time for hf_gsm_map_etsi_pdp_type_number.
#BACKPORT(1.6,1.8)

svn path=/trunk/; revision=48601
2013-03-27 21:41:56 +00:00
Chris Maynard da30b9eb92 Fix the incorrectly duplicated display filter for hf_gsm_map_dlci.
#BACKPORT(1.6, 1.8)

svn path=/trunk/; revision=48597
2013-03-27 20:44:47 +00:00
Anders Broman a6fbd905a5 Make the oid memeber a const.
svn path=/trunk/; revision=48558
2013-03-26 05:20:55 +00:00
Pascal Quantin 88c0e8e873 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8517 :
Do not tap an unknown Opration Code

svn path=/trunk/; revision=48539
2013-03-24 21:53:53 +00:00
Guy Harris a2414d8909 Don't wire into the reassembly code the notion that reassemblies should
be done on flows from one address to another; reassembly for protocols
running atop TCP should be done on flows from one TCP endpoint to
another.

We do this by:

	adding "reassembly table" as a data structure;

	associating hash tables for both in-progress reassemblies and
	completed reassemblies with that data structure (currently, not
	all reassemblies use the latter; they might keep completed
	reassemblies in the first table);

	having functions to create and destroy keys in that table;

	offering standard routines for doing address-based and
	address-and-port-based flow processing, so that dissectors not
	needing their own specialized flow processing can just use them.

This fixes some mis-reassemblies of NIS YPSERV YPALL responses (where
the second YPALL response is processed as if it were a continuation of
a previous response between different endpoints, even though said
response is already reassembled), and also allows the DCE RPC-specific
stuff to be moved out of epan/reassembly.c into the DCE RPC dissector.

svn path=/trunk/; revision=48491
2013-03-22 23:59:54 +00:00
Anders Broman 2f450cf7c9 Add some of the global codes as asn2wrs handle them now.
svn path=/trunk/; revision=48478
2013-03-22 17:19:46 +00:00
Anders Broman ed88660c9f Make Freephone-Operations parseable.
svn path=/trunk/; revision=48475
2013-03-22 06:43:49 +00:00
Pascal Quantin 8fa2e54773 Fix compilation for Linux
svn path=/trunk/; revision=48464
2013-03-21 21:12:26 +00:00
Pascal Quantin 7b3191e1b1 Upgrade LTE RRC dissector to v11.3.0
svn path=/trunk/; revision=48463
2013-03-21 20:51:19 +00:00
Bill Meier 1f083fd654 From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachments #10423,#10424

svn path=/trunk/; revision=48450
2013-03-21 14:29:58 +00:00
Pascal Quantin e704aaa14b Upgrade RRC dissector to v11.5.0
svn path=/trunk/; revision=48444
2013-03-20 21:15:19 +00:00
Pascal Quantin 52f342685d Upgrade LPP dissector to v11.2.0
svn path=/trunk/; revision=48443
2013-03-20 21:14:25 +00:00
Bill Meier 371d2dc915 From beroset:
remove C++ incompatibilities
 https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416 attachment #10401


svn path=/trunk/; revision=48441
2013-03-20 14:50:20 +00:00
Anders Broman 20c17246d4 svn path=/trunk/; revision=48440 2013-03-20 06:50:56 +00:00
Anders Broman f92bd64966 [-Wmissing-prototypes]
Use explicit casts.

svn path=/trunk/; revision=48439
2013-03-20 05:59:22 +00:00
Anders Broman 7c56677cf9 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48429
2013-03-19 21:22:31 +00:00
Anders Broman a10b98284c From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48412
2013-03-19 04:54:30 +00:00
Anders Broman 84241f46ad From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48399
2013-03-18 20:44:36 +00:00
Alexis La Goutte 55cdb2b45b Fix some Dead Store (Dead assignement/Dead increment) Warning found by Clang
svn path=/trunk/; revision=48374
2013-03-17 19:24:09 +00:00
Anders Broman 3e38475176 From beroset:
remove C++ incompatibilities 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48356
2013-03-17 17:52:26 +00:00
Anders Broman fad318ad44 From beroset:
changed implicit casts to explicit casts and corrected one erroneous cast (from void* to void**)

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48286
2013-03-14 06:26:55 +00:00
Anders Broman d0efafbcb1 From beroset:
remove C++ incompatibilities from UAT_VS_DEF macro and all uses

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8416

svn path=/trunk/; revision=48259
2013-03-12 06:40:13 +00:00
Anders Broman 1b788d4061 Update to V11.5.0 (2012-12).
svn path=/trunk/; revision=48195
2013-03-08 17:55:53 +00:00
Pascal Quantin d915e3c04f Prettify a bit dissection of sr-ProhibitTimer-r9 and drxShortCycleTimer
svn path=/trunk/; revision=48188
2013-03-08 08:19:26 +00:00
Anders Broman 37a86e4de6 Use explicit casts.
svn path=/trunk/; revision=48045
2013-03-04 06:48:36 +00:00
Anders Broman 04ec1e0984 Use explicit casts.
svn path=/trunk/; revision=48043
2013-03-03 21:22:25 +00:00
Anders Broman 9991973c37 Use explicit casts.
svn path=/trunk/; revision=48008
2013-03-02 14:51:04 +00:00
Balint Reczey 27320f87cb Remove asn1/dsp from autotools Makefile system since it lacks distclean target
svn path=/trunk/; revision=47994
2013-03-02 00:35:57 +00:00
Balint Reczey 1ebdb2e521 Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.

svn path=/trunk/; revision=47992
2013-03-01 23:53:11 +00:00
Guy Harris c522bb09c2 The LDAP dissector uses register_frame_end_routine(), so it needs to
include packet-frame.h.

svn path=/trunk/; revision=47928
2013-02-28 00:09:26 +00:00
Pascal Quantin 7fdbff4822 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8378 :
A detailed diagnostic information contains either a SMS-SUBMIT-REPORT or a SMS-DELIVERY-REPORT. Set P2P direction accordingly.

svn path=/trunk/; revision=47927
2013-02-27 23:08:17 +00:00
Guy Harris 53fffe0414 Get rid of unnecessary includes of "packet-frame.h".
svn path=/trunk/; revision=47925
2013-02-27 23:02:18 +00:00
Guy Harris 6b629c4d92 Move show_exception() and show_reported_bounds_error() to
epan/show_exception.c, as it's used outside
epan/dissectors/packet-frame.c.  Update their callers to include
<epan/show_exception.h> to get their declaration.

Add a CATCH_NONFATAL_ERRORS macro that catches all exceptions that, if
there's more stuff in the packet to dissect after the dissector call
that threw the exception, doesn't mean you shouldn't go ahead and
dissect that stuff.  Use it in all those cases, including ones where
BoundsError was inappropriately being caught (you want those passed up
to the top level, so that the packet is reported as having been cut
short in the capture process).

Add a CATCH_BOUNDS_ERRORS macro that catches all exceptions that
correspond to running past the end of the data for a tvbuff; use it
rather than explicitly catching those exceptions individually, and
rather than just catching all exceptions (the only place that
DissectorError should be caught, for example, is at the top level, so
dissector bugs show up in the protocol tree).

Don't catch and then immediately rethrow exceptions without doing
anything else; just let the exceptions go up to the final catcher.

Use show_exception() to report non-fatal errors, rather than doing it
yourself.
 
If a dissector is called from Lua, catch all non-fatal errors and use
show_exception() to report them rather than catching only
ReportedBoundsError and adding a proto_malformed item.

Don't catch exceptions when constructing a trailer tvbuff in
packet-ieee8023.c - just construct it after the payload has been
dissected, and let whatever exceptions that throws be handled at the top
level.

Avoid some TRY/CATCH/ENDTRY cases by using checks such as
tvb_bytes_exist() before even looking in the tvbuff.

svn path=/trunk/; revision=47924
2013-02-27 22:43:54 +00:00
Michael Mann 8c0d526f58 SNMP dissector should handle aes256 (better version than r47690)
svn path=/trunk/; revision=47902
2013-02-26 11:38:39 +00:00
Bill Meier 96a24cc79f Fix spelling/typos found using a list of commonly misspelled words.
The misspellings were mostly in comments but some were
in text strings visible to the user.


svn path=/trunk/; revision=47899
2013-02-26 04:42:26 +00:00
Bill Meier d449c31d1d its ==> it's & it's ==> its as needed.
svn path=/trunk/; revision=47892
2013-02-26 01:22:18 +00:00
Martin Kaiser 38a73a32f3 include the wsutil/wsgcrypt.h instead of including gcrypt.h directly
svn path=/trunk/; revision=47802
2013-02-21 18:23:29 +00:00
Guy Harris c5f0b68669 And one more case where tvb_new_subset_remaining() is appropriate.
svn path=/trunk/; revision=47760
2013-02-20 01:38:58 +00:00
Guy Harris 021069a56b Clean up white space - get rid of 4-space tabs.
Reformat the hf[] array to be consistent, and get rid of some bogus
blurbs (probably copy-and-pasteos).

svn path=/trunk/; revision=47759
2013-02-20 01:37:08 +00:00
Guy Harris 29715ccc8f How can I get a new tvbuff that starts at an offset within a given
tvbuff and runs to the end of the tvbuff?  Let me count the ways....

Replace a bunch of different ways of doing that (some incorrect, in that
they're not properly handling tvbuffs where the captured and reported
lengths are different) with tvb_new_subset_remaining().

svn path=/trunk/; revision=47751
2013-02-19 23:17:07 +00:00
Anders Broman 9736ff7cb5 Remove experiment with global code
svn path=/trunk/; revision=47747
2013-02-19 18:53:47 +00:00
Anders Broman fc2b80ac0b Add the remaining asn1 files "CODE global" not handled yet.
svn path=/trunk/; revision=47746
2013-02-19 18:44:06 +00:00
Anders Broman b38062ff8f Dissect more supplementarry services
svn path=/trunk/; revision=47738
2013-02-18 19:34:04 +00:00
Anders Broman 399f019522 Add more ASN1 files.
svn path=/trunk/; revision=47730
2013-02-18 06:26:09 +00:00
Michael Mann fd44f9a339 Remove C++ incompatibilities in c1222 dissector.
Also addresses an implicit cast in the epan/uat.h file

Bug 8342 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8342)

svn path=/trunk/; revision=47721
2013-02-17 22:15:16 +00:00
Guy Harris 61f7b3e031 Squelch some more warnings.
svn path=/trunk/; revision=47717
2013-02-17 20:00:53 +00:00
Guy Harris 947da615c4 Squelch some warnings.
svn path=/trunk/; revision=47716
2013-02-17 19:58:56 +00:00
Anders Broman ad636a9492 Try to fix merge problem.
svn path=/trunk/; revision=47714
2013-02-17 19:35:17 +00:00
Anders Broman 9341c04a12 Add a preferense to the Q.932 dissector wether facility messages should be dissected as QSIG or ETSI.
Add the ISUP Supplementary services dissector.

svn path=/trunk/; revision=47713
2013-02-17 19:28:59 +00:00
Guy Harris 1e389e91c1 Give it an RCS ID.
svn path=/trunk/; revision=47710
2013-02-17 19:08:12 +00:00
Guy Harris 4e16c03bd1 Get rid of trailing CRs, set the usual svn properties to expand $Id$ and
use native line endings.

svn path=/trunk/; revision=47709
2013-02-17 19:07:27 +00:00
Anders Broman f942b5e12a Add isdn-sup to the asn1 makefiles.
svn path=/trunk/; revision=47707
2013-02-17 18:32:35 +00:00
Anders Broman 7a60d0d9eb Add the files for an initial ISDN Supplimentary Services(ETSI) dissector.
svn path=/trunk/; revision=47706
2013-02-17 18:27:04 +00:00
Pascal Quantin 9dc510fc8e Fix typo error
svn path=/trunk/; revision=47693
2013-02-16 13:55:10 +00:00
Michael Mann 46dbc91896 Add decryption algorithm preference to SNMP dissector.
Bug 8328 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8328)

svn path=/trunk/; revision=47690
2013-02-16 02:10:50 +00:00
Pascal Quantin 203e7e0301 Factorize FGI dissection
svn path=/trunk/; revision=47654
2013-02-14 10:09:46 +00:00
Anders Broman e5556e29ce Export TBCD-STRING.
svn path=/trunk/; revision=47496
2013-02-05 15:12:13 +00:00
Bill Meier 8ef31f222e Hack: disguise '/*' in text strings to prevent checkAPIs & etc seeing 'start of comment' within a text string.
svn path=/trunk/; revision=47446
2013-02-02 14:20:15 +00:00
Pascal Quantin 98c1748e12 Add SIB type to info column
svn path=/trunk/; revision=47394
2013-01-31 20:08:38 +00:00
Anders Broman 4a8f124c43 Add an OID translation.
svn path=/trunk/; revision=47386
2013-01-31 16:59:39 +00:00
Michael Mann 8ad4ccb850 Allow SNMP user table entry to be re-editted even if engineID/Username remains the same.
Bug 2426 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=2426)

svn path=/trunk/; revision=47328
2013-01-28 21:08:14 +00:00
Pascal Quantin df466c5940 Remove duplicate include file
svn path=/trunk/; revision=47275
2013-01-25 18:37:00 +00:00
Pascal Quantin fd659d2b4a Fix dissection of ETWS/CMAS messages
svn path=/trunk/; revision=47274
2013-01-25 18:33:07 +00:00
Pascal Quantin eaf731ccad Remove non ASCII character
svn path=/trunk/; revision=47273
2013-01-25 16:50:05 +00:00
Anders Broman ce6025b059 Dissect Broadcast-Message-Content correctly.
svn path=/trunk/; revision=47272
2013-01-25 15:29:19 +00:00
Tomas Kukosa 5d3ff466da Fix H.460.9 numbers of parameters
svn path=/trunk/; revision=47256
2013-01-24 11:54:18 +00:00
Tomas Kukosa d19cde439e Fix H.460.x calling from H.225 - content decoding
svn path=/trunk/; revision=47253
2013-01-24 10:11:02 +00:00
Anders Broman 5bd9f6aa9d Add sGSNPLMNIDChange
svn path=/trunk/; revision=47250
2013-01-24 09:53:57 +00:00
Jeff Morriss ce5adea80a Try making dataCodingScheme a guint32 to quiet the MacOS buildbots.
svn path=/trunk/; revision=47244
2013-01-24 02:28:12 +00:00
Pascal Quantin 9cf7642d19 Allow dissection of several segmented warning messages in parallel
svn path=/trunk/; revision=47236
2013-01-23 21:55:07 +00:00
Anders Broman b7548f11bd Update to 3GPP TS 25.419 V11.0.0 (2012-09) no change in asn1.
svn path=/trunk/; revision=47192
2013-01-21 07:09:13 +00:00
Pascal Quantin 1a182e2a79 Dissect ETWS and CMAS notifications
svn path=/trunk/; revision=47177
2013-01-20 17:14:24 +00:00
Graham Bloice cf4fcaa8b6 snmp dissector did not correctly set length of pdu's of more than 127 bytes. The dissector assumed the ber identifier and length fields were always 2 bytes long, so a pdu length of more than 127 bytes, which requires more than 1 length octet, was incorrectly dissected.
svn path=/trunk/; revision=47173
2013-01-20 10:01:34 +00:00
Evan Huus 518eee193b Use epan-scoped memory to clean up another 1Kb+ of valgrind
sorta-false-positive leaks.

svn path=/trunk/; revision=47170
2013-01-19 20:14:42 +00:00
Jaap Keuter f177deead0 Fix for CID 280252.
We can be sure we've at least 0 bytes remaining in the TVB.

svn path=/trunk/; revision=47162
2013-01-19 13:06:26 +00:00
Jeff Morriss 1a93ee3345 Based on http://ask.wireshark.org/questions/17661/tcap-decoding-bug :
Register the Camel dissector for SSN 146 instead of (GSM MAP's) SSN 6-9.
Looks like the 6-9 list was a carryover from when this dissector was created
based on the GSM MAP dissector.

svn path=/trunk/; revision=47097
2013-01-15 16:44:02 +00:00
Pascal Quantin d3e4d6c972 Upgrade RRC dissector to v11.4.0
svn path=/trunk/; revision=47041
2013-01-11 23:25:30 +00:00
Pascal Quantin 1ca9d5c2b3 Upgrade LPP dissector to v11.1.0 and modify extract_asn1_from_spec.pl to automatically get ASN.1 from spec
svn path=/trunk/; revision=47034
2013-01-11 19:31:15 +00:00
Anders Broman 614441f9e5 #if 0 out unused code
svn path=/trunk/; revision=47017
2013-01-10 12:42:07 +00:00
Anders Broman 84a8c1d83a From an.huang:
(1) support for optional attribute in Sample Value:
    datSet    (0x81), 
    refrTm    (0x84), 
    smpRate   (0x86),
    smpMod    (0x88). New attribute in 9-2 Ed2
(2) Data (0x87) decoded as PhsMeas in 9-2 LE(Lite Edition) recommemdation is removed, now the data is decoded as simply OctString, just as 9-2, further details should refer to the data set definition and Table 14 in Ed1 / Table 15 in Ed2  Encoding for the basic data types;

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5696

svn path=/trunk/; revision=47016
2013-01-10 12:13:16 +00:00
Pascal Quantin c872b1258c Dissect CDMA2000 system time
svn path=/trunk/; revision=47001
2013-01-08 22:29:38 +00:00
Pascal Quantin ca189246fe Upgrade LTE RRC dissector to v11.2.0
svn path=/trunk/; revision=46959
2013-01-06 09:56:24 +00:00
Guy Harris 1cd57ad3c5 bytestring_to_str() now returns a const char *; assign its result to a
const char *, not a char *.

svn path=/trunk/; revision=46769
2012-12-26 10:54:03 +00:00
Guy Harris 8ed7a73e22 Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.

Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().

Change some data types to avoid those implicit conversion warnings.

When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.

Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers.  Cast
away those warnings in some cases where an API we don't control forces
us to do so.

Enable a bunch of additional warnings by default.  Note why at least
some of the other warnings aren't enabled.

randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.

If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.

svn path=/trunk/; revision=46748
2012-12-26 05:57:06 +00:00
Guy Harris 954b90418a Squelch a qualifier-discard warning.
svn path=/trunk/; revision=46664
2012-12-21 11:04:10 +00:00
Guy Harris 69270d1bea Get rid of unused routines for UDC-type.
svn path=/trunk/; revision=46662
2012-12-21 10:52:29 +00:00
Jeff Morriss 09221f45e4 When copying addresses, also copy the (new) hf field.
Use SET_ADDRESS in some dissectors that weren't using it (so that the hf field
is correctly initialized).

Introduce a COPY_ADDRESS_SHALLOW (which copies an address without copying the
contents of the data field).

svn path=/trunk/; revision=46602
2012-12-18 23:28:38 +00:00
Pascal Quantin e5fc8a400e Fix what seems to be a typo error
svn path=/trunk/; revision=46528
2012-12-13 17:57:37 +00:00
Pascal Quantin 53edadd49b From John Batty via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8087 :
H.248 MEGACO PkgName property is poorly formatted

svn path=/trunk/; revision=46526
2012-12-13 14:24:44 +00:00
Stig Bjørlykke f6f46de2ca Moved users table lookup to find_oid_by_pres_ctx_id() so other
dissectors (acse, ros, rtse) can benefit from the configured settings.

svn path=/trunk/; revision=46520
2012-12-12 15:17:36 +00:00
Anders Broman 5c1bc94608 "Fill" a couple of value_string(ext)
svn path=/trunk/; revision=46518
2012-12-12 12:48:12 +00:00
Stig Bjørlykke 38aeb0e1e3 Added deltaRevocationList.
svn path=/trunk/; revision=46438
2012-12-07 11:40:29 +00:00
Bill Meier 52e47754f1 Fix [-Wshadow] warnings.
svn path=/trunk/; revision=46357
2012-12-03 22:27:46 +00:00
Pascal Quantin 91576e1f70 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8023 :
Fix typo in LPPa protocol name

svn path=/trunk/; revision=46300
2012-11-30 08:34:50 +00:00
Jeff Morriss 0266cceef3 Make all enum_val_t's const.
svn path=/trunk/; revision=46292
2012-11-29 20:15:37 +00:00
Pascal Quantin 17781b66bf Add missing OPTIONAL keyword in RRCConnectionRequest message
svn path=/trunk/; revision=46202
2012-11-26 13:21:18 +00:00
Guy Harris e5c2f19eab You can't return from inside a TRY/CATCH/ENDTRY block (see
epan/exceptions.h; it crashes).

Try BER first, including both the test dissection and the check of the
results.  If that fails due to an exception being thrown, or due to the
results not indicating that it's a BER-encoded T.125 packet, try PER, so
that if the BER dissection doesn't work we don't just give up.

Get rid of some _U_s attached to parameters that are, in fact, used.

svn path=/trunk/; revision=46066
2012-11-18 01:39:32 +00:00
Guy Harris 2254dcaa00 In the heuristic T.124 dissector, catch BoundsError and
ReportedBoundsError exceptions when attempting to dissect the first bit
of the packet and, if either is thrown, assume the packet isn't a packet
for what we were trying to dissect, rather than just completely failing.

Return TRUE if the heuristic T.124 dissector recognizes the packet.

Get rid of some _U_s attached to parameters that are, in fact, used.

svn path=/trunk/; revision=46064
2012-11-18 01:32:31 +00:00
Stig Bjørlykke d93bf350b5 Added a try-catch in the heuristics to avoid a false malformed packet
error when having no data (occurs in COTP CR and CC).

svn path=/trunk/; revision=46038
2012-11-16 10:20:36 +00:00
Anders Broman be29436715 If we have an com_context_id entry reuse that.
svn path=/trunk/; revision=46036
2012-11-16 09:41:26 +00:00
Anders Broman ab3111f465 Add and prettify debug info - will regenerate dissector later
svn path=/trunk/; revision=46034
2012-11-15 06:32:35 +00:00
Anders Broman 02287c05d6 Dissable code causing a crash. Add debug printouts and add a few more visited checks.
svn path=/trunk/; revision=46029
2012-11-14 16:46:57 +00:00
Pascal Quantin 8acaffff82 Pacify OSX-10.5 buildbots
svn path=/trunk/; revision=46017
2012-11-13 07:40:23 +00:00
Stig Bjørlykke f267dda0d5 Added attributes from RFC 2798.
svn path=/trunk/; revision=46013
2012-11-12 22:00:53 +00:00
Pascal Quantin 4e96e6c475 Fix detection of H-RNTI when it is given after the DL-TransportChannelType configuration (typically in case of handoverToUTRANCommand)
svn path=/trunk/; revision=46012
2012-11-12 21:39:14 +00:00
Stig Bjørlykke 6a64309b02 Fixed some typos
svn path=/trunk/; revision=46009
2012-11-12 14:09:51 +00:00
Stig Bjørlykke d728699115 Update ACP133 to edition D.
svn path=/trunk/; revision=46008
2012-11-12 13:45:24 +00:00
Pascal Quantin bf4ea56713 Use a subtree for message containers
svn path=/trunk/; revision=45986
2012-11-09 22:04:14 +00:00
Stig Bjørlykke f4ade83844 Only append oid name to parent item once when having RDN as a attribute.
svn path=/trunk/; revision=45965
2012-11-08 08:42:45 +00:00
Pascal Quantin 6d044f3281 Avoid accessing a no more valid tvbuff
svn path=/trunk/; revision=45957
2012-11-07 00:00:57 +00:00
Pascal Quantin d7d1840e67 Fix dissection of NAS security parameters to/from E-UTRA
svn path=/trunk/; revision=45950
2012-11-06 19:33:27 +00:00
Anders Broman 9bdaeafabf Dissect lat. long and Uncertainty-Code.
svn path=/trunk/; revision=45946
2012-11-06 09:22:29 +00:00
Anders Broman 4ceb76265a Dissect the positioning data.
svn path=/trunk/; revision=45932
2012-11-05 16:28:53 +00:00
Anders Broman f88ffd78f3 Use little endian MNC encoding.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7952

svn path=/trunk/; revision=45931
2012-11-05 15:15:54 +00:00
Anders Broman fb46fccec4 From LI Hai:
According to Table 161 in ETSI 392-2 standard, the Class of MS field in
U-LOCATION UPDATE DEMAND in tetra.asn is incorrect. the type of Class of MS
field should be Type 2, not Type 1, and the length should be 24 bits, not
32bits.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7946

svn path=/trunk/; revision=45857
2012-11-01 09:11:06 +00:00
Chris Maynard 6a4eed57f2 To indicate that all bytes in the tvb were consumed, just return tvb_reported_length().
svn path=/trunk/; revision=45775
2012-10-24 19:13:54 +00:00