aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
AgeCommit message (Collapse)AuthorFilesLines
2014-03-07packet-smb-direct.c: add support for reassembling of fragmentsStefan Metzmacher1-5/+182
Change-Id: I6b66867774f369fa49c9ee45a6792a6ad4d4c6e2 Signed-off-by: Stefan Metzmacher <metze@samba.org> Reviewed-on: https://code.wireshark.org/review/59 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-07Introduces two new Bluetooth DLTs for RF-based captures.Christopher Kilgour4-16/+620
Adds support for BLUETOOTH_LE_LL_WITH_PHDR, dissector integrates with existing BTLE dissector. Fixes BTLE dissector to correctly extract packet CRC. Adds CRC checking to BTLE dissector. Provides optional context to BTLE dissector that allows RF captures to provide link-layer hints for dissection details. Significantly, parameters for determining CRC correctness are provided, as well as Access Address validity information. Change-Id: I7d4936b053353a7f9c524021c01f67f5828253fb Reviewed-on: https://code.wireshark.org/review/310 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-07Bluetooth: A2DP/VDP: Display SEIDs used in conversationMichal Labedzki1-8/+58
Change-Id: I855ccbee2248cafcc9b1d32245894e2933ca745a Reviewed-on: https://code.wireshark.org/review/474 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-07Bluetooth: AVDTP: Fix trees and distinguish local and remote SEPsMichal Labedzki1-133/+267
When there is more then one interface or adapter then AVDTP dissector incorrectly mixing it data together. Patch extends keys to support multiple interfaces/adapters. Also do little simplification on trees. There are two device, both use SEPs to configuration and it is possible to use the same SEID. SetConfiguration use remote "ACP" SEID and local "INT" SEID, so there is need to distinguish them and please remember then INT SEID types can be unknown in most case. Change-Id: I150f3625f532386a1078deb8d0ac70a1c05c3f04 Reviewed-on: https://code.wireshark.org/review/473 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-07Fix bug 9835 disabled second media stream disables all media streamsHadriel Kaplan2-15/+27
When a single media line is rejected in an SDP answer, for example a second 'm=video' line, wireshark disables ALL media sessions, instead of just that one. But per the RFCs, all it should do is disable just the one RTP media session the m= line represents. This commit fixes that, so that a disabled media session (one with a m= port of 0) in the SDP answer only disables its associated/paired media stream in the offer. Change-Id: I9bd0d3fc88b8eaa55207c9bf3f3e37da7746fd14 Reviewed-on: https://code.wireshark.org/review/526 Reviewed-by: Anders Broman <a.broman58@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-07(Benign) Don't use "address-of" operator on arg of VALS() (not that it makes ↵Bill Meier15-36/+36
any actual difference).. Change-Id: I0766d0f130648aaa5a58d9f4062fa24e898cbdc3 Reviewed-on: https://code.wireshark.org/review/545 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-06Bluetooth: HCI_EVT: Fix empty advertising dataMichal Labedzki1-3/+5
LE Advertising Report with length 0 is valid, so check it before dissecting adverising data. Change-Id: I4937ec2de5d703b05c6e5f5bac7f81d153e49b40 Reviewed-on: https://code.wireshark.org/review/475 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-06add the (not yet official) TLS channel_id extension that's used by ChromeMartin Kaiser2-0/+4
Change-Id: Ib8779b0db790a78fff8bd1970a7240bbd8f49f75 Reviewed-on: https://code.wireshark.org/review/537 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-06Bluetooth: Avoid using find_dissector()Michal Labedzki17-96/+61
Also remove SVN $Id$ lines. Change-Id: I4f2925e6ad8dcfe4a62d879a2cef44447f8ae916 Reviewed-on: https://code.wireshark.org/review/476 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-06fix invalid offset for URI's EMIMartin Kaiser1-1/+1
Change-Id: I397eeed3008d91aeb6c025c9146b9ed6d98881a6 Reviewed-on: https://code.wireshark.org/review/535 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-06Open Sound Control dissector.Hanspeter Portner2-0/+849
Dissector for specification at http://opensoundcontrol.org/spec-1_0. - use value_string - add integer oferflow protection - remove trailing white space - add capture file to bug tracker: Bug 9837 - fix warnings by tools/fix-encodings-args.pl - make use of VALS - dissect MIDI controller messages separately Change-Id: Iab0dc01d4bf1c08eac175b6af1dd07809090c35a Reviewed-on: https://code.wireshark.org/review/454 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-03-06Bluetooth: Make Source/Destination BD_ADDRs and names filterableMichal Labedzki2-136/+149
Source/Destination BD_ADDRs and name are filterable. Also simplify code around wmem trees, and enable commented "data" field in unreassembled case and fix btl2cap offsets (discovered by enabling "data" field). Change-Id: Ic28c9bf19bcd6281b652be538b221da74df4bb76 Reviewed-on: https://code.wireshark.org/review/471 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-06Bluetooth: Fix interface_idMichal Labedzki7-24/+64
Interface ID should correspond to the Wireshark Interface Id to avoid mixing data from various interfaces in dissectors. Change-Id: Ibaa3ddab7f0ebd0985efea74439b94a5881145a7 Reviewed-on: https://code.wireshark.org/review/472 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-06Have NFLOG TLV type and length be in host byte order.Guy Harris1-78/+5
When capturing, they'll be in host byte order. The top of the libpcap trunk and 1.5 branch, when reading a file, will, if necessary, byte-swap the type and length values so that they're in the byte order of the host reading the file (rather than the host that wrote the file). Do the same when we read a file, and have the NFLOG dissector assume host byte order for those fields. Change-Id: I493aed1e07b626af1157d75f3bc293b0a694ad07 Reviewed-on: https://code.wireshark.org/review/148 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-06Ue TFS & VALS macros for certain 'fieldconvert' fields.Bill Meier5-16/+16
Change-Id: I8d7468e62d5de99eb68b554134be71b17d1b87c8 Reviewed-on: https://code.wireshark.org/review/525 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-05Fix some code remove by 296591399f90a9d89be958d91047aa724a77ee6dAlexis La Goutte18-1/+19
(Copyright or info about file...) Change-Id: I90ba8b1c3ec8406b0c3365a69a8555837fc4bbb1 Reviewed-on: https://code.wireshark.org/review/515 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-05Don't truncate the options field.Guy Harris1-51/+47
Create a placeholder protocol tree item under which to put the options, do the analysis of fields from the fixed-length portion of the TCP header (such as sequence numbers), and then do a straightforward dissection of the options, throwing an exception if we run past the end of the options field. This is a bit simpler, and doesn't add confusing notes about truncation of the options. XXX - we're currently not including selective acknowledgments in any of the SEQ/ACK analysis; should we? That means, of course, that we have to dissect the options before doing that analysis, and if the options were cut short by slicing, you lose.... Change-Id: I425a6c83f26512b802267f76739cbf40121b3040 Reviewed-on: https://code.wireshark.org/review/511 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-04Fix compilation broken by g2965913Pascal Quantin2-2/+4
Change-Id: I5af8c0ae049bb3d2caed04bd3229c11a81f7b5b9 Reviewed-on: https://code.wireshark.org/review/501 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte1356-2712/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-04When dissecting GSM MAPv1/v2 messages, display opcode 44 or 46 as forwardSMPascal Quantin1-52/+56
Fixes bug 9829 Change-Id: Ib56bc7dc79ca27667fb89691817f6e568006d3a8 Reviewed-on: https://code.wireshark.org/review/494 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-03Show ymsg.content as bytes; it's not a simple string.Guy Harris1-3/+3
The content of a YMSG message is a sequence of lines, each one of which contains a text string (in some ASCII-based encoding) for a key, a 0xc080 separator, and a text string (in some ASCII-based encoding) for a value. That's not a string in any ASCII-based encoding I know of - 0xc0 0x80 is not, for example, a valid UTF-8 sequence (it's a too-long sequence for NUL). This should fix bug 9832: https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9832 by avoiding the general "GTK+ on Windows crashes when asked to copy something that's not valid UTF-8" problem. Fix some field descriptions while we're at it. Change-Id: I4084dabc89b0186ecd1a7329452ca2f1cb48f1c0 Reviewed-on: https://code.wireshark.org/review/488 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-03-03Create/use extended value_strings; add editor modelines as needed.Bill Meier5-255/+336
Change-Id: I36ebee937ddd1c5ccbfa36f284a4794bc63631dc Reviewed-on: https://code.wireshark.org/review/482 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03Move value_string defs from .h file; create/use extended value_string; Other ↵Bill Meier3-303/+324
minor changes. - Multiple value string arrays were defined in packet-fcels.h (which was included in two differnt .c files). Only one of the arrays was actually used in two different .c files. All the value_string arrays (and most of the #defines) moved to packet-fcels.c. - Other: Use -1 instead of tvb_length() for the length param of several proto_tree_add...() calls. Add editor modelines. Change-Id: Idc642caf1c8d62b658147a234d5560b8f2fd0630 Reviewed-on: https://code.wireshark.org/review/479 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03Create/use an extended value-string; Move value-string array from .h file; ↵Bill Meier2-268/+283
Do other misc. - Value string arrrays should never be defined in a .h file (especially one included in multiple .c files). So: a. The value_string array (and associated #defines) was moved from the .h file to packet-rtp_events.c b. A public extended value_string was created in packet-rtp_events.c and declared as external in packet-rtp_events.h - Other: Remove a few unneeded initializers; Add editor modelines. Change-Id: Ib580c3e50ab5ce79484c9c6af57f62ca604b57d1 Reviewed-on: https://code.wireshark.org/review/468 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03Create/use several extended value-strings; Do several other small changes.Bill Meier1-26/+40
- Move setting COL_PROTO & clearing COL_INFO to before a tvb fetch which could cause an exception; - Remove some unneeded initializers; - Fix up some long-lines and whitespace; - Use a consistent indentation; - Add editor modelines. Change-Id: I8a8015a65d5dc581ed02cbd134231481b9f96263 Reviewed-on: https://code.wireshark.org/review/467 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03Create/use an extended value_string; Do other misc minor changes.Bill Meier1-235/+249
- Localize some vars; - Use a consisten 4-space indentation & whitespace style; - Add editor modelines; Change-Id: I0d6270eea3fae804788a56557d3c7e171afa8aaa Reviewed-on: https://code.wireshark.org/review/466 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-03SSL: dynamically allocate session ticket storage area to avoid buffer overflowPascal Quantin3-2/+5
Fixes bug 9825 Change-Id: I20ae65331ec11b2f6774054df4c026fd5fa76d3a Reviewed-on: https://code.wireshark.org/review/447 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-03show if the current service is scrambled or freeMartin Kaiser1-2/+13
Change-Id: I9e50920fbc09fdf0650be3a63fee8153ce0fd3df Reviewed-on: https://code.wireshark.org/review/462 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03add cleartext values for retention limitMartin Kaiser1-4/+19
Change-Id: I8ecfdb1c366310d224660e89c99136a0a9f4a067 Reviewed-on: https://code.wireshark.org/review/461 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03move URI dissection to a separate functionMartin Kaiser1-29/+49
Change-Id: Ia1db91ef9344e46a3f32204bbf9cdbcc514980ce Reviewed-on: https://code.wireshark.org/review/460 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03use tvb_memdup() instead of tvb_get_ptr()Martin Kaiser1-1/+1
Change-Id: I1e9ff715c3e315c9e36abb69fb5f441b71477501 Reviewed-on: https://code.wireshark.org/review/459 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03remove unnecessary if (tree) checkMartin Kaiser1-12/+10
Change-Id: I1542d715594b1b90e2442edb6f220ddc4dd99675 Reviewed-on: https://code.wireshark.org/review/458 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03skip empty service provider name and empty service nameMartin Kaiser1-11/+15
Change-Id: I355600320865a9c7c17093d37fc693b02f0a7f0c Reviewed-on: https://code.wireshark.org/review/457 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03service provider name is a DVB-SI stringMartin Kaiser1-2/+12
Change-Id: Idea44f0e4678f738336215f4a250b9e9d9a60fbc Reviewed-on: https://code.wireshark.org/review/456 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-03service name is a DVB-SI stringMartin Kaiser1-3/+15
Change-Id: I81ef4cd363acf6cff99fd0f75b135962c4c22f53 Reviewed-on: https://code.wireshark.org/review/455 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-03-02Don't pass an invalid length to proto_item_set_lenEvan Huus1-1/+2
Fixes bug #9818. Change-Id: I4fb4cf2b5b31ed6efc55a48df67f2ec4949d47c3 Reviewed-on: https://code.wireshark.org/review/442 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-02Improve SCTP association lookup.Evan Huus1-5/+5
It's still O(n) in the worst case since the comparison function doesn't appear to be suitable for use in a tree or hash-table, but at least we no longer spend O(n) by default just finding the end of the list so we can iterate backwards. Discovered while investigating bug #9823, but probably not the cause of that bug. Change-Id: Ib6c3691cff8e7fa49703df7c75635ef797c8fbe8 Reviewed-on: https://code.wireshark.org/review/443 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-02Remove unneeded line of code.Bill Meier1-2/+0
Change-Id: Ic2769d5c125d8db7d32b6ad3ab0e4363f513f599 Reviewed-on: https://code.wireshark.org/review/451 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02Clear INFO column at the beginning of the dissector.Bill Meier1-6/+6
Change-Id: Iea901674e1d9c4745b891ac4330bd781d5eb76ec Reviewed-on: https://code.wireshark.org/review/450 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02tvb_length() --> tvb_reported_length() in several cases + other misc changes.Bill Meier1-256/+265
Misc changes: - sort entries in an enum by value; - add some XXX notes as to possible missing entries in a value-string array; - remove an unneeded initializer; - 0 --> FALSE for several boolean values; - whitespace. Change-Id: I6c8f1c1f37edad120d979fcd2d7278e7981ca5a7 Reviewed-on: https://code.wireshark.org/review/449 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02Clear INFO col; Create/use extended value-string; Do other minor changesBill Meier1-1214/+1222
- val_to_str() -> val_to_str_const() in a few cases; - localize some vars; - remove some unneeded initializers; - convert "4 space tabs" indentation to "4 spaces"; revise editor modelines to match; - do some whitespace changes. Change-Id: Ic91df02022971c973b27c71e6127395ed3ef06d3 Reviewed-on: https://code.wireshark.org/review/448 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-02Fix packet-h223.c:842:18: error: will never be executed ↵Alexis La Goutte1-4/+4
[-Werror,-Wunreachable-code] Change-Id: I8255a3841add78eaa167ef631effe58d9fb12736 Reviewed-on: https://code.wireshark.org/review/323 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-01Create/use two extended value-strings & do other minor changes.Bill Meier1-187/+138
- Use VALUE_STRING_ENUM/VALUE_STRING_ARRAY macros to create one of the value string arrays instead of using the usual separate #defines & array definition; - Remove a few unneeded initializers; - prefs_register_protocol() need not be called under 'if (gp_zbee_prefs == NULL)' - Do some minor whitespace changes; - Add editor modelines. Change-Id: I33669b25fa18ecc452b83a0d88a6c0b33aae904a Reviewed-on: https://code.wireshark.org/review/441 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-03-01Add the PPID for 3GPP Pua. Move the (unregistered) M2TP PPID into that ↵Jeff Morriss1-3/+2
dissector. Also put a note in sctpppids.h saying that only IANA-registered PPIDs should go in that file. Inspired by the rejection of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4332 Change-Id: I763aad7d1b69e9d36c798061473438ce3cb66ca1 Reviewed-on: https://code.wireshark.org/review/434 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com> Tested-by: Anders Broman <a.broman58@gmail.com>
2014-03-01GlusterFS: add support for ZEROFILL fopNiels de Vos2-6/+30
Implementation details in http://review.gluster.org/5327 BUG: 9812 Change-Id: Ib1650fb7ca8221def4e9c6a323008847dc7b5f62 Signed-off-by: Niels de Vos <ndevos@redhat.com> Reviewed-on: https://code.wireshark.org/review/429 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-01Disable IPv4 checksum verfification to match TCP and UDP.Gerald Combs1-1/+1
Offloading seems to be very common nowadays and having this option enabled by default generates a lot of false positives. Suggested by Laura Chappell. Change-Id: I285f218efb3c9f164d8ad7a6d6de8270e442ffff Reviewed-on: https://code.wireshark.org/review/426 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-28packet-homeplug-av: use HOMEPLUG_AV_MMVER_1_1 consistentlyFlorian Fainelli1-7/+7
The HomePlug AV dissector was not consistently using the HOMEPLUG_AV_MMVER_1_1 constant and was sometimes using it and sometimes using mmver == 1 directly. Make sure we use that constant throughout the code to help clarifiying which version tests are applying to. Change-Id: I602413163e4e44dedfbf3e2364448a951fa70f54 Signed-off-by: Florian Fainelli <florian@openwrt.org> Reviewed-on: https://code.wireshark.org/review/428 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-28packet-homeplug-av: fix missing reserved byte for station dumpFlorian Fainelli1-1/+1
dissect_homeplug_av_nw_info_sta() was processing stations information correctly, except that after the first station dump, all dumps would be off-by-one byte because we were not reserving a missing byte at the end of the station dump. Fixes #9798. Change-Id: Iff3afd5ff536ae718fa446de3c59cd5e9851ff20 Signed-off-by: Florian Fainelli <florian@openwrt.org> Reviewed-on: https://code.wireshark.org/review/427 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-27Ensure ieee802154_packet struct is initialized.Evan Huus1-1/+1
A malformed capture could cause the zbee-nwk-gp and 6lowpan heuristics to be called with an incompletely-initialized structure, leading to valgrind errors. Change-Id: Iaea6daecdca6856466b58071f095930e68c6e159 Closes-Bug: #9735 Reviewed-on: https://code.wireshark.org/review/418 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-27Sherman, set the Wayback Machine for 1997.Guy Harris1-1/+1
The URLs for the CRC-10 code are dead; use Wayback Machine URLs. Change-Id: I3924e9cabb3b49b0e1abb31fbffa9b89f95cd0ce Reviewed-on: https://code.wireshark.org/review/419 Reviewed-by: Guy Harris <guy@alum.mit.edu>
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-05 14:31:34 +0000