Changeset 1103:d8591b1c56cd in freeDiameter for libfdproto/messages.c

Timestamp:

May 10, 2013, 7:48:57 PM (11 years ago)

Author:

Sebastien Decugis <sdecugis@freediameter.net>

Branch:

default

Phase:

public

Message:

Implemented a few hooks

File:

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

libfdproto/messages.c

@@ -202 +202 @@
         init_chain( &msg->msg_chain, MSG_MSG);
         msg->msg_eyec = MSG_MSG_EYEC;
+        
+        fd_list_init(&msg->msg_pmdl.sentinel, NULL);
+        CHECK_POSIX_DO( pthread_mutex_init(&msg->msg_pmdl.lock, NULL), );
 }
 
@@ -1952 +1955 @@
         CHECK_PARAMS(  buffer &&  *buffer  &&  msg  &&  (buflen >= GETMSGHDRSZ())  );
         buf = *buffer;
-        *buffer = NULL;
         
         if ( buf[0] != DIAMETER_VERSION) {
                 TRACE_DEBUG(INFO, "Invalid version in message: %d (supported: %d)", buf[0], DIAMETER_VERSION);
-                free(buf);
                 return EBADMSG;
         }
@@ -1963 +1964 @@
         if ( buflen < msglen ) {  
                 TRACE_DEBUG(INFO, "Truncated message (%zd / %d)", buflen, msglen );
-                free(buf);
                 return EBADMSG; 
         }
         
         /* Create a new object */
-        CHECK_MALLOC_DO( new = malloc (sizeof(struct msg)),  { free(buf); return ENOMEM; }  );
+        CHECK_MALLOC( new = malloc (sizeof(struct msg)) );
         
         /* Initialize the fields */
@@ -1984 +1984 @@
         new->msg_public.msg_eteid = ntohl(*(uint32_t *)(buf+16));
         
-        new->msg_rawbuffer = buf;
-        
         /* Parse the AVP list */
         CHECK_FCT_DO( ret = parsebuf_list(buf + GETMSGHDRSZ(), buflen - GETMSGHDRSZ(), &new->msg_chain.children), { destroy_tree(_C(new)); return ret; }  );
         
+        /* Parsing successful */
+        new->msg_rawbuffer = buf;
+        *buffer = NULL;
         *msg = new;
         return 0;