--- a/src/server/daemon/event_bsd.c Sun Nov 01 09:46:57 2020 +0100 +++ b/src/server/daemon/event_bsd.c Thu Dec 03 11:24:51 2020 +0100 @@ -82,15 +82,32 @@ numchanges = 0; for(int i=0;i<nev;i++) { Event *event = (Event*)events[i].udata; + if(!event) { + log_ereport(LOG_WARN, "Unknown kevent (ident=%d)", (int)events[i].ident); + continue; + } + if(event->fn) { - int ep = event->events; - if(event->fn(ev, event)) { - if(event->events != ep) { - changes[numchanges++].filter = ev_convert2sys_events(ep); + u_short kev_flag = 0; + int saved_ev = event->events; + if(!event->fn(ev, event)) { + // ret 0 => remove event + kev_flag = EV_DELETE; + + if(event->finish) { + event->finish(ev, event); } - } else if(event->finish) { - changes[numchanges++].filter = ev_convert2sys_events(ep); - event->finish(ev, event); + } else if(saved_ev != event->events) { + // events changed + kev_flag = EV_ADD; + events[i].filter = ev_convert2sys_events(event->events); + } + + if(kev_flag) { + // copy current event to changelist + changes[numchanges] = events[i]; + changes[numchanges].flags = kev_flag; + numchanges++; } } }