summaryrefslogtreecommitdiff
path: root/wiretap/libpcap.h
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>1999-08-19 05:31:38 +0000
committerGuy Harris <guy@alum.mit.edu>1999-08-19 05:31:38 +0000
commit137ba48d18e0957e5fc920e7b518ba95212789a8 (patch)
tree9ea3f0562b63feb029a13b9d17f856181e5ceecb /wiretap/libpcap.h
parent7843c01d38ea4e6e17ad9c36f94999fe2ff9866c (diff)
downloadwireshark-137ba48d18e0957e5fc920e7b518ba95212789a8.tar.gz
Have the per-capture-file-type open routines "wtap_open_offline()" calls
return 1 on success, -1 if they got an error, and 0 if the file isn't of the type that file is checking for, and supply an error code if they return -1; have "wtap_open_offline()" use that error code. Also, have the per-capture-file-type open routines treat errors accessing the file as errors, and return -1, rather than just returning 0 so that we try another file type. Have the per-capture-file-type read routines "wtap_loop()" calls return -1 and supply an error code on error (and not, as they did in some cases, call "g_error()" and abort), and have "wtap_loop()", if the read routine returned an error, return FALSE (and pass an error-code-pointer argument onto the read routines, so they fill it in), and return TRUE on success. Add some new error codes for them to return. Now that "wtap_loop()" can return a success/failure indication and an error code, in "read_cap_file()" put up a message box if we get an error reading the file, and return the error code. Handle the additional errors we can get when opening a capture file. If the attempt to open a capture file succeeds, but the attempt to read it fails, don't treat that as a complete failure - we may have managed to read some of the capture file, and we should display what we managed to read. svn path=/trunk/; revision=516
Diffstat (limited to 'wiretap/libpcap.h')
-rw-r--r--wiretap/libpcap.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h
index 2bd1449996..740f6a7a05 100644
--- a/wiretap/libpcap.h
+++ b/wiretap/libpcap.h
@@ -1,6 +1,6 @@
/* libpcap.h
*
- * $Id: libpcap.h,v 1.2 1999/08/18 04:17:36 guy Exp $
+ * $Id: libpcap.h,v 1.3 1999/08/19 05:31:37 guy Exp $
*
* Wiretap Library
* Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu>
@@ -21,5 +21,5 @@
*
*/
-int libpcap_open(wtap *wth);
+int libpcap_open(wtap *wth, int *err);
int libpcap_dump_open(wtap_dumper *wdh, int *err);