- Updated to RFC 3331 version.

- Improved handling of padding bytes.
- Some cleanup of the code.

svn path=/trunk/; revision=6738

1 files changed, 302 insertions, 420 deletions

diff --git a/packet-m2ua.c b/packet-m2ua.c
index 9244307830..8173a20545 100644
--- a/packet-m2ua.c
+++ b/packet-m2ua.c
@@ -1,14 +1,12 @@
 /* packet-m2ua.c
  * Routines for MTP2 User Adaptation Layer dissection
  * It is hopefully (needs testing) compilant to
- * http://www.ietf.org/internet-drafts/draft-ietf-sigtran-m2ua-15.txt
- * To do: - clean up the code
- *        - provide better handling of length parameters
- *        - provide good information in summary window
+ * http://www.ietf.org/rfc/rfc3331.txt
+ * To do: - provide better handling of length parameters
  *
  * Copyright 2002, Michael Tuexen <Michael.Tuexen [AT] siemens.com>
  *
- * $Id: packet-m2ua.c,v 1.5 2002/12/02 23:43:26 guy Exp $
+ * $Id: packet-m2ua.c,v 1.6 2002/12/03 09:29:11 tuexen Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -37,73 +35,62 @@
 
 #include <epan/packet.h>
 
-#define SCTP_PORT_M2UA         2904
-#define M2UA_PAYLOAD_PROTO_ID  2
-#define NETWORK_BYTE_ORDER          FALSE
+#define SCTP_PORT_M2UA                  2904
+#define M2UA_PAYLOAD_PROTO_ID           2
+#define NETWORK_BYTE_ORDER              FALSE
 
 
 
 /* Initialize the protocol and registered fields */
-static int proto_m2ua = -1;
-static int hf_m2ua_version = -1;
-static int hf_m2ua_reserved = -1;
-static int hf_m2ua_message_class = -1;
-static int hf_m2ua_message_type = -1;
-static int hf_m2ua_message_length = -1;
-static int hf_m2ua_parameter_tag = -1;
-static int hf_m2ua_parameter_length = -1;
-static int hf_m2ua_parameter_value = -1;
-static int hf_m2ua_parameter_padding = -1;
-static int hf_m2ua_interface_id_int = -1;
-static int hf_m2ua_interface_id_text = -1;
-static int hf_m2ua_info_string = -1;
-static int hf_m2ua_diagnostic_information = -1;
-static int hf_m2ua_interface_id_start = -1;
-static int hf_m2ua_interface_id_stop = -1;
-static int hf_m2ua_heartbeat_data = -1;
-static int hf_m2ua_traffic_mode_type = -1;
-static int hf_m2ua_error_code = -1;
-static int hf_m2ua_status_type = -1;
-static int hf_m2ua_status_info = -1;
-static int hf_m2ua_asp_id = -1;
-static int hf_m2ua_correlation_id = -1;
-static int hf_m2ua_data_2_li = -1;
-static int hf_m2ua_state = -1;
-static int hf_m2ua_event = -1;
-static int hf_m2ua_congestion_status = -1;
-static int hf_m2ua_discard_status = -1;
-static int hf_m2ua_action = -1;
-static int hf_m2ua_sequence_number = -1;
-static int hf_m2ua_retrieval_result = -1;
-static int hf_m2ua_local_lk_id = -1;
-static int hf_m2ua_sdt_reserved = -1;
-static int hf_m2ua_sdt_id = -1;
-static int hf_m2ua_sdl_reserved = -1;
-static int hf_m2ua_sdl_id = -1;
-static int hf_m2ua_registration_status = -1;
-static int hf_m2ua_deregistration_status = -1;
+static int proto_m2ua =                 -1;
+static int hf_version =                 -1;
+static int hf_reserved =                -1;
+static int hf_message_class =           -1;
+static int hf_message_type =            -1;
+static int hf_message_length =          -1;
+static int hf_parameter_tag =           -1;
+static int hf_parameter_length =        -1;
+static int hf_parameter_value =         -1;
+static int hf_parameter_padding =       -1;
+static int hf_interface_id_int =        -1;
+static int hf_interface_id_text =       -1;
+static int hf_info_string =             -1;
+static int hf_diagnostic_information =  -1;
+static int hf_interface_id_start =      -1;
+static int hf_interface_id_stop =       -1;
+static int hf_heartbeat_data =          -1;
+static int hf_traffic_mode_type =       -1;
+static int hf_error_code =              -1;
+static int hf_status_type =             -1;
+static int hf_status_ident =            -1;
+static int hf_asp_id =                  -1;
+static int hf_correlation_id =          -1;
+static int hf_data_2_li =               -1;
+static int hf_state =                   -1;
+static int hf_event =                   -1;
+static int hf_congestion_status =       -1;
+static int hf_discard_status =          -1;
+static int hf_action =                  -1;
+static int hf_sequence_number =         -1;
+static int hf_retrieval_result =        -1;
+static int hf_local_lk_id =             -1;
+static int hf_sdt_reserved =            -1;
+static int hf_sdt_id =                  -1;
+static int hf_sdl_reserved =            -1;
+static int hf_sdl_id =                  -1;
+static int hf_registration_status =     -1;
+static int hf_deregistration_status =   -1;
 
 /* Initialize the subtree pointers */
-static gint ett_m2ua = -1;
-static gint ett_m2ua_parameter = -1;
+static gint ett_m2ua =                  -1;
+static gint ett_m2ua_parameter =        -1;
 
 static dissector_handle_t mtp3_handle;
 
 static void
-dissect_m2ua_parameters(tvbuff_t *, packet_info *, proto_tree *, proto_tree *);
+dissect_parameters(tvbuff_t *, packet_info *, proto_tree *, proto_tree *);
 
-static guint
-nr_of_padding_bytes (guint length)
-{
-  guint remainder;
-
-  remainder = length % 4;
-
-  if (remainder == 0)
-    return 0;
-  else
-    return 4 - remainder;
-}
+#define ADD_PADDING(x) ((((x) + 3) >> 2) << 2)
 
 #define VERSION_LENGTH         1
 #define RESERVED_LENGTH        1
@@ -121,7 +108,7 @@ nr_of_padding_bytes (guint length)
 
 #define PROTOCOL_VERSION_RELEASE_1             1
 
