aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors
AgeCommit message (Collapse)AuthorFilesLines
2014-12-01SNA: Fix Dead Store (Dead assignement/Dead increment) warning found by ClangAlexis La Goutte1-6/+0
Change-Id: I7a491488e67890c6cde98beec6a4935b10505afb Reviewed-on: https://code.wireshark.org/review/5555 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-01Asterix: fix Coverity scan (1025624 & 1025625: Missing break in switch)Marko Hrastovec1-0/+2
Two comments are added to the code to notify Coverity scan that breaks are not put in switch statement intentionally. Change-Id: Ie391790ee7365da56ddf0bf7b19042c9a11efddd Reviewed-on: https://code.wireshark.org/review/5554 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-01Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.Michael Mann26-1082/+787
Part 2 of many Change-Id: I50815e7738b011382392f3078a7107d3d9eec4ec Reviewed-on: https://code.wireshark.org/review/5542 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-01Update display filter names per checkfiltername.plMichael Mann4-9/+9
Change-Id: I7694a6f8d8ccec3109fb86ccefee5798de57757d Reviewed-on: https://code.wireshark.org/review/5548 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-29Use proto_tree_add_bitmask for groups of proto_tree_add_boolean.Michael Mann16-574/+586
Part 1 of many Change-Id: I77a5789ac23388e6a5f8098dc398592f39638124 Reviewed-on: https://code.wireshark.org/review/5532 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-29Rename some hf[] display filter names to fix dups.Bill Meier3-11/+11
Change-Id: Ibe932bc37e03194f1801ec4eed4da1ff31370de3 Reviewed-on: https://code.wireshark.org/review/5535 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-29ieee80211; Rename some hf[] display filter names to fix dups and for clarity.Bill Meier1-21/+21
Change-Id: Ibcca2d7f85130b4a5a74808d88735513cfc0b580 Reviewed-on: https://code.wireshark.org/review/5534 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-29Revert "Add QNX' QNET protocol"Guy Harris2-6203/+0
This reverts commit 72b91a56f86e3bbab700900366f81dc8c353b91d. value_string_ext tables ***MUST*** be sorted numerically, otherwise the code prints warnings such as the ones in http://buildbot.wireshark.org/trunk/builders/Ubuntu%2014.04%20x64/builds/1419/steps/test.sh/logs/stdio Fix this and resubmit. Change-Id: I448025bb7b19a607e992831202ed31d243ce70d8 Reviewed-on: https://code.wireshark.org/review/5530 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-29Sadly, index() was the name of a routine in V7, so....Guy Harris1-6/+6
Change-Id: Id83899de08e0ad8e5664dddfb6ca268e7d0bd54d Reviewed-on: https://code.wireshark.org/review/5529 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-29Add QNX' QNET protocolAlexis La Goutte2-0/+6203
no ethertype 0x8203-0x8205 support in trunk. 0x8204 is QNX OS VER 6's qnet ethernet protocol number. Bug:3934 Change-Id: I5f3e910876bb7fb86de2111f856d026fdf220917 Reviewed-on: https://code.wireshark.org/review/2954 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-29Add optional user Fast SER preference for SEL Fast Message Protocolcbontje1-7/+88
* Also cleanup description of remaining preferences See Bug 10719 Change-Id: I81faba77d8b88b24c65156f5139067233869154b Reviewed-on: https://code.wireshark.org/review/5416 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> 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-28Endpoint: wrong filter when select a TCP endpoint (INVALID == a.x.y.z ...)Alexis La Goutte1-2/+22
Change-Id: If56209f1274245f54100d0acfaf14098c8df4582 Reviewed-on: https://code.wireshark.org/review/5520 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-28Endpoint: wrong filter when select a UDP endpoint (INVALID == a.x.y.z ...)Alexis La Goutte1-2/+23
Change-Id: Ie46d6c201df0b0164a8bf96c02d6430734fd2948 Reviewed-on: https://code.wireshark.org/review/5518 Petri-Dish: 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-28elf: fix FDE Count formattingPeter Wu1-3/+4
Displays the FDE Count as a number, not a series of bytes. Change-Id: I60dd426cb5305a5001a8200578008b7c4a99c64e Reviewed-on: https://code.wireshark.org/review/5489 Reviewed-by: Peter Wu <peter@lekensteyn.nl> 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-28TCP: move Windows Scaling and SCPS checks after options decodingPascal Quantin1-18/+19
This was changed in g8881f3f in an attempt to avoid throwing an exception when decoding the options field Bug: 10514 Change-Id: Ia4b49f484d6255090c5a6e425a9716b48ccc4cb5 Reviewed-on: https://code.wireshark.org/review/5495 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-28Eliminate proto_tree_add_text from packet-sna.c.Michael Mann1-402/+334
Also convert many of the proto_tree_add_boolean calls into proto_tree_add_bitmask. Change-Id: I1fb2f943abed28434a2aadc48eb7e9ffb766f463 Reviewed-on: https://code.wireshark.org/review/5523 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-28Make the ENTTEC dissector reject packets that don't look like ENTTEC packets.Guy Harris1-20/+80
This should avoid questions like https://ask.wireshark.org/questions/38198/what-is-enttec-in-a-pcap-file It also splits DMX-over-UDP and DMX-over-TCP into separate dissectors, as 1) DMX-over-TCP has only config packets, DMX-over-UDP has the others; 2) that would let us do reassembly, if necessary, for DMX-over-TCP. Change-Id: I2606c814693028c7ba2bbc458e45c853372baaf3 Reviewed-on: https://code.wireshark.org/review/5522 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-11-27canopen: LSS dissectionEnrico Jorns1-7/+530
Dissection of Layer setting services (LSS) sub-protocol according to CiA 305. Change-Id: I24ca1827b25c30a672fb31cad390b3c1486102f4 Reviewed-on: https://code.wireshark.org/review/5516 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-27Fix a number of dup hf[] filter-names probably mostly resulting from ↵Bill Meier12-18/+18
cut/paste errs Change-Id: Id658b9e1803b2f5b92e711a3ce981ff602333d98 Reviewed-on: https://code.wireshark.org/review/5513 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-26Fix a number of dup hf[] filter-names probably resulting from cut/paste errs.Bill Meier18-19/+19
Change-Id: I9242300b2ace3155c1506b584a90f073100a305e Reviewed-on: https://code.wireshark.org/review/5512 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-26XML: pass XML structure to caller through p_(add|get)_proto_data functionsPascal Quantin2-8/+9
Since ge3a04bb data parameter is used for the media-type string Bug: 10729 Change-Id: I3df640079a8bf57f4bd86a1baa08cbf9a3a7e1b3 Reviewed-on: https://code.wireshark.org/review/5511 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-26canopen: Enhanced SDO decodingEnrico Jorns1-14/+379
* Move sdo dissection to separate function Added dissect_sdo() function to handle the more complex SDO dissection. * SDO command specifier decoding Decoding of both client and server command specifier for SDO transfers according to CiA 301 Chaper 7.2.4.3. Note: Fully decoding block transfer frames is more complex and not supported yet. * basic SDO abort code decoding SDO abort codes as specified in CiA 301 Chapter 7.2.4.3.17 (Table 22). * Basic value ranges for object dict index parameter Object dict ranges as specified in CiA 301 7.4.1 (Table 41) * cs-based multiplexer and data decoding A data width of 4 byte is valid only for expedited transfer and a multiplex value is present only in initialisation messages. This patch now handles also normal sdo segment data. Reference: CiA 301, Chapter 7.2.4.3.3 and 7.2.4.3.6 Change-Id: I37005894082d62eed1ddd85e09e3676aa3af8222 Reviewed-on: https://code.wireshark.org/review/5504 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: 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-26WCCP: Remove uneeded check (pinfo & info_tree)Alexis La Goutte1-18/+10
Remove also some false positive Dereference of null pointer Change-Id: I09687993531827c6e4f5178f3414ddd9a2702038 Reviewed-on: https://code.wireshark.org/review/5506 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-26Remove the use of pinfo->private_data from dissectors that just save it to ↵Michael Mann20-155/+7
restore it. Change-Id: I13197cc48068bb35ee12a7023cfe5f76bbc4e264 Reviewed-on: https://code.wireshark.org/review/5486 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-26[MGCP] When changing tvb_length(tvb) -> tvb_reported_length(tvb) it turnsAndersBroman1-4/+4
out that tvb_new_subset(tvb, tvb_sectionbegin, sectionlen, -1) causes a problem as reported_length is set to -1, set it to sectionlen. Change-Id: I650d3fa1390be5add66ed44d0f70929b9eb0aad6 Reviewed-on: https://code.wireshark.org/review/5505 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-26Remove sccp_info member from packet_info structure.Michael Mann10-225/+267
sccp_msg_info_t* is now passed from SCCP dissector to its subdissectors through dissector data parameter. Change-Id: Iab4aae58f8995e844f72e02e9f2de36e83589fc0 Reviewed-on: https://code.wireshark.org/review/5442 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-26openflow: Use (what appear to be the) correct filter names for a few fields.Bill Meier3-12/+12
Change-Id: I2acd93d99942601b34c85177d21bbc2c4a4e2633 Reviewed-on: https://code.wireshark.org/review/5492 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-26canopen: Improve NMT error control and SYNC message dissectionEnrico Jorns1-1/+21
1. Also show Reserved/Toggle bit of NMT error control In case of the node guarding protocol this bit is used as a toggle bit. In case of the hearbeat protocol this bit is reserved. Reference: CiA 301 (rev 4.2.0), Chap. 7.2.8.3.2 2. Show optional 'counter' parameter of SYNC messages if available Reference: CiA 301 (rev 4.2.0), Chap. 7.2.5.3.1 Change-Id: I5dc0ab65e95fec4846a9c8bd8972ef2eba664ee2 Reviewed-on: https://code.wireshark.org/review/5484 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-26dec-dnart: use pinfo-scoped memory for addressesEvan Huus1-6/+7
They may be accessed during the print phase, at which point packet-scope memory has already been freed. Bug: 10724 Change-Id: Ifcf5fc0c0857614edf85349b12dfe605abf6fef7 Reviewed-on: https://code.wireshark.org/review/5497 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-26wccp: use pinfo-scope memory for addressesEvan Huus1-4/+4
They may be accessed during the print phase, at which point packet-scope memory has already been freed. Bug: 10720 Change-Id: Ia2b160fd9de4ccaa3a4b8d9cb70fb9b32d4e08a0 Reviewed-on: https://code.wireshark.org/review/5496 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-11-25SCSI: type and scope fields are ignored in some SCSI persistent reserve ↵Yaniv Kaul1-11/+27
service actions Bug: 10727 Change-Id: Id34f57b2a0b89867eec1b0a13db2eba037835804 Reviewed-on: https://code.wireshark.org/review/5493 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-25openflow: Minor changesBill Meier3-159/+158
- Remove unneeded/undefined forward declarations; - Create/use some extended value-strings; - Do some whitespace changes. Change-Id: I7961864f0e404e141d2887584751116011f8d941 Reviewed-on: https://code.wireshark.org/review/5490 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-25Remove support for pinfo->private_data in "data-text-lines", ↵Michael Mann4-39/+11
"data-l1-events" and "urlencoded-form" dissectors. Data must be passed from parent through dissectors data parameter. Change-Id: I24ab56ce7d99f8ed670f4a50453223d4e6a46983 Reviewed-on: https://code.wireshark.org/review/5463 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-25Ensure dissector data parameter is used instead of pinfo->private_data when ↵Michael Mann8-72/+23
passing data between dissectors using the "media_type" subdissector. Change-Id: I82cbfed770b41404bc42cb6a4413db07d04dffdc Reviewed-on: https://code.wireshark.org/review/5462 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: Anders Broman <a.broman58@gmail.com>
2014-11-25canopen: Fixed tree expansionEnrico Jorns1-3/+7
Previously the COB-ID and Type subtree also used the main ett_canopen variable. This made control of subtree expansion impossible as both parent and subtree nodes shared the same state. Change-Id: I3dabf7f399e83bfcfbf78bc0e633e3696776c043 Reviewed-on: https://code.wireshark.org/review/5480 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-25Have media dissector take its "media type parameter" from dissector data ↵Michael Mann6-23/+18
parameter instead of pinfo->private_data. Change-Id: I0a0cb0b4838bc4e55a759fb6031355892c220c8e Reviewed-on: https://code.wireshark.org/review/5461 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-25Remove use of pinfo->private_data since it's not used anywhere.Michael Mann1-24/+12
Change-Id: Ibb47fd1a0d498cc9791ca31ee625395905a7e999 Reviewed-on: https://code.wireshark.org/review/5464 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-25Add new dissector for Shared Memory Communications over RDMA protocol (SMC-R)Joe Fowler3-11/+1458
RFC draft http://www.ietf.org/id/draft-fox-tcpm-shared-memory-rdma-05.txt used as reference for packet dissection. A small change was made to packet-infiniband, to add the Queue Number to the info column. This allows for easy indentification of session traffic for a particular QP. Also: infiniband: tvb_length() --> tvb_captured_length() Bug: 10715 Change-Id: I774ceffaa5c271cb6a28ab4ed21e53cd42f2547b Reviewed-on: https://code.wireshark.org/review/5386 Petri-Dish: Bill Meier <wmeier@newsguy.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-25Eliminate proto_tree_add_text from some dissectors.Michael Mann10-287/+406
Change-Id: Iadd80aab291e5de714891a9f3c79edeca19e9b93 Reviewed-on: https://code.wireshark.org/review/5458 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: Evan Huus <eapache@gmail.com>
2014-11-25TCP: fix wrongly set base_seq when ISN is 0 and tcp_relative_seq isMatthieu Coudron2-6/+7
enabled tcp_analysis::base_seq could be set several times when the TCP ISN was set to 0, thus inducing some undesired wraps such as 0-1 Bug: 10713 Change-Id: I69a0dfe677e93bf51015bf7a39ebf888631b12a4 Reviewed-on: https://code.wireshark.org/review/5387 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: Evan Huus <eapache@gmail.com>
2014-11-24A21: fix warning: no previous prototype for function ... [-Wmissing-prototypes]Alexis La Goutte2-2/+3
Second try... ;-) Remove also double space Change-Id: I77aa269c1abae18b4fb9daec6cc0ac862cf4ab9f Reviewed-on: https://code.wireshark.org/review/5421 Petri-Dish: Anders Broman <a.broman58@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-24Change capitalization of "DNS UDP [p]orts" to match "DNS TCP ports" in prefsStephen Fisher1-1/+1
Change-Id: Ib0bffc6d5e4bd6b68f48a843b4b4cab7422aceb7 Reviewed-on: https://code.wireshark.org/review/5476 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-11-24MIPv6: Enhance ANI dissectionAlexis La Goutte1-3/+18
* Fix wrong length for Operator Identifier * Display Latitude and longitude in Degrees Bug:10712 Change-Id: Idf6ba63db3ff16710fd0de7a7fd2233148cbaf4a Reviewed-on: https://code.wireshark.org/review/5473 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-11-24CPHA : tvb_length -> tvb_reported_lengthAlexis La Goutte1-2/+2
Change-Id: I49a7ffb1fcff71d49593ab009036f21c3ae6a2d0 Reviewed-on: https://code.wireshark.org/review/5471 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-24CPHA: Update versions listsAlexis La Goutte1-5/+106
Use also value_string ext Request from Hugo van der Kooij Bug:10723 Change-Id: I0603687215b7e82a987a4a6cde00eb996b04a77c Reviewed-on: https://code.wireshark.org/review/5466 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-24Pass data to JSON through dissector data, not pinfo->private_data.Michael Mann1-2/+1
Change-Id: I21dc2777822f0836f486432343cc1238886ad29d Reviewed-on: https://code.wireshark.org/review/5460 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-24openflow; Fix a (no-effect) typo in openflow_version_values[]Bill Meier1-1/+1
Change-Id: I7a51face9c675ac3c03f2306ec40293b4835e02e Reviewed-on: https://code.wireshark.org/review/5468 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-24[SIP/DIAMETER] Reinstate the lost dfilter_store_sip_from_addr() and use itAndersBroman2-0/+32
for 3GPP AVP 601 Public-Identity. Change-Id: I5ef6608e7821779b00f79486860ee5f578828dfc Reviewed-on: https://code.wireshark.org/review/5467 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-24SMTP: escape ASCII strings printed to COL_INFOPascal Quantin1-21/+31
This is already done automatically for the hf entries thanks to hfinfo_format_text() function Bug: 10536 Change-Id: I9ee56b795234a94f0e59c82a96e3e6cedf71c4e6 Reviewed-on: https://code.wireshark.org/review/5459 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-11-24SSL: Implement Extended Master SecretDave Tapuska4-45/+169
Store all handshake mesages in a buffer so that we can hash them correctly when generating the master secret. This change does not work correctly for DTLS retransmitted packets; that are in the handshake as they will be hashed twice; which is bad. Looking for ideas to implement this. Bug: 10686 Change-Id: Ied01d4cc37b4270f325070a8d1630d3123577a0d Reviewed-on: https://code.wireshark.org/review/5168 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>