Index: extensions/app_radgw/rgw_common.h
===================================================================
--- extensions/app_radgw/rgw_common.h	(revision 273)
+++ extensions/app_radgw/rgw_common.h	(revision 333)
@@ -99,53 +99,68 @@
 /* Attributes missing from radius.h (not used in EAP) */
 enum { RADIUS_ATTR_CHAP_PASSWORD = 3,
-       RADIUS_ATTR_SERVICE_TYPE = 6,
-       RADIUS_ATTR_FRAMED_PROTOCOL = 7,
-       RADIUS_ATTR_FRAMED_IP_ADDRESS = 8,
-       RADIUS_ATTR_FRAMED_IP_NETMASK = 9,
-       RADIUS_ATTR_FRAMED_ROUTING = 10,
-       RADIUS_ATTR_FILTER_ID = 11,
-       RADIUS_ATTR_FRAMED_COMPRESSION = 13,
-       RADIUS_ATTR_LOGIN_IP_HOST = 14,
-       RADIUS_ATTR_LOGIN_SERVICE = 15,
-       RADIUS_ATTR_LOGIN_TCP_PORT = 16,
-       RADIUS_ATTR_CALLBACK_NUMBER = 19,
-       RADIUS_ATTR_CALLBACK_ID = 20,
-       RADIUS_ATTR_FRAMED_ROUTE = 22,
-       RADIUS_ATTR_FRAMED_IPX_NETWORK = 23,
-       RADIUS_ATTR_LOGIN_LAT_SERVICE = 34,
-       RADIUS_ATTR_LOGIN_LAT_NODE = 35,
-       RADIUS_ATTR_LOGIN_LAT_GROUP = 36,
-       RADIUS_ATTR_FRAMED_APPLETALK_LINK = 37,
-       RADIUS_ATTR_FRAMED_APPLETALK_NETWORK = 38,
-       RADIUS_ATTR_FRAMED_APPLETALK_ZONE = 39,
-       RADIUS_ATTR_CHAP_CHALLENGE = 60,
-       RADIUS_ATTR_PORT_LIMIT = 62,
-       RADIUS_ATTR_LOGIN_LAT_PORT = 63,
-       RADIUS_ATTR_TUNNEL_CLIENT_ENDPOINT = 66,
-       RADIUS_ATTR_TUNNEL_SERVER_ENDPOINT = 67,
-       RADIUS_ATTR_TUNNEL_PASSWORD = 69,
-       RADIUS_ATTR_ARAP_PASSWORD = 70,
-       RADIUS_ATTR_ARAP_FEATURES = 71,
-       RADIUS_ATTR_ARAP_ZONE_ACCESS = 72,
-       RADIUS_ATTR_ARAP_SECURITY = 73,
-       RADIUS_ATTR_ARAP_SECURITY_DATA = 74,
-       RADIUS_ATTR_PASSWORD_RETRY = 75,
-       RADIUS_ATTR_PROMPT = 76,
-       RADIUS_ATTR_CONFIGURATION_TOKEN = 78,
-       RADIUS_ATTR_TUNNEL_ASSIGNMENT_ID = 82,
-       RADIUS_ATTR_TUNNEL_PREFERENCE = 83,
-       RADIUS_ATTR_ARAP_CHALLENGE_RESPONSE = 84,
-       RADIUS_ATTR_NAS_PORT_ID = 87,
-       RADIUS_ATTR_FRAMED_POOL = 88,
-       RADIUS_ATTR_TUNNEL_CLIENT_AUTH_ID = 90,
-       RADIUS_ATTR_TUNNEL_SERVER_AUTH_ID = 91,
-       RADIUS_ATTR_ORIGINATING_LINE_INFO = 94,
-       RADIUS_ATTR_FRAMED_INTERFACE_ID = 96,
-       RADIUS_ATTR_FRAMED_IPV6_PREFIX = 97,
-       RADIUS_ATTR_LOGIN_IPV6_HOST = 98,
-       RADIUS_ATTR_FRAMED_IPV6_ROUTE = 99,
-       RADIUS_ATTR_FRAMED_IPV6_POOL = 100,
-       RADIUS_ATTR_ERROR_CAUSE = 101,
-       RADIUS_ATTR_EAP_KEY_NAME = 102
+	RADIUS_ATTR_SERVICE_TYPE = 6,
+	RADIUS_ATTR_FRAMED_PROTOCOL = 7,
+	RADIUS_ATTR_FRAMED_IP_ADDRESS = 8,
+	RADIUS_ATTR_FRAMED_IP_NETMASK = 9,
+	RADIUS_ATTR_FRAMED_ROUTING = 10,
+	RADIUS_ATTR_FILTER_ID = 11,
+	RADIUS_ATTR_FRAMED_COMPRESSION = 13,
+	RADIUS_ATTR_LOGIN_IP_HOST = 14,
+	RADIUS_ATTR_LOGIN_SERVICE = 15,
+	RADIUS_ATTR_LOGIN_TCP_PORT = 16,
+	RADIUS_ATTR_CALLBACK_NUMBER = 19,
+	RADIUS_ATTR_CALLBACK_ID = 20,
+	RADIUS_ATTR_FRAMED_ROUTE = 22,
+	RADIUS_ATTR_FRAMED_IPX_NETWORK = 23,
+	RADIUS_ATTR_LOGIN_LAT_SERVICE = 34,
+	RADIUS_ATTR_LOGIN_LAT_NODE = 35,
+	RADIUS_ATTR_LOGIN_LAT_GROUP = 36,
+	RADIUS_ATTR_FRAMED_APPLETALK_LINK = 37,
+	RADIUS_ATTR_FRAMED_APPLETALK_NETWORK = 38,
+	RADIUS_ATTR_FRAMED_APPLETALK_ZONE = 39,
+	RADIUS_ATTR_CHAP_CHALLENGE = 60,
+	RADIUS_ATTR_PORT_LIMIT = 62,
+	RADIUS_ATTR_LOGIN_LAT_PORT = 63,
+	RADIUS_ATTR_TUNNEL_CLIENT_ENDPOINT = 66,
+	RADIUS_ATTR_TUNNEL_SERVER_ENDPOINT = 67,
+	RADIUS_ATTR_TUNNEL_PASSWORD = 69,
+	RADIUS_ATTR_ARAP_PASSWORD = 70,
+	RADIUS_ATTR_ARAP_FEATURES = 71,
+	RADIUS_ATTR_ARAP_ZONE_ACCESS = 72,
+	RADIUS_ATTR_ARAP_SECURITY = 73,
+	RADIUS_ATTR_ARAP_SECURITY_DATA = 74,
+	RADIUS_ATTR_PASSWORD_RETRY = 75,
+	RADIUS_ATTR_PROMPT = 76,
+	RADIUS_ATTR_CONFIGURATION_TOKEN = 78,
+	RADIUS_ATTR_TUNNEL_ASSIGNMENT_ID = 82,
+	RADIUS_ATTR_TUNNEL_PREFERENCE = 83,
+	RADIUS_ATTR_ARAP_CHALLENGE_RESPONSE = 84,
+	RADIUS_ATTR_NAS_PORT_ID = 87,
+	RADIUS_ATTR_FRAMED_POOL = 88,
+	RADIUS_ATTR_TUNNEL_CLIENT_AUTH_ID = 90,
+	RADIUS_ATTR_TUNNEL_SERVER_AUTH_ID = 91,
+	RADIUS_ATTR_ORIGINATING_LINE_INFO = 94,
+	RADIUS_ATTR_FRAMED_INTERFACE_ID = 96,
+	RADIUS_ATTR_FRAMED_IPV6_PREFIX = 97,
+	RADIUS_ATTR_LOGIN_IPV6_HOST = 98,
+	RADIUS_ATTR_FRAMED_IPV6_ROUTE = 99,
+	RADIUS_ATTR_FRAMED_IPV6_POOL = 100,
+	RADIUS_ATTR_ERROR_CAUSE = 101,
+	RADIUS_ATTR_EAP_KEY_NAME = 102,
+	RADIUS_ATTR_DIGEST_RESPONSE = 103,
+	RADIUS_ATTR_DIGEST_REALM = 104,
+	RADIUS_ATTR_DIGEST_NONCE = 105,
+	RADIUS_ATTR_DIGEST_RESPONSE_AUTH=106,
+	RADIUS_ATTR_DIGEST_NEXTNONCE = 107,
+	RADIUS_ATTR_DIGEST_METHOD = 108,
+	RADIUS_ATTR_DIGEST_URI = 109,
+	RADIUS_ATTR_DIGEST_QOP = 110,
+	RADIUS_ATTR_DIGEST_ALGORITHM = 111,
+	RADIUS_ATTR_DIGEST_ENTITY_BODY_HASH=112,
+	RADIUS_ATTR_DIGEST_CNONCE = 113,
+	RADIUS_ATTR_DIGEST_NONCE_COUNT = 114,
+	RADIUS_ATTR_DIGEST_USERNAME = 115,
+	RADIUS_ATTR_DIGEST_HA1 = 121,
+	RADIUS_ATTR_SIP_AOR = 122
 };
 
