Skip to content

Commit

Permalink
Latest changes
Browse files Browse the repository at this point in the history
- Add support for Q041; drop support for Q040
  • Loading branch information
Dmitri Tikhonov committed Sep 28, 2017
1 parent fc214ce commit 1b97e4a
Show file tree
Hide file tree
Showing 22 changed files with 87 additions and 94 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
2017-09-28

- Add support for Q041; drop support for Q040

2017-09-27

- Fix CMakeLists.txt: BoringSSL include and lib was mixed up
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ our own products: LiteSpeed Web Server and ADC. We think it is free of
major problems. Nevertheless, do not hesitate to report bugs back to us.
Even better, send us fixes and improvements!

Currently supported QUIC versions are Q035, Q037, Q038, Q039, and Q040.
Currently supported QUIC versions are Q035, Q037, Q038, Q039, and Q041.
Support for newer versions will be added soon after they are released.
The version(s) specified by IETF QUIC WG will be added once the IETF
version of the protocol settles down a little.
Expand Down
4 changes: 2 additions & 2 deletions docs/html/globals.html
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,8 @@ <h3><a class="anchor" id="index_l"></a>- l -</h3><ul>
<li>LSQVER_039
: <a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbaa9b8bed8ca169e8a3762308cbf0f3af3">lsquic.h</a>
</li>
<li>LSQVER_040
: <a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac17f226a6a4c61377a5e50710d5ef12f">lsquic.h</a>
<li>LSQVER_041
: <a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac673a00564784af03b3b9cb747ed8af3">lsquic.h</a>
</li>
</ul>
</div><!-- contents -->
Expand Down
4 changes: 2 additions & 2 deletions docs/html/globals_eval.html
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@
<li>LSQVER_039
: <a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbaa9b8bed8ca169e8a3762308cbf0f3af3">lsquic.h</a>
</li>
<li>LSQVER_040
: <a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac17f226a6a4c61377a5e50710d5ef12f">lsquic.h</a>
<li>LSQVER_041
: <a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac673a00564784af03b3b9cb747ed8af3">lsquic.h</a>
</li>
</ul>
</div><!-- contents -->
Expand Down
12 changes: 6 additions & 6 deletions docs/html/lsquic_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
<tr class="memitem:a0420e68d347462080cf2e583b77d61a0"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="lsquic_8h.html#a0420e68d347462080cf2e583b77d61a0">LSQUIC_SUPPORTED_VERSIONS</a></td></tr>
<tr class="separator:a0420e68d347462080cf2e583b77d61a0"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a9c4ad08207bd7865f40eeb18a23e04ed"><td class="memItemLeft" align="right" valign="top"><a class="anchor" id="a9c4ad08207bd7865f40eeb18a23e04ed"></a>
#define&#160;</td><td class="memItemRight" valign="bottom"><b>LSQUIC_EXPERIMENTAL_VERSIONS</b>&#160;&#160;&#160;((1 &lt;&lt; <a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac17f226a6a4c61377a5e50710d5ef12f">LSQVER_040</a>))</td></tr>
#define&#160;</td><td class="memItemRight" valign="bottom"><b>LSQUIC_EXPERIMENTAL_VERSIONS</b>&#160;&#160;&#160;((1 &lt;&lt; <a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac673a00564784af03b3b9cb747ed8af3">LSQVER_041</a>))</td></tr>
<tr class="separator:a9c4ad08207bd7865f40eeb18a23e04ed"><td class="memSeparator" colspan="2">&#160;</td></tr>
<tr class="memitem:a6fd9104d1ffa8c391dede0a714a5919b"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="lsquic_8h.html#a6fd9104d1ffa8c391dede0a714a5919b">LSQUIC_MIN_FCW</a>&#160;&#160;&#160;(16 * 1024)</td></tr>
<tr class="separator:a6fd9104d1ffa8c391dede0a714a5919b"><td class="memSeparator" colspan="2">&#160;</td></tr>
Expand Down Expand Up @@ -232,7 +232,7 @@
<a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba2d39809298e0c7866b21fc7932504966">LSQVER_038</a>,
<a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbaa9b8bed8ca169e8a3762308cbf0f3af3">LSQVER_039</a>,
<br />
&#160;&#160;<a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac17f226a6a4c61377a5e50710d5ef12f">LSQVER_040</a>,
&#160;&#160;<a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac673a00564784af03b3b9cb747ed8af3">LSQVER_041</a>,
<b>N_LSQVER</b>
<br />
}</td></tr>
Expand Down Expand Up @@ -599,11 +599,11 @@
</tr>
</table>
</div><div class="memdoc">
<b>Value:</b><div class="fragment"><div class="line">((1 &lt;&lt; <a class="code" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba1956abef5d785f45310599e4fcd39c32">LSQVER_035</a>) | (1 &lt;&lt; <a class="code" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba5c2aa78b22ea462ae839566e19a87ea7">LSQVER_037</a>) | \</div><div class="line"> (1 &lt;&lt; <a class="code" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba2d39809298e0c7866b21fc7932504966">LSQVER_038</a>) | (1 &lt;&lt; <a class="code" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbaa9b8bed8ca169e8a3762308cbf0f3af3">LSQVER_039</a>) | (1 &lt;&lt; <a class="code" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac17f226a6a4c61377a5e50710d5ef12f">LSQVER_040</a>))</div><div class="ttc" id="lsquic_8h_html_a2633ae9ee8d564f4c499f6eb0913d4dba5c2aa78b22ea462ae839566e19a87ea7"><div class="ttname"><a href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba5c2aa78b22ea462ae839566e19a87ea7">LSQVER_037</a></div><div class="ttdef"><b>Definition:</b> lsquic.h:54</div></div>
<div class="ttc" id="lsquic_8h_html_a2633ae9ee8d564f4c499f6eb0913d4dbac17f226a6a4c61377a5e50710d5ef12f"><div class="ttname"><a href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac17f226a6a4c61377a5e50710d5ef12f">LSQVER_040</a></div><div class="ttdef"><b>Definition:</b> lsquic.h:72</div></div>
<b>Value:</b><div class="fragment"><div class="line">((1 &lt;&lt; <a class="code" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba1956abef5d785f45310599e4fcd39c32">LSQVER_035</a>) | (1 &lt;&lt; <a class="code" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba5c2aa78b22ea462ae839566e19a87ea7">LSQVER_037</a>) | \</div><div class="line"> (1 &lt;&lt; <a class="code" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba2d39809298e0c7866b21fc7932504966">LSQVER_038</a>) | (1 &lt;&lt; <a class="code" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbaa9b8bed8ca169e8a3762308cbf0f3af3">LSQVER_039</a>) | (1 &lt;&lt; <a class="code" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac673a00564784af03b3b9cb747ed8af3">LSQVER_041</a>))</div><div class="ttc" id="lsquic_8h_html_a2633ae9ee8d564f4c499f6eb0913d4dba5c2aa78b22ea462ae839566e19a87ea7"><div class="ttname"><a href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba5c2aa78b22ea462ae839566e19a87ea7">LSQVER_037</a></div><div class="ttdef"><b>Definition:</b> lsquic.h:54</div></div>
<div class="ttc" id="lsquic_8h_html_a2633ae9ee8d564f4c499f6eb0913d4dbaa9b8bed8ca169e8a3762308cbf0f3af3"><div class="ttname"><a href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbaa9b8bed8ca169e8a3762308cbf0f3af3">LSQVER_039</a></div><div class="ttdef"><b>Definition:</b> lsquic.h:67</div></div>
<div class="ttc" id="lsquic_8h_html_a2633ae9ee8d564f4c499f6eb0913d4dba1956abef5d785f45310599e4fcd39c32"><div class="ttname"><a href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba1956abef5d785f45310599e4fcd39c32">LSQVER_035</a></div><div class="ttdef"><b>Definition:</b> lsquic.h:46</div></div>
<div class="ttc" id="lsquic_8h_html_a2633ae9ee8d564f4c499f6eb0913d4dba2d39809298e0c7866b21fc7932504966"><div class="ttname"><a href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba2d39809298e0c7866b21fc7932504966">LSQVER_038</a></div><div class="ttdef"><b>Definition:</b> lsquic.h:60</div></div>
<div class="ttc" id="lsquic_8h_html_a2633ae9ee8d564f4c499f6eb0913d4dbac673a00564784af03b3b9cb747ed8af3"><div class="ttname"><a href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac673a00564784af03b3b9cb747ed8af3">LSQVER_041</a></div><div class="ttdef"><b>Definition:</b> lsquic.h:72</div></div>
</div><!-- fragment --><p>We currently support versions 35, 37, 38, 39, and 40. </p><dl class="section see"><dt>See also</dt><dd><a class="el" href="lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4db">lsquic_version</a> </dd></dl>

</div>
Expand Down Expand Up @@ -678,8 +678,8 @@ <h2 class="groupheader">Enumeration Type Documentation</h2>
<tr><td class="fieldname"><a class="anchor" id="a2633ae9ee8d564f4c499f6eb0913d4dbaa9b8bed8ca169e8a3762308cbf0f3af3"></a>LSQVER_039&#160;</td><td class="fielddoc">
<p>Q039. Switch to big endian. Do not ack acks. Send connection level WINDOW_UPDATE frame every 20 sent packets which do not contain retransmittable frames. </p>
</td></tr>
<tr><td class="fieldname"><a class="anchor" id="a2633ae9ee8d564f4c499f6eb0913d4dbac17f226a6a4c61377a5e50710d5ef12f"></a>LSQVER_040&#160;</td><td class="fielddoc">
<p>Q040. RST_STREAM, ACK and STREAM frames match IETF format. </p>
<tr><td class="fieldname"><a class="anchor" id="a2633ae9ee8d564f4c499f6eb0913d4dbac673a00564784af03b3b9cb747ed8af3"></a>LSQVER_041&#160;</td><td class="fielddoc">
<p>Q041. RST_STREAM, ACK and STREAM frames match IETF format. </p>
</td></tr>
</table>

Expand Down
4 changes: 2 additions & 2 deletions docs/html/lsquic_8h_source.html

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions docs/html/lsquic__types_8h.html
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,6 @@
Include dependency graph for lsquic_types.h:</div>
<div class="dyncontent">
<div class="center"><img src="lsquic__types_8h__incl.png" border="0" usemap="#include_2lsquic__types_8h" alt=""/></div>
<map name="include_2lsquic__types_8h" id="include_2lsquic__types_8h">
</map>
</div>
</div><div class="textblock"><div class="dynheader">
This graph shows which files directly or indirectly include this file:</div>
Expand Down
2 changes: 1 addition & 1 deletion docs/html/search/all_1.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/html/search/enumvalues_0.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ var searchData=
['lsqver_5f037',['LSQVER_037',['../lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba5c2aa78b22ea462ae839566e19a87ea7',1,'lsquic.h']]],
['lsqver_5f038',['LSQVER_038',['../lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dba2d39809298e0c7866b21fc7932504966',1,'lsquic.h']]],
['lsqver_5f039',['LSQVER_039',['../lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbaa9b8bed8ca169e8a3762308cbf0f3af3',1,'lsquic.h']]],
['lsqver_5f040',['LSQVER_040',['../lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac17f226a6a4c61377a5e50710d5ef12f',1,'lsquic.h']]]
['lsqver_5f041',['LSQVER_041',['../lsquic_8h.html#a2633ae9ee8d564f4c499f6eb0913d4dbac673a00564784af03b3b9cb747ed8af3',1,'lsquic.h']]]
];
8 changes: 4 additions & 4 deletions include/lsquic.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,9 @@ enum lsquic_version
LSQVER_039,

/**
* Q040. RST_STREAM, ACK and STREAM frames match IETF format.
* Q041. RST_STREAM, ACK and STREAM frames match IETF format.
*/
LSQVER_040,
LSQVER_041,

N_LSQVER
};
Expand All @@ -79,9 +79,9 @@ enum lsquic_version
* @see lsquic_version
*/
#define LSQUIC_SUPPORTED_VERSIONS ((1 << LSQVER_035) | (1 << LSQVER_037) | \
(1 << LSQVER_038) | (1 << LSQVER_039) | (1 << LSQVER_040))
(1 << LSQVER_038) | (1 << LSQVER_039) | (1 << LSQVER_041))