-static const value_string m2ua_protocol_version_values[] = {
+static const value_string protocol_version_values[] = {
   { PROTOCOL_VERSION_RELEASE_1,  "Release 1" },
   { 0,                           NULL } };
 
@@ -131,7 +118,7 @@ static const value_string m2ua_protocol_version_values[] = {
 #define MESSAGE_CLASS_MAUP_MESSAGE         6
 #define MESSAGE_CLASS_IIM_MESSAGE         10
 
-static const value_string m2ua_message_class_values[] = {
+static const value_string message_class_values[] = {
   { MESSAGE_CLASS_MGMT_MESSAGE,   "Management messages" },
   { MESSAGE_CLASS_ASPSM_MESSAGE,  "ASP state maintenance messages" },
   { MESSAGE_CLASS_ASPTM_MESSAGE,  "ASP traffic maintenance messages" },
@@ -180,7 +167,7 @@ static const value_string m2ua_message_class_values[] = {
 #define MESSAGE_TYPE_DEREG_REQ            3
 #define MESSAGE_TYPE_DEREG_RSP            4
 
-static const value_string m2ua_message_class_type_values[] = {
+static const value_string message_class_type_values[] = {
   { MESSAGE_CLASS_MGMT_MESSAGE  * 256 + MESSAGE_TYPE_ERR,                "Error (ERR)" },
   { MESSAGE_CLASS_MGMT_MESSAGE  * 256 + MESSAGE_TYPE_NTFY,               "Notify (NTFY)" },
   { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_UP,                 "ASP up (UP)" },
@@ -214,7 +201,7 @@ static const value_string m2ua_message_class_type_values[] = {
   { MESSAGE_CLASS_IIM_MESSAGE   * 256 + MESSAGE_TYPE_DEREG_RSP ,         "Deregistration response (DEREG_RSP)" },
   { 0,                           NULL } };
 
-static const value_string m2ua_message_class_type_acro_values[] = {
+static const value_string message_class_type_acro_values[] = {
   { MESSAGE_CLASS_MGMT_MESSAGE  * 256 + MESSAGE_TYPE_ERR,                "ERR" },
   { MESSAGE_CLASS_MGMT_MESSAGE  * 256 + MESSAGE_TYPE_NTFY,               "NTFY" },
   { MESSAGE_CLASS_ASPSM_MESSAGE * 256 + MESSAGE_TYPE_UP,                 "ASP_UP" },
@@ -249,32 +236,28 @@ static const value_string m2ua_message_class_type_acro_values[] = {
   { 0,                           NULL } };
 
 static void
-dissect_m2ua_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tree *m2ua_tree)
+dissect_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, proto_tree *m2ua_tree)
 {
-  guint8  version, reserved, message_class, message_type;
-  guint32 message_length;
+  guint8  message_class, message_type;
 
   /* Extract the common header */
-  version        = tvb_get_guint8(common_header_tvb, VERSION_OFFSET);
-  reserved       = tvb_get_guint8(common_header_tvb, RESERVED_OFFSET);
   message_class  = tvb_get_guint8(common_header_tvb, MESSAGE_CLASS_OFFSET);
   message_type   = tvb_get_guint8(common_header_tvb, MESSAGE_TYPE_OFFSET);
-  message_length = tvb_get_ntohl (common_header_tvb, MESSAGE_LENGTH_OFFSET);
 
   if (check_col(pinfo->cinfo, COL_INFO)) {
-    col_append_str(pinfo->cinfo, COL_INFO, val_to_str(message_class * 256 + message_type, m2ua_message_class_type_acro_values, "reserved"));
+    col_append_str(pinfo->cinfo, COL_INFO, val_to_str(message_class * 256 + message_type, message_class_type_acro_values, "reserved"));
     col_append_str(pinfo->cinfo, COL_INFO, " ");
   }
 
   if (m2ua_tree) {
     /* add the components of the common header to the protocol tree */
-    proto_tree_add_uint(m2ua_tree, hf_m2ua_version, common_header_tvb, VERSION_OFFSET, VERSION_LENGTH, version);
-    proto_tree_add_uint(m2ua_tree, hf_m2ua_reserved, common_header_tvb, RESERVED_OFFSET, RESERVED_LENGTH, reserved);
-    proto_tree_add_uint(m2ua_tree, hf_m2ua_message_class, common_header_tvb, MESSAGE_CLASS_OFFSET, MESSAGE_CLASS_LENGTH, message_class);
-    proto_tree_add_uint_format(m2ua_tree, hf_m2ua_message_type, common_header_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, message_type,
+    proto_tree_add_item(m2ua_tree, hf_version,        common_header_tvb, VERSION_OFFSET,        VERSION_LENGTH,        NETWORK_BYTE_ORDER);
+    proto_tree_add_item(m2ua_tree, hf_reserved,       common_header_tvb, RESERVED_OFFSET,       RESERVED_LENGTH,       NETWORK_BYTE_ORDER);
+    proto_tree_add_item(m2ua_tree, hf_message_class,  common_header_tvb, MESSAGE_CLASS_OFFSET,  MESSAGE_CLASS_LENGTH,  NETWORK_BYTE_ORDER);
+    proto_tree_add_uint_format(m2ua_tree, hf_message_type, common_header_tvb, MESSAGE_TYPE_OFFSET, MESSAGE_TYPE_LENGTH, message_type,
                                "Message type: %s (%u)",
-                               val_to_str(message_class * 256 + message_type, m2ua_message_class_type_values, "reserved"), message_type);
-    proto_tree_add_uint(m2ua_tree, hf_m2ua_message_length, common_header_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, message_length);
+                               val_to_str(message_class * 256 + message_type, message_class_type_values, "reserved"), message_type);
+    proto_tree_add_item(m2ua_tree, hf_message_length, common_header_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, NETWORK_BYTE_ORDER);
   }
 }
 
@@ -288,131 +271,110 @@ dissect_m2ua_common_header(tvbuff_t *common_header_tvb, packet_info *pinfo, prot
 #define PARAMETER_HEADER_OFFSET PARAMETER_TAG_OFFSET
 
 
-#define INTERFACE_IDENTIFIER_INT_LENGTH 4
-#define INTERFACE_IDENTIFIER_INT_OFFSET PARAMETER_VALUE_OFFSET
+#define INT_INTERFACE_ID_OFFSET PARAMETER_VALUE_OFFSET
+#define INT_INTERFACE_ID_LENGTH 4
 
 static void
-dissect_m2ua_interface_identifier_int_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_interface_identifier_int_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 id;
-
-  id = tvb_get_ntohl(parameter_tvb, INTERFACE_IDENTIFIER_INT_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_interface_id_int, parameter_tvb, INTERFACE_IDENTIFIER_INT_OFFSET, INTERFACE_IDENTIFIER_INT_LENGTH, id);
-  proto_item_set_text(parameter_item, "Interface identifier parameter (integer: %u)", id);
+  proto_tree_add_item(parameter_tree, hf_interface_id_int, parameter_tvb, INT_INTERFACE_ID_OFFSET, INT_INTERFACE_ID_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%d)", tvb_get_ntohl(parameter_tvb, INT_INTERFACE_ID_OFFSET));
 }
 
-#define INTERFACE_IDENTIFIER_TEXT_OFFSET PARAMETER_VALUE_OFFSET
+#define TEXT_INTERFACE_ID_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_interface_identifier_text_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_interface_identifier_text_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint16 length, id_length;
-  const char *id;
+  guint16 interface_id_length;
 
-  length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
+  interface_id_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
 
-  id_length = length - PARAMETER_HEADER_LENGTH;
-  id        = (const char *)tvb_get_ptr(parameter_tvb, INTERFACE_IDENTIFIER_TEXT_OFFSET, id_length);
-  proto_tree_add_string(parameter_tree, hf_m2ua_interface_id_text, parameter_tvb, INTERFACE_IDENTIFIER_TEXT_OFFSET, id_length, id);
-  proto_item_set_text(parameter_item, "Interface identifier (Text: %.*s)", id_length, id);
+  proto_tree_add_item(parameter_tree, hf_interface_id_text, parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%.*s)", interface_id_length,
+                         (const char *)tvb_get_ptr(parameter_tvb, TEXT_INTERFACE_ID_OFFSET, interface_id_length));
 }
 
 #define INFO_STRING_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_info_string_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint16 length, info_string_length;
-  const char *info_string;
-
-  length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
+  guint16 info_string_length;
 
-  info_string_length = length - PARAMETER_HEADER_LENGTH;
-  info_string        = (const char *)tvb_get_ptr(parameter_tvb, INFO_STRING_OFFSET, info_string_length);
-  proto_tree_add_string(parameter_tree, hf_m2ua_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, info_string);
-  proto_item_set_text(parameter_item, "Info String (%.*s)", info_string_length, info_string);
+  info_string_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
+  proto_tree_add_item(parameter_tree, hf_info_string, parameter_tvb, INFO_STRING_OFFSET, info_string_length, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%.*s)", info_string_length,
+                         (const char *)tvb_get_ptr(parameter_tvb, INFO_STRING_OFFSET, info_string_length));
 }
 
 #define DIAGNOSTIC_INFO_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_diagnostic_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint16 length, diagnostic_info_length;
-
-  length                 = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
-  diagnostic_info_length = length - PARAMETER_HEADER_LENGTH;
+  guint16 diag_info_length;
 
-  if (diagnostic_info_length > 0)
-    proto_tree_add_bytes(parameter_tree, hf_m2ua_diagnostic_information, parameter_tvb, DIAGNOSTIC_INFO_OFFSET, diagnostic_info_length,
-                         tvb_get_ptr(parameter_tvb, DIAGNOSTIC_INFO_OFFSET, diagnostic_info_length));
-
-  proto_item_set_text(parameter_item, "Diagnostic information (%u byte%s)", diagnostic_info_length, plurality(diagnostic_info_length, "", "s"));
+  diag_info_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
+  proto_tree_add_item(parameter_tree, hf_diagnostic_information, parameter_tvb, DIAGNOSTIC_INFO_OFFSET, diag_info_length, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%u byte%s)", diag_info_length, plurality(diag_info_length, "", "s"));
 }
 
+#define START_LENGTH 4
+#define END_LENGTH   4
+#define INTERVAL_LENGTH (START_LENGTH + END_LENGTH)
+
 #define START_OFFSET 0
-#define STOP_OFFSET  (START_OFFSET + INTERFACE_IDENTIFIER_INT_LENGTH)
+#define END_OFFSET   (START_OFFSET + START_LENGTH)
 
 static void
-dissect_m2ua_interface_identifier_range_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_interface_identifier_range_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint16 length, number_of_ranges, range_number;
-  guint32 start, stop;
-  gint range_offset;
-
-  length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
-  number_of_ranges = (length - PARAMETER_HEADER_LENGTH) / (2 * INTERFACE_IDENTIFIER_INT_LENGTH);
-  range_offset = PARAMETER_VALUE_OFFSET;
-  for(range_number=1; range_number <= number_of_ranges; range_number++) {
-    start = tvb_get_ntohl(parameter_tvb, range_offset + START_OFFSET);
-    stop  = tvb_get_ntohl(parameter_tvb, range_offset + STOP_OFFSET);
-    proto_tree_add_uint(parameter_tree, hf_m2ua_interface_id_start, parameter_tvb, range_offset + START_OFFSET, INTERFACE_IDENTIFIER_INT_LENGTH, start);
-    proto_tree_add_uint(parameter_tree, hf_m2ua_interface_id_stop,  parameter_tvb, range_offset + STOP_OFFSET,  INTERFACE_IDENTIFIER_INT_LENGTH, stop);
-    range_offset += 2 * INTERFACE_IDENTIFIER_INT_LENGTH;
-  }
-  proto_item_set_text(parameter_item, "Interface identifier (%u range%s)", number_of_ranges, plurality(number_of_ranges, "", "s"));
+  guint16 number_of_ranges, range_number;
+  gint offset;
+
+  number_of_ranges = (tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH) / INTERVAL_LENGTH;
+  offset = PARAMETER_VALUE_OFFSET;
+  for(range_number = 1; range_number <= number_of_ranges; range_number++) {
+    proto_tree_add_item(parameter_tree, hf_interface_id_start, parameter_tvb, offset + START_OFFSET, START_LENGTH, NETWORK_BYTE_ORDER);
+    proto_tree_add_item(parameter_tree, hf_interface_id_stop,  parameter_tvb, offset + END_OFFSET,   END_LENGTH,   NETWORK_BYTE_ORDER);
+    offset += INTERVAL_LENGTH;
+  };
+
+  proto_item_append_text(parameter_item, " (%u range%s)", number_of_ranges, plurality(number_of_ranges, "", "s"));
 }
 
 #define HEARTBEAT_DATA_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_heartbeat_data_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint16 length, heartbeat_data_length;
-
-  length                = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
-  heartbeat_data_length = length - PARAMETER_HEADER_LENGTH;
-
-  if (heartbeat_data_length > 0)
-    proto_tree_add_bytes(parameter_tree, hf_m2ua_heartbeat_data, parameter_tvb, HEARTBEAT_DATA_OFFSET, heartbeat_data_length,
-      	                 tvb_get_ptr(parameter_tvb, HEARTBEAT_DATA_OFFSET, heartbeat_data_length));
+  guint16 heartbeat_data_length;
 
-  proto_item_set_text(parameter_item, "Heartbeat data (%u byte%s)", heartbeat_data_length, plurality(heartbeat_data_length, "", "s"));
+  heartbeat_data_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
+  proto_tree_add_item(parameter_tree, hf_heartbeat_data, parameter_tvb, HEARTBEAT_DATA_OFFSET, heartbeat_data_length, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%u byte%s)", heartbeat_data_length, plurality(heartbeat_data_length, "", "s"));
 }
 
 #define OVER_RIDE_TYPE   1
 #define LOAD_SHARE_TYPE  2
 #define BROADCAST_TYPE   3
 
