Add "Editor modelines"; Adjust whitespace as needed.

Change-Id: Ic5a5acb0f36d3aa144edbfb1ae71097b18426db4
Reviewed-on: https://code.wireshark.org/review/6216
Reviewed-by: Bill Meier <wmeier@newsguy.com>

1 files changed, 389 insertions, 376 deletions

diff --git a/wiretap/peektagged.c b/wiretap/peektagged.c
index 8317f67c36..47e2ee7d53 100644
--- a/wiretap/peektagged.c
+++ b/wiretap/peektagged.c
@@ -72,9 +72,9 @@
  * by the raw packet data.
  */
 typedef struct peektagged_section_header {
-	gint8   section_id[4];		/* string identifying the section */
-	guint32 section_len;		/* little-endian section length */
-	guint32 section_const;		/* little-endian 0x00000200 */
+        gint8   section_id[4];          /* string identifying the section */
+        guint32 section_len;            /* little-endian section length */
+        guint32 section_const;          /* little-endian 0x00000200 */
 } peektagged_section_header_t;
 
 /*
@@ -84,34 +84,34 @@ typedef struct peektagged_section_header {
  * network adapter types, with some adapters supplying the FCS and others
  * not supplying the FCS?
  */
-#define PEEKTAGGED_NST_ETHERNET		0
-#define PEEKTAGGED_NST_802_11		1	/* 802.11 with 0's at the end */
-#define PEEKTAGGED_NST_802_11_2		2	/* 802.11 with 0's at the end */
-#define PEEKTAGGED_NST_802_11_WITH_FCS	3	/* 802.11 with FCS at the end */
+#define PEEKTAGGED_NST_ETHERNET         0
+#define PEEKTAGGED_NST_802_11           1       /* 802.11 with 0's at the end */
+#define PEEKTAGGED_NST_802_11_2         2       /* 802.11 with 0's at the end */
+#define PEEKTAGGED_NST_802_11_WITH_FCS  3       /* 802.11 with FCS at the end */
 
 /* tags for fields in packet header */
-#define TAG_PEEKTAGGED_LENGTH			0x0000
-#define TAG_PEEKTAGGED_TIMESTAMP_LOWER		0x0001
-#define TAG_PEEKTAGGED_TIMESTAMP_UPPER		0x0002
-#define TAG_PEEKTAGGED_FLAGS_AND_STATUS		0x0003	/* upper 24 bits unused? */
-#define TAG_PEEKTAGGED_CHANNEL			0x0004
-#define TAG_PEEKTAGGED_DATA_RATE_OR_MCS_INDEX	0x0005
-#define TAG_PEEKTAGGED_SIGNAL_PERC		0x0006
-#define TAG_PEEKTAGGED_SIGNAL_DBM		0x0007
-#define TAG_PEEKTAGGED_NOISE_PERC		0x0008
-#define TAG_PEEKTAGGED_NOISE_DBM		0x0009
-#define TAG_PEEKTAGGED_UNKNOWN_0x000A		0x000A
-#define TAG_PEEKTAGGED_CENTER_FREQUENCY		0x000D	/* Frequency */
-#define TAG_PEEKTAGGED_UNKNOWN_0x000E		0x000E
-#define TAG_PEEKTAGGED_UNKNOWN_0x000F		0x000F	/* 000F-0013 - dBm values? */
-#define TAG_PEEKTAGGED_UNKNOWN_0x0010		0x0010
-#define TAG_PEEKTAGGED_UNKNOWN_0x0011		0x0011
-#define TAG_PEEKTAGGED_UNKNOWN_0x0012		0x0012
-#define TAG_PEEKTAGGED_UNKNOWN_0x0013		0x0013
-#define TAG_PEEKTAGGED_UNKNOWN_0x0014		0x0014
-#define TAG_PEEKTAGGED_EXT_FLAGS		0x0015	/* Extended flags for 802.11n and beyond */
-
-#define TAG_PEEKTAGGED_SLICE_LENGTH		0xffff
+#define TAG_PEEKTAGGED_LENGTH                   0x0000
+#define TAG_PEEKTAGGED_TIMESTAMP_LOWER          0x0001
+#define TAG_PEEKTAGGED_TIMESTAMP_UPPER          0x0002
+#define TAG_PEEKTAGGED_FLAGS_AND_STATUS         0x0003  /* upper 24 bits unused? */
+#define TAG_PEEKTAGGED_CHANNEL                  0x0004
+#define TAG_PEEKTAGGED_DATA_RATE_OR_MCS_INDEX   0x0005
+#define TAG_PEEKTAGGED_SIGNAL_PERC              0x0006
+#define TAG_PEEKTAGGED_SIGNAL_DBM               0x0007
+#define TAG_PEEKTAGGED_NOISE_PERC               0x0008
+#define TAG_PEEKTAGGED_NOISE_DBM                0x0009
+#define TAG_PEEKTAGGED_UNKNOWN_0x000A           0x000A
+#define TAG_PEEKTAGGED_CENTER_FREQUENCY         0x000D  /* Frequency */
+#define TAG_PEEKTAGGED_UNKNOWN_0x000E           0x000E
+#define TAG_PEEKTAGGED_UNKNOWN_0x000F           0x000F  /* 000F-0013 - dBm values? */
+#define TAG_PEEKTAGGED_UNKNOWN_0x0010           0x0010
+#define TAG_PEEKTAGGED_UNKNOWN_0x0011           0x0011
+#define TAG_PEEKTAGGED_UNKNOWN_0x0012           0x0012
+#define TAG_PEEKTAGGED_UNKNOWN_0x0013           0x0013
+#define TAG_PEEKTAGGED_UNKNOWN_0x0014           0x0014
+#define TAG_PEEKTAGGED_EXT_FLAGS                0x0015  /* Extended flags for 802.11n and beyond */
+
+#define TAG_PEEKTAGGED_SLICE_LENGTH             0xffff
 
 /*
  * Flags.
@@ -119,18 +119,18 @@ typedef struct peektagged_section_header {
  * We're assuming here that the "remote Peek" flags from bug 9586 are
  * the same as the "Peek tagged" flags.
  */
