Commit graph

213 commits

Author SHA1 Message Date
Jeff Morriss
1ee4c9e8a0 activate_link_cb() is only defined and used if we have GTK 2.18 or higher; only prototype it when we have GTK 2.18 or higher.
svn path=/trunk/; revision=41701
2012-03-21 02:42:11 +00:00
Jeff Morriss
075491702b welcome_if_tree_load() is static and only called (and prototyped) if we HAVE_LIBPCAP, so don't define the function unless we HAVE_LIBPCAP.
svn path=/trunk/; revision=41698
2012-03-21 01:22:40 +00:00
Guy Harris
4fe63c565d Well, it doesn't recurse with that code there, but it doesn't fill in
the interface list box, either.  Remove the #if 0 for now.

svn path=/trunk/; revision=41696
2012-03-21 00:44:41 +00:00
Guy Harris
7405ba8145 The chimney stuff is Windows-only (not that we shouldn't offer the
ability to turn offloading off on UN*Xes as well...).

svn path=/trunk/; revision=41695
2012-03-21 00:36:44 +00:00
Guy Harris
d43d1c0a6f Recursion, n. See "recursion".
svn path=/trunk/; revision=41694
2012-03-21 00:16:13 +00:00
Guy Harris
b551749d28 welcome_if_tree_load() is not used outside ui/gtk/main_welcome.c; make
it static.

svn path=/trunk/; revision=41693
2012-03-21 00:09:45 +00:00
Guy Harris
e64375d187 #ifdef out some variables used only if we have libpcap.
svn path=/trunk/; revision=41692
2012-03-21 00:01:42 +00:00
Guy Harris
d230d1663f Just put both clear_capture_box() and fill_capture_box() under one
#ifdef HAVE_LIBPCAP/#endif.

svn path=/trunk/; revision=41691
2012-03-20 23:37:23 +00:00
Anders Broman
24298dca48 See if this fixes the OSX build
svn path=/trunk/; revision=41690
2012-03-20 23:03:48 +00:00
Anders Broman
14e0bdf07e See if this fixes the OSX build
svn path=/trunk/; revision=41689
2012-03-20 22:43:44 +00:00
Anders Broman
f246d95f88 make it compile on Windows, \main_welcome.c(1024) : warning C4700: uninitialized local variable 'error' used seems like a logical error, hidden by init to zero. Need proper fix
svn path=/trunk/; revision=41688
2012-03-20 22:40:10 +00:00
Michael Tüxen
26dd77f0af From Irene Ruengeler: Make sure we can remove all interfaces and can
add local interfaces when there are none.
From me: Some whitespace cleanups.

svn path=/trunk/; revision=41687
2012-03-20 21:13:28 +00:00
Guy Harris
a04472a839 Sort the EXTRA_DIST list.
svn path=/trunk/; revision=41659
2012-03-19 06:31:13 +00:00
Jeff Morriss
90df1a9d94 Set eol-style to native (just to make these files readable on *NIX).
svn path=/trunk/; revision=41654
2012-03-19 01:46:24 +00:00
Jeff Morriss
e88f821bc3 Fix path to doxygen_global.cfg
svn path=/trunk/; revision=41652
2012-03-19 01:10:19 +00:00
Bill Meier
2df5dc3d53 From Reinhard Speyerer: Fix several misspellings/typos in Wireshark
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6967

svn path=/trunk/; revision=41645
2012-03-18 22:24:24 +00:00
Bill Meier
a7041cacb0 From Bill Schiller: New dissector for the HART/IP protocol
I'm contributing a new dissector for the HART/IP protocol.  This
protocol is specified by the HART Conformance Foundation (HCF).  It is
a standard protocol used in the process control industry.  It
essential wraps the multip-drop serial HART packets in TCP or UDP
packets.  The standard has been approved by the HCF and has been
assigned UDP/TCP port 5094 by IANA.

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6961
--This line, and those below,
will be ignored--

