Changeset 296:e11a9f90a65a in freeDiameter for extensions/app_radgw/rgwx_auth.c

Timestamp:

May 10, 2010, 4:04:42 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Do not send STR if the auth server sent NO_STATE_MAINTAINED

File:

• extensions/app_radgw/rgwx_auth.c (modified) (5 diffs)

extensions/app_radgw/rgwx_auth.c

@@ -50 +50 @@
 #define ACV_OAP_RADIUS                  1       /* RADIUS */
 #define ACV_ASS_STATE_MAINTAINED        0       /* STATE_MAINTAINED */
+#define ACV_ASS_NO_STATE_MAINTAINED     1       /* NO_STATE_MAINTAINED */
 #define ER_DIAMETER_MULTI_ROUND_AUTH    1001
 #define ER_DIAMETER_LIMITED_SUCCESS     2002
@@ -920 +921 @@
         char buf[254]; /* to store some attributes values (with final '\0') */
         int ta_set = 0;
+        int no_str = 0; /* indicate if an STR is required for this server */
         uint8_t tuntag = 0;
         unsigned char * req_auth = NULL;
@@ -1048 +1050 @@
                 CONV2RAD_STR(RADIUS_ATTR_STATE, buf, strlen(buf), 0);
         }
-        /* The RFC text says that this should always be the case, but it seems odd... */
+
         if ((*rad_fw)->hdr->code == RADIUS_CODE_ACCESS_ACCEPT) {
                 /* Add the Session-Id */
                 if (sizeof(buf) < snprintf(buf, sizeof(buf), "Diameter/%.*s", 
                                 sid->avp_value->os.len, sid->avp_value->os.data)) {
-                        TRACE_DEBUG(INFO, "Data truncated in Class attribute: %s", buf);
-                }
-                CONV2RAD_STR(RADIUS_ATTR_CLASS, buf, strlen(buf), 0);
-                
-                /* Add the auth-application-id required for STR */
-                CHECK_FCT( fd_msg_hdr( *diam_ans, &hdr ) );
-                if (sizeof(buf) < snprintf(buf, sizeof(buf), CLASS_AAI_PREFIX "%u", 
-                                hdr->msg_appl)) {
                         TRACE_DEBUG(INFO, "Data truncated in Class attribute: %s", buf);
                 }
@@ -1206 +1200 @@
                                         if ((!ta_set) && (ahdr->avp_value->u32 == ACV_ASS_STATE_MAINTAINED)) {
                                                 CONV2RAD_32B( RADIUS_ATTR_TERMINATION_ACTION, RADIUS_TERMINATION_ACTION_RADIUS_REQUEST );
+                                        }
+                                        
+                                        if (ahdr->avp_value->u32 == ACV_ASS_NO_STATE_MAINTAINED) {
+                                                no_str = 1;
                                         }
                                         break;
@@ -1669 +1667 @@
         free(req_auth);
 
+        if ((*rad_fw)->hdr->code == RADIUS_CODE_ACCESS_ACCEPT) {
+                /* Add the auth-application-id required for STR, or 0 if no STR is required */
+                CHECK_FCT( fd_msg_hdr( *diam_ans, &hdr ) );
+                if (sizeof(buf) < snprintf(buf, sizeof(buf), CLASS_AAI_PREFIX "%u", 
+                                no_str ? 0 : hdr->msg_appl)) {
+                        TRACE_DEBUG(INFO, "Data truncated in Class attribute: %s", buf);
+                }
+                CONV2RAD_STR(RADIUS_ATTR_CLASS, buf, strlen(buf), 0);
+        }
+        
         return 0;
 }