Changeset 1423:67c263056d78 in freeDiameter for libfdproto

Timestamp:

Feb 19, 2020, 8:20:20 AM (4 years ago)

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

Message:

fd_msg_search_avp: search msg_or_avp, not just msg

Change fd_msg_search_avp() to support searching
struct msg or struct avp, and not just struct msg.

File:

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

libfdproto/messages.c

@@ -597 +597 @@
 }
 
-/* Search a given AVP model in a message */
-int fd_msg_search_avp ( struct msg * msg, struct dict_object * what, struct avp ** avp )
+/* Search a given AVP model in a message or AVP */
+int fd_msg_search_avp ( msg_or_avp * reference, struct dict_object * what, struct avp ** avp )
 {
         struct avp * nextavp;
@@ -604 +604 @@
         enum dict_object_type   dicttype;
         
-        TRACE_ENTRY("%p %p %p", msg, what, avp);
-        
-        CHECK_PARAMS( CHECK_MSG(msg) && what );
+        TRACE_ENTRY("%p %p %p", reference, what, avp);
+        
+        CHECK_PARAMS( VALIDATE_OBJ(reference) && what );
         
         CHECK_PARAMS( (fd_dict_gettype(what, &dicttype) == 0) && (dicttype == DICT_AVP) );
         CHECK_FCT(  fd_dict_getval(what, &dictdata)  );
         
-        /* Loop on all top AVPs */
-        CHECK_FCT(  fd_msg_browse(msg, MSG_BRW_FIRST_CHILD, (void *)&nextavp, NULL)  );
+        /* Loop on all top AVPs in message or AVP */
+        CHECK_FCT(  fd_msg_browse(reference, MSG_BRW_FIRST_CHILD, (void *)&nextavp, NULL)  );
         while (nextavp) {
                 
@@ -619 +619 @@
                         break;
                 
-                /* Otherwise move to next AVP in the message */
+                /* Otherwise move to next AVP in the message or AVP */
                 CHECK_FCT( fd_msg_browse(nextavp, MSG_BRW_NEXT, (void *)&nextavp, NULL) );
         }