Commit Graph

12051 Commits

Author SHA1 Message Date
Anders Broman 3821038f94 From Michael Mann:
I made the following improvements to the Modbus/TCP dissector:

1. Implemented protocol to the latest specification (v1.1b).  See
http://www.modbus.org/specs.php.
2. Upgraded to "tcp_dissect_pdus" instead of having the dissector do it
manually.  This also provides TCP packet reassembly support.
3. Removed support for UDP port 502 because it's not supported by the protocol
specification.  I believe "Decode As..." could be used in its place.
4. Added dissector support for the following function codes:
  a) 8 - Diagnostics
  b) 11 - Event Counter
  c) 12 - Event Log
  d) 43 - Encapsulation Transport (mostly for 43/14)
5. Removed support for function codes not in the protocol specification. None
of them were really being parsed, they just offered a "name" for the function
code.
6. Moved protocol #defines to header file for access from other dissectors.  I
plan to have other dissectors use this, but one patch at a time.
7. Created "modbus" dissector that is accessible to other dissectors.
8. Renamed base "display filter name" to reflect PROTOABBREV.

I removed defines for value_strings, I think it's better to export the vaöue strings if needed.

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

svn path=/trunk/; revision=37539
2011-06-04 15:45:50 +00:00
Anders Broman 82d885013c From Michael Mann:
UATification of vcdu.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5989

svn path=/trunk/; revision=37537
2011-06-04 13:50:38 +00:00
Anders Broman b471c4a807 From Michael Mann:
UATification of isakmp dissector.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5989

svn path=/trunk/; revision=37536
2011-06-04 13:47:19 +00:00
Gerald Combs 051ff221fe From Roland Knall via bug 5977:
Handling of SercosIII if the plugin can not be loaded.

Changed the behaviour - if the SercosIII plugin is not available, the
openSAFETY dissector registers itself for ETHERTYPE_SERCOS. SercosIII
packages can not be dissected anyway in such a case and currently no
other dissector will handle those packages.

The following steps will be taken to display the situation to the user:

The message "SercosIII dissector not available, openSAFETY/SercosIII
native dissection." will be added to the tree. Additionally a similar
warning will be presented on the console during startup of wireshark.

All openSAFETY packages will be dissected, displaying the normal
openSAFETY information.

This will be more transparent for the customer.

svn path=/trunk/; revision=37533
2011-06-03 16:56:09 +00:00
Alexis La Goutte 7f2b76ad4c From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5830
Fix a minor typo about bitmask of a reserved field.

svn path=/trunk/; revision=37530
2011-06-03 06:47:23 +00:00
Guy Harris 41738f3aa8 Add some notes about attributes with a special format.
svn path=/trunk/; revision=37529
2011-06-03 01:26:08 +00:00
Chris Maynard 4541cfe5d8 From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5983:
Use offset instead of fragment_offset for boundary check. 

svn path=/trunk/; revision=37524
2011-06-02 17:12:13 +00:00
Bill Meier ce0d6a52b5 Fix Bug #5984: Infinite loop caused by fcn call arg conversion: guint->guint8
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5984

svn path=/trunk/; revision=37521
2011-06-02 14:22:19 +00:00
Anders Broman a9bbcb4a05 Remove extra space at end of IMSI.
svn path=/trunk/; revision=37519
2011-06-02 11:06:26 +00:00
Jörg Mayer 05befd7537 Add Id to info column. Makes detecting duplicates and
matching answers so much easier.

svn path=/trunk/; revision=37518
2011-06-02 07:59:36 +00:00
Jörg Mayer 99e1b372f0 Commit 37516 broke compilation for me in 3 places (with -Werror):
- get_full_XXX functions are unused in the code
- A case statement which handles only 2 of the many enum elements
  creates another warning promoted to error
- The patch removed usage of a variable but not the variable declaration
  itself.

svn path=/trunk/; revision=37517
2011-06-02 07:46:08 +00:00
Anders Broman d5e45b5cce From Michael Mann:
UATification of ESP

UATification of ESP SA keys.  Some notes:
1. Trimmed a lot of fat removing the code that parsed (and reparsed) ESP SA
keys, since UATs can take care of all that. 
2. There was no validation on the src/dest, so that was carried through (ie
there is still no validation of src/dest fields)
3. Formatting of the source was a little off, so I attempted to fix the
functions I needed to deal with.  I know that's frowned upon, but the braces
were such that I couldn't tell if/else blocks to understand the code.  If
somebody wanted to run an indent program on the file, that would be
appreciated.

Added some casts to make it compile on win64.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1123

