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

Move frame_type parameter in front of stream_id 

This commit moves frame_type parameter of
nghttp2_data_soruce_read_length_callback in front of stream_id
parameter.  The motivation is that other callback is generally put
frame related parameters first.  To make it consistent, we move
frame_type, which is frame ralted parameter, to the left.
This commit is contained in:
Tatsuhiro Tsujikawa 2014-08-25 22:31:11 +09:00
parent 93b4d9efc3
commit 0b1ab90fb8
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/includes/nghttp2/nghttp2.h
View File

@ -1444,11 +1444,10 @@ typedef ssize_t (*nghttp2_select_padding_callback)
* `nghttp2_session_callbacks_set_data_source_read_length_callback()`. * `nghttp2_session_callbacks_set_data_source_read_length_callback()`.
*/ */
typedef ssize_t (*nghttp2_data_source_read_length_callback) typedef ssize_t (*nghttp2_data_source_read_length_callback)
(nghttp2_session *session, int32_t stream_id, (nghttp2_session *session, uint8_t frame_type, int32_t stream_id,
int32_t session_remote_window_size, int32_t session_remote_window_size,
int32_t stream_remote_window_size, int32_t stream_remote_window_size,
uint32_t remote_max_frame_size, uint32_t remote_max_frame_size,
uint8_t frame_type,
void *user_data); void *user_data);
/** /**

5
lib/nghttp2_session.c
View File

@ -5642,9 +5642,10 @@ int nghttp2_session_pack_data(nghttp2_session *session,
return NGHTTP2_ERR_INVALID_ARGUMENT; return NGHTTP2_ERR_INVALID_ARGUMENT;
} }
payloadlen = session->callbacks.read_length_callback(session, stream->stream_id, payloadlen = session->callbacks.read_length_callback
(session, frame->hd.type, stream->stream_id,
session->remote_window_size, stream->remote_window_size, session->remote_window_size, stream->remote_window_size,
session->remote_settings.max_frame_size, frame->hd.type, session->user_data); session->remote_settings.max_frame_size, session->user_data);
DEBUGF(fprintf(stderr, "send: read_length_callback=%zd\n", payloadlen)); DEBUGF(fprintf(stderr, "send: read_length_callback=%zd\n", payloadlen));
payloadlen = nghttp2_session_enforce_flow_control_limits(session, stream, payloadlen); payloadlen = nghttp2_session_enforce_flow_control_limits(session, stream, payloadlen);
DEBUGF(fprintf(stderr, "send: read_length_callback after flow control=%zd\n", payloadlen)); DEBUGF(fprintf(stderr, "send: read_length_callback after flow control=%zd\n", payloadlen));

8
tests/nghttp2_session_test.c
View File

@ -239,16 +239,16 @@ static ssize_t select_padding_callback(nghttp2_session *session,
} }
static ssize_t too_large_data_source_length_callback static ssize_t too_large_data_source_length_callback
(nghttp2_session *session, int32_t stream_id, (nghttp2_session *session, uint8_t frame_type, int32_t stream_id,
int32_t session_remote_window_size, int32_t stream_remote_window_size, int32_t session_remote_window_size, int32_t stream_remote_window_size,
uint32_t remote_max_frame_size, uint8_t frame_type, void *user_data) { uint32_t remote_max_frame_size, void *user_data) {
return NGHTTP2_MAX_FRAME_SIZE_MAX + 1; return NGHTTP2_MAX_FRAME_SIZE_MAX + 1;
} }
static ssize_t smallest_length_data_source_length_callback static ssize_t smallest_length_data_source_length_callback
(nghttp2_session *session, int32_t stream_id, (nghttp2_session *session, uint8_t frame_type, int32_t stream_id,
int32_t session_remote_window_size, int32_t stream_remote_window_size, int32_t session_remote_window_size, int32_t stream_remote_window_size,
uint32_t remote_max_frame_size, uint8_t frame_type, void *user_data) { uint32_t remote_max_frame_size, void *user_data) {
return 1; return 1;
} }