Changeset 1119:79dd22145f52 in freeDiameter for libfdproto/messages.c

Timestamp:

May 14, 2013, 12:04:20 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix a number of compilation warnings

File:

• libfdproto/messages.c (modified) (6 diffs)

libfdproto/messages.c

@@ -921 +921 @@
         
         if (!CHECK_MSG(msg)) {
-                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID MESSAGE", msg), return NULL);
+                CHECK_MALLOC_DO( fd_dump_extend( FD_DUMP_STD_PARAMS, "INVALID MESSAGE"), return NULL);
                 return *buf;
         }
@@ -955 +955 @@
         int success = 0;
         struct dict_avp_data  dictdata;
-        struct dict_vendor_data  vendordata;
-        struct dict_vendor_data *vendorinfo = NULL;
-        
         
         if (level) {
@@ -1153 +1150 @@
 }
 
-#ifndef OLD_CODE_TO_BE_REPLACED
-void fd_msg_dump_walk ( int level, msg_or_avp *obj )
-{
-        LOG_D("fd_msg_dump_walk %d, %p is deprecated", level, obj);
-}
-void fd_msg_dump_one ( int level, msg_or_avp * obj )
-{
-        LOG_D("fd_msg_dump_one %d, %p is deprecated", level, obj);
-}
-#endif
 /***************************************************************************************************************/
 /* Simple meta-data management */
@@ -2058 +2045 @@
                 
                 if (mandatory && (avp->avp_public.avp_flags & AVP_FLAG_MANDATORY)) {
-                        TRACE_DEBUG(INFO, "Unsupported mandatory AVP found:");
-                        fd_msg_dump_one(INFO, avp);
+                        TRACE_DEBUG(INFO, "Unsupported mandatory AVP found");
                         if (error_info) {
                                 error_info->pei_errcode = "DIAMETER_AVP_UNSUPPORTED";
                                 error_info->pei_avp = avp;
+                        } else {
+                                char * buf = NULL;
+                                size_t buflen;
+                                CHECK_MALLOC(fd_msg_dump_treeview(&buf, &buflen, NULL, avp, NULL, 0, 0));
+                                LOG_E("Unsupported AVP: %s", buf);
+                                free(buf);
                         }
                         return ENOTSUP;
@@ -2102 +2094 @@
         if ((avp_value_sizes[dictdata.avp_basetype] != 0) &&
             (avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags ) != avp_value_sizes[dictdata.avp_basetype])) {
-                TRACE_DEBUG(INFO, "The AVP size is not suitable for the type:");
-                fd_msg_dump_one(INFO, avp);
+                TRACE_DEBUG(INFO, "The AVP size is not suitable for the type");
                 if (error_info) {
                         error_info->pei_errcode = "DIAMETER_INVALID_AVP_LENGTH";
@@ -2109 +2100 @@
                         snprintf(error_message, sizeof(error_message), "I expected a size of %d for this AVP according to my dictionary", avp_value_sizes[dictdata.avp_basetype]);
                         error_info->pei_message = error_message;
+                } else {
+                        char * buf = NULL;
+                        size_t buflen;
+                        CHECK_MALLOC(fd_msg_dump_treeview(&buf, &buflen, NULL, avp, NULL, 0, 0));
+                        LOG_E("Invalid length AVP: %s", buf);
+                        free(buf);
                 }
                 avp->avp_model = NULL;