From Naoyoshi Ueda:
authorAnders Broman <anders.broman@ericsson.com>
Thu, 2 Apr 2009 19:05:52 +0000 (19:05 -0000)
committerAnders Broman <anders.broman@ericsson.com>
Thu, 2 Apr 2009 19:05:52 +0000 (19:05 -0000)
Radius dissector enhancement to support WiMAX vendor specific attributes.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3176

svn path=/trunk/; revision=27937

AUTHORS
Makefile.am
epan/dissectors/packet-radius.c
epan/dissectors/packet-radius.h
epan/radius_dict.l
packaging/nsis/wireshark.nsi
radius/dictionary
radius/dictionary.starent [new file with mode: 0644]
radius/dictionary.usr
radius/dictionary.wimax [new file with mode: 0644]

diff --git a/AUTHORS b/AUTHORS
index 47ce2c502b6ad8cad2ab3a49e17298b2918df635..5d0ed053918b629249fb7150236494acd3f2f156 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1729,6 +1729,8 @@ Anders Broman           <anders.broman [AT] ericsson.com> {
        H264 dissection
        AMR dissection
        MP4V-ES dissection
+       NAS EPS dissection
+       GTPv2 dissection
 }
 
 Christian Falckenberg   <christian.falckenberg [AT] nortelnetworks.com> {
index a9e86e4a9b15c5361d4739ad19d685b7f5997ec3..c5cc73084efb109b44fe8d02c676df485ec9c60c 100644 (file)
@@ -206,6 +206,7 @@ radius_DATA = \
        radius/dictionary.shiva  \
        radius/dictionary.sonicwall  \
        radius/dictionary.springtide  \
+       radius/dictionary.starent  \
        radius/dictionary.t_systems_nova  \
        radius/dictionary.telebit  \
        radius/dictionary.trapeze  \
@@ -215,6 +216,7 @@ radius_DATA = \
        radius/dictionary.usr  \
        radius/dictionary.valemount  \
        radius/dictionary.versanet  \
+       radius/dictionary.wimax  \
        radius/dictionary.wispr  \
        radius/dictionary.xedia
 
index 70696d4094159810c837ee73a933c29e9ea834f5..59f62620e60dcc2b9b16eddcbebab8e43f2ec8c4 100644 (file)
@@ -128,9 +128,9 @@ static gint ett_eap = -1;
  */
 static int radius_tap = -1;
 
-radius_vendor_info_t no_vendor = {"Unknown Vendor",0,NULL,-1};
+radius_vendor_info_t no_vendor = {"Unknown Vendor",0,NULL,-1,1,1,FALSE};
 
-radius_attr_info_t no_dictionary_entry = {"Unknown-Attribute",0,FALSE,FALSE,radius_octets, NULL, NULL, -1, -1, -1, -1, -1 };
+radius_attr_info_t no_dictionary_entry = {"Unknown-Attribute",0,FALSE,FALSE,radius_octets, NULL, NULL, -1, -1, -1, -1, -1, NULL };
 
 static dissector_handle_t eap_handle;
 
@@ -210,6 +210,37 @@ static GMemChunk *radius_call_info_key_chunk;
 static GMemChunk *radius_call_info_value_chunk;
 static GHashTable *radius_calls;
 
+typedef struct _radius_vsa_buffer_key
+{
+       guint32 vendor_id;
+       guint32 vsa_type;
+} radius_vsa_buffer_key;
+
+typedef struct _radius_vsa_buffer
+{
+    radius_vsa_buffer_key key;
+    guint8* data;
+    guint seg_num;
+    guint len;
+} radius_vsa_buffer;
+
+static gint radius_vsa_equal(gconstpointer k1, gconstpointer k2)
+{
+       const radius_vsa_buffer_key* key1 = (const radius_vsa_buffer_key*) k1;
+       const radius_vsa_buffer_key* key2 = (const radius_vsa_buffer_key*) k2;
+
+       return (((key1->vendor_id == key2->vendor_id) && 
+               (key1->vsa_type == key2->vsa_type)
+               ) ? TRUE : FALSE);
+}
+
+static guint radius_vsa_hash(gconstpointer k)
+{
+       const radius_vsa_buffer_key* key = (const radius_vsa_buffer_key*) k;
+
+       return key->vendor_id + key->vsa_type;
+} 
+
 /* Compare 2 keys */
 static gint radius_call_equal(gconstpointer k1, gconstpointer k2)
 {
@@ -474,6 +505,9 @@ void radius_integer(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo
        guint32 uint;
 
        switch (len) {
+               case 1:
+                       uint = tvb_get_guint8(tvb,offset);
+                       break;
                case 2:
                        uint = tvb_get_ntohs(tvb,offset);
                        break;
@@ -502,6 +536,42 @@ void radius_integer(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo
        }
 }
 
+void radius_signed(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_, tvbuff_t* tvb, int offset, int len, proto_item* avp_item) {
+       guint32 uint;
+
+       switch (len) {
+               case 1:
+                       uint = tvb_get_guint8(tvb,offset);
+                       break;
+               case 2:
+                       uint = tvb_get_ntohs(tvb,offset);
+                       break;
+               case 3:
+                       uint = tvb_get_ntoh24(tvb,offset);
+                       break;
+               case 4:
+                       uint = tvb_get_ntohl(tvb,offset);
+                       break;
+               case 8: {
+                       guint64 uint64 = tvb_get_ntoh64(tvb,offset);
+                       proto_tree_add_int64(tree,a->hf64,tvb,offset,len,uint64);
+                       proto_item_append_text(avp_item, "%" G_GINT64_MODIFIER "u", uint64);
+                       return;
+               }
+               default:
+                       proto_item_append_text(avp_item, "[unhandled signed integer length(%u)]", len);
+                       return;
+       }
+
+       proto_tree_add_int(tree,a->hf,tvb,offset,len,uint);
+
+       if (a->vs) {
+               proto_item_append_text(avp_item, "%s(%d)", val_to_str(uint, a->vs, "Unknown"),uint);
+       } else {
+               proto_item_append_text(avp_item, "%d", uint);
+       }
+}
+
 void radius_string(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_, tvbuff_t* tvb, int offset, int len, proto_item* avp_item) {
        if (a->encrypt) {
                if (*shared_secret == '\0') {
@@ -591,6 +661,30 @@ void radius_ipv6prefix(radius_attr_info_t* a, proto_tree* tree, packet_info *pin
 }
 
 
+void radius_combo_ip(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_, tvbuff_t* tvb, int offset, int len, proto_item* avp_item) {
+       guint32 ip;
+       struct e_in6_addr ipv6_buff;
+       gchar buf[256];
+
+       if (len == 4){
+               ip=tvb_get_ipv4(tvb,offset);
+
+               proto_tree_add_item(tree, a->hf, tvb, offset, len, FALSE);
+
+               ip_to_str_buf((guint8 *)&ip, buf, MAX_IP_STR_LEN);
+               proto_item_append_text(avp_item, "%s", buf);
+       } else if (len == 16) {
+               proto_tree_add_item(tree, a->hf64, tvb, offset, len, FALSE);
+
+               tvb_get_ipv6(tvb, offset, &ipv6_buff);
+               ip6_to_str_buf(&ipv6_buff, buf);
+               proto_item_append_text(avp_item, "%s", buf);
+       } else {
+               proto_item_append_text(avp_item, "[wrong length for both of IPv4 and IPv6 address]");
+               return;
+       }
+}
+
 void radius_ipxnet(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_, tvbuff_t* tvb, int offset, int len, proto_item* avp_item) {
        guint32 net;
 
@@ -630,6 +724,86 @@ void radius_ifid(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_
        proto_item_append_text(avp_item, "%s", tvb_bytes_to_str(tvb, offset, len));
 }
 
+static void add_tlv_to_tree(proto_tree* tlv_tree, proto_item* tlv_item, packet_info* pinfo, tvbuff_t* tvb, radius_attr_info_t* dictionary_entry, guint32 tlv_length, guint32 offset) {
+       proto_item_append_text(tlv_item, ": ");
+       dictionary_entry->type(dictionary_entry,tlv_tree,pinfo,tvb,offset,tlv_length,tlv_item);
+}
+
+void radius_tlv(radius_attr_info_t* a, proto_tree* tree, packet_info *pinfo _U_, tvbuff_t* tvb, int offset, int len, proto_item* avp_item) {
+    proto_item* item;
+    gint tlv_num = 0;
+
+    while (len > 0) {
+        radius_attr_info_t* dictionary_entry = NULL;
+        gint tvb_len;
+        guint32 tlv_type;
+        guint32 tlv_length;
+
+       proto_item* tlv_item;
+        proto_item* tlv_len_item;
+        proto_tree* tlv_tree;
+
+        if (len < 2) {
+            item = proto_tree_add_text(tree, tvb, offset, 0,
+                        "Not enough room in packet for TLV header");
+            PROTO_ITEM_SET_GENERATED(item);
+            return;
+        }
+        tlv_type = tvb_get_guint8(tvb,offset);
+        tlv_length = tvb_get_guint8(tvb,offset+1);
+
+        if (tlv_length < 2) {
+            item = proto_tree_add_text(tree, tvb, offset, 0,
+                        "TLV too short: length %u < 2", tlv_length);
+            PROTO_ITEM_SET_GENERATED(item);
+            return;
+        }
+
+        if (len < (gint)tlv_length) {
+            item = proto_tree_add_text(tree, tvb, offset, 0,
+                        "Not enough room in packet for TLV");
+            PROTO_ITEM_SET_GENERATED(item);
+            return;
+        }
+
+        len -= tlv_length;
+
+        dictionary_entry = g_hash_table_lookup(a->tlvs_by_id,GUINT_TO_POINTER(tlv_type));
+
+        if (! dictionary_entry ) {
+            dictionary_entry = &no_dictionary_entry;
+        }
+
+        tlv_item = proto_tree_add_text(tree, tvb, offset, tlv_length,
+                                       "TLV: l=%u  t=%s(%u)", tlv_length,
+                                       dictionary_entry->name, tlv_type);
+
+        tlv_length -= 2;
+        offset += 2;
+
+        tlv_tree = proto_item_add_subtree(tlv_item,dictionary_entry->ett);
+
+        if (show_length) {
+            tlv_len_item = proto_tree_add_uint(tlv_tree,
+                                               dictionary_entry->hf_len,
+                                               tvb,0,0,tlv_length);
+            PROTO_ITEM_SET_GENERATED(tlv_len_item);
+        }
+
+        tvb_len = tvb_length_remaining(tvb, offset);
+
+        if ((gint)tlv_length < tvb_len)
+            tvb_len = tlv_length;
+
+        add_tlv_to_tree(tlv_tree, tlv_item, pinfo, tvb, dictionary_entry,
+                        tlv_length, offset);
+        offset += tlv_length;
+       tlv_num++;
+    }
+
+    proto_item_append_text(avp_item, "%d TLV(s) inside", tlv_num);
+}
+
 static void add_avp_to_tree(proto_tree* avp_tree, proto_item* avp_item, packet_info* pinfo, tvbuff_t* tvb, radius_attr_info_t* dictionary_entry, guint32 avp_length, guint32 offset) {
     proto_item* pi;
 
@@ -674,6 +848,20 @@ static void add_avp_to_tree(proto_tree* avp_tree, proto_item* avp_item, packet_i
     }
 }
 
+static gboolean vsa_buffer_destroy(gpointer k _U_, gpointer v, gpointer p _U_) {
+       radius_vsa_buffer* vsa_buffer = (radius_vsa_buffer*)v;
+       g_free((gpointer)vsa_buffer->data);
+       g_free(v);
+       return TRUE;
+}
+
+static void vsa_buffer_table_destroy(GHashTable *table) {
+       if (table) {
+               g_hash_table_foreach_remove(table, vsa_buffer_destroy, NULL);
+               g_hash_table_destroy(table);
+       }
+}
+
 static void dissect_attribute_value_pairs(proto_tree *tree, packet_info *pinfo, tvbuff_t *tvb, int offset, guint length) {
     proto_item* item;
     gboolean last_eap = FALSE;
@@ -684,6 +872,8 @@ static void dissect_attribute_value_pairs(proto_tree *tree, packet_info *pinfo,
     proto_tree* eap_tree = NULL;
     tvbuff_t* eap_tvb = NULL;
 
+    GHashTable* vsa_buffer_table = NULL;
+
     /*
      * In case we throw an exception, clean up whatever stuff we've
      * allocated (if any).
@@ -770,17 +960,53 @@ static void dissect_attribute_value_pairs(proto_tree *tree, packet_info *pinfo,
             vendor_tree = proto_item_add_subtree(avp_item,vendor->ett);
 
             while (offset < max_offset) {
-                guint32 avp_vsa_type = tvb_get_guint8(tvb,offset++);
-                guint32 avp_vsa_len = tvb_get_guint8(tvb,offset++);
+                guint32 avp_vsa_type;
+                guint32 avp_vsa_len;
+                guint8 avp_vsa_flags = 0;
+                guint32 avp_vsa_header_len = vendor->type_octets + vendor->length_octets + (vendor->has_flags ? 1 : 0);
+
+                switch (vendor->type_octets) {
+                    case 1:
+                        avp_vsa_type = tvb_get_guint8(tvb,offset++);
+                        break;
+                    case 2:
+                        avp_vsa_type = tvb_get_ntohs(tvb,offset);
+                        offset += 2;
+                       break;
+                    case 4:
+                        avp_vsa_type = tvb_get_ntohl(tvb,offset);
+                        offset += 4;
+                       break;
+                    default:
+                        avp_vsa_type = tvb_get_guint8(tvb,offset++);
+                }
 
+                switch (vendor->length_octets) {
+                    case 1:
+                        avp_vsa_len = tvb_get_guint8(tvb,offset++);
+                        break;
+                    case 0:
+                        avp_vsa_len = avp_length;
+                       break;
+                    case 2:
+                        avp_vsa_len = tvb_get_ntohs(tvb,offset);
+                        offset += 2;
+                       break;
+                    default:
+                        avp_vsa_len = tvb_get_guint8(tvb,offset++);
+                }
 
-                if (avp_vsa_len < 2) {
+                if (vendor->has_flags) {
+                    avp_vsa_flags = tvb_get_guint8(tvb,offset++);
+                }
+
+                if (avp_vsa_len < avp_vsa_header_len) {
                     proto_tree_add_text(tree, tvb, offset+1, 1,
                                             "[VSA too short]");
                     return;
                 }
 
-                avp_vsa_len -= 2;
+                avp_vsa_len -= avp_vsa_header_len;
 
                 dictionary_entry = g_hash_table_lookup(vendor->attrs_by_id,GUINT_TO_POINTER(avp_vsa_type));
 
@@ -788,9 +1014,15 @@ static void dissect_attribute_value_pairs(proto_tree *tree, packet_info *pinfo,
                     dictionary_entry = &no_dictionary_entry;
                 }
 
-                avp_item = proto_tree_add_text(vendor_tree,tvb,offset-2,avp_vsa_len+2,
+                if (vendor->has_flags){
+                    avp_item = proto_tree_add_text(vendor_tree,tvb,offset-avp_vsa_header_len,avp_vsa_len+avp_vsa_header_len,
+                                               "VSA: l=%u t=%s(%u) C=0x%02x",
+                                               avp_vsa_len+avp_vsa_header_len, dictionary_entry->name, avp_vsa_type, avp_vsa_flags);
+                } else {
+                    avp_item = proto_tree_add_text(vendor_tree,tvb,offset-avp_vsa_header_len,avp_vsa_len+avp_vsa_header_len,
                                                "VSA: l=%u t=%s(%u)",
-                                               avp_vsa_len+2, dictionary_entry->name, avp_vsa_type);
+                                               avp_vsa_len+avp_vsa_header_len, dictionary_entry->name, avp_vsa_type);
+                }
 
                 avp_tree = proto_item_add_subtree(avp_item,dictionary_entry->ett);
 
@@ -801,7 +1033,57 @@ static void dissect_attribute_value_pairs(proto_tree *tree, packet_info *pinfo,
                     PROTO_ITEM_SET_GENERATED(avp_len_item);
                 }
 
-                add_avp_to_tree(avp_tree, avp_item, pinfo, tvb, dictionary_entry, avp_vsa_len, offset);
+               if (vendor->has_flags) {
+                       radius_vsa_buffer_key key;
+                       radius_vsa_buffer* vsa_buffer = NULL;
+                       key.vendor_id = vendor_id;
+                       key.vsa_type = avp_vsa_type;
+
+                       if (!vsa_buffer_table) {
+                               vsa_buffer_table = g_hash_table_new(radius_vsa_hash, radius_vsa_equal);
+                       }
+
+                       vsa_buffer = g_hash_table_lookup(vsa_buffer_table, &key);
+                       if (vsa_buffer) {
+                               vsa_buffer->data = g_realloc(vsa_buffer->data, vsa_buffer->len + avp_vsa_len);
+                               tvb_memcpy(tvb, vsa_buffer->data + vsa_buffer->len, offset, avp_vsa_len);
+                               vsa_buffer->len += avp_vsa_len;
+                               vsa_buffer->seg_num++;
+                       }
+
+                       if (avp_vsa_flags & 0x80) {
+                               if (!vsa_buffer) {
+                                       vsa_buffer = g_malloc(sizeof(radius_vsa_buffer));
+                                       vsa_buffer->key.vendor_id = vendor_id;
+                                       vsa_buffer->key.vsa_type = avp_vsa_type;
+                                       vsa_buffer->len = avp_vsa_len;
+                                       vsa_buffer->seg_num = 1;
+                                       vsa_buffer->data = g_malloc(avp_vsa_len);
+                                       tvb_memcpy(tvb, vsa_buffer->data, offset, avp_vsa_len);
+                                       g_hash_table_insert(vsa_buffer_table, &(vsa_buffer->key), vsa_buffer);
+                               }
+                               proto_tree_add_text(avp_tree, tvb, offset, avp_vsa_len, "VSA fragment");
+                               proto_item_append_text(avp_item, ": VSA fragment[%u]", vsa_buffer->seg_num);
+                       } else {
+                               if (vsa_buffer) {
+                                       tvbuff_t* vsa_tvb = NULL;
+                                       proto_tree_add_text(avp_tree, tvb, offset, avp_vsa_len, "VSA fragment");
+                                       proto_item_append_text(avp_item, ": Last VSA fragment[%u]", vsa_buffer->seg_num);
+                                       vsa_tvb = tvb_new_real_data(vsa_buffer->data, vsa_buffer->len, vsa_buffer->len);
+                                       tvb_set_free_cb(vsa_tvb, g_free);
+                                       tvb_set_child_real_data_tvbuff(tvb, vsa_tvb);
+                                       add_new_data_source(pinfo, vsa_tvb, "Reassembled VSA");
+                                       add_avp_to_tree(avp_tree, avp_item, pinfo, vsa_tvb, dictionary_entry, vsa_buffer->len, 0);
+                                       g_hash_table_remove(vsa_buffer_table, &(vsa_buffer->key));
+                                       g_free(vsa_buffer);
+                                       
+                               } else {
+                                       add_avp_to_tree(avp_tree, avp_item, pinfo, tvb, dictionary_entry, avp_vsa_len, offset);
+                               }
+                       }
+               } else {
+                       add_avp_to_tree(avp_tree, avp_item, pinfo, tvb, dictionary_entry, avp_vsa_len, offset);
+               }
 
                 offset += avp_vsa_len;
             };
@@ -945,6 +1227,7 @@ static void dissect_attribute_value_pairs(proto_tree *tree, packet_info *pinfo,
 
     }
 
+    vsa_buffer_table_destroy(vsa_buffer_table);
     /*
      * Call the cleanup handler to free any reassembled data we haven't
      * attached to a tvbuff, and pop the handler.
@@ -1383,7 +1666,21 @@ static void register_attrs(gpointer k _U_, gpointer v, gpointer p) {
                }
 
                len_hf++;
+       }else if (a->type == radius_signed) {
+               hfri[0].hfinfo.type = FT_INT32;
+               hfri[0].hfinfo.display = BASE_DEC;
+
+               hfri[2].p_id = &(a->hf64);
+               hfri[2].hfinfo.name = g_strdup(a->name);
+               hfri[2].hfinfo.abbrev = abbrev;
+               hfri[2].hfinfo.type = FT_INT64;
+               hfri[2].hfinfo.display = BASE_DEC;
 
+               if (a->vs) {
+                       hfri[0].hfinfo.strings = VALS(a->vs);
+               }
+
+               len_hf++;
        } else if (a->type == radius_string) {
                hfri[0].hfinfo.type = FT_STRING;
                hfri[0].hfinfo.display = BASE_NONE;
@@ -1411,6 +1708,20 @@ static void register_attrs(gpointer k _U_, gpointer v, gpointer p) {
        } else if (a->type == radius_ifid) {
                hfri[0].hfinfo.type = FT_BYTES;
                hfri[0].hfinfo.display = BASE_NONE;
+       } else if (a->type == radius_combo_ip) {
+               hfri[0].hfinfo.type = FT_IPv4;
+               hfri[0].hfinfo.display = BASE_NONE;
+
+               hfri[2].p_id = &(a->hf64);
+               hfri[2].hfinfo.name = g_strdup(a->name);
+               hfri[2].hfinfo.abbrev = g_strdup(abbrev);
+               hfri[2].hfinfo.type = FT_IPv6;
+               hfri[2].hfinfo.display = BASE_NONE;
+
+               len_hf++;
+       } else if (a->type == radius_tlv) {
+               hfri[0].hfinfo.type = FT_BYTES;
+               hfri[0].hfinfo.display = BASE_NONE;
        } else {
                hfri[0].hfinfo.type = FT_BYTES;
                hfri[0].hfinfo.display = BASE_NONE;
@@ -1429,6 +1740,9 @@ static void register_attrs(gpointer k _U_, gpointer v, gpointer p) {
        g_array_append_vals(ri->hf,hfri,len_hf);
        g_array_append_val(ri->ett,ett);
 
+       if (a->tlvs_by_id) {
+               g_hash_table_foreach(a->tlvs_by_id,register_attrs,ri);
+       }
 }
 
 static void register_vendors(gpointer k _U_, gpointer v, gpointer p) {
@@ -1683,6 +1997,7 @@ proto_register_radius(void)
        dict->attrs_by_name = g_hash_table_new(g_str_hash,g_str_equal);
        dict->vendors_by_id = g_hash_table_new(g_direct_hash,g_direct_equal);
        dict->vendors_by_name = g_hash_table_new(g_str_hash,g_str_equal);
+       dict->tlvs_by_name = g_hash_table_new(g_str_hash,g_str_equal);
 }
 
 void
index 1314468acbcc0a065024f01a8cabc12ea4f5ea41..b688f542e1df02cb09bb9f323a38e8d4abed3ba5 100644 (file)
@@ -58,6 +58,9 @@ typedef struct _radius_vendor_info_t {
        guint code;
        GHashTable* attrs_by_id;
     gint ett;
+       guint type_octets;
+       guint length_octets;
+       gboolean has_flags; 
 } radius_vendor_info_t;
 
 typedef struct _radius_attr_info_t radius_attr_info_t;
@@ -78,6 +81,7 @@ struct _radius_attr_info_t {
        int hf64;
        int hf_tag;
        int hf_len;
+       GHashTable* tlvs_by_id;
 };
 
 typedef struct _radius_dictionary_t {
@@ -85,6 +89,7 @@ typedef struct _radius_dictionary_t {
        GHashTable* attrs_by_name;
        GHashTable* vendors_by_id;
        GHashTable* vendors_by_name;
+       GHashTable* tlvs_by_name;
 } radius_dictionary_t;
 
 radius_attr_dissector_t radius_integer;
@@ -97,6 +102,11 @@ radius_attr_dissector_t radius_ipxnet;
 radius_attr_dissector_t radius_date;
 radius_attr_dissector_t radius_abinary;
 radius_attr_dissector_t radius_ifid;
+radius_attr_dissector_t radius_byte;
+radius_attr_dissector_t radius_short;
+radius_attr_dissector_t radius_signed;
+radius_attr_dissector_t radius_combo_ip;
+radius_attr_dissector_t radius_tlv;
 
 extern void radius_register_avp_dissector(guint32 vendor_id, guint32 attribute_id, radius_avp_dissector_t dissector);
 
index 916cdc001452dde709815a796fb27b899e8ad76e..6d7337e4cd7e7c7e3d30ba088984b2c297d189cc 100644 (file)
 #define ECHO
 #define MAX_INCLUDE_DEPTH 10
 
-       void add_vendor(const gchar* name, guint32 vendor_id);
+       void add_vendor(const gchar* name, guint32 vendor_id, guint vendor_type_octets, guint vendor_length_octets, gboolean vendor_has_flags);
        void add_value(const gchar* attrib_name,const  gchar* value_repr, long value);
-       void add_attribute(const gchar*,const  gchar*, radius_attr_dissector_t,const  gchar*, gboolean, gboolean);
+       void add_tlv(const gchar* name, const  gchar* code, radius_attr_dissector_t type, const gchar* current_attr);
+       void add_attribute(const gchar*,const  gchar*, radius_attr_dissector_t,const  gchar*, gboolean, gboolean, const gchar*);
 
        static YY_BUFFER_STATE include_stack[10];
        static int include_stack_ptr = 0;
        static radius_attr_dissector_t* attr_type = NULL;
        static gchar* attr_vendor = NULL;
        static gchar* vendor_name = NULL;
+       static guint32 vendor_id = 0;
+       static guint vendor_type_octets = 1;
+       static guint vendor_length_octets = 1;
+       static gboolean vendor_has_flags = FALSE;
        static gchar* value_repr = NULL;
        static gboolean encrypted = FALSE;
        static gboolean has_tag = FALSE;
        static gchar* current_vendor = NULL;
+       static gchar* current_attr = NULL;
 
        static GString* error = NULL;
        static gchar* directory = NULL;
 
 %}
 
-%START WS_OUT VENDOR VENDOR_W_NAME ATTR ATTR_W_NAME ATTR_W_ID ATTR_W_TYPE ATTR_W_VENDOR VALUE VALUE_W_ATTR VALUE_W_NAME INCLUDE JUNK BEGIN_VENDOR END_VENDOR
+%START WS_OUT VENDOR VENDOR_W_NAME ATTR ATTR_W_NAME ATTR_W_ID ATTR_W_TYPE ATTR_W_VENDOR VALUE VALUE_W_ATTR VALUE_W_NAME INCLUDE JUNK BEGIN_VENDOR END_VENDOR VENDOR_W_ID VENDOR_W_FORMAT VENDOR_W_TYPE_OCTETS VENDOR_W_LENGTH_OCTETS VENDOR_W_CONTINUATION BEGIN_TLV END_TLV
 %%
 [:blank:]   ;
 #[^\n]*                ;
 <WS_OUT>\$INCLUDE { BEGIN INCLUDE; }
 <WS_OUT>BEGIN-VENDOR { BEGIN BEGIN_VENDOR; }
 <WS_OUT>END-VENDOR { BEGIN END_VENDOR; }
+<WS_OUT>BEGIN-TLV { BEGIN BEGIN_TLV; }
+<WS_OUT>END-TLV { BEGIN END_TLV; }
 
 <BEGIN_VENDOR>[0-9a-z_-]+ {
     if (current_vendor) {
     BEGIN WS_OUT;
 }
 
-<VENDOR>[0-9a-z_-]+   { vendor_name = g_strdup(yytext); BEGIN VENDOR_W_NAME; }
-<VENDOR_W_NAME>[0-9]+   {
-    add_vendor(vendor_name,strtol(yytext,NULL,10));
-    g_free(vendor_name);
+<BEGIN_TLV>[0-9a-z_-]+ {
+    if (current_attr) {
+        g_free(current_attr);
+    }
+    current_attr = g_strdup(yytext);
+    BEGIN WS_OUT;
+}
+<END_TLV>[^\n]* {
+    if (current_attr) {
+        g_free(current_attr);
+        current_attr = NULL;
+    }
     BEGIN WS_OUT;
 }
+
+<VENDOR>[0-9a-z_-]+   {
+    vendor_name = g_strdup(yytext);
+    vendor_type_octets = 1;
+    vendor_length_octets = 1;
+    vendor_has_flags = FALSE;
+    BEGIN VENDOR_W_NAME;
+}
+<VENDOR_W_NAME>[0-9]+   {
+    vendor_id = strtol(yytext,NULL,10);
+    BEGIN VENDOR_W_ID;
+}
 <VENDOR_W_NAME>0x[0-9a-f]+   {
-    add_vendor(vendor_name,strtol(yytext,NULL,16));
+    vendor_id = strtol(yytext,NULL,16);
+    BEGIN VENDOR_W_ID;
+}
+<VENDOR_W_ID>format= {
+    BEGIN VENDOR_W_FORMAT;
+}
+<VENDOR_W_FORMAT>[124] {
+    vendor_type_octets = strtol(yytext,NULL,10);
+    BEGIN VENDOR_W_TYPE_OCTETS;
+}
+<VENDOR_W_TYPE_OCTETS>,[012] {
+    vendor_length_octets = strtol(yytext+1,NULL,10);
+    BEGIN VENDOR_W_LENGTH_OCTETS;
+}
+<VENDOR_W_LENGTH_OCTETS>,c {
+    vendor_has_flags = TRUE;
+    BEGIN VENDOR_W_CONTINUATION;
+}
+<VENDOR_W_FORMAT>\n |
+<VENDOR_W_TYPE_OCTETS>\n |
+<VENDOR_W_LENGTH_OCTETS>\n |
+<VENDOR_W_CONTINUATION>\n |
+<VENDOR_W_ID>\n {
+    add_vendor(vendor_name, vendor_id, vendor_type_octets, vendor_length_octets, vendor_has_flags);
     g_free(vendor_name);
     BEGIN WS_OUT;
 }
 <ATTR_W_ID>ipxnet                      { attr_type = radius_ipxnet;  BEGIN ATTR_W_TYPE; }
 <ATTR_W_ID>date                                { attr_type = radius_date;  BEGIN ATTR_W_TYPE; }
 <ATTR_W_ID>ifid                                { attr_type = radius_ifid;  BEGIN ATTR_W_TYPE; }
+<ATTR_W_ID>byte                                { attr_type = radius_integer;  BEGIN ATTR_W_TYPE; }
+<ATTR_W_ID>short                       { attr_type = radius_integer;  BEGIN ATTR_W_TYPE; }
+<ATTR_W_ID>signed                      { attr_type = radius_signed;  BEGIN ATTR_W_TYPE; }
+<ATTR_W_ID>combo-ip                    { attr_type = radius_combo_ip;  BEGIN ATTR_W_TYPE; }
+<ATTR_W_ID>tlv                         { attr_type = radius_tlv;  BEGIN ATTR_W_TYPE; }
 <ATTR_W_ID>[0-9a-z_-]+                 { attr_type = radius_octets;  BEGIN ATTR_W_TYPE; }
 <ATTR_W_TYPE>has_tag[,]?               { has_tag = TRUE; }
 <ATTR_W_TYPE>encrypt=1[,]?             { encrypted=TRUE; }
 <ATTR_W_TYPE>[0-9a-z_-]+=([^\n]*)      ;
 <ATTR_W_TYPE>[0-9a-z_-]+               {
     attr_vendor = g_strdup(yytext);
-    add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypted,has_tag);
+    add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypted,has_tag,current_attr);
     g_free(attr_id);
     g_free(attr_vendor);
     g_free(attr_name);
     BEGIN WS_OUT;
 }
 <ATTR_W_TYPE>\n                                                {
-    add_attribute(attr_name,attr_id,attr_type,current_vendor,encrypted,has_tag);
+    add_attribute(attr_name,attr_id,attr_type,current_vendor,encrypted,has_tag,current_attr);
     g_free(attr_id);
     g_free(attr_name);
     linenums[include_stack_ptr]++;
     BEGIN WS_OUT;
 }
 <ATTR_W_VENDOR>\n                                      {
-    add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypted,has_tag);
+    add_attribute(attr_name,attr_id,attr_type,attr_vendor,encrypted,has_tag,current_attr);
     g_free(attr_id);
     g_free(attr_vendor);
     g_free(attr_name);
 
 %%
 
-void add_vendor(const gchar* name, guint32 vendor_id) {
+void add_vendor(const gchar* name, guint32 vendor_id, guint vendor_type_octets, guint vendor_length_octets, gboolean vendor_has_flags) {
        radius_vendor_info_t* v;
 
-       v=g_hash_table_lookup(dict->vendors_by_id, GUINT_TO_POINTER(vendor_id));
+       v = g_hash_table_lookup(dict->vendors_by_id, GUINT_TO_POINTER(vendor_id));
 
        if (!v) {
                v = g_malloc(sizeof(radius_vendor_info_t));
@@ -249,6 +305,9 @@ void add_vendor(const gchar* name, guint32 vendor_id) {
                v->code = vendor_id;
                v->ett = -1;
                v->name = NULL;
+               v->type_octets = vendor_type_octets;
+               v->length_octets = vendor_length_octets;
+               v->has_flags = vendor_has_flags; 
        }
 
        if (v->name)
@@ -259,11 +318,18 @@ void add_vendor(const gchar* name, guint32 vendor_id) {
        g_hash_table_insert(dict->vendors_by_name, (gpointer) v->name, v);
 }
 
-void add_attribute(const gchar* name, const  gchar* codestr, radius_attr_dissector_t type, const  gchar* vendor_name, gboolean crypt, gboolean tagged) {
+void add_attribute(const gchar* name, const  gchar* codestr, radius_attr_dissector_t type, const  gchar* vendor_name, gboolean crypt, gboolean tagged, const gchar* current_attr) {
        radius_attr_info_t* a;
        GHashTable* by_id;
        guint32 code;
 
+
+       if (current_attr){
+               add_tlv(name, codestr, type, current_attr);
+               return;
+       }
+
+
        if (vendor_name) {
                radius_vendor_info_t* v;
                v = g_hash_table_lookup(dict->vendors_by_name,vendor_name);
@@ -299,6 +365,7 @@ void add_attribute(const gchar* name, const  gchar* codestr, radius_attr_dissect
        a->hf_tag = -1;
        a->hf_len = -1;
        a->ett = -1;
+       a->tlvs_by_id = NULL;
 
        if (a->name)
                g_free((gpointer) a->name);
@@ -308,6 +375,61 @@ void add_attribute(const gchar* name, const  gchar* codestr, radius_attr_dissect
        g_hash_table_insert(dict->attrs_by_name,(gpointer) (a->name),a);
 }
 
+void add_tlv(const gchar* name, const  gchar* codestr, radius_attr_dissector_t type, const gchar* current_attr) {
+       radius_attr_info_t* a;
+       radius_attr_info_t* s = g_malloc(sizeof(radius_attr_info_t));
+       guint32 code;
+
+       a = g_hash_table_lookup(dict->attrs_by_name, current_attr);
+
+       if (! a) {
+               g_string_sprintfa(error, "Attr: '%s', does not exist in %s:%i \n", current_attr, fullpaths[include_stack_ptr], linenums[include_stack_ptr]);
+               BEGIN JUNK;
+               return;
+       }
+
+       if (type == radius_tlv) {
+               g_string_sprintfa(error, "sub-TLV: '%s', sub-TLV's type is specified as tlv in %s:%i \n", name, fullpaths[include_stack_ptr], linenums[include_stack_ptr]);
+               BEGIN JUNK;
+               return;
+       }
+
+
+       if (! a->tlvs_by_id) {
+               a->tlvs_by_id = g_hash_table_new(g_direct_hash,g_direct_equal);
+       }
+
+       code=strtol(codestr, NULL, 10);
+               
+       s = g_hash_table_lookup(a->tlvs_by_id, GUINT_TO_POINTER(code));
+
+       if (!s) {
+               s = g_malloc(sizeof(radius_attr_info_t));
+               s->name = NULL;
+               s->dissector = NULL;
+       }
+
+       s->code = code;
+       s->type = type;
+       s->encrypt = FALSE;
+       s->tagged = FALSE;
+       s->dissector = NULL;
+       s->vs = NULL;
+       s->hf = -1;
+       s->hf64 = -1;
+       s->hf_tag = -1;
+       s->hf_len = -1;
+       s->ett = -1;
+       s->tlvs_by_id = NULL;
+
+       if (s->name)
+               g_free((gpointer) s->name);
+       s->name = g_strdup(name);
+
+       g_hash_table_insert(a->tlvs_by_id,GUINT_TO_POINTER(s->code),s);
+       g_hash_table_insert(dict->tlvs_by_name,(gpointer) (s->name),s);
+}
+
 void add_value(const gchar* attrib_name, const gchar* value_repr, long value) {
        value_string v;
        GArray* a = g_hash_table_lookup(value_strings,attrib_name);
@@ -323,6 +445,22 @@ void add_value(const gchar* attrib_name, const gchar* value_repr, long value) {
        g_array_append_val(a,v);
 }
 
+static void setup_tlvs(gpointer k _U_, gpointer v, gpointer p _U_) {
+       radius_attr_info_t* s = v;
+       gpointer key;
+
+       union {
+               GArray* a;
+               gpointer p;
+       } vs;
+
+       if (g_hash_table_lookup_extended(value_strings, s->name, &key, &vs.p)) {
+               s->vs = (value_string*) vs.a->data;
+               g_array_free(vs.a, FALSE);
+               g_hash_table_remove(value_strings, key);
+               g_free(key);
+       }
+}
 
 static void setup_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
        radius_attr_info_t* a = v;
@@ -339,6 +477,10 @@ static void setup_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
                g_hash_table_remove(value_strings,key);
                g_free(key);
        }
+
+       if (a->tlvs_by_id) {
+               g_hash_table_foreach(a->tlvs_by_id, setup_tlvs, p);
+       }
 }
 
 static void setup_vendors(gpointer k _U_, gpointer v, gpointer p) {
@@ -360,11 +502,32 @@ static gboolean destroy_value_strings(gpointer k, gpointer v, gpointer p _U_) {
        return TRUE;
 }
 
+static gboolean destroy_tlvs(gpointer k _U_, gpointer v, gpointer p _U_) {
+       radius_attr_info_t* s = v;
+       int i;
+
+       g_free((gpointer) (s->name));
+
+       if (s->vs) {
+               for(i=0; s->vs[i].strptr; i++) {
+                       g_free((void *)s->vs[i].strptr);
+               }
+               g_free((void *)s->vs);
+       }
+       g_free(s);
+       return TRUE;
+}
+
 static gboolean destroy_attrs(gpointer k _U_, gpointer v, gpointer p _U_) {
        radius_attr_info_t* a = v;
        int i;
 
        g_free((gpointer) (a->name));
+       if (a->tlvs_by_id) {
+               g_hash_table_foreach_remove(a->tlvs_by_id, destroy_tlvs, p);
+               g_hash_table_destroy(a->tlvs_by_id);
+       }
+
        if (a->vs) {
                for(i=0; a->vs[i].strptr; i++) {
                        g_free((void *)a->vs[i].strptr);
index ac643b188d6c6aed52f315c621300d80b5095be7..7ce283487659b38f459c2efae7f7c3d31198f5fc 100644 (file)
@@ -517,6 +517,7 @@ File "..\..\radius\dictionary.shasta"
 File "..\..\radius\dictionary.shiva"
 File "..\..\radius\dictionary.sonicwall"
 File "..\..\radius\dictionary.springtide"
+File "..\..\radius\dictionary.starent"
 File "..\..\radius\dictionary.t_systems_nova"
 File "..\..\radius\dictionary.telebit"
 File "..\..\radius\dictionary.trapeze"
@@ -526,6 +527,7 @@ File "..\..\radius\dictionary.unix"
 File "..\..\radius\dictionary.usr"
 File "..\..\radius\dictionary.valemount"
 File "..\..\radius\dictionary.versanet"
+File "..\..\radius\dictionary.wimax"
 File "..\..\radius\dictionary.wispr"
 File "..\..\radius\dictionary.xedia"
 SetOutPath $INSTDIR
index 7e5c00e2d3efbb5bf1daf8978f6d732abbc0063a..417c95025d955d6099b26fc9b2b0091151864d50 100644 (file)
 #      ipv6addr   - 16 octets in network byte order
 #      ipv6prefix - 18 octets in network byte order
 #      octets  - raw octets, printed as hex strings
+#      byte     - one-octet unsigned integer
+#      short    - two-octet unsigned integer in network byte order
+#      signed   - 4-octet signed integer in network byte order.
+#      combo-ip - if length 4, is the same as the "ipaddr" type.
+#                  if length 16, is the same as "ipv6addr" type.
+#      tlv      - encapsulated sub-attributes
+#                 i.e. Vendor-Specific -> WiMAX TLV -> WiMAX sub-tlv.
 #
 
 $INCLUDE dictionary.3com
@@ -86,8 +93,9 @@ $INCLUDE dictionary.xedia
 $INCLUDE dictionary.ascend
 
 # we do not support 16bit attribute codes yet
-# $INCLUDE dictionary.usr
-
+$INCLUDE dictionary.usr
+$INCLUDE dictionary.starent
+$INCLUDE dictionary.wimax
 
 #
 #      The following are the proper new names. Use these.
diff --git a/radius/dictionary.starent b/radius/dictionary.starent
new file mode 100644 (file)
index 0000000..88c8b58
--- /dev/null
@@ -0,0 +1,176 @@
+# -*- text -*-
+##############################################################################
+#
+#      Starent dictionary
+#      http://www.starentnetworks.com/
+#
+#      These appear to be 16-bit VSA types, with 16-bit lengths.
+#
+#      $Id$
+#
+##############################################################################
+
+VENDOR         Starent                         8164    format=2,2
+
+BEGIN-VENDOR   Starent
+
+ATTRIBUTE      SN-VPN-ID                               1       integer
+ATTRIBUTE      SN-VPN-Name                             2       string
+ATTRIBUTE      SN-Disconnect-Reason                    3       integer
+ATTRIBUTE      SN-PPP-Progress-Code                    4       integer
+ATTRIBUTE      SN-Primary-DNS-Server                   5       ipaddr
+ATTRIBUTE      SN-Secondary-DNS-Server                 6       ipaddr
+ATTRIBUTE      SN-Re-CHAP-Interval                     7       integer
+ATTRIBUTE      SN-IP-Pool-Name                         8       string
+ATTRIBUTE      SN-PPP-Data-Compression                 9       integer
+ATTRIBUTE      SN-IP-Filter-In                         10      string
+ATTRIBUTE      SN-IP-Filter-Out                        11      string
+ATTRIBUTE      SN-Local-IP-Address                     13      ipaddr
+ATTRIBUTE      SN-IP-Source-Validation                 14      integer
+ATTRIBUTE      SN-PPP-Outbound-Password                15      string
+ATTRIBUTE      SN-PPP-Keepalive                        16      integer
+ATTRIBUTE      SN-IP-In-ACL                            17      string
+ATTRIBUTE      SN-IP-Out-ACL                           18      string
+ATTRIBUTE      SN-PPP-Data-Compression-Mode            19      integer
+ATTRIBUTE      SN-Subscriber-Permission                20      integer
+ATTRIBUTE      SN-Admin-Permission                     21      integer
+ATTRIBUTE      SN-Simultaneous-SIP-MIP                 22      integer
+ATTRIBUTE      SN-Min-Compress-Size                    23      integer
+ATTRIBUTE      SNA-PPP-Unfr-data-In-Oct                200     integer
+ATTRIBUTE      SNA-PPP-Unfr-data-Out-Oct               201     integer
+ATTRIBUTE      SNA-PPP-Ctrl-Input-Octets               1001    integer
+ATTRIBUTE      SNA-PPP-Ctrl-Output-Octets              1002    integer
+ATTRIBUTE      SNA-PPP-Ctrl-Input-Packets              1003    integer
+ATTRIBUTE      SNA-PPP-Ctrl-Output-Packets             1004    integer
+ATTRIBUTE      SNA-PPP-Framed-Input-Octets             1005    integer
+ATTRIBUTE      SNA-PPP-Framed-Output-Octets            1006    integer
+ATTRIBUTE      SNA-PPP-Discards-Input                  1007    integer
+ATTRIBUTE      SNA-PPP-Discards-Output                 1008    integer
+ATTRIBUTE      SNA-PPP-Errors-Input                    1009    integer
+ATTRIBUTE      SNA-PPP-Errors-Output                   1010    integer
+ATTRIBUTE      SNA-PPP-Bad-Addr                        1011    integer
+ATTRIBUTE      SNA-PPP-Bad-Ctrl                        1012    integer
+ATTRIBUTE      SNA-PPP-Packet-Too-Long                 1013    integer
+ATTRIBUTE      SNA-PPP-Bad-FCS                         1014    integer
+ATTRIBUTE      SNA-PPP-Echo-Req-Input                  1015    integer
+ATTRIBUTE      SNA-PPP-Echo-Req-Output                 1016    integer
+ATTRIBUTE      SNA-PPP-Echo-Rsp-Input                  1017    integer
+ATTRIBUTE      SNA-PPP-Echo-Rsp-Output                 1018    integer
+ATTRIBUTE      SNA-RPRRQ-Rcvd-Total                    1019    integer
+ATTRIBUTE      SNA-RPRRQ-Rcvd-Acc-Reg                  1020    integer
+ATTRIBUTE      SNA-RPRRQ-Rcvd-Acc-Dereg                1021    integer
+ATTRIBUTE      SNA-RPRRQ-Rcvd-Msg-Auth-Fail            1022    integer
+ATTRIBUTE      SNA-RPRRQ-Rcvd-Mis-ID                   1023    integer
+ATTRIBUTE      SNA-RPRRQ-Rcvd-Badly-Formed             1024    integer
+ATTRIBUTE      SNA-RPRRQ-Rcvd-VID-Unsupported          1025    integer
+ATTRIBUTE      SNA-RPRRQ-Rcvd-T-Bit-Not-Set            1026    integer
+ATTRIBUTE      SNA-RPRAK-Rcvd-Total                    1027    integer
+ATTRIBUTE      SNA-RPRAK-Rcvd-Acc-Ack                  1028    integer
+ATTRIBUTE      SNA-RPRAK-Rcvd-Msg-Auth-Fail            1029    integer
+ATTRIBUTE      SNA-RPRAK-Rcvd-Mis-ID                   1030    integer
+ATTRIBUTE      SNA-RP-Reg-Reply-Sent-Total             1031    integer
+ATTRIBUTE      SNA-RP-Reg-Reply-Sent-Acc-Reg           1032    integer
+ATTRIBUTE      SNA-RP-Reg-Reply-Sent-Acc-Dereg         1033    integer
+ATTRIBUTE      SNA-RP-Reg-Reply-Sent-Bad-Req           1034    integer
+ATTRIBUTE      SNA-RP-Reg-Reply-Sent-Denied            1035    integer
+ATTRIBUTE      SNA-RP-Reg-Reply-Sent-Mis-ID            1036    integer
+ATTRIBUTE      SNA-RP-Reg-Reply-Sent-Send-Err          1037    integer
+ATTRIBUTE      SNA-RP-Reg-Upd-Sent                     1038    integer
+ATTRIBUTE      SNA-RP-Reg-Upd-Re-Sent                  1039    integer
+ATTRIBUTE      SNA-RP-Reg-Upd-Send-Err                 1040    integer
+
+VALUE  SN-Disconnect-Reason            Not-Defined             0
+VALUE  SN-Disconnect-Reason            Admin-Disconnect        1
+VALUE  SN-Disconnect-Reason            Remote-Disconnect       2
+VALUE  SN-Disconnect-Reason            Local-Disconnect        3
+VALUE  SN-Disconnect-Reason            Disc-No-Resource        4
+VALUE  SN-Disconnect-Reason            Disc-Excd-Service-Limit 5
+VALUE  SN-Disconnect-Reason            PPP-LCP-Neg-Failed      6
+VALUE  SN-Disconnect-Reason            PPP-LCP-No-Response     7
+VALUE  SN-Disconnect-Reason            PPP-LCP-Loopback        8
+VALUE  SN-Disconnect-Reason            PPP-LCP-Max-Retry       9
+VALUE  SN-Disconnect-Reason            PPP-Echo-Failed         10
+VALUE  SN-Disconnect-Reason            PPP-Auth-Failed         11
+VALUE  SN-Disconnect-Reason            PPP-Auth-Failed-No-AAA-Resp 12
+VALUE  SN-Disconnect-Reason            PPP-Auth-No-Response    13
+VALUE  SN-Disconnect-Reason            PPP-Auth-Max-Retry      14
+VALUE  SN-Disconnect-Reason            Invalid-AAA-Attr        15
+VALUE  SN-Disconnect-Reason            Failed-User-Filter      16
+VALUE  SN-Disconnect-Reason            Failed-Provide-Service  17
+VALUE  SN-Disconnect-Reason            Invalid-IP-Address-AAA  18
+VALUE  SN-Disconnect-Reason            Invalid-IP-Pool-AAA     19
+VALUE  SN-Disconnect-Reason            PPP-IPCP-Neg-Failed     20
+VALUE  SN-Disconnect-Reason            PPP-IPCP-No-Response    21
+VALUE  SN-Disconnect-Reason            PPP-IPCP-Max-Retry      22
+VALUE  SN-Disconnect-Reason            PPP-No-Rem-IP-Address   23
+VALUE  SN-Disconnect-Reason            Inactivity-Timeout      24
+VALUE  SN-Disconnect-Reason            Session-Timeout         25
+VALUE  SN-Disconnect-Reason            Max-Data-Excd           26
+VALUE  SN-Disconnect-Reason            Invalid-IP-Source-Address 27
+VALUE  SN-Disconnect-Reason            MSID-Auth-Failed        28
+VALUE  SN-Disconnect-Reason            MSID-Auth-Fauiled-No-AAA-Resp 29
+VALUE  SN-Disconnect-Reason            A11-Max-Retry           30
+VALUE  SN-Disconnect-Reason            A11-Lifetime-Expired    31
+VALUE  SN-Disconnect-Reason            A11-Message-Integrity-Failure 32
+VALUE  SN-Disconnect-Reason            PPP-lcp-remote-disc     33
+VALUE  SN-Disconnect-Reason            Session-setup-timeout   34
+VALUE  SN-Disconnect-Reason            PPP-keepalive-failure   35
+VALUE  SN-Disconnect-Reason            Flow-add-failed         36
+VALUE  SN-Disconnect-Reason            Call-type-detection-failed 37
+VALUE  SN-Disconnect-Reason            Wrong-ipcp-params       38
+VALUE  SN-Disconnect-Reason            MIP-remote-dereg        39
+VALUE  SN-Disconnect-Reason            MIP-lifetime-expiry     40
+VALUE  SN-Disconnect-Reason            MIP-proto-error         41
+VALUE  SN-Disconnect-Reason            MIP-auth-failure        42
+VALUE  SN-Disconnect-Reason            MIP-reg-timeout         43
+VALUE  SN-Disconnect-Reason            Invalid-dest-context    44
+VALUE  SN-Disconnect-Reason            Source-context-removed  45
+VALUE  SN-Disconnect-Reason            Destination-context-removed 46
+VALUE  SN-Disconnect-Reason            Req-service-addr-unavailable 47
+VALUE  SN-Disconnect-Reason            Demux-mgr-failed        48
+VALUE  SN-Disconnect-Reason            Internal-error          49
+
+VALUE  SN-PPP-Progress-Code            Not-Defined             0
+VALUE  SN-PPP-Progress-Code            Call-Lcp-Down           1
+VALUE  SN-PPP-Progress-Code            Call-Disconnecting      2
+VALUE  SN-PPP-Progress-Code            Call-Ppp-Renegotiating  3
+VALUE  SN-PPP-Progress-Code            Call-Arrived            11
+VALUE  SN-PPP-Progress-Code            Call-Lcp-Up             12
+VALUE  SN-PPP-Progress-Code            Call-Authenticating     13
+VALUE  SN-PPP-Progress-Code            Call-Authenticated      14
+VALUE  SN-PPP-Progress-Code            Call-Ipcp-Up            15
+VALUE  SN-PPP-Progress-Code            Call-Simple-IP-Connected 16
+VALUE  SN-PPP-Progress-Code            Call-Mobile-IP-Connected 17
+
+VALUE  SN-PPP-Data-Compression         None                    0
+VALUE  SN-PPP-Data-Compression         Stac-LZS                1
+VALUE  SN-PPP-Data-Compression         MPPC                    2
+VALUE  SN-PPP-Data-Compression         MPCC-Stac-LZS           3
+VALUE  SN-PPP-Data-Compression         Deflate                 4
+VALUE  SN-PPP-Data-Compression         Deflate-Stac-LZS        5
+VALUE  SN-PPP-Data-Compression         Deflate-MPCC            6
+VALUE  SN-PPP-Data-Compression         Deflate-MPCC-Stac-LZS   7
+
+VALUE  SN-IP-Source-Validation         No                      0
+VALUE  SN-IP-Source-Validation         Yes                     1
+
+VALUE  SN-Subscriber-Permission        None                    0
+VALUE  SN-Subscriber-Permission        Simple-IP               1
+VALUE  SN-Subscriber-Permission        Mobile-IP               2
+VALUE  SN-Subscriber-Permission        Simple-IP-Mobile-IP     3
+VALUE  SN-Subscriber-Permission        HA-Mobile-IP            4
+VALUE  SN-Subscriber-Permission        Simple-IP-HA-Mobile-IP  5
+VALUE  SN-Subscriber-Permission        Mobile-IP-HA-Mobile-IP  6
+VALUE  SN-Subscriber-Permission        All                     7
+
+VALUE  SN-Admin-Permission             None                    0
+VALUE  SN-Admin-Permission             CLI                     1
+VALUE  SN-Admin-Permission             FTP                     2
+
+VALUE  SN-Simultaneous-SIP-MIP         Disabled                0
+VALUE  SN-Simultaneous-SIP-MIP         Enabled                 1
+
+VALUE  SN-PPP-Data-Compression-Mode    Normal                  0
+VALUE  SN-PPP-Data-Compression-Mode    Stateless               1
+
+END-VENDOR     Starent
index 3f7e84f8cc1a899c417a5a94dfd20b9bccd0ab13..966ae4ca5ae6070beaa31397ed35749b6eb898a4 100644 (file)
@@ -1,3 +1,4 @@
+# -*- text -*-
 #
 # dictionary.usr       USR Robotics dictionary.
 #
 #
 # Prompt value should be 1 for echo, 0 for no echo, default 1.
 #ATTRIBUTE     Prompt                  64      integer
-ATTRIBUTE      Multi-Link-Flag         126     integer
-ATTRIBUTE      Char-Noecho             250     integer
+ATTRIBUTE      Multi-Link-Flag                         126     integer
+ATTRIBUTE      Char-Noecho                             250     integer
 
 #
 #      USR specific Integer Translations
 #
 
-VALUE          Termination-Action      Manage-Resources        2
+VALUE  Termination-Action              Manage-Resources        2
 
-VALUE          Acct-Status-Type        Modem-Start             4
-VALUE          Acct-Status-Type        Modem-Stop              5
-VALUE          Acct-Status-Type        Cancel                  6
+VALUE  Acct-Status-Type                Modem-Start             4
+VALUE  Acct-Status-Type                Modem-Stop              5
+VALUE  Acct-Status-Type                Cancel                  6
 
-VALUE          Multi-Link-Flag         True                    1
-VALUE          Multi-Link-Flag         False                   0
+VALUE  Multi-Link-Flag                 True                    1
+VALUE  Multi-Link-Flag                 False                   0
 
 #      USR specific Authentication Types
 
@@ -52,13 +53,13 @@ VALUE               Multi-Link-Flag         False                   0
 #      normal vendor-specific format would work just as well.
 #
 #
-VENDOR         USR             429
+VENDOR         USR                             429     format=4,0
 BEGIN-VENDOR   USR
 
 ATTRIBUTE      USR-Last-Number-Dialed-Out              0x0066  string
 ATTRIBUTE      USR-Last-Number-Dialed-In-DNIS          0x00E8  string
 ATTRIBUTE      USR-Last-Callers-Number-ANI             0x00E9  string
-ATTRIBUTE      USR-Channel                             0xBF38  integer 
+ATTRIBUTE      USR-Channel                             0xBF38  integer
 ATTRIBUTE      USR-Event-Id                            0xBFBE  integer
 ATTRIBUTE      USR-Event-Date-Time                     0xBF2F  date
 ATTRIBUTE      USR-Call-Start-Date-Time                0xBFF7  date
@@ -119,7 +120,7 @@ ATTRIBUTE   USR-Server-Time                         0xF000  date
 
 # 0xBE5D-0xBE63 sent with Event-Id 79
 ATTRIBUTE      USR-Channel-Connected-To                0xBE5D  integer
-ATTRIBUTE      USR-Slot-Connected-To                   0xBE5E  integer 
+ATTRIBUTE      USR-Slot-Connected-To                   0xBE5E  integer
 ATTRIBUTE      USR-Device-Connected-To                 0xBE5F  integer
 ATTRIBUTE      USR-NFAS-ID                             0xBE60  integer
 ATTRIBUTE      USR-Q931-Call-Reference-Value           0xBE61  integer
@@ -130,6 +131,109 @@ ATTRIBUTE USR-DS0s                                0xBE64  string
 # Gateway-IP-Address sent with Event-Id 71,72
 ATTRIBUTE      USR-Gateway-IP-Address                  0xBE66  ipaddr
 
+#
+#
+#
+ATTRIBUTE      CW-Version-Id                           0x8000  integer
+ATTRIBUTE      CW-Account-Id                           0x8001  string
+ATTRIBUTE      CW-Acct-Type                            0x8002  integer
+ATTRIBUTE      CW-Acct-Identification-Code             0x8003  integer
+ATTRIBUTE      CW-Service-Type                         0x8004  integer
+ATTRIBUTE      CW-Rate-Plan-Id                         0x8005  integer
+ATTRIBUTE      CW-Source-Identifier                    0x8006  integer
+ATTRIBUTE      CW-Session-Id                           0x8007  string
+ATTRIBUTE      CW-Num-Call-Attempt-Session             0x8008  integer
+ATTRIBUTE      CW-Session-Sequence-Num                 0x8009  integer
+ATTRIBUTE      CW-Session-Sequence-End                 0x800a  integer
+ATTRIBUTE      CW-Authentication-Fail-Cnt              0x800b  integer
+ATTRIBUTE      CW-Clg-Party-E164-Type                  0x800c  integer
+ATTRIBUTE      CW-Clg-Party-E164-Number                0x800d  string
+ATTRIBUTE      CW-Clg-Party-Trans-Protocol             0x800e  integer
+ATTRIBUTE      CW-Clg-Party-Trans-Port                 0x800f  integer
+ATTRIBUTE      CW-Clg-Party-Trans-IP                   0x8010  ipaddr
+ATTRIBUTE      CW-Clg-Party-Trans-DNS                  0x8011  string
+ATTRIBUTE      CW-Cld-Party-E164-Type                  0x8012  integer
+ATTRIBUTE      CW-Cld-Party-E164-Number                0x8013  string
+ATTRIBUTE      CW-Cld-Party-Trans-Protocol             0x8014  integer
+ATTRIBUTE      CW-Cld-Party-Trans-Port                 0x8015  integer
+ATTRIBUTE      CW-Cld-Party-Trans-IP                   0x8016  ipaddr
+ATTRIBUTE      CW-Cld-Party-Trans-DNS                  0x8017  string
+ATTRIBUTE      CW-Orig-Line-Identifier                 0x8018  integer
+ATTRIBUTE      CW-PSTN-Interface-Number                0x8019  integer
+ATTRIBUTE      CW-Ingr-Gway-E164-Type                  0x801a  integer
+ATTRIBUTE      CW-Ingr-Gway-E164-Number                0x801b  string
+ATTRIBUTE      CW-Ingr-Gway-Trans-Protocol             0x801c  integer
+ATTRIBUTE      CW-Ingr-Gway-Trans-Port                 0x801d  integer
+ATTRIBUTE      CW-Ingr-Gway-Trans-IP                   0x801e  ipaddr
+ATTRIBUTE      CW-Ingr-Gway-Trans-DNS                  0x801f  string
+ATTRIBUTE      CW-Egr-Gway-Trans-Protocol              0x8020  integer
+ATTRIBUTE      CW-Egr-Gway-Trans-Port                  0x8021  integer
+ATTRIBUTE      CW-Egr-Gway-Trans-IP                    0x8022  ipaddr
+ATTRIBUTE      CW-Egr-Gway-Trans-DNS                   0x8023  string
+ATTRIBUTE      CW-Ingr-Gtkpr-Trans-Protocol            0x8024  integer
+ATTRIBUTE      CW-Ingr-Gtkpr-Trans-Port                0x8025  integer
+ATTRIBUTE      CW-Ingr-Gtkpr-Trans-IP                  0x8026  ipaddr
+ATTRIBUTE      CW-Ingr-Gtkpr-Trans-DNS                 0x8027  string
+ATTRIBUTE      CW-Egr-Gtkpr-Trans-Protocol             0x8028  integer
+ATTRIBUTE      CW-Egr-Gtkpr-Trans-Port                 0x8029  integer
+ATTRIBUTE      CW-Egr-Gtkpr-Trans-IP                   0x802a  ipaddr
+ATTRIBUTE      CW-Egr-Gtkpr-Trans-DNS                  0x802b  string
+ATTRIBUTE      CW-Call-Identifier                      0x802c  string
+ATTRIBUTE      CW-Call-Type                            0x802d  integer
+ATTRIBUTE      CW-Call-Start-Ingr-GW-Sec               0x802e  string
+ATTRIBUTE      CW-Call-Start-Ingr-GW-Msec              0x802f  integer
+ATTRIBUTE      CW-Call-Start-Time-Ans-Sec              0x8030  string
+ATTRIBUTE      CW-Call-Start-Time-Ans-Msec             0x8031  integer
+ATTRIBUTE      CW-Call-End-Time-Sec                    0x8032  string
+ATTRIBUTE      CW-Call-End-Time-Msec                   0x8033  integer
+ATTRIBUTE      CW-Call-Durn-Connect-Disc               0x8034  integer
+ATTRIBUTE      CW-Codec-Type                           0x8035  integer
+ATTRIBUTE      CW-Call-Termination-Cause               0x8036  integer
+ATTRIBUTE      CW-Audio-Packets-Sent                   0x8037  integer
+ATTRIBUTE      CW-Audio-Packets-Received               0x8038  integer
+ATTRIBUTE      CW-Audio-Packets-Lost                   0x8039  integer
+ATTRIBUTE      CW-Audio-Packets-In-Frame               0x803a  integer
+ATTRIBUTE      CW-Audio-Bytes-In-Frame                 0x803b  integer
+ATTRIBUTE      CW-Audio-Signal-In-Packet               0x803c  integer
+ATTRIBUTE      CW-Port-Id-For-Call                     0x803d  integer
+ATTRIBUTE      CW-Slot-Id-For-Call                     0x803e  integer
+ATTRIBUTE      CW-Acct-Balance-Start-Curr              0x803f  integer
+ATTRIBUTE      CW-Acct-Balance-Start-Amt               0x8040  integer
+ATTRIBUTE      CW-Acct-Balance-Start-Dec               0x8041  integer
+ATTRIBUTE      CW-Acct-Balance-Decr-Curr               0x8042  integer
+ATTRIBUTE      CW-LRQ-Token                            0x8043  string
+ATTRIBUTE      CW-ARQ-Token                            0x8044  string
+ATTRIBUTE      CW-Token-Status                         0x8045  integer
+ATTRIBUTE      CW-SS7-Destn-Ptcode-Type                0x8046  integer
+ATTRIBUTE      CW-SS7-Destn-Ptcode-Address             0x8047  integer
+ATTRIBUTE      CW-SS7-Orig-Ptcode-Type                 0x8048  integer
+ATTRIBUTE      CW-SS7-Orig-Ptcode-Address              0x8049  integer
+ATTRIBUTE      CW-SS7-CIC                              0x804a  integer
+ATTRIBUTE      CW-MGC-Id                               0x804b  integer
+ATTRIBUTE      CW-MG-Id                                0x804c  integer
+ATTRIBUTE      CW-Signaling-Protocol                   0x804d  integer
+ATTRIBUTE      CW-Protocol-Transport                   0x804e  integer
+ATTRIBUTE      CW-Local-Sig-Trans-Protocol             0x804f  integer
+ATTRIBUTE      CW-Local-Sig-Trans-Port                 0x8050  integer
+ATTRIBUTE      CW-Local-Sig-Trans-IP                   0x8051  ipaddr
+ATTRIBUTE      CW-Local-Sig-Trans-DNS                  0x8052  string
+ATTRIBUTE      CW-Remote-Sig-Trans-Protocol            0x8053  integer
+ATTRIBUTE      CW-Remote-Sig-Trans-Port                0x8054  integer
+ATTRIBUTE      CW-Remote-Sig-Trans-IP                  0x8055  ipaddr
+ATTRIBUTE      CW-Remote-Sig-Trans-DNS                 0x8056  string
+ATTRIBUTE      CW-Local-MG-RTP-Protocol                0x8057  integer
+ATTRIBUTE      CW-Local-MG-RTP-Port                    0x8058  integer
+ATTRIBUTE      CW-Local-MG-RTP-IP                      0x8059  ipaddr
+ATTRIBUTE      CW-Local-MG-RTP-DNS                     0x805a  string
+ATTRIBUTE      CW-Remote-MG-RTP-Protocol               0x805b  integer
+ATTRIBUTE      CW-Remote-MG-RTP-Port                   0x805c  integer
+ATTRIBUTE      CW-Remote-MG-RTP-IP                     0x805d  ipaddr
+ATTRIBUTE      CW-Remote-MG-RTP-DNS                    0x805e  string
+ATTRIBUTE      CW-Call-Model                           0x805f  integer
+ATTRIBUTE      CW-Call-Plan-Id                         0x8060  integer
+ATTRIBUTE      CW-Trans-Cld-Party-E164-Type            0x8061  integer
+ATTRIBUTE      CW-Trans-Cld-Party-E164-Num             0x8062  string
+ATTRIBUTE      CW-OSP-Source-Device                    0x8063  string
 
 #
 # These are CCA Radius attributes
@@ -160,11 +264,11 @@ ATTRIBUTE USR-Keypress-Timeout                    0x901C  integer
 ATTRIBUTE      USR-Unauthenticated-Time                0x901D  integer
 ATTRIBUTE      USR-Connect-Speed                       0x9023  integer
 ATTRIBUTE      USR-Framed_IP_Address_Pool_Name         0x9024  string
-ATTRIBUTE      USR-MP-EDO                              0x9025  string  
+ATTRIBUTE      USR-MP-EDO                              0x9025  string
 
 #
 # Pilgrim attributes
-# 
+#
 ATTRIBUTE      USR-Bearer-Capabilities                 0x9800  integer
 ATTRIBUTE      USR-Speed-Of-Connection                 0x9801  integer
 ATTRIBUTE      USR-Max-Channels                        0x9802  integer
@@ -290,6 +394,7 @@ ATTRIBUTE   USR-IDS0-Call-Type                      0xbe4f  integer
 ATTRIBUTE      USR-Call-Reference-Number               0xbe7d  integer
 ATTRIBUTE      USR-CDMA-Call-Reference-Number          0x0183  integer
 ATTRIBUTE      USR-Mobile-IP-Address                   0x088e  ipaddr
+ATTRIBUTE      USR-QNC1-Service-Destination            0x08f4  ipaddr
 ATTRIBUTE      USR-IWF-IP-Address                      0x03f4  ipaddr
 ATTRIBUTE      USR-Called-Party-Number                 0x0890  string
 ATTRIBUTE      USR-Calling-Party-Number                0x088f  string
@@ -307,7 +412,7 @@ ATTRIBUTE   USR-Call-Error-Code                     0x089b  integer
 ATTRIBUTE      USR-Modem-Setup-Time                    0x089c  integer
 ATTRIBUTE      USR-Call-Connecting-Time                0x089d  integer
 ATTRIBUTE      USR-Connect-Time                        0x089e  integer
-ATTRIBUTE      USR-RMMIE-Last-Update-Time              0x0900  integer 
+ATTRIBUTE      USR-RMMIE-Last-Update-Time              0x0900  integer
 ATTRIBUTE      USR-RMMIE-Rcv-Tot-PwrLvl                0x0902  integer
 ATTRIBUTE      USR-RMMIE-Rcv-PwrLvl-3300Hz             0x0903  integer
 ATTRIBUTE      USR-RMMIE-Rcv-PwrLvl-3750Hz             0x0904  integer
@@ -328,7 +433,62 @@ ATTRIBUTE  USR-Chat-Script-Name                    0x9865  string
 ATTRIBUTE      USR-CUSR-hat-Script-Rules               0x9866  string
 ATTRIBUTE      USR-Rad-Location-Type                   0x9867  integer
 ATTRIBUTE      USR-OSPF-Addressless-Index              0x9869  integer
+ATTRIBUTE      USR-QoS-Queuing-Mehtod                  0x986d  integer
+ATTRIBUTE      USR-PQ-Default-Priority                 0x986e  integer
+ATTRIBUTE      USR-FQ-Default-Priority                 0x9871  integer
+ATTRIBUTE      USR-IPP-Enable                          0x9872  integer
+ATTRIBUTE      USR-Pre-Shared-MN-Key                   0x9873  string
+ATTRIBUTE      USR-MIP-NAI                             0x9874  integer
 ATTRIBUTE      USR-DNIS-ReAuthentication               0x9875  integer
+ATTRIBUTE      USR-Agent                               0x9876  integer
+ATTRIBUTE      USR-PQ-Parameters                       0x9877  integer
+ATTRIBUTE      USR-Dvmrp-Prune-Lifetime                0x9878  integer
+ATTRIBUTE      USR-Special-Xon-Xoff-Flow               0x9879  integer
+ATTRIBUTE      USR-Dvmrp-Advertised-Metric             0x987a  integer
+ATTRIBUTE      USR-Dvmrp-Retransmit-Prunes             0x987b  integer
+ATTRIBUTE      USR-Dvmrp-Non-Pruners                   0x987c  integer
+ATTRIBUTE      USR-Dvmrp-Route-Transit                 0x987d  integer
+ATTRIBUTE      USR-Dvmrp-Input-Filter                  0x987e  string
+ATTRIBUTE      USR-Dvmrp-Output-Filter                 0x9880  string
+ATTRIBUTE      USR-Policy-Access                       0x9881  integer
+ATTRIBUTE      USR-Policy-Configuration                0x9882  integer
+ATTRIBUTE      USR-Policy-Filename                     0x9883  string
+ATTRIBUTE      USR-Policy-Type                         0x9884  integer
+ATTRIBUTE      USR-Mobile-Session-ID                   0x9885  integer
+ATTRIBUTE      USR-Mobile-Accounting-Type              0x9886  integer
+ATTRIBUTE      USR-Mobile-Service-Option               0x9887  integer
+ATTRIBUTE      USR-Wallclock-Timestamp                 0x9888  integer
+ATTRIBUTE      USR-Dvmrp-Initial-Flooding              0x988a  integer
+ATTRIBUTE      USR-Telnet-Options                      0x988c  integer
+ATTRIBUTE      USR-CDMA-PktData-Network-ID             0x988d  integer
+ATTRIBUTE      USR-Auth-Next-Server-Address            0x988e  ipaddr
+ATTRIBUTE      USR-User-PPP-AODI-Type                  0x988f  integer
+ATTRIBUTE      USR-MLPPP-Fragmentation-Threshld        0x9890  integer
+ATTRIBUTE      USR-Unnumbered-Local-IP-Address         0x9891  ipaddr
+ATTRIBUTE      USR-Traffic-Threshold                   0x9892  integer
+ATTRIBUTE      USR-Keep-Alive-Interval                 0x9893  integer
+ATTRIBUTE      USR-Tunnel-Challenge-Outgoing           0x9894  integer
+ATTRIBUTE      USR-X25-Trunk-Profile                   0x9895  string
+ATTRIBUTE      USR-X25-Acct-Input-Segment-Count        0x9896  integer
+ATTRIBUTE      USR-X25-Acct-Output-Segment-Coun        0x9897  integer
+ATTRIBUTE      USR-X25-Acct-Segment-Size               0x9898  integer
+ATTRIBUTE      USR-X25-Acct-Termination-Code           0x9899  integer
+ATTRIBUTE      USR-X25-SVC-Logical-Channel-Numb        0x989a  integer
+ATTRIBUTE      USR-Nailed-B-Channel-Indicator          0x989b  integer
+ATTRIBUTE      USR-X25-SVC-Call-Attributes             0x989c  integer
+ATTRIBUTE      USR-Init-Reg-Server-Addr                0x989d  ipaddr
+ATTRIBUTE      USR-Re-Reg-Server-Addr                  0x989e  ipaddr
+ATTRIBUTE      USR-Bytes-TX-Remain                     0x989f  integer
+ATTRIBUTE      USR-Bytes-RX-Remain                     0x98a0  integer
+ATTRIBUTE      USR-Session-Time-Remain                 0x98a1  integer
+ATTRIBUTE      USR-Pre-Paid-Enabled                    0x98a2  integer
+ATTRIBUTE      USR-Reg-Server-Prov-Timeout             0x98a3  integer
+ATTRIBUTE      USR-Redirect                            0x98a4  integer
+ATTRIBUTE      USR-VLAN-Tag                            0x98a5  integer
+ATTRIBUTE      USR-Rad-IP-Pool-Definition              0x98a6  string
+ATTRIBUTE      USR-Rad-NMC-Call-Progress-Status        0x98a7  integer
+ATTRIBUTE      USR-Rad-NMC-Blocks_RX                   0x98a8  integer
+
 ATTRIBUTE      USR-NAS-Type                            0xf002  integer
 ATTRIBUTE      USR-Auth-Mode                           0xf003  integer
 #
@@ -338,671 +498,662 @@ ATTRIBUTE       USR-Auth-Mode                           0xf003  integer
 #VALUE         USR-Character-Echo      Echo-On                 0
 #VALUE         USR-Character-Echo      Echo-Off                1
 
-VALUE          USR-PW_Framed_Routing_V2        Off                     0
-VALUE          USR-PW_Framed_Routing_V2        On                      1
-
-VALUE          USR-Syslog-Tap          Off                     0
-VALUE          USR-Syslog-Tap          On-Raw                  1
-VALUE          USR-Syslog-Tap          On-Framed               2
-VALUE          USR-Syslog-Tap          Unknown        4294967295
+#VALUE USR-PW_Framed_Routing_V2        Off                     0
+#VALUE USR-PW_Framed_Routing_V2        On                      1
 
+VALUE  USR-Syslog-Tap                  Off                     0
+VALUE  USR-Syslog-Tap                  On-Raw                  1
+VALUE  USR-Syslog-Tap                  On-Framed               2
+VALUE  USR-Syslog-Tap                  Unknown                 4294967295
 
 #      Event Indentifiers
 
-VALUE  USR-Event-Id    Module-Inserted                 6
-VALUE  USR-Event-Id    Module-Removed                  7
-VALUE  USR-Event-Id    PSU-Voltage-Alarm               8
-VALUE  USR-Event-Id    PSU-Failed                      9
-VALUE  USR-Event-Id    HUB-Temp-Out-of-Range           10
-VALUE  USR-Event-Id    Fan-Failed                      11
-VALUE  USR-Event-Id    Watchdog-Timeout                12
-VALUE  USR-Event-Id    Mgmt-Bus-Failure                13
-VALUE  USR-Event-Id    In-Connection-Est               14
-VALUE  USR-Event-Id    Out-Connection-Est              15
-VALUE  USR-Event-Id    In-Connection-Term              16
-VALUE  USR-Event-Id    Out-Connection-Term             17
-VALUE  USR-Event-Id    Connection-Failed               18
-VALUE  USR-Event-Id    Connection-Timeout              19
-VALUE  USR-Event-Id    DTE-Transmit-Idle               20
-VALUE  USR-Event-Id    DTR-True                        21
-VALUE  USR-Event-Id    DTR-False                       22
-VALUE  USR-Event-Id    Block-Error-at-Threshold        23
-VALUE  USR-Event-Id    Fallbacks-at-Threshold          24
-VALUE  USR-Event-Id    No-Dial-Tone-Detected           25
-VALUE  USR-Event-Id    No-Loop-Current-Detected        26
-VALUE  USR-Event-Id    Yellow-Alarm                    27
-VALUE  USR-Event-Id    Red-Alarm                       28
-VALUE  USR-Event-Id    Loss-Of-Signal                  29
-VALUE  USR-Event-Id    Rcv-Alrm-Ind-Signal             30
-VALUE  USR-Event-Id    Timing-Source-Switch            31
-VALUE  USR-Event-Id    Modem-Reset-by-DTE              32
-VALUE  USR-Event-Id    Modem-Ring-No-Answer            33
-VALUE  USR-Event-Id    DTE-Ring-No-Answer              34
-VALUE  USR-Event-Id    Pkt-Bus-Session-Active          35
-VALUE  USR-Event-Id    Pkt-Bus-Session-Congestion      36
-VALUE  USR-Event-Id    Pkt-Bus-Session-Lost            37
-VALUE  USR-Event-Id    Pkt-Bus-Session-Inactive        38
-VALUE  USR-Event-Id    User-Interface-Reset            39
-VALUE  USR-Event-Id    Gateway-Port-Out-of-Service     40
-VALUE  USR-Event-Id    Gateway-Port-Link-Active        41
-VALUE  USR-Event-Id    Dial-Out-Login-Failure          42
-VALUE  USR-Event-Id    Dial-In-Login-Failure           43
-VALUE  USR-Event-Id    Dial-Out-Restricted-Number      44
-VALUE  USR-Event-Id    Dial-Back-Restricted-Number     45
-VALUE  USR-Event-Id    User-Blacklisted                46
-VALUE  USR-Event-Id    Attempted-Login-Blacklisted     47
-VALUE  USR-Event-Id    Response-Attempt-Limit-Exceeded 48
-VALUE  USR-Event-Id    Login-Attempt-Limit-Exceeded    49
-VALUE  USR-Event-Id    Dial-Out-Call-Duration          50
-VALUE  USR-Event-Id    Dial-In-Call-Duration           51
-VALUE  USR-Event-Id    Pkt-Bus-Session-Err-Status      52
-VALUE  USR-Event-Id    NMC-AutoRespnse-Trap            53
-VALUE  USR-Event-Id    Acct-Server-Contact-Loss        54
-VALUE  USR-Event-Id    Yellow-Alarm-Clear              55
-VALUE  USR-Event-Id    Red-Alarm-Clear                 56
-VALUE  USR-Event-Id    Loss-Of-Signal-Clear            57
-VALUE  USR-Event-Id    Rcv-Alrm-Ind-Signal-Clear       58
-VALUE  USR-Event-Id    Incoming-Connection-Established 59
-VALUE  USR-Event-Id    Outgoing-Connection-Established 60
-VALUE  USR-Event-Id    Incoming-Connection-Terminated  61
-VALUE  USR-Event-Id    Outgoing-Connection-Terminated  62
-VALUE  USR-Event-Id    Connection-Attempt-Failure      63
-VALUE  USR-Event-Id    Continuous-CRC-Alarm            64
-VALUE  USR-Event-Id    Continuous-CRC-Alarm-Clear      65
-VALUE  USR-Event-Id    Physical-State-Change           66
-VALUE  USR-Event-Id    Gateway-Network-Failed          71
-VALUE  USR-Event-Id    Gateway-Network-Restored        72
-VALUE  USR-Event-Id    Packet-Bus-Clock-Lost           73
-VALUE  USR-Event-Id    Packet-Bus-Clock-Restored       74
-VALUE  USR-Event-Id    D-Channel-In-Service            75
-VALUE  USR-Event-Id    D-Channel-Out-of-Service        76
-VALUE  USR-Event-Id    DS0s-In-Service                 77
-VALUE  USR-Event-Id    DS0s-Out-of-Service             78
-VALUE  USR-Event-Id    T1/T1PRI/E1PRI-Call-Event       79
-VALUE  USR-Event-Id    Psu-Incompatible                80
-VALUE  USR-Event-Id    T1,T1-E1/PRI-Call-Arrive-Event  81
-VALUE  USR-Event-Id    T1,T1-E1/PRI-Call-Connect-Event 82
-VALUE  USR-Event-Id    T1,T1-E1/PRI-Call-Termina-Event 83
-VALUE  USR-Event-Id    T1,T1-E1/PRI-Call-Failed-Event  84
-VALUE  USR-Event-Id    DNS-Contact-Lost                85
-VALUE  USR-Event-Id    NTP-Contact-Lost                86
-VALUE  USR-Event-Id    NTP-Contact-Restored            87
-VALUE  USR-Event-Id    IPGW-Link-Up                    88
-VALUE  USR-Event-Id    IPGW-Link-Down                  89
-VALUE  USR-Event-Id    NTP-Contact-Degraded            90
-VALUE  USR-Event-Id    In-Connection-Failed            91
-VALUE  USR-Event-Id    Out-Connection-Failed           92
-VALUE  USR-Event-Id    Application-ProcessorReset      93
-VALUE  USR-Event-Id    DSP-Reset                       94
-VALUE  USR-Event-Id    Changed-to-Maint-Srvs-State     95
-VALUE  USR-Event-Id    Loop-Back-cleared-on-channel    96
-VALUE  USR-Event-Id    Loop-Back-on-channel            97
-VALUE  USR-Event-Id    Telco-Abnormal-Response         98
-VALUE  USR-Event-Id    DNS-Contact-Restored            99
-VALUE  USR-Event-Id    DNS-Contact-Degraded            100
-VALUE  USR-Event-Id    RADIUS-Accounting-Restored      101
-VALUE  USR-Event-Id    RADIUS-Accounting-Group-Restore 102
-VALUE  USR-Event-Id    RADIUS-Accounting-Group-Degrade 103
-VALUE  USR-Event-Id    RADIUS-Accounting-Group-NonOper 104
-VALUE  USR-Event-Id    T1/T1-E1/PRI-InCall-Fail-Event  119
-VALUE  USR-Event-Id    T1/T1-E1/PRI-OutCall-Fail-Event 120
-VALUE  USR-Event-Id    RMMIE-Retrain-Event             121
-VALUE  USR-Event-Id    RMMIE-Speed-Shift-Event         122
-VALUE  USR-Event-Id    CDMA-Call-Start                 191
-VALUE  USR-Event-Id    CDMA-Call-End                   192
-
-
-VALUE  USR-Card-Type   SlotEmpty                       1
-VALUE  USR-Card-Type   SlotUnknown                     2
-VALUE  USR-Card-Type   NetwMgtCard                     3
-VALUE  USR-Card-Type   DualT1NAC                       4
-VALUE  USR-Card-Type   DualModemNAC                    5
-VALUE  USR-Card-Type   QuadModemNAC                    6
-VALUE  USR-Card-Type   TrGatewayNAC                    7
-VALUE  USR-Card-Type   X25GatewayNAC                   8
-VALUE  USR-Card-Type   DualV34ModemNAC                 9
-VALUE  USR-Card-Type   QuadV32DigitalModemNAC          10
-VALUE  USR-Card-Type   QuadV32AnalogModemNAC           11
-VALUE  USR-Card-Type   QuadV32DigAnlModemNAC           12
-VALUE  USR-Card-Type   QuadV34DigModemNAC              13
-VALUE  USR-Card-Type   QuadV34AnlModemNAC              14
-VALUE  USR-Card-Type   QuadV34DigAnlModemNAC           15
-VALUE  USR-Card-Type   SingleT1NAC                     16
-VALUE  USR-Card-Type   EthernetGatewayNAC              17
-VALUE  USR-Card-Type   AccessServer                    18
-VALUE  USR-Card-Type   486TrGatewayNAC                 19
-VALUE  USR-Card-Type   486EthernetGatewayNAC           20
-VALUE  USR-Card-Type   DualRS232NAC                    22
-VALUE  USR-Card-Type   486X25GatewayNAC                23
-VALUE  USR-Card-Type   ApplicationServerNAC            25
-VALUE  USR-Card-Type   ISDNGatewayNAC                  26
-VALUE  USR-Card-Type   ISDNpriT1NAC                    27
-VALUE  USR-Card-Type   ClkedNetMgtCard                 28
-VALUE  USR-Card-Type   ModemPoolManagementNAC          29
-VALUE  USR-Card-Type   ModemPoolNetserverNAC           30
-VALUE  USR-Card-Type   ModemPoolV34ModemNAC            31
-VALUE  USR-Card-Type   ModemPoolISDNNAC                32
-VALUE  USR-Card-Type   NTServerNAC                     33
-VALUE  USR-Card-Type   QuadV34DigitalG2NAC             34
-VALUE  USR-Card-Type   QuadV34AnalogG2NAC              35
-VALUE  USR-Card-Type   QuadV34DigAnlgG2NAC             36
-VALUE  USR-Card-Type   NETServerFrameRelayNAC          37
-VALUE  USR-Card-Type   NETServerTokenRingNAC           38
-VALUE  USR-Card-Type   X2524ChannelNAC                 39
-VALUE  USR-Card-Type   WirelessGatewayNac              42
-
-VALUE  USR-Card-Type   EnhancedAccessServer              44
-VALUE  USR-Card-Type   EnhancedISDNGatewayNAC            45
-
-VALUE  USR-Card-Type   DualT1NIC                       1001
-VALUE  USR-Card-Type   DualAlogMdmNIC                  1002
-VALUE  USR-Card-Type   QuadDgtlMdmNIC                  1003
-VALUE  USR-Card-Type   QuadAlogDgtlMdmNIC              1004
-VALUE  USR-Card-Type   TokenRingNIC                    1005
-VALUE  USR-Card-Type   SingleT1NIC                     1006
-VALUE  USR-Card-Type   EthernetNIC                     1007
-VALUE  USR-Card-Type   ShortHaulDualT1NIC              1008
-VALUE  USR-Card-Type   DualAlogMgdIntlMdmNIC           1009
-VALUE  USR-Card-Type   X25NIC                          1010
-VALUE  USR-Card-Type   QuadAlogNonMgdMdmNIC            1011
-VALUE  USR-Card-Type   QuadAlogMgdIntlMdmNIC           1012
-VALUE  USR-Card-Type   QuadAlogNonMgdIntlMdmNIC        1013
-VALUE  USR-Card-Type   QuadLsdLiMgdMdmNIC              1014
-VALUE  USR-Card-Type   QuadLsdLiNonMgdMdmNIC           1015
-VALUE  USR-Card-Type   QuadLsdLiMgdIntlMdmNIC          1016
-VALUE  USR-Card-Type   QuadLsdLiNonMgdIntlMdmNIC       1017
-VALUE  USR-Card-Type   HSEthernetWithV35NIC            1018
-VALUE  USR-Card-Type   HSEthernetWithoutV35NIC         1019
-VALUE  USR-Card-Type   DualHighSpeedV35NIC             1020
-VALUE  USR-Card-Type   QuadV35RS232LowSpeedNIC         1021
-VALUE  USR-Card-Type   DualE1NIC                       1022
-VALUE  USR-Card-Type   ShortHaulDualE1NIC              1023
-VALUE  USR-Card-Type   BellcoreLongHaulDualT1NIC       1025
-VALUE  USR-Card-Type   BellcoreShrtHaulDualT1NIC       1026
-VALUE  USR-Card-Type   SCSIEdgeServerNIC               1027
-
-
-VALUE  USR-Default-DTE-Data-Rate             110-BPS         1
-VALUE  USR-Default-DTE-Data-Rate             300-BPS         2
-VALUE  USR-Default-DTE-Data-Rate             600-BPS         3
-VALUE  USR-Default-DTE-Data-Rate             1200-BPS        4
-VALUE  USR-Default-DTE-Data-Rate             2400-BPS        5
-VALUE  USR-Default-DTE-Data-Rate             4800-BPS        6
-VALUE  USR-Default-DTE-Data-Rate             7200-BPS        7
-VALUE  USR-Default-DTE-Data-Rate             9600-BPS        8
-VALUE  USR-Default-DTE-Data-Rate             12K-BPS         9
-VALUE  USR-Default-DTE-Data-Rate             14.4K-BPS       10
-VALUE  USR-Default-DTE-Data-Rate             16.8-BPS        11
-VALUE  USR-Default-DTE-Data-Rate             19.2K-BPS       12
-VALUE  USR-Default-DTE-Data-Rate             38.4K-BPS       13
-VALUE  USR-Default-DTE-Data-Rate             75-BPS          14
-VALUE  USR-Default-DTE-Data-Rate             450-BPS         15
-VALUE  USR-Default-DTE-Data-Rate             UNKNOWN-BPS     16
-VALUE  USR-Default-DTE-Data-Rate             57.6K-BPS       17
-VALUE  USR-Default-DTE-Data-Rate             21.6K-BPS       18
-VALUE  USR-Default-DTE-Data-Rate             24K-BPS         19
-VALUE  USR-Default-DTE-Data-Rate             26K-BPS         20
-VALUE  USR-Default-DTE-Data-Rate             28K-BPS         21
-VALUE  USR-Default-DTE-Data-Rate             115K-BPS        22
-
-
-VALUE  USR-Initial-Rx-Link-Data-Rate           110-BPS         1
-VALUE  USR-Initial-Rx-Link-Data-Rate           300-BPS         2
-VALUE  USR-Initial-Rx-Link-Data-Rate           600-BPS         3
-VALUE  USR-Initial-Rx-Link-Data-Rate           1200-BPS        4
-VALUE  USR-Initial-Rx-Link-Data-Rate           2400-BPS        5
-VALUE  USR-Initial-Rx-Link-Data-Rate           4800-BPS        6
-VALUE  USR-Initial-Rx-Link-Data-Rate           7200-BPS        7
-VALUE  USR-Initial-Rx-Link-Data-Rate           9600-BPS        8
-VALUE  USR-Initial-Rx-Link-Data-Rate           12000-BPS       9
-VALUE  USR-Initial-Rx-Link-Data-Rate           14400-BPS       10
-VALUE  USR-Initial-Rx-Link-Data-Rate           16800-BPS       11
-VALUE  USR-Initial-Rx-Link-Data-Rate           19200-BPS       12
-VALUE  USR-Initial-Rx-Link-Data-Rate           38400-BPS       13
-VALUE  USR-Initial-Rx-Link-Data-Rate           75-BPS          14
-VALUE  USR-Initial-Rx-Link-Data-Rate           450-BPS         15
-VALUE  USR-Initial-Rx-Link-Data-Rate           UNKNOWN-BPS     16
-VALUE  USR-Initial-Rx-Link-Data-Rate           57600-BPS       17
-VALUE  USR-Initial-Rx-Link-Data-Rate           21600-BPS       18
-VALUE  USR-Initial-Rx-Link-Data-Rate           24000-BPS       19
-VALUE  USR-Initial-Rx-Link-Data-Rate           26400-BPS       20
-VALUE  USR-Initial-Rx-Link-Data-Rate           28800-BPS       21
-VALUE  USR-Initial-Rx-Link-Data-Rate           115200-BPS      22
-VALUE  USR-Initial-Rx-Link-Data-Rate           31200-BPS       23
-VALUE  USR-Initial-Rx-Link-Data-Rate           33600-BPS       24
-VALUE  USR-Initial-Rx-Link-Data-Rate           25333-BPS       25
-VALUE  USR-Initial-Rx-Link-Data-Rate           26666-BPS       26
-VALUE  USR-Initial-Rx-Link-Data-Rate           28000-BPS       27
-VALUE  USR-Initial-Rx-Link-Data-Rate           29333-BPS       28
-VALUE  USR-Initial-Rx-Link-Data-Rate           30666-BPS       29
-VALUE  USR-Initial-Rx-Link-Data-Rate           32000-BPS       30
-VALUE  USR-Initial-Rx-Link-Data-Rate           33333-BPS       31
-VALUE  USR-Initial-Rx-Link-Data-Rate           34666-BPS       32
-VALUE  USR-Initial-Rx-Link-Data-Rate           36000-BPS       33
-VALUE  USR-Initial-Rx-Link-Data-Rate           37333-BPS       34
-VALUE  USR-Initial-Rx-Link-Data-Rate           38666-BPS       35
-VALUE  USR-Initial-Rx-Link-Data-Rate           40000-BPS       36
-VALUE  USR-Initial-Rx-Link-Data-Rate           41333-BPS       37
-VALUE  USR-Initial-Rx-Link-Data-Rate           42666-BPS       38
-VALUE  USR-Initial-Rx-Link-Data-Rate           44000-BPS       39
-VALUE  USR-Initial-Rx-Link-Data-Rate           45333-BPS       40
-VALUE  USR-Initial-Rx-Link-Data-Rate           46666-BPS       41
-VALUE  USR-Initial-Rx-Link-Data-Rate           48000-BPS       42      
-VALUE  USR-Initial-Rx-Link-Data-Rate           49333-BPS       43      
-VALUE  USR-Initial-Rx-Link-Data-Rate           50666-BPS       44
-VALUE  USR-Initial-Rx-Link-Data-Rate           52000-BPS       45      
-VALUE  USR-Initial-Rx-Link-Data-Rate           53333-BPS       46      
-VALUE  USR-Initial-Rx-Link-Data-Rate           54666-BPS       47      
-VALUE  USR-Initial-Rx-Link-Data-Rate           56000-BPS       48      
-VALUE  USR-Initial-Rx-Link-Data-Rate           57333-BPS       49      
-VALUE  USR-Initial-Rx-Link-Data-Rate           58666-BPS       50      
-VALUE  USR-Initial-Rx-Link-Data-Rate           60000-BPS       51      
-VALUE  USR-Initial-Rx-Link-Data-Rate           61333-BPS       52      
-VALUE  USR-Initial-Rx-Link-Data-Rate           62666-BPS       53      
-VALUE  USR-Initial-Rx-Link-Data-Rate           64000-BPS       54      
-
-
-
-VALUE  USR-Final-Rx-Link-Data-Rate             110-BPS         1
-VALUE  USR-Final-Rx-Link-Data-Rate             300-BPS         2
-VALUE  USR-Final-Rx-Link-Data-Rate             600-BPS         3
-VALUE  USR-Final-Rx-Link-Data-Rate             1200-BPS        4
-VALUE  USR-Final-Rx-Link-Data-Rate             2400-BPS        5
-VALUE  USR-Final-Rx-Link-Data-Rate             4800-BPS        6
-VALUE  USR-Final-Rx-Link-Data-Rate             7200-BPS        7
-VALUE  USR-Final-Rx-Link-Data-Rate             9600-BPS        8
-VALUE  USR-Final-Rx-Link-Data-Rate             12000-BPS       9
-VALUE  USR-Final-Rx-Link-Data-Rate             14400-BPS       10
-VALUE  USR-Final-Rx-Link-Data-Rate             16800-BPS       11
-VALUE  USR-Final-Rx-Link-Data-Rate             19200-BPS       12
-VALUE  USR-Final-Rx-Link-Data-Rate             38400-BPS       13
-VALUE  USR-Final-Rx-Link-Data-Rate             75-BPS          14
-VALUE  USR-Final-Rx-Link-Data-Rate             450-BPS         15
-VALUE  USR-Final-Rx-Link-Data-Rate             UNKNOWN-BPS     16
-VALUE  USR-Final-Rx-Link-Data-Rate             57600-BPS       17
-VALUE  USR-Final-Rx-Link-Data-Rate             21600-BPS       18
-VALUE  USR-Final-Rx-Link-Data-Rate             24000-BPS       19
-VALUE  USR-Final-Rx-Link-Data-Rate             26400-BPS       20
-VALUE  USR-Final-Rx-Link-Data-Rate             28800-BPS       21
-VALUE  USR-Final-Rx-Link-Data-Rate             115200-BPS      22
-VALUE  USR-Final-Rx-Link-Data-Rate             31200-BPS       23
-VALUE  USR-Final-Rx-Link-Data-Rate             33600-BPS       24
-VALUE  USR-Final-Rx-Link-Data-Rate             25333-BPS       25
-VALUE  USR-Final-Rx-Link-Data-Rate             26666-BPS       26
-VALUE  USR-Final-Rx-Link-Data-Rate             28000-BPS       27
-VALUE  USR-Final-Rx-Link-Data-Rate             29333-BPS       28
-VALUE  USR-Final-Rx-Link-Data-Rate             30666-BPS       29
-VALUE  USR-Final-Rx-Link-Data-Rate             32000-BPS       30
-VALUE  USR-Final-Rx-Link-Data-Rate             33333-BPS       31
-VALUE  USR-Final-Rx-Link-Data-Rate             34666-BPS       32
-VALUE  USR-Final-Rx-Link-Data-Rate             36000-BPS       33
-VALUE  USR-Final-Rx-Link-Data-Rate             37333-BPS       34
-VALUE  USR-Final-Rx-Link-Data-Rate             38666-BPS       35
-VALUE  USR-Final-Rx-Link-Data-Rate             40000-BPS       36
-VALUE  USR-Final-Rx-Link-Data-Rate             41333-BPS       37
-VALUE  USR-Final-Rx-Link-Data-Rate             42666-BPS       38
-VALUE  USR-Final-Rx-Link-Data-Rate             44000-BPS       39
-VALUE  USR-Final-Rx-Link-Data-Rate             45333-BPS       40
-VALUE  USR-Final-Rx-Link-Data-Rate             46666-BPS       41
-VALUE  USR-Final-Rx-Link-Data-Rate             48000-BPS       42      
-VALUE  USR-Final-Rx-Link-Data-Rate             49333-BPS       43      
-VALUE  USR-Final-Rx-Link-Data-Rate             50666-BPS       44
-VALUE  USR-Final-Rx-Link-Data-Rate             52000-BPS       45      
-VALUE  USR-Final-Rx-Link-Data-Rate             53333-BPS       46      
-VALUE  USR-Final-Rx-Link-Data-Rate             54666-BPS       47      
-VALUE  USR-Final-Rx-Link-Data-Rate             56000-BPS       48      
-VALUE  USR-Final-Rx-Link-Data-Rate             57333-BPS       49      
-VALUE  USR-Final-Rx-Link-Data-Rate             58666-BPS       50      
-VALUE  USR-Final-Rx-Link-Data-Rate             60000-BPS       51      
-VALUE  USR-Final-Rx-Link-Data-Rate             61333-BPS       52      
-VALUE  USR-Final-Rx-Link-Data-Rate             62666-BPS       53      
-VALUE  USR-Final-Rx-Link-Data-Rate             64000-BPS       54      
-
-
-VALUE  USR-Initial-Tx-Link-Data-Rate           110-BPS         1
-VALUE  USR-Initial-Tx-Link-Data-Rate           300-BPS         2
-VALUE  USR-Initial-Tx-Link-Data-Rate           600-BPS         3
-VALUE  USR-Initial-Tx-Link-Data-Rate           1200-BPS        4
-VALUE  USR-Initial-Tx-Link-Data-Rate           2400-BPS        5
-VALUE  USR-Initial-Tx-Link-Data-Rate           4800-BPS        6
-VALUE  USR-Initial-Tx-Link-Data-Rate           7200-BPS        7
-VALUE  USR-Initial-Tx-Link-Data-Rate           9600-BPS        8
-VALUE  USR-Initial-Tx-Link-Data-Rate           12000-BPS       9
-VALUE  USR-Initial-Tx-Link-Data-Rate           14400-BPS       10
-VALUE  USR-Initial-Tx-Link-Data-Rate           16800-BPS       11
-VALUE  USR-Initial-Tx-Link-Data-Rate           19200-BPS       12
-VALUE  USR-Initial-Tx-Link-Data-Rate           38400-BPS       13
-VALUE  USR-Initial-Tx-Link-Data-Rate           75-BPS          14
-VALUE  USR-Initial-Tx-Link-Data-Rate           450-BPS         15
-VALUE  USR-Initial-Tx-Link-Data-Rate           UNKNOWN-BPS     16
-VALUE  USR-Initial-Tx-Link-Data-Rate           57600-BPS       17
-VALUE  USR-Initial-Tx-Link-Data-Rate           21600-BPS       18
-VALUE  USR-Initial-Tx-Link-Data-Rate           24000-BPS       19
-VALUE  USR-Initial-Tx-Link-Data-Rate           26400-BPS       20
-VALUE  USR-Initial-Tx-Link-Data-Rate           28800-BPS       21
-VALUE  USR-Initial-Tx-Link-Data-Rate           115200-BPS      22
-VALUE  USR-Initial-Tx-Link-Data-Rate           31200-BPS       23
-VALUE  USR-Initial-Tx-Link-Data-Rate           33600-BPS       24
-VALUE  USR-Initial-Tx-Link-Data-Rate           25333-BPS       25
-VALUE  USR-Initial-Tx-Link-Data-Rate           26666-BPS       26
-VALUE  USR-Initial-Tx-Link-Data-Rate           28000-BPS       27
-VALUE  USR-Initial-Tx-Link-Data-Rate           29333-BPS       28
-VALUE  USR-Initial-Tx-Link-Data-Rate           30666-BPS       29
-VALUE  USR-Initial-Tx-Link-Data-Rate           32000-BPS       30
-VALUE  USR-Initial-Tx-Link-Data-Rate           33333-BPS       31
-VALUE  USR-Initial-Tx-Link-Data-Rate           34666-BPS       32
-VALUE  USR-Initial-Tx-Link-Data-Rate           36000-BPS       33
-VALUE  USR-Initial-Tx-Link-Data-Rate           37333-BPS       34
-VALUE  USR-Initial-Tx-Link-Data-Rate           38666-BPS       35
-VALUE  USR-Initial-Tx-Link-Data-Rate           40000-BPS       36
-VALUE  USR-Initial-Tx-Link-Data-Rate           41333-BPS       37
-VALUE  USR-Initial-Tx-Link-Data-Rate           42666-BPS       38
-VALUE  USR-Initial-Tx-Link-Data-Rate           44000-BPS       39
-VALUE  USR-Initial-Tx-Link-Data-Rate           45333-BPS       40
-VALUE  USR-Initial-Tx-Link-Data-Rate           46666-BPS       41
-VALUE  USR-Initial-Tx-Link-Data-Rate           48000-BPS       42      
-VALUE  USR-Initial-Tx-Link-Data-Rate           49333-BPS       43      
-VALUE  USR-Initial-Tx-Link-Data-Rate           50666-BPS       44
-VALUE  USR-Initial-Tx-Link-Data-Rate           52000-BPS       45      
-VALUE  USR-Initial-Tx-Link-Data-Rate           53333-BPS       46      
-VALUE  USR-Initial-Tx-Link-Data-Rate           54666-BPS       47      
-VALUE  USR-Initial-Tx-Link-Data-Rate           56000-BPS       48      
-VALUE  USR-Initial-Tx-Link-Data-Rate           57333-BPS       49      
-VALUE  USR-Initial-Tx-Link-Data-Rate           58666-BPS       50      
-VALUE  USR-Initial-Tx-Link-Data-Rate           60000-BPS       51      
-VALUE  USR-Initial-Tx-Link-Data-Rate           61333-BPS       52      
-VALUE  USR-Initial-Tx-Link-Data-Rate           62666-BPS       53      
-VALUE  USR-Initial-Tx-Link-Data-Rate           64000-BPS       54      
-
-
-
-VALUE  USR-Final-Tx-Link-Data-Rate             110-BPS         1
-VALUE  USR-Final-Tx-Link-Data-Rate             300-BPS         2
-VALUE  USR-Final-Tx-Link-Data-Rate             600-BPS         3
-VALUE  USR-Final-Tx-Link-Data-Rate             1200-BPS        4
-VALUE  USR-Final-Tx-Link-Data-Rate             2400-BPS        5
-VALUE  USR-Final-Tx-Link-Data-Rate             4800-BPS        6
-VALUE  USR-Final-Tx-Link-Data-Rate             7200-BPS        7
-VALUE  USR-Final-Tx-Link-Data-Rate             9600-BPS        8
-VALUE  USR-Final-Tx-Link-Data-Rate             12000-BPS       9
-VALUE  USR-Final-Tx-Link-Data-Rate             14400-BPS       10
-VALUE  USR-Final-Tx-Link-Data-Rate             16800-BPS       11
-VALUE  USR-Final-Tx-Link-Data-Rate             19200-BPS       12
-VALUE  USR-Final-Tx-Link-Data-Rate             38400-BPS       13
-VALUE  USR-Final-Tx-Link-Data-Rate             75-BPS          14
-VALUE  USR-Final-Tx-Link-Data-Rate             450-BPS         15
-VALUE  USR-Final-Tx-Link-Data-Rate             UNKNOWN-BPS     16
-VALUE  USR-Final-Tx-Link-Data-Rate             57600-BPS       17
-VALUE  USR-Final-Tx-Link-Data-Rate             21600-BPS       18
-VALUE  USR-Final-Tx-Link-Data-Rate             24000-BPS       19
-VALUE  USR-Final-Tx-Link-Data-Rate             26400-BPS       20
-VALUE  USR-Final-Tx-Link-Data-Rate             28800-BPS       21
-VALUE  USR-Final-Tx-Link-Data-Rate             115200-BPS      22
-VALUE  USR-Final-Tx-Link-Data-Rate             31200-BPS       23
-VALUE  USR-Final-Tx-Link-Data-Rate             33600-BPS       24
-VALUE  USR-Final-Tx-Link-Data-Rate             25333-BPS       25
-VALUE  USR-Final-Tx-Link-Data-Rate             26666-BPS       26
-VALUE  USR-Final-Tx-Link-Data-Rate             28000-BPS       27
-VALUE  USR-Final-Tx-Link-Data-Rate             29333-BPS       28
-VALUE  USR-Final-Tx-Link-Data-Rate             30666-BPS       29
-VALUE  USR-Final-Tx-Link-Data-Rate             32000-BPS       30
-VALUE  USR-Final-Tx-Link-Data-Rate             33333-BPS       31
-VALUE  USR-Final-Tx-Link-Data-Rate             34666-BPS       32
-VALUE  USR-Final-Tx-Link-Data-Rate             36000-BPS       33
-VALUE  USR-Final-Tx-Link-Data-Rate             37333-BPS       34
-VALUE  USR-Final-Tx-Link-Data-Rate             38666-BPS       35
-VALUE  USR-Final-Tx-Link-Data-Rate             40000-BPS       36
-VALUE  USR-Final-Tx-Link-Data-Rate             41333-BPS       37
-VALUE  USR-Final-Tx-Link-Data-Rate             42666-BPS       38
-VALUE  USR-Final-Tx-Link-Data-Rate             44000-BPS       39
-VALUE  USR-Final-Tx-Link-Data-Rate             45333-BPS       40
-VALUE  USR-Final-Tx-Link-Data-Rate             46666-BPS       41
-VALUE  USR-Final-Tx-Link-Data-Rate             48000-BPS       42      
-VALUE  USR-Final-Tx-Link-Data-Rate             49333-BPS       43      
-VALUE  USR-Final-Tx-Link-Data-Rate             50666-BPS       44
-VALUE  USR-Final-Tx-Link-Data-Rate             52000-BPS       45      
-VALUE  USR-Final-Tx-Link-Data-Rate             53333-BPS       46      
-VALUE  USR-Final-Tx-Link-Data-Rate             54666-BPS       47      
-VALUE  USR-Final-Tx-Link-Data-Rate             56000-BPS       48      
-VALUE  USR-Final-Tx-Link-Data-Rate             57333-BPS       49      
-VALUE  USR-Final-Tx-Link-Data-Rate             58666-BPS       50      
-VALUE  USR-Final-Tx-Link-Data-Rate             60000-BPS       51      
-VALUE  USR-Final-Tx-Link-Data-Rate             61333-BPS       52      
-VALUE  USR-Final-Tx-Link-Data-Rate             62666-BPS       53      
-VALUE  USR-Final-Tx-Link-Data-Rate             64000-BPS       54      
-
-VALUE   USR-Connect-Speed       NONE            1 
-VALUE   USR-Connect-Speed       300-BPS         2 
-VALUE   USR-Connect-Speed       1200-BPS        3 
-VALUE   USR-Connect-Speed       2400-BPS        4 
-VALUE   USR-Connect-Speed       4800-BPS        5 
-VALUE   USR-Connect-Speed       7200-BPS        6 
-VALUE   USR-Connect-Speed       9600-BPS        7 
-VALUE   USR-Connect-Speed       12000-BPS       8 
-VALUE   USR-Connect-Speed       14400-BPS       9 
-VALUE   USR-Connect-Speed       16800-BPS       10
-VALUE   USR-Connect-Speed       19200-BPS       11
-VALUE   USR-Connect-Speed       21600-BPS       12
-VALUE   USR-Connect-Speed       28800-BPS       13
-VALUE   USR-Connect-Speed       38400-BPS       14
-VALUE   USR-Connect-Speed       57600-BPS       15
-VALUE   USR-Connect-Speed       115200-BPS      16
-VALUE   USR-Connect-Speed       288000-BPS      17
-VALUE   USR-Connect-Speed       75-1200-BPS     18
-VALUE   USR-Connect-Speed       1200-75-BPS     19
-VALUE   USR-Connect-Speed       24000-BPS       20
-VALUE   USR-Connect-Speed       26400-BPS       21
-VALUE   USR-Connect-Speed       31200-BPS       22
-VALUE   USR-Connect-Speed       33600-BPS       23
-VALUE   USR-Connect-Speed       33333-BPS       24
-VALUE   USR-Connect-Speed       37333-BPS       25
-VALUE   USR-Connect-Speed       41333-BPS       26
-VALUE   USR-Connect-Speed       42666-BPS       27
-VALUE   USR-Connect-Speed       44000-BPS       28
-VALUE   USR-Connect-Speed       45333-BPS       29
-VALUE   USR-Connect-Speed       46666-BPS       30
-VALUE   USR-Connect-Speed       48000-BPS       31
-VALUE   USR-Connect-Speed       49333-BPS       32
-VALUE   USR-Connect-Speed       50666-BPS       33
-VALUE   USR-Connect-Speed       52000-BPS       34
-VALUE   USR-Connect-Speed       53333-BPS       35
-VALUE   USR-Connect-Speed       54666-BPS       36
-VALUE   USR-Connect-Speed       56000-BPS       37
-VALUE   USR-Connect-Speed       57333-BPS       38
-VALUE   USR-Connect-Speed       64000-BPS       39
-VALUE   USR-Connect-Speed       25333-BPS       40
-VALUE   USR-Connect-Speed       26666-BPS       41
-VALUE   USR-Connect-Speed       28000-BPS       42
-VALUE   USR-Connect-Speed       29333-BPS       43
-VALUE   USR-Connect-Speed       30666-BPS       44
-VALUE   USR-Connect-Speed       32000-BPS       45
-VALUE   USR-Connect-Speed       34666-BPS       46
-VALUE   USR-Connect-Speed       36000-BPS       47
-VALUE   USR-Connect-Speed       38666-BPS       48
-VALUE   USR-Connect-Speed       40000-BPS       49
-VALUE   USR-Connect-Speed       58666-BPS       50
-VALUE   USR-Connect-Speed       60000-BPS       51
-VALUE   USR-Connect-Speed       61333-BPS       52
-VALUE   USR-Connect-Speed       62666-BPS       53
-
-VALUE  USR-Sync-Async-Mode             Asynchronous                    1
-VALUE  USR-Sync-Async-Mode             Synchronous                     2
-
-VALUE  USR-Originate-Answer-Mode       Originate_in_Originate_Mode     1
-VALUE  USR-Originate-Answer-Mode       Originate_in_Answer_Mode        2
-VALUE  USR-Originate-Answer-Mode       Answer_in_Originate_Mode        3
-VALUE  USR-Originate-Answer-Mode       Answer_in_Answer_Mode           4
-
-VALUE  USR-Modulation-Type             usRoboticsHST                   1
-VALUE  USR-Modulation-Type             ccittV32                        2
-VALUE  USR-Modulation-Type             ccittV22bis                     3
-VALUE  USR-Modulation-Type             bell103                         4
-VALUE  USR-Modulation-Type             ccittV21                        5
-VALUE  USR-Modulation-Type             bell212                         6
-VALUE  USR-Modulation-Type             ccittV32bis                     7
-VALUE  USR-Modulation-Type             ccittV23                        8
-VALUE  USR-Modulation-Type             negotiationFailed               9
-VALUE  USR-Modulation-Type             bell208b                        10
-VALUE  USR-Modulation-Type             v21FaxClass1                    11
-VALUE  USR-Modulation-Type             v27FaxClass1                    12
-VALUE  USR-Modulation-Type             v29FaxClass1                    13
-VALUE  USR-Modulation-Type             v17FaxClass1                    14
-VALUE  USR-Modulation-Type             v21FaxClass2                    15
-VALUE  USR-Modulation-Type             v27FaxClass2                    16
-VALUE  USR-Modulation-Type             v29FaxClass2                    17
-VALUE  USR-Modulation-Type             v17FaxClass2                    18
-VALUE  USR-Modulation-Type             v32Terbo                        19
-VALUE  USR-Modulation-Type             v34                             20
-VALUE  USR-Modulation-Type             vFC                             21
-VALUE  USR-Modulation-Type             v34plus                         22
-VALUE  USR-Modulation-Type             x2                              23
-VALUE  USR-Modulation-Type             v110                            24
-VALUE  USR-Modulation-Type             v120                            25
-VALUE  USR-Modulation-Type             x75                             26
-VALUE  USR-Modulation-Type             asyncSyncPPP                    27
-VALUE  USR-Modulation-Type             clearChannel                    28
-VALUE  USR-Modulation-Type             x2client                        29
-VALUE  USR-Modulation-Type             x2symmetric                     30
-VALUE  USR-Modulation-Type             piafs                           31
-VALUE  USR-Modulation-Type             x2version2                      32
-VALUE  USR-Modulation-Type             v90Analog                       33
-VALUE  USR-Modulation-Type             v90Digital                      34
-VALUE  USR-Modulation-Type             v90AllDigital                   35
-
-VALUE  Initial-Modulation-Type         usRoboticsHST                   1
-VALUE  Initial-Modulation-Type         ccittV32                        2
-VALUE  Initial-Modulation-Type         ccittV22bis                     3
-VALUE  Initial-Modulation-Type         bell103                         4
-VALUE  Initial-Modulation-Type         ccittV21                        5
-VALUE  Initial-Modulation-Type         bell212                         6
-VALUE  Initial-Modulation-Type         ccittV32bis                     7
-VALUE  Initial-Modulation-Type         ccittV23                        8
-VALUE  Initial-Modulation-Type         negotiationFailed               9
-VALUE  Initial-Modulation-Type         bell208b                        10
-VALUE  Initial-Modulation-Type         v21FaxClass1                    11
-VALUE  Initial-Modulation-Type         v27FaxClass1                    12
-VALUE  Initial-Modulation-Type         v29FaxClass1                    13
-VALUE  Initial-Modulation-Type         v17FaxClass1                    14
-VALUE  Initial-Modulation-Type         v21FaxClass2                    15
-VALUE  Initial-Modulation-Type         v27FaxClass2                    16
-VALUE  Initial-Modulation-Type         v29FaxClass2                    17
-VALUE  Initial-Modulation-Type         v17FaxClass2                    18
-VALUE  Initial-Modulation-Type         v32Terbo                        19
-VALUE  Initial-Modulation-Type         v34                             20
-VALUE  Initial-Modulation-Type         vFC                             21
-VALUE  Initial-Modulation-Type         v34plus                         22
-VALUE  Initial-Modulation-Type         x2                              23
-VALUE  Initial-Modulation-Type         v110                            24
-VALUE  Initial-Modulation-Type         v120                            25
-VALUE  Initial-Modulation-Type         x75                             26
-VALUE  Initial-Modulation-Type         asyncSyncPPP                    27
-VALUE  Initial-Modulation-Type         clearChannel                    28
-VALUE  Initial-Modulation-Type         x2client                        29
-VALUE  Initial-Modulation-Type         x2symmetric                     30
-VALUE  Initial-Modulation-Type         piafs                           31
-VALUE  Initial-Modulation-Type         x2version2                      32
-VALUE  Initial-Modulation-Type         v90Analogue                     33
-VALUE  Initial-Modulation-Type         v90Digital                      34
-VALUE  Initial-Modulation-Type         v90AllDigital                   35
-
-VALUE  USR-Connect-Term-Reason dtrDrop                         1
-VALUE  USR-Connect-Term-Reason escapeSequence                  2
-VALUE  USR-Connect-Term-Reason athCommand                      3
-VALUE  USR-Connect-Term-Reason carrierLoss                     4
-VALUE  USR-Connect-Term-Reason inactivityTimout                5
-VALUE  USR-Connect-Term-Reason mnpIncompatible                 6
-VALUE  USR-Connect-Term-Reason undefined                       7
-VALUE  USR-Connect-Term-Reason remotePassword                  8
-VALUE  USR-Connect-Term-Reason linkPassword                    9
-VALUE  USR-Connect-Term-Reason retransmitLimit                 10
-VALUE  USR-Connect-Term-Reason linkDisconnectMsgReceived       11
-VALUE  USR-Connect-Term-Reason noLoopCurrent                   12
-VALUE  USR-Connect-Term-Reason invalidSpeed                    13
-VALUE  USR-Connect-Term-Reason unableToRetrain                 14
-VALUE  USR-Connect-Term-Reason managementCommand               15
-VALUE  USR-Connect-Term-Reason noDialTone                      16
-VALUE  USR-Connect-Term-Reason keyAbort                        17
-VALUE  USR-Connect-Term-Reason lineBusy                        18
-VALUE  USR-Connect-Term-Reason noAnswer                        19
-VALUE  USR-Connect-Term-Reason voice                           20
-VALUE  USR-Connect-Term-Reason noAnswerTone                    21
-VALUE  USR-Connect-Term-Reason noCarrier                       22
-VALUE  USR-Connect-Term-Reason undetermined                    23
-VALUE  USR-Connect-Term-Reason v42SabmeTimeout                 24
-VALUE  USR-Connect-Term-Reason v42BreakTimeout                 25
-VALUE  USR-Connect-Term-Reason v42DisconnectCmd                26
-VALUE  USR-Connect-Term-Reason v42IdExchangeFail               27
-VALUE  USR-Connect-Term-Reason v42BadSetup                     28
-VALUE  USR-Connect-Term-Reason v42InvalidCodeWord              29
-VALUE  USR-Connect-Term-Reason v42StringToLong                 30
-VALUE  USR-Connect-Term-Reason v42InvalidCommand               31
-VALUE  USR-Connect-Term-Reason none                            32      
-VALUE  USR-Connect-Term-Reason v32Cleardown                    33
-VALUE  USR-Connect-Term-Reason dialSecurity                    34
-VALUE  USR-Connect-Term-Reason remoteAccessDenied              35
-VALUE  USR-Connect-Term-Reason loopLoss                        36
-VALUE  USR-Connect-Term-Reason ds0Teardown                     37
-VALUE  USR-Connect-Term-Reason promptNotEnabled                38
-VALUE  USR-Connect-Term-Reason noPromptingInSync               39
-VALUE  USR-Connect-Term-Reason nonArqMode                      40
-VALUE  USR-Connect-Term-Reason modeIncompatible                41
-VALUE  USR-Connect-Term-Reason noPromptInNonARQ                42
-VALUE  USR-Connect-Term-Reason dialBackLink                    43
-VALUE  USR-Connect-Term-Reason linkAbort                       44
-VALUE  USR-Connect-Term-Reason autopassFailed                  45
-VALUE  USR-Connect-Term-Reason pbGenericError                  46
-VALUE  USR-Connect-Term-Reason pbLinkErrTxPreAck               47
-VALUE  USR-Connect-Term-Reason pbLinkErrTxTardyACK             48
-VALUE  USR-Connect-Term-Reason pbTransmitBusTimeout            49
-VALUE  USR-Connect-Term-Reason pbReceiveBusTimeout             50
-VALUE  USR-Connect-Term-Reason pbLinkErrTxTAL                  51
-VALUE  USR-Connect-Term-Reason pbLinkErrRxTAL                  52
-VALUE  USR-Connect-Term-Reason pbTransmitMasterTimeout         53
-VALUE  USR-Connect-Term-Reason pbClockMissing                  54
-VALUE  USR-Connect-Term-Reason pbReceivedLsWhileLinkUp         55
-VALUE  USR-Connect-Term-Reason pbOutOfSequenceFrame            56
-VALUE  USR-Connect-Term-Reason pbBadFrame                      57
-VALUE  USR-Connect-Term-Reason pbAckWaitTimeout                58
-VALUE  USR-Connect-Term-Reason pbReceivedAckSeqErr             59
-VALUE  USR-Connect-Term-Reason pbReceiveOvrflwRNRFail          60
-VALUE  USR-Connect-Term-Reason pbReceiveMsgBufOvrflw           61
-VALUE  USR-Connect-Term-Reason rcvdGatewayDiscCmd              62
-VALUE  USR-Connect-Term-Reason tokenPassingTimeout             63
-VALUE  USR-Connect-Term-Reason dspInterruptTimeout             64
-VALUE  USR-Connect-Term-Reason mnpProtocolViolation            65
-VALUE  USR-Connect-Term-Reason class2FaxHangupCmd              66
-VALUE  USR-Connect-Term-Reason hstSpeedSwitchTimeout           67
-VALUE   USR-Connect-Term-Reason        tooManyUnacked          68
-VALUE   USR-Connect-Term-Reason        timerExpired            69
-VALUE   USR-Connect-Term-Reason        t1Glare         70
-VALUE   USR-Connect-Term-Reason        priDialoutRqTimeout             71
-VALUE   USR-Connect-Term-Reason        abortAnlgDstOvrIsdn             72
-VALUE   USR-Connect-Term-Reason        normalUserCallClear             73
-VALUE   USR-Connect-Term-Reason        normalUnspecified               74
-VALUE   USR-Connect-Term-Reason        bearerIncompatibility           75
-VALUE   USR-Connect-Term-Reason        protocolErrorEvent              76
-VALUE   USR-Connect-Term-Reason        abnormalDisconnect              77
-VALUE   USR-Connect-Term-Reason        invalidCauseValue               78
-VALUE   USR-Connect-Term-Reason        resourceUnavailable             79
-VALUE   USR-Connect-Term-Reason        remoteHungUpDuringTraining              80
-VALUE   USR-Connect-Term-Reason        trainingTimeout         81
-VALUE   USR-Connect-Term-Reason        incomingModemNotAvailable               82
-VALUE   USR-Connect-Term-Reason        incomingInvalidBearerCap                83
-VALUE   USR-Connect-Term-Reason        incomingInvalidChannelID                84
-VALUE   USR-Connect-Term-Reason        incomingInvalidProgInd          85
-VALUE   USR-Connect-Term-Reason        incomingInvalidCallingPty               86
-VALUE   USR-Connect-Term-Reason        incomingInvalidCalledPty                87
-VALUE   USR-Connect-Term-Reason        incomingCallBlock               88
-VALUE   USR-Connect-Term-Reason        incomingLoopStNoRingOff         89
-VALUE   USR-Connect-Term-Reason        outgoingTelcoDisconnect         90
-VALUE   USR-Connect-Term-Reason        outgoingEMWinkTimeout           91
-VALUE   USR-Connect-Term-Reason        outgoingEMWinkTooShort          92
-VALUE   USR-Connect-Term-Reason        outgoingNoChannelAvail          93
-VALUE   USR-Connect-Term-Reason        dspReboot               94
-VALUE   USR-Connect-Term-Reason        noDSPRespToKA           95
-VALUE   USR-Connect-Term-Reason        noDSPRespToDisc         96
-VALUE   USR-Connect-Term-Reason        dspTailPtrInvalid               97
-VALUE   USR-Connect-Term-Reason        dspHeadPtrInvalid               98
+VALUE  USR-Event-Id                    Module-Inserted         6
+VALUE  USR-Event-Id                    Module-Removed          7
+VALUE  USR-Event-Id                    PSU-Voltage-Alarm       8
+VALUE  USR-Event-Id                    PSU-Failed              9
+VALUE  USR-Event-Id                    HUB-Temp-Out-of-Range   10
+VALUE  USR-Event-Id                    Fan-Failed              11
+VALUE  USR-Event-Id                    Watchdog-Timeout        12
+VALUE  USR-Event-Id                    Mgmt-Bus-Failure        13
+VALUE  USR-Event-Id                    In-Connection-Est       14
+VALUE  USR-Event-Id                    Out-Connection-Est      15
+VALUE  USR-Event-Id                    In-Connection-Term      16
+VALUE  USR-Event-Id                    Out-Connection-Term     17
+VALUE  USR-Event-Id                    Connection-Failed       18
+VALUE  USR-Event-Id                    Connection-Timeout      19
+VALUE  USR-Event-Id                    DTE-Transmit-Idle       20
+VALUE  USR-Event-Id                    DTR-True                21
+VALUE  USR-Event-Id                    DTR-False               22
+VALUE  USR-Event-Id                    Block-Error-at-Threshold 23
+VALUE  USR-Event-Id                    Fallbacks-at-Threshold  24
+VALUE  USR-Event-Id                    No-Dial-Tone-Detected   25
+VALUE  USR-Event-Id                    No-Loop-Current-Detected 26
+VALUE  USR-Event-Id                    Yellow-Alarm            27
+VALUE  USR-Event-Id                    Red-Alarm               28
+VALUE  USR-Event-Id                    Loss-Of-Signal          29
+VALUE  USR-Event-Id                    Rcv-Alrm-Ind-Signal     30
+VALUE  USR-Event-Id                    Timing-Source-Switch    31
+VALUE  USR-Event-Id                    Modem-Reset-by-DTE      32
+VALUE  USR-Event-Id                    Modem-Ring-No-Answer    33
+VALUE  USR-Event-Id                    DTE-Ring-No-Answer      34
+VALUE  USR-Event-Id                    Pkt-Bus-Session-Active  35
+VALUE  USR-Event-Id                    Pkt-Bus-Session-Congestion 36
+VALUE  USR-Event-Id                    Pkt-Bus-Session-Lost    37
+VALUE  USR-Event-Id                    Pkt-Bus-Session-Inactive 38
+VALUE  USR-Event-Id                    User-Interface-Reset    39
+VALUE  USR-Event-Id                    Gateway-Port-Out-of-Service 40
+VALUE  USR-Event-Id                    Gateway-Port-Link-Active 41
+VALUE  USR-Event-Id                    Dial-Out-Login-Failure  42
+VALUE  USR-Event-Id                    Dial-In-Login-Failure   43
+VALUE  USR-Event-Id                    Dial-Out-Restricted-Number 44
+VALUE  USR-Event-Id                    Dial-Back-Restricted-Number 45
+VALUE  USR-Event-Id                    User-Blacklisted        46
+VALUE  USR-Event-Id                    Attempted-Login-Blacklisted 47
+VALUE  USR-Event-Id                    Response-Attempt-Limit-Exceeded 48
+VALUE  USR-Event-Id                    Login-Attempt-Limit-Exceeded 49
+VALUE  USR-Event-Id                    Dial-Out-Call-Duration  50
+VALUE  USR-Event-Id                    Dial-In-Call-Duration   51
+VALUE  USR-Event-Id                    Pkt-Bus-Session-Err-Status 52
+VALUE  USR-Event-Id                    NMC-AutoRespnse-Trap    53
+VALUE  USR-Event-Id                    Acct-Server-Contact-Loss 54
+VALUE  USR-Event-Id                    Yellow-Alarm-Clear      55
+VALUE  USR-Event-Id                    Red-Alarm-Clear         56
+VALUE  USR-Event-Id                    Loss-Of-Signal-Clear    57
+VALUE  USR-Event-Id                    Rcv-Alrm-Ind-Signal-Clear 58
+VALUE  USR-Event-Id                    Incoming-Connection-Established 59
+VALUE  USR-Event-Id                    Outgoing-Connection-Established 60
+VALUE  USR-Event-Id                    Incoming-Connection-Terminated 61
+VALUE  USR-Event-Id                    Outgoing-Connection-Terminated 62
+VALUE  USR-Event-Id                    Connection-Attempt-Failure 63
+VALUE  USR-Event-Id                    Continuous-CRC-Alarm    64
+VALUE  USR-Event-Id                    Continuous-CRC-Alarm-Clear 65
+VALUE  USR-Event-Id                    Physical-State-Change   66
+VALUE  USR-Event-Id                    Gateway-Network-Failed  71
+VALUE  USR-Event-Id                    Gateway-Network-Restored 72
+VALUE  USR-Event-Id                    Packet-Bus-Clock-Lost   73
+VALUE  USR-Event-Id                    Packet-Bus-Clock-Restored 74
+VALUE  USR-Event-Id                    D-Channel-In-Service    75
+VALUE  USR-Event-Id                    D-Channel-Out-of-Service 76
+VALUE  USR-Event-Id                    DS0s-In-Service         77
+VALUE  USR-Event-Id                    DS0s-Out-of-Service     78
+VALUE  USR-Event-Id                    T1/T1PRI/E1PRI-Call-Event 79
+VALUE  USR-Event-Id                    Psu-Incompatible        80
+VALUE  USR-Event-Id                    T1,T1-E1/PRI-Call-Arrive-Event 81
+VALUE  USR-Event-Id                    T1,T1-E1/PRI-Call-Connect-Event 82
+VALUE  USR-Event-Id                    T1,T1-E1/PRI-Call-Termina-Event 83
+VALUE  USR-Event-Id                    T1,T1-E1/PRI-Call-Failed-Event 84
+VALUE  USR-Event-Id                    DNS-Contact-Lost        85
+VALUE  USR-Event-Id                    NTP-Contact-Lost        86
+VALUE  USR-Event-Id                    NTP-Contact-Restored    87
+VALUE  USR-Event-Id                    IPGW-Link-Up            88
+VALUE  USR-Event-Id                    IPGW-Link-Down          89
+VALUE  USR-Event-Id                    NTP-Contact-Degraded    90
+VALUE  USR-Event-Id                    In-Connection-Failed    91
+VALUE  USR-Event-Id                    Out-Connection-Failed   92
+VALUE  USR-Event-Id                    Application-ProcessorReset 93
+VALUE  USR-Event-Id                    DSP-Reset               94
+VALUE  USR-Event-Id                    Changed-to-Maint-Srvs-State 95
+VALUE  USR-Event-Id                    Loop-Back-cleared-on-channel 96
+VALUE  USR-Event-Id                    Loop-Back-on-channel    97
+VALUE  USR-Event-Id                    Telco-Abnormal-Response 98
+VALUE  USR-Event-Id                    DNS-Contact-Restored    99
+VALUE  USR-Event-Id                    DNS-Contact-Degraded    100
+VALUE  USR-Event-Id                    RADIUS-Accounting-Restored 101
+VALUE  USR-Event-Id                    RADIUS-Accounting-Group-Restore 102
+VALUE  USR-Event-Id                    RADIUS-Accounting-Group-Degrade 103
+VALUE  USR-Event-Id                    RADIUS-Accounting-Group-NonOper 104
+VALUE  USR-Event-Id                    T1/T1-E1/PRI-InCall-Fail-Event 119
+VALUE  USR-Event-Id                    T1/T1-E1/PRI-OutCall-Fail-Event 120
+VALUE  USR-Event-Id                    RMMIE-Retrain-Event     121
+VALUE  USR-Event-Id                    RMMIE-Speed-Shift-Event 122
+VALUE  USR-Event-Id                    CDMA-Call-Start         191
+VALUE  USR-Event-Id                    CDMA-Call-End           192
+
+VALUE  USR-Card-Type                   SlotEmpty               1
+VALUE  USR-Card-Type                   SlotUnknown             2
+VALUE  USR-Card-Type                   NetwMgtCard             3
+VALUE  USR-Card-Type                   DualT1NAC               4
+VALUE  USR-Card-Type                   DualModemNAC            5
+VALUE  USR-Card-Type                   QuadModemNAC            6
+VALUE  USR-Card-Type                   TrGatewayNAC            7
+VALUE  USR-Card-Type                   X25GatewayNAC           8
+VALUE  USR-Card-Type                   DualV34ModemNAC         9
+VALUE  USR-Card-Type                   QuadV32DigitalModemNAC  10
+VALUE  USR-Card-Type                   QuadV32AnalogModemNAC   11
+VALUE  USR-Card-Type                   QuadV32DigAnlModemNAC   12
+VALUE  USR-Card-Type                   QuadV34DigModemNAC      13
+VALUE  USR-Card-Type                   QuadV34AnlModemNAC      14
+VALUE  USR-Card-Type                   QuadV34DigAnlModemNAC   15
+VALUE  USR-Card-Type                   SingleT1NAC             16
+VALUE  USR-Card-Type                   EthernetGatewayNAC      17
+VALUE  USR-Card-Type                   AccessServer            18
+VALUE  USR-Card-Type                   486TrGatewayNAC         19
+VALUE  USR-Card-Type                   486EthernetGatewayNAC   20
+VALUE  USR-Card-Type                   DualRS232NAC            22
+VALUE  USR-Card-Type                   486X25GatewayNAC        23
+VALUE  USR-Card-Type                   ApplicationServerNAC    25
+VALUE  USR-Card-Type                   ISDNGatewayNAC          26
+VALUE  USR-Card-Type                   ISDNpriT1NAC            27
+VALUE  USR-Card-Type                   ClkedNetMgtCard         28
+VALUE  USR-Card-Type                   ModemPoolManagementNAC  29
+VALUE  USR-Card-Type                   ModemPoolNetserverNAC   30
+VALUE  USR-Card-Type                   ModemPoolV34ModemNAC    31
+VALUE  USR-Card-Type                   ModemPoolISDNNAC        32
+VALUE  USR-Card-Type                   NTServerNAC             33
+VALUE  USR-Card-Type                   QuadV34DigitalG2NAC     34
+VALUE  USR-Card-Type                   QuadV34AnalogG2NAC      35
+VALUE  USR-Card-Type                   QuadV34DigAnlgG2NAC     36
+VALUE  USR-Card-Type                   NETServerFrameRelayNAC  37
+VALUE  USR-Card-Type                   NETServerTokenRingNAC   38
+VALUE  USR-Card-Type                   X2524ChannelNAC         39
+VALUE  USR-Card-Type                   WirelessGatewayNac      42
+
+VALUE  USR-Card-Type                   EnhancedAccessServer    44
+VALUE  USR-Card-Type                   EnhancedISDNGatewayNAC  45
+
+VALUE  USR-Card-Type                   DualT1NIC               1001
+VALUE  USR-Card-Type                   DualAlogMdmNIC          1002
+VALUE  USR-Card-Type                   QuadDgtlMdmNIC          1003
+VALUE  USR-Card-Type                   QuadAlogDgtlMdmNIC      1004
+VALUE  USR-Card-Type                   TokenRingNIC            1005
+VALUE  USR-Card-Type                   SingleT1NIC             1006
+VALUE  USR-Card-Type                   EthernetNIC             1007
+VALUE  USR-Card-Type                   ShortHaulDualT1NIC      1008
+VALUE  USR-Card-Type                   DualAlogMgdIntlMdmNIC   1009
+VALUE  USR-Card-Type                   X25NIC                  1010
+VALUE  USR-Card-Type                   QuadAlogNonMgdMdmNIC    1011
+VALUE  USR-Card-Type                   QuadAlogMgdIntlMdmNIC   1012
+VALUE  USR-Card-Type                   QuadAlogNonMgdIntlMdmNIC 1013
+VALUE  USR-Card-Type                   QuadLsdLiMgdMdmNIC      1014
+VALUE  USR-Card-Type                   QuadLsdLiNonMgdMdmNIC   1015
+VALUE  USR-Card-Type                   QuadLsdLiMgdIntlMdmNIC  1016
+VALUE  USR-Card-Type                   QuadLsdLiNonMgdIntlMdmNIC 1017
+VALUE  USR-Card-Type                   HSEthernetWithV35NIC    1018
+VALUE  USR-Card-Type                   HSEthernetWithoutV35NIC 1019
+VALUE  USR-Card-Type                   DualHighSpeedV35NIC     1020
+VALUE  USR-Card-Type                   QuadV35RS232LowSpeedNIC 1021
+VALUE  USR-Card-Type                   DualE1NIC               1022
+VALUE  USR-Card-Type                   ShortHaulDualE1NIC      1023
+VALUE  USR-Card-Type                   BellcoreLongHaulDualT1NIC 1025
+VALUE  USR-Card-Type                   BellcoreShrtHaulDualT1NIC 1026
+VALUE  USR-Card-Type                   SCSIEdgeServerNIC       1027
+
+VALUE  USR-Default-DTE-Data-Rate       110-BPS                 1
+VALUE  USR-Default-DTE-Data-Rate       300-BPS                 2
+VALUE  USR-Default-DTE-Data-Rate       600-BPS                 3
+VALUE  USR-Default-DTE-Data-Rate       1200-BPS                4
+VALUE  USR-Default-DTE-Data-Rate       2400-BPS                5
+VALUE  USR-Default-DTE-Data-Rate       4800-BPS                6
+VALUE  USR-Default-DTE-Data-Rate       7200-BPS                7
+VALUE  USR-Default-DTE-Data-Rate       9600-BPS                8
+VALUE  USR-Default-DTE-Data-Rate       12K-BPS                 9
+VALUE  USR-Default-DTE-Data-Rate       14.4K-BPS               10
+VALUE  USR-Default-DTE-Data-Rate       16.8-BPS                11
+VALUE  USR-Default-DTE-Data-Rate       19.2K-BPS               12
+VALUE  USR-Default-DTE-Data-Rate       38.4K-BPS               13
+VALUE  USR-Default-DTE-Data-Rate       75-BPS                  14
+VALUE  USR-Default-DTE-Data-Rate       450-BPS                 15
+VALUE  USR-Default-DTE-Data-Rate       UNKNOWN-BPS             16
+VALUE  USR-Default-DTE-Data-Rate       57.6K-BPS               17
+VALUE  USR-Default-DTE-Data-Rate       21.6K-BPS               18
+VALUE  USR-Default-DTE-Data-Rate       24K-BPS                 19
+VALUE  USR-Default-DTE-Data-Rate       26K-BPS                 20
+VALUE  USR-Default-DTE-Data-Rate       28K-BPS                 21
+VALUE  USR-Default-DTE-Data-Rate       115K-BPS                22
+
+VALUE  USR-Initial-Rx-Link-Data-Rate   110-BPS                 1
+VALUE  USR-Initial-Rx-Link-Data-Rate   300-BPS                 2
+VALUE  USR-Initial-Rx-Link-Data-Rate   600-BPS                 3
+VALUE  USR-Initial-Rx-Link-Data-Rate   1200-BPS                4
+VALUE  USR-Initial-Rx-Link-Data-Rate   2400-BPS                5
+VALUE  USR-Initial-Rx-Link-Data-Rate   4800-BPS                6
+VALUE  USR-Initial-Rx-Link-Data-Rate   7200-BPS                7
+VALUE  USR-Initial-Rx-Link-Data-Rate   9600-BPS                8
+VALUE  USR-Initial-Rx-Link-Data-Rate   12000-BPS               9
+VALUE  USR-Initial-Rx-Link-Data-Rate   14400-BPS               10
+VALUE  USR-Initial-Rx-Link-Data-Rate   16800-BPS               11
+VALUE  USR-Initial-Rx-Link-Data-Rate   19200-BPS               12
+VALUE  USR-Initial-Rx-Link-Data-Rate   38400-BPS               13
+VALUE  USR-Initial-Rx-Link-Data-Rate   75-BPS                  14
+VALUE  USR-Initial-Rx-Link-Data-Rate   450-BPS                 15
+VALUE  USR-Initial-Rx-Link-Data-Rate   UNKNOWN-BPS             16
+VALUE  USR-Initial-Rx-Link-Data-Rate   57600-BPS               17
+VALUE  USR-Initial-Rx-Link-Data-Rate   21600-BPS               18
+VALUE  USR-Initial-Rx-Link-Data-Rate   24000-BPS               19
+VALUE  USR-Initial-Rx-Link-Data-Rate   26400-BPS               20
+VALUE  USR-Initial-Rx-Link-Data-Rate   28800-BPS               21
+VALUE  USR-Initial-Rx-Link-Data-Rate   115200-BPS              22
+VALUE  USR-Initial-Rx-Link-Data-Rate   31200-BPS               23
+VALUE  USR-Initial-Rx-Link-Data-Rate   33600-BPS               24
+VALUE  USR-Initial-Rx-Link-Data-Rate   25333-BPS               25
+VALUE  USR-Initial-Rx-Link-Data-Rate   26666-BPS               26
+VALUE  USR-Initial-Rx-Link-Data-Rate   28000-BPS               27
+VALUE  USR-Initial-Rx-Link-Data-Rate   29333-BPS               28
+VALUE  USR-Initial-Rx-Link-Data-Rate   30666-BPS               29
+VALUE  USR-Initial-Rx-Link-Data-Rate   32000-BPS               30
+VALUE  USR-Initial-Rx-Link-Data-Rate   33333-BPS               31
+VALUE  USR-Initial-Rx-Link-Data-Rate   34666-BPS               32
+VALUE  USR-Initial-Rx-Link-Data-Rate   36000-BPS               33
+VALUE  USR-Initial-Rx-Link-Data-Rate   37333-BPS               34
+VALUE  USR-Initial-Rx-Link-Data-Rate   38666-BPS               35
+VALUE  USR-Initial-Rx-Link-Data-Rate   40000-BPS               36
+VALUE  USR-Initial-Rx-Link-Data-Rate   41333-BPS               37
+VALUE  USR-Initial-Rx-Link-Data-Rate   42666-BPS               38
+VALUE  USR-Initial-Rx-Link-Data-Rate   44000-BPS               39
+VALUE  USR-Initial-Rx-Link-Data-Rate   45333-BPS               40
+VALUE  USR-Initial-Rx-Link-Data-Rate   46666-BPS               41
+VALUE  USR-Initial-Rx-Link-Data-Rate   48000-BPS               42
+VALUE  USR-Initial-Rx-Link-Data-Rate   49333-BPS               43
+VALUE  USR-Initial-Rx-Link-Data-Rate   50666-BPS               44
+VALUE  USR-Initial-Rx-Link-Data-Rate   52000-BPS               45
+VALUE  USR-Initial-Rx-Link-Data-Rate   53333-BPS               46
+VALUE  USR-Initial-Rx-Link-Data-Rate   54666-BPS               47
+VALUE  USR-Initial-Rx-Link-Data-Rate   56000-BPS               48
+VALUE  USR-Initial-Rx-Link-Data-Rate   57333-BPS               49
+VALUE  USR-Initial-Rx-Link-Data-Rate   58666-BPS               50
+VALUE  USR-Initial-Rx-Link-Data-Rate   60000-BPS               51
+VALUE  USR-Initial-Rx-Link-Data-Rate   61333-BPS               52
+VALUE  USR-Initial-Rx-Link-Data-Rate   62666-BPS               53
+VALUE  USR-Initial-Rx-Link-Data-Rate   64000-BPS               54
+
+VALUE  USR-Final-Rx-Link-Data-Rate     110-BPS                 1
+VALUE  USR-Final-Rx-Link-Data-Rate     300-BPS                 2
+VALUE  USR-Final-Rx-Link-Data-Rate     600-BPS                 3
+VALUE  USR-Final-Rx-Link-Data-Rate     1200-BPS                4
+VALUE  USR-Final-Rx-Link-Data-Rate     2400-BPS                5
+VALUE  USR-Final-Rx-Link-Data-Rate     4800-BPS                6
+VALUE  USR-Final-Rx-Link-Data-Rate     7200-BPS                7
+VALUE  USR-Final-Rx-Link-Data-Rate     9600-BPS                8
+VALUE  USR-Final-Rx-Link-Data-Rate     12000-BPS               9
+VALUE  USR-Final-Rx-Link-Data-Rate     14400-BPS               10
+VALUE  USR-Final-Rx-Link-Data-Rate     16800-BPS               11
+VALUE  USR-Final-Rx-Link-Data-Rate     19200-BPS               12
+VALUE  USR-Final-Rx-Link-Data-Rate     38400-BPS               13
+VALUE  USR-Final-Rx-Link-Data-Rate     75-BPS                  14
+VALUE  USR-Final-Rx-Link-Data-Rate     450-BPS                 15
+VALUE  USR-Final-Rx-Link-Data-Rate     UNKNOWN-BPS             16
+VALUE  USR-Final-Rx-Link-Data-Rate     57600-BPS               17
+VALUE  USR-Final-Rx-Link-Data-Rate     21600-BPS               18
+VALUE  USR-Final-Rx-Link-Data-Rate     24000-BPS               19
+VALUE  USR-Final-Rx-Link-Data-Rate     26400-BPS               20
+VALUE  USR-Final-Rx-Link-Data-Rate     28800-BPS               21
+VALUE  USR-Final-Rx-Link-Data-Rate     115200-BPS              22
+VALUE  USR-Final-Rx-Link-Data-Rate     31200-BPS               23
+VALUE  USR-Final-Rx-Link-Data-Rate     33600-BPS               24
+VALUE  USR-Final-Rx-Link-Data-Rate     25333-BPS               25
+VALUE  USR-Final-Rx-Link-Data-Rate     26666-BPS               26
+VALUE  USR-Final-Rx-Link-Data-Rate     28000-BPS               27
+VALUE  USR-Final-Rx-Link-Data-Rate     29333-BPS               28
+VALUE  USR-Final-Rx-Link-Data-Rate     30666-BPS               29
+VALUE  USR-Final-Rx-Link-Data-Rate     32000-BPS               30
+VALUE  USR-Final-Rx-Link-Data-Rate     33333-BPS               31
+VALUE  USR-Final-Rx-Link-Data-Rate     34666-BPS               32
+VALUE  USR-Final-Rx-Link-Data-Rate     36000-BPS               33
+VALUE  USR-Final-Rx-Link-Data-Rate     37333-BPS               34
+VALUE  USR-Final-Rx-Link-Data-Rate     38666-BPS               35
+VALUE  USR-Final-Rx-Link-Data-Rate     40000-BPS               36
+VALUE  USR-Final-Rx-Link-Data-Rate     41333-BPS               37
+VALUE  USR-Final-Rx-Link-Data-Rate     42666-BPS               38
+VALUE  USR-Final-Rx-Link-Data-Rate     44000-BPS               39
+VALUE  USR-Final-Rx-Link-Data-Rate     45333-BPS               40
+VALUE  USR-Final-Rx-Link-Data-Rate     46666-BPS               41
+VALUE  USR-Final-Rx-Link-Data-Rate     48000-BPS               42
+VALUE  USR-Final-Rx-Link-Data-Rate     49333-BPS               43
+VALUE  USR-Final-Rx-Link-Data-Rate     50666-BPS               44
+VALUE  USR-Final-Rx-Link-Data-Rate     52000-BPS               45
+VALUE  USR-Final-Rx-Link-Data-Rate     53333-BPS               46
+VALUE  USR-Final-Rx-Link-Data-Rate     54666-BPS               47
+VALUE  USR-Final-Rx-Link-Data-Rate     56000-BPS               48
+VALUE  USR-Final-Rx-Link-Data-Rate     57333-BPS               49
+VALUE  USR-Final-Rx-Link-Data-Rate     58666-BPS               50
+VALUE  USR-Final-Rx-Link-Data-Rate     60000-BPS               51
+VALUE  USR-Final-Rx-Link-Data-Rate     61333-BPS               52
+VALUE  USR-Final-Rx-Link-Data-Rate     62666-BPS               53
+VALUE  USR-Final-Rx-Link-Data-Rate     64000-BPS               54
+
+VALUE  USR-Initial-Tx-Link-Data-Rate   110-BPS                 1
+VALUE  USR-Initial-Tx-Link-Data-Rate   300-BPS                 2
+VALUE  USR-Initial-Tx-Link-Data-Rate   600-BPS                 3
+VALUE  USR-Initial-Tx-Link-Data-Rate   1200-BPS                4
+VALUE  USR-Initial-Tx-Link-Data-Rate   2400-BPS                5
+VALUE  USR-Initial-Tx-Link-Data-Rate   4800-BPS                6
+VALUE  USR-Initial-Tx-Link-Data-Rate   7200-BPS                7
+VALUE  USR-Initial-Tx-Link-Data-Rate   9600-BPS                8
+VALUE  USR-Initial-Tx-Link-Data-Rate   12000-BPS               9
+VALUE  USR-Initial-Tx-Link-Data-Rate   14400-BPS               10
+VALUE  USR-Initial-Tx-Link-Data-Rate   16800-BPS               11
+VALUE  USR-Initial-Tx-Link-Data-Rate   19200-BPS               12
+VALUE  USR-Initial-Tx-Link-Data-Rate   38400-BPS               13
+VALUE  USR-Initial-Tx-Link-Data-Rate   75-BPS                  14
+VALUE  USR-Initial-Tx-Link-Data-Rate   450-BPS                 15
+VALUE  USR-Initial-Tx-Link-Data-Rate   UNKNOWN-BPS             16
+VALUE  USR-Initial-Tx-Link-Data-Rate   57600-BPS               17
+VALUE  USR-Initial-Tx-Link-Data-Rate   21600-BPS               18
+VALUE  USR-Initial-Tx-Link-Data-Rate   24000-BPS               19
+VALUE  USR-Initial-Tx-Link-Data-Rate   26400-BPS               20
+VALUE  USR-Initial-Tx-Link-Data-Rate   28800-BPS               21
+VALUE  USR-Initial-Tx-Link-Data-Rate   115200-BPS              22
+VALUE  USR-Initial-Tx-Link-Data-Rate   31200-BPS               23
+VALUE  USR-Initial-Tx-Link-Data-Rate   33600-BPS               24
+VALUE  USR-Initial-Tx-Link-Data-Rate   25333-BPS               25
+VALUE  USR-Initial-Tx-Link-Data-Rate   26666-BPS               26
+VALUE  USR-Initial-Tx-Link-Data-Rate   28000-BPS               27
+VALUE  USR-Initial-Tx-Link-Data-Rate   29333-BPS               28
+VALUE  USR-Initial-Tx-Link-Data-Rate   30666-BPS               29
+VALUE  USR-Initial-Tx-Link-Data-Rate   32000-BPS               30
+VALUE  USR-Initial-Tx-Link-Data-Rate   33333-BPS               31
+VALUE  USR-Initial-Tx-Link-Data-Rate   34666-BPS               32
+VALUE  USR-Initial-Tx-Link-Data-Rate   36000-BPS               33
+VALUE  USR-Initial-Tx-Link-Data-Rate   37333-BPS               34
+VALUE  USR-Initial-Tx-Link-Data-Rate   38666-BPS               35
+VALUE  USR-Initial-Tx-Link-Data-Rate   40000-BPS               36
+VALUE  USR-Initial-Tx-Link-Data-Rate   41333-BPS               37
+VALUE  USR-Initial-Tx-Link-Data-Rate   42666-BPS               38
+VALUE  USR-Initial-Tx-Link-Data-Rate   44000-BPS               39
+VALUE  USR-Initial-Tx-Link-Data-Rate   45333-BPS               40
+VALUE  USR-Initial-Tx-Link-Data-Rate   46666-BPS               41
+VALUE  USR-Initial-Tx-Link-Data-Rate   48000-BPS               42
+VALUE  USR-Initial-Tx-Link-Data-Rate   49333-BPS               43
+VALUE  USR-Initial-Tx-Link-Data-Rate   50666-BPS               44
+VALUE  USR-Initial-Tx-Link-Data-Rate   52000-BPS               45
+VALUE  USR-Initial-Tx-Link-Data-Rate   53333-BPS               46
+VALUE  USR-Initial-Tx-Link-Data-Rate   54666-BPS               47
+VALUE  USR-Initial-Tx-Link-Data-Rate   56000-BPS               48
+VALUE  USR-Initial-Tx-Link-Data-Rate   57333-BPS               49
+VALUE  USR-Initial-Tx-Link-Data-Rate   58666-BPS               50
+VALUE  USR-Initial-Tx-Link-Data-Rate   60000-BPS               51
+VALUE  USR-Initial-Tx-Link-Data-Rate   61333-BPS               52
+VALUE  USR-Initial-Tx-Link-Data-Rate   62666-BPS               53
+VALUE  USR-Initial-Tx-Link-Data-Rate   64000-BPS               54
+
+VALUE  USR-Final-Tx-Link-Data-Rate     110-BPS                 1
+VALUE  USR-Final-Tx-Link-Data-Rate     300-BPS                 2
+VALUE  USR-Final-Tx-Link-Data-Rate     600-BPS                 3
+VALUE  USR-Final-Tx-Link-Data-Rate     1200-BPS                4
+VALUE  USR-Final-Tx-Link-Data-Rate     2400-BPS                5
+VALUE  USR-Final-Tx-Link-Data-Rate     4800-BPS                6
+VALUE  USR-Final-Tx-Link-Data-Rate     7200-BPS                7
+VALUE  USR-Final-Tx-Link-Data-Rate     9600-BPS                8
+VALUE  USR-Final-Tx-Link-Data-Rate     12000-BPS               9
+VALUE  USR-Final-Tx-Link-Data-Rate     14400-BPS               10
+VALUE  USR-Final-Tx-Link-Data-Rate     16800-BPS               11
+VALUE  USR-Final-Tx-Link-Data-Rate     19200-BPS               12
+VALUE  USR-Final-Tx-Link-Data-Rate     38400-BPS               13
+VALUE  USR-Final-Tx-Link-Data-Rate     75-BPS                  14
+VALUE  USR-Final-Tx-Link-Data-Rate     450-BPS                 15
+VALUE  USR-Final-Tx-Link-Data-Rate     UNKNOWN-BPS             16
+VALUE  USR-Final-Tx-Link-Data-Rate     57600-BPS               17
+VALUE  USR-Final-Tx-Link-Data-Rate     21600-BPS               18
+VALUE  USR-Final-Tx-Link-Data-Rate     24000-BPS               19
+VALUE  USR-Final-Tx-Link-Data-Rate     26400-BPS               20
+VALUE  USR-Final-Tx-Link-Data-Rate     28800-BPS               21
+VALUE  USR-Final-Tx-Link-Data-Rate     115200-BPS              22
+VALUE  USR-Final-Tx-Link-Data-Rate     31200-BPS               23
+VALUE  USR-Final-Tx-Link-Data-Rate     33600-BPS               24
+VALUE  USR-Final-Tx-Link-Data-Rate     25333-BPS               25
+VALUE  USR-Final-Tx-Link-Data-Rate     26666-BPS               26
+VALUE  USR-Final-Tx-Link-Data-Rate     28000-BPS               27
+VALUE  USR-Final-Tx-Link-Data-Rate     29333-BPS               28
+VALUE  USR-Final-Tx-Link-Data-Rate     30666-BPS               29
+VALUE  USR-Final-Tx-Link-Data-Rate     32000-BPS               30
+VALUE  USR-Final-Tx-Link-Data-Rate     33333-BPS               31
+VALUE  USR-Final-Tx-Link-Data-Rate     34666-BPS               32
+VALUE  USR-Final-Tx-Link-Data-Rate     36000-BPS               33
+VALUE  USR-Final-Tx-Link-Data-Rate     37333-BPS               34
+VALUE  USR-Final-Tx-Link-Data-Rate     38666-BPS               35
+VALUE  USR-Final-Tx-Link-Data-Rate     40000-BPS               36
+VALUE  USR-Final-Tx-Link-Data-Rate     41333-BPS               37
+VALUE  USR-Final-Tx-Link-Data-Rate     42666-BPS               38
+VALUE  USR-Final-Tx-Link-Data-Rate     44000-BPS               39
+VALUE  USR-Final-Tx-Link-Data-Rate     45333-BPS               40
+VALUE  USR-Final-Tx-Link-Data-Rate     46666-BPS               41
+VALUE  USR-Final-Tx-Link-Data-Rate     48000-BPS               42
+VALUE  USR-Final-Tx-Link-Data-Rate     49333-BPS               43
+VALUE  USR-Final-Tx-Link-Data-Rate     50666-BPS               44
+VALUE  USR-Final-Tx-Link-Data-Rate     52000-BPS               45
+VALUE  USR-Final-Tx-Link-Data-Rate     53333-BPS               46
+VALUE  USR-Final-Tx-Link-Data-Rate     54666-BPS               47
+VALUE  USR-Final-Tx-Link-Data-Rate     56000-BPS               48
+VALUE  USR-Final-Tx-Link-Data-Rate     57333-BPS               49
+VALUE  USR-Final-Tx-Link-Data-Rate     58666-BPS               50
+VALUE  USR-Final-Tx-Link-Data-Rate     60000-BPS               51
+VALUE  USR-Final-Tx-Link-Data-Rate     61333-BPS               52
+VALUE  USR-Final-Tx-Link-Data-Rate     62666-BPS               53
+VALUE  USR-Final-Tx-Link-Data-Rate     64000-BPS               54
+
+VALUE  USR-Connect-Speed               NONE                    1
+VALUE  USR-Connect-Speed               300-BPS                 2
+VALUE  USR-Connect-Speed               1200-BPS                3
+VALUE  USR-Connect-Speed               2400-BPS                4
+VALUE  USR-Connect-Speed               4800-BPS                5
+VALUE  USR-Connect-Speed               7200-BPS                6
+VALUE  USR-Connect-Speed               9600-BPS                7
+VALUE  USR-Connect-Speed               12000-BPS               8
+VALUE  USR-Connect-Speed               14400-BPS               9
+VALUE  USR-Connect-Speed               16800-BPS               10
+VALUE  USR-Connect-Speed               19200-BPS               11
+VALUE  USR-Connect-Speed               21600-BPS               12
+VALUE  USR-Connect-Speed               28800-BPS               13
+VALUE  USR-Connect-Speed               38400-BPS               14
+VALUE  USR-Connect-Speed               57600-BPS               15
+VALUE  USR-Connect-Speed               115200-BPS              16
+VALUE  USR-Connect-Speed               288000-BPS              17
+VALUE  USR-Connect-Speed               75-1200-BPS             18
+VALUE  USR-Connect-Speed               1200-75-BPS             19
+VALUE  USR-Connect-Speed               24000-BPS               20
+VALUE  USR-Connect-Speed               26400-BPS               21
+VALUE  USR-Connect-Speed               31200-BPS               22
+VALUE  USR-Connect-Speed               33600-BPS               23
+VALUE  USR-Connect-Speed               33333-BPS               24
+VALUE  USR-Connect-Speed               37333-BPS               25
+VALUE  USR-Connect-Speed               41333-BPS               26
+VALUE  USR-Connect-Speed               42666-BPS               27
+VALUE  USR-Connect-Speed               44000-BPS               28
+VALUE  USR-Connect-Speed               45333-BPS               29
+VALUE  USR-Connect-Speed               46666-BPS               30
+VALUE  USR-Connect-Speed               48000-BPS               31
+VALUE  USR-Connect-Speed               49333-BPS               32
+VALUE  USR-Connect-Speed               50666-BPS               33
+VALUE  USR-Connect-Speed               52000-BPS               34
+VALUE  USR-Connect-Speed               53333-BPS               35
+VALUE  USR-Connect-Speed               54666-BPS               36
+VALUE  USR-Connect-Speed               56000-BPS               37
+VALUE  USR-Connect-Speed               57333-BPS               38
+VALUE  USR-Connect-Speed               64000-BPS               39
+VALUE  USR-Connect-Speed               25333-BPS               40
+VALUE  USR-Connect-Speed               26666-BPS               41
+VALUE  USR-Connect-Speed               28000-BPS               42
+VALUE  USR-Connect-Speed               29333-BPS               43
+VALUE  USR-Connect-Speed               30666-BPS               44
+VALUE  USR-Connect-Speed               32000-BPS               45
+VALUE  USR-Connect-Speed               34666-BPS               46
+VALUE  USR-Connect-Speed               36000-BPS               47
+VALUE  USR-Connect-Speed               38666-BPS               48
+VALUE  USR-Connect-Speed               40000-BPS               49
+VALUE  USR-Connect-Speed               58666-BPS               50
+VALUE  USR-Connect-Speed               60000-BPS               51
+VALUE  USR-Connect-Speed               61333-BPS               52
+VALUE  USR-Connect-Speed               62666-BPS               53
+
+VALUE  USR-Sync-Async-Mode             Asynchronous            1
+VALUE  USR-Sync-Async-Mode             Synchronous             2
+
+VALUE  USR-Originate-Answer-Mode       Originate_in_Originate_Mode 1
+VALUE  USR-Originate-Answer-Mode       Originate_in_Answer_Mode 2
+VALUE  USR-Originate-Answer-Mode       Answer_in_Originate_Mode 3
+VALUE  USR-Originate-Answer-Mode       Answer_in_Answer_Mode   4
+
+VALUE  USR-Modulation-Type             usRoboticsHST           1
+VALUE  USR-Modulation-Type             ccittV32                2
+VALUE  USR-Modulation-Type             ccittV22bis             3
+VALUE  USR-Modulation-Type             bell103                 4
+VALUE  USR-Modulation-Type             ccittV21                5
+VALUE  USR-Modulation-Type             bell212                 6
+VALUE  USR-Modulation-Type             ccittV32bis             7
+VALUE  USR-Modulation-Type             ccittV23                8
+VALUE  USR-Modulation-Type             negotiationFailed       9
+VALUE  USR-Modulation-Type             bell208b                10
+VALUE  USR-Modulation-Type             v21FaxClass1            11
+VALUE  USR-Modulation-Type             v27FaxClass1            12
+VALUE  USR-Modulation-Type             v29FaxClass1            13
+VALUE  USR-Modulation-Type             v17FaxClass1            14
+VALUE  USR-Modulation-Type             v21FaxClass2            15
+VALUE  USR-Modulation-Type             v27FaxClass2            16
+VALUE  USR-Modulation-Type             v29FaxClass2            17
+VALUE  USR-Modulation-Type             v17FaxClass2            18
+VALUE  USR-Modulation-Type             v32Terbo                19
+VALUE  USR-Modulation-Type             v34                     20
+VALUE  USR-Modulation-Type             vFC                     21
+VALUE  USR-Modulation-Type             v34plus                 22
+VALUE  USR-Modulation-Type             x2                      23
+VALUE  USR-Modulation-Type             v110                    24
+VALUE  USR-Modulation-Type             v120                    25
+VALUE  USR-Modulation-Type             x75                     26
+VALUE  USR-Modulation-Type             asyncSyncPPP            27
+VALUE  USR-Modulation-Type             clearChannel            28
+VALUE  USR-Modulation-Type             x2client                29
+VALUE  USR-Modulation-Type             x2symmetric             30
+VALUE  USR-Modulation-Type             piafs                   31
+VALUE  USR-Modulation-Type             x2version2              32
+VALUE  USR-Modulation-Type             v90Analog               33
+VALUE  USR-Modulation-Type             v90Digital              34
+VALUE  USR-Modulation-Type             v90AllDigital           35
+
+VALUE  Initial-Modulation-Type         usRoboticsHST           1
+VALUE  Initial-Modulation-Type         ccittV32                2
+VALUE  Initial-Modulation-Type         ccittV22bis             3
+VALUE  Initial-Modulation-Type         bell103                 4
+VALUE  Initial-Modulation-Type         ccittV21                5
+VALUE  Initial-Modulation-Type         bell212                 6
+VALUE  Initial-Modulation-Type         ccittV32bis             7
+VALUE  Initial-Modulation-Type         ccittV23                8
+VALUE  Initial-Modulation-Type         negotiationFailed       9
+VALUE  Initial-Modulation-Type         bell208b                10
+VALUE  Initial-Modulation-Type         v21FaxClass1            11
+VALUE  Initial-Modulation-Type         v27FaxClass1            12
+VALUE  Initial-Modulation-Type         v29FaxClass1            13
+VALUE  Initial-Modulation-Type         v17FaxClass1            14
+VALUE  Initial-Modulation-Type         v21FaxClass2            15
+VALUE  Initial-Modulation-Type         v27FaxClass2            16
+VALUE  Initial-Modulation-Type         v29FaxClass2            17
+VALUE  Initial-Modulation-Type         v17FaxClass2            18
+VALUE  Initial-Modulation-Type         v32Terbo                19
+VALUE  Initial-Modulation-Type         v34                     20
+VALUE  Initial-Modulation-Type         vFC                     21
+VALUE  Initial-Modulation-Type         v34plus                 22
+VALUE  Initial-Modulation-Type         x2                      23
+VALUE  Initial-Modulation-Type         v110                    24
+VALUE  Initial-Modulation-Type         v120                    25
+VALUE  Initial-Modulation-Type         x75                     26
+VALUE  Initial-Modulation-Type         asyncSyncPPP            27
+VALUE  Initial-Modulation-Type         clearChannel            28
+VALUE  Initial-Modulation-Type         x2client                29
+VALUE  Initial-Modulation-Type         x2symmetric             30
+VALUE  Initial-Modulation-Type         piafs                   31
+VALUE  Initial-Modulation-Type         x2version2              32
+VALUE  Initial-Modulation-Type         v90Analogue             33
+VALUE  Initial-Modulation-Type         v90Digital              34
+VALUE  Initial-Modulation-Type         v90AllDigital           35
+
+VALUE  USR-Connect-Term-Reason         dtrDrop                 1
+VALUE  USR-Connect-Term-Reason         escapeSequence          2
+VALUE  USR-Connect-Term-Reason         athCommand              3
+VALUE  USR-Connect-Term-Reason         carrierLoss             4
+VALUE  USR-Connect-Term-Reason         inactivityTimout        5
+VALUE  USR-Connect-Term-Reason         mnpIncompatible         6
+VALUE  USR-Connect-Term-Reason         undefined               7
+VALUE  USR-Connect-Term-Reason         remotePassword          8
+VALUE  USR-Connect-Term-Reason         linkPassword            9
+VALUE  USR-Connect-Term-Reason         retransmitLimit         10
+VALUE  USR-Connect-Term-Reason         linkDisconnectMsgReceived 11
+VALUE  USR-Connect-Term-Reason         noLoopCurrent           12
+VALUE  USR-Connect-Term-Reason         invalidSpeed            13
+VALUE  USR-Connect-Term-Reason         unableToRetrain         14
+VALUE  USR-Connect-Term-Reason         managementCommand       15
+VALUE  USR-Connect-Term-Reason         noDialTone              16
+VALUE  USR-Connect-Term-Reason         keyAbort                17
+VALUE  USR-Connect-Term-Reason         lineBusy                18
+VALUE  USR-Connect-Term-Reason         noAnswer                19
+VALUE  USR-Connect-Term-Reason         voice                   20
+VALUE  USR-Connect-Term-Reason         noAnswerTone            21
+VALUE  USR-Connect-Term-Reason         noCarrier               22
+VALUE  USR-Connect-Term-Reason         undetermined            23
+VALUE  USR-Connect-Term-Reason         v42SabmeTimeout         24
+VALUE  USR-Connect-Term-Reason         v42BreakTimeout         25
+VALUE  USR-Connect-Term-Reason         v42DisconnectCmd        26
+VALUE  USR-Connect-Term-Reason         v42IdExchangeFail       27
+VALUE  USR-Connect-Term-Reason         v42BadSetup             28
+VALUE  USR-Connect-Term-Reason         v42InvalidCodeWord      29
+VALUE  USR-Connect-Term-Reason         v42StringToLong         30
+VALUE  USR-Connect-Term-Reason         v42InvalidCommand       31
+VALUE  USR-Connect-Term-Reason         none                    32
+VALUE  USR-Connect-Term-Reason         v32Cleardown            33
+VALUE  USR-Connect-Term-Reason         dialSecurity            34
+VALUE  USR-Connect-Term-Reason         remoteAccessDenied      35
+VALUE  USR-Connect-Term-Reason         loopLoss                36
+VALUE  USR-Connect-Term-Reason         ds0Teardown             37
+VALUE  USR-Connect-Term-Reason         promptNotEnabled        38
+VALUE  USR-Connect-Term-Reason         noPromptingInSync       39
+VALUE  USR-Connect-Term-Reason         nonArqMode              40
+VALUE  USR-Connect-Term-Reason         modeIncompatible        41
+VALUE  USR-Connect-Term-Reason         noPromptInNonARQ        42
+VALUE  USR-Connect-Term-Reason         dialBackLink            43
+VALUE  USR-Connect-Term-Reason         linkAbort               44
+VALUE  USR-Connect-Term-Reason         autopassFailed          45
+VALUE  USR-Connect-Term-Reason         pbGenericError          46
+VALUE  USR-Connect-Term-Reason         pbLinkErrTxPreAck       47
+VALUE  USR-Connect-Term-Reason         pbLinkErrTxTardyACK     48
+VALUE  USR-Connect-Term-Reason         pbTransmitBusTimeout    49
+VALUE  USR-Connect-Term-Reason         pbReceiveBusTimeout     50
+VALUE  USR-Connect-Term-Reason         pbLinkErrTxTAL          51
+VALUE  USR-Connect-Term-Reason         pbLinkErrRxTAL          52
+VALUE  USR-Connect-Term-Reason         pbTransmitMasterTimeout 53
+VALUE  USR-Connect-Term-Reason         pbClockMissing          54
+VALUE  USR-Connect-Term-Reason         pbReceivedLsWhileLinkUp 55
+VALUE  USR-Connect-Term-Reason         pbOutOfSequenceFrame    56
+VALUE  USR-Connect-Term-Reason         pbBadFrame              57
+VALUE  USR-Connect-Term-Reason         pbAckWaitTimeout        58
+VALUE  USR-Connect-Term-Reason         pbReceivedAckSeqErr     59
+VALUE  USR-Connect-Term-Reason         pbReceiveOvrflwRNRFail  60
+VALUE  USR-Connect-Term-Reason         pbReceiveMsgBufOvrflw   61
+VALUE  USR-Connect-Term-Reason         rcvdGatewayDiscCmd      62
+VALUE  USR-Connect-Term-Reason         tokenPassingTimeout     63
+VALUE  USR-Connect-Term-Reason         dspInterruptTimeout     64
+VALUE  USR-Connect-Term-Reason         mnpProtocolViolation    65
+VALUE  USR-Connect-Term-Reason         class2FaxHangupCmd      66
+VALUE  USR-Connect-Term-Reason         hstSpeedSwitchTimeout   67
+VALUE  USR-Connect-Term-Reason         tooManyUnacked          68
+VALUE  USR-Connect-Term-Reason         timerExpired            69
+VALUE  USR-Connect-Term-Reason         t1Glare                 70
+VALUE  USR-Connect-Term-Reason         priDialoutRqTimeout     71
+VALUE  USR-Connect-Term-Reason         abortAnlgDstOvrIsdn     72
+VALUE  USR-Connect-Term-Reason         normalUserCallClear     73
+VALUE  USR-Connect-Term-Reason         normalUnspecified       74
+VALUE  USR-Connect-Term-Reason         bearerIncompatibility   75
+VALUE  USR-Connect-Term-Reason         protocolErrorEvent      76
+VALUE  USR-Connect-Term-Reason         abnormalDisconnect      77
+VALUE  USR-Connect-Term-Reason         invalidCauseValue       78
+VALUE  USR-Connect-Term-Reason         resourceUnavailable     79
+VALUE  USR-Connect-Term-Reason         remoteHungUpDuringTraining 80
+VALUE  USR-Connect-Term-Reason         trainingTimeout         81
+VALUE  USR-Connect-Term-Reason         incomingModemNotAvailable 82
+VALUE  USR-Connect-Term-Reason         incomingInvalidBearerCap 83
+VALUE  USR-Connect-Term-Reason         incomingInvalidChannelID 84
+VALUE  USR-Connect-Term-Reason         incomingInvalidProgInd  85
+VALUE  USR-Connect-Term-Reason         incomingInvalidCallingPty 86
+VALUE  USR-Connect-Term-Reason         incomingInvalidCalledPty 87
+VALUE  USR-Connect-Term-Reason         incomingCallBlock       88
+VALUE  USR-Connect-Term-Reason         incomingLoopStNoRingOff 89
+VALUE  USR-Connect-Term-Reason         outgoingTelcoDisconnect 90
+VALUE  USR-Connect-Term-Reason         outgoingEMWinkTimeout   91
+VALUE  USR-Connect-Term-Reason         outgoingEMWinkTooShort  92
+VALUE  USR-Connect-Term-Reason         outgoingNoChannelAvail  93
+VALUE  USR-Connect-Term-Reason         dspReboot               94
+VALUE  USR-Connect-Term-Reason         noDSPRespToKA           95
+VALUE  USR-Connect-Term-Reason         noDSPRespToDisc         96
+VALUE  USR-Connect-Term-Reason         dspTailPtrInvalid       97
+VALUE  USR-Connect-Term-Reason         dspHeadPtrInvalid       98
 
 VALUE  USR-Failure-to-Connect-Reason   dtrDrop                 1
 VALUE  USR-Failure-to-Connect-Reason   escapeSequence          2
@@ -1035,7 +1186,7 @@ VALUE     USR-Failure-to-Connect-Reason   v42BadSetup             28
 VALUE  USR-Failure-to-Connect-Reason   v42InvalidCodeWord      29
 VALUE  USR-Failure-to-Connect-Reason   v42StringToLong         30
 VALUE  USR-Failure-to-Connect-Reason   v42InvalidCommand       31
-VALUE  USR-Failure-to-Connect-Reason   none                    32      
+VALUE  USR-Failure-to-Connect-Reason   none                    32
 VALUE  USR-Failure-to-Connect-Reason   v32Cleardown            33
 VALUE  USR-Failure-to-Connect-Reason   dialSecurity            34
 VALUE  USR-Failure-to-Connect-Reason   remoteAccessDenied      35
@@ -1056,9 +1207,9 @@ VALUE     USR-Failure-to-Connect-Reason   pbTransmitBusTimeout    49
 VALUE  USR-Failure-to-Connect-Reason   pbReceiveBusTimeout     50
 VALUE  USR-Failure-to-Connect-Reason   pbLinkErrTxTAL          51
 VALUE  USR-Failure-to-Connect-Reason   pbLinkErrRxTAL          52
-VALUE  USR-Failure-to-Connect-Reason   pbTransmitMasterTimeout 53
+VALUE  USR-Failure-to-Connect-Reason   pbTransmitMasterTimeout 53
 VALUE  USR-Failure-to-Connect-Reason   pbClockMissing          54
-VALUE  USR-Failure-to-Connect-Reason   pbReceivedLsWhileLinkUp 55
+VALUE  USR-Failure-to-Connect-Reason   pbReceivedLsWhileLinkUp 55
 VALUE  USR-Failure-to-Connect-Reason   pbOutOfSequenceFrame    56
 VALUE  USR-Failure-to-Connect-Reason   pbBadFrame              57
 VALUE  USR-Failure-to-Connect-Reason   pbAckWaitTimeout        58
@@ -1071,318 +1222,433 @@ VALUE USR-Failure-to-Connect-Reason   dspInterruptTimeout     64
 VALUE  USR-Failure-to-Connect-Reason   mnpProtocolViolation    65
 VALUE  USR-Failure-to-Connect-Reason   class2FaxHangupCmd      66
 VALUE  USR-Failure-to-Connect-Reason   hstSpeedSwitchTimeout   67
-VALUE   USR-Failure-to-Connect-Reason     tooManyUnacked          68
-VALUE   USR-Failure-to-Connect-Reason     timerExpired            69
-VALUE   USR-Failure-to-Connect-Reason     t1Glare         70
-VALUE   USR-Failure-to-Connect-Reason     priDialoutRqTimeout             71
-VALUE   USR-Failure-to-Connect-Reason     abortAnlgDstOvrIsdn             72
-VALUE   USR-Failure-to-Connect-Reason     normalUserCallClear             73
-VALUE   USR-Failure-to-Connect-Reason     normalUnspecified               74
-VALUE   USR-Failure-to-Connect-Reason     bearerIncompatibility           75
-VALUE   USR-Failure-to-Connect-Reason     protocolErrorEvent              76
-VALUE   USR-Failure-to-Connect-Reason     abnormalDisconnect              77
-VALUE   USR-Failure-to-Connect-Reason     invalidCauseValue               78
-VALUE   USR-Failure-to-Connect-Reason     resourceUnavailable             79
-VALUE   USR-Failure-to-Connect-Reason     remoteHungUpDuringTraining              80
-VALUE   USR-Failure-to-Connect-Reason     trainingTimeout         81
-VALUE   USR-Failure-to-Connect-Reason     incomingModemNotAvailable               82
-VALUE   USR-Failure-to-Connect-Reason     incomingInvalidBearerCap                83
-VALUE   USR-Failure-to-Connect-Reason     incomingInvalidChannelID                84
-VALUE   USR-Failure-to-Connect-Reason     incomingInvalidProgInd          85
-VALUE   USR-Failure-to-Connect-Reason     incomingInvalidCallingPty               86
-VALUE   USR-Failure-to-Connect-Reason     incomingInvalidCalledPty                87
-VALUE   USR-Failure-to-Connect-Reason     incomingCallBlock               88
-VALUE   USR-Failure-to-Connect-Reason     incomingLoopStNoRingOff         89
-VALUE   USR-Failure-to-Connect-Reason     outgoingTelcoDisconnect         90
-VALUE   USR-Failure-to-Connect-Reason     outgoingEMWinkTimeout           91
-VALUE   USR-Failure-to-Connect-Reason     outgoingEMWinkTooShort          92
-VALUE   USR-Failure-to-Connect-Reason     outgoingNoChannelAvail          93
-VALUE   USR-Failure-to-Connect-Reason     dspReboot               94
-VALUE   USR-Failure-to-Connect-Reason     noDSPRespToKA           95
-VALUE   USR-Failure-to-Connect-Reason     noDSPRespToDisc         96
-VALUE   USR-Failure-to-Connect-Reason     dspTailPtrInvalid               97
-VALUE   USR-Failure-to-Connect-Reason     dspHeadPtrInvalid               98
-
-VALUE  USR-Simplified-MNP-Levels               none                    1
-VALUE  USR-Simplified-MNP-Levels               mnpLevel3               2
-VALUE  USR-Simplified-MNP-Levels               mnpLevel4               3
-VALUE  USR-Simplified-MNP-Levels               ccittV42                4
-VALUE  USR-Simplified-MNP-Levels               usRoboticsHST           5
-VALUE  USR-Simplified-MNP-Levels               synchronousNone         6
-VALUE  USR-Simplified-MNP-Levels               mnpLevel2               7
-VALUE  USR-Simplified-MNP-Levels               mnp10                   8
-VALUE  USR-Simplified-MNP-Levels               v42Etc                  9
-VALUE   USR-Simplified-MNP-Levels              mnp10Etc                10
-VALUE   USR-Simplified-MNP-Levels              lapmEtc                 11
-VALUE   USR-Simplified-MNP-Levels              v42Etc2                 12
-VALUE   USR-Simplified-MNP-Levels              v42SRej                 13
-VALUE   USR-Simplified-MNP-Levels              piafs                   14
-
-VALUE  USR-Simplified-V42bis-Usage             none                    1
-VALUE  USR-Simplified-V42bis-Usage             ccittV42bis             2
-VALUE  USR-Simplified-V42bis-Usage             mnpLevel5               3
-
-VALUE  USR-Equalization-Type           Long            1
-VALUE  USR-Equalization-Type           Short           2
-
-
-VALUE  USR-Fallback-Enabled            Disabled        1
-VALUE  USR-Fallback-Enabled            Enabled         2
-
-
-VALUE  USR-Back-Channel-Data-Rate              450BPS          1
-VALUE  USR-Back-Channel-Data-Rate              300BPS          2
-VALUE  USR-Back-Channel-Data-Rate              None            3
-
-VALUE  USR-Device-Connected-To         None            1
-VALUE  USR-Device-Connected-To         isdnGateway     2
-VALUE  USR-Device-Connected-To         quadModem       3
-
-VALUE  USR-Call-Event-Code                     notSupported          1
-VALUE  USR-Call-Event-Code                     setup                 2
-VALUE  USR-Call-Event-Code                     usrSetup              3
-VALUE  USR-Call-Event-Code                     telcoDisconnect       4
-VALUE  USR-Call-Event-Code                     usrDisconnect         5
-VALUE  USR-Call-Event-Code                     noFreeModem           6
-VALUE  USR-Call-Event-Code                     modemsNotAllowed      7
-VALUE  USR-Call-Event-Code                     modemsRejectCall      8
-VALUE  USR-Call-Event-Code                     modemSetupTimeout     9
-VALUE  USR-Call-Event-Code                     noFreeIGW             10
-VALUE  USR-Call-Event-Code                     igwRejectCall         11
-VALUE  USR-Call-Event-Code                     igwSetupTimeout       12
-VALUE  USR-Call-Event-Code                     noFreeTdmts           13
-VALUE  USR-Call-Event-Code                     bcReject              14
-VALUE  USR-Call-Event-Code                     ieReject              15
-VALUE  USR-Call-Event-Code                     chidReject            16
-VALUE  USR-Call-Event-Code                     progReject            17
-VALUE  USR-Call-Event-Code                     callingPartyReject    18
-VALUE  USR-Call-Event-Code                     calledPartyReject     19
-VALUE  USR-Call-Event-Code                     blocked               20
-VALUE  USR-Call-Event-Code                     analogBlocked         21
-VALUE  USR-Call-Event-Code                     digitalBlocked        22
-VALUE  USR-Call-Event-Code                     outOfService          23
-VALUE  USR-Call-Event-Code                     busy                  24
-VALUE  USR-Call-Event-Code                     congestion            25
-VALUE  USR-Call-Event-Code                     protocolError         26 
-VALUE  USR-Call-Event-Code                     noFreeBchannel        27
-VALUE  USR-Call-Event-Code                     inOutCallCollision    28
-VALUE  USR-Call-Event-Code                     inCallArrival           29
-VALUE  USR-Call-Event-Code                     outCallArrival          30
-VALUE  USR-Call-Event-Code                     inCallConnect           31
-VALUE  USR-Call-Event-Code                     outCallConnect          32
-
-VALUE  USR-HARC-Disconnect-Code                No-Error                0
-VALUE  USR-HARC-Disconnect-Code                No-Carrier              1
-VALUE  USR-HARC-Disconnect-Code                No-DSR                  2
-VALUE  USR-HARC-Disconnect-Code                Timeout                 3
-VALUE  USR-HARC-Disconnect-Code                Reset                   4
-VALUE  USR-HARC-Disconnect-Code                Call-Drop-Req           5
-VALUE  USR-HARC-Disconnect-Code                Idle-Timeout            6
-VALUE  USR-HARC-Disconnect-Code                Session-Timeout         7
-VALUE  USR-HARC-Disconnect-Code                User-Req-Drop           8
-VALUE  USR-HARC-Disconnect-Code                Host-Req-Drop           9
-VALUE  USR-HARC-Disconnect-Code                Service-Interruption    10
-VALUE  USR-HARC-Disconnect-Code                Service-Unavailable     11
-VALUE  USR-HARC-Disconnect-Code                User-Input-Error        12
-VALUE  USR-HARC-Disconnect-Code                NAS-Drop-For-Callback   13
-VALUE  USR-HARC-Disconnect-Code                NAS-Drop-Misc-Non-Error 14
-VALUE  USR-HARC-Disconnect-Code                NAS-Internal-Error      15
-VALUE  USR-HARC-Disconnect-Code                Line-Busy               16
-VALUE  USR-HARC-Disconnect-Code                Tunnel-Term-Unreach     19
-VALUE  USR-HARC-Disconnect-Code                Tunnel-Refused          20
-VALUE  USR-HARC-Disconnect-Code                Tunnel-Auth-Failed      21
-VALUE  USR-HARC-Disconnect-Code                Tunnel-Session-Timeout  22
-VALUE  USR-HARC-Disconnect-Code                Tunnel-Timeout          23
-VALUE  USR-HARC-Disconnect-Code                Radius-Res-Reclaim      25
-VALUE  USR-HARC-Disconnect-Code                DNIS-Auth-Failed        26
-VALUE  USR-HARC-Disconnect-Code                PAP-Auth-Failure        27
-VALUE  USR-HARC-Disconnect-Code                CHAP-Auth-Failure       28
-VALUE  USR-HARC-Disconnect-Code                PPP-LCP-Failed          29
-VALUE  USR-HARC-Disconnect-Code                PPP-NCP-Failed          30
-VALUE  USR-HARC-Disconnect-Code                Radius-Timeout          31
-
-VALUE  USR-CCP-Algorithm                       NONE                    1
-VALUE  USR-CCP-Algorithm                       Stac                    2
-VALUE  USR-CCP-Algorithm                       MS                      3
-VALUE  USR-CCP-Algorithm                       Any                     4
-
-VALUE  USR-Tunnel-Security                     None                    0
-VALUE  USR-Tunnel-Security                     Control-Only            1
-VALUE  USR-Tunnel-Security                     Data-Only               2
-VALUE  USR-Tunnel-Security                     Both-Data-and-Control   3
-
-VALUE  USR-RMMIE-Status                        notEnabledInLocalModem  1
-VALUE  USR-RMMIE-Status                        notDetectedInRemoteModem        2
-VALUE  USR-RMMIE-Status                        ok                      3
-
-VALUE  USR-RMMIE-x2-Status                     notOperational          1
-VALUE  USR-RMMIE-x2-Status                     operational             2
-VALUE  USR-RMMIE-x2-Status                     x2Disabled              3
-VALUE  USR-RMMIE-x2-Status                     v8Disabled              4
-VALUE  USR-RMMIE-x2-Status                     remote3200Disabled      5
-VALUE  USR-RMMIE-x2-Status                     invalidSpeedSetting     6
-VALUE  USR-RMMIE-x2-Status                     v8NotDetected           7
-VALUE  USR-RMMIE-x2-Status                     x2NotDetected           8
-VALUE  USR-RMMIE-x2-Status                     incompatibleVersion     9
-VALUE  USR-RMMIE-x2-Status                     incompatibleModes       10
-VALUE  USR-RMMIE-x2-Status                     local3200Disabled       11
-VALUE  USR-RMMIE-x2-Status                     excessHighFrequencyAtten        12
-VALUE  USR-RMMIE-x2-Status                     connectNotSupport3200   13
-VALUE  USR-RMMIE-x2-Status                     retrainBeforeConnection 14
-
-VALUE  USR-RMMIE-Planned-Disconnect            none                    1
-VALUE  USR-RMMIE-Planned-Disconnect            dteNotReady             2
-VALUE  USR-RMMIE-Planned-Disconnect            dteInterfaceError       3
-VALUE  USR-RMMIE-Planned-Disconnect            dteRequest              4
-VALUE  USR-RMMIE-Planned-Disconnect            escapeToOnlineCommandMode       5
-VALUE  USR-RMMIE-Planned-Disconnect            athCommand              6
-VALUE  USR-RMMIE-Planned-Disconnect            inactivityTimeout       7
-VALUE  USR-RMMIE-Planned-Disconnect            arqProtocolError        8
-VALUE  USR-RMMIE-Planned-Disconnect            arqProtocolRetransmitLim        9
-VALUE  USR-RMMIE-Planned-Disconnect            invalidComprDataCodeword        10
-VALUE  USR-RMMIE-Planned-Disconnect            invalidComprDataStringLen       11
-VALUE  USR-RMMIE-Planned-Disconnect            invalidComprDataCommand 12
-
-VALUE  USR-RMMIE-Last-Update-Event             none                    1
-VALUE  USR-RMMIE-Last-Update-Event             initialConnection       2
-VALUE  USR-RMMIE-Last-Update-Event             retrain                 3
-VALUE  USR-RMMIE-Last-Update-Event             speedShift              4
-VALUE  USR-RMMIE-Last-Update-Event             plannedDisconnect       5
-
-VALUE  USR-Request-Type                        Access-Request          1
-VALUE  USR-Request-Type                        Access-Accept           2
-VALUE  USR-Request-Type                        Access-Reject           3
-VALUE  USR-Request-Type                        Accounting-Request      4
-VALUE  USR-Request-Type                        Accounting-Response     5
-VALUE  USR-Request-Type                        Access-Password-Change  7
-VALUE  USR-Request-Type                        Access-Password-Ack     8
-VALUE  USR-Request-Type                        Access-Password-Reject  9
-VALUE  USR-Request-Type                        Access-Challenge        11
-VALUE  USR-Request-Type                        Status-Server           12
-VALUE  USR-Request-Type                        Status-Client           13
-VALUE  USR-Request-Type                        Resource-Free-Request   21
-VALUE  USR-Request-Type                        Resource-Free-Response  22
-VALUE  USR-Request-Type                        Resource-Query-Request  23
-VALUE  USR-Request-Type                        Resource-Query-Response 24
-VALUE  USR-Request-Type                        Disconnect-User         25
-VALUE  USR-Request-Type                        NAS-Reboot-Request      26
-VALUE  USR-Request-Type                        NAS-Reboot-Response     27
-VALUE  USR-Request-Type                        Tacacs-Message          253
-VALUE  USR-Request-Type                        Reserved                255
-
-VALUE  USR-PW_Framed_Routing_V2                Off                     0
-VALUE  USR-PW_Framed_Routing_V2                On                      1
-
-VALUE  USR-Syslog-Tap                          Off                     0
-VALUE  USR-Syslog-Tap                          Raw                     1
-VALUE  USR-Syslog-Tap                          Framed                  2
-
-VALUE  USR-Speed-Of-Connection                 Auto                    0
-VALUE  USR-Speed-Of-Connection                 56                      1
-VALUE  USR-Speed-Of-Connection                 64                      2
-VALUE  USR-Speed-Of-Connection                 Voice                   3
-
-VALUE  USR-Expansion-Algorithm                 Constant                1
-VALUE  USR-Expansion-Algorithm                 Linear                  2
-
-VALUE  USR-Compression-Algorithm               None                    0
-VALUE  USR-Compression-Algorithm               Stac                    1
-VALUE  USR-Compression-Algorithm               Ascend                  2
-VALUE  USR-Compression-Algorithm               Microsoft               3
-VALUE  USR-Compression-Algorithm               Auto                    4
-
-VALUE  USR-Compression-Reset-Mode              Auto                    0
-VALUE  USR-Compression-Reset-Mode              Reset-Every-Packet      1
-VALUE  USR-Compression-Reset-Mode              Reset-On-Error          2
-
-VALUE  USR-Filter-Zones                        enabled                 1
-VALUE  USR-Filter-Zones                        disabled                2
-
-VALUE  USR-Bridging                            enabled                 1
-VALUE  USR-Bridging                            disabled                2
-
-VALUE  USR-Appletalk                           enabled                 1
-VALUE  USR-Appletalk                           disabled                2
-
-VALUE  USR-Spoofing                            enabled                 1
-VALUE  USR-Spoofing                            disabled                2
-
-VALUE  USR-Routing-Protocol                    Rip1                    1
-VALUE  USR-Routing-Protocol                    Rip2                    2
-
-VALUE  USR-IPX-Routing                         none                    0
-VALUE  USR-IPX-Routing                         send                    1
-VALUE  USR-IPX-Routing                         listen                  2
-VALUE  USR-IPX-Routing                         respond                 3
-VALUE  USR-IPX-Routing                         all                     4
-
-VALUE  USR-IPX-WAN                             enabled                 1
-VALUE  USR-IPX-WAN                             disabled                2
-
-VALUE  USR-IP-Default-Route-Option             enabled                 1
-VALUE  USR-IP-Default-Route-Option             disabled                2
-
-VALUE  USR-IP-RIP-Policies                     SendDefault             0x0
-VALUE  USR-IP-RIP-Policies                     SendRoutes              0x2
-VALUE  USR-IP-RIP-Policies                     SendSubnets             0x4
-VALUE  USR-IP-RIP-Policies                     AcceptDefault           0x8
-VALUE  USR-IP-RIP-Policies                     SplitHorizon            0x10
-VALUE  USR-IP-RIP-Policies                     PoisonReserve           0x20
-VALUE  USR-IP-RIP-Policies                     FlashUpdate             0x40
-VALUE  USR-IP-RIP-Policies                     SimpleAuth              0x80
-VALUE  USR-IP-RIP-Policies                     V1Send                  0x100
-VALUE  USR-IP-RIP-Policies                     V1Receive               0x200
-VALUE  USR-IP-RIP-Policies                     V2Receive               0x400
-VALUE  USR-IP-RIP-Policies                     Silent                  0x80000000
-
-VALUE  USR-Callback-Type                       Normal                  1
-VALUE  USR-Callback-Type                       ANI                     2
-VALUE  USR-Callback-Type                       Static                  3
-VALUE  USR-Callback-Type                       Dynamic                 4
-
-VALUE  USR-Request-Type                        Access-Request          1
-VALUE  USR-Request-Type                        Access-Accept           2
-VALUE  USR-Request-Type                        Access-Reject           3
-VALUE  USR-Request-Type                        Accounting-Request      4
-VALUE  USR-Request-Type                        Accounting-Response     5
+VALUE  USR-Failure-to-Connect-Reason   tooManyUnacked          68
+VALUE  USR-Failure-to-Connect-Reason   timerExpired            69
+VALUE  USR-Failure-to-Connect-Reason   t1Glare                 70
+VALUE  USR-Failure-to-Connect-Reason   priDialoutRqTimeout     71
+VALUE  USR-Failure-to-Connect-Reason   abortAnlgDstOvrIsdn     72
+VALUE  USR-Failure-to-Connect-Reason   normalUserCallClear     73
+VALUE  USR-Failure-to-Connect-Reason   normalUnspecified       74
+VALUE  USR-Failure-to-Connect-Reason   bearerIncompatibility   75
+VALUE  USR-Failure-to-Connect-Reason   protocolErrorEvent      76
+VALUE  USR-Failure-to-Connect-Reason   abnormalDisconnect      77
+VALUE  USR-Failure-to-Connect-Reason   invalidCauseValue       78
+VALUE  USR-Failure-to-Connect-Reason   resourceUnavailable     79
+VALUE  USR-Failure-to-Connect-Reason   remoteHungUpDuringTraining 80
+VALUE  USR-Failure-to-Connect-Reason   trainingTimeout         81
+VALUE  USR-Failure-to-Connect-Reason   incomingModemNotAvailable 82
+VALUE  USR-Failure-to-Connect-Reason   incomingInvalidBearerCap 83
+VALUE  USR-Failure-to-Connect-Reason   incomingInvalidChannelID 84
+VALUE  USR-Failure-to-Connect-Reason   incomingInvalidProgInd  85
+VALUE  USR-Failure-to-Connect-Reason   incomingInvalidCallingPty 86
+VALUE  USR-Failure-to-Connect-Reason   incomingInvalidCalledPty 87
+VALUE  USR-Failure-to-Connect-Reason   incomingCallBlock       88
+VALUE  USR-Failure-to-Connect-Reason   incomingLoopStNoRingOff 89
+VALUE  USR-Failure-to-Connect-Reason   outgoingTelcoDisconnect 90
+VALUE  USR-Failure-to-Connect-Reason   outgoingEMWinkTimeout   91
+VALUE  USR-Failure-to-Connect-Reason   outgoingEMWinkTooShort  92
+VALUE  USR-Failure-to-Connect-Reason   outgoingNoChannelAvail  93
+VALUE  USR-Failure-to-Connect-Reason   dspReboot               94
+VALUE  USR-Failure-to-Connect-Reason   noDSPRespToKA           95
+VALUE  USR-Failure-to-Connect-Reason   noDSPRespToDisc         96
+VALUE  USR-Failure-to-Connect-Reason   dspTailPtrInvalid       97
+VALUE  USR-Failure-to-Connect-Reason   dspHeadPtrInvalid       98
+
+VALUE  USR-Simplified-MNP-Levels       none                    1
+VALUE  USR-Simplified-MNP-Levels       mnpLevel3               2
+VALUE  USR-Simplified-MNP-Levels       mnpLevel4               3
+VALUE  USR-Simplified-MNP-Levels       ccittV42                4
+VALUE  USR-Simplified-MNP-Levels       usRoboticsHST           5
+VALUE  USR-Simplified-MNP-Levels       synchronousNone         6
+VALUE  USR-Simplified-MNP-Levels       mnpLevel2               7
+VALUE  USR-Simplified-MNP-Levels       mnp10                   8
+VALUE  USR-Simplified-MNP-Levels       v42Etc                  9
+VALUE  USR-Simplified-MNP-Levels       mnp10Etc                10
+VALUE  USR-Simplified-MNP-Levels       lapmEtc                 11
+VALUE  USR-Simplified-MNP-Levels       v42Etc2                 12
+VALUE  USR-Simplified-MNP-Levels       v42SRej                 13
+VALUE  USR-Simplified-MNP-Levels       piafs                   14
+
+VALUE  USR-Simplified-V42bis-Usage     none                    1
+VALUE  USR-Simplified-V42bis-Usage     ccittV42bis             2
+VALUE  USR-Simplified-V42bis-Usage     mnpLevel5               3
+
+VALUE  USR-Equalization-Type           Long                    1
+VALUE  USR-Equalization-Type           Short                   2
+
+VALUE  USR-Fallback-Enabled            Disabled                1
+VALUE  USR-Fallback-Enabled            Enabled                 2
+
+VALUE  USR-Back-Channel-Data-Rate      450BPS                  1
+VALUE  USR-Back-Channel-Data-Rate      300BPS                  2
+VALUE  USR-Back-Channel-Data-Rate      None                    3
+
+VALUE  USR-Device-Connected-To         None                    1
+VALUE  USR-Device-Connected-To         isdnGateway             2
+VALUE  USR-Device-Connected-To         quadModem               3
+
+VALUE  USR-Call-Event-Code             notSupported            1
+VALUE  USR-Call-Event-Code             setup                   2
+VALUE  USR-Call-Event-Code             usrSetup                3
+VALUE  USR-Call-Event-Code             telcoDisconnect         4
+VALUE  USR-Call-Event-Code             usrDisconnect           5
+VALUE  USR-Call-Event-Code             noFreeModem             6
+VALUE  USR-Call-Event-Code             modemsNotAllowed        7
+VALUE  USR-Call-Event-Code             modemsRejectCall        8
+VALUE  USR-Call-Event-Code             modemSetupTimeout       9
+VALUE  USR-Call-Event-Code             noFreeIGW               10
+VALUE  USR-Call-Event-Code             igwRejectCall           11
+VALUE  USR-Call-Event-Code             igwSetupTimeout         12
+VALUE  USR-Call-Event-Code             noFreeTdmts             13
+VALUE  USR-Call-Event-Code             bcReject                14
+VALUE  USR-Call-Event-Code             ieReject                15
+VALUE  USR-Call-Event-Code             chidReject              16
+VALUE  USR-Call-Event-Code             progReject              17
+VALUE  USR-Call-Event-Code             callingPartyReject      18
+VALUE  USR-Call-Event-Code             calledPartyReject       19
+VALUE  USR-Call-Event-Code             blocked                 20
+VALUE  USR-Call-Event-Code             analogBlocked           21
+VALUE  USR-Call-Event-Code             digitalBlocked          22
+VALUE  USR-Call-Event-Code             outOfService            23
+VALUE  USR-Call-Event-Code             busy                    24
+VALUE  USR-Call-Event-Code             congestion              25
+VALUE  USR-Call-Event-Code             protocolError           26
+VALUE  USR-Call-Event-Code             noFreeBchannel          27
+VALUE  USR-Call-Event-Code             inOutCallCollision      28
+VALUE  USR-Call-Event-Code             inCallArrival           29
+VALUE  USR-Call-Event-Code             outCallArrival          30
+VALUE  USR-Call-Event-Code             inCallConnect           31
+VALUE  USR-Call-Event-Code             outCallConnect          32
+
+VALUE  USR-HARC-Disconnect-Code        No-Error                0
+VALUE  USR-HARC-Disconnect-Code        No-Carrier              1
+VALUE  USR-HARC-Disconnect-Code        No-DSR                  2
+VALUE  USR-HARC-Disconnect-Code        Timeout                 3
+VALUE  USR-HARC-Disconnect-Code        Reset                   4
+VALUE  USR-HARC-Disconnect-Code        Call-Drop-Req           5
+VALUE  USR-HARC-Disconnect-Code        Idle-Timeout            6
+VALUE  USR-HARC-Disconnect-Code        Session-Timeout         7
+VALUE  USR-HARC-Disconnect-Code        User-Req-Drop           8
+VALUE  USR-HARC-Disconnect-Code        Host-Req-Drop           9
+VALUE  USR-HARC-Disconnect-Code        Service-Interruption    10
+VALUE  USR-HARC-Disconnect-Code        Service-Unavailable     11
+VALUE  USR-HARC-Disconnect-Code        User-Input-Error        12
+VALUE  USR-HARC-Disconnect-Code        NAS-Drop-For-Callback   13
+VALUE  USR-HARC-Disconnect-Code        NAS-Drop-Misc-Non-Error 14
+VALUE  USR-HARC-Disconnect-Code        NAS-Internal-Error      15
+VALUE  USR-HARC-Disconnect-Code        Line-Busy               16
+VALUE  USR-HARC-Disconnect-Code        Tunnel-Term-Unreach     19
+VALUE  USR-HARC-Disconnect-Code        Tunnel-Refused          20
+VALUE  USR-HARC-Disconnect-Code        Tunnel-Auth-Failed      21
+VALUE  USR-HARC-Disconnect-Code        Tunnel-Session-Timeout  22
+VALUE  USR-HARC-Disconnect-Code        Tunnel-Timeout          23
+VALUE  USR-HARC-Disconnect-Code        Radius-Res-Reclaim      25
+VALUE  USR-HARC-Disconnect-Code        DNIS-Auth-Failed        26
+VALUE  USR-HARC-Disconnect-Code        PAP-Auth-Failure        27
+VALUE  USR-HARC-Disconnect-Code        CHAP-Auth-Failure       28
+VALUE  USR-HARC-Disconnect-Code        PPP-LCP-Failed          29
+VALUE  USR-HARC-Disconnect-Code        PPP-NCP-Failed          30
+VALUE  USR-HARC-Disconnect-Code        Radius-Timeout          31
+
+VALUE  USR-CCP-Algorithm               NONE                    1
+VALUE  USR-CCP-Algorithm               Stac                    2
+VALUE  USR-CCP-Algorithm               MS                      3
+VALUE  USR-CCP-Algorithm               Any                     4
+
+VALUE  USR-Tunnel-Security             None                    0
+VALUE  USR-Tunnel-Security             Control-Only            1
+VALUE  USR-Tunnel-Security             Data-Only               2
+VALUE  USR-Tunnel-Security             Both-Data-and-Control   3
+
+VALUE  USR-RMMIE-Status                notEnabledInLocalModem  1
+VALUE  USR-RMMIE-Status                notDetectedInRemoteModem 2
+VALUE  USR-RMMIE-Status                ok                      3
+
+VALUE  USR-RMMIE-x2-Status             notOperational          1
+VALUE  USR-RMMIE-x2-Status             operational             2
+VALUE  USR-RMMIE-x2-Status             x2Disabled              3
+VALUE  USR-RMMIE-x2-Status             v8Disabled              4
+VALUE  USR-RMMIE-x2-Status             remote3200Disabled      5
+VALUE  USR-RMMIE-x2-Status             invalidSpeedSetting     6
+VALUE  USR-RMMIE-x2-Status             v8NotDetected           7
+VALUE  USR-RMMIE-x2-Status             x2NotDetected           8
+VALUE  USR-RMMIE-x2-Status             incompatibleVersion     9
+VALUE  USR-RMMIE-x2-Status             incompatibleModes       10
+VALUE  USR-RMMIE-x2-Status             local3200Disabled       11
+VALUE  USR-RMMIE-x2-Status             excessHighFrequencyAtten 12
+VALUE  USR-RMMIE-x2-Status             connectNotSupport3200   13
+VALUE  USR-RMMIE-x2-Status             retrainBeforeConnection 14
+
+VALUE  USR-RMMIE-Planned-Disconnect    none                    1
+VALUE  USR-RMMIE-Planned-Disconnect    dteNotReady             2
+VALUE  USR-RMMIE-Planned-Disconnect    dteInterfaceError       3
+VALUE  USR-RMMIE-Planned-Disconnect    dteRequest              4
+VALUE  USR-RMMIE-Planned-Disconnect    escapeToOnlineCommandMode 5
+VALUE  USR-RMMIE-Planned-Disconnect    athCommand              6
+VALUE  USR-RMMIE-Planned-Disconnect    inactivityTimeout       7
+VALUE  USR-RMMIE-Planned-Disconnect    arqProtocolError        8
+VALUE  USR-RMMIE-Planned-Disconnect    arqProtocolRetransmitLim 9
+VALUE  USR-RMMIE-Planned-Disconnect    invalidComprDataCodeword 10
+VALUE  USR-RMMIE-Planned-Disconnect    invalidComprDataStringLen 11
+VALUE  USR-RMMIE-Planned-Disconnect    invalidComprDataCommand 12
+
+VALUE  USR-RMMIE-Last-Update-Event     none                    1
+VALUE  USR-RMMIE-Last-Update-Event     initialConnection       2
+VALUE  USR-RMMIE-Last-Update-Event     retrain                 3
+VALUE  USR-RMMIE-Last-Update-Event     speedShift              4
+VALUE  USR-RMMIE-Last-Update-Event     plannedDisconnect       5
+
+VALUE  USR-Request-Type                Access-Request          1
+VALUE  USR-Request-Type                Access-Accept           2
+VALUE  USR-Request-Type                Access-Reject           3
+VALUE  USR-Request-Type                Accounting-Request      4
+VALUE  USR-Request-Type                Accounting-Response     5
 # The next three non standard packet types are used by
 # US Robotics Security/Accounting Server
-VALUE  USR-Request-Type                        Access-Password-Change  7
-VALUE  USR-Request-Type                        Access-Password-Ack     8
-VALUE  USR-Request-Type                        Access-Password-Reject  9
-VALUE  USR-Request-Type                        Access-Challenge        11
-VALUE  USR-Request-Type                        Status-Server           12
-VALUE  USR-Request-Type                        Status-Client           13
+VALUE  USR-Request-Type                Access-Password-Change  7
+VALUE  USR-Request-Type                Access-Password-Ack     8
+VALUE  USR-Request-Type                Access-Password-Reject  9
+VALUE  USR-Request-Type                Access-Challenge        11
+VALUE  USR-Request-Type                Status-Server           12
+VALUE  USR-Request-Type                Status-Client           13
 # Non standard packet types used by NetServer to implement
 # resource management and NAS reboot conditions
-VALUE  USR-Request-Type                        Resource-Free-Request   21
-VALUE  USR-Request-Type                        Resource-Free-Response  22
-VALUE  USR-Request-Type                        Resource-Query-Request  23
-VALUE  USR-Request-Type                        Resource-Query-Response 24
-VALUE  USR-Request-Type                        Disconnect-User         25
-VALUE  USR-Request-Type                        NAS-Reboot-Request      26
-VALUE  USR-Request-Type                        NAS-Reboot-Response     27
+VALUE  USR-Request-Type                Resource-Free-Request   21
+VALUE  USR-Request-Type                Resource-Free-Response  22
+VALUE  USR-Request-Type                Resource-Query-Request  23
+VALUE  USR-Request-Type                Resource-Query-Response 24
+VALUE  USR-Request-Type                Disconnect-User         25
+VALUE  USR-Request-Type                NAS-Reboot-Request      26
+VALUE  USR-Request-Type                NAS-Reboot-Response     27
 # This value is used for Tacacs Plus translation
-VALUE  USR-Request-Type                        Tacacs-Message          253
-VALUE  USR-Request-Type                        Reserved                255
-
-VALUE  USR-NAS-Type                            3Com-NMC                0
-VALUE  USR-NAS-Type                            3Com-NETServer          1
-VALUE  USR-NAS-Type                            3Com-HiPerArc           2
+VALUE  USR-Request-Type                Tacacs-Message          253
+VALUE  USR-Request-Type                Reserved                255
+
+VALUE  USR-Speed-Of-Connection         Auto                    0
+VALUE  USR-Speed-Of-Connection         56                      1
+VALUE  USR-Speed-Of-Connection         64                      2
+VALUE  USR-Speed-Of-Connection         Voice                   3
+
+VALUE  USR-Expansion-Algorithm         Constant                1
+VALUE  USR-Expansion-Algorithm         Linear                  2
+
+VALUE  USR-Compression-Algorithm       None                    0
+VALUE  USR-Compression-Algorithm       Stac                    1
+VALUE  USR-Compression-Algorithm       Ascend                  2
+VALUE  USR-Compression-Algorithm       Microsoft               3
+VALUE  USR-Compression-Algorithm       Auto                    4
+
+VALUE  USR-Compression-Reset-Mode      Auto                    0
+VALUE  USR-Compression-Reset-Mode      Reset-Every-Packet      1
+VALUE  USR-Compression-Reset-Mode      Reset-On-Error          2
+
+VALUE  USR-Filter-Zones                enabled                 1
+VALUE  USR-Filter-Zones                disabled                2
+
+VALUE  USR-Bridging                    enabled                 1
+VALUE  USR-Bridging                    disabled                2
+
+VALUE  USR-Appletalk                   enabled                 1
+VALUE  USR-Appletalk                   disabled                2
+
+VALUE  USR-Spoofing                    enabled                 1
+VALUE  USR-Spoofing                    disabled                2
+
+VALUE  USR-Routing-Protocol            Rip1                    1
+VALUE  USR-Routing-Protocol            Rip2                    2
+
+VALUE  USR-IPX-Routing                 none                    0
+VALUE  USR-IPX-Routing                 send                    1
+VALUE  USR-IPX-Routing                 listen                  2
+VALUE  USR-IPX-Routing                 respond                 3
+VALUE  USR-IPX-Routing                 all                     4
+
+VALUE  USR-IPX-WAN                     enabled                 1
+VALUE  USR-IPX-WAN                     disabled                2
+
+VALUE  USR-IP-Default-Route-Option     enabled                 1
+VALUE  USR-IP-Default-Route-Option     disabled                2
+
+VALUE  USR-IP-RIP-Policies             SendDefault             0x0
+VALUE  USR-IP-RIP-Policies             SendRoutes              0x2
+VALUE  USR-IP-RIP-Policies             SendSubnets             0x4
+VALUE  USR-IP-RIP-Policies             AcceptDefault           0x8
+VALUE  USR-IP-RIP-Policies             SplitHorizon            0x10
+VALUE  USR-IP-RIP-Policies             PoisonReserve           0x20
+VALUE  USR-IP-RIP-Policies             FlashUpdate             0x40
+VALUE  USR-IP-RIP-Policies             SimpleAuth              0x80
+VALUE  USR-IP-RIP-Policies             V1Send                  0x100
+VALUE  USR-IP-RIP-Policies             V1Receive               0x200
+VALUE  USR-IP-RIP-Policies             V2Receive               0x400
+VALUE  USR-IP-RIP-Policies             Silent                  0x80000000
+
+VALUE  USR-Callback-Type               Normal                  1
+VALUE  USR-Callback-Type               ANI                     2
+VALUE  USR-Callback-Type               Static                  3
+VALUE  USR-Callback-Type               Dynamic                 4
+
+VALUE  USR-Agent                       FA                      1
+VALUE  USR-Agent                       HA                      2
+
+VALUE  USR-NAS-Type                    3Com-NMC                0
+VALUE  USR-NAS-Type                    3Com-NETServer          1
+VALUE  USR-NAS-Type                    3Com-HiPerArc           2
 VALUE  USR-NAS-Type                            TACACS+-Server          3
-VALUE  USR-NAS-Type                            3Com-SA-Server          4
-VALUE  USR-NAS-Type                            Ascend                  5
-VALUE  USR-NAS-Type                            Generic-RADIUS          6
-VALUE  USR-NAS-Type                            3Com-NETBuilder-II      7
-
-VALUE  USR-Auth-Mode                           Auth-3Com               0
-VALUE  USR-Auth-Mode                           Auth-Ace                1
-VALUE  USR-Auth-Mode                           Auth-Safeword           2
-VALUE  USR-Auth-Mode                           Auth-UNIX-PW            3
-VALUE  USR-Auth-Mode                           Auth-Defender           4
-VALUE  USR-Auth-Mode                           Auth-TACACSP            5
-VALUE  USR-Auth-Mode                           Auth-Netware            6
-VALUE  USR-Auth-Mode                           Auth-Skey               7
-VALUE  USR-Auth-Mode                           Auth-EAP-Proxy          8
-VALUE  USR-Auth-Mode                           Auth-UNIX-Crypt         9
+VALUE  USR-NAS-Type                    3Com-SA-Server          4
+VALUE  USR-NAS-Type                    Ascend                  5
+VALUE  USR-NAS-Type                    Generic-RADIUS          6
+VALUE  USR-NAS-Type                    3Com-NETBuilder-II      7
+
+VALUE  USR-Auth-Mode                   Auth-3Com               0
+VALUE  USR-Auth-Mode                   Auth-Ace                1
+VALUE  USR-Auth-Mode                   Auth-Safeword           2
+VALUE  USR-Auth-Mode                   Auth-UNIX-PW            3
+VALUE  USR-Auth-Mode                   Auth-Defender           4
+VALUE  USR-Auth-Mode                   Auth-TACACSP            5
+VALUE  USR-Auth-Mode                   Auth-Netware            6
+VALUE  USR-Auth-Mode                   Auth-Skey               7
+VALUE  USR-Auth-Mode                   Auth-EAP-Proxy          8
+VALUE  USR-Auth-Mode                   Auth-UNIX-Crypt         9
+
+VALUE  CW-Acct-Type                    COMS-UNKNOWN-ACCT-TYPE  0
+VALUE  CW-Acct-Type                    COMS-PREPAID-ACCT       1
+VALUE  CW-Acct-Type                    COMS-NEW-ACCT           2
+VALUE  CW-Acct-Type                    COMS-SUSPENDED-ACCT     3
+VALUE  CW-Acct-Type                    COMS-ADMINISTRATIVE-ACCT 4
+
+VALUE  CW-Source-Identifier            COMS-UNKNOWN-SOURCE     0
+VALUE  CW-Source-Identifier            COMS-INGRESS-OPEN       257
+VALUE  CW-Source-Identifier            COMS-EGRESS-OPEN        258
+VALUE  CW-Source-Identifier            COMS-GTKPR-GEN-INGR-OPEN 259
+VALUE  CW-Source-Identifier            COMS-GTKPR-GEN-EGR-OPEN 260
+VALUE  CW-Source-Identifier            COMS-INGRESS-CLOSE      513
+VALUE  CW-Source-Identifier            COMS-EGRESS-CLOSE       514
+VALUE  CW-Source-Identifier            COMS-GTKPR-GEN-INGR-CLOSE 515
+VALUE  CW-Source-Identifier            COMS-GTKPR-GEN-EGR-CLOSE 516
+
+VALUE  CW-Session-Sequence-End         NOT-THE-LAST-CALL       0
+VALUE  CW-Session-Sequence-End         LAST-CALL               1
+
+VALUE  CW-Clg-Party-E164-Type          comsUnknown             1
+VALUE  CW-Clg-Party-E164-Type          comsInternationalNumber 2
+VALUE  CW-Clg-Party-E164-Type          comsNationalNumber      3
+VALUE  CW-Clg-Party-E164-Type          comsNetworkSpecificNumber 4
+VALUE  CW-Clg-Party-E164-Type          comsSubscriberNumber    5
+VALUE  CW-Clg-Party-E164-Type          comsAbbreviatedNumber   6
+VALUE  CW-Clg-Party-E164-Type          comsReserved            7
+
+VALUE  CW-Clg-Party-Trans-Protocol     TCP                     1
+VALUE  CW-Clg-Party-Trans-Protocol     UDP                     2
+VALUE  CW-Clg-Party-Trans-Protocol     SCTP                    3
+
+VALUE  CW-Cld-Party-E164-Type          comsUnknown             1
+VALUE  CW-Cld-Party-E164-Type          comsInternationalNumber 2
+VALUE  CW-Cld-Party-E164-Type          comsNationalNumber      3
+VALUE  CW-Cld-Party-E164-Type          comsNetworkSpecificNumber 4
+VALUE  CW-Cld-Party-E164-Type          comsSubscriberNumber    5
+VALUE  CW-Cld-Party-E164-Type          comsAbbreviatedNumber   6
+VALUE  CW-Cld-Party-E164-Type          comsReserved            7
+
+VALUE  CW-Cld-Party-Trans-Protocol     TCP                     1
+VALUE  CW-Cld-Party-Trans-Protocol     UDP                     2
+VALUE  CW-Cld-Party-Trans-Protocol     SCTP                    3
+
+VALUE  CW-Ingr-Gway-E164-Type          comsUnknown             1
+VALUE  CW-Ingr-Gway-E164-Type          comsInternationalNumber 2
+VALUE  CW-Ingr-Gway-E164-Type          comsNationalNumber      3
+VALUE  CW-Ingr-Gway-E164-Type          comsNetworkSpecificNumber 4
+VALUE  CW-Ingr-Gway-E164-Type          comsSubscriberNumber    5
+VALUE  CW-Ingr-Gway-E164-Type          comsAbbreviatedNumber   6
+VALUE  CW-Ingr-Gway-E164-Type          comsReserved            7
+
+VALUE  CW-Ingr-Gway-Trans-Protocol     TCP                     1
+VALUE  CW-Ingr-Gway-Trans-Protocol     UDP                     2
+VALUE  CW-Ingr-Gway-Trans-Protocol     SCTP                    3
+
+VALUE  CW-Egr-Gway-Trans-Protocol      TCP                     1
+VALUE  CW-Egr-Gway-Trans-Protocol      UDP                     2
+VALUE  CW-Egr-Gway-Trans-Protocol      SCTP                    3
+
+VALUE  CW-Ingr-Gtkpr-Trans-Protocol    TCP                     1
+VALUE  CW-Ingr-Gtkpr-Trans-Protocol    UDP                     2
+VALUE  CW-Ingr-Gtkpr-Trans-Protocol    SCTP                    3
+
+VALUE  CW-Egr-Gtkpr-Trans-Protocol     TCP                     1
+VALUE  CW-Egr-Gtkpr-Trans-Protocol     UDP                     2
+VALUE  CW-Egr-Gtkpr-Trans-Protocol     SCTP                    3
+
+VALUE  CW-Call-Type                    COMS-UNKNOWN-CALLTYPE   0
+VALUE  CW-Call-Type                    COMS-PHONE-TO-PHONE     1
+VALUE  CW-Call-Type                    COMS-PHONE-TO-PC        2
+VALUE  CW-Call-Type                    COMS-PC-TO-PHONE        3
+VALUE  CW-Call-Type                    COMS-PC-TO-PC           4
+
+VALUE  CW-Codec-Type                   COMS-UNDEFINED-CODEC    0
+VALUE  CW-Codec-Type                   COMS-G723-1             1
+VALUE  CW-Codec-Type                   COMS-G729-A             2
+VALUE  CW-Codec-Type                   COMS-G710-ALaw          3
+VALUE  CW-Codec-Type                   COMS-G711-MuLaw         4
+VALUE  CW-Codec-Type                   COMS-FAX-MODULATION     255
+
+VALUE  CW-Call-Termination-Cause       CAUSE-UNKNOWN           0
+VALUE  CW-Call-Termination-Cause       CAUSE-CLD-PARTY-TERMINATE 1
+VALUE  CW-Call-Termination-Cause       CAUSE-CLG-PARTY-TERMINATE 2
+VALUE  CW-Call-Termination-Cause       CAUSE-ACCT-BAL-DEPLETED 3
+VALUE  CW-Call-Termination-Cause       CAUSE-NO-EGR-PORTS-AVAIL 4
+VALUE  CW-Call-Termination-Cause       CAUSE-H225-UNABLE-TO-CON 5
+VALUE  CW-Call-Termination-Cause       CAUSE-H245-UNABLE-TO-CON 6
+VALUE  CW-Call-Termination-Cause       CAUSE-INGR-FACILITY-DISC 7
+VALUE  CW-Call-Termination-Cause       CAUSE-EGR-FACILITY-DISC 8
+VALUE  CW-Call-Termination-Cause       CAUSE-DIR-SERVER-DOWN   9
+VALUE  CW-Call-Termination-Cause       CAUSE-RATING-SERVER-DOWN 10
+VALUE  CW-Call-Termination-Cause       CAUSE-GATEWAY-SHUTDOWN  11
+VALUE  CW-Call-Termination-Cause       CAUSE-GTKPR-TERMINATE   12
+VALUE  CW-Call-Termination-Cause       CAUSE-GTKPR-SHUTDOWN-GTWAY 13
+VALUE  CW-Call-Termination-Cause       CAUSE-BUSY              14
+VALUE  CW-Call-Termination-Cause       CAUSE-ABANDON           15
+VALUE  CW-Call-Termination-Cause       CAUSE-INVALID-LOGIN-LIMIT 16
+VALUE  CW-Call-Termination-Cause       CAUSE-NOACCTNUMBER-ENTRY 17
+VALUE  CW-Call-Termination-Cause       CAUSE-SUSPENDED-ACCT-LOGIN 18
+VALUE  CW-Call-Termination-Cause       CAUSE-AUTHENT-SERVER-DOWN 19
+VALUE  CW-Call-Termination-Cause       CAUSE-GATEKEEPER-TIMEOUT 20
+VALUE  CW-Call-Termination-Cause       CAUSE-GATEWAY-NO-RESOURCES 21
+VALUE  CW-Call-Termination-Cause       CAUSE-ACCT-INUSE        22
+VALUE  CW-Call-Termination-Cause       CAUSE-DEBIT-ACCT-BAL-ZERO 23
+VALUE  CW-Call-Termination-Cause       CAUSE-DEBIT-ACCTBAL-INSUFF 24
+VALUE  CW-Call-Termination-Cause       CAUSE-INVALID-DESTNUMBER-THRESH 25
+VALUE  CW-Call-Termination-Cause       CAUSE-NO-DESTNUMBER-ENTRY 26
+VALUE  CW-Call-Termination-Cause       CAUSE-SEQUENCE-DIALING-THRESH 27
+
+VALUE  CW-Signaling-Protocol           SIG-UNKNOWN             0
+VALUE  CW-Signaling-Protocol           SIG-SIP                 1
+VALUE  CW-Signaling-Protocol           SIG-H323                2
+
+VALUE  CW-Protocol-Transport           TCP                     1
+VALUE  CW-Protocol-Transport           UDP                     2
+VALUE  CW-Protocol-Transport           SCTP                    3
+
+VALUE  CW-Local-Sig-Trans-Protocol     TCP                     1
+VALUE  CW-Local-Sig-Trans-Protocol     UDP                     2
+VALUE  CW-Local-Sig-Trans-Protocol     SCTP                    3
+
+VALUE  CW-Remote-Sig-Trans-Protocol    TCP                     1
+VALUE  CW-Remote-Sig-Trans-Protocol    UDP                     2
+VALUE  CW-Remote-Sig-Trans-Protocol    SCTP                    3
+
+VALUE  CW-Local-MG-RTP-Protocol        TCP                     1
+VALUE  CW-Local-MG-RTP-Protocol        UDP                     2
+VALUE  CW-Local-MG-RTP-Protocol        SCTP                    3
+
+VALUE  CW-Remote-MG-RTP-Protocol       TCP                     1
+VALUE  CW-Remote-MG-RTP-Protocol       UDP                     2
+VALUE  CW-Remote-MG-RTP-Protocol       SCTP                    3
+
+VALUE  CW-Trans-Cld-Party-E164-Type    Unknown                 1
+VALUE  CW-Trans-Cld-Party-E164-Type    International-Number    2
+VALUE  CW-Trans-Cld-Party-E164-Type    National-Number         3
+VALUE  CW-Trans-Cld-Party-E164-Type    Network-Specific-Number 4
+VALUE  CW-Trans-Cld-Party-E164-Type    Subscriber-Number       5
+VALUE  CW-Trans-Cld-Party-E164-Type    Abbreviated-Number      6
+VALUE  CW-Trans-Cld-Party-E164-Type    Reserved                7
+
 END-VENDOR USR
diff --git a/radius/dictionary.wimax b/radius/dictionary.wimax
new file mode 100644 (file)
index 0000000..9efe72c
--- /dev/null
@@ -0,0 +1,369 @@
+# -*- text -*-
+##############################################################################
+#
+#      WiMAX Forum
+#
+#      Updated from NWG_R1_V1.2.1-Stage-3.pdf
+#
+#      NWG_R1_V1.2-Stage-3.pdf
+#      RADIUS discussion is on pp. 432-498
+#      WiMAX VSA's are on p. 450 and following.
+#
+#      DHCP && MIP keys are on p.48 and following.
+#
+#      WiMAX VSA's have a non-standard format:
+#
+#              type            1 octet
+#              length          1 octet
+#              continuation    1 octet      0bcrrrrrrr
+#              value           1+ octets
+#
+#      If the high bit of the "continuation" field is set, then
+#      the next attribute of the same WiMAX type should have it's
+#      value concatenated to this one.
+#
+#      The C bit MUST be zero for all small types.  e.g.  integer,
+#      ipaddr, ipv6addr, etc.  It MAY be set for "string" and "octet"
+#      types.  The maximum attribute length for "string" and "octet"
+#      types is still 253 bytes, even with continuations.  The WiMAX
+#      specifications do not specify a maximum length, so we have chosen
+#      to keep the traditional RADIUS maximum length here.
+#
+#      The C bit MAY be 1 for TLV types.  There is no restriction on
+#      TLV length other than maximum packet size (a bit less than 4K).
+#
+#      The rest of the bits in the "continuation" octet are reserved,
+#      and MUST be zero.
+#
+#      Each WiMAX VSA is packed into one Vendor-Specific attribute
+#      with Vendor-Id of WiMAX.  Multiple WiMAX sub-TLV's ARE packed
+#      into one VSA with an encapsulating TLV.
+#
+#      The WiMAX forum adds the following (non-standard) data types:
+#
+#      byte     - one-octet unsigned integer
+#      short    - two-octet unsigned integer in network byte order
+#      signed   - 4-octet signed integer in network byte order.
+#      combo-ip - if length 4, is the same as the "ipaddr" type.
+#                 if length 16, is the same as "ipv6addr" type.
+#      tlv      - encapsulated sub-attributes
+#                 i.e. Vendor-Specific -> WiMAX TLV -> WiMAX sub-tlv.
+#
+##############################################################################
+#
+#      $Id$
+#
+##############################################################################
+
+VENDOR         WiMAX                           24757   format=1,1,c
+
+BEGIN-VENDOR   WiMAX
+
+ATTRIBUTE      WiMAX-Capability                        1       tlv
+
+BEGIN-TLV      WiMAX-Capability
+ATTRIBUTE      WiMAX-Release                           1       string
+ATTRIBUTE      WiMAX-Accounting-Capabilities           2       byte
+ATTRIBUTE      WiMAX-Hotlining-Capabilities            3       byte
+ATTRIBUTE      WiMAX-Idle-Mode-Notification-Cap        4       byte
+
+# This is really a bitmap
+VALUE  WiMAX-Accounting-Capabilities   No-Accounting           0
+VALUE  WiMAX-Accounting-Capabilities   IP-Session-Based        1
+VALUE  WiMAX-Accounting-Capabilities   Flow-Based              2
+
+# This is really a bitmap
+VALUE  WiMAX-Hotlining-Capabilities    Not-Supported           0
+VALUE  WiMAX-Hotlining-Capabilities    Hotline-Profile-Id      1
+VALUE  WiMAX-Hotlining-Capabilities    NAS-Filter-Rule         2
+VALUE  WiMAX-Hotlining-Capabilities    HTTP-Redirection        4
+VALUE  WiMAX-Hotlining-Capabilities    IP-Redirection          8
+
+VALUE  WiMAX-Idle-Mode-Notification-Cap Not-Supported          0
+VALUE  WiMAX-Idle-Mode-Notification-Cap Supported              1
+
+END-TLV                WiMAX-Capability
+
+ATTRIBUTE      WiMAX-Device-Authentication-Indicator   2       byte
+ATTRIBUTE      WiMAX-GMT-Timezone-offset               3       signed
+ATTRIBUTE      WiMAX-AAA-Session-Id                    4       octets
+
+# 32 octets in length
+ATTRIBUTE      WiMAX-MSK                               5       octets encrypt=2
+ATTRIBUTE      WiMAX-hHA-IP-MIP4                       6       ipaddr
+ATTRIBUTE      WiMAX-hHA-IP-MIP6                       7       ipv6addr
+ATTRIBUTE      WiMAX-DHCPv4-Server                     8       combo-ip
+ATTRIBUTE      WiMAX-DHCPv6-Server                     9       combo-ip
+
+# MN-HA-CMIP4 = H(MIP-RK, "CMIP4 MN HA" | HA-IPv4 | MN-NAI), or
+# MN-HA-PMIP4 = H(MIP-RK, "PMIP4 MN HA" | HA-IPv4 | MN-NAI)
+ATTRIBUTE      WiMAX-MN-hHA-MIP4-Key                   10      octets encrypt=2
+
+# MN-HA-CMIP4-SPI == MIP-SPI, or
+# MN-HA-PIMP4-SPI == MIP-SPI + 1
+ATTRIBUTE      WiMAX-MN-hHA-MIP4-SPI                   11      octets
+
+# MN-HA-CMIP6 = H(MIP-RK, "CMIP6 MN HA" | HA-IPv6 | MN-NAI)
+ATTRIBUTE      WiMAX-MN-hHA-MIP6-Key                   12      octets encrypt=2
+
+# MN-HA-CMIP6-SPI == MIP-SPI + 2
+ATTRIBUTE      WiMAX-MN-hHA-MIP6-SPI                   13      integer
+
+# FA-RK = H(MIP-RK, "FA-RK")
+ATTRIBUTE      WiMAX-FA-RK-Key                         14      octets encrypt=2
+
+# 160 bit random number
+ATTRIBUTE      WiMAX-HA-RK-Key                         15      octets encrypt=2
+# SPI-CMIP4
+ATTRIBUTE      WiMAX-HA-RK-SPI                         16      integer
+
+ATTRIBUTE      WiMAX-HA-RK-Lifetime                    17      integer
+
+#  The same as MN-HA-CMIP4, etc.  But in different packets.
+ATTRIBUTE      WiMAX-RRQ-HA-IP                         18      combo-ip
+ATTRIBUTE      WiMAX-RRQ-MN-HA-Key                     19      octets encrypt=2
+ATTRIBUTE      WiMAX-RRQ-MN-HA-SPI                     20      integer
+
+ATTRIBUTE      WiMAX-Session-Continue                  21      integer
+ATTRIBUTE      WiMAX-Beginning-Of-Session              22      integer
+ATTRIBUTE      WiMAX-IP-Technology                     23      integer
+
+VALUE  WiMAX-IP-Technology             Reserved-0              0
+VALUE  WiMAX-IP-Technology             Reserved-1              1
+VALUE  WiMAX-IP-Technology             PMIP4                   2
+VALUE  WiMAX-IP-Technology             CMIP4                   3
+VALUE  WiMAX-IP-Technology             CMIP6                   4
+VALUE  WiMAX-IP-Technology             Ethernet-CS             5
+
+ATTRIBUTE      WiMAX-Hotline-Indicator                 24      string
+ATTRIBUTE      WiMAX-Prepaid-Indicator                 25      byte
+ATTRIBUTE      WiMAX-PDFID                             26      short
+ATTRIBUTE      WiMAX-SDFID                             27      short
+ATTRIBUTE      WiMAX-Packet-Flow-Descriptor            28      tlv
+
+BEGIN-TLV WiMAX-Packet-Flow-Descriptor
+ATTRIBUTE      WiMAX-Packet-Data-Flow-Id               1       short
+ATTRIBUTE      WiMAX-Service-Data-Flow-Id              2       short
+ATTRIBUTE      WiMAX-Service-Profile-Id                3       integer
+ATTRIBUTE      WiMAX-Direction                         4       byte
+
+VALUE  WiMAX-Direction                 Reserved-0              0
+VALUE  WiMAX-Direction                 Uplink                  1
+VALUE  WiMAX-Direction                 Downlink                2
+VALUE  WiMAX-Direction                 Bi-Directional          3
+
+ATTRIBUTE      WiMAX-Activation-Trigger                5       byte    # bitmap
+ATTRIBUTE      WiMAX-Transport-Type                    6       byte
+
+VALUE  WiMAX-Transport-Type            Reserved-0              0
+VALUE  WiMAX-Transport-Type            IPv4-CS                 1
+VALUE  WiMAX-Transport-Type            IPv6-CS                 2
+VALUE  WiMAX-Transport-Type            Ethernet                3
+
+ATTRIBUTE      WiMAX-Uplink-QOS-Id                     7       byte
+ATTRIBUTE      WiMAX-Downlink-QOS-Id                   8       byte
+ATTRIBUTE      WiMAX-Uplink-Classifier                 9       string
+ATTRIBUTE      WiMAX-Downlink-Classifier               10      string
+END-TLV        WiMAX-Packet-Flow-Descriptor
+
+ATTRIBUTE      WiMAX-QoS-Descriptor                    29      tlv
+
+BEGIN-TLV WiMAX-QoS-Descriptor
+ATTRIBUTE      WiMAX-QoS-Id                            1       byte
+ATTRIBUTE      WiMAX-Global-Service-Class-Name         2       string # 6 octets
+ATTRIBUTE      WiMAX-Service-Class-Name                3       string
+ATTRIBUTE      WiMAX-Schedule-Type                     4       byte
+ATTRIBUTE      WiMAX-Traffic-Priority                  5       byte
+ATTRIBUTE      WiMAX-Maximum-Sustained-Traffic-Rate    6       integer
+ATTRIBUTE      WiMAX-Minimum-Reserved-Traffic-Rate     7       integer
+ATTRIBUTE      WiMAX-Maximum-Traffic-Burst             8       integer
+ATTRIBUTE      WiMAX-Tolerated-Jitter                  9       integer
+ATTRIBUTE      WiMAX-Maximum-Latency                   10      integer
+ATTRIBUTE      WiMAX-Reduced-Resources-Code            11      byte
+ATTRIBUTE      WiMAX-Media-Flow-Type                   12      byte
+ATTRIBUTE      WiMAX-Unsolicited-Grant-Interval        13      short
+ATTRIBUTE      WiMAX-SDU-Size                          14      short
+ATTRIBUTE      WiMAX-Unsolicited-Polling-Interval      15      short
+ATTRIBUTE      WiMAX-Media-Flow-Description-SDP        16      string
+
+VALUE  WiMAX-Schedule-Type             Best-Effort             2
+VALUE  WiMAX-Schedule-Type             nrtPS                   3
+VALUE  WiMAX-Schedule-Type             rtPS                    4
+VALUE  WiMAX-Schedule-Type             Extended-rtPS           5
+VALUE  WiMAX-Schedule-Type             UGS                     6
+
+VALUE  WiMAX-Media-Flow-Type           VoIP                    1
+VALUE  WiMAX-Media-Flow-Type           Robust-Browser          2
+VALUE  WiMAX-Media-Flow-Type           Secure-Browser-VPN      3
+VALUE  WiMAX-Media-Flow-Type           Streaming-Video         4
+VALUE  WiMAX-Media-Flow-Type           Streaming-Live-TV       5
+VALUE  WiMAX-Media-Flow-Type           Music-Photo-Download    6
+VALUE  WiMAX-Media-Flow-Type           Multi-Player-Gaming     7
+VALUE  WiMAX-Media-Flow-Type           Location-Based-Services 8
+VALUE  WiMAX-Media-Flow-Type           Text-Audio-Books        9
+VALUE  WiMAX-Media-Flow-Type           Video-Conversation      10
+VALUE  WiMAX-Media-Flow-Type           Message                 11
+VALUE  WiMAX-Media-Flow-Type           Control                 12
+VALUE  WiMAX-Media-Flow-Type           Data                    13
+
+END-TLV WiMAX-QoS-Descriptor
+
+ATTRIBUTE      WiMAX-Uplink-Granted-QoS                30      string
+ATTRIBUTE      WiMAX-Control-Packets-In                31      integer
+ATTRIBUTE      WiMAX-Control-Octets-In                 32      integer
+ATTRIBUTE      WiMAX-Control-Packets-Out               33      integer
+ATTRIBUTE      WiMAX-Control-Octets-Out                34      integer
+ATTRIBUTE      WiMAX-PPAC                              35      tlv
+
+BEGIN-TLV WiMAX-PPAC
+ATTRIBUTE      WiMAX-Available-In-Client               1       integer
+
+# Really a bitmap
+VALUE  WiMAX-Available-In-Client       Volume-Metering         1
+VALUE  WiMAX-Available-In-Client       Duration-Metering       2
+VALUE  WiMAX-Available-In-Client       Resource-Metering       4
+VALUE  WiMAX-Available-In-Client       Pools                   8
+VALUE  WiMAX-Available-In-Client       Rating-Groups           0x10
+VALUE  WiMAX-Available-In-Client       Multi-Services          0x20
+VALUE  WiMAX-Available-In-Client       Tariff-Switch           0x40
+END-TLV WiMAX-PPAC
+
+ATTRIBUTE      WiMAX-Session-Termination-Capability    36      integer
+
+# Really a bitmap
+VALUE  WiMAX-Session-Termination-Capability Dynamic-Authorization 1
+
+ATTRIBUTE      WiMAX-PPAQ                              37      tlv
+
+BEGIN-TLV      WiMAX-PPAQ
+ATTRIBUTE      WiMAX-PPAQ-Quota-Identifier             1       octets
+ATTRIBUTE      WiMAX-Volume-Quota                      2       integer #kb
+ATTRIBUTE      WiMAX-Volume-Threshold                  3       integer #kb
+ATTRIBUTE      WiMAX-Duration-Quota                    4       integer #s
+ATTRIBUTE      WiMAX-Duration-Threshold                5       integer #s
+ATTRIBUTE      WiMAX-Resource-Quota                    6       integer
+ATTRIBUTE      WiMAX-Resource-Threshold                7       integer
+ATTRIBUTE      WiMAX-Update-Reason                     8       integer
+ATTRIBUTE      WiMAX-Prepaid-Server                    9       combo-ip
+ATTRIBUTE      WiMAX-Service-Id                        10      string
+ATTRIBUTE      WiMAX-Rating-Group-Id                   11      integer
+ATTRIBUTE      WiMAX-Termination-Action                12      byte
+ATTRIBUTE      WiMAX-Pool-Id                           13      integer
+ATTRIBUTE      WiMAX-Pool-Multiplier                   14      integer
+ATTRIBUTE      WiMAX-Requested-Action                  15      byte
+ATTRIBUTE      WiMAX-Check-Balance-Result              16      byte
+
+#
+#  4 octets - integer representing 1/10's of lowest currency (e.g. cents)
+#  4 octets - currency code as in ISO-4217
+#  1+      - UTF8 string containing text like "cost is $1 per minute"
+#
+ATTRIBUTE      WiMAX-Cost-Information-AVP              17      octets
+
+VALUE  WiMAX-Update-Reason             Pre-Initialization      1
+VALUE  WiMAX-Update-Reason             Initial-Request         2
+VALUE  WiMAX-Update-Reason             Threshold-Reached       3
+VALUE  WiMAX-Update-Reason             Quota-Reached           4
+VALUE  WiMAX-Update-Reason             TITSU-Approaching       5
+VALUE  WiMAX-Update-Reason             Remote-Forced-Disconnect 6
+VALUE  WiMAX-Update-Reason             Client-Service-Termination 7
+VALUE  WiMAX-Update-Reason             Access-Service-Terminated 8
+VALUE  WiMAX-Update-Reason             Service-Not-Established 9
+VALUE  WiMAX-Update-Reason             One-Time-Charging       10
+
+VALUE  WiMAX-Termination-Action        Terminate               1
+VALUE  WiMAX-Termination-Action        Request-More-Quota      2
+VALUE  WiMAX-Termination-Action        Redirect-Or-Filter      3
+
+VALUE  WiMAX-Requested-Action          Balance-Check           1
+VALUE  WiMAX-Requested-Action          Price-Enquiry           2
+
+END-TLV                WiMAX-PPAQ
+
+ATTRIBUTE      WiMAX-Prepaid-Tariff-Switching          38      tlv
+
+BEGIN-TLV      WiMAX-Prepaid-Tariff-Switching
+ATTRIBUTE      WiMAX-Prepaid-Quota-Identifier          1       string
+ATTRIBUTE      WiMAX-Volume-Used-After                 2       integer #1k
+ATTRIBUTE      WiMAX-Tariff-Switch-Interval            3       integer #s
+ATTRIBUTE      WiMAX-Time-Interval-After               4       integer #s
+END-TLV                WiMAX-Prepaid-Tariff-Switching
+
+ATTRIBUTE      WiMAX-Active-Time-Duration              39      integer
+ATTRIBUTE      WiMAX-DHCP-RK                           40      octets encrypt=2
+ATTRIBUTE      WiMAX-DHCP-RK-Key-Id                    41      integer
+ATTRIBUTE      WiMAX-DHCP-RK-Lifetime                  42      integer
+ATTRIBUTE      WiMAX-DHCP-Msg-Server-IP                43      ipaddr
+ATTRIBUTE      WiMAX-Idle-Mode-Transition              44      byte
+ATTRIBUTE      WiMAX-NAP-Id                            45      octets
+
+# 3 octets of NAP Id
+# 3 octets of base-station Id
+ATTRIBUTE      WiMAX-BS-Id                             46      octets
+ATTRIBUTE      WiMAX-Location                          47      octets
+
+# Number of times Acct-Input-Packets rolled over 2^32.
+ATTRIBUTE      WiMAX-Acct-Input-Packets-Gigaword       48      integer
+ATTRIBUTE      WiMAX-Acct-Output-Packets-Gigaword      49      integer
+
+# Formatted as per IP Filter rule specification.
+ATTRIBUTE      WiMAX-Uplink-Flow-Description           50      string
+
+ATTRIBUTE      WiMAX-Blu-Coa-IPv6                      51      ipv6addr
+ATTRIBUTE      WiMAX-DNS-Server                        52      combo-ip
+ATTRIBUTE      WiMAX-Hotline-Profile-Id                53      string
+
+# Formatted as per IP Filter rule specification.
+ATTRIBUTE      WiMAX-HTTP-Redirection-Rule             54      string
+
+# Formatted as per IP Filter rule specification.
+ATTRIBUTE      WiMAX-IP-Redirection-Rule               55      string
+ATTRIBUTE      WiMAX-Hotline-Session-Timer             56      integer
+
+# 3 octets
+ATTRIBUTE      WiMAX-NSP-Id                            57      octets
+ATTRIBUTE      WiMAX-HA-RK-Key-Requested               58      integer
+
+VALUE  WiMAX-HA-RK-Key-Requested       No                      0
+VALUE  WiMAX-HA-RK-Key-Requested       Yes                     1
+
+ATTRIBUTE      WiMAX-Count-Type                        59      byte
+ATTRIBUTE      WiMAX-DM-Action-Code                    60      integer
+
+VALUE  WiMAX-DM-Action-Code            Deregister-MS           0
+VALUE  WiMAX-DM-Action-Code            Suspend-MS-Traffic      1
+VALUE  WiMAX-DM-Action-Code            Suspend-User-Traffic    2
+VALUE  WiMAX-DM-Action-Code            Resume-Traffic          3
+VALUE  WiMAX-DM-Action-Code            MS-Terminate            4
+VALUE  WiMAX-DM-Action-Code            MS-Idle                 5
+VALUE  WiMAX-DM-Action-Code            MS-Completed-IPv6-Handover 6
+VALUE  WiMAX-DM-Action-Code            BS-Sends-RES-Cmd        0xffff
+
+# FA-RK-SPI = SPI-CMIP4 = MIP-SPI
+ATTRIBUTE      WiMAX-FA-RK-SPI                         61      integer
+
+# Formatted as per IP Filter rule specification.
+ATTRIBUTE      WiMAX-Downlink-Flow-Description         62      string
+
+# Same as QoS-Descriptor... dang.
+ATTRIBUTE      WiMAX-Downlink-Granted-QoS              63      tlv
+
+# More MIP keys, calculated as above... but in different packets.
+# Why, oh why?
+ATTRIBUTE      WiMAX-vHA-IP-MIP4                       64      ipaddr
+ATTRIBUTE      WiMAX-vHA-IP-MIP6                       65      ipv6addr
+ATTRIBUTE      WiMAX-vHA-MIP4-Key                      66      octets encrypt=2
+ATTRIBUTE      WiMAX-vHA-RK-Key                        67      octets encrypt=2
+ATTRIBUTE      WiMAX-vHA-RK-SPI                        68      integer
+ATTRIBUTE      WiMAX-vHA-RK-Lifetime                   69      integer
+
+ATTRIBUTE      WiMAX-MN-vHA-MIP6-Key                   70      octets encrypt=2
+ATTRIBUTE      WiMAX-MN-vHA-MIP4-SPI                   71      integer
+ATTRIBUTE      WiMAX-MN-vHA-MIP6-SPI                   72      integer
+ATTRIBUTE      WiMAX-vDHCPv4-Server                    73      ipaddr
+ATTRIBUTE      WiMAX-vDHCPv6-Server                    74      ipv6addr
+ATTRIBUTE      WiMAX-vDHCP-RK                          75      octets encrypt=2
+ATTRIBUTE      WiMAX-vDHCP-RK-Key-ID                   76      integer
+ATTRIBUTE      WiMAX-vDHCP-RK-Lifetime                 77      integer
+
+END-VENDOR     WiMAX