aboutsummaryrefslogtreecommitdiffstats
path: root/epan
AgeCommit message (Collapse)AuthorFilesLines
2014-02-02QUIC dissector : Update from last Design Document and Specification (12/2/2013)Alexis La Goutte1-31/+31
Changed “GUID” to “CID” (Connection Identifier), as the original term carried common meaning and baggage that was not intended Change-Id: I04986331aee33be237dab6963c0ff39accf507cd Reviewed-on: https://code.wireshark.org/review/81 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-02Fix dissector exception when GUID is empty in flagsPeter Wu1-2/+4
When the GUID (CID or Connection Identifier in a more recent spec) field in Public Flags is 0, a zero-length item would be added. This trivial patch prevents a dissector exception by checking the length first. Change-Id: Idf6d970bc1b0b3f1a8e47618a8759f6a0cd54c65 Reviewed-on: https://code.wireshark.org/review/78 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-02dissector for HDMI (High-Definition Multimedia Interface)Martin Kaiser6-56/+325
messages on the Data Display Channel (DDC) this dissector is available as an option for I2C messages it handles EDID messages (Extended Display Identification Data) and passes HDCP messages on to the HDCP dissector Change-Id: Ia8d8e73c36e2a1ad560b911dd4c1c9f34997b5c2 Reviewed-on: https://code.wireshark.org/review/63 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-02-02[Automatic manuf, services and enterprise-numbers update for 2014-02-02]Gerald Combs1-6/+174
Change-Id: Iad6b1cf37ab39a48ef42fe957724daa4c80ef094 Reviewed-on: https://code.wireshark.org/review/75 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-01-31packet-iwarp-mpa: give more information if the ULPDU length doesn't matchStefan Metzmacher1-2/+2
Try to dissect even it the size is not as expected. Windows doesn't use alignment for smb-direct. Change-Id: I66c465d331aaab5caf28385a6dd3a43b63af2208 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/56 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-01-31remove some of the unnecessary if(tree) checksMartin Kaiser1-52/+39
Change-Id: Ie1b684327a77c265188d916c1242d335c55aa8cb Reviewed-on: https://code.wireshark.org/review/65 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-01-31TABs -> spacesMartin Kaiser1-705/+716
add editor modelines Change-Id: I5433e0d41a30043264a0f60c2166de471c80745c Reviewed-on: https://code.wireshark.org/review/64 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-01-31packet-iwarp-ddp-rdmap: make it possible to register "iwarp_ddp_rdmap" ↵Stefan Metzmacher1-2/+16
payload dissectors Change-Id: I4621cda936cb54c70de7e294cc760b9baff38961 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/54 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-01-31Revert "In get_unicode_or_ascii_string(), check if the length is odd/even, ↵Stefan Metzmacher1-1/+1
not the offset. Fixes https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778 - Volume label field ... is not displayed correctly ..." This is wrong it breaks all sort of things. The "Volume label field" is a special case, which can be fixed by using nopad=TRUE. Change-Id: I3cd3f30ff0076d5e31a735391b175fd68e5fa142 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/26 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-01-31packet-smb.c: real fix for ↵Stefan Metzmacher1-2/+2
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=5778 Change-Id: I33308c44791b487844f23db07d152897380d7cf1 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/25 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-01-31Fix for Bug-9711 Lua: the Lua stack is growing slightly during initialization.Hadriel Kaplan11-28/+38
Change-Id: I689319c0071fdb42583e8bd7633d8f0660c92f1b Reviewed-on: https://code.wireshark.org/review/51 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org> Tested-by: Stig Bjørlykke <stig@bjorlykke.org>
2014-01-31Enhance / Update ICMPv6 dissectorAlexis La Goutte1-12/+15
* Update to the last IANA icmpv6-parameters (2014-01-30) * Update to final draft (for RFC 6743 and RFC 6775) * Add RFC 7112 (Implications of Oversized IPv6 Header Chains) support (Add new Parameter Problem code) * Fix a encoding arg Change-Id: I90f65dfc54e5c0aff21a0e7ec2c937304aced02d Reviewed-on: https://code.wireshark.org/review/62 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: Id7bab3a69514f159eda8d1285ca7f8f2d42e34ad Reviewed-on: https://code.wireshark.org/review/61 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I695824b95f5e8978c2b58c4e98471d1ed204d686 Reviewed-on: https://code.wireshark.org/review/60 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31packet-smb2: dissect SMBDirect Buffer DescriptorsStefan Metzmacher1-15/+110
Change-Id: Ie91c19078a92f36044b4eee55c3228e3257bf45d Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/53 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-01-31Fix for Bug-9712 Lua: changes to WTAP_FILE_ #define names prevents them ↵Hadriel Kaplan1-2/+2
being in init.lua Change-Id: I0a2ccd686a89ffbc918a7b8b6af4a0ba8a5ab097 Reviewed-on: https://code.wireshark.org/review/52 Reviewed-by: Gilbert Ramirez <gram@alumni.rice.edu> Tested-by: Gilbert Ramirez <gram@alumni.rice.edu>
2014-01-30Add remove_last_data_source and fix bug 9169Evan Huus3-0/+18
The OP asked 9169 to be reopened because the capture was spewing ~40GB of output when dissected with tshark. Investigation showed this was because the HTTP dissector was requesting ONE_MORE_PACKET reassembly a lot, and TCP was adding each step as a data-source which was being printed by tshark's hex dump. This was leading to O(n^2) of output. To fix, introduce function remove_last_data_source which removes the most recent data source from the list. If the subdissector in TCP reassembly asks for ONE_MORE_PACKET, assume it hasn't added any tree items (since it shouldn't have) and remove the data source since it is unnecessary. This may break dissectors which add tree items and *then* return ONE_MORE_PACKET, since they will have their data source removed out from under them. I believe those cases should be fixed to not add tree items until they're sure they have enough data. Change-Id: Iff07f959b8b8bd1acda9bff03f7c8684901ba8aa Reviewed-on: https://code.wireshark.org/review/38 Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-01-30IEC60870-5-104: Added decoding of integrated totals without time tag, fixed ↵Jiri Engelthaler1-28/+32
inverted logic of "Overflow" and "Adjusted" bits, some minor code style changes. Change-Id: I76af5eabfd08f312f37547bcc10e3ffe10b17f2a
2014-01-30Merge "openSAFETY: Fixing field / byte assignment"Alexis La Goutte1-5/+5
2014-01-30openSAFETY: Fixing field / byte assignmentRoland Knall1-5/+5
- SNMT messages where presented in a way, where the value of the field was not pointing to the correct bytes where it came from - Sender / Receiver where renamed to be better understandable - SN send to (Receiver) now comes first as it does in the byte stream Change-Id: I364cb248bed9489c0cf9c7bf9fbd37b0225dbd78
2014-01-30Lua: Improved running in build directory.Stig Bjørlykke2-2/+39
Load system init.lua from build-directory/epan/wslua Set Lua datafile_path to source-directory/epan/wslua Made dofile() search in source-directory/epan/wslua Change-Id: I009234eb8193c1ed3260455b245c256c9747930f
2014-01-29replace spaces with a TABMartin Kaiser1-1/+1
Change-Id: I8340b4af524b5c4ffb1a10b0eccd809f1d6b1e9f
2014-01-29Merge "MIME: Rename image dissectors to file dissectors."Martin Kaiser5-11/+10
2014-01-29MIME: Rename image dissectors to file dissectors.Michal Labedzki5-11/+10
Change-Id: Ie160733ceeed23ff96ddccfbf0ca2e7694789ff8
2014-01-29Fix display of right arrow in CSV exportPascal Quantin1-1/+11
Changeset 1d8a895fa4d7c16d213bda50b1177eccbb54326e introduced the use of UTF-8 righ arrow to indicate the direction in TCP dissector. While it displays nicely in Wireshark GUI or in a text export of packets, an export to CSV results in an escaped string. This patch is a naive attempt to display the right arrow in a more friendly way when exporting to CSV. Any smarter fix is welcome. Change-Id: Ife787268696fa69dafc24a5cf9706af4c4832831
2014-01-29Fix for Bug 9707 'Lua: init.lua has multiple 'MENU_STAT_TELEPHONY' values'Hadriel Kaplan1-1/+1
Change-Id: If4ee1906aa60dd37366cf2ef9bc4168e0ea024b6
2014-01-29Merge "Lua: Added a utility function file_exists()."Stig Bjørlykke1-0/+5
2014-01-29packet-smb2: fix lease epoch fieldsStefan Metzmacher1-3/+4
Bug: 9703 Change-Id: I1955360adaee53846f084434c59180d715e19fcd Signed-off-by: Stefan Metzmacher <metze@samba.org>
2014-01-29Merge "smb2: Lease Epoch is only 16 bit"Alexis La Goutte1-3/+12
2014-01-29smb2: Lease Epoch is only 16 bitVolker Lendecke1-3/+12
See [MS-SMB2] 2.2.14.2.12 Bug: 9703 Change-Id: Ia9c9c658bd5020e0dad84fc74617fed60ce7df06 Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-29Merge "smb2: Fix a typo"Alexis La Goutte1-1/+1
2014-01-29Lua: Added a utility function file_exists().Stig Bjørlykke1-0/+5
This function can be used to check for files before calling dofile(), which will fail for non-existing files. Change-Id: Iae7b7ef6d8eb6e0e18f98fee7c740d2a5705eef3
2014-01-29Add newlines at end of files that are missing them.Gilbert Ramirez1-3/+0
gcc 4.1.2 complained with: No newline at end of file Change-Id: I813af88737e725a328713eea4a7096d28942f9b2
2014-01-29smb2: Fix a typoVolker Lendecke1-1/+1
Bug: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9703 Change-Id: I8ebb20a48e1131fcf14ee55e5e1822a8dcd713d2 Signed-off-by: Volker Lendecke <vl@samba.org> Reviewed-by: Stefan Metzmacher <metze@samba.org>
2014-01-28tree variables don't have to be initializedMartin Kaiser1-1/+1
Change-Id: Ic87133b143170d0146cd3a8fb23f8d0b33ec6502
2014-01-28Merge "[Automatic manuf, services and enterprise-numbers update for 2014-01-26]"Gerald Combs1-8/+152
2014-01-28Comment out a lot more hf[] entries and related.Bill Meier1-57/+16
(Found by checkhf). Note: There's quite a large amount of hf[] entries which are commented out. I wonder if there are "top-level" entries missing from the "parse-tree" arrays ? svn path=/trunk/; revision=54990
2014-01-28Comment out unused hf[] entries and related found by checkhf.Bill Meier5-20/+54
svn path=/trunk/; revision=54989
2014-01-28Re-arrange #if 0/#endif related to an hf[] entry so that checkhf doesn't ↵Bill Meier1-2/+5
complain. svn path=/trunk/; revision=54988
2014-01-28From Marko Hrastovec viaEvan Huus1-320/+1160
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9697 Architectural support for multiple version of the same Asterix categories. Includes implementation of CAT064 v.0.17. svn path=/trunk/; revision=54987
2014-01-27Fix hf[] entries with refs to range_string arraysBill Meier1-7/+7
to add missing BASE_RANGE_STRING and to use RVALS instead of VALS. Fixes crashes in 'tshark -G values' and presumably also fixes crashes when used in a dissection. Introduced in SVN #54449. (I suspect that ' convert_proto_tree_add_text.pl' may need some work to handle range_strings). svn path=/trunk/; revision=54984
2014-01-27Fix: value string specified as a BASE_VAL64_STRING inBill Meier1-1/+1
an hf[] entry but defined as a 'value_string' intead of as a 'val64_string'. Caused 'tshark -G values' to crash (and presumably would also cause a crash when the value-string is referenced in a dissection): Introduced in svn #54728 (Note: There's still another 'tshark -G values' crash to to found & fixed) svn path=/trunk/; revision=54983
2014-01-27(Trivial) Fix spellling in a comment.Bill Meier1-1/+1
svn path=/trunk/; revision=54982
2014-01-27From Pavel Moravec via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9612Evan Huus1-8/+20
Fix possibly-uninitialized variable caught by valgrind fuzzing in AMQP. svn path=/trunk/; revision=54981
2014-01-27Add missing cast.Evan Huus1-1/+1
svn path=/trunk/; revision=54980
2014-01-27Revert part of previous changeMartin Mathieson1-2/+1
svn path=/trunk/; revision=54979
2014-01-27Send news of SecurityModeFailure to PDCP dissector, which will attempt to ↵Martin Mathieson3-12/+70
roll back to previous setting svn path=/trunk/; revision=54978
2014-01-27Do not handle BER bitstring as ASCII string, because this will failStig Bjørlykke1-1/+1
when the first bit is set. svn path=/trunk/; revision=54977
2014-01-27Add back the fix from revision 54693.Stig Bjørlykke1-2/+5
svn path=/trunk/; revision=54976
2014-01-27Added back x509af_get_last_algorithm_id() removed in revision 54647 to Stig Bjørlykke4-11/+21
restore usage in cms and pkcs12. They never got a valid value in actx->external.direct_reference because they use another actx in this case. This will add back the global variable in x509af, but this is needed until we manage to pass the value in another way. See comments in bug 9573. svn path=/trunk/; revision=54975