Commit Graph

11296 Commits

Author SHA1 Message Date
Ulf Lamping 2c59ab145d bugfix: handle NULL pointer correct,
if gtk_file_chooser_get_filename returned NULL

svn path=/trunk/; revision=11197
2004-06-20 18:36:16 +00:00
Ulf Lamping c5bae1f7e3 preference setting, so "ask for unsaved capture files" can be switched off
svn path=/trunk/; revision=11196
2004-06-20 15:57:11 +00:00
Ulf Lamping 17ca623b0f preference setting for the option to "avoid" the capture info dialog
svn path=/trunk/; revision=11195
2004-06-20 14:48:24 +00:00
Ulf Lamping 7e8187df20 added an option to "avoid" the capture info dialog completely.
This matters for "update of list in real time" (sync_mode) only,
as in normal mode you wouldn't otherwise have the possibility
to stop the capture.

svn path=/trunk/; revision=11194
2004-06-20 13:39:44 +00:00
Ulf Lamping a85e91903a add merge.obj to the linking of mergecap.exe
svn path=/trunk/; revision=11193
2004-06-20 09:49:36 +00:00
Ulf Lamping f098b90832 preview: add 3 seconds timeout, and show the information got so far.
This will prevent getting the preview information take a lot of time for
*very* long capture files. However, on a Pentium-M 1.6 even a 35MB
capture file will not timeout in this 3 second interval.

svn path=/trunk/; revision=11192
2004-06-20 09:35:51 +00:00
Ulf Lamping 7812b42c24 bugfix: prefix for int64 output on win32 must be "I64" not "i64"
svn path=/trunk/; revision=11191
2004-06-20 09:31:48 +00:00
Guy Harris 1d2413f4a3 Include <string.h> to declare "strlen()".
Make "cf_name" a "const gchar *", as, at least in GTK+ 2.x, a "const
gchar *" is assigned to it.  (If it's just a "gchar *" being assigned to
it, declaring it a "const gchar *" does no harm.)

svn path=/trunk/; revision=11190
2004-06-20 07:28:02 +00:00
Guy Harris 894c4e445c Make the elapsed time value an "unsigned int" (if the stop time is
before the start time, due to packet time stamp bogosity, neither a
signed value nor an unsigned value will give a sensible answer, and it
doesn't need to be a "long" as the capture's unlikely to span more than
2^32-1 seconds, again modulo packet time stamp bogosity).  That
eliminates some format item vs. value warnings.

Make the packet count an "unsigned int" (it can't be negative, and we're
unlikely to have more than 2^32-1 packets - and, if we are, it should be
made a guint64).  That eliminates some more format item vs. value
warnings.

Initialize "start_time" and "stop_time" to 0, so that we handle files
with no packets (and so that we don't get uninitialized variable
warnings).

Display the file size with PRIu64, after casting it to "guint64" (that
way we handle file sizes if they're "unsigned int", "unsigned long", or
a 64-bit type on ILP64 platforms (it's 64 bits in BSDs derived from
4.4BSD, even on ILP64 platforms).

Mark the first argument to "file_open_entry_changed()" as unused.

Don't use G_CONST_RETURN, as it's not defined by GLib 1.2[.x].

Get rid of an unused variable.

Clean up white space.

svn path=/trunk/; revision=11189
2004-06-20 03:05:57 +00:00
Guy Harris 5b96828900 The sequence number in COTP packets is either unused (for TP0) or
relative to the beginning of the connection (for TP1-4).  They are *not*
relative to the first segment of a segmented TPDU, so the sequence
number can't be used in calls to "fragment_add_seq_check()".

For now, we assume that COTP packets are seen in order, and just use
"fragment_add_seq_next()" - that's unlikely to make anything worse (the
only time when "fragment_add_seq_check()" will work is when the first
segment has a sequence number of 0), and definitely fixes reassembly in
a number of cases.  In the long term, we might want to handle
out-of-order packets above the reassembly layer, so that it handles even
out-of-order unsegmented packets.

svn path=/trunk/; revision=11188
2004-06-20 01:05:07 +00:00
Ulf Lamping 915f02d0f5 add preview information to the open and merge dialog boxes
svn path=/trunk/; revision=11187
2004-06-19 10:48:06 +00:00
Guy Harris b93965db56 From Dennis Lim: add routines used by dissectors for ONC RPC protocols
to the plugin API.

Add them to the list of routines exported from the libethereal DLL on
Windows as well.

svn path=/trunk/; revision=11186
2004-06-19 10:13:52 +00:00
Guy Harris 4c9a7c3c87 From Carles Kishimoto: add support for GMPLS extensions, as per the I-D
draft-ietf-ccamp-ospf-gmpls-extensions-12.

