ソースを参照

RADIUS dictionary update:
- SER-Service-Type attribute added
- Added Digest-Authentication value for SER-Service-Type

Jan Janak 19 年 前
コミット
5ed740788a
2 ファイル変更29 行追加16 行削除
  1. 9 7
      etc/dictionary.ser
  2. 20 9
      rad_dict.h

+ 9 - 7
etc/dictionary.ser

@@ -79,12 +79,12 @@ ATTRIBUTE SER-From-UID                 10   string   iptelorg  # SER, acc_radius
 ATTRIBUTE SER-From-DID                 11   string   iptelorg  # SER, acc_radius
 ATTRIBUTE SER-To-UID                   12   string   iptelorg  # SER, acc_radius
 ATTRIBUTE SER-Response-Timestamp       13   integer  iptelorg  # SER, acc_radius
-
-ATTRIBUTE SER-Service-Type             15   string   iptelorg  # SER, avp_radius
+ATTRIBUTE SER-Service-Type             14   integer  iptelorg  # SER, avp_radius
 ATTRIBUTE SER-DID                      16   string   iptelorg  # SER, ?
 ATTRIBUTE SER-UID                      17   string   iptelorg  # SER, ?
 ATTRIBUTE SER-Domain                   18   string   iptelorg  # SER, ?
 ATTRIBUTE SER-Uri-User                 19   string   iptelorg  # SER, auth_radius
+ATTRIBUTE SER-Uri-Scheme               20   string   iptelorg  # SER, avp_radius
 
 
 ### Acct-Status-Type Values ###
@@ -97,8 +97,10 @@ VALUE Acct-Status-Type      Failed          15         # RFC2866, acc_radius
 VALUE Service-Type         Sip-Session      15         # Schulzrinne, acc_radius, auth_radius
 
 ### SER-Service-Type Values ###
-VALUE SER-Service-Type     Get-URI-Attrs     1         # SER, avp_radius
-VALUE SER-Service-Type     Get-User-Attrs    2         # SER, avp_radius
-VALUE SER-Service-Type     Get-Domain-Attrs  3         # SER, ?
-VALUE SER-Service-Type     Get-Global-Attrs  4         # SER, ?
-VALUE SER-Service-Type     Lookup-Domain     5         # SER, ?
+VALUE SER-Service-Type     Get-URI-Attrs          1         # SER, avp_radius
+VALUE SER-Service-Type     Get-User-Attrs         2         # SER, avp_radius
+VALUE SER-Service-Type     Digest-Authentication  3         # SER, auth_radius
+VALUE SER-Service-Type     Get-Domain-Attrs       4         # SER, ?
+VALUE SER-Service-Type     Get-Global-Attrs       5         # SER, ?
+VALUE SER-Service-Type     Lookup-Domain          6         # SER, ?
+

+ 20 - 9
rad_dict.h

@@ -80,12 +80,8 @@ typedef enum rad_attr {
 	A_DIGEST_USER_NAME,
 
 	     /* To be deprecated in the future */
-	A_SER_URI_USER,
-	A_SER_GROUP,
-	A_SER_RPID,
 
 	     /* SER-specific attributes */
-	A_SER_ATTRS,
 	A_SER_FROM,
 	A_SER_FLAGS,
 	A_SER_ORIGINAL_REQUEST_ID,
@@ -98,6 +94,13 @@ typedef enum rad_attr {
 	A_SER_FROM_DID,
 	A_SER_TO_UID,
 	A_SER_RESPONSE_TIMESTAMP,
+	A_SER_ATTR,
+	A_SER_SERVICE_TYPE,
+	A_SER_DID,
+	A_SER_UID,
+	A_SER_DOMAIN,
+	A_SER_URI_USER,
+	A_SER_URI_SCHEME,
 
 	     /* CISCO Vendor Specific Attributes */
 	A_CISCO_AVPAIR,
@@ -106,15 +109,23 @@ typedef enum rad_attr {
 
 
 typedef enum rad_val {
+	 /* Acct-Status-Type */
 	V_START = 0,
 	V_STOP,
 	V_INTERIM_UPDATE,
 	V_FAILED,
-	V_CALL_CHECK,
-	V_SIP_SESSION,
-	V_SER_CALLER_AVPS,
-	V_SER_CALLEE_AVPS,
-	V_SER_GROUP_CHECK,
+
+	     /* Service-Type */
+	V_SIP_SESSION,     
+
+	     /* SER-Service-Type */
+	V_GET_URI_ATTRS,
+	V_GET_USER_ATTRS,
+	V_DIGEST_AUTHENTICATION,
+	V_GET_DOMAIN_ATTRS,
+	V_GET_GLOBAL_ATTRS,
+	V_LOOKUP_DOMAIN,
+
 	V_MAX
 } rad_val_t;