Commit Graph

2706 Commits

Author SHA1 Message Date
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