--- a/extensions/app_radgw/rgw_common.h	Mon Apr 19 17:00:24 2010 +0900
+++ b/extensions/app_radgw/rgw_common.h	Tue Apr 20 19:34:59 2010 +0900
@@ -129,7 +129,7 @@
        RADIUS_ATTR_PASSWORD_RETRY = 75,
        RADIUS_ATTR_PROMPT = 76,
        RADIUS_ATTR_CONFIGURATION_TOKEN = 78,
-       RADIUS_ATTR_TUNNEL_ASSIGNEMENT_ID = 82,
+       RADIUS_ATTR_TUNNEL_ASSIGNMENT_ID = 82,
        RADIUS_ATTR_TUNNEL_PREFERENCE = 83,
        RADIUS_ATTR_ARAP_CHALLENGE_RESPONSE = 84,
        RADIUS_ATTR_NAS_PORT_ID = 87,
@@ -148,6 +148,8 @@
 
 enum {  DIAM_ATTR_USER_NAME = 1,
 	DIAM_ATTR_USER_PASSWORD = 2,
+	DIAM_ATTR_NAS_IP_ADDRESS = 4,
+	DIAM_ATTR_NAS_PORT = 5,
 	DIAM_ATTR_SERVICE_TYPE = 6,
 	DIAM_ATTR_FRAMED_PROTOCOL = 7,
 	DIAM_ATTR_FRAMED_IP_ADDRESS = 8,
@@ -167,12 +169,17 @@
 	DIAM_ATTR_STATE = 24,
 	DIAM_ATTR_CLASS = 25,
 	DIAM_ATTR_IDLE_TIMEOUT = 28,
+	DIAM_ATTR_NAS_IDENTIFIER = 32,
 	DIAM_ATTR_LOGIN_LAT_SERVICE = 34,
 	DIAM_ATTR_LOGIN_LAT_NODE = 35,
 	DIAM_ATTR_LOGIN_LAT_GROUP = 36,
 	DIAM_ATTR_FRAMED_APPLETALK_LINK = 37,
 	DIAM_ATTR_FRAMED_APPLETALK_NETWORK = 38,
 	DIAM_ATTR_FRAMED_APPLETALK_ZONE = 39,
+	DIAM_ATTR_ACCT_SESSION_ID = 44,
+	DIAM_ATTR_ACCT_MULTI_SESSION_ID = 50,
+	DIAM_ATTR_EVENT_TIMESTAMP = 55,
+	DIAM_ATTR_NAS_PORT_TYPE = 61,
 	DIAM_ATTR_PORT_LIMIT = 62,
 	DIAM_ATTR_LOGIN_LAT_PORT = 63,
 	DIAM_ATTR_TUNNEL_TYPE = 64,
@@ -188,13 +195,15 @@
 	DIAM_ATTR_PROMPT = 76,
 	DIAM_ATTR_CONFIGURATION_TOKEN = 78,
 	DIAM_ATTR_TUNNEL_PRIVATE_GROUP_ID = 81,
-	DIAM_ATTR_TUNNEL_ASSIGNEMENT_ID = 82,
+	DIAM_ATTR_TUNNEL_ASSIGNMENT_ID = 82,
 	DIAM_ATTR_TUNNEL_PREFERENCE = 83,
 	DIAM_ATTR_ARAP_CHALLENGE_RESPONSE = 84,
 	DIAM_ATTR_ACCT_INTERIM_INTERVAL = 85,
+	DIAM_ATTR_NAS_PORT_ID = 87,
 	DIAM_ATTR_FRAMED_POOL = 88,
 	DIAM_ATTR_TUNNEL_CLIENT_AUTH_ID = 90,
 	DIAM_ATTR_TUNNEL_SERVER_AUTH_ID = 91,
+	DIAM_ATTR_NAS_IPV6_ADDRESS = 95,
 	DIAM_ATTR_FRAMED_INTERFACE_ID = 96,
 	DIAM_ATTR_FRAMED_IPV6_PREFIX = 97,
 	DIAM_ATTR_LOGIN_IPV6_HOST = 98,
@@ -202,6 +211,10 @@
 	DIAM_ATTR_FRAMED_IPV6_POOL = 100,
 	DIAM_ATTR_EAP_KEY_NAME = 102,
 	DIAM_ATTR_AUTH_APPLICATION_ID = 258,
+	DIAM_ATTR_ACCT_APPLICATION_ID = 259,
+	DIAM_ATTR_VENDOR_SPECIFIC_APPLICATION_ID = 260,
+	DIAM_ATTR_SESSION_ID = 263,
+	DIAM_ATTR_ORIGIN_HOST = 264,
 	DIAM_ATTR_MULTI_ROUND_TIMEOUT = 272,
 	DIAM_ATTR_AUTH_REQUEST_TYPE = 274,
 	DIAM_ATTR_AUTH_GRACE_PERIOD = 276,
@@ -211,7 +224,10 @@
 	DIAM_ATTR_ERROR_MESSAGE = 281,
 	DIAM_ATTR_ROUTE_RECORD = 282,
 	DIAM_ATTR_PROXY_INFO = 284,
+	DIAM_ATTR_ACCOUNTING_SUB_SESSION_ID = 287,
 	DIAM_ATTR_ERROR_REPORTING_HOST = 294,
+	DIAM_ATTR_TERMINATION_CAUSE = 295,
+	DIAM_ATTR_ORIGIN_REALM = 296,
 	DIAM_ATTR_NAS_FILTER_RULE = 400,
 	DIAM_ATTR_TUNNELING = 401,
 	DIAM_ATTR_QOS_FILTER_RULE = 407,
@@ -219,7 +235,10 @@
 	DIAM_ATTR_EAP_PAYLOAD = 462,
 	DIAM_ATTR_EAP_REISSUED_PAYLOAD = 463,
 	DIAM_ATTR_EAP_MASTER_SESSION_KEY = 464,
-	DIAM_ATTR_ACCOUNTING_EAP_AUTH_METHOD = 465
+	DIAM_ATTR_ACCOUNTING_EAP_AUTH_METHOD = 465,
+	DIAM_ATTR_ACCOUNTING_RECORD_TYPE = 480,
+	DIAM_ATTR_ACCOUNTING_REALTIME_REQUIRED = 483,
+	DIAM_ATTR_ACCOUNTING_RECORD_NUMBER = 485
 };
 
 const char * rgw_msg_attrtype_str(unsigned char c);