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

Timestamp:

Jul 1, 2010, 3:47:34 PM (14 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/rgw_worker.c (modified) (9 diffs)

extensions/app_radgw/rgw_worker.c

@@ -130 +130 @@
                 
                 /* Note: after this point, the radius message buffer may not be consistent with the array of attributes anymore. */
+                diam_msg = NULL;
+                
+                /* Create an empty message with only Origin information (no session, no destination -- added by the plugins) */
+                CHECK_FCT_DO( rgw_msg_create_base(cli, &diam_msg),
+                        {
+                                /* An error occurred, discard message */
+                                rgw_msg_free(&msg);
+                                rgw_clients_dispose(&cli);
+                                continue;
+                        }  );
                 
                 session = NULL;
-                diam_msg = NULL;
-                
-                /* Create the session and an empty message with default common AVPs */
-                CHECK_FCT_DO( rgw_msg_create_base(msg, cli, &session, &diam_msg),
-                        {
-                                /* An error occurred, discard message */
-                                rgw_msg_free(&msg);
-                                rgw_clients_dispose(&cli);
-                                continue;
-                        }  );
                 
                 /* Pass the message to the list of registered plugins */
@@ -158 +158 @@
                                 continue;
                         }  );
-                if (msg == NULL) {
+                if (msg == NULL) { /* Error or RADIUS answer locally generated */
                         rgw_clients_dispose(&cli);
                         if (diam_msg) {
@@ -164 +164 @@
                                 diam_msg = NULL;
                         }
-                        if (session) {
-                                CHECK_FCT_DO( fd_sess_destroy(&session), );
-                        }
                         continue; /* the message was handled already */
                 }
@@ -172 +169 @@
                 pb = 0;
                 
-                /* Check the created Diameter message */
+                /* Check the created Diameter message -- it will be invalid if no callback has handled the RADIUS message */
                 if ((diam_msg == NULL) || ( fd_msg_parse_rules(diam_msg, fd_g_config->cnf_dict, NULL) ) ) {
                         fd_log_debug("[radgw] No or invalid Diameter message was generated after processing the RADIUS command %hhd (%s).\n"
-                                        " This is likely an implementation problem, please report.\n",
+                                        " It may indicate a gateway configuration problem, or implementation issue in a plugin.\n",
                                         msg->radius.hdr->code, rgw_msg_code_str(msg->radius.hdr->code));
-                        /* We might also dump the conflicting rule here if useful */
+                        /* We should also dump the conflicting rule here to help debug? */
                         pb++;
                 }
@@ -189 +186 @@
                                         msg->radius.hdr->code, rgw_msg_code_str(msg->radius.hdr->code));
                 }
-                
-                /* Check the session is correct (for debug) */
-                ASSERT(session != NULL);
                 
                 if (pb) {
@@ -253 +247 @@
         struct avp_hdr  *ahdr;
         int pb = 0;
+        int keepsession=0;
         
         TRACE_ENTRY("%p %p", pa, ans);
@@ -261 +256 @@
         
         /* Pass the Diameter answer to the same extensions as the request */
-        CHECK_FCT_DO( rgw_plg_loop_ans(pa->rad, pa->sess, ans, &rad_ans, pa->cli), goto out );
+        CHECK_FCT_DO( rgw_plg_loop_ans(pa->rad, pa->sess, ans, &rad_ans, pa->cli, &keepsession), goto out );
 
         if (*ans != NULL) {
@@ -293 +288 @@
 
                 if (pb) {
-                        TRACE_DEBUG(INFO, "[radgw] WARNING: %d mandatory AVP in the Diameter answer have not been translated to RADIUS!\n Please use plg_debug.rgwx for more information.", pb);
+                        TRACE_DEBUG(INFO, "[radgw] WARNING: %d mandatory AVP in the Diameter answer have not been translated to RADIUS!\n Please use debug.rgwx for more information.", pb);
                 }
         }
@@ -303 +298 @@
 
 out:
-        /* Destroy remaining session data (stateless gateway) */
-        CHECK_FCT_DO( fd_sess_destroy(&pa->sess),  );
+        if (!keepsession) {
+                /* Destroy remaining session data (stateless gateway) */
+                CHECK_FCT_DO( fd_sess_destroy(&pa->sess),  );
+        }
         
         /* Clear the Diameter message */