#define LSQUIC_EXPERIMENTAL_VERSIONS ((1 << LSQVER_040))
#define LSQUIC_EXPERIMENTAL_VERSIONS ((1 << LSQVER_041))

/**
* @struct lsquic_stream_if
Expand Down
2 changes: 1 addition & 1 deletion src/liblsquic/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SET(lsquic_STAT_SRCS
lsquic_parse_gquic_common.c
lsquic_parse_gquic_le.c
lsquic_parse_gquic_be.c
lsquic_parse_gquic_Q040.c
lsquic_parse_gquic_Q041.c
lsquic_packet_in.c
lsquic_packet_out.c
lsquic_crypto.c
Expand Down
5 changes: 0 additions & 5 deletions src/liblsquic/lsquic_engine.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@
#include <unistd.h>
#include <netdb.h>

#ifndef NDEBUG
#include <sys/types.h>
#include <regex.h> /* For code that loses packets */
#endif



#include "lsquic.h"
Expand Down
6 changes: 3 additions & 3 deletions src/liblsquic/lsquic_parse.h
Original file line number Diff line number Diff line change
Expand Up @@ -158,15 +158,15 @@ struct parse_funcs
extern const struct parse_funcs lsquic_parse_funcs_gquic_le;
/* Q039 and later are big-endian: */
extern const struct parse_funcs lsquic_parse_funcs_gquic_Q039;
extern const struct parse_funcs lsquic_parse_funcs_gquic_Q040;
extern const struct parse_funcs lsquic_parse_funcs_gquic_Q041;

