Commit Graph

59025 Commits

Author SHA1 Message Date
Hadriel Kaplan 281055af9c Lua: add functions for more field information
Add Lua functions so a plugin can introspect field information, such
as the type of field, flags, tvb, etc. Also add a couple of Tvb and
ByteArray methods. And cleanup the TreeItem code a little.

Change-Id: I7b58ce589ace91cce14b8abccd01ceabb63e2653
Reviewed-on: https://code.wireshark.org/review/6500
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-09 01:49:11 +00:00
Alexis La Goutte 7b85f62ba3 service_response_time_dialog/response_time_delay_dialog(.h): fix '@return' command used in a comment that is attached to a function returning void [-Wdocumentation]
Change-Id: I84682651f40ab9e8f54a6ae656d0670096b5a3bc
Reviewed-on: https://code.wireshark.org/review/9559
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>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-09 00:28:42 +00:00
Alexis La Goutte ac7a46505f main_window(.h): fix parameter 'menu_path' not found in the function declaration [-Wdocumentation]
Change-Id: I98a9388f44fe38261fde5422ac821fbb6c1d993c
Reviewed-on: https://code.wireshark.org/review/9553
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-09 00:22:45 +00:00
Alexis La Goutte d88639cb4a qt_ui_utils.h: fix empty paragraph passed to '@return' command [-Wdocumentation]
Change-Id: I120ed85ee88253084646db4817ae77a8c90492f2
Reviewed-on: https://code.wireshark.org/review/9557
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-09 00:20:46 +00:00
Alexis La Goutte 9cb2f76ed3 ARP: Remove double space before Tell
Change-Id: I5d8f79e01912c010ca74a0134a0f397c62f1e106
Reviewed-on: https://code.wireshark.org/review/9556
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-09 00:19:59 +00:00
Gerald Combs a8faa04234 Qt: Add dynamic menu support.
Generalize the dynamic menu code and make it possible to connect
multiple types of actions to their corresponding slots.

Change-Id: Ib915ad5a666310e2a6e366fada006336820d1653
Reviewed-on: https://code.wireshark.org/review/9568
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-09 00:05:51 +00:00
Guy Harris 131e0ab7ea Handle setModule(NULL) more safely.
If module_name is null, we can't do much of anything - we don't have a
protocol ID, so we don't have a protocol.

Change-Id: I42c2fa4b47e39d7ac122c60be91b5d408bf30a1d
Reviewed-on: https://code.wireshark.org/review/9569
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-08 23:20:03 +00:00
Gerald Combs e312d41883 GTK+: Add a Telephony/ANSI menu placeholder.
Add REGISTER_STAT_GROUP_TELEPHONY_ANSI as well, and use it to add
recently updated stats.

Make sure we properly escape our path separators.

Change-Id: I979d5c29a82acddec1a9bcae7e3cb9c5ea3f9d33
Reviewed-on: https://code.wireshark.org/review/9564
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-08 23:01:49 +00:00
Guy Harris 5c8b92c28b Make sure we get the Qt tools for the Qt version with which we're building.
For example, Qt 4's uic produces .h files that don't compile with Qt 5,
as they use header #include paths that work with Qt 4's headers but not
Qt 5's headers.

Change-Id: I50c7bd15fca05475180a933a6c77955dc686c0c5
Reviewed-on: https://code.wireshark.org/review/9567
Petri-Dish: Guy Harris <guy@alum.mit.edu>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-08 22:10:05 +00:00
Martin Kaiser 6a35ee33ef dapp: cleanup, make elements filterable
don't squeeze all info into the subtree title
remove an unnecessary THROW()

Change-Id: I542f220d9d786d0fa879a0b2fe4549ffa1ca87af
Reviewed-on: https://code.wireshark.org/review/9544
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2015-07-08 22:02:44 +00:00
Bill Meier f96a5923c3 Revert "[ieee80211] Cleanup"
This reverts commit 89c24ee8e8.

Further investigation of unused functions required ....

Change-Id: I0c015cf067eaa0ce5bdafa0bce29bed373e9a82f
Reviewed-on: https://code.wireshark.org/review/9565
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-07-08 21:00:27 +00:00
Bill Meier 89c24ee8e8 [ieee80211] Cleanup
Primarily:
   Call fixed_field functions directly instead of doing a
   linear search by "function number" in a large table
   of dissector addresses to determine the function address
   for each function call.

   As part of this change,  the order of certain fixed_field
   functions was changed to fix any forward references.

Also:
   Spelling
   Whitespace

