Commit Graph

2334 Commits

Author SHA1 Message Date
Anders Broman 44784a9fe4 From Olivier Jacques,
Here is a patch that:
- Replaces the arrow labels by the beginning of the COLINFO column if available (usually containing message names/types).
- Change the comment area to be "protocol: colinfo_content"
From Anders
Added ID tag

Camel
Use col_set_str to remove TCAP info in col_info
 


svn path=/trunk/; revision=16975
2006-01-07 11:10:50 +00:00
Ulf Lamping 4e973150ea fix bug #660: we must alphabetically sort columns 0&1, not 0&2
svn path=/trunk/; revision=16974
2006-01-07 11:08:07 +00:00
Jörg Mayer deeb41e08b Olivier Jacques:
Here is a very small patch against current SVN for a mem free bug in
flow graph feature.


svn path=/trunk/; revision=16966
2006-01-06 10:37:56 +00:00
Jörg Mayer 7719a3b803 Jaap Keuter:
Browsing through the wishlist I came across this old one by Steve Brown:
------8<------
The GTK1 UI wordwraps assembled TCP streams, the GTK2 UI doesn't, but
should also. Not wrapping makes reading any protocol that lacks linebreaks
virtually impossible (XML, etc.) as it all ends up on one line. I'm tired
of having to install the GTK1 UI :P
------8<------
It seems like a simple request. The oneliner patch implements this wish.
Maybe someone feels the need to make it a preference or selectable.


svn path=/trunk/; revision=16939
2006-01-03 23:45:58 +00:00
Ulf Lamping b4471e0195 fix #152
set the read filter dialog modal and transient to the parent window if requested. This way, it will receive input signals (solving problems with GTK2's gtk_file_chooser).

To do this, add another construct_args flag, so it will be modal only if really needed ...

svn path=/trunk/; revision=16926
2005-12-31 17:09:27 +00:00
Jörg Mayer ca4722c47b Foil another of Ronnies attempts to make the repository properties free :-)
svn path=/trunk/; revision=16892
2005-12-24 03:13:16 +00:00
Guy Harris 56a87c2239 Clean up indentation.
"error_t" is defined elsewhere on at least some versions of Fedora Core,
so it collides with our usage; use "expert_comp_dlg_t" instead.

svn path=/trunk/; revision=16889
2005-12-23 10:55:05 +00:00
Ronnie Sahlberg 6ca2431e06 add service response time statistics for smb2
svn path=/trunk/; revision=16887
2005-12-23 04:57:06 +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 c9b702ba1a Provide not only copyright information, but a GPL blurb, in all the
version/usage messages.

Put newlines at the end of various version strings.

svn path=/trunk/; revision=16870
2005-12-21 08:59:52 +00:00
Jörg Mayer dba7a99e1d warning: C++ style comments are not allowed in ISO C90
svn path=/trunk/; revision=16853
2005-12-18 23:22:47 +00:00
Ulf Lamping 5777e86158 use #ifdef SHOW_WELCOME_PAGE for the currently disabled welcome page instead of simply #if 0
svn path=/trunk/; revision=16843
2005-12-18 11:36:06 +00:00
Anders Broman 3e759db24c modify the tool tip "Nodes in the diagram are identified with network source and destination address (like SS7 point codes)" remove the section between parenthesis
svn path=/trunk/; revision=16829
2005-12-16 20:54:24 +00:00
Anders Broman e0bec8bb86 From Jacques, Olivier (OCBU-Test Infra)
> here is a small patch for the flow graph feature. It allows 
> to have SS7 nodes (network indicator/point codes) to be 
> recognized as nodes in the graphs.
> The patch consists in using "pinfo->net_src" or 
> "pinfo->net_dst" instead of "pinfo->src" or "pinfo->dst".
> I did some tests with other IP protocols and behavior was 
> still the same as before. But I do not guaranty that it 
> doesn't have some bad side effects for some protocols.

svn path=/trunk/; revision=16817
2005-12-16 07:20:13 +00:00
Ulf Lamping 0268ed5e2d remove a missplaced comment
svn path=/trunk/; revision=16806
2005-12-15 00:46:23 +00:00
Guy Harris eaee2b68c5 Constify a bunch of arguments and variables, to squelch compiler
warnings.

Include "wiretap/libpcap.h" in "capture_loop.h", to get its declarations
of data structures for headers in libpcap files.  This lets us remove
the includes of "wiretap/libpcap.h from files including
"capture_loop.h".

Make "log_func_ignore()" in "tethereal.c" static, and declare some of
its arguments unused.  Also get rid of an unused variable.

Include <pcap.h> before including "wiretap/wtap-capture.h", to declare
"struct pcap_pkthdr".

svn path=/trunk/; revision=16791
2005-12-14 07:29:38 +00:00
Ulf Lamping 1f5bf52d6b hmmm, the include sequence might be important too ...
svn path=/trunk/; revision=16790
2005-12-14 01:45:09 +00:00
Ulf Lamping 292fa7814d add missing include
svn path=/trunk/; revision=16789
2005-12-14 00:10:23 +00:00
Ulf Lamping 79217bab2e HUGE STEP (hopefully toward the right direction):
remove a lot of redundant code from tethereal and use (move) stuff from capture_loop.c instead.

