Changeset 892:b2e8f1a3ef76 in freeDiameter

Timestamp:

Nov 19, 2012, 4:58:40 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Allow the content of the Failed-AVP to be parseable to bufferize the message. The content is only padded currently

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

@@ -2025 +2025 @@
 
 /* Some flags used in the functions bellow */
-#define AVPFL_SET_BLANK_VALUE   0x01    /* When creating an AVP, initialize its value to a blank area */
-#define AVPFL_MAX               AVPFL_SET_BLANK_VALUE   /* The biggest valid flag value */
+#define AVPFL_SET_BLANK_VALUE      0x01 /* When creating an AVP, initialize its value to a blank area */
+#define AVPFL_SET_RAWDATA_FROM_AVP 0x02 /* When creating an AVP, initialize its rawdata area from an existing AVP -- it is only blank padding (for error reporting) */
+#define AVPFL_MAX                  AVPFL_SET_RAWDATA_FROM_AVP   /* The biggest valid flag value */
         
 #define MSGFL_ALLOC_ETEID       0x01    /* When creating a message, a new end-to-end ID is allocated and set in the message */

libfdcore/messages.c

@@ -241 +241 @@
                 
                 /* 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) );
+                optavp_cpy = optavp;
+                CHECK_FCT( fd_msg_avp_new( NULL, AVPFL_SET_BLANK_VALUE | AVPFL_SET_RAWDATA_FROM_AVP, &optavp_cpy) );
                 
                 CHECK_FCT( fd_msg_avp_hdr(optavp, &opt_hdr) );

libfdproto/messages.c

@@ -232 +232 @@
         }
         
+        if (flags & AVPFL_SET_RAWDATA_FROM_AVP) {
+                new->avp_rawlen = (*avp)->avp_public.avp_len - GETAVPHDRSZ( (*avp)->avp_public.avp_flags );
+                if (new->avp_rawlen) {
+                        CHECK_MALLOC(  new->avp_rawdata = malloc(new->avp_rawlen)  );
+                        memset(new->avp_rawdata, 0xFF, new->avp_rawlen);
+                }
+        }
+        
         /* The new object is ready, return */
         *avp = new;

tests/testmesg.c

@@ -757 +757 @@
 #if 1
                         {
+                                unsigned char * buftmp = NULL;
                                 /* Check the parse or error works as expected */
                                 CPYBUF();
@@ -767 +768 @@
                                 CHECK( EBADMSG, fd_msg_parse_or_error( &msg ) );
                                 
+                                CHECK( 0, fd_msg_bufferize( msg, &buftmp, NULL ) );                             
+                                
+                                fd_msg_dump_walk(0, msg);
+                                
                                 TODO("Check the Failed-AVP is as expected");
                                 
-                                fd_msg_dump_walk(0, msg);
                                 
                                 /* reset */
                                 CHECK( 0, fd_msg_free ( msg ) );
+                                free(buftmp);
                         }
 #endif