Changes in libfdproto/messages.c [1001:d03f7e3805ad:995:2016a0c46bda] in freeDiameter

File:

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

libfdproto/messages.c

@@ -303 +303 @@
 static int bufferize_avp(unsigned char * buffer, size_t buflen, size_t * offset,  struct avp * avp);
 static int parsebuf_list(unsigned char * buf, size_t buflen, struct fd_list * head);
-static int parsedict_do_chain(struct dictionary * dict, struct fd_list * head, int mandatory, struct fd_pei *error_info);
-
 
 /* Create answer from a request */
@@ -368 +366 @@
         if (! (flags & MSGFL_ANSW_NOPROXYINFO)) {
                 struct avp * avp;
-                struct fd_pei pei;
-                struct fd_list avpcpylist = FD_LIST_INITIALIZER(avpcpylist);
-                
                 CHECK_FCT(  fd_msg_browse(qry, MSG_BRW_FIRST_CHILD, &avp, NULL)  );
                 while (avp) {
@@ -381 +376 @@
                                 size_t offset = 0;
 
-                                /* Create a buffer with the content of the AVP. This is easier than going through the list */
                                 CHECK_FCT(  fd_msg_update_length(avp)  );
                                 CHECK_MALLOC(  buf = malloc(avp->avp_public.avp_len)  );
                                 CHECK_FCT( bufferize_avp(buf, avp->avp_public.avp_len, &offset, avp)  );
 
-                                /* Now we parse this buffer to create a copy AVP */
-                                CHECK_FCT( parsebuf_list(buf, avp->avp_public.avp_len, &avpcpylist) );
-                                
-                                /* Parse dictionary objects now to remove the dependency on the buffer */
-                                CHECK_FCT( parsedict_do_chain(dict, &avpcpylist, 0, &pei) );
+                                /* Now we directly parse this buffer into the new message list */
+                                CHECK_FCT( parsebuf_list(buf, avp->avp_public.avp_len, &ans->msg_chain.children) );
 
                                 /* Done for this AVP */
                                 free(buf);
-
-                                /* We move this AVP now so that we do not parse again in next loop */
-                                fd_list_move_end(&ans->msg_chain.children, &avpcpylist);
                         }
                         /* move to next AVP in the message, we can have several Proxy-Info instances */
                         CHECK_FCT( fd_msg_browse(avp, MSG_BRW_NEXT, &avp, NULL) );
                 }
+                CHECK_FCT( fd_msg_parse_dict( ans, dict, NULL ) );
         }
 
@@ -1569 +1558 @@
                 CHECK_PARAMS( avp->avp_source || avp->avp_rawdata );
                 
-                if ( avp->avp_rawdata != NULL ) {
-                        /* the content was stored in rawdata */
-                        memcpy(&buffer[*offset], avp->avp_rawdata, avp->avp_rawlen);
-                        *offset += PAD4(avp->avp_rawlen);
-                } else {
+                if ( avp->avp_source != NULL ) {
                         /* the message was not parsed completely */
                         size_t datalen = avp->avp_public.avp_len - GETAVPHDRSZ(avp->avp_public.avp_flags);
                         memcpy(&buffer[*offset], avp->avp_source, datalen);
                         *offset += PAD4(datalen);
+                } else {
+                        /* the content was stored in rawdata */
+                        memcpy(&buffer[*offset], avp->avp_rawdata, avp->avp_rawlen);
+                        *offset += PAD4(avp->avp_rawlen);
                 }
                 
@@ -1824 +1813 @@
  */
 
+static int parsedict_do_chain(struct dictionary * dict, struct fd_list * head, int mandatory, struct fd_pei *error_info);
+
 static char error_message[256];
 
@@ -1830 +1821 @@
 {
         struct dict_avp_data dictdata;
-        uint8_t * source;
         
         TRACE_ENTRY("%p %p %d %p", dict, avp, mandatory, error_info);
@@ -1923 +1913 @@
         }
         
-        source = avp->avp_source;
-        avp->avp_source = NULL;
-
         /* Now get the value inside */
         switch (dictdata.avp_basetype) {
@@ -1932 +1919 @@
                         
                         /* This is a grouped AVP, so let's parse the list of AVPs inside */
-                        CHECK_FCT_DO(  ret = parsebuf_list(source, avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags ), &avp->avp_chain.children),
+                        CHECK_FCT_DO(  ret = parsebuf_list(avp->avp_source, avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags ), &avp->avp_chain.children),
                                 {
                                         if ((ret == EBADMSG) && (error_info)) {
@@ -1940 +1927 @@
                                                 error_info->pei_message = error_message;
                                         }
-                                        avp->avp_source = source;
                                         return ret;
                                 }  );
@@ -1955 +1941 @@
                                                 error_info->pei_avp = avp;
                                         }
-                                        avp->avp_source = source;
                                         return EBADMSG;
                                 } );
                         avp->avp_storage.os.len = avp->avp_public.avp_len - GETAVPHDRSZ( avp->avp_public.avp_flags );
-                        CHECK_MALLOC(  avp->avp_storage.os.data = os0dup(source, avp->avp_storage.os.len)  );
+                        CHECK_MALLOC(  avp->avp_storage.os.data = os0dup(avp->avp_source, avp->avp_storage.os.len)  );
                         avp->avp_mustfreeos = 1;
                         break;
                 
                 case AVP_TYPE_INTEGER32:
-                        avp->avp_storage.i32 = (int32_t)ntohl(*(uint32_t *)source);
+                        avp->avp_storage.i32 = (int32_t)ntohl(*(uint32_t *)avp->avp_source);
                         break;
         
@@ -1971 +1956 @@
                         {
                                 uint64_t __stor;
-                                memcpy(&__stor, source, sizeof(__stor));
+                                memcpy(&__stor, avp->avp_source, sizeof(__stor));
                                 avp->avp_storage.i64 = (int64_t)ntohll(__stor);
                         }
@@ -1978 +1963 @@
                 case AVP_TYPE_UNSIGNED32:
                 case AVP_TYPE_FLOAT32: /* For float, we must not cast, or the value is changed. Instead we use implicit cast by changing the member of the union */
-                        avp->avp_storage.u32 = (uint32_t)ntohl(*(uint32_t *)source);
+                        avp->avp_storage.u32 = (uint32_t)ntohl(*(uint32_t *)avp->avp_source);
                         break;
         
@@ -1985 +1970 @@
                         {
                                 uint64_t __stor;
-                                memcpy(&__stor, source, sizeof(__stor));
+                                memcpy(&__stor, avp->avp_source, sizeof(__stor));
                                 avp->avp_storage.u64 = (uint64_t)ntohll(__stor);
                         }