girineko/dhcpd-pools
1
0
Fork 0
mirror of git://git.code.sf.net/p/dhcpd-pools/code synced 2025-12-17 00:06:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow xml output with leases to use output file

Browse source 
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-02-08 22:11:49 +01:00
parent 17429ef85b
commit 171ff1d704
7 changed files with 70 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/output.c
View file

@ -190,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;
@ -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,6 +280,7 @@ int output_xml(void)
fprintf(outfile, "</summary>\n");
}
fprintf(outfile, "</dhcpstatus>\n");
if (outfile == stdout) {
ret = fflush(stdout);
if (ret) {
@ -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,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) {
@ -434,7 +439,6 @@ int output_html(void)
range_p = ranges;
shared_p = shared_networks;
if (fullhtml) {
html_header(outfile);
}
@ -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",
@ -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");
@ -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");
@ -626,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) {
@ -639,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
@ -649,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);
@ -685,7 +682,6 @@ int output_csv(void)
range_p->first_ip - 1));
}
fprintf(outfile, "\n");
range_p++;
}
@ -723,8 +719,6 @@ int output_csv(void)
}
fprintf(outfile, "\n");
}
fprintf(outfile, "\n");
}
@ -758,7 +752,6 @@ int output_csv(void)
shared_networks->available);
}
fprintf(outfile, "\n");
}
if (outfile == stdout) {
ret = fflush(stdout);