upstream/monitoring-plugins
1
0
Fork 0
mirror of https://github.com/monitoring-plugins/monitoring-plugins.git synced 2026-04-22 06:36:55 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make extract_value more generic:

Browse source 
Add a separator argument passed using defines.
This commit is contained in:
Thomas Guyot-Sionnest 2009-01-26 02:05:21 -05:00
parent 0a74b6fda0
commit ba132e9e52
4 changed files with 37 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
lib/tests/test_utils.c
View file

@ -172,83 +172,83 @@ main (int argc, char **argv)
test = np_escaped_string("everything");
ok( strcmp(test, "everything") == 0, "everything okay");
/* np_extract_value tests (23) */
test=np_extract_value("foo=bar, bar=foo, foobar=barfoo\n", "foo");
/* np_extract_ntpvar tests (23) */
test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foo");
ok(test && !strcmp(test, "bar"), "1st test as expected");
free(test);
test=np_extract_value("foo=bar,bar=foo,foobar=barfoo\n", "bar");
test=np_extract_ntpvar("foo=bar,bar=foo,foobar=barfoo\n", "bar");
ok(test && !strcmp(test, "foo"), "2nd test as expected");
free(test);
test=np_extract_value("foo=bar, bar=foo, foobar=barfoo\n", "foobar");
test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfoo\n", "foobar");
ok(test && !strcmp(test, "barfoo"), "3rd test as expected");
free(test);
test=np_extract_value("foo=bar\n", "foo");
test=np_extract_ntpvar("foo=bar\n", "foo");
ok(test && !strcmp(test, "bar"), "Single test as expected");
free(test);
test=np_extract_value("foo=bar, bar=foo, foobar=barfooi\n", "abcd");
test=np_extract_ntpvar("foo=bar, bar=foo, foobar=barfooi\n", "abcd");
ok(!test, "Key not found 1");
test=np_extract_value("foo=bar\n", "abcd");
test=np_extract_ntpvar("foo=bar\n", "abcd");
ok(!test, "Key not found 2");
test=np_extract_value("foo=bar=foobar", "foo");
test=np_extract_ntpvar("foo=bar=foobar", "foo");
ok(test && !strcmp(test, "bar=foobar"), "Strange string 1");
free(test);
test=np_extract_value("foo", "foo");
test=np_extract_ntpvar("foo", "foo");
ok(!test, "Malformed string 1");
test=np_extract_value("foo,", "foo");
test=np_extract_ntpvar("foo,", "foo");
ok(!test, "Malformed string 2");
test=np_extract_value("foo=", "foo");
test=np_extract_ntpvar("foo=", "foo");
ok(!test, "Malformed string 3");
test=np_extract_value("foo=,bar=foo", "foo");
test=np_extract_ntpvar("foo=,bar=foo", "foo");
ok(!test, "Malformed string 4");
test=np_extract_value(",foo", "foo");
test=np_extract_ntpvar(",foo", "foo");
ok(!test, "Malformed string 5");
test=np_extract_value("=foo", "foo");
test=np_extract_ntpvar("=foo", "foo");
ok(!test, "Malformed string 6");
test=np_extract_value("=foo,", "foo");
test=np_extract_ntpvar("=foo,", "foo");
ok(!test, "Malformed string 7");
test=np_extract_value(",,,", "foo");
test=np_extract_ntpvar(",,,", "foo");
ok(!test, "Malformed string 8");
test=np_extract_value("===", "foo");
test=np_extract_ntpvar("===", "foo");
ok(!test, "Malformed string 9");
test=np_extract_value(",=,=,", "foo");
test=np_extract_ntpvar(",=,=,", "foo");
ok(!test, "Malformed string 10");
test=np_extract_value("=,=,=", "foo");
test=np_extract_ntpvar("=,=,=", "foo");
ok(!test, "Malformed string 11");
test=np_extract_value(" foo=bar ,\n bar=foo\n , foobar=barfoo \n ", "foo");
test=np_extract_ntpvar(" foo=bar ,\n bar=foo\n , foobar=barfoo \n ", "foo");
ok(test && !strcmp(test, "bar"), "Random spaces and newlines 1");
free(test);
test=np_extract_value(" foo=bar ,\n bar=foo\n , foobar=barfoo \n ", "bar");
test=np_extract_ntpvar(" foo=bar ,\n bar=foo\n , foobar=barfoo \n ", "bar");
ok(test && !strcmp(test, "foo"), "Random spaces and newlines 2");
free(test);
test=np_extract_value(" foo=bar ,\n bar=foo\n , foobar=barfoo \n ", "foobar");
test=np_extract_ntpvar(" foo=bar ,\n bar=foo\n , foobar=barfoo \n ", "foobar");
ok(test && !strcmp(test, "barfoo"), "Random spaces and newlines 3");
free(test);
test=np_extract_value(" foo=bar ,\n bar\n \n= \n foo\n , foobar=barfoo \n ", "bar");
test=np_extract_ntpvar(" foo=bar ,\n bar\n \n= \n foo\n , foobar=barfoo \n ", "bar");
ok(test && !strcmp(test, "foo"), "Random spaces and newlines 4");
free(test);
test=np_extract_value("", "foo");
test=np_extract_ntpvar("", "foo");
ok(!test, "Empty string return NULL");
return exit_status();

