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

diff --git a/src/output.c b/src/output.c
index f2858c6..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
@@ -191,6 +190,7 @@ 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;
 
@@ -207,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",
@@ -236,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");
 		}
 	}
@@ -246,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);
@@ -274,6 +280,7 @@ int output_xml(void)
 		fprintf(outfile, "</summary>\n");
 	}
 
+	fprintf(outfile, "</dhcpstatus>\n");
 	if (outfile == stdout) {
 		ret = fflush(stdout);
 		if (ret) {
@@ -356,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 \" + ");
@@ -408,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);
@@ -422,7 +427,6 @@ 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) {
@@ -435,7 +439,6 @@ int output_html(void)
 
 	range_p = ranges;
 	shared_p = shared_networks;
-
 	if (fullhtml) {
 		html_header(outfile);
 	}
@@ -462,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",
@@ -509,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");
@@ -557,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");
@@ -627,7 +627,6 @@ 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) {
@@ -640,7 +639,6 @@ 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
@@ -650,13 +648,11 @@ int output_csv(void)
 			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);
@@ -686,7 +682,6 @@ int output_csv(void)
 					 range_p->first_ip - 1));
 			}
 
-
 			fprintf(outfile, "\n");
 			range_p++;
 		}
@@ -724,8 +719,6 @@ int output_csv(void)
 			}
 
 			fprintf(outfile, "\n");
-
-
 		}
 		fprintf(outfile, "\n");
 	}
@@ -759,7 +752,6 @@ int output_csv(void)
 				shared_networks->available);
 		}
 		fprintf(outfile, "\n");
-
 	}
 	if (outfile == stdout) {
 		ret = fflush(stdout);