aboutsummaryrefslogtreecommitdiffstats
path: root/wireshark-qt.cpp
AgeCommit message (Collapse)AuthorFilesLines
2015-12-14Make init_progfile_dir() take a function pointer [-Wpedantic]João Valverde1-1/+1
Change-Id: I45f8ea5ee6ccc5a484c60ad6e686aaf30f6b0c98 Reviewed-on: https://code.wireshark.org/review/12557 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-12-13Qt: Start with correct seconds formatStig Bjørlykke1-1/+1
Set seconds type from recent values at startup. Change-Id: I761f4e25f41cf9eae666196fe5cd69ef9f87556f Reviewed-on: https://code.wireshark.org/review/12582 Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-12Remove -Wwrite-strings compiler flagJoão Valverde1-7/+5
The "-Wwrite-strings" flag produces nuisance warnings. These warnings are not useful, they're impossible to fix in a sane way and therefore are being handled with casts of static strings to (char *). This just moves the warning to [-Wcast-qual] and a compiler pragma is in turn required (and used) to squelch that warning. Remove the Wwrite-strings warning. Let that responsibility fall on the programmer (as is done by casting). Change-Id: I5a44dfd9decd6d80797a521a3373593074962fb5 Reviewed-on: https://code.wireshark.org/review/12162 Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-12-10Qt: Reset preferences when reloading Lua pluginsStig Bjørlykke1-1/+1
Reading configuration files may duplicate some entries, so ensure we reset preferences before reloading. Change-Id: I746414cbc10c206ddf47669856f329b9e0202a0d Reviewed-on: https://code.wireshark.org/review/12496 Petri-Dish: Stig Bjørlykke <stig@bjorlykke.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Stig Bjørlykke <stig@bjorlykke.org>
2015-12-04More libcodecs -> libwscodecs.Guy Harris1-1/+1
Change-Id: Ieb0bb131b6d141bf85997c9a0127e0eb11ea3a3b Reviewed-on: https://code.wireshark.org/review/12420 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-11-11Update user guide for development releasePascal Quantin1-1/+1
Change-Id: I9b4c5ab2e98ad6daa618bcda20b53a23467e16e0 Reviewed-on: https://code.wireshark.org/review/11734 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-10-28Catch REPORT_DISSECTOR_BUG() calls in dissector registration routines.Guy Harris1-2/+5
Have epan_init() return a success/failure Boolean indication. Catch exceptions when calling the dissector registration routines and, if we get one, report the error and return a failure indication. If epan_init() fails, quit, but first make sure the reported error is displayed. Change-Id: I0300cbb1f66a5644f857a205235124909d684c50 Reviewed-on: https://code.wireshark.org/review/11340 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-10-04Fix various memleaksPeter Wu1-8/+8
Found by starting Wireshark within an empty profile, opening Preferences, search for Protocol "IEEE 802.11" (because it has radio buttons), then close everything again. Many fixes are trivial, but the various recent_read_* functions in recent.c were changed to return a boolean such that the result can always be checked even if errno==0. QButtonGroup leak was hinted by Clang Static Analyzer, all other memleaks were found using ASAN/LSan. Change-Id: Ia73f5d4c09d92f22e72377be59e23342f8ad7211 Reviewed-on: https://code.wireshark.org/review/10776 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: Alexis La Goutte <alexis.lagoutte@gmail.com>
2015-10-02Qt: Show the QtMultimedia status.Gerald Combs1-1/+5
Show the QtMultimedia status in the compiled version info instead of PortAudio. Change-Id: Id4a657b1a65e4d0127a3a36643d1c446ed79b8e5 Reviewed-on: https://code.wireshark.org/review/10742 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-09-11Fix a bunch of leaks found by Valgrind.Gerald Combs1-2/+2
Change-Id: I8862ed15d354aee487bacd80ab5fb4918423287e Reviewed-on: https://code.wireshark.org/review/10487 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-25DNS: move DNS name resolution pref to Name Resolution prefsHadriel Kaplan1-6/+3
Move the boolean flag for using captured DNS packet info for name resolution to the Name Resolution preferences settings, as it was rather surprising to disable Name Resolution preferences and still have names being resolved. Also disble them all if the '-n' command line switch is used, and re-enable it for a 'd' character in the '-N' option. Bug: 10337 Change-Id: Ie4d47bab0100db3360cc447cd3e446b2e39aa917 Reviewed-on: https://code.wireshark.org/review/9786 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-22Fix retrieval of data link type supported by remote interfaces with ↵Pascal Quantin1-2/+2
authentication Make use of -A parameter when querying data link types supported by a given interface with dumpcap. Ensure to pass the authentication parameters configured for a remote interface when calling capture_get_if_capabilities() Bug: 11366 Change-Id: I4efea615084a82108e4a12a64e8c46817f30a5c6 Reviewed-on: https://code.wireshark.org/review/9690 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> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-07-17Add new long options to GUIs to allow arbitrary protocols and heuristics to ↵Jim Young1-0/+43
be disabled via command-line Future: Allow multiple protocols to be disabled in one option statement (perhaps using a comma or colon delmited set of names in <proto_name>) instead of having to specify --disable-protocol <proto_name> multiple times. Change-Id: I9b8f960acf75298ebb098d9b667fca49dca52306 Reviewed-on: https://code.wireshark.org/review/9631 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-15Qt: fix detection of WinPcap / AirPcapPascal Quantin1-52/+51
Libraries must be loaded before calling get_runtime_version_info() Change-Id: Ic95ccde4ce80338b058a22a653736b663c517b38 Reviewed-on: https://code.wireshark.org/review/9637 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-14Add a "heuristic dissectors" tab to the Enable Protocols dialog.Michael Mann1-0/+1
This allows for a global place to enable/disable all heuristic dissectors. This removes the need for individual dissector preferences, but those will be removed at a later date. The more important part is the epan code to save/restore the enabled state of the heuristic dissector. The GTK dialog was more for quickly testing the feature (there was already some GTK code in place that started the heuristic dialog tab) Change-Id: Ie10687505c27a4456c49d5c4c69a5fc5f6394275 Ping-Bug:11152 Reviewed-on: https://code.wireshark.org/review/9508 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-07-08Add SimpleStatisticsDialog.Gerald Combs1-0/+2
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-07Add ResponseTimeDelayDialog.Gerald Combs1-8/+10
Change-Id: Ie1ea316643a3465763aec71f4a3ef4bf1a5ae639 Reviewed-on: https://code.wireshark.org/review/9548 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-07-03Add ServiceResponseTimeDialog.Gerald Combs1-20/+23
Add ServiceResponseTimeDialog as a subclass of TapParameterDialog, similar to StatsTreeDialog. Add initial plumbing for statistics menu items and command line invocation. Don't append "..." to menu item names. Don't add menu icons. In each case this avoids repetitive UI clutter. Change-Id: I463b95c93090160bb81d2e80b16aad389dc0bd6c Reviewed-on: https://code.wireshark.org/review/8864 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
2015-06-17Qt: fix a crash when closing application under WindowsPascal Quantin1-8/+14
QCoreApplication visits eldritch horrors upon argv on Windows. Keep a local copy for our own processing. --- [ Pascal's original comments ] g6c4ec4a introduced the use of arg_list_utf_16to8 that triggers a crash on my computer when freeing the g_allocated memory. Let's do a similar work but with a memory allocator that does not trigger an exception. Also fix a memory leak in arg_list_utf_16to8 while we are at it. Change-Id: I93d899af20b09c9a5d584a46297f715591502df9 Reviewed-on: https://code.wireshark.org/review/8961 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-06-16Qt: Make sure we have usable command line arguments.Gerald Combs1-11/+16
Call arg_list_utf_16to8 in wireshark-qt.cpp on Windows. Set our default codec in Qt4 to UTF-8 before doing so. Bug: 11276 Change-Id: I8e0afb9523ddb5956d30424b7b7ad7f3ea0838c7 Reviewed-on: https://code.wireshark.org/review/8954 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-16Add the wireless toolbar.Gerald Combs1-7/+4
Add the wireless toolbar to the Qt UI. Start adding AirPcap support to ui/80211_utils. Add FCS validation routines to ws80211_utils. Move a bunch of AirPcap routines that require epan from caputils to ui/gtk. They were required for driver key management, which we'll leave to the AirPcap Control Panel in the Qt UI. Move frequency-utils to wsutil. Change-Id: I44446758046621d183f5c2ba9f6526bf01e084f1 Reviewed-on: https://code.wireshark.org/review/8910 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-05-31Don't create a GLib main loop.Guy Harris1-1/+0
In the Qt Wireshark, the main loop is a Qt main loop; no need for a GLib one. Change-Id: I65378eb9a73d145ef60389e5e02a128e2321c403 Reviewed-on: https://code.wireshark.org/review/8721 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-06Have global_capture_opts if we either have pcap or extcap.Guy Harris1-1/+1
The extcap code uses it; if the intent is not to support extcap if you don't have pcap, then don't enable it in the configure scripts/CMake. Change-Id: I4af80a2e6f557134fa8c542ad3143f3e8ca555d4 Reviewed-on: https://code.wireshark.org/review/8318 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-05-03Qt: remove a debug log showing the plugins path at startupPascal Quantin1-2/+0
Change-Id: I357a7d0b32a6cb4e80711feee49046b13317ea14 Reviewed-on: https://code.wireshark.org/review/8277 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-03-25Have a #define for whether the capture buffer size can be set.Guy Harris1-3/+3
It can be set if either 1) this is Windows (where we're assumed to be using WinPcap, which includes calls to set the buffer size) or 2) we have pcap_create() (in which case we also have pcap_set_buffer_size(), at least in a normal libpcap release). Use that rather than testing "defined(_WIN32) || defined(HAVE_PCAP_CREATE)"; that makes it a bit more obvious what's being tested. Change-Id: Id9f8455019d19206b04dd6820a748cb97ae5ad12 Reviewed-on: https://code.wireshark.org/review/7816 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-03-10Change a lot of http:// URLs to https://.Gerald Combs1-1/+1
Most of our sites are now HTTPS-only. Update URLs accordingly. Update other URLs while we're at it. Remove or comment out dead links. Change-Id: I7c4f323e6585d22760bb90bf28fc0faa6b893a33 Reviewed-on: https://code.wireshark.org/review/7621 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-02-24Qt: Apply recent settings.Gerald Combs1-2/+2
Add PacketList::applyRecentColumnWidths which set the packet list column widths from our recent settings. Make sure it gets called at startup and when we change profiles. Save the packet list header state so that we can restore it when we reset the model (i.e. freezing and thawing) and load a new capture file. Save the state when the user resizes a column. As a side effect this works around a weird bug that adjusts the width of column 1 at an inopportune time. Add a profileChanging signal so that we can save the main window geometry in each profile. Get rid of MainWindow::configurationProfileChanged. It was unused. Apply saved pane widths and heights. Note that we might want to add a separate pair of recent settings for the Qt panes. Use the last opened directory in the capture file dialog. Git rid of some unneeded Q_UNUSEDs while we're here. Bug: 10953 Change-Id: I812aff59818cf0b4d1598b580627d32728d2e9d7 Reviewed-on: https://code.wireshark.org/review/7247 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-02-20Just have init_progfile_dir() take a void pointer.Guy Harris1-1/+1
dladdr() takes a void * as a code pointer; have init_progfile_dir() do so, and do the casting in the calls. We don't care about the signature of the function whose address we're passing, we just want to pass a pointer to *something* in the main program. Change-Id: I9372620a97b0eb53c2bb3c0c41a238b4408f3709 Reviewed-on: https://code.wireshark.org/review/7270 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-02-18Fix various warnings in wireshark-qt.cpp.Gerald Combs1-1/+5
Squelch warnings due to (char *) casts. Use "include_directories(SYSTEM..." in CMakeLists.txt so that we don't get pedantic warnings about things we can't easily fix such as QList loop optimizations. Not sure if there's an easy way to do this in Autotools. Pass get_gui_compiled_info to init_progfile_dir. C++ don't have to show you any stinkin' ::main. warning: ISO C++ forbids taking address of function ‘::main’ [-Wpedantic] Change-Id: If1c77284ab0d1b4786bce4e926a4109dd9b1ae34 Reviewed-on: https://code.wireshark.org/review/7207 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-02-12Qt: Add the "new packet" window^Wdialog^Wwindow.Gerald Combs1-0/+1
Allow persistence across files. Preserve the use of "window" even though we're really a dialog. Update ByteViewTab and ProtoTree to support multiple instances. Remove the need for a cast in frame_data. Add more forward declarations. Change-Id: I50d3d9d1455b8ecc158a37218f9e41fe696d5ae2 Reviewed-on: https://code.wireshark.org/review/7086 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-02-12WSDG: Start adding Qt material.Gerald Combs1-1/+1
Move some text from README.qt to the Developer's Guide. Add an overview. Change-Id: Ia20ed837939e34871b157566c38cd0c6e590bc38 Reviewed-on: https://code.wireshark.org/review/7087 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-31Get rid of a trailing blank.Guy Harris1-1/+1
Change-Id: I27e3ba1be4a9ee23d619d751ae1abdef963b7597 Reviewed-on: https://code.wireshark.org/review/6871 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-31Fix a comment to reflect reality.Guy Harris1-2/+2
Change-Id: I90fce5376ca17648840c473afac7f9e962c14667 Reviewed-on: https://code.wireshark.org/review/6870 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-31We need to get the pathname of the executable *before* running dumpcap.Guy Harris1-6/+6
In order to find dumpcap, we need to get the pathname of the executable image, and we support -D in the first argument parsing loop, and that runs dumpcap to get the interface list, so we need to get the pathname of the executable image before that. Change-Id: If789cf1ff4f5cf5d5c3b171a3d4eb90a6e2faf1d Reviewed-on: https://code.wireshark.org/review/6869 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-31No main window *to* update in the early argument list parsing.Guy Harris1-1/+1
We haven't yet popped the main window up, so, when we call capture_interface_list(), we shouldn't pass a pointer to the "update the main window" routine. Change-Id: Id3e02199479e66bb9e9aff99b435bd03af45a1af Reviewed-on: https://code.wireshark.org/review/6868 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-31This being C++, maybe we don't have to initialize ws_app until later.Guy Harris1-4/+3
Try going back to haveing ws_app be an automatic variable, but don't declare it until after we've done the first-pass argument parsing. Change-Id: Ia1f2a4819570bfadcba75d498e01dbe64991843c Reviewed-on: https://code.wireshark.org/review/6867 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-31Do the first-pass argument parsing before creating the WiresharkApplication.Guy Harris1-133/+120
That way, *all* the don't-need-a-GUI options can be processed without trying to pop up a GUI, just as is the case with the GTK+ version. Change-Id: Icbe47642eec45e887087f46c366322b8f23206cc Reviewed-on: https://code.wireshark.org/review/6866 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-30Qt: Fix library path reset.Gerald Combs1-4/+38
g9a3676a reset the Qt library path *after* wsApp was instantiated, which is too late. Do so before QCoreApplication has a chance to do anything we might regret. Change-Id: Ibbdb69d1b7c0ea4bf1042e98a5bb5deba13e954e Reviewed-on: https://code.wireshark.org/review/6864 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-01-30When issued with -v wireshark-qt prints version and exits.Dario Lombardo1-13/+24
Change-Id: I3993c502156d534f17baa409729e2dc763910ac8 Bug: 10789 Reviewed-on: https://code.wireshark.org/review/6840 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>
2015-01-04Fix out-of-tree build includes of config.hGraham Bloice1-3/+3
If a file in the same directory as config.h, e.g. wireshark-qt.cpp has a #include "config.h", or another header it includes also has a #include "config.h", then an out-of-tree build, e.g. CMake will pick up any in-tree config.h and odd things may happen. The correct form is #include <config.h> which will pick up the out-of-tree version. To find this, introduce a deliberate error and then make an out-of-tree build, noting where it fails and fix that file. If that file includes other files that still cause the build to fail, set the compiler to emit the pre-processed version so you can locate the include with the next errant "config.h". Repeat ad nauseum. Possibly all includes of "config.h" should be changed to <config.h> Revert "CMake: Clobber the top-level config.h before we build." This reverts commit 1f3849ce614aeae5fda742beffe5558e7c2a8b71. Ping-Bug: 10301 Change-Id: Ie567e7cc696fd48f3e730fc27032c5d2a7d8f341 Reviewed-on: https://code.wireshark.org/review/6285 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: Gerald Combs <gerald@wireshark.org>
2015-01-03Remove the testing stuff.Guy Harris1-11/+0
The problem was probably that we had two competing config.h files, with some source files including one of them and othe source files including the other, with the nmake config.h defining HAVE_KERBEROS and HAVE_MIT_KERBEROS and the CMake config.h defining neither, and with wireshark-qt.cpp including the nmake config.h, so that it expected there to be a read_keytab_file() routine, and epan/dissectors/packet-kerberos.c including the CMake config.h, so that it didn't define a read_keytab_file() routine. (If the CMake build is done out-of-tree, with its config.h file outside the source tree, and the nmake build done in-tree, with its config.h in the top-level source directory, wireshark-qt.cpp, in the top-level source directory, might pick up the config.h in the same directory, but epan/dissectors/packet-kerberos.c doesn't have a config.h in its source directory and might pick up the config.h from the CMake build directory.) Change-Id: I040126026c4101aca1264affc04e585fee89b87b Reviewed-on: https://code.wireshark.org/review/6272 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03Stick some #define probes in on Windows.Guy Harris1-2/+12
Let's try to figure out why, on the 64-bit Windows build, wireshark-qt.cpp is being compiled to call read_keytab_file() but packet-kerberos.c is not being compiled to define it. Change-Id: I782406e2189819d9400b84b6632fe0fb62c5996d Reviewed-on: https://code.wireshark.org/review/6261 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03Temporarily #if 0 out the call to read_keytab_file().Guy Harris1-1/+2
If this fixes the Win64 build, somehow HAVE_KERBEROS is getting defined when this is built but we're not actually building read_keytab_file in packet-kerberos.c. If that *doesn't* fix the Win64 build's failure to find read_keytab_file(), something Really Weird is going on, because nobody should be looking for it. Change-Id: If607e0eeeff854693cf9ce2ea1009d34a20a9992 Reviewed-on: https://code.wireshark.org/review/6259 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-03Support -K iff HAVE_KERBEROS is defined.Guy Harris1-3/+3
This *shouldn't* make a difference, but it's a bit clearer, and, if it *does* make a difference with some build, there's a bug in the configuration process for that build. Clean up indentation while we're at it. Change-Id: I94aa6d565c3d5545620a7aeeaabce03153ec5e1c Reviewed-on: https://code.wireshark.org/review/6257 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Declare read_keytab_file() in epan/dissectors/packet-kerberos.h.Guy Harris1-0/+6
Don't throw its declaration in file.h, as it's not defined in file.c. Instead, include it in epan/dissectors/packet-kerberos.h and include that wherever read_keytab_file() is called. Yes, that means you also have to include <epan/asn1.h> and, therefore, you have to include <epan/packet.h>. Yes, that should be cleaned up, perhaps by splitting the Kerberos support code into "stuff that handles encryption keys without any reference to dissection" and "stuff that does dissection-related work". Change-Id: Ide5c31e6d85e6011d57202f728dbc656e36138ef Reviewed-on: https://code.wireshark.org/review/6210 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Include "file.h" to get read_keytab_file() declared.Guy Harris1-0/+1
Change-Id: I7e9ea47019f259a56a8652d0e003e23a3e1d1366 Reviewed-on: https://code.wireshark.org/review/6202 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2015-01-01Move ui/qt/main.cpp to wireshark-qt.cpp, and get rid of the dummy.cpp hack.Guy Harris1-0/+1357
Change-Id: Ib4684264363593372b3bf078cf17cae1a1cb10d6 Reviewed-on: https://code.wireshark.org/review/6199 Reviewed-by: Guy Harris <guy@alum.mit.edu>