From David Frascone: update to the DIAMETER dissector for

draft-ietf-aaa-diameter-07.  His changenotes:

	Changes:

	o       Flags are now done properly.  (I changed it to dissect
		them like packet-tcp.c does)

	o       Completely re-did the dictionary.  I think it is much
		more maintainable now.  And, it is no longer dynamically
		generated.

	o       Added some lookup routines to work with new dictionary.

	o       Removed lots of old lookup stuff that had been cloned
		from packet-radius.c.  It's much cleaner now.

svn path=/trunk/; revision=3799

1 files changed, 286 insertions, 830 deletions

diff --git a/packet-diameter-defs.h b/packet-diameter-defs.h
index 4de27cd803..14458f1b0b 100644
--- a/packet-diameter-defs.h
+++ b/packet-diameter-defs.h
@@ -9,631 +9,30 @@
 #ifndef _PACKET_DIAMETER_DEFS_H
 #define _PACKET_DIAMETER_DEFS_H
 
-/* Attributes */
-#define DIAMETER_ATT_USER_NAME 1
-#define DIAMETER_ATT_USER_PASSWORD 2
-#define DIAMETER_ATT_CHAP_PASSWORD 3
-#define DIAMETER_ATT_NAS_IP_ADDRESS 4
-#define DIAMETER_ATT_NAS_PORT 5
-#define DIAMETER_ATT_SERVICE_TYPE 6
-#define DIAMETER_ATT_FRAMED_PROTOCOL 7
-#define DIAMETER_ATT_FRAMED_IP_ADDRESS 8
-#define DIAMETER_ATT_FRAMED_IP_NETMASK 9
-#define DIAMETER_ATT_FRAMED_ROUTING 10
-#define DIAMETER_ATT_FILTER_ID 11
-#define DIAMETER_ATT_FRAMED_MTU 12
-#define DIAMETER_ATT_FRAMED_COMPRESSION 13
-#define DIAMETER_ATT_LOGIN_IP_HOST 14
-#define DIAMETER_ATT_LOGIN_SERVICE 15
-#define DIAMETER_ATT_LOGIN_TCP_PORT 16
-#define DIAMETER_ATT_OLD_PASSWORD 17
-#define DIAMETER_ATT_REPLY_MESSAGE 18
-#define DIAMETER_ATT_CALLBACK_NUMBER 19
-#define DIAMETER_ATT_CALLBACK_ID 20
-#define DIAMETER_ATT_FRAMED_ROUTE 22
-#define DIAMETER_ATT_FRAMED_IPX_NETWORK 23
-#define DIAMETER_ATT_STATE 24
-#define DIAMETER_ATT_CLASS 25
-#define DIAMETER_ATT_SESSION_TIMEOUT 27
-#define DIAMETER_ATT_IDLE_TIMEOUT 28
-#define DIAMETER_ATT_TERMINATION_ACTION 29
-#define DIAMETER_ATT_CALLED_STATION_ID 30
-#define DIAMETER_ATT_CALLING_STATION_ID 31
-#define DIAMETER_ATT_NAS_IDENTIFIER 32
-#define DIAMETER_ATT_PROXY_STATE 33
-#define DIAMETER_ATT_LOGIN_LAT_SERVICE 34
-#define DIAMETER_ATT_LOGIN_LAT_NODE 35
-#define DIAMETER_ATT_LOGIN_LAT_GROUP 36
-#define DIAMETER_ATT_FRAMED_APPLETALK_LINK 37
-#define DIAMETER_ATT_FRAMED_APPLETALK_NETWORK 38
-#define DIAMETER_ATT_FRAMED_APPLETALK_ZONE 39
-#define DIAMETER_ATT_CHAP_CHALLENGE 60
-#define DIAMETER_ATT_NAS_PORT_TYPE 61
-#define DIAMETER_ATT_PORT_LIMIT 62
-#define DIAMETER_ATT_LOGIN_LAT_PORT 63
-#define DIAMETER_ATT_TUNNEL_TYPE 64
-#define DIAMETER_ATT_TUNNEL_MEDIUM_TYPE 65
-#define DIAMETER_ATT_ACCT_TUNNEL_CLIENT_ENDPOINT 66
-#define DIAMETER_ATT_TUNNEL_SERVER_ENDPOINT 67
-#define DIAMETER_ATT_ACCT_TUNNEL_CONNECTION_ID 68
-#define DIAMETER_ATT_TUNNEL_PASSWORD 69
-#define DIAMETER_ATT_ARAP_PASSWORD 70
-#define DIAMETER_ATT_ARAP_FEATURES 71
-#define DIAMETER_ATT_ARAP_ZONE_ACCESS 72
-#define DIAMETER_ATT_ARAP_SECURITY 73
-#define DIAMETER_ATT_ARAP_SECURITY_DATA 74
-#define DIAMETER_ATT_PASSWORD_RETRY 75
-#define DIAMETER_ATT_PROMPT 76
-#define DIAMETER_ATT_CONNECT_INFO 77
-#define DIAMETER_ATT_CONFIGURATION_TOKEN 78
-#define DIAMETER_ATT_EAP_MESSAGE 79
-#define DIAMETER_ATT_SIGNATURE 80
-#define DIAMETER_ATT_ACCT_STATUS_TYPE 40
-#define DIAMETER_ATT_ACCT_DELAY_TIME 41
-#define DIAMETER_ATT_ACCT_INPUT_OCTETS 42
-#define DIAMETER_ATT_ACCT_OUTPUT_OCTETS 43
-#define DIAMETER_ATT_ACCT_SESSION_ID 44
-#define DIAMETER_ATT_ACCT_AUTHENTIC 45
-#define DIAMETER_ATT_ACCT_SESSION_TIME 46
-#define DIAMETER_ATT_ACCT_INPUT_PACKETS 47
-#define DIAMETER_ATT_ACCT_OUTPUT_PACKETS 48
-#define DIAMETER_ATT_ACCT_TERMINATE_CAUSE 49
-#define DIAMETER_ATT_ACCT_MULTI_SESSION_ID 50
-#define DIAMETER_ATT_ACCT_LINK_COUNT 51
-#define DIAMETER_ATT_MERIT_ENCAPSULATED 141
-#define DIAMETER_ATT_MERIT_REPLY_IF_ACK_MESSAGE 144
-#define DIAMETER_ATT_MERIT_LAS_START_TIME 145
-#define DIAMETER_ATT_MERIT_LAS_CODE 146
-#define DIAMETER_ATT_MERIT_LAS_DURATION 147
-#define DIAMETER_ATT_MERIT_LOCAL_DURATION 148
-#define DIAMETER_ATT_MERIT_HUNTGROUP_SERVICE 149
-#define DIAMETER_ATT_MERIT_PORT_ENTRY 150
-#define DIAMETER_ATT_MERIT_PROXY_ACTION 211
-#define DIAMETER_ATT_MERIT_TOKEN 213
-#define DIAMETER_ATT_MERIT_OWNERSHIP 219
-#define DIAMETER_ATT_MERIT_SUBGROUP 220
-#define DIAMETER_ATT_MERIT_HUNTGROUP_NAME 221
-#define DIAMETER_ATT_MERIT_USER_ID 222
-#define DIAMETER_ATT_MERIT_USER_REALM 223
-#define DIAMETER_ATT_AUTHENTICATION_TRANSFORM_ID 285
-#define DIAMETER_ATT_AUTHORIZATION_LIFETIME 291
-#define DIAMETER_ATT_DESTINATION_NAI 293
-#define DIAMETER_ATT_DIGEST 287
-#define DIAMETER_ATT_ENCRYPTED_DATA 290
-#define DIAMETER_ATT_ENCRYPTED_PAYLOAD 260
-#define DIAMETER_ATT_ENCRYPTION_TRANSFORM_ID 288
-#define DIAMETER_ATT_ERROR_MESSAGE 281
-#define DIAMETER_ATT_ERROR_REPORTING_NAI 294
-#define DIAMETER_ATT_EXTENSION_ID 258
-#define DIAMETER_ATT_FAILED_AVP 279
-#define DIAMETER_ATT_FAILED_COMMAND_CODE 270
-#define DIAMETER_ATT_FIRMWARE_REVISION 267
-#define DIAMETER_ATT_HOST_IP_ADDRESS 257
-#define DIAMETER_ATT_HOST_NAME 264
-#define DIAMETER_ATT_INTEGRITY_CHECK_VALUE 259
-#define DIAMETER_ATT_KEY_ID 286
-#define DIAMETER_ATT_NONCE 261
-#define DIAMETER_ATT_PLAINTEXT_DATA_LENGTH 289
-#define DIAMETER_ATT_PROXY_ADDRESS 289
-#define DIAMETER_ATT_PROXY_INFO 284
-#define DIAMETER_ATT_PROXY_STATE 33
-#define DIAMETER_ATT_REDIRECT_HOST_ADDRESS 278
-#define DIAMETER_ATT_REDIRECT_HOST_PORT 277
-#define DIAMETER_ATT_REDIRECT_HOST 292
-#define DIAMETER_ATT_RESULT_CODE 268
-#define DIAMETER_ATT_ROUTE_RECORD 282
-#define DIAMETER_ATT_ROUTING_REALM 283
-#define DIAMETER_ATT_SESSION_ID 263
-#define DIAMETER_ATT_SESSION_TIMEOUT 27
-#define DIAMETER_ATT_TIMESTAMP 262
-#define DIAMETER_ATT_USER_NAME 1
-#define DIAMETER_ATT_VENDOR_ID 266
-#define DIAMETER_ATT_ACCOUNTING_AUTHENTICATION_TYPE 45
-#define DIAMETER_ATT_ACCOUNTING_INTERIM_INTERVAL 482
-#define DIAMETER_ATT_ACCOUNTING_RECORD_NUMBER 485
-#define DIAMETER_ATT_ACCOUNTING_RECORD_TYPE 480
-#define DIAMETER_ATT_ACCOUNTING_SESSION_ID 44
-#define DIAMETER_ATT_ACCOUNTING_STATE 486
-#define DIAMETER_ATT_ACCOUNTING_INPUT_OCTETS 42
-#define DIAMETER_ATT_ACCOUNTING_OUTPUT_OCTETS 43
-#define DIAMETER_ATT_ACCOUNTING_INPUT_PACKETS 47
-#define DIAMETER_ATT_ACCOUNTING_OUTPUT_PACKETS 48
-#define DIAMETER_ATT_ACCOUNTING_SESSION_TIME 46
-#define DIAMETER_ATT_MIP_REG_REQUEST 320
-#define DIAMETER_ATT_MIP_REG_REPLY 321
-#define DIAMETER_ATT_MIP_MN_AAA_SPI 341
-#define DIAMETER_ATT_MIP_AUTH_INPUT_DATA_LENGTH 338
-#define DIAMETER_ATT_MIP_AUTHENTICATOR_LENGTH 339
-#define DIAMETER_ATT_MIP_AUTHENTICATOR_OFFSET 340
-#define DIAMETER_ATT_MIP_MN_AAA_AUTH 322
-#define DIAMETER_ATT_MIP_MOBILE_NODE_ADDRESS 333
-#define DIAMETER_ATT_MIP_HOME_AGENT_ADDRESS 334
-#define DIAMETER_ATT_MIP_PREVIOUS_FA_NAI 335
-#define DIAMETER_ATT_MIP_PREVIOUS_FA_ADDR 336
-#define DIAMETER_ATT_MIP_FEATURE_VECTOR 337
-#define DIAMETER_ATT_MIP_PEER_SPI 342
-#define DIAMETER_ATT_MIP_SESSION_KEY 343
-#define DIAMETER_ATT_MIP_MN_TO_FA_KEY 325
-#define DIAMETER_ATT_MIP_MN_TO_HA_KEY 331
-#define DIAMETER_ATT_MIP_FA_TO_MN_KEY 326
-#define DIAMETER_ATT_MIP_FA_TO_HA_KEY 328
-#define DIAMETER_ATT_MIP_HA_TO_FA_KEY 329
-#define DIAMETER_ATT_MIP_HA_TO_MN_KEY 332
-#define DIAMETER_ATT_MIP_FA_MN_PREFERRED_SPI 324
-#define DIAMETER_ATT_MIP_FA_HA_PREFERRED_SPI 327
-#define DIAMETER_ATT_FILTER_RULE 400
-#define DIAMETER_ATT_REQUEST_TYPE 401
-#define DIAMETER_ATT_EAP_PAYLOAD 402
-#define DIAMETER_ATT_CMS_DATA 310
-#define DIAMETER_ATT_RES_MGMT_INDEX 573
-#define DIAMETER_ATT_RES_MGMT_TOKEN 574
-#define DIAMETER_ATT_SOURCE_HOST 600
-#define DIAMETER_ATT_DESTINATION_HOST 601
-#define DIAMETER_ATT_SOURCE_PORT 602
-#define DIAMETER_ATT_DESTINATION_PORT 603
-#define DIAMETER_ATT_PROTOCOL 604
-#define DIAMETER_ATT_RSVP_SERVICE_TYPE 605
-#define DIAMETER_ATT_TOKEN_BUCKET_RATE 606
-#define DIAMETER_ATT_TOKEN_BUCKET_SIZE 607
-#define DIAMETER_ATT_PEAK_DATA_RATE 608
-#define DIAMETER_ATT_MINIMUM_POLICED_UNIT 609
-#define DIAMETER_ATT_MAXIMUM_PACKET_SIZE 610
-#define DIAMETER_ATT_QOS_RATE 611
-#define DIAMETER_ATT_SLACK_TERM 612
-#define DIAMETER_ATT_TOS_DS_VALUE 613
-#define DIAMETER_ATT_INTERFACE_ADDRESS 614
-#define DIAMETER_ATT_QOS_SERVICE_TYPE 615
-#define DIAMETER_ATT_VOIP_CALLER 686
-#define DIAMETER_ATT_VOIP_CALLEE 687
-#define DIAMETER_ATT_VOIP_CHALLENGE 688
-#define DIAMETER_ATT_VOIP_RESPONSE 689
-#define DIAMETER_ATT_VOIP_SESSION_LENGTH 690
-#define DIAMETER_ATT_SUN_PING_TIMESTAMP 1
-#define DIAMETER_ATT_COMMENT 1024
-#define DIAMETER_ATT_XVALUE 1025
-#define DIAMETER_ATT_XSTRING 1026
-#define DIAMETER_ATT_AUTHENTICATION_TYPE 1027
-#define DIAMETER_ATT_PROHIBIT 1028
-#define DIAMETER_ATT_USER_CATEGORY 1029
-#define DIAMETER_ATT_GROUP_NAME 1030
-#define DIAMETER_ATT_ENCRYPTED_PASSWORD 1031
-#define DIAMETER_ATT_EXPIRATION 1032
-#define DIAMETER_ATT_PASSWORD 1033
-#define DIAMETER_ATT_SIMULTANEOUS_USE 1034
-#define DIAMETER_ATT_SESSION_LIMIT 1034
-#define DIAMETER_ATT_SERVER_NAME 1035
-#define DIAMETER_ATT_FRAMED_IP_ADDRESS_POOL_NAME 1036
-#define DIAMETER_ATT_SERVICE_CLASS 1037
-#define DIAMETER_ATT_DENY_MESSAGE 1038
-#define DIAMETER_ATT_SOURCE_SUBNET 1039
-#define DIAMETER_ATT_DESTINATION_SUBNET 1040
-#define DIAMETER_ATT_MAX_QOS_RATE 1041
-#define DIAMETER_ATT_EXAMPLE_AVP 999999
-
-
-            /* Attribute to String table */
-
-static value_string diameter_attrib_type_vals[] = {
-   {DIAMETER_ATT_USER_NAME, "User-Name"},
-   {DIAMETER_ATT_USER_PASSWORD, "User-Password"},
-   {DIAMETER_ATT_CHAP_PASSWORD, "CHAP-Password"},
-   {DIAMETER_ATT_NAS_IP_ADDRESS, "NAS-IP-Address"},
-   {DIAMETER_ATT_NAS_PORT, "NAS-Port"},
-   {DIAMETER_ATT_SERVICE_TYPE, "Service-Type"},
-   {DIAMETER_ATT_FRAMED_PROTOCOL, "Framed-Protocol"},
-   {DIAMETER_ATT_FRAMED_IP_ADDRESS, "Framed-IP-Address"},
-   {DIAMETER_ATT_FRAMED_IP_NETMASK, "Framed-IP-Netmask"},
-   {DIAMETER_ATT_FRAMED_ROUTING, "Framed-Routing"},
-   {DIAMETER_ATT_FILTER_ID, "Filter-Id"},
-   {DIAMETER_ATT_FRAMED_MTU, "Framed-MTU"},
-   {DIAMETER_ATT_FRAMED_COMPRESSION, "Framed-Compression"},
-   {DIAMETER_ATT_LOGIN_IP_HOST, "Login-IP-Host"},
-   {DIAMETER_ATT_LOGIN_SERVICE, "Login-Service"},
-   {DIAMETER_ATT_LOGIN_TCP_PORT, "Login-TCP-Port"},
-   {DIAMETER_ATT_OLD_PASSWORD, "Old-Password"},
-   {DIAMETER_ATT_REPLY_MESSAGE, "Reply-Message"},
-   {DIAMETER_ATT_CALLBACK_NUMBER, "Callback-Number"},
-   {DIAMETER_ATT_CALLBACK_ID, "Callback-Id"},
-   {DIAMETER_ATT_FRAMED_ROUTE, "Framed-Route"},
-   {DIAMETER_ATT_FRAMED_IPX_NETWORK, "Framed-IPX-Network"},
-   {DIAMETER_ATT_STATE, "State"},
-   {DIAMETER_ATT_CLASS, "Class"},
-   {DIAMETER_ATT_SESSION_TIMEOUT, "Session-Timeout"},
-   {DIAMETER_ATT_IDLE_TIMEOUT, "Idle-Timeout"},
-   {DIAMETER_ATT_TERMINATION_ACTION, "Termination-Action"},
-   {DIAMETER_ATT_CALLED_STATION_ID, "Called-Station-Id"},
-   {DIAMETER_ATT_CALLING_STATION_ID, "Calling-Station-Id"},
-   {DIAMETER_ATT_NAS_IDENTIFIER, "NAS-Identifier"},
-   {DIAMETER_ATT_PROXY_STATE, "Proxy-State"},
-   {DIAMETER_ATT_LOGIN_LAT_SERVICE, "Login-LAT-Service"},
-   {DIAMETER_ATT_LOGIN_LAT_NODE, "Login-LAT-Node"},
-   {DIAMETER_ATT_LOGIN_LAT_GROUP, "Login-LAT-Group"},
-   {DIAMETER_ATT_FRAMED_APPLETALK_LINK, "Framed-AppleTalk-Link"},
-   {DIAMETER_ATT_FRAMED_APPLETALK_NETWORK, "Framed-AppleTalk-Network"},
-   {DIAMETER_ATT_FRAMED_APPLETALK_ZONE, "Framed-AppleTalk-Zone"},
-   {DIAMETER_ATT_CHAP_CHALLENGE, "CHAP-Challenge"},
-   {DIAMETER_ATT_NAS_PORT_TYPE, "NAS-Port-Type"},
-   {DIAMETER_ATT_PORT_LIMIT, "Port-Limit"},
-   {DIAMETER_ATT_LOGIN_LAT_PORT, "Login-LAT-Port"},
-   {DIAMETER_ATT_TUNNEL_TYPE, "Tunnel-Type"},
-   {DIAMETER_ATT_TUNNEL_MEDIUM_TYPE, "Tunnel-Medium-Type"},
-   {DIAMETER_ATT_ACCT_TUNNEL_CLIENT_ENDPOINT, "Acct-Tunnel-Client-Endpoint"},
-   {DIAMETER_ATT_TUNNEL_SERVER_ENDPOINT, "Tunnel-Server-Endpoint"},
-   {DIAMETER_ATT_ACCT_TUNNEL_CONNECTION_ID, "Acct-Tunnel-Connection-ID"},
-   {DIAMETER_ATT_TUNNEL_PASSWORD, "Tunnel-Password"},
-   {DIAMETER_ATT_ARAP_PASSWORD, "ARAP-Password"},
-   {DIAMETER_ATT_ARAP_FEATURES, "ARAP-Features"},
-   {DIAMETER_ATT_ARAP_ZONE_ACCESS, "ARAP-Zone-Access"},
-   {DIAMETER_ATT_ARAP_SECURITY, "ARAP-Security"},
-   {DIAMETER_ATT_ARAP_SECURITY_DATA, "ARAP-Security-Data"},
-   {DIAMETER_ATT_PASSWORD_RETRY, "Password-Retry"},
-   {DIAMETER_ATT_PROMPT, "Prompt"},
-   {DIAMETER_ATT_CONNECT_INFO, "Connect-Info"},
-   {DIAMETER_ATT_CONFIGURATION_TOKEN, "Configuration-Token"},
-   {DIAMETER_ATT_EAP_MESSAGE, "EAP-Message"},
-   {DIAMETER_ATT_SIGNATURE, "Signature"},
-   {DIAMETER_ATT_ACCT_STATUS_TYPE, "Acct-Status-Type"},
-   {DIAMETER_ATT_ACCT_DELAY_TIME, "Acct-Delay-Time"},
-   {DIAMETER_ATT_ACCT_INPUT_OCTETS, "Acct-Input-Octets"},
-   {DIAMETER_ATT_ACCT_OUTPUT_OCTETS, "Acct-Output-Octets"},
-   {DIAMETER_ATT_ACCT_SESSION_ID, "Acct-Session-Id"},
-   {DIAMETER_ATT_ACCT_AUTHENTIC, "Acct-Authentic"},
-   {DIAMETER_ATT_ACCT_SESSION_TIME, "Acct-Session-Time"},
-   {DIAMETER_ATT_ACCT_INPUT_PACKETS, "Acct-Input-Packets"},
-   {DIAMETER_ATT_ACCT_OUTPUT_PACKETS, "Acct-Output-Packets"},
-   {DIAMETER_ATT_ACCT_TERMINATE_CAUSE, "Acct-Terminate-Cause"},
-   {DIAMETER_ATT_ACCT_MULTI_SESSION_ID, "Acct-Multi-Session-Id"},
-   {DIAMETER_ATT_ACCT_LINK_COUNT, "Acct-Link-Count"},
-   {DIAMETER_ATT_MERIT_ENCAPSULATED, "Merit.Encapsulated"},
-   {DIAMETER_ATT_MERIT_REPLY_IF_ACK_MESSAGE, "Merit.Reply-If-Ack-Message"},
-   {DIAMETER_ATT_MERIT_LAS_START_TIME, "Merit.LAS-Start-Time"},
-   {DIAMETER_ATT_MERIT_LAS_CODE, "Merit.LAS-Code"},
-   {DIAMETER_ATT_MERIT_LAS_DURATION, "Merit.LAS-Duration"},
-   {DIAMETER_ATT_MERIT_LOCAL_DURATION, "Merit.Local-Duration"},
-   {DIAMETER_ATT_MERIT_HUNTGROUP_SERVICE, "Merit.Huntgroup-Service"},
-   {DIAMETER_ATT_MERIT_PORT_ENTRY, "Merit.Port-Entry"},
-   {DIAMETER_ATT_MERIT_PROXY_ACTION, "Merit.Proxy-Action"},
-   {DIAMETER_ATT_MERIT_TOKEN, "Merit.Token"},
-   {DIAMETER_ATT_MERIT_OWNERSHIP, "Merit.Ownership"},
-   {DIAMETER_ATT_MERIT_SUBGROUP, "Merit.Subgroup"},
-   {DIAMETER_ATT_MERIT_HUNTGROUP_NAME, "Merit.Huntgroup-Name"},
-   {DIAMETER_ATT_MERIT_USER_ID, "Merit.User-Id"},
-   {DIAMETER_ATT_MERIT_USER_REALM, "Merit.User-Realm"},
-   {DIAMETER_ATT_AUTHENTICATION_TRANSFORM_ID, "Authentication-Transform-Id"},
-   {DIAMETER_ATT_AUTHORIZATION_LIFETIME, "Authorization-Lifetime"},
-   {DIAMETER_ATT_DESTINATION_NAI, "Destination-NAI"},
-   {DIAMETER_ATT_DIGEST, "Digest"},
-   {DIAMETER_ATT_ENCRYPTED_DATA, "Encrypted-Data"},
-   {DIAMETER_ATT_ENCRYPTED_PAYLOAD, "Encrypted-Payload"},
-   {DIAMETER_ATT_ENCRYPTION_TRANSFORM_ID, "Encryption-Transform-Id"},
-   {DIAMETER_ATT_ERROR_MESSAGE, "Error-Message"},
-   {DIAMETER_ATT_ERROR_REPORTING_NAI, "Error-Reporting-NAI"},
-   {DIAMETER_ATT_EXTENSION_ID, "Extension-Id"},
-   {DIAMETER_ATT_FAILED_AVP, "Failed-AVP"},
-   {DIAMETER_ATT_FAILED_COMMAND_CODE, "Failed-Command-Code"},
-   {DIAMETER_ATT_FIRMWARE_REVISION, "Firmware-Revision"},
-   {DIAMETER_ATT_HOST_IP_ADDRESS, "Host-IP-Address"},
-   {DIAMETER_ATT_HOST_NAME, "Host-Name"},
-   {DIAMETER_ATT_INTEGRITY_CHECK_VALUE, "Integrity-Check-Value"},
-   {DIAMETER_ATT_KEY_ID, "Key-Id"},
-   {DIAMETER_ATT_NONCE, "Nonce"},
-   {DIAMETER_ATT_PLAINTEXT_DATA_LENGTH, "Plaintext-Data-Length"},
-   {DIAMETER_ATT_PROXY_ADDRESS, "Proxy-Address"},
-   {DIAMETER_ATT_PROXY_INFO, "Proxy-Info"},
-   {DIAMETER_ATT_PROXY_STATE, "Proxy-State"},
-   {DIAMETER_ATT_REDIRECT_HOST_ADDRESS, "Redirect-Host-Address"},
-   {DIAMETER_ATT_REDIRECT_HOST_PORT, "Redirect-Host-Port"},
-   {DIAMETER_ATT_REDIRECT_HOST, "Redirect-Host"},
-   {DIAMETER_ATT_RESULT_CODE, "Result-Code"},
-   {DIAMETER_ATT_ROUTE_RECORD, "Route-Record"},
-   {DIAMETER_ATT_ROUTING_REALM, "Routing-Realm"},
-   {DIAMETER_ATT_SESSION_ID, "Session-Id"},
-   {DIAMETER_ATT_SESSION_TIMEOUT, "Session-Timeout"},
-   {DIAMETER_ATT_TIMESTAMP, "Timestamp"},
-   {DIAMETER_ATT_USER_NAME, "User-Name"},
-   {DIAMETER_ATT_VENDOR_ID, "Vendor-Id"},
-   {DIAMETER_ATT_ACCOUNTING_AUTHENTICATION_TYPE, "Accounting-Authentication-Type"},
-   {DIAMETER_ATT_ACCOUNTING_INTERIM_INTERVAL, "Accounting-Interim-Interval"},
-   {DIAMETER_ATT_ACCOUNTING_RECORD_NUMBER, "Accounting-Record-Number"},
-   {DIAMETER_ATT_ACCOUNTING_RECORD_TYPE, "Accounting-Record-Type"},
-   {DIAMETER_ATT_ACCOUNTING_SESSION_ID, "Accounting-Session-Id"},
-   {DIAMETER_ATT_ACCOUNTING_STATE, "Accounting-State"},
-   {DIAMETER_ATT_ACCOUNTING_INPUT_OCTETS, "Accounting-Input-Octets"},
-   {DIAMETER_ATT_ACCOUNTING_OUTPUT_OCTETS, "Accounting-Output-Octets"},
-   {DIAMETER_ATT_ACCOUNTING_INPUT_PACKETS, "Accounting-Input-Packets"},
-   {DIAMETER_ATT_ACCOUNTING_OUTPUT_PACKETS, "Accounting-Output-Packets"},
-   {DIAMETER_ATT_ACCOUNTING_SESSION_TIME, "Accounting-Session-Time"},
-   {DIAMETER_ATT_MIP_REG_REQUEST, "MIP-Reg-Request"},
-   {DIAMETER_ATT_MIP_REG_REPLY, "MIP-Reg-Reply"},
-   {DIAMETER_ATT_MIP_MN_AAA_SPI, "MIP-MN-AAA-SPI"},
-   {DIAMETER_ATT_MIP_AUTH_INPUT_DATA_LENGTH, "MIP-Auth-Input-Data-Length"},
-   {DIAMETER_ATT_MIP_AUTHENTICATOR_LENGTH, "MIP-Authenticator-Length"},
-   {DIAMETER_ATT_MIP_AUTHENTICATOR_OFFSET, "MIP-Authenticator-Offset"},
-   {DIAMETER_ATT_MIP_MN_AAA_AUTH, "MIP-MN-AAA-Auth"},
-   {DIAMETER_ATT_MIP_MOBILE_NODE_ADDRESS, "MIP-Mobile-Node-Address"},
-   {DIAMETER_ATT_MIP_HOME_AGENT_ADDRESS, "MIP-Home-Agent-Address"},
-   {DIAMETER_ATT_MIP_PREVIOUS_FA_NAI, "MIP-Previous-FA-NAI"},
-   {DIAMETER_ATT_MIP_PREVIOUS_FA_ADDR, "MIP-Previous-FA-Addr"},
-   {DIAMETER_ATT_MIP_FEATURE_VECTOR, "MIP-Feature-Vector"},
-   {DIAMETER_ATT_MIP_PEER_SPI, "MIP-Peer-SPI"},
-   {DIAMETER_ATT_MIP_SESSION_KEY, "MIP-Session-Key"},
-   {DIAMETER_ATT_MIP_MN_TO_FA_KEY, "MIP-MN-to-FA-Key"},
-   {DIAMETER_ATT_MIP_MN_TO_HA_KEY, "MIP-MN-to-HA-Key"},
-   {DIAMETER_ATT_MIP_FA_TO_MN_KEY, "MIP-FA-to-MN-Key"},
-   {DIAMETER_ATT_MIP_FA_TO_HA_KEY, "MIP-FA-to-HA-Key"},
-   {DIAMETER_ATT_MIP_HA_TO_FA_KEY, "MIP-HA-to-FA-Key"},
-   {DIAMETER_ATT_MIP_HA_TO_MN_KEY, "MIP-HA-to-MN-Key"},
-   {DIAMETER_ATT_MIP_FA_MN_PREFERRED_SPI, "MIP-FA-MN-Preferred-SPI"},
-   {DIAMETER_ATT_MIP_FA_HA_PREFERRED_SPI, "MIP-FA-HA-Preferred-SPI"},
-   {DIAMETER_ATT_FILTER_RULE, "Filter-Rule"},
-   {DIAMETER_ATT_REQUEST_TYPE, "Request-Type"},
-   {DIAMETER_ATT_EAP_PAYLOAD, "EAP-Payload"},
-   {DIAMETER_ATT_CMS_DATA, "CMS-Data"},
-   {DIAMETER_ATT_RES_MGMT_INDEX, "Res-Mgmt-Index"},
-   {DIAMETER_ATT_RES_MGMT_TOKEN, "Res-Mgmt-Token"},
-   {DIAMETER_ATT_SOURCE_HOST, "Source-Host"},
-   {DIAMETER_ATT_DESTINATION_HOST, "Destination-Host"},
-   {DIAMETER_ATT_SOURCE_PORT, "Source-Port"},
-   {DIAMETER_ATT_DESTINATION_PORT, "Destination-Port"},
-   {DIAMETER_ATT_PROTOCOL, "Protocol"},
-   {DIAMETER_ATT_RSVP_SERVICE_TYPE, "RSVP-Service-Type"},
-   {DIAMETER_ATT_TOKEN_BUCKET_RATE, "Token-Bucket-Rate"},
-   {DIAMETER_ATT_TOKEN_BUCKET_SIZE, "Token-Bucket-Size"},
-   {DIAMETER_ATT_PEAK_DATA_RATE, "Peak-Data-Rate"},
-   {DIAMETER_ATT_MINIMUM_POLICED_UNIT, "Minimum-Policed-Unit"},
-   {DIAMETER_ATT_MAXIMUM_PACKET_SIZE, "Maximum-Packet-Size"},
-   {DIAMETER_ATT_QOS_RATE, "QOS-Rate"},
-   {DIAMETER_ATT_SLACK_TERM, "Slack-Term"},
-   {DIAMETER_ATT_TOS_DS_VALUE, "TOS-DS-Value"},
-   {DIAMETER_ATT_INTERFACE_ADDRESS, "Interface-Address"},
-   {DIAMETER_ATT_QOS_SERVICE_TYPE, "QOS-Service-Type"},
-   {DIAMETER_ATT_VOIP_CALLER, "Voip-Caller"},
-   {DIAMETER_ATT_VOIP_CALLEE, "Voip-Callee"},
-   {DIAMETER_ATT_VOIP_CHALLENGE, "Voip-Challenge"},
-   {DIAMETER_ATT_VOIP_RESPONSE, "Voip-Response"},
-   {DIAMETER_ATT_VOIP_SESSION_LENGTH, "Voip-Session-Length"},
-   {DIAMETER_ATT_SUN_PING_TIMESTAMP, "Sun.Ping-Timestamp"},
-   {DIAMETER_ATT_COMMENT, "Comment"},
-   {DIAMETER_ATT_XVALUE, "Xvalue"},
-   {DIAMETER_ATT_XSTRING, "Xstring"},
-   {DIAMETER_ATT_AUTHENTICATION_TYPE, "Authentication-Type"},
-   {DIAMETER_ATT_PROHIBIT, "Prohibit"},
-   {DIAMETER_ATT_USER_CATEGORY, "User-Category"},
-   {DIAMETER_ATT_GROUP_NAME, "Group-Name"},
-   {DIAMETER_ATT_ENCRYPTED_PASSWORD, "Encrypted-Password"},
-   {DIAMETER_ATT_EXPIRATION, "Expiration"},
-   {DIAMETER_ATT_PASSWORD, "Password"},
-   {DIAMETER_ATT_SIMULTANEOUS_USE, "Simultaneous-Use"},
-   {DIAMETER_ATT_SESSION_LIMIT, "Session-Limit"},
-   {DIAMETER_ATT_SERVER_NAME, "Server-Name"},
-   {DIAMETER_ATT_FRAMED_IP_ADDRESS_POOL_NAME, "Framed-IP-Address-Pool-Name"},
-   {DIAMETER_ATT_SERVICE_CLASS, "Service-Class"},
-   {DIAMETER_ATT_DENY_MESSAGE, "Deny-Message"},
-   {DIAMETER_ATT_SOURCE_SUBNET, "Source-Subnet"},
-   {DIAMETER_ATT_DESTINATION_SUBNET, "Destination-Subnet"},
-   {DIAMETER_ATT_MAX_QOS_RATE, "Max-QOS-Rate"},
-   {DIAMETER_ATT_EXAMPLE_AVP, "Example-AVP"},
-   {0, (char *)NULL}
-};
-
-
-           /* Attribute to Type Table */
-
-static value_value_pair diameter_printinfo[] = {
-   { DIAMETER_ATT_USER_NAME, DIAMETER_STRING },
-   { DIAMETER_ATT_USER_PASSWORD, DIAMETER_STRING },
-   { DIAMETER_ATT_CHAP_PASSWORD, DIAMETER_STRING },
-   { DIAMETER_ATT_NAS_IP_ADDRESS, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_NAS_PORT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_SERVICE_TYPE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FRAMED_PROTOCOL, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FRAMED_IP_ADDRESS, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_FRAMED_IP_NETMASK, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_FRAMED_ROUTING, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FILTER_ID, DIAMETER_STRING },
-   { DIAMETER_ATT_FRAMED_MTU, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FRAMED_COMPRESSION, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_LOGIN_IP_HOST, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_LOGIN_SERVICE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_LOGIN_TCP_PORT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_OLD_PASSWORD, DIAMETER_STRING },
-   { DIAMETER_ATT_REPLY_MESSAGE, DIAMETER_STRING },
-   { DIAMETER_ATT_CALLBACK_NUMBER, DIAMETER_STRING },
-   { DIAMETER_ATT_CALLBACK_ID, DIAMETER_STRING },
-   { DIAMETER_ATT_FRAMED_ROUTE, DIAMETER_STRING },
-   { DIAMETER_ATT_FRAMED_IPX_NETWORK, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_STATE, DIAMETER_STRING },
-   { DIAMETER_ATT_CLASS, DIAMETER_STRING },
-   { DIAMETER_ATT_SESSION_TIMEOUT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_IDLE_TIMEOUT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_TERMINATION_ACTION, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_CALLED_STATION_ID, DIAMETER_STRING },
-   { DIAMETER_ATT_CALLING_STATION_ID, DIAMETER_STRING },
-   { DIAMETER_ATT_NAS_IDENTIFIER, DIAMETER_STRING },
-   { DIAMETER_ATT_PROXY_STATE, DIAMETER_DATA },
-   { DIAMETER_ATT_LOGIN_LAT_SERVICE, DIAMETER_STRING },
-   { DIAMETER_ATT_LOGIN_LAT_NODE, DIAMETER_STRING },
-   { DIAMETER_ATT_LOGIN_LAT_GROUP, DIAMETER_STRING },
-   { DIAMETER_ATT_FRAMED_APPLETALK_LINK, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FRAMED_APPLETALK_NETWORK, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FRAMED_APPLETALK_ZONE, DIAMETER_STRING },
-   { DIAMETER_ATT_CHAP_CHALLENGE, DIAMETER_STRING },
-   { DIAMETER_ATT_NAS_PORT_TYPE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_PORT_LIMIT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_LOGIN_LAT_PORT, DIAMETER_STRING },
-   { DIAMETER_ATT_TUNNEL_TYPE, DIAMETER_STRING },
-   { DIAMETER_ATT_TUNNEL_MEDIUM_TYPE, DIAMETER_STRING },
-   { DIAMETER_ATT_ACCT_TUNNEL_CLIENT_ENDPOINT, DIAMETER_STRING },
-   { DIAMETER_ATT_TUNNEL_SERVER_ENDPOINT, DIAMETER_STRING },
-   { DIAMETER_ATT_ACCT_TUNNEL_CONNECTION_ID, DIAMETER_STRING },
-   { DIAMETER_ATT_TUNNEL_PASSWORD, DIAMETER_STRING },
-   { DIAMETER_ATT_ARAP_PASSWORD, DIAMETER_STRING },
-   { DIAMETER_ATT_ARAP_FEATURES, DIAMETER_STRING },
-   { DIAMETER_ATT_ARAP_ZONE_ACCESS, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ARAP_SECURITY, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ARAP_SECURITY_DATA, DIAMETER_STRING },
-   { DIAMETER_ATT_PASSWORD_RETRY, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_PROMPT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_CONNECT_INFO, DIAMETER_STRING },
-   { DIAMETER_ATT_CONFIGURATION_TOKEN, DIAMETER_STRING },
-   { DIAMETER_ATT_EAP_MESSAGE, DIAMETER_STRING },
-   { DIAMETER_ATT_SIGNATURE, DIAMETER_STRING },
-   { DIAMETER_ATT_ACCT_STATUS_TYPE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCT_DELAY_TIME, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCT_INPUT_OCTETS, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCT_OUTPUT_OCTETS, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCT_SESSION_ID, DIAMETER_STRING },
-   { DIAMETER_ATT_ACCT_AUTHENTIC, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCT_SESSION_TIME, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCT_INPUT_PACKETS, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCT_OUTPUT_PACKETS, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCT_TERMINATE_CAUSE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCT_MULTI_SESSION_ID, DIAMETER_STRING },
-   { DIAMETER_ATT_ACCT_LINK_COUNT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MERIT_ENCAPSULATED, DIAMETER_DATA },
-   { DIAMETER_ATT_MERIT_REPLY_IF_ACK_MESSAGE, DIAMETER_STRING },
-   { DIAMETER_ATT_MERIT_LAS_START_TIME, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MERIT_LAS_CODE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MERIT_LAS_DURATION, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MERIT_LOCAL_DURATION, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MERIT_HUNTGROUP_SERVICE, DIAMETER_STRING },
-   { DIAMETER_ATT_MERIT_PORT_ENTRY, DIAMETER_DATA },
-   { DIAMETER_ATT_MERIT_PROXY_ACTION, DIAMETER_STRING },
-   { DIAMETER_ATT_MERIT_TOKEN, DIAMETER_STRING },
-   { DIAMETER_ATT_MERIT_OWNERSHIP, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MERIT_SUBGROUP, DIAMETER_STRING },
-   { DIAMETER_ATT_MERIT_HUNTGROUP_NAME, DIAMETER_STRING },
-   { DIAMETER_ATT_MERIT_USER_ID, DIAMETER_STRING },
-   { DIAMETER_ATT_MERIT_USER_REALM, DIAMETER_STRING },
-   { DIAMETER_ATT_AUTHENTICATION_TRANSFORM_ID, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_AUTHORIZATION_LIFETIME, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_DESTINATION_NAI, DIAMETER_STRING },
-   { DIAMETER_ATT_DIGEST, DIAMETER_DATA },
-   { DIAMETER_ATT_ENCRYPTED_DATA, DIAMETER_DATA },
-   { DIAMETER_ATT_ENCRYPTED_PAYLOAD, DIAMETER_DATA },
-   { DIAMETER_ATT_ENCRYPTION_TRANSFORM_ID, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ERROR_MESSAGE, DIAMETER_STRING },
-   { DIAMETER_ATT_ERROR_REPORTING_NAI, DIAMETER_STRING },
-   { DIAMETER_ATT_EXTENSION_ID, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FAILED_AVP, DIAMETER_DATA },
-   { DIAMETER_ATT_FAILED_COMMAND_CODE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FIRMWARE_REVISION, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_HOST_IP_ADDRESS, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_HOST_NAME, DIAMETER_STRING },
-   { DIAMETER_ATT_INTEGRITY_CHECK_VALUE, DIAMETER_GROUPED },
-   { DIAMETER_ATT_KEY_ID, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_NONCE, DIAMETER_DATA },
-   { DIAMETER_ATT_PLAINTEXT_DATA_LENGTH, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_PROXY_ADDRESS, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_PROXY_INFO, DIAMETER_DATA },
-   { DIAMETER_ATT_PROXY_STATE, DIAMETER_GROUPED },
-   { DIAMETER_ATT_REDIRECT_HOST_ADDRESS, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_REDIRECT_HOST_PORT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_REDIRECT_HOST, DIAMETER_GROUPED },
-   { DIAMETER_ATT_RESULT_CODE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ROUTE_RECORD, DIAMETER_STRING },
-   { DIAMETER_ATT_ROUTING_REALM, DIAMETER_STRING },
-   { DIAMETER_ATT_SESSION_ID, DIAMETER_DATA },
-   { DIAMETER_ATT_SESSION_TIMEOUT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_TIMESTAMP, DIAMETER_TIME },
-   { DIAMETER_ATT_USER_NAME, DIAMETER_STRING },
-   { DIAMETER_ATT_VENDOR_ID, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_AUTHENTICATION_TYPE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_INTERIM_INTERVAL, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_RECORD_NUMBER, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_RECORD_TYPE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_SESSION_ID, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_STATE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_INPUT_OCTETS, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_OUTPUT_OCTETS, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_INPUT_PACKETS, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_OUTPUT_PACKETS, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_SESSION_TIME, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MIP_REG_REQUEST, DIAMETER_DATA },
-   { DIAMETER_ATT_MIP_REG_REPLY, DIAMETER_DATA },
-   { DIAMETER_ATT_MIP_MN_AAA_SPI, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MIP_AUTH_INPUT_DATA_LENGTH, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MIP_AUTHENTICATOR_LENGTH, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MIP_AUTHENTICATOR_OFFSET, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MIP_MN_AAA_AUTH, DIAMETER_GROUPED },
-   { DIAMETER_ATT_MIP_MOBILE_NODE_ADDRESS, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_MIP_HOME_AGENT_ADDRESS, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_MIP_PREVIOUS_FA_NAI, DIAMETER_STRING },
-   { DIAMETER_ATT_MIP_PREVIOUS_FA_ADDR, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_MIP_FEATURE_VECTOR, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MIP_PEER_SPI, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MIP_SESSION_KEY, DIAMETER_DATA },
-   { DIAMETER_ATT_MIP_MN_TO_FA_KEY, DIAMETER_DATA },
-   { DIAMETER_ATT_MIP_MN_TO_HA_KEY, DIAMETER_DATA },
-   { DIAMETER_ATT_MIP_FA_TO_MN_KEY, DIAMETER_GROUPED },
-   { DIAMETER_ATT_MIP_FA_TO_HA_KEY, DIAMETER_GROUPED },
-   { DIAMETER_ATT_MIP_HA_TO_FA_KEY, DIAMETER_GROUPED },
-   { DIAMETER_ATT_MIP_HA_TO_MN_KEY, DIAMETER_GROUPED },
-   { DIAMETER_ATT_MIP_FA_MN_PREFERRED_SPI, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MIP_FA_HA_PREFERRED_SPI, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FILTER_RULE, DIAMETER_STRING },
-   { DIAMETER_ATT_REQUEST_TYPE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_EAP_PAYLOAD, DIAMETER_DATA },
-   { DIAMETER_ATT_CMS_DATA, DIAMETER_DATA },
-   { DIAMETER_ATT_RES_MGMT_INDEX, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_RES_MGMT_TOKEN, DIAMETER_DATA },
-   { DIAMETER_ATT_SOURCE_HOST, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_DESTINATION_HOST, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_SOURCE_PORT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_DESTINATION_PORT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_PROTOCOL, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_RSVP_SERVICE_TYPE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_TOKEN_BUCKET_RATE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_TOKEN_BUCKET_SIZE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_PEAK_DATA_RATE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MINIMUM_POLICED_UNIT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MAXIMUM_PACKET_SIZE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_QOS_RATE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_SLACK_TERM, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_TOS_DS_VALUE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_INTERFACE_ADDRESS, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_QOS_SERVICE_TYPE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_VOIP_CALLER, DIAMETER_STRING },
-   { DIAMETER_ATT_VOIP_CALLEE, DIAMETER_STRING },
-   { DIAMETER_ATT_VOIP_CHALLENGE, DIAMETER_DATA },
-   { DIAMETER_ATT_VOIP_RESPONSE, DIAMETER_DATA },
-   { DIAMETER_ATT_VOIP_SESSION_LENGTH, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_SUN_PING_TIMESTAMP, DIAMETER_TIME },
-   { DIAMETER_ATT_COMMENT, DIAMETER_STRING },
-   { DIAMETER_ATT_XVALUE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_XSTRING, DIAMETER_STRING },
-   { DIAMETER_ATT_AUTHENTICATION_TYPE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_PROHIBIT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_USER_CATEGORY, DIAMETER_STRING },
-   { DIAMETER_ATT_GROUP_NAME, DIAMETER_STRING },
-   { DIAMETER_ATT_ENCRYPTED_PASSWORD, DIAMETER_STRING },
-   { DIAMETER_ATT_EXPIRATION, DIAMETER_TIME },
-   { DIAMETER_ATT_PASSWORD, DIAMETER_STRING },
-   { DIAMETER_ATT_SIMULTANEOUS_USE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_SESSION_LIMIT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_SERVER_NAME, DIAMETER_STRING },
-   { DIAMETER_ATT_FRAMED_IP_ADDRESS_POOL_NAME, DIAMETER_STRING },
-   { DIAMETER_ATT_SERVICE_CLASS, DIAMETER_STRING },
-   { DIAMETER_ATT_DENY_MESSAGE, DIAMETER_STRING },
-   { DIAMETER_ATT_SOURCE_SUBNET, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_DESTINATION_SUBNET, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_MAX_QOS_RATE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_EXAMPLE_AVP, DIAMETER_GROUPED },
-   {0, 0}
-};
 