-static const value_string m2ua_traffic_mode_type_values[] = {
-  { OVER_RIDE_TYPE ,                             "Over-ride" },
-  { LOAD_SHARE_TYPE,                             "Load-share" },
-  { BROADCAST_TYPE,                              "Broadcast" },
-  {0,                           NULL } };
+static const value_string traffic_mode_type_values[] = {
+  { OVER_RIDE_TYPE ,            "Override" },
+  { LOAD_SHARE_TYPE,            "Load-share" },
+  { BROADCAST_TYPE,             "Broadcast" },
+  { 0,                          NULL } };
 
 #define TRAFFIC_MODE_TYPE_LENGTH 4
 #define TRAFFIC_MODE_TYPE_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 traffic_mode_type;
-
-  traffic_mode_type = tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, traffic_mode_type);
-
-  proto_item_set_text(parameter_item, "Traffic mode type parameter (%s)", val_to_str(traffic_mode_type, m2ua_traffic_mode_type_values, "unknown"));
-
+  proto_tree_add_item(parameter_tree, hf_traffic_mode_type, parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET, TRAFFIC_MODE_TYPE_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)",
+                         val_to_str(tvb_get_ntohl(parameter_tvb, TRAFFIC_MODE_TYPE_OFFSET), traffic_mode_type_values, "unknown"));
 }
 
 #define INVALID_VERSION_ERROR_CODE                       0x01
