ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/AnyEvent/lib/AnyEvent/Handle.pm
(Generate patch)

Comparing AnyEvent/lib/AnyEvent/Handle.pm (file contents):
Revision 1.151 by root, Thu Jul 16 04:20:23 2009 UTC vs.
Revision 1.175 by root, Sat Aug 8 22:20:43 2009 UTC

1package AnyEvent::Handle; 1package AnyEvent::Handle;
2 2
3no warnings;
4use strict qw(subs vars);
5
6use AnyEvent ();
7use AnyEvent::Util qw(WSAEWOULDBLOCK);
8use Scalar::Util (); 3use Scalar::Util ();
9use Carp (); 4use Carp ();
10use Fcntl ();
11use Errno qw(EAGAIN EINTR); 5use Errno qw(EAGAIN EINTR);
12 6
7use AnyEvent (); BEGIN { AnyEvent::common_sense }
8use AnyEvent::Util qw(WSAEWOULDBLOCK);
9
13=head1 NAME 10=head1 NAME
14 11
15AnyEvent::Handle - non-blocking I/O on file handles via AnyEvent 12AnyEvent::Handle - non-blocking I/O on file handles via AnyEvent
16 13
17=cut 14=cut
18 15
19our $VERSION = 4.82; 16our $VERSION = 4.91;
20 17
21=head1 SYNOPSIS 18=head1 SYNOPSIS
22 19
23 use AnyEvent; 20 use AnyEvent;
24 use AnyEvent::Handle; 21 use AnyEvent::Handle;
47 $cv->recv; 44 $cv->recv;
48 45
49=head1 DESCRIPTION 46=head1 DESCRIPTION
50 47
51This module is a helper module to make it easier to do event-based I/O on 48This module is a helper module to make it easier to do event-based I/O on
52filehandles. For utility functions for doing non-blocking connects and accepts 49filehandles.
53on sockets see L<AnyEvent::Util>.
54 50
55The L<AnyEvent::Intro> tutorial contains some well-documented 51The L<AnyEvent::Intro> tutorial contains some well-documented
56AnyEvent::Handle examples. 52AnyEvent::Handle examples.
57 53
58In the following, when the documentation refers to of "bytes" then this 54In the following, when the documentation refers to of "bytes" then this
59means characters. As sysread and syswrite are used for all I/O, their 55means characters. As sysread and syswrite are used for all I/O, their
60treatment of characters applies to this module as well. 56treatment of characters applies to this module as well.
61 57
58At the very minimum, you should specify C<fh> or C<connect>, and the
59C<on_error> callback.
60
62All callbacks will be invoked with the handle object as their first 61All callbacks will be invoked with the handle object as their first
63argument. 62argument.
64 63
65=head1 METHODS 64=head1 METHODS
66 65
70 69
71The constructor supports these arguments (all as C<< key => value >> pairs). 70The constructor supports these arguments (all as C<< key => value >> pairs).
72 71
73=over 4 72=over 4
74 73
75=item fh => $filehandle [MANDATORY] 74=item fh => $filehandle [C<fh> or C<connect> MANDATORY]
76 75
77The filehandle this L<AnyEvent::Handle> object will operate on. 76The filehandle this L<AnyEvent::Handle> object will operate on.
78
79NOTE: The filehandle will be set to non-blocking mode (using 77NOTE: The filehandle will be set to non-blocking mode (using
80C<AnyEvent::Util::fh_nonblocking>) by the constructor and needs to stay in 78C<AnyEvent::Util::fh_nonblocking>) by the constructor and needs to stay in
81that mode. 79that mode.
80
81=item connect => [$host, $service] [C<fh> or C<connect> MANDATORY]
82
83Try to connect to the specified host and service (port), using
84C<AnyEvent::Socket::tcp_connect>. The C<$host> additionally becomes the
85default C<peername>.
86
87You have to specify either this parameter, or C<fh>, above.
88
89It is possible to push requests on the read and write queues, and modify
90properties of the stream, even while AnyEvent::Handle is connecting.
91
92When this parameter is specified, then the C<on_prepare>,
93C<on_connect_error> and C<on_connect> callbacks will be called under the
94appropriate circumstances:
95
96=over 4
97
98=item on_prepare => $cb->($handle)
99
100This (rarely used) callback is called before a new connection is
101attempted, but after the file handle has been created. It could be used to
102prepare the file handle with parameters required for the actual connect
103(as opposed to settings that can be changed when the connection is already
104established).
105
106The return value of this callback should be the connect timeout value in
107seconds (or C<0>, or C<undef>, or the empty list, to indicate the default
108timeout is to be used).
109
110=item on_connect => $cb->($handle, $host, $port, $retry->())
111
112This callback is called when a connection has been successfully established.
113
114The actual numeric host and port (the socket peername) are passed as
115parameters, together with a retry callback.
116
117When, for some reason, the handle is not acceptable, then calling
118C<$retry> will continue with the next conenction target (in case of
119multi-homed hosts or SRV records there can be multiple connection
120endpoints). When it is called then the read and write queues, eof status,
121tls status and similar properties of the handle are being reset.
122
123In most cases, ignoring the C<$retry> parameter is the way to go.
124
125=item on_connect_error => $cb->($handle, $message)
126
127This callback is called when the conenction could not be
128established. C<$!> will contain the relevant error code, and C<$message> a
129message describing it (usually the same as C<"$!">).
130
131If this callback isn't specified, then C<on_error> will be called with a
132fatal error instead.
133
134=back
135
136=item on_error => $cb->($handle, $fatal, $message)
137
138This is the error callback, which is called when, well, some error
139occured, such as not being able to resolve the hostname, failure to
140connect or a read error.
141
142Some errors are fatal (which is indicated by C<$fatal> being true). On
143fatal errors the handle object will be destroyed (by a call to C<< ->
144destroy >>) after invoking the error callback (which means you are free to
145examine the handle object). Examples of fatal errors are an EOF condition
146with active (but unsatisifable) read watchers (C<EPIPE>) or I/O errors. In
147cases where the other side can close the connection at their will it is
148often easiest to not report C<EPIPE> errors in this callback.
149
150AnyEvent::Handle tries to find an appropriate error code for you to check
151against, but in some cases (TLS errors), this does not work well. It is
152recommended to always output the C<$message> argument in human-readable
153error messages (it's usually the same as C<"$!">).
154
155Non-fatal errors can be retried by simply returning, but it is recommended
156to simply ignore this parameter and instead abondon the handle object
157when this callback is invoked. Examples of non-fatal errors are timeouts
158C<ETIMEDOUT>) or badly-formatted data (C<EBADMSG>).
159
160On callback entrance, the value of C<$!> contains the operating system
161error code (or C<ENOSPC>, C<EPIPE>, C<ETIMEDOUT>, C<EBADMSG> or
162C<EPROTO>).
163
164While not mandatory, it is I<highly> recommended to set this callback, as
165you will not be notified of errors otherwise. The default simply calls
166C<croak>.
167
168=item on_read => $cb->($handle)
169
170This sets the default read callback, which is called when data arrives
171and no read request is in the queue (unlike read queue callbacks, this
172callback will only be called when at least one octet of data is in the
173read buffer).
174
175To access (and remove data from) the read buffer, use the C<< ->rbuf >>
176method or access the C<< $handle->{rbuf} >> member directly. Note that you
177must not enlarge or modify the read buffer, you can only remove data at
178the beginning from it.
179
180When an EOF condition is detected then AnyEvent::Handle will first try to
181feed all the remaining data to the queued callbacks and C<on_read> before
182calling the C<on_eof> callback. If no progress can be made, then a fatal
183error will be raised (with C<$!> set to C<EPIPE>).
184
185Note that, unlike requests in the read queue, an C<on_read> callback
186doesn't mean you I<require> some data: if there is an EOF and there
187are outstanding read requests then an error will be flagged. With an
188C<on_read> callback, the C<on_eof> callback will be invoked.
82 189
83=item on_eof => $cb->($handle) 190=item on_eof => $cb->($handle)
84 191
85Set the callback to be called when an end-of-file condition is detected, 192Set the callback to be called when an end-of-file condition is detected,
86i.e. in the case of a socket, when the other side has closed the 193i.e. in the case of a socket, when the other side has closed the
93callback and continue writing data, as only the read part has been shut 200callback and continue writing data, as only the read part has been shut
94down. 201down.
95 202
96If an EOF condition has been detected but no C<on_eof> callback has been 203If an EOF condition has been detected but no C<on_eof> callback has been
97set, then a fatal error will be raised with C<$!> set to <0>. 204set, then a fatal error will be raised with C<$!> set to <0>.
98
99=item on_error => $cb->($handle, $fatal, $message)
100
101This is the error callback, which is called when, well, some error
102occured, such as not being able to resolve the hostname, failure to
103connect or a read error.
104
105Some errors are fatal (which is indicated by C<$fatal> being true). On
106fatal errors the handle object will be destroyed (by a call to C<< ->
107destroy >>) after invoking the error callback (which means you are free to
108examine the handle object). Examples of fatal errors are an EOF condition
109with active (but unsatisifable) read watchers (C<EPIPE>) or I/O errors.
110
111AnyEvent::Handle tries to find an appropriate error code for you to check
112against, but in some cases (TLS errors), this does not work well. It is
113recommended to always output the C<$message> argument in human-readable
114error messages (it's usually the same as C<"$!">).
115
116Non-fatal errors can be retried by simply returning, but it is recommended
117to simply ignore this parameter and instead abondon the handle object
118when this callback is invoked. Examples of non-fatal errors are timeouts
119C<ETIMEDOUT>) or badly-formatted data (C<EBADMSG>).
120
121On callback entrance, the value of C<$!> contains the operating system
122error code (or C<ENOSPC>, C<EPIPE>, C<ETIMEDOUT>, C<EBADMSG> or
123C<EPROTO>).
124
125While not mandatory, it is I<highly> recommended to set this callback, as
126you will not be notified of errors otherwise. The default simply calls
127C<croak>.
128
129=item on_read => $cb->($handle)
130
131This sets the default read callback, which is called when data arrives
132and no read request is in the queue (unlike read queue callbacks, this
133callback will only be called when at least one octet of data is in the
134read buffer).
135
136To access (and remove data from) the read buffer, use the C<< ->rbuf >>
137method or access the C<< $handle->{rbuf} >> member directly. Note that you
138must not enlarge or modify the read buffer, you can only remove data at
139the beginning from it.
140
141When an EOF condition is detected then AnyEvent::Handle will first try to
142feed all the remaining data to the queued callbacks and C<on_read> before
143calling the C<on_eof> callback. If no progress can be made, then a fatal
144error will be raised (with C<$!> set to C<EPIPE>).
145
146Note that, unlike requests in the read queue, an C<on_read> callback
147doesn't mean you I<require> some data: if there is an EOF and there
148are outstanding read requests then an error will be flagged. With an
149C<on_read> callback, the C<on_eof> callback will be invoked.
150 205
151=item on_drain => $cb->($handle) 206=item on_drain => $cb->($handle)
152 207
153This sets the callback that is called when the write buffer becomes empty 208This sets the callback that is called when the write buffer becomes empty
154(or when the callback is set and the buffer is empty already). 209(or when the callback is set and the buffer is empty already).
353 408
354sub new { 409sub new {
355 my $class = shift; 410 my $class = shift;
356 my $self = bless { @_ }, $class; 411 my $self = bless { @_ }, $class;
357 412
358 $self->{fh} or Carp::croak "mandatory argument fh is missing"; 413 if ($self->{fh}) {
414 $self->_start;
415 return unless $self->{fh}; # could be gone by now
416
417 } elsif ($self->{connect}) {
418 require AnyEvent::Socket;
419
420 $self->{peername} = $self->{connect}[0]
421 unless exists $self->{peername};
422
423 $self->{_skip_drain_rbuf} = 1;
424
425 {
426 Scalar::Util::weaken (my $self = $self);
427
428 $self->{_connect} =
429 AnyEvent::Socket::tcp_connect (
430 $self->{connect}[0],
431 $self->{connect}[1],
432 sub {
433 my ($fh, $host, $port, $retry) = @_;
434
435 if ($fh) {
436 $self->{fh} = $fh;
437
438 delete $self->{_skip_drain_rbuf};
439 $self->_start;
440
441 $self->{on_connect}
442 and $self->{on_connect}($self, $host, $port, sub {
443 delete @$self{qw(fh _tw _ww _rw _eof _queue rbuf _wbuf tls _tls_rbuf _tls_wbuf)};
444 $self->{_skip_drain_rbuf} = 1;
445 &$retry;
446 });
447
448 } else {
449 if ($self->{on_connect_error}) {
450 $self->{on_connect_error}($self, "$!");
451 $self->destroy;
452 } else {
453 $self->_error ($!, 1);
454 }
455 }
456 },
457 sub {
458 local $self->{fh} = $_[0];
459
460 $self->{on_prepare}
461 ? $self->{on_prepare}->($self)
462 : ()
463 }
464 );
465 }
466
467 } else {
468 Carp::croak "AnyEvent::Handle: either an existing fh or the connect parameter must be specified";
469 }
470
471 $self
472}
473
474sub _start {
475 my ($self) = @_;
359 476
360 AnyEvent::Util::fh_nonblocking $self->{fh}, 1; 477 AnyEvent::Util::fh_nonblocking $self->{fh}, 1;
361 478
362 $self->{_activity} = AnyEvent->now; 479 $self->{_activity} = AE::now;
363 $self->_timeout; 480 $self->_timeout;
364 481
365 $self->no_delay (delete $self->{no_delay}) if exists $self->{no_delay}; 482 $self->no_delay (delete $self->{no_delay}) if exists $self->{no_delay};
366 483
367 $self->starttls (delete $self->{tls}, delete $self->{tls_ctx}) 484 $self->starttls (delete $self->{tls}, delete $self->{tls_ctx})
368 if $self->{tls}; 485 if $self->{tls};
369 486
370 $self->on_drain (delete $self->{on_drain}) if $self->{on_drain}; 487 $self->on_drain (delete $self->{on_drain}) if $self->{on_drain};
371 488
372 $self->start_read 489 $self->start_read
373 if $self->{on_read}; 490 if $self->{on_read} || @{ $self->{_queue} };
374 491
375 $self->{fh} && $self 492 $self->_drain_wbuf;
376} 493}
377 494
378#sub _shutdown { 495#sub _shutdown {
379# my ($self) = @_; 496# my ($self) = @_;
380# 497#
460sub no_delay { 577sub no_delay {
461 $_[0]{no_delay} = $_[1]; 578 $_[0]{no_delay} = $_[1];
462 579
463 eval { 580 eval {
464 local $SIG{__DIE__}; 581 local $SIG{__DIE__};
465 setsockopt $_[0]{fh}, &Socket::IPPROTO_TCP, &Socket::TCP_NODELAY, int $_[1]; 582 setsockopt $_[0]{fh}, &Socket::IPPROTO_TCP, &Socket::TCP_NODELAY, int $_[1]
583 if $_[0]{fh};
466 }; 584 };
467} 585}
468 586
469=item $handle->on_starttls ($cb) 587=item $handle->on_starttls ($cb)
470 588
484 602
485sub on_starttls { 603sub on_starttls {
486 $_[0]{on_stoptls} = $_[1]; 604 $_[0]{on_stoptls} = $_[1];
487} 605}
488 606
607=item $handle->rbuf_max ($max_octets)
608
609Configures the C<rbuf_max> setting (C<undef> disables it).
610
611=cut
612
613sub rbuf_max {
614 $_[0]{rbuf_max} = $_[1];
615}
616
489############################################################################# 617#############################################################################
490 618
491=item $handle->timeout ($seconds) 619=item $handle->timeout ($seconds)
492 620
493Configures (or disables) the inactivity timeout. 621Configures (or disables) the inactivity timeout.
496 624
497sub timeout { 625sub timeout {
498 my ($self, $timeout) = @_; 626 my ($self, $timeout) = @_;
499 627
500 $self->{timeout} = $timeout; 628 $self->{timeout} = $timeout;
629 delete $self->{_tw};
501 $self->_timeout; 630 $self->_timeout;
502} 631}
503 632
504# reset the timeout watcher, as neccessary 633# reset the timeout watcher, as neccessary
505# also check for time-outs 634# also check for time-outs
506sub _timeout { 635sub _timeout {
507 my ($self) = @_; 636 my ($self) = @_;
508 637
509 if ($self->{timeout}) { 638 if ($self->{timeout} && $self->{fh}) {
510 my $NOW = AnyEvent->now; 639 my $NOW = AE::now;
511 640
512 # when would the timeout trigger? 641 # when would the timeout trigger?
513 my $after = $self->{_activity} + $self->{timeout} - $NOW; 642 my $after = $self->{_activity} + $self->{timeout} - $NOW;
514 643
515 # now or in the past already? 644 # now or in the past already?
530 } 659 }
531 660
532 Scalar::Util::weaken $self; 661 Scalar::Util::weaken $self;
533 return unless $self; # ->error could have destroyed $self 662 return unless $self; # ->error could have destroyed $self
534 663
535 $self->{_tw} ||= AnyEvent->timer (after => $after, cb => sub { 664 $self->{_tw} ||= AE::timer $after, 0, sub {
536 delete $self->{_tw}; 665 delete $self->{_tw};
537 $self->_timeout; 666 $self->_timeout;
538 }); 667 };
539 } else { 668 } else {
540 delete $self->{_tw}; 669 delete $self->{_tw};
541 } 670 }
542} 671}
543 672
593 my $len = syswrite $self->{fh}, $self->{wbuf}; 722 my $len = syswrite $self->{fh}, $self->{wbuf};
594 723
595 if (defined $len) { 724 if (defined $len) {
596 substr $self->{wbuf}, 0, $len, ""; 725 substr $self->{wbuf}, 0, $len, "";
597 726
598 $self->{_activity} = AnyEvent->now; 727 $self->{_activity} = AE::now;
599 728
600 $self->{on_drain}($self) 729 $self->{on_drain}($self)
601 if $self->{low_water_mark} >= (length $self->{wbuf}) + (length $self->{_tls_wbuf}) 730 if $self->{low_water_mark} >= (length $self->{wbuf}) + (length $self->{_tls_wbuf})
602 && $self->{on_drain}; 731 && $self->{on_drain};
603 732
609 738
610 # try to write data immediately 739 # try to write data immediately
611 $cb->() unless $self->{autocork}; 740 $cb->() unless $self->{autocork};
612 741
613 # if still data left in wbuf, we need to poll 742 # if still data left in wbuf, we need to poll
614 $self->{_ww} = AnyEvent->io (fh => $self->{fh}, poll => "w", cb => $cb) 743 $self->{_ww} = AE::io $self->{fh}, 1, $cb
615 if length $self->{wbuf}; 744 if length $self->{wbuf};
616 }; 745 };
617} 746}
618 747
619our %WH; 748our %WH;
632 ->($self, @_); 761 ->($self, @_);
633 } 762 }
634 763
635 if ($self->{tls}) { 764 if ($self->{tls}) {
636 $self->{_tls_wbuf} .= $_[0]; 765 $self->{_tls_wbuf} .= $_[0];
637 766 &_dotls ($self) if $self->{fh};
638 &_dotls ($self);
639 } else { 767 } else {
640 $self->{wbuf} .= $_[0]; 768 $self->{wbuf} .= $_[0];
641 $self->_drain_wbuf; 769 $self->_drain_wbuf if $self->{fh};
642 } 770 }
643} 771}
644 772
645=item $handle->push_write (type => @args) 773=item $handle->push_write (type => @args)
646 774
863=cut 991=cut
864 992
865sub _drain_rbuf { 993sub _drain_rbuf {
866 my ($self) = @_; 994 my ($self) = @_;
867 995
996 # avoid recursion
997 return if $self->{_skip_drain_rbuf};
868 local $self->{_in_drain} = 1; 998 local $self->{_skip_drain_rbuf} = 1;
869
870 if (
871 defined $self->{rbuf_max}
872 && $self->{rbuf_max} < length $self->{rbuf}
873 ) {
874 $self->_error (Errno::ENOSPC, 1), return;
875 }
876 999
877 while () { 1000 while () {
878 # we need to use a separate tls read buffer, as we must not receive data while 1001 # we need to use a separate tls read buffer, as we must not receive data while
879 # we are draining the buffer, and this can only happen with TLS. 1002 # we are draining the buffer, and this can only happen with TLS.
880 $self->{rbuf} .= delete $self->{_tls_rbuf} if exists $self->{_tls_rbuf}; 1003 $self->{rbuf} .= delete $self->{_tls_rbuf}
1004 if exists $self->{_tls_rbuf};
881 1005
882 my $len = length $self->{rbuf}; 1006 my $len = length $self->{rbuf};
883 1007
884 if (my $cb = shift @{ $self->{_queue} }) { 1008 if (my $cb = shift @{ $self->{_queue} }) {
885 unless ($cb->($self)) { 1009 unless ($cb->($self)) {
886 if ($self->{_eof}) { 1010 # no progress can be made
887 # no progress can be made (not enough data and no data forthcoming) 1011 # (not enough data and no data forthcoming)
888 $self->_error (Errno::EPIPE, 1), return; 1012 $self->_error (Errno::EPIPE, 1), return
889 } 1013 if $self->{_eof};
890 1014
891 unshift @{ $self->{_queue} }, $cb; 1015 unshift @{ $self->{_queue} }, $cb;
892 last; 1016 last;
893 } 1017 }
894 } elsif ($self->{on_read}) { 1018 } elsif ($self->{on_read}) {
914 last; 1038 last;
915 } 1039 }
916 } 1040 }
917 1041
918 if ($self->{_eof}) { 1042 if ($self->{_eof}) {
919 if ($self->{on_eof}) { 1043 $self->{on_eof}
920 $self->{on_eof}($self) 1044 ? $self->{on_eof}($self)
921 } else {
922 $self->_error (0, 1, "Unexpected end-of-file"); 1045 : $self->_error (0, 1, "Unexpected end-of-file");
923 } 1046
1047 return;
1048 }
1049
1050 if (
1051 defined $self->{rbuf_max}
1052 && $self->{rbuf_max} < length $self->{rbuf}
1053 ) {
1054 $self->_error (Errno::ENOSPC, 1), return;
924 } 1055 }
925 1056
926 # may need to restart read watcher 1057 # may need to restart read watcher
927 unless ($self->{_rw}) { 1058 unless ($self->{_rw}) {
928 $self->start_read 1059 $self->start_read
940 1071
941sub on_read { 1072sub on_read {
942 my ($self, $cb) = @_; 1073 my ($self, $cb) = @_;
943 1074
944 $self->{on_read} = $cb; 1075 $self->{on_read} = $cb;
945 $self->_drain_rbuf if $cb && !$self->{_in_drain}; 1076 $self->_drain_rbuf if $cb;
946} 1077}
947 1078
948=item $handle->rbuf 1079=item $handle->rbuf
949 1080
950Returns the read buffer (as a modifiable lvalue). 1081Returns the read buffer (as a modifiable lvalue).
1002 $cb = ($RH{$type} or Carp::croak "unsupported type passed to AnyEvent::Handle::push_read") 1133 $cb = ($RH{$type} or Carp::croak "unsupported type passed to AnyEvent::Handle::push_read")
1003 ->($self, $cb, @_); 1134 ->($self, $cb, @_);
1004 } 1135 }
1005 1136
1006 push @{ $self->{_queue} }, $cb; 1137 push @{ $self->{_queue} }, $cb;
1007 $self->_drain_rbuf unless $self->{_in_drain}; 1138 $self->_drain_rbuf;
1008} 1139}
1009 1140
1010sub unshift_read { 1141sub unshift_read {
1011 my $self = shift; 1142 my $self = shift;
1012 my $cb = pop; 1143 my $cb = pop;
1018 ->($self, $cb, @_); 1149 ->($self, $cb, @_);
1019 } 1150 }
1020 1151
1021 1152
1022 unshift @{ $self->{_queue} }, $cb; 1153 unshift @{ $self->{_queue} }, $cb;
1023 $self->_drain_rbuf unless $self->{_in_drain}; 1154 $self->_drain_rbuf;
1024} 1155}
1025 1156
1026=item $handle->push_read (type => @args, $cb) 1157=item $handle->push_read (type => @args, $cb)
1027 1158
1028=item $handle->unshift_read (type => @args, $cb) 1159=item $handle->unshift_read (type => @args, $cb)
1409 my ($self) = @_; 1540 my ($self) = @_;
1410 1541
1411 unless ($self->{_rw} || $self->{_eof}) { 1542 unless ($self->{_rw} || $self->{_eof}) {
1412 Scalar::Util::weaken $self; 1543 Scalar::Util::weaken $self;
1413 1544
1414 $self->{_rw} = AnyEvent->io (fh => $self->{fh}, poll => "r", cb => sub { 1545 $self->{_rw} = AE::io $self->{fh}, 0, sub {
1415 my $rbuf = \($self->{tls} ? my $buf : $self->{rbuf}); 1546 my $rbuf = \($self->{tls} ? my $buf : $self->{rbuf});
1416 my $len = sysread $self->{fh}, $$rbuf, $self->{read_size} || 8192, length $$rbuf; 1547 my $len = sysread $self->{fh}, $$rbuf, $self->{read_size} || 8192, length $$rbuf;
1417 1548
1418 if ($len > 0) { 1549 if ($len > 0) {
1419 $self->{_activity} = AnyEvent->now; 1550 $self->{_activity} = AE::now;
1420 1551
1421 if ($self->{tls}) { 1552 if ($self->{tls}) {
1422 Net::SSLeay::BIO_write ($self->{_rbio}, $$rbuf); 1553 Net::SSLeay::BIO_write ($self->{_rbio}, $$rbuf);
1423 1554
1424 &_dotls ($self); 1555 &_dotls ($self);
1425 } else { 1556 } else {
1426 $self->_drain_rbuf unless $self->{_in_drain}; 1557 $self->_drain_rbuf;
1427 } 1558 }
1428 1559
1429 } elsif (defined $len) { 1560 } elsif (defined $len) {
1430 delete $self->{_rw}; 1561 delete $self->{_rw};
1431 $self->{_eof} = 1; 1562 $self->{_eof} = 1;
1432 $self->_drain_rbuf unless $self->{_in_drain}; 1563 $self->_drain_rbuf;
1433 1564
1434 } elsif ($! != EAGAIN && $! != EINTR && $! != WSAEWOULDBLOCK) { 1565 } elsif ($! != EAGAIN && $! != EINTR && $! != WSAEWOULDBLOCK) {
1435 return $self->_error ($!, 1); 1566 return $self->_error ($!, 1);
1436 } 1567 }
1437 }); 1568 };
1438 } 1569 }
1439} 1570}
1440 1571
1441our $ERROR_SYSCALL; 1572our $ERROR_SYSCALL;
1442our $ERROR_WANT_READ; 1573our $ERROR_WANT_READ;
1497 $self->{_eof} = 1; 1628 $self->{_eof} = 1;
1498 } 1629 }
1499 } 1630 }
1500 1631
1501 $self->{_tls_rbuf} .= $tmp; 1632 $self->{_tls_rbuf} .= $tmp;
1502 $self->_drain_rbuf unless $self->{_in_drain}; 1633 $self->_drain_rbuf;
1503 $self->{tls} or return; # tls session might have gone away in callback 1634 $self->{tls} or return; # tls session might have gone away in callback
1504 } 1635 }
1505 1636
1506 $tmp = Net::SSLeay::get_error ($self->{tls}, -1); 1637 $tmp = Net::SSLeay::get_error ($self->{tls}, -1);
1507 return $self->_tls_error ($tmp) 1638 return $self->_tls_error ($tmp)
1522 1653
1523Instead of starting TLS negotiation immediately when the AnyEvent::Handle 1654Instead of starting TLS negotiation immediately when the AnyEvent::Handle
1524object is created, you can also do that at a later time by calling 1655object is created, you can also do that at a later time by calling
1525C<starttls>. 1656C<starttls>.
1526 1657
1658Starting TLS is currently an asynchronous operation - when you push some
1659write data and then call C<< ->starttls >> then TLS negotiation will start
1660immediately, after which the queued write data is then sent.
1661
1527The first argument is the same as the C<tls> constructor argument (either 1662The first argument is the same as the C<tls> constructor argument (either
1528C<"connect">, C<"accept"> or an existing Net::SSLeay object). 1663C<"connect">, C<"accept"> or an existing Net::SSLeay object).
1529 1664
1530The second argument is the optional C<AnyEvent::TLS> object that is used 1665The second argument is the optional C<AnyEvent::TLS> object that is used
1531when AnyEvent::Handle has to create its own TLS connection object, or 1666when AnyEvent::Handle has to create its own TLS connection object, or
1535The TLS connection object will end up in C<< $handle->{tls} >>, the TLS 1670The TLS connection object will end up in C<< $handle->{tls} >>, the TLS
1536context in C<< $handle->{tls_ctx} >> after this call and can be used or 1671context in C<< $handle->{tls_ctx} >> after this call and can be used or
1537changed to your liking. Note that the handshake might have already started 1672changed to your liking. Note that the handshake might have already started
1538when this function returns. 1673when this function returns.
1539 1674
1540If it an error to start a TLS handshake more than once per 1675Due to bugs in OpenSSL, it might or might not be possible to do multiple
1541AnyEvent::Handle object (this is due to bugs in OpenSSL). 1676handshakes on the same stream. Best do not attempt to use the stream after
1677stopping TLS.
1542 1678
1543=cut 1679=cut
1544 1680
1545our %TLS_CACHE; #TODO not yet documented, should we? 1681our %TLS_CACHE; #TODO not yet documented, should we?
1546 1682
1547sub starttls { 1683sub starttls {
1548 my ($self, $ssl, $ctx) = @_; 1684 my ($self, $tls, $ctx) = @_;
1685
1686 Carp::croak "It is an error to call starttls on an AnyEvent::Handle object while TLS is already active, caught"
1687 if $self->{tls};
1688
1689 $self->{tls} = $tls;
1690 $self->{tls_ctx} = $ctx if @_ > 2;
1691
1692 return unless $self->{fh};
1549 1693
1550 require Net::SSLeay; 1694 require Net::SSLeay;
1551
1552 Carp::croak "it is an error to call starttls more than once on an AnyEvent::Handle object"
1553 if $self->{tls};
1554 1695
1555 $ERROR_SYSCALL = Net::SSLeay::ERROR_SYSCALL (); 1696 $ERROR_SYSCALL = Net::SSLeay::ERROR_SYSCALL ();
1556 $ERROR_WANT_READ = Net::SSLeay::ERROR_WANT_READ (); 1697 $ERROR_WANT_READ = Net::SSLeay::ERROR_WANT_READ ();
1557 1698
1699 $tls = $self->{tls};
1558 $ctx ||= $self->{tls_ctx}; 1700 $ctx = $self->{tls_ctx};
1701
1702 local $Carp::CarpLevel = 1; # skip ourselves when creating a new context or session
1559 1703
1560 if ("HASH" eq ref $ctx) { 1704 if ("HASH" eq ref $ctx) {
1561 require AnyEvent::TLS; 1705 require AnyEvent::TLS;
1562
1563 local $Carp::CarpLevel = 1; # skip ourselves when creating a new context
1564 1706
1565 if ($ctx->{cache}) { 1707 if ($ctx->{cache}) {
1566 my $key = $ctx+0; 1708 my $key = $ctx+0;
1567 $ctx = $TLS_CACHE{$key} ||= new AnyEvent::TLS %$ctx; 1709 $ctx = $TLS_CACHE{$key} ||= new AnyEvent::TLS %$ctx;
1568 } else { 1710 } else {
1569 $ctx = new AnyEvent::TLS %$ctx; 1711 $ctx = new AnyEvent::TLS %$ctx;
1570 } 1712 }
1571 } 1713 }
1572 1714
1573 $self->{tls_ctx} = $ctx || TLS_CTX (); 1715 $self->{tls_ctx} = $ctx || TLS_CTX ();
1574 $self->{tls} = $ssl = $self->{tls_ctx}->_get_session ($ssl, $self, $self->{peername}); 1716 $self->{tls} = $tls = $self->{tls_ctx}->_get_session ($tls, $self, $self->{peername});
1575 1717
1576 # basically, this is deep magic (because SSL_read should have the same issues) 1718 # basically, this is deep magic (because SSL_read should have the same issues)
1577 # but the openssl maintainers basically said: "trust us, it just works". 1719 # but the openssl maintainers basically said: "trust us, it just works".
1578 # (unfortunately, we have to hardcode constants because the abysmally misdesigned 1720 # (unfortunately, we have to hardcode constants because the abysmally misdesigned
1579 # and mismaintained ssleay-module doesn't even offer them). 1721 # and mismaintained ssleay-module doesn't even offer them).
1586 # and we drive openssl fully in blocking mode here. Or maybe we don't - openssl seems to 1728 # and we drive openssl fully in blocking mode here. Or maybe we don't - openssl seems to
1587 # have identity issues in that area. 1729 # have identity issues in that area.
1588# Net::SSLeay::CTX_set_mode ($ssl, 1730# Net::SSLeay::CTX_set_mode ($ssl,
1589# (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ENABLE_PARTIAL_WRITE () } || 1) 1731# (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ENABLE_PARTIAL_WRITE () } || 1)
1590# | (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ACCEPT_MOVING_WRITE_BUFFER () } || 2)); 1732# | (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ACCEPT_MOVING_WRITE_BUFFER () } || 2));
1591 Net::SSLeay::CTX_set_mode ($ssl, 1|2); 1733 Net::SSLeay::CTX_set_mode ($tls, 1|2);
1592 1734
1593 $self->{_rbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ()); 1735 $self->{_rbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ());
1594 $self->{_wbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ()); 1736 $self->{_wbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ());
1595 1737
1738 Net::SSLeay::BIO_write ($self->{_rbio}, delete $self->{rbuf});
1739
1596 Net::SSLeay::set_bio ($ssl, $self->{_rbio}, $self->{_wbio}); 1740 Net::SSLeay::set_bio ($tls, $self->{_rbio}, $self->{_wbio});
1597 1741
1598 $self->{_on_starttls} = sub { $_[0]{on_starttls}(@_) } 1742 $self->{_on_starttls} = sub { $_[0]{on_starttls}(@_) }
1599 if $self->{on_starttls}; 1743 if $self->{on_starttls};
1600 1744
1601 &_dotls; # need to trigger the initial handshake 1745 &_dotls; # need to trigger the initial handshake
1604 1748
1605=item $handle->stoptls 1749=item $handle->stoptls
1606 1750
1607Shuts down the SSL connection - this makes a proper EOF handshake by 1751Shuts down the SSL connection - this makes a proper EOF handshake by
1608sending a close notify to the other side, but since OpenSSL doesn't 1752sending a close notify to the other side, but since OpenSSL doesn't
1609support non-blocking shut downs, it is not possible to re-use the stream 1753support non-blocking shut downs, it is not guarenteed that you can re-use
1610afterwards. 1754the stream afterwards.
1611 1755
1612=cut 1756=cut
1613 1757
1614sub stoptls { 1758sub stoptls {
1615 my ($self) = @_; 1759 my ($self) = @_;
1628sub _freetls { 1772sub _freetls {
1629 my ($self) = @_; 1773 my ($self) = @_;
1630 1774
1631 return unless $self->{tls}; 1775 return unless $self->{tls};
1632 1776
1633 $self->{tls_ctx}->_put_session (delete $self->{tls}); 1777 $self->{tls_ctx}->_put_session (delete $self->{tls})
1778 if $self->{tls} > 0;
1634 1779
1635 delete @$self{qw(_rbio _wbio _tls_wbuf _on_starttls)}; 1780 delete @$self{qw(_rbio _wbio _tls_wbuf _on_starttls)};
1636} 1781}
1637 1782
1638sub DESTROY { 1783sub DESTROY {
1640 1785
1641 &_freetls; 1786 &_freetls;
1642 1787
1643 my $linger = exists $self->{linger} ? $self->{linger} : 3600; 1788 my $linger = exists $self->{linger} ? $self->{linger} : 3600;
1644 1789
1645 if ($linger && length $self->{wbuf}) { 1790 if ($linger && length $self->{wbuf} && $self->{fh}) {
1646 my $fh = delete $self->{fh}; 1791 my $fh = delete $self->{fh};
1647 my $wbuf = delete $self->{wbuf}; 1792 my $wbuf = delete $self->{wbuf};
1648 1793
1649 my @linger; 1794 my @linger;
1650 1795
1651 push @linger, AnyEvent->io (fh => $fh, poll => "w", cb => sub { 1796 push @linger, AE::io $fh, 1, sub {
1652 my $len = syswrite $fh, $wbuf, length $wbuf; 1797 my $len = syswrite $fh, $wbuf, length $wbuf;
1653 1798
1654 if ($len > 0) { 1799 if ($len > 0) {
1655 substr $wbuf, 0, $len, ""; 1800 substr $wbuf, 0, $len, "";
1656 } else { 1801 } else {
1657 @linger = (); # end 1802 @linger = (); # end
1658 } 1803 }
1659 }); 1804 };
1660 push @linger, AnyEvent->timer (after => $linger, cb => sub { 1805 push @linger, AE::timer $linger, 0, sub {
1661 @linger = (); 1806 @linger = ();
1662 }); 1807 };
1663 } 1808 }
1664} 1809}
1665 1810
1666=item $handle->destroy 1811=item $handle->destroy
1667 1812
1668Shuts down the handle object as much as possible - this call ensures that 1813Shuts down the handle object as much as possible - this call ensures that
1669no further callbacks will be invoked and as many resources as possible 1814no further callbacks will be invoked and as many resources as possible
1670will be freed. You must not call any methods on the object afterwards. 1815will be freed. Any method you will call on the handle object after
1816destroying it in this way will be silently ignored (and it will return the
1817empty list).
1671 1818
1672Normally, you can just "forget" any references to an AnyEvent::Handle 1819Normally, you can just "forget" any references to an AnyEvent::Handle
1673object and it will simply shut down. This works in fatal error and EOF 1820object and it will simply shut down. This works in fatal error and EOF
1674callbacks, as well as code outside. It does I<NOT> work in a read or write 1821callbacks, as well as code outside. It does I<NOT> work in a read or write
1675callback, so when you want to destroy the AnyEvent::Handle object from 1822callback, so when you want to destroy the AnyEvent::Handle object from
1689sub destroy { 1836sub destroy {
1690 my ($self) = @_; 1837 my ($self) = @_;
1691 1838
1692 $self->DESTROY; 1839 $self->DESTROY;
1693 %$self = (); 1840 %$self = ();
1841 bless $self, "AnyEvent::Handle::destroyed";
1842}
1843
1844sub AnyEvent::Handle::destroyed::AUTOLOAD {
1845 #nop
1694} 1846}
1695 1847
1696=item AnyEvent::Handle::TLS_CTX 1848=item AnyEvent::Handle::TLS_CTX
1697 1849
1698This function creates and returns the AnyEvent::TLS object used by default 1850This function creates and returns the AnyEvent::TLS object used by default

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines