diff --git a/lib/ngtcp2_pkt.c b/lib/ngtcp2_pkt.c
index c3f2f10a3b1a5c1f9b2f2be033638225ac338445..ff7b7240bfb5e54f2df16d439c789dab9784d91b 100644
--- a/lib/ngtcp2_pkt.c
+++ b/lib/ngtcp2_pkt.c
@@ -371,6 +371,9 @@ ssize_t ngtcp2_pkt_decode_stream_frame(ngtcp2_stream *dest,
}
switch (offsetlen) {
+ case 0:
+ dest->offset = 0;
+ break;
case 2:
dest->offset = ngtcp2_get_uint16(p);
break;
@@ -384,7 +387,7 @@ ssize_t ngtcp2_pkt_decode_stream_frame(ngtcp2_stream *dest,
p += offsetlen;
- if (datalen) {
+ if (type & NGTCP2_STREAM_D_BIT) {
dest->datalen = datalen;
p += 2;
dest->data = p;
diff --git a/tests/Makefile.am b/tests/Makefile.am
index cd1da64979f271527c8d0818485c5c661145bb39..75eb054a6b65a428f274e863f5362f2f9d5a67fe 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -29,9 +29,11 @@ check_PROGRAMS = main
OBJECTS = \
main.c \
ngtcp2_pkt_test.c \
+ ngtcp2_upe_test.c \
ngtcp2_test_helper.c
HFILES= \
ngtcp2_pkt_test.h \
+ ngtcp2_upe_test.h \
ngtcp2_test_helper.h
main_SOURCES = $(HFILES) $(OBJECTS)
diff --git a/tests/main.c b/tests/main.c
index 8057bb92c7d1dd3bf4c8b1ec7a2be9de2e2e7656..eaf3d666ab403d9a0dbc977f9530e0f067694b05 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -32,6 +32,7 @@
#include <CUnit/Basic.h>
/* include test cases' include files here */
#include "ngtcp2_pkt_test.h"
+#include "ngtcp2_upe_test.h"
static int init_suite1(void) { return 0; }
@@ -66,7 +67,8 @@ int main() {
!CU_add_test(pSuite, "pkt_encode_stream_frame",
test_ngtcp2_pkt_encode_stream_frame) ||
!CU_add_test(pSuite, "pkt_encode_ack_frame",
- test_ngtcp2_pkt_encode_ack_frame)) {
+ test_ngtcp2_pkt_encode_ack_frame) ||
+ !CU_add_test(pSuite, "upe_encode", test_ngtcp2_upe_encode)) {
CU_cleanup_registry();
return CU_get_error();
}
diff --git a/tests/ngtcp2_upe_test.c b/tests/ngtcp2_upe_test.c
new file mode 100644
index 0000000000000000000000000000000000000000..79e003124b386b309a89fe8c8e5689f323382b5f
--- /dev/null
+++ b/tests/ngtcp2_upe_test.c
@@ -0,0 +1,138 @@
+/*
+ * ngtcp2
+ *
+ * Copyright (c) 2017 ngtcp2 contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#include "ngtcp2_upe_test.h"
+
+#include <assert.h>
+
+#include <CUnit/CUnit.h>
+
+#include "ngtcp2_upe.h"
+#include "ngtcp2_pkt.h"
+#include "ngtcp2_test_helper.h"
+
+void test_ngtcp2_upe_encode(void) {
+ const uint8_t ro[256] = {0};
+ uint8_t buf[1024];
+ ngtcp2_pkt_hd hd, nhd;
+ ngtcp2_frame s1 = {0}, s2 = {0}, ns;
+ ngtcp2_upe upe;
+ int rv;
+ size_t pktlen;
+ const uint8_t *out;
+ ssize_t nread;
+
+ hd.flags = NGTCP2_PKT_FLAG_LONG_FORM;
+ hd.type = NGTCP2_PKT_CLIENT_INITIAL;
+ hd.conn_id = 1000000009;
+ hd.pkt_num = 1000000007;
+ hd.version = 0xff;
+
+ s1.type = NGTCP2_FRAME_STREAM;
+ s1.stream.fin = 0;
+ s1.stream.stream_id = 0x00;
+ s1.stream.offset = 0x00;
+ s1.stream.datalen = 123;
+ s1.stream.data = ro;
+
+ s2.type = NGTCP2_FRAME_STREAM;
+ s2.stream.fin = 1;
+ s2.stream.stream_id = 0x01;
+ s2.stream.offset = 0x1000000009;
+ s2.stream.datalen = 255;
+ s2.stream.data = ro;
+
+ ngtcp2_upe_init(&upe, buf, sizeof(buf));
+ rv = ngtcp2_upe_encode_hd(&upe, &hd);
+
+ CU_ASSERT(0 == rv);
+
+ rv = ngtcp2_upe_encode_frame(&upe, &s1);
+
+ CU_ASSERT(0 == rv);
+
+ rv = ngtcp2_upe_encode_frame(&upe, &s2);
+
+ CU_ASSERT(0 == rv);
+
+ ngtcp2_upe_padding(&upe);
+
+ pktlen = ngtcp2_upe_final(&upe, &out);
+
+ CU_ASSERT(1024 == pktlen);
+ CU_ASSERT(buf == out);
+
+ /* Verify checksum */
+ rv = ngtcp2_pkt_verify(out, pktlen);
+
+ CU_ASSERT(0 == rv);
+
+ pktlen -= NGTCP2_PKT_MDLEN;
+
+ /* Let's decode packet */
+ nread = ngtcp2_pkt_decode_hd_long(&nhd, out, pktlen);
+
+ CU_ASSERT(NGTCP2_LONG_HEADERLEN == nread);
+ CU_ASSERT(hd.flags == nhd.flags);
+ CU_ASSERT(hd.type == nhd.type);
+ CU_ASSERT(hd.conn_id == nhd.conn_id);
+ CU_ASSERT(hd.pkt_num == nhd.pkt_num);
+ CU_ASSERT(hd.version == nhd.version);
+
+ out += nread;
+ pktlen -= (size_t)nread;
+
+ /* Read first STREAM frame */
+ nread = ngtcp2_pkt_decode_frame(&ns, out, pktlen);
+
+ CU_ASSERT(nread > 0);
+ CU_ASSERT(s1.type == ns.type);
+ CU_ASSERT(s1.stream.fin == ns.stream.fin);
+ CU_ASSERT(s1.stream.stream_id == ns.stream.stream_id);
+ CU_ASSERT(s1.stream.offset == ns.stream.offset);
+ CU_ASSERT(s1.stream.datalen == ns.stream.datalen);
+
+ out += nread;
+ pktlen -= (size_t)nread;
+
+ /* Read second STREAM frame */
+ nread = ngtcp2_pkt_decode_frame(&ns, out, pktlen);
+
+ CU_ASSERT(nread > 0);
+ CU_ASSERT(s2.type == ns.type);
+ CU_ASSERT(s2.stream.fin == ns.stream.fin);
+ CU_ASSERT(s2.stream.stream_id == ns.stream.stream_id);
+ CU_ASSERT(s2.stream.offset == ns.stream.offset);
+ CU_ASSERT(s2.stream.datalen == ns.stream.datalen);
+
+ out += nread;
+ pktlen -= (size_t)nread;
+
+ /* Read PADDING frames to the end */
+ nread = ngtcp2_pkt_decode_frame(&ns, out, pktlen);
+
+ CU_ASSERT(nread == (ssize_t)pktlen);
+ CU_ASSERT(NGTCP2_FRAME_PADDING == ns.type);
+ CU_ASSERT(pktlen == ns.padding.len);
+}
diff --git a/tests/ngtcp2_upe_test.h b/tests/ngtcp2_upe_test.h
new file mode 100644
index 0000000000000000000000000000000000000000..87292253e9232bef2497d79a958fd984ddb63298
--- /dev/null
+++ b/tests/ngtcp2_upe_test.h
@@ -0,0 +1,34 @@
+/*
+ * ngtcp2
+ *
+ * Copyright (c) 2017 ngtcp2 contributors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the
+ * "Software"), to deal in the Software without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Software, and to
+ * permit persons to whom the Software is furnished to do so, subject to
+ * the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+ * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+ * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+#ifndef NGTCP2_UPE_TEST_H
+#define NGTCP2_UPE_TEST_H
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif /* HAVE_CONFIG_H */
+
+void test_ngtcp2_upe_encode(void);
+
+#endif /* NGTCP2_UPE_TEST_H */