Changeset 340:81821e9f6988 in freeDiameter for libfreeDiameter/sessions.c

Timestamp:

Jun 28, 2010, 11:20:48 AM (14 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.

File:

• libfreeDiameter/sessions.c (modified) (4 diffs)

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);
         }