summaryrefslogtreecommitdiff
path: root/ui
AgeCommit message (Collapse)AuthorFilesLines
2014-04-25Move the XXX-to-UTF-8 loops to routines in epan/charsets.c.Guy Harris1-0/+1
This moves a bunch of character set knowledge into epan/charsets.c. Change-Id: Ieb79dcaac9753c77703af756b666ad2ca9385d9e Reviewed-on: https://code.wireshark.org/review/1339 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-25Support out-of-source checkapiStig Bjørlykke4-8/+16
Always call $(top_srcdir)/tools/checkAPIs.pl with -sourcedir=$(srcdir) from Makefile.am to allow out-of-source 'make checkapi'. Change-Id: I60d7e0079984a8ededdacf4517a0738486fa7973 Reviewed-on: https://code.wireshark.org/review/1294 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-24Fix warning: extra ‘;’ [-Wpedantic]Alexis La Goutte1-1/+1
Change-Id: Ib2f52d28dce0f64bf56ff0df7b4ed7d091670620 Reviewed-on: https://code.wireshark.org/review/1319 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-23Fix typo in comment (parameterts => parameter)Alexis La Goutte2-2/+2
Change-Id: Ie1fefc27d249929f0f5108b0757768e7e23a9dbe Reviewed-on: https://code.wireshark.org/review/1310 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-23CaptureDialog: Fix IF type for user created pipeRoland Knall1-0/+1
- If a user adds a pipe via "Capture Options"->"Manage Interfaces" ->"Pipes" the device.if_type.type is either not filled out (in the case if no other interfaces exist), or will be set to the last set if_type of the device queried by the iteration in line 3537. - One could argue, that this is just a fixup, as still the issue remains, that the device structure will not be resetted, after the search for an already existing pipe element. Maybe a separate variable should be used for searching as it is used for adding the pipe Change-Id: Ia727bf3ce270a62d065e8c524a13768af389c346 Reviewed-on: https://code.wireshark.org/review/1296 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-22Fix ASAN error due to invalid typePeter Wu1-7/+5
ei_array is supposed to be an array of expert_entry items. However, it was initialized of an array of expert_info_t items which is much larger. This caused an ASAN error when running `tshark -z expert` because expert_stat_packet wants to read past the stack. Fix this by correcting the type. While at it, reduce the size of expert_entry for 64-bit systems (reduces initial memory usage by 8 kilobytes) and avoid a redundant g_array_index call. Change-Id: I2e08676a5e242743ed502dd2836806604ea75cc0 Reviewed-on: https://code.wireshark.org/review/1275 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-21Fix gcc "warning: no previous prototype ... [-Wmissing-prototypes]"; Do some ↵Bill Meier2-0/+4
whitespace changes Change-Id: I8c2e8694223270f1810aa6b13d955f0d08001d30 Reviewed-on: https://code.wireshark.org/review/1239 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-21Replace linked list of proto fields with arrayEvan Huus3-9/+10
This is substantially more memory-efficient, shaving another ~1.5MB off our base usage. It also lets us remove the annoying extra "last_field" pointer and simplify proto_register_field_common(). It also accidentally fixed what may have been a memory leak in proto_unregister_field(). It unfortunately complicates proto_get_next_protocol_field() to require refetching the protocol each time, but that is itself just an array-lookup under the covers (and isn't much used), so I don't expect the performance hit to be noticable. Change-Id: I8e1006b2326d6563fc3b710b827cc99b54440df1 Reviewed-on: https://code.wireshark.org/review/1225 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-19More name changes.Guy Harris7-37/+37
Add ep_ to routines that may return ephemeral strings. Change "get_XXX" to "XXX_to_display" if the routine returns a formatted string if it can't get a name. Change-Id: Ia0e82784349752cf4285bf82788316c9588fdd88 Reviewed-on: https://code.wireshark.org/review/1217 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-19Some routine name changes.Guy Harris16-59/+59
"get_addr_name()" -> "ep_address_to_display()", to 1) indicate that it returns a string with ephemeral scope and 2) indicate that it maps an address to a "displayable" form - a name if possible, an address string if not. "se_get_addr_name()" -> "get_addr_name()", to indicate that its strings have the same scope as "get_ether_name()", "get_hostname()", and "get_hostname6()". Change-Id: If2ab776395c7a4a163fef031d92b7757b5d23838 Reviewed-on: https://code.wireshark.org/review/1216 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-15Fix crash on invalid SSH_CONNECTION and SSH_CLIENT valuesPeter Wu1-11/+12
The third parameter to g_strsplit is the maximum number of elements, you cannot just assume that a vector with exactly that number of elements is available. This will crash for example: `SSH_CONNECTION= wireshark`. This patch takes care of that and also fixes a memleak due to missing g_strfreev. To reduce code bloat, return the filter at last so that g_strfreev does not have to be repeated before returning. Note that it still possible for the filter to contain absolute junk since the port and host number is not validated... Change-Id: I4414d2a748f83ded59775fb1e733ce1250cfc553 Reviewed-on: https://code.wireshark.org/review/1100 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-15ui/gtk/voip_calls: Fix minor memleakPeter Wu1-6/+2
Return values from g_strsplit must be always be freed. Also remove a useless return statement and set a saner maximum split. Change-Id: I680e20d40fe86103b0dcba210ef41aa5769f4f86 Reviewed-on: https://code.wireshark.org/review/1155 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-15Update French translationAlexis La Goutte2-726/+771
Change-Id: If552907a2eb0828198e912fa5c2628efa7190f20 Reviewed-on: https://code.wireshark.org/review/1119 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Fix Argument with 'nonnull' attribute passed null found by ClangAlexis La Goutte1-4/+6
Change-Id: I9b8a6c37e4ed589ac3066ec9cbb1b63a9f30a12b Reviewed-on: https://code.wireshark.org/review/1097 Reviewed-by: Peter Wu <peter@lekensteyn.nl> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-0/+2
ui/decode_as_utils.h:42: Warning: The following parameters of decode_build_reset_list(const gchar *table_name, ftenum_t selector_type, gpointer key, gpointer value, gpointer user_data) are not documented: parameter 'selector_type' Change-Id: I8353dae120e87c9651c6611924c1fc652436146d Reviewed-on: https://code.wireshark.org/review/1138 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-2/+12
ui/gtk/gui_stat_menu.h:42: Warning: The following parameters of register_menu_bar_menu_items(const char *gui_path, const char *name, const gchar *stock_id, const char *label, const char *accelerator, const gchar *tooltip, gpointer callback, gpointer callback_data, gboolean enabled, gboolean(*selected_packet_enabled)(frame_data *, struct epan_dissect *, gpointer callback_data), gboolean(*selected_tree_row_enabled)(field_info *, gpointer callback_data)) are not documented: parameter 'gui_path' parameter 'label' parameter 'accelerator' parameter 'tooltip' parameter 'enabled' Change-Id: I422d767741b29b8722c85a4ef97186d599d802c3 Reviewed-on: https://code.wireshark.org/review/1137 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-1/+3
ui/gtk/gui_utils.h:277: Warning: argument 'parent' of command @param is not found in the argument list of pixbuf_to_widget(const guint8 *pb_data) ui/gtk/gui_utils.h:277: Warning: argument 'xpm' of command @param is not found in the argument list of pixbuf_to_widget(const guint8 *pb_data) Change-Id: I9182a6f8c85b69bd8b0bab7e03af441dee31fc1d Reviewed-on: https://code.wireshark.org/review/1136 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Fix warning when generate documentation (doxygen)Alexis La Goutte1-4/+4
ui/packet_list_utils.h:32: warning: argument 'IN' of command @param is not found in the argument list of right_justify_column(gint col, capture_file *cf) ui/packet_list_utils.h:32: warning: argument 'IN' of command @param is not found in the argument list of right_justify_column(gint col, capture_file *cf) ui/packet_list_utils.h:32: warning: The following parameters of right_justify_column(gint col, capture_file *cf) are not documented: parameter 'col' parameter 'cf' ui/packet_list_utils.h:42: warning: argument 'IN' of command @param is not found in the argument list of resolve_column(gint col, capture_file *cf) ui/packet_list_utils.h:42: warning: argument 'IN' of command @param is not found in the argument list of resolve_column(gint col, capture_file *cf) ui/packet_list_utils.h:42: warning: The following parameters of resolve_column(gint col, capture_file *cf) are not documented: parameter 'col' parameter 'cf' Change-Id: I15c7046a36cc72d9904002946eab4dec81ab6861 Reviewed-on: https://code.wireshark.org/review/1132 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-04-14Adjust path width for OS X & Linux.Gerald Combs1-1/+1
Change-Id: Icc51e8c3c93f78cbfa0a0aeda3552ceb4c82803d Reviewed-on: https://code.wireshark.org/review/1122 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-14lrelease / lupdate translation filesAlexis La Goutte4-154/+51
Change-Id: I2962614ad9d4bd5a263f50e827705133c6c65d9c Reviewed-on: https://code.wireshark.org/review/1110 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Fix typo (double at...)Alexis La Goutte1-1/+1
Change-Id: If095b9d01817e4345ae588020cdc3332709c18d0 Reviewed-on: https://code.wireshark.org/review/1109 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Fix typo (Link size => Link type) in Qt Summary windowAlexis La Goutte1-1/+1
Change-Id: I78844161e19eaa88a62417f492ac5e439c6bbac0 Reviewed-on: https://code.wireshark.org/review/1108 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14path is used only for libsmi and geoipMartin Kaiser1-1/+1
fix a compile error when they're both unused Change-Id: I23b341bc02624e3e56320818056ac3cc8cd65b99 Reviewed-on: https://code.wireshark.org/review/1107 Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
2014-04-14Enhance translation (rename also pixel => Pixel to avoid similar string...)Alexis La Goutte1-8/+8
Change-Id: Ic2e0ca99382208c13ea2c71c11684c43b34b9988 Reviewed-on: https://code.wireshark.org/review/1099 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14lupdate / lrelease translation file...Alexis La Goutte7-2629/+4713
Change-Id: I6d93828ece6e62e4885c31d6d4429c652ead9389 Reviewed-on: https://code.wireshark.org/review/1090 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-04-14Enhance translation (rename toolTip to avoid similar string...)Alexis La Goutte2-10/+10
Change-Id: I66a17871829a769fe6ffecb2becbb5f4cc7fa078 Reviewed-on: https://code.wireshark.org/review/1089 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-04-13Replace QTableWidgets with QLabels + HTML tables.Gerald Combs3-153/+185
This lets the user select and copy the folder and plugin data as text. Add clickable local filesystem URLs while we're at it. (I suspect that you shouldn't use QTableWidgets unless you're creating a spreadsheet.) Change-Id: I45650bd4f4b6215824a4ed70ec80698d0805baba Reviewed-on: https://code.wireshark.org/review/1064 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-04-12Get rid of more tvb_get_nstringz* calls.Guy Harris6-6/+18
Add an FT_STRINGZPAD type, for null-padded strings (typically fixed-length fields, where the string can be up to the length of the field, and is null-padded if it's shorter than that), and use it. Use IS_FT_STRING() in more cases, so that less code needs to know what types are string types. Add a tvb_get_stringzpad() routine, which gets null-padded strings. Currently, it does the same thing that tvb_get_string_enc() does, but that might change if we don't store string values as null-terminated strings. Change-Id: I46f56e130de8f419a19b56ded914e24cc7518a66 Reviewed-on: https://code.wireshark.org/review/1082 Reviewed-by: Guy Harris <guy@alum.mit.edu>
2014-04-10Fix called C++ object pointer is null found by Clang AnalyzerAlexis La Goutte1-5/+15
Change-Id: I7d142ed60af8bb776ea732bf9ef94ad92bc23d70 Reviewed-on: https://code.wireshark.org/review/1061 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-04-07Add a Qt I/O Graph dialog.Gerald Combs27-433/+3577
For each graph you can set: - Its visibility - A name - A display filter - Color, from a fixed list - Plot style: Line, Impulse, Bar, Stacked Bar, Dot, Square, Diamond - Basic Y Axes (packets/s, bytes/s, bits/s) - Computed Y Axes (SUM, MIN, AVG, MAX) - Smoothing You can pan and zoom using the mouse and keyboard. Clicking on a graph selects the last packet for that interval. If all graphs have the same Y axis a single label is shown, otherwise a legend is shown. The time scale (X axis) can be toggled between relative seconds and the time of day. Graphs can be saved as PDF, PNG, BMP, and JPEG. Settings are "sticky" via the io_graphs UAT. To do: - Minimize graph drawing delays. - Figure out why smoothing differs from GTK+ - Everything else at the top of io_graph_dialog.cpp - Fix empty resets. A fair amount of code was copied from TCPStreamDialog. We might want to subclass QCustomPlot and place the shared code there. Move common syntax checking to SyntaxLineEdit. Move some common code from ui/gtk/io_stat.c to ui/io_graph_item.[ch] and use it in both GTK+ and Qt. Make the io_graph_item_t array allocation in io_stat.c static. The behavior should be identical and this gives us additional compile-time checks. Change-Id: I9a3d544469b7048f0761fdbf7bcf20f44ae76577 Reviewed-on: https://code.wireshark.org/review/435 Reviewed-by: Gerald Combs <gerald@wireshark.org> Tested-by: Gerald Combs <gerald@wireshark.org>
2014-04-03Remove garbage character inadvertantly introduced in the previous commit.Bill Meier1-1/+1
Change-Id: I6338fdb4506973ea5ed991512bbefa6b855640e9 Reviewed-on: https://code.wireshark.org/review/944 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-03(Pedantic): set editor modelines tab-width & etc to 8; Also: fix some ↵Bill Meier3-10/+10
indentation in packet-sip.c Change-Id: I623fc5e4c1247dbe5e15f0f33270f4f0994268ab Reviewed-on: https://code.wireshark.org/review/943 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-04-03Fix Bug 9920 Buildbot crash due to SDP/RTP mismatchHadriel Kaplan1-4/+3
For details see comments in Bug 9920. The executive summary: Bug 9920 is a crash caused by a couple of issues: 1) The memory ownership model for the rtp_dyn_payload hashtable is split: SDP creates the rtp_dyn_payload hashtable, but RTP can free it. Since there isn't *one* pointer to the hashtable, RTP freeing it means SDP has a dangling pointer. 2) Either the SDP dissector shouldn't be creating two separate, unique hashtables for multiple media channels of the same addr:port, or RTP shouldn't be free'ing the previous one. Change-Id: I436e67de6882f84aa82dcbdfe60bf313fe4fd99c Reviewed-on: https://code.wireshark.org/review/918 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte22-36/+2
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^ \$Id\$/,+1 d') (No star only 2 spaces before) Change-Id: Id7b254031769a9dca2941304e4d3a0f4bdbc3f54 Reviewed-on: https://code.wireshark.org/review/883 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte2-3/+0
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$) Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688 Reviewed-on: https://code.wireshark.org/review/876 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte2-4/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') (Double space between star and $Id$) Change-Id: If9b8f345e3b6493de0b573600e60005c8b0b33c3 Reviewed-on: https://code.wireshark.org/review/877 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-29Upgrade Windows builds to Lua 5.2.1Pascal Quantin1-1/+1
Change-Id: I5d2058673b69beb8393aae0571703cd9dbb79c4e Reviewed-on: https://code.wireshark.org/review/863 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-28Fix crash when calling "MAP Summary" dialog when no file is openPascal Quantin1-0/+4
Fixes bug 9934 Change-Id: I2915d0715431cf983511fe7f5f036be99bbd2467 Reviewed-on: https://code.wireshark.org/review/853 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-28Deleted one line to much in previous chgange.AndersBroman1-0/+1
Change-Id: I19d1153558130356286bac55f6cb321d30a767b1 Reviewed-on: https://code.wireshark.org/review/852 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-27Fix bug9931 'Encapsulated ethernet packets sometimes show invalid FCS'Hadriel Kaplan4-9/+9
This fixes part-1 of bug9931: the uninitialized use of a wtap_pkthdr struct. The second part of the bug deals with dissectors calling the Ethernet dissector for ecnapsulated Ethernet packets but using the wrong dissector handle to do so. That's unrelated to the issue this commit addresses, so I'm splitting them up. Change-Id: I87be7b736f82dd74d8c261062f88143372b5344c Reviewed-on: https://code.wireshark.org/review/848 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-26Postpone replacing GTK+ stock icon usageBalint Reczey1-10/+16
This prevents regressions observable on GTK+ 3.10 which caused icons to disappear in some cases. Change-Id: Ic971258807510dc038e30c6c64fb547f0529a3c2 Reviewed-on: https://code.wireshark.org/review/792 Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2014-03-24Don't include voip_bg.xpm, it's not used any more.AndersBroman1-2/+0
Change-Id: I34fb5166afb7b1218cb7e011096c4a3455b364d3 Reviewed-on: https://code.wireshark.org/review/812 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-24Get rid of the background pixmap, set the background color directly.AndersBroman1-17/+8
Change-Id: I7b291892b041055fe4165abcbb2962a295aedce4 Reviewed-on: https://code.wireshark.org/review/811 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-23Update to QCustomPlot 1.2.0Alexis La Goutte2-3771/+6960
Reapply remove trailing whitespace and some spelling fixes MSCV warning are already fixed Fix also a not ASCII caracter in qcustomplot.h Change-Id: Ied6b0a4ad7397caea6b75fa56f4f2d6ea91d0472 Reviewed-on: https://code.wireshark.org/review/787 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-23Add missing modelines infoAlexis La Goutte1-0/+13
Change-Id: Ic0f83eb469442b386d6389c08860b0faaae2e324 Reviewed-on: https://code.wireshark.org/review/785 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21fix a crash in the GTK "Interface Management" dialogueMartin Kaiser1-1/+5
for Pipes and Local Interfaces (Capture / Options / Manage Interfaces) if you start with an empty dialogue, select a pipe using Browse and press Save, wireshark crashes because of a strcmp() against the uninitialized pipe_name initialize pipe_name to NULL and make sure its value is reset when the dialogue is closed don't add a pipe unless there's an active selection in the pipe list (which may be "New Pipe") Change-Id: Id460c8d0d43cd7fc4cb8f4e9b4357898bbef20f7 Reviewed-on: https://code.wireshark.org/review/776 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-21Add a missing word to translationAlexis La Goutte1-1/+1
Change-Id: I7ec79840331a5072f12236c27f8dc842c703b23f Reviewed-on: https://code.wireshark.org/review/773 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21Enhance translation (rename toolTip to avoid similar string...)Alexis La Goutte4-28/+28
Change-Id: I23e30b445ac587e2702477afcf6b155ff21f23d4 Reviewed-on: https://code.wireshark.org/review/772 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-21Add dot to stringAlexis La Goutte1-1/+1
And avoid different string for translation... Change-Id: I36ae0fd3366cb9b42f146163f4355778f0b9b40c Reviewed-on: https://code.wireshark.org/review/771 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>