aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
AgeCommit message (Collapse)AuthorFilesLines
2015-01-20CMake: Set an output directory for plugins.Gerald Combs14-537/+49
Redefine PLUGIN_DIR similar to DATAFILE_DIR and use it on all platforms. Add WiresharkPlugin.cmake so that we can start defining common macros for plugins/*/CMakeLists.txt. Load plugins in out-of-tree builds. Change-Id: I8c1359ed3cf8a71788b8320ff89dfe2d3969def2 Reviewed-on: https://code.wireshark.org/review/6640 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-18Remove some apparently-unnecessary includes of emem.h.Guy Harris1-1/+0
Change-Id: Id50ce3e707056cca8f30052f05c451ce431b39b5 Reviewed-on: https://code.wireshark.org/review/6632 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-17A few more emem replacements with wmem.Michael Mann1-6/+5
Change-Id: Icfb319fba937642db637a7f26b5e7627461df3b0 Reviewed-on: https://code.wireshark.org/review/6590 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-15mate_util: fix parameter ... not found in the function declaration ↵Alexis La Goutte1-3/+3
[-Wdocumentation] Change-Id: I66af53ee06866b45339814b5fa949551c0dd45c1 Reviewed-on: https://code.wireshark.org/review/6535 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-13Consistently use the "g_string_free returns a C string pointer" idiom.Guy Harris2-6/+3
g_string_free(str, FALSE) frees the GString container but not the underlying g_malloc()ed string; instead, it returns a pointer to the g_malloc()ed string. Fix those places that didn't already get the string pointer from g_string_free() to do so rather than manually extracting the string themselves. And fix one place that didn't even need to use a string - it was just scanning a C string without even modifying it. Change-Id: Ibbf4872bf5b9935b9907f539b6edb1013f3053a5 Reviewed-on: https://code.wireshark.org/review/6532 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-13UAT error string pointers should not be const pointers.Guy Harris1-1/+1
UAT error strings are usually allocated by g_strdup() or g_strdup_printf(), and must ultimately be freed by the caller. Make the pointer-to-error-string-pointer arguments to various functions be "char **", not "const char **". Fix cases that finds where a raw string was being used, as that won't work if you try to free it; g_strdup() it instead. Add a missing free of an error string. Remove some no-longer-necessary casts. Remove some unnecessary g_strdup()s (the string being handed to it was already g_malloc()ated). Change some variable declarations to match. Put in XXX comments for some cases where the error string is just freed, without being shown to the user. Change-Id: I40297746a2ef729c56763baeddbb0842386fa0d0 Reviewed-on: https://code.wireshark.org/review/6525 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-12Remove emem APIs from UAT functionality.Michael Mann1-1/+5
Change-Id: I009c09f25d170e5c9aaaef713eaacb3252817856 Reviewed-on: https://code.wireshark.org/review/6460 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Petri-Dish: Anders Broman <a.broman58@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-12msg_rng_rsp (Wimax): fix Copy-paste error (CID 11158604)Alexis La Goutte1-1/+1
Change-Id: I134d8178d741d741404963a89f60e1d1bfd9a2dd Reviewed-on: https://code.wireshark.org/review/6473 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-11Fix CMake generation and use of Windows .rc filesGraham Bloice27-26/+334
CMake now generates local copies of .rc files for all the Windows components and uses the files in the build of the components. The .rc.in files that include an icon were modified to allow the icon path to be set by CMake. The path is removed for nmake builds. Updated build architecture detection, required for wireshark.manifest.in Change-Id: I7b1ff43050e9b0efb861d1041636fb4aef49a4f8 Reviewed-on: https://code.wireshark.org/review/6482 Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
2015-01-11Revert "Lemon: Update lemon tools"Pascal Quantin3-3/+3
This reverts commit 5855dd8d538eb81d4825961b1bf0d583bf96f751. This Lemon update fails to compile on OSX and triggers asserts on other platforms Change-Id: I12a8a2bf32db31e5a9b0cb1a67a39724e30f3e91 Reviewed-on: https://code.wireshark.org/review/6496 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-11Lemon: Update lemon toolsAlexis La Goutte3-3/+3
Fix warning: declaration shadows a variable in the global scope [-Wshadow] Add include <config.h> Fix warning: unused parameter 'argc' [-Wunused-parameter] (using _U_) Fix implicit conversion loses integer precision Fix comparison of integers of different signs: 'size_t' (aka 'unsigned long') and 'int' [-Wsign-compare] Fix function declaration isn’t a prototype [-Wstrict-prototypes] Fix warning: old-style function definition [-Wold-style-definition] Fix trailing whitespace Fix use -T for template for epan\Makefile.nmake, epan\dfilter\Makefile.nmake, plugins\mate\Makefile.nmake, plugins\tpg\Makefile.nmake and cmake/modules/UseLemon.cmake Fix -Wmissing-prototypes Remove unused function (acttab_free) Add basename the filename with only filename (no path...) Change-Id: Ia79f61e29f828575df61cc89134c6c553044e86d Reviewed-on: https://code.wireshark.org/review/3976 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-08Unistim: Nesting level does not match indendation (CID 1159216)Alexis La Goutte1-3/+1
Change-Id: I024f47a41328ea7e8db3c79012b892f3cb48caad Reviewed-on: https://code.wireshark.org/review/6376 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08guid_to_ep_str -> guid_to_strMichael Mann1-8/+11
guid_to_str now uses wmem allocation. Change-Id: I8e48d1a720942fbefbaa6227ae0929cb9f856359 Reviewed-on: https://code.wireshark.org/review/6391 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-01-08packet-irda.c: Add editor modelinesBill Meier1-0/+13
Change-Id: I626b60a185e750af94306892cd41dc8729920cfd Reviewed-on: https://code.wireshark.org/review/6393 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-06Replace ep_address_to_str with address_to_str.Michael Mann1-7/+7
Change-Id: I4f1078b20f41800f72a751612703ad0d4c2ae87b Reviewed-on: https://code.wireshark.org/review/6323 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>
2015-01-06[PROFINET] v2: Fix swapped MaintenanceRequired & MaintenanceDemanded bitsAnish Bhatt1-2/+5
Fix the correct code path this time. Bug: 10753 Change-Id: I7bc2e74c91868986303e8b41b25e43a665be1860 Reviewed-on: https://code.wireshark.org/review/6335 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-06Revert "[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bits"Anish Bhatt1-8/+8
This reverts commit 0452f763fb0dd2cf7e38f0a127c306199a814c3e. Changes should have been made in ChannelProperties instead of Submodule state. Current implementation merely *appears* to be correct as we are reading it as a two bit value but instead should be addressing it as individual bits, little endian Bug: 10753 Change-Id: Ia3bd088aeb376b8511d64352f62c4304e4129ba6 Reviewed-on: https://code.wireshark.org/review/6334 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-01-05Wimax: fix no previous prototype for ... [-Wmissing-prototypes]Alexis La Goutte3-1/+3
Change-Id: I1dac7d362bab680c313766de19d51132d1ce6dfa Reviewed-on: https://code.wireshark.org/review/6298 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>
2015-01-04Fix linkage on Windows machinePascal Quantin1-1/+1
Change-Id: I24c8670fdf0910c3324fcfa8db8a8dbaad1dfbba Reviewed-on: https://code.wireshark.org/review/6305 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-01-04Create BASE_DOT, BASE_DASH, and BASE_SEMICOLON types for the FT_BYTES field ↵Michael Mann1-1/+1
type. These "bases" will put a ".", "-", or ":" respectively between hexidecimal bytes in the field in packet view and display filter. FT_BYTES with BASE_NONE will have no separator in the packet view, but continue to have the ':' as a separator in the display filter. Converted the "string" hf_ entries that used tvb_fc_to_str as a string to use proto_tree_add_item with FT_BYTES/BASE_DOT type. Converted applicable tvb_bytes_to_ep_str_punct() calls to use the new BASE values. Change-Id: I2442185bb314d04a3ff2ba57883652ecd738b5f9 Reviewed-on: https://code.wireshark.org/review/6098 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-04stats tree plugin: fix no previous prototype for ↵Alexis La Goutte1-0/+2
'plugin_register_tap_listener' [-Wmissing-prototypes] Change-Id: If8ea78b9aceb9dbd7f2103aa141b57715188ff4f Reviewed-on: https://code.wireshark.org/review/6297 Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-03[PROFINET] Fix swapped MaintenanceRequired & MaintenanceDemanded bitsAnish Bhatt1-8/+8
Bug: 10753 Change-Id: Ib5522eba5c1d9107219ee2d70c96899ba6f22ca1 Reviewed-on: https://code.wireshark.org/review/6258 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-01-02Add '*.nativecodeanalysis.xml' to 'clean' targetsBill Meier15-15/+15
Change-Id: I90dbf0b31fc737150a01533763a7869b34c68cb6 Reviewed-on: https://code.wireshark.org/review/6220 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-01-01Rename a variable to avoid a compiler warning.Guy Harris1-3/+3
(Thanks, IBM and AT&T.) Change-Id: Ifcffd4937f90ca466c01ebc4f3e3bd8555a9b078 Reviewed-on: https://code.wireshark.org/review/6198 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Eliminate proto_tree_add_text from WiMax plugin.Michael Mann6-892/+2228
Most of this was done with a custom perl script that picked out the field names from the XBIT macro and generated an hf_ and filter (that was humanly tweaked from there). Change-Id: I563db9f8ea216efe37322b784ab0daf25c038d9e Reviewed-on: https://code.wireshark.org/review/6149 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-12-31Remove proto_tree_add_text from packet-dcerpc-pn-io.cMichael Mann1-3/+7
Change-Id: Ia144061dc8c394d9ae89135009d06457e2aabb7d Reviewed-on: https://code.wireshark.org/review/6152 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29Wimaxasncp: Fix Dead Store (Dead assignement/Dead increment) warning found ↵Alexis La Goutte1-2/+0
by Clang Change-Id: Ie2808d20a7f8e28bfe9b929b1b222a901a29f510 Reviewed-on: https://code.wireshark.org/review/6120 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.Michael Mann1-13/+3
Change-Id: I1d258923a7a63539ec8456d3e306bca5016a1e4b Reviewed-on: https://code.wireshark.org/review/6060 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-26Fix assertion when applying conversation colorPascal Quantin1-16/+16
Packet scoped memory cannot be used here; let's use the pinfo pool Change-Id: If76605f7a3021f5900fd46ce7d1c642a518c902f Reviewed-on: https://code.wireshark.org/review/6061 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-26Replace ip_to_str with [ep_]address_to_str and tvb_ip_to_str.Michael Mann5-53/+60
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71 Reviewed-on: https://code.wireshark.org/review/5934 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-23DOCSIS: missing break in switch (CID 280485 & 280486)Alexis La Goutte2-0/+2
Change-Id: I5b756b96ca6c3c48a43948d456bfcb07aab527fd Reviewed-on: https://code.wireshark.org/review/5994 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-22Fix unknown command tag name [-Wdocumentation-unknown-command]Alexis La Goutte1-3/+3
Change-Id: I6c2564a86e13d9321001856ba1f51681a9f20976 Reviewed-on: https://code.wireshark.org/review/5979 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22plugins: Cleanup #includesBill Meier75-122/+30
Change-Id: Ic839f2995532d68308f8b5908c185acc7acaaa9c Mostly: remove '#include <glib/glib.h>' and certain other #includes already included in packet.h Reviewed-on: https://code.wireshark.org/review/5971 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-12-21Replace ether_to_str with either address_to_str or tvb_ether_to_str.Michael Mann2-12/+27
Change-Id: I8cce9fddbfe950e27e96ea8a5a6d2e0921ff4260 Reviewed-on: https://code.wireshark.org/review/5933 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> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-21Have a heur_dissector_list_t be an opaque handle.Guy Harris3-3/+3
This allows dissector lists to be looked up by name, so they can be shared by multiple dissectors. (This means that there's no "udplite" heuristic dissector list, but there shouldn't be one - protocols can run atop UDP or UDPLite equally well, and they share a port namespace and uint dissector table, so they should share a heuristic dissector table as well.) Change-Id: Ifb2d2c294938c06d348a159adea7a57db8d770a7 Reviewed-on: https://code.wireshark.org/review/5936 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-21Remove profinet_type from packet_info structure.Michael Mann2-35/+43
Profinet I/O and DCOM CBA had completely separate uses for the profinet_type member, so it's okay to separate them with different proto ids tracking the proto_data. Change-Id: I7b9c01b8d4f74d51fe9f9ef2f957479dff0a7157 Reviewed-on: https://code.wireshark.org/review/5852 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-12-19Use new color_dissector_filters.[ch] to refactor (color) conversation ↵Michael Mann1-1/+1
generation in GTK menus. Change-Id: I5868a40b71a989a3a1522cb091064bb0aaec6daf Reviewed-on: https://code.wireshark.org/review/5828 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-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>