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

Rename framebuflen as framerv, cause it is not a length

This commit is contained in:
Tatsuhiro Tsujikawa 2014-04-01 21:59:26 +09:00
parent f5ead55f0e
commit f2d945734e
2 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
lib/nghttp2_session.c
View File

@ -1476,7 +1476,7 @@ static int session_headers_add_pad(nghttp2_session *session,
static int nghttp2_session_prep_frame(nghttp2_session *session, static int nghttp2_session_prep_frame(nghttp2_session *session,
nghttp2_outbound_item *item) nghttp2_outbound_item *item)
{ {
ssize_t framebuflen = 0; ssize_t framerv = 0;
int rv; int rv;
if(item->frame_cat == NGHTTP2_CAT_CTRL) { if(item->frame_cat == NGHTTP2_CAT_CTRL) {
@ -1519,20 +1519,20 @@ static int nghttp2_session_prep_frame(nghttp2_session *session,
return rv; return rv;
} }
} }
framebuflen = nghttp2_frame_pack_headers(&session->aob.framebufs, framerv = nghttp2_frame_pack_headers(&session->aob.framebufs,
&frame->headers, &frame->headers,
&session->hd_deflater); &session->hd_deflater);
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
DEBUGF(fprintf(stderr, DEBUGF(fprintf(stderr,
"send: before padding, HEADERS serialized in %zd bytes\n", "send: before padding, HEADERS serialized in %zd bytes\n",
nghttp2_bufs_len(&session->aob.framebufs))); nghttp2_bufs_len(&session->aob.framebufs)));
framebuflen = session_headers_add_pad(session, frame); framerv = session_headers_add_pad(session, frame);
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
switch(frame->headers.cat) { switch(frame->headers.cat) {
@ -1568,18 +1568,18 @@ static int nghttp2_session_prep_frame(nghttp2_session *session,
if(rv != 0) { if(rv != 0) {
return rv; return rv;
} }
framebuflen = nghttp2_frame_pack_priority(&session->aob.framebufs, framerv = nghttp2_frame_pack_priority(&session->aob.framebufs,
&frame->priority); &frame->priority);
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
break; break;
} }
case NGHTTP2_RST_STREAM: case NGHTTP2_RST_STREAM:
framebuflen = nghttp2_frame_pack_rst_stream(&session->aob.framebufs, framerv = nghttp2_frame_pack_rst_stream(&session->aob.framebufs,
&frame->rst_stream); &frame->rst_stream);
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
break; break;
case NGHTTP2_SETTINGS: { case NGHTTP2_SETTINGS: {
@ -1587,10 +1587,10 @@ static int nghttp2_session_prep_frame(nghttp2_session *session,
if(rv != 0) { if(rv != 0) {
return rv; return rv;
} }
framebuflen = nghttp2_frame_pack_settings(&session->aob.framebufs, framerv = nghttp2_frame_pack_settings(&session->aob.framebufs,
&frame->settings); &frame->settings);
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
break; break;
} }
@ -1608,15 +1608,15 @@ static int nghttp2_session_prep_frame(nghttp2_session *session,
} }
frame->push_promise.promised_stream_id = session->next_stream_id; frame->push_promise.promised_stream_id = session->next_stream_id;
session->next_stream_id += 2; session->next_stream_id += 2;
framebuflen = nghttp2_frame_pack_push_promise(&session->aob.framebufs, framerv = nghttp2_frame_pack_push_promise(&session->aob.framebufs,
&frame->push_promise, &frame->push_promise,
&session->hd_deflater); &session->hd_deflater);
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
framebuflen = session_headers_add_pad(session, frame); framerv = session_headers_add_pad(session, frame);
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
stream = nghttp2_session_get_stream(session, frame->hd.stream_id); stream = nghttp2_session_get_stream(session, frame->hd.stream_id);
@ -1638,10 +1638,10 @@ static int nghttp2_session_prep_frame(nghttp2_session *session,
break; break;
} }
case NGHTTP2_PING: case NGHTTP2_PING:
framebuflen = nghttp2_frame_pack_ping(&session->aob.framebufs, framerv = nghttp2_frame_pack_ping(&session->aob.framebufs,
&frame->ping); &frame->ping);
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
break; break;
case NGHTTP2_WINDOW_UPDATE: { case NGHTTP2_WINDOW_UPDATE: {
@ -1650,10 +1650,10 @@ static int nghttp2_session_prep_frame(nghttp2_session *session,
if(rv != 0) { if(rv != 0) {
return rv; return rv;
} }
framebuflen = nghttp2_frame_pack_window_update(&session->aob.framebufs, framerv = nghttp2_frame_pack_window_update(&session->aob.framebufs,
&frame->window_update); &frame->window_update);
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
break; break;
} }
@ -1665,18 +1665,18 @@ static int nghttp2_session_prep_frame(nghttp2_session *session,
peer that last-stream-id. */ peer that last-stream-id. */
return NGHTTP2_ERR_GOAWAY_ALREADY_SENT; return NGHTTP2_ERR_GOAWAY_ALREADY_SENT;
} }
framebuflen = nghttp2_frame_pack_goaway(&session->aob.framebufs, framerv = nghttp2_frame_pack_goaway(&session->aob.framebufs,
&frame->goaway); &frame->goaway);
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
break; break;
case NGHTTP2_ALTSVC: case NGHTTP2_ALTSVC:
framebuflen = nghttp2_frame_pack_altsvc(&session->aob.framebufs, framerv = nghttp2_frame_pack_altsvc(&session->aob.framebufs,
&frame->altsvc); &frame->altsvc);
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
break; break;
@ -1724,17 +1724,17 @@ static int nghttp2_session_prep_frame(nghttp2_session *session,
nghttp2_active_outbound_item_reset(&session->aob); nghttp2_active_outbound_item_reset(&session->aob);
return NGHTTP2_ERR_DEFERRED; return NGHTTP2_ERR_DEFERRED;
} }
framebuflen = nghttp2_session_pack_data(session, framerv = nghttp2_session_pack_data(session,
&session->aob.framebufs, &session->aob.framebufs,
next_readmax, next_readmax,
data_frame); data_frame);
if(framebuflen == NGHTTP2_ERR_DEFERRED) { if(framerv == NGHTTP2_ERR_DEFERRED) {
nghttp2_stream_defer_data(stream, item, NGHTTP2_DEFERRED_NONE); nghttp2_stream_defer_data(stream, item, NGHTTP2_DEFERRED_NONE);
session->aob.item = NULL; session->aob.item = NULL;
nghttp2_active_outbound_item_reset(&session->aob); nghttp2_active_outbound_item_reset(&session->aob);
return NGHTTP2_ERR_DEFERRED; return NGHTTP2_ERR_DEFERRED;
} }
if(framebuflen == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) { if(framerv == NGHTTP2_ERR_TEMPORAL_CALLBACK_FAILURE) {
rv = nghttp2_stream_detach_data(stream, &session->ob_pq); rv = nghttp2_stream_detach_data(stream, &session->ob_pq);
if(nghttp2_is_fatal(rv)) { if(nghttp2_is_fatal(rv)) {
@ -1746,10 +1746,10 @@ static int nghttp2_session_prep_frame(nghttp2_session *session,
if(rv != 0) { if(rv != 0) {
return rv; return rv;
} }
return framebuflen; return framerv;
} }
if(framebuflen < 0) { if(framerv < 0) {
return framebuflen; return framerv;
} }
return 0; return 0;
} else { } else {
@ -2161,7 +2161,7 @@ static int nghttp2_session_after_frame_sent(nghttp2_session *session)
return 0; return 0;
} }
assert(rv >= 0); assert(rv == 0);
return 0; return 0;
} }
@ -5358,7 +5358,7 @@ int nghttp2_session_add_settings(nghttp2_session *session, uint8_t flags,
return 0; return 0;
} }
ssize_t nghttp2_session_pack_data(nghttp2_session *session, int nghttp2_session_pack_data(nghttp2_session *session,
nghttp2_bufs *bufs, nghttp2_bufs *bufs,
size_t datamax, size_t datamax,
nghttp2_private_data *frame) nghttp2_private_data *frame)
@ -5446,7 +5446,7 @@ ssize_t nghttp2_session_pack_data(nghttp2_session *session,
frame->hd.flags |= hd.flags; frame->hd.flags |= hd.flags;
frame->padlen = padlen; frame->padlen = padlen;
return nghttp2_buf_len(buf); return 0;
} }
void* nghttp2_session_get_stream_user_data(nghttp2_session *session, void* nghttp2_session_get_stream_user_data(nghttp2_session *session,

6
lib/nghttp2_session.h
View File

@ -621,8 +621,8 @@ nghttp2_stream_group* nghttp2_session_get_stream_group
* filled using |frame->data_prd|. The length of payload is at most * filled using |frame->data_prd|. The length of payload is at most
* |datamax| bytes. * |datamax| bytes.
* *
* This function returns the size of packed frame if it succeeds, or * This function returns 0 if it succeeds, or one of the following
* one of the following negative error codes: * negative error codes:
* *
* NGHTTP2_ERR_DEFERRED * NGHTTP2_ERR_DEFERRED
* The DATA frame is postponed. * The DATA frame is postponed.
@ -633,7 +633,7 @@ nghttp2_stream_group* nghttp2_session_get_stream_group
* NGHTTP2_ERR_CALLBACK_FAILURE * NGHTTP2_ERR_CALLBACK_FAILURE
* The read_callback failed (session error). * The read_callback failed (session error).
*/ */
ssize_t nghttp2_session_pack_data(nghttp2_session *session, int nghttp2_session_pack_data(nghttp2_session *session,
nghttp2_bufs *bufs, nghttp2_bufs *bufs,
size_t datamax, size_t datamax,
nghttp2_private_data *frame); nghttp2_private_data *frame);