diff options
| author | Guy Harris <guy@alum.mit.edu> | 2010-07-30 02:30:50 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2010-07-30 02:30:50 +0000 |
| commit | 11b9ed0426b00dc822d4ab755821f7029b2d821d (patch) | |
| tree | d02aa5f227d6806ed9d8c668ce15087b89566796 /wiretap/wtap.c | |
| parent | 9a7e8cdddfab04ae270843ce3e310289b3428ad6 (diff) | |
Define WTAP_ENCAP_IEEE802_15_4_NOFCS, for use in file formats that don't
include the FCS, and use it for the Daintree SNA file format. While
we're at it, explicitly check to make sure the purported packet length
gives it at least one byte of packet data, and fix some print formats to
use %u for unsigned values.
svn path=/trunk/; revision=33678
Diffstat (limited to 'wiretap/wtap.c')
| -rw-r--r-- | wiretap/wtap.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/wiretap/wtap.c b/wiretap/wtap.c index 1ac731a123..6ce9f32d16 100644 --- a/wiretap/wtap.c +++ b/wiretap/wtap.c @@ -473,7 +473,10 @@ static struct encap_type_info encap_table_base[] = { { "SocketCAN", "socketcan" }, /* WTAP_ENCAP_IEEE802_11_NETMON_RADIO */ - { "IEEE 802.11 plus Network Monitor radio header", "ieee-802-11-netmon" } + { "IEEE 802.11 plus Network Monitor radio header", "ieee-802-11-netmon" }, + + /* WTAP_ENCAP_IEEE802_15_4_NOFCS */ + { "IEEE 802.15.4 Wireless PAN with FCS not present", "wpan-nofcs" }, }; gint wtap_num_encap_types = sizeof(encap_table_base) / sizeof(struct encap_type_info); |