[master] a3b26d0ba Make the fallback argument optional on std.ip

[Poul-Henning Kamp]

commit a3b26d0ba7dd8763a4e34d9e18d92fc24f1c291c
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Tue Mar 12 09:50:19 2019 +0000

    Make the fallback argument optional on std.ip

diff --git a/lib/libvmod_std/vmod.vcc b/lib/libvmod_std/vmod.vcc
index f2597f5cc..3d45b8c59 100644
--- a/lib/libvmod_std/vmod.vcc
+++ b/lib/libvmod_std/vmod.vcc
@@ -328,15 +328,15 @@ Examples::
 	set resp.http.answer = std.integer(real=126.42/3);
 
 
-$Function IP ip(STRING s, IP fallback, BOOL resolve = 1)
+$Function IP ip(STRING s, [IP fallback], BOOL resolve = 1)
 
 Converts the string *s* to the first IP number returned by
 the system library function `getaddrinfo(3)`. If conversion
-fails, *fallback* will be returned.
+fails, *fallback* will be returned or VCL failure will happen.
 
-If *resolve* is false, `getaddrinfo(3)` is called using
-``AI_NUMERICHOST`` to avoid network lookups. This makes "pure" IP
-strings cheaper to convert.
+If *resolve* is false, `getaddrinfo(3)` is called using ``AI_NUMERICHOST``
+to avoid network lookups. This makes "numerical" IP strings cheaper
+to convert.
 
 Example::
 
diff --git a/lib/libvmod_std/vmod_std_conversions.c b/lib/libvmod_std/vmod_std_conversions.c
index e7a2172f0..c89fa4e91 100644
--- a/lib/libvmod_std/vmod_std_conversions.c
+++ b/lib/libvmod_std/vmod_std_conversions.c
@@ -189,49 +189,62 @@ vmod_integer(VRT_CTX, struct VARGS(integer) *a)
 	return (0);
 }
 
-VCL_IP
-vmod_ip(VRT_CTX, VCL_STRING s, VCL_IP d, VCL_BOOL resolve)
+static VCL_IP
+lookup(VCL_IP *p, const char *s, int resolve)
 {
 	struct addrinfo hints, *res0 = NULL;
 	const struct addrinfo *res;
 	int error;
+	VCL_IP retval = NULL;
+
+	if (s == NULL)
+		return (retval);
+
+	memset(&hints, 0, sizeof(hints));
+	hints.ai_family = PF_UNSPEC;
+	hints.ai_socktype = SOCK_STREAM;
+	if (!resolve)
+		hints.ai_flags |= AI_NUMERICHOST;
+	error = getaddrinfo(s, "80", &hints, &res0);
+	if (!error) {
+		for (res = res0; res != NULL; res = res->ai_next) {
+			retval = VSA_Build(p, res->ai_addr, res->ai_addrlen);
+			if (retval != NULL)
+				break;
+		}
+		freeaddrinfo(res0);
+	}
+	return (retval);
+}
+
+VCL_IP
+vmod_ip(VRT_CTX, struct VARGS(ip) *a)
+{
 	void *p;
-	const struct suckaddr *r;
+	VCL_IP retval;
 
 	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
-	AN(d);
-	assert(VSA_Sane(d));
+	if (a->valid_fallback)
+		assert(VSA_Sane(a->fallback));
 
 	p = WS_Alloc(ctx->ws, vsa_suckaddr_len);
 	if (p == NULL) {
 		VSLb(ctx->vsl, SLT_VCL_Error,
 		    "vmod std.ip(): insufficient workspace");
-		return (d);
-	}
-	r = NULL;
-
-	if (s != NULL) {
-		memset(&hints, 0, sizeof(hints));
-		hints.ai_family = PF_UNSPEC;
-		hints.ai_socktype = SOCK_STREAM;
-		if (!resolve)
-			hints.ai_flags |= AI_NUMERICHOST;
-		error = getaddrinfo(s, "80", &hints, &res0);
-		if (!error) {
-			for (res = res0; res != NULL; res = res->ai_next) {
-				r = VSA_Build(p, res->ai_addr, res->ai_addrlen);
-				if (r != NULL)
-					break;
-			}
-		}
+		return (NULL);
 	}
-	if (r == NULL) {
-		WS_Reset(ctx->ws, (uintptr_t)p);
-		r = d;
-	}
-	if (res0 != NULL)
-		freeaddrinfo(res0);
-	return (r);
+
+	retval = lookup(p, a->s, a->resolve);
+	if (retval != NULL)
+		return (retval);
+
+	WS_Reset(ctx->ws, (uintptr_t)p);
+
+	if (a->valid_fallback)
+		return (a->fallback);
+
+	VRT_fail(ctx, "std.integer: conversion failed");
+	return (NULL);
 }
 
 VCL_REAL v_matchproto_(td_std_real)