Updates from David Frascone: includes DIAMETER-over-SCTP support.

svn path=/trunk/; revision=3073

1 files changed, 31 insertions, 30 deletions

diff --git a/packet-diameter-defs.h b/packet-diameter-defs.h
index 986a49595d..d30dfbf9c7 100644
--- a/packet-diameter-defs.h
+++ b/packet-diameter-defs.h
@@ -3,7 +3,7 @@
  * 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
+ * Generated: Fri Feb 23 13:04:15 2001
  */
 
 #ifndef _PACKET_DIAMETER_DEFS_H
@@ -117,9 +117,9 @@
 #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_REDIRECT_HOST 292
 #define DIAMETER_ATT_RESULT_CODE 268
 #define DIAMETER_ATT_ROUTE_RECORD 282
 #define DIAMETER_ATT_ROUTING_REALM 283
@@ -141,24 +141,24 @@
 #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_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_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_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
@@ -208,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_EXAMPLE_AVP 99999
+#define DIAMETER_ATT_EXAMPLE_AVP 999999
 
 
             /* Attribute to String table */
@@ -321,9 +321,9 @@ static value_string diameter_attrib_type_vals[] = {
    {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_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"},
@@ -345,24 +345,24 @@ static value_string diameter_attrib_type_vals[] = {
    {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_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_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_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"},
@@ -526,16 +526,16 @@ static value_value_pair diameter_printinfo[] = {
    { 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_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_TIMESTAMP, DIAMETER_INTEGER32 },
    { DIAMETER_ATT_USER_NAME, DIAMETER_STRING },
    { DIAMETER_ATT_VENDOR_ID, DIAMETER_INTEGER32 },
    { DIAMETER_ATT_ACCOUNTING_AUTHENTICATION_TYPE, DIAMETER_INTEGER32 },
@@ -551,23 +551,24 @@ static value_value_pair diameter_printinfo[] = {
    { 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_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_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_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 },
@@ -597,7 +598,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_SUN_PING_TIMESTAMP, DIAMETER_INTEGER32 },
    { DIAMETER_ATT_COMMENT, DIAMETER_STRING },
    { DIAMETER_ATT_XVALUE, DIAMETER_INTEGER32 },
    { DIAMETER_ATT_XSTRING, DIAMETER_STRING },