-#define FLAGS_CONTROL_FRAME	0x01	/* Frame is a control frame */
-#define FLAGS_HAS_CRC_ERROR	0x02	/* Frame has a CRC error */
-#define FLAGS_HAS_FRAME_ERROR	0x04	/* Frame has a frame error */
+#define FLAGS_CONTROL_FRAME     0x01    /* Frame is a control frame */
+#define FLAGS_HAS_CRC_ERROR     0x02    /* Frame has a CRC error */
+#define FLAGS_HAS_FRAME_ERROR   0x04    /* Frame has a frame error */
 
 /*
  * Status.
  *
  * Is this in the next 8 bits of the "flags and status" field?
  */
-#define STATUS_PROTECTED	0x0400	/* Frame is protected (encrypted) */
-#define STATUS_DECRYPT_ERROR	0x0800	/* Error decrypting protected frame */
-#define STATUS_SHORT_PREAMBLE	0x4000	/* Short preamble */
+#define STATUS_PROTECTED        0x0400  /* Frame is protected (encrypted) */
+#define STATUS_DECRYPT_ERROR    0x0800  /* Error decrypting protected frame */
+#define STATUS_SHORT_PREAMBLE   0x4000  /* Short preamble */
 
 /*
  * Extended flags.
@@ -141,17 +141,17 @@ typedef struct peektagged_section_header {
  * use the same bits (which wouldn't be too surprising, as they
  * both come from Wildpackets).
  */
-#define EXT_FLAG_20_MHZ_LOWER			0x00000001
-#define EXT_FLAG_20_MHZ_UPPER			0x00000002
-#define EXT_FLAG_40_MHZ				0x00000004
-#define EXT_FLAGS_BANDWIDTH			0x00000007
-#define EXT_FLAG_HALF_GI			0x00000008
-#define EXT_FLAG_FULL_GI			0x00000010
-#define EXT_FLAGS_GI				0x00000018
-#define EXT_FLAG_AMPDU				0x00000020
-#define EXT_FLAG_AMSDU				0x00000040
-#define EXT_FLAG_802_11ac			0x00000080
-#define EXT_FLAG_MCS_INDEX_USED			0x00000100
+#define EXT_FLAG_20_MHZ_LOWER                   0x00000001
+#define EXT_FLAG_20_MHZ_UPPER                   0x00000002
+#define EXT_FLAG_40_MHZ                         0x00000004
+#define EXT_FLAGS_BANDWIDTH                     0x00000007
+#define EXT_FLAG_HALF_GI                        0x00000008
+#define EXT_FLAG_FULL_GI                        0x00000010
+#define EXT_FLAGS_GI                            0x00000018
+#define EXT_FLAG_AMPDU                          0x00000020
+#define EXT_FLAG_AMSDU                          0x00000040
+#define EXT_FLAG_802_11ac                       0x00000080
+#define EXT_FLAG_MCS_INDEX_USED                 0x00000100
 
 /*
  * XXX - mapping to radiotap, for fields that don't just map to wiretap
@@ -211,12 +211,12 @@ typedef struct peektagged_section_header {
 
 /* 64-bit time in nanoseconds from the (Windows FILETIME) epoch */
 typedef struct peektagged_utime {
-	guint32 upper;
-	guint32 lower;
+        guint32 upper;
+        guint32 lower;
 } peektagged_utime;
 
 typedef struct {
-	gboolean	has_fcs;
+        gboolean        has_fcs;
 } peektagged_t;
 
 static gboolean peektagged_read(wtap *wth, int *err, gchar **err_info,
@@ -225,7 +225,7 @@ static gboolean peektagged_seek_read(wtap *wth, gint64 seek_off,
     struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info);
 
 static int wtap_file_read_pattern (wtap *wth, const char *pattern, int *err,
-				gchar **err_info)
+                                gchar **err_info)
 {
     int c;
     const char *cp;
@@ -233,31 +233,31 @@ static int wtap_file_read_pattern (wtap *wth, const char *pattern, int *err,
     cp = pattern;
     while (*cp)
     {
-	c = file_getc(wth->fh);
-	if (c == EOF)
-	{
-	    *err = file_error(wth->fh, err_info);
-	    if (*err != 0 && *err != WTAP_ERR_SHORT_READ)
-		return -1;	/* error */
-	    return 0;	/* EOF */
-	}
-	if (c == *cp)
-	    cp++;
-	else
-	{
-	    if (c == pattern[0])
-		cp = &pattern[1];
-	    else
-		cp = pattern;
-	}
+        c = file_getc(wth->fh);
+        if (c == EOF)
+        {
+            *err = file_error(wth->fh, err_info);
+            if (*err != 0 && *err != WTAP_ERR_SHORT_READ)
+                return -1;      /* error */
+            return 0;   /* EOF */
+        }
+        if (c == *cp)
+            cp++;
+        else
+        {
+            if (c == pattern[0])
+                cp = &pattern[1];
+            else
+                cp = pattern;
+        }
     }
     return (*cp == '\0' ? 1 : 0);
 }
 
 
 static int wtap_file_read_till_separator (wtap *wth, char *buffer, int buflen,
-					const char *separators, int *err,
-					gchar **err_info)
+                                        const char *separators, int *err,
+                                        gchar **err_info)
 {
     int c;
     char *cp;
@@ -265,28 +265,28 @@ static int wtap_file_read_till_separator (wtap *wth, char *buffer, int buflen,
 
     for (cp = buffer, i = 0; i < buflen; i++, cp++)
     {
-	c = file_getc(wth->fh);
-	if (c == EOF)
-	{
-	    *err = file_error(wth->fh, err_info);
-	    if (*err != 0 && *err != WTAP_ERR_SHORT_READ)
-		return -1;	/* error */
-	    return 0;	/* EOF */
-	}
-	if (strchr (separators, c) != NULL)
-	{
-	    *cp = '\0';
-	    break;
-	}
-	else
-	    *cp = c;
+        c = file_getc(wth->fh);
+        if (c == EOF)
+        {
+            *err = file_error(wth->fh, err_info);
+            if (*err != 0 && *err != WTAP_ERR_SHORT_READ)
+                return -1;      /* error */
+            return 0;   /* EOF */
+        }
+        if (strchr (separators, c) != NULL)
+        {
+            *cp = '\0';
+            break;
+        }
+        else
+            *cp = c;
     }
     return i;
 }
 
 
 static int wtap_file_read_number (wtap *wth, guint32 *num, int *err,
-				gchar **err_info)
+                                gchar **err_info)
 {
     int ret;
     char str_num[12];
@@ -294,15 +294,15 @@ static int wtap_file_read_number (wtap *wth, guint32 *num, int *err,
     char *p;
 
     ret = wtap_file_read_till_separator (wth, str_num, sizeof (str_num)-1, "<",
-					 err, err_info);
+                                         err, err_info);
     if (ret == 0 || ret == -1) {
-	/* 0 means EOF, which means "not a valid Peek tagged file";
-	   -1 means error, and "err" has been set. */
-	return ret;
+        /* 0 means EOF, which means "not a valid Peek tagged file";
+           -1 means error, and "err" has been set. */
+        return ret;
     }
     value = strtoul (str_num, &p, 10);
     if (p == str_num || value > G_MAXUINT32)
-	return 0;
+        return 0;
     *num = (guint32)value;
     return 1;
 }
