Complete the COPS dissector. Heikki Vatiainen <hessu@cs.tut.fi>

svn path=/trunk/; revision=2497

1 files changed, 510 insertions, 8 deletions

diff --git a/packet-cops.c b/packet-cops.c
index 09feb44f46..8d77252179 100644
--- a/packet-cops.c
+++ b/packet-cops.c
@@ -4,7 +4,7 @@
  *
  * Copyright 2000, Heikki Vatiainen <hessu@cs.tut.fi>
  *
- * $Id: packet-cops.c,v 1.4 2000/08/13 14:08:07 deniel Exp $
+ * $Id: packet-cops.c,v 1.5 2000/10/16 14:05:08 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -36,6 +36,7 @@
 #include <string.h>
 #include <glib.h>
 #include "packet.h"
+#include "packet-ipv6.h"
 
 #define TCP_PORT_COPS 3288
 
@@ -125,6 +126,74 @@ static const value_string cops_c_num_vals[] = {
 
 };
 
+/* R-Type is carried within the Context Object */
+static const value_string cops_r_type_vals[] = {
+        { 0x01, "Incoming-Message/Admission Control request" },
+        { 0x02, "Resource-Allocation request" },
+        { 0x04, "Outgoing-Message request" },
+        { 0x08, "Configuration request" },
+        { 0, NULL },
+};
+
+/* Reason-Code is carried within the Reason object */
+static const value_string cops_reason_vals[] = {
+        { 1,  "Unspecified" },
+        { 2,  "Management" },
+        { 3,  "Preempted (Another request state takes precedence)" },
+        { 4,  "Tear (Used to communicate a signaled state removal)" },
+        { 5,  "Timeout (Local state has timed-out)" },
+        { 6,  "Route Change (Change invalidates request state)" },
+        { 7,  "Insufficient Resources (No local resource available)" },
+        { 8,  "PDP's Directive (PDP decision caused the delete)" },
+        { 9,  "Unsupported decision (PDP decision not supported)" },
+        { 10, "Synchronize Handle Unknown" },
+        { 11, "Transient Handle (stateless event)" },
+        { 12, "Malformed Decision (could not recover)" },
+        { 13, "Unknown COPS Object from PDP" },
+        { 0, NULL },
+};
+
+/* Command-Code is carried within the Decision object if C-Type is 1 */
+static const value_string cops_dec_cmd_code_vals[] = {
+        { 0, "NULL Decision (No configuration data available)" },
+        { 1, "Install (Admit request/Install configuration)" },
+        { 2, "Remove (Remove request/Remove configuration)" },
+        { 0, NULL },
+};
+
+/* Decision flags are also carried with the Decision object if C-Type is 1 */
+static const value_string cops_dec_cmd_flag_vals[] = {
+        { 0x00, "<None set>" },
+        { 0x01, "Trigger Error (Trigger error message if set)" },
+        { 0, NULL },
+};
+
+/* Error-Code from Error object */
+static const value_string cops_error_vals[] = {
+        {1,  "Bad handle" },
+        {2,  "Invalid handle reference" },
+        {3,  "Bad message format (Malformed Message)" },
+        {4,  "Unable to process (server gives up on query)" },
+        {5,  "Mandatory client-specific info missing" },
+        {6,  "Unsupported client" },
+        {7,  "Mandatory COPS object missing" },
+        {8,  "Client Failure" },
+        {9,  "Communication Failure" },
+        {10, "Unspecified" },
+        {11, "Shutting down" },
+        {12, "Redirect to Preferred Server" },
+        {13, "Unknown COPS Object" },
+        {14, "Authentication Failure" },
+        {15, "Authentication Required" },
+};
+
+/* Report-Type from Report-Type object */
+static const value_string cops_report_type_vals[] = {
+        {1, " Success   : Decision was successful at the PEP" },
+        {2, " Failure   : Decision could not be completed by PEP" },
+        {3, " Accounting: Accounting update for an installed state" },
+};
+
 /* Initialize the protocol and registered fields */
 static gint proto_cops = -1;
 static gint hf_cops_ver_flags = -1;
@@ -139,12 +208,56 @@ static gint hf_cops_obj_len = -1;
 static gint hf_cops_obj_c_num = -1;
 static gint hf_cops_obj_c_type = -1;
 
