Merge pull request #4 from krishnangnair/webcfg-log

Webconfig Log checks and Improvements.

Author: shilpa24balaji

src/webcfg.c

@@ -89,9 +89,9 @@ void *WebConfigMultipartTask(void *status)
 	{
 		if(forced_sync)
 		{
-			WebcfgInfo("Triggered Forced sync\n");
+			WebcfgDebug("Triggered Forced sync\n");
 			processWebconfgSync((int)Status);
-			WebcfgInfo("reset forced_sync after sync\n");
+			WebcfgDebug("reset forced_sync after sync\n");
 			forced_sync = 0;
 			setForceSync("", "", 0);
 		}
@@ -125,7 +125,7 @@ void *WebConfigMultipartTask(void *status)
 				if((ForceSyncDoc != NULL) && strlen(ForceSyncDoc)>0)
 				{
 					forced_sync = 1;
-					WebcfgInfo("Received signal interrupt to Force Sync\n");
+					WebcfgDebug("Received signal interrupt to Force Sync\n");
 					WEBCFG_FREE(ForceSyncDoc);
 					WEBCFG_FREE(ForceSyncTransID);
 				}
@@ -261,7 +261,7 @@ int handlehttpResponse(long response_code, char *webConfigData, int retry_count,
 			}
 			else
 			{
-				WebcfgError("Failed to apply webConfigData\n");
+				WebcfgError("Failed to apply root webConfigData received from server\n");
 				return 1;
 			}
 		}

src/webcfg_db.c

@@ -144,12 +144,12 @@ WEBCFG_STATUS generateBlob()
 
     if(webcfgdb_blob)
     {
-	WebcfgInfo("Delete existing webcfgdb_blob.\n");
+	WebcfgDebug("Delete existing webcfgdb_blob.\n");
 	WEBCFG_FREE(webcfgdb_blob->data);
 	WEBCFG_FREE(webcfgdb_blob);
 	webcfgdb_blob = NULL;
     }
-    WebcfgInfo("Generate new blob\n");
+    WebcfgDebug("Generate new blob\n");
     if(webcfgdb_data != NULL || g_head != NULL)
     {
         webcfgdbBlobPackSize = webcfgdb_blob_pack(webcfgdb_data, g_head, &data);
@@ -423,7 +423,7 @@ WEBCFG_STATUS updateDBlist(char *docname, uint32_t version)
 		if( strcmp(docname, webcfgdb->name) == 0)
 		{
 			webcfgdb->version = version;
-			WebcfgInfo("webcfgdb %s is updated to version %lu\n", docname, (long)webcfgdb->version);
+			WebcfgDebug("webcfgdb %s is updated to version %lu\n", docname, (long)webcfgdb->version);
 			return WEBCFG_SUCCESS;
 		}
 		webcfgdb= webcfgdb->next;
@@ -474,7 +474,7 @@ WEBCFG_STATUS deleteFromTmpList(char* doc_name)
 		WebcfgError("Invalid value for doc\n");
 		return WEBCFG_FAILURE;
 	}
-	WebcfgInfo("doc to be deleted: %s\n", doc_name);
+	WebcfgDebug("doc to be deleted: %s\n", doc_name);
 
 	prev_node = NULL;
 	curr_node = g_head ;
@@ -824,8 +824,7 @@ char * base64blobencoder(char * blob_data, size_t blob_size )
 	char* b64buffer =  NULL;
 	size_t encodeSize = -1;
    	WebcfgDebug("Data is %s\n", blob_data);
-     	
-	WebcfgDebug("-----------Start of Base64 Encode ------------\n");
+     	WebcfgDebug("-----------Start of Base64 Encode ------------\n");
         encodeSize = b64_get_encoded_buffer_size(blob_size);
         WebcfgDebug("encodeSize is %zu\n", encodeSize);
         b64buffer = malloc(encodeSize + 1);

src/webcfg_multipart.c

