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

Small refactoring

This commit is contained in:
Tatsuhiro Tsujikawa 2012-02-24 00:04:35 +09:00
parent 769150d5f7
commit 9dbec4f2bf
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/spdylay_session.c
View File

@ -416,14 +416,13 @@ static int spdylay_session_is_reply_allowed(spdylay_session *session,
int32_t stream_id) int32_t stream_id)
{ {
spdylay_stream *stream = spdylay_session_get_stream(session, stream_id); spdylay_stream *stream = spdylay_session_get_stream(session, stream_id);
if(stream == NULL) { if(stream == NULL || (stream->shut_flags & SPDYLAY_SHUT_WR)) {
return 0; return 0;
} }
if(spdylay_session_is_my_stream_id(session, stream_id)) { if(spdylay_session_is_my_stream_id(session, stream_id)) {
return 0; return 0;
} else { } else {
return stream->state == SPDYLAY_STREAM_OPENING && return stream->state == SPDYLAY_STREAM_OPENING;
(stream->shut_flags & SPDYLAY_SHUT_WR) == 0;
} }
} }
@ -449,7 +448,7 @@ static int spdylay_session_is_data_allowed(spdylay_session *session,
int32_t stream_id) int32_t stream_id)
{ {
spdylay_stream *stream = spdylay_session_get_stream(session, stream_id); spdylay_stream *stream = spdylay_session_get_stream(session, stream_id);
if(stream == NULL) { if(stream == NULL || (stream->shut_flags & SPDYLAY_SHUT_WR)) {
return 0; return 0;
} }
if(stream->deferred_data != NULL) { if(stream->deferred_data != NULL) {
@ -467,11 +466,9 @@ static int spdylay_session_is_data_allowed(spdylay_session *session,
frames are sent. This is not desirable situation; we want to frames are sent. This is not desirable situation; we want to
close stream as soon as possible. To achieve this, we remove close stream as soon as possible. To achieve this, we remove
DATA frame before RST_STREAM. */ DATA frame before RST_STREAM. */
return stream->state != SPDYLAY_STREAM_CLOSING && return stream->state != SPDYLAY_STREAM_CLOSING;
(stream->shut_flags & SPDYLAY_SHUT_WR) == 0;
} else { } else {
return stream->state == SPDYLAY_STREAM_OPENED && return stream->state == SPDYLAY_STREAM_OPENED;
(stream->shut_flags & SPDYLAY_SHUT_WR) == 0;
} }
} }