diff options
| -rw-r--r-- | lib/tests/test_utils.c | 48 | ||||
| -rw-r--r-- | lib/utils_base.c | 6 | ||||
| -rw-r--r-- | lib/utils_base.h | 8 | ||||
| -rw-r--r-- | plugins/check_ntp_peer.c | 6 |
4 files changed, 37 insertions, 31 deletions
diff --git a/lib/tests/test_utils.c b/lib/tests/test_utils.c index 97343afa..3a45944a 100644 --- a/lib/tests/test_utils.c +++ b/lib/tests/test_utils.c @@ -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(); diff --git a/lib/utils_base.c b/lib/utils_base.c index a34cc5cc..77700f5b 100644 --- a/lib/utils_base.c +++ b/lib/utils_base.c @@ -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 { diff --git a/lib/utils_base.h b/lib/utils_base.h index c34f0445..f40fdb0f 100644 --- a/lib/utils_base.h +++ b/lib/utils_base.h @@ -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_ */ diff --git a/plugins/check_ntp_peer.c b/plugins/check_ntp_peer.c index b40dbfcb..e8325bc8 100644 --- a/plugins/check_ntp_peer.c +++ b/plugins/check_ntp_peer.c @@ -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) |