Commit Graph

1710 Commits

Author SHA1 Message Date
Gerald Combs b6e976a26e Fix trimming the maximum number if display filter entries.
svn path=/trunk/; revision=49456
2013-05-20 19:04:19 +00:00
Alexis La Goutte 1ceed4fc38 Fix Typo about filename
svn path=/trunk/; revision=49455
2013-05-20 18:56:56 +00:00
Alexis La Goutte 022ce2dea9 From Richard Turner via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8630 QtShark doesn't quit properly after closing the main window during initialization
When trying to close the QtShark application during its initialization process
(by hitting the "close" button), the processes "qtshark.exe" and "dumpcap.exe" don't terminate properly

The patch contains fix to:

1. QtShark doesn't quit properly after closing the main window during initialization

2. User is not prompted to save the capture to file when user chooses to exit
the program during capturing.

3. Bug exists in function MainWindow::testCaptureFileClose(bool from_quit, QString &before_what),
which prevent it from behaving correctly when from_quit == true.

svn path=/trunk/; revision=49454
2013-05-20 18:56:47 +00:00
Alexis La Goutte 36495e5e98 From report of mot990-8omk7tp8mio8ro via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8469 QtShark (wireshark-qt) doesn't use the saved preferences
Detail about this issue :
Bug is reproduced when accessing Preferences Dialog before QtShark start-up is finished,
specifically before preferences loading is completed which comes very late in the initialization process.

Fix from Richard Turner :
Patch to fix problems arising from users interacting with main interface before initialization is complete

Introduced a new slot function in main window for the locking of features before
init complete and for the unlocking of features after all systems good to go.

svn path=/trunk/; revision=49453
2013-05-20 18:56:33 +00:00
Michael Mann 312daa4f6c The printf format may require 2 arguments passed and if it does, the second argument could be garbage, so make sure printf has 2 arguments. Fixes bug 8066 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8066)
svn path=/trunk/; revision=49451
2013-05-20 18:50:50 +00:00
Anders Broman 6a3a3c228c Make preparation to select which level tap is to be used.
svn path=/trunk/; revision=49446
2013-05-20 17:48:09 +00:00
Anders Broman 64f9f5fb1c From chaitanya:
Find Window: The cursor is not set when we seleted String/hex/Display Filter (again)

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8498

svn path=/trunk/; revision=49435
2013-05-20 05:45:32 +00:00
Anders Broman d06cb317a6 Add filter capabillities.
svn path=/trunk/; revision=49419
2013-05-19 17:14:33 +00:00
Evan Huus 48285bb16b From Robert Bullen via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8643
When a TCP segment contains the end of two or more SSL PDUs, the TCP reassembly
code passes that segment up to the SSL dissector multiple times--one for each
SSL PDU. The SSL dissector queues the packet for SSL tap listeners each time it
is invoked. Therefore a single packet can be processed by SSL tap listeners
multiple times. But the tap data that the SSL dissector sends to its tap
listeners is a linked list of all PDUs in the packet.

The SSL tap listener responsible for populating the Follow SSL Stream dialog
did not account for the possibility of seeing a packet multiple times. As a
result, it would process the entire linked list of PDUs each time it received a
packet, and that would result in some SSL PDUs showing up two or more times in
the dialog.

This patch fixes the described bug. It also implements a few slight
improvements in closely related code. See bugzilla for details.


svn path=/trunk/; revision=49387
2013-05-17 21:50:27 +00:00
Jeff Morriss 2572f8ac1e From Cal Turney via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8690 :
Change "Edit" to "Rename" and add icons to "Manage Profiles..." and "Switch
to...". Update the associated widget, routine, and variable names in order
to facilitate future maintenance.

svn path=/trunk/; revision=49361
2013-05-17 00:42:45 +00:00
Stig Bjørlykke bcca452d93 Only add one "New from Global" entry in the profiles menu.
(someone removed this when rewriting the code)

