Commit Graph

1187 Commits

Author SHA1 Message Date
Gerald Combs 430d616e28 Do a better job of getting the user's attention for temporary messages.
Rename some variables.

svn path=/trunk/; revision=46310
2012-11-30 23:14:53 +00:00
Jeff Morriss 62857dd6b4 Add addr_resolution_dlg.c
svn path=/trunk/; revision=46308
2012-11-30 16:17:00 +00:00
Anders Broman 5efb100bc4 Add a menu to view the current address resolution.
Future enhancments(?) to save as new hosts file.

svn path=/trunk/; revision=46307
2012-11-30 14:57:50 +00:00
Gerald Combs a0eb2268a7 select_ifaces and select_current_ifaces haven't been used since r40715.
Presumably it's OK to remove them.

svn path=/trunk/; revision=46299
2012-11-29 22:58:16 +00:00
Jeff Morriss b39a7b487a Make tap_param.enum_vals const.
svn path=/trunk/; revision=46297
2012-11-29 22:21:23 +00:00
Jeff Morriss 987b122d58 Make an enum_val_t const.
svn path=/trunk/; revision=46295
2012-11-29 21:40:26 +00:00
Pascal Quantin 0594b41113 Add missing newline at end of file
svn path=/trunk/; revision=46284
2012-11-29 14:57:06 +00:00
Anders Broman cec78c6518 From Michal Labedzki:
Src/dst ports are stored as guint32 in packet_info, so do the same
for RTP ports. This also fix no stream after analyze when
there is used high port, for example 0xFFFFFFFF. So there is
casting to 0xFFFF and comparing to 32bit value and finally fail.

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

svn path=/trunk/; revision=46277
2012-11-29 12:14:53 +00:00
Jeff Morriss 7d0bb3bc0d Remove a now-unused variable.
svn path=/trunk/; revision=46246
2012-11-28 15:34:50 +00:00
Anders Broman 7d92266058 Add a copy button that copies to clipboard.
svn path=/trunk/; revision=46245
2012-11-28 14:34:20 +00:00
Martin Mathieson bd3b559725 - Allocate the correct number of elements to draw
- Draw data list then control list, so can spot blue of ACKs when zoomed
  right out
- Made the red crosses for NACKs smaller

svn path=/trunk/; revision=46243
2012-11-28 03:10:05 +00:00
Anders Broman 20abe45694 Add more information about the capture.
svn path=/trunk/; revision=46224
2012-11-27 16:46:00 +00:00
Anders Broman 55a7c0f646 Get rid of now unused variable.
svn path=/trunk/; revision=46223
2012-11-27 14:42:28 +00:00
Anders Broman 18d5f2dbfc Start including info from Statistics/Summary.
svn path=/trunk/; revision=46219
2012-11-27 13:35:33 +00:00
Alexis La Goutte 70a4056c1d From report of Joerg Wunsch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7973 QRC files are missing in 1.8.3/SVN release tarball
Fix :
make[2]: *** No rule to make target `ui/qt/qtshark_fr.ts', needed by `ui/qt/qtshark_fr.qm'.  Stop.
make[1]: *** [ui/qt/CMakeFiles/qtui.dir/all] Error 2
make: *** [all] Error 2

From me:
Add missing files (*.ts, *.qm) to ui/qt/Makefile.common

svn path=/trunk/; revision=46218
2012-11-27 13:14:37 +00:00
Alexis La Goutte 126c3f8b88 From report of Joerg Wunsch via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7973 QRC files are missing in 1.8.3/SVN release tarball
Fix :
CMake Error at /usr/share/cmake-2.8/Modules/Qt4Macros.cmake:187 (FILE):
  file Internal CMake error when trying to open file:
  /wireshark-1.9.0-SVN/ui/qt/i18n.qrc for reading.
Call Stack (most recent call first):
  ui/qt/CMakeLists.txt:139 (QT4_ADD_RESOURCES)
...

From me:
Add missing files (*.qrc, qtshark.pro...) to ui/qt/Makefile.common

svn path=/trunk/; revision=46217
2012-11-27 09:18:42 +00:00
Martin Mathieson 85e8ebaf19 Add %DL padding to LTE MAC stats.
svn path=/trunk/; revision=46215
2012-11-27 01:11:41 +00:00
Anders Broman 77dafd7b7c Add comment syúmmary to GUI and add Capture comment from SHB.
svn path=/trunk/; revision=46206
2012-11-26 18:52:29 +00:00
Anders Broman beeabf86aa Rudimentary code to show comments summary.
svn path=/trunk/; revision=46204
2012-11-26 16:11:04 +00:00
Anders Broman 0f19bd385b From Jim Young:
Refactoring committed in Revision 460001 of tcp_graph.c introduced a copy&pasteo to wscale_make_elmtlist() such that compare_headers() would always return false.  Consequently no elements would get added to the list of elements to be plotted.

The attached patch corrects wscale_make_elmtlist() so that the Windows Scaling graph will plot elements.

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

