New tvbuffified DIAMETER dissector, from David Frascone.

It doesn't do DIAMETER-over-UDP, so the RADIUS dissector no longer
checks for DIAMETER packets and calls the DIAMETER dissector if it finds
one.

svn path=/trunk/; revision=3049

1 files changed, 248 insertions, 155 deletions

diff --git a/packet-diameter-defs.h b/packet-diameter-defs.h
index 43f6d38814..986a49595d 100644
--- a/packet-diameter-defs.h
+++ b/packet-diameter-defs.h
@@ -2,6 +2,8 @@
  * Filename: packet-diameter-defs.h
  * WARNING:  This file was automatically generated by dict2h.pl.  Modifications
  *           will be erased by next invocation of dictionary parser.
+ *
+ * Generated: Fri Feb  9 14:03:07 2001
  */
 
 #ifndef _PACKET_DIAMETER_DEFS_H
@@ -93,46 +95,72 @@
 #define DIAMETER_ATT_MERIT_HUNTGROUP_NAME 221
 #define DIAMETER_ATT_MERIT_USER_ID 222
 #define DIAMETER_ATT_MERIT_USER_REALM 223
-#define DIAMETER_ATT_COMMAND_CODE 256
+#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_ENCRYPTED_PAYLOAD 260
+#define DIAMETER_ATT_KEY_ID 286
 #define DIAMETER_ATT_NONCE 261
-#define DIAMETER_ATT_TIMESTAMP 262
-#define DIAMETER_ATT_SESSION_ID 263
-#define DIAMETER_ATT_VENDOR_NAME 266
-#define DIAMETER_ATT_FIRMWARE_REVISION 267
+#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 292
+#define DIAMETER_ATT_REDIRECT_HOST_ADDRESS 278
+#define DIAMETER_ATT_REDIRECT_HOST_PORT 277
 #define DIAMETER_ATT_RESULT_CODE 268
-#define DIAMETER_ATT_DESTINATION_NAI 269
-#define DIAMETER_ATT_REBOOT_TYPE 271
-#define DIAMETER_ATT_REBOOT_TIME 272
-#define DIAMETER_ATT_FAILED_AVP 279
-#define DIAMETER_ATT_RECEIVE_WINDOW 277
-#define DIAMETER_ATT_REDIRECT_HOST 278
-#define DIAMETER_ATT_IP_PORT 281
-#define DIAMETER_ATT_ACCOUNTING_RECORD_TYPE 480
-#define DIAMETER_ATT_ADIF_RECORD 481
+#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_DELIVERY_MAX_BATCH 483
-#define DIAMETER_ATT_ACCOUNTING_DELIVERY_MAX_DELAY 484
 #define DIAMETER_ATT_ACCOUNTING_RECORD_NUMBER 485
-#define DIAMETER_ATT_MIP_REGISTRATION_REQUEST 320
-#define DIAMETER_ATT_MIP_REGISTRATION_REPLY 321
-#define DIAMETER_ATT_MN_FA_CHALLENGE_LENGTH 322
-#define DIAMETER_ATT_MN_FA_RESPONSE 323
-#define DIAMETER_ATT_MOBILE_NODE_ADDRESS 333
-#define DIAMETER_ATT_HOME_AGENT_ADDRESS 334
-#define DIAMETER_ATT_PREVIOUS_FA_NAI 335
-#define DIAMETER_ATT_MN_AAA_SPI 336
-#define DIAMETER_ATT_FOREIGN_HA_AVAIL 337
-#define DIAMETER_ATT_MN_TO_FA_KEY 325
-#define DIAMETER_ATT_MN_TO_HA_KEY 331
-#define DIAMETER_ATT_FA_TO_MN_KEY 326
-#define DIAMETER_ATT_FA_TO_HA_KEY 328
-#define DIAMETER_ATT_HA_TO_MN_KEY 332
-#define DIAMETER_ATT_HA_TO_FA_KEY 329
-#define DIAMETER_ATT_FA_MN_PREFERRED_SPI 324
-#define DIAMETER_ATT_FA_HA_PREFERRED_SPI 327
+#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_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_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_FEATURE_VECTOR 337
+#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_PEER_SPI 999
+#define DIAMETER_ATT_MIP_SESSION_KEY 999
+#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
@@ -160,6 +188,7 @@
 #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
