diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-09-15 06:58:41 +0000 |
|---|---|---|
| committer | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2013-09-15 06:58:41 +0000 |
| commit | cbf315b8edf05d663ac8c9b0071872fac444ebfe (patch) | |
| tree | 4b0f8a0e823718597c98662f7140749b2c3c076e /wiretap/vwr.c | |
| parent | be2ebb19348262e109e9e163d178a63db61d4e93 (diff) | |
From Tom Cook via https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=9147 Long / short guard interval not properly read from IxVeriWave vwr files
The short / long guard interval is located in a different spot than the current vwr reader looks.
svn path=/trunk/; revision=52047
Diffstat (limited to 'wiretap/vwr.c')
| -rw-r--r-- | wiretap/vwr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/wiretap/vwr.c b/wiretap/vwr.c index ae36f84e99..9a78e5d0c6 100644 --- a/wiretap/vwr.c +++ b/wiretap/vwr.c @@ -1319,18 +1319,18 @@ static int parse_s2_W_stats(wtap *wth, guint8 *rec, int rec_size, ext_rtap_field else if (plcp_type == vVW510021_W_PLCP_MIXED) { /* set the appropriate flags to indicate HT mode and CB */ radioflags |= RADIOTAP_F_CHAN_HT | ((plcp_ptr[3] & 0x80) ? RADIOTAP_F_CHAN_40MHZ : 0) | - ((plcp_ptr[6] & 0x80) ? RADIOTAP_F_CHAN_SHORTGI : 0); + ((l1p_1 & 0x40) ? 0 : RADIOTAP_F_CHAN_SHORTGI); chanflags |= CHAN_OFDM; } else if (plcp_type == vVW510021_W_PLCP_GREENFIELD) { /* set the appropriate flags to indicate HT mode and CB */ radioflags |= RADIOTAP_F_CHAN_HT | ((plcp_ptr[0] & 0x80) ? RADIOTAP_F_CHAN_40MHZ : 0) | - ((plcp_ptr[3] & 0x80) ? RADIOTAP_F_CHAN_SHORTGI : 0); + ((l1p_1 & 0x40) ? 0 : RADIOTAP_F_CHAN_SHORTGI); chanflags |= CHAN_OFDM; } else if (plcp_type == vVW510021_W_PLCP_VHT_MIXED) { guint8 SBW = l1p_2 >> 4 & 0xf; - radioflags |= RADIOTAP_F_CHAN_VHT | ((plcp_ptr[6] & 0x80) ? RADIOTAP_F_CHAN_SHORTGI : 0); + radioflags |= RADIOTAP_F_CHAN_VHT | ((l1p_1 & 0x40) ? 0 : RADIOTAP_F_CHAN_SHORTGI); chanflags |= CHAN_OFDM; if (SBW == 3) radioflags |= RADIOTAP_F_CHAN_40MHZ; |