whitespace fixes; mostly: remove trailing blanks

svn path=/trunk/; revision=52591

1 files changed, 969 insertions, 969 deletions

diff --git a/epan/dissectors/packet-icep.c b/epan/dissectors/packet-icep.c
index d7dcf55651..bd65d3a1b0 100644
--- a/epan/dissectors/packet-icep.c
+++ b/epan/dissectors/packet-icep.c
@@ -66,10 +66,10 @@
 
 /* fixed values taken from the standard */
 static const guint8 icep_magic[] = { 'I', 'c', 'e', 'P' };
-#define ICEP_HEADER_SIZE			14
-#define ICEP_MIN_REPLY_SIZE			5
-#define ICEP_MIN_PARAMS_SIZE			6
-#define ICEP_MIN_COMMON_REQ_HEADER_SIZE		13
+#define ICEP_HEADER_SIZE                14
+#define ICEP_MIN_REPLY_SIZE              5
+#define ICEP_MIN_PARAMS_SIZE             6
+#define ICEP_MIN_COMMON_REQ_HEADER_SIZE 13
 
 /* Initialize the protocol and registered fields */
 static int proto_icep = -1;
@@ -122,46 +122,46 @@ static expert_field ei_icep_facet_missing = EI_INIT;
 static expert_field ei_icep_context_too_long = EI_INIT;
 
 /* Preferences */
-static guint icep_max_batch_requests	= 64;
-static guint icep_max_ice_string_len	= 512;
-static guint icep_max_ice_context_pairs	= 64;
-static guint icep_tcp_port				= 0;
-static guint icep_udp_port				= 0;
+static guint icep_max_batch_requests    = 64;
+static guint icep_max_ice_string_len    = 512;
+static guint icep_max_ice_context_pairs = 64;
+static guint icep_tcp_port              = 0;
+static guint icep_udp_port              = 0;
 
 
 static const value_string icep_msgtype_vals[] = {
-	{0x0, "Request"},
-	{0x1, "Batch request"},
-	{0x2, "Reply"},
-	{0x3, "Validate connection"},
-	{0x4, "Close connection"},
-	{0, NULL}
+    {0x0, "Request"},
+    {0x1, "Batch request"},
+    {0x2, "Reply"},
+    {0x3, "Validate connection"},
+    {0x4, "Close connection"},
+    {0, NULL}
 };
 
 static const value_string icep_zipstatus_vals[] = {
-	{0x0, "Uncompressed, sender cannot accept a compressed reply"},
-	{0x1, "Uncompressed, sender can accept a compressed reply"},
-	{0x2, "Compressed, sender can accept a compressed reply"},
-	{0, NULL}
+    {0x0, "Uncompressed, sender cannot accept a compressed reply"},
+    {0x1, "Uncompressed, sender can accept a compressed reply"},
+    {0x2, "Compressed, sender can accept a compressed reply"},
+    {0, NULL}
 };
 
 static const value_string icep_replystatus_vals[] = {
-	{0x0, "Success"},
-	{0x1, "User exception"},
-	{0x2, "Object does not exist"},
-	{0x3, "Facet does not exist"},
-	{0x4, "Operation does not exist"},
-	{0x5, "Unknown Ice local exception"},
-	{0x6, "Unknown Ice user exception"},
-	{0x7, "Unknown exception"},
-	{0, NULL}
+    {0x0, "Success"},
+    {0x1, "User exception"},
+    {0x2, "Object does not exist"},
+    {0x3, "Facet does not exist"},
+    {0x4, "Operation does not exist"},
+    {0x5, "Unknown Ice local exception"},
+    {0x6, "Unknown Ice user exception"},
+    {0x7, "Unknown exception"},
+    {0, NULL}
 };
 
 static const value_string icep_mode_vals[] = {
-	{0x0, "normal"},
-	{0x1, "nonmutating"},
-	{0x2, "idempotent"},
-	{0, NULL}
+    {0x0, "normal"},
+    {0x1, "nonmutating"},
+    {0x2, "idempotent"},
+    {0, NULL}
 };
 
 /*
@@ -171,90 +171,90 @@ static const value_string icep_mode_vals[] = {
  * "*dest" is a null terminated version of the dissected Ice string.
  */
 static void dissect_ice_string(packet_info *pinfo, proto_tree *tree, proto_item *item, int hf_icep,
-							   tvbuff_t *tvb, guint32 offset, gint32 *consumed, char **dest)
+                               tvbuff_t *tvb, guint32 offset, gint32 *consumed, char **dest)
 {
-	/* p. 586 chapter 23.2.1 and p. 588 chapter 23.2.5
-	 * string == Size + content
-	 * string = 1byte (0..254) + string not null terminated
-	 * or
-	 * string = 1byte (255) + 1int (255..2^32-1) + string not null terminated
-	 */
+    /* p. 586 chapter 23.2.1 and p. 588 chapter 23.2.5
+     * string == Size + content
+     * string = 1byte (0..254) + string not null terminated
+     * or
+     * string = 1byte (255) + 1int (255..2^32-1) + string not null terminated
+     */
 
-	guint32 Size = 0;
-	char *s = NULL;
+    guint32 Size = 0;
+    char *s = NULL;
 
-	(*consumed) = 0;
+    (*consumed) = 0;
 
-	/* check for first byte */
-	if ( !tvb_bytes_exist(tvb, offset, 1) ) {
+    /* check for first byte */
+    if ( !tvb_bytes_exist(tvb, offset, 1) ) {
 
-		expert_add_info_format(pinfo, item, &ei_icep_string_malformed, "1st byte of Size missing");
-		col_append_str(pinfo->cinfo, COL_INFO, " (1st byte of Size missing)");
+        expert_add_info_format(pinfo, item, &ei_icep_string_malformed, "1st byte of Size missing");
+        col_append_str(pinfo->cinfo, COL_INFO, " (1st byte of Size missing)");
 
-		(*consumed) = -1;
-		return;
-	}
+        (*consumed) = -1;
+        return;
+    }
 
-	/* get the Size */
-	Size = tvb_get_guint8(tvb, offset);
-	offset++;
-	(*consumed)++;
+    /* get the Size */
+    Size = tvb_get_guint8(tvb, offset);
+    offset++;
+    (*consumed)++;
 
-	if ( Size == 255 ) {
+    if ( Size == 255 ) {
 
-		/* check for next 4 bytes */
-		if ( !tvb_bytes_exist(tvb, offset, 4) ) {
+        /* check for next 4 bytes */
+        if ( !tvb_bytes_exist(tvb, offset, 4) ) {
 
-			expert_add_info_format(pinfo, item, &ei_icep_string_malformed, "second field of Size missing");
-			col_append_str(pinfo->cinfo, COL_INFO, " (second field of Size missing)");
+            expert_add_info_format(pinfo, item, &ei_icep_string_malformed, "second field of Size missing");
+            col_append_str(pinfo->cinfo, COL_INFO, " (second field of Size missing)");
 
-			(*consumed) = -1;
-			return;
-		}
+            (*consumed) = -1;
+            return;
+        }
 
-		/* get second field of Size */
-		Size = tvb_get_letohl(tvb, offset);
-		offset += 4;
-		(*consumed) += 4;
-	}
+        /* get second field of Size */
+        Size = tvb_get_letohl(tvb, offset);
+        offset += 4;
+        (*consumed) += 4;
+    }
 
-	DBG1("string.Size --> %d\n", Size);
+    DBG1("string.Size --> %d\n", Size);
 
-	/* check if the string exists */
-	if ( !tvb_bytes_exist(tvb, offset, Size) ) {
+    /* check if the string exists */
+    if ( !tvb_bytes_exist(tvb, offset, Size) ) {
 
-		expert_add_info_format(pinfo, item, &ei_icep_string_malformed, "missing or truncated string");
-		col_append_str(pinfo->cinfo, COL_INFO, " (missing or truncated string)");
+        expert_add_info_format(pinfo, item, &ei_icep_string_malformed, "missing or truncated string");
+        col_append_str(pinfo->cinfo, COL_INFO, " (missing or truncated string)");
 
-		(*consumed) = -1;
-		return;
-	}
+        (*consumed) = -1;
+        return;
+    }
 
-	if ( Size > icep_max_ice_string_len ) {
+    if ( Size > icep_max_ice_string_len ) {
 
-		expert_add_info(pinfo, item, &ei_icep_string_too_long);
-		col_append_str(pinfo->cinfo, COL_INFO, " (string too long)");
+        expert_add_info(pinfo, item, &ei_icep_string_too_long);
+        col_append_str(pinfo->cinfo, COL_INFO, " (string too long)");
 
-		(*consumed) = -1;
-		return;
-	}
+        (*consumed) = -1;
+        return;
+    }
 
 
-	if ( Size != 0 ) {
-		s = tvb_get_string(wmem_packet_scope(), tvb, offset, Size);
-		proto_tree_add_string(tree, hf_icep, tvb, offset, Size, s);
-	} else {
-		s = wmem_strdup(wmem_packet_scope(), "(empty)");
-		/* display the 0x00 Size byte when click on a empty ice_string */
-		proto_tree_add_string(tree, hf_icep, tvb, offset - 1, 1, s);
-	}
+    if ( Size != 0 ) {
+        s = tvb_get_string(wmem_packet_scope(), tvb, offset, Size);
+        proto_tree_add_string(tree, hf_icep, tvb, offset, Size, s);
+    } else {
+        s = wmem_strdup(wmem_packet_scope(), "(empty)");
+        /* display the 0x00 Size byte when click on a empty ice_string */
+        proto_tree_add_string(tree, hf_icep, tvb, offset - 1, 1, s);
+    }
 
-	if ( dest != NULL )
-		*dest = s;
+    if ( dest != NULL )
+        *dest = s;
 
-	/*offset += Size;*/
-	(*consumed) += Size;
-	return;
+    /*offset += Size;*/
+    (*consumed) += Size;
+    return;
 }
 
 /*
@@ -262,188 +262,188 @@ static void dissect_ice_string(packet_info *pinfo, proto_tree *tree, proto_item
  * bytes in "*consumed", if errors "*consumed" is -1.
  */
 static void dissect_ice_facet(packet_info *pinfo, proto_tree *tree, proto_item *item, int hf_icep,
-			      tvbuff_t *tvb, guint32 offset, gint32 *consumed)
+                  tvbuff_t *tvb, guint32 offset, gint32 *consumed)
 {
-	/*  p. 588, chapter 23.2.6:
-	 *  "facet" is a StringSeq, a StringSeq is a:
-	 *  sequence<string>
-	 *
-	 *
-	 * sequence == Size + SizeElements
-	 * sequence = 1byte (0..254) + SizeElements
-	 * or
-	 * sequence = 1byte (255) + 1int (255..2^32-1) + SizeElements
-	 *
-	 *
-	 * p.613. chapter 23.3.2
-	 * "facet has either zero elements (empty) or one element"
-	 *
-	 *
-	 */
+    /*  p. 588, chapter 23.2.6:
+     *  "facet" is a StringSeq, a StringSeq is a:
+     *  sequence<string>
+     *
+     *
+     * sequence == Size + SizeElements
+     * sequence = 1byte (0..254) + SizeElements
+     * or
+     * sequence = 1byte (255) + 1int (255..2^32-1) + SizeElements
+     *
+     *
+     * p.613. chapter 23.3.2
+     * "facet has either zero elements (empty) or one element"
+     *
+     *
+     */
 
-	guint32 Size = 0; /* number of elements in the sequence */
+    guint32 Size = 0; /* number of elements in the sequence */
 
-	(*consumed) = 0;
+    (*consumed) = 0;
 
-	/* check first byte */
-	if ( !tvb_bytes_exist(tvb, offset, 1) ) {
+    /* check first byte */
+    if ( !tvb_bytes_exist(tvb, offset, 1) ) {
 
-		expert_add_info(pinfo, item, &ei_icep_facet_missing);
-		col_append_str(pinfo->cinfo, COL_INFO, " (facet field missing)");
+        expert_add_info(pinfo, item, &ei_icep_facet_missing);
+        col_append_str(pinfo->cinfo, COL_INFO, " (facet field missing)");
 
-		(*consumed) = -1;
-		return;
-	}
+        (*consumed) = -1;
+        return;
+    }
 
-	/* get first byte of Size */
-	Size = tvb_get_guint8(tvb, offset);
-	offset++;
-	(*consumed)++;
+    /* get first byte of Size */
+    Size = tvb_get_guint8(tvb, offset);
+    offset++;
+    (*consumed)++;
 
-	if ( Size == 0 ) {
-		/* display the 0x00 Size byte when click on a empty ice_string */
-		proto_tree_add_string(tree, hf_icep, tvb, offset - 1, 1, "(empty)");
-		return;
-	}
+    if ( Size == 0 ) {
+        /* display the 0x00 Size byte when click on a empty ice_string */
+        proto_tree_add_string(tree, hf_icep, tvb, offset - 1, 1, "(empty)");
+        return;
+    }
 
-	if ( Size == 1 ) {
+    if ( Size == 1 ) {
 
-		gint32 consumed_facet = 0;
+        gint32 consumed_facet = 0;
 
-		dissect_ice_string(pinfo, tree, item, hf_icep, tvb, offset, &consumed_facet, NULL);
+        dissect_ice_string(pinfo, tree, item, hf_icep, tvb, offset, &consumed_facet, NULL);
 
-		if ( consumed_facet == -1 ) {
-			(*consumed) = -1;
-			return;
-		}
+        if ( consumed_facet == -1 ) {
+            (*consumed) = -1;
+            return;
+        }
 
-		/*offset += consumed_facet;*/
-		(*consumed) += consumed_facet;
-		return;
-	}
+        /*offset += consumed_facet;*/
+        (*consumed) += consumed_facet;
+        return;
+    }
 
-	/* if here => Size > 1 => not possible */
+    /* if here => Size > 1 => not possible */
 
-	/* display the XX Size byte when click here */
-	expert_add_info(pinfo, item, &ei_icep_facet_max_one_element);
+    /* display the XX Size byte when click here */
+    expert_add_info(pinfo, item, &ei_icep_facet_max_one_element);
 
-	col_append_str(pinfo->cinfo, COL_INFO, " (facet can be max one element)");
+    col_append_str(pinfo->cinfo, COL_INFO, " (facet can be max one element)");
 
-	(*consumed) = -1;
-	return;
+    (*consumed) = -1;
+    return;
 }
 
 /*
  * This function dissects an "Ice context", adds hf(s) to "tree" and returns consumed
  * bytes in "*consumed", if errors "*consumed" is -1.
  */
