Changeset 278:50bfb29bf036 in freeDiameter for extensions/app_radgw/rgw_clients.c

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)

File:

• extensions/app_radgw/rgw_clients.c (modified) (2 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;