Commit Graph

187 Commits

Author SHA1 Message Date
Anders Broman 1b7e7ea109 Try to make the buildbot happy
svn path=/trunk/; revision=41370
2012-03-06 09:24:49 +00:00
Anders Broman 6df56f8542 From Martin Kaiser: capture dialogue: unitialized pointer is dereferenced, assigning an arbitrary dlt to a capture interface https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6914
svn path=/trunk/; revision=41369
2012-03-06 09:16:50 +00:00
Anders Broman 3b06ee6ca0 From Cal Turney: Try to fix the remaining warnings. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6883
svn path=/trunk/; revision=41367
2012-03-06 08:45:54 +00:00
Anders Broman 34f66b12d8 Use a dedicated treview for packet comments.
svn path=/trunk/; revision=41356
2012-03-05 13:34:55 +00:00
Anders Broman de47b36104 From Cal Turney:
Bugs in the tshark '-z io,stat' output:
1: The LOAD stat in the last row of the output is inaccurate because rpc.time
is divided by the full interval rather than limiting it to the capture
duration.
2: An The empty comma field (for outputting total frames and bytes) is ignored
when it is the first field in the command.
3: Intervals at the end of capture that contain no data are not displayed. Such
intervals are as important to see as those (zero data intervals) that occur
earlier in the capture. 
4: Floating point numbers are not properly aligned under their column headers.

Enhancements to '-z io,stat' output:
1. Column widths are determined by the maximum magnitude of their values rather
than set to a fixed width of 15 chars which allows for more stats to be
displayed per row without wrapping. 
2. To improve readability, filters wrap at 102 chars or the table width,
whichever is greater, and wrap on the nearest space. An option can be added to
alter the 102-char limit. 
3. Column numbers begin at 1 instead of 0.     
4. The columns and entire output are enclosed in a border for improved
presentability in reports. The table can be imported into a spreadsheet by
specifying the vertical bar as the data delimiter.

"Fixed" compiling on Ubuntu

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

svn path=/trunk/; revision=41355
2012-03-05 12:06:26 +00:00
Balint Reczey 104bab54f1 Use 'wireshark' icon from theme
This makes Wireshark able to use SVG icon when it is installed

svn path=/trunk/; revision=41329
2012-03-03 15:40:38 +00:00
Anders Broman 464ec2dcb1 Typo
svn path=/trunk/; revision=41323
2012-03-02 13:53:30 +00:00
Anders Broman ff47bdf96c Use the expert system to show packet comments.
The packet comment widget should be replaced by a ListView with two columns,  packet no and Comment.

svn path=/trunk/; revision=41322
2012-03-02 13:31:16 +00:00
Jeff Morriss 5811471407 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6891 :
Handle generating selected values for hf's with BASE_DEC_HEX and BASE_HEX_DEC.

svn path=/trunk/; revision=41272
2012-03-01 16:42:49 +00:00
Jeff Morriss 8db7c4d369 #if out setting the help buttons' callbacks to NULL to avoid GLib-Object-CRITICAL warnings.
svn path=/trunk/; revision=41269
2012-03-01 16:03:42 +00:00
Jeff Morriss e3cf120575 Keep track of whether we have a "Edit Capture Comment" dialog open. If we do,
don't open another one.

Make a couple globals static.

svn path=/trunk/; revision=41268
2012-03-01 15:57:39 +00:00
Michael Tüxen 566dc82999 Fix CID 1373.
svn path=/trunk/; revision=41265
2012-03-01 15:10:45 +00:00
Martin Mathieson 59099158b9 Add a checkbox to allow MAC SRs to be included in generated filter
expressions.

svn path=/trunk/; revision=41250
2012-02-29 23:05:27 +00:00
Alexis La Goutte a1d847ed16 Fix compile for QtShark (../../util.c => ../../ui/util.c)
svn path=/trunk/; revision=41243
2012-02-29 16:54:29 +00:00
Anders Broman d24fad6371 - Add a LED in the statusbar to indicate that capture comments exists,
clickable to open an edit window.
- Add checks for NULL pointers.

Help with a different color LED possibly with Jeff's (c) in it apreceated.
Should the LED be placed elsewhere or the whole thing done differently?

