Commit Graph

125 Commits

Author SHA1 Message Date
Bill Meier 32625e0329 Fix some gcc -Wshadow warnings.
svn path=/trunk/; revision=31756
2010-02-01 16:22:17 +00:00
Anders Broman 875d0c46c2 From Jim Young:
Add keyboard navigation controls to TCP Stream Graphs
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4144

svn path=/trunk/; revision=31122
2009-11-29 20:42:00 +00:00
Kovarththanan Rajaratnam 729497d72f Avoid possible NULL pointer dereference
svn path=/trunk/; revision=31108
2009-11-29 02:33:22 +00:00
Stig Bjørlykke 005049bebb Changed hf_ip_proto to use ipproto_val[].
Removed some unneeded includes.

svn path=/trunk/; revision=31017
2009-11-19 15:30:06 +00:00
Stig Bjørlykke 4355ba12a9 Removed unused variable thdr.
svn path=/trunk/; revision=30359
2009-10-06 13:21:15 +00:00
Anders Broman 199330559c Remove #if 0'ed code.
svn path=/trunk/; revision=30312
2009-10-04 18:21:14 +00:00
Kovarththanan Rajaratnam 8c48c6835f Rename address_to_str() to ep_address_to_str() because:
1) This indicates that the string has ephemeral lifetime
2) More consistent with its existing seasonal counterpart, se_address_to_str().

svn path=/trunk/; revision=29747
2009-09-06 14:25:47 +00:00
Bill Meier a15bb4beb9 Add #include <stdio.h> in a few more places ....
svn path=/trunk/; revision=29578
2009-08-27 04:47:28 +00:00
Kovarththanan Rajaratnam 80a6d3fbcf Introduce epan_dissect_init()/epan_dissect_cleanup(). These are used to initialise/cleanup stack allocated 'edt' structures. This should speed up dissection since we avoid some malloc traffic.
svn path=/trunk/; revision=29404
2009-08-13 19:42:46 +00:00
Anders Broman 463a58589e From Sean Walberg:
The title in the TCP sequence graphs is too short.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3556

svn path=/trunk/; revision=28873
2009-06-28 15:22:43 +00:00
Guy Harris cf91fdf16b Have tap listeners specify whether the "packet" routine requires
a protocol tree;

	the column values.

This includes stats-tree listeners.

Have the routines to build the packet list, and to retap packets, honor
those requirements.  This means that cf_retap_packets() no longer needs
an argument to specify whether to construct the column values or not, so
get rid of that argument.

This also means that there's no need for a tap to have a fake filter
to ensure that the protocol tree will be built, so don't set up a fake
"frame" filter.

While we're at it, clean up some cases where "no filter" was represented
as a null string rather than a null pointer.

Have a routine to return an indication of the number of tap listeners
with filters; use that rather than the global num_tap_filters.

Clean up some indentation and some gboolean vs. gint items.

svn path=/trunk/; revision=28645
2009-06-05 22:42:47 +00:00
Bill Meier 27024a1d5a As suggested by Jakub Zawadzki: actually use sizeof(...) rather than a numeric constant in various places;
svn path=/trunk/; revision=27800
2009-03-19 17:49:11 +00:00
Stephen Fisher 3e60203474 Fix a few more problems found by checkAPIs.pl
svn path=/trunk/; revision=26887
2008-12-01 07:31:07 +00:00
Stephen Fisher 5f707964bd Remove call to deprecated perror() and a check to see if g_malloc() failed
since g_malloc will terminate the program if it cannot allocate memory instead
of returning NULL.


