ds: support greeting protocols

[public-inbox.git] / lib / PublicInbox / DS.pm

diff --git a/lib/PublicInbox/DS.pm b/lib/PublicInbox/DS.pm
index ba6c74d0ea97d51e069a85bdef6ad3123cc7e4d5..79f7046f87a4dbfe3732d221ecdbc05976336484 100644 (file)
--- a/lib/PublicInbox/DS.pm
+++ b/lib/PublicInbox/DS.pm
@@ -37,14 +37,12 @@ our @EXPORT_OK = qw(now msg_more dwaitpid add_timer add_uniq_timer);
 my %Stack;
 my $nextq; # queue for next_tick
 my $wait_pids; # list of [ pid, callback, callback_arg ]
-my $EXPMAP; # fd -> idle_time
-our $EXPTIME = 180; # 3 minutes
-my ($reap_armed);
+my $reap_armed;
 my $ToClose; # sockets to close when event loop is done
 our (
      %DescriptorMap,             # fd (num) -> PublicInbox::DS object
      $Epoll,                     # Global epoll fd (or DSKQXS ref)
-     $_io,                       # IO::Handle for Epoll
+     $ep_io,                     # IO::Handle for Epoll
 
      $PostLoopCallback,          # subref to call at the end of each loop, if defined (global)
 
@@ -76,9 +74,8 @@ sub Reset {
                # we may be iterating inside one of these on our stack
                my @q = delete @Stack{keys %Stack};
                for my $q (@q) { @$q = () }
-               $EXPMAP = undef;
                $wait_pids = $nextq = $ToClose = undef;
-               $_io = undef; # closes real $Epoll FD
+               $ep_io = undef; # closes real $Epoll FD
                $Epoll = undef; # may call DSKQXS::DESTROY
        } while (@Timers || keys(%Stack) || $nextq || $wait_pids ||
                $ToClose || keys(%DescriptorMap) ||
@@ -127,32 +124,24 @@ sub add_uniq_timer { # ($name, $secs, $coderef, @args) = @_;
        $UniqTimer{$_[0]} //= _add_named_timer(@_);
 }
 
-# keeping this around in case we support other FD types for now,
-# epoll_create1(EPOLL_CLOEXEC) requires Linux 2.6.27+...
-sub set_cloexec ($) {
-    my ($fd) = @_;
-
-    open($_io, '+<&=', $fd) or return;
-    defined(my $fl = fcntl($_io, F_GETFD, 0)) or return;
-    fcntl($_io, F_SETFD, $fl | FD_CLOEXEC);
-}
-
 # caller sets return value to $Epoll
-sub _InitPoller
-{
-    if (PublicInbox::Syscall::epoll_defined())  {
-        my $fd = epoll_create();
-        set_cloexec($fd) if (defined($fd) && $fd >= 0);
-       $fd;
-    } else {
-        my $cls;
-        for (qw(DSKQXS DSPoll)) {
-            $cls = "PublicInbox::$_";
-            last if eval "require $cls";
-        }
-        $cls->import(qw(epoll_ctl epoll_wait));
-        $cls->new;
-    }
+sub _InitPoller () {
+       if (PublicInbox::Syscall::epoll_defined())  {
+               my $fd = epoll_create();
+               die "epoll_create: $!" if $fd < 0;
+               open($ep_io, '+<&=', $fd) or return;
+               my $fl = fcntl($ep_io, F_GETFD, 0);
+               fcntl($ep_io, F_SETFD, $fl | FD_CLOEXEC);
+               $fd;
+       } else {
+               my $cls;
+               for (qw(DSKQXS DSPoll)) {
+                       $cls = "PublicInbox::$_";
+                       last if eval "require $cls";
+               }
+               $cls->import(qw(epoll_ctl epoll_wait));
+               $cls->new;
+       }
 }
 
 sub now () { clock_gettime(CLOCK_MONOTONIC) }
@@ -259,9 +248,6 @@ sub PostEventLoop () {
                $ToClose = undef; # will be autovivified on push
                @$close_now = map { fileno($_) } @$close_now;
 
-               # order matters, destroy expiry times, first:
-               delete @$EXPMAP{@$close_now};
-
                # ->DESTROY methods may populate ToClose
                delete @DescriptorMap{@$close_now};
        }
@@ -361,6 +347,24 @@ retry:
     $DescriptorMap{$fd} = $self;
 }
 
+# for IMAP, NNTP, and POP3 which greet clients upon connect
+sub greet {
+       my ($self, $sock) = @_;
+       my $ev = EPOLLIN;
+       my $wbuf;
+       if ($sock->can('accept_SSL') && !$sock->accept_SSL) {
+               return CORE::close($sock) if $! != EAGAIN;
+               $ev = PublicInbox::TLS::epollbit() or return CORE::close($sock);
+               $wbuf = [ \&accept_tls_step, $self->can('do_greet')];
+       }
+       new($self, $sock, $ev | EPOLLONESHOT);
+       if ($wbuf) {
+               $self->{wbuf} = $wbuf;
+       } else {
+               $self->do_greet;
+       }
+       $self;
+}
 
 #####################################################################
 ### I N S T A N C E   M E T H O D S
@@ -502,16 +506,15 @@ sub drop {
     $self->close;
 }
 
-# n.b.: use ->write/->read for this buffer to allow compatibility with
-# PerlIO::mmap or PerlIO::scalar if needed
 sub tmpio ($$$) {
        my ($self, $bref, $off) = @_;
        my $fh = tmpfile('wbuf', $self->{sock}, O_APPEND) or
                return drop($self, "tmpfile $!");
        $fh->autoflush(1);
        my $len = length($$bref) - $off;
-       print $fh substr($$bref, $off, $len) or
+       my $n = syswrite($fh, $$bref, $len, $off) //
                return drop($self, "write ($len): $!");
+       $n == $len or return drop($self, "wrote $n < $len bytes");
        [ $fh, 0 ] # [1] = offset, [2] = length, not set by us
 }
 
@@ -664,35 +667,6 @@ sub dwaitpid ($;$$) {
        }
 }
 
-sub expire_old () {
-       my $cur = $EXPMAP or return;
-       $EXPMAP = undef;
-       my $old = now() - $EXPTIME;
-       while (my ($fd, $idle_at) = each %$cur) {
-               if ($idle_at < $old) {
-                       my $ds_obj = $DescriptorMap{$fd};
-                       $EXPMAP->{$fd} = $idle_at if !$ds_obj->shutdn;
-               } else {
-                       $EXPMAP->{$fd} = $idle_at;
-               }
-       }
-       add_uniq_timer('expire', 60, \&expire_old) if $EXPMAP;
-}
-
-sub update_idle_time {
-       my ($self) = @_;
-       my $sock = $self->{sock} or return;
-       $EXPMAP->{fileno($sock)} = now();
-       add_uniq_timer('expire', 60, \&expire_old);
-}
-
-sub not_idle_long {
-       my ($self, $now) = @_;
-       my $sock = $self->{sock} or return;
-       my $idle_at = $EXPMAP->{fileno($sock)} or return;
-       ($idle_at + $EXPTIME) > $now;
-}
-
 1;
 
 =head1 AUTHORS (Danga::Socket)