From c2694e31503ee03f553a39bfb027656066ac950d Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Fri, 16 Dec 2022 10:22:17 +0100
Subject: [PATCH] cmd/tcpserv: moar logging

---
 cmd/tcpserv/main.ha | 14 ++++++++++++--

diff --git a/cmd/tcpserv/main.ha b/cmd/tcpserv/main.ha
index c6c6c71f67210397df52468ad6414ea38ce5f49a..9f7321ac244b4256b910e6539daa00489334fcfd 100644
--- a/cmd/tcpserv/main.ha
+++ b/cmd/tcpserv/main.ha
@@ -15,6 +15,8 @@
 type client = struct {
 	server: *server,
 	sock: *ev::file,
+	addr: ip::addr,
+	port: u16,
 	buf: [os::BUFSIZ]u8,
 	wbuf: []u8,
 };
@@ -55,6 +57,8 @@
 	const client = alloc(client {
 		server = server,
 		sock = sock,
+		addr = addr,
+		port = port,
 		...
 	});
 	append(server.clients, client);
@@ -67,7 +71,9 @@ fn client_read(sock: *ev::file, r: (size | io::EOF | io::error)) void = {
 	const client = ev::getuser(sock): *client;
 	const n = match (r) {
 	case let err: io::error =>
-		log::printfln("error: read: {}", io::strerror(err));
+		log::printfln("{}:{}: error: read: {}",
+			ip::string(client.addr), client.port,
+			io::strerror(err));
 		client_close(client);
 		return;
 	case io::EOF =>
@@ -84,7 +90,9 @@ fn client_write(sock: *ev::file, r: (size | io::error)) void = {
 	const client = ev::getuser(sock): *client;
 	const n = match (r) {
 	case let err: io::error =>
-		log::printfln("error: write: {}", io::strerror(err));
+		log::printfln("{}:{}: error: write: {}",
+			ip::string(client.addr), client.port,
+			io::strerror(err));
 		client_close(client);
 		return;
 	case let n: size =>
@@ -106,6 +114,8 @@ 			delete(server.clients[i]);
 			break;
 		};
 	};
+	log::printfln("{}:{}: Connection closed",
+		ip::string(client.addr), client.port);
 	ev::close(client.sock);
 	free(client);
 };

-- 
2.48.1