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

output: add separate first_ip and last_ip to json and mustach outputs

Browse source 
This give greater liberty to people who are using these formats to do what
ever they need to.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2017-11-09 09:55:11 +00:00
parent 7d9a5b5561
commit 74fdf90980
No known key found for this signature in database
GPG key ID: A9553245FDE9B739
3 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/mustach-dhcpd-pools.c
View file

@ -84,6 +84,14 @@ static int must_put_range(void *closure, const char *name, int escape
ntop_ipaddr(&e->range_p->last_ip)); ntop_ipaddr(&e->range_p->last_ip));
return 0; return 0;
} }
if (!strcmp(name, "first_ip")) {
fprintf(file, "%s", ntop_ipaddr(&e->range_p->first_ip));
return 0;
}
if (!strcmp(name, "last_ip")) {
fprintf(file, "%s", ntop_ipaddr(&e->range_p->last_ip));
return 0;
}
if (!strcmp(name, "used")) { if (!strcmp(name, "used")) {
fprintf(file, "%g", e->range_p->count); fprintf(file, "%g", e->range_p->count);
return 0; return 0;

2
src/output.c
View file

@ -497,6 +497,8 @@ static int output_json(const int print_mac_addreses)
fprintf(outfile, "\"range\":\"%s", ntop_ipaddr(&range_p->first_ip)); fprintf(outfile, "\"range\":\"%s", ntop_ipaddr(&range_p->first_ip));
fprintf(outfile, " - %s\", ", ntop_ipaddr(&range_p->last_ip)); fprintf(outfile, " - %s\", ", ntop_ipaddr(&range_p->last_ip));
fprintf(outfile, "\"first_ip\":\"%s\", ", ntop_ipaddr(&range_p->first_ip));
fprintf(outfile, "\"last_ip\":\"%s\", ", ntop_ipaddr(&range_p->last_ip));
fprintf(outfile, "\"defined\":%g, ", oh.range_size); fprintf(outfile, "\"defined\":%g, ", oh.range_size);
fprintf(outfile, "\"used\":%g, ", range_p->count); fprintf(outfile, "\"used\":%g, ", range_p->count);
fprintf(outfile, "\"touched\":%g, ", range_p->touched); fprintf(outfile, "\"touched\":%g, ", range_p->touched);

2
tests/expected/same-twice-json
View file

@ -3,7 +3,7 @@
{ "ip":"10.0.0.5", "macaddress":"00:00:00:00:00:00" } { "ip":"10.0.0.5", "macaddress":"00:00:00:00:00:00" }
], ],
"subnets": [ "subnets": [
{ "location":"All networks", "range":"10.0.0.1 - 10.0.0.10", "defined":10, "used":1, "touched":0, "free":9, "percent":10, "touch_count":1, "touch_percent":10, "status":0 } { "location":"All networks", "range":"10.0.0.1 - 10.0.0.10", "first_ip":"10.0.0.1", "last_ip":"10.0.0.10", "defined":10, "used":1, "touched":0, "free":9, "percent":10, "touch_count":1, "touch_percent":10, "status":0 }
], ],
"shared-networks": [ "shared-networks": [
], ],