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

ouput format: fix active lease printing

Browse source 
Earlier ethernet address collection did not remove duplicated.  Basically
the problem was the same as in problem fixed in commit
ae7747db87, but this time affecting only
the ethernet addresses.  The fix is, as one can see, to make ethernet
collection to share structure with the lease, so that if one is wrong
both are wrong the same way.

Reported-by: Gilles Bouthenot <gilles.bouthenot@univ-fcomte.fr>
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2012-12-07 21:23:01 +00:00
parent d8aae53968
commit fdc560bab9
5 changed files with 38 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/output.c
View file

@ -220,7 +220,6 @@ int output_xml(void)
struct range_t *range_p;
unsigned long range_size;
struct shared_network_t *shared_p;
struct macaddr_t *macaddr_p;
int ret;
FILE *outfile;
@ -239,12 +238,17 @@ int output_xml(void)
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_format[0] == 'X' || config.output_format[0] == 'J') {
struct leases_t *l;
for (l = leases; l != NULL; l = l->hh.next) {
if (l->type == ACTIVE) {
fputs("<active_lease>\n\t<ip>", outfile);
fputs(ntop_ipaddr(&l->ip), outfile);
fputs("</ip>\n\t<macaddress>", outfile);
fputs(l->ethernet, outfile);
fputs("</macaddress>\n</active_lease>\n",
outfile);
}
}
}
@ -324,11 +328,10 @@ int output_xml(void)
int output_json(void)
{
unsigned int i;
unsigned int i = 0;
struct range_t *range_p;
unsigned long range_size;
struct shared_network_t *shared_p;
struct macaddr_t *macaddr_p;
int ret;
FILE *outfile;
unsigned int sep;
@ -350,19 +353,22 @@ int output_json(void)
fprintf(outfile, "{\n");
if (macaddr != NULL) {
if (config.output_format[0] == 'X' || config.output_format[0] == 'J') {
struct leases_t *l;
fprintf(outfile, " \"active_leases\": [");
for (i = 0, macaddr_p = macaddr; macaddr_p->next != NULL;
macaddr_p = macaddr_p->next) {
if (0 != i) {
fprintf(outfile, ",\n ");
} else {
fprintf(outfile, "\n ");
for (l = leases; l != NULL; l = l->hh.next) {
if (l->type == ACTIVE) {
if (i == 0) {
i = 1;
} else {
fputc(',', outfile);
}
fputs("\n { \"ip\":\"", outfile);
fputs(ntop_ipaddr(&l->ip), outfile);
fputs("\", \"macaddress\":\"", outfile);
fputs(l->ethernet, outfile);
fputs("\" }", outfile);
}
fprintf(outfile,
"{ \"ip\":\"%s\", \"macaddress\":\"%s\" }",
macaddr_p->ip, macaddr_p->ethernet);
i++;
}
fprintf(outfile, "\n ]"); /* end of active_leases */
sep++;