Commit 2cf9e59b authored by Nils Goroll's avatar Nils Goroll

rename cluster_blacklist_add/del -> cluster_deny/allow

parent 43e72d21
...@@ -212,7 +212,7 @@ cluster_task_param_r(VRT_CTX, struct vmod_cluster_cluster *vc) ...@@ -212,7 +212,7 @@ cluster_task_param_r(VRT_CTX, struct vmod_cluster_cluster *vc)
} }
static void static void
cluster_blacklist_add(VRT_CTX, struct vmod_cluster_cluster_param *p, cluster_deny(VRT_CTX, struct vmod_cluster_cluster_param *p,
VCL_BACKEND b) VCL_BACKEND b)
{ {
CHECK_OBJ_NOTNULL(p, VMOD_CLUSTER_CLUSTER_PARAM_MAGIC); CHECK_OBJ_NOTNULL(p, VMOD_CLUSTER_CLUSTER_PARAM_MAGIC);
...@@ -225,7 +225,7 @@ cluster_blacklist_add(VRT_CTX, struct vmod_cluster_cluster_param *p, ...@@ -225,7 +225,7 @@ cluster_blacklist_add(VRT_CTX, struct vmod_cluster_cluster_param *p,
} }
static void static void
cluster_blacklist_del(VRT_CTX, struct vmod_cluster_cluster_param *p, cluster_allow(VRT_CTX, struct vmod_cluster_cluster_param *p,
VCL_BACKEND b) VCL_BACKEND b)
{ {
int i; int i;
...@@ -292,7 +292,7 @@ vmod_cluster__init(VRT_CTX, ...@@ -292,7 +292,7 @@ vmod_cluster__init(VRT_CTX,
if (args->valid_real) if (args->valid_real)
p->real = args->real; p->real = args->real;
if (args->valid_deny) if (args->valid_deny)
cluster_blacklist_add(ctx, p, args->deny); cluster_deny(ctx, p, args->deny);
vc->dir = VRT_AddDirector(ctx, vmod_cluster_methods, vc, vc->dir = VRT_AddDirector(ctx, vmod_cluster_methods, vc,
"%s", vcl_name); "%s", vcl_name);
} }
...@@ -336,7 +336,7 @@ vmod_cluster_deny(VRT_CTX, ...@@ -336,7 +336,7 @@ vmod_cluster_deny(VRT_CTX,
return; return;
pl = cluster_task_param_l(ctx, vc, pr->nblack + 1, NULL); pl = cluster_task_param_l(ctx, vc, pr->nblack + 1, NULL);
cluster_blacklist_add(ctx, pl, b); cluster_deny(ctx, pl, b);
} }
VCL_VOID VCL_VOID
...@@ -355,7 +355,7 @@ vmod_cluster_allow(VRT_CTX, ...@@ -355,7 +355,7 @@ vmod_cluster_allow(VRT_CTX,
return; return;
pl = cluster_task_param_l(ctx, vc, pr->nblack, NULL); pl = cluster_task_param_l(ctx, vc, pr->nblack, NULL);
cluster_blacklist_del(ctx, pl, b); cluster_allow(ctx, pl, b);
} }
VCL_BOOL VCL_BOOL
...@@ -529,7 +529,7 @@ cluster_update_by_args(VRT_CTX, struct vmod_cluster_cluster *vc, ...@@ -529,7 +529,7 @@ cluster_update_by_args(VRT_CTX, struct vmod_cluster_cluster *vc,
if (pl == NULL) if (pl == NULL)
pr = pl = cluster_task_param_l(ctx, vc, pr = pl = cluster_task_param_l(ctx, vc,
++nblack, spc); ++nblack, spc);
cluster_blacklist_add(ctx, pl, arg->deny); cluster_deny(ctx, pl, arg->deny);
} }
if (arg->valid_real && pr->real != arg->real) { if (arg->valid_real && pr->real != arg->real) {
if (pl == NULL) if (pl == NULL)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment