osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

On an I/O error, merge_read_packet() and merge_append_read_packet() need 

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
This commit is contained in:
Guy Harris 2011-11-21 06:26:03 +00:00
parent f2e8579ba3
commit 272c011d19
3 changed files with 36 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
file.c
View File

@ -1290,7 +1290,12 @@ cf_merge_files(char **out_filenamep, int in_file_count,
in_file = merge_read_packet(in_file_count, in_files, &read_err, in_file = merge_read_packet(in_file_count, in_files, &read_err,
&err_info); &err_info);
if (in_file == NULL) { if (in_file == NULL) {
if (read_err != 0) /* EOF */
break;
}
if (read_err != 0) {
/* I/O error reading from in_file */
got_read_error = TRUE; got_read_error = TRUE;
break; break;
} }

29
merge.c
View File

@ -150,9 +150,16 @@ is_earlier(struct wtap_nstime *l, struct wtap_nstime *r) {
/* /*
* Read the next packet, in chronological order, from the set of files * Read the next packet, in chronological order, from the set of files
* to be merged. Return a pointer to the merge_in_file_t for the file * to be merged.
* from which the packet was read on success, or NULL on EOF or error. *
* On EOF, *err is 0; on an error, it's an error code. * On success, set *err to 0 and return a pointer to the merge_in_file_t
* for the file from which the packet was read.
*
* On a read error, set *err to the error and return a pointer to the
* merge_in_file_t for the file on which we got an error.
*
* On an EOF (meaning all the files are at EOF), set *err to 0 and return
* NULL.
*/ */
merge_in_file_t * merge_in_file_t *
merge_read_packet(int in_file_count, merge_in_file_t in_files[], merge_read_packet(int in_file_count, merge_in_file_t in_files[],
@ -211,9 +218,16 @@ merge_read_packet(int in_file_count, merge_in_file_t in_files[],
/* /*
* Read the next packet, in file sequence order, from the set of files * Read the next packet, in file sequence order, from the set of files
* to be merged. Return a pointer to the merge_in_file_t for the file * to be merged.
* from which the packet was read on success, or NULL on EOF or error. *
* On EOF, *err is 0; on an error, it's an error code. * On success, set *err to 0 and return a pointer to the merge_in_file_t
* for the file from which the packet was read.
*
* On a read error, set *err to the error and return a pointer to the
* merge_in_file_t for the file on which we got an error.
*
* On an EOF (meaning all the files are at EOF), set *err to 0 and return
* NULL.
*/ */
merge_in_file_t * merge_in_file_t *
merge_append_read_packet(int in_file_count, merge_in_file_t in_files[], merge_append_read_packet(int in_file_count, merge_in_file_t in_files[],
@ -232,7 +246,7 @@ merge_append_read_packet(int in_file_count, merge_in_file_t in_files[],
if (*err != 0) { if (*err != 0) {
/* Read error - quit immediately. */ /* Read error - quit immediately. */
in_files[i].state = GOT_ERROR; in_files[i].state = GOT_ERROR;
return NULL; return &in_files[i];
} }
/* EOF - flag this file as being at EOF, and try the next one. */ /* EOF - flag this file as being at EOF, and try the next one. */
in_files[i].state = AT_EOF; in_files[i].state = AT_EOF;
@ -244,5 +258,6 @@ merge_append_read_packet(int in_file_count, merge_in_file_t in_files[],
} }
/* Return the ordinal of the file from which the packet was read. */ /* Return the ordinal of the file from which the packet was read. */
*err = 0;
return &in_files[i]; return &in_files[i];
} }

7
mergecap.c
View File

@ -351,7 +351,12 @@ main(int argc, char *argv[])
in_file = merge_read_packet(in_file_count, in_files, &read_err, in_file = merge_read_packet(in_file_count, in_files, &read_err,
&err_info); &err_info);
if (in_file == NULL) { if (in_file == NULL) {
if (read_err != 0) /* EOF */
break;
}
if (read_err != 0) {
/* I/O error reading from in_file */
got_read_error = TRUE; got_read_error = TRUE;
break; break;
} }