mir/isc-dhcp
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/dhcp synced 2025-08-30 05:47:45 +00:00
Code Issues Releases Wiki Activity

Account for possibility that io object has no inner object.

Browse Source
This commit is contained in:
Ted Lemon 2000-06-06 23:47:27 +00:00
parent ee3aeca67f
commit d8c4674091
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
omapip/dispatch.c
View File

@ -264,7 +264,7 @@ isc_result_t omapi_one_dispatch (omapi_object_t *wo,
/* Check for a read socket. If we shouldn't be /* Check for a read socket. If we shouldn't be
trying to read for this I/O object, either there trying to read for this I/O object, either there
won't be a readfd function, or it'll return -1. */ won't be a readfd function, or it'll return -1. */
if (io -> readfd && if (io -> readfd && io -> inner &&
(desc = (*(io -> readfd)) (io -> inner)) >= 0) { (desc = (*(io -> readfd)) (io -> inner)) >= 0) {
FD_SET (desc, &r); FD_SET (desc, &r);
if (desc > max) if (desc > max)
@ -272,7 +272,7 @@ isc_result_t omapi_one_dispatch (omapi_object_t *wo,
} }
/* Same deal for write fdets. */ /* Same deal for write fdets. */
if (io -> writefd && if (io -> writefd && io -> inner &&
(desc = (*(io -> writefd)) (io -> inner)) >= 0) { (desc = (*(io -> writefd)) (io -> inner)) >= 0) {
FD_SET (desc, &w); FD_SET (desc, &w);
if (desc > max) if (desc > max)
@ -292,6 +292,8 @@ isc_result_t omapi_one_dispatch (omapi_object_t *wo,
return ISC_R_UNEXPECTED; return ISC_R_UNEXPECTED;
for (io = omapi_io_states.next; io; io = io -> next) { for (io = omapi_io_states.next; io; io = io -> next) {
if (!io -> inner)
continue;
omapi_object_reference (&tmp, io -> inner, MDL); omapi_object_reference (&tmp, io -> inner, MDL);
/* Check for a read descriptor, and if there is one, /* Check for a read descriptor, and if there is one,
see if we got input on that socket. */ see if we got input on that socket. */
@ -318,8 +320,9 @@ isc_result_t omapi_one_dispatch (omapi_object_t *wo,
prev = (omapi_io_object_t *)0; prev = (omapi_io_object_t *)0;
for (io = omapi_io_states.next; io; io = io -> next) { for (io = omapi_io_states.next; io; io = io -> next) {
if (io -> reaper) { if (io -> reaper) {
status = (*(io -> reaper)) (io -> inner); if (io -> inner)
if (status != ISC_R_SUCCESS) { status = (*(io -> reaper)) (io -> inner);
if (!io -> inner || status != ISC_R_SUCCESS) {
omapi_io_object_t *tmp = omapi_io_object_t *tmp =
(omapi_io_object_t *)0; (omapi_io_object_t *)0;
/* Save a reference to the next /* Save a reference to the next