Changeset 770:27fef2ca2cf6 in freeDiameter

Timestamp:

Oct 30, 2011, 8:33:28 PM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Improved usability of fd_dict_getlistof for vendors and apps

Files:

• libfdproto/dictionary.c (modified) (2 diffs)
• tests/testdict.c (modified) (1 diff)

libfdproto/dictionary.c

@@ -1969 +1969 @@
         new->dict_vendors.data.vendor.vendor_name = NO_VENDOR_NAME;
         new->dict_vendors.datastr_len = CONSTSTRLEN(NO_VENDOR_NAME);
-        new->dict_vendors.list[0].o = NULL; /* overwrite since element is also sentinel for this list. */
+        /* new->dict_vendors.list[0].o = NULL; *//* overwrite since element is also sentinel for this list. */
         new->dict_vendors.dico = new;
         
@@ -1977 +1977 @@
         new->dict_applications.data.application.application_name = APPLICATION_0_NAME;
         new->dict_applications.datastr_len = CONSTSTRLEN(APPLICATION_0_NAME);
-        new->dict_applications.list[0].o = NULL; /* overwrite since since element is also sentinel for this list. */
+        /* new->dict_applications.list[0].o = NULL; *//* overwrite since since element is also sentinel for this list. */
         new->dict_applications.dico = new;
                         

tests/testdict.c

@@ -137 +137 @@
                 struct dict_object * defvnd=NULL;
                 vendor_id_t vid = 0;
+                int first = 1;
                 
                 CHECK( 0, fd_dict_getlistof(VENDOR_BY_ID, fd_g_config->cnf_dict, &sentinel));
                 
-                for (li = sentinel->next; li != sentinel; li = li->next) {
+                for (li = sentinel; (li != sentinel) || (first != 0); li = li->next) {
+                        first = 0;
                         CHECK(0, fd_dict_gettype(li->o, &type));
                         CHECK(DICT_VENDOR, type);
+#if 0
+                        struct dict_vendor_data data;
+                        CHECK( 0, fd_dict_getval(li->o, &data) );
+                        printf("%d : %s\n", data.vendor_id, data.vendor_name);
+#endif
                 }