#define select_pf_by_ver(ver) ( \
((1 << (ver)) & ((1 << LSQVER_035) | \
(1 << LSQVER_037) | (1 << LSQVER_038))) \
? &lsquic_parse_funcs_gquic_le : \
((1 << (ver)) & (1 << LSQVER_039)) \
? &lsquic_parse_funcs_gquic_Q039 \
: &lsquic_parse_funcs_gquic_Q040)
: &lsquic_parse_funcs_gquic_Q041)

/* This function is QUIC-version independent */
int
Expand All @@ -177,7 +177,7 @@ enum QUIC_FRAME_TYPE
parse_frame_type_gquic_Q035_thru_Q039 (unsigned char first_byte);

enum QUIC_FRAME_TYPE
parse_frame_type_gquic_Q040 (unsigned char first_byte);
parse_frame_type_gquic_Q041 (unsigned char first_byte);

unsigned
parse_stream_frame_header_sz_gquic (unsigned char type);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,6 @@ gquic_ietf_parse_stream_frame (const unsigned char *buf, size_t rem_packet_sz,

stream_frame->data_frame.df_fin = !!(type & 0x20);

if (data_len)
{
READ_UINT(stream_frame->data_frame.df_size, 16, p, data_len);
p += data_len;
}

READ_UINT(stream_frame->stream_id, 32, p, stream_id_len);
p += stream_id_len;

Expand All @@ -115,6 +109,8 @@ gquic_ietf_parse_stream_frame (const unsigned char *buf, size_t rem_packet_sz,

if (data_len)
{
READ_UINT(stream_frame->data_frame.df_size, 16, p, data_len);
p += data_len;
CHECK_SPACE(stream_frame->data_frame.df_size, p, pend);
stream_frame->data_frame.df_data = p;
p += stream_frame->data_frame.df_size;
Expand Down Expand Up @@ -198,8 +194,6 @@ gquic_ietf_gen_stream_frame (unsigned char *buf, size_t buf_len, uint32_t stream
CHECK_SPACE(1 + olen + slen + dlen +
+ 1 /* We need to write at least 1 byte */, buf, buf + buf_len);

p += dlen; /* Save room for data length */

#if __BYTE_ORDER == __LITTLE_ENDIAN
stream_id = bswap_32(stream_id);
#endif
Expand All @@ -213,7 +207,7 @@ gquic_ietf_gen_stream_frame (unsigned char *buf, size_t buf_len, uint32_t stream
p += olen;

/* Read as much as we can */
nr = gsf_read(stream, p, n_avail, &fin);
nr = gsf_read(stream, p + dlen, n_avail, &fin);
assert(nr != 0);

if (dlen)
Expand All @@ -222,17 +216,15 @@ gquic_ietf_gen_stream_frame (unsigned char *buf, size_t buf_len, uint32_t stream
#if __BYTE_ORDER == __LITTLE_ENDIAN
nr_copy = bswap_16(nr_copy);
#endif
memcpy(p - slen - olen - 2, &nr_copy, 2);
memcpy(p, &nr_copy, 2);
}

p += nr;
p += dlen + nr;
}
else
{
dlen = 2;
CHECK_SPACE(1 + slen + olen + 2, buf, buf + buf_len);
memset(p, 0, 2);
p += 2;
#if __BYTE_ORDER == __LITTLE_ENDIAN
stream_id = bswap_32(stream_id);
#endif
Expand All @@ -243,6 +235,8 @@ gquic_ietf_gen_stream_frame (unsigned char *buf, size_t buf_len, uint32_t stream
#endif
memcpy(p, (unsigned char *) &offset + 8 - olen, olen);
p += olen;
memset(p, 0, 2);
p += 2;
}

/* Convert slen to bit representation: 0 - 3: */
Expand Down Expand Up @@ -279,7 +273,7 @@ gquic_ietf_parse_ack_high (const unsigned char *buf, size_t buf_len)
type = buf[0];
largest_obs_len = twobit_to_1248((type >> 2) & 3);
n_blocks_len = !!(type & 0x10);
assert(parse_frame_type_gquic_Q040(type) == QUIC_FRAME_ACK);
assert(parse_frame_type_gquic_Q041(type) == QUIC_FRAME_ACK);
assert(buf_len >= 1 + n_blocks_len + 1 + largest_obs_len);
READ_UINT(packno, 64, buf + 1 + n_blocks_len + 1, largest_obs_len);
return packno;
Expand Down Expand Up @@ -540,7 +534,7 @@ gquic_ietf_gen_ack_frame (unsigned char *outbuf, size_t outbuf_sz,
}


const struct parse_funcs lsquic_parse_funcs_gquic_Q040 =
const struct parse_funcs lsquic_parse_funcs_gquic_Q041 =
{
.pf_gen_ver_nego_pkt = gquic_be_gen_ver_nego_pkt,
.pf_gen_reg_pkt_header = gquic_be_gen_reg_pkt_header,
Expand Down Expand Up @@ -570,5 +564,5 @@ const struct parse_funcs lsquic_parse_funcs_gquic_Q040 =
.pf_write_float_time16 = gquic_be_write_float_time16,
.pf_read_float_time16 = gquic_be_read_float_time16,
#endif
.pf_parse_frame_type = parse_frame_type_gquic_Q040,
.pf_parse_frame_type = parse_frame_type_gquic_Q041,
};
6 changes: 3 additions & 3 deletions src/liblsquic/lsquic_parse_gquic_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ static const enum QUIC_FRAME_TYPE byte2frame_type_Q035_thru_Q039[0x100] =
};


static const enum QUIC_FRAME_TYPE byte2frame_type_Q040[0x100] =
static const enum QUIC_FRAME_TYPE byte2frame_type_Q041[0x100] =
{
[0x00] = QUIC_FRAME_PADDING,
[0x01] = QUIC_FRAME_RST_STREAM,
Expand Down Expand Up @@ -658,9 +658,9 @@ parse_frame_type_gquic_Q035_thru_Q039 (unsigned char b)


enum QUIC_FRAME_TYPE
parse_frame_type_gquic_Q040 (unsigned char b)
parse_frame_type_gquic_Q041 (unsigned char b)
{
return byte2frame_type_Q040[b];
return byte2frame_type_Q041[b];
}


Expand Down
4 changes: 2 additions & 2 deletions src/liblsquic/lsquic_version.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ static const unsigned char version_tags[N_LSQVER][4] =
[LSQVER_037] = { 'Q', '0', '3', '7', },
[LSQVER_038] = { 'Q', '0', '3', '8', },
[LSQVER_039] = { 'Q', '0', '3', '9', },
[LSQVER_040] = { 'Q', '0', '4', '0', },
[LSQVER_041] = { 'Q', '0', '4', '1', },
};


Expand Down Expand Up @@ -61,7 +61,7 @@ const char *const lsquic_ver2str[N_LSQVER] = {
[LSQVER_037] = "Q037",
[LSQVER_038] = "Q038",
[LSQVER_039] = "Q039",
[LSQVER_040] = "Q040",
[LSQVER_041] = "Q041",
};


Expand Down
4 changes: 2 additions & 2 deletions test/test_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -916,9 +916,9 @@ set_engine_option (struct lsquic_engine_settings *settings,
settings->es_versions |= 1 << LSQVER_039;
return 0;
}
if (0 == strcmp(val, "Q040"))
if (0 == strcmp(val, "Q041"))
{
settings->es_versions |= 1 << LSQVER_040;
settings->es_versions |= 1 << LSQVER_041;
return 0;
}
}
Expand Down
2 changes: 1 addition & 1 deletion test/unittests/test_ackgen_gquic_ietf.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "lsquic_logger.h"
#include "lsquic.h"

static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_040);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_041);

static void
test1 (void) /* Inverse of quic_framer_test.cc -- NewAckFrameOneAckBlock */
Expand Down
2 changes: 1 addition & 1 deletion test/unittests/test_ackparse_gquic_ietf.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include "lsquic_util.h"
#include "lsquic.h"

static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_040);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_041);


static lsquic_packno_t
Expand Down
2 changes: 1 addition & 1 deletion test/unittests/test_rst_stream_ietf.c
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include "lsquic_alarmset.h"
#include "lsquic_parse.h"

static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_040);
static const struct parse_funcs *const pf = select_pf_by_ver(LSQVER_041);


/* The test is both for generation and parsing: */
Expand Down
Loading

0 comments on commit 1b97e4a

Please sign in to comment.