X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fovs_events.c;h=afa11997cfc3a1ec8fadd50a29db39c1d0ecd7b3;hb=e746ad785774de37a30302fef65f1c4aaf8698ab;hp=f971d1112ce418b53315ac17dc393659f57db69a;hpb=12f649741333f3b36d0f859800041674ad9e5011;p=collectd.git diff --git a/src/ovs_events.c b/src/ovs_events.c index f971d111..afa11997 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 @@ -25,59 +28,59 @@ * Volodymyr Mytnyk **/ -#include "common.h" /* auxiliary functions */ +#include "collectd.h" -#include "utils_ovs.h" /* OVS helpers */ +#include "common.h" /* auxiliary functions */ + +#include "utils_ovs.h" /* OVS helpers */ #define OVS_EVENTS_IFACE_NAME_SIZE 128 #define OVS_EVENTS_IFACE_UUID_SIZE 64 #define OVS_EVENTS_EXT_IFACE_ID_SIZE 64 -#define OVS_EVENTS_EXT_VM_UUID_SIZE 64 -#define OVS_EVENTS_OVS_DB_URL_SIZE 64 +#define OVS_EVENTS_EXT_VM_UUID_SIZE 64 #define OVS_EVENTS_PLUGIN "ovs_events" -#define OVS_EVENTS_CTX_LOCK for (int __i = ovs_events_ctx_lock(); __i != 0 ; \ - __i = ovs_events_ctx_unlock()) -#define OVS_EVENTS_CONFIG_ERROR(option) do { \ - ERROR(OVS_EVENTS_PLUGIN ": read '%s' config option failed", option); \ - goto failure; } while (0) +#define OVS_EVENTS_CTX_LOCK \ + for (int __i = ovs_events_ctx_lock(); __i != 0; __i = ovs_events_ctx_unlock()) /* Link status type */ -enum ovs_events_link_status_e {DOWN, UP}; +enum ovs_events_link_status_e { DOWN, UP }; typedef enum ovs_events_link_status_e ovs_events_link_status_t; /* Interface info */ struct ovs_events_iface_info_s { - char name[OVS_EVENTS_IFACE_NAME_SIZE]; /* interface name */ - char uuid[OVS_EVENTS_IFACE_UUID_SIZE]; /* interface UUID */ - char ext_iface_id[OVS_EVENTS_EXT_IFACE_ID_SIZE]; /* external interface id */ - char ext_vm_uuid[OVS_EVENTS_EXT_VM_UUID_SIZE]; /* external VM UUID */ - ovs_events_link_status_t link_status; /* interface link status */ - struct ovs_events_iface_info_s *next; /* next interface info */ + char name[OVS_EVENTS_IFACE_NAME_SIZE]; /* interface name */ + char uuid[OVS_EVENTS_IFACE_UUID_SIZE]; /* interface UUID */ + char ext_iface_id[OVS_EVENTS_EXT_IFACE_ID_SIZE]; /* external interface id */ + char ext_vm_uuid[OVS_EVENTS_EXT_VM_UUID_SIZE]; /* external VM UUID */ + ovs_events_link_status_t link_status; /* interface link status */ + struct ovs_events_iface_info_s *next; /* next interface info */ }; typedef struct ovs_events_iface_info_s ovs_events_iface_info_t; /* Interface list */ struct ovs_events_iface_list_s { - char name[OVS_EVENTS_IFACE_NAME_SIZE]; /* interface name */ - struct ovs_events_iface_list_s *next; /* next interface info */ + char name[OVS_EVENTS_IFACE_NAME_SIZE]; /* interface name */ + struct ovs_events_iface_list_s *next; /* next interface info */ }; 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? */ - char ovs_db_server_url[OVS_EVENTS_OVS_DB_URL_SIZE]; /* OVS DB server URL */ - ovs_events_iface_list_t *ifaces; /* interface info */ + _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 */ + ovs_events_iface_list_t *ifaces; /* interface info */ }; typedef struct ovs_events_config_s ovs_events_config_t; /* OVS events context type */ struct ovs_events_ctx_s { - pthread_mutex_t mutex; /* mutex to lock the context */ - 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 */ + pthread_mutex_t mutex; /* mutex to lock the context */ + 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 */ }; typedef struct ovs_events_ctx_s ovs_events_ctx_t; @@ -85,49 +88,44 @@ typedef struct ovs_events_ctx_s ovs_events_ctx_t; * Private variables */ static ovs_events_ctx_t ovs_events_ctx = { - .mutex = PTHREAD_MUTEX_INITIALIZER, - .config = { - .send_notification = 0, /* do not send notification */ - .ovs_db_server_url = "tcp:127.0.0.1:6640", /* use default OVS DB URL */ - .ifaces = NULL}, - .ovs_db_select_params = NULL, - .is_db_available = 0, - .ovs_db = NULL}; + .mutex = PTHREAD_MUTEX_INITIALIZER, + .config = {.send_notification = 1, /* send notification by default */ + .ovs_db_node = "localhost", /* use default OVS DB node */ + .ovs_db_serv = "6640"} /* use default OVS DB service */ +}; + +/* Forward declaration */ +static int ovs_events_plugin_read(user_data_t *u); /* This function is used only by "OVS_EVENTS_CTX_LOCK" define (see above). * It always returns 1 when context is locked. */ -static inline int -ovs_events_ctx_lock() -{ +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). * It always returns 0 when context is unlocked. */ -static inline int -ovs_events_ctx_unlock() -{ +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 * returns 1 if exists otherwise 0. If no interfaces are configured, * -1 is returned */ -static int -ovs_events_config_iface_exists(const char *ifname) -{ +static int ovs_events_config_iface_exists(const char *ifname) { if (ovs_events_ctx.config.ifaces == NULL) return -1; /* check if given interface exists */ for (ovs_events_iface_list_t *iface = ovs_events_ctx.config.ifaces; iface; iface = iface->next) - return (strcmp(ifname, iface->name) == 0); + if (strcmp(ifname, iface->name) == 0) + return 1; return 0; } @@ -135,64 +133,62 @@ ovs_events_config_iface_exists(const char *ifname) /* Get OVS DB select parameter request based on rfc7047, * "Transact" & "Select" section */ -static inline char * -ovs_events_get_select_params() -{ - int ret = 0; +static char *ovs_events_get_select_params() { size_t buff_size = 0; - size_t offset = 0; - char *buff = NULL; - char *new_buff = NULL; - const char params_fmt[] = "[\"Open_vSwitch\"%s]"; - const char option_fmt[] = ",{\"op\":\"select\",\"table\":\"Interface\"," - "\"where\":[[\"name\",\"==\",\"%s\"]]," - "\"columns\":[\"link_state\",\"external_ids\"," - "\"name\",\"_uuid\"]}"; - const char default_opt[] = ",{\"op\":\"select\",\"table\":\"Interface\"," - "\"where\":[],\"columns\":[\"link_state\"," - "\"external_ids\",\"name\",\"_uuid\"]}"; + size_t buff_off = 0; + char *opt_buff = NULL; + static const char params_fmt[] = "[\"Open_vSwitch\"%s]"; + static const char option_fmt[] = + ",{\"op\":\"select\",\"table\":\"Interface\"," + "\"where\":[[\"name\",\"==\",\"%s\"]]," + "\"columns\":[\"link_state\",\"external_ids\"," + "\"name\",\"_uuid\"]}"; + static const char default_opt[] = + ",{\"op\":\"select\",\"table\":\"Interface\"," + "\"where\":[],\"columns\":[\"link_state\"," + "\"external_ids\",\"name\",\"_uuid\"]}"; /* setup OVS DB interface condition */ for (ovs_events_iface_list_t *iface = ovs_events_ctx.config.ifaces; iface; - iface = iface->next, offset += ret) { + iface = iface->next) { /* allocate new buffer (format size + ifname len is good enough) */ - buff_size += (sizeof(option_fmt) + strlen(iface->name)); - new_buff = realloc(buff, buff_size); - if (new_buff == NULL) - goto failure; - buff = new_buff; - ret = ssnprintf(buff + offset, buff_size, option_fmt, iface->name); - if (ret < 0) - goto failure; + buff_size += sizeof(option_fmt) + strlen(iface->name); + char *new_buff = realloc(opt_buff, buff_size); + if (new_buff == NULL) { + sfree(opt_buff); + return NULL; + } + opt_buff = new_buff; + int ret = snprintf(opt_buff + buff_off, buff_size - buff_off, option_fmt, + iface->name); + if (ret < 0) { + sfree(opt_buff); + return NULL; + } + buff_off += ret; } /* if no interfaces are configured, use default params */ - if (buff == NULL) { - buff = strdup(default_opt); - offset = strlen(default_opt); - } + if (opt_buff == NULL) + if ((opt_buff = strdup(default_opt)) == NULL) + return NULL; /* allocate memory for OVS DB select params */ - buff_size = offset + sizeof(params_fmt); - new_buff = malloc(buff_size); - if (new_buff == NULL) - goto failure; + size_t params_size = sizeof(params_fmt) + strlen(opt_buff); + char *params_buff = calloc(1, params_size); + if (params_buff == NULL) { + sfree(opt_buff); + return NULL; + } /* create OVS DB select params */ - if (ssnprintf(new_buff, buff_size, params_fmt, buff) < 0) - goto failure; + if (snprintf(params_buff, params_size, params_fmt, opt_buff) < 0) + sfree(params_buff); - sfree(buff); - return new_buff; - -failure: - sfree(new_buff); - sfree(buff); - return NULL; + sfree(opt_buff); + return params_buff; } /* Release memory allocated for configuration data */ -static void -ovs_events_config_free() -{ +static void ovs_events_config_free() { ovs_events_iface_list_t *del_iface = NULL; sfree(ovs_events_ctx.ovs_db_select_params); while (ovs_events_ctx.config.ifaces) { @@ -202,68 +198,108 @@ ovs_events_config_free() } } +/* Parse/process "Interfaces" configuration option. Returns 0 if success + * otherwise -1 (error) + */ +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; + } + /* 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; + } else { + /* store interface name */ + sstrncpy(new_iface->name, ci->values[j].value.string, + sizeof(new_iface->name)); + new_iface->next = ovs_events_ctx.config.ifaces; + ovs_events_ctx.config.ifaces = new_iface; + DEBUG(OVS_EVENTS_PLUGIN ": found monitored interface \"%s\"", + new_iface->name); + } + } + 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) -{ - ovs_events_iface_list_t *new_iface; - +static int ovs_events_plugin_config(oconfig_item_t *ci) { + _Bool dispatch_values = 0; 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_ERROR(child->key); - } else if (strcasecmp("OvsDbServerUrl", child->key) == 0) { - if (cf_util_get_string_buffer(child, - ovs_events_ctx.config.ovs_db_server_url, - sizeof(ovs_events_ctx.config. - ovs_db_server_url)) < 0) - OVS_EVENTS_CONFIG_ERROR(child->key); + &ovs_events_ctx.config.send_notification) != 0) { + ovs_events_config_free(); + 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; + } + } else if (strcasecmp("Port", child->key) == 0) { + char *service = NULL; + if (cf_util_get_service(child, &service) != 0) { + ovs_events_config_free(); + return -1; + } + strncpy(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; + } } else if (strcasecmp("Interfaces", child->key) == 0) { - for (int j = 0; j < child->values_num; j++) { - /* check value type */ - if (child->values[j].type != OCONFIG_TYPE_STRING) { - ERROR(OVS_EVENTS_PLUGIN - ": given interface name is not a string [idx=%d]", j); - goto failure; - } - /* allocate memory for configured interface */ - if ((new_iface = malloc(sizeof(*new_iface))) == NULL) { - ERROR(OVS_EVENTS_PLUGIN ": malloc () copy interface name fail"); - goto failure; - } else { - /* store interface name */ - sstrncpy(new_iface->name, child->values[j].value.string, - sizeof(new_iface->name)); - new_iface->next = ovs_events_ctx.config.ifaces; - ovs_events_ctx.config.ifaces = new_iface; - DEBUG(OVS_EVENTS_PLUGIN ": found monitored interface \"%s\"", - new_iface->name); - } + if (ovs_events_config_get_interfaces(child) != 0) { + ovs_events_config_free(); + return -1; + } + } else if (strcasecmp("DispatchValues", child->key) == 0) { + if (cf_util_get_boolean(child, &dispatch_values) != 0) { + ovs_events_config_free(); + return -1; } } else { - ERROR(OVS_EVENTS_PLUGIN ": option '%s' is not allowed here", - child->key); - goto failure; + ERROR(OVS_EVENTS_PLUGIN ": option '%s' is not allowed here", child->key); + ovs_events_config_free(); + return -1; } } - return (0); + /* 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"); + } + /* Dispatch link status values if configured */ + if (dispatch_values) + return plugin_register_complex_read(NULL, OVS_EVENTS_PLUGIN, + ovs_events_plugin_read, 0, NULL); -failure: - ovs_events_config_free(); - return (-1); + return 0; } /* Dispatch OVS interface link status event to collectd */ static void -ovs_events_dispatch_notification(const ovs_events_iface_info_t *ifinfo) -{ +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}; + notification_t n = { + NOTIF_FAILURE, cdtime(), "", "", OVS_EVENTS_PLUGIN, "", "", "", NULL}; /* convert link status to message string */ switch (ifinfo->link_status) { @@ -276,34 +312,36 @@ ovs_events_dispatch_notification(const ovs_events_iface_info_t *ifinfo) n.severity = NOTIF_WARNING; break; default: - ERROR(OVS_EVENTS_PLUGIN, ": unknown interface link status"); + ERROR(OVS_EVENTS_PLUGIN ": unknown interface link status"); return; } /* add interface metadata to the notification */ if (plugin_notification_meta_add_string(&n, "uuid", ifinfo->uuid) < 0) { - ERROR(OVS_EVENTS_PLUGIN, ": add interface uuid meta data failed"); + ERROR(OVS_EVENTS_PLUGIN ": add interface uuid meta data failed"); return; } - if (strlen(ifinfo->ext_vm_uuid) > 0) - if (plugin_notification_meta_add_string - (&n, "vm-uuid", ifinfo->ext_vm_uuid) < 0) { - ERROR(OVS_EVENTS_PLUGIN, ": add interface vm-uuid meta data failed"); + if (strlen(ifinfo->ext_vm_uuid) > 0) { + if (plugin_notification_meta_add_string(&n, "vm-uuid", + ifinfo->ext_vm_uuid) < 0) { + ERROR(OVS_EVENTS_PLUGIN ": add interface vm-uuid meta data failed"); return; } + } - if (strlen(ifinfo->ext_iface_id) > 0) - if (plugin_notification_meta_add_string - (&n, "iface-id", ifinfo->ext_iface_id) < 0) { - ERROR(OVS_EVENTS_PLUGIN, ": add interface iface-id meta data failed"); + if (strlen(ifinfo->ext_iface_id) > 0) { + if (plugin_notification_meta_add_string(&n, "iface-id", + ifinfo->ext_iface_id) < 0) { + ERROR(OVS_EVENTS_PLUGIN ": add interface iface-id meta data failed"); return; } + } /* 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)); @@ -313,33 +351,29 @@ ovs_events_dispatch_notification(const ovs_events_iface_info_t *ifinfo) /* Dispatch OVS interface link status value to collectd */ static void -ovs_events_link_status_submit(const ovs_events_iface_info_t *ifinfo) -{ - value_t values[1]; +ovs_events_link_status_submit(const ovs_events_iface_info_t *ifinfo) { value_list_t vl = VALUE_LIST_INIT; meta_data_t *meta = NULL; /* add interface metadata to the submit value */ if ((meta = meta_data_create()) != NULL) { if (meta_data_add_string(meta, "uuid", ifinfo->uuid) < 0) - ERROR(OVS_EVENTS_PLUGIN, ": add interface uuid meta data failed"); + ERROR(OVS_EVENTS_PLUGIN ": add interface uuid meta data failed"); if (strlen(ifinfo->ext_vm_uuid) > 0) if (meta_data_add_string(meta, "vm-uuid", ifinfo->ext_vm_uuid) < 0) - ERROR(OVS_EVENTS_PLUGIN, ": add interface vm-uuid meta data failed"); + ERROR(OVS_EVENTS_PLUGIN ": add interface vm-uuid meta data failed"); if (strlen(ifinfo->ext_iface_id) > 0) if (meta_data_add_string(meta, "iface-id", ifinfo->ext_iface_id) < 0) - ERROR(OVS_EVENTS_PLUGIN, ": add interface iface-id meta data failed"); + ERROR(OVS_EVENTS_PLUGIN ": add interface iface-id meta data failed"); vl.meta = meta; } else ERROR(OVS_EVENTS_PLUGIN ": create metadata failed"); - values[0].gauge = (gauge_t)ifinfo->link_status; vl.time = cdtime(); - vl.values = values; - vl.values_len = STATIC_ARRAY_SIZE(values); - sstrncpy(vl.host, hostname_g, sizeof(vl.host)); + vl.values = &(value_t){.gauge = (gauge_t)ifinfo->link_status}; + vl.values_len = 1; sstrncpy(vl.plugin, OVS_EVENTS_PLUGIN, sizeof(vl.plugin)); sstrncpy(vl.plugin_instance, ifinfo->name, sizeof(vl.plugin_instance)); sstrncpy(vl.type, "gauge", sizeof(vl.type)); @@ -349,33 +383,34 @@ ovs_events_link_status_submit(const ovs_events_iface_info_t *ifinfo) } /* Dispatch OVS DB terminate connection event to collectd */ -static void -ovs_events_dispatch_terminate_notification(const char *msg) -{ - notification_t n = {NOTIF_FAILURE, cdtime(), "", "", OVS_EVENTS_PLUGIN, - "", "", "", NULL}; - ssnprintf(n.message, sizeof(n.message), msg); +static void ovs_events_dispatch_terminate_notification(const char *msg) { + notification_t n = { + NOTIF_FAILURE, cdtime(), "", "", OVS_EVENTS_PLUGIN, "", "", "", NULL}; + sstrncpy(n.message, msg, sizeof(n.message)); sstrncpy(n.host, hostname_g, sizeof(n.host)); plugin_dispatch_notification(&n); } /* Get OVS DB interface information and stores it into * ovs_events_iface_info_t structure */ -static int -ovs_events_get_iface_info(yajl_val jobject, ovs_events_iface_info_t *ifinfo) -{ +static int ovs_events_get_iface_info(yajl_val jobject, + ovs_events_iface_info_t *ifinfo) { yajl_val jexternal_ids = NULL; yajl_val jvalue = NULL; yajl_val juuid = NULL; + const char *state = NULL; /* check YAJL type */ if (!YAJL_IS_OBJECT(jobject)) - return NULL; + return -1; + + /* zero the interface info structure */ + memset(ifinfo, 0, sizeof(*ifinfo)); /* 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; /* get iface-id from external_ids field */ jvalue = ovs_utils_get_map_value(jexternal_ids, "iface-id"); @@ -393,37 +428,35 @@ ovs_events_get_iface_info(yajl_val jobject, ovs_events_iface_info_t *ifinfo) 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 */ jvalue = ovs_utils_get_value_by_key(jobject, "link_state"); - if (jvalue != NULL && YAJL_IS_STRING(jvalue)) { + if (jvalue != NULL && ((state = YAJL_GET_STRING(jvalue)) != NULL)) { /* convert OVS table link state to link status */ - if (strcmp(YAJL_GET_STRING(jvalue), "up") == 0) + if (strcmp(state, "up") == 0) ifinfo->link_status = UP; - else if (strcmp(YAJL_GET_STRING(jvalue), "down") == 0) + 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) * and dispatches the value(s) to collectd if interface name matches one of * interfaces specified in configuration file. */ -static void -ovs_events_table_update_cb(yajl_val jupdates) -{ +static void ovs_events_table_update_cb(yajl_val jupdates) { yajl_val jnew_val = NULL; yajl_val jupdate = NULL; yajl_val jrow_update = NULL; @@ -459,7 +492,7 @@ ovs_events_table_update_cb(yajl_val jupdates) return; } /* go through all row updates */ - for (int row_index = 0; row_index < YAJL_GET_OBJECT(jupdate)->len; + for (size_t row_index = 0; row_index < YAJL_GET_OBJECT(jupdate)->len; ++row_index) { jrow_update = YAJL_GET_OBJECT(jupdate)->values[row_index]; @@ -475,19 +508,20 @@ ovs_events_table_update_cb(yajl_val jupdates) " :unexpected interface information data received"); return; } - if (ovs_events_config_iface_exists(ifinfo.name) != 0) + if (ovs_events_config_iface_exists(ifinfo.name) != 0) { + DEBUG("name=%s, uuid=%s, ext_iface_id=%s, ext_vm_uuid=%s", ifinfo.name, + ifinfo.uuid, ifinfo.ext_iface_id, ifinfo.ext_vm_uuid); /* dispatch notification */ ovs_events_dispatch_notification(&ifinfo); + } } } -/* OVD DB reply callback. It parses reply, receives +/* OVS DB reply callback. It parses reply, receives * interface information and dispatches the info to - * collecd + * collectd */ -static void -ovs_events_poll_result_cb(yajl_val jresult, yajl_val jerror) -{ +static void ovs_events_poll_result_cb(yajl_val jresult, yajl_val jerror) { yajl_val *jvalues = NULL; yajl_val jvalue = NULL; ovs_events_iface_info_t ifinfo; @@ -505,24 +539,22 @@ ovs_events_poll_result_cb(yajl_val jresult, yajl_val jerror) /* go through all rows and get interface info */ jvalues = YAJL_GET_ARRAY(jresult)->values; - for (int i = 0; i < YAJL_GET_ARRAY(jresult)->len; i++) { + for (size_t i = 0; i < YAJL_GET_ARRAY(jresult)->len; i++) { jvalue = ovs_utils_get_value_by_key(jvalues[i], "rows"); if (jvalue == NULL || !YAJL_IS_ARRAY(jvalue)) { ERROR(OVS_EVENTS_PLUGIN "invalid data (array of rows is expected)"); return; } /* get interfaces info */ - for (int j = 0; j < YAJL_GET_ARRAY(jvalue)->len; j++) { - memset(&ifinfo, 0, sizeof(ifinfo)); - if (ovs_events_get_iface_info - (YAJL_GET_ARRAY(jvalue)->values[j], &ifinfo) < 0) { + for (size_t j = 0; j < YAJL_GET_ARRAY(jvalue)->len; j++) { + if (ovs_events_get_iface_info(YAJL_GET_ARRAY(jvalue)->values[j], + &ifinfo) < 0) { ERROR(OVS_EVENTS_PLUGIN "unexpected interface information data received"); return; } - DEBUG("name=%s, uuid=%s, ext_iface_id=%s, ext_vm_uuid=%s", - ifinfo.name, ifinfo.uuid, ifinfo.ext_iface_id, - ifinfo.ext_vm_uuid); + DEBUG("name=%s, uuid=%s, ext_iface_id=%s, ext_vm_uuid=%s", ifinfo.name, + ifinfo.uuid, ifinfo.ext_iface_id, ifinfo.ext_vm_uuid); ovs_events_link_status_submit(&ifinfo); } } @@ -531,72 +563,56 @@ ovs_events_poll_result_cb(yajl_val jresult, yajl_val jerror) /* Setup OVS DB table callback. It subscribes to OVS DB 'Interface' table * to receive link status event(s). */ -static void -ovs_events_conn_initialize(ovs_db_t *pdb) -{ - int ret = 0; +static void ovs_events_conn_initialize(ovs_db_t *pdb) { const char tb_name[] = "Interface"; - const char *columns[] = {"_uuid", "external_ids", - "name", "link_state", NULL}; + const char *columns[] = {"_uuid", "external_ids", "name", "link_state", NULL}; /* register update link status event if needed */ if (ovs_events_ctx.config.send_notification) { - ret = ovs_db_table_cb_register(pdb, tb_name, columns, - ovs_events_table_update_cb, NULL, - OVS_DB_TABLE_CB_FLAG_MODIFY); + int ret = ovs_db_table_cb_register(pdb, tb_name, columns, + ovs_events_table_update_cb, NULL, + OVS_DB_TABLE_CB_FLAG_MODIFY); if (ret < 0) { ERROR(OVS_EVENTS_PLUGIN ": register OVS DB update callback failed"); return; } } - OVS_EVENTS_CTX_LOCK { - ovs_events_ctx.is_db_available = 1; - } - DEBUG(OVS_EVENTS_PLUGIN ": OVS DB has been initialized"); + OVS_EVENTS_CTX_LOCK { ovs_events_ctx.is_db_available = 1; } + DEBUG(OVS_EVENTS_PLUGIN ": OVS DB connection has been initialized"); } /* OVS DB terminate connection notification callback */ -static void -ovs_events_conn_terminate() -{ +static void ovs_events_conn_terminate() { const char msg[] = "OVS DB connection has been lost"; 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 = 0; } } /* Read OVS DB interface link status callback */ -static int -ovs_events_plugin_read(user_data_t *ud) -{ - (void)ud; /* unused argument */ +static int ovs_events_plugin_read(__attribute__((unused)) user_data_t *u) { _Bool is_connected = 0; - OVS_EVENTS_CTX_LOCK { - is_connected = ovs_events_ctx.is_db_available; - } + 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 */ -static int -ovs_events_plugin_init(void) -{ +static int ovs_events_plugin_init(void) { ovs_db_t *ovs_db = NULL; ovs_db_callback_t cb = {.post_conn_init = ovs_events_conn_initialize, .post_conn_terminate = ovs_events_conn_terminate}; - DEBUG(OVS_EVENTS_PLUGIN ": OVS DB url = %s", - ovs_events_ctx.config.ovs_db_server_url); + DEBUG(OVS_EVENTS_PLUGIN ": OVS DB address=%s, service=%s, unix=%s", + ovs_events_ctx.config.ovs_db_node, ovs_events_ctx.config.ovs_db_serv, + ovs_events_ctx.config.ovs_db_unix); /* generate OVS DB select condition based on list on configured interfaces */ ovs_events_ctx.ovs_db_select_params = ovs_events_get_select_params(); @@ -606,31 +622,29 @@ ovs_events_plugin_init(void) } /* initialize OVS DB */ - ovs_db = ovs_db_init(ovs_events_ctx.config.ovs_db_server_url, &cb); + ovs_db = ovs_db_init(ovs_events_ctx.config.ovs_db_node, + ovs_events_ctx.config.ovs_db_serv, + ovs_events_ctx.config.ovs_db_unix, &cb); if (ovs_db == NULL) { ERROR(OVS_EVENTS_PLUGIN ": fail to connect to OVS DB server"); goto ovs_events_failure; } /* store OVS DB handler */ - OVS_EVENTS_CTX_LOCK { - ovs_events_ctx.ovs_db = ovs_db; - } + 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 */ -static int -ovs_events_plugin_shutdown(void) -{ +static int ovs_events_plugin_shutdown(void) { /* destroy OVS DB */ if (ovs_db_destroy(ovs_events_ctx.ovs_db)) ERROR(OVS_EVENTS_PLUGIN ": OVSDB object destroy failed"); @@ -639,16 +653,12 @@ 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 */ -void -module_register(void) -{ +void module_register(void) { plugin_register_complex_config(OVS_EVENTS_PLUGIN, ovs_events_plugin_config); plugin_register_init(OVS_EVENTS_PLUGIN, ovs_events_plugin_init); - plugin_register_complex_read(NULL, OVS_EVENTS_PLUGIN, - ovs_events_plugin_read, 0, NULL); plugin_register_shutdown(OVS_EVENTS_PLUGIN, ovs_events_plugin_shutdown); }