From dd2b016905f0cbe3b62742b45c895e6ae955ef09 Mon Sep 17 00:00:00 2001
From: Tom Early <ham.n7tae@gmail.com>
Date: Sat, 20 Apr 2024 09:29:49 -0700
Subject: [PATCH] Changed return type for CUnixDgrmWriter::Write

---
 UnixDgramSocket.cpp | 40 +++++++++++++---------------------------
 UnixDgramSocket.h   |  2 +-
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/UnixDgramSocket.cpp b/UnixDgramSocket.cpp
index f07d2fb..2738f24 100644
--- a/UnixDgramSocket.cpp
+++ b/UnixDgramSocket.cpp
@@ -96,14 +96,14 @@ void CUnixDgramWriter::SetUp(const char *path)	// returns true on failure
 	strncpy(addr.sun_path+1, path, sizeof(addr.sun_path)-2);
 }
 
-ssize_t CUnixDgramWriter::Write(const void *buf, size_t size)
+bool CUnixDgramWriter::Write(const void *buf, size_t size)
 {
 	// open the socket
 	int fd = socket(AF_UNIX, SOCK_DGRAM, 0);
 	if (fd < 0)
 	{
 		fprintf(stderr, "Failed to open socket %s : %s\n", addr.sun_path+1, strerror(errno));
-		return -1;
+		return true;
 	}
 	// connect to the receiver
 	int rval = connect(fd, (struct sockaddr *)&addr, sizeof(addr));
@@ -111,33 +111,19 @@ ssize_t CUnixDgramWriter::Write(const void *buf, size_t size)
 	{
 		fprintf(stderr, "Failed to connect to socket %s : %s\n", addr.sun_path+1, strerror(errno));
 		close(fd);
-		return -1;
+		return true;
 	}
 
-	ssize_t written = 0;
-	int count = 0;
-	while (written <= 0)
-	{
-		written = write(fd, buf, size);
-		if (written == (ssize_t)size)
-			break;
-		else if (written < 0)
-			fprintf(stderr, "ERROR: faied to write to %s : %s\n", addr.sun_path+1, strerror(errno));
-		else if (written == 0)
-			fprintf(stderr, "Warning: zero bytes written to %s\n", addr.sun_path+1);
-		else if (written != (ssize_t)size)
-		{
-			fprintf(stderr, "ERROR: only %d of %d bytes written to %s\n", (int)written, (int)size, addr.sun_path+1);
-			break;
-		}
-		if (++count >= 100)
-		{
-			fprintf(stderr, "ERROR: Write failed after %d attempts\n", count-1);
-			break;
-		}
-		std::this_thread::sleep_for(std::chrono::microseconds(5));
-	}
+	auto written = write(fd, buf, size);
+	if (written == (ssize_t)size)
+		return false;
+	else if (written < 0)
+		fprintf(stderr, "ERROR: faied to write to %s : %s\n", addr.sun_path+1, strerror(errno));
+	else if (written == 0)
+		fprintf(stderr, "ERROR: zero bytes written to %s\n", addr.sun_path+1);
+	else
+		fprintf(stderr, "ERROR: only %d of %d bytes written to %s\n", (int)written, (int)size, addr.sun_path+1);
 
 	close(fd);
-	return written;
+	return true;
 }
diff --git a/UnixDgramSocket.h b/UnixDgramSocket.h
index fe193e9..95eb24b 100644
--- a/UnixDgramSocket.h
+++ b/UnixDgramSocket.h
@@ -39,7 +39,7 @@ public:
 	CUnixDgramWriter();
 	~CUnixDgramWriter();
 	void SetUp(const char *path);
-	ssize_t Write(const void *buf, size_t size);
+	bool Write(const void *buf, size_t size);
 private:
 	struct sockaddr_un addr;
 };