concentrate common capture related code in capture_opts.c, e.g. trying to find the right interface to capture from (command line option, preference, first usable) instead of duplicating this code over several files.

remove redundant code from dumpcap.c

this also implements command line option -D (and indexed interfaces at -i) for Ethereal and Dumpcap (as we have it in Tethereal already for a while)

svn path=/trunk/; revision=16787
2005-12-13 22:48:58 +00:00
Ulf Lamping 1fe28ca017 We should really do quit Ethereal if user asked us to do so with the -Q option!
Update the window title, right after the fixed capture finished. This might be required if the loading of the capture file afterwards just fails, leaving the title unchanged.

svn path=/trunk/; revision=16772
2005-12-13 02:09:14 +00:00
Ulf Lamping 47ae9fa7bd add a short comment to cant_load_winpcap_err() and use it in gtk/capture_dlg.c
svn path=/trunk/; revision=16693
2005-12-06 01:04:55 +00:00
Ulf Lamping 7e3a24418c rename pcap-....c/.h files to capture-pcap-....c/.h
this way, the capture prefix will "logically" group the files together and file browsers will also group them

we may want to move the files into a subdir capture later

svn path=/trunk/; revision=16691
2005-12-06 00:07:13 +00:00
Ulf Lamping 8dab6be33c move some GTK only function declarations from ui_util.h to the appropriate header files in the gtk dir, as these declarations are obsolete and only confuses (at least me)
svn path=/trunk/; revision=16687
2005-12-05 22:45:54 +00:00
Ulf Lamping e1ee12bc71 add capture_opts_trim(), as this sequence is used three times now (will replace the other appearances later) ...
svn path=/trunk/; revision=16683
2005-12-05 21:26:01 +00:00
Guy Harris 46325167d9 Check for a null blurb pointer for a field, as is done in some other
locations, and initialize the blurb field to NULL for protocols, now
that we support the blurb being a null pointer.

svn path=/trunk/; revision=16672
2005-12-04 04:22:43 +00:00
Ulf Lamping e829856c0c move the complete functionality of the capture info dialog from capture_loop.c to capture_info.c and call it from capture.c (instead of capture_loop.c).
This way, the capture child don't need to now any of the packet_counter things (no epan/packet.h and all alike).

Currently the capture_info code will always open another wiretap file instance to build it's own counter values. This isn't optimized for now (next step: use data from cf_continue_tail() somehow).

svn path=/trunk/; revision=16669
2005-12-04 02:04:18 +00:00
Ulf Lamping f856dbafa8 split some parts of the packet counting functions into their own files capture_info(.c/.h),
so we can use it from the main program

svn path=/trunk/; revision=16668
2005-12-03 22:38:50 +00:00
Ulf Lamping d2a024af60 split capture.h into capture.h, capture_loop.h and capture_opts.h and place the parts into the corresponding files
svn path=/trunk/; revision=16664
2005-12-03 19:32:54 +00:00
Ulf Lamping ca14992672 fix alphabetical order of OPTINIT string, v seems to be a controversial character :-)
svn path=/trunk/; revision=16642
2005-12-01 20:04:55 +00:00
Michael Tüxen fd7caa4b84 Bug fixes from Irene.
svn path=/trunk/; revision=16639
2005-12-01 15:15:42 +00:00
Ulf Lamping 11a0eb4867 fix #568: disable event "activate" handler for the range entry field. see the added comment for details
svn path=/trunk/; revision=16604
2005-11-26 11:57:54 +00:00
Ulf Lamping b847af543d fix #358: instead of simply using tpmnam() for the Win32 print function, use the "official" function to create a temporary file
Well, we actually only need the filename here, so create a temp file with the "official" create_tempfile function, keep that tempfile name and then delete this file again, leaving only the name.

I know that's a bit uncommon, but should work and uses the same mechanisms as with other temporary files. So if there are still problems with the official function, we only have one place to fix :-)

svn path=/trunk/; revision=16597
2005-11-26 01:56:22 +00:00
Ulf Lamping 6244dc8ec9 fix a simple GTK1 warning
svn path=/trunk/; revision=16595
2005-11-25 23:54:19 +00:00
Ulf Lamping 5d66658184 from Greg Morris:
Composite Expert statistics, see: 
http://www.ethereal.com/lists/ethereal-dev/200511/msg00002.html
and the following discussions

svn path=/trunk/; revision=16593
2005-11-25 23:42:52 +00:00
Jörg Mayer eff40f65db Trivial warning fixes
svn path=/trunk/; revision=16561
2005-11-22 12:51:14 +00:00
Guy Harris 2f7fd680e2 Handle "-G" only in Tethereal - it doesn't work in Ethereal, and isn't
necessary there.

