Changeset 330:e283e18b2673 in freeDiameter

Timestamp:

May 31, 2010, 10:33:59 AM (13 years ago)

Author:

Sebastien Decugis <sdecugis@nict.go.jp>

Branch:

default

Phase:

public

Message:

Removed incorrect ASSERT -- thanks to Alexandre for the bug finding.

File:

• libfreeDiameter/messages.c (modified) (1 diff)

libfreeDiameter/messages.c

@@ -2212 +2212 @@
                 /* For unknown AVP, we don't have a callback registered, so just skip */
                 if (avp->avp_model) {
-                        struct dict_object * type, * enumval;
-                        
-                        /* Sanity */
-                        ASSERT( avp->avp_public.avp_value );
-
+                        struct dict_object * enumval = NULL;
+                        
                         /* Get the list of callback for this AVP */
                         CHECK_FCT_DO( ret = fd_dict_disp_cb(DICT_AVP, avp->avp_model, &cb_list), goto error );
                         
-                        /* Check if the AVP has a constant value */
-                        CHECK_FCT_DO( ret = fd_dict_search(dict, DICT_TYPE, TYPE_OF_AVP, avp->avp_model, &type, 0), goto error );
-                        if (type) {
-                                struct dict_enumval_request req;
-                                memset(&req, 0, sizeof(struct dict_enumval_request));
-                                req.type_obj = type;
-                                memcpy( &req.search.enum_value, avp->avp_public.avp_value, sizeof(union avp_value) );
-                                CHECK_FCT_DO( ret = fd_dict_search(dict, DICT_ENUMVAL, ENUMVAL_BY_STRUCT, &req, &enumval, 0), goto error );
-                        } else {
-                                /* No enumerated value in this case */
-                                enumval = NULL;
+                        /* We search enumerated values only in case of non-grouped AVP */
+                        if ( avp->avp_public.avp_value ) {
+                                struct dict_object * type;
+                                /* Check if the AVP has a constant value */
+                                CHECK_FCT_DO( ret = fd_dict_search(dict, DICT_TYPE, TYPE_OF_AVP, avp->avp_model, &type, 0), goto error );
+                                if (type) {
+                                        struct dict_enumval_request req;
+                                        memset(&req, 0, sizeof(struct dict_enumval_request));
+                                        req.type_obj = type;
+                                        memcpy( &req.search.enum_value, avp->avp_public.avp_value, sizeof(union avp_value) );
+                                        CHECK_FCT_DO( ret = fd_dict_search(dict, DICT_ENUMVAL, ENUMVAL_BY_STRUCT, &req, &enumval, 0), goto error );
+                                }
                         }