X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Foutput.c;h=874efa4edb6fcacc2482f194da1f63ca5f701fdc;hb=8e09c76eae80ef56fa38a67463aee4da4278125c;hp=22a67a46efea929431d6e91b63ff34cd8f714877;hpb=74aef1c34e31699595b4b198bcde5ac1af694260;p=debian%2Fdhcpd-pools.git

diff --git a/src/output.c b/src/output.c
index 22a67a4..874efa4 100644
--- a/src/output.c
+++ b/src/output.c
@@ -1,19 +1,18 @@
-/*
-** Copyright (C) 2006- Sami Kerola <kerolasa@iki.fi>
-**  
-** This program is free software; you can redistribute it and/or modify
+/* http://dhcpd-pools.sourceforge.net/
+** Copyright 2006- Sami Kerola <kerolasa@iki.fi>
+**
+** This program is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation, either version 3 of the License, or
 ** (at your option) any later version.
-** 
+**
 ** This program is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -24,6 +23,7 @@
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#include <err.h>
 
 #include "dhcpd-pools.h"
 
@@ -39,8 +39,8 @@ int output_txt(void)
 	if (config.output_file[0]) {
 		outfile = fopen(config.output_file, "w+");
 		if (outfile == NULL) {
-			eprintf("output_txt: %s:", config.output_file);
-			exit(EXIT_FAILURE);
+			err(EXIT_FAILURE, "output_txt: %s",
+			    config.output_file);
 		}
 	} else {
 		outfile = stdout;
@@ -54,7 +54,7 @@ int output_txt(void)
 		fprintf
 		    (outfile,
 		     "shared net name     first ip           last ip            max   cur    percent  touch   t+c  t+c perc");
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			fprintf(outfile, "     bu  bu perc");
 		}
 		fprintf(outfile, "\n");
@@ -85,7 +85,7 @@ int output_txt(void)
 					  range_p->count)) /
 				(range_p->last_ip - range_p->first_ip -
 				 1));
-			if (num_backups > 0) {
+			if (0 < num_backups) {
 				fprintf(outfile, "%7lu %8.3f",
 					range_p->backups,
 					(float) (100 * range_p->backups) /
@@ -104,7 +104,7 @@ int output_txt(void)
 		fprintf(outfile, "Shared networks:\n");
 		fprintf(outfile,
 			"name                   max   cur     percent  touch    t+c  t+c perc");
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			fprintf(outfile, "     bu  bu perc");
 		}
 		fprintf(outfile, "\n");
@@ -123,7 +123,7 @@ int output_txt(void)
 					 (shared_p->touched +
 					  shared_p->used)) /
 				shared_p->available);
-			if (num_backups > 0) {
+			if (0 < num_backups) {
 				fprintf(outfile, "%7lu %8.3f",
 					shared_p->backups,
 					(float) (100 * shared_p->backups) /
@@ -142,7 +142,7 @@ int output_txt(void)
 		fprintf(outfile,
 			"name                   max   cur     percent  touch    t+c  t+c perc");
 
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			fprintf(outfile, "     bu  bu perc");
 		}
 		fprintf(outfile, "\n");
@@ -161,7 +161,7 @@ int output_txt(void)
 				  shared_networks->used)) /
 			shared_networks->available);
 
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			fprintf(outfile, "%7lu %8.3f",
 				shared_networks->backups,
 				(float) (100 * shared_networks->backups) /
@@ -172,12 +172,12 @@ int output_txt(void)
 	if (outfile == stdout) {
 		ret = fflush(stdout);
 		if (ret) {
-			eprintf("output_txt: fflush:");
+			warn("output_txt: fflush");
 		}
 	} else {
 		ret = fclose(outfile);
 		if (ret) {
-			eprintf("output_txt: fclose:");
+			warn("output_txt: fclose");
 		}
 	}
 
@@ -190,14 +190,15 @@ int output_xml(void)
 	struct in_addr first, last;
 	struct range_t *range_p;
 	struct shared_network_t *shared_p;
+	struct macaddr_t *macaddr_p;
 	int ret;
 	FILE *outfile;
 
 	if (config.output_file[0]) {
 		outfile = fopen(config.output_file, "w+");
 		if (outfile == NULL) {
-			eprintf("output_xml: %s:", config.output_file);
-			exit(EXIT_FAILURE);
+			err(EXIT_FAILURE, "output_xml: %s",
+			    config.output_file);
 		}
 	} else {
 		outfile = stdout;
@@ -206,13 +207,22 @@ int output_xml(void)
 	range_p = ranges;
 	shared_p = shared_networks;
 
+	fprintf(outfile, "<dhcpstatus>\n");
+
+	if (macaddr != NULL) {
+		for (macaddr_p = macaddr; macaddr_p->next != NULL;
+		     macaddr_p = macaddr_p->next) {
+			fprintf(outfile,
+				"<active_lease>\n\t<ip>%s</ip>\n\t<macaddress>%s</macaddress>\n</active_lease>\n",
+				macaddr_p->ip, macaddr_p->ethernet);
+		}
+	}
+
 	if (config.output_limit[1] & output_limit_bit_1) {
 		for (i = 0; i < num_ranges; i++) {
 			first.s_addr = ntohl(range_p->first_ip + 1);
 			last.s_addr = ntohl(range_p->last_ip - 1);
-
 			fprintf(outfile, "<subnet>\n");
-
 			if (range_p->shared_net) {
 				fprintf(outfile,
 					"\t<location>%s</location>\n",
@@ -235,9 +245,7 @@ int output_xml(void)
 			fprintf(outfile, "\t<free>%lu</free>\n",
 				range_p->last_ip - range_p->first_ip - 1 -
 				range_p->count);
-
 			range_p++;
-
 			fprintf(outfile, "</subnet>\n");
 		}
 	}
@@ -245,7 +253,6 @@ int output_xml(void)
 	if (config.output_limit[1] & output_limit_bit_2) {
 		for (i = 0; i < num_shared_networks; i++) {
 			shared_p++;
-
 			fprintf(outfile, "<shared-network>\n");
 			fprintf(outfile, "\t<location>%s</location>\n",
 				shared_p->name);
@@ -273,15 +280,16 @@ int output_xml(void)
 		fprintf(outfile, "</summary>\n");
 	}
 
+	fprintf(outfile, "</dhcpstatus>\n");
 	if (outfile == stdout) {
 		ret = fflush(stdout);
 		if (ret) {
-			eprintf("output_xml: fflush:");
+			warn("output_xml: fflush");
 		}
 	} else {
 		ret = fclose(outfile);
 		if (ret) {
-			eprintf("output_xml: fclose:");
+			warn("output_xml: fclose");
 		}
 	}
 
@@ -355,7 +363,6 @@ void html_footer(FILE * f)
 	fprintf(f, "<p class=created>\nData generated by ");
 	fprintf(f, "<a href=\"%s\">", PACKAGE_URL);
 	fprintf(f, "dhcpd-pools</a>.\n</p>\n");
-
 	fprintf(f, "<p class=updated>\n");
 	fprintf(f, "<script type=\"text/javascript\">\n");
 	fprintf(f, "  document.write(\"Last Updated On \" + ");
@@ -407,7 +414,6 @@ void newsection(FILE * f, char *title)
 	newrow(f);
 	output_line(f, "td", "calign", "&nbsp;");
 	endrow(f);
-
 	newrow(f);
 	output_line(f, "th", "section", title);
 	endrow(f);
@@ -421,12 +427,11 @@ int output_html(void)
 	struct shared_network_t *shared_p;
 	int ret;
 	FILE *outfile;
-
 	if (config.output_file[0]) {
 		outfile = fopen(config.output_file, "w+");
 		if (outfile == NULL) {
-			eprintf("output_html: %s:", config.output_file);
-			exit(EXIT_FAILURE);
+			err(EXIT_FAILURE, "output_html: %s",
+			    config.output_file);
 		}
 	} else {
 		outfile = stdout;
@@ -434,7 +439,6 @@ int output_html(void)
 
 	range_p = ranges;
 	shared_p = shared_networks;
-
 	if (fullhtml) {
 		html_header(outfile);
 	}
@@ -451,7 +455,7 @@ int output_html(void)
 		output_line(outfile, "th", "ralign", "touch");
 		output_line(outfile, "th", "ralign", "t+c");
 		output_line(outfile, "th", "ralign", "t+c perc");
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			output_line(outfile, "th", "ralign", "bu");
 			output_line(outfile, "th", "ralign", "bu perc");
 		}
@@ -461,7 +465,6 @@ int output_html(void)
 		for (i = 0; i < num_ranges; i++) {
 			first.s_addr = ntohl(range_p->first_ip + 1);
 			last.s_addr = ntohl(range_p->last_ip - 1);
-
 			newrow(outfile);
 			if (range_p->shared_net) {
 				output_line(outfile, "td", "calign",
@@ -491,7 +494,7 @@ int output_html(void)
 					       range_p->count)) /
 				     (range_p->last_ip -
 				      range_p->first_ip - 1));
-			if (num_backups > 0) {
+			if (0 < num_backups) {
 				output_long(outfile, "td",
 					    range_p->backups);
 				output_float(outfile, "td",
@@ -508,7 +511,6 @@ int output_html(void)
 	table_start(outfile);
 	if (config.output_limit[0] & output_limit_bit_2) {
 		newsection(outfile, "Shared networks:");
-
 		newrow(outfile);
 		output_line(outfile, "th", "calign", "name");
 		output_line(outfile, "th", "ralign", "max");
@@ -517,7 +519,7 @@ int output_html(void)
 		output_line(outfile, "th", "ralign", "touch");
 		output_line(outfile, "th", "ralign", "t+c");
 		output_line(outfile, "th", "ralign", "t+c perc");
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			output_line(outfile, "th", "ralign", "bu");
 			output_line(outfile, "th", "ralign", "bu perc");
 		}
@@ -542,7 +544,7 @@ int output_html(void)
 					      (shared_p->touched +
 					       shared_p->used)) /
 				     shared_p->available);
-			if (num_backups > 0) {
+			if (0 < num_backups) {
 				output_long(outfile, "td",
 					    shared_p->backups);
 				output_float(outfile, "td",
@@ -556,7 +558,6 @@ int output_html(void)
 	}
 	if (config.output_limit[0] & output_limit_bit_3) {
 		newsection(outfile, "Sum of all ranges:");
-
 		newrow(outfile);
 		output_line(outfile, "th", "calign", "name");
 		output_line(outfile, "th", "ralign", "max");
@@ -565,7 +566,7 @@ int output_html(void)
 		output_line(outfile, "th", "ralign", "touch");
 		output_line(outfile, "th", "ralign", "t+c");
 		output_line(outfile, "th", "ralign", "t+c perc");
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			output_line(outfile, "th", "ralign", "bu");
 			output_line(outfile, "th", "ralign", "bu perc");
 		}
@@ -590,7 +591,7 @@ int output_html(void)
 				      (shared_networks->touched +
 				       shared_networks->used)) /
 			     shared_networks->available);
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			output_long(outfile, "td",
 				    shared_networks->backups);
 			output_float(outfile, "td",
@@ -607,12 +608,12 @@ int output_html(void)
 	if (outfile == stdout) {
 		ret = fflush(stdout);
 		if (ret) {
-			eprintf("output_html: fflush:");
+			warn("output_html: fflush");
 		}
 	} else {
 		ret = fclose(outfile);
 		if (ret) {
-			eprintf("output_html: fclose:");
+			warn("output_html: fclose");
 		}
 	}
 	return 0;
@@ -626,12 +627,11 @@ int output_csv(void)
 	struct shared_network_t *shared_p;
 	FILE *outfile;
 	int ret;
-
 	if (config.output_file[0]) {
 		outfile = fopen(config.output_file, "w+");
 		if (outfile == NULL) {
-			eprintf("output_csv: %s:", config.output_file);
-			exit(EXIT_FAILURE);
+			err(EXIT_FAILURE, "output_csv: %s",
+			    config.output_file);
 		}
 	} else {
 		outfile = stdout;
@@ -639,23 +639,20 @@ int output_csv(void)
 
 	range_p = ranges;
 	shared_p = shared_networks;
-
 	if (config.output_limit[0] & output_limit_bit_1) {
 		fprintf(outfile, "\"Ranges:\"\n");
 		fprintf
 		    (outfile,
 		     "\"shared net name\",\"first ip\",\"last ip\",\"max\",\"cur\",\"percent\",\"touch\",\"t+c\",\"t+c perc\"");
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			fprintf(outfile, ",\"bu\",\"bu perc\"");
 		}
 		fprintf(outfile, "\n");
-
 	}
 	if (config.output_limit[1] & output_limit_bit_1) {
 		for (i = 0; i < num_ranges; i++) {
 			first.s_addr = ntohl(range_p->first_ip + 1);
 			last.s_addr = ntohl(range_p->last_ip - 1);
-
 			if (range_p->shared_net) {
 				fprintf(outfile, "\"%s\",",
 					range_p->shared_net->name);
@@ -677,7 +674,7 @@ int output_csv(void)
 					  range_p->count)) /
 				(range_p->last_ip - range_p->first_ip -
 				 1));
-			if (num_backups > 0) {
+			if (0 < num_backups) {
 				fprintf(outfile, ",\"%lu\",\"%.3f\"",
 					range_p->backups,
 					(float) (100 * range_p->backups) /
@@ -685,7 +682,6 @@ int output_csv(void)
 					 range_p->first_ip - 1));
 			}
 
-
 			fprintf(outfile, "\n");
 			range_p++;
 		}
@@ -695,7 +691,7 @@ int output_csv(void)
 		fprintf(outfile, "\"Shared networks:\"\n");
 		fprintf(outfile,
 			"\"name\",\"max\",\"cur\",\"percent\",\"touch\",\"t+c\",\"t+c perc\"");
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			fprintf(outfile, ",\"bu\",\"bu perc\"");
 		}
 		fprintf(outfile, "\n");
@@ -715,7 +711,7 @@ int output_csv(void)
 					 (shared_p->touched +
 					  shared_p->used)) /
 				shared_p->available);
-			if (num_backups > 0) {
+			if (0 < num_backups) {
 				fprintf(outfile, ",\"%lu\",\"%.3f\"",
 					shared_p->backups,
 					(float) (100 * shared_p->backups) /
@@ -723,8 +719,6 @@ int output_csv(void)
 			}
 
 			fprintf(outfile, "\n");
-
-
 		}
 		fprintf(outfile, "\n");
 	}
@@ -732,7 +726,7 @@ int output_csv(void)
 		fprintf(outfile, "\"Sum of all ranges:\"\n");
 		fprintf(outfile,
 			"\"name\",\"max\",\"cur\",\"percent\",\"touch\",\"t+c\",\"t+c perc\"");
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			fprintf(outfile, ",\"bu\",\"bu perc\"");
 		}
 		fprintf(outfile, "\n");
@@ -751,25 +745,24 @@ int output_csv(void)
 				 (shared_networks->touched +
 				  shared_networks->used)) /
 			shared_networks->available);
-		if (num_backups > 0) {
+		if (0 < num_backups) {
 			fprintf(outfile, "%7lu %8.3f",
 				shared_networks->backups,
 				(float) (100 * shared_networks->backups) /
 				shared_networks->available);
 		}
 		fprintf(outfile, "\n");
-
 	}
 	if (outfile == stdout) {
 		ret = fflush(stdout);
 		if (ret) {
-			eprintf("output_cvs: fflush:");
+			warn("output_cvs: fflush");
 		}
 
 	} else {
 		ret = fclose(outfile);
 		if (ret) {
-			eprintf("output_cvs: fclose:");
+			warn("output_cvs: fclose");
 		}
 
 	}