aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
AgeCommit message (Collapse)AuthorFilesLines
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>
2014-08-16Fix warning: no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte1-0/+1
Change-Id: I6e545cb85b6a75cde0ca6c41c57e8c7d69ae4dcb Reviewed-on: https://code.wireshark.org/review/3631 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-12Remove make-dissector-reg and require python for autotool builds as wellJoerg Mayer13-156/+52
Change-Id: I6239063a08ba37199a4e95302a3650a80544c750 Reviewed-on: https://code.wireshark.org/review/3562 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-08-09Now that Python is mandatory on Windows, remove checks for it from nmakefilesРоман Донченко13-156/+13
Change-Id: I2ca6abb372ec4bda0af1aa40089082533a61df3a Reviewed-on: https://code.wireshark.org/review/3392 Petri-Dish: Evan Huus <eapache@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-08-05Fix Bug #10348 Different dissection results for same file.AndersBroman1-90/+99
The fault is that reassembly_table_init() must be called when reloading the file - move it to an init routine and register the init routine. While there move the proto_register_opcua() routine to the end of the file to be more consistent with other dissectors. Change soft deprecated APIs Change-Id: I2b93692be24dbf60f4ef09aa7283e55ebf3c1874 Reviewed-on: https://code.wireshark.org/review/3431 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-08-01Add the easy_codec plugin to the source distribution.Jeff Morriss2-0/+35
It doesn't build on Linux but cmake looks for it (won't build without it) and Windows users might want it. Change-Id: I978f0de0a2895a82f4f3b8c1e9e0ecec6a93e6f4 Reviewed-on: https://code.wireshark.org/review/3325 Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
2014-07-31Add more files to the release tarball.Guy Harris2-2/+16
Change-Id: I02ce275154979ff56f8f8929e5909f3035f62c47 Reviewed-on: https://code.wireshark.org/review/3286 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-30fix encodingmask of DiagnosticInfoHannes Mezger1-4/+16
In 2008, before the OpcUa specification was released, the EncodingMask was changed to include the Locale after the LocalizedText. This commit applies the changes necessary to display DiagnosticInfo correctly. Change-Id: Iad35ff0557eac62a259a63505ebce3e637095136 Reviewed-on: https://code.wireshark.org/review/3259 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-30Convert tvb_get_ptr buffer access macros to use much safer tvb access macros.Michael Mann4-379/+426
Added a few filterable fields in the process of trying to figure out the macros. Much more can be done to add many more filterable fields (and remove proto_tree_add_text calls hidden in the macros), but that'll be done some other time. bug:10281 Change-Id: I9788f176c0e721ff4f243d4ecb79d7d0114fffc0 Reviewed-on: https://code.wireshark.org/review/3262 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-07-25Replace lseek/fstat by ws_lseek64/ws_fstat64Peter Wu1-2/+2
lseek returns an off_t type which is system-dependent. Use ws_lseek64 in favor of lseek as that supports 64-bit quanities. Use ws_fstat64 instead of stat to support 64-bit file sizes on Windows. For the majority of the changes, this makes no difference as they do not apply to Windows ("ifndef _WIN32"; availability of st_blksize). There are no other users of "struct stat" besides the portability code in wsutil. Forbid the use of fstat and lseek in checkAPIs. Change-Id: I17b930ab9543f21a9d3100f3795d250c9b9ae459 Reviewed-on: https://code.wireshark.org/review/3198 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-20Use forward slashes in paths to runlex.shРоман Донченко2-2/+2
This gets rid of "MS-DOS style path detected" warnings from Cygwin. Change-Id: Id10429669704aa371dbf56a9398947c8002260ad Reviewed-on: https://code.wireshark.org/review/3024 Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Wireshark Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2014-07-11Strip some trailing whitespace; Fix some indentation; Add editor-modelines ↵Bill Meier1-1/+1
as needed. Change-Id: I943153e28f468070d86535abad7be032e1386118 Reviewed-on: https://code.wireshark.org/review/2994 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-10convert to proto_tree_add_subtree[_format] for plugin dissectorsMichael Mann26-868/+469
Change-Id: I13924c5a2f056688a42cdee25654d82c056b5f97 Reviewed-on: https://code.wireshark.org/review/2974 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-07-10Revert "More needed to get rid of "lib" in "libwsutil" on Windows."Guy Harris5-5/+5
This reverts commit 28719a4e4e01b478889dab9611fed517e506360e. Most of the change to remove "lib" seems to work, but the list of libraries to sign appears not to be in the source repository, so I can't make that step work. Change-Id: I32e400593e8a39f582cc702df34eea7f6e9e722a Reviewed-on: https://code.wireshark.org/review/2972 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-09More needed to get rid of "lib" in "libwsutil" on Windows.Guy Harris5-5/+5
Change-Id: Iffc12ce67a8245e96eac3cf253641a15385001a9 Reviewed-on: https://code.wireshark.org/review/2969 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-07Squelch compiler warning.Guy Harris1-1/+1
Change-Id: I37c495cb4d68b95d8388c654bbf6a817167261ac Reviewed-on: https://code.wireshark.org/review/2909 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-07-06Add printf-format annotations, fix garbagePeter Wu4-5/+19
The WRETH dissector showed up some garbage in the column display. Upon further inspection, it turns out that the format string had a trailing percent sign which caused (unsigned)-1 to be returned by g_printf_string_upper_bound (in emem_strdup_vprintf). Then ep_alloc is called with (unsigned)-1 + 1 = 0 memory, no wonder that garbage shows up. ASAN could not even catch this error because EP is in charge of this. So, start adding G_GNUC_PRINTF annotations in each header that uses the "fmt" or "format" paramters (grepped + awk). This revealed some other errors. The NCP2222 dissector was missing a format string (not a security vuln though). Many dissectors used val_to_str with a constant (but empty) string, these have been replaced by val_to_str_const. ASN.1 dissectors were regenerated for this. Minor: the mate plugin used "%X" instead of "%p" for a pointer type. The ncp2222 dissector and wimax plugin gained modelines. Change-Id: I7f3f6a3136116f9b251719830a39a7b21646f622 Reviewed-on: https://code.wireshark.org/review/2881 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-07-06make-dissectors-reg: optimize by factoring out the loopsРоман Донченко26-130/+130
Instead of calling the grep/sed pipelines for each file, build the list of files in the beginning and call each pipeline only once, passing the list to the first grep. This results in a massive speedup in Cygwin; in my test, the time it takes to run make-dissector-reg . dissectors packet-*.c in dissectors/epan is reduced from ~116 to ~3 seconds. I also tried it on NetBSD, where the time do to the same goes from ~6 to ~0.5 seconds. Amend makefile comments to elide mentions of invoking multiple processes per file. Change-Id: Iad441e7d2b6cc3669dada57646e2f8f6b987fd34 Reviewed-on: https://code.wireshark.org/review/2826 Reviewed-by: Anders Broman <a.broman58@gmail.com>