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;
/td> 2021-09-23Hide htop "function bar"June McEnroe Useless thing... 2021-09-23Allow FocusEvents in xtermJune McEnroe Oops! This whole time I thought OpenBSD xterm for some reason didn't support focus events. It turns out allowMouseOps: false disables them by default. Replace the disallowedMouseOps list with everything but. 2021-09-23Use NI_NUMERICSERVJune McEnroe 2021-09-23Make up build away from FreeBSDJune McEnroe 2021-09-23Add quickJune McEnroe 2021-09-23Add The HobbitJune McEnroe Surprisingly good for something written by a man like a hundred years ago! 2021-09-22Remove PSF fontsJune McEnroe They were fun to make but I never actually used them. 2021-09-22Remove Linux-specific utilitiesJune McEnroe I haven't used these in ages. 2021-09-22Call sandbox in CGI modeJune McEnroe Otherwise upload won't actually work. 2021-09-22Support HTTP PUT in upJune McEnroe For use by Palaver[1]. Unfortunately, at least in the current App Store version of Palaver, this doesn't work correctly with basic auth. [1]: https://palaverapp.com/guides/commands/set.html#ui-image_service 2021-09-22Remove default faviconJune McEnroe I hate these things and also this one sucks. 2021-09-21Use Z_FILTERED strategyJune McEnroe 2021-09-21Recalculate various lengths only as neededJune McEnroe This actually speeds things up quite a bit, saving roughly a second on a big PNG screenshot. Almost all the remaining time is spent in deflate. 2021-09-21Rewrite pngo, add explicit optionsJune McEnroe Interesting to see how my code habits have changed. 2021-09-16Fix /* **/ comment matchingJune McEnroe 2021-09-15Remove typer, add downgrade to READMEJune McEnroe 2021-09-15Set bot mode on downgradeJune McEnroe 2021-09-15Enter capsicum in downgradeJune McEnroe 2021-09-15Factor out common parts of downgrade messagesJune McEnroe Also bump the message cap to 1024 because that is ostensibly useful for replying to older messages. 2021-09-14Add downgrade IRC botJune McEnroe 2021-09-14Sort by title if authors matchJune McEnroe There are probably better things to sort by but title definitely always exists. 2021-09-13Swap-remove tags as they're foundJune McEnroe This makes it even faster. From ~1s on a sqlite3.c amalgamation to ~0.85s. 2021-09-12Replace htagml regex with strncmpJune McEnroe Since ctags only ever produces regular expressions of the form /^re$/ or /^re/ with no other special characters, instead unescape the pattern and simply use strncmp. Running on a sqlite3.c amalgamation, the regex version takes ~37s while the strncmp version takes ~1s, producing identical output. Big win! 2021-09-11Also defer printing comment for lone close-parensJune McEnroe 2021-09-10Publish "git-comment"June McEnroe 2021-09-10Add git comment --pretty optionJune McEnroe 2021-09-08Defer printing comment if line is blank or closing braceJune McEnroe This fixes badly indented comments. 2021-09-08Up default min-repeat to 30 linesJune McEnroe 2021-09-08Handle dirty lines in git-commentJune McEnroe 2021-09-08Document and install git-commentJune McEnroe 2021-09-08Add repeat and all options to git-commentJune McEnroe 2021-09-08Add group threshold to git-commentJune McEnroe