+static gint hf_cops_r_type_flags = -1;
+static gint hf_cops_m_type_flags = -1;
+
+static gint hf_cops_in_int_ipv4 = -1;
+static gint hf_cops_in_int_ipv6 = -1;
+static gint hf_cops_out_int_ipv4 = -1;
+static gint hf_cops_out_int_ipv6 = -1;
+static gint hf_cops_int_ifindex = -1;
+
+static gint hf_cops_reason = -1;
+static gint hf_cops_reason_sub = -1;
+
+static gint hf_cops_dec_cmd_code = -1;
+static gint hf_cops_dec_flags = -1;
+
+static gint hf_cops_error = -1;
+static gint hf_cops_error_sub = -1;
+
+static gint hf_cops_katimer = -1;
+
+static gint hf_cops_pepid = -1;
+
+static gint hf_cops_report_type = -1;
+
+static gint hf_cops_pdprediraddr_ipv4 = -1;
+static gint hf_cops_pdprediraddr_ipv6 = -1;
+static gint hf_cops_lastpdpaddr_ipv4 = -1;
+static gint hf_cops_lastpdpaddr_ipv6 = -1;
+static gint hf_cops_pdp_tcp_port = -1;
+
+static gint hf_cops_accttimer = -1;
+
+static gint hf_cops_key_id = -1;
+static gint hf_cops_seq_num = -1;
+
 /* Initialize the subtree pointers */
 static gint ett_cops = -1;
 static gint ett_cops_ver_flags = -1;
 static gint ett_cops_obj = -1;
+static gint ett_cops_obj_data = -1;
+static gint ett_cops_r_type_flags = -1;
+static gint ett_cops_itf = -1;
+static gint ett_cops_reason = -1;
+static gint ett_cops_decision = -1;
+static gint ett_cops_error = -1;
+static gint ett_cops_pdp = -1;
 
 static int dissect_cops_object(tvbuff_t *tvb, guint32 offset, proto_tree *tree);
+static int dissect_cops_object_data(tvbuff_t *tvb, guint32 offset, proto_tree *tree,
+                                    guint8 c_num, guint8 c_type, guint16 len);
 
 /* Code to actually dissect the packets */
 static void dissect_cops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
@@ -213,12 +326,71 @@ static void dissect_cops(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
         return;
 }
 
+static char *cops_c_type_to_str(guint8 c_num, guint8 c_type)
+{
+        switch (c_num) {
+        case COPS_OBJ_HANDLE:
+                if (c_type == 1)
+                        return "Client Handle";
+                break;
+        case COPS_OBJ_IN_INT:
+        case COPS_OBJ_OUT_INT:
+                if (c_type == 1)
+                        return "IPv4 Address + Interface";
+                else if (c_type == 2)
+                        return "IPv6 Address + Interface";
+                break;
+        case COPS_OBJ_DECISION:
+        case COPS_OBJ_LPDPDECISION:
+                if (c_type == 1)
+                        return "Decision Flags (Mandatory)";
+                else if (c_type == 2)
+                        return "Stateless Data";
+                else if (c_type == 3)
+                        return "Replacement Data";
+                else if (c_type == 4)
+                        return "Client Specific Decision Data";
+                else if (c_type == 5)
+                        return "Named Decision Data";
+                break;
+        case COPS_OBJ_CLIENTSI:
+                if (c_type == 1)
+                        return "Signaled ClientSI";
+                else if (c_type == 2)
+                        return "Named ClientSI";
+                break;
+        case COPS_OBJ_KATIMER:
+                if (c_type == 1)
+                        return "Keep-alive timer value";
+                break;
+        case COPS_OBJ_PDPREDIRADDR:
+        case COPS_OBJ_LASTPDPADDR:
+                if (c_type == 1)
+                        return "IPv4 Address + TCP Port";
+                else if (c_type == 2)
+                        return "IPv6 Address + TCP Port";
+                break;
+        case COPS_OBJ_ACCTTIMER:
+                if (c_type == 1)
+                        return "Accounting timer value";
+                break;
+        case COPS_OBJ_INTEGRITY:
+                if (c_type == 1)
+                        return "HMAC digest";
+                break;
+        }
+
+        return "";
+}
+
 static int dissect_cops_object(tvbuff_t *tvb, guint32 offset, proto_tree *tree)
 {
         guint16 object_len, contents_len;
         guint8 c_num, c_type;
         proto_item *ti;
         proto_tree *obj_tree;
+        char *type_str;
+        int ret;
 
         if (tvb_length_remaining(tvb, offset) < COPS_OBJECT_HDR_SIZE)
                 return 0;
@@ -228,21 +400,27 @@ static int dissect_cops_object(tvbuff_t *tvb, guint32 offset, proto_tree *tree)
         c_type = tvb_get_guint8(tvb, offset + 3);
 
         ti = proto_tree_add_uint_format(tree, hf_cops_obj_c_num, tvb, offset, object_len, c_num,
-                                          "Object Type: %s", val_to_str(c_num, cops_c_num_vals, "Unknown"));
+                                        "%s: %s", val_to_str(c_num, cops_c_num_vals, "Unknown"),
+                                        cops_c_type_to_str(c_num, c_type));
         obj_tree = proto_item_add_subtree(ti, ett_cops_obj);
 
         proto_tree_add_uint(obj_tree, hf_cops_obj_len, tvb, offset, 2, tvb_get_ntohs(tvb, offset));
         offset += 2;
 
