X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Futils_cmd_putnotif.c;h=d3cf3834dea42885ff6df3d4695b53bf38d64872;hb=9717b1a55d60d992c16e66e2ae5bdfb42f80aca8;hp=eb7d60bc88657dfb5df94fec66940482c3d7b5c3;hpb=47faf00c18402cefd0e195d63ad48d5e7e6a4a92;p=collectd.git diff --git a/src/utils_cmd_putnotif.c b/src/utils_cmd_putnotif.c index eb7d60bc..8f687fd8 100644 --- a/src/utils_cmd_putnotif.c +++ b/src/utils_cmd_putnotif.c @@ -1,178 +1,182 @@ /** - * collectd - src/utils_cms_putnotif.c - * Copyright (C) 2008 Florian octo Forster + * collectd - src/utils_cmd_putnotif.c + * Copyright (C) 2008 Florian octo Forster * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License as published by the - * Free Software Foundation; only version 2 of the License is applicable. + * 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 so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License along - * with this program; if not, write to the Free Software Foundation, Inc., - * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. * - * Author: - * Florian octo Forster + * Authors: + * Florian octo Forster **/ #include "collectd.h" + #include "common.h" #include "plugin.h" -#define print_to_socket(fh, ...) \ - if (fprintf (fh, __VA_ARGS__) < 0) { \ - char errbuf[1024]; \ - WARNING ("handle_putnotif: failed to write to socket #%i: %s", \ - fileno (fh), sstrerror (errno, errbuf, sizeof (errbuf))); \ - return -1; \ - } - -static int parse_option_severity (notification_t *n, char *value) -{ - if (strcasecmp (value, "Failure") == 0) +#include "utils_cmd_putnotif.h" +#include "utils_parse_option.h" + +#define print_to_socket(fh, ...) \ + do { \ + if (fprintf(fh, __VA_ARGS__) < 0) { \ + char errbuf[1024]; \ + WARNING("handle_putnotif: failed to write to socket #%i: %s", \ + fileno(fh), sstrerror(errno, errbuf, sizeof(errbuf))); \ + return -1; \ + } \ + fflush(fh); \ + } while (0) + +static int set_option_severity(notification_t *n, const char *value) { + if (strcasecmp(value, "Failure") == 0) n->severity = NOTIF_FAILURE; - else if (strcasecmp (value, "Warning") == 0) + else if (strcasecmp(value, "Warning") == 0) n->severity = NOTIF_WARNING; - else if (strcasecmp (value, "Okay") == 0) + else if (strcasecmp(value, "Okay") == 0) n->severity = NOTIF_OKAY; else return (-1); return (0); -} /* int parse_option_severity */ - -static int parse_option_time (notification_t *n, char *value) -{ - time_t tmp; - - tmp = (time_t) atoi (value); - if (tmp <= 0) +} /* int set_option_severity */ + +static int set_option_time(notification_t *n, const char *value) { + char *endptr = NULL; + double tmp; + + errno = 0; + tmp = strtod(value, &endptr); + if ((errno != 0) /* Overflow */ + || (endptr == value) /* Invalid string */ + || (endptr == NULL) /* This should not happen */ + || (*endptr != 0)) /* Trailing chars */ return (-1); - n->time = tmp; + n->time = DOUBLE_TO_CDTIME_T(tmp); return (0); -} /* int parse_option_time */ +} /* int set_option_time */ -static int parse_option (notification_t *n, char *buffer) -{ - char *option = buffer; - char *value; - - if ((n == NULL) || (option == NULL)) +static int set_option(notification_t *n, const char *option, + const char *value) { + if ((n == NULL) || (option == NULL) || (value == NULL)) return (-1); - value = strchr (option, '='); - if (value == NULL) - return (-1); - *value = '\0'; value++; - - if (strcasecmp ("severity", option) == 0) - return (parse_option_severity (n, value)); - else if (strcasecmp ("time", option) == 0) - return (parse_option_time (n, value)); - else if (strcasecmp ("host", option) == 0) - sstrncpy (n->host, value, sizeof (n->host)); - else if (strcasecmp ("plugin", option) == 0) - sstrncpy (n->plugin, value, sizeof (n->plugin)); - else if (strcasecmp ("plugin_instance", option) == 0) - sstrncpy (n->plugin_instance, value, sizeof (n->plugin_instance)); - else if (strcasecmp ("type", option) == 0) - sstrncpy (n->type, value, sizeof (n->type)); - else if (strcasecmp ("type_instance", option) == 0) - sstrncpy (n->type_instance, value, sizeof (n->type_instance)); + DEBUG("utils_cmd_putnotif: set_option (option = %s, value = %s);", option, + value); + + /* Add a meta option in the form: : */ + if (option[0] != '\0' && option[1] == ':') { + /* Refuse empty key */ + if (option[2] == '\0') + return (1); + + if (option[0] == 's') + return plugin_notification_meta_add_string(n, option + 2, value); + else + return (1); + } + + if (strcasecmp("severity", option) == 0) + return (set_option_severity(n, value)); + else if (strcasecmp("time", option) == 0) + return (set_option_time(n, value)); + else if (strcasecmp("message", option) == 0) + sstrncpy(n->message, value, sizeof(n->message)); + else if (strcasecmp("host", option) == 0) + sstrncpy(n->host, value, sizeof(n->host)); + else if (strcasecmp("plugin", option) == 0) + sstrncpy(n->plugin, value, sizeof(n->plugin)); + else if (strcasecmp("plugin_instance", option) == 0) + sstrncpy(n->plugin_instance, value, sizeof(n->plugin_instance)); + else if (strcasecmp("type", option) == 0) + sstrncpy(n->type, value, sizeof(n->type)); + else if (strcasecmp("type_instance", option) == 0) + sstrncpy(n->type_instance, value, sizeof(n->type_instance)); else return (1); return (0); -} /* int parse_option */ +} /* int set_option */ -static int parse_message (notification_t *n, char **fields, int fields_num) -{ +int handle_putnotif(FILE *fh, char *buffer) { + char *command; + notification_t n = {0}; int status; - /* Strip off the leading `message=' */ - fields[0] += strlen ("message="); - - status = strjoin (n->message, sizeof (n->message), fields, fields_num, " "); - if (status < 0) + if ((fh == NULL) || (buffer == NULL)) return (-1); - return (0); -} /* int parse_message */ + DEBUG("utils_cmd_putnotif: handle_putnotif (fh = %p, buffer = %s);", + (void *)fh, buffer); -int handle_putnotif (FILE *fh, char **fields, int fields_num) -{ - notification_t n; - int status; - int i; - - /* Required fields: `PUTNOTIF', severity, time, message */ - if (fields_num < 4) - { - DEBUG ("cmd putnotif: Wrong number of fields: %i", fields_num); - print_to_socket (fh, "-1 Wrong number of fields: Got %i, " - "expected at least 4.\n", - fields_num); + command = NULL; + status = parse_string(&buffer, &command); + if (status != 0) { + print_to_socket(fh, "-1 Cannot parse command.\n"); return (-1); } + assert(command != NULL); - memset (&n, '\0', sizeof (n)); + if (strcasecmp("PUTNOTIF", command) != 0) { + print_to_socket(fh, "-1 Unexpected command: `%s'.\n", command); + return (-1); + } status = 0; - for (i = 1; i < fields_num; i++) - { - if (strncasecmp (fields[i], "message=", strlen ("message=")) == 0) - { - status = parse_message (&n, fields + i, fields_num - i); - if (status != 0) - { - print_to_socket (fh, "-1 Error parsing the message. Have you hit the " - "limit of %u bytes?\n", (unsigned int) sizeof (n.message)); - } + while (*buffer != 0) { + char *key; + char *value; + + status = parse_option(&buffer, &key, &value); + if (status != 0) { + print_to_socket(fh, "-1 Malformed option.\n"); break; } - else - { - status = parse_option (&n, fields[i]); - if (status != 0) - { - print_to_socket (fh, "-1 Error parsing option `%s'\n", fields[i]); - break; - } + + status = set_option(&n, key, value); + if (status != 0) { + print_to_socket(fh, "-1 Error parsing option `%s'\n", key); + break; } } /* for (i) */ /* Check for required fields and complain if anything is missing. */ - if ((status == 0) && (n.severity == 0)) - { - print_to_socket (fh, "-1 Option `severity' missing.\n"); + if ((status == 0) && (n.severity == 0)) { + print_to_socket(fh, "-1 Option `severity' missing.\n"); status = -1; } - if ((status == 0) && (n.time == 0)) - { - print_to_socket (fh, "-1 Option `time' missing.\n"); + if ((status == 0) && (n.time == 0)) { + print_to_socket(fh, "-1 Option `time' missing.\n"); status = -1; } - if ((status == 0) && (strlen (n.message) == 0)) - { - print_to_socket (fh, "-1 No message or message of length 0 given.\n"); + if ((status == 0) && (strlen(n.message) == 0)) { + print_to_socket(fh, "-1 No message or message of length 0 given.\n"); status = -1; } /* If status is still zero the notification is fine and we can finally * dispatch it. */ - if (status == 0) - { - plugin_dispatch_notification (&n); - print_to_socket (fh, "0 Success\n"); + if (status == 0) { + plugin_dispatch_notification(&n); + print_to_socket(fh, "0 Success\n"); } return (0); } /* int handle_putnotif */ - -/* vim: set shiftwidth=2 softtabstop=2 tabstop=8 : */