Changeset 1424:c8057892e56b in freeDiameter for extensions/app_sip/libapp_sip.c

Timestamp:

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

Author:

Luke Mewburn <luke@mewburn.net>

Branch:

default

Phase:

public

Message:

adapt extensions to fd_msg_search_avp(struct avp)

Remove now-unnecessary fd_avp_search_avp() implementations
now that fd_msg_search_avp() can be used.

TODO: rt_rewrite.fdx still uses own version because that does
extra validation and logging (that may or may not be necessary).

File:

• extensions/app_sip/libapp_sip.c (modified) (1 diff)

extensions/app_sip/libapp_sip.c

@@ -67 +67 @@
 }
 
-
-/* Search a given AVP model in an AVP (extracted from libfreediameter/message.c ) */
-int fd_avp_search_avp ( struct avp * groupedavp, struct dict_object * what, struct avp ** avp )
-{
-        struct avp * nextavp;
-        struct avp_hdr * nextavphdr;
-        struct dict_avp_data    dictdata;
-        
-        
-        TRACE_ENTRY("%p %p %p", groupedavp, what, avp);
-        
-        CHECK_FCT(  fd_dict_getval(what, &dictdata)  );
-        
-        // Loop only in the group AVP 
-        CHECK_FCT(  fd_msg_browse(groupedavp, MSG_BRW_FIRST_CHILD, (void *)&nextavp, NULL)  );
-        CHECK_FCT( fd_msg_avp_hdr( nextavp, &nextavphdr )  );
-        
-        while (nextavphdr) {
-                
-                if ( (nextavphdr->avp_code   == dictdata.avp_code) && (nextavphdr->avp_vendor == dictdata.avp_vendor) ) // always 0 if no Vendor flag
-                {
-                        break;
-                }
-                
-                // Otherwise move to next AVP in the grouped AVP 
-                CHECK_FCT( fd_msg_browse(nextavp, MSG_BRW_NEXT, (void *)&nextavp, NULL) );
-                
-                if(nextavp!=NULL)
-                {
-                        CHECK_FCT( fd_msg_avp_hdr( nextavp, &nextavphdr )  );
-                }
-                else
-                        nextavphdr=NULL;
-        }
-        if (avp)
-                *avp = nextavp;
-        
-        if (avp && nextavp) {
-                struct dictionary * dict;
-                CHECK_FCT( fd_dict_getdict( what, &dict) );
-                CHECK_FCT_DO( fd_msg_parse_dict( nextavp, dict, NULL ),  );
-        }
-        
-        if (avp || nextavp)
-                return 0;
-        else
-                return ENOENT;
-}
 struct avp_hdr *walk_digest(struct avp *avp, int avp_code)
 {