@@ -214,4 +229,19 @@
 	DIAM_ATTR_FRAMED_IPV6_POOL = 100,
 	DIAM_ATTR_EAP_KEY_NAME = 102,
+	DIAM_ATTR_DIGEST_RESPONSE = 103,
+	DIAM_ATTR_DIGEST_REALM = 104,
+	DIAM_ATTR_DIGEST_NONCE = 105,
+	DIAM_ATTR_DIGEST_RESPONSE_AUTH=106,
+	DIAM_ATTR_DIGEST_NEXTNONCE = 107,
+	DIAM_ATTR_DIGEST_METHOD = 108,
+	DIAM_ATTR_DIGEST_URI = 109,
+	DIAM_ATTR_DIGEST_QOP = 110,
+	DIAM_ATTR_DIGEST_ALGORITHM = 111,
+	DIAM_ATTR_DIGEST_ENTITY_BODY_HASH=112,
+	DIAM_ATTR_DIGEST_CNONCE = 113,
+	DIAM_ATTR_DIGEST_NONCE_COUNT = 114,
+	DIAM_ATTR_DIGEST_USERNAME = 115,
+	DIAM_ATTR_DIGEST_HA1 = 121,
+	DIAM_ATTR_SIP_AOR = 122,
 	DIAM_ATTR_AUTH_APPLICATION_ID = 258,
 	DIAM_ATTR_ACCT_APPLICATION_ID = 259,
@@ -232,4 +262,8 @@
 	DIAM_ATTR_TERMINATION_CAUSE = 295,
 	DIAM_ATTR_ORIGIN_REALM = 296,
+	DIAM_ATTR_SIP_AUTH_DATA_ITEM = 376,
+	DIAM_ATTR_SIP_AUTHENTICATION_SCHEME = 377,
+	DIAM_ATTR_SIP_AUTHENTICATE = 379,
+	DIAM_ATTR_SIP_NUMBER_AUTH_ITEMS = 382,
 	DIAM_ATTR_NAS_FILTER_RULE = 400,
 	DIAM_ATTR_TUNNELING = 401,
