Changeset 891:9432ac55823c in freeDiameter

Timestamp:

Nov 18, 2012, 7:28:50 AM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Tentative fix for the parse_or_error function

Files:

• include/freeDiameter/libfdproto.h (modified) (1 diff)
• libfdcore/messages.c (modified) (1 diff)
• libfdproto/messages.c (modified) (1 diff)
• tests/testmesg.c (modified) (2 diffs)

include/freeDiameter/libfdproto.h

@@ -2524 +2524 @@
 struct fd_pei {
         char *          pei_errcode;    /* name of the error code to use */
-        struct avp *    pei_avp;        /* pointer to invalid or missing AVP (to be freed) */
+        struct avp *    pei_avp;        /* pointer to invalid (in original message) or missing AVP (to be freed) */
         char *          pei_message;    /* Overwrite default message if needed */
         int             pei_protoerr;   /* do we set the 'E' bit in the error message ? */

libfdcore/messages.c

@@ -234 +234 @@
         /* Now add the optavp in a FailedAVP if provided */
         if (optavp) {
+                struct avp * optavp_cpy = NULL;
+                struct avp_hdr *opt_hdr, *optcpy_hdr;
+                
                 /* Create the Failed-AVP AVP */
                 CHECK_FCT( fd_msg_avp_new( dict_avp_FAVP, 0, &avp_FAVP ) );
-
+                
+                /* Create a new AVP with a copy of the data of the invalid or missing AVP */
+                CHECK_FCT( fd_msg_avp_new( NULL, AVPFL_SET_BLANK_VALUE, &optavp_cpy) );
+                
+                CHECK_FCT( fd_msg_avp_hdr(optavp, &opt_hdr) );
+                CHECK_FCT( fd_msg_avp_hdr(optavp_cpy, &optcpy_hdr) );
+                memcpy(optcpy_hdr, opt_hdr, sizeof(struct avp_hdr));
+                
                 /* Add the passed AVP inside it */
-                CHECK_FCT( fd_msg_avp_add( avp_FAVP, MSG_BRW_LAST_CHILD, optavp ) );
+                CHECK_FCT( fd_msg_avp_add( avp_FAVP, MSG_BRW_LAST_CHILD, optavp_cpy ) );
                 
                 /* And add to the message */

libfdproto/messages.c

@@ -1779 +1779 @@
                         error_info->pei_message = error_message;
                 }
+                avp->avp_model = NULL;
                 return EBADMSG;
         }

tests/testmesg.c

@@ -767 +767 @@
                                 CHECK( EBADMSG, fd_msg_parse_or_error( &msg ) );
                                 
-                                /* Check the Failed-AVP is as expected */
+                                TODO("Check the Failed-AVP is as expected");
                                 
                                 fd_msg_dump_walk(0, msg);
@@ -773 +773 @@
                                 /* reset */
                                 CHECK( 0, fd_msg_free ( msg ) );
-                                
-                                ASSERT(0);
                         }
 #endif