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
*
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)
if (commonEventHeader == NULL)
{
printf("Could not create JSON object: commonEventHeader\n");
+ cJSON_Delete(postDataJson);
return 1;
}
cJSON_AddItemToObject(event, "commonEventHeader", commonEventHeader);
if (heartbeatFields == NULL)
{
printf("Could not create JSON object: heartbeatFields\n");
+ cJSON_Delete(postDataJson);
return 1;
}
cJSON_AddItemToObject(event, "heartbeatFields", heartbeatFields);
if (res != CURLE_OK)
{
- printf("Failed to send cURL...\n");
return SR_ERR_OPERATION_FAILED;
}
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);
if (commonEventHeader == NULL)
{
printf("Could not create JSON object: commonEventHeader\n");
+ cJSON_Delete(postDataJson);
return 1;
}
cJSON_AddItemToObject(event, "commonEventHeader", commonEventHeader);
if (pnfRegistrationFields == NULL)
{
printf("Could not create JSON object: pnfRegistrationFields\n");
+ cJSON_Delete(postDataJson);
return 1;
}
cJSON_AddItemToObject(event, "pnfRegistrationFields", pnfRegistrationFields);
return SR_ERR_OK;
}
-static void pnf_registration(void)
+static void *pnf_registration(void *arg)
{
// delay the PNF Registration VES message, until anything else is initialized
printf("delay the PNF Registration VES message, until anything else is initialized");
{
//ves-registration object is set to False, we do not make an automatic PNF registration
printf("ves-registration object is set to False, we do not make an automatic PNF registration");
- return;
+ return NULL;
}
int rc = SR_ERR_OK, netconf_port_base = 0;
- char *netconf_base_string = getenv("NETCONF_BASE");
char *hostname_string = getenv("HOSTNAME");
+ int port = 0;
- if (netconf_base_string != NULL)
- {
- rc = sscanf(netconf_base_string, "%d", &netconf_port_base);
- if (rc != 1)
- {
- printf("Could not find the NETCONF base port, aborting the PNF registration...\n");
- return;
- }
- }
+ netconf_port_base = getIntFromString(getenv("NETCONF_BASE"), 0);
//TODO This is where we hardcoded: 7 devices will have SSH connections and 3 devices will have TLS connections
- for (int port = 0; port < NETCONF_CONNECTIONS_PER_DEVICE - 3; ++port)
+ for (int i = 0; i < SSH_CONNECTIONS_PER_DEVICE; ++port, ++i)
{
pthread_mutex_lock(&lock);
rc = send_pnf_registration_instance(hostname_string, netconf_port_base + port, FALSE);
}
pthread_mutex_unlock(&lock);
}
- for (int port = NETCONF_CONNECTIONS_PER_DEVICE - 3; port < NETCONF_CONNECTIONS_PER_DEVICE; ++port)
+ for (int i = 0; i < TLS_CONNECTIONS_PER_DEVICE; ++port, ++i)
{
pthread_mutex_lock(&lock);
rc = send_pnf_registration_instance(hostname_string, netconf_port_base + port, TRUE);
}
}
- return;
+ return NULL;
}
int