walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed: if bytes of one frame are received in several chunks, unpacking fails.

This commit is contained in:
Tatsuhiro Tsujikawa 2012-02-19 00:05:52 +09:00
parent 03307116a2
commit 4f28698572
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/spdylay_session.c
View File

@ -1572,7 +1572,8 @@ int spdylay_session_recv(spdylay_session *session)
bufavail = spdylay_inbound_buffer_avail(&session->ibuf); bufavail = spdylay_inbound_buffer_avail(&session->ibuf);
readlen = bufavail < rempayloadlen ? bufavail : rempayloadlen; readlen = bufavail < rempayloadlen ? bufavail : rempayloadlen;
if(spdylay_frame_is_ctrl_frame(session->iframe.headbuf[0])) { if(spdylay_frame_is_ctrl_frame(session->iframe.headbuf[0])) {
memcpy(session->iframe.buf, session->ibuf.mark, readlen); memcpy(session->iframe.buf+session->iframe.off,
session->ibuf.mark, readlen);
} else if(session->callbacks.on_data_chunk_recv_callback) { } else if(session->callbacks.on_data_chunk_recv_callback) {
int32_t stream_id; int32_t stream_id;
uint8_t flags; uint8_t flags;

23
tests/spdylay_session_test.c
View File

@ -181,10 +181,7 @@ static char** dup_nv(const char **src)
void test_spdylay_session_recv() void test_spdylay_session_recv()
{ {
spdylay_session *session; spdylay_session *session;
spdylay_session_callbacks callbacks = { spdylay_session_callbacks callbacks;
NULL,
scripted_recv_callback
};
scripted_data_feed df; scripted_data_feed df;
my_user_data user_data; my_user_data user_data;
const char *nv[] = { const char *nv[] = {
@ -194,21 +191,33 @@ void test_spdylay_session_recv()
size_t framedatalen = 0, nvbuflen = 0; size_t framedatalen = 0, nvbuflen = 0;
ssize_t framelen; ssize_t framelen;
spdylay_frame frame; spdylay_frame frame;
int i;
memset(&callbacks, 0, sizeof(spdylay_session_callbacks));
callbacks.recv_callback = scripted_recv_callback;
callbacks.on_ctrl_recv_callback = on_ctrl_recv_callback;
user_data.df = &df; user_data.df = &df;
spdylay_session_client_new(&session, &callbacks, &user_data); spdylay_session_server_new(&session, &callbacks, &user_data);
spdylay_frame_syn_stream_init(&frame.syn_stream, SPDYLAY_FLAG_NONE, 0, 0, 3, spdylay_frame_syn_stream_init(&frame.syn_stream, SPDYLAY_FLAG_NONE, 1, 0, 3,
dup_nv(nv)); dup_nv(nv));
framelen = spdylay_frame_pack_syn_stream(&framedata, &framedatalen, framelen = spdylay_frame_pack_syn_stream(&framedata, &framedatalen,
&nvbuf, &nvbuflen, &nvbuf, &nvbuflen,
&frame.syn_stream, &frame.syn_stream,
&session->hd_deflater); &session->hd_deflater);
scripted_data_feed_init(&df, framedata, framelen); scripted_data_feed_init(&df, framedata, framelen);
/* Send 1 byte per each read */
for(i = 0; i < framelen; ++i) {
df.feedseq[i] = 1;
}
free(framedata); free(framedata);
free(nvbuf); free(nvbuf);
spdylay_frame_syn_stream_free(&frame.syn_stream); spdylay_frame_syn_stream_free(&frame.syn_stream);
CU_ASSERT(0 == spdylay_session_recv(session)); user_data.ctrl_recv_cb_called = 0;
while(df.seqidx < framelen) {
CU_ASSERT(0 == spdylay_session_recv(session));
}
CU_ASSERT(1 == user_data.ctrl_recv_cb_called);
spdylay_session_del(session); spdylay_session_del(session);
} }