aboutsummaryrefslogtreecommitdiffstats
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2014-12-31Do the full string in get_{compiled,runtime}_version_info().Guy Harris2-16/+10
Have them start the string with "Compiled" or "Running on", and return the string when done. Change-Id: Ic4d290c963621fa0385dc5aab766fd4ad31d3810 Reviewed-on: https://code.wireshark.org/review/6155 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-31Move the version_info.c stuff to wsutil/ws_version_info.c.Guy Harris5-7/+3
Change-Id: I3a5c7e219974bfb924819b43b4d445eaf00e5bde Reviewed-on: https://code.wireshark.org/review/6153 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-30Qt: More WiresharkDialog conversions.Gerald Combs7-80/+73
Convert the Follow Stream and Export Objects dialogs. Change-Id: I8a4dda634f2f0475a24cf09601f76fb52069fe50 Reviewed-on: https://code.wireshark.org/review/6126 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-30Qt: Continue using the new window title format.Gerald Combs10-20/+16
Update several dialog titles to "Wireshark · <subtile...>". Change-Id: I64645e913500ecd55a008e1609b46385dafe7de9 Reviewed-on: https://code.wireshark.org/review/6127 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-30Qt: Convert more dialogs to WiresharkDialog.Gerald Combs13-133/+85
Make the Sequence, IO Graph, Statistics Tree, and VoIP Calls dialogs subclasses of WiresharkDialog. Remove "Stats Tree" from Statistics Tree dialog titles. Don't complain if the user opens more than one instance of the dialog. Use the applicationName property in WiresharkApplication instead of a separate variable. Add a preexisting item to the IO Graph bug list (hovering when the file is closed clears the graph). Change-Id: I8411a25305d00b16e0d4a82fa50a9bad5c85b239 Reviewed-on: https://code.wireshark.org/review/6125 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-29Add ability to follow UDP stream by indexPascal Quantin3-17/+50
-z "follow,udp" tshark cli command now supports a stream index It is now possible to select the UDP stream displayed in Qt GUI (like for TCP) Change-Id: Ia367f36ea4f60db0fddb997a7e0903c09e172f2d Reviewed-on: https://code.wireshark.org/review/6083 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-29Wireshark Dialog (Qt): Add Modelines infoAlexis La Goutte2-0/+26
Change-Id: I6689f5a95c6dc051d660198fd58ae96967f3468f Reviewed-on: https://code.wireshark.org/review/6116 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29capture_file.h (Qt): missing ]Alexis La Goutte1-1/+1
Change-Id: Ibc512f03913d77a6c4f0cdbcf5141efbd94b22f0 Reviewed-on: https://code.wireshark.org/review/6115 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-29Qt: Add a WiresharkDialog convenience class.Gerald Combs20-94/+212
Add WiresharkDialog, a common base class for dialogs centered around capture files. Make it a parent of Capture File Properties, Traffic Table, Conversations, and Endpoints. Rename CaptureFile::read_only_ to file_closed_. Add methods to WiresharkApplication for generating consistent window titles. Change-Id: Idc771556d8192e60f85dddc08fc4757698dee257 Reviewed-on: https://code.wireshark.org/review/6097 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-28Create FT_FCWWN field type.Michael Mann1-2/+3
Also, convert the "string" hf_ entries that used tvb_fcwwn_to_str as a string to use proto_tree_add_item with FT_FCWWN type. Change-Id: I4ca77870499fd8239584a70874998b5d194a7167 Reviewed-on: https://code.wireshark.org/review/6036 Petri-Dish: Michael Mann <mmann78@netscape.net> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-28Qt Follow window: keep data representation when switching between streamsPascal Quantin1-3/+3
Change-Id: I1c7092d33d841e80ce110224f3bd617cb112be61 Reviewed-on: https://code.wireshark.org/review/6091 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-28Replace ip6_to_str and ip6_guint8_to_str with address_to_str and tvb_ip_to_str.Michael Mann7-25/+17
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-28If we can't open the GeoIP database, close and unlink the map file.Guy Harris1-0/+6
We can't write out the full map file, and we return an error, so just get rid of the file. Fixes Coverity CID 1256521. Change-Id: Ieee078f760c035d65b2fce199ea472ba915be9c6 Reviewed-on: https://code.wireshark.org/review/6090 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-28Removed duplicated #include linesDario Lombardo15-15/+1
Change-Id: I9cafa3cd5c74121168777d8c656e7e94e89efd3c Reviewed-on: https://code.wireshark.org/review/6065 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Martin Mathieson <martin.r.mathieson@googlemail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-26Fix building of color conversation filterPascal Quantin1-12/+20
Right now eth filter (the last one tried) is always applied Change-Id: Ibe5d3c30033bd2d385bd1e68b20388114673cb5c Reviewed-on: https://code.wireshark.org/review/6064 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-26Use getopt_long() for the first pass through the argument list.Guy Harris2-105/+164
That way: 1) we don't have to worry about the system getopt() and our getopt_long(), on platforms that have getopt() but not getopt_long() (Solaris prior to Solaris 10, HP-UX, AIX), not working well together; 2) if necessary, we can handle long options in the first pass. Switch to using getopt_long() for the *second* pass for the GTK+ version of Wireshark. Use the documented mechanism for resetting the argument parser for the glibc version of getopt_long(); use the mostly-undocumented-but-at-least- they-documented-optreset mechanism for the *BSD version. (We should look into doing only one pass, saving away arguments that can't fully be processed in the first pass for further processing after initializing libwireshark.) Change-Id: Ide5069f1c7c66a5d04acc712551eb201080ce02f Reviewed-on: https://code.wireshark.org/review/6063 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-26UDP: fix 'Follow Stream' button from conversations tabPascal Quantin1-5/+1
Add stream index to conversation table Change-Id: Id63b2cc0000d89297c8638b9a89315096fc5458b Reviewed-on: https://code.wireshark.org/review/6062 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 Mann11-29/+56
Change-Id: I40d0c8253743183aecef252040b7dd6742ae5c71 Reviewed-on: https://code.wireshark.org/review/5934 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-25VoIP Calls: Missing break in switch (CID 1155515)Alexis La Goutte1-0/+1
Change-Id: Ie62cd2901c791490fe6685f560815e09b921d03b Reviewed-on: https://code.wireshark.org/review/6001 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-25Only include <wsutil/os_version_info.h> if we need it.Guy Harris1-1/+1
Change-Id: Idee0e7205969ac2e7b33c4748a1463a0bfffe0a6 Reviewed-on: https://code.wireshark.org/review/6051 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-25Check for getopt_long(), not getopt().Guy Harris2-5/+7
We support three types of platforms: 1) UN*Xes that have both getopt() and getopt_long(); 2) UN*Xes that have getopt() but not getopt_long(); 3) Windows, which has neither. Checking for getopt_long() lets us distinguish between 1) and 2) and build getopt_long() for them. Change-Id: Iaf0f142f9bebaa2eed2128d544ec9786711def45 Reviewed-on: https://code.wireshark.org/review/6045 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-24Qt (pref.gui_layout_type): Missing break in switch (CID 1159202 & 1159203)Alexis La Goutte1-0/+2
Change-Id: I28af99cff5db310ef10258e3054afa7337df1e60 Reviewed-on: https://code.wireshark.org/review/5996 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-24Qt (KeyPressEvent): Missing break in switch (CID 1159205, 1159206, 1159208, ↵Alexis La Goutte4-0/+7
1159209) Change-Id: I40b7c7eefb269570e6a1c5c9ec310fa97840d42d Reviewed-on: https://code.wireshark.org/review/5995 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-12-24Move twelve show_version() functions from the varoius programs andStephen Fisher2-31/+2
Wireshark UI files into a single one in wsutil. Change-Id: I0a64f0cc8106bd681bd185289c36272c4c43baad Reviewed-on: https://code.wireshark.org/review/6026 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-23Qt (emitAppSignal): Missing break in switch (CID 1159204)Alexis La Goutte1-0/+1
Change-Id: Ia2ba40a4fc284dbf3da8e27edf336a4e27cdb4e3 Reviewed-on: https://code.wireshark.org/review/6000 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-12-22Qt: Add methods to CaptureFile and WiresharkApplication.Gerald Combs11-87/+137
Add isValid, fileTitle, and retapPackets methods to CaptureFile. Add application name and title separator convenience methods to WiresharkApplication. Convert traffic tables, conversations, and endpoints to use CaptureFile directly and to let the user know when the capture file is closed. Set the file dialog titles while we're here. Change-Id: I990392786d3833e1e0b3638aa2d34a5ada39fa13 Reviewed-on: https://code.wireshark.org/review/5957 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-22Fix unknown command tag name [-Wdocumentation-unknown-command]Alexis La Goutte1-1/+1
Change-Id: I6c2564a86e13d9321001856ba1f51681a9f20976 Reviewed-on: https://code.wireshark.org/review/5979 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-12-22Qt: Fix status bar signal.Gerald Combs2-2/+2
Change-Id: Ie935269f6cbe9495b95bcc24b45198fbd284fb35 Reviewed-on: https://code.wireshark.org/review/5963 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Do not use packet scoped memory in GUIPascal Quantin7-19/+19
It will trigger an assertion Change-Id: I2436c11b45e1505a94256a06ed3ad0c5480e034b Reviewed-on: https://code.wireshark.org/review/5953 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-21Qt: rename SummaryDialog class to CaptureFilePropertiesDialogPascal Quantin3-5/+5
Change-Id: I79aa63621853ff15b8c568e1c7949fb8fa0caca2 Reviewed-on: https://code.wireshark.org/review/5929 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: Gerald Combs <gerald@wireshark.org>
2014-12-21Qt: Better accordion frame layout.Gerald Combs1-9/+9
Calling invalidate + activate on the parent layout has better results than calling adjustSize on the parent widget. Change-Id: I844bee49b868d988b0fc93a72687407adf232ef9 Reviewed-on: https://code.wireshark.org/review/5951 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Qt: keep "Copy to clipboard" button active when closing the ↵Pascal Quantin1-4/+0
capture_file_properties_dialog As the Capture File Properties window content is kept once the capture is closed, allow to copy it Change-Id: I11466e102fcf75a31aaa22225861ad8bf27f89a8 Reviewed-on: https://code.wireshark.org/review/5942 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-12-21Qt: Don't clear the capture file properties.Gerald Combs1-2/+0
Don't clear the contents of the capture file properties dialog when the capture closes. Retaining the contents lets users compare the properties for multiple files. Change-Id: I6bf684e7bd996f22032ec3d0adcddc343bb17992 Reviewed-on: https://code.wireshark.org/review/5937 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Qt: Fix accordion frame height calculation.Gerald Combs3-12/+41
Change-Id: I32d2ea2ff34544e285b52e4e35e035306c33d3aa Reviewed-on: https://code.wireshark.org/review/5935 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-21Qt: fix a crash when closing a file while capture file properties window is openPascal Quantin2-5/+14
refresh_button_ and copy_comment_button_ are not used neither initialized, get rid of them Also clear text areas and disable buttons Change-Id: I418d712313041dcf4f15aceee01497f01ae74918 Reviewed-on: https://code.wireshark.org/review/5927 Reviewed-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: Gerald Combs <gerald@wireshark.org>
2014-12-21Qt: disable Capture File Properties toolbar icon by defaultPascal Quantin1-1/+2
Otherwise it can be opened by clikcing on the icon just after launching Wireshark Also update tooltip to match the exact dialog name Change-Id: I5ce5e0c24f3dfb44c2303c78114102c5c03ccc88 Reviewed-on: https://code.wireshark.org/review/5930 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-20Qt: Use an accordion frame in the welcome screen.Gerald Combs3-15/+52
Place the recent files list in an accordion frame so that showing and hiding is more visually smooth. Change-Id: Ifdc534a33aa9f93949c9f919cfe0765fbfcde750 Reviewed-on: https://code.wireshark.org/review/5924 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-20Remove debugging code.Gerald Combs1-6/+0
Change-Id: If3a64a6914ae8ce2521c85766df6f733a13ca7e1 Reviewed-on: https://code.wireshark.org/review/5926 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-20Fix filter test for multifield custom columnStig Bjørlykke1-1/+1
This adds support for "field||field" without spaces. Change-Id: Ia738d6642d12a188d1629bbdd9701cc8f8bb7a68 Reviewed-on: https://code.wireshark.org/review/5922 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-20Qt: Revert back to an all-in-one main window.Gerald Combs3-230/+197
Switch back to having everything on the main window similar to GTK+. It's more cluttered but this way but you don't have to navigate the task selector to get to the recent files and help links. Retain the "Capture", "Open", and "Learn" imperative text. Move "Open" to the top as suggested by Michal. Change-Id: Iaf7d93f9caf686b5cbeb640e5e5f95ecb46f7f2d Reviewed-on: https://code.wireshark.org/review/5896 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-20Fix filter valid/invalid test for multifield custom typeMichal Labedzki4-3/+28
Check for "or" or "||" (also ignore whitespaces) and check both arguments of this operator to be fieldname (character check), then check whole filter is valid for dfilter compiler. Change-Id: I412b5dc1fca16fcd2b640aa74af81167300fd11e Reviewed-on: https://code.wireshark.org/review/5848 Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Tested-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2014-12-20Qt: Add a CaptureFile class.Gerald Combs14-358/+534
Wrap the capture_file struct in a QObject which translates cf_cb_* and capture_cb_* events into signals. Move the global cfile to capture_file.cpp. Don't use a void pointer for the capture file struct. Change-Id: Ic5d5efb4bb1db64aa0247245890e5669b1da723a Reviewed-on: https://code.wireshark.org/review/5885 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-20Consolidate RTP stream structs.Gerald Combs7-246/+169
Consolidate the three different RTP stream structs in ui/rtp_stream.h, ui/gtk/rtp_player.c, and ui/voip_calls.c into one. Make the member names a bit more consistent. Document what each GList contains. Use nstime_t for timestamps since that's what we get from the frame data. Use g_new0 to initialize our structs. Change-Id: I2b3f8f2051394a6a98a5c7bc49c117f07161d031 Reviewed-on: https://code.wireshark.org/review/5843 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-12-20Rename wsutil/floor.[ch] to wsutil/floorl.[ch].Guy Harris1-1/+1
That better indicates what they do - they don't supply floor(), as that's a standard math.h feature dating back before C89, they supply floorl(). Change-Id: Ib1278c51cdfc57680c28c51de87eafb2cb50c8eb Reviewed-on: https://code.wireshark.org/review/5905 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20Handle floorl() the same way we handle other not-on-all-platforms functions.Guy Harris1-1/+3
Use AC_CHECK_FUNC() for it, define FLOORL_LO to floorl.lo if we *don't* have it, add FLOORL_LO to the list of items conditionally built in libwsutil, and include "wsutil/floor.h" only if HAVE_FLOORL is *not* defined, as that means it's *not* supplied by the platform and thus *not* declared in <math.h>. Also, use the standard export stuff in wsutil/floor.h. Change-Id: Ic24aa69f65f2d15450d8b84b0c2b0c58f38edebe Reviewed-on: https://code.wireshark.org/review/5901 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-12-20Change more variables from si_code to mtp3_si_code to avoid conflictsStephen Fisher3-9/+9
with a #define in a NetBSD header file. Change-Id: I2136db207cb4707571920b373708fcb63505131c Reviewed-on: https://code.wireshark.org/review/5900 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-20Another missing change, to include floor.hStephen Fisher1-0/+2
Change-Id: Ice962bb9d62ab99f225228bf1e78850947eea625 Reviewed-on: https://code.wireshark.org/review/5895 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19Revert "Provide a floorl() function (which is currently only able to call ↵Stephen Fisher1-2/+0
GCC's __builtin_floorl() function) for systems which don't provide one." because I left off the new wsutil/floor.[ch] files This reverts commit e2586ec36d0d924b933d2127e809918b980cb413. Change-Id: Ie38b7f32b2d21e3beba5173eec22ca12b7f5da91 Reviewed-on: https://code.wireshark.org/review/5891 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19Provide a floorl() function (which is currently only able to call GCC'sStephen Fisher1-0/+2
__builtin_floorl() function) for systems which don't provide one. Change-Id: Ie0140ff195f0eae525c7bd70c7c3e23039fde569 Reviewed-on: https://code.wireshark.org/review/5889 Reviewed-by: Stephen Fisher <sfisher@sdf.org>
2014-12-19Replace uses of proto_get_frame_protocols with proto_is_frame_protocol when ↵Michael Mann3-34/+4
only one protocol is desired. Also use proto_get_frame_protocols in main_menubar.c instead of doing it "manually". Change-Id: Ie7a365c538700f2cebdd1e3d253f2fd9b189f5cf Reviewed-on: https://code.wireshark.org/review/5851 Reviewed-by: Michael Mann <mmann78@netscape.net>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 02:09:38 +0000