aboutsummaryrefslogtreecommitdiffstats
path: root/ui/gtk
AgeCommit message (Collapse)AuthorFilesLines
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 Goutte6-10/+1
(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 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-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 Kaplan1-0/+2
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-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-21Fix Bug 9903: 'Clicking reload-file ignores selected file format reader'Hadriel Kaplan2-3/+3
There's a relatively new feature in 1.11.3 to select a specific file format reader, instead of relying on magics or heuristics. If you select a file reader and open a file, open it, and then click the reload-file button or go to View->Reload or press the ctrl-R keymap, the file is reloaded but using the magic/heuristics again instead of the file format reader you previously chose. Likewise, the Lua relaod() function has the same issue (which is how I found this problem). I have tested this change by hand, using a Lua script, but I didn't add it to the testsuite because I need another change for my test script to work correctly. (an enhancement rather than a bug fix, which I'll submit separately) Change-Id: I48c2d9ea443e37fd9d41be43d6b6cd5a866d5b01 Reviewed-on: https://code.wireshark.org/review/764 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-19fix of bug 9836. Avg. packet size in Statistics -> Summary is rounded to ↵Jan Kaisrlik1-9/+6
nearest. GTK QT Change-Id: I34e84e6cf4587fee999764435fa1a407c8aa04bb Reviewed-on: https://code.wireshark.org/review/687 Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-17Try to fix warning: cast discards__attribute__((const)) qualifierAndersBroman1-172/+172
from pointer target type [-Wcast-qual] Change-Id: Idb1d8c9ac6fee135d3c3c7438d46ad6fb396954f Reviewed-on: https://code.wireshark.org/review/715 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-16Remove Visual Studio solution and project files (and their existence from ↵Michael Mann2-1092/+0
Makefiles) There have been discussions on -dev about removing this and I believe I was the last holdout. Finally convinced that I should just have a local copy (ignored by git) Change-Id: Ic72a22baf58e3412023cf851f0fce16eb07113b0 Reviewed-on: https://code.wireshark.org/review/681 Reviewed-by: Michael Mann <mmann78@netscape.net> Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-15Fix -Wabsolute-value in GTK Compare stat (Found by Clang 3.5)Alexis La Goutte1-3/+3
compare_stat.c:235:34: error: taking the absolute value of unsigned type 'guint32' (aka 'unsigned int') has no effect [-Werror,-Wabsolute-value] compare_stat.c:235:34: note: remove the call to 'abs' since unsigned values cannot be negative compare_stat.c:406:55: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] compare_stat.c:406:55: note: remove the call to 'abs' since unsigned values cannot be negative compare_stat.c:432:56: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] compare_stat.c:432:56: note: remove the call to 'abs' since unsigned values cannot be negative Change-Id: I03cc3136df3faf42c25986f52f015b8d87ce5774 Reviewed-on: https://code.wireshark.org/review/675 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-15Fix -Wabsolute-value in GTK SCTP Graph (Found by Clang 3.5)Alexis La Goutte1-2/+2
sctp_graph_dlg.c:1562:18: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] sctp_graph_dlg.c:1562:18: note: remove the call to 'abs' since unsigned values cannot be negative sctp_graph_dlg.c:1574:18: error: taking the absolute value of unsigned type 'unsigned int' has no effect [-Werror,-Wabsolute-value] sctp_graph_dlg.c:1574:18: note: remove the call to 'abs' since unsigned values cannot be negative Change-Id: If3cdce123256543a95fe0b596eee962e1d93d118 Reviewed-on: https://code.wireshark.org/review/674 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-11GTK_STOCK_PRINT_ERROR was missing in GTK+ < 2.14, tooBalint Reczey1-0/+2
Change-Id: I1be141c58252b8bb0db2ffff2edbb80f92c69cd6 Reviewed-on: https://code.wireshark.org/review/606 Reviewed-by: Balint Reczey <balint@balintreczey.hu> Tested-by: Balint Reczey <balint@balintreczey.hu>
2014-03-11Don't use some stock icons missing in old (< 2.16) versions in GTK+Balint Reczey1-0/+10
Change-Id: I2716a8a25627de9c3945fbf5117edcb4859aa95f Reviewed-on: https://code.wireshark.org/review/605 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-11Migrate GTK icon handling to GTK 3.10 APIBalint Reczey50-289/+1124
GtkStockItem usage is deprecated with all the GTK_STOCK_.* stock ids. We keep a stock id based approach but without relying on GTK's GtkStockItem system. We create our own internal stock ids for {icon, label} tuples and keep the original GTK stock id #define-s and values to preserve backward compatibility. Change-Id: Ia0b35a5903f079e92c8026e3df21bbf0be2d06b0 Reviewed-on: https://code.wireshark.org/review/302 Reviewed-by: Gerald Combs <gerald@wireshark.org> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-08Do not try to use unknown/non-existent webbrowserMichal Labedzki1-2/+4
Some systems do not have webbrowser or have strange browser. Do not try to use it and dislayed URL for user information. Change-Id: I3f5bcca6701b20cafa942629cbee78aa1fc689b1 Reviewed-on: https://code.wireshark.org/review/516 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-03-06Reorganize Capture Options dialogPeter Hatina1-42/+38
Opening Capture Options dialog on low resolution displays (e.g. 1366x768) in GNOME-shell makes user unable to see the bottom of the dialog Change-Id: Icc39d5ca89f98edb3ff246cd23ab9663a3dfbd1e Reviewed-on: https://code.wireshark.org/review/453 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-06Remove unused include headerAlexis La Goutte1-3/+0
Change-Id: Ia8d5da43b1ab2db3aa508863fc94ca758cdff37d Reviewed-on: https://code.wireshark.org/review/536 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-05Add command-line arg for input file format for tshark/wiresharkHadriel Kaplan1-1/+5
Now that we have the ability to choose input file format type in the GUI, we might as well have it in the command-line too. Plus it would help me in test-stuies if we had a commandline. So I've added a '-X read_format:Foo' for this. Using just '-X read_format:', or with a bad name, will make it print out the full list (in tshark); just like the '-F' does for output file formats. Note: I am *not* putting in code for Win32 GUI, because I can't compile that and I wouldn't have even done the GTK one if I could compile Qt originally. (I don't think we need to add any more features to GTK or Win32, just Qt from now on, right?) Change-Id: I2fe6481d186f63bd2303b9e591edf397a2e14b64 Reviewed-on: https://code.wireshark.org/review/493 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-05Fix some code remove by 296591399f90a9d89be958d91047aa724a77ee6dAlexis La Goutte2-0/+2
(Copyright or info about file...) Change-Id: I90ba8b1c3ec8406b0c3365a69a8555837fc4bbb1 Reviewed-on: https://code.wireshark.org/review/515 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-03-04win32: Implement format type selector in open file dialogMichal Labedzki1-1/+1
Change-Id: Idef1829fcc2b7b08783e5288bb6486ce19c4779b Reviewed-on: https://code.wireshark.org/review/405 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2014-03-04Remove all $Id$ from top of fileAlexis La Goutte280-560/+0
(Using sed : sed -i '/^ \* \$Id\$/,+1 d') Fix manually some typo (in export_object_dicom.c and crc16-plain.c) Change-Id: I4c1ae68d1c4afeace8cb195b53c715cf9e1227a8 Reviewed-on: https://code.wireshark.org/review/497 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-03Create/use an extended value-string; Move value-string array from .h file; ↵Bill Meier1-2/+2
Do other misc. - Value string arrrays should never be defined in a .h file (especially one included in multiple .c files). So: a. The value_string array (and associated #defines) was moved from the .h file to packet-rtp_events.c b. A public extended value_string was created in packet-rtp_events.c and declared as external in packet-rtp_events.h - Other: Remove a few unneeded initializers; Add editor modelines. Change-Id: Ib580c3e50ab5ce79484c9c6af57f62ca604b57d1 Reviewed-on: https://code.wireshark.org/review/468 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25Remove trailing whitespaceBill Meier44-108/+108
Change-Id: I8116f63ff88687c8db3fd6e8e23b22ab2f759af0 Reviewed-on: https://code.wireshark.org/review/385 Reviewed-by: Bill Meier <wmeier@newsguy.com> Tested-by: Bill Meier <wmeier@newsguy.com>
2014-02-25Use correct macro to really fix MacOSX buildbotEvan Huus1-3/+3
Change-Id: Ibb7b13c0c9c5699642cda48522b34ace34c28b46 Reviewed-on: https://code.wireshark.org/review/377 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25Include old-gtk-compat.h to fix build.Evan Huus1-0/+1
Change-Id: I3614e11fb0e76625b2b9686be423bf421c295e6f Reviewed-on: https://code.wireshark.org/review/376 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-25Wireshark: Add option to choose format type of capture fileMichal Labedzki7-13/+36
The best heuristic can fail, so add possibility to manually choose capture file format type, so not correctly recognize file format can be loaded in Wireshark. On the other side now it is possible to open capture file as file format to be dissected. Change-Id: I5a9f662b32ff7e042f753a92eaaa86c6e41f400a Reviewed-on: https://code.wireshark.org/review/16 Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com> Reviewed-by: Hadriel Kaplan <hadrielk@yahoo.com> Reviewed-by: Evan Huus <eapache@gmail.com> Tested-by: Evan Huus <eapache@gmail.com>
2014-02-18Fix Branch condition evaluates to a garbage value found by Clang AnalyzerAlexis La Goutte1-0/+4
Change-Id: I745f838a763e5cc89e1b9c0536ad3cb299b00786 Reviewed-on: https://code.wireshark.org/review/245 Reviewed-by: Evan Huus <eapache@gmail.com> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-18Add Logcat to Exported PDUMichal Labedzki1-0/+1
Logcat can be exported from ADB over USB or ADB over TCP where can occur multiple Logcat PDUs in one frame. Change-Id: I290fa131e5600c62357e5be4e76096ea5c35364b Reviewed-on: https://code.wireshark.org/review/234 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Tested-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
2014-02-16Add explicit casts to fix OSX10.5 BuildbotEvan Huus1-8/+8
Change-Id: I13fa3d6af3d0fddc367835fc05efdbe106b991e6 Reviewed-on: https://code.wireshark.org/review/228 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-16Replace last use of emem trees with GHashTablesEvan Huus1-44/+52
Change-Id: I1cedc611c9b7888eb671cf858c6f7819d37afba9 Reviewed-on: https://code.wireshark.org/review/219 Reviewed-by: Michael Mann <mmann78@netscape.net>
2014-02-12RTP: Add support for SBC codec in RTP PlayerMichal Labedzki1-98/+82
Add optional dependancy to libsbc to play Bluetooth SBC in A2DP payload. Also simplify RTP Player and extent codec interface. Change-Id: I52e1fce9c82e2885736354fe73c6c37168a4fda3 Reviewed-on: https://code.wireshark.org/review/19 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-02-07Replace "svn" with "git" all over the place.Gerald Combs7-10/+10
Rename "SVNPATH" to "GITBRANCH" since that seems more appropriate. Rename "svnversion.h" to "version.h" as Evan suggested. Update some URLs. In make-version.pl, make sure we don't set an improper upstream branch name. Use the number of commits + short hash from `git describe` for package names by default. Change-Id: I922bba8d83eabdf49284a119f55b4076bc469b96 Reviewed-on: https://code.wireshark.org/review/139 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-01-26Drop support of Visual Studio 2005Alexis La Goutte2-13/+0
* Remove _MSC_VER < 1500 check * Cleanup config.nmake See http://www.wireshark.org/lists/wireshark-dev/201305/msg00159.html svn path=/trunk/; revision=54965
2014-01-22Clean up whitespace: use consistent indentation, etc;Bill Meier1-46/+59
Add editor modelines. svn path=/trunk/; revision=54883
2014-01-20Fix indent (use 4 spaces) and remove trailing whitespaceAlexis La Goutte1-3/+3
svn path=/trunk/; revision=54854
2014-01-20Split the GUI and the tap part to make it possible to adapt to Qt.Anders Broman3-213/+32
svn path=/trunk/; revision=54850
2014-01-17Fix [-Wmissing-prototypes]Anders Broman23-0/+44
svn path=/trunk/; revision=54834
2014-01-17Fix [-Wmissing-prototypes]Anders Broman28-0/+49
svn path=/trunk/; revision=54833
2014-01-16Fix [-Wmissing-prototypes]Anders Broman15-1/+28
svn path=/trunk/; revision=54826
2014-01-15Don't cast away constness.Guy Harris1-1/+1
svn path=/trunk/; revision=54818
2014-01-14In a source file that defines external functions, the header file thatGuy Harris1-1/+3
declares the functions must be included, in order to make sure the declarations match the function signature. Make it so. Don't cast away constness when passing something to a routine that takes a const pointer argument. svn path=/trunk/; revision=54747
2014-01-11Fix indent (use 4 spaces) and add modelinesAlexis La Goutte2-47/+73
svn path=/trunk/; revision=54695
2014-01-10Note in a comment that with Gtk 3.4.4 reselecting UE+channel doesn't work as ↵Martin Mathieson1-0/+3
other UEs seem to get selected while list is being repopulated during retapping svn path=/trunk/; revision=54690
2014-01-08Coverity 280335, 280336Martin Kaiser1-2/+4
check the return value of gtk_tree_selection_get_selected() svn path=/trunk/; revision=54657