X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fnetwork.c;h=bf0b2bc647e63f7de410e561dd2d9b16817fbd7c;hb=7cea19815ba24735e91dde1c08a889960b299b62;hp=19b4cc34d41d39a758b1db0f70f0e22080fdb982;hpb=55832a2197b65223bbfaff233dab755384c33a86;p=collectd.git diff --git a/src/network.c b/src/network.c index 19b4cc34..bf0b2bc6 100644 --- a/src/network.c +++ b/src/network.c @@ -1,6 +1,6 @@ /** * collectd - src/network.c - * Copyright (C) 2005-2009 Florian octo Forster + * Copyright (C) 2005-2013 Florian octo Forster * Copyright (C) 2009 Aman Gupta * * This program is free software; you can redistribute it and/or modify it @@ -18,7 +18,7 @@ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * * Authors: - * Florian octo Forster + * Florian octo Forster * Aman Gupta **/ @@ -117,6 +117,8 @@ struct sockent_client gcry_cipher_hd_t cypher; unsigned char password_hash[32]; #endif + cdtime_t next_resolve_reconnect; + cdtime_t resolve_interval; }; struct sockent_server @@ -276,7 +278,8 @@ typedef struct receive_list_entry_s receive_list_entry_t; * Private variables */ static int network_config_ttl = 0; -static size_t network_config_packet_size = 1024; +/* Ethernet - (IPv6 + UDP) = 1500 - (40 + 8) = 1452 */ +static size_t network_config_packet_size = 1452; static int network_config_forward = 0; static int network_config_stats = 0; @@ -313,14 +316,14 @@ static pthread_mutex_t send_buffer_lock = PTHREAD_MUTEX_INITIALIZER; * example). Only if neither is true, the stats_lock is acquired. The counters * are always read without holding a lock in the hope that writing 8 bytes to * memory is an atomic operation. */ -static uint64_t stats_octets_rx = 0; -static uint64_t stats_octets_tx = 0; -static uint64_t stats_packets_rx = 0; -static uint64_t stats_packets_tx = 0; -static uint64_t stats_values_dispatched = 0; -static uint64_t stats_values_not_dispatched = 0; -static uint64_t stats_values_sent = 0; -static uint64_t stats_values_not_sent = 0; +static derive_t stats_octets_rx = 0; +static derive_t stats_octets_tx = 0; +static derive_t stats_packets_rx = 0; +static derive_t stats_packets_tx = 0; +static derive_t stats_values_dispatched = 0; +static derive_t stats_values_not_dispatched = 0; +static derive_t stats_values_sent = 0; +static derive_t stats_values_not_sent = 0; static pthread_mutex_t stats_lock = PTHREAD_MUTEX_INITIALIZER; /* @@ -337,30 +340,30 @@ static _Bool check_receive_okay (const value_list_t *vl) /* {{{ */ /* This is a value we already sent. Don't allow it to be received again in * order to avoid looping. */ if ((status == 0) && (time_sent >= ((uint64_t) vl->time))) - return (false); + return (0); - return (true); + return (1); } /* }}} _Bool check_receive_okay */ static _Bool check_send_okay (const value_list_t *vl) /* {{{ */ { - _Bool received = false; + _Bool received = 0; int status; if (network_config_forward != 0) - return (true); + return (1); if (vl->meta == NULL) - return (true); + return (1); status = meta_data_get_boolean (vl->meta, "network:received", &received); if (status == -ENOENT) - return (true); + return (1); else if (status != 0) { ERROR ("network plugin: check_send_okay: meta_data_get_boolean failed " "with status %i.", status); - return (true); + return (1); } /* By default, only *send* value lists that were not *received* by the @@ -394,7 +397,7 @@ static _Bool check_send_notify_okay (const notification_t *n) /* {{{ */ { c_complain_once (LOG_ERR, &complain_forwarding, "network plugin: A notification has been received via the network " - "forwarding if enabled. Forwarding of notifications is currently " + "and forwarding is enabled. Forwarding of notifications is currently " "not supported, because there is not loop-deteciton available. " "Please contact the collectd mailing list if you need this " "feature."); @@ -438,7 +441,7 @@ static int network_dispatch_values (value_list_t *vl, /* {{{ */ return (-ENOMEM); } - status = meta_data_add_boolean (vl->meta, "network:received", true); + status = meta_data_add_boolean (vl->meta, "network:received", 1); if (status != 0) { ERROR ("network plugin: meta_data_add_boolean failed."); @@ -459,7 +462,7 @@ static int network_dispatch_values (value_list_t *vl, /* {{{ */ } } - plugin_dispatch_values_secure (vl); + plugin_dispatch_values (vl); stats_values_dispatched++; meta_data_destroy (vl->meta); @@ -492,6 +495,27 @@ static int network_dispatch_notification (notification_t *n) /* {{{ */ } /* }}} int network_dispatch_notification */ #if HAVE_LIBGCRYPT +static void network_init_gcrypt (void) /* {{{ */ +{ + /* http://lists.gnupg.org/pipermail/gcrypt-devel/2003-August/000458.html + * Because you can't know in a library whether another library has + * already initialized the library */ + if (gcry_control (GCRYCTL_ANY_INITIALIZATION_P)) + return; + + /* http://www.gnupg.org/documentation/manuals/gcrypt/Multi_002dThreading.html + * To ensure thread-safety, it's important to set GCRYCTL_SET_THREAD_CBS + * *before* initalizing Libgcrypt with gcry_check_version(), which itself must + * be called before any other gcry_* function. GCRYCTL_ANY_INITIALIZATION_P + * above doesn't count, as it doesn't implicitly initalize Libgcrypt. + * + * tl;dr: keep all these gry_* statements in this exact order please. */ + gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); + gcry_check_version (NULL); + gcry_control (GCRYCTL_INIT_SECMEM, 32768); + gcry_control (GCRYCTL_INITIALIZATION_FINISHED); +} /* }}} void network_init_gcrypt */ + static gcry_cipher_hd_t network_get_aes256_cypher (sockent_t *se, /* {{{ */ const void *iv, size_t iv_size, const char *username) { @@ -895,15 +919,19 @@ static int parse_part_number (void **ret_buffer, size_t *ret_buffer_len, } /* int parse_part_number */ static int parse_part_string (void **ret_buffer, size_t *ret_buffer_len, - char *output, int output_len) + char *output, size_t const output_len) { char *buffer = *ret_buffer; size_t buffer_len = *ret_buffer_len; uint16_t tmp16; - size_t header_size = 2 * sizeof (uint16_t); + size_t const header_size = 2 * sizeof (uint16_t); uint16_t pkg_length; + size_t payload_size; + + if (output_len <= 0) + return (EINVAL); if (buffer_len < header_size) { @@ -922,6 +950,7 @@ static int parse_part_string (void **ret_buffer, size_t *ret_buffer_len, memcpy ((void *) &tmp16, buffer, sizeof (tmp16)); buffer += sizeof (tmp16); pkg_length = ntohs (tmp16); + payload_size = ((size_t) pkg_length) - header_size; /* Check that packet fits in the input buffer */ if (pkg_length > buffer_len) @@ -947,22 +976,24 @@ static int parse_part_string (void **ret_buffer, size_t *ret_buffer_len, /* Check that the package data fits into the output buffer. * The previous if-statement ensures that: * `pkg_length > header_size' */ - if ((output_len < 0) - || ((size_t) output_len < ((size_t) pkg_length - header_size))) + if (output_len < payload_size) { WARNING ("network plugin: parse_part_string: " - "Output buffer too small."); + "Buffer too small: " + "Output buffer holds %zu bytes, " + "which is too small to hold the received " + "%zu byte string.", + output_len, payload_size); return (-1); } /* All sanity checks successfull, let's copy the data over */ - output_len = pkg_length - header_size; - memcpy ((void *) output, (void *) buffer, output_len); - buffer += output_len; + memcpy ((void *) output, (void *) buffer, payload_size); + buffer += payload_size; /* For some very weird reason '\0' doesn't do the trick on SPARC in * this statement. */ - if (output[output_len - 1] != 0) + if (output[payload_size - 1] != 0) { WARNING ("network plugin: parse_part_string: " "Received string does not end " @@ -1456,8 +1487,19 @@ static int parse_packet (sockent_t *se, /* {{{ */ &tmp); if (status == 0) { - vl.time = (time_t) tmp; - n.time = (time_t) tmp; + vl.time = TIME_T_TO_CDTIME_T (tmp); + n.time = TIME_T_TO_CDTIME_T (tmp); + } + } + else if (pkg_type == TYPE_TIME_HR) + { + uint64_t tmp = 0; + status = parse_part_number (&buffer, &buffer_size, + &tmp); + if (status == 0) + { + vl.time = (cdtime_t) tmp; + n.time = (cdtime_t) tmp; } } else if (pkg_type == TYPE_INTERVAL) @@ -1466,7 +1508,15 @@ static int parse_packet (sockent_t *se, /* {{{ */ status = parse_part_number (&buffer, &buffer_size, &tmp); if (status == 0) - vl.interval = (int) tmp; + vl.interval = TIME_T_TO_CDTIME_T (tmp); + } + else if (pkg_type == TYPE_INTERVAL_HR) + { + uint64_t tmp = 0; + status = parse_part_number (&buffer, &buffer_size, + &tmp); + if (status == 0) + vl.interval = (cdtime_t) tmp; } else if (pkg_type == TYPE_HOST) { @@ -1951,14 +2001,19 @@ static int network_bind_socket (int fd, const struct addrinfo *ai, const int int /* Initialize a sockent structure. `type' must be either `SOCKENT_TYPE_CLIENT' * or `SOCKENT_TYPE_SERVER' */ -static int sockent_init (sockent_t *se, int type) /* {{{ */ +static sockent_t *sockent_create (int type) /* {{{ */ { - if (se == NULL) - return (-1); + sockent_t *se; + if ((type != SOCKENT_TYPE_CLIENT) && (type != SOCKENT_TYPE_SERVER)) + return (NULL); + + se = malloc (sizeof (*se)); + if (se == NULL) + return (NULL); memset (se, 0, sizeof (*se)); - se->type = SOCKENT_TYPE_CLIENT; + se->type = type; se->node = NULL; se->service = NULL; se->interface = 0; @@ -1966,7 +2021,6 @@ static int sockent_init (sockent_t *se, int type) /* {{{ */ if (type == SOCKENT_TYPE_SERVER) { - se->type = SOCKENT_TYPE_SERVER; se->data.server.fd = NULL; #if HAVE_LIBGCRYPT se->data.server.security_level = SECURITY_LEVEL_NONE; @@ -1979,6 +2033,8 @@ static int sockent_init (sockent_t *se, int type) /* {{{ */ { se->data.client.fd = -1; se->data.client.addr = NULL; + se->data.client.resolve_interval = 0; + se->data.client.next_resolve_reconnect = 0; #if HAVE_LIBGCRYPT se->data.client.security_level = SECURITY_LEVEL_NONE; se->data.client.username = NULL; @@ -1987,28 +2043,18 @@ static int sockent_init (sockent_t *se, int type) /* {{{ */ #endif } - return (0); -} /* }}} int sockent_init */ + return (se); +} /* }}} sockent_t *sockent_create */ -/* Open the file descriptors for a initialized sockent structure. */ -static int sockent_open (sockent_t *se) /* {{{ */ +static int sockent_init_crypto (sockent_t *se) /* {{{ */ { - struct addrinfo ai_hints; - struct addrinfo *ai_list, *ai_ptr; - int ai_return; - - const char *node; - const char *service; - - if (se == NULL) - return (-1); - - /* Set up the security structures. */ #if HAVE_LIBGCRYPT /* {{{ */ if (se->type == SOCKENT_TYPE_CLIENT) { if (se->data.client.security_level > SECURITY_LEVEL_NONE) { + network_init_gcrypt (); + if ((se->data.client.username == NULL) || (se->data.client.password == NULL)) { @@ -2027,6 +2073,8 @@ static int sockent_open (sockent_t *se) /* {{{ */ { if (se->data.server.security_level > SECURITY_LEVEL_NONE) { + network_init_gcrypt (); + if (se->data.server.auth_file == NULL) { ERROR ("network plugin: Server socket with " @@ -2050,13 +2098,150 @@ static int sockent_open (sockent_t *se) /* {{{ */ } #endif /* }}} HAVE_LIBGCRYPT */ + return (0); +} /* }}} int sockent_init_crypto */ + +static int sockent_client_disconnect (sockent_t *se) /* {{{ */ +{ + struct sockent_client *client; + + if ((se == NULL) || (se->type != SOCKENT_TYPE_CLIENT)) + return (EINVAL); + + client = &se->data.client; + if (client->fd >= 0) /* connected */ + { + close (client->fd); + client->fd = -1; + } + + sfree (client->addr); + client->addrlen = 0; + + return (0); +} /* }}} int sockent_client_disconnect */ + +static int sockent_client_connect (sockent_t *se) /* {{{ */ +{ + static c_complain_t complaint = C_COMPLAIN_INIT_STATIC; + + struct sockent_client *client; + struct addrinfo ai_hints; + struct addrinfo *ai_list = NULL, *ai_ptr; + int status; + _Bool reconnect = 0; + cdtime_t now; + + if ((se == NULL) || (se->type != SOCKENT_TYPE_CLIENT)) + return (EINVAL); + + client = &se->data.client; + + now = cdtime (); + if (client->resolve_interval != 0 && client->next_resolve_reconnect < now) { + DEBUG("network plugin: Reconnecting socket, resolve_interval = %lf, next_resolve_reconnect = %lf", + CDTIME_T_TO_DOUBLE(client->resolve_interval), CDTIME_T_TO_DOUBLE(client->next_resolve_reconnect)); + reconnect = 1; + } + + if (client->fd >= 0 && !reconnect) /* already connected and not stale*/ + return (0); + + memset (&ai_hints, 0, sizeof (ai_hints)); +#ifdef AI_ADDRCONFIG + ai_hints.ai_flags |= AI_ADDRCONFIG; +#endif + ai_hints.ai_family = AF_UNSPEC; + ai_hints.ai_socktype = SOCK_DGRAM; + ai_hints.ai_protocol = IPPROTO_UDP; + + status = getaddrinfo (se->node, + (se->service != NULL) ? se->service : NET_DEFAULT_PORT, + &ai_hints, &ai_list); + if (status != 0) + { + c_complain (LOG_ERR, &complaint, + "network plugin: getaddrinfo (%s, %s) failed: %s", + (se->node == NULL) ? "(null)" : se->node, + (se->service == NULL) ? "(null)" : se->service, + gai_strerror (status)); + return (-1); + } + else + { + c_release (LOG_NOTICE, &complaint, + "network plugin: Successfully resolved \"%s\".", + se->node); + } + + for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) + { + if (client->fd >= 0) /* when we reconnect */ + sockent_client_disconnect(se); + + client->fd = socket (ai_ptr->ai_family, + ai_ptr->ai_socktype, + ai_ptr->ai_protocol); + if (client->fd < 0) + { + char errbuf[1024]; + ERROR ("network plugin: socket(2) failed: %s", + sstrerror (errno, errbuf, + sizeof (errbuf))); + continue; + } + + client->addr = malloc (sizeof (*client->addr)); + if (client->addr == NULL) + { + ERROR ("network plugin: malloc failed."); + close (client->fd); + client->fd = -1; + continue; + } + + memset (client->addr, 0, sizeof (*client->addr)); + assert (sizeof (*client->addr) >= ai_ptr->ai_addrlen); + memcpy (client->addr, ai_ptr->ai_addr, ai_ptr->ai_addrlen); + client->addrlen = ai_ptr->ai_addrlen; + + network_set_ttl (se, ai_ptr); + network_set_interface (se, ai_ptr); + + /* We don't open more than one write-socket per + * node/service pair.. */ + break; + } + + freeaddrinfo (ai_list); + if (client->fd < 0) + return (-1); + + if (client->resolve_interval > 0) + client->next_resolve_reconnect = now + client->resolve_interval; + return (0); +} /* }}} int sockent_client_connect */ + +/* Open the file descriptors for a initialized sockent structure. */ +static int sockent_server_listen (sockent_t *se) /* {{{ */ +{ + struct addrinfo ai_hints; + struct addrinfo *ai_list, *ai_ptr; + int status; + + const char *node; + const char *service; + + if (se == NULL) + return (-1); + node = se->node; service = se->service; if (service == NULL) service = NET_DEFAULT_PORT; - DEBUG ("network plugin: sockent_open: node = %s; service = %s;", + DEBUG ("network plugin: sockent_server_listen: node = %s; service = %s;", node, service); memset (&ai_hints, 0, sizeof (ai_hints)); @@ -2071,109 +2256,59 @@ static int sockent_open (sockent_t *se) /* {{{ */ ai_hints.ai_socktype = SOCK_DGRAM; ai_hints.ai_protocol = IPPROTO_UDP; - ai_return = getaddrinfo (node, service, &ai_hints, &ai_list); - if (ai_return != 0) + status = getaddrinfo (node, service, &ai_hints, &ai_list); + if (status != 0) { ERROR ("network plugin: getaddrinfo (%s, %s) failed: %s", (se->node == NULL) ? "(null)" : se->node, (se->service == NULL) ? "(null)" : se->service, - gai_strerror (ai_return)); + gai_strerror (status)); return (-1); } for (ai_ptr = ai_list; ai_ptr != NULL; ai_ptr = ai_ptr->ai_next) { - int status; + int *tmp; - if (se->type == SOCKENT_TYPE_SERVER) /* {{{ */ + tmp = realloc (se->data.server.fd, + sizeof (*tmp) * (se->data.server.fd_num + 1)); + if (tmp == NULL) { - int *tmp; - - tmp = realloc (se->data.server.fd, - sizeof (*tmp) * (se->data.server.fd_num + 1)); - if (tmp == NULL) - { - ERROR ("network plugin: realloc failed."); - continue; - } - se->data.server.fd = tmp; - tmp = se->data.server.fd + se->data.server.fd_num; - - *tmp = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, - ai_ptr->ai_protocol); - if (*tmp < 0) - { - char errbuf[1024]; - ERROR ("network plugin: socket(2) failed: %s", - sstrerror (errno, errbuf, - sizeof (errbuf))); - continue; - } - - status = network_bind_socket (*tmp, ai_ptr, se->interface); - if (status != 0) - { - close (*tmp); - *tmp = -1; - continue; - } - - se->data.server.fd_num++; + ERROR ("network plugin: realloc failed."); continue; - } /* }}} if (se->type == SOCKENT_TYPE_SERVER) */ - else /* if (se->type == SOCKENT_TYPE_CLIENT) {{{ */ - { - se->data.client.fd = socket (ai_ptr->ai_family, - ai_ptr->ai_socktype, - ai_ptr->ai_protocol); - if (se->data.client.fd < 0) - { - char errbuf[1024]; - ERROR ("network plugin: socket(2) failed: %s", - sstrerror (errno, errbuf, - sizeof (errbuf))); - continue; - } - - se->data.client.addr = malloc (sizeof (*se->data.client.addr)); - if (se->data.client.addr == NULL) - { - ERROR ("network plugin: malloc failed."); - close (se->data.client.fd); - se->data.client.fd = -1; - continue; - } + } + se->data.server.fd = tmp; + tmp = se->data.server.fd + se->data.server.fd_num; - memset (se->data.client.addr, 0, sizeof (*se->data.client.addr)); - assert (sizeof (*se->data.client.addr) >= ai_ptr->ai_addrlen); - memcpy (se->data.client.addr, ai_ptr->ai_addr, ai_ptr->ai_addrlen); - se->data.client.addrlen = ai_ptr->ai_addrlen; + *tmp = socket (ai_ptr->ai_family, ai_ptr->ai_socktype, + ai_ptr->ai_protocol); + if (*tmp < 0) + { + char errbuf[1024]; + ERROR ("network plugin: socket(2) failed: %s", + sstrerror (errno, errbuf, + sizeof (errbuf))); + continue; + } - network_set_ttl (se, ai_ptr); - network_set_interface (se, ai_ptr); + status = network_bind_socket (*tmp, ai_ptr, se->interface); + if (status != 0) + { + close (*tmp); + *tmp = -1; + continue; + } - /* We don't open more than one write-socket per - * node/service pair.. */ - break; - } /* }}} if (se->type == SOCKENT_TYPE_CLIENT) */ + se->data.server.fd_num++; + continue; } /* for (ai_list) */ freeaddrinfo (ai_list); - /* Check if all went well. */ - if (se->type == SOCKENT_TYPE_SERVER) - { - if (se->data.server.fd_num <= 0) - return (-1); - } - else /* if (se->type == SOCKENT_TYPE_CLIENT) */ - { - if (se->data.client.fd < 0) - return (-1); - } - + if (se->data.server.fd_num <= 0) + return (-1); return (0); -} /* }}} int sockent_open */ +} /* }}} int sockent_server_listen */ /* Add a sockent to the global list of sockets */ static int sockent_add (sockent_t *se) /* {{{ */ @@ -2441,26 +2576,32 @@ static void network_init_buffer (void) memset (&send_buffer_vl, 0, sizeof (send_buffer_vl)); } /* int network_init_buffer */ -static void networt_send_buffer_plain (const sockent_t *se, /* {{{ */ +static void networt_send_buffer_plain (sockent_t *se, /* {{{ */ const char *buffer, size_t buffer_size) { int status; while (42) { + status = sockent_client_connect (se); + if (status != 0) + return; + status = sendto (se->data.client.fd, buffer, buffer_size, - /* flags = */ 0, - (struct sockaddr *) se->data.client.addr, - se->data.client.addrlen); - if (status < 0) + /* flags = */ 0, + (struct sockaddr *) se->data.client.addr, + se->data.client.addrlen); + if (status < 0) { char errbuf[1024]; - if (errno == EINTR) + + if ((errno == EINTR) || (errno == EAGAIN)) continue; - ERROR ("network plugin: sendto failed: %s", - sstrerror (errno, errbuf, - sizeof (errbuf))); - break; + + ERROR ("network plugin: sendto failed: %s. Closing sending socket.", + sstrerror (errno, errbuf, sizeof (errbuf))); + sockent_client_disconnect (se); + return; } break; @@ -2473,7 +2614,7 @@ static void networt_send_buffer_plain (const sockent_t *se, /* {{{ */ buffer_offset += (s); \ } while (0) -static void networt_send_buffer_signed (const sockent_t *se, /* {{{ */ +static void networt_send_buffer_signed (sockent_t *se, /* {{{ */ const char *in_buffer, size_t in_buffer_size) { part_signature_sha256_t ps; @@ -2667,7 +2808,7 @@ static int add_to_buffer (char *buffer, int buffer_size, /* {{{ */ if (vl_def->time != vl->time) { - if (write_part_number (&buffer, &buffer_size, TYPE_TIME, + if (write_part_number (&buffer, &buffer_size, TYPE_TIME_HR, (uint64_t) vl->time)) return (-1); vl_def->time = vl->time; @@ -2675,7 +2816,7 @@ static int add_to_buffer (char *buffer, int buffer_size, /* {{{ */ if (vl_def->interval != vl->interval) { - if (write_part_number (&buffer, &buffer_size, TYPE_INTERVAL, + if (write_part_number (&buffer, &buffer_size, TYPE_INTERVAL_HR, (uint64_t) vl->interval)) return (-1); vl_def->interval = vl->interval; @@ -2859,6 +3000,10 @@ static int network_config_set_ttl (const oconfig_item_t *ci) /* {{{ */ tmp = (int) ci->values[0].value.number; if ((tmp > 0) && (tmp <= 255)) network_config_ttl = tmp; + else { + WARNING ("network plugin: The `TimeToLive' must be between 1 and 255."); + return (-1); + } return (0); } /* }}} int network_config_set_ttl */ @@ -2969,13 +3114,12 @@ static int network_config_add_listen (const oconfig_item_t *ci) /* {{{ */ return (-1); } - se = malloc (sizeof (*se)); + se = sockent_create (SOCKENT_TYPE_SERVER); if (se == NULL) { - ERROR ("network plugin: malloc failed."); + ERROR ("network plugin: sockent_create failed."); return (-1); } - sockent_init (se, SOCKENT_TYPE_SERVER); se->node = strdup (ci->values[0].value.string); if (ci->values_num >= 2) @@ -3015,10 +3159,18 @@ static int network_config_add_listen (const oconfig_item_t *ci) /* {{{ */ } #endif /* HAVE_LIBGCRYPT */ - status = sockent_open (se); + status = sockent_init_crypto (se); + if (status != 0) + { + ERROR ("network plugin: network_config_add_listen: sockent_init_crypto() failed."); + sockent_destroy (se); + return (-1); + } + + status = sockent_server_listen (se); if (status != 0) { - ERROR ("network plugin: network_config_add_listen: sockent_open failed."); + ERROR ("network plugin: network_config_add_server: sockent_server_listen failed."); sockent_destroy (se); return (-1); } @@ -3049,13 +3201,12 @@ static int network_config_add_server (const oconfig_item_t *ci) /* {{{ */ return (-1); } - se = malloc (sizeof (*se)); + se = sockent_create (SOCKENT_TYPE_CLIENT); if (se == NULL) { - ERROR ("network plugin: malloc failed."); + ERROR ("network plugin: sockent_create failed."); return (-1); } - sockent_init (se, SOCKENT_TYPE_CLIENT); se->node = strdup (ci->values[0].value.string); if (ci->values_num >= 2) @@ -3078,6 +3229,8 @@ static int network_config_add_server (const oconfig_item_t *ci) /* {{{ */ if (strcasecmp ("Interface", child->key) == 0) network_config_set_interface (child, &se->interface); + else if (strcasecmp ("ResolveInterval", child->key) == 0) + cf_util_get_cdtime(child, &se->data.client.resolve_interval); else { WARNING ("network plugin: Option `%s' is not allowed here.", @@ -3098,14 +3251,17 @@ static int network_config_add_server (const oconfig_item_t *ci) /* {{{ */ } #endif /* HAVE_LIBGCRYPT */ - status = sockent_open (se); + status = sockent_init_crypto (se); if (status != 0) { - ERROR ("network plugin: network_config_add_server: sockent_open failed."); + ERROR ("network plugin: network_config_add_server: sockent_init_crypto() failed."); sockent_destroy (se); return (-1); } + /* No call to sockent_client_connect() here -- it is called from + * networt_send_buffer_plain(). */ + status = sockent_add (se); if (status != 0) { @@ -3121,6 +3277,14 @@ static int network_config (oconfig_item_t *ci) /* {{{ */ { int i; + /* The options need to be applied first */ + for (i = 0; i < ci->children_num; i++) + { + oconfig_item_t *child = ci->children + i; + if (strcasecmp ("TimeToLive", child->key) == 0) + network_config_set_ttl (child); + } + for (i = 0; i < ci->children_num; i++) { oconfig_item_t *child = ci->children + i; @@ -3129,16 +3293,15 @@ static int network_config (oconfig_item_t *ci) /* {{{ */ network_config_add_listen (child); else if (strcasecmp ("Server", child->key) == 0) network_config_add_server (child); - else if (strcasecmp ("TimeToLive", child->key) == 0) - network_config_set_ttl (child); + else if (strcasecmp ("TimeToLive", child->key) == 0) { + /* Handled earlier */ + } else if (strcasecmp ("MaxPacketSize", child->key) == 0) network_config_set_buffer_size (child); else if (strcasecmp ("Forward", child->key) == 0) network_config_set_boolean (child, &network_config_forward); else if (strcasecmp ("ReportStats", child->key) == 0) network_config_set_boolean (child, &network_config_stats); - else if (strcasecmp ("CacheFlush", child->key) == 0) - /* no op for backwards compatibility only */; else { WARNING ("network plugin: Option `%s' is not allowed here.", @@ -3162,7 +3325,7 @@ static int network_notification (const notification_t *n, memset (buffer, 0, sizeof (buffer)); - status = write_part_number (&buffer_ptr, &buffer_free, TYPE_TIME, + status = write_part_number (&buffer_ptr, &buffer_free, TYPE_TIME_HR, (uint64_t) n->time); if (status != 0) return (-1); @@ -3225,6 +3388,8 @@ static int network_notification (const notification_t *n, static int network_shutdown (void) { + sockent_t *se; + listen_loop++; /* Kill the listening thread */ @@ -3255,7 +3420,9 @@ static int network_shutdown (void) sfree (send_buffer); - /* TODO: Close `sending_sockets' */ + for (se = sending_sockets; se != NULL; se = se->next) + sockent_client_disconnect (se); + sockent_destroy (sending_sockets); plugin_unregister_config ("network"); plugin_unregister_init ("network"); @@ -3267,15 +3434,15 @@ static int network_shutdown (void) static int network_stats_read (void) /* {{{ */ { - uint64_t copy_octets_rx; - uint64_t copy_octets_tx; - uint64_t copy_packets_rx; - uint64_t copy_packets_tx; - uint64_t copy_values_dispatched; - uint64_t copy_values_not_dispatched; - uint64_t copy_values_sent; - uint64_t copy_values_not_sent; - uint64_t copy_receive_list_length; + derive_t copy_octets_rx; + derive_t copy_octets_tx; + derive_t copy_packets_rx; + derive_t copy_packets_tx; + derive_t copy_values_dispatched; + derive_t copy_values_not_dispatched; + derive_t copy_values_sent; + derive_t copy_values_not_sent; + derive_t copy_receive_list_length; value_list_t vl = VALUE_LIST_INIT; value_t values[2]; @@ -3293,21 +3460,20 @@ static int network_stats_read (void) /* {{{ */ vl.values = values; vl.values_len = 2; vl.time = 0; - vl.interval = interval_g; sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "network", sizeof (vl.plugin)); /* Octets received / sent */ - vl.values[0].counter = (counter_t) copy_octets_rx; - vl.values[1].counter = (counter_t) copy_octets_tx; + vl.values[0].derive = (derive_t) copy_octets_rx; + vl.values[1].derive = (derive_t) copy_octets_tx; sstrncpy (vl.type, "if_octets", sizeof (vl.type)); - plugin_dispatch_values_secure (&vl); + plugin_dispatch_values (&vl); /* Packets received / send */ - vl.values[0].counter = (counter_t) copy_packets_rx; - vl.values[1].counter = (counter_t) copy_packets_tx; + vl.values[0].derive = (derive_t) copy_packets_rx; + vl.values[1].derive = (derive_t) copy_packets_tx; sstrncpy (vl.type, "if_packets", sizeof (vl.type)); - plugin_dispatch_values_secure (&vl); + plugin_dispatch_values (&vl); /* Values (not) dispatched and (not) send */ sstrncpy (vl.type, "total_values", sizeof (vl.type)); @@ -3316,54 +3482,44 @@ static int network_stats_read (void) /* {{{ */ vl.values[0].derive = (derive_t) copy_values_dispatched; sstrncpy (vl.type_instance, "dispatch-accepted", sizeof (vl.type_instance)); - plugin_dispatch_values_secure (&vl); + plugin_dispatch_values (&vl); vl.values[0].derive = (derive_t) copy_values_not_dispatched; sstrncpy (vl.type_instance, "dispatch-rejected", sizeof (vl.type_instance)); - plugin_dispatch_values_secure (&vl); + plugin_dispatch_values (&vl); vl.values[0].derive = (derive_t) copy_values_sent; sstrncpy (vl.type_instance, "send-accepted", sizeof (vl.type_instance)); - plugin_dispatch_values_secure (&vl); + plugin_dispatch_values (&vl); vl.values[0].derive = (derive_t) copy_values_not_sent; sstrncpy (vl.type_instance, "send-rejected", sizeof (vl.type_instance)); - plugin_dispatch_values_secure (&vl); + plugin_dispatch_values (&vl); /* Receive queue length */ vl.values[0].gauge = (gauge_t) copy_receive_list_length; sstrncpy (vl.type, "queue_length", sizeof (vl.type)); vl.type_instance[0] = 0; - plugin_dispatch_values_secure (&vl); + plugin_dispatch_values (&vl); return (0); } /* }}} int network_stats_read */ static int network_init (void) { - static _Bool have_init = false; + static _Bool have_init = 0; /* Check if we were already initialized. If so, just return - there's * nothing more to do (for now, that is). */ if (have_init) return (0); - have_init = true; + have_init = 1; #if HAVE_LIBGCRYPT - /* http://lists.gnupg.org/pipermail/gcrypt-devel/2003-August/000458.html - * Because you can't know in a library whether another library has - * already initialized the library - */ - if (!gcry_control (GCRYCTL_ANY_INITIALIZATION_P)) - { - gcry_check_version(NULL); /* before calling any other functions */ - gcry_control (GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); - gcry_control (GCRYCTL_INIT_SECMEM, 32768, 0); - gcry_control (GCRYCTL_INITIALIZATION_FINISHED, 0); - } + network_init_gcrypt (); #endif if (network_config_stats != 0) @@ -3397,7 +3553,7 @@ static int network_init (void) if (dispatch_thread_running == 0) { int status; - status = pthread_create (&dispatch_thread_id, + status = plugin_thread_create (&dispatch_thread_id, NULL /* no attributes */, dispatch_thread, NULL /* no argument */); @@ -3417,7 +3573,7 @@ static int network_init (void) if (receive_thread_running == 0) { int status; - status = pthread_create (&receive_thread_id, + status = plugin_thread_create (&receive_thread_id, NULL /* no attributes */, receive_thread, NULL /* no argument */); @@ -3444,9 +3600,9 @@ static int network_init (void) * just send the buffer if `flush' is called - if the requested value was in * there, good. If not, well, then there is nothing to flush.. -octo */ -static int network_flush (int timeout, - const char __attribute__((unused)) *identifier, - user_data_t __attribute__((unused)) *user_data) +static int network_flush (__attribute__((unused)) cdtime_t timeout, + __attribute__((unused)) const char *identifier, + __attribute__((unused)) user_data_t *user_data) { pthread_mutex_lock (&send_buffer_lock);