Changeset 903:4382d7420e65 in freeDiameter for libfdproto

Timestamp:

Dec 15, 2012, 5:24:34 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Add new AVP_BY_STRUCT method for searching vendor-specific AVPs. This allows more flexibility and superseeds AVP_BY_NAME_AND_VENDOR and AVP_BY_CODE_AND_VENDOR.

Location:

libfdproto

Files:

• dictionary.c (modified) (1 diff)
• messages.c (modified) (1 diff)

libfdproto/dictionary.c

@@ -977 +977 @@
                         break;
                 
+                case AVP_BY_STRUCT:
+                        {
+                                struct dict_avp_request_ex * _what = (struct dict_avp_request_ex *) what;
+                                struct dict_object * vendor = NULL;
+                                
+                                CHECK_PARAMS( _what->avp_vendor.vendor || _what->avp_vendor.vendor_id || _what->avp_vendor.vendor_name );
+                                CHECK_PARAMS( _what->avp_data.avp_code || _what->avp_data.avp_name );
+                                
+                                /* Now look for the vendor first */
+                                if (_what->avp_vendor.vendor) {
+                                        CHECK_PARAMS( ! _what->avp_vendor.vendor_id && ! _what->avp_vendor.vendor_name );
+                                        vendor = _what->avp_vendor.vendor;
+                                } else if (_what->avp_vendor.vendor_id) {
+                                        CHECK_PARAMS( ! _what->avp_vendor.vendor_name );
+                                        CHECK_FCT( search_vendor( dict, VENDOR_BY_ID, &_what->avp_vendor.vendor_id, &vendor ) );
+                                } else {
+                                        CHECK_FCT( search_vendor( dict, VENDOR_BY_NAME, &_what->avp_vendor.vendor_name, &vendor ) );
+                                }
+                                
+                                if (vendor == NULL) {
+                                        if (result)
+                                                *result = NULL;
+                                        else
+                                                ret = ENOENT;
+                                        goto end;
+                                }
+                                
+                                /* We now have our vendor = head of the appropriate avp list */
+                                if (_what->avp_data.avp_code) {
+                                        CHECK_PARAMS( ! _what->avp_data.avp_name );
+                                        SEARCH_scalar( _what->avp_data.avp_code, &vendor->list[1], avp.avp_code, 1, (struct dict_object *)NULL );
+                                } else {
+                                        SEARCH_os0( _what->avp_data.avp_name, &vendor->list[2], avp.avp_name, 1);
+                                }
+                        }
+                        break;
+                
                 case AVP_BY_NAME_ALL_VENDORS:
                         {

libfdproto/messages.c

@@ -1791 +1791 @@
         /* Now try and resolve the model from the avp code and vendor */
         if (avp->avp_public.avp_flags & AVP_FLAG_VENDOR) {
-                struct dict_avp_request avpreq;
-                avpreq.avp_vendor = avp->avp_public.avp_vendor;
-                avpreq.avp_code = avp->avp_public.avp_code;
-                CHECK_FCT( fd_dict_search ( dict, DICT_AVP, AVP_BY_CODE_AND_VENDOR, &avpreq, &avp->avp_model, 0));
+                struct dict_avp_request_ex avpreq;
+                memset(&avpreq, 0, sizeof(avpreq));
+                avpreq.avp_vendor.vendor_id = avp->avp_public.avp_vendor;
+                avpreq.avp_data.avp_code = avp->avp_public.avp_code;
+                CHECK_FCT( fd_dict_search ( dict, DICT_AVP, AVP_BY_STRUCT, &avpreq, &avp->avp_model, 0));
         } else {
                 /* no vendor */