@@ -317,10 +317,10 @@ wtap_open_return_val peektagged_open(wtap *wth, int *err, gchar **err_info)
     guint32 mediaSubType = 0;
     int file_encap;
     static const int peektagged_encap[] = {
-	WTAP_ENCAP_ETHERNET,
-	WTAP_ENCAP_IEEE_802_11_WITH_RADIO,
-	WTAP_ENCAP_IEEE_802_11_WITH_RADIO,
-	WTAP_ENCAP_IEEE_802_11_WITH_RADIO
+        WTAP_ENCAP_ETHERNET,
+        WTAP_ENCAP_IEEE_802_11_WITH_RADIO,
+        WTAP_ENCAP_IEEE_802_11_WITH_RADIO,
+        WTAP_ENCAP_IEEE_802_11_WITH_RADIO
     };
     #define NUM_PEEKTAGGED_ENCAPS (sizeof peektagged_encap / sizeof peektagged_encap[0])
     peektagged_t *peektagged;
@@ -332,7 +332,7 @@ wtap_open_return_val peektagged_open(wtap *wth, int *err, gchar **err_info)
     }
 
     if (memcmp (ap_hdr.section_id, "\177ver", sizeof(ap_hdr.section_id)) != 0)
-	return WTAP_OPEN_NOT_MINE;	/* doesn't begin with a "\177ver" section */
+        return WTAP_OPEN_NOT_MINE;      /* doesn't begin with a "\177ver" section */
 
     /*
      * XXX - we should get the length of the "\177ver" section, check
@@ -344,26 +344,26 @@ wtap_open_return_val peektagged_open(wtap *wth, int *err, gchar **err_info)
      */
     ret = wtap_file_read_pattern (wth, "<FileVersion>", err, err_info);
     if (ret == -1)
-	return WTAP_OPEN_ERROR;
+        return WTAP_OPEN_ERROR;
     if (ret == 0) {
-	/* 0 means EOF, which means "not a valid Peek tagged file" */
-	return WTAP_OPEN_NOT_MINE;
+        /* 0 means EOF, which means "not a valid Peek tagged file" */
+        return WTAP_OPEN_NOT_MINE;
     }
     ret = wtap_file_read_number (wth, &fileVersion, err, err_info);
     if (ret == -1)