M    AUTHORS
M    epan/CMakeLists.txt
M    epan/dissectors/Makefile.common
AM   epan/dissectors/packet-hartip.c
M    ui/gtk/main_menubar.c

svn path=/trunk/; revision=41644
2012-03-18 19:51:39 +00:00
Guy Harris
fe37c0ccb8 Add @configure_input@ to a bunch of .in files that didn't have it.
Add $Id$ to those of said files that didn't have it, and fix one $Id to
be $Id$.

svn path=/trunk/; revision=41594
2012-03-16 03:39:51 +00:00
Jeff Morriss
08953cee3a Actually, the Lua-menu-items aren't necessary anyway; remove them.
svn path=/trunk/; revision=41592
2012-03-16 02:47:16 +00:00
Jeff Morriss
80a7287360 Get the Lua menus working again: when adding UI menus, it appears that our
description of existing menus must be accurate: if a name and action are
both specified then the to-be-added-XML must include both the name and the
action.

It appears that the formats given in stat_group_name()'s value_string were
designed to take this into account, but there was no code to separate the menu
name from its action.  Adding that separation is complicated by the fact that
menus are separated by /'s and actions may also contain that character.  To
deal with that, "escape" the /'s in actions by replacing them with #'s.
make_menu_xml() then un-escapes them back into /'s.

There has to be an easier way to do all of this...

svn path=/trunk/; revision=41591
2012-03-16 02:36:32 +00:00
Jeff Morriss
a2c94ef9bf Fix menu path typos: Stataistics->Statistics, LUA->Lua
svn path=/trunk/; revision=41588
2012-03-16 02:24:56 +00:00
Jörg Mayer
19ea690e10 Fix:
work/wireshark/svn/trunk/ui/gtk/voip_calls.c:599:9: error: variable ‘voip_calls_graph_list’ set but not used [-Werror=unused-but-set-variable]


svn path=/trunk/; revision=41548
2012-03-14 17:26:49 +00:00
Anders Broman
1d4f630589 voip_calls.c Use the hastable instead, we should do away with the list.
graph_analysis.h Doxygen changes.

svn path=/trunk/; revision=41545
2012-03-14 16:46:59 +00:00
Anders Broman
4c801c8604 VoIP Calls Graph Analysis: Elements not sorted by Time.
Sort the list based on frame number.

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

svn path=/trunk/; revision=41544
2012-03-14 09:53:33 +00:00
Guy Harris
cd1debf183 Add an explicit capture_cb_capture_failed indication for the case where
we weren't even able to start a capture, rather than delivering a fake
"capture start" indication and relying on a later "capture file closed"
indication - for a capture that was never opened in the first place - to
handle GUI cleanups.

Don't deliver any GUI indications in cf_close() if we didn't have a
capture file open in the first place.

Clear the status bar and welcome header if that indication is delivered.

If we start a capture from the command line with the -k flag, don't show
the captured packet information unless the capture actually starts.

svn path=/trunk/; revision=41521
2012-03-13 08:36:25 +00:00
Guy Harris
dce6f88487 SystemConfiguration framework, not IOKit?
svn path=/trunk/; revision=41519
2012-03-13 05:02:48 +00:00
Guy Harris
b85eebdd7e Suggest a better way of getting the interface type on OS X.
svn path=/trunk/; revision=41518
2012-03-13 05:02:16 +00:00
Guy Harris
fa64659e93 Closing a capture file has nothing to do with the list of interfaces on
which to do a live capture; don't clear the latter list when closing the
capture file.

collect_ifaces() should clear out the existing list of interfaces before
filling that list up with the interfaces selected by the user.  In
addition, when it frees up interfaces in that list, it should free up
the strings attached to those interfaces.