@@ -433,7 +395,7 @@ dissect_m2ua_traffic_mode_type_parameter(tvbuff_t *parameter_tvb, proto_tree *pa
 #define UNEXPECTED_PARAMETER_ERROR_CODE                  0x13
 #define MISSING_PARAMETER_ERROR_CODE                     0x16
 
-static const value_string m2ua_error_code_values[] = {
+static const value_string error_code_values[] = {
   { INVALID_VERSION_ERROR_CODE,                       "Invalid version" },
   { INVALID_INTERFACE_IDENTIFIER_ERROR_CODE,          "Invalid interface identifier" },
   { UNSUPPORTED_MESSAGE_CLASS_ERROR_CODE,             "Unsupported message class" },
@@ -441,12 +403,12 @@ static const value_string m2ua_error_code_values[] = {
   { UNSUPPORTED_TRAFFIC_HANDLING_MODE_ERROR_CODE,     "Unsupported traffic handling mode" },
   { UNEXPECTED_MESSAGE_ERROR_CODE,                    "Unexpected message" },
   { PROTOCOL_ERROR_ERROR_CODE,                        "Protocol error" },
-  { UNSUPPORTED_INTERFACE_IDENTIFIER_TYPE_ERROR_CODE, "Unsupported interface identifertype" },
+  { UNSUPPORTED_INTERFACE_IDENTIFIER_TYPE_ERROR_CODE, "Unsupported interface identifier type" },
   { INVALID_STREAM_IDENTIFIER_ERROR_CODE,             "Invalid stream identifier" },
   { REFUSED_ERROR_CODE,                               "Refused - management blocking" },
   { ASP_IDENTIFIER_REQUIRED_ERROR_CODE,               "ASP identifier required" },
   { INVALID_ASP_IDENTIFIER_ERROR_CODE,                "Invalid ASP identifier" },
-  { ASP_ACTIVE_FOR_INTERFACE_IDENTIFIER_ERROR_CODE,   "ASP active for interface identifer" },
+  { ASP_ACTIVE_FOR_INTERFACE_IDENTIFIER_ERROR_CODE,   "ASP active for interface identifier" },
   { INVALID_PARAMETER_VALUE_ERROR_CODE,               "Invalid parameter value" },
   { PARAMETER_FIELD_ERROR_CODE,                       "Parameter field error" },
   { UNEXPECTED_PARAMETER_ERROR_CODE,                  "Unexpected parameter" },
@@ -457,19 +419,17 @@ static const value_string m2ua_error_code_values[] = {
 #define ERROR_CODE_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_error_code_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 error_code;
-
-  error_code = tvb_get_ntohl(parameter_tvb, ERROR_CODE_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_error_code, parameter_tvb, ERROR_CODE_OFFSET, ERROR_CODE_LENGTH, error_code);
-  proto_item_set_text(parameter_item, "Error code parameter (%s)", val_to_str(error_code, m2ua_error_code_values, "unknown"));
+  proto_tree_add_item(parameter_tree, hf_error_code, parameter_tvb, ERROR_CODE_OFFSET, ERROR_CODE_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)",
+                         val_to_str(tvb_get_ntohl(parameter_tvb, ERROR_CODE_OFFSET), error_code_values, "unknown"));
 }
 
 #define AS_STATE_CHANGE_TYPE       1
 #define OTHER_TYPE                 2
 
-static const value_string m2ua_status_type_values[] = {
+static const value_string status_type_values[] = {
   { AS_STATE_CHANGE_TYPE,            "Application server state change" },
   { OTHER_TYPE,                      "Other" },
   { 0,                           NULL } };
@@ -483,7 +443,7 @@ static const value_string m2ua_status_type_values[] = {
 #define ALTERNATE_ASP_ACTIVE_INFO  2
 #define ASP_FAILURE_INFO           3
 
-static const value_string m2ua_status_type_info_values[] = {
+static const value_string status_type_id_values[] = {
   { AS_STATE_CHANGE_TYPE * 256 * 256 + RESERVED_INFO,             "Reserved" },
   { AS_STATE_CHANGE_TYPE * 256 * 256 + AS_INACTIVE_INFO,          "Application server inactive" },
   { AS_STATE_CHANGE_TYPE * 256 * 256 + AS_ACTIVE_INFO,            "Application server active" },
@@ -493,59 +453,53 @@ static const value_string m2ua_status_type_info_values[] = {
   { OTHER_TYPE           * 256 * 256 + ASP_FAILURE_INFO,          "ASP Failure" },
   {0,                           NULL } };
 
-#define STATUS_TYPE_LENGTH 2
-#define STATUS_INFO_LENGTH 2
+#define STATUS_TYPE_LENGTH  2
+#define STATUS_IDENT_LENGTH 2
 
-#define STATUS_TYPE_OFFSET PARAMETER_VALUE_OFFSET
-#define STATUS_INFO_OFFSET (STATUS_TYPE_OFFSET + STATUS_TYPE_LENGTH)
+#define STATUS_TYPE_OFFSET  PARAMETER_VALUE_OFFSET
+#define STATUS_IDENT_OFFSET (STATUS_TYPE_OFFSET + STATUS_TYPE_LENGTH)
 
 static void
-dissect_m2ua_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint16 status_type, status_info;
+  guint16 status_type, status_id;
 
   status_type = tvb_get_ntohs(parameter_tvb, STATUS_TYPE_OFFSET);
-  status_info = tvb_get_ntohs(parameter_tvb, STATUS_INFO_OFFSET);
+  status_id   = tvb_get_ntohs(parameter_tvb, STATUS_IDENT_OFFSET);
 
-  proto_tree_add_uint(parameter_tree, hf_m2ua_status_type, parameter_tvb, STATUS_TYPE_OFFSET, STATUS_TYPE_LENGTH, status_type);
-  proto_tree_add_uint_format(parameter_tree, hf_m2ua_status_info, parameter_tvb, STATUS_INFO_OFFSET, STATUS_INFO_LENGTH, status_info,
-                             "Status info: %s (%u)", val_to_str(status_type * 256 * 256 + status_info, m2ua_status_type_info_values, "unknown"), status_info);
+  proto_tree_add_item(parameter_tree, hf_status_type, parameter_tvb, STATUS_TYPE_OFFSET, STATUS_TYPE_LENGTH, NETWORK_BYTE_ORDER);
+  proto_tree_add_uint_format(parameter_tree, hf_status_ident,  parameter_tvb, STATUS_IDENT_OFFSET, STATUS_IDENT_LENGTH,
+                             status_id, "Status identification: %u (%s)", status_id,
+                             val_to_str(status_type * 256 * 256 + status_id, status_type_id_values, "unknown"));
 
-  proto_item_set_text(parameter_item,
-                      "Status type / ID (%s)", val_to_str(status_type * 256 * 256 + status_info, m2ua_status_type_info_values, "unknown status information"));
+  proto_item_append_text(parameter_item, " (%s)",
+                         val_to_str(status_type * 256 * 256 + status_id, status_type_id_values, "unknown status information"));
 }
 
 #define ASP_IDENTIFIER_OFFSET PARAMETER_VALUE_OFFSET
 #define ASP_IDENTIFIER_LENGTH  4
 
 static void
-dissect_m2ua_asp_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_asp_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 id;
-
-  id = tvb_get_ntohl(parameter_tvb, ASP_IDENTIFIER_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_asp_id, parameter_tvb, ASP_IDENTIFIER_OFFSET, ASP_IDENTIFIER_LENGTH, id);
-  proto_item_set_text(parameter_item, "ASP identifier (%u)", id);
+  proto_tree_add_item(parameter_tree, hf_asp_id, parameter_tvb, ASP_IDENTIFIER_OFFSET, ASP_IDENTIFIER_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%u)", tvb_get_ntohl(parameter_tvb, ASP_IDENTIFIER_OFFSET));
 }
 
 #define CORRELATION_ID_LENGTH 4
 #define CORRELATION_ID_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_correlation_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_correlation_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 id;
-
-  id = tvb_get_ntohl(parameter_tvb, CORRELATION_ID_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_correlation_id, parameter_tvb, CORRELATION_ID_OFFSET, CORRELATION_ID_LENGTH, id);
-
-  proto_item_set_text(parameter_item, "Correlation identifier parameter (%u)", id);
+  proto_tree_add_item(parameter_tree, hf_correlation_id, parameter_tvb, CORRELATION_ID_OFFSET, CORRELATION_ID_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%u)", tvb_get_ntohl(parameter_tvb, CORRELATION_ID_OFFSET));
 }
 
 #define DATA_1_MTP3_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_protocol_data_1_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_item *parameter_item)
+dissect_protocol_data_1_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_item *parameter_item)
 {
   tvbuff_t *payload_tvb;
   guint32 payload_length;
@@ -555,8 +509,6 @@ dissect_m2ua_protocol_data_1_parameter(tvbuff_t *parameter_tvb, packet_info *pin
   payload_tvb = tvb_new_subset(parameter_tvb, DATA_1_MTP3_OFFSET, payload_length, payload_length);
   proto_item_set_len(parameter_item, PARAMETER_HEADER_LENGTH);
   call_dissector(mtp3_handle, payload_tvb, pinfo, tree);
-
-  proto_item_set_text(parameter_item, "Data 1 parameter");
 }
 
 #define DATA_2_LI_LENGTH   1
@@ -564,21 +516,17 @@ dissect_m2ua_protocol_data_1_parameter(tvbuff_t *parameter_tvb, packet_info *pin
 #define DATA_2_MTP3_OFFSET (DATA_2_LI_OFFSET + DATA_2_LI_LENGTH)
 
 static void
-dissect_m2ua_protocol_data_2_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_protocol_data_2_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item)
 {
   tvbuff_t *payload_tvb;
   guint32 payload_length;
-  guint8  li;
 
   payload_length = tvb_length(parameter_tvb) - PARAMETER_HEADER_LENGTH - DATA_2_LI_LENGTH;
-  li = tvb_get_guint8(parameter_tvb, DATA_2_LI_OFFSET);
 
-  proto_tree_add_uint(parameter_tree, hf_m2ua_data_2_li, parameter_tvb, DATA_2_LI_OFFSET, DATA_2_LI_LENGTH, li);
+  proto_tree_add_item(parameter_tree, hf_data_2_li, parameter_tvb, DATA_2_LI_OFFSET, DATA_2_LI_LENGTH, NETWORK_BYTE_ORDER);
   payload_tvb = tvb_new_subset(parameter_tvb, DATA_2_MTP3_OFFSET, payload_length, payload_length);
   proto_item_set_len(parameter_item, PARAMETER_HEADER_LENGTH + DATA_2_LI_LENGTH);
   call_dissector(mtp3_handle, payload_tvb, pinfo, tree);
-
-  proto_item_set_text(parameter_item, "Data 2 parameter");
 }
 
 
@@ -594,7 +542,7 @@ dissect_m2ua_protocol_data_2_parameter(tvbuff_t *parameter_tvb, packet_info *pin
 #define STATUS_CONG_ACCEPT      0x9
 #define STATUS_CONG_DISCARD     0xa
 
-static const value_string m2ua_state_values[] = {
+static const value_string state_values[] = {
   { STATUS_LPO_SET,        "Request local processor outage" },
   { STATUS_LPO_CLEAR,      "Request local processor outage recovered" },
   { STATUS_EMER_SET,       "Request emergency alignment" },
@@ -612,14 +560,10 @@ static const value_string m2ua_state_values[] = {
 #define STATE_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_state_request_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_state_request_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 state;
-
-  state = tvb_get_ntohl(parameter_tvb, STATE_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_state, parameter_tvb, STATE_OFFSET, STATE_LENGTH, state);
-
-  proto_item_set_text(parameter_item, "State request parameter (%s)", val_to_str(state, m2ua_state_values, "unknown"));
+  proto_tree_add_item(parameter_tree, hf_state, parameter_tvb, STATE_OFFSET, STATE_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, STATE_OFFSET), state_values, "unknown"));
 }
 
 #define EVENT_RPO_ENTER        0x1
@@ -627,7 +571,7 @@ dissect_m2ua_state_request_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
 #define EVENT_LPO_ENTER        0x3
 #define EVENT_LPO_EXIT         0x4
 
-static const value_string m2ua_event_values[] = {
+static const value_string event_values[] = {
   { EVENT_RPO_ENTER, "Remote entered processor outage" },
   { EVENT_RPO_EXIT,  "Remote exited processor outage" },
   { EVENT_LPO_ENTER, "Link entered processor outage" },
@@ -638,14 +582,10 @@ static const value_string m2ua_event_values[] = {
 #define EVENT_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_event_request_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_state_event_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 event;
-
-  event = tvb_get_ntohl(parameter_tvb, STATE_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_event, parameter_tvb, EVENT_OFFSET, EVENT_LENGTH, event);
-
-  proto_item_set_text(parameter_item, "State event parameter (%s)", val_to_str(event, m2ua_event_values, "unknown"));
+  proto_tree_add_item(parameter_tree, hf_event, parameter_tvb, EVENT_OFFSET, EVENT_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, STATE_OFFSET), event_values, "unknown"));
 }
 
 #define LEVEL_NONE       0x0
@@ -653,7 +593,7 @@ dissect_m2ua_event_request_parameter(tvbuff_t *parameter_tvb, proto_tree *parame
 #define LEVEL_2          0x2
 #define LEVEL_3          0x3
 
-static const value_string m2ua_level_values[] = {
+static const value_string level_values[] = {
   { LEVEL_NONE, "No congestion" },
   { LEVEL_1,    "Congestion Level 1" },
   { LEVEL_2,    "Congestion Level 2" },
@@ -664,34 +604,26 @@ static const value_string m2ua_level_values[] = {
 #define CONGESTION_STATUS_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_congestion_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_congestion_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 status;
-
-  status = tvb_get_ntohl(parameter_tvb, CONGESTION_STATUS_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_congestion_status, parameter_tvb, CONGESTION_STATUS_OFFSET, CONGESTION_STATUS_LENGTH, status);
-
-  proto_item_set_text(parameter_item, "Congestion status parameter (%s)", val_to_str(status, m2ua_level_values, "unknown"));
+  proto_tree_add_item(parameter_tree, hf_congestion_status, parameter_tvb, CONGESTION_STATUS_OFFSET, CONGESTION_STATUS_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, CONGESTION_STATUS_OFFSET), level_values, "unknown"));
 }
 
 #define DISCARD_STATUS_LENGTH 4
 #define DISCARD_STATUS_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_discard_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_discard_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 status;
-
-  status = tvb_get_ntohl(parameter_tvb, DISCARD_STATUS_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_discard_status, parameter_tvb, DISCARD_STATUS_OFFSET, DISCARD_STATUS_LENGTH, status);
-
-  proto_item_set_text(parameter_item, "Discard status parameter (%s)", val_to_str(status, m2ua_level_values, "unknown"));
+  proto_tree_add_item(parameter_tree, hf_discard_status, parameter_tvb, DISCARD_STATUS_OFFSET, DISCARD_STATUS_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, DISCARD_STATUS_OFFSET), level_values, "unknown"));
 }
 
 #define ACTION_RTRV_BSN      0x1
 #define ACTION_RTRV_MSGS     0x2
 
-static const value_string m2ua_action_values[] = {
+static const value_string action_values[] = {
   { ACTION_RTRV_BSN,  "Retrieve the backward sequence number" },
   { ACTION_RTRV_MSGS, "Retrieve the PDUs from the transmit and retransmit queues" },
   {0,                  NULL } };
@@ -701,34 +633,26 @@ static const value_string m2ua_action_values[] = {
 #define ACTION_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_action_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_action_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 action;
-
-  action = tvb_get_ntohl(parameter_tvb, ACTION_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_action, parameter_tvb, ACTION_OFFSET, ACTION_LENGTH, action);
-
-  proto_item_set_text(parameter_item, "Action parameter (%s)", val_to_str(action, m2ua_action_values, "unknown"));
+  proto_tree_add_uint(parameter_tree, hf_action, parameter_tvb, ACTION_OFFSET, ACTION_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)", val_to_str(tvb_get_ntohl(parameter_tvb, ACTION_OFFSET), action_values, "unknown"));
 }
 
 #define SEQUENCE_NUMBER_LENGTH 4
 #define SEQUENCE_NUMBER_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_sequence_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_sequence_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 number;
-
-  number = tvb_get_ntohl(parameter_tvb, SEQUENCE_NUMBER_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_sequence_number, parameter_tvb, SEQUENCE_NUMBER_OFFSET, SEQUENCE_NUMBER_LENGTH, number);
-
-  proto_item_set_text(parameter_item, "Sequence number parameter (%u)", number);
+  proto_tree_add_item(parameter_tree, hf_sequence_number, parameter_tvb, SEQUENCE_NUMBER_OFFSET, SEQUENCE_NUMBER_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%u)", tvb_get_ntohl(parameter_tvb, SEQUENCE_NUMBER_OFFSET));
 }
 
 #define RESULT_SUCCESS       0x0
 #define RESULT_FAILURE       0x1
 
-static const value_string m2ua_retrieval_result_values[] = {
+static const value_string retrieval_result_values[] = {
   { RESULT_SUCCESS,    "Action successful" },
   { RESULT_FAILURE ,   "Action failed" },
   { 0,                  NULL } };
@@ -738,41 +662,31 @@ static const value_string m2ua_retrieval_result_values[] = {
 #define RETRIEVAL_RESULT_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_retrieval_result_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_retrieval_result_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 result;
-
-  result = tvb_get_ntohl(parameter_tvb, RETRIEVAL_RESULT_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_retrieval_result, parameter_tvb, RETRIEVAL_RESULT_OFFSET, RETRIEVAL_RESULT_LENGTH, result);
-
-  proto_item_set_text(parameter_item, "Retrieval result parameter (%s)",  val_to_str(result, m2ua_retrieval_result_values, "unknown"));
+  proto_tree_add_item(parameter_tree, hf_retrieval_result, parameter_tvb, RETRIEVAL_RESULT_OFFSET, RETRIEVAL_RESULT_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)",  val_to_str(tvb_get_ntohl(parameter_tvb, RETRIEVAL_RESULT_OFFSET), retrieval_result_values, "unknown"));
 }
 
 static void
-dissect_m2ua_link_key_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_link_key_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree)
 {
   tvbuff_t *parameters_tvb;
-  guint16 length, parameters_length;
+  guint16 parameters_length;
 
-  length            = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
-  parameters_length = length - PARAMETER_HEADER_LENGTH;
+  parameters_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
   parameters_tvb    = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length);
-  dissect_m2ua_parameters(parameters_tvb, pinfo, tree, parameter_tree);
-  proto_item_set_text(parameter_item, "Link key parameter");
+  dissect_parameters(parameters_tvb, pinfo, tree, parameter_tree);
 }
 
 #define LOCAL_LK_ID_LENGTH 4
 #define LOCAL_LK_ID_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_local_lk_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_local_lk_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 id;
-
-  id = tvb_get_ntohl(parameter_tvb, LOCAL_LK_ID_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_local_lk_id, parameter_tvb, LOCAL_LK_ID_OFFSET, LOCAL_LK_ID_LENGTH, id);
-
-  proto_item_set_text(parameter_item, "Local KL identifier parameter (%u)",  id);
+  proto_tree_add_item(parameter_tree, hf_local_lk_id, parameter_tvb, LOCAL_LK_ID_OFFSET, LOCAL_LK_ID_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%u)",  tvb_get_ntohl(parameter_tvb, LOCAL_LK_ID_OFFSET));
 }
 
 #define SDT_RESERVED_LENGTH 2
@@ -781,17 +695,11 @@ dissect_m2ua_local_lk_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *
 #define SDT_ID_OFFSET       (SDT_RESERVED_OFFSET + SDT_RESERVED_LENGTH)
 
 static void
-dissect_m2ua_sdt_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_sdt_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint16 reserved, id;
-
-  reserved = tvb_get_ntohs(parameter_tvb, SDT_RESERVED_OFFSET);
-  id       = tvb_get_ntohs(parameter_tvb, SDT_ID_OFFSET);
-
-  proto_tree_add_uint(parameter_tree, hf_m2ua_sdt_reserved, parameter_tvb, SDT_RESERVED_OFFSET, SDT_RESERVED_LENGTH, reserved);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_sdt_id, parameter_tvb, SDT_ID_OFFSET, SDT_ID_LENGTH, id);
-
-  proto_item_set_text(parameter_item, "SDT identifier parameter (%u)",  id);
+  proto_tree_add_item(parameter_tree, hf_sdt_reserved, parameter_tvb, SDT_RESERVED_OFFSET, SDT_RESERVED_LENGTH, NETWORK_BYTE_ORDER);
+  proto_tree_add_item(parameter_tree, hf_sdt_id, parameter_tvb,       SDT_ID_OFFSET,       SDT_ID_LENGTH,       NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%u)",  tvb_get_ntohs(parameter_tvb, SDT_ID_OFFSET));
 }
 
 #define SDL_RESERVED_LENGTH 2
