Commit graph

158 commits

Author SHA1 Message Date
Jörg Mayer
e9ea42eed9 Fix more "no previous declaration" warnings
svn path=/trunk/; revision=15173
2005-08-02 04:47:15 +00:00
Ulf Lamping
9b5d52aab6 ask for unsaved file when using the new start capture feature,
ask for unsaved file when really starting the capture, not already when showing the options dialog,
use the start capture icon in the capture options dialog (instead of simply Ok)

svn path=/trunk/; revision=14142
2005-04-19 21:02:01 +00:00
Ulf Lamping
fcb74124f8 Save As: ask user if he wants to overwrite an already existing file
svn path=/trunk/; revision=14058
2005-04-12 21:24:30 +00:00
Ulf Lamping
ccff84dbdf code cleanup: use common prefix for all functions in color_filters.h
svn path=/trunk/; revision=13910
2005-03-26 01:09:14 +00:00
Guy Harris
9105b04e4b Have "cf_merge_files()" take a pointer-to-pointer-to-char as the output
file name argument; if the pointed-to pointer is null, it opens a
temporary file, and sets that pointer to a mallocated copy of the
pathname of the temporary file.  It no longer needs a file descriptor as
an argument.

svn path=/trunk/; revision=13419
2005-02-17 03:05:54 +00:00
Guy Harris
ea7ef54b0d Have "cf_merge_files()" always close "out_fd" before returning; it does
so if "wtap_dump_fdopen()" succeeds (as a side-effect of calling
"wtap_dump_close()"), even if "cf_merge_fails()" after that, so it
should do so if it fails.

That means we don't need to close it in the callers of "cf_merge_files()".

svn path=/trunk/; revision=13407
2005-02-15 20:01:24 +00:00
Ulf Lamping
9d18adec33 minor enhancements to Guy's last update
svn path=/trunk/; revision=13304
2005-02-05 13:44:27 +00:00
Guy Harris
fa3e5609ab Put "cf_status_t" back.
svn path=/trunk/; revision=13303
2005-02-05 12:50:47 +00:00
Ulf Lamping
0861927ce3 huge cleanup of capture file API (functions in file.c/file.h).
This includes: all functions in file.h now have a cf_ prefix, will have doxygen tags, will have the capture_file *cf as the first parameter and I tried to generalize the return values for non trivial functions.

Hopefully, I didn't introduced any new bugs, as I had to change a lot of files...

svn path=/trunk/; revision=13289
2005-02-04 18:44:44 +00:00
Guy Harris
f72cba5413 We use the range utilities regardless of whether we're built with
libpcap or not.

svn path=/trunk/; revision=13182
2005-01-27 11:23:06 +00:00
Guy Harris
0067b4b94e The right way to check whether a pointer is null and get a Boolean is to
test it against null, not to cast it to a Boolean type - as Boolean
types in C89/C90, at least, are just integral types, that cast might
just throw away the upper 32 bits; that probably yields the results you
want, but the compiler might well justifiably warn about that on an LP64
platform.

svn path=/trunk/; revision=12915
2005-01-01 23:19:11 +00:00
Guy Harris
6e622fd24e "gtk_entry_get_text()" returns a "const char *" - assign the result to
one.

"get_basename()" doesn't modify its argument, and its callers don't
modify the substring pointed to by the result, so make it take a "const
char *" as an argument and return a "const char *". 

"find_last_pathname_separator()" doesn't modify its argument, so make it
a "const char *" - but some of its callers pass a non-"const" "char *"
and modify the result, so don't make its return value a "const char *".
And, as none of its callers are outside "filesystem.c", make it static.

In "about_folders_page_new()", have separate variables for pathnames
returned as "const char *" (which are cached by the routine that returns
them, so you can't modify them - and can't free them, so get rid of the
commented-out "g_free()" calls for them) and pathnames returned as "char
*" (which are allocated anew for each call, and can be modified, but
have to be freed).

Clean up white space.

