X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=src%2Fopenvpn.c;h=50670c5313f78148402770f5c6cdd749faec2705;hb=5917eb3d38171296d021351aba4e2601c8819bb7;hp=65440d5cffa21f5f39db8766d3cbef6407a4e950;hpb=c1219a1c9db2e8400e2ee94b87f86ccd441485d5;p=collectd.git diff --git a/src/openvpn.c b/src/openvpn.c index 65440d5c..50670c53 100644 --- a/src/openvpn.c +++ b/src/openvpn.c @@ -26,12 +26,14 @@ **/ #include "collectd.h" + #include "common.h" #include "plugin.h" #define V1STRING "Common Name,Real Address,Bytes Received,Bytes Sent,Connected Since\n" #define V2STRING "HEADER,CLIENT_LIST,Common Name,Real Address,Virtual Address,Bytes Received,Bytes Sent,Connected Since,Connected Since (time_t)\n" #define V3STRING "HEADER CLIENT_LIST Common Name Real Address Virtual Address Bytes Received Bytes Sent Connected Since Connected Since (time_t)\n" +#define V4STRING "HEADER,CLIENT_LIST,Common Name,Real Address,Virtual Address,Bytes Received,Bytes Sent,Connected Since,Connected Since (time_t),Username\n" #define VSSTRING "OpenVPN STATISTICS\n" @@ -43,6 +45,7 @@ struct vpn_status_s MULTI1 = 1, /* status-version 1 */ MULTI2, /* status-version 2 */ MULTI3, /* status-version 3 */ + MULTI4, /* status-version 4 */ SINGLE = 10 /* currently no versions for single mode, maybe in the future */ } version; char *name; @@ -93,16 +96,13 @@ static int openvpn_strsplit (char *string, char **fields, size_t size) } /* int openvpn_strsplit */ /* dispatches number of users */ -static void numusers_submit (char *pinst, char *tinst, gauge_t value) +static void numusers_submit (const char *pinst, const char *tinst, + gauge_t value) { - value_t values[1]; value_list_t vl = VALUE_LIST_INIT; - values[0].gauge = value; - - vl.values = values; - vl.values_len = STATIC_ARRAY_SIZE (values); - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); + vl.values = &(value_t) { .gauge = value }; + vl.values_len = 1; sstrncpy (vl.plugin, "openvpn", sizeof (vl.plugin)); sstrncpy (vl.type, "users", sizeof (vl.type)); if (pinst != NULL) @@ -113,14 +113,16 @@ static void numusers_submit (char *pinst, char *tinst, gauge_t value) plugin_dispatch_values (&vl); } /* void numusers_submit */ -/* dispatches stats about traffic (TCP or UDP) generated by the tunnel per single endpoint */ -static void iostats_submit (char *pinst, char *tinst, derive_t rx, derive_t tx) +/* dispatches stats about traffic (TCP or UDP) generated by the tunnel + * per single endpoint */ +static void iostats_submit (const char *pinst, const char *tinst, + derive_t rx, derive_t tx) { - value_t values[2]; value_list_t vl = VALUE_LIST_INIT; - - values[0].derive = rx; - values[1].derive = tx; + value_t values[] = { + { .derive = rx }, + { .derive = tx }, + }; /* NOTE ON THE NEW NAMING SCHEMA: * using plugin_instance to identify each vpn config (and @@ -130,7 +132,6 @@ static void iostats_submit (char *pinst, char *tinst, derive_t rx, derive_t tx) vl.values = values; vl.values_len = STATIC_ARRAY_SIZE (values); - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "openvpn", sizeof (vl.plugin)); if (pinst != NULL) sstrncpy (vl.plugin_instance, pinst, @@ -143,18 +144,17 @@ static void iostats_submit (char *pinst, char *tinst, derive_t rx, derive_t tx) } /* void traffic_submit */ /* dispatches stats about data compression shown when in single mode */ -static void compression_submit (char *pinst, char *tinst, +static void compression_submit (const char *pinst, const char *tinst, derive_t uncompressed, derive_t compressed) { - value_t values[2]; value_list_t vl = VALUE_LIST_INIT; - - values[0].derive = uncompressed; - values[1].derive = compressed; + value_t values[] = { + { .derive = uncompressed }, + { .derive = compressed }, + }; vl.values = values; vl.values_len = STATIC_ARRAY_SIZE (values); - sstrncpy (vl.host, hostname_g, sizeof (vl.host)); sstrncpy (vl.plugin, "openvpn", sizeof (vl.plugin)); if (pinst != NULL) sstrncpy (vl.plugin_instance, pinst, @@ -166,7 +166,7 @@ static void compression_submit (char *pinst, char *tinst, plugin_dispatch_values (&vl); } /* void compression_submit */ -static int single_read (char *name, FILE *fh) +static int single_read (const char *name, FILE *fh) { char buffer[1024]; char *fields[4]; @@ -259,7 +259,7 @@ static int single_read (char *name, FILE *fh) } /* int single_read */ /* for reading status version 1 */ -static int multi1_read (char *name, FILE *fh) +static int multi1_read (const char *name, FILE *fh) { char buffer[1024]; char *fields[10]; @@ -322,7 +322,7 @@ static int multi1_read (char *name, FILE *fh) } /* int multi1_read */ /* for reading status version 2 */ -static int multi2_read (char *name, FILE *fh) +static int multi2_read (const char *name, FILE *fh) { char buffer[1024]; char *fields[10]; @@ -384,7 +384,7 @@ static int multi2_read (char *name, FILE *fh) } /* int multi2_read */ /* for reading status version 3 */ -static int multi3_read (char *name, FILE *fh) +static int multi3_read (const char *name, FILE *fh) { char buffer[1024]; char *fields[15]; @@ -448,17 +448,86 @@ static int multi3_read (char *name, FILE *fh) return (read); } /* int multi3_read */ +/* for reading status version 4 */ +static int multi4_read (const char *name, FILE *fh) +{ + char buffer[1024]; + char *fields[11]; + const int max_fields = STATIC_ARRAY_SIZE (fields); + int fields_num, read = 0; + long long sum_users = 0; + + while (fgets (buffer, sizeof (buffer), fh) != NULL) + { + fields_num = openvpn_strsplit (buffer, fields, max_fields); + + /* status file is generated by openvpn/multi.c:multi_print_status() + * http://svn.openvpn.net/projects/openvpn/trunk/openvpn/multi.c + * + * The line we're expecting has 9 fields. We ignore all lines + * with more or less fields. + */ + if (fields_num != 9) + continue; + + + if (strcmp (fields[0], "CLIENT_LIST") != 0) + continue; + + + if (collect_user_count) + /* If so, sum all users, ignore the individuals*/ + { + sum_users += 1; + } + if (collect_individual_users) + { + if (new_naming_schema) + { + /* plugin inst = file name, type inst = fields[1] */ + iostats_submit (name, /* vpn instance */ + fields[1], /* "Common Name" */ + atoll (fields[4]), /* "Bytes Received" */ + atoll (fields[5])); /* "Bytes Sent" */ + } + else + { + /* plugin inst = fields[1], type inst = "" */ + iostats_submit (fields[1], /* "Common Name" */ + NULL, /* unused when in multimode */ + atoll (fields[4]), /* "Bytes Received" */ + atoll (fields[5])); /* "Bytes Sent" */ + } + } + + read = 1; + } + + if (collect_user_count) + { + numusers_submit(name, name, sum_users); + read = 1; + } + + return (read); +} /* int multi4_read */ + /* read callback */ static int openvpn_read (void) { FILE *fh; - int i, read; + int read; read = 0; + + if (vpn_num == 0) + return (0); /* call the right read function for every status entry in the list */ - for (i = 0; i < vpn_num; i++) + for (int i = 0; i < vpn_num; i++) { + int vpn_read = 0; + fh = fopen (vpn_list[i]->file, "r"); if (fh == NULL) { @@ -472,23 +541,28 @@ static int openvpn_read (void) switch (vpn_list[i]->version) { case SINGLE: - read = single_read(vpn_list[i]->name, fh); + vpn_read = single_read(vpn_list[i]->name, fh); break; case MULTI1: - read = multi1_read(vpn_list[i]->name, fh); + vpn_read = multi1_read(vpn_list[i]->name, fh); break; case MULTI2: - read = multi2_read(vpn_list[i]->name, fh); + vpn_read = multi2_read(vpn_list[i]->name, fh); break; case MULTI3: - read = multi3_read(vpn_list[i]->name, fh); + vpn_read = multi3_read(vpn_list[i]->name, fh); + break; + + case MULTI4: + vpn_read = multi4_read(vpn_list[i]->name, fh); break; } fclose (fh); + read += vpn_read; } return (read ? 0 : -1); @@ -545,6 +619,13 @@ static int version_detect (const char *filename) version = MULTI3; break; } + /* searching for multi version 4 */ + else if (strcmp (buffer, V4STRING) == 0) + { + DEBUG ("openvpn plugin: found status file version MULTI4"); + version = MULTI4; + break; + } } if (version == 0) @@ -567,7 +648,7 @@ static int openvpn_config (const char *key, const char *value) if (strcasecmp ("StatusFile", key) == 0) { char *status_file, *status_name, *filename; - int status_version, i; + int status_version; vpn_status_t *temp; /* try to detect the status file format */ @@ -575,8 +656,8 @@ static int openvpn_config (const char *key, const char *value) if (status_version == 0) { - WARNING ("openvpn plugin: unable to detect status version, \ - discarding status file \"%s\".", value); + WARNING ("openvpn plugin: unable to detect status version, " + "discarding status file \"%s\".", value); return (1); } @@ -603,7 +684,7 @@ static int openvpn_config (const char *key, const char *value) } /* scan the list looking for a clone */ - for (i = 0; i < vpn_num; i++) + for (int i = 0; i < vpn_num; i++) { if (strcasecmp (vpn_list[i]->name, status_name) == 0) { @@ -616,7 +697,7 @@ static int openvpn_config (const char *key, const char *value) } /* create a new vpn element since file, version and name are ok */ - temp = (vpn_status_t *) malloc (sizeof (vpn_status_t)); + temp = malloc (sizeof (*temp)); if (temp == NULL) { char errbuf[1024]; @@ -629,17 +710,19 @@ static int openvpn_config (const char *key, const char *value) temp->version = status_version; temp->name = status_name; - vpn_list = (vpn_status_t **) realloc (vpn_list, (vpn_num + 1) * sizeof (vpn_status_t *)); - if (vpn_list == NULL) + vpn_status_t **tmp_list = realloc (vpn_list, (vpn_num + 1) * sizeof (*vpn_list)); + if (tmp_list == NULL) { char errbuf[1024]; ERROR ("openvpn plugin: realloc failed: %s", sstrerror (errno, errbuf, sizeof (errbuf))); + sfree (vpn_list); sfree (temp->file); sfree (temp); return (1); } + vpn_list = tmp_list; vpn_list[vpn_num] = temp; vpn_num++; @@ -692,9 +775,7 @@ static int openvpn_config (const char *key, const char *value) /* shutdown callback */ static int openvpn_shutdown (void) { - int i; - - for (i = 0; i < vpn_num; i++) + for (int i = 0; i < vpn_num; i++) { sfree (vpn_list[i]->file); sfree (vpn_list[i]);