@@ -800,30 +708,22 @@ dissect_m2ua_sdt_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *param
 #define SDL_ID_OFFSET       (SDL_RESERVED_OFFSET + SDL_RESERVED_LENGTH)
 
 static void
-dissect_m2ua_sdl_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_sdl_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint16 reserved, id;
-
-  reserved = tvb_get_ntohs(parameter_tvb, SDT_RESERVED_OFFSET);
-  id       = tvb_get_ntohs(parameter_tvb, SDT_ID_OFFSET);
-
-  proto_tree_add_uint(parameter_tree, hf_m2ua_sdl_reserved, parameter_tvb, SDL_RESERVED_OFFSET, SDL_RESERVED_LENGTH, reserved);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_sdl_id, parameter_tvb, SDL_ID_OFFSET, SDL_ID_LENGTH, id);
-
-  proto_item_set_text(parameter_item, "SDL identifier parameter (%u)",  id);
+  proto_tree_add_item(parameter_tree, hf_sdl_reserved, parameter_tvb, SDL_RESERVED_OFFSET, SDL_RESERVED_LENGTH, NETWORK_BYTE_ORDER);
+  proto_tree_add_item(parameter_tree, hf_sdl_id,       parameter_tvb, SDL_ID_OFFSET,       SDL_ID_LENGTH,       NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%u)", tvb_get_ntohs(parameter_tvb, SDL_ID_OFFSET));
 }
 
 static void
-dissect_m2ua_registration_result_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_registration_result_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree)
 {
   tvbuff_t *parameters_tvb;
-  guint16 length, parameters_length;
+  guint16  parameters_length;
 
-  length            = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
-  parameters_length = length - PARAMETER_HEADER_LENGTH;
+  parameters_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
   parameters_tvb    = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length);
-  dissect_m2ua_parameters(parameters_tvb, pinfo, tree, parameter_tree);
-  proto_item_set_text(parameter_item, "Registration result parameter");
+  dissect_parameters(parameters_tvb, pinfo, tree, parameter_tree);
 }
 
 #define SUCCESSFULL_REGISTRATION_STATUS               0
