Changeset 639:95a784729cac in freeDiameter for libfreeDiameter/dispatch.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/dispatch.c (modified) (7 diffs)

libfreeDiameter/dispatch.c

@@ -56 +56 @@
         enum disp_how    how;   /* Copy of registration parameter */
         struct disp_when when;  /* Copy of registration parameter */
-        int             (*cb)( struct msg **, struct avp *, struct session *, enum disp_action *);      /* The callback itself */
+        int             (*cb)( struct msg **, struct avp *, struct session *, void *, enum disp_action *);      /* The callback itself */
+        void            *opaque; /* opaque data passed back to the callback */
 };
 
@@ -93 +94 @@
                 
                 /* We have a match, the cb must be called. */
-                CHECK_FCT( (*hdl->cb)(msg, avp, sess, action) );
+                CHECK_FCT( (*hdl->cb)(msg, avp, sess, hdl->opaque, action) );
                 
                 if (*action != DISP_ACT_CONT)
@@ -109 +110 @@
 
 /* Create a new handler and link it */
-int fd_disp_register ( int (*cb)( struct msg **, struct avp *, struct session *, enum disp_action *), 
-                        enum disp_how how, struct disp_when * when, struct disp_hdl ** handle )
+int fd_disp_register ( int (*cb)( struct msg **, struct avp *, struct session *, void *, enum disp_action *), 
+                        enum disp_how how, struct disp_when * when, void * opaque, struct disp_hdl ** handle )
 {
         struct fd_list * cb_list = NULL;
@@ -171 +172 @@
         }
         new->cb = cb;
+        new->opaque = opaque;
         
         /* Now, link this new element in the appropriate lists */
@@ -186 +188 @@
 
 /* Delete a handler */
-int fd_disp_unregister ( struct disp_hdl ** handle )
+int fd_disp_unregister ( struct disp_hdl ** handle, void ** opaque )
 {
         struct disp_hdl * del;
@@ -199 +201 @@
         CHECK_POSIX( pthread_rwlock_unlock(&fd_disp_lock) );
         
+        if (opaque)
+                *opaque = del->opaque;
+        
         free(del);
         return 0;
@@ -208 +213 @@
         TRACE_ENTRY("");
         while (!FD_IS_LIST_EMPTY(&all_handlers)) {
-                CHECK_FCT_DO( fd_disp_unregister((void *)&(all_handlers.next->o)), /* continue */ );
+                CHECK_FCT_DO( fd_disp_unregister((void *)&(all_handlers.next->o), NULL), /* continue */ );
         }
         return;