Skip to content

Added match alias only option & some other things #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Added match alias only option & some other things #15

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4adfa05
Added match alias only option
distahl May 11, 2021
b9d54c0
--aliases-only option documented
distahl May 11, 2021
f216a0c
More information for debugging
distahl May 11, 2021
ce38437
Quick and dirty fix for segfault in debug mode
distahl May 11, 2021
628ca86
Version 1.5
distahl May 11, 2021
be1a656
Added additional regex targets
distahl May 26, 2021
803f844
Fix for segfault with wrong interface count
distahl May 27, 2021
e19fa31
Reverted ce38437 & implemted a better solution for segfault in debug …
distahl May 27, 2021
43f7b07
Bugfix for 803f844
distahl May 28, 2021
df2ce93
Rework/Bugfix of 803f844 (interface count). Missed the fact, that the…
distahl May 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Added match alias only option
  • Loading branch information
@distahl
distahl committed May 11, 2021
commit 4adfa054775c60b1523eb2f69b19773e1dbf899f
22 changes: 17 additions & 5 deletions snmp_bulkget.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,7 @@ main(int argc, char *argv[])
int crit_on_down_flag = 1;
int get_aliases_flag = 0;
int match_aliases_flag = 0;
int match_aliases_only_flag = 0;
int get_names_flag = 0;
int print_all_flag = 0;
int err_tolerance = 50;
Expand Down Expand Up @@ -227,6 +228,7 @@ main(int argc, char *argv[])
{"sleep", required_argument, NULL, 3},
{"retries", required_argument, NULL, 4},
{"max-repetitions", required_argument, NULL, 5},
{"aliases-only", no_argument, NULL, 6},
{NULL, 0, NULL, 0}
};

Expand Down Expand Up @@ -332,6 +334,10 @@ main(int argc, char *argv[])
case 5:
pdu_max_repetitions = strtol(optarg, NULL, 10);
break;
case 6:
get_aliases_flag = 1; /* we need to see what we have matched... */
match_aliases_only_flag = 1;
break;
case '?':
default:
exit(usage(progname));
Expand Down Expand Up @@ -610,7 +616,7 @@ main(int argc, char *argv[])

/* now optionally fetch the interface aliases */

if (match_aliases_flag) {
if (match_aliases_flag || match_aliases_only_flag) {
lastifflag = 0;
count = 0;
/* allocate the space for the alias OIDs */
Expand Down Expand Up @@ -888,18 +894,23 @@ main(int argc, char *argv[])

count = 0;
for (i=0; i < ifNumber; i++) {
/* When --aliases-only is set check only alias */
if (match_aliases_only_flag)
status = !(regexec(&re, interfaces[i].alias, (size_t) 0, NULL, 0));
/* When --if-name is set ignore descr in favor of name, else use old behaviour */
if (get_names_flag)
else if (get_names_flag)
status = !regexec(&re, interfaces[i].name, (size_t) 0, NULL, 0) ||
(get_aliases_flag && !(regexec(&re, interfaces[i].alias, (size_t) 0, NULL, 0)));
else
status = !regexec(&re, interfaces[i].descr, (size_t) 0, NULL, 0) ||
(get_aliases_flag && !(regexec(&re, interfaces[i].alias, (size_t) 0, NULL, 0)));
status2 = 0;
if (status && exclude_list) {
if (get_names_flag)
if (match_aliases_only_flag)
status2 = !(regexec(&exclude_re, interfaces[i].alias, (size_t) 0, NULL, 0));
else if (get_names_flag)
status2 = !regexec(&exclude_re, interfaces[i].name, (size_t) 0, NULL, 0) ||
(get_aliases_flag && !(regexec(&re, interfaces[i].alias, (size_t) 0, NULL, 0)));
(get_aliases_flag && !(regexec(&exclude_re, interfaces[i].alias, (size_t) 0, NULL, 0)));
else
status2 = !regexec(&exclude_re, interfaces[i].descr, (size_t) 0, NULL, 0) ||
(get_aliases_flag && !(regexec(&exclude_re, interfaces[i].alias, (size_t) 0, NULL, 0)));
Expand Down Expand Up @@ -1353,7 +1364,8 @@ int usage(char *progname)
printf(" --timeout\t\tsets the SNMP timeout (in ms)\n");
printf(" --sleep\t\tsleep between every SNMP query (in ms)\n");
printf(" --retries\t\thow often to retry before giving up\n");
printf(" --max-repetitions\t\tsee <http://www.net-snmp.org/docs/man/snmpbulkwalk.html>\n");
printf(" --max-repetitions\tsee <http://www.net-snmp.org/docs/man/snmpbulkwalk.html>\n");
printf(" --aliases-only\tmatch only against aliases (Option -a automatically enabled)\n");
printf("\n");
return 3;
}
Expand Down