WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-09-30 13:44:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

whitelist does not work on events, due to deletions.

Browse Source 
git-svn-id: file:///svn/unbound/trunk@670 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards
2007-10-09 11:58:58 +00:00
parent c46e1a1ee8
commit aed61e4d8a
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/netevent.c
+16 -10
View File
@@ -206,7 +206,8 @@ comm_point_udp_callback(int fd, short event, void* arg)
(void)comm_point_send_udp_msg(rep.c, rep.c->buffer,
(struct sockaddr*)&rep.addr, rep.addrlen);
}
log_assert(fptr_whitelist_event(rep.c->ev->ev.ev_callback));
/* may be deleted
log_assert(fptr_whitelist_event(rep.c->ev->ev.ev_callback)); */
}
/** Use a new tcp handler for new query fd, set to read query */
@@ -263,7 +264,8 @@ comm_point_tcp_accept_callback(int fd, short event, void* arg)
}
/* addr is dropped. Not needed for tcp reply. */
setup_tcp_handler(c_hdl, new_fd);
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback));
/* may be deleted
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback)); */
}
/** Make tcp handler free for next assignment */
@@ -466,7 +468,8 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
NETEVENT_CLOSED, NULL);
}
}
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback));
/* may be deleted
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback)); */
return;
}
if(event&EV_WRITE) {
@@ -479,7 +482,8 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
NETEVENT_CLOSED, NULL);
}
}
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback));
/*
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback)); */
return;
}
if(event&EV_TIMEOUT) {
@@ -490,11 +494,13 @@ comm_point_tcp_handle_callback(int fd, short event, void* arg)
(void)(*c->callback)(c, c->cb_arg,
NETEVENT_TIMEOUT, NULL);
}
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback));
/*
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback)); */
return;
}
log_err("Ignored event %d for tcphdl.", event);
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback));
/*
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback)); */
}
void comm_point_local_handle_callback(int fd, short event, void* arg)
@@ -508,11 +514,11 @@ void comm_point_local_handle_callback(int fd, short event, void* arg)
(void)(*c->callback)(c, c->cb_arg, NETEVENT_CLOSED,
NULL);
}
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback));
/* log_assert(fptr_whitelist_event(c->ev->ev.ev_callback));*/
return;
}
log_err("Ignored event %d for localhdl.", event);
log_assert(fptr_whitelist_event(c->ev->ev.ev_callback));
/*log_assert(fptr_whitelist_event(c->ev->ev.ev_callback));*/
}
struct comm_point*
@@ -1038,7 +1044,7 @@ comm_timer_callback(int ATTR_UNUSED(fd), short event, void* arg)
tm->ev_timer->enabled = 0;
log_assert(fptr_whitelist_comm_timer(tm->callback));
(*tm->callback)(tm->cb_arg);
log_assert(fptr_whitelist_event(tm->ev_timer->ev.ev_callback));
/* it was deleted log_assert(fptr_whitelist_event(tm->ev_timer->ev.ev_callback)); */
}
int
@@ -1078,7 +1084,7 @@ comm_signal_callback(int sig, short event, void* arg)
return;
log_assert(fptr_whitelist_comm_signal(comsig->callback));
(*comsig->callback)(sig, comsig->cb_arg);
log_assert(fptr_whitelist_event(comsig->ev_signal->ev.ev_callback));
/*log_assert(fptr_whitelist_event(comsig->ev_signal->ev.ev_callback));*/
}
int