svn path=/trunk/; revision=12881
2004-12-31 00:26:36 +00:00
Guy Harris
f1deabed56 Make the tone of the error messages a bit less formal, by using
contractions.  (Safari does, at least when you're trying to open a file
to which you don't have read access.)

svn path=/trunk/; revision=12852
2004-12-29 01:08:20 +00:00
Guy Harris
b48b8847b1 Change some of the merge.c APIs to return more information on failure,
and use that information to provide better error messages.

Have "merge_open_outfile()" do all the work of filling in the
merge_out_file_t structure, with the values to use passed as arguments. 
Get rid of some structure members that used to be used solely to pass
information to "merge_open_outfile()".

Add a "cf_merge_files()" routine to do the merging and reporting of errors.

svn path=/trunk/; revision=12420
2004-10-27 23:28:37 +00:00
Guy Harris
c0ad4beb9c Change some code that affects g_resolv_flags to set a flag if the check
box for the flag is active and clear it if it's inactive, rather than
clearing all but RESOLV_CONCURRENT and then setting flags if the check
box is active - or, in one case, not clearing any flags due to a typo
and then setting them, so they never get cleared.  This matches what's
done with theresolution flags in some other places.

svn path=/trunk/; revision=12375
2004-10-22 07:07:08 +00:00
Guy Harris
34a94d6b37 When merging, default to the current file format as the output format.
svn path=/trunk/; revision=12327
2004-10-17 03:11:31 +00:00
Guy Harris
4624549a99 From Mark C. Brown: allow the file type for the merge operation to be
specified in the GUI.

svn path=/trunk/; revision=12326
2004-10-17 02:53:26 +00:00
Guy Harris
727ad67453 Remove the fixed maximum number of subranges in a range_t; dynamically
allocate them to be large enough.

Add checks that the numbers in the range fit in a guint32.

Check the validity of a range before saving or printing, and report
errors in an alert box.

Clean up white space.

svn path=/trunk/; revision=12320
2004-10-16 23:32:24 +00:00
Guy Harris
bbe7f89742 Move prefs.c and prefs.h into the epan subdirectory.
svn path=/trunk/; revision=12115
2004-09-27 22:55:15 +00:00
Ulf Lamping
636317d3a6 Fix a minor bug only with GTK2.4: if have a problem while saving a file (e.g. filename already exists) will lead to an unresponding file dialog. The fix will close the dialog, which isn't the best solution, but I don't see a better one.
svn path=/trunk/; revision=11943
2004-09-08 19:26:36 +00:00
Guy Harris
f06c1b5fb0 The packet range stuff knows about capture_file structures, so it's
really more of an Ethereal/Tethereal component than a libethereal
component (nothing else in libethereal knows about capture files); move
it back out of libethereal.  (The range stuff doesn't; we leave it in
libethereal.)

svn path=/trunk/; revision=11898
2004-09-04 20:02:11 +00:00
Guy Harris
478ba9a691 Rename "range.c" and "range.h" to "packet-range.c" and "packet-range.h";
they should ultimately be split into files with routines that handle
ranges, which are just subsets of [0,2^32), and packet ranges, which are
subsets of the packet list, possibly specified by a range.

Move them into epan, so they can be used by, for example, utilities that
handle ranges, such editcap.

svn path=/trunk/; revision=11890
2004-09-04 00:53:16 +00:00
Ulf Lamping
5e32dc06eb added a preference setting, to be able to change the preview timeout in the file open dialog (as requested by Ronnie Sahlberg).
svn path=/trunk/; revision=11859
2004-08-31 09:22:57 +00:00
Ulf Lamping
50b29ff07d Split the preview function into a prepare and a do part, to be able to do some experiments about the preview timeout things.
As the FileChooser dialog (GTK2.4) doesn't seem to let pass other GTK events (even with calling gtk_main_iteration()), it's not possible to change the preview behaviour to be more keen. To get a mechanism to update the preview independant from the dialog workings, we would need to start a new thread/task, which is too much effort for this IMHO.

So we might use the more simple approach of setting the timeout by a preference setting.

svn path=/trunk/; revision=11856
2004-08-31 08:18:10 +00:00
Gerald Combs
c8235fae25 Move the file-reloading code from gtk/file_dlg.c to file.c.
svn path=/trunk/; revision=11823
2004-08-25 03:01:32 +00:00
Gerald Combs
76fd761686 As suggested by Guy: Have mark_frame() do nothing if the frame has
already been marked and have unmark_frame() do likewise.  Don't mess
with the marked frame count in mark_all_frames().

Be a little more paranoid about the marked frame count in other places.

svn path=/trunk/; revision=11775
2004-08-19 14:35:55 +00:00
Guy Harris
3a583aeb59 From Albert Chin: rename resolv.{ch} to addr_resolv.{ch}, so that an
include of <resolv.h> in any system header file gets the system
<resolv.h> (needed for builds on Tru64 with GTK+ 1.2[.x]).

svn path=/trunk/; revision=11615
2004-08-06 19:57:49 +00:00
Guy Harris
b67a0f92d2 Move color_filters.c and color_filters.h up to the top-level directory,
as they're now (theoretically) toolkit-independent (modulo changes that
might be required to the code to update filter lists when a new filter
is read in).

