Changeset 278:50bfb29bf036 in freeDiameter

Timestamp:

Apr 23, 2010, 5:22:09 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Try better handling several pending requests for the same session (not very clean yet)

Location:

extensions/app_radgw

Files:

• rgw_clients.c (modified) (2 diffs)
• rgw_msg.c (modified) (1 diff)
• rgw_worker.c (modified) (4 diffs)

extensions/app_radgw/rgw_clients.c

@@ -260 +260 @@
                 rgw_msg_free(msg);
         } else {
-                /* Update information for new message */
-                if (cli->last[idx].ans) {
-                        /* Free it */
-                        radius_msg_free(cli->last[idx].ans);
-                        free(cli->last[idx].ans);
-                        cli->last[idx].ans = NULL;
-                }
-                cli->last[idx].id = (*msg)->radius.hdr->identifier;
-                cli->last[idx].port = (*msg)->port;
+                /* We have not just received this message already */
+                if (cli->last[idx].port == 0) { /* first message from this client */
+                        /* Just add the new information */
+                        ASSERT(cli->last[idx].ans == NULL);
+                        cli->last[idx].id = (*msg)->radius.hdr->identifier;
+                        cli->last[idx].port = (*msg)->port;
+                } else { 
+                        /* We have got previous message(s), update the info only if answered already */
+                        if (cli->last[idx].ans) {
+                                cli->last[idx].id = (*msg)->radius.hdr->identifier;
+                                cli->last[idx].port = (*msg)->port;
+                                /* Free the previous answer */
+                                radius_msg_free(cli->last[idx].ans);
+                                free(cli->last[idx].ans);
+                                cli->last[idx].ans = NULL;
+                        } 
+                }
         }
         
@@ -607 +615 @@
         }
         cli->last[idx].ans = *msg;
+        cli->last[idx].id = req->radius.hdr->identifier;
+        cli->last[idx].port = req->port;
         *msg = NULL;
         

extensions/app_radgw/rgw_msg.c

@@ -268 +268 @@
         if (*session) {
                 CHECK_FCT( fd_sess_getsid(*session, &sess_str) );
-                TRACE_DEBUG(FULL, "Session '%s' has been successfully %s.", sess_str, idx ? "created" : "retrieved");
+                if (idx == 0) {
+                        TRACE_DEBUG(INFO, "Another message was translated for this session ('%s') and not answered yet, discarding the new RADIUS request.", sess_str);
+                        *session = NULL;
+                        return EALREADY;
+                }
+                
+                TRACE_DEBUG(FULL, "Translating new message for session '%s'...", sess_str);
                 
                 /* Add the Session-Id AVP as first AVP */

extensions/app_radgw/rgw_worker.c

@@ -147 +147 @@
                         {
                                 /* An error occurred, discard message */
+                                if (diam_msg) {
+                                        CHECK_FCT_DO( fd_msg_free(diam_msg), );
+                                        diam_msg = NULL;
+                                }
+                                if (session) {
+                                        CHECK_FCT_DO( fd_sess_destroy(&session), );
+                                }
                                 rgw_msg_free(&msg);
                                 rgw_clients_dispose(&cli);
@@ -153 +160 @@
                 if (msg == NULL) {
                         rgw_clients_dispose(&cli);
+                        if (diam_msg) {
+                                CHECK_FCT_DO( fd_msg_free(diam_msg), );
+                                diam_msg = NULL;
+                        }
+                        if (session) {
+                                CHECK_FCT_DO( fd_sess_destroy(&session), );
+                        }
                         continue; /* the message was handled already */
                 }
@@ -176 +190 @@
                 }
                 
-                /* Check the session is correct */
+                /* Check the session is correct (for debug) */
                 ASSERT(session != NULL);
                 
@@ -298 +312 @@
         }
         
+        /* Clear the RADIUS request */
+        if (pa->rad) {
+                rgw_msg_free(&pa->rad);
+        }
+        
         /* Release reference on the client */
         rgw_clients_dispose(&pa->cli);