-        proto_tree_add_uint(obj_tree, hf_cops_obj_c_num, tvb, offset, 1, tvb_get_guint8(tvb, offset));
+        proto_tree_add_uint(obj_tree, hf_cops_obj_c_num, tvb, offset, 1, c_num);
         offset++;
 
-        proto_tree_add_uint(obj_tree, hf_cops_obj_c_type, tvb, offset, 1, tvb_get_guint8(tvb, offset));
+        type_str = cops_c_type_to_str(c_num, c_type);
+        proto_tree_add_text(obj_tree, tvb, offset, 1, "C-Type: %s%s%u%s",
+                            type_str,
+                            strlen(type_str) ? " (" : "",
+                            c_type,
+                            strlen(type_str) ? ")" : "");
         offset++;
 
         contents_len = object_len - COPS_OBJECT_HDR_SIZE;
-        proto_tree_add_text(obj_tree, tvb, offset, contents_len,
-                            "Object contents: %u bytes", contents_len);
+        ret = dissect_cops_object_data(tvb, offset, obj_tree, c_num, c_type, contents_len);
+        if (ret < 0) return 0;
 
         /* Pad to 32bit boundary */
         if (object_len % sizeof (guint32))
@@ -252,6 +430,203 @@ static int dissect_cops_object(tvbuff_t *tvb, guint32 offset, proto_tree *tree)
         
 }
 