svn path=/trunk/; revision=37516
2011-06-02 07:11:26 +00:00
Bill Meier bfa6690f20 Allow filtering on docsis-capability-type field;
Rename docs_cm_... to docsis_cm_cap_....
Do whitespace & indentation cleanup.

svn path=/trunk/; revision=37514
2011-06-02 00:56:41 +00:00
Chris Maynard a02b8fb247 From Michael Chen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5863, with some additional enhancements by me: Add dtls heuristics.
svn path=/trunk/; revision=37511
2011-06-01 18:34:41 +00:00
Stig Bjørlykke e96930f38b Yet another cast to uint.
svn path=/trunk/; revision=37508
2011-06-01 13:58:19 +00:00
Stig Bjørlykke 9334eee893 Corrected usage of uint/pointer conversion.
svn path=/trunk/; revision=37507
2011-06-01 13:57:13 +00:00
Stig Bjørlykke d368f9325b Added support for DMP version 2 and some national variants.
svn path=/trunk/; revision=37506
2011-06-01 13:31:48 +00:00
Alexis La Goutte 96215c08a9 From Mark Phillips via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5830
802.11 Tag WME Qos Info field is not decoded

From me :
* Update from Trunk
* Make item fiterable


svn path=/trunk/; revision=37497
2011-05-31 21:41:43 +00:00
Anders Broman 4c93ff1b8a REmove the check for HAVE_AIRPDCAP
svn path=/trunk/; revision=37494
2011-05-31 21:34:23 +00:00
Guy Harris c681f0434e From Roland Knall: openSAFETY dissector.
svn path=/trunk/; revision=37487
2011-05-31 19:31:45 +00:00
Alexis La Goutte aa966d3186 Enhance Vendor Specific IE (227)
Specifically WPA/WME sub dissector 
* Rework from scratch VS WPA/WME dissector
* Replace proto_tree_add_text/string (ugly hf_ieee80211_tag_interpretation header field...) by proto_tree_add_item
* Make item filterable
* and other stuff...

Based on WMM_Specification_1-1

svn path=/trunk/; revision=37486
2011-05-31 19:30:53 +00:00
Anders Broman b520ff3a1d From Michael Mann:
Dissect DVB-CI host control resource
according to section 8.5.1 of the DVB-CI specification (EN50221). 

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

svn path=/trunk/; revision=37472
2011-05-31 06:01:09 +00:00
Stig Bjørlykke 26ba5d5714 Renamed reassembled snmp bytes buffer to "Reassembled SMTP".
svn path=/trunk/; revision=37470
2011-05-30 12:43:35 +00:00
Anders Broman ccd2833ad8 From Michael Mann:
UATification of 802.11 decryption keys.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=1123

svn path=/trunk/; revision=37468
2011-05-30 06:10:25 +00:00
Alexis La Goutte 144a684bd4 Add some comments about RSN IE
Fix some Clang Warnings

svn path=/trunk/; revision=37460
2011-05-29 13:04:06 +00:00
Alexis La Goutte cf3a4ec432 Don't return offset when it is the end of Extended Capability IE (Only use break)
svn path=/trunk/; revision=37459
2011-05-29 12:51:10 +00:00
Alexis La Goutte b89d2d8f42 Fix a wrong length when there is unknown Atheros IE Data
svn path=/trunk/; revision=37458
2011-05-29 12:16:53 +00:00
Anders Broman 3c0b5a41fe From Martin Kaiser:
allows filtering
of the event in the pseudo header and removes the pointless filter for
version_number+current_next_indicator.

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

svn path=/trunk/; revision=37456
2011-05-29 06:59:54 +00:00
Anders Broman 06e2b1ae51 From Martin Kaiser:
DVB-CI dissector: exception in close_session_request apdus (wrong offset)

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

svn path=/trunk/; revision=37455
2011-05-29 06:43:27 +00:00
Anders Broman 62c7cdacea From Martin Kaiser:
checks the address of the Configuration
Option Register that is used for switching a PC-Card in DVB-CI mode.

The address must be <= 0xffe..

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

svn path=/trunk/; revision=37454
2011-05-29 06:34:05 +00:00
Anders Broman bb31fde9fe From Martin Kaiser:
implements the DVB-CI date-time resource
according to section 8.5.2 of the DVB-CI specification (EN50221).

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

svn path=/trunk/; revision=37453
2011-05-29 06:29:48 +00:00
Anders Broman 1a768b36b4 - Added new SignatureIdentity values.
From Marc Petit-Huguenin:
- Removed directResponseForwarding.
- The certificate_type enum is now defined as RFC 6091's CertificateType
  so moved the definition to packet-ssl-utils.[ch].
