X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fascent.c;h=ca0fac7fb7ad37a8c323bc386c71628f5a35e208;hb=9d2c4f87ab2ae4a4749dc48eabb0b780ecdd0a99;hp=6285176a9a6b9e7406d1bc5b47fdfd4a9e2e8770;hpb=d3fc6d0831a63af2e96300f488a9f8f5fc3183fb;p=collectd.git diff --git a/src/ascent.c b/src/ascent.c index 6285176a..ca0fac7f 100644 --- a/src/ascent.c +++ b/src/ascent.c @@ -1,22 +1,27 @@ /** * collectd - src/ascent.c - * Copyright (C) 2008 Florian octo Forster + * 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. * * Authors: - * Florian octo Forster + * Florian octo Forster **/ #include "collectd.h" @@ -126,7 +131,6 @@ static int ascent_submit_gauge (const char *plugin_instance, /* {{{ */ vl.values = values; vl.values_len = 1; - vl.time = time (NULL); sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "ascent", sizeof (vl.plugin)); @@ -144,7 +148,7 @@ static int ascent_submit_gauge (const char *plugin_instance, /* {{{ */ } /* }}} int ascent_submit_gauge */ static size_t ascent_curl_callback (void *buf, size_t size, size_t nmemb, /* {{{ */ - void *stream) + void __attribute__((unused)) *stream) { size_t len = size * nmemb; @@ -175,7 +179,7 @@ static size_t ascent_curl_callback (void *buf, size_t size, size_t nmemb, /* {{{ static int ascent_submit_players (player_stats_t *ps) /* {{{ */ { - int i; + size_t i; gauge_t value; for (i = 0; i < RACES_LIST_LENGTH; i++) @@ -214,7 +218,7 @@ static int ascent_account_player (player_stats_t *ps, /* {{{ */ { if (pi->race >= 0) { - if ((pi->race >= RACES_LIST_LENGTH) + if (((size_t) pi->race >= RACES_LIST_LENGTH) || (races_list[pi->race] == NULL)) ERROR ("ascent plugin: Ignoring invalid numeric race %i.", pi->race); else @@ -223,7 +227,7 @@ static int ascent_account_player (player_stats_t *ps, /* {{{ */ if (pi->class >= 0) { - if ((pi->class >= CLASSES_LIST_LENGTH) + if (((size_t) pi->class >= CLASSES_LIST_LENGTH) || (classes_list[pi->class] == NULL)) ERROR ("ascent plugin: Ignoring invalid numeric class %i.", pi->class); else @@ -232,7 +236,7 @@ static int ascent_account_player (player_stats_t *ps, /* {{{ */ if (pi->gender >= 0) { - if ((pi->gender >= GENDERS_LIST_LENGTH) + if (((size_t) pi->gender >= GENDERS_LIST_LENGTH) || (genders_list[pi->gender] == NULL)) ERROR ("ascent plugin: Ignoring invalid numeric gender %i.", pi->gender); @@ -540,8 +544,9 @@ static int ascent_init (void) /* {{{ */ return (-1); } + curl_easy_setopt (curl, CURLOPT_NOSIGNAL, 1L); curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ascent_curl_callback); - curl_easy_setopt (curl, CURLOPT_USERAGENT, PACKAGE_NAME"/"PACKAGE_VERSION); + curl_easy_setopt (curl, CURLOPT_USERAGENT, COLLECTD_USERAGENT); curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, ascent_curl_error); if (user != NULL) @@ -550,7 +555,7 @@ static int ascent_init (void) /* {{{ */ status = ssnprintf (credentials, sizeof (credentials), "%s:%s", user, (pass == NULL) ? "" : pass); - if (status >= sizeof (credentials)) + if ((status < 0) || ((size_t) status >= sizeof (credentials))) { ERROR ("ascent plugin: ascent_init: Returning an error because the " "credentials have been truncated."); @@ -561,16 +566,18 @@ static int ascent_init (void) /* {{{ */ } curl_easy_setopt (curl, CURLOPT_URL, url); + curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L); + curl_easy_setopt (curl, CURLOPT_MAXREDIRS, 50L); - if ((verify_peer == NULL) || (strcmp (verify_peer, "true") == 0)) - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1); + if ((verify_peer == NULL) || IS_TRUE (verify_peer)) + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 1L); else - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0); + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYPEER, 0L); - if ((verify_host == NULL) || (strcmp (verify_host, "true") == 0)) - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2); + if ((verify_host == NULL) || IS_TRUE (verify_host)) + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 2L); else - curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0); + curl_easy_setopt (curl, CURLOPT_SSL_VERIFYHOST, 0L); if (cacert != NULL) curl_easy_setopt (curl, CURLOPT_CAINFO, cacert); @@ -595,7 +602,7 @@ static int ascent_read (void) /* {{{ */ } ascent_buffer_fill = 0; - if (curl_easy_perform (curl) != 0) + if (curl_easy_perform (curl) != CURLE_OK) { ERROR ("ascent plugin: curl_easy_perform failed: %s", ascent_curl_error);