-	return WTAP_OPEN_ERROR;
+        return WTAP_OPEN_ERROR;
     if (ret == 0) {
-	/* 0 means EOF, which means "not a valid Peek tagged file" */
-	return WTAP_OPEN_NOT_MINE;
+        /* 0 means EOF, which means "not a valid Peek tagged file" */
+        return WTAP_OPEN_NOT_MINE;
     }
 
     /* If we got this far, we assume it's a Peek tagged file. */
     if (fileVersion != 9) {
-	/* We only support version 9. */
-	*err = WTAP_ERR_UNSUPPORTED;
-	*err_info = g_strdup_printf("peektagged: version %u unsupported",
-	    fileVersion);
-	return WTAP_OPEN_ERROR;
+        /* We only support version 9. */
+        *err = WTAP_ERR_UNSUPPORTED;
+        *err_info = g_strdup_printf("peektagged: version %u unsupported",
+            fileVersion);
+        return WTAP_OPEN_ERROR;
     }
 
     /*
@@ -378,58 +378,58 @@ wtap_open_return_val peektagged_open(wtap *wth, int *err, gchar **err_info)
      */
     ret = wtap_file_read_pattern (wth, "<MediaType>", err, err_info);
     if (ret == -1)
-	return WTAP_OPEN_ERROR;
+        return WTAP_OPEN_ERROR;
     if (ret == 0) {
-	*err = WTAP_ERR_BAD_FILE;
-	*err_info = g_strdup("peektagged: <MediaType> tag not found");
-	return WTAP_OPEN_ERROR;
+        *err = WTAP_ERR_BAD_FILE;
+        *err_info = g_strdup("peektagged: <MediaType> tag not found");
+        return WTAP_OPEN_ERROR;
     }
     /* XXX - this appears to be 0 in both the EtherPeek and AiroPeek
        files we've seen; should we require it to be 0? */
     ret = wtap_file_read_number (wth, &mediaType, err, err_info);
     if (ret == -1)
-	return WTAP_OPEN_ERROR;
+        return WTAP_OPEN_ERROR;
     if (ret == 0) {
-	*err = WTAP_ERR_BAD_FILE;
-	*err_info = g_strdup("peektagged: <MediaType> value not found");
-	return WTAP_OPEN_ERROR;
+        *err = WTAP_ERR_BAD_FILE;
+        *err_info = g_strdup("peektagged: <MediaType> value not found");
+        return WTAP_OPEN_ERROR;
     }
 
     ret = wtap_file_read_pattern (wth, "<MediaSubType>", err, err_info);
     if (ret == -1)
-	return WTAP_OPEN_ERROR;
+        return WTAP_OPEN_ERROR;
     if (ret == 0) {
-	*err = WTAP_ERR_BAD_FILE;
-	*err_info = g_strdup("peektagged: <MediaSubType> tag not found");
-	return WTAP_OPEN_ERROR;
+        *err = WTAP_ERR_BAD_FILE;
+        *err_info = g_strdup("peektagged: <MediaSubType> tag not found");
+        return WTAP_OPEN_ERROR;
     }
     ret = wtap_file_read_number (wth, &mediaSubType, err, err_info);
     if (ret == -1)
-	return WTAP_OPEN_ERROR;
+        return WTAP_OPEN_ERROR;
     if (ret == 0) {
-	*err = WTAP_ERR_BAD_FILE;
-	*err_info = g_strdup("peektagged: <MediaSubType> value not found");
-	return WTAP_OPEN_ERROR;
+        *err = WTAP_ERR_BAD_FILE;
+        *err_info = g_strdup("peektagged: <MediaSubType> value not found");
+        return WTAP_OPEN_ERROR;
     }
     if (mediaSubType >= NUM_PEEKTAGGED_ENCAPS
         || peektagged_encap[mediaSubType] == WTAP_ENCAP_UNKNOWN) {
-	*err = WTAP_ERR_UNSUPPORTED;
-	*err_info = g_strdup_printf("peektagged: network type %u unknown or unsupported",
-	    mediaSubType);
-	return WTAP_OPEN_ERROR;
+        *err = WTAP_ERR_UNSUPPORTED;
+        *err_info = g_strdup_printf("peektagged: network type %u unknown or unsupported",
+            mediaSubType);
+        return WTAP_OPEN_ERROR;
     }
 
     ret = wtap_file_read_pattern (wth, "pkts", err, err_info);
     if (ret == -1)
-	return WTAP_OPEN_ERROR;
+        return WTAP_OPEN_ERROR;
     if (ret == 0) {
-	*err = WTAP_ERR_SHORT_READ;
-	return WTAP_OPEN_ERROR;
+        *err = WTAP_ERR_SHORT_READ;
+        return WTAP_OPEN_ERROR;
     }
 
     /* skip 8 zero bytes */
     if (file_seek (wth->fh, 8L, SEEK_CUR, err) == -1)
-	return WTAP_OPEN_NOT_MINE;
+        return WTAP_OPEN_NOT_MINE;
 
     /*
      * This is an Peek tagged file.
@@ -449,12 +449,12 @@ wtap_open_return_val peektagged_open(wtap *wth, int *err, gchar **err_info)
     case PEEKTAGGED_NST_ETHERNET:
     case PEEKTAGGED_NST_802_11:
     case PEEKTAGGED_NST_802_11_2:
-	peektagged->has_fcs = FALSE;
-	break;
+        peektagged->has_fcs = FALSE;
+        break;
 
     case PEEKTAGGED_NST_802_11_WITH_FCS:
-	peektagged->has_fcs = TRUE;
-	break;
+        peektagged->has_fcs = TRUE;
+        break;
     }
 
     wth->snapshot_length   = 0; /* not available in header */
