Move dissectors to epan/dissectors directory.

Also move ncp222.py, x11-fields, process-x11-fields.pl,
make-reg-dotc, and make-reg-dotc.py.

Adjust #include lines in files that include packet-*.h
files.

svn path=/trunk/; revision=11410

1 files changed, 665 insertions, 0 deletions

diff --git a/epan/dissectors/packet-asap.c b/epan/dissectors/packet-asap.c
new file mode 100644
index 0000000000..d06aef7434
--- /dev/null
+++ b/epan/dissectors/packet-asap.c
@@ -0,0 +1,665 @@
+/* packet-asap.c
+ * Routines for Aggregate Server Access Protocol
+ * It is hopefully (needs testing) compilant to
+ * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-common-param-06.txt
+ * http://www.ietf.org/internet-drafts/draft-ietf-rserpool-asap-09.txt
+ *
+ * Copyright 2004, Michael Tuexen <tuexen [AT] fh-muenster.de>
+ *
+ * $Id$
+ *
+ * Ethereal - Network traffic analyzer
+ * By Gerald Combs <gerald@ethereal.com>
+ * Copyright 1998 Gerald Combs
+ *
+ * Copied from README.developer
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <epan/packet.h>
+#include "sctpppids.h"
+
+/* Initialize the protocol and registered fields */
+static int proto_asap = -1;
+static int hf_cause_code = -1;
+static int hf_cause_length = -1;
+static int hf_cause_info = -1;
+static int hf_cause_padding = -1;
+static int hf_message_type = -1;
+static int hf_message_flags = -1;
+static int hf_message_length = -1;
+static int hf_parameter_type = -1;
+static int hf_parameter_length = -1;
+static int hf_parameter_value = -1;
+static int hf_parameter_padding = -1;
+static int hf_parameter_ipv4_address = -1;
+static int hf_parameter_ipv6_address = -1;
+static int hf_sctp_port = -1;
+static int hf_transport_use = -1;
+static int hf_tcp_port = -1;
+static int hf_udp_port = -1;
+static int hf_udp_reserved = -1;
+static int hf_policy_type = -1;
+static int hf_policy_value = -1;
+static int hf_pool_handle = -1;
+static int hf_pe_pe_identifier = -1;
+static int hf_home_enrp_id = -1;
+static int hf_reg_life = -1;
+static int hf_server_identifier = -1;
+static int hf_m_bit = -1;
+static int hf_reserved = -1;
+static int hf_cookie = -1;
+static int hf_pe_identifier = -1;
+static int hf_pe_checksum = -1;
+
+/* Initialize the subtree pointers */
+static gint ett_asap = -1;
+static gint ett_asap_parameter = -1;
+static gint ett_asap_cause = -1;
+
+static void
+dissect_parameters(tvbuff_t *, proto_tree *);
+
+#define NETWORK_BYTE_ORDER     FALSE
+#define ADD_PADDING(x) ((((x) + 3) >> 2) << 2)
+
+/* Dissectors for error causes */
+#define CAUSE_CODE_LENGTH   2
+#define CAUSE_LENGTH_LENGTH 2
+#define CAUSE_HEADER_LENGTH (CAUSE_CODE_LENGTH + CAUSE_LENGTH_LENGTH)
+
+#define CAUSE_HEADER_OFFSET 0
+#define CAUSE_CODE_OFFSET   CAUSE_HEADER_OFFSET
+#define CAUSE_LENGTH_OFFSET (CAUSE_CODE_OFFSET + CAUSE_CODE_LENGTH)
+#define CAUSE_INFO_OFFSET   (CAUSE_LENGTH_OFFSET + CAUSE_LENGTH_LENGTH)
+
+static void
+dissect_unknown_cause(tvbuff_t *cause_tvb, proto_tree *cause_tree, proto_item *cause_item)
+{
+  guint16 code, length, cause_info_length;
+
+  code              = tvb_get_ntohs(cause_tvb, CAUSE_CODE_OFFSET);
+  length            = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET);
+  cause_info_length = length - CAUSE_HEADER_LENGTH;
+  if (cause_info_length > 0)
+    proto_tree_add_bytes(cause_tree, hf_cause_info, cause_tvb, CAUSE_INFO_OFFSET, cause_info_length,
+                         tvb_get_ptr(cause_tvb, CAUSE_INFO_OFFSET, cause_info_length));
+  proto_item_append_text(cause_item, " (code %u and %u byte%s information)", code, cause_info_length, plurality(cause_info_length, "", "s"));
+}
+
+#define UNRECOGNIZED_PARAMETER_CAUSE_CODE                  1
+#define UNRECONGNIZED_MESSAGE_CAUSE_CODE                   2
+#define INVALID_VALUES                                     3
+#define NON_UNIQUE_PE_IDENTIFIER                           4
+#define POOLING_POLICY_INCONSISTENT_CAUSE_CODE             5
+#define LACK_OF_RESOURCES_CAUSE_CODE                       6
+#define INCONSISTENT_TRANSPORT_TYPE_CAUSE_CODE             7
+#define INCONSISTENT_DATA_CONTROL_CONFIGURATION_CAUSE_CODE 8
+
+static const value_string cause_code_values[] = {
+  { UNRECOGNIZED_PARAMETER_CAUSE_CODE,                  "Unrecognized parameter"         },
+  { UNRECONGNIZED_MESSAGE_CAUSE_CODE,                   "Unrecognized message"           },
+  { INVALID_VALUES,                                     "Invalid values"                 },
+  { NON_UNIQUE_PE_IDENTIFIER,                           "Non-unique PE identifier"       },
+  { POOLING_POLICY_INCONSISTENT_CAUSE_CODE,             "Pooling policy inconsistent"    },
+  { LACK_OF_RESOURCES_CAUSE_CODE,                       "Lack of resources"              },
+  { INCONSISTENT_TRANSPORT_TYPE_CAUSE_CODE,             "Inconsistent transport type"    },
+  { INCONSISTENT_DATA_CONTROL_CONFIGURATION_CAUSE_CODE, "Inconsistent data/control type" },
+  { 0,                                                  NULL                             } };
+
+static void
+dissect_error_cause(tvbuff_t *cause_tvb, proto_tree *parameter_tree)
+{
+  guint16 code, length, padding_length;
+  proto_item *cause_item;
+  proto_tree *cause_tree;
+
+  code           = tvb_get_ntohs(cause_tvb, CAUSE_CODE_OFFSET);
+  length         = tvb_get_ntohs(cause_tvb, CAUSE_LENGTH_OFFSET);
+  padding_length = tvb_length(cause_tvb) - length;
+
+  cause_item = proto_tree_add_text(parameter_tree, cause_tvb, CAUSE_HEADER_OFFSET, tvb_length(cause_tvb), val_to_str(code, cause_code_values, "Unknown error cause"));
+  cause_tree = proto_item_add_subtree(cause_item, ett_asap_cause);
+
+  proto_tree_add_item(cause_tree, hf_cause_code,   cause_tvb, CAUSE_CODE_OFFSET,   CAUSE_CODE_LENGTH,   NETWORK_BYTE_ORDER);
+  proto_tree_add_item(cause_tree, hf_cause_length, cause_tvb, CAUSE_LENGTH_OFFSET, CAUSE_LENGTH_LENGTH, NETWORK_BYTE_ORDER);
+
+  switch(code) {
+  default:
+    dissect_unknown_cause(cause_tvb, cause_tree, cause_item);
+    break;
+  }
+  if (padding_length > 0)
+    proto_tree_add_item(cause_tree, hf_cause_padding, cause_tvb, CAUSE_HEADER_OFFSET + length, padding_length, NETWORK_BYTE_ORDER);
+}
+
+static void
+dissect_error_causes(tvbuff_t *error_causes_tvb, proto_tree *parameter_tree)
+{
+  guint16 length, total_length;
+  gint offset;
+  tvbuff_t *error_cause_tvb;
+
+  offset = 0;
+  while(tvb_reported_length_remaining(error_causes_tvb, offset)) {
+    length          = tvb_get_ntohs(error_causes_tvb, offset + CAUSE_LENGTH_OFFSET);
+    total_length    = ADD_PADDING(length);
+    error_cause_tvb = tvb_new_subset(error_causes_tvb, offset , total_length, total_length);
+    dissect_error_cause(error_cause_tvb, parameter_tree);
+    offset += total_length;
+  }
+}
+
+/* Dissectors for parameters. This is common for ASAP and ENRP */
+
+#define PARAMETER_TYPE_LENGTH   2
+#define PARAMETER_LENGTH_LENGTH 2
+#define PARAMETER_HEADER_LENGTH (PARAMETER_TYPE_LENGTH + PARAMETER_LENGTH_LENGTH)
+
+#define PARAMETER_HEADER_OFFSET 0
+#define PARAMETER_TYPE_OFFSET   PARAMETER_HEADER_OFFSET
+#define PARAMETER_LENGTH_OFFSET (PARAMETER_TYPE_OFFSET + PARAMETER_TYPE_LENGTH)
+#define PARAMETER_VALUE_OFFSET  (PARAMETER_LENGTH_OFFSET + PARAMETER_LENGTH_LENGTH)
+
+#define IPV4_ADDRESS_LENGTH 4
+#define IPV4_ADDRESS_OFFSET PARAMETER_VALUE_OFFSET
+
+static void
+dissect_ipv4_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+{
+  proto_tree_add_item(parameter_tree, hf_parameter_ipv4_address, parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)", ip_to_str((const guint8 *)tvb_get_ptr(parameter_tvb, IPV4_ADDRESS_OFFSET, IPV4_ADDRESS_LENGTH)));
+}
+
+#define IPV6_ADDRESS_LENGTH 16
+#define IPV6_ADDRESS_OFFSET PARAMETER_VALUE_OFFSET
+
+static void
+dissect_ipv6_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+{
+  proto_tree_add_item(parameter_tree, hf_parameter_ipv6_address, parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%s)", ip6_to_str((const struct e_in6_addr *)tvb_get_ptr(parameter_tvb, IPV6_ADDRESS_OFFSET, IPV6_ADDRESS_LENGTH)));
+}
+
+#define TRANSPORT_USE_DATA_ONLY         0
+#define TRANSPORT_USE_DATA_PLUS_CONTROL 1
+
+static const value_string transport_use_values[] = {
+  { TRANSPORT_USE_DATA_ONLY,          "Data only"         },
+  { TRANSPORT_USE_DATA_PLUS_CONTROL,  "Data plus control" },
+  { 0,                                NULL                } };
+  
+#define SCTP_PORT_LENGTH          2
+#define SCTP_TRANSPORT_USE_LENGTH 2
+#define SCTP_PORT_OFFSET          PARAMETER_VALUE_OFFSET
+#define SCTP_TRANSPORT_USE_OFFSET (SCTP_PORT_OFFSET + SCTP_PORT_LENGTH)
+#define SCTP_ADDRESS_OFFSET       (SCTP_TRANSPORT_USE_OFFSET + SCTP_TRANSPORT_USE_LENGTH)
+
+static void
+dissect_sctp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
+{
+  tvbuff_t *parameters_tvb;
+
+  proto_tree_add_item(parameter_tree, hf_sctp_port,     parameter_tvb, SCTP_PORT_OFFSET,          SCTP_PORT_LENGTH,          NETWORK_BYTE_ORDER);
+  proto_tree_add_item(parameter_tree, hf_transport_use, parameter_tvb, SCTP_TRANSPORT_USE_OFFSET, SCTP_TRANSPORT_USE_LENGTH, NETWORK_BYTE_ORDER);
+
+  parameters_tvb = tvb_new_subset(parameter_tvb, SCTP_ADDRESS_OFFSET, -1, -1);
+  dissect_parameters(parameters_tvb, parameter_tree);
+}
+
+#define TCP_PORT_LENGTH          2
+#define TCP_TRANSPORT_USE_LENGTH 2
+#define TCP_PORT_OFFSET          PARAMETER_VALUE_OFFSET
+#define TCP_TRANSPORT_USE_OFFSET (TCP_PORT_OFFSET + TCP_PORT_LENGTH)
+#define TCP_ADDRESS_OFFSET       (TCP_TRANSPORT_USE_OFFSET + TCP_TRANSPORT_USE_LENGTH)
+
+static void
+dissect_tcp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
+{
+  tvbuff_t *parameters_tvb;
+
+  proto_tree_add_item(parameter_tree, hf_tcp_port,      parameter_tvb, TCP_PORT_OFFSET,          TCP_PORT_LENGTH,          NETWORK_BYTE_ORDER);
+  proto_tree_add_item(parameter_tree, hf_transport_use, parameter_tvb, TCP_TRANSPORT_USE_OFFSET, TCP_TRANSPORT_USE_LENGTH, NETWORK_BYTE_ORDER);
+
+  parameters_tvb = tvb_new_subset(parameter_tvb, TCP_ADDRESS_OFFSET, -1, -1);
+  dissect_parameters(parameters_tvb, parameter_tree);
+}
+
+#define UDP_PORT_LENGTH     2
+#define UDP_RESERVED_LENGTH 2
+#define UDP_PORT_OFFSET     PARAMETER_VALUE_OFFSET
+#define UDP_RESERVED_OFFSET (UDP_PORT_OFFSET + UDP_PORT_LENGTH)
+#define UDP_ADDRESS_OFFSET  (UDP_RESERVED_OFFSET + UDP_RESERVED_LENGTH)
+
+static void
+dissect_udp_transport_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
+{
+  tvbuff_t *parameters_tvb;
+
+  proto_tree_add_item(parameter_tree, hf_udp_port,     parameter_tvb, UDP_PORT_OFFSET,     UDP_PORT_LENGTH,     NETWORK_BYTE_ORDER);
+  proto_tree_add_item(parameter_tree, hf_udp_reserved, parameter_tvb, UDP_RESERVED_OFFSET, UDP_RESERVED_LENGTH, NETWORK_BYTE_ORDER);
+
+  parameters_tvb = tvb_new_subset(parameter_tvb, UDP_ADDRESS_OFFSET, -1, -1);
+  dissect_parameters(parameters_tvb, parameter_tree);
+}
+
+#define POLICY_TYPE_LENGTH   1
+#define POLICY_VALUE_LENGTH  3
+
+#define POLICY_TYPE_OFFSET   PARAMETER_VALUE_OFFSET
+#define POLICY_VALUE_OFFSET  (POLICY_TYPE_OFFSET + POLICY_TYPE_LENGTH)
+
+#define ROUND_ROBIN_POLICY   1
+#define LEAST_USED_POLICY    2
+#define LEAST_USED_WITH_DEG  3
+#define WEIGHTED_ROUND_ROBIN 4
+
+static const value_string policy_type_values[] = {
+  { ROUND_ROBIN_POLICY,   "Round robin" },
+  { LEAST_USED_POLICY,    "Least used" },
+  { LEAST_USED_WITH_DEG,  "Least used with degradation" },
+  { WEIGHTED_ROUND_ROBIN, "Weighted round robin" },
+  { 0,                    NULL } };
+
+static void
+dissect_pool_member_selection_policy_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
+{
+  proto_tree_add_item(parameter_tree, hf_policy_type,  parameter_tvb, POLICY_TYPE_OFFSET,  POLICY_TYPE_LENGTH,  NETWORK_BYTE_ORDER);
+  proto_tree_add_item(parameter_tree, hf_policy_value, parameter_tvb, POLICY_VALUE_OFFSET, POLICY_VALUE_LENGTH, NETWORK_BYTE_ORDER);
+}
+
+#define POOL_HANDLE_OFFSET PARAMETER_VALUE_OFFSET
+
+static void
+dissect_pool_handle_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
+{
+  guint16 handle_length;
+
+  handle_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
+  proto_tree_add_item(parameter_tree, hf_pool_handle, parameter_tvb, POOL_HANDLE_OFFSET, handle_length, NETWORK_BYTE_ORDER);
+}
+
+#define PE_PE_IDENTIFIER_LENGTH         4
+#define HOME_ENRP_INDENTIFIER_LENGTH    4
+#define REGISTRATION_LIFE_LENGTH        4
+
+#define PE_PE_IDENTIFIER_OFFSET         PARAMETER_VALUE_OFFSET
+#define HOME_ENRP_INDENTIFIER_OFFSET    (PE_PE_IDENTIFIER_OFFSET + PE_PE_IDENTIFIER_LENGTH)
+#define REGISTRATION_LIFE_OFFSET        (HOME_ENRP_INDENTIFIER_OFFSET + HOME_ENRP_INDENTIFIER_LENGTH)
+#define USER_TRANSPORT_PARAMETER_OFFSET (REGISTRATION_LIFE_OFFSET + REGISTRATION_LIFE_LENGTH)
+
+static void
+dissect_pool_element_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
+{
+  tvbuff_t *parameters_tvb;
+
+  proto_tree_add_item(parameter_tree, hf_pe_pe_identifier, parameter_tvb, PE_PE_IDENTIFIER_OFFSET,      PE_PE_IDENTIFIER_LENGTH,      NETWORK_BYTE_ORDER);
+  proto_tree_add_item(parameter_tree, hf_home_enrp_id,     parameter_tvb, HOME_ENRP_INDENTIFIER_OFFSET, HOME_ENRP_INDENTIFIER_LENGTH, NETWORK_BYTE_ORDER);
+  proto_tree_add_item(parameter_tree, hf_reg_life,         parameter_tvb, REGISTRATION_LIFE_OFFSET,     REGISTRATION_LIFE_LENGTH,     NETWORK_BYTE_ORDER);
+
+  parameters_tvb = tvb_new_subset(parameter_tvb, USER_TRANSPORT_PARAMETER_OFFSET, -1, -1);
+  dissect_parameters(parameters_tvb, parameter_tree);
+}
+
+#define SERVER_ID_LENGTH         4
+#define RESERVED_LENGTH          4
+
+#define SERVER_ID_OFFSET         PARAMETER_VALUE_OFFSET
+#define RESERVED_OFFSET          (SERVER_ID_OFFSET + SERVER_ID_LENGTH)
+#define SERVER_TRANSPORT_OFFSET  (RESERVED_OFFSET + RESERVED_LENGTH)
+
+#define M_BIT_MASK               0x80000000
+#define RESERVED_MASK            0x7fffffff
+
+static void
+dissect_server_information_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
+{
+  tvbuff_t *parameters_tvb;
+
+  proto_tree_add_item(parameter_tree, hf_server_identifier, parameter_tvb, SERVER_ID_OFFSET, SERVER_ID_LENGTH, NETWORK_BYTE_ORDER);
+  proto_tree_add_item(parameter_tree, hf_m_bit,             parameter_tvb, RESERVED_OFFSET,  RESERVED_LENGTH,  NETWORK_BYTE_ORDER);
+  proto_tree_add_item(parameter_tree, hf_reserved,          parameter_tvb, RESERVED_OFFSET,  RESERVED_LENGTH,  NETWORK_BYTE_ORDER);
+
+  parameters_tvb = tvb_new_subset(parameter_tvb, SERVER_TRANSPORT_OFFSET, -1, -1);
+  dissect_parameters(parameters_tvb, parameter_tree);
+}
+
+#define ERROR_CAUSES_OFFSET PARAMETER_VALUE_OFFSET
+
+static void
+dissect_operation_error_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree)
+{
+  tvbuff_t *error_causes_tvb;
+
+  error_causes_tvb = tvb_new_subset(parameter_tvb, ERROR_CAUSES_OFFSET, -1,-1);
+  dissect_error_causes(error_causes_tvb, parameter_tree);
+}
+
+#define COOKIE_OFFSET PARAMETER_VALUE_OFFSET
+
+static void
+dissect_cookie_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+{
+  guint16 cookie_length;
+
+  cookie_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
+  if (cookie_length > 0)
+    proto_tree_add_item(parameter_tree, hf_cookie, parameter_tvb, COOKIE_OFFSET, cookie_length, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (%u byte%s)", cookie_length, plurality(cookie_length, "", "s"));
+}
+
+#define PE_IDENTIFIER_LENGTH 4
+#define PE_IDENTIFIER_OFFSET PARAMETER_VALUE_OFFSET
+
+static void
+dissect_pe_identifier_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+{
+  proto_tree_add_item(parameter_tree, hf_pe_identifier, parameter_tvb, PE_IDENTIFIER_OFFSET, PE_IDENTIFIER_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (0x%x)", tvb_get_ntohl(parameter_tvb, PE_IDENTIFIER_OFFSET));
+}
+
+#define PE_CHECKSUM_LENGTH 4
+#define PE_CHECKSUM_OFFSET PARAMETER_VALUE_OFFSET
+
+static void
+dissect_pe_checksum_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+{
+  proto_tree_add_item(parameter_tree, hf_pe_checksum, parameter_tvb, PE_CHECKSUM_OFFSET, PE_CHECKSUM_LENGTH, NETWORK_BYTE_ORDER);
+  proto_item_append_text(parameter_item, " (0x%x)", tvb_get_ntohl(parameter_tvb, PE_CHECKSUM_OFFSET));
+}
+
+static void
+dissect_unknown_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item)
+{
+  guint16 type, parameter_value_length;
+
+  type                   = tvb_get_ntohs(parameter_tvb, PARAMETER_TYPE_OFFSET);
+  parameter_value_length = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET) - PARAMETER_HEADER_LENGTH;
+
+  if (parameter_value_length > 0)
+    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, " (type %u and %u byte%s value)", type, parameter_value_length, plurality(parameter_value_length, "", "s"));
+}
+
+#define IPV4_ADDRESS_PARAMETER_TYPE                 0x01
+#define IPV6_ADDRESS_PARAMETER_TYPE                 0x02
+#define SCTP_TRANSPORT_PARAMETER_TYPE               0x03
+#define TCP_TRANSPORT_PARAMETER_TYPE                0x04
+#define UDP_TRANSPORT_PARAMETER_TYPE                0x05
+#define POOL_MEMBER_SELECTION_POLICY_PARAMETER_TYPE 0x06
+#define POOL_HANDLE_PARAMETER_TYPE                  0x07
+#define POOL_ELEMENT_PARAMETER_TYPE                 0x08
+#define SERVER_INFORMATION_PARAMETER_TYPE           0x09
+#define OPERATION_ERROR_PARAMETER_TYPE              0x0a
+#define COOKIE_PARAMETER_TYPE                       0x0b
+#define PE_IDENTIFIER_PARAMETER_TYPE                0x0c
+#define PE_CHECKSUM_PARAMETER_TYPE                  0x0d
+
+static const value_string parameter_type_values[] = {
+  { IPV4_ADDRESS_PARAMETER_TYPE,                 "IPV4 address" },
+  { IPV6_ADDRESS_PARAMETER_TYPE,                 "IPV6 address" },
+  { SCTP_TRANSPORT_PARAMETER_TYPE,               "SCTP transport address" },
+  { TCP_TRANSPORT_PARAMETER_TYPE,                "TCP transport address" },
+  { UDP_TRANSPORT_PARAMETER_TYPE,                "UDP transport address" },
+  { POOL_MEMBER_SELECTION_POLICY_PARAMETER_TYPE, "Pool member selection policy" },
+  { POOL_HANDLE_PARAMETER_TYPE,                  "Pool handle" },
+  { POOL_ELEMENT_PARAMETER_TYPE,                 "Pool element" },
+  { SERVER_INFORMATION_PARAMETER_TYPE,           "Server Information" },
+  { OPERATION_ERROR_PARAMETER_TYPE,              "Operation error" },
+  { COOKIE_PARAMETER_TYPE,                       "Cookie" },
+  { PE_IDENTIFIER_PARAMETER_TYPE,                "Pool Element identifier" },
+  { PE_CHECKSUM_PARAMETER_TYPE,                  "PE checksum" },
+  { 0,                                           NULL } };
+
+
+static void
+dissect_parameter(tvbuff_t *parameter_tvb, proto_tree *asap_tree)
+{
+  guint16 type, length, padding_length;
+  proto_item *parameter_item;
+  proto_tree *parameter_tree;
+
+  /* extract tag and length from the parameter */
+  type           = tvb_get_ntohs(parameter_tvb, PARAMETER_TYPE_OFFSET);
+  length         = tvb_get_ntohs(parameter_tvb, PARAMETER_LENGTH_OFFSET);
+  padding_length = tvb_length(parameter_tvb) - length;
+
+  /* create proto_tree stuff */
+  parameter_item   = proto_tree_add_text(asap_tree, parameter_tvb, PARAMETER_HEADER_OFFSET, tvb_length(parameter_tvb), val_to_str(type, parameter_type_values, "Unknown parameter"));
+  parameter_tree   = proto_item_add_subtree(parameter_item, ett_asap_parameter);
+
+  /* add tag and length to the asap tree */
+  proto_tree_add_item(parameter_tree, hf_parameter_type,   parameter_tvb, PARAMETER_TYPE_OFFSET,   PARAMETER_TYPE_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(type) {
+  case IPV4_ADDRESS_PARAMETER_TYPE:
+    dissect_ipv4_parameter(parameter_tvb, parameter_tree, parameter_item);
+    break;
+  case IPV6_ADDRESS_PARAMETER_TYPE:
+    dissect_ipv6_parameter(parameter_tvb, parameter_tree, parameter_item);
+    break;
+  case SCTP_TRANSPORT_PARAMETER_TYPE:
+    dissect_sctp_transport_parameter(parameter_tvb, parameter_tree);
+    break;
+  case TCP_TRANSPORT_PARAMETER_TYPE:
+    dissect_tcp_transport_parameter(parameter_tvb, parameter_tree);
+    break;
+  case UDP_TRANSPORT_PARAMETER_TYPE:
+    dissect_udp_transport_parameter(parameter_tvb, parameter_tree);
+    break;
+  case POOL_MEMBER_SELECTION_POLICY_PARAMETER_TYPE:
+    dissect_pool_member_selection_policy_parameter(parameter_tvb, parameter_tree);
+    break;
+  case POOL_HANDLE_PARAMETER_TYPE:
+    dissect_pool_handle_parameter(parameter_tvb, parameter_tree);
+    break;
+  case POOL_ELEMENT_PARAMETER_TYPE:
+    dissect_pool_element_parameter(parameter_tvb, parameter_tree);
+    break;
+  case SERVER_INFORMATION_PARAMETER_TYPE:
+    dissect_server_information_parameter(parameter_tvb, parameter_tree);
+    break;
+  case OPERATION_ERROR_PARAMETER_TYPE:
+    dissect_operation_error_parameter(parameter_tvb, parameter_tree);
+    break;
+  case COOKIE_PARAMETER_TYPE:
+    dissect_cookie_parameter(parameter_tvb, parameter_tree, parameter_item);
+    break;
+  case PE_IDENTIFIER_PARAMETER_TYPE:
+    dissect_pe_identifier_parameter(parameter_tvb, parameter_tree, parameter_item);
+    break;
+  case PE_CHECKSUM_PARAMETER_TYPE:
+    dissect_pe_checksum_parameter(parameter_tvb, parameter_tree, parameter_item);
+    break;
+  default:
+    dissect_unknown_parameter(parameter_tvb, parameter_tree, parameter_item);
+    break;
+  };
+
+  if (padding_length > 0)
+    proto_tree_add_item(parameter_tree, hf_parameter_padding, parameter_tvb, PARAMETER_HEADER_OFFSET + length, padding_length, NETWORK_BYTE_ORDER);
+}
+
+static void
+dissect_parameters(tvbuff_t *parameters_tvb, proto_tree *tree)
+{
+  gint offset, length, total_length, remaining_length;
+  tvbuff_t *parameter_tvb;
+
+  offset = 0;
+  while((remaining_length = tvb_length_remaining(parameters_tvb, offset))) {
+    length       = tvb_get_ntohs(parameters_tvb, offset + PARAMETER_LENGTH_OFFSET);
+    total_length = ADD_PADDING(length);
+    if (remaining_length >= 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_parameter(parameter_tvb, tree);
+    /* get rid of the handled parameter */
+    offset += total_length;
+  }
+}
+
+#define MESSAGE_TYPE_LENGTH   1
+#define MESSAGE_FLAGS_LENGTH  1
+#define MESSAGE_LENGTH_LENGTH 2
+
+#define MESSAGE_TYPE_OFFSET   0
+#define MESSAGE_FLAGS_OFFSET  (MESSAGE_TYPE_OFFSET   + MESSAGE_TYPE_LENGTH)
+#define MESSAGE_LENGTH_OFFSET (MESSAGE_FLAGS_OFFSET  + MESSAGE_FLAGS_LENGTH)
+#define MESSAGE_VALUE_OFFSET  (MESSAGE_LENGTH_OFFSET + MESSAGE_LENGTH_LENGTH)
+
+#define REGISTRATION_MESSAGE_TYPE             0x01
+#define DEREGISTRATION_MESSAGE_TYPE           0x02
+#define REGISTRATION_RESPONSE_MESSAGE_TYPE    0x03
+#define DEREGISTRATION_RESPONSE_MESSAGE_TYPE  0x04
+#define NAME_RESOLUTION_MESSAGE_TYPE          0x05
+#define NAME_RESOLUTION_RESPONSE_MESSAGE_TYPE 0x06
+#define ENDPOINT_KEEP_ALIVE_MESSAGE_TYPE      0x07
+#define ENDPOINT_KEEP_ALIVE_ACK_MESSAGE_TYPE  0x08
+#define ENDPOINT_UNREACHABLE_MESSAGE_TYPE     0x09
+#define SERVER_ANNOUNCE_MESSAGE_TYPE          0x0a
+#define COOKIE_MESSAGE_TYPE                   0x0b
+#define COOKIE_ECHO_MESSAGE_TYPE              0x0c
+#define BUSINESS_CARD_MESSAGE_TYPE            0x0d
+#define PEER_ERROR_MESSAGE_TYPE               0x0e
+
+static const value_string message_type_values[] = {
+  { REGISTRATION_MESSAGE_TYPE,             "Registration" },
+  { DEREGISTRATION_MESSAGE_TYPE,           "Deregistration" },
+  { REGISTRATION_RESPONSE_MESSAGE_TYPE,    "Registration response" },
+  { DEREGISTRATION_RESPONSE_MESSAGE_TYPE,  "Deregistration response" },
+  { NAME_RESOLUTION_MESSAGE_TYPE,          "Name resolution" },
+  { NAME_RESOLUTION_RESPONSE_MESSAGE_TYPE, "Name resolution response" },
+  { ENDPOINT_KEEP_ALIVE_MESSAGE_TYPE,      "Endpoint keep alive" },
+  { ENDPOINT_KEEP_ALIVE_ACK_MESSAGE_TYPE,  "Endpoint keep alive acknowledgement" },
+  { ENDPOINT_UNREACHABLE_MESSAGE_TYPE,     "Endpoint unreachable" },
+  { SERVER_ANNOUNCE_MESSAGE_TYPE,          "Server announce" },
+  { COOKIE_MESSAGE_TYPE,                   "Cookie" },
+  { COOKIE_ECHO_MESSAGE_TYPE,              "Cookie echo" },
+  { BUSINESS_CARD_MESSAGE_TYPE,            "Business card" },
+  { PEER_ERROR_MESSAGE_TYPE,               "Peer error" },
+  { 0,                                     NULL } };
+
+static void
+dissect_asap_message(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *asap_tree)
+{
+  tvbuff_t *parameters_tvb;
+
+  if (check_col(pinfo->cinfo, COL_INFO))
+    col_add_fstr(pinfo->cinfo, COL_INFO, "%s ", val_to_str(tvb_get_guint8(message_tvb, MESSAGE_TYPE_OFFSET), message_type_values, "Unknown ASAP type"));
+    
+  if (asap_tree) {
+    proto_tree_add_item(asap_tree, hf_message_type,   message_tvb, MESSAGE_TYPE_OFFSET,   MESSAGE_TYPE_LENGTH,   NETWORK_BYTE_ORDER);
+    proto_tree_add_item(asap_tree, hf_message_flags,  message_tvb, MESSAGE_FLAGS_OFFSET,  MESSAGE_FLAGS_LENGTH,  NETWORK_BYTE_ORDER);
+    proto_tree_add_item(asap_tree, hf_message_length, message_tvb, MESSAGE_LENGTH_OFFSET, MESSAGE_LENGTH_LENGTH, NETWORK_BYTE_ORDER);
+    parameters_tvb    = tvb_new_subset(message_tvb, MESSAGE_VALUE_OFFSET, -1, -1);
+    dissect_parameters(parameters_tvb, asap_tree);
+    }
+}
+
+static void
+dissect_asap(tvbuff_t *message_tvb, packet_info *pinfo, proto_tree *tree)
+{
+  proto_item *asap_item;
+  proto_tree *asap_tree;
+
+  /* make entry in the Protocol column on summary display */
+  if (check_col(pinfo->cinfo, COL_PROTOCOL))
+    col_set_str(pinfo->cinfo, COL_PROTOCOL, "ASAP");
+
+  /* In the interest of speed, if "tree" is NULL, don't do any work not
+     necessary to generate protocol tree items. */
+  if (tree) {
+    /* create the asap protocol tree */
+    asap_item = proto_tree_add_item(tree, proto_asap, message_tvb, 0, -1, FALSE);
+    asap_tree = proto_item_add_subtree(asap_item, ett_asap);
+  } else {
+    asap_tree = NULL;
+  };
+  /* dissect the message */
+  dissect_asap_message(message_tvb, pinfo, asap_tree);
+}
+
+/* Register the protocol with Ethereal */
+void
+proto_register_asap(void)
+{
+
+  /* Setup list of header fields */
+  static hf_register_info hf[] = {
+    { &hf_message_type,           { "Type",                        "asap.message_type",                             FT_UINT8,   BASE_DEC,  VALS(message_type_values),   0x0,           "", HFILL } },
+    { &hf_message_flags,          { "Flags",                       "asap.message_flags",                            FT_UINT8,   BASE_HEX,  NULL,                        0x0,           "", HFILL } },
+    { &hf_message_length,         { "Length",                      "asap.message_length",                           FT_UINT16,  BASE_DEC,  NULL,                        0x0,           "", HFILL } },
+    { &hf_cause_code,             { "Cause code",                  "asap.cause_code",                               FT_UINT16,  BASE_HEX,  VALS(cause_code_values),     0x0,           "", HFILL } },
+    { &hf_cause_length,           { "Cause length",                "asap.cause_length",                             FT_UINT16,  BASE_DEC,  NULL,                        0x0,           "", HFILL } },
+    { &hf_cause_info,             { "Cause info",                  "asap.cause_info",                               FT_BYTES,   BASE_NONE, NULL,                        0x0,           "", HFILL } },
+    { &hf_cause_padding,          { "Padding",                     "asap.cause_padding",                            FT_BYTES,   BASE_NONE, NULL,                        0x0,           "", HFILL } },
+    { &hf_parameter_type,         { "Parameter Type",              "asap.parameter_type",                           FT_UINT16,  BASE_HEX,  VALS(parameter_type_values), 0x0,           "", HFILL } },
+    { &hf_parameter_length,       { "Parameter length",            "asap.parameter_length",                         FT_UINT16,  BASE_DEC,  NULL,                        0x0,           "", HFILL } },
+    { &hf_parameter_value,        { "Parameter value",             "asap.parameter_value",                          FT_BYTES,   BASE_NONE, NULL,                        0x0,           "", HFILL } },
+    { &hf_parameter_padding,      { "Padding",                     "asap.parameter_padding",                        FT_BYTES,   BASE_NONE, NULL,                        0x0,           "", HFILL } },
+    { &hf_parameter_ipv4_address, { "IP Version 4 address",        "asap.ipv4_address",                             FT_IPv4,    BASE_NONE, NULL,                        0x0,           "", HFILL } },
+    { &hf_parameter_ipv6_address, { "IP Version 6 address",        "asap.ipv6_address",                             FT_IPv6,    BASE_NONE, NULL,                        0x0,           "", HFILL } },
+    { &hf_sctp_port,              { "Port",                        "asap.sctp_transport_port",                      FT_UINT16,  BASE_DEC,  NULL,                        0x0,           "", HFILL } },
+    { &hf_transport_use,          { "Transport use",               "asap.transport_use",                            FT_UINT16,  BASE_DEC,  VALS(transport_use_values),  0x0,           "", HFILL } },
+    { &hf_tcp_port,               { "Port",                        "asap.tcp_transport_port",                       FT_UINT16,  BASE_DEC,  NULL,                        0x0,           "", HFILL } },
+    { &hf_udp_port,               { "Port",                        "asap.udp_transport_port",                       FT_UINT16,  BASE_DEC,  NULL,                        0x0,           "", HFILL } },
+    { &hf_udp_reserved,           { "Reserved",                    "asap.udp_transport_reserved",                   FT_UINT16,  BASE_DEC,  NULL,                        0x0,           "", HFILL } },
+    { &hf_policy_type,            { "Policy type",                 "asap.pool_member_slection_policy_type",         FT_UINT8,   BASE_DEC,  VALS(policy_type_values),    0x0,           "", HFILL } },
+    { &hf_policy_value,           { "Policy value",                "asap.pool_member_slection_policy_value",        FT_INT24,   BASE_DEC,  NULL,                        0x0,           "", HFILL } },
+    { &hf_pool_handle,            { "Pool handle",                 "asap.pool_handle_pool_handle",                  FT_BYTES,   BASE_HEX,  NULL,                        0x0,           "", HFILL } },
+    { &hf_pe_pe_identifier,       { "PE identifier",               "asap.pool_element_pe_identifier",               FT_UINT32,  BASE_HEX,  NULL,                        0x0,           "", HFILL } },
+    { &hf_home_enrp_id,           { "Home ENRP server identifier", "asap.pool_element_home_enrp_server_identifier", FT_UINT32,  BASE_HEX,  NULL,                        0x0,           "", HFILL } },
+    { &hf_reg_life,               { "Registration life",           "asap.pool_element_registration_life",           FT_INT32,   BASE_DEC,  NULL,                        0x0,           "", HFILL } },
+    { &hf_server_identifier,      { "Server identifier",           "asap.server_information_server_identifier",     FT_UINT32,  BASE_HEX,  NULL,                        0x0,           "", HFILL } },
+    { &hf_m_bit,                  { "M-Bit",                       "asap.server_information_m_bit",                 FT_BOOLEAN, 32,        NULL,                        M_BIT_MASK,    "", HFILL } },
+    { &hf_reserved,               { "Reserved",                    "asap.server_information_reserved",              FT_UINT32,  BASE_HEX,  NULL,                        RESERVED_MASK, "", HFILL } },
+    { &hf_cookie,                 { "Cookie",                      "asap.cookie",                                   FT_BYTES,   BASE_HEX,  NULL,                        0x0,           "", HFILL } },
+    { &hf_pe_identifier,          { "PE identifier",               "asap.pe_identifier",                            FT_UINT32,  BASE_HEX,  NULL,                        0x0,           "", HFILL } },
+    { &hf_pe_checksum,            { "PE checksum",                 "asap.pe_checksum",                              FT_UINT32,  BASE_HEX,  NULL,                        0x0,           "", HFILL } },
+  };
+
+  /* Setup protocol subtree array */
+  static gint *ett[] = {
+    &ett_asap,
+    &ett_asap_parameter,
+    &ett_asap_cause,
+  };
+
+  /* Register the protocol name and description */
+  proto_asap = proto_register_protocol("Aggregate Server Access Protocol", "ASAP",  "asap");
+
+  /* Required function calls to register the header fields and subtrees used */
+  proto_register_field_array(proto_asap, hf, array_length(hf));
+  proto_register_subtree_array(ett, array_length(ett));
+
+}
+
+void
+proto_reg_handoff_asap(void)
+{
+  dissector_handle_t asap_handle;
+
+  asap_handle = create_dissector_handle(dissect_asap, proto_asap);
+  dissector_add("sctp.ppi",  ASAP_PAYLOAD_PROTOCOL_ID, asap_handle);
+}