Change-Id: I9bb7e239086f9b65044929f2cb7e7f9d9b9adaee
Reviewed-on: https://code.wireshark.org/review/9563
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-07-08 20:00:12 +00:00
Jean Thomas ccdd4be568 GSM A RR: fix GSM H/L bits management
Bug: 11347
Change-Id: Iec48d52fd1f9c0669a7ef0cd95bf403025d477ae
Reviewed-on: https://code.wireshark.org/review/9562
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>
2015-07-08 19:24:35 +00:00
Hannes Mezger e0deadcbc7 opcua dissector: fix display of service type in packet column
The loop was iterating using g_NumServices, which is the number of entries in g_arParserTable and not the number of entries in g_requesttypes. Instead now we use val_to_str which can in addition display the ServiceId instead if not found in the table.

Change-Id: If15ee5c460e07c4687464805935b92c913392011
Reviewed-on: https://code.wireshark.org/review/9459
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-07-08 18:33:39 +00:00
Gerald Combs 4eca268935 Add SimpleStatisticsDialog.
To do:
- Refactor dynamic menu item placement.

Change-Id: I087de9f2fa3c2ff7dc08e5d54bc9c1b984fdd7b1
Reviewed-on: https://code.wireshark.org/review/9561
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-08 17:01:15 +00:00
Martin Mathieson d3f71f923a nb_rtpmux: Add a port preference
Add as a preference a UDP port range to register the dissector on. Also:
- show multiple frames in the Info column
- show summary (ports, length) in protocol root

Change-Id: I91d0a006cd8d0b97d2c6d65ae432fca3dff94733
Reviewed-on: https://code.wireshark.org/review/9558
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-07-08 15:22:08 +00:00
Martin Mathieson bd64be6444 RANAP: if bindingid looks like port number, extract and show
Change-Id: Ibfb98bf72ebbd620f21a13e5a4435144a8ef9f6a
Reviewed-on: https://code.wireshark.org/review/9560
Petri-Dish: Martin Mathieson <martin.r.mathieson@googlemail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com>
2015-07-08 14:27:45 +00:00
Graham Bloice 0997129e0f Fix CMake install of lua scripts
The CMake generation of all-manifest.nsh is missing the 3
lua scripts, init.lua, console.lua and dtd_gen.lua.

Change-Id: I2d34cfe075c5195d1d8816c0d816015195756fa2
Reviewed-on: https://code.wireshark.org/review/9551
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-07-08 10:21:25 +00:00
Joerg Mayer 8fdd49aaa1 Duplicate CheckCCompilerFlag for CXX.
Correctly detect that XCode7Beta1 does not support -fno-delete-null-pointer-checks
  by adding a new regex.

Change-Id: I76e0b6bb72094e6e75dae9be97bc7ee8e7051792
Reviewed-on: https://code.wireshark.org/review/9552
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-08 07:16:01 +00:00
Guy Harris d7f0118a74 Put back closing } accidentally removed in previous commit.
Change-Id: Ic02b0c86e55751a27d5d0417f4f5314def69e794
Reviewed-on: https://code.wireshark.org/review/9550
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-08 05:18:00 +00:00
Gerald Combs e93fa8a82d Add ResponseTimeDelayDialog.
Change-Id: Ie1ea316643a3465763aec71f4a3ef4bf1a5ae639
Reviewed-on: https://code.wireshark.org/review/9548
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-07 23:17:51 +00:00
Alexis La Goutte 5ccd8afe9f qt_ui_utils.h: fix @param command used in a comment that is not attached to a function declaration [-Wdocumentation]
Move class declaration on the top

Change-Id: I4ced45f2c677a41cc8f5180d2eb5d211f4c6e6c1
Reviewed-on: https://code.wireshark.org/review/9518
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-07 22:57:33 +00:00
Joerg Mayer 0619ed241c Finish removal of Q_UNUSED.
Todo: qcustomplot via upstream

Change-Id: I19cf98f1281ecb1f6efbb7d36c997d5aa43f5baf
Reviewed-on: https://code.wireshark.org/review/9547
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-07 22:17:22 +00:00
Joerg Mayer 51a37b666a Continuing to remove Q_UNUSED
Change-Id: I54bc4a1b7d39abd1bb88ee361b0de5fcbca1efe8
Reviewed-on: https://code.wireshark.org/review/9546
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-07 21:50:17 +00:00
Gerald Combs e91ca72a44 Qt: Add initial Lua support.
Add a FunnelStatistics class, which is the main interface between the Qt
UI and the Funnel API.

Add FunnelTextDialog, which implements the text_window, ProgDlg, menu,
and other routines. Add FunnelStringDialog, which implements dlg_new.

We currently only support "Tools" menu items (MENU_TOOLS_UNSORTED, aka
REGISTER_TOOLS_GROUP_UNSORTED). Add a disabled placeholder to the
"Tools" menu in case we don't load any scripts.

