Age | Commit message (Collapse) | Author | Files | Lines |
|
svn path=/trunk/; revision=50656
|
|
https://www.wireshark.org/lists/wireshark-dev/201301/msg00062.html
svn path=/trunk/; revision=47088
|
|
svn path=/trunk/; revision=45015
|
|
file from which we got the error.
On a successful read, always clear out err - wtap_read() doesn't set *err
on success.
svn path=/trunk/; revision=42854
|
|
to return a pointer to the merge_in_file_t that got the error. Set *err
to 0 on success and an error code on an err, treat a null return as an
EOF indication, and if we don't get a null return check for a non-zero
error code and treat that as an I/O error.
svn path=/trunk/; revision=39964
|
|
type" when writing out a capture file (i.e., writing a
per-packet-encapsulation capture to a file type that supports it but
doesn't support one of the packet's encapsulations), report the packet
number and, when doing this in a merge operation, report the file from
which it came.
When reporting "sorry, that file can't be written to a file of that
type, period", show the file type rather than the input file link-layer
type that causes the problem. (We could show both. We could be
*really* ambitious and iterate through all possible file types and show
the ones that will or at least might work....)
file_write_error_message() is documented as handling only UNIX-style
errnos, and libwireshark should be usable without libwiretap, so leave
it up to its callers to handle Wiretap errors such as
WTAP_ERR_SHORT_WRITE.
Clean up indentation.
svn path=/trunk/; revision=39949
|
|
svn path=/trunk/; revision=32312
|
|
svn path=/trunk/; revision=30329
|
|
svn path=/trunk/; revision=28055
|
|
"int" or a "long"; initialize it with LONG_MAX cast to "time_t".
The second argument is an "int"; initialize it with INT_MAX.
svn path=/trunk/; revision=23764
|
|
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
|
|
(so if the file's gzipped, it's *NOT* the size of the file after
uncompressing), and an approximation of the amount of that data read
sequentially so far.
Use those for various progress bars and the like.
Make the fstat() in the Ascend trace reader directly use wth->fd, as
it's inside Wiretap; that gets rid of the last caller of wtap_fd() (as
we're no longer directly using fstat() or lseek() in Ethereal), so get
rid of wtap_fd().
svn path=/trunk/; revision=15437
|
|
that return the next packet from a set of {chronologically sorted,
sequential-by-file} packets; it doesn't need to have a loop over all
those packets, or any code to write packets.
Supply those abstractions, change the code that merges packets to do its
own writing, and have the Ethereal version manage a progress bar and
have the mergecap version print packet numbers in verbose mode, as the
common merge code used to do.
svn path=/trunk/; revision=12427
|
|
indication - success, read failure, write failure - and have their
callers handle read failures by looking for the file that got the read
failure and reporting the failure in question.
Free up the err_info string returned by "wtap_read()" after using it.
svn path=/trunk/; revision=12423
|
|
mergecap.c (get rid of the verbose printing of information for each
packet).
Have "merge_append_files()" return FALSE only on a write error, as
"merge_files()" does.
Sort the routines in "merge.c" in the order from "merge.h".
svn path=/trunk/; revision=12422
|
|
absorbing its logic into "cf_merge_files()" simplifies things a bit.
svn path=/trunk/; revision=12421
|
|
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
|
|
svn path=/trunk/; revision=12411
|
|
specified in the GUI.
svn path=/trunk/; revision=12326
|
|
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
|
|
instead of giving the merge stuff a filename,
give it an already opened file descriptor
svn path=/trunk/; revision=11273
|
|
merge them together into a new temporary file
(and notice the user by a simple_dialog about it)
svn path=/trunk/; revision=11205
|
|
- It's gboolean not boolean
Fix warning about extraneous , at end of enum.
svn path=/trunk/; revision=11177
|
|
and doing some more code cleanup
svn path=/trunk/; revision=11176
|
|
svn path=/trunk/; revision=11175
|
|
Copied and sligthly modified merge.c from mergecap.c
(needs a lot of code cleanup, though)
svn path=/trunk/; revision=11171
|