Use ENC_ values in proto_tree_add_item() calls.

Get rid of the code that attempts to deal with the FCS; if the
link-layer dissector hasn't removed the FCS, either:

	1) the link-layer dissector is buggy and should be fixed;

or

	2) the link-layer dissector doesn't know whether there's an FCS
	   and you have to tell it by setting a preference (and if there
	   is no such preference, one needs to be added).

The code in question was causing errors when the link-layer dissector
was removing the FCS when it's known to be present, as it should do.

Get rid of 4-space tabs in favor of spaces.

svn path=/trunk/; revision=39158

1 files changed, 347 insertions, 345 deletions

diff --git a/plugins/profinet/packet-pn-rt.c b/plugins/profinet/packet-pn-rt.c
index f189296619..92c427d4db 100644
--- a/plugins/profinet/packet-pn-rt.c
+++ b/plugins/profinet/packet-pn-rt.c
@@ -102,20 +102,20 @@ static heur_dissector_list_t heur_subdissector_list;
 
 
 static const value_string pn_rt_position_control[] = {
-	{ 0x00, "CRC16 and CycleCounter shall not be checked" },
-	{ 0x80, "CRC16 and CycleCounter valid" },
+    { 0x00, "CRC16 and CycleCounter shall not be checked" },
+    { 0x80, "CRC16 and CycleCounter valid" },
     { 0, NULL }
 };
 
 static const value_string pn_rt_frag_status_error[] = {
-	{ 0x00, "No error" },
-	{ 0x01, "An error occured, all earlier fragments shall be dropped" },
+    { 0x00, "No error" },
+    { 0x01, "An error occured, all earlier fragments shall be dropped" },
     { 0, NULL }
 };
 
 static const value_string pn_rt_frag_status_more_follows[] = {
-	{ 0x00, "Last fragment" },
-	{ 0x01, "More fragments follow" },
+    { 0x00, "Last fragment" },
+    { 0x01, "More fragments follow" },
     { 0, NULL }
 };
 
@@ -128,13 +128,13 @@ dissect_DataStatus(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 u8DataSta
     proto_tree *sub_tree;
 
     sub_item = proto_tree_add_uint_format(tree, hf_pn_rt_data_status, 
-	    tvb, offset, 1, u8DataStatus,
-	    "DataStatus: 0x%02x (Frame: %s and %s, Provider: %s and %s)", 
-	    u8DataStatus, 
-	    (u8DataStatus & 0x04) ? "Valid" : "Invalid",
-	    (u8DataStatus & 0x01) ? "Primary" : "Backup",
-	    (u8DataStatus & 0x20) ? "Ok" : "Problem",
-	    (u8DataStatus & 0x10) ? "Run" : "Stop");
+        tvb, offset, 1, u8DataStatus,
+        "DataStatus: 0x%02x (Frame: %s and %s, Provider: %s and %s)", 
+        u8DataStatus, 
+        (u8DataStatus & 0x04) ? "Valid" : "Invalid",
+        (u8DataStatus & 0x01) ? "Primary" : "Backup",
+        (u8DataStatus & 0x20) ? "Ok" : "Problem",
+        (u8DataStatus & 0x10) ? "Run" : "Stop");
     sub_tree = proto_item_add_subtree(sub_item, ett_pn_rt_data_status);
     proto_tree_add_uint(sub_tree, hf_pn_rt_data_status_ignore, tvb, offset, 1, u8DataStatus);
     proto_tree_add_uint(sub_tree, hf_pn_rt_data_status_subframe_sender_mode, tvb, offset, 1, u8DataStatus);
