Changeset 1101:40b48a3997a2 in freeDiameter for libfdproto

Timestamp:

May 9, 2013, 1:06:03 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Parents:

1098:f38d77f9cfd3 (diff), 1100:4b7192d0ffde (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Phase:

public

Message:

Merged

Files:

• libfdproto/messages.c (modified) (1 diff)
• libfdproto/messages.c (modified) (3 diffs)

libfdproto/messages.c

@@ -1255 +1255 @@
                 return anscb ? EINVAL : 0; /* we associate with requests only */
         
-        CHECK_PARAMS( (anscb == NULL)    || (msg->msg_cb.anscb == NULL) ); /* We are not overwritting a cb */
-        CHECK_PARAMS( (expirecb == NULL) || (msg->msg_cb.expirecb == NULL) ); /* We are not overwritting a cb */
+        CHECK_PARAMS( (anscb == NULL)    || (msg->msg_cb.anscb == NULL) ); /* We are not overwriting a cb */
+        CHECK_PARAMS( (expirecb == NULL) || (msg->msg_cb.expirecb == NULL) ); /* We are not overwriting a cb */
         
         /* Associate callback and data with the message, if any */

libfdproto/messages.c

@@ -137 +137 @@
         DiamId_t                 msg_src_id;            /* Diameter Id of the peer this message was received from. This string is malloc'd and must be freed */
         size_t                   msg_src_id_len;        /* cached length of this string */
-        
+        struct fd_msg_pmdl       msg_pmdl;              /* list of permessagedata structures. */
 };
 
@@ -674 +674 @@
         }
         
+        if ((obj->type == MSG_MSG) && (_M(obj)->msg_pmdl.sentinel.o != NULL)) {
+                ((void (*)(struct fd_msg_pmdl *))_M(obj)->msg_pmdl.sentinel.o)(&_M(obj)->msg_pmdl);
+        }
+        
         /* free the object */
         free(obj);
@@ -1496 +1500 @@
         
         return 0;
+}
+
+/* Retrieve the location of the pmd list for the message; return NULL if failed */
+struct fd_msg_pmdl * fd_msg_pmdl_get(struct msg * msg)
+{
+        CHECK_PARAMS_DO( CHECK_MSG(msg), return NULL );
+        return &msg->msg_pmdl;
 }