Skip to content

Fix/number of interfaces bug #39

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

Merged
merged 6 commits into from
Jul 10, 2024
Merged

Fix/number of interfaces bug #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b303d26
Try (harder?) to detect the real number of check_interfaces
Jul 9, 2024
da2dc56
Remove suspicious type cast
Jul 9, 2024
1e2fe6b
Add tests for one specific device which is lying to us
Jul 9, 2024
35338b1
Longer timeout for tests
Jul 10, 2024
94d481f
Remove additional test, they are always running too long
Jul 10, 2024
d4d2ba1
Remove -Werror for clang build
Jul 10, 2024
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
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ jobs:
build:
runs-on: ubuntu-latest
env:
CFLAGS: "-Wall"
CFLAGS: "-Wall -Werror"

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: '3.x'
Expand Down Expand Up @@ -41,18 +41,18 @@ jobs:
run: sleep 30s
shell: bash

- name: check_interfaces
- name: check_interfaces with some cisco stuff
run: ./check_interfaces -h 127.0.0.1 --port=1611 -c cisco-c3560 -d

clang-build:
runs-on: ubuntu-latest
env:
CC: clang
CFLAGS: "-Wall"
CFLAGS: "-Wall"

steps:
- uses: actions/checkout@v4

- uses: actions/setup-python@v5
with:
python-version: '3.x'
Expand Down Expand Up @@ -81,5 +81,5 @@ jobs:
run: sleep 30s
shell: bash

- name: check_interfaces
- name: check_interfaces with some cisco stuff
run: ./check_interfaces -h 127.0.0.1 --port=1611 -c cisco-c3560 -d
19 changes: 17 additions & 2 deletions check_interfaces.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,18 @@ int main(int argc, char *argv[]) {
vars = vars->next_variable;
}

// get the real list length we need
int real_count = 0;
for (netsnmp_variable_list *runner = response->variables; runner; runner = runner->next_variable) {
if (vars->type == ASN_OCTET_STR) {
real_count ++;
}
}

if (real_count > ifNumber) {
ifNumber = real_count;
}

interfaces = (struct ifStruct *)calloc((size_t)ifNumber,
sizeof(struct ifStruct));
oldperfdata = (struct ifStruct *)calloc(
Expand Down Expand Up @@ -365,15 +377,18 @@ int main(int argc, char *argv[]) {
if (vars->type == ASN_OCTET_STR) {
if (config.trimdescr && config.trimdescr < vars->val_len) {
interfaces[count].index =
(int)vars->name[(vars->name_length - 1)];
vars->name[(vars->name_length - 1)];

MEMCPY(interfaces[count].descr,
(vars->val.string) + config.trimdescr,
vars->val_len - config.trimdescr);

TERMSTR(interfaces[count].descr,
vars->val_len - config.trimdescr);
} else {
interfaces[count].index =
(int)vars->name[(vars->name_length - 1)];
vars->name[(vars->name_length - 1)];

MEMCPY(interfaces[count].descr, vars->val.string,
vars->val_len);
TERMSTR(interfaces[count].descr, vars->val_len);
Expand Down