From Adam Sulmicki: additional AVPs for RADIUS. and making

RD_TP_CONNECT_INFO a RADIUS_STRING rather than a RADIUS_STRING_TAGGED.

svn path=/trunk/; revision=4780

1 files changed, 31 insertions, 2 deletions

diff --git a/packet-radius.c b/packet-radius.c
index 53ae88e854..6ecdd612a2 100644
--- a/packet-radius.c
+++ b/packet-radius.c
@@ -2,7 +2,7 @@
  * Routines for RADIUS packet disassembly
  * Copyright 1999 Johan Feyaerts
  *
- * $Id: packet-radius.c,v 1.41 2002/01/21 07:36:40 guy Exp $
+ * $Id: packet-radius.c,v 1.42 2002/02/22 09:57:04 guy Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@ethereal.com>
@@ -136,7 +136,9 @@ typedef struct _value_value_pair {
 #define RD_TP_ACCT_LINK_COUNT 51
 #define RD_TP_ACCT_INPUT_GIGAWORDS 52
 #define RD_TP_ACCT_OUTPUT_GIGAWORDS 53
+/* 54 Unused */
 #define RD_TP_EVENT_TIMESTAMP 55
+/* 56-59 Unused */ 
 #define RD_TP_CHAP_CHALLENGE 60
 #define RD_TP_NAS_PORT_TYPE 61
 #define RD_TP_PORT_LIMIT 62
@@ -147,7 +149,16 @@ typedef struct _value_value_pair {
 #define RD_TP_TUNNEL_SERVER_ENDPOINT 67
 #define RD_TP_TUNNEL_CONNECTION 68
 #define RD_TP_TUNNEL_PASSWORD 69
+#define RD_TP_ARAP_PASSWORD 70
+#define RD_TP_ARAP_FEATURES 71
+#define RD_TP_ARAP_ZONE_ACCESS 72
+#define RD_TP_ARAP_SECURITY 73
+#define RD_TP_ARAP_SECURITY_DATA 74
+#define RD_TP_PASSWORD_RETRY 75
+#define RD_TP_PROMPT 76
 #define RD_TP_CONNECT_INFO 77
+#define RD_TP_CONFIGURATION_TOKEN 78
+#define RD_TP_EAP_MESSAGE 79
 #define RD_TP_MESSAGE_AUTHENTICATOR 80
 #define RD_TP_TUNNEL_PRIVATE_GROUP_ID 81
 #define RD_TP_TUNNEL_ASSIGNMENT_ID 82
@@ -486,7 +497,16 @@ static value_value_pair radius_printinfo[] = {
 { RD_TP_TUNNEL_SERVER_ENDPOINT, RADIUS_STRING_TAGGED},
 { RD_TP_TUNNEL_CONNECTION, RADIUS_BINSTRING},
 { RD_TP_TUNNEL_PASSWORD, RADIUS_STRING_TAGGED},
-{ RD_TP_CONNECT_INFO, RADIUS_STRING_TAGGED},
+{ RD_TP_ARAP_PASSWORD, RADIUS_BINSTRING},
+{ RD_TP_ARAP_FEATURES, RADIUS_BINSTRING},
+{ RD_TP_ARAP_ZONE_ACCESS, RADIUS_BINSTRING},
+{ RD_TP_ARAP_SECURITY, RADIUS_BINSTRING},
+{ RD_TP_ARAP_SECURITY_DATA, RADIUS_BINSTRING},
+{ RD_TP_PASSWORD_RETRY, RADIUS_BINSTRING},
+{ RD_TP_PROMPT, RADIUS_BINSTRING},
+{ RD_TP_CONNECT_INFO, RADIUS_STRING},
+{ RD_TP_CONFIGURATION_TOKEN, RADIUS_BINSTRING},
+{ RD_TP_EAP_MESSAGE, RADIUS_BINSTRING},
 { RD_TP_MESSAGE_AUTHENTICATOR, RADIUS_BINSTRING},
 { RD_TP_TUNNEL_PRIVATE_GROUP_ID, RADIUS_STRING_TAGGED},
 { RD_TP_TUNNEL_ASSIGNMENT_ID, RADIUS_STRING_TAGGED},
@@ -579,7 +599,16 @@ static value_string radius_attrib_type_vals[] = {
 { RD_TP_TUNNEL_SERVER_ENDPOINT, "Tunnel Server Endpoint"},
 { RD_TP_TUNNEL_CONNECTION, "Tunnel Connection"},
 { RD_TP_TUNNEL_PASSWORD, "Tunnel Password"},
+{ RD_TP_ARAP_PASSWORD, "ARAP-Password"},
+{ RD_TP_ARAP_FEATURES, "ARAP-Features"},
+{ RD_TP_ARAP_ZONE_ACCESS, "ARAP-Zone-Access"},
+{ RD_TP_ARAP_SECURITY, "ARAP-Security"},
+{ RD_TP_ARAP_SECURITY_DATA, "ARAP-Security-Data"},
+{ RD_TP_PASSWORD_RETRY, "Password-Retry"},
+{ RD_TP_PROMPT, "Prompt"},
 { RD_TP_CONNECT_INFO, "Connect-Info"},
+{ RD_TP_CONFIGURATION_TOKEN, "Configuration-Token"},
+{ RD_TP_EAP_MESSAGE, "EAP-Message"},
 { RD_TP_MESSAGE_AUTHENTICATOR, "Message Authenticator"},
 { RD_TP_TUNNEL_PRIVATE_GROUP_ID, "Tunnel Private Group ID"},
 { RD_TP_TUNNEL_ASSIGNMENT_ID, "Tunnel Assignment ID"},