[master] 74ee676c0 vtc: Simplify SO_RCVTIMEO_WORKS feature check

Dridi Boukelmoune dridi.boukelmoune at gmail.com
Mon May 10 13:14:06 UTC 2021


commit 74ee676c0c4a4a5cf9ccc828fcc9584448f3d58d
Author: Dridi Boukelmoune <dridi.boukelmoune at gmail.com>
Date:   Mon May 10 14:52:23 2021 +0200

    vtc: Simplify SO_RCVTIMEO_WORKS feature check

diff --git a/bin/varnishtest/vtc_misc.c b/bin/varnishtest/vtc_misc.c
index 53e50812f..63cddfdbf 100644
--- a/bin/varnishtest/vtc_misc.c
+++ b/bin/varnishtest/vtc_misc.c
@@ -440,6 +440,12 @@ static const unsigned no_sanitizer = 0;
 static const unsigned no_sanitizer = 1;
 #endif
 
+#ifdef SO_RCVTIMEO_WORKS
+static const unsigned so_rcvtimeo_works = 1;
+#else
+static const unsigned so_rcvtimeo_works = 0;
+#endif
+
 void v_matchproto_(cmd_f)
 cmd_feature(CMD_ARGS)
 {
@@ -464,13 +470,6 @@ cmd_feature(CMD_ARGS)
 
 	for (av++; *av != NULL; av++) {
 		good = 0;
-		if (!strcmp(*av, "SO_RCVTIMEO_WORKS")) {
-#ifdef SO_RCVTIMEO_WORKS
-			good = 1;
-#else
-			vtc_stop = 2;
-#endif
-		}
 
 		FEATURE("ipv4", ipvx_works("127.0.0.1"));
 		FEATURE("ipv6", ipvx_works("[::1]"));
@@ -484,6 +483,7 @@ cmd_feature(CMD_ARGS)
 		FEATURE("group_varnish", getgrnam("varnish") != NULL);
 		FEATURE("persistent_storage", with_persistent_storage);
 		FEATURE("no_sanitizer", no_sanitizer);
+		FEATURE("SO_RCVTIMEO_WORKS", so_rcvtimeo_works);
 
 		if (!strcmp(*av, "disable_aslr")) {
 			good = 1;


More information about the varnish-commit mailing list