@@ -836,43 +736,37 @@ dissect_m2ua_registration_result_parameter(tvbuff_t *parameter_tvb, packet_info
 #define LINK_KEY_NOT_PROVISIONED_REGISTRATION_STATUS  7
 #define INSUFFICIENT_RESOURCES_REGISTRATION_STATUS    8
 
-static const value_string m2ua_registration_status_values[] = {
-  { SUCCESSFULL_REGISTRATION_STATUS,              "Successfully Registered" },
+static const value_string registration_status_values[] = {
+  { SUCCESSFULL_REGISTRATION_STATUS,              "Successfully registered" },
   { UNKNOWN_REGISTRATION_STATUS,                  "Error - Unknown" },
   { INVALID_SDLI_REGISTRATION_STATUS,             "Error - Invalid SDLI" },
   { INVALID_SDTI_REGISTRATION_STATUS,             "Error - Invalid SDTI" },
-  { INVALID_LINK_KEY_REGISTRATION_STATUS,         "Error - Invalid Link Key" },
-  { PERMISSION_DENIED_REGISTRATION_STATUS,        "Error - Permission Denied" },
-  { OVERLAPPING_LINK_KEY_REGISTRATION_STATUS,     "Error - Overlapping (Non-unique) Link Key" },
-  { LINK_KEY_NOT_PROVISIONED_REGISTRATION_STATUS, "Error - Link Key not Provisioned" },
-  { INSUFFICIENT_RESOURCES_REGISTRATION_STATUS,   "Error - Insufficient Resources" },
+  { INVALID_LINK_KEY_REGISTRATION_STATUS,         "Error - Invalid link key" },
+  { PERMISSION_DENIED_REGISTRATION_STATUS,        "Error - Permission denied" },
+  { OVERLAPPING_LINK_KEY_REGISTRATION_STATUS,     "Error - Overlapping (Non-unique) link key" },
+  { LINK_KEY_NOT_PROVISIONED_REGISTRATION_STATUS, "Error - Link key not provisioned" },
+  { INSUFFICIENT_RESOURCES_REGISTRATION_STATUS,   "Error - Insufficient resources" },
   { 0,                  NULL } };
 
 #define REGISTRATION_STATUS_LENGTH 4
 #define REGISTRATION_STATUS_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_registration_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_registration_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 status;
-
-  status = tvb_get_ntohl(parameter_tvb, REGISTRATION_STATUS_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_registration_status, parameter_tvb, REGISTRATION_STATUS_OFFSET, REGISTRATION_STATUS_LENGTH, status);
-
-  proto_item_set_text(parameter_item, "Registration status parameter (%s)",  val_to_str(status, m2ua_registration_status_values, "unknown"));
+  proto_tree_add_item(parameter_tree, hf_registration_status, parameter_tvb, REGISTRATION_STATUS_OFFSET, REGISTRATION_STATUS_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)",  val_to_str(tvb_get_ntohl(parameter_tvb, REGISTRATION_STATUS_OFFSET), registration_status_values, "unknown"));
 }
 
 static void
-dissect_m2ua_deregistration_result_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_deregistration_result_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *parameter_tree)
 {
   tvbuff_t *parameters_tvb;
-  guint16 length, parameters_length;
+  guint16  parameters_length;
 
-  length            = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
-  parameters_length = length - PARAMETER_HEADER_LENGTH;
+  parameters_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
   parameters_tvb    = tvb_new_subset(parameter_tvb, PARAMETER_VALUE_OFFSET, parameters_length, parameters_length);
-  dissect_m2ua_parameters(parameters_tvb, pinfo, tree, parameter_tree);
-  proto_item_set_text(parameter_item, "Deregistration result parameter");
+  dissect_parameters(parameters_tvb, pinfo, tree, parameter_tree);
 }
 
 #define SUCCESSFULL_DEREGISTRATION_STATUS                  0
@@ -881,11 +775,11 @@ dissect_m2ua_deregistration_result_parameter(tvbuff_t *parameter_tvb, packet_inf
 #define PERMISSION_DENIED_DEREGISTRATION_STATUS            3
 #define NOT_REGISTRED_DEREGISTRATION_STATUS                4
 
-static const value_string m2ua_deregistration_status_values[] = {
-  { SUCCESSFULL_DEREGISTRATION_STATUS,                  "Successfully Registered" },
+static const value_string deregistration_status_values[] = {
+  { SUCCESSFULL_DEREGISTRATION_STATUS,                  "Successfully deregistered" },
   { UNKNOWN_DEREGISTRATION_STATUS,                      "Error - Unknown" },
   { INVALID_INTERFACE_IDENTIFIER_DEREGISTRATION_STATUS, "Error - Invalid interface identifier" },
-  { PERMISSION_DENIED_DEREGISTRATION_STATUS,            "Error - Permission Denied" },
+  { PERMISSION_DENIED_DEREGISTRATION_STATUS,            "Error - Permission denied" },
   { NOT_REGISTRED_DEREGISTRATION_STATUS,                "Error - Not registered" },
   { 0,                                                  NULL } };
 
@@ -893,31 +787,22 @@ static const value_string m2ua_deregistration_status_values[] = {
 #define DEREGISTRATION_STATUS_OFFSET PARAMETER_VALUE_OFFSET
 
 static void
-dissect_m2ua_deregistration_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_deregistration_status_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint32 status;
-
-  status = tvb_get_ntohl(parameter_tvb, DEREGISTRATION_STATUS_OFFSET);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_deregistration_status, parameter_tvb, DEREGISTRATION_STATUS_OFFSET, DEREGISTRATION_STATUS_LENGTH, status);
-
-  proto_item_set_text(parameter_item, "Deregistration status parameter (%s)",  val_to_str(status, m2ua_deregistration_status_values, "unknown"));
+  proto_tree_add_item(parameter_tree, hf_deregistration_status, parameter_tvb, DEREGISTRATION_STATUS_OFFSET, DEREGISTRATION_STATUS_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)",  val_to_str(tvb_get_ntohl(parameter_tvb, DEREGISTRATION_STATUS_OFFSET), deregistration_status_values, "unknown"));
 }
 
 static void
-dissect_m2ua_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
 {
-  guint16 tag, length, parameter_value_length;
-
-  tag    = tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET);
-  length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
-
-  parameter_value_length = length - PARAMETER_HEADER_LENGTH;
+  guint16 parameter_value_length;
 
+  parameter_value_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
   if (parameter_value_length > 0)
-    proto_tree_add_bytes(parameter_tree, hf_m2ua_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length,
-                         tvb_get_ptr(parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length));
-
-  proto_item_set_text(parameter_item, "Parameter with tag %u and %u byte%s value", tag, parameter_value_length, plurality(parameter_value_length, "", "s"));
+    proto_tree_add_item(parameter_tree, hf_parameter_value, parameter_tvb, PARAMETER_VALUE_OFFSET, parameter_value_length, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " with tag %u and %u byte%s value",
+                         tvb_get_ntohs(parameter_tvb, PARAMETER_TAG_OFFSET), parameter_value_length, plurality(parameter_value_length, "", "s"));
 }
 
 /* Common parameter tags */
@@ -952,7 +837,7 @@ dissect_m2ua_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tr
 #define DEREG_RESULT_PARAMETER_TAG                 0x030f
 #define DEREG_STATUS_PARAMETER_TAG                 0x0310
 
-static const value_string m2ua_parameter_tag_values[] = {
+static const value_string parameter_tag_values[] = {
   { INTERFACE_IDENTIFIER_INT_PARAMETER_TAG,        "Interface identifier (integer)" },
   { INTERFACE_IDENTIFIER_TEXT_PARAMETER_TAG,       "Interface identifier (text)" },
   { INFO_STRING_PARAMETER_TAG,                     "Info string" },
@@ -984,9 +869,9 @@ static const value_string m2ua_parameter_tag_values[] = {
   { 0,                           NULL } };
 
 static void
-dissect_m2ua_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m2ua_tree)
+dissect_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m2ua_tree)
 {
-  guint16 tag, length, padding_length, total_length;
+  guint16 tag, length, padding_length;
   proto_item *parameter_item;
   proto_tree *parameter_tree;
 
@@ -996,129 +881,126 @@ dissect_m2ua_parameter(tvbuff_t *parameter_tvb, packet_info *pinfo, proto_tree *
 
   /* calculate padding and total length */
   padding_length = tvb_length(parameter_tvb) - length;
-  total_length   = length + padding_length;
 
   /* create proto_tree stuff */
-  parameter_item   = proto_tree_add_text(m2ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, total_length, "Incomplete parameter");
+  parameter_item   = proto_tree_add_text(m2ua_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb),
+                                         val_to_str(tag, parameter_tag_values, "Unknown parameter"));
   parameter_tree   = proto_item_add_subtree(parameter_item, ett_m2ua_parameter);
 
   /* add tag and length to the m2ua tree */
-  proto_tree_add_uint(parameter_tree, hf_m2ua_parameter_tag, parameter_tvb, PARAMETER_TAG_OFFSET, PARAMETER_TAG_LENGTH, tag);
-  proto_tree_add_uint(parameter_tree, hf_m2ua_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, length);
+  proto_tree_add_item(parameter_tree, hf_parameter_tag,    parameter_tvb, PARAMETER_TAG_OFFSET,    PARAMETER_TAG_LENGTH,    NETWORK_BYTE_ORDER);
+  proto_tree_add_item(parameter_tree, hf_parameter_length, parameter_tvb, PARAMETER_LENGTH_OFFSET, PARAMETER_LENGTH_LENGTH, NETWORK_BYTE_ORDER);
 
   switch(tag) {
   case INTERFACE_IDENTIFIER_INT_PARAMETER_TAG:
-    dissect_m2ua_interface_identifier_int_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_interface_identifier_int_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case INTERFACE_IDENTIFIER_TEXT_PARAMETER_TAG:
-    dissect_m2ua_interface_identifier_text_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_interface_identifier_text_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case INFO_STRING_PARAMETER_TAG:
-    dissect_m2ua_info_string_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_info_string_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case DIAGNOSTIC_INFORMATION_PARAMETER_TAG:
-    dissect_m2ua_diagnostic_information_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_diagnostic_information_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case INTERFACE_IDENTIFIER_RANGE_PARAMETER_TAG:
-    dissect_m2ua_interface_identifier_range_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_interface_identifier_range_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case HEARTBEAT_DATA_PARAMETER_TAG:
-    dissect_m2ua_heartbeat_data_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_heartbeat_data_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case TRAFFIC_MODE_TYPE_PARAMETER_TAG:
-    dissect_m2ua_traffic_mode_type_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_traffic_mode_type_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case ERROR_CODE_PARAMETER_TAG:
-    dissect_m2ua_error_code_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_error_code_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case STATUS_PARAMETER_TAG:
-    dissect_m2ua_status_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_status_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case ASP_IDENTIFIER_PARAMETER_TAG:
-    dissect_m2ua_asp_identifier_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_asp_identifier_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case CORRELATION_IDENTIFIER_PARAMETER_TAG:
-    dissect_m2ua_correlation_identifier_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_correlation_identifier_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case PROTOCOL_DATA_1_PARAMETER_TAG:
-    dissect_m2ua_protocol_data_1_parameter(parameter_tvb, pinfo, tree, parameter_item);
+    dissect_protocol_data_1_parameter(parameter_tvb, pinfo, tree, parameter_item);
     break;
   case PROTOCOL_DATA_2_PARAMETER_TAG:
-    dissect_m2ua_protocol_data_2_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item);
+    dissect_protocol_data_2_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item);
     break;
   case STATE_REQUEST_PARAMETER_TAG:
