p
/
json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 2 Wiki Activity

Wrap request::write_cb in a function

This commit is contained in:
Přemysl Eric Janouch 2018-10-17 23:34:59 +02:00
parent cf56921c4e
commit 253e35e1e4
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
demo-json-rpc-server.c
View File

@ -1563,6 +1563,13 @@ request_free (struct request *self)
self->handler->finalize_cb (self); self->handler->finalize_cb (self);
} }
/// Write request CGI response data, intended for use by request handlers
static void
request_write (struct request *self, const void *data, size_t len)
{
self->write_cb (self, data, len);
}
/// This function is only intended to be run from asynchronous event handlers /// This function is only intended to be run from asynchronous event handlers
/// such as timers, not as a direct result of starting the request or receiving /// such as timers, not as a direct result of starting the request or receiving
/// request data. CALLING THIS MAY CAUSE THE REQUEST TO BE DESTROYED. /// request data. CALLING THIS MAY CAUSE THE REQUEST TO BE DESTROYED.
@ -1599,7 +1606,7 @@ request_start (struct request *self, struct str_map *headers)
struct str response = str_make (); struct str response = str_make ();
str_append (&response, "Status: 404 Not Found\n"); str_append (&response, "Status: 404 Not Found\n");
str_append (&response, "Content-Type: text/plain\n\n"); str_append (&response, "Content-Type: text/plain\n\n");
self->write_cb (self, response.str, response.len); request_write (self, response.str, response.len);
str_free (&response); str_free (&response);
return false; return false;
} }
@ -1654,7 +1661,7 @@ request_handler_json_rpc_push
str_append (&response, "Status: 200 OK\n"); str_append (&response, "Status: 200 OK\n");
str_append_printf (&response, "Content-Type: %s\n\n", "application/json"); str_append_printf (&response, "Content-Type: %s\n\n", "application/json");
process_json_rpc (request->ctx, buf->str, buf->len, &response); process_json_rpc (request->ctx, buf->str, buf->len, &response);
request->write_cb (request, response.str, response.len); request_write (request, response.str, response.len);
str_free (&response); str_free (&response);
return false; return false;
} }
@ -1770,7 +1777,7 @@ request_handler_static_try_handle
str_append (&response, "Content-Type: text/plain\n\n"); str_append (&response, "Content-Type: text/plain\n\n");
str_append_printf (&response, str_append_printf (&response,
"File %s was not found on this server\n", suffix); "File %s was not found on this server\n", suffix);
request->write_cb (request, response.str, response.len); request_write (request, response.str, response.len);
str_free (&response); str_free (&response);
free (suffix); free (suffix);
@ -1794,17 +1801,17 @@ request_handler_static_try_handle
struct str response = str_make (); struct str response = str_make ();
str_append (&response, "Status: 200 OK\n"); str_append (&response, "Status: 200 OK\n");
str_append_printf (&response, "Content-Type: %s\n\n", mime_type); str_append_printf (&response, "Content-Type: %s\n\n", mime_type);
request->write_cb (request, response.str, response.len); request_write (request, response.str, response.len);
str_free (&response); str_free (&response);
free (mime_type); free (mime_type);
// Write the chunk we've used to help us with magic detection; // Write the chunk we've used to help us with magic detection;
// obviously we have to do it after we've written the headers // obviously we have to do it after we've written the headers
if (len) if (len)
request->write_cb (request, buf, len); request_write (request, buf, len);
while ((len = fread (buf, 1, sizeof buf, fp))) while ((len = fread (buf, 1, sizeof buf, fp)))
request->write_cb (request, buf, len); request_write (request, buf, len);
fclose (fp); fclose (fp);
// TODO: this should rather not be returned all at once but in chunks; // TODO: this should rather not be returned all at once but in chunks;