Add a "cmdarg_err()" routine to report command-line option errors; it
creates a console if necessary, and prints the command name and the
trailing newline.  Also add "cmdarg_err_cont()", which also creates a
console if necessary, and prints a trailing newline but no command name;
it's used to continue the message.  Use those, rather than
"g_warning()", for errors.

That means that we no longer need to pass the command name to various
command-line argument parsing routines.

svn path=/trunk/; revision=16526
2005-11-17 05:59:21 +00:00
Guy Harris ff10d1c217 Don't list "-B" on UN*X - it's not available there.
On Windows, show it using the same usage-message syntax as other
options.

Clean up the usage message.

When doing the "pre-scan" of command-line arguments, suppress error
messages - that suppresses bogus messages for GTK+ command-line flags,
and gets rid of double messages for other errors.

svn path=/trunk/; revision=16521
2005-11-17 04:10:31 +00:00
Ulf Lamping 32b71d9b7e hmmm, buggy bugfix
capture_child isn't initialized already here, so remove the whole error reaction check for now

svn path=/trunk/; revision=16517
2005-11-16 22:08:50 +00:00
Ulf Lamping 8b24e8d8f0 the "pre-scan" of the command line parameters shouldn't stop the capture child. The child uses a slightly different parameter pattern, so this isn't an error here. Fixes the reported capture problem
svn path=/trunk/; revision=16516
2005-11-16 21:46:24 +00:00
Guy Harris 0dbf17b690 Allow a progress dialog to have "Stop" or "Cancel" as the "terminate
button"; "Stop" should be used for operations that can only be stopped
(meaning that what it's already done isn't undone), not cancelled
(meaning that whatever it's already done *is* undone), for which
"Cancel" is used.

Allow the merging process to be cancelled.

Clean up indentation.

Update some comments.

svn path=/trunk/; revision=16489
2005-11-12 11:05:02 +00:00
Guy Harris 177dc6902c Skip some toolbar #includes if we're not using GTK+ 2.x.
svn path=/trunk/; revision=16454
2005-11-10 03:00:43 +00:00
Guy Harris 03ac44a500 Remove comment that no longer applies.
If we get a getopt() error in the pre-scanning, quit - don't do all the
GUI stuff and re-scan the arguments (and print the error message twice).

svn path=/trunk/; revision=16443
2005-11-09 08:46:24 +00:00
Ulf Lamping c3187174bf replace *a lot* of file related calls by their GLib counterparts. This is necessary for the switch to GTK 2.6 (at least on WIN32).
to do this, I've added file_util.h to wiretap (would file_compat.h be a better name?), and provide compat_macros like eth_open() instead of open(). While at it, move other file related things there, like #include <io.h>, definition of O_BINARY and alike, so it's all in one place.

deleted related things from config.h.win32

As of these massive changes, I'm almost certain that this will break the Unix build. I'll keep an eye on the buildbot so hopefully everything is working again soon.

svn path=/trunk/; revision=16403
2005-11-06 22:43:25 +00:00
Anders Broman 2916d12d76 Packet-amr Register as "AMR" not "amr".
Add Dynamic PT:s mimestring  to rtp_info if avalable.
Use Dynamic PT:s mime string to find clock rate.

svn path=/trunk/; revision=16397
2005-11-05 21:38:22 +00:00
Guy Harris 542381825f Get rid of no-longer-used code (the list of plugins is now just a tab in
Help->About, not a separate dialog from Help->About Plugins).

svn path=/trunk/; revision=16385
2005-11-03 04:32:11 +00:00
Anders Broman bd8e72aa0a From Jaap Keuter
Improvments to PCMA and PCMU handling-

svn path=/trunk/; revision=16356
2005-10-29 15:34:16 +00:00
Guy Harris eb7e8111c6 Fix uninitialized variable errors.
Rename some variables to make the names used in progress bars more
common.  (Should more of that functionality be moved into common
progress bar code?)

svn path=/trunk/; revision=16347
2005-10-27 20:18:50 +00:00
Guy Harris 6ed8c9a07b Make the processing of "-z" arguments in the Tethereal I/O stat tap more
like that of the Ethereal I/O stat tap.  Improve error messages in both
taps.

Use nstime() routines and structure assignment to do operations on
nstime_t values.

svn path=/trunk/; revision=16346
2005-10-27 19:42:24 +00:00
Guy Harris 0203c65739 Check on every iteration of a loop whether to pop up a dialog box,
rather than checking only on every progress bar update quantum, so that
if the update quantum is *very* large, we don't end up waiting longer
than the standard time for a dialog box before checking.

svn path=/trunk/; revision=16327
2005-10-27 06:45:37 +00:00
Ulf Lamping fe17843002 bugfix: don't crash the file open dialog, if the preview gets confused by "invalid" timestamps.
The localtime call will return NULL on invalid input which results in a NULL pointer exception. Simply print '?' if localtime returned NULL.

svn path=/trunk/; revision=16317
2005-10-26 08:32:21 +00:00