Use "struct progdlg" instead of needlessly casting to
funnel_progress_window_t.

To do:
- Add support for MENU_STAT_UNSORTED, MENU_STAT_GENERIC, etc.
- Make the firewall config generator a Lua script?
- Add FunnelGraphDialog? It seems like it would be useful to
  make QCustomPlot accessible to Lua scripts.

Ping-Bug: 9845
Change-Id: Iefff02e9032ed1853666f7902509ed08b431e7a7
Reviewed-on: https://code.wireshark.org/review/9523
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-07 20:49:30 +00:00
cbontje e9622175f7 Added support for optional display of signed 16/32-bit integer Modbus register data
Change-Id: I2a81fdf426fdc20db200596ccd2eae26936fc81a
Reviewed-on: https://code.wireshark.org/review/9526
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-07 19:57:15 +00:00
Guy Harris b8f3888141 Add #defines for various aggregation flags, and use them.
Fewer magic hex numbers, more readability.

Change-Id: I698e0e9b28b75249c7dff5f1e1c7fbe0b4a93be2
Reviewed-on: https://code.wireshark.org/review/9543
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-07 17:43:48 +00:00
Hadriel Kaplan 4f1a81871a MySQL: use tvb_format_text instead of format_text/tvb_get_ptr
Bug: 11344
Change-Id: Ibddbcce3e6e98bc3866cab9eb76e9762e4d19138
Reviewed-on: https://code.wireshark.org/review/9538
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-07 16:48:47 +00:00
Guy Harris 813a1fb5be Initialize the 11b presence flag to 0.
There were some cases where it wasn't getting initialized when we set
the PHY to 11b, in addition to the one Pascal found.

Change-Id: I127737cd29dc53c96342364de5cb722b135f23f3
Reviewed-on: https://code.wireshark.org/review/9540
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-07 16:44:53 +00:00
Pascal Quantin 5b76ef3965 Next Windows Server version seems to be named Windows Server 2016 now
Change-Id: I31fb5495f5e17ccba1578a069ca33448a291923f
Reviewed-on: https://code.wireshark.org/review/9539
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-07 16:30:36 +00:00
Pascal Quantin f4ce6cbf28 PPI: initialize optional presence flags bitmap when using 802.11B
Bug: 11346
Change-Id: I3c80bda24af0c981c75e6d815dd2a1d328e9eb41
Reviewed-on: https://code.wireshark.org/review/9536
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-07 16:17:54 +00:00
Pascal Quantin a908cf07ca ixveriwave: comment pcp_type variable as it is not used yet
Change-Id: If4751f1044282579c8741b57579a5f2e8f9f393c
Reviewed-on: https://code.wireshark.org/review/9535
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-07-07 12:36:50 +00:00
Guy Harris 30d82a423e Actually, user_data *is* used there.
Change-Id: Ic22741e6551b5ec2eb76408ff8521067d9d40a88
Reviewed-on: https://code.wireshark.org/review/9534
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-07 07:47:16 +00:00
Guy Harris 53fcaabe66 Use the NSS provided by the Ixia Veriwave hardware.
It doesn't appear to provide the FEC type, although radiotap does, so
add a flag to indicate whether we have that.

Change-Id: I298d79bc6b640ee2408c3d70075c32bf331a210c
Reviewed-on: https://code.wireshark.org/review/9533
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-07 07:40:31 +00:00
Joerg Mayer 21754f43e1 Starting to get rid of Q_UNUSED declarations for unused function parameters.
The official C++ way is to leave out the variable name instead. This has the
advantage to be reliable: In one case a variable declared unused was later
used.

Change-Id: I1c96636f7fa7a621d1594d1e9cacaec75c561faa
Reviewed-on: https://code.wireshark.org/review/9532
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2015-07-07 06:29:31 +00:00
Evan Huus aca5f4ee2d Revert "diameter: convert some GArrays to epan wmem_arrays"
This reverts commit 59017a22be.

As indicated by Michael on the original change, this breaks
diameter rather badly for some reason I haven't been able to
determine. Reverting until I can track down the root cause.

Change-Id: Iedfab546a726395c546a88138cd45b6667913a11
Reviewed-on: https://code.wireshark.org/review/9531
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-07-07 02:07:35 +00:00
Hadriel Kaplan 5999b97013 MySQL: dissector adds packet content to INFO column without scrubbing it
Make the MYSQL protocol dissector scrub the strings from the packet content by
putting it through format_text() to remove/replace CR, LF, TAB, etc. The
fields affected are: query string, greeting version string, login username,
and login schema.

Bug: 11344