- Fixed invalid values for CERTIFICATE_BY_NODE and CERTIFICATE_BY_USER
  Kinds.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5967

svn path=/trunk/; revision=37452
2011-05-29 06:16:19 +00:00
Anders Broman ed1bfad981 From Pascal Quantin:
Update 3GPP NAS MS Radio Access Capability dissection to Release 9.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5970

From me change all enc type to ENC_BIG_ENDIAN.

svn path=/trunk/; revision=37451
2011-05-29 06:06:22 +00:00
Sake Blok ba086053c7 Add "File -> Export -> SSL Session Keys..." to be able to save the keyring info for each session in the trace file. This makes it possible to give someone the trace and the exported keys so that they can decrypt the traffic in the trace, but not new sessions to the same server.
(See also: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3444)


svn path=/trunk/; revision=37446
2011-05-28 18:17:50 +00:00
Chris Maynard 521b65f257 From Martin Kaiser via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5959
Use _U_ for unused function parameter.

svn path=/trunk/; revision=37442
2011-05-27 18:18:28 +00:00
Chris Maynard 0a3319cbc6 Use a non-volatile temporary variable as a parameter to DISSECTOR_ASSERT().
This avoids an "assert with side effects" warning and resolves Coverity CID322.

svn path=/trunk/; revision=37441
2011-05-27 18:08:46 +00:00
Bill Meier e3dff872d0 Put proto_reg_handoff_...() at the end of the file as per the usual Wireshark convention.
svn path=/trunk/; revision=37440
2011-05-27 15:51:21 +00:00
Chris Maynard 955008c4b0 When parsing OPTION_REMOTE_ID, don't modify optlen or we'll return the wrong
number of bytes consumed.
Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5962

svn path=/trunk/; revision=37439
2011-05-27 14:38:42 +00:00
Bill Meier 8ad97b46ca Fix a gcc 4.6 error: "variable might be clobbered by 'longjmp' or 'vfork' [-Werror=clobbered]"
svn path=/trunk/; revision=37438
2011-05-27 13:23:54 +00:00
Stig Bjørlykke 0b154761fa One more still dirty.
svn path=/trunk/; revision=37436
2011-05-27 12:46:35 +00:00
Stig Bjørlykke 8a8ff7f03d Moved nbap and pcap back as dirty dissectors.
svn path=/trunk/; revision=37434
2011-05-27 11:58:47 +00:00
Stig Bjørlykke 51864807b3 Corrected "old-style function definition".
svn path=/trunk/; revision=37433
2011-05-27 11:03:04 +00:00
Stig Bjørlykke 21432aa5b0 Try building some ASN.1 dissectors as clean.
svn path=/trunk/; revision=37432
2011-05-27 10:52:25 +00:00
Stig Bjørlykke 7b5896a179 Corrected "old-style function definition".
svn path=/trunk/; revision=37429
2011-05-27 10:18:17 +00:00
Jaap Keuter 8e30d1990e From Colin O'Flynn:
Avoid processing tvb when fragment dissection didn't create one.

svn path=/trunk/; revision=37426
2011-05-27 07:02:26 +00:00
Jeff Morriss f3f9f2697f Make TVBs opaque for most users.
Convert TVB_RAW_OFFSET() and TVB_GET_DS_TVB() into functions.

svn path=/trunk/; revision=37422
2011-05-27 03:06:50 +00:00
Jeff Morriss 7ad71a2d78 Treat TVBs as opaque: use the accessor functions instead of accessing the fields
directly.

svn path=/trunk/; revision=37420
2011-05-27 01:57:33 +00:00
Jeff Morriss 8ce306faa0 Inspired by one of the changes from r37406 and bug 2794: detect hf abbreviations
with two or more periods in a row.  Fix one case of that.

svn path=/trunk/; revision=37407
2011-05-26 13:32:04 +00:00
Anders Broman 6a4ed4f4c3 From Michael Mann.
Part of "display filters with redundancies of PROTABBREV in them."
The ones left outs should be fixed differently I think.
Rename som ndps hf variables while at it.

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

svn path=/trunk/; revision=37406
2011-05-26 06:32:51 +00:00
Jeff Morriss b2120849b1 From Michael Mann via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5749 :
Added support for the following services of the Connection Manager object:
LargeForwardOpen
GetConnectionOwner

Added support for the following services of the Connection Configuration
Object:
GetAttributeAll
SetAttributeAll

From me:
Replace tabs with spaces; adjust modelines for 8-space tabs instead of 3.

svn path=/trunk/; revision=37404
2011-05-26 02:20:23 +00:00