Add int return value to nghttp2_on_frame_recv_parse_error_callback

This commit is contained in:
Tatsuhiro Tsujikawa
2013-08-29 23:07:07 +09:00
parent 053c444769
commit db4f519500
6 changed files with 34 additions and 24 deletions

View File

@@ -950,8 +950,13 @@ typedef int (*nghttp2_on_request_recv_callback)
* The |payloadlen| is the length of the |payload|. This is the data
* after the length field. The |lib_error_code| is one of the error code
* defined in :enum:`nghttp2_error` and indicates the error.
*
* The implementation of this function must return 0 if it
* succeeds. If nonzero is returned, it is treated as fatal error and
* `nghttp2_session_recv()` and `nghttp2_session_send()` functions
* immediately return :enum:`NGHTTP2_ERR_CALLBACK_FAILURE`.
*/
typedef void (*nghttp2_on_frame_recv_parse_error_callback)
typedef int (*nghttp2_on_frame_recv_parse_error_callback)
(nghttp2_session *session, nghttp2_frame_type type,
const uint8_t *head, size_t headlen,
const uint8_t *payload, size_t payloadlen,

View File

@@ -1681,15 +1681,17 @@ static int nghttp2_session_handle_parse_error(nghttp2_session *session,
nghttp2_error_code error_code)
{
if(session->callbacks.on_frame_recv_parse_error_callback) {
session->callbacks.on_frame_recv_parse_error_callback
(session,
type,
session->iframe.headbuf,
sizeof(session->iframe.headbuf),
session->iframe.buf,
session->iframe.buflen,
lib_error_code,
session->user_data);
if(session->callbacks.on_frame_recv_parse_error_callback
(session,
type,
session->iframe.headbuf,
sizeof(session->iframe.headbuf),
session->iframe.buf,
session->iframe.buflen,
lib_error_code,
session->user_data) != 0) {
return NGHTTP2_ERR_CALLBACK_FAILURE;
}
}
return nghttp2_session_fail_session(session, error_code);
}