Commit Graph

9 Commits

Author SHA1 Message Date
Ulf Lamping 79053183c5 remove dependencies to pcap.h, so getting an idea what needs to be done by dumpcap in addition to the things already done now
various dumpcap related code cleanup: mainly #include's and capture engine related stuff

svn path=/trunk/; revision=17327
2006-02-17 02:18:48 +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
Ulf Lamping 39b2f7c4d9 two bugfixes:
- don't use GtkSelectionData after returned to GTK, as it might free this data immediately (copy the data instead and free it after usage)
- fix return value handling for DnD merge, so it will work again

svn path=/trunk/; revision=15056
2005-07-25 18:02:32 +00:00
Guy Harris bcc201cd88 If we have libpcap, include <pcap.h>, because "capture.h" requires it.
If we *don't* have libpcap, don't include "capture.h", and don't test
whether a capture is in progress.

Clean up a message.

svn path=/trunk/; revision=14356
2005-05-12 03:29:26 +00:00
Ulf Lamping 22e13e1197 fix bugzilla #110 (http://bugs.ethereal.com/bugzilla/show_bug.cgi?id=110)
don't crash if dropping a file while running a capture or reading a file

svn path=/trunk/; revision=14206
2005-04-27 19:56:31 +00:00
Ulf Lamping 37f7683cd1 from Ilya Konstantinov: fixed a bug as DND wasn't working with GNOME, I've also added a comment how GNOME handles these things
svn path=/trunk/; revision=14020
2005-04-06 21:24:00 +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 a1a2ae3180 rename kill_capture_child to capture_kill_child to have a common prefix
split drag and drop support out of main.c into new file drag_and_drop.c, to reduce the size of main.c a bit.

Hopefully this won't break unix builds because of missing #include's, I will keep an eye on the buildbot

svn path=/trunk/; revision=13308
2005-02-05 15:35:25 +00:00