Commit Graph

782 Commits

Author SHA1 Message Date
Anders Broman 6d107d40e0 From Michal Labedzki:
If we have strinfo->info_payload_type_str use that othewise
use the value string for known PT:s

Part of 
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7893

svn path=/trunk/; revision=45924
2012-11-05 12:15:37 +00:00
Anders Broman 8366b45559 Try to fix prefs_dlg.c:1814: warning: 'abbrev' may be used uninitialized in this function.
svn path=/trunk/; revision=45919
2012-11-05 09:55:04 +00:00
Anders Broman dc284b0c04 Initialize variables.
svn path=/trunk/; revision=45916
2012-11-05 09:13:36 +00:00
Anders Broman 217c746d83 From Michal Labedzki:
Add Preferences submenu to packet list menu

Preferences point to protocol which is on top expect "malformed", "text" and "expert" fields.


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

svn path=/trunk/; revision=45914
2012-11-05 08:59:25 +00:00
Anders Broman 120dab634e From Michal Labedzki:
"Decode By" for Bluetooth support decoding by L2CAP service, L2CAP CID,
L2CAP PSM, RFCOMM service and RFCOMM channel.

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

svn path=/trunk/; revision=45913
2012-11-05 08:39:51 +00:00
Anders Broman eba7e0dc1e Use GtkGrid if GTK version is >= 3.2
svn path=/trunk/; revision=45910
2012-11-04 17:39:07 +00:00
Anders Broman c28020cda0 Fix a typo
svn path=/trunk/; revision=45902
2012-11-04 17:06:22 +00:00
Anders Broman 5965384149 Use GtkGrid if GTK version is >= 3.2
svn path=/trunk/; revision=45901
2012-11-04 17:00:01 +00:00
Anders Broman d23097f96d Add the row with the tags first
svn path=/trunk/; revision=45899
2012-11-04 16:05:28 +00:00
Anders Broman d54b681f84 From Jim Young and updated by Max Romanov:
The modification to acinclude.m4 adds a new test in the
AC_WIRESHARK_OSX_INTEGRATION_CHECK section to first look for the library
gtkmacintegration.  "gtkmacintegration" is the new internal name for GTK+ MAC
OSX library after the project was moved to www.gtk.org.  Previously this
library was known as igemacintegration.

