aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
AgeCommit message (Collapse)AuthorFilesLines
2014-12-13plugins: replace ENC_NA by ENC_..._ENDIAN when fetching integral typesBill Meier2-14/+14
Change-Id: I3958bbd0eadd4472a003ea272e596026ad8731d1 Reviewed-on: https://code.wireshark.org/review/5753 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-10Refactor "color" conversation filtersMichael Mann1-0/+49
Have dissectors register their desire to be part of "color" conversation filters and have the GUI use that registered list. GUI actually using API will come in a separate commit. Change-Id: I5ffe922d97894fe7bf3182056b76ab5839a9461a Reviewed-on: https://code.wireshark.org/review/5658 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-08Fix full name of NodeId namespace index field, was a copy&pase errorHannes Mezger1-1/+1
Change-Id: I7b1eea9965880e35c65f04406ff756d245b568d4 Reviewed-on: https://code.wireshark.org/review/5668 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-12-02Fix instances of duplicate display-filter-names with incompatible types.Bill Meier1-5/+5
Change-Id: I3b5afb8a59f6443624708b9fecfdcbe93dad59ef Note: Some of the filters, when/if used, could have caused Wireshark crashes. Reviewed-on: https://code.wireshark.org/review/5575 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-01Remove private_data member from packet_info structure.Michael Mann1-1/+0
Dissectors should pass data directly to their subdissectors through the data parameter (of new-style dissectors). This avoids unintentional "trampling" from other dissectors trying to "share" private_data member. Change-Id: I2efef5c8dfeef64588ba3ac6e695b469238c6468 Reviewed-on: https://code.wireshark.org/review/5487 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-11-29Rename some hf[] display filter names to fix dups.Bill Meier1-1/+1
Change-Id: Ibe932bc37e03194f1801ec4eed4da1ff31370de3 Reviewed-on: https://code.wireshark.org/review/5535 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-27Fix a number of dup hf[] filter-names probably mostly resulting from ↵Bill Meier1-1/+1
cut/paste errs Change-Id: Id658b9e1803b2f5b92e711a3ce981ff602333d98 Reviewed-on: https://code.wireshark.org/review/5513 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-11-24Mate: Fix indent (use tabs)Alexis La Goutte1-6/+6
Change-Id: I9a02e4a063dc4fc173ff9b7596acd7f9ceba7aa7 Reviewed-on: https://code.wireshark.org/review/5477 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-11-24Pass FrameID as data to the heuristic table, rather than use ↵Michael Mann6-44/+24
pinfo->private_data. Change-Id: Idd5818cbb2b1f8628bb29c2c71dfc6d41df89b5d Reviewed-on: https://code.wireshark.org/review/5448 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-23Remove use of pinfo->private_data (which doesn't appear to be used anyway) ↵Michael Mann3-49/+44
and pass it as dissector data. Some other minor cleanup while in the neighborhood. Change-Id: I1b0c0567488fa350c14d21c5f5e4cb9746177af1 Reviewed-on: https://code.wireshark.org/review/5447 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-20IrDA: always initialize buffer before accessing itPascal Quantin1-0/+3
Bug: 10716 Change-Id: I8e54f750b70076758d5fd0d7f35f9c782f5d0bf9 Reviewed-on: https://code.wireshark.org/review/5398 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>
2014-11-19Eliminate proto_tree_add_text from packet-mate.cMichael Mann1-28/+50
Change-Id: I3f4b3eb23b91b219df373b3012fbefa63abfa4d3 Reviewed-on: https://code.wireshark.org/review/5350 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-17Eliminate proto_tree_add_textMichael Mann1-207/+101
Also some other cleanup to simplify dissector logic. Change-Id: Ia84300b7eadafe292361014dd0e565ec250cae44 Reviewed-on: https://code.wireshark.org/review/5311 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-17Eliminate proto_tree_add_text by formatting field hf_opcua_ByteString in a ↵Michael Mann1-3/+2
few places. Change-Id: I9606aa36b7d7b6bb2ef2e7685e6629163ca83ef7 Reviewed-on: https://code.wireshark.org/review/5312 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-15Eliminate proto_tree_add_text from some plugin dissector files.Michael Mann4-83/+109
Change-Id: Ib2d900833a8763307be6b1cfc8df20d7019d2706 Reviewed-on: https://code.wireshark.org/review/5313 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-22Replace pinfo->circuit_id will passing data through functions.Michael Mann3-44/+41
Change-Id: I5b35ad57c5c40a1393cbc174384b8a275abd763c Reviewed-on: https://code.wireshark.org/review/4903 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-10-20Sign, Flex strikes again; it generates code that produces warnings.Guy Harris1-3/+6
Change-Id: Ibd92bd07e537a4ac19e2a5b159ece0e25aa366b1 Reviewed-on: https://code.wireshark.org/review/4861 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-19This appears to be clean with my build; see if it needs work with others.Guy Harris1-6/+3
Change-Id: I2c3e3ce8e29b26958d42b66eca3c7539b65695ab Reviewed-on: https://code.wireshark.org/review/4848 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-19Eliminate a use of a ctype.h function.Guy Harris1-2/+1
That way, we avoid locale-dependent behavior. Change-Id: I429fde961dc7cb61013756a663d6cd511f19ca70 Reviewed-on: https://code.wireshark.org/review/4845 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-10-18Use proto_tree_add_expert_format instead of proto_tree_add_textHannes Mezger1-12/+16
Change-Id: Ia017fa9535cbc7570ce6bd442972eedd2143825a Reviewed-on: https://code.wireshark.org/review/4729 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-10-17Use proto_tree_add_bitmask for ExpandedNodeId EncodingMaskHannes Mezger1-9/+16
Instead of adding the items using proto_tree_add_item, use proto_tree_add_bitmask in parseExpandedNodeId(). Also, the redundant 'NodeId ' text is removed from hf_opcua_nodeid_... items for better readability. Change-Id: Ie68f1d280dd733fd2eede0b2b73ad8d7f28396b3 Reviewed-on: https://code.wireshark.org/review/4730 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-10-17Add argument 'packet_info *pinfo' to all dissecting functionsHannes Mezger15-1623/+1624
Change-Id: Ie02326e365ee3f620fcbe3f2e8e45dc5300d3418 Reviewed-on: https://code.wireshark.org/review/4728 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-10-16Replace proto_tree_add_text in non-generated filesHannes Mezger2-36/+39
As requested by Michael Mann, most of the occurences of proto_tree_add_text/proto_item_add_subtree are replaced with proto_tree_add_subtree(_format) or proto_tree_add_item/proto_item_append_text in the non-generated files. Change-Id: I27cccde88780adef43c78efd26333f47af098ad6 Reviewed-on: https://code.wireshark.org/review/4726 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-10-16Replace proto_tree_add_text with proto_tree_add_subtree(_format) in ↵Hannes Mezger2-432/+431
generated files As requested by Michael Mann, all occurences of proto_tree_add_text/proto_item_add_subtree are replaced with proto_tree_add_subtree(_format) in the generated files. Our generator templates have also been updated accordingly. Change-Id: I49ddd664dffef4b3ceda77edd1b2d7e01da363f3 Reviewed-on: https://code.wireshark.org/review/4725 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-10-14Always put editor-modelines at the end of the file ...Bill Meier1-3/+4
... to ensure that there are no potential issues with respect to editors limiting the number of lines scanned at the end of the file when checking for editor modelines. Change-Id: Ic85cbb108bb5159d6ec4116fea11f5eebb4e44a4 Reviewed-on: https://code.wireshark.org/review/4688 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-13fix forward declarations in opcua_serviceparser.hHannes Mezger1-271/+159
The declarations from opcua_complextypeparser.h were used instead of the serviceparser ones, this is also fixed in our generator Change-Id: I3d78d26a3b2b4995dfd4556720d29ecdd6960c4b Reviewed-on: https://code.wireshark.org/review/4650 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-10-12Add support for NTTIME_hyper and NTTIME_1secMatthieu Patou1-1/+1
It's hyper with 8 bytes alignment it can have 1/100000 sec resolution or 1sec resolution Bug: 10541 Change-Id: Iecc4c6d1bd1695a4c02db72e1617134254810cd9 Reviewed-on: https://code.wireshark.org/review/4606 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-10-09CMake: Bundle our plugins.Gerald Combs14-42/+168
plugins/*/CMakeLists.txt has a lot of repitition. We might want to create a module or include file to simplify things. Change-Id: Iadd453c286a4127beacd80edf6dc200aa9148852 Reviewed-on: https://code.wireshark.org/review/4582 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-10-06Adjust some whitespace to match editor modelines.Bill Meier2-6/+6
Change-Id: Ia22cac3ebd7a454c156f98d967e6fd61f708a2b3 Reviewed-on: https://code.wireshark.org/review/4489 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-06plugins: Add editor modelines; Adjust whitespace as needed.Bill Meier70-3745/+4623
Change-Id: I36124f6021d46a228721bdc976f6b9fef1c8c088 Reviewed-on: https://code.wireshark.org/review/4488 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-10-05docsis: Add editor modelines; Adjust whitespace; Remove boilerplate comments.Bill Meier44-7941/+7702
Change-Id: I78f9815616f4fc3c14204339c5826f0ca7d0680e Reviewed-on: https://code.wireshark.org/review/4485 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-09-19Don't assert that values fit in 32 bits if the NDR64 flag is set.Michael Mann1-3/+10
For now, this just pacifies fuzz-testing. If real world examples have this, there needs to be a drastic overhaul to support fields that could be either 32 or 64-bit values. Bug:9329 Change-Id: I3e28808ca0291868a5f84258b0ee1e2a922703c2 Reviewed-on: https://code.wireshark.org/review/4189 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-18Having CmakeListsCustom.txt in git defeats the purpose of its existence:Joerg Mayer1-28/+0
If it is used, there is a modified file in git. Fix this by only including the file if it exists. Other changes: - Rename the existing Custom files to CMakeListsCustom.txt.example. - Move the plugins custom file to the top level (same level as its including parent). - Optionally allow a list of custom includes instead of the default one. Change-Id: I8960eac6222f741c045055d43d1d5a2d4979caf6 Reviewed-on: https://code.wireshark.org/review/4163 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-09-17opcua: prefix all hf_register_info with opcua, unify namingHannes Mezger4-67/+67
Change-Id: I575bd2f93202837b2ce15a39b1b0bd9b5c53f5bf Reviewed-on: https://code.wireshark.org/review/4151 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17opcua: use BASE_NONE instead of 0Hannes Mezger1-4/+4
Change-Id: I5ca5d41edf1f56b24da6360a10f0c6e2600572d2 Reviewed-on: https://code.wireshark.org/review/4150 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17opcua: format all hf_register_info tables by aligning them to longest valueHannes Mezger5-176/+89
Change-Id: I0b533edd7bad52922dd1e0aaa2c980e56dd88b78 Reviewed-on: https://code.wireshark.org/review/4149 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17opcua: remove unused codeHannes Mezger2-20/+0
Change-Id: I78963640e32393f3ac399e59a659ddf619d15c3d Reviewed-on: https://code.wireshark.org/review/4148 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-17opcua: add hint to OPCUA settings tooltipHannes Mezger1-1/+1
It's unclear how the ports should be separated, this additional text in the tooltip clarifies it Change-Id: I686482522d006024f920a3cc26b83cd21c19f8a5 Reviewed-on: https://code.wireshark.org/review/4147 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-09-06Remove obsolete dissectors.AndersBroman15-7551/+0
Change-Id: Icd480491670de9d8495a95861b18a8a5cb9724b4 Reviewed-on: https://code.wireshark.org/review/4006 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-09-01Add CMake stuff for custom plugins.AndersBroman1-0/+28
Change-Id: I1eff6b902d9bd9fb8f3073ab0f4fc3dd143d0fc4 Reviewed-on: https://code.wireshark.org/review/3946 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-31Don't show the echo/python command lines when making plugin.cРоман Донченко13-39/+52
For consistency with epan/dissectors/Makefile.am. Also, remove the "with python" parts, since that's the only option now. Change-Id: I761e1bf7995c1cc1ebd790013181fd6116b289a1 Reviewed-on: https://code.wireshark.org/review/3925 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-08-24Remove obsolete comments regarding the shell version of make-dissector-regРоман Донченко13-65/+0
Change-Id: I93470e8c6e9afd6c1ebf735eb13141586964be0e Reviewed-on: https://code.wireshark.org/review/3818 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-08-18Revert "Fix warning: no previous prototype for ... [-Wmissing-prototypes]"Anders Broman9-20/+10
This reverts commit 9918435ed70a1e386e1501982c2bbe0eed25e723. Change-Id: I122b65ec59f48b8a21e2b43ccdad0ed146b0e78f Reviewed-on: https://code.wireshark.org/review/3702 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte9-10/+20
Change-Id: If41ffdfa15fb24af3e6846f1cfc855eb6cfffb77 Reviewed-on: https://code.wireshark.org/review/3699 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-1/+1
Add static before function Change-Id: Icb54ccf58e5752892e7217327380a0af7da45647 Reviewed-on: https://code.wireshark.org/review/3690 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18Add missing parameter to proto_tree_add_bytes_format_value()AndersBroman1-3/+3
tvb_lenght -> tvb_reported_length Change-Id: Ibcb4a7caceaa8207877bdec0f770ad77f84dbe56 Reviewed-on: https://code.wireshark.org/review/3701 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-18Remove proto_tree_add_text from gryphon dissector.Michael Mann1-78/+164
Change-Id: If9f85a6cda483c5b89f9bee3524502b888ccb1d1 Reviewed-on: https://code.wireshark.org/review/3676 Reviewed-by: Michael Mann <mmann78@netscape.net> Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-17DCERPC PN IO: Add modelines infoAlexis La Goutte1-0/+13
Change-Id: I124c5d38f8f3b4aee6d5dbee0367555742350e55 Reviewed-on: https://code.wireshark.org/review/3657 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17Wimax Plugins: Fix indent (use tabs) and modelinesAlexis La Goutte10-1992/+2109
Change-Id: I27a976c9cac598be5a90412da171915181a784d3 Reviewed-on: https://code.wireshark.org/review/3656 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-17Stats Tree: Add ModelinesAlexis La Goutte1-0/+13
Change-Id: Id4b2a2837377d52e9f6c9145f9fbed2465a538df Reviewed-on: https://code.wireshark.org/review/3654 Reviewed-by: Evan Huus <eapache@gmail.com>