Changeset 291:2d3a799ad29c in freeDiameter

Timestamp:

May 10, 2010, 2:10:51 PM (14 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Cache the session pointer in answers when it was present in queries

Location:

libfreeDiameter

Files:

• libfD.h (modified) (1 diff)
• messages.c (modified) (2 diffs)
• sessions.c (modified) (1 diff)

libfreeDiameter/libfD.h

@@ -62 +62 @@
 /* Messages / sessions API */
 int fd_sess_fromsid_msg ( unsigned char * sid, size_t len, struct session ** session, int * new);
+int fd_sess_ref_msg ( struct session * session );
 int fd_sess_reclaim_msg ( struct session ** session );
 

libfreeDiameter/messages.c

@@ -336 +336 @@
                 CHECK_FCT( fd_msg_avp_setvalue( avp, &val ) );
                 CHECK_FCT( fd_msg_avp_add( ans, MSG_BRW_FIRST_CHILD, avp ) );
+                ans->msg_sess = sess;
+                CHECK_FCT( fd_sess_ref_msg(sess) );
         }
         
@@ -2208 +2210 @@
         CHECK_FCT_DO( ret = fd_msg_browse( *msg, MSG_BRW_FIRST_CHILD, &avp, NULL ), goto error );
         while (avp != NULL) {
-                /* Sanity */
-                ASSERT( avp->avp_public.avp_value );
-                
                 /* For unknown AVP, we don't have a callback registered, so just skip */
                 if (avp->avp_model) {
                         struct dict_object * type, * enumval;
                         
+                        /* Sanity */
+                        ASSERT( avp->avp_public.avp_value );
+
                         /* Get the list of callback for this AVP */
                         CHECK_FCT_DO( ret = fd_dict_disp_cb(DICT_AVP, avp->avp_model, &cb_list), goto error );

libfreeDiameter/sessions.c

@@ -712 +712 @@
         CHECK_FCT( fd_sess_fromsid ( (char *) sid, len, session, new) );
         
+        /* Increase count */
+        CHECK_FCT( fd_sess_ref_msg ( *session ) );
+        
+        /* Done */
+        return 0;
+}
+
+int fd_sess_ref_msg ( struct session * session )
+{
+        TRACE_ENTRY("%p", session);
+        CHECK_PARAMS( VALIDATE_SI(session) );
+
         /* Update the msg refcount */
-        CHECK_POSIX( pthread_mutex_lock(&(*session)->stlock) );
-        (*session)->msg_cnt++;
-        CHECK_POSIX( pthread_mutex_unlock(&(*session)->stlock) );
-        
-        /* Done */
+        CHECK_POSIX( pthread_mutex_lock(&session->stlock) );
+        session->msg_cnt++;
+        CHECK_POSIX( pthread_mutex_unlock(&session->stlock) );
+        
         return 0;
 }