svn path=/trunk/; revision=41242
2012-02-29 16:51:32 +00:00
Jeff Morriss 094e8f8947 Revert 41240, 41239, 41234, 41233, and (finally) 41231. Every time I fix a warning, 3 more pop up. Some of the uninitialized-variable ones look genuine and figuring them out would take a while.
svn path=/trunk/; revision=41241
2012-02-29 15:28:20 +00:00
Anders Broman ee38355eed Remove the offending %s for now.
svn path=/trunk/; revision=41240
2012-02-29 15:22:33 +00:00
Jeff Morriss 4a6e191973 Don't use itoa(). It still doesn't compile due to a format warning on line 760; like Martin, I'm not sure what is supposed to be there.
svn path=/trunk/; revision=41239
2012-02-29 15:04:06 +00:00
Anders Broman 53af6b37b6 Use GTK_COMBO_BOX_TEXT, compile failed when using GTK 2.24.10.
svn path=/trunk/; revision=41235
2012-02-29 11:56:36 +00:00
Martin Mathieson e7bd26af04 Fix another couple of warnings, but not sure what to do about the rest:
tap-iostat.c: In function ‘iostat_draw’:
tap-iostat.c:542:5: error: implicit declaration of function ‘itoa’
tap-iostat.c:756:9: error: too few arguments for format
tap-iostat.c:756:9: error: too few arguments for format

itoa() could be converted into a g_snprintf(), but the buffer used is only
one character long.  Is that right?

For the printf() format one, I'm not sure what was intended.


svn path=/trunk/; revision=41234
2012-02-29 10:25:44 +00:00
Martin Mathieson 86f0a7b80c Fix several compiler warnings (a few more remain though).
svn path=/trunk/; revision=41233
2012-02-29 10:19:32 +00:00
Anders Broman 9bdde5216f From Cal Turney:io,stat LOAD error, comma field ignored, zero data intervals not displayed, enhanced output https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6883
svn path=/trunk/; revision=41231
2012-02-29 05:49:18 +00:00
Anders Broman b3ef8443ab Packet comments are working
svn path=/trunk/; revision=41218
2012-02-28 06:05:32 +00:00
Jeff Morriss 89cfdc3559 Fix https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3315 -
make Save-As/Displayed/All-Packets save not only the displayed packets but
also any other packets needed (e.g., for reassembly) to fully dissect the
displayed packets.

This works only for the "All packets" case; choosing only the Selected packet,
the Marked packets, or a range of packets would require actually storing which
packets depend on which (too much memory) or going through the packet list many
times (too slow).  Also, this behavior is always the case: you can't save the
displayed packets without their dependencies (I don't see why this would be
desirable).

So far this is done for SCTP and things using the reassembly routines (TCP has
been tested).

The Win32 dialog was modified but hasn't been tested yet.

One confusing aspect of the UI is that the Displayed count in the Save-As
dialog does not match the number of displayed packets.  (I tried renaming the
button "Displayed + Dependencies" but it looked too big.)  The tooltip tries
to explain this and the fact that this works only in the All-Packets case;
suggestions for improvement are welcome.


Implementation details:

Dissectors (or the reassembly code) can list frames which were needed to
build the current frame's tree.  If the current frame passes the display
filter then each listed frame is marked as "depended upon" (this takes up the
last free frame_data flag).

When performing a Save-As/Displayed/All-Packets then choose packets which
passed the dfilter _or_ are depended upon.

svn path=/trunk/; revision=41216
2012-02-28 03:19:49 +00:00
Anders Broman ec778bd8f5 Mark the file as unsaved when updating packet comments.
svn path=/trunk/; revision=41208
2012-02-27 15:38:34 +00:00
Chris Maynard 9528902271 Re-apply r40728 and fix Coverity CID 1371 UNINIT again.
svn path=/trunk/; revision=41199
2012-02-27 00:25:41 +00:00
Anders Broman ce30b39aa3 Mark the gile as unsaved if comments are edited
svn path=/trunk/; revision=41198
2012-02-26 19:54:58 +00:00
Anders Broman 38c69c8431 Make it possible to edit capture comments
svn path=/trunk/; revision=41193
2012-02-26 17:04:28 +00:00
Guy Harris 83bf13e1e6 For LANalyzer files, make the "File type name" be the file comment.
Display the file comment in the Summary dialog.

svn path=/trunk/; revision=41188
2012-02-26 10:20:40 +00:00
Guy Harris 30b86b7817 Suppress invalid or non-meaningful statistics - for example, without
time stamps on all packets in a set, you can't determine the start and
end time of the packets in the set (even one timestampless packet throws
the determination off - was that packet before the first time-stamped or
after the last time-stamped packet, or between them?).

svn path=/trunk/; revision=41187
2012-02-26 08:02:02 +00:00
Jeff Morriss bc465f37fc Revisit https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3161
and r39501:

Setting _XOPEN_SOURCE to 600 is only allowed on Solaris 10 if the compiler is
set to C99 mode.  Conversely (and as reported in the bug), simply defining it
(but with no value) is not allowed if the compiler *is* compiling to C99.

So, don't define _XOPEN_SOURCE at all on Solaris.  Keep defining it as 600 on
other OS's as (also) requested in that bug.

Maybe there's a cleaner way to do this but all of this is a "trickery" mess
anyway...