@@ -352,22 +352,18 @@ WEBCFG_STATUS parseMultipartDocument(void *config_data, char *ct , size_t data_s
 			}
 			if(0 == memcmp(ptr_lb, line_boundary, strlen(line_boundary)))
 			{
-				ptr_lb = ptr_lb+(strlen(line_boundary));
+				ptr_lb = ptr_lb+(strlen(line_boundary))-1;
 				num_of_parts = 1;
 				while(0 != num_of_parts % 2)
 				{
-					ptr_lb = memchr(ptr_lb, '\n', data_size - (ptr_lb - str_body));
-					// printf("printing newline: %ld\n",ptr_lb-str_body);
 					ptr_lb1 = memchr(ptr_lb+1, '\n', data_size - (ptr_lb - str_body));
-					// printf("printing newline2: %ld\n",ptr_lb1-str_body);
 					if(0 != memcmp(ptr_lb1-1, "\r",1 )){
 					ptr_lb1 = memchr(ptr_lb1+1, '\n', data_size - (ptr_lb - str_body));
 					}
 					index2 = ptr_lb1-str_body;
 					index1 = ptr_lb-str_body;
 					parse_multipart(str_body+index1+1,index2 - index1 - 2, &mp->entries[count]);
 					ptr_lb++;
-
 					if(0 == memcmp(ptr_lb, last_line_boundary, strlen(last_line_boundary)))
 					{
 						WebcfgDebug("last line boundary inside \n");
@@ -379,7 +375,8 @@ WEBCFG_STATUS parseMultipartDocument(void *config_data, char *ct , size_t data_s
 						num_of_parts++;
 						count++;
 					}
-				}
+					ptr_lb = memchr(ptr_lb, '\n', data_size - (ptr_lb - str_body));
+}
 			}
 			else
 			{
@@ -397,7 +394,7 @@ WEBCFG_STATUS parseMultipartDocument(void *config_data, char *ct , size_t data_s
 		}
 		else
 		{
-			WebcfgError("processMsgpackSubdoc failed\n");
+			WebcfgError("processMsgpackSubdoc failed,as all the docs are not applied\n");
 		}
 		return WEBCFG_FAILURE;
 	}
@@ -482,7 +479,7 @@ WEBCFG_STATUS processMsgpackSubdoc(multipart_t *mp, char *transaction_id)
 						reqParam[i].type = pm->entries[i].type;
 					}
                                 }
-				WebcfgInfo("Request:> param[%d].name = %s\n",i,reqParam[i].name);
+				WebcfgInfo("Request:> param[%d].name = %s, type = %d\n",i,reqParam[i].name,reqParam[i].type);
 				WebcfgDebug("Request:> param[%d].value = %s\n",i,reqParam[i].value);
 				WebcfgDebug("Request:> param[%d].type = %d\n",i,reqParam[i].type);
 			}
@@ -617,7 +614,7 @@ WEBCFG_STATUS processMsgpackSubdoc(multipart_t *mp, char *transaction_id)
 			j--;
 			temp1 = temp1->next;
 		}
-		WebcfgInfo("addNewDocEntry\n");
+		WebcfgDebug("addNewDocEntry\n");
 		addNewDocEntry(get_successDocCount());
 	}
 
@@ -1243,8 +1240,18 @@ void multipart_destroy( multipart_t *m )
 
 void parse_multipart(char *ptr, int no_of_bytes, multipartdocs_t *m)
 {
+	char *Content_type = NULL;
 	/*for storing respective values */
-	if(0 == strncasecmp(ptr,"Namespace",strlen("Namespace")))
+	if(0 == strncmp(ptr,"Content-type: ",strlen("Content-type")))
+	{
+		Content_type = strndup(ptr+(strlen("Content-type: ")),no_of_bytes-((strlen("Content-type: "))));
+		if(strncmp(Content_type, "application/msgpack",strlen("application/msgpack")) !=0)
+		{
+			WebcfgError("Content-type not msgpack: %s", Content_type);
+		}
+		WEBCFG_FREE(Content_type);
+	}
+	else if(0 == strncasecmp(ptr,"Namespace",strlen("Namespace")))
 	{
                 m->name_space = strndup(ptr+(strlen("Namespace: ")),no_of_bytes-((strlen("Namespace: "))));
 	}