diff options
| author | Glenn Strauss <gstrauss@gluelogic.com> | 2019-10-13 20:14:09 -0400 |
|---|---|---|
| committer | Glenn Strauss <gstrauss@gluelogic.com> | 2020-02-24 11:15:32 -0500 |
| commit | 5aadcba456aa1327a938c19c2afcc130cac9d6cc (patch) | |
| tree | 6240c2d132bdd8a18d9cbde4f97f332200922572 /src/configfile-glue.c | |
| parent | a51278030eba383f1f524bcaeebd3e17659439d1 (diff) | |
| download | lighttpd-git-5aadcba456aa1327a938c19c2afcc130cac9d6cc.tar.gz | |
[core] buffer string in data_config
(instead of (buffer *))
Diffstat (limited to 'src/configfile-glue.c')
| -rw-r--r-- | src/configfile-glue.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/configfile-glue.c b/src/configfile-glue.c index 63d84511..2dd409a2 100644 --- a/src/configfile-glue.c +++ b/src/configfile-glue.c @@ -233,7 +233,7 @@ static int config_addrstr_eq_remote_ip_mask(server *srv, const char *addrstr, in return sock_addr_is_addr_eq_bits(&addr, rmt, nm_bits); } -static int config_addrbuf_eq_remote_ip_mask(server *srv, buffer *string, char *nm_slash, sock_addr *rmt) { +static int config_addrbuf_eq_remote_ip_mask(server *srv, const buffer *string, char *nm_slash, sock_addr *rmt) { char *err; int nm_bits = strtol(nm_slash + 1, &err, 10); size_t addrstrlen = (size_t)(nm_slash - string->ptr); @@ -364,7 +364,7 @@ static cond_result_t config_check_cond_nocache(server *srv, connection *con, con case CONFIG_COND_EQ: port = sock_addr_get_port(&srv_sock->addr); if (0 == port) break; - ck_colon = strchr(dc->string->ptr, ':'); + ck_colon = strchr(dc->string.ptr, ':'); val_colon = strchr(l->ptr, ':'); if (NULL != ck_colon && NULL == val_colon) { @@ -400,8 +400,8 @@ static cond_result_t config_check_cond_nocache(server *srv, connection *con, con if ((dc->cond == CONFIG_COND_EQ || dc->cond == CONFIG_COND_NE) && - (NULL != (nm_slash = strchr(dc->string->ptr, '/')))) { - switch (config_addrbuf_eq_remote_ip_mask(srv, dc->string, nm_slash, &con->dst_addr)) { + (NULL != (nm_slash = strchr(dc->string.ptr, '/')))) { + switch (config_addrbuf_eq_remote_ip_mask(srv, &dc->string, nm_slash, &con->dst_addr)) { case 1: return (dc->cond == CONFIG_COND_EQ) ? COND_RESULT_TRUE : COND_RESULT_FALSE; case 0: return (dc->cond == CONFIG_COND_EQ) ? COND_RESULT_FALSE : COND_RESULT_TRUE; case -1: return COND_RESULT_FALSE; /*(error parsing configfile entry)*/ @@ -449,12 +449,12 @@ static cond_result_t config_check_cond_nocache(server *srv, connection *con, con if (con->conf.log_condition_handling) { log_error_write(srv, __FILE__, __LINE__, "bsbsb", dc->comp_key, - "(", l, ") compare to ", dc->string); + "(", l, ") compare to ", &dc->string); } switch(dc->cond) { case CONFIG_COND_NE: case CONFIG_COND_EQ: - if (buffer_is_equal(l, dc->string)) { + if (buffer_is_equal(l, &dc->string)) { return (dc->cond == CONFIG_COND_EQ) ? COND_RESULT_TRUE : COND_RESULT_FALSE; } else { return (dc->cond == CONFIG_COND_EQ) ? COND_RESULT_FALSE : COND_RESULT_TRUE; |