server.c (xinetd-2.3.15) | : | server.c (xinetd-2.3.15.4.tar.xz) | ||
---|---|---|---|---|
skipping to change at line 18 | skipping to change at line 18 | |||
#include "config.h" | #include "config.h" | |||
#include <sys/types.h> | #include <sys/types.h> | |||
#include <sys/socket.h> | #include <sys/socket.h> | |||
#include <netinet/in.h> | #include <netinet/in.h> | |||
#include <arpa/inet.h> | #include <arpa/inet.h> | |||
#include <syslog.h> | #include <syslog.h> | |||
#include <fcntl.h> | #include <fcntl.h> | |||
#include <time.h> | #include <time.h> | |||
#include <stdlib.h> | #include <stdlib.h> | |||
#include <unistd.h> | #include <unistd.h> | |||
#ifdef HAVE_SYS_FILE_H | ||||
#include <sys/file.h> | #include <sys/file.h> | |||
#endif | ||||
#include "pset.h" | #include "pset.h" | |||
#include "sio.h" | #include "sio.h" | |||
#include "server.h" | #include "server.h" | |||
#include "util.h" | #include "util.h" | |||
#include "msg.h" | #include "msg.h" | |||
#include "service.h" | #include "service.h" | |||
#include "sconf.h" | #include "sconf.h" | |||
#include "state.h" | #include "state.h" | |||
#include "main.h" | #include "main.h" | |||
skipping to change at line 292 | skipping to change at line 289 | |||
msg( LOG_DEBUG, func, | msg( LOG_DEBUG, func, | |||
"%s server %d %s", SVC_ID( sp ) , SERVER_PID(serp), death_type ) ; | "%s server %d %s", SVC_ID( sp ) , SERVER_PID(serp), death_type ) ; | |||
else | else | |||
msg( LOG_DEBUG, func, | msg( LOG_DEBUG, func, | |||
"%s server %d running on behalf of service %s %s", | "%s server %d running on behalf of service %s %s", | |||
SVC_ID( sp ), SERVER_PID(serp), SVC_ID( conn_sp ), death_type ) ; | SVC_ID( sp ), SERVER_PID(serp), SVC_ID( conn_sp ), death_type ) ; | |||
} | } | |||
/* Added this for when accepting wait=yes services */ | /* Added this for when accepting wait=yes services */ | |||
if( SVC_WAITS( sp ) ) | if( SVC_WAITS( sp ) ) | |||
#ifdef HAVE_POLL | ||||
SVC_EVENTS( sp ) = POLLIN ; | ||||
#else | ||||
FD_SET( SVC_FD( sp ), &ps.rws.socket_mask ) ; | FD_SET( SVC_FD( sp ), &ps.rws.socket_mask ) ; | |||
#endif /* HAVE_POLL */ | ||||
svc_postmortem( sp, serp ) ; | svc_postmortem( sp, serp ) ; | |||
server_release( serp ) ; | server_release( serp ) ; | |||
} | } | |||
else if ( PROC_STOPPED( SERVER_EXITSTATUS(serp) ) ) | else if ( PROC_STOPPED( SERVER_EXITSTATUS(serp) ) ) | |||
msg( LOG_WARNING, func, "service %s: server with pid %d stopped", | msg( LOG_WARNING, func, "service %s: server with pid %d stopped", | |||
SVC_ID( sp ), SERVER_PID(serp) ) ; | SVC_ID( sp ), SERVER_PID(serp) ) ; | |||
} | } | |||
/* | /* | |||
End of changes. 4 change blocks. | ||||
3 lines changed or deleted | 4 lines changed or added |