svn path=/trunk/; revision=41517
2012-03-13 03:48:27 +00:00
Martin Mathieson
d772d2acd2 Add checkboxes to filter for RACH attempts and SRs.
svn path=/trunk/; revision=41500
2012-03-12 13:19:28 +00:00
Martin Mathieson
9560aab8c2 Add a checkbox to filter for RACH attempts.
svn path=/trunk/; revision=41499
2012-03-12 13:18:56 +00:00
Anders Broman
b2515852f9 Add doxygen tags.
svn path=/trunk/; revision=41498
2012-03-12 12:18:02 +00:00
Guy Harris
681c29c5d5 Don't close the currently loaded capture file in capture_start(), do so
in its callers; when starting a capture with "wireshark -k", there's no
capture file to close, and closing it might be provoking some UI actions
that cause crashes on Windows.

Don't copy the list of selected interfaces to the list of capture
interfaces in capture_start(), either, do that in the callers; we were
already doing that in one place and, in one of the remaining cases,
namely "wireshark -k", we should do so only if no capture interfaces
were supplied on the command line.  (I.e., the set of interfaces on
which we want to capture depends on where in the UI the capture is being
started.)

svn path=/trunk/; revision=41491
2012-03-11 20:08:54 +00:00
Anders Broman
b8fd91e8c1 Add a comments LED
svn path=/trunk/; revision=41487
2012-03-11 19:31:10 +00:00
Stig Bjørlykke
6a724c8d83 Free name string only when used.
svn path=/trunk/; revision=41479
2012-03-11 12:00:13 +00:00
Guy Harris
42df48aab0 capture_opts_add_opt() does just fine at adding an interface to the
capture options, so don't special-case the -i option.

svn path=/trunk/; revision=41477
2012-03-11 07:10:48 +00:00
Guy Harris
5dc7d02ed8 Replace 4-space tabs (and one 8-space tab, the only remaining tab in the
file after replacing the 4-space tabs) with spaces.

svn path=/trunk/; revision=41457
2012-03-10 09:08:03 +00:00
Guy Harris
541dab39eb Replace inconsistent tabs with spaces.
svn path=/trunk/; revision=41456
2012-03-10 09:01:48 +00:00
Jeff Morriss
da33d2ef5a Fix up indentation (get rid of 4-space tabs).
svn path=/trunk/; revision=41453
2012-03-09 14:25:30 +00:00
Anders Broman
d862ce97e3 Mark an unused parameter as such.
svn path=/trunk/; revision=41452
2012-03-09 14:20:53 +00:00
Anders Broman
f6919f2b50 Make packet comments editable from the expert info tab.
svn path=/trunk/; revision=41451
2012-03-09 13:36:29 +00:00
Guy Harris
96aab62f5c Convert 4-space tabs to spaces.
svn path=/trunk/; revision=41442
2012-03-08 20:02:10 +00:00
Gerald Combs
de7c1b3ee0 Update the comment icons and tooltips.
svn path=/trunk/; revision=41440
2012-03-08 19:07:02 +00:00
Anders Broman
ed05b98afa Add capture_comment_icons.h
svn path=/trunk/; revision=41428
2012-03-08 10:16:30 +00:00
Guy Harris
281f48f7e1 And fix some other ../../image/...s for out-of-tree builds.
svn path=/trunk/; revision=41426
2012-03-08 08:46:52 +00:00
Guy Harris
3c04c817d7 Fix to handle out-of-tree builds - use $(top_srcdir) rather than a
string of ../ items to get to another directory in the source tree, as,
when doing an out-of-tree build, the source tree is a separate tree from
the build tree.