svn path=/trunk/; revision=49333
2013-05-16 16:31:45 +00:00
Guy Harris b658db4ba2 Use file_selection_run() for dialogs created with file_selection_new().
svn path=/trunk/; revision=49320
2013-05-15 22:03:14 +00:00
Gerald Combs 6b7cb4e478 Remove an unused variable.
svn path=/trunk/; revision=49318
2013-05-15 17:49:59 +00:00
Anders Broman ac3957c4cd Merge some of the changes to rtp player from https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893 by hand.
svn path=/trunk/; revision=49316
2013-05-15 16:55:02 +00:00
Guy Harris 75b64dc285 gtk_file_chooser_dialog_new() makes the file chooser dialog a transient
window for the specified parent; we don't have to do that ourselves.

svn path=/trunk/; revision=49309
2013-05-15 04:25:52 +00:00
Guy Harris 89afc91ccf Give file_selection_new() an argument to specify the parent window of
the file selection dialog.

Call gtk_file_chooser_set_do_overwrite_confirmation() in
file_selection_new() for FILE_SELECTION_SAVE file selection dialogs,
rather than doing it in the individual callers of file_selection_new().

Use gtk_dialog_set_alternative_button_order() in file_selection_new() to
set the alternative button order, rather than using #ifdefs.

Use file_selection_new() and file_selection_run() in the graph analysis
code.  (We should clean up other code that uses file_selection_new() to
use file_selection_run(), and clean up other code that uses
gtk_file_chooser_dialog_new() to use file_selection_new() and
file_selection_run().)

svn path=/trunk/; revision=49308
2013-05-14 21:53:57 +00:00
Guy Harris 67a18cd0e6 Fix indentation.
svn path=/trunk/; revision=49295
2013-05-14 19:06:20 +00:00
Guy Harris 9c4b84589c Pull dnd_merge_files() into dnd_open_file_cmd(); the resulting code is a
bit simpler.

Don't bother popping up a window saying "you dragged more than one file,
so we're merging"; presumably that's what they had in mind when they
dragged multiple files.  (If that's not what they had in mind, the
window should at least offer a choice to cancel.)

