aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
AgeCommit message (Collapse)AuthorFilesLines
2014-11-22Add version check in Geneve dissector.Jesse Gross1-17/+31
We should warn when decoding Geneve packets with an unknown version number. Change-Id: Id40b756c3bb0320b69fbd8ee98830a2b05834a48 Reviewed-on: https://code.wireshark.org/review/5420 Reviewed-by: Anders Broman <a.broman58@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-21CANopen bugfixesMichael Mann1-24/+24
1. Fixed endianess in CANopen dissector. According to CiA 301, 7.1.1. (p. 26): "For numerical data types the encoding is little endian style." 2. Fixed NMT type string in CANopen dissector NMT function code should not display 'EMERGENCY' 3. Fixed time stamp decoding * Offset increment was too low for data type size * Decoding of time_stamp_days must equal time_stamp_msec and thus be letohs instead of ntohs. CANopen data is little-endian encoded. 4. Fix: Use correct description string for NMT error control state bits canopen.nmt_guard.state was faulty named "Node-ID". This was changed to "State". 5. Fix nmt_guard_state value_string array CiA 301 desribes only 4 valid values. All other were deleted. 0x00 was renamed from 'Initalisation' to 'Boot-up' following CiA301. 6. Shortened EMERGENCY to EMCY The term EMCY is the standard abbreviation used in CiA standard for Emergency service. 7. Fix: Allow SYNC and NMT error frames without any payload NMT node guard remote requests do note have a payload, SYNC frames only have an optional payload (counter) If item length is set to -1, decode will cause a 'Malformed Packet' error. 8. Rename MT_NMT_GUARD to MT_NMT_ERR_CTRL which better reflects its scope Change-Id: I676f9b5f2e4efd8e7c9528fe289e7510c4d43235 Reviewed-on: https://code.wireshark.org/review/5425 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-21Replace tvb_length()AndersBroman14-54/+54
Change-Id: I0b5ad4d588f0b658abaf3892d08d6520ecd2f645 Reviewed-on: https://code.wireshark.org/review/5431 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-21Move text logcat regex strings to shared headerMichał Orynicz1-10/+1
To avoid further duplication of work and bugfixing, move regex strings to wiretap/logcat_text.h and include this file in epan/dissectors/packet-logcat-text.c Change-Id: I82773cda0e3240844139b104c68738ec82788014 Reviewed-on: https://code.wireshark.org/review/5410 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-21Fix the build: dissect_a21_ie_common() can't be static any more.Jeff Morriss1-1/+1
Change-Id: I93db6bc35aef9c36a294e530730cd295ad6851ef Reviewed-on: https://code.wireshark.org/review/5419 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-11-21Include "ws_symbol_export.h" to make sure WS_DLL_PUBLIC is defined.Guy Harris1-0/+10
Wrap the declaration for C++ while we're at it. Change-Id: Ifcc1b47bab139f5fb8da8c3dd4f20b1ebb99739e Reviewed-on: https://code.wireshark.org/review/5418 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-20A21: fix warning: no previous prototype for function ... [-Wmissing-prototypes]Alexis La Goutte1-1/+1
Change-Id: Ib2f3816892f1682c175b0dee3c80725caebf3d4d Reviewed-on: https://code.wireshark.org/review/5415 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20EPL: fix warning: no previous prototype for function ... [-Wmissing-prototypes]Alexis La Goutte1-5/+5
Change-Id: I40de0c8c2bd40f18a33947367fdeec5a22a3093a Reviewed-on: https://code.wireshark.org/review/5414 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20Eliminate proto_tree_add_text from some dissectors.Michael Mann9-293/+420
Change-Id: Ib160211198ca02f7eacf29d04568628c11f208a5 Reviewed-on: https://code.wireshark.org/review/5407 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-20Replace tvb_length...() calls.AndersBroman9-55/+55
Change-Id: Idda7cd56a12b36d18774a1fe324c69eb8f5e4330 Reviewed-on: https://code.wireshark.org/review/5412 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-20Fix text logcat for changes in android LMichał Orynicz1-1/+1
In L, in line "-- beginning of /<buffer>" the "/" was removed. This commit accomodates text logcat to that change. Change-Id: I4cbfadf5a8169589f2848ce1a5793cea593ba459 Reviewed-on: https://code.wireshark.org/review/5405 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-20MIP6: Access network identifier option is not full decodedAlexis La Goutte1-17/+122
* Add subtype Geo Location (2) and Operator Identifier (3) * Use also offset to calculate the length * Remove proto_tree_add_text Issue reported by Ravindranath K M Bug:10712 Change-Id: I9ad81ece856df134f3a706ad774d34e638cb5c94 Reviewed-on: https://code.wireshark.org/review/5397 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-19Add support for PAD chunks.Michael Tüxen1-0/+18
Add support for PAD chunks as defined in RFC 4820. Change-Id: I66a83d5d133429154fe40ccef26687c8350463cf Reviewed-on: https://code.wireshark.org/review/5393 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-11-19Fix the length reported as value length.Michael Tüxen1-3/+6
The length reported as value length for unknown chunks was actually the chunk length. Therefore it was off by 4. Change-Id: Ieea79d2c51b4729fc139395174625d1f362d1ee5 Reviewed-on: https://code.wireshark.org/review/5392 Reviewed-by: Michael Tüxen <tuexen@wireshark.org>
2014-11-18dissect TA(1)Martin Kaiser1-5/+88
Change-Id: If618b0c3dc0502f5a31dcc580b9116daacb40239 Reviewed-on: https://code.wireshark.org/review/5389 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx> Tested-by: Martin Kaiser <wireshark@kaiser.cx>
2014-11-18Update Couchbase dissector:Sergey Avseyev1-0/+9
* Register new commands: * 0x5c: DCP_NOOP * 0x5d: DCP_BUFFER_ACKNOWLEDGEMENT * 0x5e: DCP_CONTROL * 0x5f: DCP_RESERVED4 Change-Id: I22d8eb8f6628e07b2e2ab2bc137688329eead1be Reviewed-on: https://code.wireshark.org/review/5385 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-18SPDY: do not try to access an uninitialized tvb Pascal Quantin1-0/+2
Coming when data length = 0 Bug: 10704 Change-Id: Ibd0730be661d966aa0429480dba97ed7d3e5c471 Reviewed-on: https://code.wireshark.org/review/5377 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-18802.11: Remove proto_tree_add_textAlexis La Goutte1-21/+70
Change-Id: I40d351e3317ff7e207e5c68a39aaedb73faf54f9 Reviewed-on: https://code.wireshark.org/review/5281 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-18MIPv6: display Experimental Mobility Message Data as suchPascal Quantin1-4/+4
Bug: 10703 Change-Id: I9b16f503418d7464234be3c772b5dae3fb5eb7a9 Reviewed-on: https://code.wireshark.org/review/5378 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-18voip_calls: Move to ui.Gerald Combs2-2/+2
Move voip_calls.[ch] to ui. Add callbacks to voip_calls_tapinfo_t. Remove unused function definitions. Change-Id: Ib12db7053d53afa81ef2a66dc0cfe681bc624dd2 Reviewed-on: https://code.wireshark.org/review/5379 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-17802.11: Enhance Supported Operating ClassesAlexis La Goutte1-7/+3
* Use expert_info to display warning about length (Remove proto_tree_add_text) Change-Id: I36ce6b6fc1138c53621da4913e23f9f1ceaaca50 Reviewed-on: https://code.wireshark.org/review/5369 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17802.11: Enhance Extenede Channel Switch AnnouncementAlexis La Goutte1-10/+1
* Use expert info to display warning about launch (remove proto_tree_add_text) * Remove a check about Unknown data (Not need) Change-Id: I3ec1d0f5b955019cfe43141df5f712eb1446dce3 Reviewed-on: https://code.wireshark.org/review/5368 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17H248: Fix Dereference of null pointer found by Clang analyzerAlexis La Goutte1-20/+22
Also fix some indent issue Change-Id: I262bdddd031fec6a0f91b7172bb2d67be3c33000 Reviewed-on: https://code.wireshark.org/review/5370 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17DECT: ensure that bfield_data buffer is always fully initiatedPascal Quantin1-0/+4
Bug: 10710 Change-Id: I444bc4ff7e542a8aa5ac8e20bac44a823ac74cfd Reviewed-on: https://code.wireshark.org/review/5371 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17Use ntoh24 instead of less readable and less correct code.Joerg Mayer1-13/+7
Remove redundant / wrong comments. Add two small (helpful) comments :-) Change-Id: I9c5451587d744a8418e6a90139b771a055e93387 Reviewed-on: https://code.wireshark.org/review/5366 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-11-17LLDP: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-2/+2
Change-Id: I8c750ed9ad775b9be9d12050d200d7f1b4ddb86e Reviewed-on: https://code.wireshark.org/review/5365 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-17[BSSMAP] de_mid() used with wrong length.AndersBroman1-1/+1
Change-Id: Ia64f254d85845ff39eacc7a339fdfa646ff9bb50 Reviewed-on: https://code.wireshark.org/review/5364 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-17E212: fix bytes highlighting when dissecting the high nibble variantPascal Quantin1-2/+2
Change-Id: I376dcb333f7768242dbdb73313870e1e22d959ff Reviewed-on: https://code.wireshark.org/review/5362 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-17BATMAN: fix indent and encoding argsAlexis La Goutte1-79/+79
use tabs for indent and use fix-encoding-args tools Change-Id: I5e066c6cbc429021cf21a55d5ffd5b60718ad5f8 Reviewed-on: https://code.wireshark.org/review/5340 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-16Make sure the NLPID appears in the protocol tree.Guy Harris1-2/+23
For protocols for which the NLPID is not considered part of the PDU, put the NLPID into the protocol tree ourselves. Bug: 10706 Change-Id: I2676d1934dd468ec755a6f94d95a23f025ba0f25 Reviewed-on: https://code.wireshark.org/review/5358 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-16Fix a comment to reflect reality.Guy Harris1-1/+1
Change-Id: I812b0246368266c76f7fe9ef355619603c5d37b0 Reviewed-on: https://code.wireshark.org/review/5357 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-16BATMAN: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+1
Change-Id: I6cfabc18921397002a2303f3511fa51bf5b41956 Reviewed-on: https://code.wireshark.org/review/5341 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-16RADIUS: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-1/+0
Change-Id: I5127b737c0d9db08c61a70bb6c16fef030d39f83 Reviewed-on: https://code.wireshark.org/review/5339 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-16btavdtp: Add missing break;Alexis La Goutte1-0/+1
Issue found by Clang Analyzer: Value stored to 'codec_dissector' is never read Change-Id: I7a9fc5e3ffd04c77cbbb8d5e5b885d8a29468cfd Reviewed-on: https://code.wireshark.org/review/5330 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-11-16Remove file_type_subtype member from packet_info.Michael Mann1-6/+12
Just pass the necessary data to the frame dissector. Change-Id: I1a4bab32f7b5e28f4e7707794d71b04dab388908 Reviewed-on: https://code.wireshark.org/review/5328 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-16"Bubble up" the use of pinfo->circuit_id and pinfo->ctype to make it more ↵Michael Mann4-30/+30
obvious where in used in hopes that it can be eliminated through passing dissector data (or methods other than using packet_info) Change-Id: Ib0e7efc123a3f9c06f58b5579c3c25b18818205c Reviewed-on: https://code.wireshark.org/review/5326 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-16Remove ipproto member of packet_info.Michael Mann8-67/+62
All situations can be handled with "shimmed" dissector functions. Change-Id: Ic85483b32d99d3270b193c9f6b29574d8fad46a8 Reviewed-on: https://code.wireshark.org/review/5327 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-16DNS: NAPTR RR Replacement Length is incorrectAlexis La Goutte1-3/+4
It seems the Replacement Length field calculated by Wireshark (which Wireshark calls "rReplacement Length"), is the length of the first label of the DNS name in the Replacement, instead of the entire DNS name length. Issue found by Boaz Bug:10700 Change-Id: I8b726f3a3bf316d688a40c3ade100d255ca3be42 Reviewed-on: https://code.wireshark.org/review/5300 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-15paquet-mq: Eliminiate proto_tree_add_textRobert Grange3-33/+37
Eliminate proto_tree_add_text for Expert Info Improve PCF Parameters numeric value display Change-Id: Ibc259ba05d0591d434e7638d91d6943101d45305 Reviewed-on: https://code.wireshark.org/review/5080 Reviewed-by: Robert Grange <robionekenobi@bluewin.ch> Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-150.0 is a double, 0.0f is a float.Guy Harris1-1/+1
Change-Id: I882bbda2c579cfd7a1b96ce190541262193405e0 Reviewed-on: https://code.wireshark.org/review/5320 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-15LLDP: Dissector for Hytec specific extensions addedGregor Miernik1-1/+587
It provides dissection of objects with additional neighbor and link information defined by Hytec (pcap example available on wiki.wireshark.org/HYTEC). Also OUI of "Hytec Geraetebau GmbH" added. Change-Id: I92119e46fd5f4c4b385ac3df3170a4766fe056b7 Reviewed-on: https://code.wireshark.org/review/5107 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-14Use G_GUINT64_FORMAT to format a guint64.Guy Harris1-3/+3
A 64-bit integer isn't necessarily a long, it might be a long long. Use G_GUINT64_FORMAT to format it. Make it a guint64 while we're at it - the field is a FT_GUINT64. Change-Id: I7ee855905ea77347576005441824b1c4630f5659 Reviewed-on: https://code.wireshark.org/review/5302 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-14hiqnet: Improve dissection for hiqnet over TCP or UDPBill Meier1-6/+60
-- Use tcp_dissect_pdus() for hiqnet over tcp so as to properly handle hiqnet PDUS is a TCP stream of data; -- Handle possible multiple hiqnet PDUs in a UDP payload. -- Add Fixme: re multiple hiqnet PDUs in a frame. Change-Id: I3527c6ea13571d16bcf23dd3771d0a89734a7c5a Reviewed-on: https://code.wireshark.org/review/5267 Reviewed-by: Raphaël Doursenaud <rdoursenaud@free.fr> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-14hiqnet: Simplify code somewhat; Adjust the "names" and display of certain ↵Bill Meier1-184/+75
fields. Specifically: Use proto_tree_add_bitmask() to show the "flags" and "categories" bitfields (instead of building the fields display "by hand"). The bitfield display changed as follows: - A bitfield with all bits=0 will have a detailed dissection tree; (for both 'flags' & 'categories'); - The 'categories' individual bitfields are now displayed as FT_BOOLEAN (not FT_UINT32). Change-Id: Icd35698aae492b81b340d08030e6a1563f1640ae Reviewed-on: https://code.wireshark.org/review/5266 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-14[S1AP) Wrong tree usedAndersBroman1-1/+1
s1ap.cnf:547:14: error: variable 'subtree' set but not used Change-Id: I84a345709b1ef9688f3f1a4e876a75dd575c1c2e Reviewed-on: https://code.wireshark.org/review/5299 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-14[S1AP] Let the A21 dissector do further dissection of Cdma2000SectorIDAndersBroman4-54/+107
Change-Id: I8c503acf6860b34d24769cdf981dcaeea4667ffb Reviewed-on: https://code.wireshark.org/review/5298 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-14Fix declaration in btavrcpMichal Labedzki1-1/+1
Change-Id: I47e4ad2baa7ca4c48e8c0eea472e568fc06d3386 Reviewed-on: https://code.wireshark.org/review/5297 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-14Bluetooth: Ubertooth: Update to the latest firmwareMichal Labedzki1-3/+82
Changelog: - add some assign numbers - implement new type of usb_rx_packet: LE_PROMISC Change-Id: Iffe01a50f873221c695f16a76c1954d6c82d73df Reviewed-on: https://code.wireshark.org/review/5289 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Orynicz <michal.orynicz@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-11-14[BSSMAP] Handle vendor specific encoding of "Layer 3 Message Contents".AndersBroman1-0/+13
Change-Id: I351bc0a6a8ae636b2f888a80f61e526096a61b64 Reviewed-on: https://code.wireshark.org/review/5295 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-14NAS EPS: fix dissection of APN AMBR IE when first byte is set to 0xFEPascal Quantin1-14/+6
Bug: 10699 Change-Id: I0f359639d5836f557370ab6d6aad45faa4417b6e Reviewed-on: https://code.wireshark.org/review/5285 Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>