X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fovs_events.c;h=ba3238b6c0b47978354722407493a7057361098a;hb=7c9d772c992647fcba64a96800c146eb9f1647f8;hp=8c2cd12cb296f8ac3fc22ada9a6b2b8d266b0f9e;hpb=c3d354c58d56c4b2bb4138a227f3546928bd84f2;p=collectd.git diff --git a/src/ovs_events.c b/src/ovs_events.c index 8c2cd12c..ba3238b6 100644 --- a/src/ovs_events.c +++ b/src/ovs_events.c @@ -3,14 +3,17 @@ * * Copyright(c) 2016 Intel Corporation. All rights reserved. * - * Permission is hereby granted, free of charge, to any person obtaining a copy of + * Permission is hereby granted, free of charge, to any person obtaining a copy + *of * this software and associated documentation files (the "Software"), to deal in * the Software without restriction, including without limitation the rights to * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies - * of the Software, and to permit persons to whom the Software is furnished to do + * of the Software, and to permit persons to whom the Software is furnished to + *do * so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be included in all + * The above copyright notice and this permission notice shall be included in + *all * copies or substantial portions of the Software. * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR @@ -63,7 +66,7 @@ typedef struct ovs_events_iface_list_s ovs_events_iface_list_t; /* OVS events configuration data */ struct ovs_events_config_s { - _Bool send_notification; /* sent notification to collectd? */ + bool send_notification; /* sent notification to collectd? */ char ovs_db_node[OVS_DB_ADDR_NODE_SIZE]; /* OVS DB node */ char ovs_db_serv[OVS_DB_ADDR_SERVICE_SIZE]; /* OVS DB service */ char ovs_db_unix[OVS_DB_ADDR_UNIX_SIZE]; /* OVS DB unix socket path */ @@ -77,7 +80,7 @@ struct ovs_events_ctx_s { ovs_db_t *ovs_db; /* pointer to OVS DB instance */ ovs_events_config_t config; /* plugin config */ char *ovs_db_select_params; /* OVS DB select parameter request */ - _Bool is_db_available; /* specify whether OVS DB is available */ + bool is_db_available; /* specify whether OVS DB is available */ }; typedef struct ovs_events_ctx_s ovs_events_ctx_t; @@ -86,7 +89,8 @@ typedef struct ovs_events_ctx_s ovs_events_ctx_t; */ static ovs_events_ctx_t ovs_events_ctx = { .mutex = PTHREAD_MUTEX_INITIALIZER, - .config = {.ovs_db_node = "localhost", /* use default OVS DB node */ + .config = {.send_notification = true, /* send notification by default */ + .ovs_db_node = "localhost", /* use default OVS DB node */ .ovs_db_serv = "6640"} /* use default OVS DB service */ }; @@ -98,7 +102,7 @@ static int ovs_events_plugin_read(user_data_t *u); */ static int ovs_events_ctx_lock() { pthread_mutex_lock(&ovs_events_ctx.mutex); - return (1); + return 1; } /* This function is used only by "OVS_EVENTS_CTX_LOCK" define (see above). @@ -106,7 +110,7 @@ static int ovs_events_ctx_lock() { */ static int ovs_events_ctx_unlock() { pthread_mutex_unlock(&ovs_events_ctx.mutex); - return (0); + return 0; } /* Check if given interface name exists in configuration file. It @@ -115,15 +119,15 @@ static int ovs_events_ctx_unlock() { */ static int ovs_events_config_iface_exists(const char *ifname) { if (ovs_events_ctx.config.ifaces == NULL) - return (-1); + return -1; /* check if given interface exists */ for (ovs_events_iface_list_t *iface = ovs_events_ctx.config.ifaces; iface; iface = iface->next) if (strcmp(ifname, iface->name) == 0) - return (1); + return 1; - return (0); + return 0; } /* Get OVS DB select parameter request based on rfc7047, @@ -154,8 +158,8 @@ static char *ovs_events_get_select_params() { return NULL; } opt_buff = new_buff; - int ret = ssnprintf(opt_buff + buff_off, buff_size - buff_off, option_fmt, - iface->name); + int ret = snprintf(opt_buff + buff_off, buff_size - buff_off, option_fmt, + iface->name); if (ret < 0) { sfree(opt_buff); return NULL; @@ -176,7 +180,7 @@ static char *ovs_events_get_select_params() { } /* create OVS DB select params */ - if (ssnprintf(params_buff, params_size, params_fmt, opt_buff) < 0) + if (snprintf(params_buff, params_size, params_fmt, opt_buff) < 0) sfree(params_buff); sfree(opt_buff); @@ -201,15 +205,15 @@ static int ovs_events_config_get_interfaces(const oconfig_item_t *ci) { for (int j = 0; j < ci->values_num; j++) { /* check interface name type */ if (ci->values[j].type != OCONFIG_TYPE_STRING) { - ERROR(OVS_EVENTS_PLUGIN - ": given interface name is not a string [idx=%d]", j); - return (-1); + ERROR(OVS_EVENTS_PLUGIN ": given interface name is not a string [idx=%d]", + j); + return -1; } /* allocate memory for configured interface */ ovs_events_iface_list_t *new_iface = calloc(1, sizeof(*new_iface)); if (new_iface == NULL) { ERROR(OVS_EVENTS_PLUGIN ": calloc () copy interface name fail"); - return (-1); + return -1; } else { /* store interface name */ sstrncpy(new_iface->name, ci->values[j].value.string, @@ -220,77 +224,79 @@ static int ovs_events_config_get_interfaces(const oconfig_item_t *ci) { new_iface->name); } } - return (0); + return 0; } /* Parse plugin configuration file and store the config * in allocated memory. Returns negative value in case of error. */ static int ovs_events_plugin_config(oconfig_item_t *ci) { - _Bool dispatch_values = 1; + bool dispatch_values = false; for (int i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; if (strcasecmp("SendNotification", child->key) == 0) { if (cf_util_get_boolean(child, &ovs_events_ctx.config.send_notification) != 0) { ovs_events_config_free(); - return (-1); + return -1; } } else if (strcasecmp("Address", child->key) == 0) { if (cf_util_get_string_buffer( child, ovs_events_ctx.config.ovs_db_node, sizeof(ovs_events_ctx.config.ovs_db_node)) != 0) { ovs_events_config_free(); - return (-1); + return -1; } } else if (strcasecmp("Port", child->key) == 0) { char *service = NULL; if (cf_util_get_service(child, &service) != 0) { ovs_events_config_free(); - return (-1); + return -1; } - strncpy(ovs_events_ctx.config.ovs_db_serv, service, - sizeof(ovs_events_ctx.config.ovs_db_serv)); + sstrncpy(ovs_events_ctx.config.ovs_db_serv, service, + sizeof(ovs_events_ctx.config.ovs_db_serv)); sfree(service); } else if (strcasecmp("Socket", child->key) == 0) { if (cf_util_get_string_buffer( child, ovs_events_ctx.config.ovs_db_unix, sizeof(ovs_events_ctx.config.ovs_db_unix)) != 0) { ovs_events_config_free(); - return (-1); + return -1; } } else if (strcasecmp("Interfaces", child->key) == 0) { if (ovs_events_config_get_interfaces(child) != 0) { ovs_events_config_free(); - return (-1); + return -1; } } else if (strcasecmp("DispatchValues", child->key) == 0) { if (cf_util_get_boolean(child, &dispatch_values) != 0) { ovs_events_config_free(); - return (-1); + return -1; } } else { ERROR(OVS_EVENTS_PLUGIN ": option '%s' is not allowed here", child->key); ovs_events_config_free(); - return (-1); + return -1; } } /* Check and warn about invalid configuration */ if (!ovs_events_ctx.config.send_notification && !dispatch_values) { - WARNING(OVS_EVENTS_PLUGIN ": send notification and dispatch values " - "options are disabled. No information will be dispatched by the " - "plugin. Please check your configuration"); + WARNING(OVS_EVENTS_PLUGIN + ": send notification and dispatch values " + "options are disabled. No information will be dispatched by the " + "plugin. Please check your configuration"); } /* Dispatch link status values if configured */ if (dispatch_values) return plugin_register_complex_read(NULL, OVS_EVENTS_PLUGIN, ovs_events_plugin_read, 0, NULL); - return (0); + return 0; } /* Dispatch OVS interface link status event to collectd */ -static void ovs_events_dispatch_notification(const ovs_events_iface_info_t *ifinfo) { +static void +ovs_events_dispatch_notification(const ovs_events_iface_info_t *ifinfo) { const char *msg_link_status = NULL; notification_t n = { NOTIF_FAILURE, cdtime(), "", "", OVS_EVENTS_PLUGIN, "", "", "", NULL}; @@ -333,9 +339,9 @@ static void ovs_events_dispatch_notification(const ovs_events_iface_info_t *ifin } /* fill the notification data */ - ssnprintf(n.message, sizeof(n.message), - "link state of \"%s\" interface has been changed to \"%s\"", - ifinfo->name, msg_link_status); + snprintf(n.message, sizeof(n.message), + "link state of \"%s\" interface has been changed to \"%s\"", + ifinfo->name, msg_link_status); sstrncpy(n.host, hostname_g, sizeof(n.host)); sstrncpy(n.plugin_instance, ifinfo->name, sizeof(n.plugin_instance)); sstrncpy(n.type, "gauge", sizeof(n.type)); @@ -344,7 +350,8 @@ static void ovs_events_dispatch_notification(const ovs_events_iface_info_t *ifin } /* Dispatch OVS interface link status value to collectd */ -static void ovs_events_link_status_submit(const ovs_events_iface_info_t *ifinfo) { +static void +ovs_events_link_status_submit(const ovs_events_iface_info_t *ifinfo) { value_list_t vl = VALUE_LIST_INIT; meta_data_t *meta = NULL; @@ -395,15 +402,15 @@ static int ovs_events_get_iface_info(yajl_val jobject, /* check YAJL type */ if (!YAJL_IS_OBJECT(jobject)) - return (-1); - - /* zero the interface info structure */ - memset(ifinfo, 0, sizeof(*ifinfo)); + return -1; /* try to find external_ids, name and link_state fields */ jexternal_ids = ovs_utils_get_value_by_key(jobject, "external_ids"); if (jexternal_ids == NULL || ifinfo == NULL) - return (-1); + return -1; + + /* zero the interface info structure */ + memset(ifinfo, 0, sizeof(*ifinfo)); /* get iface-id from external_ids field */ jvalue = ovs_utils_get_map_value(jexternal_ids, "iface-id"); @@ -421,16 +428,16 @@ static int ovs_events_get_iface_info(yajl_val jobject, jvalue = ovs_utils_get_value_by_key(jobject, "_uuid"); if (jvalue == NULL || !YAJL_IS_ARRAY(jvalue) || YAJL_GET_ARRAY(jvalue)->len != 2) - return (-1); + return -1; juuid = YAJL_GET_ARRAY(jvalue)->values[1]; if (juuid == NULL || !YAJL_IS_STRING(juuid)) - return (-1); + return -1; sstrncpy(ifinfo->uuid, YAJL_GET_STRING(juuid), sizeof(ifinfo->uuid)); /* get interface name */ jvalue = ovs_utils_get_value_by_key(jobject, "name"); if (jvalue == NULL || !YAJL_IS_STRING(jvalue)) - return (-1); + return -1; sstrncpy(ifinfo->name, YAJL_GET_STRING(jvalue), sizeof(ifinfo->name)); /* get OVS DB interface link status */ @@ -442,7 +449,7 @@ static int ovs_events_get_iface_info(yajl_val jobject, else if (strcmp(state, "down") == 0) ifinfo->link_status = DOWN; } - return (0); + return 0; } /* Process OVS DB update table event. It handles link status update event(s) @@ -570,7 +577,7 @@ static void ovs_events_conn_initialize(ovs_db_t *pdb) { return; } } - OVS_EVENTS_CTX_LOCK { ovs_events_ctx.is_db_available = 1; } + OVS_EVENTS_CTX_LOCK { ovs_events_ctx.is_db_available = true; } DEBUG(OVS_EVENTS_PLUGIN ": OVS DB connection has been initialized"); } @@ -580,21 +587,21 @@ static void ovs_events_conn_terminate() { if (ovs_events_ctx.config.send_notification) ovs_events_dispatch_terminate_notification(msg); WARNING(OVS_EVENTS_PLUGIN ": %s", msg); - OVS_EVENTS_CTX_LOCK { ovs_events_ctx.is_db_available = 0; } + OVS_EVENTS_CTX_LOCK { ovs_events_ctx.is_db_available = false; } } /* Read OVS DB interface link status callback */ static int ovs_events_plugin_read(__attribute__((unused)) user_data_t *u) { - _Bool is_connected = 0; + bool is_connected = false; OVS_EVENTS_CTX_LOCK { is_connected = ovs_events_ctx.is_db_available; } if (is_connected) if (ovs_db_send_request(ovs_events_ctx.ovs_db, "transact", ovs_events_ctx.ovs_db_select_params, ovs_events_poll_result_cb) < 0) { ERROR(OVS_EVENTS_PLUGIN ": get interface info failed"); - return (-1); + return -1; } - return (0); + return 0; } /* Initialize OVS plugin */ @@ -627,13 +634,13 @@ static int ovs_events_plugin_init(void) { OVS_EVENTS_CTX_LOCK { ovs_events_ctx.ovs_db = ovs_db; } DEBUG(OVS_EVENTS_PLUGIN ": plugin has been initialized"); - return (0); + return 0; ovs_events_failure: ERROR(OVS_EVENTS_PLUGIN ": plugin initialize failed"); /* release allocated memory */ ovs_events_config_free(); - return (-1); + return -1; } /* Shutdown OVS plugin */ @@ -646,7 +653,7 @@ static int ovs_events_plugin_shutdown(void) { ovs_events_config_free(); DEBUG(OVS_EVENTS_PLUGIN ": plugin has been destroyed"); - return (0); + return 0; } /* Register OVS plugin callbacks */