Changeset 1424:c8057892e56b in freeDiameter for extensions/app_sip/multimediaauth.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/multimediaauth.c (modified) (11 diffs)

extensions/app_sip/multimediaauth.c

@@ -321 +321 @@
                                                         
                                                         
-                                                        CHECK_FCT(fd_avp_search_avp (avp, sip_dict.Digest_CNonce, &a2 ));
+                                                        CHECK_FCT(fd_msg_search_avp (avp, sip_dict.Digest_CNonce, &a2 ));
                                                         
                                                         if(a2!=NULL)
@@ -458 +458 @@
                                                                         
                                                                         
-                                                                        CHECK_FCT(fd_avp_search_avp (avp, sip_dict.Digest_Nonce, &a2 ));
+                                                                        CHECK_FCT(fd_msg_search_avp (avp, sip_dict.Digest_Nonce, &a2 ));
                                                                         if(a2!=NULL)
                                                                         {
@@ -487 +487 @@
                                                                                         
                                                                         }
-                                                                        CHECK_FCT(fd_avp_search_avp (avp, sip_dict.Digest_Response, &a2 ));
+                                                                        CHECK_FCT(fd_msg_search_avp (avp, sip_dict.Digest_Response, &a2 ));
                                                                         if(a2!=NULL)
                                                                         {
@@ -501 +501 @@
                                                                                 
                                                                         }
-                                                                        CHECK_FCT(fd_avp_search_avp (avp, sip_dict.Digest_Realm, &a2 ));
+                                                                        CHECK_FCT(fd_msg_search_avp (avp, sip_dict.Digest_Realm, &a2 ));
                                                                         if(a2!=NULL)
                                                                         {
@@ -515 +515 @@
                                                                         }
                                                                         
-                                                                        CHECK_FCT(fd_avp_search_avp (avp, sip_dict.Digest_Method, &a2 ));
+                                                                        CHECK_FCT(fd_msg_search_avp (avp, sip_dict.Digest_Method, &a2 ));
                                                                         if(a2!=NULL)
                                                                         {
@@ -531 +531 @@
                                                                                 digest_method="";
                                                                         
-                                                                        CHECK_FCT(fd_avp_search_avp (avp, sip_dict.Digest_URI, &a2 ));
+                                                                        CHECK_FCT(fd_msg_search_avp (avp, sip_dict.Digest_URI, &a2 ));
                                                                         if(a2!=NULL)
                                                                         {
@@ -545 +545 @@
                                                                         }
                                                                         
-                                                                        CHECK_FCT(fd_avp_search_avp (avp, sip_dict.Digest_QOP, &a2 ));
+                                                                        CHECK_FCT(fd_msg_search_avp (avp, sip_dict.Digest_QOP, &a2 ));
                                                                         if(a2!=NULL)
                                                                         {
@@ -560 +560 @@
                                                                         else
                                                                                 digest_qop=NULL;
-                                                                        CHECK_FCT(fd_avp_search_avp (avp, sip_dict.Digest_Algorithm, &a2 ));
+                                                                        CHECK_FCT(fd_msg_search_avp (avp, sip_dict.Digest_Algorithm, &a2 ));
                                                                         if(a2!=NULL)
                                                                         {
@@ -575 +575 @@
                                                                         else
                                                                                 digest_algorithm=NULL;
-                                                                        CHECK_FCT(fd_avp_search_avp (avp, sip_dict.Digest_CNonce, &a2 ));
+                                                                        CHECK_FCT(fd_msg_search_avp (avp, sip_dict.Digest_CNonce, &a2 ));
                                                                         if(a2!=NULL)
                                                                         {
@@ -590 +590 @@
                                                                         else
                                                                                 digest_cnonce="";
-                                                                        CHECK_FCT(fd_avp_search_avp (avp, sip_dict.Digest_Nonce_Count, &a2 ));
+                                                                        CHECK_FCT(fd_msg_search_avp (avp, sip_dict.Digest_Nonce_Count, &a2 ));
                                                                         if(a2!=NULL)
                                                                         {
@@ -605 +605 @@
                                                                         else
                                                                                 digest_noncecount="";
-                                                                        CHECK_FCT(fd_avp_search_avp (avp, sip_dict.Digest_Username, &a2 ));
+                                                                        CHECK_FCT(fd_msg_search_avp (avp, sip_dict.Digest_Username, &a2 ));
                                                                         if(a2!=NULL)
                                                                         {