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

Refactoring

Browse Source
This commit is contained in:
Přemysl Eric Janouch 2015-03-10 20:48:25 +01:00
parent 5885d1aa69
commit 3c0e48a429
1 changed files with 57 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1203,9 +1203,7 @@ ws_parser_push (struct ws_parser *self, const void *data, size_t len)
else if (self->payload_len == 126) else if (self->payload_len == 126)
self->state = WS_PARSER_PAYLOAD_LEN_16; self->state = WS_PARSER_PAYLOAD_LEN_16;
else else
self->state = self->is_masked self->state = WS_PARSER_MASK;
? WS_PARSER_MASK
: WS_PARSER_PAYLOAD;
str_remove_slice (&self->input, 0, 2); str_remove_slice (&self->input, 0, 2);
break; break;
@ -1217,9 +1215,7 @@ ws_parser_push (struct ws_parser *self, const void *data, size_t len)
(void) msg_unpacker_u16 (&unpacker, &u16); (void) msg_unpacker_u16 (&unpacker, &u16);
self->payload_len = u16; self->payload_len = u16;
self->state = self->is_masked self->state = WS_PARSER_MASK;
? WS_PARSER_MASK
: WS_PARSER_PAYLOAD;
str_remove_slice (&self->input, 0, 2); str_remove_slice (&self->input, 0, 2);
break; break;
@ -1229,13 +1225,16 @@ ws_parser_push (struct ws_parser *self, const void *data, size_t len)
(void) msg_unpacker_u64 (&unpacker, &self->payload_len); (void) msg_unpacker_u64 (&unpacker, &self->payload_len);
self->state = self->is_masked self->state = WS_PARSER_MASK;
? WS_PARSER_MASK
: WS_PARSER_PAYLOAD;
str_remove_slice (&self->input, 0, 8); str_remove_slice (&self->input, 0, 8);
break; break;
case WS_PARSER_MASK: case WS_PARSER_MASK:
if (!self->is_masked)
{
self->state = WS_PARSER_PAYLOAD;
break;
}
if (self->input.len < 4) if (self->input.len < 4)
return true; return true;
@ -2416,52 +2415,53 @@ error:
} }
static void static void
on_client_available (EV_P_ ev_io *watcher, int revents) make_client (EV_P_ struct client_impl *impl, int sock_fd)
{ {
struct server_context *ctx = ev_userdata (loop); struct server_context *ctx = ev_userdata (loop);
set_blocking (sock_fd, false);
struct client *client = xmalloc (sizeof *client);
client_init (client);
client->socket_fd = sock_fd;
client->impl = impl;
ev_io_init (&client->read_watcher, on_client_ready, sock_fd, EV_READ);
ev_io_init (&client->write_watcher, on_client_ready, sock_fd, EV_WRITE);
client->read_watcher.data = client;
client->write_watcher.data = client;
// We're only interested in reading as the write queue is empty now
ev_io_start (EV_A_ &client->read_watcher);
// Initialize the higher-level implementation
client->impl->init (client);
LIST_PREPEND (ctx->clients, client);
ctx->n_clients++;
}
static void
on_client_available (EV_P_ ev_io *watcher, int revents)
{
struct listener *listener = watcher->data; struct listener *listener = watcher->data;
(void) revents; (void) revents;
while (true) while (true)
{ {
int sock_fd = accept (watcher->fd, NULL, NULL); int sock_fd = accept (watcher->fd, NULL, NULL);
if (sock_fd == -1) if (sock_fd != -1)
{ make_client (EV_A_ listener->impl, sock_fd);
if (errno == EAGAIN) else if (errno == EAGAIN)
break; return;
if (errno == EINTR else if (errno != EINTR && errno != ECONNABORTED)
|| errno == ECONNABORTED)
continue;
// Stop accepting connections to prevent busy looping
ev_io_stop (EV_A_ watcher);
print_fatal ("%s: %s", "accept", strerror (errno));
// TODO: initiate_quit (ctx);
break; break;
}
set_blocking (sock_fd, false);
struct client *client = xmalloc (sizeof *client);
client_init (client);
client->socket_fd = sock_fd;
client->impl = listener->impl;
ev_io_init (&client->read_watcher, on_client_ready, sock_fd, EV_READ);
ev_io_init (&client->write_watcher, on_client_ready, sock_fd, EV_WRITE);
client->read_watcher.data = client;
client->write_watcher.data = client;
// We're only interested in reading as the write queue is empty now
ev_io_start (EV_A_ &client->read_watcher);
// Initialize the higher-level implementation
client->impl->init (client);
LIST_PREPEND (ctx->clients, client);
ctx->n_clients++;
} }
// Stop accepting connections to prevent busy looping
ev_io_stop (EV_A_ watcher);
print_fatal ("%s: %s", "accept", strerror (errno));
// TODO: initiate_quit (ctx);
} }
// --- Application setup ------------------------------------------------------- // --- Application setup -------------------------------------------------------
@ -2520,7 +2520,7 @@ listener_finish (struct addrinfo *gai_iter)
static void static void
listener_add (struct server_context *ctx, const char *host, const char *port, listener_add (struct server_context *ctx, const char *host, const char *port,
struct addrinfo *gai_hints, struct client_impl *impl) const struct addrinfo *gai_hints, struct client_impl *impl)
{ {
struct addrinfo *gai_result, *gai_iter; struct addrinfo *gai_result, *gai_iter;
int err = getaddrinfo (host, port, gai_hints, &gai_result); int err = getaddrinfo (host, port, gai_hints, &gai_result);
@ -2553,29 +2553,27 @@ listener_add (struct server_context *ctx, const char *host, const char *port,
static bool static bool
setup_listen_fds (struct server_context *ctx, struct error **e) setup_listen_fds (struct server_context *ctx, struct error **e)
{ {
static const struct addrinfo gai_hints =
{
.ai_socktype = SOCK_STREAM,
.ai_flags = AI_PASSIVE,
};
const char *bind_host = str_map_find (&ctx->config, "bind_host"); const char *bind_host = str_map_find (&ctx->config, "bind_host");
const char *port_fcgi = str_map_find (&ctx->config, "port_fastcgi"); const char *port_fcgi = str_map_find (&ctx->config, "port_fastcgi");
const char *port_scgi = str_map_find (&ctx->config, "port_scgi"); const char *port_scgi = str_map_find (&ctx->config, "port_scgi");
const char *port_ws = str_map_find (&ctx->config, "port_ws"); const char *port_ws = str_map_find (&ctx->config, "port_ws");
struct addrinfo gai_hints;
memset (&gai_hints, 0, sizeof gai_hints);
gai_hints.ai_socktype = SOCK_STREAM;
gai_hints.ai_flags = AI_PASSIVE;
struct str_vector ports_fcgi; str_vector_init (&ports_fcgi); struct str_vector ports_fcgi; str_vector_init (&ports_fcgi);
struct str_vector ports_scgi; str_vector_init (&ports_scgi); struct str_vector ports_scgi; str_vector_init (&ports_scgi);
struct str_vector ports_ws; str_vector_init (&ports_ws); struct str_vector ports_ws; str_vector_init (&ports_ws);
if (port_fcgi) if (port_fcgi) split_str_ignore_empty (port_fcgi, ',', &ports_fcgi);
split_str_ignore_empty (port_fcgi, ',', &ports_fcgi); if (port_scgi) split_str_ignore_empty (port_scgi, ',', &ports_scgi);
if (port_scgi) if (port_ws) split_str_ignore_empty (port_ws, ',', &ports_ws);
split_str_ignore_empty (port_scgi, ',', &ports_scgi);
if (port_ws)
split_str_ignore_empty (port_ws, ',', &ports_ws);
size_t n_ports = ports_fcgi.len + ports_scgi.len; size_t n_ports = ports_fcgi.len + ports_scgi.len + ports_ws.len;
ctx->listeners = xcalloc (n_ports, sizeof *ctx->listeners); ctx->listeners = xcalloc (n_ports, sizeof *ctx->listeners);
for (size_t i = 0; i < ports_fcgi.len; i++) for (size_t i = 0; i < ports_fcgi.len; i++)