+static int dissect_cops_object_data(tvbuff_t *tvb, guint32 offset, proto_tree *tree,
+                                    guint8 c_num, guint8 c_type, guint16 len)
+{
+        proto_item *ti;
+        proto_tree *r_type_tree, *itf_tree, *reason_tree, *dec_tree, *error_tree, *pdp_tree;
+        guint16 r_type, m_type, reason, reason_sub, cmd_code, cmd_flags, error, error_sub, tcp_port;
+        guint32 ipv4addr, ifindex;
+        struct e_in6_addr ipv6addr;
+
+        switch (c_num) {
+        case COPS_OBJ_CONTEXT:
+                r_type = tvb_get_ntohs(tvb, offset);
+                m_type = tvb_get_ntohs(tvb, offset + 2);
+                ti = proto_tree_add_text(tree, tvb, offset, 4, "Contents: R-Type: %s, M-Type: %u",
+                                         val_to_str(r_type, cops_r_type_vals, "Unknown"),
+                                         m_type);
+
+                r_type_tree = proto_item_add_subtree(ti, ett_cops_r_type_flags);
+                proto_tree_add_uint(r_type_tree, hf_cops_r_type_flags, tvb, offset, 2, r_type);
+                offset += 2;
+                proto_tree_add_uint(r_type_tree, hf_cops_m_type_flags, tvb, offset, 2, m_type);
+
+                return 0;
+                break;
+        case COPS_OBJ_IN_INT:
+        case COPS_OBJ_OUT_INT:
+                if (c_type == 1) {          /* IPv4 */
+                        tvb_memcpy(tvb, (guint8 *)&ipv4addr, offset, 4);
+                        ifindex = tvb_get_ntohl(tvb, offset + 4);
+                        ti = proto_tree_add_text(tree, tvb, offset, 8, "Contents: IPv4 address %s, ifIndex: %u",
+                                                 ip_to_str((guint8 *)&ipv4addr), ifindex);
+                        itf_tree = proto_item_add_subtree(ti, ett_cops_itf);
+                        proto_tree_add_ipv4(itf_tree,
+                                            (c_num == COPS_OBJ_IN_INT) ? hf_cops_in_int_ipv4 : hf_cops_out_int_ipv4,
+                                            tvb, offset, 4, ipv4addr);
+                        offset += 4;
+                } else if (c_type == 2) {   /* IPv6 */
+                        tvb_memcpy(tvb, (guint8 *)&ipv6addr, offset, sizeof ipv6addr);
+                        ifindex = tvb_get_ntohl(tvb, offset + sizeof ipv6addr);
+                        ti = proto_tree_add_text(tree, tvb, offset, 20, "Contents: IPv6 address %s, ifIndex: %u",
+                                                 ip6_to_str(&ipv6addr), ifindex);
+                        itf_tree = proto_item_add_subtree(ti, ett_cops_itf);
+                        proto_tree_add_ipv6(itf_tree,
+                                            (c_num == COPS_OBJ_IN_INT) ? hf_cops_in_int_ipv6 : hf_cops_out_int_ipv6,
+                                            tvb, offset, 16, (guint8 *)&ipv6addr);
+                        offset += 16;
+                } else {
+                        break;
+                }
+                proto_tree_add_uint(itf_tree, hf_cops_int_ifindex, tvb, offset, 4, ifindex);
+
+                return 0;
+                break;
+        case COPS_OBJ_REASON:
+                reason = tvb_get_ntohs(tvb, offset);
+                reason_sub = tvb_get_ntohs(tvb, offset + 2);
+                ti = proto_tree_add_text(tree, tvb, offset, 4, "Contents: Reason-Code: %s, Reason Sub-code: 0x%04x",
+                                         val_to_str(reason, cops_reason_vals, "<Unknown value>"), reason_sub);
+                reason_tree = proto_item_add_subtree(ti, ett_cops_reason);
+                proto_tree_add_uint(reason_tree, hf_cops_reason, tvb, offset, 2, reason);
+                offset += 2;
+                if (reason == 13) {
+                        proto_tree_add_text(reason_tree, tvb, offset, 2, "Reason Sub-code: "
+                                            "Unknown object's C-Num %u, C-Type %u",
+                                            tvb_get_guint8(tvb, offset), tvb_get_guint8(tvb, offset + 1));
+                } else 
+                        proto_tree_add_uint(reason_tree, hf_cops_reason_sub, tvb, offset, 2, reason_sub);
+
+                return 0;
+                break;
+        case COPS_OBJ_DECISION:
+        case COPS_OBJ_LPDPDECISION:
+                if (c_type != 1)
+                        break;
+
+                cmd_code = tvb_get_ntohs(tvb, offset);
+                cmd_flags = tvb_get_ntohs(tvb, offset + 2);
+                ti = proto_tree_add_text(tree, tvb, offset, 4, "Contents: Command-Code: %s, Flags: %s",
+                                         val_to_str(cmd_code, cops_dec_cmd_code_vals, "<Unknown value>"),
+                                         val_to_str(cmd_flags, cops_dec_cmd_flag_vals, "<Unknown flag>"));
+                dec_tree = proto_item_add_subtree(ti, ett_cops_decision);
+                proto_tree_add_uint(dec_tree, hf_cops_dec_cmd_code, tvb, offset, 2, cmd_code);
+                offset += 2;
+                proto_tree_add_uint(dec_tree, hf_cops_dec_flags, tvb, offset, 2, cmd_flags);
+                
+                return 0;
+                break;
+        case COPS_OBJ_ERROR:
+                if (c_type != 1)
+                        break;
+                
+                error = tvb_get_ntohs(tvb, offset);
+                error_sub = tvb_get_ntohs(tvb, offset + 2);
+                ti = proto_tree_add_text(tree, tvb, offset, 4, "Contents: Error-Code: %s, Error Sub-code: 0x%04x",
+                                         val_to_str(error, cops_error_vals, "<Unknown value>"), error_sub);
+                error_tree = proto_item_add_subtree(ti, ett_cops_error);
+                proto_tree_add_uint(error_tree, hf_cops_error, tvb, offset, 2, error);
+                offset += 2;
+                if (error == 13) {
+                        proto_tree_add_text(error_tree, tvb, offset, 2, "Error Sub-code: "
+                                            "Unknown object's C-Num %u, C-Type %u",
+                                            tvb_get_guint8(tvb, offset), tvb_get_guint8(tvb, offset + 1));
+                } else 
+                        proto_tree_add_uint(error_tree, hf_cops_error_sub, tvb, offset, 2, error_sub);
+
+                return 0;
+                break;
+        case COPS_OBJ_KATIMER:
+                if (c_type != 1)
+                        break;
+
+                proto_tree_add_item(tree, hf_cops_katimer, tvb, offset + 2, 2, FALSE);
+                if (tvb_get_ntohs(tvb, offset + 2) == 0)
+                        proto_tree_add_text(tree, tvb, offset, 0, "Value of zero implies infinity.");
+                
+                return 0;
+                break;
+        case COPS_OBJ_PEPID:
+                if (c_type != 1)
+                        break;
+
+                if (tvb_strnlen(tvb, offset, len) == -1)
+                        proto_tree_add_text(tree, tvb, offset, len, "<PEP Id is not a NUL terminated ASCII string>");
+                else
+                        proto_tree_add_item(tree, hf_cops_pepid, tvb, offset,
+                                            tvb_strnlen(tvb, offset, len) + 1, FALSE);
+
+                return 0;
+                break;
+        case COPS_OBJ_REPORT_TYPE:
+                if (c_type != 1)
+                        break;
+
+                proto_tree_add_item(tree, hf_cops_report_type, tvb, offset, 2, FALSE);
+
+                return 0;
+                break;
+        case COPS_OBJ_PDPREDIRADDR:
+        case COPS_OBJ_LASTPDPADDR:
+                if (c_type == 1) {          /* IPv4 */
+                        tvb_memcpy(tvb, (guint8 *)&ipv4addr, offset, 4);
+                        tcp_port = tvb_get_ntohs(tvb, offset + 4 + 2);
+                        ti = proto_tree_add_text(tree, tvb, offset, 8, "Contents: IPv4 address %s, TCP Port Number: %u",
+                                                 ip_to_str((guint8 *)&ipv4addr), tcp_port);
+                        pdp_tree = proto_item_add_subtree(ti, ett_cops_pdp);
+                        proto_tree_add_ipv4(pdp_tree,
+                                            (c_num == COPS_OBJ_PDPREDIRADDR) ? hf_cops_pdprediraddr_ipv4 : hf_cops_lastpdpaddr_ipv4,
+                                            tvb, offset, 4, ipv4addr);
+                        offset += 4;
+                } else if (c_type == 2) {   /* IPv6 */
+                        tvb_memcpy(tvb, (guint8 *)&ipv6addr, offset, sizeof ipv6addr);
+                        tcp_port = tvb_get_ntohs(tvb, offset + sizeof ipv6addr + 2);
+                        ti = proto_tree_add_text(tree, tvb, offset, 20, "Contents: IPv6 address %s, TCP Port Number: %u",
+                                                 ip6_to_str(&ipv6addr), tcp_port);
+                        pdp_tree = proto_item_add_subtree(ti, ett_cops_pdp);
+                        proto_tree_add_ipv6(pdp_tree,
+                                            (c_num == COPS_OBJ_PDPREDIRADDR) ? hf_cops_pdprediraddr_ipv6 : hf_cops_lastpdpaddr_ipv6,
+                                            tvb, offset, 16, (guint8 *)&ipv6addr);
+                        offset += 16;
+                } else {
+                        break;
+                }
+                offset += 2;
+                proto_tree_add_uint(pdp_tree, hf_cops_pdp_tcp_port, tvb, offset, 2, tcp_port);
+
+                return 0;
+                break;
+        case COPS_OBJ_ACCTTIMER:
+                if (c_type != 1)
+                        break;
+
+                proto_tree_add_item(tree, hf_cops_accttimer, tvb, offset + 2, 2, FALSE);
+                if (tvb_get_ntohs(tvb, offset + 2) == 0)
+                        proto_tree_add_text(tree, tvb, offset, 0, "Value of zero means "
+                                            "there SHOULD be no unsolicited accounting updates.");
+
+                return 0;
+                break;
+        case COPS_OBJ_INTEGRITY:
+                if (c_type != 1)
+                        break;      /* Not HMAC digest */
+
+                proto_tree_add_item(tree, hf_cops_key_id, tvb, offset, 4, FALSE);
+                proto_tree_add_item(tree, hf_cops_seq_num, tvb, offset + 4, 4, FALSE);
+                proto_tree_add_text(tree, tvb, offset + 8 , len - 8, "Contents: Keyed Message Digest");
+
+                return 0;
+                break;
+        default:
+                break;
+        }
+
+        ti = proto_tree_add_text(tree, tvb, offset, len, "Contents: %u bytes", len);
+
+        return 0;
+}
+
 /* Register the protocol with Ethereal */
 void proto_register_cops(void)
 {                 
@@ -294,15 +669,135 @@ void proto_register_cops(void)
                         "Object Length in COPS Object Header" }
                 },
                 { &hf_cops_obj_c_num,
-                        { "C-Num",           "cops.obj.c_num",
+                        { "C-Num",           "cops.c_num",
                         FT_UINT8, BASE_DEC, VALS(cops_c_num_vals), 0x0,
                         "C-Num in COPS Object Header" }
                 },
                 { &hf_cops_obj_c_type,
-                        { "C-Type",           "cops.obj.c_type",
+                        { "C-Type",           "cops.c_type",
                         FT_UINT8, BASE_DEC, NULL, 0x0,
                         "C-Type in COPS Object Header" }
                 },
+                { &hf_cops_r_type_flags,
+                        { "R-Type",           "cops.context.r_type",
+                        FT_UINT16, BASE_HEX, VALS(cops_r_type_vals), 0xFFFF,
+                        "R-Type in COPS Context Object" }
+                },
+                { &hf_cops_m_type_flags,
+                        { "M-Type",           "cops.context.m_type",
+                        FT_UINT16, BASE_HEX, NULL, 0xFFFF,
+                        "M-Type in COPS Context Object" }
+                },
+                { &hf_cops_in_int_ipv4,
+                        { "IPv4 address",           "cops.in-int.ipv4",
+                        FT_IPv4, 0, NULL, 0xFFFF,
+                        "IPv4 address in COPS IN-Int object" }
+                },
+                { &hf_cops_in_int_ipv6,
+                        { "IPv6 address",           "cops.in-int.ipv6",
+                        FT_IPv6, 0, NULL, 0xFFFF,
+                        "IPv6 address in COPS IN-Int object" }
+                },
+                { &hf_cops_out_int_ipv4,
+                        { "IPv4 address",           "cops.out-int.ipv4",
+                        FT_IPv4, 0, NULL, 0xFFFF,
+                        "IPv4 address in COPS OUT-Int object" }
+                },
+                { &hf_cops_out_int_ipv6,
+                        { "IPv6 address",           "cops.out-int.ipv6",
+                        FT_IPv6, 0, NULL, 0xFFFF,
+                        "IPv6 address in COPS OUT-Int" }
+                },
+                { &hf_cops_int_ifindex,
+                        { "ifIndex",           "cops.in-out-int.ifindex",
+                        FT_UINT32, BASE_DEC, NULL, 0x0,
+                        "If SNMP is supported, corresponds to MIB-II ifIndex" } 
+                },
+                { &hf_cops_reason,
+                        { "Reason",           "cops.reason",
+                        FT_UINT16, BASE_DEC, VALS(cops_reason_vals), 0,
+                        "Reason in Reason object" }
+                },
+                { &hf_cops_reason_sub,
+                        { "Reason Sub-code",           "cops.reason_sub",
+                        FT_UINT16, BASE_HEX, NULL, 0,
+                        "Reason Sub-code in Reason object" }
+                },
+                { &hf_cops_dec_cmd_code,
+                        { "Command-Code",           "cops.decision.cmd",
+                        FT_UINT16, BASE_DEC, VALS(cops_dec_cmd_code_vals), 0,
+                        "Command-Code in Decision/LPDP Decision object" }
+                },
+                { &hf_cops_dec_flags,
+                        { "Flags",           "cops.decision.flags",
+                        FT_UINT16, BASE_HEX, VALS(cops_dec_cmd_flag_vals), 0xffff,
+                        "Flags in Decision/LPDP Decision object" }
+                },
+                { &hf_cops_error,
+                        { "Error",           "cops.error",
+                        FT_UINT16, BASE_DEC, VALS(cops_error_vals), 0,
+                        "Error in Error object" }
+                },
+                { &hf_cops_error_sub,
+                        { "Error Sub-code",           "cops.error_sub",
+                        FT_UINT16, BASE_HEX, NULL, 0,
+                        "Error Sub-code in Error object" }
+                },
+                { &hf_cops_katimer,
+                        { "Contents: KA Timer Value",           "cops.katimer.value",
+                        FT_UINT16, BASE_DEC, NULL, 0,
+                        "Keep-Alive Timer Value in KATimer object" }
+                },
+                { &hf_cops_pepid,
+                        { "Contents: PEP Id",           "cops.pepid.id",
+                        FT_STRING, BASE_NONE, NULL, 0,
+                        "PEP Id in PEPID object" }
+                },
+                { &hf_cops_report_type,
+                        { "Contents: Report-Type",           "cops.report_type",
+                        FT_UINT16, BASE_DEC, VALS(cops_report_type_vals), 0,
+                        "Report-Type in Report-Type object" }
+                },
+                { &hf_cops_pdprediraddr_ipv4,
+                        { "IPv4 address",           "cops.pdprediraddr.ipv4",
+                        FT_IPv4, 0, NULL, 0xFFFF,
+                        "IPv4 address in COPS PDPRedirAddr object" }
+                },
+                { &hf_cops_pdprediraddr_ipv6,
+                        { "IPv6 address",           "cops.pdprediraddr.ipv6",
+                        FT_IPv6, 0, NULL, 0xFFFF,
+                        "IPv6 address in COPS PDPRedirAddr object" }
+                },
+                { &hf_cops_lastpdpaddr_ipv4,
+                        { "IPv4 address",           "cops.lastpdpaddr.ipv4",
+                        FT_IPv4, 0, NULL, 0xFFFF,
+                        "IPv4 address in COPS LastPDPAddr object" }
+                },
+                { &hf_cops_lastpdpaddr_ipv6,
+                        { "IPv6 address",           "cops.lastpdpaddr.ipv6",
+                        FT_IPv6, 0, NULL, 0xFFFF,
+                        "IPv6 address in COPS LastPDPAddr object" }
+                },
+                { &hf_cops_pdp_tcp_port,
+                        { "TCP Port Number",           "cops.pdp.tcp_port",
+                        FT_UINT32, BASE_DEC, NULL, 0x0,
+                         "TCP Port Number of PDP in PDPRedirAddr/LastPDPAddr object" }
+                },
+                { &hf_cops_accttimer,
+                        { "Contents: ACCT Timer Value",           "cops.accttimer.value",
+                        FT_UINT16, BASE_DEC, NULL, 0,
+                        "Accounting Timer Value in AcctTimer object" }
+                },
+                { &hf_cops_key_id,
+                        { "Contents: Key ID",           "cops.integrity.key_id",
+                        FT_UINT32, BASE_DEC, NULL, 0,
+                        "Key ID in Integrity object" }
+                },
+                { &hf_cops_seq_num,
+                        { "Contents: Sequence Number",           "cops.integrity.seq_num",
+                        FT_UINT32, BASE_DEC, NULL, 0,
+                        "Sequence Number in Integrity object" }
+                },
         };
 
         /* Setup protocol subtree array */
@@ -310,6 +805,13 @@ void proto_register_cops(void)
                 &ett_cops,
                 &ett_cops_ver_flags,
                 &ett_cops_obj,
+                &ett_cops_obj_data,
+                &ett_cops_r_type_flags,
+                &ett_cops_itf,
+                &ett_cops_reason,
+                &ett_cops_decision,
+                &ett_cops_error,
+                &ett_cops_pdp,
         };
 
         /* Register the protocol name and description */