@@ -179,7 +208,7 @@
 #define DIAMETER_ATT_SOURCE_SUBNET 1039
 #define DIAMETER_ATT_DESTINATION_SUBNET 1040
 #define DIAMETER_ATT_MAX_QOS_RATE 1041
-#define DIAMETER_ATT_ACCOUNTING_ADIF_RECORD 2000
+#define DIAMETER_ATT_EXAMPLE_AVP 99999
 
 
             /* Attribute to String table */
@@ -270,46 +299,72 @@ static value_string diameter_attrib_type_vals[] = {
    {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_COMMAND_CODE, "Command-Code"},
+   {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_ENCRYPTED_PAYLOAD, "Encrypted-Payload"},
+   {DIAMETER_ATT_KEY_ID, "Key-Id"},
    {DIAMETER_ATT_NONCE, "Nonce"},
-   {DIAMETER_ATT_TIMESTAMP, "Timestamp"},
-   {DIAMETER_ATT_SESSION_ID, "Session-Id"},
-   {DIAMETER_ATT_VENDOR_NAME, "Vendor-Name"},
-   {DIAMETER_ATT_FIRMWARE_REVISION, "Firmware-Revision"},
-   {DIAMETER_ATT_RESULT_CODE, "Result-Code"},
-   {DIAMETER_ATT_DESTINATION_NAI, "Destination-NAI"},
-   {DIAMETER_ATT_REBOOT_TYPE, "Reboot-Type"},
-   {DIAMETER_ATT_REBOOT_TIME, "Reboot-Time"},
-   {DIAMETER_ATT_FAILED_AVP, "Failed-AVP"},
-   {DIAMETER_ATT_RECEIVE_WINDOW, "Receive-Window"},
+   {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, "Redirect-Host"},
-   {DIAMETER_ATT_IP_PORT, "IP-Port"},
-   {DIAMETER_ATT_ACCOUNTING_RECORD_TYPE, "Accounting-Record-Type"},
-   {DIAMETER_ATT_ADIF_RECORD, "ADIF-Record"},
+   {DIAMETER_ATT_REDIRECT_HOST_ADDRESS, "Redirect-Host-Address"},
+   {DIAMETER_ATT_REDIRECT_HOST_PORT, "Redirect-Host-Port"},
+   {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_DELIVERY_MAX_BATCH, "Accounting-Delivery-Max-Batch"},
-   {DIAMETER_ATT_ACCOUNTING_DELIVERY_MAX_DELAY, "Accounting-Delivery-Max-Delay"},
    {DIAMETER_ATT_ACCOUNTING_RECORD_NUMBER, "Accounting-Record-Number"},
-   {DIAMETER_ATT_MIP_REGISTRATION_REQUEST, "MIP-Registration-Request"},
-   {DIAMETER_ATT_MIP_REGISTRATION_REPLY, "MIP-Registration-Reply"},
-   {DIAMETER_ATT_MN_FA_CHALLENGE_LENGTH, "MN-FA-Challenge-Length"},
-   {DIAMETER_ATT_MN_FA_RESPONSE, "MN-FA-Response"},
-   {DIAMETER_ATT_MOBILE_NODE_ADDRESS, "Mobile-Node-Address"},
-   {DIAMETER_ATT_HOME_AGENT_ADDRESS, "Home-Agent-Address"},
-   {DIAMETER_ATT_PREVIOUS_FA_NAI, "Previous-FA-NAI"},
-   {DIAMETER_ATT_MN_AAA_SPI, "MN-AAA-SPI"},
-   {DIAMETER_ATT_FOREIGN_HA_AVAIL, "Foreign-HA-Avail"},
-   {DIAMETER_ATT_MN_TO_FA_KEY, "MN-to-FA-Key"},
-   {DIAMETER_ATT_MN_TO_HA_KEY, "MN-to-HA-Key"},
-   {DIAMETER_ATT_FA_TO_MN_KEY, "FA-to-MN-Key"},
-   {DIAMETER_ATT_FA_TO_HA_KEY, "FA-to-HA-Key"},
-   {DIAMETER_ATT_HA_TO_MN_KEY, "HA-to-MN-Key"},
-   {DIAMETER_ATT_HA_TO_FA_KEY, "HA-to-FA-Key"},
-   {DIAMETER_ATT_FA_MN_PREFERRED_SPI, "FA-MN-Preferred-SPI"},
-   {DIAMETER_ATT_FA_HA_PREFERRED_SPI, "FA-HA-Preferred-SPI"},
+   {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_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_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_FEATURE_VECTOR, "MIP-Feature-Vector"},
+   {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_PEER_SPI, "MIP-Peer-SPI"},
+   {DIAMETER_ATT_MIP_SESSION_KEY, "MIP-Session-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"},
@@ -337,6 +392,7 @@ static value_string diameter_attrib_type_vals[] = {
    {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"},
@@ -356,7 +412,7 @@ static value_string diameter_attrib_type_vals[] = {
    {DIAMETER_ATT_SOURCE_SUBNET, "Source-Subnet"},
    {DIAMETER_ATT_DESTINATION_SUBNET, "Destination-Subnet"},
    {DIAMETER_ATT_MAX_QOS_RATE, "Max-QOS-Rate"},
-   {DIAMETER_ATT_ACCOUNTING_ADIF_RECORD, "Accounting-Adif-Record"},
+   {DIAMETER_ATT_EXAMPLE_AVP, "Example-AVP"},
    {0, (char *)NULL}
 };
 
@@ -449,46 +505,71 @@ static value_value_pair diameter_printinfo[] = {
    { DIAMETER_ATT_MERIT_HUNTGROUP_NAME, DIAMETER_STRING },
    { DIAMETER_ATT_MERIT_USER_ID, DIAMETER_STRING },
    { DIAMETER_ATT_MERIT_USER_REALM, DIAMETER_STRING },
-   { DIAMETER_ATT_COMMAND_CODE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_EXTENSION_ID, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_INTEGRITY_CHECK_VALUE, DIAMETER_COMPLEX },
+   { 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_NONCE, DIAMETER_DATA },
-   { DIAMETER_ATT_TIMESTAMP, DIAMETER_TIME },
-   { DIAMETER_ATT_SESSION_ID, DIAMETER_DATA },
-   { DIAMETER_ATT_VENDOR_NAME, DIAMETER_STRING },
+   { 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_DATA },
+   { DIAMETER_ATT_REDIRECT_HOST, DIAMETER_DATA },
+   { DIAMETER_ATT_REDIRECT_HOST_ADDRESS, DIAMETER_ADDRESS },
+   { DIAMETER_ATT_REDIRECT_HOST_PORT, DIAMETER_INTEGER32 },
    { DIAMETER_ATT_RESULT_CODE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_DESTINATION_NAI, DIAMETER_STRING },
-   { DIAMETER_ATT_REBOOT_TYPE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_REBOOT_TIME, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FAILED_AVP, DIAMETER_DATA },
-   { DIAMETER_ATT_RECEIVE_WINDOW, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_REDIRECT_HOST, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_IP_PORT, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_RECORD_TYPE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ADIF_RECORD, DIAMETER_DATA },
+   { 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_DELIVERY_MAX_BATCH, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_DELIVERY_MAX_DELAY, DIAMETER_INTEGER32 },
    { DIAMETER_ATT_ACCOUNTING_RECORD_NUMBER, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MIP_REGISTRATION_REQUEST, DIAMETER_DATA },
-   { DIAMETER_ATT_MIP_REGISTRATION_REPLY, DIAMETER_DATA },
-   { DIAMETER_ATT_MN_FA_CHALLENGE_LENGTH, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MN_FA_RESPONSE, DIAMETER_DATA },
-   { DIAMETER_ATT_MOBILE_NODE_ADDRESS, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_HOME_AGENT_ADDRESS, DIAMETER_ADDRESS },
-   { DIAMETER_ATT_PREVIOUS_FA_NAI, DIAMETER_STRING },
-   { DIAMETER_ATT_MN_AAA_SPI, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FOREIGN_HA_AVAIL, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_MN_TO_FA_KEY, DIAMETER_DATA },
-   { DIAMETER_ATT_MN_TO_HA_KEY, DIAMETER_DATA },
-   { DIAMETER_ATT_FA_TO_MN_KEY, DIAMETER_DATA },
-   { DIAMETER_ATT_FA_TO_HA_KEY, DIAMETER_DATA },
-   { DIAMETER_ATT_HA_TO_MN_KEY, DIAMETER_DATA },
-   { DIAMETER_ATT_HA_TO_FA_KEY, DIAMETER_DATA },
-   { DIAMETER_ATT_FA_MN_PREFERRED_SPI, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_FA_HA_PREFERRED_SPI, 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_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_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_FEATURE_VECTOR, DIAMETER_INTEGER32 },
+   { 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_DATA },
+   { DIAMETER_ATT_MIP_FA_TO_HA_KEY, DIAMETER_DATA },
+   { DIAMETER_ATT_MIP_HA_TO_FA_KEY, DIAMETER_DATA },
+   { DIAMETER_ATT_MIP_HA_TO_MN_KEY, DIAMETER_DATA },
+   { DIAMETER_ATT_MIP_PEER_SPI, DIAMETER_INTEGER32 },
+   { DIAMETER_ATT_MIP_SESSION_KEY, DIAMETER_DATA },
+   { 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 },
@@ -516,6 +597,7 @@ static value_value_pair diameter_printinfo[] = {
    { 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 },
@@ -535,7 +617,7 @@ static value_value_pair diameter_printinfo[] = {
    { DIAMETER_ATT_SOURCE_SUBNET, DIAMETER_ADDRESS },
    { DIAMETER_ATT_DESTINATION_SUBNET, DIAMETER_ADDRESS },
    { DIAMETER_ATT_MAX_QOS_RATE, DIAMETER_INTEGER32 },
-   { DIAMETER_ATT_ACCOUNTING_ADIF_RECORD, DIAMETER_DATA },
+   { DIAMETER_ATT_EXAMPLE_AVP, DIAMETER_GROUPED },
    {0, 0}
 };
 
@@ -613,48 +695,6 @@ static value_string diameter_framed_routing_vals[]={
    {0, (char *)NULL}
 };
 
-static value_string diameter_command_code_vals[]={
-   {257, "Device-Reboot-Ind"},
-   {258, "Device-Watchdog-Ind"},
-   {259, "Message-Reject-Ind"},
-   {260, "AA-Mobile-Node-Request"},
-   {261, "AA-Mobile-Node-Answer"},
-   {262, "Home-Agent-MIP-Request"},
-   {263, "Home-Agent-MIP-Answer"},
-   {264, "Mobile-Node-Terminate-Ind"},
-   {265, "AA-Request"},
-   {266, "AA-Answer"},
-   {267, "AA-Challenge-Ind"},
-   {268, "DIAMETER-EAP-Request"},
-   {269, "DIAMETER-EAP-Answer"},
-   {270, "DIAMETER-EAP-Ind"},
-   {271, "Accounting-Request"},
-   {272, "Accounting-Answer"},
-   {273, "Accounting-Poll"},
-   {483, "Accounting-Start-Answer"},
-   {511, "Ping-Req"},
-   {484, "Accounting-Interim-Req"},
-   {480, "Voip-Stop-Req"},
-   {512, "Ping-Answer"},
-   {513, "EAP-Req"},
-   {485, "Accounting-Interim-Answer"},
-   {481, "Voip-Stop-Answer"},
-   {478, "Voip-Start-Req"},
-   {486, "Accounting-Stop-Req"},
-   {514, "EAP-Answer"},
-   {515, "Domain-Discovery-Request"},
-   {479, "Voip-Start-Answer"},
-   {516, "Domain-Discovery-Answer"},
-   {487, "Accounting-Stop-Answer"},
-   {482, "Accounting-Start-Req"},
-   {0, (char *)NULL}
-};
-
-static value_string diameter_framed_ip_address_vals[]={
-   {-1, "Assigned"},
-   {0, (char *)NULL}
-};
-
 static value_string diameter_arap_zone_access_vals[]={
    {4, "Exclusive-Filter"},
    {2, "Inclusive-Filter"},
@@ -815,12 +855,6 @@ static value_string diameter_rsvp_service_type_vals[]={
    {0, (char *)NULL}
 };
 
-static value_string diameter_reboot_type_vals[]={
-   {1, "Reboot-Imminent"},
-   {2, "Reboot-Complete"},
-   {0, (char *)NULL}
-};
-
 static value_string diameter_acct_status_type_vals[]={
    {1, "Start"},
    {2, "Stop"},
@@ -834,4 +868,63 @@ static value_string diameter_acct_status_type_vals[]={
 };
 
 
-#endif /* _PACKET_DIAMETER_DEFS_H */
+#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}
+};
+
+
+
+
+#endif /* _PACKET_DIAMETER_H */