X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=ntsimulator%2Fsrc%2Fves-messages%2Fheartbeat.c;h=29d69f836ed6cf50742504bbb6b712fed613f4dc;hb=1f1479ff8ce3a268acb7b70a32bb789d859a915b;hp=fce544cc3a7afa9773b2f8c85014e1a5bcdb01ff;hpb=29ce368a8b49cb41f3a1640581ff9958ea50ad8c;p=sim%2Fo1-interface.git

diff --git a/ntsimulator/src/ves-messages/heartbeat.c b/ntsimulator/src/ves-messages/heartbeat.c
index fce544c..29d69f8 100644
--- a/ntsimulator/src/ves-messages/heartbeat.c
+++ b/ntsimulator/src/ves-messages/heartbeat.c
@@ -1,9 +1,19 @@
-/*
- * heartbeat.c
- *
- *  Created on: Oct 24, 2019
- *      Author: parallels
- */
+/*************************************************************************
+*
+* Copyright 2019 highstreet technologies GmbH and others
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+***************************************************************************/
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -55,24 +65,6 @@ int cleanup_curl()
 	return SR_ERR_OK;
 }
 
-//static void prepare_ves_message_curl(void)
-//{
-//	curl_easy_reset(curl);
-//	set_curl_common_info();
-//
-//	char *ves_ip = getVesIpFromConfigJson();
-//	int ves_port = getVesPortFromConfigJson();
-//
-//	char url[100];
-//	sprintf(url, "http://%s:%d/eventListener/v7", ves_ip, ves_port);
-//	curl_easy_setopt(curl, CURLOPT_URL, url);
-//
-//	free(ves_ip);
-//
-////	curl_easy_setopt(curl, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-//
-//	return;
-//}
 /*
  * Heartbeat payload example
  *
@@ -117,6 +109,11 @@ static int send_heartbeat(int heartbeat_interval)
 	prepare_ves_message_curl(curl);
 
 	cJSON *postDataJson = cJSON_CreateObject();
+	if (postDataJson == NULL)
+	{
+		printf("Could not create JSON object: postDataJson\n");
+		return 1;
+	}
 
 	cJSON *event = cJSON_CreateObject();
 	if (event == NULL)
@@ -133,6 +130,7 @@ static int send_heartbeat(int heartbeat_interval)
 	if (commonEventHeader == NULL)
 	{
 		printf("Could not create JSON object: commonEventHeader\n");
+		cJSON_Delete(postDataJson);
 		return 1;
 	}
 	cJSON_AddItemToObject(event, "commonEventHeader", commonEventHeader);
@@ -141,6 +139,7 @@ static int send_heartbeat(int heartbeat_interval)
 	if (heartbeatFields == NULL)
 	{
 		printf("Could not create JSON object: heartbeatFields\n");
+		cJSON_Delete(postDataJson);
 		return 1;
 	}
 	cJSON_AddItemToObject(event, "heartbeatFields", heartbeatFields);
@@ -162,7 +161,6 @@ static int send_heartbeat(int heartbeat_interval)
 
 	if (res != CURLE_OK)
 	{
-		printf("Failed to send cURL...\n");
 		return SR_ERR_OPERATION_FAILED;
 	}
 
@@ -183,11 +181,17 @@ static int send_pnf_registration_instance(char *hostname, int port, bool is_tls)
 	prepare_ves_message_curl(curl);
 
 	cJSON *postDataJson = cJSON_CreateObject();
+	if (postDataJson == NULL)
+	{
+		printf("Could not create JSON object: postDataJson\n");
+		return 1;
+	}
 
 	cJSON *event = cJSON_CreateObject();
 	if (event == NULL)
 	{
 		printf("Could not create JSON object: event\n");
+		cJSON_Delete(postDataJson);
 		return 1;
 	}
 	cJSON_AddItemToObject(postDataJson, "event", event);
@@ -199,6 +203,7 @@ static int send_pnf_registration_instance(char *hostname, int port, bool is_tls)
 	if (commonEventHeader == NULL)
 	{
 		printf("Could not create JSON object: commonEventHeader\n");
+		cJSON_Delete(postDataJson);
 		return 1;
 	}
 	cJSON_AddItemToObject(event, "commonEventHeader", commonEventHeader);
@@ -207,6 +212,7 @@ static int send_pnf_registration_instance(char *hostname, int port, bool is_tls)
 	if (pnfRegistrationFields == NULL)
 	{
 		printf("Could not create JSON object: pnfRegistrationFields\n");
+		cJSON_Delete(postDataJson);
 		return 1;
 	}
 	cJSON_AddItemToObject(event, "pnfRegistrationFields", pnfRegistrationFields);