-
-
-
-        /* Values Structures */
-
-static value_string diameter_qos_service_type_vals[]={
-   {3, "Labels"},
-   {1, "RSVP"},
-   {2, "TOS"},
-   {0, (char *)NULL}
+/* Type to string table */
+
+
+static value_string diameter_avp_type_vals[]={
+	{  1, "OctetString" },
+	{  2, "Integer32" },
+	{  3, "Integer64" },
+	{  4, "Unsigned32" },
+	{  5, "Unsigned64" },
+	{  6, "Float32" },
+	{  7, "Float64" },
+	{  8, "Float128" },
+	{  9, "Grouped" },
+	{ 10, "IpAddress" },
+	{ 11, "Time" },
+	{ 12, "UTF8String" },
+	{ 13, "DiameterIdentity" },
+	{ 14, "Enumerated" },
+	{ 15, "IPFilterRule" },
+	{ 16, "QOSFilterRule" },
+	{0, (char *)NULL}
 };
-
+/* Attribute to String tables */
 static value_string diameter_service_type_vals[]={
    {5, "Outbound"},
    {7, "NAS-Prompt"},
@@ -647,44 +46,19 @@ static value_string diameter_service_type_vals[]={
    {0, (char *)NULL}
 };
 
-static value_string diameter_prohibit_vals[]={
-   {0, "Dumb"},
-   {2, "SLIP"},
+static value_string diameter_framed_protocol_vals[]={
    {1, "PPP"},
-   {3, "Auth-Only"},
-   {255, "All"},
-   {0, (char *)NULL}
-};
-
-static value_string diameter_prompt_vals[]={
-   {0, "No-Echo"},
-   {1, "Echo"},
-   {0, (char *)NULL}
-};
-
-static value_string diameter_source_port_vals[]={
-   {23, "ftp"},
-   {0, "*"},
-   {21, "telnet"},
-   {0, (char *)NULL}
-};
-
-static value_string diameter_nas_port_type_vals[]={
-   {6, "PIAFS"},
-   {9, "X75"},
-   {7, "HDLC-Clear-Channel"},
-   {5, "Virtual"},
-   {2, "ISDN-Sync"},
-   {1, "Sync"},
-   {0, "Async"},
-   {4, "ISDN-Async-v110"},
-   {3, "ISDN-Async-v120"},
-   {8, "X25"},
-   {0, (char *)NULL}
-};
-
-static value_string diameter_interface_address_vals[]={
-   {0, "Any-Interface"},
+   {260, "COMB"},
+   {5, "Xylogics"},
+   {257, "EURAW"},
+   {3, "ARA"},
+   {261, "FR"},
+   {2, "SLIP"},
+   {258, "EUUI"},
+   {4, "Gandalf"},
+   {256, "MPP"},
+   {255, "Ascend-ARA"},
+   {259, "X25"},
    {0, (char *)NULL}
 };
 
@@ -696,69 +70,60 @@ static value_string diameter_framed_routing_vals[]={
    {0, (char *)NULL}
 };
 
-static value_string diameter_arap_zone_access_vals[]={
-   {4, "Exclusive-Filter"},
-   {2, "Inclusive-Filter"},
-   {1, "Default-Zone"},
+static value_string diameter_framed_compression_vals[]={
+   {0, "None"},
+   {1, "Van-Jacobson-TCP-IP"},
+   {2, "IPX-Header-Compression"},
    {0, (char *)NULL}
 };
 
-static value_string diameter_acct_authentic_vals[]={
-   {1, "RADIUS"},
-   {0, "None"},
-   {2, "Local"},
+static value_string diameter_login_service_vals[]={
+   {0, "Telnet"},
+   {1, "Rlogin"},
+   {2, "TCP-Clear"},
+   {3, "PortMaster"},
+   {4, "LAT"},
+   {5, "X25-PAD"},
+   {6, "X25-T3POS"},
    {0, (char *)NULL}
 };
 
-static value_string diameter_framed_protocol_vals[]={
-   {1, "PPP"},
-   {260, "COMB"},
-   {5, "Xylogics"},
-   {257, "EURAW"},
-   {3, "ARA"},
-   {261, "FR"},
-   {2, "SLIP"},
-   {258, "EUUI"},
-   {4, "Gandalf"},
-   {256, "MPP"},
-   {255, "Ascend-ARA"},
-   {259, "X25"},
+static value_string diameter_vendor_specific_vendors[]= {
+	{0, "None"},
+	{5, "ACC"},
+	{9, "Cisco"},
+	{42, "Sun Microsystems"},
+	{166, "Shiva"},
+	{307, "Livingston"},
+	{429, "3Com"},
+	{529, "Ascend"},
+	{1584, "Bay Networks"},
+	{2636, "Juniper Networks"},
+	{0,NULL}
+};
+
+static value_string diameter_termination_action_vals[]={
+   {0, "Default"},
+   {1, "RADIUS-Request"},
    {0, (char *)NULL}
 };
 
-static value_string diameter_framed_compression_vals[]={
-   {0, "None"},
-   {1, "Van-Jacobson-TCP-IP"},
-   {2, "IPX-Header-Compression"},
+static value_string diameter_acct_status_type_vals[]={
+   {1, "Start"},
+   {2, "Stop"},
+   {3, "Alive"},
+   {4, "Modem-Start"},
+   {5, "Modem-Stop"},
+   {6, "Cancel"},
+   {7, "Accounting-On"},
+   {8, "Accounting-Off"},
    {0, (char *)NULL}
 };
 
-static value_string diameter_authentication_type_vals[]={
-   {10, "File"},
-   {22, "LDAP"},
-   {21, "Slow"},
-   {20, "Blackhole"},
-   {2, "AFS-Krb"},
-   {6, "KCHAP"},
-   {4, "RADIUS"},
-   {13, "ACE"},
-   {9, "Local"},
-   {7, "TACACS"},
+static value_string diameter_acct_authentic_vals[]={
+   {1, "RADIUS"},
    {0, "None"},
-   {19, "Deny"},
-   {23, "Unassigned"},
-   {8, "Realm"},
-   {1, "Passwd"},
-   {5, "MNET"},
-   {3, "MIT-Krb"},
-   {17, "Oracle"},
-   {1, "Unix-PW"},
-   {16, "ODBC"},
-   {11, "TACPLUS"},
-   {15, "SKEY"},
-   {12, "ARA-DES"},
-   {14, "DEFENDER"},
-   {18, "Allow"},
+   {2, "Local"},
    {0, (char *)NULL}
 };
 
@@ -783,146 +148,237 @@ static value_string diameter_acct_terminate_cause_vals[]={
    {18, "Host-Request"},
    {0, (char *)NULL}
 };
-
-static value_string diameter_protocol_vals[]={
-   {65535, "Any"},
-   {17, "UDP"},
-   {1, "ICMP"},
-   {0, "IP"},
-   {6, "TCP"},
+static value_string diameter_nas_port_type_vals[]={
+   {6, "PIAFS"},
+   {9, "X75"},
+   {7, "HDLC-Clear-Channel"},
+   {5, "Virtual"},
+   {2, "ISDN-Sync"},
+   {1, "Sync"},
+   {0, "Async"},
+   {4, "ISDN-Async-v110"},
+   {3, "ISDN-Async-v120"},
+   {8, "X25"},
    {0, (char *)NULL}
 };
 
-static value_string diameter_destination_port_vals[]={
-   {10000, "vic-rsvp"},
-   {23, "ftp"},
-   {0, "*"},
-   {21, "telnet"},
-   {0, (char *)NULL}
+static value_string diameter_tunnel_type_vals[]= {
+	{1,"PPTP"},
+	{2,"L2F"},
+	{3,"L2TP"},
+	{4,"ATMP"},
+	{5,"VTP"},
+	{6,"AH"},
+	{7,"IP-IP-Encap"},
+	{8,"MIN-IP-IP"},
+	{9,"ESP"},
+	{10,"GRE"},
+	{11,"DVS"},
+	{12,"IP-IP"},
+	{0,NULL}
 };
 
-static value_string diameter_termination_action_vals[]={
-   {0, "Default"},
-   {1, "RADIUS-Request"},
-   {0, (char *)NULL}
+static value_string diameter_tunnel_medium_type_vals[]= {
+	{1,"IPv4"}, 
+	{2,"IPv6"},
+	{3,"NSAP"},
+	{4,"HDLC"},
+	{5,"BBN"},
+	{6,"IEEE-802"},
+	{7,"E-163"},
+	{8,"E-164"},
+	{9,"F-69"},
+	{10,"X-121"},
+	{11,"IPX"},
+	{12,"Appletalk"},
+	{13,"Decnet4"},
+	{14,"Vines"},
+	{15,"E-164-NSAP"},
+	{0,NULL}
 };
 
-static value_string diameter_extension_id_vals[]={
-   {1, "NASREQ"},
-   {2, "Strong-Security"},
-   {4, "Mobile-IP"},
-   {5, "Accounting"},
-   {7, "VOIP"},
-   {8, "EAP"},
-   {555, "Test"},
-   {556, "AccountingV3"},
-   {0, (char *)NULL}
+static value_string diameter_accounting_record_type_vals[]= {
+	{1, "Event Record"},
+	{2, "Start Record"},
+	{3, "Interim Record"},
+	{4, "Stop Record"},
+	{0,NULL}
 };
 
-static value_string diameter_merit_las_code_vals[]={
-   {0, "LAS-Normal"},
-   {1, "LAS-Reject"},
-   {2, "LAS-Cancel"},
-   {3, "LAS-Noconfirm"},
-   {4, "LAS-Overtime"},
-   {5, "LAS-Unknown"},
-   {6, "LAS-Notoken"},
-   {7, "LAS-Notlocal"},
-   {8, "LAS-Suspend"},
-   {9, "LAS-Failed"},
-   {10, "LAS-Authorized"},
-   {11, "LAS-NASreboot"},
-   {12, "LAS-Remote"},
-   {13, "LAS-Duplicate"},
-   {14, "LAS-Collision"},
-   {15, "LAS-Stop"},
-   {0, (char *)NULL}
+static value_string diameter_auth_request_type_vals[]= {
+	{1, "Authenticate Only"},
+	{2, "Authorize Only"},
+	{3, "Authorize Authenticate"},
+	{0,NULL}
 };
 
-static value_string diameter_login_service_vals[]={
-   {0, "Telnet"},
-   {1, "Rlogin"},
-   {2, "TCP-Clear"},
-   {3, "PortMaster"},
-   {4, "LAT"},
-   {5, "X25-PAD"},
-   {6, "X25-T3POS"},
-   {0, (char *)NULL}
+static value_string diameter_auth_session_state_vals[]= {
+	{0, "State Maintained"},
+	{1, "No State Maintained"},
+	{0,NULL}
 };
 
-static value_string diameter_rsvp_service_type_vals[]={
-   {1, "RSVP-Controlled-Load"},
-   {2, "RSVP-Guaranteed"},
-   {0, (char *)NULL}
+static value_string diameter_re_auth_request_type_vals[]= {
+	{0, "Authorize Only"},
+	{1, "Authorize Authenticate"},
+	{0,NULL}
 };
 
-static value_string diameter_acct_status_type_vals[]={
-   {1, "Start"},
-   {2, "Stop"},
-   {3, "Alive"},
-   {4, "Modem-Start"},
-   {5, "Modem-Stop"},
-   {6, "Cancel"},
-   {7, "Accounting-On"},
-   {8, "Accounting-Off"},
-   {0, (char *)NULL}
+static value_string diameter_disconnect_cause_vals[]= {
+	{0, "Rebooting"},
+	{1, "Busy"},
+	{2, "Do Not Want To Talk To You"},
+	{0,NULL}
+};
+
+static value_string diameter_redirect_host_usage_vals[]= {
+	{0, "Don't Cache"},
+	{1, "All Session"},
+	{2, "All Realm"},
+	{3, "Realm and Application"},
+	{4, "All Application"},
+	{5, "All Host"},
+	{0,NULL}
+};
+
+static value_string diameter_session_server_failover_vals[]= {
+	{0, "Refuse Service"},
+	{1, "Try Again"},
+	{2, "Allow Service"},
+	{3, "Try Again / Allow Service"},
+	{0,NULL}
+};
+
+static value_string diameter_termination_cause_vals[]= {
+	{1, "Logout"},
+	{2, "Service Not Provided"},
+	{3, "Bad Answer"},
+	{4, "Administrative"},
+	{5, "Link Broken"},
+	{0,NULL}
+};
+
+static struct avp_info diameter_avps[] = {
+	/* Radius Attributes */
+	{  1, "User-Name",                DIAMETER_UTF8STRING,   (value_string *)NULL},
+	{  2, "User-Password",            DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{  3, "CHAP-Password",            DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{  4, "NAS-IP-Address",           DIAMETER_IP_ADDRESS,   (value_string *)NULL},
+	{  5, "NAS-Port",                 DIAMETER_INTEGER32,    (value_string *)NULL},
+	{  6, "Service-Type",             DIAMETER_ENUMERATED,   diameter_service_type_vals},
+	{  7, "Framed-Protocol",          DIAMETER_ENUMERATED,   diameter_framed_protocol_vals},
+	{  8, "Framed-IP-Address",        DIAMETER_IP_ADDRESS,   (value_string *)NULL},
+	{  9, "Framed-IP-Netmask",        DIAMETER_IP_ADDRESS,   (value_string *)NULL},
+	{ 10, "Framed-Routing",           DIAMETER_ENUMERATED,   diameter_framed_routing_vals},
+	{ 11, "Filter-Id",                DIAMETER_UTF8STRING,   (value_string *)NULL},
+	{ 12, "Framed-MTU",               DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 13, "Framed-Compression",       DIAMETER_ENUMERATED,   diameter_framed_compression_vals},
+	{ 14, "Login-IP-Host",            DIAMETER_IP_ADDRESS,   (value_string *)NULL},
+	{ 15, "Login-Service",            DIAMETER_ENUMERATED,   diameter_login_service_vals},
+	{ 16, "Login-TCP-Port",           DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 17, "Old-Password",             DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 18, "Reply-Message",            DIAMETER_UTF8STRING,   (value_string *)NULL},
+	{ 19, "Callback-Number",          DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 20, "Callback-Id",              DIAMETER_OCTET_STRING, (value_string *)NULL},
+	/* 21 is Unassigned */
+	{ 22, "Framed-Route",             DIAMETER_UTF8STRING,   (value_string *)NULL},
+	{ 23, "Framed-IPX-Network",       DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 24, "State",                    DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 25, "Class",                    DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 26, "Vendor-Specific",          DIAMETER_ENUMERATED,   diameter_vendor_specific_vendors},
+	{ 27, "Session-Timeout",          DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 28, "Idle-Timeout",             DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 29, "Termination-Action",       DIAMETER_ENUMERATED,   diameter_termination_action_vals},
+	{ 30, "Called-Station-Id",        DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 31, "Calling-Station-Id",       DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 32, "NAS-Identifier",           DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 33, "Proxy-State",              DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 34, "Login-LAT-Service",        DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 35, "Login-LAT-Node",           DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 36, "Login-LAT-Group",          DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 37, "Framed-AppleTalk-Link",    DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 38, "Framed-AppleTalk-Network", DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 39, "Framed-AppleTalk-Zone",    DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 40, "Acct-Status-Type",         DIAMETER_ENUMERATED,   diameter_acct_status_type_vals},
+	{ 41, "Acct-Delay-Time",          DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 42, "Acct-Input-Octets",        DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 43, "Acct-Output-Octets",       DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 44, "Acct-Session-Id",          DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 45, "Acct-Authentic",           DIAMETER_ENUMERATED,   diameter_acct_authentic_vals},
+	{ 46, "Acct-Session-Time",        DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 47, "Acct-Input-Packets",       DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 48, "Acct-Output-Packets",      DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 49, "Acct-Terminate-Cause",     DIAMETER_ENUMERATED,   diameter_acct_terminate_cause_vals},
+	{ 50, "Acct-Multi-Session-Id",    DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 51, "Acct-Link-Count",          DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 60, "CHAP-Challenge",           DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 61, "NAS-Port-Type",            DIAMETER_ENUMERATED,   diameter_nas_port_type_vals},
+	{ 62, "Port-Limit",               DIAMETER_INTEGER32,    (value_string *)NULL},
+	{ 63, "Login-LAT-Port",           DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 64, "Tunnel-Type",              DIAMETER_ENUMERATED,   diameter_tunnel_type_vals},
+	{ 65, "Tunnel-Medium-Type",       DIAMETER_ENUMERATED,   diameter_tunnel_medium_type_vals},
+	{ 66, "Tunnel-Client-Endpoint",   DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 67, "Tunnel-Server-Endpoint",   DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 68, "Tunnel-Connection-ID",     DIAMETER_OCTET_STRING, (value_string *)NULL},
+	{ 69, "Tunnel-Password",          DIAMETER_OCTET_STRING, (value_string *)NULL},
+    { 82, "Tunnel-Assignment-Id",     DIAMETER_OCTET_STRING, (value_string *)NULL},
+
+	/* Diameter AVPs */
+    { 482, "Accounting-Interim-Interval", DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 485, "Accounting-Record-Number",    DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 480, "Accounting-Record-Type",      DIAMETER_ENUMERATED,  diameter_accounting_record_type_vals},
+    { 259, "Acct-Application-Id",         DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 275, "Alternate-Peer",              DIAMETER_IDENTITY,    (value_string *)NULL},
+    { 258, "Auth-Aplication-Id",          DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 274, "Auth-Request-Type",           DIAMETER_ENUMERATED,  diameter_auth_request_type_vals},
+    { 291, "Authorization-Lifetime",      DIAMETER_INTEGER32,   (value_string *)NULL},
+    { 276, "Auth-Grace-Period",           DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 277, "Auth-Session-State",          DIAMETER_ENUMERATED,  diameter_auth_session_state_vals},
+    { 285, "Re-Auth-Request-Type",        DIAMETER_ENUMERATED,  diameter_re_auth_request_type_vals},
+    { 293, "Destination-Host",            DIAMETER_IDENTITY,    (value_string *)NULL},
+    { 283, "Desintation-Realm",           DIAMETER_UTF8STRING,  (value_string *)NULL},
+    { 273, "Disconnect-Cause",            DIAMETER_ENUMERATED,  diameter_disconnect_cause_vals},
+    { 281, "Error-Message",               DIAMETER_UTF8STRING,  (value_string *)NULL},
+    { 294, "Error-Reporting-Host",        DIAMETER_IDENTITY,    (value_string *)NULL},
+    { 279, "Failed-AVP",                  DIAMETER_OCTET_STRING,(value_string *)NULL},
+    { 267, "Firmware-Revision",           DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 257, "Host-IP-Address",             DIAMETER_IP_ADDRESS,  (value_string *)NULL},
+    { 272, "Multi-Round-Time-Out",        DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 264, "Origin-Host",                 DIAMETER_IDENTITY,    (value_string *)NULL},
+    { 296, "Origin-Realm",                DIAMETER_UTF8STRING,  (value_string *)NULL},
+    { 278, "Origin-State-Id",             DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 269, "Product-Name",                DIAMETER_UTF8STRING,  (value_string *)NULL},
+    { 280, "Proxy-Host",                  DIAMETER_IDENTITY,    (value_string *)NULL},
+    { 284, "Proxy-Info",                  DIAMETER_OCTET_STRING,(value_string *)NULL},
+    { 292, "Redirect-Host",               DIAMETER_IDENTITY,    (value_string *)NULL},
+    { 261, "Redirect-Host-Usage",         DIAMETER_ENUMERATED,  diameter_redirect_host_usage_vals}, 
+    { 262, "Redirect-Max-Cache-Time",     DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 268, "Result-Code",                 DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 282, "Route-Record",                DIAMETER_IDENTITY,    (value_string *)NULL},
+    { 263, "Session-Id",                  DIAMETER_UTF8STRING,  (value_string *)NULL},
+    { 270, "Session-Binding",             DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 271, "Session-Server-Failover",     DIAMETER_ENUMERATED,  diameter_session_server_failover_vals},
+    { 286, "Source-Route",                DIAMETER_IDENTITY,    (value_string *)NULL},
+    { 265, "Supported-Vendor-Id",         DIAMETER_UNSIGNED32,  (value_string *)NULL},
+    { 295, "Termination-Cause",           DIAMETER_ENUMERATED,  diameter_termination_cause_vals},
+    { 266, "Vendor-Id",                   DIAMETER_ENUMERATED,  diameter_vendor_specific_vendors},
+    { 260, "Vendor-Specific-Application-Id", DIAMETER_GROUPED, (value_string *)NULL},
+	{0, (char *)NULL, 0, (value_string*)NULL}
 };
 
 
-#define DIAMETER_COMMAND_DEVICE_REBOOT_IND 257
-#define DIAMETER_COMMAND_MESSAGE_REJECT_IND 259
-#define DIAMETER_COMMAND_SESSION_TERMINATION_IND 274
-#define DIAMETER_COMMAND_SESSION_TERMINATION_REQUEST 275
-#define DIAMETER_COMMAND_SESSION_TERMINATION_ANSWER 276
-#define DIAMETER_COMMAND_AA_MOBILE_NODE_REQUEST 260
-#define DIAMETER_COMMAND_AA_MOBILE_NODE_ANSWER 261
-#define DIAMETER_COMMAND_HOME_AGENT_MIP_REQUEST 262
-#define DIAMETER_COMMAND_HOME_AGENT_MIP_ANSWER 263
-#define DIAMETER_COMMAND_MOBILE_NODE_TERMINATE_IND 264
-#define DIAMETER_COMMAND_AA_REQUEST 265
-#define DIAMETER_COMMAND_AA_ANSWER 266
-#define DIAMETER_COMMAND_AA_CHALLENGE_IND 267
-#define DIAMETER_COMMAND_DIAMETER_EAP_REQUEST 268
-#define DIAMETER_COMMAND_DIAMETER_EAP_ANSWER 269
-#define DIAMETER_COMMAND_DIAMETER_EAP_IND 270
-#define DIAMETER_COMMAND_ACCOUNTING_REQUEST 271
-#define DIAMETER_COMMAND_ACCOUNTING_ANSWER 272
-#define DIAMETER_COMMAND_ACCOUNTING_POLL 273
-#define DIAMETER_COMMAND_VOIP_START_REQ 478
-#define DIAMETER_COMMAND_VOIP_START_ANSWER 479
-#define DIAMETER_COMMAND_VOIP_STOP_REQ 480
-#define DIAMETER_COMMAND_VOIP_STOP_ANSWER 481
-#define DIAMETER_COMMAND_PING_REQ 511
-#define DIAMETER_COMMAND_PING_ANSWER 512
-            /* Command Code to String table */
 
 static value_string diameter_command_code_vals[] = {
-{DIAMETER_COMMAND_DEVICE_REBOOT_IND, "Device-Reboot-Ind"},
-{DIAMETER_COMMAND_MESSAGE_REJECT_IND, "Message-Reject-Ind"},
-{DIAMETER_COMMAND_SESSION_TERMINATION_IND, "Session-Termination-Ind"},
-{DIAMETER_COMMAND_SESSION_TERMINATION_REQUEST, "Session-Termination-Request"},
-{DIAMETER_COMMAND_SESSION_TERMINATION_ANSWER, "Session-Termination-Answer"},
-{DIAMETER_COMMAND_AA_MOBILE_NODE_REQUEST, "AA-Mobile-Node-Request"},
-{DIAMETER_COMMAND_AA_MOBILE_NODE_ANSWER, "AA-Mobile-Node-Answer"},
-{DIAMETER_COMMAND_HOME_AGENT_MIP_REQUEST, "Home-Agent-MIP-Request"},
-{DIAMETER_COMMAND_HOME_AGENT_MIP_ANSWER, "Home-Agent-MIP-Answer"},
-{DIAMETER_COMMAND_MOBILE_NODE_TERMINATE_IND, "Mobile-Node-Terminate-Ind"},
-{DIAMETER_COMMAND_AA_REQUEST, "AA-Request"},
-{DIAMETER_COMMAND_AA_ANSWER, "AA-Answer"},
-{DIAMETER_COMMAND_AA_CHALLENGE_IND, "AA-Challenge-Ind"},
-{DIAMETER_COMMAND_DIAMETER_EAP_REQUEST, "DIAMETER-EAP-Request"},
-{DIAMETER_COMMAND_DIAMETER_EAP_ANSWER, "DIAMETER-EAP-Answer"},
-{DIAMETER_COMMAND_DIAMETER_EAP_IND, "DIAMETER-EAP-Ind"},
-{DIAMETER_COMMAND_ACCOUNTING_REQUEST, "Accounting-Request"},
-{DIAMETER_COMMAND_ACCOUNTING_ANSWER, "Accounting-Answer"},
-{DIAMETER_COMMAND_ACCOUNTING_POLL, "Accounting-Poll"},
-{DIAMETER_COMMAND_VOIP_START_REQ, "Voip-Start-Req"},
-{DIAMETER_COMMAND_VOIP_START_ANSWER, "Voip-Start-Answer"},
-{DIAMETER_COMMAND_VOIP_STOP_REQ, "Voip-Stop-Req"},
-{DIAMETER_COMMAND_VOIP_STOP_ANSWER, "Voip-Stop-Answer"},
-{DIAMETER_COMMAND_PING_REQ, "Ping-Req"},
-{DIAMETER_COMMAND_PING_ANSWER, "Ping-Answer"},
-{0, (char *)NULL}
+
+	/* Base Protocol */
+	{274, "Abort-Session"},
+	{271, "Accounting"},
+	{257, "Capabilities-Exchange"},
+	{280, "Device-Watchdog"},
+	{282, "Disconnect-Peer"},
+	{258, "Re-Auth"},
+	{275, "Session-Termination"},
+	{0, (char *)NULL}
 };