Changeset 356:e203fc0c95e3 in freeDiameter for extensions/app_radgw/rgwx_acct.c

Timestamp:

Jul 1, 2010, 3:47:34 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Updated the app_radgw extension to allow more souple management of sessions, and stateful gateway features.

File:

• extensions/app_radgw/rgwx_acct.c (modified) (7 diffs)

extensions/app_radgw/rgwx_acct.c

@@ -285 +285 @@
 
 /* Incoming RADIUS request */
-static int acct_rad_req( struct rgwp_config * cs, struct session * session, struct radius_msg * rad_req, struct radius_msg ** rad_ans, struct msg ** diam_fw, struct rgw_client * cli )
+static int acct_rad_req( struct rgwp_config * cs, struct session ** session, struct radius_msg * rad_req, struct radius_msg ** rad_ans, struct msg ** diam_fw, struct rgw_client * cli )
 {
         int idx;
@@ -300 +300 @@
         struct avp ** avp_tun = NULL, *avp = NULL;
         
+        const char * prefix = "Diameter/";
+        size_t pref_len;
+        char * si = NULL;
+        size_t si_len = 0;
+        
         TRACE_ENTRY("%p %p %p %p %p %p", cs, session, rad_req, rad_ans, diam_fw, cli);
         CHECK_PARAMS(rad_req && (rad_req->hdr->code == RADIUS_CODE_ACCOUNTING_REQUEST) && rad_ans && diam_fw && *diam_fw);
+        
+        pref_len = strlen(prefix);
         
         /*
@@ -309 +316 @@
               port or the NAS does not distinguish among its ports.
         */
+        /* We also enforce that the message contains a CLASS attribute with Diameter/ prefix containing the Session-Id. */
         for (idx = 0; idx < rad_req->attr_used; idx++) {
                 struct radius_attr_hdr * attr = (struct radius_attr_hdr *)(rad_req->buf + rad_req->attr_pos[idx]);
@@ -342 +350 @@
                                                    |  v[3] ;
                                 break;
+                                
+                        case RADIUS_ATTR_CLASS:
+                                {
+                                        char * attr_val = (char *)(attr + 1);
+                                        size_t attr_len = attr->length - sizeof(struct radius_attr_hdr);
+                                        if ((attr_len > pref_len ) && ! strncmp(attr_val, prefix, pref_len)) {
+                                                int i;
+                                                si = attr_val + pref_len;
+                                                si_len = attr_len - pref_len;
+                                                TRACE_DEBUG(ANNOYING, "Found Class attribute with '%s' prefix (attr #%d), SI:'%.*s'.", prefix, idx, si_len, si);
+                                                /* Remove from the message */
+                                                for (i = idx + 1; i < rad_req->attr_used; i++)
+                                                        rad_req->attr_pos[i - 1] = rad_req->attr_pos[i];
+                                                rad_req->attr_used -= 1;
+                                                break;
+                                        }
+                                }
+                                break;
+
                 }
         }
@@ -418 +445 @@
         }
         
+        /* Check if we got a valid session information, otherwise the server will not be able to handle the data... */
+        if (!*session && !si) {
+                TRACE_DEBUG(INFO, "[acct.rgwx] RADIUS Account-Request from %s did not contain a CLASS attribute with Diameter session information, reject.", rgw_clients_id(cli));
+                return EINVAL;
+        }
+        
+        /* Create the Session-Id AVP if needed */
+        if (!*session) {
+                CHECK_FCT( fd_sess_fromsid ( si, si_len, session, NULL) );
+                
+                TRACE_DEBUG(FULL, "[auth.rgwx] Translating new accounting message for session '%.*s'...", si_len, si);
+                
+                /* Add the Session-Id AVP as first AVP */
+                CHECK_FCT( fd_msg_avp_new ( cs->dict.Session_Id, 0, &avp ) );
+                value.os.data = (unsigned char *)si;
+                value.os.len = si_len;
+                CHECK_FCT( fd_msg_avp_setvalue ( avp, &value ) );
+                CHECK_FCT( fd_msg_avp_add ( *diam_fw, MSG_BRW_FIRST_CHILD, avp) );
+        }
+                
         /* Add the command code */
         {
@@ -1092 +1139 @@
                 }
                 st->term_cause = str_cause;
-                CHECK_FCT( fd_sess_state_store( cs->sess_hdl, session, &st ) );
+                CHECK_FCT( fd_sess_state_store( cs->sess_hdl, *session, &st ) );
         }
         
@@ -1128 +1175 @@
 }
 
-static int acct_diam_ans( struct rgwp_config * cs, struct session * session, struct msg ** diam_ans, struct radius_msg ** rad_fw, struct rgw_client * cli )
+static int acct_diam_ans( struct rgwp_config * cs, struct session * session, struct msg ** diam_ans, struct radius_msg ** rad_fw, struct rgw_client * cli, int * stateful )
 {
         struct sess_state * st = NULL;