Changeset 996:cf09fde3d7f5 in freeDiameter for extensions/app_radgw/rgwx_sip.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_sip.c (modified) (14 diffs)

extensions/app_radgw/rgwx_sip.c

@@ -2 +2 @@
 * Software License Agreement (BSD License)                                                               *
 * Author: Alexandre Westfahl <awestfahl@freediameter.net>                                                *
-*                                                                                                        *
+*                                                                                                        *                                                                                               *
+* Copyright (c) 2013, WIDE Project and NICT                                                              *
 * Copyright (c) 2010, Alexandre Westfahl, Teraoka Laboratory (Keio University), and the WIDE Project.    *              
 *                                                                                                        *
@@ -322 +323 @@
 
 /* Handle an incoming RADIUS request */
-static int sip_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 sip_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;
@@ -340 +341 @@
         struct avp *auth_data=NULL, *auth=NULL, *avp = NULL;
         union avp_value value;
-        
-        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_ACCESS_REQUEST) && rad_ans && diam_fw && *diam_fw && session);
-        
-        //We check that session is not already filled
-        if(*session)
-        {
-                TRACE_DEBUG(INFO,"INTERNAL ERROR: We are not supposed to receive a session in radSIP plugin.");
-                return EINVAL;
-        }
+        struct session * sess;
+        
+        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_ACCESS_REQUEST) && rad_ans && diam_fw && *diam_fw);
         
         /*
            RFC5090 RADIUS Extension Digest Application
         */
+        CHECK_FCT( fd_msg_sess_get(fd_g_config->cnf_dict, *diam_fw, &sess, NULL) );
+        if (sess != NULL) {
+                TRACE_DEBUG(INFO,"INTERNAL ERROR: We are not supposed to receive a session in radSIP plugin.");
+                return EINVAL;          
+        }
         
         /* Check basic information is there */
@@ -398 +398 @@
                                         return EINVAL;
                                 }
-                                CHECK_FCT(fd_sess_fromsid (sid, sidlen, session, NULL));
+                                CHECK_FCT(fd_sess_fromsid_msg (sid, sidlen, &sess, NULL));
                                 free(sid);
                                                         
@@ -424 +424 @@
 
         /* Create the session if it is not already done */
-        if (!*session) {
+        if (!sess) {
                 
                 DiamId_t fqdn;
@@ -431 +431 @@
                 size_t realm_len;
                 
-                
-                
-                
                 /* Get information on the RADIUS client */
                 CHECK_FCT( rgw_clients_get_origin(cli, &fqdn, &fqdn_len, &realm, &realm_len) );
@@ -440 +437 @@
                 CHECK_MALLOC( sid = malloc(un_len + 1 /* ';' */ + fd_g_config->cnf_diamid_len + 1 /* '\0' */) );
                 sidlen = sprintf((char *)sid, "%.*s;%s", (int)un_len, un, fd_g_config->cnf_diamid);
-                CHECK_FCT( fd_sess_new(session, fqdn, fqdn_len, sid, sidlen) );
+                CHECK_FCT( fd_sess_new(&sess, fqdn, fqdn_len, sid, sidlen) );
                 free(sid);
         }
+        
+        /* Now, add the Session-Id AVP at beginning of Diameter message */
+        CHECK_FCT( fd_msg_avp_new ( cs->dict.Session_Id, 0, &avp ) );
+        value.os.data = sid;
+        value.os.len = sidlen;
+        CHECK_FCT( fd_msg_avp_setvalue ( avp, &value ) );
+        CHECK_FCT( fd_msg_avp_add ( *diam_fw, MSG_BRW_FIRST_CHILD, avp) );
+        
+        TRACE_DEBUG(FULL, "[sip.rgwx] Translating new message for session '%s'...", sid);
+        
+        /* Now add this session in the message */
+        CHECK_FCT( fd_msg_sess_set(*diam_fw, sess) );
                 
         /* Add the Destination-Realm AVP */
@@ -467 +476 @@
         
         CHECK_FCT( fd_msg_avp_setvalue ( avp, &value ) );
-        CHECK_FCT( fd_msg_avp_add ( *diam_fw, MSG_BRW_FIRST_CHILD, avp) );
-        
-        /* Now, add the Session-Id AVP at beginning of Diameter message */
-        CHECK_FCT( fd_sess_getsid(*session, &sid, &sidlen) );
-        
-        TRACE_DEBUG(FULL, "[sip.rgwx] Translating new message for session '%s'...", sid);
-        
-        /* Add the Session-Id AVP as first AVP */
-        CHECK_FCT( fd_msg_avp_new ( cs->dict.Session_Id, 0, &avp ) );
-        value.os.data = sid;
-        value.os.len = sidlen;
-        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, *session) );
+        CHECK_FCT( fd_msg_avp_add ( *diam_fw, MSG_BRW_LAST_CHILD, avp) );
         
         /*
@@ -721 +717 @@
         //fd_msg_dump_walk(1,*diam_fw);
         
-        /* Store the request identifier in the session (if provided) */
-        if (*session) {
+        /* Store the request identifier in the session */
+        {
                 unsigned char * req_sip;
                 CHECK_MALLOC(req_sip = malloc(16));
                 memcpy(req_sip, &rad_req->hdr->authenticator[0], 16);
                 
-                CHECK_FCT( fd_sess_state_store( cs->sess_hdl, *session, &req_sip ) );
+                CHECK_FCT( fd_sess_state_store( cs->sess_hdl, sess, &req_sip ) );
         }
         
@@ -734 +730 @@
 }
 
