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

Invoke on_invalid_frame_recv_callback on session failure

This commit is contained in:
Tatsuhiro Tsujikawa 2013-07-16 23:47:56 +09:00
parent f9911a6251
commit 76b430c26b
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/nghttp2_session.c
View File

@ -1429,10 +1429,8 @@ int nghttp2_session_on_syn_stream_received(nghttp2_session *session,
stream ID, it MUST issue connection error with error code stream ID, it MUST issue connection error with error code
PROTOCOL_ERROR */ PROTOCOL_ERROR */
if(session->callbacks.on_invalid_frame_recv_callback) { if(session->callbacks.on_invalid_frame_recv_callback) {
session->callbacks.on_invalid_frame_recv_callback(session, session->callbacks.on_invalid_frame_recv_callback
frame, (session, frame, NGHTTP2_PROTOCOL_ERROR, session->user_data);
NGHTTP2_PROTOCOL_ERROR,
session->user_data);
} }
return nghttp2_session_fail_session(session, NGHTTP2_PROTOCOL_ERROR); return nghttp2_session_fail_session(session, NGHTTP2_PROTOCOL_ERROR);
} else { } else {
@ -1499,10 +1497,7 @@ int nghttp2_session_on_syn_reply_received(nghttp2_session *session,
with multiple response headers? */ with multiple response headers? */
if(session->callbacks.on_invalid_frame_recv_callback) { if(session->callbacks.on_invalid_frame_recv_callback) {
session->callbacks.on_invalid_frame_recv_callback session->callbacks.on_invalid_frame_recv_callback
(session, (session, frame, NGHTTP2_PROTOCOL_ERROR, session->user_data);
frame,
NGHTTP2_PROTOCOL_ERROR,
session->user_data);
} }
return nghttp2_session_fail_session(session, NGHTTP2_PROTOCOL_ERROR); return nghttp2_session_fail_session(session, NGHTTP2_PROTOCOL_ERROR);
} }
@ -1713,6 +1708,10 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
return rv; return rv;
} }
} else { } else {
if(session->callbacks.on_invalid_frame_recv_callback) {
session->callbacks.on_invalid_frame_recv_callback
(session, frame, NGHTTP2_PROTOCOL_ERROR, session->user_data);
}
return nghttp2_session_fail_session(session, NGHTTP2_PROTOCOL_ERROR); return nghttp2_session_fail_session(session, NGHTTP2_PROTOCOL_ERROR);
} }
break; break;
@ -1727,6 +1726,10 @@ int nghttp2_session_on_settings_received(nghttp2_session *session,
} else if(session->remote_settings[entry->settings_id] == 1) { } else if(session->remote_settings[entry->settings_id] == 1) {
/* Re-enabling flow control is subject to connection-level /* Re-enabling flow control is subject to connection-level
error(?) */ error(?) */
if(session->callbacks.on_invalid_frame_recv_callback) {
session->callbacks.on_invalid_frame_recv_callback
(session, frame, NGHTTP2_PROTOCOL_ERROR, session->user_data);
}
return nghttp2_session_fail_session(session, return nghttp2_session_fail_session(session,
NGHTTP2_FLOW_CONTROL_ERROR); NGHTTP2_FLOW_CONTROL_ERROR);
} }
@ -1821,6 +1824,10 @@ int nghttp2_session_on_window_update_received(nghttp2_session *session,
} }
if(INT32_MAX - frame->window_update.window_size_increment < if(INT32_MAX - frame->window_update.window_size_increment <
session->window_size) { session->window_size) {
if(session->callbacks.on_invalid_frame_recv_callback) {
session->callbacks.on_invalid_frame_recv_callback
(session, frame, NGHTTP2_FLOW_CONTROL_ERROR, session->user_data);
}
return nghttp2_session_fail_session return nghttp2_session_fail_session
(session, NGHTTP2_FLOW_CONTROL_ERROR); (session, NGHTTP2_FLOW_CONTROL_ERROR);
} }