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

Allow transmission and reception of PRIORITY frame to a closed stream

This commit is contained in:
Tatsuhiro Tsujikawa 2014-06-07 18:36:58 +09:00
parent c46d3dafc6
commit bfaab30733
1 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
lib/nghttp2_session.c
View File

@ -99,6 +99,39 @@ static int state_reserved_local(nghttp2_session *session,
nghttp2_session_is_my_stream_id(session, stream->stream_id); nghttp2_session_is_my_stream_id(session, stream->stream_id);
} }
/*
* Checks whether received stream_id is valid.
* This function returns 1 if it succeeds, or 0.
*/
static int session_is_new_peer_stream_id(nghttp2_session *session,
int32_t stream_id)
{
if(stream_id == 0 || session->last_recv_stream_id >= stream_id) {
return 0;
}
if(session->server) {
return stream_id % 2 == 1;
} else {
return stream_id % 2 == 0;
}
}
static int session_detect_idle_stream(nghttp2_session *session,
int32_t stream_id)
{
/* Assume that stream object with stream_id does not exist */
if(nghttp2_session_is_my_stream_id(session, stream_id)) {
if(session->next_stream_id <= (uint32_t)stream_id) {
return 1;
}
return 0;
}
if(session_is_new_peer_stream_id(session, stream_id)) {
return 1;
}
return 0;
}
int nghttp2_session_terminate_session(nghttp2_session *session, int nghttp2_session_terminate_session(nghttp2_session *session,
nghttp2_error_code error_code) nghttp2_error_code error_code)
{ {
@ -1123,17 +1156,16 @@ static int session_predicate_priority_send
{ {
nghttp2_stream *stream; nghttp2_stream *stream;
stream = nghttp2_session_get_stream(session, stream_id); stream = nghttp2_session_get_stream(session, stream_id);
if(stream == NULL) {
return NGHTTP2_ERR_STREAM_CLOSED;
}
if(stream->state == NGHTTP2_STREAM_CLOSING) {
return NGHTTP2_ERR_STREAM_CLOSING;
}
/* PRIORITY must not be sent in reserved(local) */ /* PRIORITY must not be sent in reserved(local) */
if(stream) {
if(state_reserved_local(session, stream)) { if(state_reserved_local(session, stream)) {
return NGHTTP2_ERR_INVALID_STREAM_STATE; return NGHTTP2_ERR_INVALID_STREAM_STATE;
} }
/* Sending PRIORITY in reserved(remote) state is OK */ } else if(session_detect_idle_stream(session, stream_id)) {
return NGHTTP2_ERR_INVALID_STREAM_ID;
}
return 0; return 0;
} }
@ -2091,7 +2123,7 @@ static int session_after_frame_sent(nghttp2_session *session)
} }
case NGHTTP2_PRIORITY: { case NGHTTP2_PRIORITY: {
nghttp2_stream *stream; nghttp2_stream *stream;
stream = nghttp2_session_get_stream(session, frame->hd.stream_id); stream = nghttp2_session_get_stream_raw(session, frame->hd.stream_id);
if(!stream) { if(!stream) {
break; break;
} }
@ -2526,39 +2558,6 @@ static int session_call_on_header(nghttp2_session *session,
return 0; return 0;
} }
/*
* Checks whether received stream_id is valid.
* This function returns 1 if it succeeds, or 0.
*/
static int session_is_new_peer_stream_id(nghttp2_session *session,
int32_t stream_id)
{
if(stream_id == 0 || session->last_recv_stream_id >= stream_id) {
return 0;
}
if(session->server) {
return stream_id % 2 == 1;
} else {
return stream_id % 2 == 0;
}
}
static int session_detect_idle_stream(nghttp2_session *session,
int32_t stream_id)
{
/* Assume that stream object with stream_id does not exist */
if(nghttp2_session_is_my_stream_id(session, stream_id)) {
if(session->next_stream_id <= (uint32_t)stream_id) {
return 1;
}
return 0;
}
if(session_is_new_peer_stream_id(session, stream_id)) {
return 1;
}
return 0;
}
/* /*
* Handles frame size error. * Handles frame size error.
* *
@ -3078,7 +3077,7 @@ int nghttp2_session_on_priority_received(nghttp2_session *session,
return session_handle_invalid_connection(session, frame, return session_handle_invalid_connection(session, frame,
NGHTTP2_PROTOCOL_ERROR); NGHTTP2_PROTOCOL_ERROR);
} }
stream = nghttp2_session_get_stream(session, frame->hd.stream_id); stream = nghttp2_session_get_stream_raw(session, frame->hd.stream_id);
if(!stream) { if(!stream) {
if(session_detect_idle_stream(session, frame->hd.stream_id)) { if(session_detect_idle_stream(session, frame->hd.stream_id)) {
return session_handle_invalid_connection(session, frame, return session_handle_invalid_connection(session, frame,