diff options
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/file.c | 20 | ||||
| -rw-r--r-- | wiretap/libpcap.c | 4 | ||||
| -rw-r--r-- | wiretap/libpcap.h | 4 | ||||
| -rw-r--r-- | wiretap/netmon.c | 4 | ||||
| -rw-r--r-- | wiretap/netmon.h | 4 | ||||
| -rw-r--r-- | wiretap/snoop.c | 4 | ||||
| -rw-r--r-- | wiretap/snoop.h | 4 |
7 files changed, 22 insertions, 22 deletions
diff --git a/wiretap/file.c b/wiretap/file.c index 9edcec26b6..1b6890002f 100644 --- a/wiretap/file.c +++ b/wiretap/file.c @@ -1,6 +1,6 @@ /* file.c * - * $Id: file.c,v 1.34 1999/12/04 08:51:52 guy Exp $ + * $Id: file.c,v 1.35 1999/12/04 09:38:36 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -174,7 +174,7 @@ success: /* Table of the file types we know about. */ const static struct file_type_info { const char *name; - int (*can_dump_encap)(int, int); + int (*can_write_encap)(int, int); int (*dump_open)(wtap_dumper *, int *); } dump_open_table[WTAP_NUM_FILE_TYPES] = { /* WTAP_FILE_UNKNOWN */ @@ -187,7 +187,7 @@ const static struct file_type_info { /* WTAP_FILE_PCAP */ { "libpcap (tcpdump)", - libpcap_dump_can_dump_encap, libpcap_dump_open }, + libpcap_dump_can_write_encap, libpcap_dump_open }, /* WTAP_FILE_PCAP_MODIFIED */ { "modified libpcap (tcpdump)", @@ -203,7 +203,7 @@ const static struct file_type_info { /* WTAP_FILE_SNOOP */ { "snoop", - snoop_dump_can_dump_encap, snoop_dump_open }, + snoop_dump_can_write_encap, snoop_dump_open }, /* WTAP_FILE_IPTRACE_1_0 */ { "AIX iptrace 1.0", @@ -215,7 +215,7 @@ const static struct file_type_info { /* WTAP_FILE_NETMON_1_x */ { "Microsoft Network Monitor 1.x", - netmon_dump_can_dump_encap, netmon_dump_open }, + netmon_dump_can_write_encap, netmon_dump_open }, /* WTAP_FILE_NETMON_2_x */ { "Microsoft Network Monitor 2.x", @@ -259,7 +259,7 @@ const char *wtap_file_type_string(int filetype) return dump_open_table[filetype].name; } -gboolean wtap_can_open(int filetype) +gboolean wtap_dump_can_open(int filetype) { if (filetype < 0 || filetype >= WTAP_NUM_FILE_TYPES || dump_open_table[filetype].dump_open == NULL) @@ -268,13 +268,13 @@ gboolean wtap_can_open(int filetype) return TRUE; } -gboolean wtap_can_dump_encap(int filetype, int encap) +gboolean wtap_dump_can_write_encap(int filetype, int encap) { if (filetype < 0 || filetype >= WTAP_NUM_FILE_TYPES - || dump_open_table[filetype].can_dump_encap == NULL) + || dump_open_table[filetype].can_write_encap == NULL) return FALSE; - if ((*dump_open_table[filetype].can_dump_encap)(filetype, encap) != 0) + if ((*dump_open_table[filetype].can_write_encap)(filetype, encap) != 0) return FALSE; return TRUE; @@ -332,7 +332,7 @@ static wtap_dumper* wtap_dump_open_common(FILE *fh, int filetype, int encap, /* OK, we know how to write that type; can we write the specified encapsulation type? */ - *err = (*dump_open_table[filetype].can_dump_encap)(filetype, encap); + *err = (*dump_open_table[filetype].can_write_encap)(filetype, encap); if (*err != 0) { /* NOTE: this means the FD handed to "wtap_dump_fdopen()" will be closed if we can't write that encapsulation type. */ diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 85ee54d29d..bad38b9f3e 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -1,6 +1,6 @@ /* libpcap.c * - * $Id: libpcap.c,v 1.25 1999/12/04 08:32:13 guy Exp $ + * $Id: libpcap.c,v 1.26 1999/12/04 09:38:37 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -479,7 +479,7 @@ static const int wtap_encap[] = { /* Returns 0 if we could write the specified encapsulation type, an error indication otherwise. */ -int libpcap_dump_can_dump_encap(int filetype, int encap) +int libpcap_dump_can_write_encap(int filetype, int encap) { /* Per-packet encapsulations aren't supported. */ if (encap == WTAP_ENCAP_PER_PACKET) diff --git a/wiretap/libpcap.h b/wiretap/libpcap.h index 7cc0cfbda0..0ef7812c60 100644 --- a/wiretap/libpcap.h +++ b/wiretap/libpcap.h @@ -1,6 +1,6 @@ /* libpcap.h * - * $Id: libpcap.h,v 1.5 1999/12/04 08:32:13 guy Exp $ + * $Id: libpcap.h,v 1.6 1999/12/04 09:38:37 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -23,4 +23,4 @@ int libpcap_open(wtap *wth, int *err); gboolean libpcap_dump_open(wtap_dumper *wdh, int *err); -int libpcap_dump_can_dump_encap(int filetype, int encap); +int libpcap_dump_can_write_encap(int filetype, int encap); diff --git a/wiretap/netmon.c b/wiretap/netmon.c index 0921e24a43..2242c23450 100644 --- a/wiretap/netmon.c +++ b/wiretap/netmon.c @@ -1,6 +1,6 @@ /* netmon.c * - * $Id: netmon.c,v 1.20 1999/12/04 08:32:12 guy Exp $ + * $Id: netmon.c,v 1.21 1999/12/04 09:38:38 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -390,7 +390,7 @@ static const int wtap_encap[] = { /* Returns 0 if we could write the specified encapsulation type, an error indication otherwise. */ -int netmon_dump_can_dump_encap(int filetype, int encap) +int netmon_dump_can_write_encap(int filetype, int encap) { /* Per-packet encapsulations aren't supported. */ if (encap == WTAP_ENCAP_PER_PACKET) diff --git a/wiretap/netmon.h b/wiretap/netmon.h index 0efd7abe7d..d63e79c03a 100644 --- a/wiretap/netmon.h +++ b/wiretap/netmon.h @@ -1,6 +1,6 @@ /* netmon.h * - * $Id: netmon.h,v 1.4 1999/12/04 08:32:12 guy Exp $ + * $Id: netmon.h,v 1.5 1999/12/04 09:38:38 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -23,4 +23,4 @@ int netmon_open(wtap *wth, int *err); gboolean netmon_dump_open(wtap_dumper *wdh, int *err); -int netmon_dump_can_dump_encap(int filetype, int encap); +int netmon_dump_can_write_encap(int filetype, int encap); diff --git a/wiretap/snoop.c b/wiretap/snoop.c index b7fea213a6..eccf9d7970 100644 --- a/wiretap/snoop.c +++ b/wiretap/snoop.c @@ -1,6 +1,6 @@ /* snoop.c * - * $Id: snoop.c,v 1.20 1999/12/04 08:32:12 guy Exp $ + * $Id: snoop.c,v 1.21 1999/12/04 09:38:37 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -369,7 +369,7 @@ static const int wtap_encap[] = { /* Returns 0 if we could write the specified encapsulation type, an error indication otherwise. */ -int snoop_dump_can_dump_encap(int filetype, int encap) +int snoop_dump_can_write_encap(int filetype, int encap) { /* Per-packet encapsulations aren't supported. */ if (encap == WTAP_ENCAP_PER_PACKET) diff --git a/wiretap/snoop.h b/wiretap/snoop.h index 4e104da02f..5ecdec85d5 100644 --- a/wiretap/snoop.h +++ b/wiretap/snoop.h @@ -1,6 +1,6 @@ /* snoop.h * - * $Id: snoop.h,v 1.5 1999/12/04 08:32:13 guy Exp $ + * $Id: snoop.h,v 1.6 1999/12/04 09:38:38 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@verdict.uthscsa.edu> @@ -23,4 +23,4 @@ int snoop_open(wtap *wth, int *err); gboolean snoop_dump_open(wtap_dumper *wdh, int *err); -int snoop_dump_can_dump_encap(int filetype, int encap); +int snoop_dump_can_write_encap(int filetype, int encap); |