-static void dissect_ice_context(packet_info *pinfo, proto_tree *tree, proto_item *item, 
-								tvbuff_t *tvb, guint32 offset, gint32 *consumed)
+static void dissect_ice_context(packet_info *pinfo, proto_tree *tree, proto_item *item,
+                                tvbuff_t *tvb, guint32 offset, gint32 *consumed)
 {
-	/*  p. 588, chapter 23.2.7 and p. 613, 23.3.2:
-	 *  "context" is a dictionary<string, string>
-	 *
-	 * dictionary<string, string> == Size + SizeKeyValuePairs
-	 * dictionary<string, string> = 1byte (0..254) + SizeKeyValuePairs
-	 * or
-	 * dictionary<string, string>= 1byte (255) + 1int (255..2^32-1)+SizeKeyValuePairs
-	 *
-	 */
-
-	guint32 Size = 0; /* number of key-value in the dictionary */
-	guint32 i = 0;
-	const char *s = NULL;
-
-	(*consumed) = 0;
-
-	/* check first byte */
-	if ( !tvb_bytes_exist(tvb, offset, 1) ) {
-
-		expert_add_info_format(pinfo, item, &ei_icep_context_missing, "context missing");
-		col_append_str(pinfo->cinfo, COL_INFO, " (context missing)");
-
-		(*consumed) = -1;
-		return;
-	}
-
-	/* get first byte of Size */
-	Size = tvb_get_guint8(tvb, offset);
-	offset++;
-	(*consumed)++;
-
-	if ( Size == 255 ) {
-
-		/* check for next 4 bytes */
-		if ( !tvb_bytes_exist(tvb, offset, 4) ) {
-
-			expert_add_info_format(pinfo, item, &ei_icep_context_missing, "second field of Size missing");
-			col_append_str(pinfo->cinfo, COL_INFO, " (second field of Size missing)");
-
-			(*consumed) = -1;
-			return;
-		}
-
-		/* get second field of Size */
-		Size = tvb_get_letohl(tvb, offset);
-		offset += 4;
-		(*consumed) += 4;
-	}
-
-	DBG1("context.Size --> %d\n", Size);
-
-	if ( Size > icep_max_ice_context_pairs ) {
-
-		/* display the XX Size byte when click here */
-		expert_add_info(pinfo, item, &ei_icep_context_too_long);
-
-		col_append_str(pinfo->cinfo, COL_INFO, " (too long context)");
-
-		(*consumed) = -1;
-		return;
-	}
-
-	if (Size == 0) {
-		s = "(empty)";
-		/* display the 0x00 Size byte when click on a empty context */
-		proto_tree_add_string(tree, hf_icep_context, tvb, offset - 1, 1, s);
-		return;
-	}
-
-	/* looping through the dictionary */
-	for ( i = 0; i < Size; i++ ) {
-		/* key */
-		gint32 consumed_key = 0;
-		char *str_key = NULL;
-		/* value */
-		gint32 consumed_value = 0;
-		char *str_value = NULL;
-		proto_item *ti = NULL;
-
-		DBG1("looping through context dictionary, loop #%d\n", i);
-		ti = proto_tree_add_text(tree, tvb, offset, -1, "Invocation Context");
-
-		dissect_ice_string(pinfo, tree, ti, hf_icep_invocation_key, tvb, offset, &consumed_key, &str_key);
-
-		if ( consumed_key == -1 ) {
-			(*consumed) = -1;
-			return;
-		}
-
-		offset += consumed_key;
-		(*consumed) += consumed_key;
-
-		dissect_ice_string(pinfo, tree, ti, hf_icep_invocation_value, tvb, offset, &consumed_value, &str_value);
-
-		if ( consumed_value == -1 ) {
-			(*consumed) = -1;
-			return;
-		}
-
-		offset += consumed_value;
-		(*consumed) += consumed_value;
-		if (ti)
-			proto_item_set_len(ti, (consumed_key + consumed_value) + 1);
-	}
+    /*  p. 588, chapter 23.2.7 and p. 613, 23.3.2:
+     *  "context" is a dictionary<string, string>
+     *
+     * dictionary<string, string> == Size + SizeKeyValuePairs
+     * dictionary<string, string> = 1byte (0..254) + SizeKeyValuePairs
+     * or
+     * dictionary<string, string>= 1byte (255) + 1int (255..2^32-1)+SizeKeyValuePairs
+     *
+     */
+
+    guint32 Size = 0; /* number of key-value in the dictionary */
+    guint32 i = 0;
+    const char *s = NULL;
+
+    (*consumed) = 0;
+
+    /* check first byte */
+    if ( !tvb_bytes_exist(tvb, offset, 1) ) {
+
+        expert_add_info_format(pinfo, item, &ei_icep_context_missing, "context missing");
+        col_append_str(pinfo->cinfo, COL_INFO, " (context missing)");
+
+        (*consumed) = -1;
+        return;
+    }
+
+    /* get first byte of Size */
+    Size = tvb_get_guint8(tvb, offset);
+    offset++;
+    (*consumed)++;
+
+    if ( Size == 255 ) {
+
+        /* check for next 4 bytes */
+        if ( !tvb_bytes_exist(tvb, offset, 4) ) {
+
+            expert_add_info_format(pinfo, item, &ei_icep_context_missing, "second field of Size missing");
+            col_append_str(pinfo->cinfo, COL_INFO, " (second field of Size missing)");
+
+            (*consumed) = -1;
+            return;
+        }
+
+        /* get second field of Size */
+        Size = tvb_get_letohl(tvb, offset);
+        offset += 4;
+        (*consumed) += 4;
+    }
+
+    DBG1("context.Size --> %d\n", Size);
+
+    if ( Size > icep_max_ice_context_pairs ) {
+
+        /* display the XX Size byte when click here */
+        expert_add_info(pinfo, item, &ei_icep_context_too_long);
+
+        col_append_str(pinfo->cinfo, COL_INFO, " (too long context)");
+
+        (*consumed) = -1;
+        return;
+    }
+
+    if (Size == 0) {
+        s = "(empty)";
+        /* display the 0x00 Size byte when click on a empty context */
+        proto_tree_add_string(tree, hf_icep_context, tvb, offset - 1, 1, s);
+        return;
+    }
+
+    /* looping through the dictionary */
+    for ( i = 0; i < Size; i++ ) {
+        /* key */
+        gint32 consumed_key = 0;
+        char *str_key = NULL;
+        /* value */
+        gint32 consumed_value = 0;
+        char *str_value = NULL;
+        proto_item *ti = NULL;
+
+        DBG1("looping through context dictionary, loop #%d\n", i);
+        ti = proto_tree_add_text(tree, tvb, offset, -1, "Invocation Context");
+
+        dissect_ice_string(pinfo, tree, ti, hf_icep_invocation_key, tvb, offset, &consumed_key, &str_key);
+
+        if ( consumed_key == -1 ) {
+            (*consumed) = -1;
+            return;
+        }
+
+        offset += consumed_key;
+        (*consumed) += consumed_key;
+
+        dissect_ice_string(pinfo, tree, ti, hf_icep_invocation_value, tvb, offset, &consumed_value, &str_value);
+
+        if ( consumed_value == -1 ) {
+            (*consumed) = -1;
+            return;
+        }
+
+        offset += consumed_value;
+        (*consumed) += consumed_value;
+        if (ti)
+            proto_item_set_len(ti, (consumed_key + consumed_value) + 1);
+    }
 }
 
 /*
@@ -451,912 +451,912 @@ static void dissect_ice_context(packet_info *pinfo, proto_tree *tree, proto_item
  * bytes in "*consumed", if errors "*consumed" is -1.
  */
 static void dissect_ice_params(packet_info *pinfo, proto_tree *tree, proto_item *item, tvbuff_t *tvb,
-							   guint32 offset, gint32 *consumed)
+                               guint32 offset, gint32 *consumed)
 {
-	/*  p. 612, chapter 23.3.2 and p. 587, 23.2.2:
-	 *  "params" is an Encapsulation
-	 *
-	 *  struct Encapsulation {
-	 *  	int size;
-	 *  	byte major;
-	 *      byte minor;
-	 *      //(size - 6) bytes of data
-	 *  }
-	 *
-	 */
+    /*  p. 612, chapter 23.3.2 and p. 587, 23.2.2:
+     *  "params" is an Encapsulation
+     *
+     *  struct Encapsulation {
+     *      int size;
+     *      byte major;
+     *      byte minor;
+     *      //(size - 6) bytes of data
+     *  }
+     *
+     */
 
-	gint32 size = 0;
-	gint tvb_data_remained = 0;
+    gint32 size = 0;
+    gint tvb_data_remained = 0;
 
-	(*consumed) = 0;
+    (*consumed) = 0;
 
-	/* check first 6 bytes */
-	if ( !tvb_bytes_exist(tvb, offset, ICEP_MIN_PARAMS_SIZE) ) {
+    /* check first 6 bytes */
+    if ( !tvb_bytes_exist(tvb, offset, ICEP_MIN_PARAMS_SIZE) ) {
 
-		expert_add_info(pinfo, item, &ei_icep_params_missing);
-		col_append_str(pinfo->cinfo, COL_INFO, " (params missing)");
+        expert_add_info(pinfo, item, &ei_icep_params_missing);
+        col_append_str(pinfo->cinfo, COL_INFO, " (params missing)");
 
-		(*consumed) = -1;
-		return;
-	}
+        (*consumed) = -1;
+        return;
+    }
 
-	/* get the size */
-	size = tvb_get_letohl(tvb, offset);
+    /* get the size */
+    size = tvb_get_letohl(tvb, offset);
 
-	DBG1("params.size --> %d\n", size);
+    DBG1("params.size --> %d\n", size);
 
-	if ( size < ICEP_MIN_PARAMS_SIZE ) {
+    if ( size < ICEP_MIN_PARAMS_SIZE ) {
 
-		expert_add_info(pinfo, item, &ei_icep_params_size);
-		col_append_str(pinfo->cinfo, COL_INFO, " (params size too small)");
+        expert_add_info(pinfo, item, &ei_icep_params_size);
+        col_append_str(pinfo->cinfo, COL_INFO, " (params size too small)");
 
-		(*consumed) = -1;
-		return;
-	}
+        (*consumed) = -1;
+        return;
+    }
 
-	if ( tree ) {
+    if ( tree ) {
 
-		proto_tree_add_item(tree, hf_icep_params_size, tvb, offset, 4, ENC_LITTLE_ENDIAN);
-		offset += 4;
-		(*consumed) += 4;
+        proto_tree_add_item(tree, hf_icep_params_size, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+        offset += 4;
+        (*consumed) += 4;
 
-		proto_tree_add_item(tree, hf_icep_params_major, tvb, offset, 1, ENC_LITTLE_ENDIAN);
-		offset += 1;
-		(*consumed)++;
+        proto_tree_add_item(tree, hf_icep_params_major, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset += 1;
+        (*consumed)++;
 
-		proto_tree_add_item(tree, hf_icep_params_minor, tvb, offset, 1, ENC_LITTLE_ENDIAN);
-		offset += 1;
-		(*consumed)++;
+        proto_tree_add_item(tree, hf_icep_params_minor, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset += 1;
+        (*consumed)++;
 
-	} else {
-		/* skip size, major, minor */
-		offset += 6;
-		(*consumed) += 6;
-	}
+    } else {
+        /* skip size, major, minor */
+        offset += 6;
+        (*consumed) += 6;
+    }
 
-	if( size == ICEP_MIN_PARAMS_SIZE ) /* no encapsulatd data present, it's normal */
-		return;
+    if( size == ICEP_MIN_PARAMS_SIZE ) /* no encapsulatd data present, it's normal */
+        return;
 
-	/* check if I got all encapsulated data */
-	tvb_data_remained = tvb_reported_length_remaining(tvb, offset);
+    /* check if I got all encapsulated data */
+    tvb_data_remained = tvb_reported_length_remaining(tvb, offset);
 
-	if ( tvb_data_remained < ( size - ICEP_MIN_PARAMS_SIZE ) ) {
+    if ( tvb_data_remained < ( size - ICEP_MIN_PARAMS_SIZE ) ) {
 
-		expert_add_info_format(pinfo, item, &ei_icep_params_encapsulated, "missing encapsulated data (%d bytes)", size - ICEP_MIN_PARAMS_SIZE - tvb_data_remained);
+        expert_add_info_format(pinfo, item, &ei_icep_params_encapsulated, "missing encapsulated data (%d bytes)", size - ICEP_MIN_PARAMS_SIZE - tvb_data_remained);
 
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-					" (missing encapsulated data (%d bytes))",
-					size - ICEP_MIN_PARAMS_SIZE - tvb_data_remained);
+        col_append_fstr(pinfo->cinfo, COL_INFO,
+                    " (missing encapsulated data (%d bytes))",
+                    size - ICEP_MIN_PARAMS_SIZE - tvb_data_remained);
 
-		(*consumed) = -1;
-		return;
-	}
+        (*consumed) = -1;
+        return;
+    }
 
-	/* encapsulated params */
-	proto_tree_add_item(tree, hf_icep_params_encapsulated, tvb, offset, (size - ICEP_MIN_PARAMS_SIZE), ENC_LITTLE_ENDIAN);
+    /* encapsulated params */
+    proto_tree_add_item(tree, hf_icep_params_encapsulated, tvb, offset, (size - ICEP_MIN_PARAMS_SIZE), ENC_LITTLE_ENDIAN);
 
-	(*consumed) += (size - ICEP_MIN_PARAMS_SIZE);
+    (*consumed) += (size - ICEP_MIN_PARAMS_SIZE);
 }
 
 static void dissect_icep_request_common(tvbuff_t *tvb, guint32 offset,
-					packet_info *pinfo, proto_tree *icep_sub_tree, proto_item* icep_sub_item, gint32 *total_consumed)
+                    packet_info *pinfo, proto_tree *icep_sub_tree, proto_item* icep_sub_item, gint32 *total_consumed)
 {
-	/*  p. 613, chapter 23.3.3 and p. 612 chapter 23.3.2:
-	 *  Request and BatchRequest differ only in the first 4 bytes (requestID)
-	 *  so them share this part
-	 *
-	 *	 Ice::Identity id;
-	 *	 Ice::StringSeq facet;
-	 *	 string operation;
-	 *	 byte mode;
-	 *	 Ice::Context context;
-	 *	 Encapsulation params;
-	 *  }
-	 */
+    /*  p. 613, chapter 23.3.3 and p. 612 chapter 23.3.2:
+     *  Request and BatchRequest differ only in the first 4 bytes (requestID)
+     *  so them share this part
+     *
+     *   Ice::Identity id;
+     *   Ice::StringSeq facet;
+     *   string operation;
+     *   byte mode;
+     *   Ice::Context context;
+     *   Encapsulation params;
+     *  }
+     */
 
-	gint32 consumed = 0;
-	char *namestr = NULL;
-	char *opstr = NULL;
+    gint32 consumed = 0;
+    char *namestr = NULL;
+    char *opstr = NULL;
 
-	(*total_consumed) = 0;
+    (*total_consumed) = 0;
 
-	/* check common header (i.e. the batch request one)*/
-	if ( !tvb_bytes_exist(tvb, offset, ICEP_MIN_COMMON_REQ_HEADER_SIZE) ) {
+    /* check common header (i.e. the batch request one)*/
+    if ( !tvb_bytes_exist(tvb, offset, ICEP_MIN_COMMON_REQ_HEADER_SIZE) ) {
 
-		expert_add_info_format(pinfo, icep_sub_item, &ei_icep_length, "too short header");
-		col_append_str(pinfo->cinfo, COL_INFO, " (too short header)");
+        expert_add_info_format(pinfo, icep_sub_item, &ei_icep_length, "too short header");
+        col_append_str(pinfo->cinfo, COL_INFO, " (too short header)");
 
-		goto error;
-	}
+        goto error;
+    }
 
-	/* got at least 15 bytes */
+    /* got at least 15 bytes */
 
-	/*  "id" is a:
-	 *  struct Identity {
-	 *      string name;
-	 *	string category;
-	 *  }
-	 */
+    /*  "id" is a:
+     *  struct Identity {
+     *      string name;
+     *  string category;
+     *  }
+     */
 
-	dissect_ice_string(pinfo, icep_sub_tree, icep_sub_item, hf_icep_id_name, tvb, offset, &consumed, &namestr);
+    dissect_ice_string(pinfo, icep_sub_tree, icep_sub_item, hf_icep_id_name, tvb, offset, &consumed, &namestr);
 
-	if ( consumed == -1 )
-		goto error;
+    if ( consumed == -1 )
+        goto error;
 
-	offset += consumed; DBG1("consumed --> %d\n", consumed);
-	(*total_consumed) += consumed;
+    offset += consumed; DBG1("consumed --> %d\n", consumed);
+    (*total_consumed) += consumed;
 
 
-	dissect_ice_string(pinfo, icep_sub_tree, icep_sub_item, hf_icep_id_category, tvb, offset, &consumed, NULL);
+    dissect_ice_string(pinfo, icep_sub_tree, icep_sub_item, hf_icep_id_category, tvb, offset, &consumed, NULL);
 
-	if ( consumed == -1 )
-		goto error;
+    if ( consumed == -1 )
+        goto error;
 
-	offset += consumed; DBG1("consumed --> %d\n", consumed);
-	(*total_consumed) += consumed;
+    offset += consumed; DBG1("consumed --> %d\n", consumed);
+    (*total_consumed) += consumed;
 
 
-	/*  "facet" is a:
-	 *  sequence<string> StringSeq
-	 *
-	 */
+    /*  "facet" is a:
+     *  sequence<string> StringSeq
+     *
+     */
 
-	dissect_ice_facet(pinfo, icep_sub_tree, icep_sub_item, hf_icep_facet, tvb, offset, &consumed);
+    dissect_ice_facet(pinfo, icep_sub_tree, icep_sub_item, hf_icep_facet, tvb, offset, &consumed);
 
-	if ( consumed == -1 )
-		goto error;
+    if ( consumed == -1 )
+        goto error;
 
-	offset += consumed; DBG1("consumed --> %d\n", consumed);
-	(*total_consumed) += consumed;
+    offset += consumed; DBG1("consumed --> %d\n", consumed);
+    (*total_consumed) += consumed;
 
-	/*  "operation" is an ice_string
-	 *
-	 */
+    /*  "operation" is an ice_string
+     *
+     */
 
-	dissect_ice_string(pinfo, icep_sub_tree, icep_sub_item, hf_icep_operation, tvb, offset, &consumed, &opstr);
+    dissect_ice_string(pinfo, icep_sub_tree, icep_sub_item, hf_icep_operation, tvb, offset, &consumed, &opstr);
 
-	if ( consumed == -1 )
-		goto error;
-	else {
-		offset += consumed; DBG1("consumed --> %d\n", consumed);
-		(*total_consumed) += consumed;
+    if ( consumed == -1 )
+        goto error;
+    else {
+        offset += consumed; DBG1("consumed --> %d\n", consumed);
+        (*total_consumed) += consumed;
 
-		if ( opstr && namestr ) {
-			DBG2("operation --> %s.%s()\n", namestr, opstr);
-			col_append_fstr(pinfo->cinfo, COL_INFO, " %s.%s()",
-						namestr, opstr);
-			opstr = NULL;
-			namestr = NULL;
-		}
-	}
+        if ( opstr && namestr ) {
+            DBG2("operation --> %s.%s()\n", namestr, opstr);
+            col_append_fstr(pinfo->cinfo, COL_INFO, " %s.%s()",
+                        namestr, opstr);
+            opstr = NULL;
+            namestr = NULL;
+        }
+    }
 
-	/* check and get mode byte */
-	if ( !tvb_bytes_exist(tvb, offset, 1) ) {
+    /* check and get mode byte */
+    if ( !tvb_bytes_exist(tvb, offset, 1) ) {
 
-		expert_add_info(pinfo, icep_sub_item, &ei_icep_mode_missing);
+        expert_add_info(pinfo, icep_sub_item, &ei_icep_mode_missing);
 
-		col_append_str(pinfo->cinfo, COL_INFO, " (mode field missing)");
-		goto error;
-	}
+        col_append_str(pinfo->cinfo, COL_INFO, " (mode field missing)");
+        goto error;
+    }
 
-	proto_tree_add_item(icep_sub_tree, hf_icep_mode, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    proto_tree_add_item(icep_sub_tree, hf_icep_mode, tvb, offset, 1, ENC_LITTLE_ENDIAN);
 
-	offset++; DBG0("consumed --> 1\n");
-	(*total_consumed)++;
+    offset++; DBG0("consumed --> 1\n");
+    (*total_consumed)++;
 
 
-	/*  "context" is a dictionary<string, string>
-	 *
-	 */
+    /*  "context" is a dictionary<string, string>
+     *
+     */
 
-	dissect_ice_context(pinfo, icep_sub_tree, icep_sub_item, tvb, offset, &consumed);
+    dissect_ice_context(pinfo, icep_sub_tree, icep_sub_item, tvb, offset, &consumed);
 
-	if ( consumed == -1 )
-		goto error;
+    if ( consumed == -1 )
+        goto error;
 
-	offset += consumed; DBG1("consumed --> %d\n", consumed);
-	(*total_consumed) += consumed;
+    offset += consumed; DBG1("consumed --> %d\n", consumed);
+    (*total_consumed) += consumed;
 
-	/*  "params" is a Encapsulation
-	 *
-	 */
+    /*  "params" is a Encapsulation
+     *
+     */
 
-	dissect_ice_params(pinfo, icep_sub_tree, icep_sub_item, tvb, offset, &consumed);
+    dissect_ice_params(pinfo, icep_sub_tree, icep_sub_item, tvb, offset, &consumed);
 
-	if ( consumed == -1 )
-		goto error;
+    if ( consumed == -1 )
+        goto error;
 
-	/*offset += consumed;*/
-	 DBG1("consumed --> %d\n", consumed);
-	(*total_consumed) += consumed;
+    /*offset += consumed;*/
+     DBG1("consumed --> %d\n", consumed);
+    (*total_consumed) += consumed;
 
-	return;
+    return;
 
 error:
-	(*total_consumed) = -1;
+    (*total_consumed) = -1;
 }
 
 
-static void dissect_icep_request(tvbuff_t *tvb, guint32 offset, 
-								 packet_info *pinfo, proto_tree *icep_tree, proto_item* icep_item)
+static void dissect_icep_request(tvbuff_t *tvb, guint32 offset,
+                                 packet_info *pinfo, proto_tree *icep_tree, proto_item* icep_item)
 {
-	/*  p. 612, chapter 23.3.2:
-	 *
-	 *  struct RequestData {
-	 * 	 int requestID;
-	 *	 Ice::Identity id;
-	 *	 Ice::StringSeq facet;
-	 *	 string operation;
-	 *	 byte mode;
-	 *	 Ice::Context context;
-	 *	 Encapsulation params;
-	 *  }
-	 */
+    /*  p. 612, chapter 23.3.2:
+     *
+     *  struct RequestData {
+     *   int requestID;
+     *   Ice::Identity id;
+     *   Ice::StringSeq facet;
+     *   string operation;
+     *   byte mode;
+     *   Ice::Context context;
+     *   Encapsulation params;
+     *  }
+     */
 
-	proto_item *ti = NULL;
-	proto_tree *icep_sub_tree = NULL;
-	gint32 consumed = 0;
-	guint32 reqid = 0;
+    proto_item *ti = NULL;
+    proto_tree *icep_sub_tree = NULL;
+    gint32 consumed = 0;
+    guint32 reqid = 0;
 
-	DBG0("dissect request\n");
+    DBG0("dissect request\n");
 
-	/* check for req id */
-	if ( !tvb_bytes_exist(tvb, offset, 4) ) {
+    /* check for req id */
+    if ( !tvb_bytes_exist(tvb, offset, 4) ) {
 
-		expert_add_info_format(pinfo, icep_item, &ei_icep_length, "too short header");
-		col_append_str(pinfo->cinfo, COL_INFO, " (too short header)");
-		return;
-	}
+        expert_add_info_format(pinfo, icep_item, &ei_icep_length, "too short header");
+        col_append_str(pinfo->cinfo, COL_INFO, " (too short header)");
+        return;
+    }
 
-	/* got at least 4 bytes */
+    /* got at least 4 bytes */
 
-	/* create display subtree for this message type */
+    /* create display subtree for this message type */
 
-	reqid = tvb_get_letohl(tvb, offset);
+    reqid = tvb_get_letohl(tvb, offset);
 
-	ti = proto_tree_add_text(icep_tree, tvb, offset, -1, "Request Message Body");
-	icep_sub_tree = proto_item_add_subtree(ti, ett_icep_msg);
+    ti = proto_tree_add_text(icep_tree, tvb, offset, -1, "Request Message Body");
+    icep_sub_tree = proto_item_add_subtree(ti, ett_icep_msg);
 
-	proto_tree_add_item(icep_sub_tree, hf_icep_request_id, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    proto_tree_add_item(icep_sub_tree, hf_icep_request_id, tvb, offset, 4, ENC_LITTLE_ENDIAN);
 
-	if ( reqid != 0 ) {
-		col_append_fstr(pinfo->cinfo, COL_INFO, "(%d):", tvb_get_letohl(tvb, offset));
-	} else
-		col_append_str(pinfo->cinfo, COL_INFO, "(oneway):");
+    if ( reqid != 0 ) {
+        col_append_fstr(pinfo->cinfo, COL_INFO, "(%d):", tvb_get_letohl(tvb, offset));
+    } else
+        col_append_str(pinfo->cinfo, COL_INFO, "(oneway):");
 
 
-	offset += 4;
-	DBG0("consumed --> 4\n");
+    offset += 4;
+    DBG0("consumed --> 4\n");
 
-	dissect_icep_request_common(tvb, offset, pinfo, icep_sub_tree, ti, &consumed);
+    dissect_icep_request_common(tvb, offset, pinfo, icep_sub_tree, ti, &consumed);
 
-	if ( consumed == -1 )
-		return;
+    if ( consumed == -1 )
+        return;
 
-	/*offset += consumed;*/
-	DBG1("consumed --> %d\n", consumed);
+    /*offset += consumed;*/
+    DBG1("consumed --> %d\n", consumed);
 }
 
 
 
 static void dissect_icep_batch_request(tvbuff_t *tvb, guint32 offset,
-										packet_info *pinfo, proto_tree *icep_tree, proto_item* icep_item)
+                                        packet_info *pinfo, proto_tree *icep_tree, proto_item* icep_item)
 {
-	/*  p. 613, chapter 23.3.3
-	 *  A batch request msg is a "sequence" of batch request
-	 *  Sequence is Size + elements
-	 *
-	 *  struct BatchRequestData {
-	 *	 Ice::Identity id;
-	 *	 Ice::StringSeq facet;
-	 *	 string operation;
-	 *	 byte mode;
-	 *	 Ice::Context context;
-	 *	 Encapsulation params;
-	 *  }
-	 *
-	 * NOTE!!!:
-	 * The only real implementation of the Ice protocol puts a 32bit count in front
-	 * of a Batch Request, *not* an Ice::Sequence (as the standard says). Basically the
-	 * same people wrote both code and standard so I'll follow the code.
-	 */
+    /*  p. 613, chapter 23.3.3
+     *  A batch request msg is a "sequence" of batch request
+     *  Sequence is Size + elements
+     *
+     *  struct BatchRequestData {
+     *   Ice::Identity id;
+     *   Ice::StringSeq facet;
+     *   string operation;
+     *   byte mode;
+     *   Ice::Context context;
+     *   Encapsulation params;
+     *  }
+     *
+     * NOTE!!!:
+     * The only real implementation of the Ice protocol puts a 32bit count in front
+     * of a Batch Request, *not* an Ice::Sequence (as the standard says). Basically the
+     * same people wrote both code and standard so I'll follow the code.
+     */
 
-	proto_item *ti = NULL;
-	proto_tree *icep_sub_tree = NULL;
-	guint32 num_reqs = 0;
-	guint32 i = 0;
-	gint32 consumed = 0;
+    proto_item *ti = NULL;
+    proto_tree *icep_sub_tree = NULL;
+    guint32 num_reqs = 0;
+    guint32 i = 0;
+    gint32 consumed = 0;
 
-	DBG0("dissect batch request\n");
+    DBG0("dissect batch request\n");
 
-	/* check for first 4 byte */
-	if ( !tvb_bytes_exist(tvb, offset, 4) ) {
+    /* check for first 4 byte */
+    if ( !tvb_bytes_exist(tvb, offset, 4) ) {
 
-		expert_add_info_format(pinfo, icep_item, &ei_icep_length, "counter of batch requests missing");
-		col_append_str(pinfo->cinfo, COL_INFO, " (counter of batch requests missing)");
-		return;
-	}
+        expert_add_info_format(pinfo, icep_item, &ei_icep_length, "counter of batch requests missing");
+        col_append_str(pinfo->cinfo, COL_INFO, " (counter of batch requests missing)");
+        return;
+    }
 
-	num_reqs = tvb_get_letohl(tvb, offset);
-	offset += 4;
+    num_reqs = tvb_get_letohl(tvb, offset);
+    offset += 4;
 
-	DBG1("batch_requests.count --> %d\n", num_reqs);
+    DBG1("batch_requests.count --> %d\n", num_reqs);
 
-	if ( num_reqs > icep_max_batch_requests ) {
+    if ( num_reqs > icep_max_batch_requests ) {
 
-		expert_add_info_format(pinfo, icep_item, &ei_icep_batch_requests, "too many batch requests (%d)", num_reqs);
+        expert_add_info_format(pinfo, icep_item, &ei_icep_batch_requests, "too many batch requests (%d)", num_reqs);
 
-		col_append_fstr(pinfo->cinfo, COL_INFO, " (too many batch requests, %d)", num_reqs);
-		return;
-	}
+        col_append_fstr(pinfo->cinfo, COL_INFO, " (too many batch requests, %d)", num_reqs);
+        return;
+    }
 
-	if ( num_reqs == 0 ) {
+    if ( num_reqs == 0 ) {
 
-		proto_tree_add_text(icep_tree, tvb, offset, -1,
-					    "empty batch requests sequence");
-		col_append_str(pinfo->cinfo, COL_INFO, " (empty batch requests sequence)");
+        proto_tree_add_text(icep_tree, tvb, offset, -1,
+                        "empty batch requests sequence");
+        col_append_str(pinfo->cinfo, COL_INFO, " (empty batch requests sequence)");
 
-		return;
-	}
+        return;
+    }
 
 
-	col_append_str(pinfo->cinfo, COL_INFO, ":");
+    col_append_str(pinfo->cinfo, COL_INFO, ":");
 
-	/*
-	 * process requests
-	 */
+    /*
+     * process requests
+     */
 
-	for ( i = 0; i < num_reqs; i++ ) {
+    for ( i = 0; i < num_reqs; i++ ) {
 
-		DBG1("looping through sequence of batch requests, loop #%d\n", i);
+        DBG1("looping through sequence of batch requests, loop #%d\n", i);
 
-		/* create display subtree for this message type */
+        /* create display subtree for this message type */
 
-		ti = proto_tree_add_text(icep_tree, tvb, offset, -1,
-						 "Batch Request Message Body: #%d", i);
-			icep_sub_tree = proto_item_add_subtree(ti, ett_icep_msg);
+        ti = proto_tree_add_text(icep_tree, tvb, offset, -1,
+                         "Batch Request Message Body: #%d", i);
+            icep_sub_tree = proto_item_add_subtree(ti, ett_icep_msg);
 
-		if (i != 0) {
-			col_append_str(pinfo->cinfo, COL_INFO, ",");
-		}
+        if (i != 0) {
+            col_append_str(pinfo->cinfo, COL_INFO, ",");
+        }
 
-		dissect_icep_request_common(tvb, offset, pinfo, icep_sub_tree, ti, &consumed);
+        dissect_icep_request_common(tvb, offset, pinfo, icep_sub_tree, ti, &consumed);
 
-		if ( consumed == -1 )
-			return;
+        if ( consumed == -1 )
+            return;
 
-		if ( icep_tree && ti )
-			proto_item_set_len(ti, consumed);
+        if ( icep_tree && ti )
+            proto_item_set_len(ti, consumed);
 
-		offset += consumed;
-		DBG1("consumed --> %d\n", consumed);
-	}
+        offset += consumed;
+        DBG1("consumed --> %d\n", consumed);
+    }
 }
 
-static void dissect_icep_reply(tvbuff_t *tvb, guint32 offset, 
-							   packet_info *pinfo, proto_tree *icep_tree, proto_item* icep_item)
+static void dissect_icep_reply(tvbuff_t *tvb, guint32 offset,
+                               packet_info *pinfo, proto_tree *icep_tree, proto_item* icep_item)
 {
-	/*  p. 614, chapter 23.3.4:
-	 *
-	 *  struct ReplyData {
-	 * 	 int requestId;
-	 *	 byte replyStatus;
-	 *	 [... messageSize - 19 bytes ...  ]
-	 *  }
-	 */
+    /*  p. 614, chapter 23.3.4:
+     *
+     *  struct ReplyData {
+     *   int requestId;
+     *   byte replyStatus;
+     *   [... messageSize - 19 bytes ...  ]
+     *  }
+     */
 
-	gint32 messageSize = 0;
-	guint32 tvb_data_remained = 0;
-	guint32 reported_reply_data = 0;
-	proto_item *ti = NULL;
-	proto_tree *icep_sub_tree = NULL;
+    gint32 messageSize = 0;
+    guint32 tvb_data_remained = 0;
+    guint32 reported_reply_data = 0;
+    proto_item *ti = NULL;
+    proto_tree *icep_sub_tree = NULL;
 
-	DBG0("dissect reply\n");
+    DBG0("dissect reply\n");
 
-	/* get at least a full reply message header */
+    /* get at least a full reply message header */
 
-	if ( !tvb_bytes_exist(tvb, offset, ICEP_MIN_REPLY_SIZE) ) {
+    if ( !tvb_bytes_exist(tvb, offset, ICEP_MIN_REPLY_SIZE) ) {
 
-		expert_add_info_format(pinfo, icep_item, &ei_icep_length, "too short header");
+        expert_add_info_format(pinfo, icep_item, &ei_icep_length, "too short header");
 
-		col_append_str(pinfo->cinfo, COL_INFO, " (too short header)");
-		return;
-	}
+        col_append_str(pinfo->cinfo, COL_INFO, " (too short header)");
+        return;
+    }
 
-	/* got 5 bytes, then data */
+    /* got 5 bytes, then data */
 
-	/* create display subtree for this message type */
+    /* create display subtree for this message type */
 
-	ti = proto_tree_add_text(icep_tree, tvb, offset, -1,
-					 "Reply Message Body");
+    ti = proto_tree_add_text(icep_tree, tvb, offset, -1,
+                     "Reply Message Body");
 
-	icep_sub_tree = proto_item_add_subtree(ti, ett_icep_msg);
+    icep_sub_tree = proto_item_add_subtree(ti, ett_icep_msg);
 
-	proto_tree_add_item(icep_sub_tree, hf_icep_request_id, tvb, offset, 4, ENC_LITTLE_ENDIAN);
+    proto_tree_add_item(icep_sub_tree, hf_icep_request_id, tvb, offset, 4, ENC_LITTLE_ENDIAN);
 
-	col_append_fstr(pinfo->cinfo, COL_INFO, "(%d):", tvb_get_letohl(tvb, offset));
+    col_append_fstr(pinfo->cinfo, COL_INFO, "(%d):", tvb_get_letohl(tvb, offset));
 
-	offset += 4;
+    offset += 4;
 
-	proto_tree_add_item(icep_sub_tree, hf_icep_reply_status, tvb, offset, 1, ENC_LITTLE_ENDIAN);
+    proto_tree_add_item(icep_sub_tree, hf_icep_reply_status, tvb, offset, 1, ENC_LITTLE_ENDIAN);
 
-	col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
-				val_to_str_const(tvb_get_guint8(tvb, offset),
+    col_append_fstr(pinfo->cinfo, COL_INFO, " %s",
+                val_to_str_const(tvb_get_guint8(tvb, offset),
                                                  icep_replystatus_vals,
                                                  "unknown reply status"));
 
-	offset++;
+    offset++;
 
-	DBG1("consumed --> %d\n", 5);
+    DBG1("consumed --> %d\n", 5);
 
-	/* check if I got all reply data */
-	tvb_data_remained = tvb_length_remaining(tvb, offset);
-	messageSize = tvb_get_letohl(tvb, 10);
-	reported_reply_data = messageSize - (ICEP_HEADER_SIZE + ICEP_MIN_REPLY_SIZE);
+    /* check if I got all reply data */
+    tvb_data_remained = tvb_length_remaining(tvb, offset);
+    messageSize = tvb_get_letohl(tvb, 10);
+    reported_reply_data = messageSize - (ICEP_HEADER_SIZE + ICEP_MIN_REPLY_SIZE);
 
-	/* no */
-	if ( tvb_data_remained < reported_reply_data ) {
+    /* no */
+    if ( tvb_data_remained < reported_reply_data ) {
 
-		expert_add_info_format(pinfo, ti, &ei_icep_reply_data, "Reply Data (missing %d bytes out of %d)", reported_reply_data - tvb_data_remained, reported_reply_data);
+        expert_add_info_format(pinfo, ti, &ei_icep_reply_data, "Reply Data (missing %d bytes out of %d)", reported_reply_data - tvb_data_remained, reported_reply_data);
 
-		col_append_fstr(pinfo->cinfo, COL_INFO,
-					" (missing reply data, %d bytes)",
-					reported_reply_data - tvb_data_remained);
+        col_append_fstr(pinfo->cinfo, COL_INFO,
+                    " (missing reply data, %d bytes)",
+                    reported_reply_data - tvb_data_remained);
 
-		/*offset += tvb_data_remained;*/
-		DBG1("consumed --> %d\n", tvb_data_remained);
-		return;
-	}
+        /*offset += tvb_data_remained;*/
+        DBG1("consumed --> %d\n", tvb_data_remained);
+        return;
+    }
 
-	/* yes (reported_reply_data can be 0) */
+    /* yes (reported_reply_data can be 0) */
 
-	proto_tree_add_item(icep_sub_tree, hf_icep_reply_data, tvb, offset, reported_reply_data, ENC_NA);
+    proto_tree_add_item(icep_sub_tree, hf_icep_reply_data, tvb, offset, reported_reply_data, ENC_NA);
 
-	/*offset += reported_reply_data;*/
-	DBG1("consumed --> %d\n", reported_reply_data);
+    /*offset += reported_reply_data;*/
+    DBG1("consumed --> %d\n", reported_reply_data);
 }
 
 static guint get_icep_pdu_len(packet_info *pinfo _U_, tvbuff_t *tvb, int offset)
 {
-	return tvb_get_letohl(tvb, offset + 10);
+    return tvb_get_letohl(tvb, offset + 10);
 }
 
 static void dissect_icep_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
-	/*  p. 611, chapter 23.3.1:
-	 *
-	 *  struct HeaderData {
-	 * 	 int magic;
-	 *	 byte protocolMajor;
-	 *	 byte protocolMinor;
-	 *	 byte encodingMajor;
-	 *	 byte encodingMinor;
-	 *	 byte messageType;
-	 *	 byte compressionStatus;
-	 *	 int messageSize;
-	 *  }
-	 */
-
-	proto_item *ti, *msg_item = NULL;
-	proto_tree *icep_tree;
-	guint32 offset = 0;
-
-	/* Make entries in Protocol column and Info column on summary display */
-
-	col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICEP");
-
-	col_add_str(pinfo->cinfo, COL_INFO,
-			     val_to_str(tvb_get_guint8(tvb, 8),
-					icep_msgtype_vals,
-					"Unknown Message Type: 0x%02x"));
-
-	DBG0("got an icep msg, start analysis\n");
-
-	/* create display subtree for the protocol */
-
-	ti = proto_tree_add_item(tree, proto_icep, tvb, 0, -1, ENC_NA);
-	icep_tree = proto_item_add_subtree(ti, ett_icep);
-
-	if (icep_tree) {
-		/* add items to the subtree */
-
-		/* message header */
-
-		proto_tree_add_text(icep_tree, tvb, offset, 4,
-				    "Magic Number: 'I','c','e','P'");
-		offset += 4;
-
-		proto_tree_add_item(icep_tree, hf_icep_protocol_major,
-				    tvb, offset, 1, ENC_LITTLE_ENDIAN);
-		offset++;
-
-		proto_tree_add_item(icep_tree, hf_icep_protocol_minor,
-				    tvb, offset, 1, ENC_LITTLE_ENDIAN);
-		offset++;
-
-		proto_tree_add_item(icep_tree, hf_icep_encoding_major,
-				    tvb, offset, 1, ENC_LITTLE_ENDIAN);
-		offset++;
-
-		proto_tree_add_item(icep_tree, hf_icep_encoding_minor,
-				    tvb, offset, 1, ENC_LITTLE_ENDIAN);
-		offset++;
-
-		msg_item = proto_tree_add_item(icep_tree, hf_icep_message_type,
-				    tvb, offset, 1, ENC_LITTLE_ENDIAN);
-		offset++;
-
-		proto_tree_add_item(icep_tree, hf_icep_compression_status,
-				    tvb, offset, 1, ENC_LITTLE_ENDIAN);
-		offset++;
-
-		proto_tree_add_item(icep_tree, hf_icep_message_size,
-				    tvb, offset, 4, ENC_LITTLE_ENDIAN);
-		offset += 4;
-	} else {
-		offset += ICEP_HEADER_SIZE;
-	}
-
-	switch(tvb_get_guint8(tvb, 8)) {
-	case 0x0:
-		DBG1("request message body: parsing %d bytes\n",
-		    tvb_length_remaining(tvb, offset));
-		dissect_icep_request(tvb, offset, pinfo, icep_tree, ti);
-		break;
-	case 0x1:
-		DBG1("batch request message body: parsing %d bytes\n",
-		    tvb_length_remaining(tvb, offset));
-		dissect_icep_batch_request(tvb, offset, pinfo, icep_tree, ti);
-		break;
-	case 0x2:
-		DBG1("reply message body: parsing %d bytes\n",
-		    tvb_length_remaining(tvb, offset));
-		dissect_icep_reply(tvb, offset, pinfo, icep_tree, ti);
-		break;
-	case 0x3:
-	case 0x4:
-	        /* messages already dissected */
-		break;
-	default:
-		expert_add_info_format(pinfo, msg_item, &ei_icep_message_type, "Unknown Message Type: 0x%02x", tvb_get_guint8(tvb, 8));
-		break;
-	}
+    /*  p. 611, chapter 23.3.1:
+     *
+     *  struct HeaderData {
+     *   int magic;
+     *   byte protocolMajor;
+     *   byte protocolMinor;
+     *   byte encodingMajor;
+     *   byte encodingMinor;
+     *   byte messageType;
+     *   byte compressionStatus;
+     *   int messageSize;
+     *  }
+     */
+
+    proto_item *ti, *msg_item = NULL;
+    proto_tree *icep_tree;
+    guint32 offset = 0;
+
+    /* Make entries in Protocol column and Info column on summary display */
+
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "ICEP");
+
+    col_add_str(pinfo->cinfo, COL_INFO,
+                 val_to_str(tvb_get_guint8(tvb, 8),
+                    icep_msgtype_vals,
+                    "Unknown Message Type: 0x%02x"));
+
+    DBG0("got an icep msg, start analysis\n");
+
+    /* create display subtree for the protocol */
+
+    ti = proto_tree_add_item(tree, proto_icep, tvb, 0, -1, ENC_NA);
+    icep_tree = proto_item_add_subtree(ti, ett_icep);
+
+    if (icep_tree) {
+        /* add items to the subtree */
+
+        /* message header */
+
+        proto_tree_add_text(icep_tree, tvb, offset, 4,
+                    "Magic Number: 'I','c','e','P'");
+        offset += 4;
+
+        proto_tree_add_item(icep_tree, hf_icep_protocol_major,
+                    tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+
+        proto_tree_add_item(icep_tree, hf_icep_protocol_minor,
+                    tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+
+        proto_tree_add_item(icep_tree, hf_icep_encoding_major,
+                    tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+
+        proto_tree_add_item(icep_tree, hf_icep_encoding_minor,
+                    tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+
+        msg_item = proto_tree_add_item(icep_tree, hf_icep_message_type,
+                    tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+
+        proto_tree_add_item(icep_tree, hf_icep_compression_status,
+                    tvb, offset, 1, ENC_LITTLE_ENDIAN);
+        offset++;
+
+        proto_tree_add_item(icep_tree, hf_icep_message_size,
+                    tvb, offset, 4, ENC_LITTLE_ENDIAN);
+        offset += 4;
+    } else {
+        offset += ICEP_HEADER_SIZE;
+    }
+
+    switch(tvb_get_guint8(tvb, 8)) {
+    case 0x0:
+        DBG1("request message body: parsing %d bytes\n",
+            tvb_length_remaining(tvb, offset));
+        dissect_icep_request(tvb, offset, pinfo, icep_tree, ti);
+        break;
+    case 0x1:
+        DBG1("batch request message body: parsing %d bytes\n",
+            tvb_length_remaining(tvb, offset));
+        dissect_icep_batch_request(tvb, offset, pinfo, icep_tree, ti);
+        break;
+    case 0x2:
+        DBG1("reply message body: parsing %d bytes\n",
+            tvb_length_remaining(tvb, offset));
+        dissect_icep_reply(tvb, offset, pinfo, icep_tree, ti);
+        break;
+    case 0x3:
+    case 0x4:
+            /* messages already dissected */
+        break;
+    default:
+        expert_add_info_format(pinfo, msg_item, &ei_icep_message_type, "Unknown Message Type: 0x%02x", tvb_get_guint8(tvb, 8));
+        break;
+    }
 }
 
 /* entry point */
 static gboolean dissect_icep_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-	DBG0("triggered\n");
+    DBG0("triggered\n");
 
-	if ( tvb_memeql(tvb, 0, icep_magic, 4) == -1 ) {
-		/* Not a ICEP packet. */
-		return FALSE;
-	}
+    if ( tvb_memeql(tvb, 0, icep_magic, 4) == -1 ) {
+        /* Not a ICEP packet. */
+        return FALSE;
+    }
 
-	/* start dissecting */
+    /* start dissecting */
 
-	tcp_dissect_pdus(tvb, pinfo, tree, TRUE, ICEP_HEADER_SIZE,
-	    get_icep_pdu_len, dissect_icep_pdu);
+    tcp_dissect_pdus(tvb, pinfo, tree, TRUE, ICEP_HEADER_SIZE,
+        get_icep_pdu_len, dissect_icep_pdu);
 
-	return TRUE;
+    return TRUE;
 }
 
 static gboolean dissect_icep_udp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data _U_)
 {
-	DBG0("triggered\n");
+    DBG0("triggered\n");
 
-	if ( tvb_memeql(tvb, 0, icep_magic, 4) == -1 ) {
-		/* Not a ICEP packet. */
-		return FALSE;
-	}
+    if ( tvb_memeql(tvb, 0, icep_magic, 4) == -1 ) {
+        /* Not a ICEP packet. */
+        return FALSE;
+    }
 
-	/* start dissecting */
-	dissect_icep_pdu(tvb, pinfo, tree);
-	return TRUE;
+    /* start dissecting */
+    dissect_icep_pdu(tvb, pinfo, tree);
+    return TRUE;
 }
 
 /* Register the protocol with Wireshark */
 
 void proto_register_icep(void)
 {
-	module_t *icep_module;
-	expert_module_t* expert_icep;
-
-	/* Setup list of header fields */
-
-	static hf_register_info hf[] = {
-
-		{ &hf_icep_protocol_major,
-		  {
-			  "Protocol Major", "icep.protocol_major",
-			  FT_INT8, BASE_DEC, NULL, 0x0,
-			  "The protocol major version number", HFILL
-		  }
-		},
-
-		{ &hf_icep_protocol_minor,
-		  {
-			  "Protocol Minor", "icep.protocol_minor",
-			  FT_INT8, BASE_DEC, NULL, 0x0,
-			  "The protocol minor version number", HFILL
-		  }
-		},
-
-		{ &hf_icep_encoding_major,
-		  {
-			  "Encoding Major", "icep.encoding_major",
-			  FT_INT8, BASE_DEC, NULL, 0x0,
-			  "The encoding major version number", HFILL
-		  }
-		},
-
-		{ &hf_icep_encoding_minor,
-		  {
-			  "Encoding Minor", "icep.encoding_minor",
-			  FT_INT8, BASE_DEC, NULL, 0x0,
-			  "The encoding minor version number", HFILL
-		  }
-		},
-
-		{ &hf_icep_message_type,
-		  {
-			  "Message Type", "icep.message_type",
-			  FT_INT8, BASE_DEC, VALS(icep_msgtype_vals), 0x0,
-			  "The message type", HFILL
-		  }
-		},
-
-		{ &hf_icep_compression_status,
-		  {
-			  "Compression Status", "icep.compression_status",
-			  FT_INT8, BASE_DEC, VALS(icep_zipstatus_vals), 0x0,
-			  "The compression status of the message", HFILL
-		  }
-		},
-
-		{ &hf_icep_message_size,
-		  {
-			  "Message Size", "icep.message_status",
-			  FT_INT32, BASE_DEC, NULL, 0x0,
-			  "The size of the message in bytes, including the header",
-			  HFILL
-		  }
-		},
-
-		{ &hf_icep_request_id,
-		  {
-			  "Request Identifier", "icep.request_id",
-			  FT_INT32, BASE_DEC, NULL, 0x0,
-			  "The request identifier",
-			  HFILL
-		  }
-		},
-
-		{ &hf_icep_reply_status,
-		  {
-			  "Reply Status", "icep.protocol_major",
-			  FT_INT8, BASE_DEC, VALS(icep_replystatus_vals), 0x0,
-			  "The reply status", HFILL
-		  }
-		},
-
-		{ &hf_icep_id_name,
-		  {
-			  "Object Identity Name", "icep.id.name",
-			  FT_STRINGZ, BASE_NONE, NULL, 0x0,
-			  "The object identity name", HFILL
-		  }
-		},
-
-		{ &hf_icep_id_category,
-		  {
-			  "Object Identity Content", "icep.id.content",
-			  FT_STRINGZ, BASE_NONE, NULL, 0x0,
-			  "The object identity content", HFILL
-		  }
-		},
-
-		{ &hf_icep_facet,
-		  {
-			  "Facet Name", "icep.facet",
-			  FT_STRINGZ, BASE_NONE, NULL, 0x0,
-			  "The facet name", HFILL
-		  }
-		},
-
-		{ &hf_icep_operation,
-		  {
-			  "Operation Name", "icep.operation",
-			  FT_STRINGZ, BASE_NONE, NULL, 0x0,
-			  "The operation name", HFILL
-		  }
-		},
-
-		{ &hf_icep_mode,
-		  {
-			  "Ice::OperationMode", "icep.operation_mode",
-			  FT_INT8, BASE_DEC, VALS(icep_mode_vals), 0x0,
-			  "A byte representing Ice::OperationMode", HFILL
-		  }
-		},
-
-		{ &hf_icep_context,
-		  {
-			  "Invocation Context", "icep.context",
-			  FT_STRINGZ, BASE_NONE, NULL, 0x0,
-			  "The invocation context", HFILL
-		  }
-		},
-
-		{ &hf_icep_params_size,
-		  {
-			  "Input Parameters Size", "icep.params.size",
-			  FT_INT32, BASE_DEC, NULL, 0x0,
-			  "The encapsulated input parameters size",
-			  HFILL
-		  }
-		},
-
-		{ &hf_icep_params_major,
-		  {
-			  "Input Parameters Encoding Major",
-			  "icep.params.major",
-			  FT_INT8, BASE_DEC, NULL, 0x0,
-			  "The major encoding version of encapsulated parameters",
-			  HFILL
-		  }
-		},
-
-		{ &hf_icep_params_minor,
-		  {
-			  "Input Parameters Encoding Minor",
-			  "icep.params.minor",
-			  FT_INT8, BASE_DEC, NULL, 0x0,
-			  "The minor encoding version of encapsulated parameters",
-			  HFILL
-		  }
-		},
-
-		{ &hf_icep_params_encapsulated,
-		  {
-			  "Encapsulated parameters",
-			  "icep.params.encapsulated",
-			  FT_BYTES, BASE_NONE, NULL, 0x0,
-			  "Remaining encapsulated parameters",
-			  HFILL
-		  }
-		},
-
-		{ &hf_icep_reply_data,
-		  {
-			  "Reported reply data",
-			  "icep.params.reply_data",
-			  FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
-		  }
-		},
-
-		{ &hf_icep_invocation_key,
-		  {
-			  "Key",
-			  "icep.invocation_key",
-			  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL
-		  }
-		},
-
-		{ &hf_icep_invocation_value,
-		  {
-			  "Value",
-			  "icep.invocation_value",
-			  FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL
-		  }
-		},
-	};
-
-	/* Setup protocol subtree array */
-
-	static gint *ett[] = {
-		&ett_icep,
-		&ett_icep_msg,
-	};
-
-	static ei_register_info ei[] = {
-		{ &ei_icep_string_malformed, { "icep.string.malformed", PI_MALFORMED, PI_ERROR, "String malformed", EXPFILL }},
-		{ &ei_icep_string_too_long, { "icep.string.too_long", PI_PROTOCOL, PI_WARN, "string too long", EXPFILL }},
-		{ &ei_icep_facet_missing, { "icep.facet.missing", PI_MALFORMED, PI_ERROR, "facet field missing", EXPFILL }},
-		{ &ei_icep_facet_max_one_element, { "icep.facet.max_one_element", PI_PROTOCOL, PI_WARN, "facet can be max one element", EXPFILL }},
-		{ &ei_icep_context_missing, { "icep.context.missing", PI_MALFORMED, PI_ERROR, "context missing", EXPFILL }},
-		{ &ei_icep_context_too_long, { "icep.context.too_long", PI_PROTOCOL, PI_WARN, "too long context", EXPFILL }},
-		{ &ei_icep_params_missing, { "icep.params.missing", PI_MALFORMED, PI_ERROR, "params missing", EXPFILL }},
-		{ &ei_icep_params_size, { "icep.params.size.invalid", PI_PROTOCOL, PI_WARN, "params size too small", EXPFILL }},
-		{ &ei_icep_params_encapsulated, { "icep.params.encapsulated.missing", PI_PROTOCOL, PI_WARN, "missing encapsulated data (%d bytes)", EXPFILL }},
-		{ &ei_icep_length, { "icep.length_invalid", PI_MALFORMED, PI_ERROR, "Invalid length", EXPFILL }},
-		{ &ei_icep_mode_missing, { "icep.mode.missing", PI_MALFORMED, PI_ERROR, "mode field missing", EXPFILL }},
-		{ &ei_icep_batch_requests, { "icep.batch_requests.invalid", PI_PROTOCOL, PI_WARN, "too many batch requests", EXPFILL }},
-		{ &ei_icep_reply_data, { "icep.params.reply_data.missing", PI_MALFORMED, PI_ERROR, "Reply Data missing", EXPFILL }},
-		{ &ei_icep_message_type, { "icep.message_type.unknown", PI_PROTOCOL, PI_WARN, "Unknown Message Type", EXPFILL }},
-	};
-
-	/* Register the protocol name and description */
-
-	proto_icep =
-		proto_register_protocol("Internet Communications Engine Protocol",
-					"ICEP", "icep");
-
-	/* Required function calls to register the header fields and subtrees used */
-
-	proto_register_field_array(proto_icep, hf, array_length(hf));
-	proto_register_subtree_array(ett, array_length(ett));
-	expert_icep = expert_register_protocol(proto_icep);
-	expert_register_field_array(expert_icep, ei, array_length(ei));
-
-	icep_module = prefs_register_protocol(proto_icep, NULL);
-
-	prefs_register_uint_preference(icep_module, "tcp.port",
-								 "ICEP TCP Port",
-								 "ICEP TCP port",
-								 10,
-								 &icep_tcp_port);
-
-	prefs_register_uint_preference(icep_module, "udp.port",
-								 "ICEP UDP Port",
-								 "ICEP UDP port",
-								 10,
-								 &icep_udp_port);
-
-	prefs_register_uint_preference(icep_module, "max_batch_requests",
-								  "Maximum batch requests",
-								  "Maximum number of batch requests allowed",
-								  10, &icep_max_batch_requests);
-
-	prefs_register_uint_preference(icep_module, "max_ice_string_len",
-								  "Maximum string length",
-								  "Maximum length allowed of an ICEP string",
-								  10, &icep_max_ice_string_len);
-
-	prefs_register_uint_preference(icep_module, "max_ice_context_pairs",
-								  "Maximum context pairs",
-								  "Maximum number of context pairs allowed",
-								  10, &icep_max_ice_context_pairs);
+    module_t *icep_module;
+    expert_module_t* expert_icep;
+
+    /* Setup list of header fields */
+
+    static hf_register_info hf[] = {
+
+        { &hf_icep_protocol_major,
+          {
+              "Protocol Major", "icep.protocol_major",
+              FT_INT8, BASE_DEC, NULL, 0x0,
+              "The protocol major version number", HFILL
+          }
+        },
+
+        { &hf_icep_protocol_minor,
+          {
+              "Protocol Minor", "icep.protocol_minor",
+              FT_INT8, BASE_DEC, NULL, 0x0,
+              "The protocol minor version number", HFILL
+          }
+        },
+
+        { &hf_icep_encoding_major,
+          {
+              "Encoding Major", "icep.encoding_major",
+              FT_INT8, BASE_DEC, NULL, 0x0,
+              "The encoding major version number", HFILL
+          }
+        },
+
+        { &hf_icep_encoding_minor,
+          {
+              "Encoding Minor", "icep.encoding_minor",
+              FT_INT8, BASE_DEC, NULL, 0x0,
+              "The encoding minor version number", HFILL
+          }
+        },
+
+        { &hf_icep_message_type,
+          {
+              "Message Type", "icep.message_type",
+              FT_INT8, BASE_DEC, VALS(icep_msgtype_vals), 0x0,
+              "The message type", HFILL
+          }
+        },
+
+        { &hf_icep_compression_status,
+          {
+              "Compression Status", "icep.compression_status",
+              FT_INT8, BASE_DEC, VALS(icep_zipstatus_vals), 0x0,
+              "The compression status of the message", HFILL
+          }
+        },
+
+        { &hf_icep_message_size,
+          {
+              "Message Size", "icep.message_status",
+              FT_INT32, BASE_DEC, NULL, 0x0,
+              "The size of the message in bytes, including the header",
+              HFILL
+          }
+        },
+
+        { &hf_icep_request_id,
+          {
+              "Request Identifier", "icep.request_id",
+              FT_INT32, BASE_DEC, NULL, 0x0,
+              "The request identifier",
+              HFILL
+          }
+        },
+
+        { &hf_icep_reply_status,
+          {
+              "Reply Status", "icep.protocol_major",
+              FT_INT8, BASE_DEC, VALS(icep_replystatus_vals), 0x0,
+              "The reply status", HFILL
+          }
+        },
+
+        { &hf_icep_id_name,
+          {
+              "Object Identity Name", "icep.id.name",
+              FT_STRINGZ, BASE_NONE, NULL, 0x0,
+              "The object identity name", HFILL
+          }
+        },
+
+        { &hf_icep_id_category,
+          {
+              "Object Identity Content", "icep.id.content",
+              FT_STRINGZ, BASE_NONE, NULL, 0x0,
+              "The object identity content", HFILL
+          }
+        },
+
+        { &hf_icep_facet,
+          {
+              "Facet Name", "icep.facet",
+              FT_STRINGZ, BASE_NONE, NULL, 0x0,
+              "The facet name", HFILL
+          }
+        },
+
+        { &hf_icep_operation,
+          {
+              "Operation Name", "icep.operation",
+              FT_STRINGZ, BASE_NONE, NULL, 0x0,
+              "The operation name", HFILL
+          }
+        },
+
+        { &hf_icep_mode,
+          {
+              "Ice::OperationMode", "icep.operation_mode",
+              FT_INT8, BASE_DEC, VALS(icep_mode_vals), 0x0,
+              "A byte representing Ice::OperationMode", HFILL
+          }
+        },
+
+        { &hf_icep_context,
+          {
+              "Invocation Context", "icep.context",
+              FT_STRINGZ, BASE_NONE, NULL, 0x0,
+              "The invocation context", HFILL
+          }
+        },
+
+        { &hf_icep_params_size,
+          {
+              "Input Parameters Size", "icep.params.size",
+              FT_INT32, BASE_DEC, NULL, 0x0,
+              "The encapsulated input parameters size",
+              HFILL
+          }
+        },
+
+        { &hf_icep_params_major,
+          {
+              "Input Parameters Encoding Major",
+              "icep.params.major",
+              FT_INT8, BASE_DEC, NULL, 0x0,
+              "The major encoding version of encapsulated parameters",
+              HFILL
+          }
+        },
+
+        { &hf_icep_params_minor,
+          {
+              "Input Parameters Encoding Minor",
+              "icep.params.minor",
+              FT_INT8, BASE_DEC, NULL, 0x0,
+              "The minor encoding version of encapsulated parameters",
+              HFILL
+          }
+        },
+
+        { &hf_icep_params_encapsulated,
+          {
+              "Encapsulated parameters",
+              "icep.params.encapsulated",
+              FT_BYTES, BASE_NONE, NULL, 0x0,
+              "Remaining encapsulated parameters",
+              HFILL
+          }
+        },
+
+        { &hf_icep_reply_data,
+          {
+              "Reported reply data",
+              "icep.params.reply_data",
+              FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL
+          }
+        },
+
+        { &hf_icep_invocation_key,
+          {
+              "Key",
+              "icep.invocation_key",
+              FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL
+          }
+        },
+
+        { &hf_icep_invocation_value,
+          {
+              "Value",
+              "icep.invocation_value",
+              FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL
+          }
+        },
+    };
+
+    /* Setup protocol subtree array */
+
+    static gint *ett[] = {
+        &ett_icep,
+        &ett_icep_msg,
+    };
+
+    static ei_register_info ei[] = {
+        { &ei_icep_string_malformed, { "icep.string.malformed", PI_MALFORMED, PI_ERROR, "String malformed", EXPFILL }},
+        { &ei_icep_string_too_long, { "icep.string.too_long", PI_PROTOCOL, PI_WARN, "string too long", EXPFILL }},
+        { &ei_icep_facet_missing, { "icep.facet.missing", PI_MALFORMED, PI_ERROR, "facet field missing", EXPFILL }},
+        { &ei_icep_facet_max_one_element, { "icep.facet.max_one_element", PI_PROTOCOL, PI_WARN, "facet can be max one element", EXPFILL }},
+        { &ei_icep_context_missing, { "icep.context.missing", PI_MALFORMED, PI_ERROR, "context missing", EXPFILL }},
+        { &ei_icep_context_too_long, { "icep.context.too_long", PI_PROTOCOL, PI_WARN, "too long context", EXPFILL }},
+        { &ei_icep_params_missing, { "icep.params.missing", PI_MALFORMED, PI_ERROR, "params missing", EXPFILL }},
+        { &ei_icep_params_size, { "icep.params.size.invalid", PI_PROTOCOL, PI_WARN, "params size too small", EXPFILL }},
+        { &ei_icep_params_encapsulated, { "icep.params.encapsulated.missing", PI_PROTOCOL, PI_WARN, "missing encapsulated data (%d bytes)", EXPFILL }},
+        { &ei_icep_length, { "icep.length_invalid", PI_MALFORMED, PI_ERROR, "Invalid length", EXPFILL }},
+        { &ei_icep_mode_missing, { "icep.mode.missing", PI_MALFORMED, PI_ERROR, "mode field missing", EXPFILL }},
+        { &ei_icep_batch_requests, { "icep.batch_requests.invalid", PI_PROTOCOL, PI_WARN, "too many batch requests", EXPFILL }},
+        { &ei_icep_reply_data, { "icep.params.reply_data.missing", PI_MALFORMED, PI_ERROR, "Reply Data missing", EXPFILL }},
+        { &ei_icep_message_type, { "icep.message_type.unknown", PI_PROTOCOL, PI_WARN, "Unknown Message Type", EXPFILL }},
+    };
+
+    /* Register the protocol name and description */
+
+    proto_icep =
+        proto_register_protocol("Internet Communications Engine Protocol",
+                    "ICEP", "icep");
+
+    /* Required function calls to register the header fields and subtrees used */
+
+    proto_register_field_array(proto_icep, hf, array_length(hf));
+    proto_register_subtree_array(ett, array_length(ett));
+    expert_icep = expert_register_protocol(proto_icep);
+    expert_register_field_array(expert_icep, ei, array_length(ei));
+
+    icep_module = prefs_register_protocol(proto_icep, NULL);
+
+    prefs_register_uint_preference(icep_module, "tcp.port",
+                                 "ICEP TCP Port",
+                                 "ICEP TCP port",
+                                 10,
+                                 &icep_tcp_port);
+
+    prefs_register_uint_preference(icep_module, "udp.port",
+                                 "ICEP UDP Port",
+                                 "ICEP UDP port",
+                                 10,
+                                 &icep_udp_port);
+
+    prefs_register_uint_preference(icep_module, "max_batch_requests",
+                                  "Maximum batch requests",
+                                  "Maximum number of batch requests allowed",
+                                  10, &icep_max_batch_requests);
+
+    prefs_register_uint_preference(icep_module, "max_ice_string_len",
+                                  "Maximum string length",
+                                  "Maximum length allowed of an ICEP string",
+                                  10, &icep_max_ice_string_len);
+
+    prefs_register_uint_preference(icep_module, "max_ice_context_pairs",
+                                  "Maximum context pairs",
+                                  "Maximum number of context pairs allowed",
+                                  10, &icep_max_ice_context_pairs);
 }
 
 
 void proto_reg_handoff_icep(void)
 {
-	static gboolean icep_prefs_initialized = FALSE;
-	static dissector_handle_t icep_tcp_handle, icep_udp_handle;
-	static guint old_icep_tcp_port = 0;
-	static guint old_icep_udp_port = 0;
+    static gboolean icep_prefs_initialized = FALSE;
+    static dissector_handle_t icep_tcp_handle, icep_udp_handle;
+    static guint old_icep_tcp_port = 0;
+    static guint old_icep_udp_port = 0;
 
-	/* Register as a heuristic TCP/UDP dissector */
-	if (icep_prefs_initialized == FALSE) {
-		icep_tcp_handle = new_create_dissector_handle(dissect_icep_tcp, proto_icep);
-		icep_udp_handle = new_create_dissector_handle(dissect_icep_udp, proto_icep);
+    /* Register as a heuristic TCP/UDP dissector */
+    if (icep_prefs_initialized == FALSE) {
+        icep_tcp_handle = new_create_dissector_handle(dissect_icep_tcp, proto_icep);
+        icep_udp_handle = new_create_dissector_handle(dissect_icep_udp, proto_icep);
 
-		heur_dissector_add("tcp", dissect_icep_tcp, proto_icep);
-		heur_dissector_add("udp", dissect_icep_udp, proto_icep);
+        heur_dissector_add("tcp", dissect_icep_tcp, proto_icep);
+        heur_dissector_add("udp", dissect_icep_udp, proto_icep);
 
-		icep_prefs_initialized = TRUE;
-	}
+        icep_prefs_initialized = TRUE;
+    }
 
-	/* Register TCP port for dissection */
-	if(old_icep_tcp_port != 0 && old_icep_tcp_port != icep_tcp_port){
-		dissector_delete_uint("tcp.port", old_icep_tcp_port, icep_tcp_handle);
-	}
+    /* Register TCP port for dissection */
+    if(old_icep_tcp_port != 0 && old_icep_tcp_port != icep_tcp_port){
+        dissector_delete_uint("tcp.port", old_icep_tcp_port, icep_tcp_handle);
+    }
 
-	if(icep_tcp_port != 0 && old_icep_tcp_port != icep_tcp_port) {
-		dissector_add_uint("tcp.port", icep_tcp_port, icep_tcp_handle);
-	}
+    if(icep_tcp_port != 0 && old_icep_tcp_port != icep_tcp_port) {
+        dissector_add_uint("tcp.port", icep_tcp_port, icep_tcp_handle);
+    }
 
-	old_icep_tcp_port = icep_tcp_port;
+    old_icep_tcp_port = icep_tcp_port;
 
-	/* Register UDP port for dissection */
-	if(old_icep_udp_port != 0 && old_icep_udp_port != icep_udp_port){
-		dissector_delete_uint("udp.port", old_icep_udp_port, icep_udp_handle);
-	}
+    /* Register UDP port for dissection */
+    if(old_icep_udp_port != 0 && old_icep_udp_port != icep_udp_port){
+        dissector_delete_uint("udp.port", old_icep_udp_port, icep_udp_handle);
+    }
 
-	if(icep_udp_port != 0 && old_icep_udp_port != icep_udp_port) {
-		dissector_add_uint("udp.port", icep_udp_port, icep_udp_handle);
-	}
+    if(icep_udp_port != 0 && old_icep_udp_port != icep_udp_port) {
+        dissector_add_uint("udp.port", icep_udp_port, icep_udp_handle);
+    }
 
-	old_icep_udp_port = icep_udp_port;
+    old_icep_udp_port = icep_udp_port;
 }