Changeset 340:81821e9f6988 in freeDiameter

Timestamp:

Jun 28, 2010, 11:20:48 AM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Fix issue on session cleanup callback parameters -- thanks Souheil for reporting.

Files:

• extensions/app_radgw/rgwx_echodrop.c (modified) (1 diff)
• freeDiameter/tests/testsess.c (modified) (3 diffs)
• include/freeDiameter/libfreeDiameter.h (modified) (1 diff)
• libfreeDiameter/sessions.c (modified) (4 diffs)

extensions/app_radgw/rgwx_echodrop.c

@@ -39 +39 @@
 
 /* If a session is destroyed, empty the list of ed_saved_attribute */
-static void state_delete(void * arg) {
+static void state_delete(void * arg, char * sid) {
         struct fd_list * list = (struct fd_list *)arg;
         

freeDiameter/tests/testsess.c

@@ -47 +47 @@
 };
 
-static void mycleanup( char * sid, struct mystate * data )
+static void mycleanup( struct mystate * data, char * sid )
 {
         /* sanity */
@@ -268 +268 @@
                 CHECK( NULL, tms );
                 
-                mycleanup(str1, ms[0]);
-                mycleanup(str1, ms[1]);
+                mycleanup(ms[0], str1);
+                mycleanup(ms[1], str1);
                 
                 /* Now create 6 states */
@@ -350 +350 @@
                 CHECK( 0, fd_sess_state_retrieve( hdl1, sess1, &tms ) );
                 CHECK( 0, fd_sess_getsid(sess1, &str1) );
-                mycleanup(str1, tms);
+                mycleanup(tms, str1);
         }
         

include/freeDiameter/libfreeDiameter.h

@@ -1527 +1527 @@
  *  ENOMEM      : Not enough memory to complete the operation
  */
-int fd_sess_handler_create_internal ( struct session_handler ** handler, void (*cleanup)(char * sid, session_state * state) );
+int fd_sess_handler_create_internal ( struct session_handler ** handler, void (*cleanup)(session_state * state, char * sid) );
 /* Macro to avoid casting everywhere */
 #define fd_sess_handler_create( _handler, _cleanup ) \
-        fd_sess_handler_create_internal( (_handler), (void (*)(char *, session_state *))(_cleanup) )
-
+        fd_sess_handler_create_internal( (_handler), (void (*)(session_state *, char *))(_cleanup) )
+
+        
 /*
  * FUNCTION:    fd_sess_handler_destroy

libfreeDiameter/sessions.c

@@ -69 +69 @@
         int               eyec; /* An eye catcher also used to ensure the object is valid, must be SH_EYEC */
         int               id;   /* A unique integer to identify this handler */
-        void            (*cleanup)(char *, session_state *); /* The cleanup function to be called for cleaning a state */
+        void            (*cleanup)(session_state *, char *); /* The cleanup function to be called for cleaning a state */
 };
 
@@ -247 +247 @@
 
 /* Create a new handler */
-int fd_sess_handler_create_internal ( struct session_handler ** handler, void (*cleanup)(char * sid, session_state * state) )
+int fd_sess_handler_create_internal ( struct session_handler ** handler, void (*cleanup)(session_state * state, char * sid) )
 {
         struct session_handler *new;
@@ -318 +318 @@
                 struct state * st = (struct state *)(deleted_states.next->o);
                 TRACE_DEBUG(FULL, "Calling cleanup handler for session '%s' and data %p", st->sid, st->state);
-                (*del->cleanup)(st->sid, st->state);
+                (*del->cleanup)(st->state, st->sid);
                 free(st->sid);
                 fd_list_unlink(&st->chain);
@@ -576 +576 @@
                 fd_list_unlink(&st->chain);
                 TRACE_DEBUG(FULL, "Calling handler %p cleanup for state registered with session '%s'", st->hdl, sess->sid);
-                (*st->hdl->cleanup)(sess->sid, st->state);
+                (*st->hdl->cleanup)(st->state, sess->sid);
                 free(st);
         }