@@ -508,169 +508,169 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
 
     /* Extract the fields from the packet header */
     do {
-	/* Get the tag and value.
-	   XXX - this assumes all values are 4 bytes long. */
-	if (!wtap_read_bytes_or_eof(fh, tag_value, sizeof tag_value, err, err_info)) {
-	    if (*err == 0) {
-		/*
-		 * Short read if we've read something already;
-		 * just an EOF if we haven't.
-		 */
-		if (read_a_tag)
-		    *err = WTAP_ERR_SHORT_READ;
-	    }
-	    return -1;
-	}
-	read_a_tag = TRUE;
-	tag = pletoh16(&tag_value[0]);
-	switch (tag) {
-
-	case TAG_PEEKTAGGED_LENGTH:
-	    if (saw_length) {
-		*err = WTAP_ERR_BAD_FILE;
-		*err_info = g_strdup("peektagged: record has two length fields");
-		return -1;
-	    }
-	    length = pletoh32(&tag_value[2]);
-	    saw_length = TRUE;
-	    break;
-
-	case TAG_PEEKTAGGED_TIMESTAMP_LOWER:
-	    if (saw_timestamp_lower) {
-		*err = WTAP_ERR_BAD_FILE;
-		*err_info = g_strdup("peektagged: record has two timestamp-lower fields");
-		return -1;
-	    }
-	    timestamp.lower = pletoh32(&tag_value[2]);
-	    saw_timestamp_lower = TRUE;
-	    break;
-
-	case TAG_PEEKTAGGED_TIMESTAMP_UPPER:
-	    if (saw_timestamp_upper) {
-		*err = WTAP_ERR_BAD_FILE;
-		*err_info = g_strdup("peektagged: record has two timestamp-upper fields");
-		return -1;
-	    }
-	    timestamp.upper = pletoh32(&tag_value[2]);
-	    saw_timestamp_upper = TRUE;
-	    break;
-
-	case TAG_PEEKTAGGED_FLAGS_AND_STATUS:
-	    /* XXX - not used yet */
-	    break;
-
-	case TAG_PEEKTAGGED_CHANNEL:
-	    ieee_802_11.presence_flags |= PHDR_802_11_HAS_CHANNEL;
-	    ieee_802_11.channel = pletoh32(&tag_value[2]);
-	    break;
-
-	case TAG_PEEKTAGGED_DATA_RATE_OR_MCS_INDEX:
-	    data_rate_or_mcs_index = pletoh32(&tag_value[2]);
-	    saw_data_rate_or_mcs_index = TRUE;
-	    break;
-
-	case TAG_PEEKTAGGED_SIGNAL_PERC:
-	    ieee_802_11.presence_flags |= PHDR_802_11_HAS_SIGNAL_PERCENT;
-	    ieee_802_11.signal_percent = pletoh32(&tag_value[2]);
-	    break;
-
-	case TAG_PEEKTAGGED_SIGNAL_DBM:
-	    ieee_802_11.presence_flags |= PHDR_802_11_HAS_SIGNAL_DBM;
-	    ieee_802_11.signal_dbm = pletoh32(&tag_value[2]);
-	    break;
-
-	case TAG_PEEKTAGGED_NOISE_PERC:
-	    ieee_802_11.presence_flags |= PHDR_802_11_HAS_NOISE_PERCENT;
-	    ieee_802_11.noise_percent = pletoh32(&tag_value[2]);
-	    break;
-
-	case TAG_PEEKTAGGED_NOISE_DBM:
-	    ieee_802_11.presence_flags |= PHDR_802_11_HAS_NOISE_DBM;
-	    ieee_802_11.noise_dbm = pletoh32(&tag_value[2]);
-	    break;
-
-	case TAG_PEEKTAGGED_UNKNOWN_0x000A:
-	    /* XXX - seen in an OmniPeek 802.11n capture; value unknown */
-	    break;
-
-	case TAG_PEEKTAGGED_CENTER_FREQUENCY:
-	    /* XXX - also seen in an EtherPeek capture; value unknown */
-	    ieee_802_11.presence_flags |= PHDR_802_11_HAS_FREQUENCY;
-	    ieee_802_11.frequency = pletoh32(&tag_value[2]);
-	    break;
-
-	case TAG_PEEKTAGGED_UNKNOWN_0x000E:
-	    /* XXX - seen in an AiroPeek/OmniPeek capture; value unknown */
-	    break;
-
-	case TAG_PEEKTAGGED_UNKNOWN_0x000F:
-	    /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
-	    break;
-
-	case TAG_PEEKTAGGED_UNKNOWN_0x0010:
-	    /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
-	    break;
-
-	case TAG_PEEKTAGGED_UNKNOWN_0x0011:
-	    /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
-	    break;
-
-	case TAG_PEEKTAGGED_UNKNOWN_0x0012:
-	    /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
-	    break;
-
-	case TAG_PEEKTAGGED_UNKNOWN_0x0013:
-	    /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
-	    break;
-
-	case TAG_PEEKTAGGED_UNKNOWN_0x0014:
-	    /* XXX - seen in an AiroPeek/OmniPeek capture; value unknown */
-	    break;
-
-	case TAG_PEEKTAGGED_EXT_FLAGS:
-	    ext_flags = pletoh32(&tag_value[2]);
-	    break;
-
-	case TAG_PEEKTAGGED_SLICE_LENGTH:
-	    sliceLength = pletoh32(&tag_value[2]);
-	    break;
-
-	default:
-	    break;
+        /* Get the tag and value.
+           XXX - this assumes all values are 4 bytes long. */
+        if (!wtap_read_bytes_or_eof(fh, tag_value, sizeof tag_value, err, err_info)) {
+            if (*err == 0) {
+                /*
+                 * Short read if we've read something already;
+                 * just an EOF if we haven't.
+                 */
+                if (read_a_tag)
+                    *err = WTAP_ERR_SHORT_READ;
+            }
+            return -1;
+        }
+        read_a_tag = TRUE;
+        tag = pletoh16(&tag_value[0]);
+        switch (tag) {
+
+        case TAG_PEEKTAGGED_LENGTH:
+            if (saw_length) {
+                *err = WTAP_ERR_BAD_FILE;
+                *err_info = g_strdup("peektagged: record has two length fields");
+                return -1;
+            }
+            length = pletoh32(&tag_value[2]);
+            saw_length = TRUE;
+            break;
+
+        case TAG_PEEKTAGGED_TIMESTAMP_LOWER:
+            if (saw_timestamp_lower) {
+                *err = WTAP_ERR_BAD_FILE;
+                *err_info = g_strdup("peektagged: record has two timestamp-lower fields");
+                return -1;
+            }
+            timestamp.lower = pletoh32(&tag_value[2]);
+            saw_timestamp_lower = TRUE;
+            break;
+
+        case TAG_PEEKTAGGED_TIMESTAMP_UPPER:
+            if (saw_timestamp_upper) {
+                *err = WTAP_ERR_BAD_FILE;
+                *err_info = g_strdup("peektagged: record has two timestamp-upper fields");
+                return -1;
+            }
+            timestamp.upper = pletoh32(&tag_value[2]);
+            saw_timestamp_upper = TRUE;
+            break;
+
+        case TAG_PEEKTAGGED_FLAGS_AND_STATUS:
+            /* XXX - not used yet */
+            break;
+
+        case TAG_PEEKTAGGED_CHANNEL:
+            ieee_802_11.presence_flags |= PHDR_802_11_HAS_CHANNEL;
+            ieee_802_11.channel = pletoh32(&tag_value[2]);
+            break;
+
+        case TAG_PEEKTAGGED_DATA_RATE_OR_MCS_INDEX:
+            data_rate_or_mcs_index = pletoh32(&tag_value[2]);
+            saw_data_rate_or_mcs_index = TRUE;
+            break;
+
+        case TAG_PEEKTAGGED_SIGNAL_PERC:
+            ieee_802_11.presence_flags |= PHDR_802_11_HAS_SIGNAL_PERCENT;
+            ieee_802_11.signal_percent = pletoh32(&tag_value[2]);
+            break;
+
+        case TAG_PEEKTAGGED_SIGNAL_DBM:
+            ieee_802_11.presence_flags |= PHDR_802_11_HAS_SIGNAL_DBM;
+            ieee_802_11.signal_dbm = pletoh32(&tag_value[2]);
+            break;
+
+        case TAG_PEEKTAGGED_NOISE_PERC:
+            ieee_802_11.presence_flags |= PHDR_802_11_HAS_NOISE_PERCENT;
+            ieee_802_11.noise_percent = pletoh32(&tag_value[2]);
+            break;
+
+        case TAG_PEEKTAGGED_NOISE_DBM:
+            ieee_802_11.presence_flags |= PHDR_802_11_HAS_NOISE_DBM;
+            ieee_802_11.noise_dbm = pletoh32(&tag_value[2]);
+            break;
+
+        case TAG_PEEKTAGGED_UNKNOWN_0x000A:
+            /* XXX - seen in an OmniPeek 802.11n capture; value unknown */
+            break;
+
+        case TAG_PEEKTAGGED_CENTER_FREQUENCY:
+            /* XXX - also seen in an EtherPeek capture; value unknown */
+            ieee_802_11.presence_flags |= PHDR_802_11_HAS_FREQUENCY;
+            ieee_802_11.frequency = pletoh32(&tag_value[2]);
+            break;
+
+        case TAG_PEEKTAGGED_UNKNOWN_0x000E:
+            /* XXX - seen in an AiroPeek/OmniPeek capture; value unknown */
+            break;
+
+        case TAG_PEEKTAGGED_UNKNOWN_0x000F:
+            /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
+            break;
+
+        case TAG_PEEKTAGGED_UNKNOWN_0x0010:
+            /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
+            break;
+
+        case TAG_PEEKTAGGED_UNKNOWN_0x0011:
+            /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
+            break;
+
+        case TAG_PEEKTAGGED_UNKNOWN_0x0012:
+            /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
+            break;
+
+        case TAG_PEEKTAGGED_UNKNOWN_0x0013:
+            /* XXX - seen in an AiroPeek/OmniPeek capture; dBm value? */
+            break;
+
+        case TAG_PEEKTAGGED_UNKNOWN_0x0014:
+            /* XXX - seen in an AiroPeek/OmniPeek capture; value unknown */
+            break;
+
+        case TAG_PEEKTAGGED_EXT_FLAGS:
+            ext_flags = pletoh32(&tag_value[2]);
+            break;
+
+        case TAG_PEEKTAGGED_SLICE_LENGTH:
+            sliceLength = pletoh32(&tag_value[2]);
+            break;
+
+        default:
+            break;
         }
-    } while (tag != TAG_PEEKTAGGED_SLICE_LENGTH);	/* last tag */
+    } while (tag != TAG_PEEKTAGGED_SLICE_LENGTH);       /* last tag */
 
     if (!saw_length) {
-	*err = WTAP_ERR_BAD_FILE;
-	*err_info = g_strdup("peektagged: record has no length field");
-	return -1;
+        *err = WTAP_ERR_BAD_FILE;
+        *err_info = g_strdup("peektagged: record has no length field");
+        return -1;
     }
     if (!saw_timestamp_lower) {
-	*err = WTAP_ERR_BAD_FILE;
-	*err_info = g_strdup("peektagged: record has no timestamp-lower field");
-	return -1;
+        *err = WTAP_ERR_BAD_FILE;
+        *err_info = g_strdup("peektagged: record has no timestamp-lower field");
+        return -1;
     }
     if (!saw_timestamp_upper) {
-	*err = WTAP_ERR_BAD_FILE;
-	*err_info = g_strdup("peektagged: record has no timestamp-upper field");
-	return -1;
+        *err = WTAP_ERR_BAD_FILE;
+        *err_info = g_strdup("peektagged: record has no timestamp-upper field");
+        return -1;
     }
 
     /*
      * If sliceLength is 0, force it to be the actual length of the packet.
      */
     if (sliceLength == 0)