svn path=/trunk/; revision=11185
2004-06-19 09:48:49 +00:00
Guy Harris 7c1556c1fe If the user hasn't explicitly said they want to build with Heimdal,
don't *require* them to have "krb5.h" - if they don't have it, don't
build with Heimdal.

svn path=/trunk/; revision=11184
2004-06-19 04:12:56 +00:00
Guy Harris f9dbc641e5 From Thomas Anders: display the Security Parameter Lifetime as a
relative time string rather than raw seconds.

svn path=/trunk/; revision=11183
2004-06-19 04:10:33 +00:00
Guy Harris 7002776572 Pick up the stuff I did for tcpdump to figure out the right strings to
use to format 64-bit integers.

Fix the RSVP dissector to use that rather than hardcoding "%ll" in.

Remove the "only if G_HAVE_GINT64 is defined" bit from the discussion of
64-bit integers - we're too dependent on having them to support
compilers that don't have a 64-bit integral data type.  Do, however,
note that neither "long" nor "long long" are acceptable, and also note
that you shouldn't assume "%ll" does the trick for printing them.

svn path=/trunk/; revision=11182
2004-06-19 00:07:23 +00:00
Guy Harris 641a9fbf47 "ti_time" is a "time_t", not a "long" ("time_t" isn't necessarily a
"long").

Make "elapsed_time" an "unsigned int" rather than an "unsigned long" -
2^32-1 seconds is about 136 years, so on LP64 machines that won't
matter, and on ILP32 machines it doesn't make any difference, but it
*does* generate compiler warnings from "%u" being used with "unsigned
long" values.

svn path=/trunk/; revision=11181
2004-06-18 20:23:10 +00:00
Jörg Mayer e4a45b0a98 Add local MAC addresses for MS-Loadbalancing (not all, see comment in wka.tmpl)
Update manuf

svn path=/trunk/; revision=11180
2004-06-18 14:27:13 +00:00
Ulf Lamping 14a5228639 add timestamp of first and last packet to summary dialog
svn path=/trunk/; revision=11179
2004-06-18 14:11:09 +00:00
Jörg Mayer 4651530481 Add the kerberos linking options to the right magic variable
svn path=/trunk/; revision=11178
2004-06-18 12:19:24 +00:00
Jörg Mayer a3b7664597 Fix compile errors on Suse 9.1:
- It's gboolean not boolean
Fix warning about extraneous , at end of enum.

svn path=/trunk/; revision=11177
2004-06-18 12:04:49 +00:00
Ulf Lamping a43f7d1f88 merge: remove code duplication in merge.c and mergecap.c (put it in merge.c),
and doing some more code cleanup

svn path=/trunk/; revision=11176
2004-06-18 10:01:59 +00:00
Ulf Lamping fa46f7a6db merge: bugfixes and code cleanup
svn path=/trunk/; revision=11175
2004-06-18 07:41:21 +00:00
Ulf Lamping 0657cbad2e added some tooltips, minor code cleanup
svn path=/trunk/; revision=11174
2004-06-18 05:58:30 +00:00
Guy Harris 25fc80c257 Use an adverb to modify a verb.
svn path=/trunk/; revision=11173
2004-06-17 22:42:40 +00:00
Guy Harris 6f9b4384d5 Include <string.h> to declare "strdup()".
svn path=/trunk/; revision=11172
2004-06-17 22:41:29 +00:00
Ulf Lamping bd3aea8d04 add Merge functionality to Ethereal in an experimental state.
Copied and sligthly modified merge.c from mergecap.c
(needs a lot of code cleanup, though)

svn path=/trunk/; revision=11171
2004-06-17 21:53:26 +00:00
Ulf Lamping a93978dc30 add implementation of button mask ESD_BTNS_YES_NO
svn path=/trunk/; revision=11170
2004-06-17 21:34:12 +00:00
Anders Broman a4fb4fe655 Add two new media types:
"application/vnd.poc.refer-to"
"application/cpim-pidf+xml"
/ Anders

svn path=/trunk/; revision=11169
2004-06-17 20:49:01 +00:00
Guy Harris e08deab6f5 Give the RFC number for ARP.
When checking for a gratuitous ARP, compare the raw bytes of the
protocol addresses, not the strings for those addresses.

Do the stuff we do even if we *aren't* constructing a protocol tree or
setting the Info column first, and then quit if we're doing neither.
That obviates the need to set "is_gratuitous" if we're doing neither.

Construct the strings for addresses when we need them, rather than
constructing them in advance even if we don't need them.

Capitalize "ARP" in "Gratuitous ARP".