The patches to the three gtk/*.c files update the conditional #include
<gtkmacintegration/gtkosxapplication.h> to use the new folder name.   The
Option 1 patch will break any build environment that expects to find the
gtkosapplication.h file in the older igemacintegration folder.  
In addition the patch includes updates to
gtk/main.c and gtk/main_menubar.c for a more standard looking App menu.

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

svn path=/trunk/; revision=45869
2012-11-02 09:58:43 +00:00
Gerald Combs 606a7433ce Add changes missing from the last commit.
svn path=/trunk/; revision=45862
2012-11-01 21:17:29 +00:00
Martin Kaiser 000f8eb62c fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7913
When we create a new color filter, we prepend the color filter list with
a default entry and launch an edit dialogue. If the user cancels, we
have to remove this _first_ entry from the list (not the last one).

svn path=/trunk/; revision=45820
2012-10-28 19:13:54 +00:00
Chris Maynard 6147e6d1d5 Wireshark Filter Expression dialog does not sort list of named fields. Patch from Jakub Zawadzki. Resolves https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7743
svn path=/trunk/; revision=45719
2012-10-22 18:10:48 +00:00
Pascal Quantin b439ae0d6a Revert r45692 and try to fix link failure another way: console_win32.[ch] definitely belong to ui/win32
Add console_win32.[ch] to Makefile.am

svn path=/trunk/; revision=45693
2012-10-21 19:12:18 +00:00
Alexis La Goutte 5af3defc46 Try to fix LINK : fatal error LNK1181: cannot open input file 'win32/console_win32.obj'
move ui/win32/console_win32.[ch] to ui/console_win32.[ch]

svn path=/trunk/; revision=45692
2012-10-21 18:10:31 +00:00
Alexis La Goutte 62ce10ced8 Move MSWindows console "windows" to ui/win32/console_win32.[ch]
svn path=/trunk/; revision=45677
2012-10-21 14:45:23 +00:00
Jakub Zawadzki b53dbea042 Make data_source opqaue, add getter for tvb.
svn path=/trunk/; revision=45672
2012-10-20 19:54:56 +00:00
Jakub Zawadzki 77368c3668 Introduce epan_dissect_run_with_taps() which run dissection with taps.
unexport tap_queue_init, tap_push_tapped_queue

svn path=/trunk/; revision=45670
2012-10-20 19:27:24 +00:00
Gerald Combs 576b24c96e Move ui-independent object export routines to the common ui directory.
Implement DICOM, HTTP, and SMB object exports. Rename the GTK+ export
files. C++-ize epan/tap.h. Fix an apparent memory leak in
eo_save_all_clicked_cb.

The Qt dialog has an indeterminate progress bar. I tried adding
something similar to the GTK+ dialog but event processing led down a
rabbit hole.

svn path=/trunk/; revision=45647
2012-10-18 21:14:43 +00:00
Gerald Combs c801088198 Change the "Bytes" column to "Size" and make its values human readable.
svn path=/trunk/; revision=45608
2012-10-16 23:25:31 +00:00
Gerald Combs e49ff2373e Move the DICOM, HTTP, and SMB object export code to the ui directory.
svn path=/trunk/; revision=45606
2012-10-16 22:57:22 +00:00
Jakub Zawadzki 78631020b8 Add wtap_pseudo_header union to wtap_pkthdr structure.
Use pkthdr instead of pseudo_header as argument for dissecting.

svn path=/trunk/; revision=45601
2012-10-16 21:50:57 +00:00
Gerald Combs 9f1fd13e9a Use topic_action instead of topic_cb for the Windows file dialogs. Move
the common Qt help code to wireshark_application.cpp.

svn path=/trunk/; revision=45594
2012-10-16 19:47:43 +00:00
Gerald Combs 403e6dc86a Move common SSL key export routines to ui/ssl_key_export.[ch]. Make the
exported keys a gchar *. Implement SSL key exports in the Qt UI. Remove
some no-longer-necessary packet-ssl*.h includes.

Change lastOpenDir().absolutePath() to .canonicalPath(). Get rid of the
"Export As PostScript" action.

svn path=/trunk/; revision=45589
2012-10-16 18:14:16 +00:00
Martin Mathieson 9fa43a6c33 Allow the RLC sequence graph to be called from the statistics window.
svn path=/trunk/; revision=45562
2012-10-15 17:29:04 +00:00
Gerald Combs 818cf887f9 Add missing arguments.
svn path=/trunk/; revision=45516
2012-10-13 01:01:48 +00:00
Gerald Combs 419f851e34 Fix Windows compilation problems from r45513. #ifdef out some non-Windows
code.  Get rid of a few uses of the global cfile.

svn path=/trunk/; revision=45514
2012-10-13 00:18:46 +00:00
Alexis La Goutte b504e64b6a From Edwin Groothuis via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7842
Make relative time columns rightly right justified

When showing the relative time in the framelist columns, they are left aligned.
This is sub-optimal if you are scanning the list for a different time.

This patch, very small, will properly right justify these times:
DELTA_TIME
DELTA_TIME_DIS

svn path=/trunk/; revision=45481
2012-10-11 20:16:24 +00:00
Martin Mathieson 6f112aa115 Copy of tap details needed to be a little bit deeper.
svn path=/trunk/; revision=45458
2012-10-10 23:09:52 +00:00
Gerald Combs f003add90f Fix a copy+paste error and a missing include. Adjust the format_size
digit threshold.

svn path=/trunk/; revision=45456
2012-10-10 20:19:18 +00:00
Gerald Combs 98b0812341 Add a format_size function similar to g_format_size that renders a size
value in a human-readable format. Use it in the welcome screen, status
bar, and Win32 interface details.

Note that in the welcome screen and status bar we've switched from
customary binary prefixes to strict SI.

svn path=/trunk/; revision=45453
2012-10-10 19:17:31 +00:00
Martin Mathieson 81a50ff80b Take a deep copy of the tap struct in the tap function, as it is not
safe to access it after the packet has been fully dissected (the
struct will have been allocated with ep_alloc()).

svn path=/trunk/; revision=45449
2012-10-10 16:17:19 +00:00
Gerald Combs ce4967bfec Remove a debugging #include.
svn path=/trunk/; revision=45406
2012-10-08 20:04:38 +00:00
Gerald Combs 445148ac0e Add a PacketRangeGroupBox widget. Use it to implement "Export Selected
Packets". Not yet tested on Windows. "Ignore Packet" hasn't been
implemented so we can't test that either.

Create a SyntaxLineEdit widget from the QLineEdit code in
DisplayFilterEdit. Use it in the file import and export dialogs and the
PacketRangeGroupBox widget. This lets us provide instant feedback
instead of popping up an error dialog.

Expand the Tango color list based on
http://emilis.info/other/extended_tango .

Rearrange QtShark.pro to (hopefully) work better with Qt Creator.

svn path=/trunk/; revision=45405
2012-10-08 20:01:59 +00:00
Evan Huus 92c3bc0228 Don't leak all of our column data in packet_list_recreate (I think we still leak
some of it?).

Maybe part of https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7775

svn path=/trunk/; revision=45388
2012-10-08 15:12:45 +00:00
Bill Meier ff7059d588 (Trivial) Remove unneeded #include.
svn path=/trunk/; revision=45376
2012-10-07 22:33:59 +00:00
Bill Meier ebe086ef08 Minor cleanup:
- remove unneeded #includes;
- remove some "no effect" code;
- fix some whitespace and long lines.

svn path=/trunk/; revision=45371
2012-10-07 17:45:56 +00:00
Chris Maynard 62169cf312 This is an attempt to improve the default window placement position when there's more than one monitor and Wireshark's main window isn't located on the primary monitor. New windows will now open on the same monitor as Wireshark's main window, at a fixed location slightly offset from the main window. Previously, new windows would always open on the primary monitor regardless of the monitor that Wireshark was on. Note that this is only the default position and future patches will likely cause many windows to change this position. Further usage/feedback will determine if this is a good temporary stategy or not. It *may* help obviate the need to save every window's x,y & size though.
svn path=/trunk/; revision=45370
2012-10-07 17:16:51 +00:00
Martin Mathieson 0e32b4e2ef Use ellipses rather than crosses made from lines to show data points,
and no longer connect the data points with lines.

Because this is slower than before, increase the zoom multipler.

The (very) slow part is filling in the circles - using
cairo_set_tolerance() with 1.0 doesn't do anti-aliasing but looks good
enough (halfing the time for this operation).

svn path=/trunk/; revision=45336
2012-10-06 00:56:55 +00:00
Martin Mathieson 3884220435 Fix some indentation, add missing braces, and don't bother calling
cairo_set_width() inside the loops while doing the axes.

svn path=/trunk/; revision=45335
2012-10-06 00:23:23 +00:00
Gerald Combs 71ed773862 Add a capture_file * element to packet_range_t and pass it explicitly in
packet_range_init(). Get rid of global cfile references in
packet-range.c. C++-ize packet-range.h. Shuffle some includes around.

svn path=/trunk/; revision=45333
2012-10-05 18:52:42 +00:00
Chris Maynard b436d64d55 A minor modification to Stephen Fisher's r34265 patch to [attempt to] resolve bug 553. This change takes into account that viewable_area.[x|y] may not be 0,0. Will this finally fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=553 ?Unknown, but I am unable to reproduce it.
svn path=/trunk/; revision=45331
2012-10-05 14:51:31 +00:00
Bill Meier 0a0b4aecbf Modify use of GtkTable in preparation for using GtkGrid instead if GTK3.
Specifically:
 - keep track of number of table rows instead of using gtk_table_get_size();
 - remove call to gtk_table_resize() [not required].

svn path=/trunk/; revision=45320
2012-10-04 19:29:54 +00:00
Bill Meier 54e814970d Simplify use of GtkTable in preparation for using GtkGrid instead if GTK3.
Specifically: remove/replace use of gtk_table_resize().

Also: minor indentation and whitespace cleanup;

svn path=/trunk/; revision=45309
2012-10-04 15:35:10 +00:00
Gerald Combs 13a2e931b7 Remove more obsolete _MSC_VER code.
svn path=/trunk/; revision=45299
2012-10-03 20:23:51 +00:00
Bill Meier c74466c744 (Trivial): add some whitespace for readability.
svn path=/trunk/; revision=45297
2012-10-03 19:43:36 +00:00
Gerald Combs bcd2cea774 Unify the GTK+ and Win32 versions of "Export Specified Packets". Add a
shared "file_add_extension" routine. We no longer support _MSC_VER <
1400 so get rid of some clutter. Add a gzip checkbox to the Win32 export
packets dialog. Windows code hasn't yet been tested (and is likely
broken). I'll fix it shortly.

svn path=/trunk/; revision=45296
2012-10-03 19:24:14 +00:00
Martin Mathieson bf370afa44 When drawing an axis, only call cairo_stroke once all lines are drawn.
svn path=/trunk/; revision=45281
2012-10-03 09:15:16 +00:00
Martin Mathieson a273e4a913 Submit Jacub's fix for bug 7771 (hanging while drawing graph types that
involved ellipses). cairo_save/restore is nicer than
cairo_create/destroy, and quite a bit quicker too.

svn path=/trunk/; revision=45280
2012-10-03 08:58:12 +00:00
Guy Harris 73dd0321ea Get rid of the always-null and unused argument to
host_name_lookup_process().  If, in the future, we find that we need an
argument for changes we're making, we can add it then.

svn path=/trunk/; revision=45269
2012-10-02 21:13:59 +00:00