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

Added SETTINGS send/recv. Added missing RST_STREAM send.

This commit is contained in:
Tatsuhiro Tsujikawa 2012-02-01 01:12:26 +09:00
parent 0b75800c23
commit f429cc45cb
2 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/spdylay_session.c
View File

@ -145,6 +145,9 @@ static void spdylay_outbound_item_free(spdylay_outbound_item *item)
case SPDYLAY_RST_STREAM: case SPDYLAY_RST_STREAM:
spdylay_frame_rst_stream_free(&item->frame->rst_stream); spdylay_frame_rst_stream_free(&item->frame->rst_stream);
break; break;
case SPDYLAY_SETTINGS:
spdylay_frame_settings_free(&item->frame->settings);
break;
case SPDYLAY_NOOP: case SPDYLAY_NOOP:
/* We don't have any public API to add NOOP, so here is /* We don't have any public API to add NOOP, so here is
unreachable. */ unreachable. */
@ -222,6 +225,9 @@ int spdylay_session_add_frame(spdylay_session *session,
} }
break; break;
} }
case SPDYLAY_SETTINGS:
/* Should SPDYLAY_SETTINGS have higher priority? */
break;
case SPDYLAY_NOOP: case SPDYLAY_NOOP:
/* We don't have any public API to add NOOP, so here is /* We don't have any public API to add NOOP, so here is
unreachable. */ unreachable. */
@ -403,6 +409,20 @@ ssize_t spdylay_session_prep_frame(spdylay_session *session,
} }
break; break;
} }
case SPDYLAY_RST_STREAM:
framebuflen = spdylay_frame_pack_rst_stream(&framebuf,
&item->frame->rst_stream);
if(framebuflen < 0) {
return framebuflen;
}
break;
case SPDYLAY_SETTINGS:
framebuflen = spdylay_frame_pack_settings(&framebuf,
&item->frame->settings);
if(framebuflen < 0) {
return framebuflen;
}
break;
case SPDYLAY_NOOP: case SPDYLAY_NOOP:
/* We don't have any public API to add NOOP, so here is /* We don't have any public API to add NOOP, so here is
unreachable. */ unreachable. */
@ -535,6 +555,9 @@ static int spdylay_session_after_frame_sent(spdylay_session *session)
spdylay_session_close_stream(session, frame->rst_stream.stream_id, spdylay_session_close_stream(session, frame->rst_stream.stream_id,
frame->rst_stream.status_code); frame->rst_stream.status_code);
break; break;
case SPDYLAY_SETTINGS:
/* nothing to do */
break;
case SPDYLAY_NOOP: case SPDYLAY_NOOP:
/* We don't have any public API to add NOOP, so here is /* We don't have any public API to add NOOP, so here is
unreachable. */ unreachable. */
@ -865,6 +888,14 @@ int spdylay_session_on_rst_stream_received(spdylay_session *session,
return 0; return 0;
} }
int spdylay_session_on_settings_received(spdylay_session *session,
spdylay_frame *frame)
{
/* TODO Check ID/value pairs and persist them if necessary. */
spdylay_session_call_on_ctrl_frame_received(session, SPDYLAY_SETTINGS, frame);
return 0;
}
int spdylay_session_on_ping_received(spdylay_session *session, int spdylay_session_on_ping_received(spdylay_session *session,
spdylay_frame *frame) spdylay_frame *frame)
{ {
@ -990,6 +1021,17 @@ static int spdylay_session_process_ctrl_frame(spdylay_session *session)
spdylay_frame_rst_stream_free(&frame.rst_stream); spdylay_frame_rst_stream_free(&frame.rst_stream);
} }
break; break;
case SPDYLAY_SETTINGS:
r = spdylay_frame_unpack_settings(&frame.settings,
session->iframe.headbuf,
sizeof(session->iframe.headbuf),
session->iframe.buf,
session->iframe.len);
if(r == 0) {
r = spdylay_session_on_settings_received(session, &frame);
spdylay_frame_settings_free(&frame.settings);
}
break;
case SPDYLAY_NOOP: case SPDYLAY_NOOP:
break; break;
case SPDYLAY_PING: case SPDYLAY_PING:

6
lib/spdylay_session.h
View File

@ -202,6 +202,12 @@ int spdylay_session_on_syn_reply_received(spdylay_session *session,
int spdylay_session_on_rst_stream_received(spdylay_session *session, int spdylay_session_on_rst_stream_received(spdylay_session *session,
spdylay_frame *frame); spdylay_frame *frame);
/*
* Called when SETTINGS is received. Received frame is |frame|.
*/
int spdylay_session_on_settings_received(spdylay_session *session,
spdylay_frame *frame);
/* /*
* Called when PING is received. Received frame is |frame|. * Called when PING is received. Received frame is |frame|.
*/ */