Changeset 639:95a784729cac in freeDiameter for libfreeDiameter/sessions.c

Timestamp:

Dec 20, 2010, 1:07:06 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added new opaque pointer to fd_sess_handler_create and fd_disp_register for usability. Bumped API version number.

File:

• libfreeDiameter/sessions.c (modified) (7 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)(session_state *, char *); /* The cleanup function to be called for cleaning a state */
+        void            (*cleanup)(session_state *, char *, void *); /* The cleanup function to be called for cleaning a state */
+        void             *opaque; /* a value that is passed as is to the cleanup callback */
 };
 
@@ -253 +254 @@
 
 /* Create a new handler */
-int fd_sess_handler_create_internal ( struct session_handler ** handler, void (*cleanup)(session_state * state, char * sid) )
+int fd_sess_handler_create_internal ( struct session_handler ** handler, void (*cleanup)(session_state * state, char * sid, void * opaque), void * opaque )
 {
         struct session_handler *new;
@@ -270 +271 @@
         new->eyec = SH_EYEC;
         new->cleanup = cleanup;
+        new->opaque = opaque;
         
         *handler = new;
@@ -277 +279 @@
 /* Destroy a handler, and all states attached to this handler. This operation is very slow but we don't care since it's rarely used. 
  * Note that it's better to call this function after all sessions have been deleted... */
-int fd_sess_handler_destroy ( struct session_handler ** handler )
+int fd_sess_handler_destroy ( struct session_handler ** handler, void ** opaque )
 {
         struct session_handler * del;
@@ -323 +325 @@
                 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->state, st->sid);
+                (*del->cleanup)(st->state, st->sid, del->opaque);
                 free(st->sid);
                 fd_list_unlink(&st->chain);
                 free(st);
         }
+        
+        if (opaque)
+                *opaque = del->opaque;
         
         /* Free the handler */
@@ -583 +588 @@
                 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)(st->state, sess->sid);
+                (*st->hdl->cleanup)(st->state, sess->sid, st->hdl->opaque);
                 free(st);
         }
@@ -805 +810 @@
                 fd_log_debug("\t  %*s  Invalid session handler object\n", level, "");
         } else {
-                fd_log_debug("\t  %*s  id %d, cleanup %p\n", level, "", handler->id, handler->cleanup);
+                fd_log_debug("\t  %*s  id %d, cleanup %p, opaque %p\n", level, "", handler->id, handler->cleanup, handler->opaque);
         }
         fd_log_debug("\t  %*s -- end of handler @%p --\n", level, "", handler);