commit - 80eac8c7533dc64510f07bd63e921eca403be4f1
commit + 64f3fabf64caccc3f568e34b05fa33ac14376156
blob - 1ff02eb5fc4b80ce98db79c0633d872c966804f1
blob + 7cf3fdc8ae66434c30e781cf46428d9468615549
--- thingsd/client.c
+++ thingsd/client.c
extern volatile int client_inflight;
extern enum privsep_procid privsep_process;
-void bufferevent_read_pressure_cb(struct evbuffer *, size_t, size_t,
- void *);
void client_write_to_things(struct packages *);
void
}
void
-client_tls_readcb(int fd, short event, void *arg)
-{
- struct client *client = (struct client *)arg;
- struct bufferevent *bufev = client->bev;
- char pkt[PKT_BUFF];
- ssize_t ret;
- size_t len;
- int toread = EVBUFFER_READ;
-
- memset(pkt, 0, sizeof(pkt));
-
- ret = tls_read(client->tls_ctx, pkt, PKT_BUFF);
- if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) {
- goto retry;
- } else if (ret < 0) {
- toread |= EVBUFFER_ERROR;
- goto err;
- }
-
- len = ret;
- if (len == 0) {
- toread |= EVBUFFER_EOF;
- goto err;
- }
-
- if (evbuffer_add(bufev->input, pkt, len) == -1) {
- toread |= EVBUFFER_ERROR;
- goto err;
- }
-
- event_add(&bufev->ev_read, NULL);
-
- len = EVBUFFER_LENGTH(bufev->input);
- if (bufev->wm_read.low != 0 && len < bufev->wm_read.low)
- return;
-
- if (bufev->wm_read.high != 0 && len > bufev->wm_read.high) {
- struct evbuffer *buf = bufev->input;
- event_del(&bufev->ev_read);
- evbuffer_setcb(buf, bufferevent_read_pressure_cb, bufev);
- return;
- }
-
- if (bufev->readcb != NULL)
- (*bufev->readcb)(bufev, bufev->cbarg);
-
- return;
-retry:
- event_del(&bufev->ev_read);
- event_add(&bufev->ev_read, NULL);
- return;
-err:
- (*bufev->errorcb)(bufev, toread, bufev->cbarg);
-}
-
-void
-client_tls_writecb(int fd, short event, void *arg)
-{
- struct client *client = (struct client *)arg;
- struct bufferevent *bufev = client->bev;
- ssize_t ret;
- size_t len;
- int towrite = EVBUFFER_WRITE;
-
- if (EVBUFFER_LENGTH(bufev->output)) {
- if (client == NULL)
- return;
-
- ret = tls_write(client->tls_ctx,
- EVBUFFER_DATA(bufev->output),
- EVBUFFER_LENGTH(bufev->output));
-
- if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) {
- goto retry;
- } else if (ret < 0) {
- towrite |= EVBUFFER_ERROR;
- goto err;
- }
-
- len = ret;
- evbuffer_drain(bufev->output, len);
- }
-
- if (EVBUFFER_LENGTH(bufev->output) != 0) {
- event_del(&bufev->ev_write);
- event_add(&bufev->ev_write, NULL);
- }
-
- if (bufev->writecb != NULL && EVBUFFER_LENGTH(bufev->output) <=
- bufev->wm_write.low)
- (*bufev->writecb)(bufev, bufev->cbarg);
-
- return;
-retry:
- event_del(&bufev->ev_write);
- event_add(&bufev->ev_write, NULL);
- return;
-err:
- (*bufev->errorcb)(bufev, towrite, bufev->cbarg);
-}
-
-void
client_err(struct bufferevent *bev, short error, void *arg)
{
struct client *client = (struct client *)arg;
blob - 768cca12fb81e2e7dc140051df0bfb0716430769
blob + 9f1fe9e22d4697416a8270af940344b9e9319e4f
--- thingsd/examples/clients/c/tls_client.c
+++ thingsd/examples/clients/c/tls_client.c
int sd, i, w, written;
struct tls_config *tls_cfg = NULL;
struct tls *tls_ctx = NULL;
- char pkt[] = "~~~subscribe{{name,\"thgtstr\"},{things{thing{\"thing2\",\"Mother\"}}}}";
+ char pkt[] = "~~~subscribe{{name,\"thgtstr2\"},{things{thing{\"thing4\",\"pass_thing\"}}}}";
if (argc != 4)
usage();
blob - 47bc5e09e96ddd2bce598e364af5667863253b2f
blob + 4d8a3787ab8628023b7a2d171a2505c32e2165ac
--- thingsd/sockets.c
+++ thingsd/sockets.c
volatile int client_inflight = 0;
+void bufferevent_read_pressure_cb(struct evbuffer *, size_t, size_t,
+ void *);
+
int sockets_dispatch_thingsd(int, struct privsep_proc *, struct imsg *);
int sockets_socket_af(struct sockaddr_storage *, struct portrange);
int sockets_accept_reserve(int, struct sockaddr *, socklen_t *, int,
void sockets_show_info(struct privsep *, struct imsg *);
void sockets_show_clients_info(struct privsep *, struct imsg *);
void sockets_kill_client(struct privsep *, struct imsg *);
+void sockets_tls_readcb(int, short, void *);
+void sockets_tls_writecb(int, short, void *);
struct socket
*sockets_conf_new_socket(struct thingsd *, struct thing *, int, int);
sock->conf.port.op = p_sock->conf.port.op;
sock->conf.tls = p_sock->conf.tls;
- sock->conf.tls_protocols = p_sock->conf.tls_flags;
+ sock->conf.tls_protocols = p_sock->conf.tls_protocols;
sock->conf.tls_flags = p_sock->conf.tls_flags;
sock->conf.max_clients = p_sock->conf.max_clients;
sizeof(sock->conf.tls_ecdhe_curves)) >=
sizeof(sock->conf.tls_ecdhe_curves))
fatalx("%s: strlcpy", __func__);
-
- socket_tls_load(sock);
}
struct socket *
sock->conf.port.op = thing->conf.tcp_listen_port.op;
sock->conf.tls = thing->conf.tls;
- sock->conf.tls_protocols = thing->conf.tls_flags;
+ sock->conf.tls_protocols = thing->conf.tls_protocols;
sock->conf.tls_flags = thing->conf.tls_flags;
if(sock->conf.tls == 0)
sizeof(sock->conf.tls_ecdhe_curves)) >=
sizeof(sock->conf.tls_ecdhe_curves))
fatalx("%s: strlcpy", __func__);
- socket_tls_load(sock);
done:
return (sock);
}
if (client->tls) {
event_set(&client->bev->ev_read, client->fd, EV_READ,
- client_tls_readcb, client);
+ sockets_tls_readcb, client->bev);
event_set(&client->bev->ev_write, client->fd, EV_WRITE,
- client_tls_writecb, client);
+ sockets_tls_writecb, client->bev);
}
bufferevent_setwatermark(client->bev, EV_READ, 0, PKT_BUFF);
free(client);
}
}
+
+void
+sockets_tls_readcb(int fd, short event, void *arg)
+{
+ struct bufferevent *bufev = (struct bufferevent *)arg;
+ struct client *client = bufev->cbarg;
+ char pkt[PKT_BUFF];
+ ssize_t ret;
+ size_t len;
+ int toread = EVBUFFER_READ;
+
+ memset(pkt, 0, sizeof(pkt));
+
+ ret = tls_read(client->tls_ctx, pkt, PKT_BUFF);
+ if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) {
+ goto retry;
+ } else if (ret < 0) {
+ toread |= EVBUFFER_ERROR;
+ goto err;
+ }
+
+ len = ret;
+ if (len == 0) {
+ toread |= EVBUFFER_EOF;
+ goto err;
+ }
+
+ if (evbuffer_add(bufev->input, pkt, len) == -1) {
+ toread |= EVBUFFER_ERROR;
+ goto err;
+ }
+
+ event_add(&bufev->ev_read, NULL);
+
+ len = EVBUFFER_LENGTH(bufev->input);
+ if (bufev->wm_read.low != 0 && len < bufev->wm_read.low)
+ return;
+
+ if (bufev->wm_read.high != 0 && len > bufev->wm_read.high) {
+ struct evbuffer *buf = bufev->input;
+ event_del(&bufev->ev_read);
+ evbuffer_setcb(buf, bufferevent_read_pressure_cb, bufev);
+ return;
+ }
+
+ if (bufev->readcb != NULL)
+ (*bufev->readcb)(bufev, bufev->cbarg);
+
+ return;
+retry:
+ event_del(&bufev->ev_read);
+ event_add(&bufev->ev_read, NULL);
+ return;
+err:
+ (*bufev->errorcb)(bufev, toread, bufev->cbarg);
+}
+
+void
+sockets_tls_writecb(int fd, short event, void *arg)
+{
+ struct bufferevent *bufev = (struct bufferevent *)arg;
+ struct client *client = bufev->cbarg;
+ ssize_t ret;
+ size_t len;
+ int towrite = EVBUFFER_WRITE;
+
+ if (EVBUFFER_LENGTH(bufev->output)) {
+ if (client == NULL)
+ return;
+
+ ret = tls_write(client->tls_ctx,
+ EVBUFFER_DATA(bufev->output),
+ EVBUFFER_LENGTH(bufev->output));
+
+ if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) {
+ goto retry;
+ } else if (ret < 0) {
+ towrite |= EVBUFFER_ERROR;
+ goto err;
+ }
+
+ len = ret;
+ evbuffer_drain(bufev->output, len);
+ }
+
+ if (EVBUFFER_LENGTH(bufev->output) != 0) {
+ event_del(&bufev->ev_write);
+ event_add(&bufev->ev_write, NULL);
+ }
+
+ if (bufev->writecb != NULL && EVBUFFER_LENGTH(bufev->output) <=
+ bufev->wm_write.low)
+ (*bufev->writecb)(bufev, bufev->cbarg);
+
+ return;
+retry:
+ event_del(&bufev->ev_write);
+ event_add(&bufev->ev_write, NULL);
+ return;
+err:
+ (*bufev->errorcb)(bufev, towrite, bufev->cbarg);
+}
+
blob - 9c8892f2be29b70641620c857ebfe3fc865470cc
blob + 3da903d65403f56b25cbac2154f8de10d250dbed
--- thingsd/thingsd.c
+++ thingsd/thingsd.c
TAILQ_FOREACH(sock, env->sockets, entry) {
+ socket_tls_load(sock);
if (config_setsocks(env, sock) == -1)
fatalx("%s: send socket error", __func__);
}
blob - cb467c736b20c390bdde15a8d171302e89742419
blob + 919489e63b0c04db861748562a90042037166adb
--- thingsd/thingsd.h
+++ thingsd/thingsd.h
void client_rd(struct bufferevent *, void *);
void client_wr(struct bufferevent *, void *);
void client_err(struct bufferevent *, short, void *);
-void client_tls_readcb(int, short, void *);
-void client_tls_writecb(int, short, void *);
/* sockets.c */
struct socket
blob - 9363c450d62ab00679b8c5fa4dfc7cf49846a4bb
blob + 775cb1b60baf43498aceabb1e4fad58b706947ab
--- thingsd/tls.c
+++ thingsd/tls.c
socket_tls_handshake(int fd, short event, void *arg)
{
struct client *client = (struct client *)arg;
+ struct socket *sock = client->sock;
ssize_t ret = 0;
if (client == NULL)
return;
+ if (sock->tls_ctx == NULL || client->tls_ctx == NULL)
+ fatalx("NULL tls context");
+
ret = tls_handshake(client->tls_ctx);
if (ret == 0) {