Changeset 1230:e72c9dad62ac in freeDiameter for libfdproto

Timestamp:

Jul 21, 2013, 6:57:39 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Fix issue with generating Failed-AVP when the error is DIAMETER_MISSING_AVP. Also fix a memory leak in that case

File:

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

libfdproto/messages.c

@@ -2371 +2371 @@
         CHECK_FCT_DO( fd_dict_getval(model_avp, &avp_info), return NULL );
         
+        /* Set an initial size */
+        avp->avp_public.avp_len = GETAVPHDRSZ( avp->avp_public.avp_flags ) + avp_value_sizes[avp_info.avp_basetype];
+        
         /* Prepare the empty value */
         memset(&val, 0, sizeof(val));
@@ -2377 +2380 @@
                         val.os.data = os;
                         val.os.len  = sizeof(os);
+                        avp->avp_public.avp_len += val.os.len;
                 case AVP_TYPE_INTEGER32:
                 case AVP_TYPE_INTEGER64:
@@ -2440 +2444 @@
                         pr_data->pei->pei_errcode = "DIAMETER_MISSING_AVP";
                         pr_data->pei->pei_avp = empty_avp(rule->rule_avp);
+                        pr_data->pei->pei_avp_free = 1;
                 }
                 return EBADMSG;
@@ -2453 +2458 @@
                                 pr_data->pei->pei_errcode = "DIAMETER_AVP_OCCURS_TOO_MANY_TIMES";
                         pr_data->pei->pei_avp = empty_avp(rule->rule_avp); /* Well we are supposed to return the (max + 1)th instance of the AVP instead... Pfff... */ TODO("Improve...");
+                        pr_data->pei->pei_avp_free = 1;
                 }
                 return EBADMSG;
@@ -2472 +2478 @@
                                         pr_data->pei->pei_message = "AVP was not in its fixed position";
                                         pr_data->pei->pei_avp = empty_avp(rule->rule_avp);
+                                        pr_data->pei->pei_avp_free = 1;
                                 }
                                 return EBADMSG;
@@ -2485 +2492 @@
                                         pr_data->pei->pei_message = "AVP was not in its fixed position";
                                         pr_data->pei->pei_avp = empty_avp(rule->rule_avp);
+                                        pr_data->pei->pei_avp_free = 1;
                                 }
                                 return EBADMSG;