-	sliceLength = length;
+        sliceLength = length;
 
     if (sliceLength > WTAP_MAX_PACKET_SIZE) {
-	/*
-	 * Probably a corrupt capture file; don't blow up trying
-	 * to allocate space for an immensely-large packet.
-	 */
-	*err = WTAP_ERR_BAD_FILE;
-	*err_info = g_strdup_printf("peektagged: File has %u-byte packet, bigger than maximum of %u",
-	    sliceLength, WTAP_MAX_PACKET_SIZE);
-	return -1;
+        /*
+         * Probably a corrupt capture file; don't blow up trying
+         * to allocate space for an immensely-large packet.
+         */
+        *err = WTAP_ERR_BAD_FILE;
+        *err_info = g_strdup_printf("peektagged: File has %u-byte packet, bigger than maximum of %u",
+            sliceLength, WTAP_MAX_PACKET_SIZE);
+        return -1;
     }
 
     phdr->rec_type = REC_TYPE_PACKET;
@@ -680,7 +680,7 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
 
     /* calculate and fill in packet time stamp */
     t =  (double) timestamp.lower +
-	 (double) timestamp.upper * 4294967296.0;
+         (double) timestamp.upper * 4294967296.0;
     t *= 1.0e-9;
     t -= TIME_FIXUP_CONSTANT;
     phdr->ts.secs  = (time_t) t;
