summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-10-27 02:51:22 -0400
committerJune McEnroe <june@causal.agency>2019-10-27 02:51:22 -0400
commitdead932716bcd81cf00a40d00b769a6eb79a9e60 (patch)
tree4af54bae6f771048abbc2a7f2db8c1520ac61d8e
parentAdd reload cmd to rc script (diff)
downloadpounce-dead932716bcd81cf00a40d00b769a6eb79a9e60.tar.gz
pounce-dead932716bcd81cf00a40d00b769a6eb79a9e60.zip
Improve client/server error messages
-rw-r--r--client.c4
-rw-r--r--server.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/client.c b/client.c
index 7aa2584..b5fb36a 100644
--- a/client.c
+++ b/client.c
@@ -67,7 +67,7 @@ void clientSend(struct Client *client, const char *ptr, size_t len) {
 		ssize_t ret = tls_write(client->tls, ptr, len);
 		if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) continue;
 		if (ret < 0) {
-			warnx("tls_write: %s", tls_error(client->tls));
+			warnx("client tls_write: %s", tls_error(client->tls));
 			client->error = true;
 			return;
 		}
@@ -226,7 +226,7 @@ void clientRecv(struct Client *client) {
 	);
 	if (read == TLS_WANT_POLLIN || read == TLS_WANT_POLLOUT) return;
 	if (read <= 0) {
-		if (read < 0) warnx("tls_read: %s", tls_error(client->tls));
+		if (read < 0) warnx("client tls_read: %s", tls_error(client->tls));
 		client->error = true;
 		return;
 	}
diff --git a/server.c b/server.c
index 964b15b..a304db0 100644
--- a/server.c
+++ b/server.c
@@ -90,7 +90,7 @@ void serverSend(const char *ptr, size_t len) {
 	while (len) {
 		ssize_t ret = tls_write(client, ptr, len);
 		if (ret == TLS_WANT_POLLIN || ret == TLS_WANT_POLLOUT) continue;
-		if (ret < 0) errx(EX_IOERR, "tls_write: %s", tls_error(client));
+		if (ret < 0) errx(EX_IOERR, "server tls_write: %s", tls_error(client));
 		ptr += ret;
 		len -= ret;
 	}
@@ -170,7 +170,7 @@ void serverRecv(void) {
 
 	ssize_t read = tls_read(client, &buf[len], sizeof(buf) - len);
 	if (read == TLS_WANT_POLLIN || read == TLS_WANT_POLLOUT) return;
-	if (read < 0) errx(EX_IOERR, "tls_read: %s", tls_error(client));
+	if (read < 0) errx(EX_IOERR, "server tls_read: %s", tls_error(client));
 	len += read;
 
 	char *crlf;