Changeset 996:cf09fde3d7f5 in freeDiameter for extensions/app_radgw/rgwx_acct.c

Timestamp:

Mar 20, 2013, 12:13:14 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Children:

997:632913581c37, 998:ad6c1ee04d2d

Phase:

public

Message:

Fix management of sessions in app_radgw: sessions are simply associated with messages, that is sufficient

File:

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

extensions/app_radgw/rgwx_acct.c

@@ -289 +289 @@
 
 /* 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 radius_msg * rad_req, struct radius_msg ** rad_ans, struct msg ** diam_fw, struct rgw_client * cli )
 {
         int idx;
@@ -303 +303 @@
         union avp_value value;
         struct avp ** avp_tun = NULL, *avp = NULL;
+        struct session * sess;
         
         const char * prefix = "Diameter/";
@@ -311 +312 @@
         size_t un_len = 0;
         
-        TRACE_ENTRY("%p %p %p %p %p %p", cs, session, rad_req, rad_ans, diam_fw, cli);
+        TRACE_ENTRY("%p %p %p %p %p", cs, 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);
         
@@ -452 +453 @@
         if (status_type == RADIUS_ACCT_STATUS_TYPE_ACCOUNTING_OFF) {
                 TRACE_DEBUG(FULL, "[acct.rgwx] Received Accounting-Off Acct-Status-Type attribute, we must terminate all active sessions.");
-                TODO("RADIUS side is rebooting, send STR on all sessions?");
+                TODO("RADIUS side is rebooting, send STR on all sessions???");
                 return ENOTSUP;
         }
         
         /* Check if we got a valid session information, otherwise the server will not be able to handle the data... */
-        if (!*session && !si) {
+        if (!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;
@@ -483 +484 @@
         }
         CHECK_FCT( fd_msg_avp_setvalue ( avp, &value ) );
-        CHECK_FCT( fd_msg_avp_add ( *diam_fw, *session ? MSG_BRW_LAST_CHILD : MSG_BRW_FIRST_CHILD, avp) );
-        
-        /* Create the Session-Id AVP if needed */
-        if (!*session) {
-                CHECK_FCT( fd_sess_fromsid ( si, si_len, session, NULL) );
+        CHECK_FCT( fd_msg_avp_add ( *diam_fw, MSG_BRW_FIRST_CHILD, avp) );
+        
+        /* Create the Session-Id AVP */
+        {
+                CHECK_FCT( fd_sess_fromsid_msg ( si, si_len, &sess, NULL) );
                 
                 TRACE_DEBUG(FULL, "[acct.rgwx] Translating new accounting message for session '%.*s'...", si_len, si);
@@ -497 +498 @@
                 CHECK_FCT( fd_msg_avp_setvalue ( avp, &value ) );
                 CHECK_FCT( fd_msg_avp_add ( *diam_fw, MSG_BRW_FIRST_CHILD, avp) );
+                CHECK_FCT( fd_msg_sess_set(*diam_fw, sess) );
         }
         
@@ -1177 +1179 @@
         {
                 struct sess_state * st;
-                CHECK_PARAMS(session);
                 
                 CHECK_MALLOC( st = malloc(sizeof(struct sess_state)) );
@@ -1186 +1187 @@
                 }
                 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, sess, &st ) );
         }
         
@@ -1222 +1223 @@
 }
 
-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 )
+static int acct_diam_ans( struct rgwp_config * cs, struct msg ** diam_ans, struct radius_msg ** rad_fw, struct rgw_client * cli )
 {
+        struct session * sess;
         struct sess_state * st = NULL, stloc;
         struct avp *avp, *next;
-        struct avp_hdr *ahdr, *sid, *oh, *or;
-        
-        TRACE_ENTRY("%p %p %p %p %p", cs, session, diam_ans, rad_fw, cli);
+        struct avp_hdr *ahdr, *oh, *or;
+        os0_t sid = NULL;
+        size_t sidlen;
+        
+        TRACE_ENTRY("%p %p %p %p", cs, diam_ans, rad_fw, cli);
         CHECK_PARAMS(cs);
         
-        if (session) {
-                CHECK_FCT( fd_sess_state_retrieve( cs->sess_hdl, session, &st ) );
+        CHECK_FCT( fd_msg_sess_get(fd_g_config->cnf_dict, *diam_ans, &sess, NULL) );
+        if (sess) {
+                CHECK_FCT( fd_sess_state_retrieve( cs->sess_hdl, sess, &st ) );
+                CHECK_FCT( fd_sess_getsid(sess, &sid, &sidlen) );
         }
         
@@ -1246 +1252 @@
         
         /* Search these AVPs first */
-        CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Session_Id, &avp) );
-        CHECK_FCT( fd_msg_avp_hdr ( avp, &sid ) );
-        
         CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Origin_Host, &avp) );
         CHECK_FCT( fd_msg_avp_hdr ( avp, &oh ) );
@@ -1269 +1272 @@
                                         ahdr->avp_value->u32, 
                                         oh->avp_value->os.len, oh->avp_value->os.data,
-                                        sid->avp_value->os.len, sid->avp_value->os.data);
+                                        sidlen, sid);
                         CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Error_Message, &avp) );
                         if (avp) {
@@ -1310 +1313 @@
                 CHECK_FCT(  fd_msg_new ( cs->dict.Session_Termination_Request, MSGFL_ALLOC_ETEID, &str )  );
                 
-                /* Set the application-id to the auth application if available, accouting otherwise (not sure what is actually expected...) */
+                /* Set the application-id to the auth application if available, accounting otherwise (not sure what is actually expected...) */
                 CHECK_FCT( fd_msg_hdr ( str, &hdr ) );
                 hdr->msg_appl = st->auth_appl ?: AI_ACCT;
@@ -1316 +1319 @@
                 /* Add the Session-Id AVP as first AVP */
                 CHECK_FCT( fd_msg_avp_new (  cs->dict.Session_Id, 0, &avp ) );
-                CHECK_FCT( fd_msg_avp_setvalue ( avp, sid->avp_value ) );
+                avp_val.os.data = sid;
+                avp_val.os.len = sidlen;
+                CHECK_FCT( fd_msg_avp_setvalue ( avp, &avp_val ) );
                 CHECK_FCT( fd_msg_avp_add ( str, MSG_BRW_FIRST_CHILD, avp) );
+                CHECK_FCT( fd_sess_ref_msg(sess) );
 
                 /* Add the Destination-Realm as next AVP */