@@ -689,96 +689,96 @@ peektagged_read_packet(wtap *wth, FILE_T fh, struct wtap_pkthdr *phdr,
     switch (wth->file_encap) {
 
     case WTAP_ENCAP_IEEE_802_11_WITH_RADIO:
-	if (saw_data_rate_or_mcs_index) {
-	    if (ext_flags & EXT_FLAG_MCS_INDEX_USED) {
-		/* It's an MCS index. */
-		ieee_802_11.presence_flags |= PHDR_802_11_HAS_MCS_INDEX;
-		ieee_802_11.mcs_index = data_rate_or_mcs_index;
-
-		/*
-		 * Fill in other 802.11n information.
-		 */
-		switch (ext_flags & EXT_FLAGS_BANDWIDTH) {
-
-		case 0:
-		    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
-		    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_MHZ;
-		    break;
-
-		case EXT_FLAG_20_MHZ_LOWER:
-		    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
-		    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_20L;
-		    break;
-
-		case EXT_FLAG_20_MHZ_UPPER:
-		    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
-		    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_20U;
-		    break;
-
-		case EXT_FLAG_40_MHZ:
-		    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
-		    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_40_MHZ;
-		    break;
-
-		default:
-		    /* Mutually exclusive flags set */
-		    break;
-		}
-
-		switch (ext_flags & EXT_FLAGS_GI) {
-
-		case EXT_FLAG_HALF_GI:
-		    ieee_802_11.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
-		    ieee_802_11.short_gi = 1;
-		    break;
-
-		case EXT_FLAG_FULL_GI:
-		    ieee_802_11.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
-		    ieee_802_11.short_gi = 0;
-		    break;
-
-		default:
-		    /* Mutually exclusive flags set */
-		    break;
-		}
-	    } else {
-		/* It's a data rate */
-		ieee_802_11.presence_flags |= PHDR_802_11_HAS_DATA_RATE;
-		ieee_802_11.data_rate = data_rate_or_mcs_index;
-	    }
-	}
-	phdr->pseudo_header.ieee_802_11 = ieee_802_11;
-	if (peektagged->has_fcs)
-	    phdr->pseudo_header.ieee_802_11.fcs_len = 4;
-	else {
-	    if (phdr->len < 4 || phdr->caplen < 4) {
-		*err = WTAP_ERR_BAD_FILE;
-		*err_info = g_strdup_printf("peektagged: 802.11 packet has length < 4");
-		return FALSE;
-	    }
-	    phdr->pseudo_header.ieee_802_11.fcs_len = 0;
-	    phdr->len -= 4;
-	    phdr->caplen -= 4;
-	    skip_len = 4;
-	}
-	phdr->pseudo_header.ieee_802_11.decrypted = FALSE;
-	break;
+        if (saw_data_rate_or_mcs_index) {
+            if (ext_flags & EXT_FLAG_MCS_INDEX_USED) {
+                /* It's an MCS index. */
+                ieee_802_11.presence_flags |= PHDR_802_11_HAS_MCS_INDEX;
+                ieee_802_11.mcs_index = data_rate_or_mcs_index;
+
+                /*
+                 * Fill in other 802.11n information.
+                 */
+                switch (ext_flags & EXT_FLAGS_BANDWIDTH) {
+
+                case 0:
+                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
+                    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_MHZ;
+                    break;
+
+                case EXT_FLAG_20_MHZ_LOWER:
+                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
+                    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_20L;
+                    break;
+
+                case EXT_FLAG_20_MHZ_UPPER:
+                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
+                    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_20_20U;
+                    break;
+
+                case EXT_FLAG_40_MHZ:
+                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_BANDWIDTH;
+                    ieee_802_11.bandwidth = PHDR_802_11_BANDWIDTH_40_MHZ;
+                    break;
+
+                default:
+                    /* Mutually exclusive flags set */
+                    break;
+                }
+
+                switch (ext_flags & EXT_FLAGS_GI) {
+
+                case EXT_FLAG_HALF_GI:
+                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
+                    ieee_802_11.short_gi = 1;
+                    break;
+
+                case EXT_FLAG_FULL_GI:
+                    ieee_802_11.presence_flags |= PHDR_802_11_HAS_SHORT_GI;
+                    ieee_802_11.short_gi = 0;
+                    break;
+
+                default:
+                    /* Mutually exclusive flags set */
+                    break;
+                }
+            } else {
+                /* It's a data rate */
+                ieee_802_11.presence_flags |= PHDR_802_11_HAS_DATA_RATE;
+                ieee_802_11.data_rate = data_rate_or_mcs_index;
+            }
+        }
+        phdr->pseudo_header.ieee_802_11 = ieee_802_11;
+        if (peektagged->has_fcs)
+            phdr->pseudo_header.ieee_802_11.fcs_len = 4;
+        else {
+            if (phdr->len < 4 || phdr->caplen < 4) {
+                *err = WTAP_ERR_BAD_FILE;
+                *err_info = g_strdup_printf("peektagged: 802.11 packet has length < 4");
+                return FALSE;
+            }
+            phdr->pseudo_header.ieee_802_11.fcs_len = 0;
+            phdr->len -= 4;
+            phdr->caplen -= 4;
+            skip_len = 4;
+        }
+        phdr->pseudo_header.ieee_802_11.decrypted = FALSE;
+        break;
 
     case WTAP_ENCAP_ETHERNET:
-	/*
-	 * The last 4 bytes appear to be 0 in the captures I've seen;
-	 * are there any captures where it's an FCS?
-	 */
-	if (phdr->len < 4 || phdr->caplen < 4) {
-	    *err = WTAP_ERR_BAD_FILE;
-	    *err_info = g_strdup_printf("peektagged: Ethernet packet has length < 4");
-	    return FALSE;
-	}
-	phdr->pseudo_header.eth.fcs_len = 0;
-	phdr->len -= 4;
-	phdr->caplen -= 4;
-	skip_len = 4;
-	break;
+        /*
+         * The last 4 bytes appear to be 0 in the captures I've seen;
+         * are there any captures where it's an FCS?
+         */
+        if (phdr->len < 4 || phdr->caplen < 4) {
+            *err = WTAP_ERR_BAD_FILE;
+            *err_info = g_strdup_printf("peektagged: Ethernet packet has length < 4");
+            return FALSE;
+        }
+        phdr->pseudo_header.eth.fcs_len = 0;
+        phdr->len -= 4;
+        phdr->caplen -= 4;
+        skip_len = 4;
+        break;
     }
 
     /* Read the packet data. */
@@ -799,12 +799,12 @@ static gboolean peektagged_read(wtap *wth, int *err, gchar **err_info,
     skip_len = peektagged_read_packet(wth, wth->fh, &wth->phdr,
                                       wth->frame_buffer, err, err_info);
     if (skip_len == -1)
-	return FALSE;
+        return FALSE;
 
     if (skip_len != 0) {
-	/* Skip extra junk at the end of the packet data. */
+        /* Skip extra junk at the end of the packet data. */
         if (!file_skip(wth->fh, skip_len, err))
-	    return FALSE;
+            return FALSE;
     }
 
     return TRUE;
@@ -815,13 +815,26 @@ peektagged_seek_read(wtap *wth, gint64 seek_off,
     struct wtap_pkthdr *phdr, Buffer *buf, int *err, gchar **err_info)
 {
     if (file_seek(wth->random_fh, seek_off, SEEK_SET, err) == -1)
-	return FALSE;
+        return FALSE;
 
     /* Read the packet. */
     if (peektagged_read_packet(wth, wth->random_fh, phdr, buf, err, err_info) == -1) {
         if (*err == 0)
             *err = WTAP_ERR_SHORT_READ;
-	return FALSE;
+        return FALSE;
     }
     return TRUE;
 }
+
+/*
+ * Editor modelines  -  http://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 4
+ * tab-width: 8
+ * indent-tabs-mode: nil
+ * End:
+ *
+ * vi: set shiftwidth=4 tabstop=8 expandtab:
+ * :indentSize=4:tabSize=8:noTabs=true:
+ */