aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2020-02-04 15:12:44 +0100
committerDaniel Stenberg <daniel@haxx.se>2020-02-04 22:28:21 +0100
commitd913c1e99ee1a6de372579e849af83a48a151c54 (patch)
treeec2e58506546a5c17a31f2aee99c56da7ffe5825 /lib
parent9e1f72075855d2b2770c2fb0f0083f15c8714616 (diff)
altsvc: set h3 version at a common single spot
... and move the #ifdefs out of the functions. Addresses the fact they were different before this change. Reported-by: Harry Sintonen Closes #4876
Diffstat (limited to 'lib')
-rw-r--r--lib/altsvc.c19
1 files changed, 8 insertions, 11 deletions
diff --git a/lib/altsvc.c b/lib/altsvc.c
index 0e9a97826..93cc302bd 100644
--- a/lib/altsvc.c
+++ b/lib/altsvc.c
@@ -48,19 +48,20 @@
#define MAX_ALTSVC_ALPNLENSTR "10"
#define MAX_ALTSVC_ALPNLEN 10
+#if (defined(USE_QUICHE) || defined(USE_NGTCP2)) && !defined(UNITTESTS)
+#define H3VERSION "h3-25"
+#else
+#define H3VERSION "h3"
+#endif
+
static enum alpnid alpn2alpnid(char *name)
{
if(strcasecompare(name, "h1"))
return ALPN_h1;
if(strcasecompare(name, "h2"))
return ALPN_h2;
-#if (defined(USE_QUICHE) || defined(USE_NGTCP2)) && !defined(UNITTESTS)
- if(strcasecompare(name, "h3-25"))
+ if(strcasecompare(name, H3VERSION))
return ALPN_h3;
-#else
- if(strcasecompare(name, "h3"))
- return ALPN_h3;
-#endif
return ALPN_none; /* unknown, probably rubbish input */
}
@@ -73,11 +74,7 @@ const char *Curl_alpnid2str(enum alpnid id)
case ALPN_h2:
return "h2";
case ALPN_h3:
-#if (defined(USE_QUICHE) || defined(USE_NGTCP2)) && !defined(UNITTESTS)
- return "h3-24";
-#else
- return "h3";
-#endif
+ return H3VERSION;
default:
return ""; /* bad */
}