svn path=/trunk/; revision=41425
2012-03-08 08:45:20 +00:00
Anders Broman
376dde9371 summary_dlg.c:419: error: 'dl_description' undeclared (first use in this function)
svn path=/trunk/; revision=41424
2012-03-08 08:07:21 +00:00
Anders Broman
44828083ee Don't show expert info or comments icons unless we have a file loaded
svn path=/trunk/; revision=41423
2012-03-08 08:04:39 +00:00
Anders Broman
839b3e7481 Put a frame around capture comments, don't depend on LIBPCAP to print dl_description or capture filter info
svn path=/trunk/; revision=41422
2012-03-08 07:28:26 +00:00
Anders Broman
368ba24bef Use an OK button rather than save for consistency, wouldapply be more apropriate?
svn path=/trunk/; revision=41421
2012-03-08 06:59:38 +00:00
Jeff Morriss
57f331b9ea Followup to r41415: don't enable *any* of the file operations during a live
capture.

svn path=/trunk/; revision=41416
2012-03-08 02:33:14 +00:00
Jeff Morriss
2f33dbb8f4 As reported by Joerg on -dev: don't enable File->Save if we're still reading
the file (as is the case during a live capture).

Replace tabs with spaces (for consistency with the rest of the file).

svn path=/trunk/; revision=41415
2012-03-08 02:18:12 +00:00
Gerald Combs
52deb5a309 Create some standard definitions for dialog control spacing. Use them in
the comment dialog.

svn path=/trunk/; revision=41412
2012-03-08 01:24:31 +00:00
Jeff Morriss
5b120f36d8 Rename the functions and variables to go along with r41410.
svn path=/trunk/; revision=41411
2012-03-07 23:04:15 +00:00
Jeff Morriss
94e539a193 Use OK, Clear, and Cancel in the comment dialogs (instead of Save, Clear, and Close). This makes the UI similar to our Preferences dialog. And it avoids confusion about whether Save will save the file or not.
svn path=/trunk/; revision=41410
2012-03-07 22:38:02 +00:00
Jeff Morriss
7f96e88fc0 Set File->Save sensitivity after file or packet comments are changed.
svn path=/trunk/; revision=41409
2012-03-07 22:19:06 +00:00
Gerald Combs
d839a834cb Update and add icons for capture comments / annotations.
svn path=/trunk/; revision=41406
2012-03-07 20:56:01 +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
34f66b12d8 Use a dedicated treview for packet comments.
svn path=/trunk/; revision=41356
2012-03-05 13:34:55 +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
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
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
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
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
b4ffaa9be0 Put back the comment for the rule to generate wireshark-tap-register.c.
svn path=/trunk/; revision=41069
2012-02-19 18:59:08 +00:00
Guy Harris
bdab9be898 Rename the (static) library built from stuff in ui/gtk to "libgtkui" in
automake/autoconf and nmake builds, to match the name in CMake builds.

svn path=/trunk/; revision=41058
2012-02-18 20:21:30 +00:00
Michael Tüxen
ed68db6e5d Fix tooltips (There is a hidden column).
svn path=/trunk/; revision=41051
2012-02-17 16:48:55 +00:00
Jörg Mayer
a206a11e7e include "../util.h" -> include "ui/util.h"
svn path=/trunk/; revision=41048
2012-02-17 12:46:50 +00:00
Michael Tüxen
fe30e4ad2e Fix from Irene Ruengeler: Show correct details in the interface dialog on
Windows.

svn path=/trunk/; revision=41042
2012-02-16 20:22:34 +00:00
Anders Broman
d0b4fb05f0 From Sean Bright:
Wireshark crashes after editing interface settings from capture options dialog.

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

svn path=/trunk/; revision=41017
2012-02-13 18:58:14 +00:00
Anders Broman
196e1ab97b Mark an unused parameter.
svn path=/trunk/; revision=41016
2012-02-13 18:50:31 +00:00
Anders Broman
c894108aca Edit packet comments
svn path=/trunk/; revision=41013
2012-02-13 17:33:05 +00:00
Anders Broman
6971302a1b Drop count is 64 bits
svn path=/trunk/; revision=41012
2012-02-13 17:31:54 +00:00
Jeff Morriss
95c75fb67a Add edit_packet_comment_dlg.h to the source distribution
svn path=/trunk/; revision=41006
2012-02-12 23:17:01 +00:00