Skip to content
Permalink
Browse files

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
  • Loading branch information
bagder committed Feb 4, 2020
1 parent 9e1f720 commit d913c1e99ee1a6de372579e849af83a48a151c54
Showing with 8 additions and 11 deletions.
  1. +8 −11 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 */
}

0 comments on commit d913c1e

Please sign in to comment.
You can’t perform that action at this time.