diff options
| author | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-01-29 09:45:58 +0000 |
|---|---|---|
| committer | guy <guy@f5534014-38df-0310-8fa8-9805f1628bb7> | 2002-01-29 09:45:58 +0000 |
| commit | 87859a653d416075359509af21692f78d896ddfa (patch) | |
| tree | aee45c0a61eaedb10e87afe5ffa3f90d2f08d731 /wiretap | |
| parent | 0be04089580b08e9e65fb8bc0f1104a223c75556 (diff) | |
Untested support for AiroPeek captures.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@4619 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/etherpeek.c | 11 | ||||
| -rw-r--r-- | wiretap/wtap.c | 5 | ||||
| -rw-r--r-- | wiretap/wtap.h | 5 |
3 files changed, 11 insertions, 10 deletions
diff --git a/wiretap/etherpeek.c b/wiretap/etherpeek.c index 8a9c134994..6844e26e3a 100644 --- a/wiretap/etherpeek.c +++ b/wiretap/etherpeek.c @@ -2,7 +2,7 @@ * Routines for opening EtherPeek (and TokenPeek?) files * Copyright (c) 2001, Daniel Thompson <d.thompson@gmx.net> * - * $Id: etherpeek.c,v 1.13 2002/01/23 06:32:51 guy Exp $ + * $Id: etherpeek.c,v 1.14 2002/01/29 09:45:58 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -225,12 +225,9 @@ int etherpeek_open(wtap *wth, int *err) * 802.11, with a private header giving * some radio information. Presumably * this is from AiroPeek. - * - * We don't yet support that. */ - g_message("etherpeek: 802.11 captures unsupported"); - *err = WTAP_ERR_UNSUPPORTED_ENCAP; - return -1; + file_encap = WTAP_ENCAP_AIROPEEK; + break; default: /* @@ -283,7 +280,7 @@ int etherpeek_open(wtap *wth, int *err) } /* - * This is an EtherPeek (or TokenPeek?) file. + * This is an EtherPeek (or TokenPeek or AiroPeek?) file. * * At this point we have recognised the file type and have populated * the whole ep_hdr structure in host byte order. diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 253eda2159..e77644057c 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -1,6 +1,6 @@ /* wtap.c * - * $Id: wtap.c,v 1.59 2002/01/29 08:44:53 guy Exp $ + * $Id: wtap.c,v 1.60 2002/01/29 09:45:58 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -136,6 +136,9 @@ static const struct encap_type_info { /* WTAP_ENCAP_PFLOG */ { "OpenBSD PF Firewall logs", "pflog" }, + + /* WTAP_ENCAP_AIROPEEK */ + { "IEEE 802.11 plus AiroPeek header", "airopeek" }, }; /* Name that should be somewhat descriptive. */ diff --git a/wiretap/wtap.h b/wiretap/wtap.h index 74df2e1c70..e80d3863e0 100644 --- a/wiretap/wtap.h +++ b/wiretap/wtap.h @@ -1,6 +1,6 @@ /* wtap.h * - * $Id: wtap.h,v 1.102 2002/01/29 08:44:53 guy Exp $ + * $Id: wtap.h,v 1.103 2002/01/29 09:45:58 guy Exp $ * * Wiretap Library * Copyright (c) 1998 by Gilbert Ramirez <gram@alumni.rice.edu> @@ -102,9 +102,10 @@ #define WTAP_ENCAP_LOCALTALK 23 #define WTAP_ENCAP_PRISM_HEADER 24 #define WTAP_ENCAP_PFLOG 25 +#define WTAP_ENCAP_AIROPEEK 26 /* last WTAP_ENCAP_ value + 1 */ -#define WTAP_NUM_ENCAP_TYPES 26 +#define WTAP_NUM_ENCAP_TYPES 27 /* File types that can be read by wiretap. We support writing some many of these file types, too, so we |