@@ -150,92 +150,92 @@ dissect_DataStatus(tvbuff_t *tvb, int offset, proto_tree *tree, guint8 u8DataSta
 /* possibly dissect a CSF_SDU related PN-RT packet */
 static gboolean
 dissect_CSF_SDU_heur(tvbuff_t *tvb,
-	packet_info *pinfo, proto_tree *tree)
+    packet_info *pinfo, proto_tree *tree)
 {
-	guint16 u16FrameID;
-	guint16 u16SFCRC16;
-	guint8  u8SFPosition;
-	guint8  u8SFDataLength = 255;
-	guint8  u8SFCycleCounter;
-	guint8  u8SFDataStatus;
-	int offset = 0;
-	guint32 u32SubStart;
+    guint16 u16FrameID;
+    guint16 u16SFCRC16;
+    guint8  u8SFPosition;
+    guint8  u8SFDataLength = 255;
+    guint8  u8SFCycleCounter;
+    guint8  u8SFDataStatus;
+    int offset = 0;
+    guint32 u32SubStart;
     proto_item *sub_item;
     proto_tree *sub_tree;
     proto_item *item;
-	guint16 crc;
+    guint16 crc;
 
 
     /* the sub tvb will NOT contain the frame_id here! */
     u16FrameID = GPOINTER_TO_UINT(pinfo->private_data);
 
-	/* possible FrameID ranges for DFP */
-	if ((u16FrameID >= 0x0500 && u16FrameID < 0x05ff) ||
-	    (u16FrameID >= 0x0600 && u16FrameID < 0x07ff) ||
-	    (u16FrameID >= 0x4800 && u16FrameID < 0x4fff) ||
-	    (u16FrameID >= 0x5800 && u16FrameID < 0x5fff) ||
-	    (u16FrameID >= 0x6800 && u16FrameID < 0x6fff) ||
-	    (u16FrameID >= 0x7800 && u16FrameID < 0x7fff)) {
-		/* can't check this CRC, as the checked data bytes are not available */
-		u16SFCRC16 = tvb_get_letohs(tvb, offset);
-		proto_tree_add_uint(tree, hf_pn_rt_sf_crc16, tvb, offset, 2, u16SFCRC16);
-		offset += 2;
-
-		while(1) {
-			sub_item = proto_tree_add_item(tree, hf_pn_rt_sf, tvb, offset, 0, FALSE);
-			sub_tree = proto_item_add_subtree(sub_item, ett_pn_rt_sf);
-			u32SubStart = offset;
-
-			u8SFPosition = tvb_get_guint8(tvb, offset);
-			proto_tree_add_uint(sub_tree, hf_pn_rt_sf_position_control, tvb, offset, 1, u8SFPosition);
-			proto_tree_add_uint(sub_tree, hf_pn_rt_sf_position, tvb, offset, 1, u8SFPosition);
-			offset += 1;
-
-			u8SFDataLength = tvb_get_guint8(tvb, offset);
-			proto_tree_add_uint(sub_tree, hf_pn_rt_sf_data_length, tvb, offset, 1, u8SFDataLength);
-			offset += 1;
-
-			if(u8SFDataLength == 0) {
-				proto_item_append_text(sub_item, ": Pos:%u, Length:%u", u8SFPosition, u8SFDataLength);
-				proto_item_set_len(sub_item, offset - u32SubStart);
-				break;
-			}
-
-			u8SFCycleCounter = tvb_get_guint8(tvb, offset);
-			proto_tree_add_uint(sub_tree, hf_pn_rt_sf_cycle_counter, tvb, offset, 1, u8SFCycleCounter);
-			offset += 1;
-
-			u8SFDataStatus = tvb_get_guint8(tvb, offset);
-			dissect_DataStatus(tvb, offset, sub_tree, u8SFDataStatus);
-			offset += 1;
-
-			offset = dissect_pn_user_data(tvb, offset, pinfo, sub_tree, u8SFDataLength, "DataItem");
-
-			u16SFCRC16 = tvb_get_letohs(tvb, offset);
-			item = proto_tree_add_uint(sub_tree, hf_pn_rt_sf_crc16, tvb, offset, 2, u16SFCRC16);
-
-			if(u8SFPosition & 0x80) {
-				crc = crc16_plain_tvb_offset(tvb, u32SubStart, offset-u32SubStart);
-				if(crc != u16SFCRC16) {
-					proto_item_append_text(item, " [Preliminary check: incorrect, should be: %u]", crc);
-					expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_ERROR, "Bad checksum");
-				} else {
-					proto_item_append_text(item, " [Preliminary check: Correct]");
-				}
-			} else {
-				proto_item_append_text(item, " [No preliminary check, Control bit not set]");
-			}
-			offset += 2;
-
-			proto_item_append_text(sub_item, ": Pos:%u, Length:%u, Cycle:%u, Status: 0x%02x (%s,%s,%s,%s)",
-				u8SFPosition, u8SFDataLength, u8SFCycleCounter, u8SFDataStatus,
-				(u8SFDataStatus & 0x04) ? "Valid" : "Invalid",
-				(u8SFDataStatus & 0x01) ? "Primary" : "Backup",
-				(u8SFDataStatus & 0x20) ? "Ok" : "Problem",
-				(u8SFDataStatus & 0x10) ? "Run" : "Stop");
-
-			proto_item_set_len(sub_item, offset - u32SubStart);
-		}
+    /* possible FrameID ranges for DFP */
+    if ((u16FrameID >= 0x0500 && u16FrameID < 0x05ff) ||
+        (u16FrameID >= 0x0600 && u16FrameID < 0x07ff) ||
+        (u16FrameID >= 0x4800 && u16FrameID < 0x4fff) ||
+        (u16FrameID >= 0x5800 && u16FrameID < 0x5fff) ||
+        (u16FrameID >= 0x6800 && u16FrameID < 0x6fff) ||
+        (u16FrameID >= 0x7800 && u16FrameID < 0x7fff)) {
+        /* can't check this CRC, as the checked data bytes are not available */
+        u16SFCRC16 = tvb_get_letohs(tvb, offset);
+        proto_tree_add_uint(tree, hf_pn_rt_sf_crc16, tvb, offset, 2, u16SFCRC16);
+        offset += 2;
+
+        while(1) {
+            sub_item = proto_tree_add_item(tree, hf_pn_rt_sf, tvb, offset, 0, ENC_BIG_ENDIAN);
+            sub_tree = proto_item_add_subtree(sub_item, ett_pn_rt_sf);
+            u32SubStart = offset;
+
+            u8SFPosition = tvb_get_guint8(tvb, offset);
+            proto_tree_add_uint(sub_tree, hf_pn_rt_sf_position_control, tvb, offset, 1, u8SFPosition);
+            proto_tree_add_uint(sub_tree, hf_pn_rt_sf_position, tvb, offset, 1, u8SFPosition);
+            offset += 1;
+
+            u8SFDataLength = tvb_get_guint8(tvb, offset);
+            proto_tree_add_uint(sub_tree, hf_pn_rt_sf_data_length, tvb, offset, 1, u8SFDataLength);
+            offset += 1;
+
+            if(u8SFDataLength == 0) {
+                proto_item_append_text(sub_item, ": Pos:%u, Length:%u", u8SFPosition, u8SFDataLength);
+                proto_item_set_len(sub_item, offset - u32SubStart);
+                break;
+            }
+
+            u8SFCycleCounter = tvb_get_guint8(tvb, offset);
+            proto_tree_add_uint(sub_tree, hf_pn_rt_sf_cycle_counter, tvb, offset, 1, u8SFCycleCounter);
+            offset += 1;
+
+            u8SFDataStatus = tvb_get_guint8(tvb, offset);
+            dissect_DataStatus(tvb, offset, sub_tree, u8SFDataStatus);
+            offset += 1;
+
+            offset = dissect_pn_user_data(tvb, offset, pinfo, sub_tree, u8SFDataLength, "DataItem");
+
+            u16SFCRC16 = tvb_get_letohs(tvb, offset);
+            item = proto_tree_add_uint(sub_tree, hf_pn_rt_sf_crc16, tvb, offset, 2, u16SFCRC16);
+
+            if(u8SFPosition & 0x80) {
+                crc = crc16_plain_tvb_offset(tvb, u32SubStart, offset-u32SubStart);
+                if(crc != u16SFCRC16) {
+                    proto_item_append_text(item, " [Preliminary check: incorrect, should be: %u]", crc);
+                    expert_add_info_format(pinfo, item, PI_CHECKSUM, PI_ERROR, "Bad checksum");
+                } else {
+                    proto_item_append_text(item, " [Preliminary check: Correct]");
+                }
+            } else {
+                proto_item_append_text(item, " [No preliminary check, Control bit not set]");
+            }
+            offset += 2;
+
+            proto_item_append_text(sub_item, ": Pos:%u, Length:%u, Cycle:%u, Status: 0x%02x (%s,%s,%s,%s)",
+                u8SFPosition, u8SFDataLength, u8SFCycleCounter, u8SFDataStatus,
+                (u8SFDataStatus & 0x04) ? "Valid" : "Invalid",
+                (u8SFDataStatus & 0x01) ? "Primary" : "Backup",
+                (u8SFDataStatus & 0x20) ? "Ok" : "Problem",
+                (u8SFDataStatus & 0x10) ? "Run" : "Stop");
+
+            proto_item_set_len(sub_item, offset - u32SubStart);
+        }
 
         return TRUE;
     }
@@ -248,49 +248,49 @@ dissect_CSF_SDU_heur(tvbuff_t *tvb,
 /* possibly dissect a FRAG_PDU related PN-RT packet */
 static gboolean
 dissect_FRAG_PDU_heur(tvbuff_t *tvb,
-	packet_info *pinfo, proto_tree *tree)
+    packet_info *pinfo, proto_tree *tree)
 {
-	guint16 u16FrameID;
-	int offset = 0;
+    guint16 u16FrameID;
+    int offset = 0;
     proto_item *sub_item;
     proto_tree *sub_tree;
-	guint8  u8FragDataLength;
+    guint8  u8FragDataLength;
     proto_item *status_item;
     proto_tree *status_tree;
-	guint8  u8FragStatus;
+    guint8  u8FragStatus;
 
 
     /* the sub tvb will NOT contain the frame_id here! */
     u16FrameID = GPOINTER_TO_UINT(pinfo->private_data);
 
-	/* possible FrameID ranges for FRAG_PDU */
-	if (u16FrameID >= 0xFF80 && u16FrameID < 0xFF8F) {
-		sub_item = proto_tree_add_item(tree, hf_pn_rt_frag, tvb, offset, 0, FALSE);
-		sub_tree = proto_item_add_subtree(sub_item, ett_pn_rt_frag);
+    /* possible FrameID ranges for FRAG_PDU */
+    if (u16FrameID >= 0xFF80 && u16FrameID < 0xFF8F) {
+        sub_item = proto_tree_add_item(tree, hf_pn_rt_frag, tvb, offset, 0, ENC_BIG_ENDIAN);
+        sub_tree = proto_item_add_subtree(sub_item, ett_pn_rt_frag);
 
-		u8FragDataLength = tvb_get_guint8(tvb, offset);
-		proto_tree_add_uint(sub_tree, hf_pn_rt_frag_data_length, tvb, offset, 1, u8FragDataLength);
-		offset += 1;
+        u8FragDataLength = tvb_get_guint8(tvb, offset);
+        proto_tree_add_uint(sub_tree, hf_pn_rt_frag_data_length, tvb, offset, 1, u8FragDataLength);
+        offset += 1;
 
-		status_item = proto_tree_add_item(sub_tree, hf_pn_rt_frag_status, tvb, offset, 1, FALSE);
-		status_tree = proto_item_add_subtree(status_item, ett_pn_rt_frag_status);
+        status_item = proto_tree_add_item(sub_tree, hf_pn_rt_frag_status, tvb, offset, 1, ENC_BIG_ENDIAN);
+        status_tree = proto_item_add_subtree(status_item, ett_pn_rt_frag_status);
 
-		u8FragStatus = tvb_get_guint8(tvb, offset);
-		proto_tree_add_uint(status_tree, hf_pn_rt_frag_status_more_follows, tvb, offset, 1, u8FragStatus);
-		proto_tree_add_uint(status_tree, hf_pn_rt_frag_status_error, tvb, offset, 1, u8FragStatus);
-		proto_tree_add_uint(status_tree, hf_pn_rt_frag_status_fragment_number, tvb, offset, 1, u8FragStatus);
-		offset += 1;
-		proto_item_append_text(status_item, ": Number: %u, %s, %s",
-			u8FragStatus & 0x3F,
-			val_to_str( (u8FragStatus & 0x80) >> 7, pn_rt_frag_status_more_follows, "Unknown"),
-			val_to_str( (u8FragStatus & 0x40) >> 6, pn_rt_frag_status_error, "Unknown"));
+        u8FragStatus = tvb_get_guint8(tvb, offset);
+        proto_tree_add_uint(status_tree, hf_pn_rt_frag_status_more_follows, tvb, offset, 1, u8FragStatus);
+        proto_tree_add_uint(status_tree, hf_pn_rt_frag_status_error, tvb, offset, 1, u8FragStatus);
+        proto_tree_add_uint(status_tree, hf_pn_rt_frag_status_fragment_number, tvb, offset, 1, u8FragStatus);
+        offset += 1;
+        proto_item_append_text(status_item, ": Number: %u, %s, %s",
+            u8FragStatus & 0x3F,
+            val_to_str( (u8FragStatus & 0x80) >> 7, pn_rt_frag_status_more_follows, "Unknown"),
+            val_to_str( (u8FragStatus & 0x40) >> 6, pn_rt_frag_status_error, "Unknown"));
 
 
-		proto_tree_add_string_format(sub_tree, hf_pn_rt_frag_data, tvb, offset, tvb_length(tvb) - offset, "data", 
-			"FragData: %d bytes", tvb_length(tvb) - offset);
+        proto_tree_add_string_format(sub_tree, hf_pn_rt_frag_data, tvb, offset, tvb_length(tvb) - offset, "data", 
+            "FragData: %d bytes", tvb_length(tvb) - offset);
 
-		/* note: the actual defragmentation implementation is still missing here */
-		dissect_pn_undecoded(tvb, offset, pinfo, sub_tree, tvb_length(tvb) - offset);
+        /* note: the actual defragmentation implementation is still missing here */
+        dissect_pn_undecoded(tvb, offset, pinfo, sub_tree, tvb_length(tvb) - offset);
 
         return TRUE;
     }
@@ -322,24 +322,26 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
   gboolean  bCyclic;
 
 
-  /* The PN-RT protocol uses status values at the end of the Ethernet frame.
-   * Unfortunately it doesn't contain a length field in the PN-RT protocol itself,
-   * so we must depend on the tvb length. This is sometimes is a bit confusing
-   * whether the length of the tvb contains the optional FCS at the end or not
-   * therefore the following heuristic ... */
-
-  if(pinfo->fd->lnk_t == WTAP_ENCAP_IEEE_802_11_WITH_RADIO) {
-    /* 802.11: at least when using AiroPeek to capture,
-     * the 802.11 dissector already has stripped the FCS from the tvb.
-     * XXX - we might need to add other 802.11 encaps here as well */
-    tvb_len = tvb_length(tvb);
-  } else {
-	/* Ethernet: subtract (optional) FCS or trailer len
-     * (fcs_len -1 means we don't know if FCS is appended, we assume it's not) */
-    tvb_len = tvb_length(tvb) -
-	  ((pinfo->pseudo_header->eth.fcs_len != -1) ? pinfo->pseudo_header->eth.fcs_len : 0);
-  }
-  tvb_set_reported_length(tvb, tvb_len);
+  /* If the link-layer dissector for the protocol above us knows whether
+   * the packet, as handed to it, includes a link-layer FCS, what it
+   * hands to us should not include the FCS; if that's not the case,
+   * that's a bug in that dissector, and should be fixed there.
+   *
+   * If the link-layer dissector for the protocol above us doesn't know
+   * whether the packet, as handed to us, includes a link-layer FCS,
+   * there are limits as to what can be done there; the dissector
+   * ultimately needs a "yes, it has an FCS" preference setting, which
+   * both the Ethernet and 802.11 dissectors do.  If that's not the case
+   * for a dissector, that's a deficiency in that dissector, and should
+   * be fixed there.
+   *
+   * Therefore, we assume we are not handed a packet that includes an
+   * FCS.  If we are ever handed such a packet, either the link-layer
+   * dissector needs to be fixed or the link-layer dissector's preference
+   * needs to be set for your capture (even if that means adding such
+   * a preference).  This dissector (and other dissectors for protcols
+   * running atop the link layer) should not attempt to process the
+   * FCS themselves, as that will just break things. */
 
   /* Initialize variables */
   pn_rt_tree = NULL;
@@ -360,260 +362,260 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
 
     /* build some "raw" data */
-	u16FrameID = tvb_get_ntohs(tvb, 0);
+    u16FrameID = tvb_get_ntohs(tvb, 0);
     if (u16FrameID <= 0x001F) {
-        pszProtShort 	= "PN-RT";
+        pszProtShort    = "PN-RT";
         pszProtAddInfo  = "reserved, ";
         pszProtSummary  = "Real-Time";
-        pszProtComment	= "0x0000-0x001F: Reserved ID";
+        pszProtComment  = "0x0000-0x001F: Reserved ID";
         bCyclic         = FALSE;
     } else if (u16FrameID <= 0x0021) {
-        pszProtShort 	= "PN-PTCP";
+        pszProtShort    = "PN-PTCP";
         pszProtAddInfo  = "Synchronization, ";
         pszProtSummary  = "Real-Time";
-        pszProtComment	= "0x0020-0x0021: Real-Time: Sync (with follow up)";
+        pszProtComment  = "0x0020-0x0021: Real-Time: Sync (with follow up)";
         bCyclic         = FALSE;
     } else if (u16FrameID <= 0x007F) {
-        pszProtShort 	= "PN-RT";
+        pszProtShort    = "PN-RT";
         pszProtAddInfo  = "reserved, ";
         pszProtSummary  = "Real-Time";
-        pszProtComment	= "0x0022-0x007F: Reserved ID";
+        pszProtComment  = "0x0022-0x007F: Reserved ID";
         bCyclic         = FALSE;
     } else if (u16FrameID <= 0x0081) {
-        pszProtShort 	= "PN-PTCP";
+        pszProtShort    = "PN-PTCP";
         pszProtAddInfo  = "Synchronization, ";
         pszProtSummary  = "Isochronous-Real-Time";
-        pszProtComment	= "0x0080-0x0081: Real-Time: Sync (without follow up)";
+        pszProtComment  = "0x0080-0x0081: Real-Time: Sync (without follow up)";
         bCyclic         = FALSE;
     } else if (u16FrameID <= 0x00FF) {
-        pszProtShort 	= "PN-RT";
+        pszProtShort    = "PN-RT";
         pszProtAddInfo  = "reserved, ";
         pszProtSummary  = "Real-Time";
-        pszProtComment	= "0x0082-0x00FF: Reserved ID";
+        pszProtComment  = "0x0082-0x00FF: Reserved ID";
         bCyclic         = FALSE;
 
-	} else if (u16FrameID <= 0x04FF){
-        pszProtShort 	= "PN-RTC3";
+    } else if (u16FrameID <= 0x04FF){
+        pszProtShort    = "PN-RTC3";
         pszProtAddInfo  = "RTC3, ";
         pszProtSummary  = "Isochronous-Real-Time";
-        pszProtComment	= "0x0100-0x04FF: Isochronous-Real-Time(class=3): non redundant, normal";
+        pszProtComment  = "0x0100-0x04FF: Isochronous-Real-Time(class=3): non redundant, normal";
         bCyclic         = TRUE;
     } else if (u16FrameID <= 0x05FF){
-        pszProtShort 	= "PN-RTC3";
+        pszProtShort    = "PN-RTC3";
         pszProtAddInfo  = "RTC3, ";
         pszProtSummary  = "Isochronous-Real-Time";
-        pszProtComment	= "0x0500-0x05FF: Isochronous-Real-Time(class=3): non redundant, DFP";
+        pszProtComment  = "0x0500-0x05FF: Isochronous-Real-Time(class=3): non redundant, DFP";
         bCyclic         = TRUE;
     } else if (u16FrameID <= 0x07FF){
-        pszProtShort 	= "PN-RTC3";
+        pszProtShort    = "PN-RTC3";
         pszProtAddInfo  = "RTC3, ";
         pszProtSummary  = "Isochronous-Real-Time";
-        pszProtComment	= "0x0600-0x07FF: Isochronous-Real-Time(class=3): redundant, DFP";
+        pszProtComment  = "0x0600-0x07FF: Isochronous-Real-Time(class=3): redundant, DFP";
         bCyclic         = TRUE;
     } else if (u16FrameID <= 0x0FFF){
-        pszProtShort 	= "PN-RTC3";
+        pszProtShort    = "PN-RTC3";
         pszProtAddInfo  = "RTC3, ";
         pszProtSummary  = "Isochronous-Real-Time";
-        pszProtComment	= "0x0800-0x0FFF: Isochronous-Real-Time(class=3): redundant, normal";
+        pszProtComment  = "0x0800-0x0FFF: Isochronous-Real-Time(class=3): redundant, normal";
         bCyclic         = TRUE;
     } else if (u16FrameID <= 0x47FF) {
-        pszProtShort 	= "PN-RT";
+        pszProtShort    = "PN-RT";
         pszProtAddInfo  = "reserved, ";
         pszProtSummary  = "Real-Time";
-        pszProtComment	= "0x1000-0x47FF: Reserved ID";
+        pszProtComment  = "0x1000-0x47FF: Reserved ID";
         bCyclic         = FALSE;
     } else if (u16FrameID <= 0x4FFF){
-        pszProtShort 	= "PN-RTC2";
+        pszProtShort    = "PN-RTC2";
         pszProtAddInfo  = "RTC2, ";
-        pszProtSummary 	= "cyclic Real-Time";
-        pszProtComment	= "0x4800-0x4FFF: Real-Time(class=2): redundant, DFP";
+        pszProtSummary  = "cyclic Real-Time";
+        pszProtComment  = "0x4800-0x4FFF: Real-Time(class=2): redundant, DFP";
         bCyclic         = TRUE;
     } else if (u16FrameID < 0x57FF){
-        pszProtShort 	= "PN-RTC2";
+        pszProtShort    = "PN-RTC2";
         pszProtAddInfo  = "RTC2, ";
-        pszProtSummary 	= "cyclic Real-Time";
-        pszProtComment	= "0x5000-0x57FF: Real-Time(class=2): redundant, normal";
+        pszProtSummary  = "cyclic Real-Time";
+        pszProtComment  = "0x5000-0x57FF: Real-Time(class=2): redundant, normal";
         bCyclic         = TRUE;
-	} else if (u16FrameID <= 0x5FFF){
-        pszProtShort 	= "PN-RTC2";
+    } else if (u16FrameID <= 0x5FFF){
+        pszProtShort    = "PN-RTC2";
         pszProtAddInfo  = "RTC2, ";
-        pszProtSummary 	= "cyclic Real-Time";
-        pszProtComment	= "0x5800-0x5FFF: Real-Time(class=2): non redundant, DFP";
+        pszProtSummary  = "cyclic Real-Time";
+        pszProtComment  = "0x5800-0x5FFF: Real-Time(class=2): non redundant, DFP";
         bCyclic         = TRUE;
     } else if (u16FrameID <= 0x67FF){
-        pszProtShort 	= "PN-RTC2";
+        pszProtShort    = "PN-RTC2";
         pszProtAddInfo  = "RTC2, ";
-        pszProtSummary 	= "cyclic Real-Time";
-        pszProtComment	= "0x6000-0x67FF: Real-Time(class=2): non redundant, normal";
+        pszProtSummary  = "cyclic Real-Time";
+        pszProtComment  = "0x6000-0x67FF: Real-Time(class=2): non redundant, normal";
         bCyclic         = TRUE;
-	} else if (u16FrameID <= 0x6FFF){
-        pszProtShort 	= "PN-RTC2";
+    } else if (u16FrameID <= 0x6FFF){
+        pszProtShort    = "PN-RTC2";
         pszProtAddInfo  = "RTC2, ";
-        pszProtSummary 	= "cyclic Real-Time";
-        pszProtComment	= "0x6800-0x6FFF: Real-Time(class=2): redundant, DFP";
+        pszProtSummary  = "cyclic Real-Time";
+        pszProtComment  = "0x6800-0x6FFF: Real-Time(class=2): redundant, DFP";
         bCyclic         = TRUE;
     } else if (u16FrameID <= 0x77FF){
-        pszProtShort 	= "PN-RTC2";
+        pszProtShort    = "PN-RTC2";
         pszProtAddInfo  = "RTC2, ";
-        pszProtSummary 	= "cyclic Real-Time";
-        pszProtComment	= "0x7000-0x77FF: Real-Time(class=2): redundant, normal";
+        pszProtSummary  = "cyclic Real-Time";
+        pszProtComment  = "0x7000-0x77FF: Real-Time(class=2): redundant, normal";
         bCyclic         = TRUE;
-	} else if (u16FrameID <= 0x7FFF){
-        pszProtShort 	= "PN-RTC2";
+    } else if (u16FrameID <= 0x7FFF){
+        pszProtShort    = "PN-RTC2";
         pszProtAddInfo  = "RTC2, ";
-        pszProtSummary 	= "cyclic Real-Time";
-        pszProtComment	= "0x7800-0x7FFF: Real-Time(class=2): non redundant, DFP";
+        pszProtSummary  = "cyclic Real-Time";
+        pszProtComment  = "0x7800-0x7FFF: Real-Time(class=2): non redundant, DFP";
         bCyclic         = TRUE;
     } else if (u16FrameID <= 0xBBFF){
-        pszProtShort 	= "PN-RTC2";
+        pszProtShort    = "PN-RTC2";
         pszProtAddInfo  = "RTC2, ";
-        pszProtSummary 	= "cyclic Real-Time";
-        pszProtComment	= "0x8000-0xBBFF: Real-Time(class=2): non redundant, normal";
+        pszProtSummary  = "cyclic Real-Time";
+        pszProtComment  = "0x8000-0xBBFF: Real-Time(class=2): non redundant, normal";
         bCyclic         = TRUE;
     } else if (u16FrameID <= 0xBFFF){
-        pszProtShort 	= "PN-RTC2";
+        pszProtShort    = "PN-RTC2";
         pszProtAddInfo  = "RTC2, ";
-        pszProtSummary 	= "cyclic Real-Time";
-        pszProtComment	= "0xBC00-0xBFFF: Real-Time(class=2 multicast): non redundant, normal";
+        pszProtSummary  = "cyclic Real-Time";
+        pszProtComment  = "0xBC00-0xBFFF: Real-Time(class=2 multicast): non redundant, normal";
         bCyclic         = TRUE;
-	} else if (u16FrameID <= 0xF7FF){
-        pszProtShort 	= "PN-RTC1/UDP";
+    } else if (u16FrameID <= 0xF7FF){
+        pszProtShort    = "PN-RTC1/UDP";
         pszProtAddInfo  = "RTC1/UDP, ";
-        pszProtSummary 	= "cyclic Real-Time";
-        pszProtComment	= "0xC000-0xF7FF: Real-Time(class=1/UDP): Cyclic";
+        pszProtSummary  = "cyclic Real-Time";
+        pszProtComment  = "0xC000-0xF7FF: Real-Time(class=1/UDP): Cyclic";
         bCyclic         = TRUE;
     } else if (u16FrameID <= 0xFBFF){
-        pszProtShort 	= "PN-RTC1/UDP";
+        pszProtShort    = "PN-RTC1/UDP";
         pszProtAddInfo  = "Multicast, ";
-        pszProtSummary 	= "cyclic Real-Time";
-        pszProtComment	= "0xF800-0xFBFF: Real-Time(class=1/UDP multicast): Cyclic";
+        pszProtSummary  = "cyclic Real-Time";
+        pszProtComment  = "0xF800-0xFBFF: Real-Time(class=1/UDP multicast): Cyclic";
         bCyclic         = TRUE;
-	} else if (u16FrameID <= 0xFDFF){
-        pszProtShort 	= "PN-RTA";
+    } else if (u16FrameID <= 0xFDFF){
+        pszProtShort    = "PN-RTA";
         pszProtAddInfo  = "Reserved, ";
-        pszProtSummary	= "acyclic Real-Time";
-        pszProtComment	= "0xFC00-0xFDFF: Reserved";
+        pszProtSummary  = "acyclic Real-Time";
+        pszProtComment  = "0xFC00-0xFDFF: Reserved";
         bCyclic         = FALSE;
         if (u16FrameID == 0xfc01) {
-			pszProtShort 	= "PN-RTA";
+            pszProtShort    = "PN-RTA";
             pszProtAddInfo  = "Alarm High, ";
-	        pszProtSummary	= "acyclic Real-Time";
-	        pszProtComment	= "Real-Time: Acyclic PN-IO Alarm high priority";
+            pszProtSummary  = "acyclic Real-Time";
+            pszProtComment  = "Real-Time: Acyclic PN-IO Alarm high priority";
         }
 
-	} else if (u16FrameID <= 0xFEFF){
-        pszProtShort 	= "PN-RTA";
+    } else if (u16FrameID <= 0xFEFF){
+        pszProtShort    = "PN-RTA";
         pszProtAddInfo  = "Reserved, ";
-        pszProtSummary	= "acyclic Real-Time";
-        pszProtComment	= "0xFE00-0xFEFF: Real-Time: Reserved";
+        pszProtSummary  = "acyclic Real-Time";
+        pszProtComment  = "0xFE00-0xFEFF: Real-Time: Reserved";
         bCyclic         = FALSE;
         if (u16FrameID == 0xFE01) {
-			pszProtShort 	= "PN-RTA";
+            pszProtShort    = "PN-RTA";
             pszProtAddInfo  = "Alarm Low, ";
-	        pszProtSummary	= "acyclic Real-Time";
-	        pszProtComment	= "Real-Time: Acyclic PN-IO Alarm low priority";
+            pszProtSummary  = "acyclic Real-Time";
+            pszProtComment  = "Real-Time: Acyclic PN-IO Alarm low priority";
         }
         if (u16FrameID == FRAME_ID_DCP_HELLO) {
-			pszProtShort 	= "PN-RTA";
+            pszProtShort    = "PN-RTA";
             pszProtAddInfo  = "";
-	        pszProtSummary	= "acyclic Real-Time";
-	        pszProtComment	= "Real-Time: DCP (Dynamic Configuration Protocol) hello";
+            pszProtSummary  = "acyclic Real-Time";
+            pszProtComment  = "Real-Time: DCP (Dynamic Configuration Protocol) hello";
         }
         if (u16FrameID == FRAME_ID_DCP_GETORSET) {
-			pszProtShort 	= "PN-RTA";
+            pszProtShort    = "PN-RTA";
             pszProtAddInfo  = "";
-	        pszProtSummary	= "acyclic Real-Time";
-	        pszProtComment	= "Real-Time: DCP (Dynamic Configuration Protocol) get/set";
+            pszProtSummary  = "acyclic Real-Time";
+            pszProtComment  = "Real-Time: DCP (Dynamic Configuration Protocol) get/set";
         }
         if (u16FrameID == FRAME_ID_DCP_IDENT_REQ) {
-			pszProtShort 	= "PN-RTA";
+            pszProtShort    = "PN-RTA";
             pszProtAddInfo  = "";
-	        pszProtSummary	= "acyclic Real-Time";
-	        pszProtComment	= "Real-Time: DCP (Dynamic Configuration Protocol) identify multicast request";
+            pszProtSummary  = "acyclic Real-Time";
+            pszProtComment  = "Real-Time: DCP (Dynamic Configuration Protocol) identify multicast request";
         }
         if (u16FrameID == FRAME_ID_DCP_IDENT_RES) {
-			pszProtShort 	= "PN-RTA";
+            pszProtShort    = "PN-RTA";
             pszProtAddInfo  = "";
-	        pszProtSummary	= "acyclic Real-Time";
-	        pszProtComment	= "Real-Time: DCP (Dynamic Configuration Protocol) identify response";
+            pszProtSummary  = "acyclic Real-Time";
+            pszProtComment  = "Real-Time: DCP (Dynamic Configuration Protocol) identify response";
         }
     } else if (u16FrameID <= 0xFF01){
-		pszProtShort 	= "PN-PTCP";
+        pszProtShort    = "PN-PTCP";
         pszProtAddInfo  = "RTA Sync, ";
-        pszProtSummary	= "acyclic Real-Time";
-        pszProtComment	= "0xFF00-0xFF01: PTCP Announce";
+        pszProtSummary  = "acyclic Real-Time";
+        pszProtComment  = "0xFF00-0xFF01: PTCP Announce";
         bCyclic         = FALSE;
     } else if (u16FrameID <= 0xFF1F){
-		pszProtShort 	= "PN-PTCP";
+        pszProtShort    = "PN-PTCP";
         pszProtAddInfo  = "RTA Sync, ";
-        pszProtSummary	= "acyclic Real-Time";
-        pszProtComment	= "0xFF02-0xFF1F: Reserved";
+        pszProtSummary  = "acyclic Real-Time";
+        pszProtComment  = "0xFF02-0xFF1F: Reserved";
         bCyclic         = FALSE;
     } else if (u16FrameID <= 0xFF21){
-		pszProtShort 	= "PN-PTCP";
+        pszProtShort    = "PN-PTCP";
         pszProtAddInfo  = "Follow Up, ";
-        pszProtSummary	= "acyclic Real-Time";
-        pszProtComment	= "0xFF20-0xFF21: PTCP Follow Up";
+        pszProtSummary  = "acyclic Real-Time";
+        pszProtComment  = "0xFF20-0xFF21: PTCP Follow Up";
         bCyclic         = FALSE;
     } else if (u16FrameID <= 0xFF22){
-		pszProtShort 	= "PN-PTCP";
+        pszProtShort    = "PN-PTCP";
         pszProtAddInfo  = "Follow Up, ";
-        pszProtSummary	= "acyclic Real-Time";
-        pszProtComment	= "0xFF22-0xFF3F: Reserved";
+        pszProtSummary  = "acyclic Real-Time";
+        pszProtComment  = "0xFF22-0xFF3F: Reserved";
         bCyclic         = FALSE;
     } else if (u16FrameID <= 0xFF43){
-		pszProtShort 	= "PN-PTCP";
+        pszProtShort    = "PN-PTCP";
         pszProtAddInfo  = "Delay, ";
-        pszProtSummary	= "acyclic Real-Time";
-        pszProtComment	= "0xFF40-0xFF43: Acyclic Real-Time: Delay";
+        pszProtSummary  = "acyclic Real-Time";
+        pszProtComment  = "0xFF40-0xFF43: Acyclic Real-Time: Delay";
         bCyclic         = FALSE;
     } else if (u16FrameID <= 0xFF7F){
-		pszProtShort 	= "PN-RT";
+        pszProtShort    = "PN-RT";
         pszProtAddInfo  = "Reserved, ";
-        pszProtSummary	= "Real-Time";
-        pszProtComment	= "0xFF44-0xFF7F: reserved ID";
+        pszProtSummary  = "Real-Time";
+        pszProtComment  = "0xFF44-0xFF7F: reserved ID";
         bCyclic         = FALSE;
     } else if (u16FrameID <= 0xFF8F){
-		pszProtShort 	= "PN-RT";
+        pszProtShort    = "PN-RT";
         pszProtAddInfo  = "Fragmentation, ";
-        pszProtSummary	= "Real-Time";
-        pszProtComment	= "0xFF80-0xFF8F: Fragmentation";
+        pszProtSummary  = "Real-Time";
+        pszProtComment  = "0xFF80-0xFF8F: Fragmentation";
         bCyclic         = FALSE;
     } else {
-		pszProtShort 	= "PN-RT";
+        pszProtShort    = "PN-RT";
         pszProtAddInfo  = "Reserved, ";
-        pszProtSummary	= "Real-Time";
-        pszProtComment	= "0xFF90-0xFFFF: reserved ID";
+        pszProtSummary  = "Real-Time";
+        pszProtComment  = "0xFF90-0xFFFF: reserved ID";
         bCyclic         = FALSE;
-	}
+    }
 
     /* decode optional cyclic fields at the packet end and build the summary line */
     if (bCyclic) {
         /* cyclic transfer has cycle counter, data status and transfer status fields at the end */
-		u16CycleCounter = tvb_get_ntohs(tvb, tvb_len - 4);
-		u8DataStatus = tvb_get_guint8(tvb, tvb_len - 2);
-	    u8TransferStatus = tvb_get_guint8(tvb, tvb_len - 1);
-
-		g_snprintf (szFieldSummary, sizeof(szFieldSummary),
-				  "%sID:0x%04x, Len:%4u, Cycle:%5u (%s,%s,%s,%s)",
-				pszProtAddInfo, u16FrameID, tvb_len - 2 - 4, u16CycleCounter,
-			    (u8DataStatus & 0x04) ? "Valid" : "Invalid",
-			    (u8DataStatus & 0x01) ? "Primary" : "Backup",
-			    (u8DataStatus & 0x20) ? "Ok" : "Problem",
-			    (u8DataStatus & 0x10) ? "Run" : "Stop");
+        u16CycleCounter = tvb_get_ntohs(tvb, tvb_len - 4);
+        u8DataStatus = tvb_get_guint8(tvb, tvb_len - 2);
+        u8TransferStatus = tvb_get_guint8(tvb, tvb_len - 1);
+
+        g_snprintf (szFieldSummary, sizeof(szFieldSummary),
+                  "%sID:0x%04x, Len:%4u, Cycle:%5u (%s,%s,%s,%s)",
+                pszProtAddInfo, u16FrameID, tvb_len - 2 - 4, u16CycleCounter,
+                (u8DataStatus & 0x04) ? "Valid" : "Invalid",
+                (u8DataStatus & 0x01) ? "Primary" : "Backup",
+                (u8DataStatus & 0x20) ? "Ok" : "Problem",
+                (u8DataStatus & 0x10) ? "Run" : "Stop");
 
         /* user data length is packet len - frame id - optional cyclic status fields */
         data_len = tvb_len - 2 - 4;
     } else {
         /* satisfy the gcc compiler, so it won't throw an "uninitialized" warning */
-		u16CycleCounter     = 0;
-		u8DataStatus        = 0;
-	    u8TransferStatus    = 0;
+        u16CycleCounter     = 0;
+        u8DataStatus        = 0;
+        u8TransferStatus    = 0;
 
         /* acyclic transfer has no fields at the end */
-		g_snprintf (szFieldSummary, sizeof(szFieldSummary),
-				  "%sID:0x%04x, Len:%4u",
-				pszProtAddInfo, u16FrameID, tvb_len - 2);
+        g_snprintf (szFieldSummary, sizeof(szFieldSummary),
+                  "%sID:0x%04x, Len:%4u",
+                pszProtAddInfo, u16FrameID, tvb_len - 2);
 
         /* user data length is packet len - frame id field */
         data_len = tvb_len - 2;
@@ -621,48 +623,48 @@ dissect_pn_rt(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 
     /* build protocol tree only, if tree is really used */
     if (tree) {
-		/* build pn_rt protocol tree with summary line */
-	    if (pn_rt_summary_in_tree) {
-	      ti = proto_tree_add_protocol_format(tree, proto_pn_rt, tvb, 0, tvb_len,
-				"PROFINET %s, %s", pszProtSummary, szFieldSummary);
-	    } else {
-			ti = proto_tree_add_item(tree, proto_pn_rt, tvb, 0, tvb_len, FALSE);
-	    }
-		pn_rt_tree = proto_item_add_subtree(ti, ett_pn_rt);
-
-		/* add frame ID */
+        /* build pn_rt protocol tree with summary line */
+        if (pn_rt_summary_in_tree) {
+          ti = proto_tree_add_protocol_format(tree, proto_pn_rt, tvb, 0, tvb_len,
+                "PROFINET %s, %s", pszProtSummary, szFieldSummary);
+        } else {
+            ti = proto_tree_add_item(tree, proto_pn_rt, tvb, 0, tvb_len, ENC_BIG_ENDIAN);
+        }
+        pn_rt_tree = proto_item_add_subtree(ti, ett_pn_rt);
+
+        /* add frame ID */
         proto_tree_add_uint_format(pn_rt_tree, hf_pn_rt_frame_id, tvb,
           0, 2, u16FrameID, "FrameID: 0x%04x (%s)", u16FrameID, pszProtComment);
 
         if (bCyclic) {
-		    /* add cycle counter */
+            /* add cycle counter */
             proto_tree_add_uint_format(pn_rt_tree, hf_pn_rt_cycle_counter, tvb,
               tvb_len - 4, 2, u16CycleCounter, "CycleCounter: %u", u16CycleCounter);
-		    
+            
             /* add data status subtree */
-			dissect_DataStatus(tvb, tvb_len - 2, tree, u8DataStatus);
-
-	        /* add transfer status */
-	        if (u8TransferStatus) {
-		        proto_tree_add_uint_format(pn_rt_tree, hf_pn_rt_transfer_status, tvb,
-		    	    tvb_len - 1, 1, u8TransferStatus, 
-				    "TransferStatus: 0x%02x (ignore this frame)", u8TransferStatus);
-		    } else {
-		        proto_tree_add_uint_format(pn_rt_tree, hf_pn_rt_transfer_status, tvb,
-		    	    tvb_len - 1, 1, u8TransferStatus, 
-				    "TransferStatus: 0x%02x (OK)", u8TransferStatus);
-		    }
+            dissect_DataStatus(tvb, tvb_len - 2, tree, u8DataStatus);
+
+            /* add transfer status */
+            if (u8TransferStatus) {
+                proto_tree_add_uint_format(pn_rt_tree, hf_pn_rt_transfer_status, tvb,
+                    tvb_len - 1, 1, u8TransferStatus, 
+                    "TransferStatus: 0x%02x (ignore this frame)", u8TransferStatus);
+            } else {
+                proto_tree_add_uint_format(pn_rt_tree, hf_pn_rt_transfer_status, tvb,
+                    tvb_len - 1, 1, u8TransferStatus, 
+                    "TransferStatus: 0x%02x (OK)", u8TransferStatus);
+            }
         }
     }
-		
-	/* update column info now */
+        
+    /* update column info now */
     col_add_str(pinfo->cinfo, COL_INFO, szFieldSummary);
     col_set_str(pinfo->cinfo, COL_PROTOCOL, pszProtShort);
 
     pinfo->private_data = GUINT_TO_POINTER( (guint32) u16FrameID);
 
-	/* get frame user data tvb (without header and footer) */
-	next_tvb = tvb_new_subset(tvb, 2, data_len, data_len);
+    /* get frame user data tvb (without header and footer) */
+    next_tvb = tvb_new_subset(tvb, 2, data_len, data_len);
 
     /* ask heuristics, if some sub-dissector is interested in this packet payload */
     if(!dissector_try_heuristic(heur_subdissector_list, next_tvb, pinfo, tree)) {
@@ -679,68 +681,68 @@ void
 proto_register_pn_rt(void)
 {
   static hf_register_info hf[] = {
-    { &hf_pn_rt_frame_id,
-      { "FrameID", "pn_rt.frame_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-	{ &hf_pn_rt_cycle_counter, { 
-		"CycleCounter", "pn_rt.cycle_counter", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-	{ &hf_pn_rt_data_status, { 
-		"DataStatus", "pn_rt.ds", FT_UINT8, BASE_HEX, 0, 0x0, NULL, HFILL }},
-	{ &hf_pn_rt_data_status_ignore, { 
-		"Ignore (1:Ignore/0:Evaluate)", "pn_rt.ds_ignore", FT_UINT8, BASE_HEX, 0, 0x80, NULL, HFILL }},
-	{ &hf_pn_rt_data_status_subframe_sender_mode, { 
-		"SubFrameSenderMode", "pn_rt.ds_subframe_sender_mode", FT_UINT8, BASE_HEX, 0, 0x40, NULL, HFILL }},
-	{ &hf_pn_rt_data_status_ok, { 
-		"StationProblemIndicator (1:Ok/0:Problem)", "pn_rt.ds_ok", FT_UINT8, BASE_HEX, 0, 0x20, NULL, HFILL }},
-	{ &hf_pn_rt_data_status_operate, { 
-		"ProviderState (1:Run/0:Stop)", "pn_rt.ds_operate", FT_UINT8, BASE_HEX, 0, 0x10, NULL, HFILL }},
-	{ &hf_pn_rt_data_status_res3, { 
-		"Reserved (should be zero)", "pn_rt.ds_res3", FT_UINT8, BASE_HEX, 0, 0x08, NULL, HFILL }},
-	{ &hf_pn_rt_data_status_valid, { 
-		"DataValid (1:Valid/0:Invalid)", "pn_rt.ds_valid", FT_UINT8, BASE_HEX, 0, 0x04, NULL, HFILL }},
-	{ &hf_pn_rt_data_status_res1, { 
-		"Reserved (should be zero)", "pn_rt.ds_res1", FT_UINT8, BASE_HEX, 0, 0x02, NULL, HFILL }},
-	{ &hf_pn_rt_data_status_primary, { 
-		"State (1:Primary/0:Backup)", "pn_rt.ds_primary", FT_UINT8, BASE_HEX, 0, 0x01, NULL, HFILL }},
+    { &hf_pn_rt_frame_id, {
+      "FrameID", "pn_rt.frame_id", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+    { &hf_pn_rt_cycle_counter, { 
+        "CycleCounter", "pn_rt.cycle_counter", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+    { &hf_pn_rt_data_status, { 
+        "DataStatus", "pn_rt.ds", FT_UINT8, BASE_HEX, 0, 0x0, NULL, HFILL }},
+    { &hf_pn_rt_data_status_ignore, { 
+        "Ignore (1:Ignore/0:Evaluate)", "pn_rt.ds_ignore", FT_UINT8, BASE_HEX, 0, 0x80, NULL, HFILL }},
+    { &hf_pn_rt_data_status_subframe_sender_mode, { 
+        "SubFrameSenderMode", "pn_rt.ds_subframe_sender_mode", FT_UINT8, BASE_HEX, 0, 0x40, NULL, HFILL }},
+    { &hf_pn_rt_data_status_ok, { 
+        "StationProblemIndicator (1:Ok/0:Problem)", "pn_rt.ds_ok", FT_UINT8, BASE_HEX, 0, 0x20, NULL, HFILL }},
+    { &hf_pn_rt_data_status_operate, { 
+        "ProviderState (1:Run/0:Stop)", "pn_rt.ds_operate", FT_UINT8, BASE_HEX, 0, 0x10, NULL, HFILL }},
+    { &hf_pn_rt_data_status_res3, { 
+        "Reserved (should be zero)", "pn_rt.ds_res3", FT_UINT8, BASE_HEX, 0, 0x08, NULL, HFILL }},
+    { &hf_pn_rt_data_status_valid, { 
+        "DataValid (1:Valid/0:Invalid)", "pn_rt.ds_valid", FT_UINT8, BASE_HEX, 0, 0x04, NULL, HFILL }},
+    { &hf_pn_rt_data_status_res1, { 
+        "Reserved (should be zero)", "pn_rt.ds_res1", FT_UINT8, BASE_HEX, 0, 0x02, NULL, HFILL }},
+    { &hf_pn_rt_data_status_primary, { 
+        "State (1:Primary/0:Backup)", "pn_rt.ds_primary", FT_UINT8, BASE_HEX, 0, 0x01, NULL, HFILL }},
     { &hf_pn_rt_transfer_status,
       { "TransferStatus", "pn_rt.transfer_status", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-	{ &hf_pn_rt_sf, { 
-		"SubFrame", "pn_rt.sf", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-	{ &hf_pn_rt_sf_crc16, { 
-		"CRC16", "pn_rt.sf.crc16", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-	{ &hf_pn_rt_sf_position, { 
-		"Position", "pn_rt.sf.position", FT_UINT8, BASE_DEC, NULL, 0x7F, NULL, HFILL }},
-	{ &hf_pn_rt_sf_position_control, { 
-		"Control", "pn_rt.sf.position_control", FT_UINT8, BASE_DEC, VALS(pn_rt_position_control), 0x80, NULL, HFILL }},
-	{ &hf_pn_rt_sf_data_length, { 
-		"DataLength", "pn_rt.sf.data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-	{ &hf_pn_rt_sf_cycle_counter, { 
-		"CycleCounter", "pn_rt.sf.cycle_counter", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-	{ &hf_pn_rt_frag, { 
-		"PROFINET Real-Time Fragment", "pn_rt.frag", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-	{ &hf_pn_rt_frag_data_length, { 
-		"FragDataLength", "pn_rt.frag_data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
-	{ &hf_pn_rt_frag_status, { 
-		"FragStatus", "pn_rt.frag_status", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
-	{ &hf_pn_rt_frag_status_more_follows, { 
-		"MoreFollows", "pn_rt.frag_status.more_follows", FT_UINT8, BASE_HEX, VALS(pn_rt_frag_status_more_follows), 0x80, NULL, HFILL }},
-	{ &hf_pn_rt_frag_status_error, { 
-		"Error", "pn_rt.frag_status.error", FT_UINT8, BASE_HEX, VALS(pn_rt_frag_status_error), 0x40, NULL, HFILL }},
-	{ &hf_pn_rt_frag_status_fragment_number, { 
-		"FragmentNumber (zero based)", "pn_rt.frag_status.fragment_number", FT_UINT8, BASE_DEC, NULL, 0x3F, NULL, HFILL }},
-	{ &hf_pn_rt_frag_data, { 
-		"FragData", "pn_rt.frag_data", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
+    { &hf_pn_rt_sf, { 
+        "SubFrame", "pn_rt.sf", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+    { &hf_pn_rt_sf_crc16, { 
+        "CRC16", "pn_rt.sf.crc16", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+    { &hf_pn_rt_sf_position, { 
+        "Position", "pn_rt.sf.position", FT_UINT8, BASE_DEC, NULL, 0x7F, NULL, HFILL }},
+    { &hf_pn_rt_sf_position_control, { 
+        "Control", "pn_rt.sf.position_control", FT_UINT8, BASE_DEC, VALS(pn_rt_position_control), 0x80, NULL, HFILL }},
+    { &hf_pn_rt_sf_data_length, { 
+        "DataLength", "pn_rt.sf.data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+    { &hf_pn_rt_sf_cycle_counter, { 
+        "CycleCounter", "pn_rt.sf.cycle_counter", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+    { &hf_pn_rt_frag, { 
+        "PROFINET Real-Time Fragment", "pn_rt.frag", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+    { &hf_pn_rt_frag_data_length, { 
+        "FragDataLength", "pn_rt.frag_data_length", FT_UINT8, BASE_DEC, NULL, 0x0, NULL, HFILL }},
+    { &hf_pn_rt_frag_status, { 
+        "FragStatus", "pn_rt.frag_status", FT_NONE, BASE_NONE, NULL, 0x0, NULL, HFILL }},
+    { &hf_pn_rt_frag_status_more_follows, { 
+        "MoreFollows", "pn_rt.frag_status.more_follows", FT_UINT8, BASE_HEX, VALS(pn_rt_frag_status_more_follows), 0x80, NULL, HFILL }},
+    { &hf_pn_rt_frag_status_error, { 
+        "Error", "pn_rt.frag_status.error", FT_UINT8, BASE_HEX, VALS(pn_rt_frag_status_error), 0x40, NULL, HFILL }},
+    { &hf_pn_rt_frag_status_fragment_number, { 
+        "FragmentNumber (zero based)", "pn_rt.frag_status.fragment_number", FT_UINT8, BASE_DEC, NULL, 0x3F, NULL, HFILL }},
+    { &hf_pn_rt_frag_data, { 
+        "FragData", "pn_rt.frag_data", FT_STRING, BASE_NONE, NULL, 0x00, NULL, HFILL }},
   };
   static gint *ett[] = {
     &ett_pn_rt,
     &ett_pn_rt_data_status,
-	&ett_pn_rt_sf,
-	&ett_pn_rt_frag,
-	&ett_pn_rt_frag_status
+    &ett_pn_rt_sf,
+    &ett_pn_rt_frag,
+    &ett_pn_rt_frag_status
   };
   module_t *pn_rt_module; 
 
   proto_pn_rt = proto_register_protocol("PROFINET Real-Time Protocol",
-				       "PN-RT", "pn_rt");
+                       "PN-RT", "pn_rt");
 
   proto_register_field_array(proto_pn_rt, hf, array_length(hf));
   proto_register_subtree_array(ett, array_length(ett));
@@ -750,9 +752,9 @@ proto_register_pn_rt(void)
   pn_rt_module = prefs_register_protocol(proto_pn_rt, NULL);
 
   prefs_register_bool_preference(pn_rt_module, "summary_in_tree",
-	    "Show PN-RT summary in protocol tree",
-	    "Whether the PN-RT summary line should be shown in the protocol tree",
-	    &pn_rt_summary_in_tree);
+        "Show PN-RT summary in protocol tree",
+        "Whether the PN-RT summary line should be shown in the protocol tree",
+        &pn_rt_summary_in_tree);
 
   /* register heuristics anchor for payload dissectors */
   register_heur_dissector_list("pn_rt", &heur_subdissector_list);