Changeset 602:0b5d21c87855 in freeDiameter

Timestamp:

Nov 25, 2010, 4:27:54 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Added new AVP search criteria in the dictionary: AVP_BY_NAME_ALL_VENDORS

Files:

• include/freeDiameter/libfreeDiameter.h (modified) (1 diff)
• libfreeDiameter/dictionary.c (modified) (2 diffs)

include/freeDiameter/libfreeDiameter.h

@@ -1210 +1210 @@
         AVP_BY_NAME,            /* "what" points to a string, vendor is always 0 */
         AVP_BY_CODE_AND_VENDOR, /* "what" points to a struct dict_avp_request (see bellow), where avp_vendor and avp_code are set */
-        AVP_BY_NAME_AND_VENDOR  /* "what" points to a struct dict_avp_request (see bellow), where avp_vendor and avp_name are set */
+        AVP_BY_NAME_AND_VENDOR, /* "what" points to a struct dict_avp_request (see bellow), where avp_vendor and avp_name are set */
+        AVP_BY_NAME_ALL_VENDORS /* "what" points to a string. Might be quite slow... */
 };
 

libfreeDiameter/dictionary.c

@@ -592 +592 @@
         struct fd_list * __li;                                                  \
         ret = 0;                                                                \
-        for  (__li = (sentinel); __li->next != (sentinel); __li = __li->next) { \
-                __cmp = strcmp(__str, _O(__li->next->o)->data. datafield );     \
+        for  (__li = (sentinel)->next; __li != (sentinel); __li = __li->next) { \
+                __cmp = strcmp(__str, _O(__li->o)->data. datafield );           \
                 if (__cmp == 0) {                                               \
                         if (result)                                             \
-                                *result = _O(__li->next->o);                    \
+                                *result = _O(__li->o);                          \
                         goto end;                                               \
                 }                                                               \
@@ -974 +974 @@
                         break;
                 
+                case AVP_BY_NAME_ALL_VENDORS:
+                        {
+                                struct fd_list * li;
+                                
+                                /* First, search for vendor 0 */
+                                SEARCH_string( what, &dict->dict_vendors.list[2], avp.avp_name, 1);
+                                
+                                /* If not found, loop for all vendors, until found */
+                                for (li = dict->dict_vendors.list[0].next; li != &dict->dict_vendors.list[0]; li = li->next) {
+                                        SEARCH_string( what, &_O(li->o)->list[2], avp.avp_name, 1);
+                                }
+                        }
+                        break;
+                
                 default:
                         /* Invalid criteria */