Changeset 889:4a299daed8b2 in freeDiameter for libfdproto

Timestamp:

Nov 18, 2012, 6:52:50 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Add information about parsing errors

File:

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

libfdproto/messages.c

@@ -1686 +1686 @@
 static int parsedict_do_chain(struct dictionary * dict, struct fd_list * head, int mandatory, struct fd_pei *error_info);
 
+static char error_message[256];
+
 /* Process an AVP. If we are not in recheck, the avp_source must be set. */
 static int parsedict_do_avp(struct dictionary * dict, struct avp * avp, int mandatory, struct fd_pei *error_info)
@@ -1769 +1771 @@
         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.");
+                TRACE_DEBUG(INFO, "The AVP size is not suitable for the type:");
+                fd_msg_dump_one(INFO, avp);
                 if (error_info) {
                         error_info->pei_errcode = "DIAMETER_INVALID_AVP_LENGTH";
                         error_info->pei_avp = avp;
+                        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;
                 }
                 return EBADMSG;
@@ -1788 +1793 @@
                                                 error_info->pei_errcode = "DIAMETER_INVALID_AVP_VALUE";
                                                 error_info->pei_avp = avp;
+                                                snprintf(error_message, sizeof(error_message), "I cannot parse this AVP as a Grouped AVP");
+                                                error_info->pei_message = error_message;
                                         }
                                         return ret;