-    dissect_m2ua_state_request_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_state_request_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case STATE_EVENT_PARAMETER_TAG:
-    dissect_m2ua_event_request_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_state_event_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case CONGESTION_STATUS_PARAMETER_TAG:
-    dissect_m2ua_congestion_status_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_congestion_status_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case DISCARD_STATUS_PARAMETER_TAG:
-    dissect_m2ua_discard_status_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_discard_status_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case ACTION_PARAMETER_TAG:
-    dissect_m2ua_action_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_action_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case SEQUENCE_NUMBER_PARAMETER_TAG:
-    dissect_m2ua_sequence_number_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_sequence_number_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case RETRIEVAL_RESULT_PARAMETER_TAG:
-    dissect_m2ua_retrieval_result_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_retrieval_result_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case LINK_KEY_PARAMETER_TAG:
-    dissect_m2ua_link_key_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item);
+    dissect_link_key_parameter(parameter_tvb, pinfo, tree, parameter_tree);
     break;
   case LOCAL_LK_IDENTIFIER_PARAMETER_TAG:
-    dissect_m2ua_local_lk_identifier_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_local_lk_identifier_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case SDT_IDENTIFIER_PARAMETER_TAG:
-    dissect_m2ua_sdt_identifier_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_sdt_identifier_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case SDL_IDENTIFIER_PARAMETER_TAG:
-    dissect_m2ua_sdl_identifier_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_sdl_identifier_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case REG_RESULT_PARAMETER_TAG:
-    dissect_m2ua_registration_result_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item);
+    dissect_registration_result_parameter(parameter_tvb, pinfo, tree, parameter_tree);
     break;
   case REG_STATUS_PARAMETER_TAG:
-    dissect_m2ua_registration_status_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_registration_status_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   case DEREG_RESULT_PARAMETER_TAG:
-    dissect_m2ua_deregistration_result_parameter(parameter_tvb, pinfo, tree, parameter_tree, parameter_item);
+    dissect_deregistration_result_parameter(parameter_tvb, pinfo, tree, parameter_tree);
     break;
   case DEREG_STATUS_PARAMETER_TAG:
-    dissect_m2ua_deregistration_status_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_deregistration_status_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   default:
-    dissect_m2ua_unknown_parameter(parameter_tvb, parameter_tree, parameter_item);
+    dissect_unknown_parameter(parameter_tvb, parameter_tree, parameter_item);
     break;
   };
 
   if (padding_length > 0)
-    proto_tree_add_bytes(parameter_tree, hf_m2ua_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length,
-                         tvb_get_ptr(parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length));
+    proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, NETWORK_BYTE_ORDER);
 }
 
 
 static void
-dissect_m2ua_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m2ua_tree)
+dissect_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m2ua_tree)
 {
-  gint offset, length, padding_length, total_length, remaining_length;
+  gint offset, length, total_length, remaining_length;
   tvbuff_t *parameter_tvb;
 
   offset = 0;
   while((remaining_length = tvb_reported_length_remaining(parameters_tvb, offset))) {
-    length         = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET);
-    padding_length = nr_of_padding_bytes(length);
+    length       = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET);
+    total_length = ADD_PADDING(length);
     if (remaining_length >= length)
-      total_length = MIN(length + padding_length, remaining_length);
-    else
-      total_length = length + padding_length;
+      total_length = MIN(total_length, remaining_length);
     /* create a tvb for the parameter including the padding bytes */
     parameter_tvb    = tvb_new_subset(parameters_tvb, offset, total_length, total_length);
-    dissect_m2ua_parameter(parameter_tvb, pinfo, tree, m2ua_tree);
+    dissect_parameter(parameter_tvb, pinfo, tree, m2ua_tree);
     /* get rid of the handled parameter */
     offset += total_length;
   }
@@ -1126,14 +1008,14 @@ dissect_m2ua_parameters(tvbuff_t *parameters_tvb, packet_info *pinfo, proto_tree
 
 
 static void
-dissect_m2ua_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m2ua_tree)
+dissect_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree, proto_tree *m2ua_tree)
 {
   tvbuff_t *common_header_tvb, *parameters_tvb;
 
   common_header_tvb = tvb_new_subset(message_tvb, 0, COMMON_HEADER_LENGTH, COMMON_HEADER_LENGTH);
   parameters_tvb    = tvb_new_subset(message_tvb, COMMON_HEADER_LENGTH, -1, -1);
-  dissect_m2ua_common_header(common_header_tvb, pinfo, m2ua_tree);
-  dissect_m2ua_parameters(parameters_tvb, pinfo, tree, m2ua_tree);
+  dissect_common_header(common_header_tvb, pinfo, m2ua_tree);
+  dissect_parameters(parameters_tvb, pinfo, tree, m2ua_tree);
 }
 
 static void
@@ -1156,7 +1038,7 @@ dissect_m2ua(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
     m2ua_tree = NULL;
   };
   /* dissect the message */
-  dissect_m2ua_message(message_tvb, pinfo, tree, m2ua_tree);
+  dissect_message(message_tvb, pinfo, tree, m2ua_tree);
 }
 
 /* Register the protocol with Ethereal */