svn path=/trunk/; revision=26886
2008-12-01 07:16:32 +00:00
Stig Bjørlykke 8608c8f1de Fix some "format not a string literal and no format arguments" warnings.
svn path=/trunk/; revision=26641
2008-10-31 09:53:56 +00:00
Bill Meier c9898d7f6b #include <emem.h> not req'd
svn path=/trunk/; revision=26094
2008-08-26 02:53:21 +00:00
Bill Meier 56206e0002 Fix some simple cases of GTK2 deprecated API usage by using a renamed or equivalent API
gtk_container_border_width()          ==> gtk_container_set_border_width()
  gtk_container_children()              ==> gtk_container_get_children()
  gtk_entry_new_with_max_length()       ==> gtk_entry_new(); gtk_entry_set_max_length()
  gtk_menu_append()                     ==> gtk_menu_shell_append()
  gtk_menu_prepend()                    ==> gtk_menu_shell_prepend()
  gtk_notebook_set_page()               ==> gtk_notebook_set_current_page()
  gtk_paned_gutter_size()               ==> gtk_paned_set_gutter_size()
  gtk_radio_button_group()              ==> gtk_radio_button_get_group()
  gtk_signal_connect()                  ==> g_signal_connect()
  gtk_signal_disconnect()               ==> g_signal_handler_disconnect()
  gtk_signal_emit_by_name()             ==> g_signal_emit_by_name()
  gtk_signal_handler_block_by_data()    ==> g_signal_handlers_block_matched()
  gtk_signal_handler_block_by_func()    ==> g_signal_handlers_block_by_func()
  gtk_signal_handler_unblock_by_data()  ==> g_signal-handlers_unblock_matched()
  gtk_signal_handler_unblock_by_func()  ==> g_signal-handlers_unblock_by_func()
  gtk_spin_button_get_value_as_float()  ==> gtk_spin_button_get_value()
  gtk_toggle_button_set_state()         ==> gtk_toggle_button_set_active()

svn path=/trunk/; revision=25634
2008-06-29 15:51:43 +00:00
Guy Harris aeda5cffa7 Sun C warns about an integer overflow for 1 << 31, presumably because 1
is signed; make the flags field in "struct magnify" unsigned, and make
the flags unsigned, so we shift 1U rather than 1.

svn path=/trunk/; revision=25421
2008-06-04 00:05:57 +00:00
Ulf Lamping 85e14ceb86 rename REGISTER_xxx_GROUP_NONE to REGISTER_xxx_GROUP_UNSORTED, as NONE seems a bit misleading
svn path=/trunk/; revision=25086
2008-04-17 02:16:39 +00:00
Ulf Lamping 644a474c95 sort #includes by directories
svn path=/trunk/; revision=24969
2008-04-13 03:32:24 +00:00
Ulf Lamping d4ccf577a8 where it's not necessary, remove #include "compat_macros.h"
svn path=/trunk/; revision=24922
2008-04-12 01:02:59 +00:00
Ulf Lamping 8e58ec7085 last round to replace SIGNAL_CONNECT with g_signal_connect
svn path=/trunk/; revision=24918
2008-04-11 23:16:06 +00:00
Ulf Lamping c6d13dc2c8 replace WIDGET_SET_SIZE with gtk_widget_set_size_request
svn path=/trunk/; revision=24910
2008-04-11 20:31:05 +00:00
Bill Meier 42acebd42c OBECT_..._DATA --> g_object_..._data
svn path=/trunk/; revision=24893
2008-04-11 16:04:54 +00:00
Stephen Fisher b010ad9411 Replace FONT_TYPE macro with PangoFontDescription.
svn path=/trunk/; revision=24889
2008-04-11 04:52:36 +00:00
Ulf Lamping 49ad47d477 remove GTK1 code
svn path=/trunk/; revision=24824
2008-04-07 01:05:55 +00:00
Stig Bjørlykke ad5e6ad06b Removed some more "statement not reached" warnings.
svn path=/trunk/; revision=24283
2008-02-07 12:52:08 +00:00
Ulf Lamping 4b215597ae experimental feature: dissector filters
add the possibility, that a dissector writer can provide (usually non-trivial) display filters specific for the protocol in question (with an example in packet-dcerpc-pn-io.c), that will appear in the GUI


svn path=/trunk/; revision=22530
2007-08-16 22:03:10 +00:00
Michael Tüxen 06ff527c5b Make debugging static.
svn path=/trunk/; revision=22347
2007-07-18 07:06:46 +00:00
Sebastien Tandel 76729e5d0f From David Howells :
Fix compilation failures when building wireshark-0.99.6-SVN-21916 on an
x86_64-unknown-linux-gnu target with gcc version 4.1.2 20070403 (Red Hat
4.1.2-8).

The failures fall into two categories:
  (1) Casts between pointers and 32-bit integers without an intermediary cast