svn path=/trunk/; revision=46200
2012-11-26 08:50:25 +00:00
Bill Meier 6f606223aa Fix a [-Wshadow] warning;
svn path=/trunk/; revision=46188
2012-11-25 21:54:55 +00:00
Bill Meier 6f08979550 Fix a [-Wshadow] warning;
Also: Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46186
2012-11-25 21:45:50 +00:00
Bill Meier 4dacdedbe7 Fix several [-Wshadow] warnings;
Also: Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46185
2012-11-25 21:07:07 +00:00
Bill Meier 8c6af904b6 Fix a [-Wshadow] warning;
Also: Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46184
2012-11-25 21:05:15 +00:00
Bill Meier db4c220cea Fix several [-Wshadow] warnings;
Also: Do some minor whitespace and formatting changes.

svn path=/trunk/; revision=46183
2012-11-25 19:27:59 +00:00
Martin Mathieson 4fb9cfe714 Set line width 1 for the cairo context used to draw all lines (bug
8017).  Do it outside of the loop.

svn path=/trunk/; revision=46176
2012-11-25 14:15:02 +00:00
Martin Mathieson 8abda3c25a Needed to match up correct element lists for data + control for tcptrace
graphs.

Should really make clearer the way lists of elements are allocated and
the final next is assigned to NULL...

svn path=/trunk/; revision=46174
2012-11-25 02:04:00 +00:00
Martin Mathieson 6851b6dee2 Show ACK after data list, so grey/blue is visible when zoomed out.
svn path=/trunk/; revision=46173
2012-11-25 00:35:36 +00:00
Martin Mathieson 535a8887d7 From Jim Young:
- restore rendering TCP graph titles with black text (fixing bug 8016)

Plus a couple of updated comments.

svn path=/trunk/; revision=46164
2012-11-24 14:20:00 +00:00
Guy Harris 5290b60ab3 Rename get_windows_interface_friendlyname() to
get_windows_interface_friendly_name(), and have it return the friendly
name on success and NULL on failure.

Get rid of the logging in get_windows_interface_friendly_name().

svn path=/trunk/; revision=46161
2012-11-24 00:05:32 +00:00
Irene Rüngeler 2a18c9b5df Fix bug reported in https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=8011
svn path=/trunk/; revision=46153
2012-11-23 13:16:04 +00:00
Gerald Combs 7d27bd0c6e Add cfutils.c + capture_unix_ifnames.c + SystemConfiguration. Sort our
SOURCES.

svn path=/trunk/; revision=46145
2012-11-22 17:29:58 +00:00
Anders Broman fbce97738b From Preben Guldberg:
Add a tooltip for a pkt_comment column to show packet comment.

Modified to check frame data for packet_comment and show it as
a tooltip for the entire row.

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

svn path=/trunk/; revision=46141
2012-11-22 12:33:21 +00:00
Guy Harris 1105a21a8c Fix another reference to the "description" member of an if_info_t (in
commented-out code).

svn path=/trunk/; revision=46134
2012-11-22 07:02:53 +00:00
Guy Harris 6a5d8a1e65 Fix a reference to the "description" member of an if_info_t.
svn path=/trunk/; revision=46132
2012-11-22 06:54:35 +00:00
Guy Harris bd976ae6c0 On UN*X, if an interface has a description, use it as the "friendly
name".  If it doesn't have a description, on OS X, use the System
Configuration framework to attempt to get a "friendly name" for
interfaces.

If a loopback device doesn't have a friendly name, give it "Loopback" as
the friendly name.

Move the "turn a CFString into a mallocated C string" routine into
common code, as it's used in more than one place.

svn path=/trunk/; revision=46131
2012-11-22 06:02:49 +00:00
Guy Harris d415d3d87c On error, have capture_opts_trim_iface() return the exit status that
should be used (on success, have it return 0).  Exit with that exit
status; if the problem is that we couldn't get the interface list or if
there are no interfaces in that list, return 2, as that's not a
command-line syntax error.

svn path=/trunk/; revision=46108
2012-11-21 17:14:54 +00:00
Guy Harris 85b5a71c73 Clean up white space.
Clarify that the other "friendly name" is NDIS's idea of a "friendly
name".

svn path=/trunk/; revision=46096
2012-11-20 01:15:00 +00:00
Jeff Morriss e1b2eda268 Attempt to fix the Windows Qt builds.
svn path=/trunk/; revision=46092
2012-11-19 22:16:39 +00:00
Jeff Morriss 5681aa0fda Put a line of code on its own line (instead of following a comment).
svn path=/trunk/; revision=46090
2012-11-19 22:01:07 +00:00
Anders Broman 28474fe8ef From Mike Garratt:
Friendly Names for interfaces on Windows

Notes on the changes the patch covers:
* if_info_t struct: addition of friendly_name
* Dumpcap Interface list format changes:
  + Win32: "dumpcap -D" shows friendly_name in place of descript if known
  + All: machine interface "dumpcap -D -Z none" includes friendly_name in the
list in addition to the existing parameters
* interface_options struct: addition of console_display_name
  + When an interface name is displayed in a console, it will typically be the
console_display_name (instead of name). 
  + console_display_name is used as the basis of the autogenerated temp
filenames
  + console_display_name is typically set to the friendly_name if known,