svn path=/trunk/; revision=41182
2012-02-24 20:33:19 +00:00
Bill Meier 605dea0486 CVARSDLL hasn't been used (is undefined) for a while....
svn path=/trunk/; revision=41180
2012-02-24 16:23:38 +00:00
Michael Tüxen acdd01a1d9 From Irene Ruengeler: Always show snaplen.
svn path=/trunk/; revision=41176
2012-02-24 13:13:21 +00:00
Michael Tüxen 64ba56a080 From Irene Ruengeler: Whitespace changes.
svn path=/trunk/; revision=41174
2012-02-24 12:54:15 +00:00
Anders Broman fc42284f1d From Mark Cottrell: Attempting to view an RTP stream analysis graph causes program exit. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6866
svn path=/trunk/; revision=41170
2012-02-24 05:42:40 +00:00
Anders Broman b5a2ba98be Add SHB info to Summary
svn path=/trunk/; revision=41167
2012-02-23 21:29:13 +00:00
Anders Broman 286f3425e7 Have the used interfaces show up if number of interfaces > 0.
(pcapng file).

svn path=/trunk/; revision=41163
2012-02-23 15:40:31 +00:00
Anders Broman 07c039ad17 From Dirk Leinenbach:
Follow TCP IPv6 - wrong hostname.

#BACKPORT
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6861

svn path=/trunk/; revision=41162
2012-02-23 13:24:54 +00:00
Anders Broman 511d403ec2 From Kundok Park:
new_packet_list: crash in add_byte_views from decrypted zigbee data


The cause of the crash I saw was that the add_byte_views() function in
main_proto_draw.c relies on output from previous dissector run while the
function may eventually trigger dissector to run again which wipes out the
previous output.
The patch copies the output of the dissector before calling add_byte_tab() so
that even when add_byte_tab() updates the dissector output, the loop continues
with previous dissector output.

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

svn path=/trunk/; revision=41158
2012-02-23 11:29:24 +00:00
Michael Tüxen a36c67130f Fix compilation (hopefully).
svn path=/trunk/; revision=41107
2012-02-21 12:56:52 +00:00
Michael Tüxen b1fa4c19e6 From Irene Ruengeler:
* Add support in the GUI for pipes.
* Allow the local interfaces to be rescanned via the GUI.
* Allow remote interfaces to be added and deleted.
The GUI can be extended to support other ways of capturing.

svn path=/trunk/; revision=41105
2012-02-21 11:59:41 +00:00
Guy Harris 1696a933b6 Fix tpo.
svn path=/trunk/; revision=41080
2012-02-20 00:01:21 +00:00
Guy Harris 979db3f4fb Don't run Flex-generated files through checkapi - they use forbidden
APIs such as malloc and free.

svn path=/trunk/; revision=41079
2012-02-19 23:35:19 +00:00
Bill Meier d7ed0237c4 (Minor): use GLIB_CFLAGS instead of GTK_CFLAGS; also put libcliui: as first target
svn path=/trunk/; revision=41078
2012-02-19 23:30:03 +00:00
Bill Meier 82a10ad34d (Minor): Use GLIB_CFLAGS instead of GTK_CFLAGS when compiling in ui directory.
svn path=/trunk/; revision=41077
2012-02-19 23:28:31 +00:00
Guy Harris 7100e7a8a0 We already have GENERATED_HEADER_FILES; use that instead of
GENERATED_H_FILES.

If we have DIRTY_GENERATED_C_FILES, use it the same way we use
GENERATED_C_FILES.

GENERATED_FILES is "everything to nuke on a "make maintainer-clean"",
not "everything to put into the distribution".

svn path=/trunk/; revision=41075
2012-02-19 22:41:53 +00:00
Guy Harris e79881c8b4 We already have GENERATED_HEADER_FILES; no need for GENERATED_H_FILES.
Remove a bunch of stuff copied over from ui/gtk/Makefile.am that doesn't
apply here.

There's no DIRTY_GENERATED_C_FILES.

svn path=/trunk/; revision=41074
2012-02-19 22:25:54 +00:00
Bill Meier ec953f91f2 A few more changes to fix the Windows build: Fix building tshark-tap-register.c
svn path=/trunk/; revision=41073
2012-02-19 21:38:48 +00:00
Guy Harris 30d168baa6 This is 2 levels down, unlike the 1-level-down ui/Makefile.nmake I
copied as an initial contents of this.

svn path=/trunk/; revision=41071
2012-02-19 19:28:31 +00:00
Guy Harris 2ae289a62e Build the TShark taps into a static libcliui library in the ui/cli
directory, and link TShark with that; let's see if this fixes the
Windows buildbots.

svn path=/trunk/; revision=41070
2012-02-19 19:01:01 +00:00