Change-Id: Ie1a593026c21720eecc77e7b3a7e63db11adf2a1
Reviewed-on: https://code.wireshark.org/review/9530
Petri-Dish: Hadriel Kaplan <hadrielk@yahoo.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-07 01:00:51 +00:00
Guy Harris 8ebf735c90 Clean up a bunch of stuff.
The command byte values aren't FPGA-specific - if they were, the code
wouldn't have worked.  Provide #defines for the main ones and check for
them, and use that to determine whether the packet is transmitted or
received.

Add a bunch of #defines, shuffle some defines to cluster related ones
together and separate unrelated ones, get rid of duplicate #defines
(where different FPGAs use the same value).

Fix some typoes.

Change-Id: Ic8adc589d7c36a4a91a81858de40c904743dd067
Reviewed-on: https://code.wireshark.org/review/9529
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-06 23:46:37 +00:00
Guy Harris 886c2d008f Update a comment.
Change-Id: I71e66a8f6faf3b213ab6db2856a36c1d31897166
Reviewed-on: https://code.wireshark.org/review/9527
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-06 21:54:46 +00:00
Luca Melette e7dfcbaee2 GTP fixes: RAB setup and PDP context prio
Change-Id: Ie250eaf17136076dbb3e44ac15b222a8b2e367ac
Reviewed-on: https://code.wireshark.org/review/9520
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
2015-07-06 21:43:59 +00:00
Bill Meier e55e785ed6 [ieee80211] Fix proto_tree_add_item() reversed offset,length args
Change-Id: I2bb087138de662fd41301b93ef9804345c0875b8
Reviewed-on: https://code.wireshark.org/review/9521
Reviewed-by: Bill Meier <wmeier@newsguy.com>
2015-07-06 16:11:18 +00:00
Hadriel Kaplan d29c5eb710 Rawshark calls init_process_policies() twice
Calling it twice won't make it work any better.

Change-Id: I30fea0ba2ccf6ebfb6caf6a58333cee9b192e4cb
Reviewed-on: https://code.wireshark.org/review/9513
Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com>
2015-07-06 04:01:12 +00:00
Guy Harris 0b4cd71ce1 Add some comments.
OK, where's NSS for the presumably-one-and-only user hiding for 11ac?

Change-Id: I53eb216c5d209dc5bb46c1d0aca7f8a200161e3e
Reviewed-on: https://code.wireshark.org/review/9512
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-06 02:11:50 +00:00
Guy Harris a7ac6cf048 Stub out the US public safety band.
OK, anybody know how to convert a frequency between 4.9 GHz and 5.0 GHz
into a channel number, in a fashion that handles what's actually used in
both the US and Japan?

Change-Id: I95f4f9649e379b3d6651aadf8f62d8406b81b3b3
Reviewed-on: https://code.wireshark.org/review/9511
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-06 02:07:08 +00:00
Guy Harris 94eb30ab04 Add a comment.
Why, oh why, are channel numbers used for 802.11?

Change-Id: Ie26987dfeaad2ce0ead0eef72339f966aadeeecd
Reviewed-on: https://code.wireshark.org/review/9510
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-06 02:04:06 +00:00
Evan Huus 35399887f4 prefs: fix memory leak reading capture columns
Change-Id: I925ec3329cc099a5f3d2ae66e43b06fc52309dc8
Reviewed-on: https://code.wireshark.org/review/9504
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>
2015-07-06 00:26:03 +00:00
Guy Harris ef1f0c167b Use space indentation consistently.
Change-Id: I1af52157a8c7383981c514d9dddea3b7186dbe6d
Reviewed-on: https://code.wireshark.org/review/9509
Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-07-05 23:32:26 +00:00
Tyson Key fbd81bfd6f Associate the file-mp4 dissector with the audio/mp4 MIME type
Bug:11338
Change-Id: Ied463ea5ef65bcc657e09c0d5f7983cb4dcd581a
Reviewed-on: https://code.wireshark.org/review/9503
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-05 21:35:54 +00:00
Alexis La Goutte 1aecd8867f rtd_table.h: fix parameter 'rtd_stat_table' not found in the function declaration [-Wdocumentation]
Change-Id: Ie31efc352b5f51808aa9f3d1e6b00734ccc38bfe
Reviewed-on: https://code.wireshark.org/review/9507
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-05 21:22:10 +00:00
Alexis La Goutte 3658a0434f RPC: Fix Dead Store (Dead assignement/Dead increment) warning found by Clang
Change-Id: Iea6529d8fb43d1cea723c92b3b348029c39c0c8d
Reviewed-on: https://code.wireshark.org/review/9506
Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-05 21:21:27 +00:00