byterazor/qpsmtpd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Slightly better signal handling - may help stability issues for some people

Browse Source 
git-svn-id: https://svn.perl.org/qpsmtpd/trunk@228 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Matt Sergeant 2004-03-18 23:02:43 +00:00
parent 04dacc4488
commit f84bd18601
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
qpsmtpd-forkserver
View File

@ -11,7 +11,7 @@ use Qpsmtpd::TcpServer;
use Qpsmtpd::Constants; use Qpsmtpd::Constants;
use IO::Socket; use IO::Socket;
use Socket; use Socket;
use POSIX qw(:sys_wait_h); use POSIX qw(:sys_wait_h :errno_h :signal_h);
use strict; use strict;
$| = 1; $| = 1;
@ -19,8 +19,19 @@ delete $ENV{ENV};
$ENV{PATH} = '/bin:/usr/bin:/var/qmail/bin'; $ENV{PATH} = '/bin:/usr/bin:/var/qmail/bin';
sub REAPER { sub REAPER {
1 until (-1 == waitpid(-1, WNOHANG)); while (defined(my $child = waitpid(-1, WNOHANG)) ) {
$SIG{CHLD} = \&REAPER; # unless $] >= 5.002 if ($child == -1) {
# No child here? Loop back
}
elsif (WIFEXITED($?)) {
# Process exited
last;
}
else {
# Possibly SIGSTOP on child...
last;
}
}
} }
$SIG{CHLD} = \&REAPER; $SIG{CHLD} = \&REAPER;
@ -49,21 +60,28 @@ $plugin_loader->load_plugins;
# $plugin_loader->log(LOGINFO, "Listening on port 25"); # $plugin_loader->log(LOGINFO, "Listening on port 25");
my $client;
while (1) { while (1) {
my $hisaddr = accept($client, $server); my $hisaddr = accept(my $client, $server);
if (!$hisaddr) { if (!$hisaddr) {
# possible something condition... # possible something condition...
next; next;
} }
my $pid = fork; my $pid = fork;
next if $pid; if ($pid) {
close($client);
next;
}
die "fork: $!" unless defined $pid; # failure die "fork: $!" unless defined $pid; # failure
# otherwise child # otherwise child
close($server); # no use to child
$SIG{CHLD} = 'DEFAULT'; close($server);
$SIG{CHLD} = $SIG{HUP} = $SIG{PIPE} = $SIG{INT} =
$SIG{TERM} = $SIG{QUIT} = 'DEFAULT';
my $localsockaddr = getsockname($client);
my ($lport, $laddr) = sockaddr_in($localsockaddr);
$ENV{TCPLOCALIP} = inet_ntoa($laddr);
my ($port, $iaddr) = sockaddr_in($hisaddr); my ($port, $iaddr) = sockaddr_in($hisaddr);
$ENV{TCPREMOTEIP} = inet_ntoa($iaddr); $ENV{TCPREMOTEIP} = inet_ntoa($iaddr);
$ENV{TCPREMOTEHOST} = gethostbyaddr($iaddr, AF_INET) || "Unknown"; $ENV{TCPREMOTEHOST} = gethostbyaddr($iaddr, AF_INET) || "Unknown";
@ -77,8 +95,6 @@ while (1) {
$qpsmtpd->run(); $qpsmtpd->run();
exit; # child leaves exit; # child leaves
} continue {
close($client); # no use to parent
} }
__END__ __END__