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

Don't continually check ->isa() for continue/pause_read - use OO properly

Browse Source 
Support case where no connect hook is defined (thus continue_read() never gets called)


git-svn-id: https://svn.perl.org/qpsmtpd/trunk@882 958fd67b-6ff1-0310-b445-bb7760255be9
This commit is contained in:
Matt Sergeant 2008-05-02 17:50:29 +00:00
parent b2532e8daa
commit bb724645a7
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Qpsmtpd.pm
View File

@ -403,11 +403,14 @@ sub run_hooks_no_respond {
return (0, '');
}
sub continue_read {} # subclassed in -async
sub pause_read { die "Continuations only work in qpsmtpd-async" }
sub run_continuation {
my $self = shift;
#my $t1 = $SAMPLER->("run_hooks", undef, 1);
die "No continuation in progress" unless $self->{_continuation};
$self->continue_read() if $self->isa('Danga::Client');
$self->continue_read();
my $todo = $self->{_continuation};
$self->{_continuation} = undef;
my $hook = shift @$todo || die "No hook in the continuation";
@ -441,7 +444,7 @@ sub run_continuation {
}
if ($r[0] == YIELD) {
$self->pause_read() if $self->isa('Danga::Client');
$self->pause_read();
$self->{_continuation} = [$hook, $args, @$todo];
return @r;
}

4
lib/Qpsmtpd/PollServer.pm
View File

@ -1,5 +1,3 @@
# $Id: Server.pm,v 1.10 2005/02/14 22:04:48 msergeant Exp $
package Qpsmtpd::PollServer;
use base ('Danga::Client', 'Qpsmtpd::SMTP');
@ -160,7 +158,7 @@ sub start_conversation {
$conn->remote_info("[$ip]");
ParaDNS->new(
finished => sub { $self->run_hooks("connect") },
finished => sub { $self->continue_read(); $self->run_hooks("connect") },
# NB: Setting remote_info to the same as remote_host
callback => sub { $conn->remote_info($conn->remote_host($_[0])) },
host => $ip,