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

use more descriptive names in limit bits enum definition

Browse source 
Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2015-11-29 23:36:19 +00:00
parent 4aff49ed80
commit 327691f34a
No known key found for this signature in database
GPG key ID: A9553245FDE9B739
2 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/dhcpd-pools.h
View file

@ -185,12 +185,12 @@ struct leases_t {
UT_hash_handle hh; UT_hash_handle hh;
}; };
/*! \enum limbits /*! \enum limbits
* \brief Output limit bits * \brief Output limit bits: R_BIT ranges, S_BIT shared networks, A_BIT all.
*/ */
enum limbits { enum limbits {
BIT1 = 0x1, R_BIT = 0x1,
BIT2 = 0x2, S_BIT = 0x2,
BIT3 = 0x4 A_BIT = 0x4
}; };
/*! \def STATE_OK /*! \def STATE_OK

70
src/output.c
View file

@ -82,7 +82,7 @@ int output_txt(void)
range_size = get_range_size(range_p); range_size = get_range_size(range_p);
shared_p = shared_networks; shared_p = shared_networks;
if (config.output_limit[0] & BIT1) { if (config.output_limit[0] & R_BIT) {
fprintf(outfile, "Ranges:\n"); fprintf(outfile, "Ranges:\n");
fprintf fprintf
(outfile, (outfile,
@ -97,7 +97,7 @@ int output_txt(void)
} }
fprintf(outfile, "\n"); fprintf(outfile, "\n");
} }
if (config.output_limit[1] & BIT1) { if (config.output_limit[1] & R_BIT) {
for (i = 0; i < num_ranges; i++) { for (i = 0; i < num_ranges; i++) {
if (range_p->shared_net) { if (range_p->shared_net) {
fprintf(outfile, "%-20s", range_p->shared_net->name); fprintf(outfile, "%-20s", range_p->shared_net->name);
@ -129,10 +129,10 @@ int output_txt(void)
range_size = get_range_size(range_p); range_size = get_range_size(range_p);
} }
} }
if (config.output_limit[1] & BIT1 && config.output_limit[0] & BIT2) { if (config.output_limit[1] & R_BIT && config.output_limit[0] & S_BIT) {
fprintf(outfile, "\n"); fprintf(outfile, "\n");
} }
if (config.output_limit[0] & BIT2) { if (config.output_limit[0] & S_BIT) {
fprintf(outfile, "Shared networks:\n"); fprintf(outfile, "Shared networks:\n");
fprintf(outfile, fprintf(outfile,
"name max cur percent touch t+c t+c perc"); "name max cur percent touch t+c t+c perc");
@ -141,7 +141,7 @@ int output_txt(void)
} }
fprintf(outfile, "\n"); fprintf(outfile, "\n");
} }
if (config.output_limit[1] & BIT2) { if (config.output_limit[1] & S_BIT) {
for (i = 0; i < num_shared_networks; i++) { for (i = 0; i < num_shared_networks; i++) {
shared_p++; shared_p++;
fprintf(outfile, fprintf(outfile,
@ -163,10 +163,10 @@ int output_txt(void)
fprintf(outfile, "\n"); fprintf(outfile, "\n");
} }
} }
if (config.output_limit[1] & BIT2 && config.output_limit[0] & BIT3) { if (config.output_limit[1] & S_BIT && config.output_limit[0] & A_BIT) {
fprintf(outfile, "\n"); fprintf(outfile, "\n");
} }
if (config.output_limit[0] & BIT3) { if (config.output_limit[0] & A_BIT) {
fprintf(outfile, "Sum of all ranges:\n"); fprintf(outfile, "Sum of all ranges:\n");
fprintf(outfile, fprintf(outfile,
"name max cur percent touch t+c t+c perc"); "name max cur percent touch t+c t+c perc");
@ -176,7 +176,7 @@ int output_txt(void)
} }
fprintf(outfile, "\n"); fprintf(outfile, "\n");
} }
if (config.output_limit[1] & BIT3) { if (config.output_limit[1] & A_BIT) {
fprintf(outfile, "%-20s %5g %5g %10.3f %7g %6g %9.3f", fprintf(outfile, "%-20s %5g %5g %10.3f %7g %6g %9.3f",
shared_networks->name, shared_networks->name,
shared_networks->available, shared_networks->available,
@ -254,7 +254,7 @@ int output_xml(void)
} }
} }
if (config.output_limit[1] & BIT1) { if (config.output_limit[1] & R_BIT) {
for (i = 0; i < num_ranges; i++) { for (i = 0; i < num_ranges; i++) {
fprintf(outfile, "<subnet>\n"); fprintf(outfile, "<subnet>\n");
if (range_p->shared_net) { if (range_p->shared_net) {
@ -275,7 +275,7 @@ int output_xml(void)
} }
} }
if (config.output_limit[1] & BIT2) { if (config.output_limit[1] & S_BIT) {
for (i = 0; i < num_shared_networks; i++) { for (i = 0; i < num_shared_networks; i++) {
shared_p++; shared_p++;
fprintf(outfile, "<shared-network>\n"); fprintf(outfile, "<shared-network>\n");
@ -289,7 +289,7 @@ int output_xml(void)
} }
} }
if (config.output_limit[0] & BIT3) { if (config.output_limit[0] & A_BIT) {
fprintf(outfile, "<summary>\n"); fprintf(outfile, "<summary>\n");
fprintf(outfile, "\t<location>%s</location>\n", shared_networks->name); fprintf(outfile, "\t<location>%s</location>\n", shared_networks->name);
fprintf(outfile, "\t<defined>%g</defined>\n", shared_networks->available); fprintf(outfile, "\t<defined>%g</defined>\n", shared_networks->available);
@ -367,7 +367,7 @@ int output_json(void)
sep++; sep++;
} }
if (config.output_limit[1] & BIT1) { if (config.output_limit[1] & R_BIT) {
if (sep) { if (sep) {
fprintf(outfile, ",\n"); fprintf(outfile, ",\n");
} }
@ -399,7 +399,7 @@ int output_json(void)
sep++; sep++;
} }
if (config.output_limit[1] & BIT2) { if (config.output_limit[1] & S_BIT) {
if (sep) { if (sep) {
fprintf(outfile, ",\n"); fprintf(outfile, ",\n");
} }
@ -422,7 +422,7 @@ int output_json(void)
sep++; sep++;
} }
if (config.output_limit[0] & BIT3) { if (config.output_limit[0] & A_BIT) {
if (sep) { if (sep) {
fprintf(outfile, ",\n"); fprintf(outfile, ",\n");
} }
@ -618,7 +618,7 @@ int output_html(void)
html_header(outfile); html_header(outfile);
newsection(outfile, "Sum of all"); newsection(outfile, "Sum of all");
table_start(outfile, "a", "all"); table_start(outfile, "a", "all");
if (config.output_limit[0] & BIT3) { if (config.output_limit[0] & A_BIT) {
start_tag(outfile, "thead"); start_tag(outfile, "thead");
start_tag(outfile, "tr"); start_tag(outfile, "tr");
output_line(outfile, "th", "name"); output_line(outfile, "th", "name");
@ -635,7 +635,7 @@ int output_html(void)
end_tag(outfile, "tr"); end_tag(outfile, "tr");
end_tag(outfile, "thead"); end_tag(outfile, "thead");
} }
if (config.output_limit[1] & BIT3) { if (config.output_limit[1] & A_BIT) {
start_tag(outfile, "tbody"); start_tag(outfile, "tbody");
start_tag(outfile, "tr"); start_tag(outfile, "tr");
output_line(outfile, "td", shared_networks->name); output_line(outfile, "td", shared_networks->name);
@ -666,7 +666,7 @@ int output_html(void)
table_end(outfile); table_end(outfile);
newsection(outfile, "Shared networks"); newsection(outfile, "Shared networks");
table_start(outfile, "s", "snet"); table_start(outfile, "s", "snet");
if (config.output_limit[0] & BIT2) { if (config.output_limit[0] & S_BIT) {
start_tag(outfile, "thead"); start_tag(outfile, "thead");
start_tag(outfile, "tr"); start_tag(outfile, "tr");
output_line(outfile, "th", "name"); output_line(outfile, "th", "name");
@ -683,7 +683,7 @@ int output_html(void)
end_tag(outfile, "tr"); end_tag(outfile, "tr");
end_tag(outfile, "thead"); end_tag(outfile, "thead");
} }
if (config.output_limit[1] & BIT2) { if (config.output_limit[1] & S_BIT) {
start_tag(outfile, "tbody"); start_tag(outfile, "tbody");
for (i = 0; i < num_shared_networks; i++) { for (i = 0; i < num_shared_networks; i++) {
shared_p++; shared_p++;
@ -716,7 +716,7 @@ int output_html(void)
table_end(outfile); table_end(outfile);
newsection(outfile, "Ranges"); newsection(outfile, "Ranges");
table_start(outfile, "r", "ranges"); table_start(outfile, "r", "ranges");
if (config.output_limit[0] & BIT1) { if (config.output_limit[0] & R_BIT) {
start_tag(outfile, "thead"); start_tag(outfile, "thead");
start_tag(outfile, "tr"); start_tag(outfile, "tr");
output_line(outfile, "th", "shared net name"); output_line(outfile, "th", "shared net name");
@ -735,7 +735,7 @@ int output_html(void)
end_tag(outfile, "tr"); end_tag(outfile, "tr");
end_tag(outfile, "thead"); end_tag(outfile, "thead");
} }
if (config.output_limit[1] & BIT1) { if (config.output_limit[1] & R_BIT) {
start_tag(outfile, "tbody"); start_tag(outfile, "tbody");
for (i = 0; i < num_ranges; i++) { for (i = 0; i < num_ranges; i++) {
start_tag(outfile, "tr"); start_tag(outfile, "tr");
@ -803,7 +803,7 @@ int output_csv(void)
range_p = ranges; range_p = ranges;
range_size = get_range_size(range_p); range_size = get_range_size(range_p);
shared_p = shared_networks; shared_p = shared_networks;
if (config.output_limit[0] & BIT1) { if (config.output_limit[0] & R_BIT) {
fprintf(outfile, "\"Ranges:\"\n"); fprintf(outfile, "\"Ranges:\"\n");
fprintf fprintf
(outfile, (outfile,
@ -813,7 +813,7 @@ int output_csv(void)
} }
fprintf(outfile, "\n"); fprintf(outfile, "\n");
} }
if (config.output_limit[1] & BIT1) { if (config.output_limit[1] & R_BIT) {
for (i = 0; i < num_ranges; i++) { for (i = 0; i < num_ranges; i++) {
if (range_p->shared_net) { if (range_p->shared_net) {
fprintf(outfile, "\"%s\",", range_p->shared_net->name); fprintf(outfile, "\"%s\",", range_p->shared_net->name);
@ -841,7 +841,7 @@ int output_csv(void)
} }
fprintf(outfile, "\n"); fprintf(outfile, "\n");
} }
if (config.output_limit[0] & BIT2) { if (config.output_limit[0] & S_BIT) {
fprintf(outfile, "\"Shared networks:\"\n"); fprintf(outfile, "\"Shared networks:\"\n");
fprintf(outfile, fprintf(outfile,
"\"name\",\"max\",\"cur\",\"percent\",\"touch\",\"t+c\",\"t+c perc\""); "\"name\",\"max\",\"cur\",\"percent\",\"touch\",\"t+c\",\"t+c perc\"");
@ -850,7 +850,7 @@ int output_csv(void)
} }
fprintf(outfile, "\n"); fprintf(outfile, "\n");
} }
if (config.output_limit[1] & BIT2) { if (config.output_limit[1] & S_BIT) {
for (i = 0; i < num_shared_networks; i++) { for (i = 0; i < num_shared_networks; i++) {
shared_p++; shared_p++;
@ -877,7 +877,7 @@ int output_csv(void)
} }
fprintf(outfile, "\n"); fprintf(outfile, "\n");
} }
if (config.output_limit[0] & BIT3) { if (config.output_limit[0] & A_BIT) {
fprintf(outfile, "\"Sum of all ranges:\"\n"); fprintf(outfile, "\"Sum of all ranges:\"\n");
fprintf(outfile, fprintf(outfile,
"\"name\",\"max\",\"cur\",\"percent\",\"touch\",\"t+c\",\"t+c perc\""); "\"name\",\"max\",\"cur\",\"percent\",\"touch\",\"t+c\",\"t+c perc\"");
@ -886,7 +886,7 @@ int output_csv(void)
} }
fprintf(outfile, "\n"); fprintf(outfile, "\n");
} }
if (config.output_limit[1] & BIT3) { if (config.output_limit[1] & A_BIT) {
fprintf(outfile, fprintf(outfile,
"\"%s\",\"%g\",\"%g\",\"%.3f\",\"%g\",\"%g\",\"%.3f\"", "\"%s\",\"%g\",\"%g\",\"%.3f\",\"%g\",\"%g\",\"%.3f\"",
@ -948,7 +948,7 @@ int output_alarming(void)
outfile = stdout; outfile = stdout;
} }
if (config.output_limit[1] & BIT1) { if (config.output_limit[1] & R_BIT) {
for (i = 0; i < num_ranges; i++) { for (i = 0; i < num_ranges; i++) {
if (config.snet_alarms && range_p->shared_net != shared_networks) { if (config.snet_alarms && range_p->shared_net != shared_networks) {
continue; continue;
@ -968,7 +968,7 @@ int output_alarming(void)
range_size = get_range_size(range_p); range_size = get_range_size(range_p);
} }
} }
if (config.output_limit[1] & BIT2) { if (config.output_limit[1] & S_BIT) {
for (i = 0; i < num_shared_networks; i++) { for (i = 0; i < num_shared_networks; i++) {
shared_p++; shared_p++;
if (config.minsize < shared_p->available) { if (config.minsize < shared_p->available) {
@ -994,19 +994,19 @@ int output_alarming(void)
else else
ret_val = STATE_OK; ret_val = STATE_OK;
if ((0 < rc && config.output_limit[1] & BIT1) if ((0 < rc && config.output_limit[1] & R_BIT)
|| (0 < sc && config.output_limit[1] & BIT2)) { || (0 < sc && config.output_limit[1] & S_BIT)) {
fprintf(outfile, "CRITICAL: %s:", program_name); fprintf(outfile, "CRITICAL: %s:", program_name);
} else if ((0 < rw && config.output_limit[1] & BIT1) } else if ((0 < rw && config.output_limit[1] & R_BIT)
|| (0 < sw && config.output_limit[1] & BIT2)) { || (0 < sw && config.output_limit[1] & S_BIT)) {
fprintf(outfile, "WARNING: %s:", program_name); fprintf(outfile, "WARNING: %s:", program_name);
} else { } else {
if (config.output_limit[1] & BIT3) if (config.output_limit[1] & A_BIT)
fprintf(outfile, "OK:"); fprintf(outfile, "OK:");
else else
return ret_val; return ret_val;
} }
if (config.output_limit[0] & BIT1) { if (config.output_limit[0] & R_BIT) {
fprintf(outfile, " Ranges - crit: %d warn: %d ok: %d", rc, rw, ro); fprintf(outfile, " Ranges - crit: %d warn: %d ok: %d", rc, rw, ro);
if (ri != 0) { if (ri != 0) {
fprintf(outfile, " ignored: %d", ri); fprintf(outfile, " ignored: %d", ri);
@ -1019,7 +1019,7 @@ int output_alarming(void)
} else { } else {
fprintf(outfile, " "); fprintf(outfile, " ");
} }
if (config.output_limit[0] & BIT2) { if (config.output_limit[0] & S_BIT) {
fprintf(outfile, "Shared nets - crit: %d warn: %d ok: %d", sc, sw, so); fprintf(outfile, "Shared nets - crit: %d warn: %d ok: %d", sc, sw, so);
if (si != 0) { if (si != 0) {
fprintf(outfile, " ignored: %d", si); fprintf(outfile, " ignored: %d", si);