svn path=/trunk/; revision=49293
2013-05-14 18:16:58 +00:00
Guy Harris aa2e4c1535 Merge capture_start_confirmed() into capture_start_cb().
svn path=/trunk/; revision=49286
2013-05-14 08:22:12 +00:00
Guy Harris 231757c4d5 Use gtk_dialog_set_alternative_button_order() to set the "alternative"
button order (that order is what's used on Windows).

Put the affirmative answer on the right by default.

svn path=/trunk/; revision=49284
2013-05-14 02:46:17 +00:00
Guy Harris 679ee2e9af Make the dialog a child of the color filters dialog, not the top-level
window.

svn path=/trunk/; revision=49283
2013-05-14 01:29:23 +00:00
Guy Harris afb44c61ec Use a modal GTK+ message dialog to ask the user whether to nuke their
personal color settings.

svn path=/trunk/; revision=49282
2013-05-14 01:09:23 +00:00
Guy Harris 0de5240a74 Fix indentation.
svn path=/trunk/; revision=49280
2013-05-13 23:22:44 +00:00
Guy Harris 0b7d789607 Clean up indentation.
svn path=/trunk/; revision=49279
2013-05-13 23:17:12 +00:00
Guy Harris 039a075699 Eliminate some includes of ui/simple_dialog.h by files that don't use
anything from it.

svn path=/trunk/; revision=49277
2013-05-13 22:50:29 +00:00
Guy Harris 311f61d916 Get rid of declaration of no-longer-defined-or-used routine.
svn path=/trunk/; revision=49276
2013-05-13 22:02:37 +00:00
Alexis La Goutte 98ac861268 lupdate/lrelease ui/qt/QtShark.pro Sync with last change in Qt Files
svn path=/trunk/; revision=49272
2013-05-13 20:23:55 +00:00
Alexis La Goutte a80ad2f9f2 Add Some missing text to translate
svn path=/trunk/; revision=49271
2013-05-13 20:23:46 +00:00
Alexis La Goutte 91c482d3d6 Add Some missing text to translate
svn path=/trunk/; revision=49270
2013-05-13 20:23:35 +00:00
Anders Broman 85a8e304dd Add the posibillity to use a key for per-packet-data.
svn path=/trunk/; revision=49259
2013-05-12 18:11:02 +00:00
Pascal Quantin 914099a5a9 Fix a few bugs related to PDU export feature:
- tag length is wrong if proto name was a multiple of 4 bytes
- tag length is wrong in case no IP address is available in packet_info structwhile tag is requested
- endianness issue when dumping the port number
- overlapping tag IPv4 Dst address and IPv6 Src address
- do not call dissector when it is not found
- typo errors
Enhancements:
- add a subtree for tag content
- display IPv6 Src/Dst address

svn path=/trunk/; revision=49232
2013-05-10 13:13:50 +00:00
Irene Rüngeler 27816067e8 Set Start menu button inactive, if capture is in progress.
svn path=/trunk/; revision=49231
2013-05-10 11:52:44 +00:00
Irene Rüngeler 8f8a287880 Delete unused variable.
svn path=/trunk/; revision=49230
2013-05-10 11:35:38 +00:00
Irene Rüngeler 47dd0701f5 The Interface column cannot be hidden any more.
svn path=/trunk/; revision=49227
2013-05-10 07:04:46 +00:00
Anders Broman 1ab65e7146 Add a helper function to load tags, handle IP and port tags and
copy packet comments.

svn path=/trunk/; revision=49184
2013-05-06 15:59:16 +00:00
Jörg Mayer 361bac10a8 Make compiling export_pdu_dlg.c actually work:
- Fix some warnings about unused variables
- Add to Cmake build

svn path=/trunk/; revision=49180
2013-05-05 20:45:08 +00:00
Anders Broman a268bb6b94 Add the abillity to export PDU:s to file using a USER_DLT adding meta data before the actual protocol PDU. Some meta tags makes it possible for the dissector of the user DLT to call the correct PDU dissector.
This is prof-of-concept needs a bit of cleanup.

svn path=/trunk/; revision=49177
2013-05-05 19:37:51 +00:00
Anders Broman 44f48d0464 Add the abillity to export PDU:s to file using a USER_DLT adding meta data before the actual protocol PDU. Some meta tags makes it possible for the dissector of the user DLT to call the correct PDU dissector.
This is prof-of-concept needs a bit of cleanup.

svn path=/trunk/; revision=49176
2013-05-05 19:36:53 +00:00
Jörg Mayer e13a0996ee Revert 49166: It breaks compilation:
[ 82%] Building C object ui/gtk/CMakeFiles/gtkui.dir/filter_dlg.c.o
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c: In function ‘color_filter_te’:
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:1258:5: error: enum conversion when passing argument 2 of ‘gtk_widget_modify_bg’ is invalid in C++ [-Werror=c++-compat]
     gtk_widget_modify_bg(w, GTK_STATE_FLAG_NORMAL, &bg);
     ^
In file included from /usr/include/gtk-3.0/gtk/gtkaction.h:38:0,
                 from /usr/include/gtk-3.0/gtk/gtkactiongroup.h:38,
                 from /usr/include/gtk-3.0/gtk/gtkapplication.h:29,
                 from /usr/include/gtk-3.0/gtk/gtkwindow.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkdialog.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkaboutdialog.h:32,
                 from /usr/include/gtk-3.0/gtk/gtk.h:33,
                 from /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:29:
/usr/include/gtk-3.0/gtk/gtkwidget.h:813:13: note: expected ‘GtkStateType’ but argument is of type ‘int’
 void        gtk_widget_modify_bg          (GtkWidget            *widget,
             ^
/home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:1258:5: error: passing argument 3 of ‘gtk_widget_modify_bg’ from incompatible pointer type [-Werror]
     gtk_widget_modify_bg(w, GTK_STATE_FLAG_NORMAL, &bg);
     ^
In file included from /usr/include/gtk-3.0/gtk/gtkaction.h:38:0,
                 from /usr/include/gtk-3.0/gtk/gtkactiongroup.h:38,
                 from /usr/include/gtk-3.0/gtk/gtkapplication.h:29,
                 from /usr/include/gtk-3.0/gtk/gtkwindow.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkdialog.h:35,
                 from /usr/include/gtk-3.0/gtk/gtkaboutdialog.h:32,
                 from /usr/include/gtk-3.0/gtk/gtk.h:33,
                 from /home/jmayer/work/wireshark/svn/trunk/ui/gtk/filter_dlg.c:29:
/usr/include/gtk-3.0/gtk/gtkwidget.h:813:13: note: expected ‘const struct GdkColor *’ but argument is of type ‘struct GdkRGBA *’
 void        gtk_widget_modify_bg          (GtkWidget            *widget,
             ^
cc1: all warnings being treated as errors
make[2]: *** [ui/gtk/CMakeFiles/gtkui.dir/filter_dlg.c.o] Error 1


Also note that
https://developer.gnome.org/gtk3/3.6/GtkWidget.html#gtk-widget-modify-bg
states:
gtk_widget_modify_bg has been deprecated since version 3.0 and should not be used in newly-written code. Use gtk_widget_override_background_color() instead

Of course we are not the only ones who have problems with that replacement:
http://gtk.10911.n7.nabble.com/button-background-color-in-gtk3-td14268.html
which ends with a sort of ugly solution without the deprecated function.



svn path=/trunk/; revision=49169
2013-05-05 09:07:09 +00:00
Balint Reczey b0a2f8e76e Really change display filter combo box's background color using GTK3
svn path=/trunk/; revision=49166
2013-05-05 05:25:35 +00:00
Jeff Morriss 2602490a2d From Niels de Vos via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8626 :
It is useful to see not only the minimal, maximum and average service time for
RPC procedures, but also the total time these took.


From me: add it to the man page.

svn path=/trunk/; revision=49144
2013-05-03 13:53:16 +00:00
Irene Rüngeler c3ad89879e Fix Bug 8615 concerning the active "Start" button when remote interfaces are added.
svn path=/trunk/; revision=49134
2013-05-02 11:47:09 +00:00
Gerald Combs 9120bf883e Move the contents of wsar_html/core to wsar_html. Create tag files for
core, epan, and ui, and link them to each other to varying degrees. This
seems to be the best way to organize our documentation. The alternative
is to switch to a single doxygen.cfg and manually add files to different
groups or sections.

Add a wireshark.dox file which contains markup for the main page. Add
.dox and .txt to svnadd. Clean up our tag files. Force wsar_html to
rebuild each time.

svn path=/trunk/; revision=49091
2013-04-30 00:27:02 +00:00
Martin Kaiser 3beb9a36a3 free the linkname allocated by g_strdup()
set linkname to unknown for interfaces without a linkname (e.g.  pipes)
remove "this should not happen" warnings

svn path=/trunk/; revision=49072
2013-04-27 12:35:30 +00:00
Martin Kaiser e1bc174b39 when a named pipe is added to the interfaces list, it has no linktype
this triggered the g_assert(linktype) in create_and_fill_model()
    
the assert is not necessary as both gtk_list_store_set() and g_free()
can handle NULL parameters
    
remove the assert and add set linktype to "unknown" if the interface
has no linktype 

svn path=/trunk/; revision=49071
2013-04-27 09:55:46 +00:00
Guy Harris 2013b5ad31 Fix a comment (the "it worked but didn't pop up a window" conclusion
came from a bad test).

svn path=/trunk/; revision=49070
2013-04-27 03:51:40 +00:00
Guy Harris a36a0a7a84 Update comments.
svn path=/trunk/; revision=49069
2013-04-27 02:57:16 +00:00
Gerald Combs 32352fb1a2 Update the capture start, stop, and restart icons and development badge
with enhanced versions from Elliott.

Switch the interface configuration icon to the "gear" version. This
matches the gear in the capture icon.

svn path=/trunk/; revision=49059
2013-04-26 21:10:35 +00:00
Evan Huus 63ef04ec84 Fix a whole bunch of doxygen warnings, mostly typos or renamed parameters.
svn path=/trunk/; revision=49053
2013-04-26 18:28:21 +00:00
Gerald Combs 098997e5fb Buildbot (via Twisted) sets a restrictive umask. Unset it before we run
Doxygen.

svn path=/trunk/; revision=49052
2013-04-26 18:23:05 +00:00