Changeset 637:22e8fac3b2d6 in freeDiameter for libfreeDiameter/messages.c

Timestamp:

Dec 16, 2010, 6:56:41 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Split interface file in modules

File:

• libfreeDiameter/messages.c (modified) (6 diffs)

libfreeDiameter/messages.c

@@ -118 +118 @@
         int                      msg_routable;          /* Is this a routable message? (0: undef, 1: routable, 2: non routable) */
         struct msg              *msg_query;             /* the associated query if the message is a received answer */
+        int                      msg_associated;        /* and the counter part information in the query, to avoid double free */
         struct rt_data          *msg_rtdata;            /* Routing list for the query */
         struct session          *msg_sess;              /* Cached message session if any */
@@ -342 +343 @@
         /* associate with query */
         ans->msg_query = qry;
+        qry->msg_associated = 1;
         
         /* Done */
@@ -629 +631 @@
         if (CHECK_MSG(object)) {
                 if (_M(object)->msg_query) {
+                        _M(_M(object)->msg_query)->msg_associated = 0;
                         CHECK_FCT(  fd_msg_free( _M(object)->msg_query )  );
                         _M(object)->msg_query = NULL;
+                } else {
+                        if (_M(object)->msg_associated) {
+                                TRACE_DEBUG(INFO, "Not freeing query %p referenced in an answer (will be freed along the answer).", object);
+                                return 0;
+                        }
                 }
         }
@@ -689 +697 @@
                 msg->msg_public.msg_eteid
                 );
-        fd_log_debug(INOBJHDR "intern: rwb:%p rt:%d cb:%p(%p) qry:%p sess:%p src:%s\n", 
-                        INOBJHDRVAL, msg->msg_rawbuffer, msg->msg_routable, msg->msg_cb.fct, msg->msg_cb.data, msg->msg_query, msg->msg_sess, msg->msg_src_id?:"(nil)");
+        fd_log_debug(INOBJHDR "intern: rwb:%p rt:%d cb:%p(%p) qry:%p asso:%d sess:%p src:%s\n", 
+                        INOBJHDRVAL, msg->msg_rawbuffer, msg->msg_routable, msg->msg_cb.fct, msg->msg_cb.data, msg->msg_query, msg->msg_associated, msg->msg_sess, msg->msg_src_id?:"(nil)");
 }
 
@@ -862 +870 @@
         
         answer->msg_query = query;
+        query->msg_associated = 1;
         
         return 0;
@@ -883 +892 @@
         CHECK_PARAMS(  CHECK_MSG(answer) );
         
+        answer->msg_query->msg_associated = 0;
         answer->msg_query = NULL;