diff options
| author | Gerald Combs <gerald@wireshark.org> | 2006-11-12 00:52:05 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2006-11-12 00:52:05 +0000 |
| commit | d20f77d3ec1c04b0d55827a7f7bfdb8cb8446be2 (patch) | |
| tree | 2226fe2424f5b7bd4c8d688adf6d8de67aa81bbc /wiretap | |
| parent | 14810dd30cdf982f464094229233439d493cad30 (diff) | |
Add a plain "radiotap.channel" field to the radiotap dissector.
Check for an invalid channel frequency. Pass the channel, data rate,
and quality to the 802.11 dissector, so that they show up there
as well. Clean up whitespace.
svn path=/trunk/; revision=19878
Diffstat (limited to 'wiretap')
| -rw-r--r-- | wiretap/libpcap.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/wiretap/libpcap.c b/wiretap/libpcap.c index 997b63f896..0869f81de4 100644 --- a/wiretap/libpcap.c +++ b/wiretap/libpcap.c @@ -86,7 +86,7 @@ struct mtp2_hdr { #endif /* - * The fake link-layer header of LAPD packets + * The fake link-layer header of LAPD packets */ struct lapd_sll_hdr { guint16 sll_pkttype; /* packet type */ @@ -639,7 +639,7 @@ int libpcap_open(wtap *wth, int *err, gchar **err_info) gboolean aix; int file_encap; - + /* Read in the number that should be at the start of a "libpcap" file */ errno = WTAP_ERR_CANT_READ; bytes_read = file_read(&magic, 1, sizeof magic, wth->fh); @@ -697,7 +697,7 @@ int libpcap_open(wtap *wth, int *err, gchar **err_info) case PCAP_SWAPPED_NSEC_MAGIC: /* Host that wrote it out has a byte order opposite to - ours, and was running a program using either ss990915 + ours, and was running a program using either ss990915 or ss991029 libpcap. */ byte_swapped = TRUE; modified = FALSE; @@ -1277,6 +1277,9 @@ static gboolean libpcap_read(wtap *wth, int *err, gchar **err_info, * supplies an FCS? */ wth->pseudo_header.ieee_802_11.fcs_len = -1; + wth->pseudo_header.ieee_802_11.channel = 0; + wth->pseudo_header.ieee_802_11.data_rate = 0; + wth->pseudo_header.ieee_802_11.signal_level = 0; break; case WTAP_ENCAP_IRDA: @@ -1814,7 +1817,7 @@ libpcap_read_mtp2_pseudoheader(FILE_T fh, union wtap_pseudo_header *pseudo_heade } return libpcap_get_mtp2_pseudoheader(&mtp2_hdr, pseudo_header); - + } static gboolean |