@@ -1166,43 +1048,43 @@ proto_register_m2ua(void)
 
   /* Setup list of header fields */
   static hf_register_info hf[] = {
-    { &hf_m2ua_version,                { "Version",                        "m2ua.version",                    FT_UINT8,  BASE_DEC,  VALS(m2ua_protocol_version_values),      0x0, "", HFILL } },
-    { &hf_m2ua_reserved,               { "Reserved",                       "m2ua.reserved",                   FT_UINT8,  BASE_HEX,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_message_class,          { "Message class",                  "m2ua.message_class",              FT_UINT8,  BASE_DEC,  VALS(m2ua_message_class_values),         0x0, "", HFILL } },
-    { &hf_m2ua_message_type,           { "Message Type",                   "m2ua.message_type",               FT_UINT8,  BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_message_length,         { "Message length",                 "m2ua.message_length",             FT_UINT32, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_parameter_tag,          { "Parameter Tag",                  "m2ua.parameter_tag",              FT_UINT16, BASE_HEX,  VALS(m2ua_parameter_tag_values),         0x0, "", HFILL } },
-    { &hf_m2ua_parameter_length,       { "Parameter length",               "m2ua.parameter_length",           FT_UINT16, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_parameter_value,        { "Parameter value",                "m2ua.parameter_value",            FT_BYTES,  BASE_NONE, NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_parameter_padding,      { "Padding",                        "m2ua.parameter_padding",          FT_BYTES,  BASE_NONE, NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_interface_id_int,       { "Interface Identifier (integer)", "m2ua.interface_identifier_int",   FT_UINT32, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_interface_id_text,      { "Interface identifier (text)",    "m2ua.interface_identifier_text",  FT_STRING, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_info_string,            { "Info string",                    "m2ua.info_string",                FT_STRING, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_diagnostic_information, { "Diagnostic information",         "m2ua.diagnostic_information",     FT_BYTES,  BASE_NONE, NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_interface_id_start,     { "Interface Identifier (start)",   "m2ua.interface_identifier_start", FT_UINT32, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_interface_id_stop,      { "Interface Identifier (stop)",    "m2ua.interface_identifier_stop",  FT_UINT32, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_heartbeat_data,         { "Heartbeat data",                 "m2ua.heartbeat_data",             FT_BYTES,  BASE_NONE, NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_traffic_mode_type,      { "Traffic mode Type",              "m2ua.traffic_mode_type",          FT_UINT32, BASE_DEC,  VALS(m2ua_traffic_mode_type_values),     0x0, "", HFILL } },
-    { &hf_m2ua_error_code,             { "Error code",                     "m2ua.error_code",                 FT_UINT32, BASE_DEC,  VALS(m2ua_error_code_values),            0x0, "", HFILL } },
-    { &hf_m2ua_status_type,            { "Status type",                    "m2ua.status_type",                FT_UINT16, BASE_DEC,  VALS(m2ua_status_type_values),           0x0, "", HFILL } },
-    { &hf_m2ua_status_info,            { "Status info",                    "m2ua.status_info",                FT_UINT16, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_asp_id,                 { "ASP identifier",                 "m2ua.asp_identifier",             FT_UINT32, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_correlation_id,         { "Correlation identifier",         "m2ua.correlation identifier",     FT_UINT32, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_data_2_li,              { "Length indicator",               "m2ua.data_2_li",                  FT_UINT8,  BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_state,                  { "State",                          "m2ua.state",                      FT_UINT32, BASE_DEC,  VALS(m2ua_state_values),                 0x0, "", HFILL } },
-    { &hf_m2ua_event,                  { "Event",                          "m2ua.event",                      FT_UINT32, BASE_DEC,  VALS(m2ua_event_values),                 0x0, "", HFILL } },
-    { &hf_m2ua_congestion_status,      { "Congestion status",              "m2ua.congestion_status",          FT_UINT32, BASE_DEC,  VALS(m2ua_level_values),                 0x0, "", HFILL } },
-    { &hf_m2ua_discard_status,         { "Discard status",                 "m2ua.discard_status",             FT_UINT32, BASE_DEC,  VALS(m2ua_level_values),                 0x0, "", HFILL } },
-    { &hf_m2ua_action,                 { "Actions",                        "m2ua.action",                     FT_UINT32, BASE_DEC,  VALS(m2ua_action_values),                0x0, "", HFILL } },
-    { &hf_m2ua_sequence_number,        { "Sequence number",                "m2ua.sequence_number",            FT_UINT32, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_retrieval_result,       { "Retrieval result",               "m2ua.retrieval_result",           FT_UINT32, BASE_DEC,  VALS(m2ua_retrieval_result_values),      0x0, "", HFILL } },
-    { &hf_m2ua_local_lk_id,            { "Local LK identifier",            "m2ua.local_lk_identifier",        FT_UINT32, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_sdt_reserved,           { "Reserved",                       "m2ua.sdt_reserved",               FT_UINT16, BASE_HEX,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_sdt_id,                 { "SDT identifier",                 "m2ua.sdt_identifier",             FT_UINT16, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_sdl_reserved,           { "Reserved",                       "m2ua.sdl_reserved",               FT_UINT16, BASE_HEX,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_sdl_id,                 { "SDL identifier",                 "m2ua.sdl_identifier",             FT_UINT16, BASE_DEC,  NULL,                                    0x0, "", HFILL } },
-    { &hf_m2ua_registration_status,    { "Registration status",            "m2ua.registration_status",        FT_UINT32, BASE_DEC,  VALS(m2ua_registration_status_values),   0x0, "", HFILL } },
-    { &hf_m2ua_deregistration_status,  { "Deregistration status",          "m2ua.deregistration_status",      FT_UINT32, BASE_DEC,  VALS(m2ua_deregistration_status_values), 0x0, "", HFILL } },
+    { &hf_version,                { "Version",                        "m2ua.version",                    FT_UINT8,  BASE_DEC,  VALS(protocol_version_values),      0x0, "", HFILL } },
+    { &hf_reserved,               { "Reserved",                       "m2ua.reserved",                   FT_UINT8,  BASE_HEX,  NULL,                               0x0, "", HFILL } },
+    { &hf_message_class,          { "Message class",                  "m2ua.message_class",              FT_UINT8,  BASE_DEC,  VALS(message_class_values),         0x0, "", HFILL } },
+    { &hf_message_type,           { "Message Type",                   "m2ua.message_type",               FT_UINT8,  BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_message_length,         { "Message length",                 "m2ua.message_length",             FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_parameter_tag,          { "Parameter Tag",                  "m2ua.parameter_tag",              FT_UINT16, BASE_HEX,  VALS(parameter_tag_values),         0x0, "", HFILL } },
+    { &hf_parameter_length,       { "Parameter length",               "m2ua.parameter_length",           FT_UINT16, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_parameter_value,        { "Parameter value",                "m2ua.parameter_value",            FT_BYTES,  BASE_NONE, NULL,                               0x0, "", HFILL } },
+    { &hf_parameter_padding,      { "Padding",                        "m2ua.parameter_padding",          FT_BYTES,  BASE_NONE, NULL,                               0x0, "", HFILL } },
+    { &hf_interface_id_int,       { "Interface Identifier (integer)", "m2ua.interface_identifier_int",   FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_interface_id_text,      { "Interface identifier (text)",    "m2ua.interface_identifier_text",  FT_STRING, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_info_string,            { "Info string",                    "m2ua.info_string",                FT_STRING, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_diagnostic_information, { "Diagnostic information",         "m2ua.diagnostic_information",     FT_BYTES,  BASE_NONE, NULL,                               0x0, "", HFILL } },
+    { &hf_interface_id_start,     { "Interface Identifier (start)",   "m2ua.interface_identifier_start", FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_interface_id_stop,      { "Interface Identifier (stop)",    "m2ua.interface_identifier_stop",  FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_heartbeat_data,         { "Heartbeat data",                 "m2ua.heartbeat_data",             FT_BYTES,  BASE_NONE, NULL,                               0x0, "", HFILL } },
+    { &hf_traffic_mode_type,      { "Traffic mode Type",              "m2ua.traffic_mode_type",          FT_UINT32, BASE_DEC,  VALS(traffic_mode_type_values),     0x0, "", HFILL } },
+    { &hf_error_code,             { "Error code",                     "m2ua.error_code",                 FT_UINT32, BASE_DEC,  VALS(error_code_values),            0x0, "", HFILL } },
+    { &hf_status_type,            { "Status type",                    "m2ua.status_type",                FT_UINT16, BASE_DEC,  VALS(status_type_values),           0x0, "", HFILL } },
+    { &hf_status_ident,           { "Status info",                    "m2ua.status_info",                FT_UINT16, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_asp_id,                 { "ASP identifier",                 "m2ua.asp_identifier",             FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_correlation_id,         { "Correlation identifier",         "m2ua.correlation identifier",     FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_data_2_li,              { "Length indicator",               "m2ua.data_2_li",                  FT_UINT8,  BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_state,                  { "State",                          "m2ua.state",                      FT_UINT32, BASE_DEC,  VALS(state_values),                 0x0, "", HFILL } },
+    { &hf_event,                  { "Event",                          "m2ua.event",                      FT_UINT32, BASE_DEC,  VALS(event_values),                 0x0, "", HFILL } },
+    { &hf_congestion_status,      { "Congestion status",              "m2ua.congestion_status",          FT_UINT32, BASE_DEC,  VALS(level_values),                 0x0, "", HFILL } },
+    { &hf_discard_status,         { "Discard status",                 "m2ua.discard_status",             FT_UINT32, BASE_DEC,  VALS(level_values),                 0x0, "", HFILL } },
+    { &hf_action,                 { "Actions",                        "m2ua.action",                     FT_UINT32, BASE_DEC,  VALS(action_values),                0x0, "", HFILL } },
+    { &hf_sequence_number,        { "Sequence number",                "m2ua.sequence_number",            FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_retrieval_result,       { "Retrieval result",               "m2ua.retrieval_result",           FT_UINT32, BASE_DEC,  VALS(retrieval_result_values),      0x0, "", HFILL } },
+    { &hf_local_lk_id,            { "Local LK identifier",            "m2ua.local_lk_identifier",        FT_UINT32, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_sdt_reserved,           { "Reserved",                       "m2ua.sdt_reserved",               FT_UINT16, BASE_HEX,  NULL,                               0x0, "", HFILL } },
+    { &hf_sdt_id,                 { "SDT identifier",                 "m2ua.sdt_identifier",             FT_UINT16, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_sdl_reserved,           { "Reserved",                       "m2ua.sdl_reserved",               FT_UINT16, BASE_HEX,  NULL,                               0x0, "", HFILL } },
+    { &hf_sdl_id,                 { "SDL identifier",                 "m2ua.sdl_identifier",             FT_UINT16, BASE_DEC,  NULL,                               0x0, "", HFILL } },
+    { &hf_registration_status,    { "Registration status",            "m2ua.registration_status",        FT_UINT32, BASE_DEC,  VALS(registration_status_values),   0x0, "", HFILL } },
+    { &hf_deregistration_status,  { "Deregistration status",          "m2ua.deregistration_status",      FT_UINT32, BASE_DEC,  VALS(deregistration_status_values), 0x0, "", HFILL } },
   };
 
   /* Setup protocol subtree array */