-static int sip_diam_ans( struct rgwp_config * cs, struct session * session, struct msg ** diam_ans, struct radius_msg ** rad_fw, struct rgw_client * cli, int * statefull )
+static int sip_diam_ans( struct rgwp_config * cs, struct msg ** diam_ans, struct radius_msg ** rad_fw, struct rgw_client * cli )
 {
         
         
-        struct avp *avp, *next, *asid;
-        struct avp_hdr *ahdr, *sid;
+        struct avp *avp, *next;
+        struct avp_hdr *ahdr;
         //char buf[254]; /* to store some attributes values (with final '\0') */
         unsigned char * req_sip = NULL;
-        
-        TRACE_ENTRY("%p %p %p %p %p", cs, session, diam_ans, rad_fw, cli);
-        CHECK_PARAMS(cs && session && diam_ans && *diam_ans && rad_fw && *rad_fw);
-        
-        
-        
+        struct session * sess;
+        os0_t sid = NULL;
+        size_t sidlen;
+        
+        TRACE_ENTRY("%p %p %p %p", cs, diam_ans, rad_fw, cli);
+        CHECK_PARAMS(cs && diam_ans && *diam_ans && rad_fw && *rad_fw);
         
         
@@ -777 +773 @@
         }
 
-
         /* Search the different AVPs we handle here */
-        CHECK_FCT( fd_msg_search_avp (*diam_ans, cs->dict.Session_Id, &asid) );
-        CHECK_FCT( fd_msg_avp_hdr ( asid, &sid ) );
+        CHECK_FCT( fd_msg_sess_get(fd_g_config->cnf_dict, *diam_ans, &sess, NULL) );
+        if (sess) {
+                CHECK_FCT( fd_sess_getsid(sess, &sid, &sidlen) );
+        }
+
 
         /* Check the Diameter error code */
@@ -804 +802 @@
                         (*rad_fw)->hdr->code = RADIUS_CODE_ACCESS_REJECT;
                         fd_log_debug("[sip.rgwx] Received Diameter answer with error code '%d', session %.*s, translating into Access-Reject",
-                                        ahdr->avp_value->u32, 
-                                        sid->avp_value->os.len, sid->avp_value->os.data);
+                                        ahdr->avp_value->u32, sidlen, sid);
                         return 0;
         }
@@ -827 +824 @@
                                 case DIAM_ATTR_DIGEST_NONCE:
                                         CONV2RAD_STR(DIAM_ATTR_DIGEST_NONCE, ahdr->avp_value->os.data, ahdr->avp_value->os.len, 0);
-                                        /* Retrieve the request identified which was stored in the session */
-                                        if (session) {
-                                                os0_t sid=NULL;
-                                                size_t sidlen;
-                                                fd_sess_getsid (session, &sid, &sidlen );
-                                                
-                                                nonce_add_element(ahdr->avp_value->os.data, ahdr->avp_value->os.len, sid, sidlen, cs);
-                                        }
+                                        nonce_add_element(ahdr->avp_value->os.data, ahdr->avp_value->os.len, sid, sidlen, cs);
                                         break;
                                 case DIAM_ATTR_DIGEST_REALM:
@@ -867 +857 @@
         }
         
-        if (session) 
-        {
-                CHECK_FCT( fd_sess_state_retrieve( cs->sess_hdl, session, &req_sip ) );
-        }
+        CHECK_FCT( fd_sess_state_retrieve( cs->sess_hdl, sess, &req_sip ) );
         free(req_sip);
-        
         
         return 0;