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

Don't set an alarm if in connect mode.

Browse Source 
Make fault() not return anything otherwise we get a "1" output in the stream


git-svn-id: https://svn.perl.org/qpsmtpd/branches/high_perf@426 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Matt Sergeant 2005-05-23 14:17:43 +00:00
parent 56451a722f
commit 42e49d493a
1 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/Qpsmtpd/PollServer.pm
View File

@ -89,6 +89,12 @@ sub respond {
return 1;
}
sub fault {
my $self = shift;
$self->SUPER::fault(@_);
return;
}
sub process_line {
my $self = shift;
my $line = shift || return;
@ -97,14 +103,19 @@ sub process_line {
my ($pkg, $file, $line) = caller();
die "ALARM: ($self->{mode}) $pkg, $file, $line";
};
my $prev = alarm(2); # must process a command in < 2 seconds
eval { $self->_process_line($line) };
alarm($prev);
if ($@) {
print STDERR "Error: $@\n";
return $self->fault("command failed unexpectedly") if $self->{mode} eq 'cmd';
return $self->fault("error processing data lines") if $self->{mode} eq 'data';
return $self->fault("unknown error");
if( $self->{mode} eq 'connect' ) {
eval { $self->_process_line($line) }
}
else {
my $prev = alarm(2); # must process a command in < 2 seconds
eval { $self->_process_line($line) };
alarm($prev);
if ($@) {
print STDERR "Error: $@\n";
return $self->fault("command failed unexpectedly") if $self->{mode} eq 'cmd';
return $self->fault("error processing data lines") if $self->{mode} eq 'data';
return $self->fault("unknown error");
}
}
return;
}
@ -114,13 +125,12 @@ sub _process_line {
my $line = shift;
if ($self->{mode} eq 'connect') {
warn("Connection incoming\n");
$self->{mode} = 'cmd';
my $rc = $self->start_conversation;
if ($rc != DONE) {
$self->close;
return;
}
$self->{mode} = 'cmd';
}
elsif ($self->{mode} eq 'cmd') {
$line =~ s/\r?\n//;