otherwise it is set to the interface name
* Enhancements to capture_opts_add_iface_opt() (the function which process -i
options).
  + Can now specify the interface using its name and friendly_name
  + Interface name matching is case insenstive
  + Name matching first attempts exact matching, then falls back to prefix
matching
    (e.g. dumpcap -i local)
  + Validates interface names, instead of blindly sending them off to
winpcap/libpcap
  + Interface specification by number is still supported.
* capture_opts_trim_iface() has been refactored:
  + Instead of repeating a decent chunk of the cost in
capture_opts_add_iface_opt(), it calls capture_opts_trim_iface() to specify the
interface.
* introduction of capture_win_ifnames.[ch] (windows only code)
  + Implements static function GetInterfaceFriendlyNameFromDeviceGuid() - a
windows version independant function to convert an interface guid into its
friendly name.  Uses published api functions on windows vista and higher, but
falls back to unpublished API functions on older windows releases.
  + void get_windows_interface_friendlyname(/* IN */ char
*interface_devicename, /* OUT */char **interface_friendlyname); - extracts the
GUID from the interface_devicename, then uses
GetInterfaceFriendlyNameFromDeviceGuid() to do the resolution
* Auto temp filename generation:
  + Now uses wireshark_pcapng_* or  wireshark_pcap_* depending on file format
  + Basis temp filename format on console_display_name
  + Win32: if console_display_name is a windows interface guid, extracts
numbers from GUID here (instead of in interface option processing) 

GUI CHANGES:
* Dialog that displays when you click the "Manage Interfaces" button (within
Capture Options dialog) has been renamed from "Add new interfaces" to
"Interface Management"
* ui/gtk/capture_dlg.c: new_interfaces_w variable renamed to
interface_management_w
* Win32: Local Interfaces tab on Interface Management dialog, shows includes
friendly name as far left column
* Interface Management dialog defaults to larger size on win32 - so it fits
without resizing local interfaces tab
* Interface Management dialog now saves preferences when you click the apply
button (local hidden interfaces was not persisting across restarts)
* Tweaks: "Interface Details" dialog (Interface list->Capture Interfaces ->
Details):
  + "Friendly Name" renamed to "NDIS Friendly Name"
  + Added "OS Friendly Name" to the top of the list
* Win32: The "Capture Interfaces" dialog now shows the friendly name instead of
device guid
* Welcome screen:
  + The height of the interface list scrollbox dynamically adjusts & updates to
the number visible interfaces.
    Up to 10 interfaces can be listed without a scroll bar, the minimum height
is for 2 interfaces. 
  + Win32: now shows just the Friendly Name if known - in place of
"Interfacename_Guid:(Description)"

svn path=/trunk/; revision=46083
2012-11-19 20:07:27 +00:00
Martin Mathieson f4c90e138d Was not allocating a large enough element array for tput graphs.
svn path=/trunk/; revision=46079
2012-11-18 19:52:48 +00:00
Anders Broman 45e9735b09 Enhance error output.
svn path=/trunk/; revision=46076
2012-11-18 18:10:48 +00:00
Martin Mathieson 1a1e7f38b7 - Make perform_zoom() quickly return if graph already fully zoomed out
- Restore zooming out with middle-button + shift
- Lose unused graph->next and register_tap_listener_tcp_graph()
- Fix up some whitespace

svn path=/trunk/; revision=46072
2012-11-18 15:56:29 +00:00
Martin Mathieson e0da278d5f After launching 'Follow stream' or one of the graphs, restore the
conversation selection.

svn path=/trunk/; revision=46027
2012-11-14 02:53:41 +00:00
Martin Mathieson e9e2137c19 Try to cast away windows buildbot errors.
svn path=/trunk/; revision=46025
2012-11-13 20:13:32 +00:00
Martin Mathieson 14d585d743 Zoom in on a rectangle chosen by clicking and dragging the left mouse
button.

From Edwin Goothuis (bug 7931), with some small edits and
comments from me.

svn path=/trunk/; revision=46024
2012-11-13 19:37:58 +00:00
Martin Mathieson 777b1274df Initialise a variable and try to make the OSX-10.6-x64 buildbot happy.
svn path=/trunk/; revision=46007
2012-11-12 04:13:13 +00:00
Martin Mathieson 0aebd579e3 Show SACK information in TCP graphs. Also add a generated field for the
number of SACK ranges found in the SACK option.

This involved extending the IP options framework to include an extra
void* data field, which in the case of TCP is filled in with the tap
struct - other users currently pass NULL.

I first implemented the graph to sort the SACK ranges and show (in red)
the unacknowledged regions between them, but this became confusing where
the number of ranges is limited by TCP padding bytes. i.e. you can't
tell how many SACKs could have been encoded, so some of the gaps between
ranges may already have been received.

svn path=/trunk/; revision=46006
2012-11-12 03:55:46 +00:00
Evan Huus 08b94f4dd0 Fix compilation error (set but unused variable) and allow TCP graphs to be
launched from the Conversation List -> TCP (IPv4 & IPv6) window as well, since
that looked like the intention of the unused variable.

svn path=/trunk/; revision=46002
2012-11-11 19:16:06 +00:00