Commit Graph

12075 Commits

Author SHA1 Message Date
Jakub Zawadzki a723874490 - Replace jpeg_jfif decoder, with more generic mime_file (no more 64KB limit!).
- Add new dissector packet-mime-encap which understands mime_file fragmentation.

svn path=/trunk/; revision=37636
2011-06-09 21:21:06 +00:00
Alexis La Goutte 08dcc37848 From Colin O'Flynn via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5980
Add draft-ietf-6man-rpl-routing-header-03 Support (RH4 RPL Routing Header)

From me :
* Display Bytes of Address and Full Address (Generated)
* Fix some Whitespace and minor enhance...




svn path=/trunk/; revision=37632
2011-06-09 18:02:13 +00:00
Gerald Combs 0abba34b6a Only count an ACK if it's part of an existing conversation, otherwise we
get a lot of false positives.

svn path=/trunk/; revision=37631
2011-06-09 17:30:13 +00:00
Alexis La Goutte 5bcc2dc2f7 * Add Keep Going bit flag in insert command
* Replace tab by space

svn path=/trunk/; revision=37624
2011-06-08 18:26:50 +00:00
Martin Mathieson 5d78458e4b Fix a typo (spotted by Pascal Quantin).
svn path=/trunk/; revision=37622
2011-06-08 17:10:40 +00:00
Anders Broman 30a3988111 Move the warning "...SercosIII heuristic dissector cannot be registered.." to the handoff routine as sercosIII most probably will
not have registered it's name when opensafty's register routine is executed e.g the warning will always be printed.

svn path=/trunk/; revision=37615
2011-06-08 12:02:38 +00:00
Anders Broman afb0e8b434 From Michael Mann:
Make interlink built-in dissector (from plugin).
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6005

svn path=/trunk/; revision=37610
2011-06-08 05:20:43 +00:00
Bill Meier 6399940fd8 From Daniel Willmann: Lontalk protocol (EIA-709.1)
Attached is a dissector for the Lontalk protocol (EIA-709.1). This dissector
registers as a subdissector of the CN/IP protocol.

Some code (mostly definitions) were taken from Bug #2252
(http://bugs.wireshark.org/bugzilla/attachment.cgi?id=4562)

From me: minor mostly cosmetic changes.

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


svn path=/trunk/; revision=37599
2011-06-07 21:10:44 +00:00
Anders Broman d8e1b0d3d5 Move packet-sercosiii.c to be a builtin dissector.
svn path=/trunk/; revision=37597
2011-06-07 20:33:26 +00:00
Bill Meier c8475f0b89 From Daniel Willmann: dissector for EIA-852 protocol (Component Network over IP)
Attached is a dissector for CN/IP protocol described in EIA-852. It is mainly
used to encapsulate and send Lontalk (EIA-709.1) or EIA-600 frames over UDP (or
TCP).

This dissector can only decode the common header and data frames can be decoded
by further dissectors.

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


svn path=/trunk/; revision=37596
2011-06-07 18:56:24 +00:00
Anders Broman fba66f7f7b Delete no longer used .h file
svn path=/trunk/; revision=37590
2011-06-07 14:16:40 +00:00
Graham Bloice 13743add73 Added code to distinguish conversations between different RTUs that happen to use the same address\port pair.
Based on patch supplied by Kelvin Proctor.

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

svn path=/trunk/; revision=37584
2011-06-06 22:32:37 +00:00
Anders Broman 318e86e2d7 From Pascal Quantin:
Add the following enhancements to the UMTS RLC dissector
(as specified in 3GPP 25.322 v9.2.0):
- UDP framing protocol to allow dissection of RLC PDUs over UDP (like what is
done for LTE MAC/RLC/PDCP protocols)
- 15 bits Length Indicator support (both with variable and fixed LI size)
- Poll type SUFI
- enhanced dissection of LIST, Relative List and Bitmap SUFI
- dissection of Reset and Reset Ack Control PDU
- an option to decode RLC headers only
- an option to skip SDU reassembly

svn path=/trunk/; revision=37576
2011-06-06 20:01:53 +00:00
Stephen Fisher af0e8c25d0 Fix Unix compilation error...
packet-3g-a11.c:135: warning: 'hf_a11_fqi_granted_qos' defined but not used

... by removing definition


svn path=/trunk/; revision=37575
2011-06-06 19:49:31 +00:00
Anders Broman c56d401c35 On behalf of Ericsson - enhance A11 dissection.
svn path=/trunk/; revision=37573
2011-06-06 19:17:32 +00:00
Martin Mathieson b3cbce492a Warn if there are > 2 padding subheaders at the beginning of a frame.
svn path=/trunk/; revision=37570
2011-06-06 16:07:09 +00:00
Anders Broman 5bb09a0c10 From Roland Knall:
Modbus/TCP: Calculating the drop-out criteria for special data dissection fails.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5997

svn path=/trunk/; revision=37566
2011-06-06 10:32:19 +00:00
Martin Mathieson 4295086a6f Avoid no-newline-at-end-of-file warning.
svn path=/trunk/; revision=37565
2011-06-06 09:40:30 +00:00
Anders Broman 2477298026 From Sean Van Gorder:
When Wireshark attempts to read an SNMP packet with a variable-bindings item
with an OID containing an index string which includes an entry of type
"Unsigned32", Wireshark will stop dissecting the packet at this index entry and
end with the error:

[Dissector bug, protocol SNMP: proto.c:2761: failed assertion
"DISSECTOR_ASSERT_NOT_REACHED"]

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

svn path=/trunk/; revision=37558
2011-06-05 20:12:44 +00:00
Anders Broman 70f488cea7 From Ivan Kluchnikov:
GSMTAP carries payload in various formats of WiMAX interfaces.
It uses the wimax plugin to decode the WiMAX bursts.

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

svn path=/trunk/; revision=37557
2011-06-05 19:58:02 +00:00
Anders Broman 7cd35baaaf From Aamer Akhter:
This patch adds support for a number of performance related metric in NetFlow.

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

svn path=/trunk/; revision=37556
2011-06-05 19:45:22 +00:00
Guy Harris 0082437631 Clean up indentation.
svn path=/trunk/; revision=37547
2011-06-05 02:48:03 +00:00
Anders Broman 7b75e66774 Try to pacify the OSX build bot.
svn path=/trunk/; revision=37542
2011-06-04 20:14:06 +00:00
Anders Broman a8a69c6111 Try to fix part of the build bot errors.
svn path=/trunk/; revision=37541
2011-06-04 19:17:28 +00:00
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