Refactor signal handling in pvsprivinputd

Only use one socketpair and delegate the actual decision of what to do
when a specific signal is received to a special object.

1 files changed, 12 insertions, 2 deletions

diff --git a/src/input/pvsPrivInputSocket.cpp b/src/input/pvsPrivInputSocket.cpp
index c491dd9..df5dff5 100644
--- a/src/input/pvsPrivInputSocket.cpp
+++ b/src/input/pvsPrivInputSocket.cpp
@@ -60,6 +60,17 @@ QString pvsPrivInputGetSocketAddress()
 	return pvsPrivInputGetSettings()->value("socketpath", "/tmp/pvsprivinputd.sock").toString();
 }
 
+bool pvsPrivInputEnableReceiveCredentials(int sock)
+{
+	int passcred = 1;
+	if(setsockopt(sock, SOL_SOCKET, SO_PASSCRED, &passcred, sizeof(passcred)) < 0)
+	{
+		return false;
+	}
+	else
+	{
+		return true;
+	}
 }
 
 int pvsPrivInputMakeClientSocket()
@@ -110,8 +121,7 @@ int pvsPrivInputMakeServerSocket()
 	}
 
 	// Announce that credentials are requested:
-	int passcred = 1;
-	if(setsockopt(sock, SOL_SOCKET, SO_PASSCRED, &passcred, sizeof(passcred)) < 0)
+	if(!pvsPrivInputEnableReceiveCredentials(sock))
 	{
 		// We will not operate without credentials.
 		qCritical("Could not request peer credentials: %s", strerror(errno));