6
lib/utils_base.c
View file

@ -258,7 +258,7 @@ int np_warn_if_not_root(void) {
* This function can be used to parse NTP control packet data and performance
* data strings.
*/
char *np_extract_value(const char *varlist, const char *name) {
char *np_extract_value(const char *varlist, const char *name, char sep) {
char *tmp=NULL, *value=NULL;
int i;
@ -277,7 +277,7 @@ char *np_extract_value(const char *varlist, const char *name) {
/* strip leading spaces */
for (varlist; isspace(varlist[0]); varlist++);
if (tmp = index(varlist, ',')) {
if (tmp = index(varlist, sep)) {
/* Value is delimited by a comma */
if (tmp-varlist == 0) continue;
value = (char *)malloc(tmp-varlist+1);
@ -293,7 +293,7 @@ char *np_extract_value(const char *varlist, const char *name) {
break;
}
}
if (tmp = index(varlist, ',')) {
if (tmp = index(varlist, sep)) {
/* More keys, keep going... */
varlist = tmp + 1;
} else {

8
lib/utils_base.h
View file

@ -56,6 +56,12 @@ int np_warn_if_not_root(void);
* This function can be used to parse NTP control packet data and performance
* data strings.
*/
char *np_extract_value(const char*, const char*);
char *np_extract_value(const char*, const char*, char);
/*
* Same as np_extract_value with separator suitable for NTP control packet
* payloads (comma)
*/
#define np_extract_ntpvar(l, n) np_extract_value(l, n, ',')
#endif /* _UTILS_BASE_ */

6
plugins/check_ntp_peer.c
View file

@ -333,7 +333,7 @@ int ntp_request(const char *host, double *offset, int *offset_result, double *ji
if(verbose)
printf("parsing offset from peer %.2x: ", ntohs(peers[i].assoc));
value = np_extract_value(data, "offset");
value = np_extract_ntpvar(data, "offset");
nptr=NULL;
/* Convert the value if we have one */
if(value != NULL)
@ -357,7 +357,7 @@ int ntp_request(const char *host, double *offset, int *offset_result, double *ji
if(verbose) {
printf("parsing %s from peer %.2x: ", strstr(getvar, "dispersion") != NULL ? "dispersion" : "jitter", ntohs(peers[i].assoc));
}
value = np_extract_value(data, strstr(getvar, "dispersion") != NULL ? "dispersion" : "jitter");
value = np_extract_ntpvar(data, strstr(getvar, "dispersion") != NULL ? "dispersion" : "jitter");
nptr=NULL;
/* Convert the value if we have one */
if(value != NULL)
@ -376,7 +376,7 @@ int ntp_request(const char *host, double *offset, int *offset_result, double *ji
if(verbose) {
printf("parsing stratum from peer %.2x: ", ntohs(peers[i].assoc));
}
value = np_extract_value(data, "stratum");
value = np_extract_ntpvar(data, "stratum");
nptr=NULL;
/* Convert the value if we have one */
if(value != NULL)