Commit Graph

1694 Commits

Author SHA1 Message Date
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
Gerald Combs ea5829c50b Add some Doxygen checks.
svn path=/trunk/; revision=49051
2013-04-26 17:49:00 +00:00
Guy Harris edfe2fc28c Work around a bug in a Microsoft security fix.
svn path=/trunk/; revision=49046
2013-04-26 04:42:20 +00:00
Guy Harris 889e2d6e5e Get rid of leftover debugging variable.
svn path=/trunk/; revision=49045
2013-04-26 01:01:32 +00:00
Guy Harris d3dc1bfd43 Check, for each of the standard handles, whether they need to be
redirected to a console.  Only if at least one of them needs to be
redirected to we create a console, and don't redirect them if they don't
need to be redirected.

This makes redirection of the standard output of, for example,
"wireshark -D" work; we don't redirect it out from under the shell.

svn path=/trunk/; revision=49044
2013-04-26 00:50:21 +00:00
Gerald Combs e6434ae19e Update the main, epan, and ui Doxygen configuration files. Change the
output directory to wsar_html (Wireshark API Reference HTML) to match
the Docbook naming convention. In each doxygen.cfg.in move the
doxygen_global.cfg to the top of the file so that our local definitions
don't get clobbered. Add makefile targets for wsar_html and wsar-zip.

svn path=/trunk/; revision=49043
2013-04-26 00:07:42 +00:00
Jörg Mayer c3d7f57f58 Add Qt5 build support with cmake. Just do cmake ... -DENABLE_QT5=ON ...
svn path=/trunk/; revision=49042
2013-04-25 23:04:19 +00:00
Jörg Mayer 9b87dc0afc Fix a warning: sparkline_delegate.h does not contain a Q_OBJECT
svn path=/trunk/; revision=49039
2013-04-25 22:11:40 +00:00
Jörg Mayer 52965244cd Add GTK3_DEFINITIONS to the compiler flag when building with gtk3
svn path=/trunk/; revision=49038
2013-04-25 21:35:54 +00:00
Gerald Combs d83d4accb0 Update QtShark.pro for Qt5, hopefully without breaking Qt4. Enable the
startup blur on OS X for Qt >= 5.

svn path=/trunk/; revision=49036
2013-04-25 21:08:56 +00:00
Guy Harris 39779a7bee Send the output of the -D and -L options to the standard output rather
than the standard error.

In Wireshark on Windows, create a console before doing so and destroy it
before exiting.  Don't do that in TShark or dumpcap, as those are
console-mode programs on Windows.

This should fix bug 8609 and still allow "wireshark -D" and "wireshark
-L" to work when the standard output isn't redirected.

svn path=/trunk/; revision=49025
2013-04-25 05:47:11 +00:00
Jörg Mayer 9db6d700cd The porting guide for Qt5 requires that Q_OS_ be used instead
of Q_WS_ in Qt4 projects
See:
http://qt-project.org/doc/qt-5.0/qtdoc/portingguide.html

svn path=/trunk/; revision=49013
2013-04-24 11:07:25 +00:00
Jörg Mayer 8c11433414 Revert
http://anonsvn.wireshark.org/viewvc/viewvc.cgi?view=rev&revision=46575

User: gerald                                                                           Date: 2012/12/17 01:24 PM

Log:
 Add libui_dirty.

This is the autofoo way of solving the problem.

Implement the cmake solution (which is used in wiretap/ and other places)
which does not require building a separate lib.

svn path=/trunk/; revision=48976
2013-04-22 19:00:29 +00:00
Michael Mann 4a1bd75b60 Add a "hidden" array of UAT entry data to allow separation between UAT file syntax errors and "syntactically correct, but invalid field". Now UAT files load all entries into the "hidden" array (raw_data), but only adds valid ones to the user_data, which is used by the dissectors.
This is a start to fixing bug 7471 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7471) and is being committed to get the new ABI/API in before the 1.10 release.
What remains is the "GUI portion" (GTK+qt) to indicate to users which UAT entries are invalid.

svn path=/trunk/; revision=48960
2013-04-22 02:10:49 +00:00
Anders Broman 0567069a98 Based on http://anonsvn.wireshark.org/viewvc?revision=48893&view=revision
"Cast scrolling values to gdoubles, not gfloats - GtkAdjustment have
always taken doubles that I've been able to find, and casting to floats
causes loss of precision and weird bugs when the values get enormous."

svn path=/trunk/; revision=48930
2013-04-19 16:26:27 +00:00
Irene Rüngeler e1713c142d Initialize another variable.
svn path=/trunk/; revision=48926
2013-04-19 11:54:22 +00:00
Irene Rüngeler 319e5be393 Show Forward_Tsn chunks in the graph
svn path=/trunk/; revision=48925
2013-04-19 11:34:46 +00:00