From 45edddd42012056e61fc167b1fcc8fa9455eac94 Mon Sep 17 00:00:00 2001
From: octo <octo>
Date: Fri, 19 May 2006 08:30:35 +0000
Subject: [PATCH] apcups.c: - Improved the `do_pthreads_status' function to not
 have the same code 10 times (or so).

---
 src/apcups.c | 135 ++++++++++++++++++++++++---------------------------
 1 file changed, 63 insertions(+), 72 deletions(-)

diff --git a/src/apcups.c b/src/apcups.c
index b99b2e70..5ac066ac 100644
--- a/src/apcups.c
+++ b/src/apcups.c
@@ -376,86 +376,77 @@ static int net_send(int sockfd, char *buff, int len)
 
 
 /* Get and print status from apcupsd NIS server */
-static void do_pthreads_status(char *host, int port, struct apc_detail_s *apcups_detail)
-{
-	int sockfd, n;
-	char recvline[MAXSTRING + 1];
-	char *tokptr;
-
-	if ((sockfd = net_open(host, NULL, port)) < 0)
-		Error_abort0(net_errmsg);
-
-	net_send(sockfd, "status", 6);
-
-	while ((n = net_recv(sockfd, recvline, sizeof(recvline))) > 0) {
-		recvline[n] = 0;
-#ifdef APCMAIN
-		fputs(recvline, stdout);
-		int printit = 1;
+static int do_pthreads_status(char *host, int port, struct apc_detail_s *apcups_detail)
+{
+	int     sockfd;
+	int     n;
+	char    recvline[MAXSTRING + 1];
+	char   *tokptr;
+	char   *key;
+	double  value;
+#if APCMAIN
+# define PRINT_VALUE(name, val) printf("  Found property: name = %s; value = %f;\n", name, val)
 #else
-		int printit = 0;
-#endif /* ifdef APCMAIN */
+# define PRINT_VALUE(name, val) /**/
+#endif
 
-		tokptr = strtok(recvline,":");
-		while(tokptr != NULL) {
-			/* Look for Limit_Add */
-			if(strncmp("LINEV",tokptr,5) == 0) { 
-				if(printit) fprintf(stdout,"  Found LINEV.\n");
-				tokptr = strtok(NULL," \t");
-				if(tokptr == NULL) continue;
-				if(printit) fprintf(stdout,"  Value %s.\n",tokptr);
-				apcups_detail->linev = atof (tokptr);
-			}else if(strncmp("BATTV",tokptr,5) == 0) { 
-				if(printit) fprintf(stdout,"  Found BATTV.\n");
-				tokptr = strtok(NULL," \t");
-				if(tokptr == NULL) continue;
-				if(printit) fprintf(stdout,"  Value %s.\n",tokptr);
-				apcups_detail->battv = atof (tokptr);
-			}else if(strncmp("ITEMP",tokptr,5) == 0) { 
-				if(printit) fprintf(stdout,"  Found ITEMP.\n");
-				tokptr = strtok(NULL," \t");
-				if(tokptr == NULL) continue;
-				if(printit) fprintf(stdout,"  Value %s.\n",tokptr);
-				apcups_detail->itemp = atof (tokptr);
-			}else if(strncmp("LOADPCT",tokptr,7) == 0) { 
-				if(printit) fprintf(stdout,"  Found LOADPCT.\n");
-				tokptr = strtok(NULL," \t");
-				if(tokptr == NULL) continue;
-				if(printit) fprintf(stdout,"  Value %s.\n",tokptr);
-				apcups_detail->loadpct = atof (tokptr);
-			}else if(strncmp("BCHARGE",tokptr,7) == 0) { 
-				if(printit) fprintf(stdout,"  Found BCHARGE.\n");
-				tokptr = strtok(NULL," \t");
-				if(tokptr == NULL) continue;
-				if(printit) fprintf(stdout,"  Value %s.\n",tokptr);
-				apcups_detail->bcharge = atof (tokptr);
-			}else if(strncmp("OUTPUTV",tokptr,7) == 0) { 
-				if(printit) fprintf(stdout,"  Found OUTPUTV.\n");
-				tokptr = strtok(NULL," \t");
-				if(tokptr == NULL) continue;
-				if(printit) fprintf(stdout,"  Value %s.\n",tokptr);
-				apcups_detail->outputv = atof (tokptr);
-			}else if(strncmp("LINEFREQ",tokptr,8) == 0) { 
-				if(printit) fprintf(stdout,"  Found LINEFREQ.\n");
-				tokptr = strtok(NULL," \t");
-				if(tokptr == NULL) continue;
-				if(printit) fprintf(stdout,"  Value %s.\n",tokptr);
-				apcups_detail->linefreq = atof (tokptr);
-			}else if(strncmp("TIMELEFT",tokptr,8) == 0) { 
-				if(printit) fprintf(stdout,"  Found TIMELEFT.\n");
-				tokptr = strtok(NULL," \t");
-				if(tokptr == NULL) continue;
-				if(printit) fprintf(stdout,"  Value %s.\n",tokptr);
-				apcups_detail->timeleft = atof (tokptr);
-			} /* */
-			tokptr = strtok(NULL,":");
-		}
+	/* TODO: Keep the socket open, if possible */
+	if ((sockfd = net_open (host, NULL, port)) < 0)
+	{
+		syslog (LOG_ERR, "apcups plugin: Connecting to the apcupsd failed.");
+		return (-1);
+	}
+
+	net_send (sockfd, "status", 6);
+
+	while ((n = net_recv (sockfd, recvline, sizeof (recvline))) > 0)
+	{
+		recvline[n] = '\0';
+#if APCMAIN
+		printf ("net_recv = `%s';\n", recvline);
+#endif /* if APCMAIN */
+
+		tokptr = strtok (recvline, ":");
+		while (tokptr != NULL)
+		{
+			key = tokptr;
+			if ((tokptr = strtok (NULL, " \t")) == NULL)
+				continue;
+			value = atof (tokptr);
+			PRINT_VALUE (key, value);
+
+			if (strcmp ("LINEV", key) == 0)
+				apcups_detail->linev = value;
+			else if (strcmp ("BATTV", tokptr) == 0)
+				apcups_detail->battv = value;
+			else if (strcmp ("ITEMP", tokptr) == 0)
+				apcups_detail->itemp = value;
+			else if (strcmp ("LOADPCT", tokptr) == 0)
+				apcups_detail->loadpct = value;
+			else if (strcmp ("BCHARGE", tokptr) == 0)
+				apcups_detail->bcharge = value;
+			else if (strcmp ("OUTPUTV", tokptr) == 0)
+				apcups_detail->outputv = value;
+			else if (strcmp ("LINEFREQ", tokptr) == 0)
+				apcups_detail->linefreq = value;
+			else if (strcmp ("TIMELEFT", tokptr) == 0)
+				apcups_detail->timeleft = value;
+			else
+			{
+				syslog (LOG_WARNING, "apcups plugin: Received unknown property from apcupsd: `%s' = %f",
+						key, value);
+			}
+
+			tokptr = strtok (NULL, ":");
+		} /* while (tokptr != NULL) */
 	}
 
 	if (n < 0)
 		Error_abort0(net_errmsg);
 
 	net_close(sockfd);
+
+	return (0);
 }
 
 #ifdef APCMAIN
-- 
2.30.2