svn path=/trunk/; revision=11500
2004-07-24 01:29:12 +00:00
Ulf Lamping
bfd6ace52e renamed filter_prefs to filter_dlg, as the filter settings are (well, for a long time) no longer part of the preferences dialog.
svn path=/trunk/; revision=11436
2004-07-19 21:42:01 +00:00
Guy Harris
8a8b883450 Set the svn:eol-style property on all text files to "native", so that
they have LF at the end of the line on UN*X and CR/LF on Windows;
hopefully this means that if a CR/LF version is checked in on Windows,
the CRs will be stripped so that they show up only when checked out on
Windows, not on UN*X.

svn path=/trunk/; revision=11400
2004-07-18 00:24:25 +00:00
Guy Harris
fd262f1b97 From Daniel Thompson: add additional message/alert box options to
display "Save", "Continue without Saving", and "Cancel", for the "do you
want to save?" messages.

svn path=/trunk/; revision=11372
2004-07-13 07:15:45 +00:00
Guy Harris
9cff51ea78 Include <unistd.h>, if available, to declare "close()".
svn path=/trunk/; revision=11278
2004-06-30 07:12:25 +00:00
Ulf Lamping
24527148ab close temporary merge output file, if merging failed
svn path=/trunk/; revision=11275
2004-06-30 05:49:30 +00:00
Ulf Lamping
19c7f04794 avoid using tmpnam() for security reasons.
instead of giving the merge stuff a filename,
give it an already opened file descriptor

svn path=/trunk/; revision=11273
2004-06-29 20:59:24 +00:00
Jörg Mayer
4bbb32eaaa The patch to fix the race condition introduced by using tmpnam replaced
insecure code by not-working code.  As I currently lack the time to fix
this properly until Monday as the earliest possible date I undo the patch.

Please note that Ethereal should not be used on multiuser systems with
untrusted users until a proper fix has been applied.

svn path=/trunk/; revision=11263
2004-06-29 03:27:52 +00:00
Ulf Lamping
bf6103638f minor bugfix for merge dialog: use the correct handle for resizing
svn path=/trunk/; revision=11259
2004-06-28 15:09:26 +00:00
Jörg Mayer
0195deceae tmpnam() really should not be used for security reasons.
Replace it where used and update README.developer accordingly.

svn path=/trunk/; revision=11235
2004-06-25 07:04:03 +00:00
Ulf Lamping
5c061e582e if more than one file is (drag and) dropped into the program,
merge them together into a new temporary file
(and notice the user by a simple_dialog about it)

svn path=/trunk/; revision=11205
2004-06-21 16:45:07 +00:00
Ulf Lamping
527ad5b35d use the "correct" resize function for the file selection dialog
svn path=/trunk/; revision=11202
2004-06-21 05:48:15 +00:00
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
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
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
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
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