Changeset 1329:175f2eb883a0 in freeDiameter

Timestamp:

Nov 27, 2017, 11:27:31 PM (6 years ago)

Author:

Thomas Klausner <tk@giga.or.at>

Branch:

default

Phase:

public

Message:

Add function to retrieve pmd structure associated with a request.

Returns NULL in case of error.

Files:

• include/freeDiameter/libfdcore.h (modified) (1 diff)
• libfdcore/hooks.c (modified) (5 diffs)

include/freeDiameter/libfdcore.h

@@ -1155 +1155 @@
 struct fd_hook_permsgdata * fd_hook_get_request_pmd(struct fd_hook_data_hdl *data_hdl, struct msg * answer);
 
+/* Use the following function to retrieve any pmd structure associated with a request. Returns NULL in case of error */
+struct fd_hook_permsgdata * fd_hook_get_pmd(struct fd_hook_data_hdl *data_hdl, struct msg * msg);
+
+
 /* The following is used by HOOK_MASK macro */
 uint32_t fd_hook_mask_helper(int dummy, ...);

libfdcore/hooks.c

@@ -196 +196 @@
 
 /* Return the location of the permsgdata area corresponding to this handle, after eventually having created it. Return NULL in case of failure */
-static struct fd_hook_permsgdata * get_or_create_pmd(struct fd_msg_pmdl *pmdl, struct fd_hook_hdl * h) 
+static struct fd_hook_permsgdata * get_or_create_pmd(struct fd_msg_pmdl *pmdl, struct fd_hook_data_hdl * h)
 {
         struct fd_hook_permsgdata * ret = NULL;
@@ -210 +210 @@
         for (li=pmdl->sentinel.next; li != &pmdl->sentinel; li = li->next) {
                 struct pmd_list_item * pli = (struct pmd_list_item *) li;
-                if (pli->hdl == h->data_hdl)
+                if (pli->hdl == h)
                         ret = &pli->pmd;
-                if (pli->hdl >= h->data_hdl)
+                if (pli->hdl >= h)
                         break;
         }
@@ -218 +218 @@
                 /* we need to create a new one and insert before li */
                 struct pmd_list_item * pli;
-                CHECK_MALLOC_DO( pli = malloc(sizeof_pmd(h->data_hdl)), );
+                CHECK_MALLOC_DO( pli = malloc(sizeof_pmd(h)), );
                 if (pli) {
-                        memset(pli, 0, sizeof_pmd(h->data_hdl));
+                        memset(pli, 0, sizeof_pmd(h));
                         fd_list_init(&pli->chain, pli);
-                        pli->hdl = h->data_hdl;
+                        pli->hdl = h;
                         ret = &pli->pmd;
-                        if (h->data_hdl->pmd_init_cb) {
-                                (*h->data_hdl->pmd_init_cb)(ret);
+                        if (h->pmd_init_cb) {
+                                (*h->pmd_init_cb)(ret);
                         }
                         fd_list_insert_before(li, &pli->chain);
@@ -233 +233 @@
         CHECK_POSIX_DO( pthread_mutex_unlock(&pmdl->lock), );
         return ret;
+}
+
+struct fd_hook_permsgdata * fd_hook_get_pmd(struct fd_hook_data_hdl *data_hdl, struct msg * msg)
+{
+    return get_or_create_pmd(fd_msg_pmdl_get(msg), data_hdl);
 }
 
@@ -307 +312 @@
                         /* do we need to handle pmd ? */
                         if (h->data_hdl && pmdl) {
-                                pmd = get_or_create_pmd(pmdl, h);
+                                pmd = get_or_create_pmd(pmdl, h->data_hdl);
                         }