svn path=/trunk/; revision=11168
2004-06-17 20:04:53 +00:00
Ulf Lamping dc1a5f5a60 move font related stuff to new file font_utils.c/.h
do some font related renaming/code cleanup

svn path=/trunk/; revision=11167
2004-06-17 16:44:46 +00:00
Ulf Lamping 25e6749eb4 move font related stuff to new file font_utils.c/.h
do some font related renaming/code cleanup

svn path=/trunk/; revision=11166
2004-06-17 16:35:26 +00:00
Jörg Mayer d69ae05d29 Turn on kerberos by default if it is present
svn path=/trunk/; revision=11165
2004-06-17 14:37:43 +00:00
Jörg Mayer 7abd8a323d Link the Kerberos into the main app, not libethereal
svn path=/trunk/; revision=11164
2004-06-17 08:53:42 +00:00
Jörg Mayer e9aa839e79 Explicitly print gratuitous arp requests as such
svn path=/trunk/; revision=11163
2004-06-17 08:32:59 +00:00
Guy Harris 517ff91586 From Dave Sclarsky: add support for "multiple instances", and add
additional hidden fields for use as filters.

svn path=/trunk/; revision=11162
2004-06-17 07:10:33 +00:00
Guy Harris 8b66765a41 The short name for AAL 3/4 should be "AAL3/4", not "AAL3_4" (even though
the *filter* name is "aal3_4").

svn path=/trunk/; revision=11161
2004-06-16 23:36:57 +00:00
Guy Harris e656facb26 As long as any text has been put into a time interval string, the next
clause we add will have to have ", " separating it from the text before
it.

svn path=/trunk/; revision=11160
2004-06-16 23:09:43 +00:00
Anders Broman 2a7418594b Completly change parsing of "From" and "To" lines to fix a problem with finding "tag"
add and export "dfilter_store_sip_from_addr" to make it possible to filter on
SIP url:s in multiple dissectors and some wite space changes.

svn path=/trunk/; revision=11159
2004-06-16 18:20:49 +00:00
Guy Harris f17a8f98ec To return an EOF indication, return FALSE from the read routine *AND*
set "*err" to 0, rather than leaving what random value happened to be in
"*err" there.

svn path=/trunk/; revision=11158
2004-06-16 08:11:59 +00:00
Guy Harris 20d6c818e8 Use "format_text()" on strings, so we handle non-printable characters.
Clean up white space a bit.

svn path=/trunk/; revision=11157
2004-06-16 07:51:21 +00:00
Guy Harris 7e128ddeb3 Note that the reason why there's parser state that stays around after
the parse finishes (forcing us to feed the parser an end-of-input even
after an error) is that we don't create a new parser object when we
start a new parse and don't destroy it when the parse finishes.

svn path=/trunk/; revision=11156
2004-06-16 07:33:46 +00:00
Gerald Combs 24861362a0 From Yaniv Kaul: Switch from the DPD draft to RFC 3706.
svn path=/trunk/; revision=11155
2004-06-15 18:47:24 +00:00
Anders Broman de103d9aff From Thomas Anders: Navigating from RTP/RTCP packets to setup where it was set up
svn path=/trunk/; revision=11154
2004-06-15 18:26:08 +00:00
Gerald Combs 33cb6ac10a Add and entry for 03-00-C7-00-00-EE (HP/Compaq ProLiant NIC teaming).
The protocol is documented at http://www.hp.com/sbso/bus_protect/teaming.pdf
if anyone wants to write a dissector.

svn path=/trunk/; revision=11153
2004-06-15 18:25:04 +00:00
Guy Harris 95391789a3 From Graeme Hewson:
Add a #define to enable parser tracing.

	Clean up parser state when finished parsing, even if we stopped
	parsing due to a syntax error, so that there's nothing left
	around to screw up the next parse.

svn path=/trunk/; revision=11152
2004-06-15 10:38:14 +00:00
Guy Harris 6ce3f952e0 From Graeme Hewson: fix a debug message.
svn path=/trunk/; revision=11151
2004-06-15 10:16:10 +00:00
Guy Harris 9d3a03d975 From Jean-Baptiste Marchand: fix up a couple of #defines that collided
with existing defines.

svn path=/trunk/; revision=11150
2004-06-15 09:50:57 +00:00
Guy Harris f74521e9a9 From Philippe Mazeau: T.35 codes for Swissvoice.
svn path=/trunk/; revision=11149
2004-06-15 09:43:19 +00:00
Guy Harris 3c0ec39bed From Greg Morris: dissect the first packet in a packet burst connection
(NCP type 7777).

svn path=/trunk/; revision=11148
2004-06-15 09:30:54 +00:00