via 'long' or 'unsigned long'.  This results in a compiler warning complaining
about casts between a pointer and an integer of a different size.
  (2) Passing values to "%lld" or similar printf-style format options that the
compiler thinks are a different size.  Such values need to be cast to 'long
long' or 'unsigned long long'.

svn path=/trunk/; revision=21975
2007-05-29 02:43:18 +00:00
Ulf Lamping 407d0aeab0 fix all warnings in gtk dir & set the "treat all warnings as errors" MSVC flag
svn path=/trunk/; revision=21080
2007-03-21 03:26:26 +00:00
Jeff Morriss 8c6bda4db5 Squelch a couple (false) uninitialized variable warnings
svn path=/trunk/; revision=20858
2007-02-19 10:26:21 +00:00
Ulf Lamping a5d65e64c1 gtkglobals.h not needed
svn path=/trunk/; revision=20127
2006-12-12 23:49:28 +00:00
Anders Broman 05448fcc3d Ethereal->Wireshark
svn path=/trunk/; revision=18232
2006-05-28 17:19:08 +00:00
Guy Harris 92552c2d76 Get rid of a bunch of "Ethereal"s and "ethereal"s in comments, GUI
strings, and function names.

svn path=/trunk/; revision=18205
2006-05-22 07:29:40 +00:00
Ronnie Sahlberg 89f022b12b name change
svn path=/trunk/; revision=18197
2006-05-21 05:12:17 +00:00
Ronnie Sahlberg f331077a60 waste a couple of bytes per tcp conversation and make the tree for acked_packets (i.e. packets that have interesting tcp properties such as being retransmissions etc) hang off the per conversation tcpd struct instead of being global.
while this should improve performance by unmeasurably little it does have the sideeffect that once we finish the rewrite   tcp analysis might actually work and work well even for tcp over tcp tunnelling. 

this also means that if you include packet-tcp.h   you also need to include emem.h .




svn path=/trunk/; revision=17681
2006-03-20 10:52:53 +00:00
Guy Harris 7cf33cb6fc Get rid of a declaration of a non-existent function.
svn path=/trunk/; revision=17673
2006-03-19 20:23:59 +00:00
Gerald Combs 1feda8e2e2 There is a one-to-one mapping between each graph and its "toplevel" and
drawing_area widgets.  Instead of canoodling around with a global list
of graphs, simply associate a graph to its widgets using OBJECT_SET_DATA.
This should take care of Coverity CIDs 50 - 59.

Clean up whitespace.

svn path=/trunk/; revision=17554
2006-03-09 17:58:20 +00:00
Lars Roland 12224e5f22 Make calculation of TCP Graph bounds more robust. The calculation might have failed in unusual conditions.
This bug was discovered while looking at defects #130 and #131 discovered by  coverity. 
This patch also fixes these non-severe defects.

svn path=/trunk/; revision=17531
2006-03-08 18:42:16 +00:00
Gerald Combs 0027278005 From Bill Meier:
After investigating the time-sequence graphs (Stevens and tcptrace) produced 
using an FTP capture file supplied by Eduardo Segura 
(see http://www.ethereal.com/lists/ethereal-users/200512/msg00153.html ) 
I've identified several problems in tcp_trace.c.

The problems mostly involve incorrect determination of the lower/upper 
sequence number bounds (for the Y axis) in certain cases (e.g. having to do
with 'partial' conversations).

I've reworked the '...get_bounds' code to handle cases such as:

1. out of order data segments (e.g.: the first segment in a captured
conversation has a higher sequence number than a later segment);

2. 'ack' sequence numbers for initial ack segments in a conversation lower
than the sequence numbers of the initial data segments;

3. maximum 'ack + win' sequence number in a conversation greater than the 
max data sequence number;

4. Stevens graph: only use data segment sequence numbers when 
determining bounds;

5. TCP RST packet without 'ack' flag: do not try to use the 'ack' seq num from
the packet in this case. (This was the specific cause of the originally reported
problem).


I've also reworked the tcptrace display code slightly to properly handle 
the initial ack packet of a sequence;

As an example of the some of the fixes the Ethereal tcptrace style graph 
of the following conversation fragment will now be similar to the graph 
produced by Tcptrace.

data:  seq 10000 len 100
data:  seq 10100 len 200
ack:   ack 5000  win 6000
ack:   ack 5400  win 5600 


svn path=/trunk/; revision=16874
2005-12-22 01:23:27 +00:00
Guy Harris b7b80d94be Move a pile of protocol-related headers from the top-level source
directory to the epan directory.  Some of them should perhaps ultimately
be moved to epan/dissectors, if they pertain only to stuff exported by a
particular dissector.

Fix Gerald's e-mail address in files we're moving.

svn path=/trunk/; revision=15844
2005-09-17 00:02:31 +00:00
Guy Harris f34e1a97c6 Have cf_retap_packets() take an argument that indicates whether to
generate columns; use cf_retap_packets instead of cf_redissect_packets()
when running taps (the general flow graph stat uses the Info column).

svn path=/trunk/; revision=15793
2005-09-14 08:59:41 +00:00
Ulf Lamping 6f43fbb2f0 EVERYTHING IN THE BUILDBOT IS GOING TO BE RED!!! Sorry!
I've done more than a day to change the timestamp resolution from microseconds to nanoseconds. As I really don't want to loose those changes, I'm going to check in the changes I've done so far. Hopefully someone else will give me a helping hand with the things left ...

What's done: I've changed the timestamp resolution from usec to nsec in almost any place in the sources. I've changed parts of the implementation in nstime.s/.h and a lot of places elsewhere.

As I don't understand the editcap source (well, I'm maybe just too tired right now), hopefully someone else might be able to fix this soon.

Doing all those changes, we get native nanosecond timestamp resolution in Ethereal. After fixing all the remaining issues, I'll take a look how to display this in a convenient way...

As I've also changed the wiretap timestamp resolution from usec to nsec we might want to change the wiretap version number...

svn path=/trunk/; revision=15520
2005-08-24 21:31:56 +00:00
Guy Harris 13e0b409cf As per a suggestion by Ulf Lamping, rename gtk_*.[ch] to gui_*.[ch], so
that it doesn't appear to be part of GTK+.

svn path=/trunk/; revision=15501
2005-08-21 19:24:11 +00:00
Guy Harris a0e68da918 Add a "register_dfilter_stat()", to register stats that take a display
filter as an argument on the command line and have a dialog box to enter
the display filter through the GUI.  Use it for all stats using
"gtk_tap_dfilter_dlg_cb()".

Add a top-level "stat_menu.h" file to declare "REGISTER_STAT_GROUP_E"
for the benefit of the declaration of "register_dfilter_stat()" in the
top-level "tap_dfilter_dlg.h".  Rename the "stat_menu.h" in the gtk
directory to "gtk_stat_menu.h", so as not to have two headers with the
same name.

Get rid of headers not declaring any functions not being used in the
module.

svn path=/trunk/; revision=15493
2005-08-21 09:48:27 +00:00
Jörg Mayer 0edcc8920e - Declare some functions static
- Add plugins_dlg.h
- Include .h files in their respective .c files
- Include .h and remove extern declarations in .c files
- set eol-style and keywords on gui_utils.[hc]

svn path=/trunk/; revision=15471
2005-08-20 14:02:00 +00:00
Ulf Lamping eafbbbcabb renamed ui_util.c/.h to gui_utils.c/.h to prevent confusion with identical named ui_util.h in / dir
svn path=/trunk/; revision=15465
2005-08-20 12:09:48 +00:00
Guy Harris b2807e2ab6 Move the APIs for registering and processing "-z" command-line arguments
and "Statistics" menu items into "stat.h" and "stat.c", to separate them
from the core tapping APIs.  A tap could conceivably not register as a
"-z" command-line argument or "Statistics" menu item, and a stat could
conceivably not be implemented as a tap, and dissectors that implement
tapping points don't need the UI-related stuff from "stat.h", they just
want the tap-related stuff in <epan/tap.h>.

svn path=/trunk/; revision=15427
2005-08-19 09:29:41 +00:00
Ulf Lamping f3407856f4 fix some MSVC const warnings
svn path=/trunk/; revision=15263
2005-08-08 17:22:55 +00:00