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.67 by root, Fri Jun 6 15:33:10 2008 UTC vs.
Revision 1.92 by root, Wed Oct 1 08:52:06 2008 UTC

1package AnyEvent::Handle; 1package AnyEvent::Handle;
2 2
3no warnings; 3no warnings;
4use strict; 4use strict qw(subs vars);
5 5
6use AnyEvent (); 6use AnyEvent ();
7use AnyEvent::Util qw(WSAEWOULDBLOCK); 7use AnyEvent::Util qw(WSAEWOULDBLOCK);
8use Scalar::Util (); 8use Scalar::Util ();
9use Carp (); 9use Carp ();
14 14
15AnyEvent::Handle - non-blocking I/O on file handles via AnyEvent 15AnyEvent::Handle - non-blocking I/O on file handles via AnyEvent
16 16
17=cut 17=cut
18 18
19our $VERSION = 4.15; 19our $VERSION = 4.3;
20 20
21=head1 SYNOPSIS 21=head1 SYNOPSIS
22 22
23 use AnyEvent; 23 use AnyEvent;
24 use AnyEvent::Handle; 24 use AnyEvent::Handle;
49 49
50This module is a helper module to make it easier to do event-based I/O on 50This module is a helper module to make it easier to do event-based I/O on
51filehandles. For utility functions for doing non-blocking connects and accepts 51filehandles. For utility functions for doing non-blocking connects and accepts
52on sockets see L<AnyEvent::Util>. 52on sockets see L<AnyEvent::Util>.
53 53
54The L<AnyEvent::Intro> tutorial contains some well-documented
55AnyEvent::Handle examples.
56
54In the following, when the documentation refers to of "bytes" then this 57In the following, when the documentation refers to of "bytes" then this
55means characters. As sysread and syswrite are used for all I/O, their 58means characters. As sysread and syswrite are used for all I/O, their
56treatment of characters applies to this module as well. 59treatment of characters applies to this module as well.
57 60
58All callbacks will be invoked with the handle object as their first 61All callbacks will be invoked with the handle object as their first
59argument. 62argument.
60 63
64=head2 SIGPIPE is not handled by this module
65
66SIGPIPE is not handled by this module, so one of the practical
67requirements of using it is to ignore SIGPIPE (C<$SIG{PIPE} =
68'IGNORE'>). At least, this is highly recommend in a networked program: If
69you use AnyEvent::Handle in a filter program (like sort), exiting on
70SIGPIPE is probably the right thing to do.
71
61=head1 METHODS 72=head1 METHODS
62 73
63=over 4 74=over 4
64 75
65=item B<new (%args)> 76=item B<new (%args)>
70 81
71=item fh => $filehandle [MANDATORY] 82=item fh => $filehandle [MANDATORY]
72 83
73The filehandle this L<AnyEvent::Handle> object will operate on. 84The filehandle this L<AnyEvent::Handle> object will operate on.
74 85
75NOTE: The filehandle will be set to non-blocking (using 86NOTE: The filehandle will be set to non-blocking mode (using
76AnyEvent::Util::fh_nonblocking). 87C<AnyEvent::Util::fh_nonblocking>) by the constructor and needs to stay in
88that mode.
77 89
78=item on_eof => $cb->($handle) 90=item on_eof => $cb->($handle)
79 91
80Set the callback to be called when an end-of-file condition is detcted, 92Set the callback to be called when an end-of-file condition is detected,
81i.e. in the case of a socket, when the other side has closed the 93i.e. in the case of a socket, when the other side has closed the
82connection cleanly. 94connection cleanly.
83 95
96For sockets, this just means that the other side has stopped sending data,
97you can still try to write data, and, in fact, one can return from the eof
98callback and continue writing data, as only the read part has been shut
99down.
100
84While not mandatory, it is highly recommended to set an eof callback, 101While not mandatory, it is I<highly> recommended to set an eof callback,
85otherwise you might end up with a closed socket while you are still 102otherwise you might end up with a closed socket while you are still
86waiting for data. 103waiting for data.
104
105If an EOF condition has been detected but no C<on_eof> callback has been
106set, then a fatal error will be raised with C<$!> set to <0>.
87 107
88=item on_error => $cb->($handle, $fatal) 108=item on_error => $cb->($handle, $fatal)
89 109
90This is the error callback, which is called when, well, some error 110This is the error callback, which is called when, well, some error
91occured, such as not being able to resolve the hostname, failure to 111occured, such as not being able to resolve the hostname, failure to
92connect or a read error. 112connect or a read error.
93 113
94Some errors are fatal (which is indicated by C<$fatal> being true). On 114Some errors are fatal (which is indicated by C<$fatal> being true). On
95fatal errors the handle object will be shut down and will not be 115fatal errors the handle object will be shut down and will not be usable
116(but you are free to look at the current C<< ->rbuf >>). Examples of fatal
117errors are an EOF condition with active (but unsatisifable) read watchers
118(C<EPIPE>) or I/O errors.
119
96usable. Non-fatal errors can be retried by simply returning, but it is 120Non-fatal errors can be retried by simply returning, but it is recommended
97recommended to simply ignore this parameter and instead abondon the handle 121to simply ignore this parameter and instead abondon the handle object
98object when this callback is invoked. 122when this callback is invoked. Examples of non-fatal errors are timeouts
123C<ETIMEDOUT>) or badly-formatted data (C<EBADMSG>).
99 124
100On callback entrance, the value of C<$!> contains the operating system 125On callback entrance, the value of C<$!> contains the operating system
101error (or C<ENOSPC>, C<EPIPE>, C<ETIMEDOUT> or C<EBADMSG>). 126error (or C<ENOSPC>, C<EPIPE>, C<ETIMEDOUT> or C<EBADMSG>).
102 127
103While not mandatory, it is I<highly> recommended to set this callback, as 128While not mandatory, it is I<highly> recommended to set this callback, as
124This sets the callback that is called when the write buffer becomes empty 149This sets the callback that is called when the write buffer becomes empty
125(or when the callback is set and the buffer is empty already). 150(or when the callback is set and the buffer is empty already).
126 151
127To append to the write buffer, use the C<< ->push_write >> method. 152To append to the write buffer, use the C<< ->push_write >> method.
128 153
154This callback is useful when you don't want to put all of your write data
155into the queue at once, for example, when you want to write the contents
156of some file to the socket you might not want to read the whole file into
157memory and push it into the queue, but instead only read more data from
158the file when the write queue becomes empty.
159
129=item timeout => $fractional_seconds 160=item timeout => $fractional_seconds
130 161
131If non-zero, then this enables an "inactivity" timeout: whenever this many 162If non-zero, then this enables an "inactivity" timeout: whenever this many
132seconds pass without a successful read or write on the underlying file 163seconds pass without a successful read or write on the underlying file
133handle, the C<on_timeout> callback will be invoked (and if that one is 164handle, the C<on_timeout> callback will be invoked (and if that one is
134missing, an C<ETIMEDOUT> error will be raised). 165missing, a non-fatal C<ETIMEDOUT> error will be raised).
135 166
136Note that timeout processing is also active when you currently do not have 167Note that timeout processing is also active when you currently do not have
137any outstanding read or write requests: If you plan to keep the connection 168any outstanding read or write requests: If you plan to keep the connection
138idle then you should disable the timout temporarily or ignore the timeout 169idle then you should disable the timout temporarily or ignore the timeout
139in the C<on_timeout> callback. 170in the C<on_timeout> callback, in which case AnyEvent::Handle will simply
171restart the timeout.
140 172
141Zero (the default) disables this timeout. 173Zero (the default) disables this timeout.
142 174
143=item on_timeout => $cb->($handle) 175=item on_timeout => $cb->($handle)
144 176
148 180
149=item rbuf_max => <bytes> 181=item rbuf_max => <bytes>
150 182
151If defined, then a fatal error will be raised (with C<$!> set to C<ENOSPC>) 183If defined, then a fatal error will be raised (with C<$!> set to C<ENOSPC>)
152when the read buffer ever (strictly) exceeds this size. This is useful to 184when the read buffer ever (strictly) exceeds this size. This is useful to
153avoid denial-of-service attacks. 185avoid some forms of denial-of-service attacks.
154 186
155For example, a server accepting connections from untrusted sources should 187For example, a server accepting connections from untrusted sources should
156be configured to accept only so-and-so much data that it cannot act on 188be configured to accept only so-and-so much data that it cannot act on
157(for example, when expecting a line, an attacker could send an unlimited 189(for example, when expecting a line, an attacker could send an unlimited
158amount of data without a callback ever being called as long as the line 190amount of data without a callback ever being called as long as the line
159isn't finished). 191isn't finished).
160 192
193=item autocork => <boolean>
194
195When disabled (the default), then C<push_write> will try to immediately
196write the data to the handle, if possible. This avoids having to register
197a write watcher and wait for the next event loop iteration, but can
198be inefficient if you write multiple small chunks (on the wire, this
199disadvantage is usually avoided by your kernel's nagle algorithm, see
200C<no_delay>, but this option can save costly syscalls).
201
202When enabled, then writes will always be queued till the next event loop
203iteration. This is efficient when you do many small writes per iteration,
204but less efficient when you do a single write only per iteration (or when
205the write buffer often is full). It also increases write latency.
206
207=item no_delay => <boolean>
208
209When doing small writes on sockets, your operating system kernel might
210wait a bit for more data before actually sending it out. This is called
211the Nagle algorithm, and usually it is beneficial.
212
213In some situations you want as low a delay as possible, which can be
214accomplishd by setting this option to a true value.
215
216The default is your opertaing system's default behaviour (most likely
217enabled), this option explicitly enables or disables it, if possible.
218
161=item read_size => <bytes> 219=item read_size => <bytes>
162 220
163The default read block size (the amount of bytes this module will try to read 221The default read block size (the amount of bytes this module will
164during each (loop iteration). Default: C<8192>. 222try to read during each loop iteration, which affects memory
223requirements). Default: C<8192>.
165 224
166=item low_water_mark => <bytes> 225=item low_water_mark => <bytes>
167 226
168Sets the amount of bytes (default: C<0>) that make up an "empty" write 227Sets the amount of bytes (default: C<0>) that make up an "empty" write
169buffer: If the write reaches this size or gets even samller it is 228buffer: If the write reaches this size or gets even samller it is
170considered empty. 229considered empty.
171 230
231Sometimes it can be beneficial (for performance reasons) to add data to
232the write buffer before it is fully drained, but this is a rare case, as
233the operating system kernel usually buffers data as well, so the default
234is good in almost all cases.
235
172=item linger => <seconds> 236=item linger => <seconds>
173 237
174If non-zero (default: C<3600>), then the destructor of the 238If non-zero (default: C<3600>), then the destructor of the
175AnyEvent::Handle object will check wether there is still outstanding write 239AnyEvent::Handle object will check whether there is still outstanding
176data and will install a watcher that will write out this data. No errors 240write data and will install a watcher that will write this data to the
177will be reported (this mostly matches how the operating system treats 241socket. No errors will be reported (this mostly matches how the operating
178outstanding data at socket close time). 242system treats outstanding data at socket close time).
179 243
180This will not work for partial TLS data that could not yet been 244This will not work for partial TLS data that could not be encoded
181encoded. This data will be lost. 245yet. This data will be lost.
182 246
183=item tls => "accept" | "connect" | Net::SSLeay::SSL object 247=item tls => "accept" | "connect" | Net::SSLeay::SSL object
184 248
185When this parameter is given, it enables TLS (SSL) mode, that means it 249When this parameter is given, it enables TLS (SSL) mode, that means
186will start making tls handshake and will transparently encrypt/decrypt 250AnyEvent will start a TLS handshake as soon as the conenction has been
187data. 251established and will transparently encrypt/decrypt data afterwards.
188 252
189TLS mode requires Net::SSLeay to be installed (it will be loaded 253TLS mode requires Net::SSLeay to be installed (it will be loaded
190automatically when you try to create a TLS handle). 254automatically when you try to create a TLS handle): this module doesn't
255have a dependency on that module, so if your module requires it, you have
256to add the dependency yourself.
191 257
192For the TLS server side, use C<accept>, and for the TLS client side of a 258Unlike TCP, TLS has a server and client side: for the TLS server side, use
193connection, use C<connect> mode. 259C<accept>, and for the TLS client side of a connection, use C<connect>
260mode.
194 261
195You can also provide your own TLS connection object, but you have 262You can also provide your own TLS connection object, but you have
196to make sure that you call either C<Net::SSLeay::set_connect_state> 263to make sure that you call either C<Net::SSLeay::set_connect_state>
197or C<Net::SSLeay::set_accept_state> on it before you pass it to 264or C<Net::SSLeay::set_accept_state> on it before you pass it to
198AnyEvent::Handle. 265AnyEvent::Handle.
199 266
200See the C<starttls> method if you need to start TLs negotiation later. 267See the C<< ->starttls >> method for when need to start TLS negotiation later.
201 268
202=item tls_ctx => $ssl_ctx 269=item tls_ctx => $ssl_ctx
203 270
204Use the given Net::SSLeay::CTX object to create the new TLS connection 271Use the given C<Net::SSLeay::CTX> object to create the new TLS connection
205(unless a connection object was specified directly). If this parameter is 272(unless a connection object was specified directly). If this parameter is
206missing, then AnyEvent::Handle will use C<AnyEvent::Handle::TLS_CTX>. 273missing, then AnyEvent::Handle will use C<AnyEvent::Handle::TLS_CTX>.
207 274
208=item json => JSON or JSON::XS object 275=item json => JSON or JSON::XS object
209 276
210This is the json coder object used by the C<json> read and write types. 277This is the json coder object used by the C<json> read and write types.
211 278
212If you don't supply it, then AnyEvent::Handle will create and use a 279If you don't supply it, then AnyEvent::Handle will create and use a
213suitable one, which will write and expect UTF-8 encoded JSON texts. 280suitable one (on demand), which will write and expect UTF-8 encoded JSON
281texts.
214 282
215Note that you are responsible to depend on the JSON module if you want to 283Note that you are responsible to depend on the JSON module if you want to
216use this functionality, as AnyEvent does not have a dependency itself. 284use this functionality, as AnyEvent does not have a dependency itself.
217 285
218=item filter_r => $cb 286=item filter_r => $cb
219 287
220=item filter_w => $cb 288=item filter_w => $cb
221 289
222These exist, but are undocumented at this time. 290These exist, but are undocumented at this time. (They are used internally
291by the TLS code).
223 292
224=back 293=back
225 294
226=cut 295=cut
227 296
240 } 309 }
241 310
242 $self->{_activity} = AnyEvent->now; 311 $self->{_activity} = AnyEvent->now;
243 $self->_timeout; 312 $self->_timeout;
244 313
245 $self->on_drain (delete $self->{on_drain}) if $self->{on_drain}; 314 $self->on_drain (delete $self->{on_drain}) if exists $self->{on_drain};
315 $self->no_delay (delete $self->{no_delay}) if exists $self->{no_delay};
246 316
247 $self->start_read 317 $self->start_read
248 if $self->{on_read}; 318 if $self->{on_read};
249 319
250 $self 320 $self
256 delete $self->{_tw}; 326 delete $self->{_tw};
257 delete $self->{_rw}; 327 delete $self->{_rw};
258 delete $self->{_ww}; 328 delete $self->{_ww};
259 delete $self->{fh}; 329 delete $self->{fh};
260 330
261 $self->stoptls; 331 &_freetls;
332
333 delete $self->{on_read};
334 delete $self->{_queue};
262} 335}
263 336
264sub _error { 337sub _error {
265 my ($self, $errno, $fatal) = @_; 338 my ($self, $errno, $fatal) = @_;
266 339
276 } 349 }
277} 350}
278 351
279=item $fh = $handle->fh 352=item $fh = $handle->fh
280 353
281This method returns the file handle of the L<AnyEvent::Handle> object. 354This method returns the file handle used to create the L<AnyEvent::Handle> object.
282 355
283=cut 356=cut
284 357
285sub fh { $_[0]{fh} } 358sub fh { $_[0]{fh} }
286 359
304 $_[0]{on_eof} = $_[1]; 377 $_[0]{on_eof} = $_[1];
305} 378}
306 379
307=item $handle->on_timeout ($cb) 380=item $handle->on_timeout ($cb)
308 381
309Replace the current C<on_timeout> callback, or disables the callback 382Replace the current C<on_timeout> callback, or disables the callback (but
310(but not the timeout) if C<$cb> = C<undef>. See C<timeout> constructor 383not the timeout) if C<$cb> = C<undef>. See the C<timeout> constructor
311argument. 384argument and method.
312 385
313=cut 386=cut
314 387
315sub on_timeout { 388sub on_timeout {
316 $_[0]{on_timeout} = $_[1]; 389 $_[0]{on_timeout} = $_[1];
390}
391
392=item $handle->autocork ($boolean)
393
394Enables or disables the current autocork behaviour (see C<autocork>
395constructor argument).
396
397=cut
398
399=item $handle->no_delay ($boolean)
400
401Enables or disables the C<no_delay> setting (see constructor argument of
402the same name for details).
403
404=cut
405
406sub no_delay {
407 $_[0]{no_delay} = $_[1];
408
409 eval {
410 local $SIG{__DIE__};
411 setsockopt $_[0]{fh}, &Socket::IPPROTO_TCP, &Socket::TCP_NODELAY, int $_[1];
412 };
317} 413}
318 414
319############################################################################# 415#############################################################################
320 416
321=item $handle->timeout ($seconds) 417=item $handle->timeout ($seconds)
436 $self->_error ($!, 1); 532 $self->_error ($!, 1);
437 } 533 }
438 }; 534 };
439 535
440 # try to write data immediately 536 # try to write data immediately
441 $cb->(); 537 $cb->() unless $self->{autocork};
442 538
443 # if still data left in wbuf, we need to poll 539 # if still data left in wbuf, we need to poll
444 $self->{_ww} = AnyEvent->io (fh => $self->{fh}, poll => "w", cb => $cb) 540 $self->{_ww} = AnyEvent->io (fh => $self->{fh}, poll => "w", cb => $cb)
445 if length $self->{wbuf}; 541 if length $self->{wbuf};
446 }; 542 };
593ways, the "simple" way, using only C<on_read> and the "complex" way, using 689ways, the "simple" way, using only C<on_read> and the "complex" way, using
594a queue. 690a queue.
595 691
596In the simple case, you just install an C<on_read> callback and whenever 692In the simple case, you just install an C<on_read> callback and whenever
597new data arrives, it will be called. You can then remove some data (if 693new data arrives, it will be called. You can then remove some data (if
598enough is there) from the read buffer (C<< $handle->rbuf >>) if you want 694enough is there) from the read buffer (C<< $handle->rbuf >>). Or you cna
599or not. 695leave the data there if you want to accumulate more (e.g. when only a
696partial message has been received so far).
600 697
601In the more complex case, you want to queue multiple callbacks. In this 698In the more complex case, you want to queue multiple callbacks. In this
602case, AnyEvent::Handle will call the first queued callback each time new 699case, AnyEvent::Handle will call the first queued callback each time new
603data arrives (also the first time it is queued) and removes it when it has 700data arrives (also the first time it is queued) and removes it when it has
604done its job (see C<push_read>, below). 701done its job (see C<push_read>, below).
622 # handle xml 719 # handle xml
623 }); 720 });
624 }); 721 });
625 }); 722 });
626 723
627Example 2: Implement a client for a protocol that replies either with 724Example 2: Implement a client for a protocol that replies either with "OK"
628"OK" and another line or "ERROR" for one request, and 64 bytes for the 725and another line or "ERROR" for the first request that is sent, and 64
629second request. Due tot he availability of a full queue, we can just 726bytes for the second request. Due to the availability of a queue, we can
630pipeline sending both requests and manipulate the queue as necessary in 727just pipeline sending both requests and manipulate the queue as necessary
631the callbacks: 728in the callbacks.
632 729
633 # request one 730When the first callback is called and sees an "OK" response, it will
731C<unshift> another line-read. This line-read will be queued I<before> the
73264-byte chunk callback.
733
734 # request one, returns either "OK + extra line" or "ERROR"
634 $handle->push_write ("request 1\015\012"); 735 $handle->push_write ("request 1\015\012");
635 736
636 # we expect "ERROR" or "OK" as response, so push a line read 737 # we expect "ERROR" or "OK" as response, so push a line read
637 $handle->push_read (line => sub { 738 $handle->push_read (line => sub {
638 # if we got an "OK", we have to _prepend_ another line, 739 # if we got an "OK", we have to _prepend_ another line,
645 ... 746 ...
646 }); 747 });
647 } 748 }
648 }); 749 });
649 750
650 # request two 751 # request two, simply returns 64 octets
651 $handle->push_write ("request 2\015\012"); 752 $handle->push_write ("request 2\015\012");
652 753
653 # simply read 64 bytes, always 754 # simply read 64 bytes, always
654 $handle->push_read (chunk => 64, sub { 755 $handle->push_read (chunk => 64, sub {
655 my $response = $_[1]; 756 my $response = $_[1];
667 768
668 if ( 769 if (
669 defined $self->{rbuf_max} 770 defined $self->{rbuf_max}
670 && $self->{rbuf_max} < length $self->{rbuf} 771 && $self->{rbuf_max} < length $self->{rbuf}
671 ) { 772 ) {
672 return $self->_error (&Errno::ENOSPC, 1); 773 $self->_error (&Errno::ENOSPC, 1), return;
673 } 774 }
674 775
675 while () { 776 while () {
676 no strict 'refs';
677
678 my $len = length $self->{rbuf}; 777 my $len = length $self->{rbuf};
679 778
680 if (my $cb = shift @{ $self->{_queue} }) { 779 if (my $cb = shift @{ $self->{_queue} }) {
681 unless ($cb->($self)) { 780 unless ($cb->($self)) {
682 if ($self->{_eof}) { 781 if ($self->{_eof}) {
683 # no progress can be made (not enough data and no data forthcoming) 782 # no progress can be made (not enough data and no data forthcoming)
684 $self->_error (&Errno::EPIPE, 1), last; 783 $self->_error (&Errno::EPIPE, 1), return;
685 } 784 }
686 785
687 unshift @{ $self->{_queue} }, $cb; 786 unshift @{ $self->{_queue} }, $cb;
688 last; 787 last;
689 } 788 }
697 && !@{ $self->{_queue} } # and the queue is still empty 796 && !@{ $self->{_queue} } # and the queue is still empty
698 && $self->{on_read} # but we still have on_read 797 && $self->{on_read} # but we still have on_read
699 ) { 798 ) {
700 # no further data will arrive 799 # no further data will arrive
701 # so no progress can be made 800 # so no progress can be made
702 $self->_error (&Errno::EPIPE, 1), last 801 $self->_error (&Errno::EPIPE, 1), return
703 if $self->{_eof}; 802 if $self->{_eof};
704 803
705 last; # more data might arrive 804 last; # more data might arrive
706 } 805 }
707 } else { 806 } else {
709 delete $self->{_rw}; 808 delete $self->{_rw};
710 last; 809 last;
711 } 810 }
712 } 811 }
713 812
813 if ($self->{_eof}) {
814 if ($self->{on_eof}) {
714 $self->{on_eof}($self) 815 $self->{on_eof}($self)
715 if $self->{_eof} && $self->{on_eof}; 816 } else {
817 $self->_error (0, 1);
818 }
819 }
716 820
717 # may need to restart read watcher 821 # may need to restart read watcher
718 unless ($self->{_rw}) { 822 unless ($self->{_rw}) {
719 $self->start_read 823 $self->start_read
720 if $self->{on_read} || @{ $self->{_queue} }; 824 if $self->{on_read} || @{ $self->{_queue} };
846 $cb->($_[0], substr $_[0]{rbuf}, 0, $len, ""); 950 $cb->($_[0], substr $_[0]{rbuf}, 0, $len, "");
847 1 951 1
848 } 952 }
849}; 953};
850 954
851# compatibility with older API
852sub push_read_chunk {
853 $_[0]->push_read (chunk => $_[1], $_[2]);
854}
855
856sub unshift_read_chunk {
857 $_[0]->unshift_read (chunk => $_[1], $_[2]);
858}
859
860=item line => [$eol, ]$cb->($handle, $line, $eol) 955=item line => [$eol, ]$cb->($handle, $line, $eol)
861 956
862The callback will be called only once a full line (including the end of 957The callback will be called only once a full line (including the end of
863line marker, C<$eol>) has been read. This line (excluding the end of line 958line marker, C<$eol>) has been read. This line (excluding the end of line
864marker) will be passed to the callback as second argument (C<$line>), and 959marker) will be passed to the callback as second argument (C<$line>), and
879=cut 974=cut
880 975
881register_read_type line => sub { 976register_read_type line => sub {
882 my ($self, $cb, $eol) = @_; 977 my ($self, $cb, $eol) = @_;
883 978
884 $eol = qr|(\015?\012)| if @_ < 3; 979 if (@_ < 3) {
980 # this is more than twice as fast as the generic code below
981 sub {
982 $_[0]{rbuf} =~ s/^([^\015\012]*)(\015?\012)// or return;
983
984 $cb->($_[0], $1, $2);
985 1
986 }
987 } else {
885 $eol = quotemeta $eol unless ref $eol; 988 $eol = quotemeta $eol unless ref $eol;
886 $eol = qr|^(.*?)($eol)|s; 989 $eol = qr|^(.*?)($eol)|s;
887 990
888 sub { 991 sub {
889 $_[0]{rbuf} =~ s/$eol// or return; 992 $_[0]{rbuf} =~ s/$eol// or return;
890 993
891 $cb->($_[0], $1, $2); 994 $cb->($_[0], $1, $2);
995 1
892 1 996 }
893 } 997 }
894}; 998};
895
896# compatibility with older API
897sub push_read_line {
898 my $self = shift;
899 $self->push_read (line => @_);
900}
901
902sub unshift_read_line {
903 my $self = shift;
904 $self->unshift_read (line => @_);
905}
906 999
907=item regex => $accept[, $reject[, $skip], $cb->($handle, $data) 1000=item regex => $accept[, $reject[, $skip], $cb->($handle, $data)
908 1001
909Makes a regex match against the regex object C<$accept> and returns 1002Makes a regex match against the regex object C<$accept> and returns
910everything up to and including the match. 1003everything up to and including the match.
1031register_read_type packstring => sub { 1124register_read_type packstring => sub {
1032 my ($self, $cb, $format) = @_; 1125 my ($self, $cb, $format) = @_;
1033 1126
1034 sub { 1127 sub {
1035 # when we can use 5.10 we can use ".", but for 5.8 we use the re-pack method 1128 # when we can use 5.10 we can use ".", but for 5.8 we use the re-pack method
1036 defined (my $len = eval { unpack $format, $_[0]->{rbuf} }) 1129 defined (my $len = eval { unpack $format, $_[0]{rbuf} })
1037 or return; 1130 or return;
1038 1131
1132 $format = length pack $format, $len;
1133
1134 # bypass unshift if we already have the remaining chunk
1135 if ($format + $len <= length $_[0]{rbuf}) {
1136 my $data = substr $_[0]{rbuf}, $format, $len;
1137 substr $_[0]{rbuf}, 0, $format + $len, "";
1138 $cb->($_[0], $data);
1139 } else {
1039 # remove prefix 1140 # remove prefix
1040 substr $_[0]->{rbuf}, 0, (length pack $format, $len), ""; 1141 substr $_[0]{rbuf}, 0, $format, "";
1041 1142
1042 # read rest 1143 # read remaining chunk
1043 $_[0]->unshift_read (chunk => $len, $cb); 1144 $_[0]->unshift_read (chunk => $len, $cb);
1145 }
1044 1146
1045 1 1147 1
1046 } 1148 }
1047}; 1149};
1048 1150
1105 1207
1106 require Storable; 1208 require Storable;
1107 1209
1108 sub { 1210 sub {
1109 # when we can use 5.10 we can use ".", but for 5.8 we use the re-pack method 1211 # when we can use 5.10 we can use ".", but for 5.8 we use the re-pack method
1110 defined (my $len = eval { unpack "w", $_[0]->{rbuf} }) 1212 defined (my $len = eval { unpack "w", $_[0]{rbuf} })
1111 or return; 1213 or return;
1112 1214
1215 my $format = length pack "w", $len;
1216
1217 # bypass unshift if we already have the remaining chunk
1218 if ($format + $len <= length $_[0]{rbuf}) {
1219 my $data = substr $_[0]{rbuf}, $format, $len;
1220 substr $_[0]{rbuf}, 0, $format + $len, "";
1221 $cb->($_[0], Storable::thaw ($data));
1222 } else {
1113 # remove prefix 1223 # remove prefix
1114 substr $_[0]->{rbuf}, 0, (length pack "w", $len), ""; 1224 substr $_[0]{rbuf}, 0, $format, "";
1115 1225
1116 # read rest 1226 # read remaining chunk
1117 $_[0]->unshift_read (chunk => $len, sub { 1227 $_[0]->unshift_read (chunk => $len, sub {
1118 if (my $ref = eval { Storable::thaw ($_[1]) }) { 1228 if (my $ref = eval { Storable::thaw ($_[1]) }) {
1119 $cb->($_[0], $ref); 1229 $cb->($_[0], $ref);
1120 } else { 1230 } else {
1121 $self->_error (&Errno::EBADMSG); 1231 $self->_error (&Errno::EBADMSG);
1232 }
1122 } 1233 });
1123 }); 1234 }
1235
1236 1
1124 } 1237 }
1125}; 1238};
1126 1239
1127=back 1240=back
1128 1241
1206 while ((my $len = Net::SSLeay::write ($self->{tls}, $self->{_tls_wbuf})) > 0) { 1319 while ((my $len = Net::SSLeay::write ($self->{tls}, $self->{_tls_wbuf})) > 0) {
1207 substr $self->{_tls_wbuf}, 0, $len, ""; 1320 substr $self->{_tls_wbuf}, 0, $len, "";
1208 } 1321 }
1209 } 1322 }
1210 1323
1211 if (length ($buf = Net::SSLeay::BIO_read ($self->{_wbio}))) {
1212 $self->{wbuf} .= $buf;
1213 $self->_drain_wbuf;
1214 }
1215
1216 while (defined ($buf = Net::SSLeay::read ($self->{tls}))) { 1324 while (defined ($buf = Net::SSLeay::read ($self->{tls}))) {
1217 if (length $buf) { 1325 unless (length $buf) {
1218 $self->{rbuf} .= $buf;
1219 $self->_drain_rbuf unless $self->{_in_drain};
1220 } else {
1221 # let's treat SSL-eof as we treat normal EOF 1326 # let's treat SSL-eof as we treat normal EOF
1327 delete $self->{_rw};
1222 $self->{_eof} = 1; 1328 $self->{_eof} = 1;
1223 $self->_shutdown; 1329 &_freetls;
1224 return;
1225 } 1330 }
1331
1332 $self->{rbuf} .= $buf;
1333 $self->_drain_rbuf unless $self->{_in_drain};
1334 $self->{tls} or return; # tls session might have gone away in callback
1226 } 1335 }
1227 1336
1228 my $err = Net::SSLeay::get_error ($self->{tls}, -1); 1337 my $err = Net::SSLeay::get_error ($self->{tls}, -1);
1229 1338
1230 if ($err!= Net::SSLeay::ERROR_WANT_READ ()) { 1339 if ($err!= Net::SSLeay::ERROR_WANT_READ ()) {
1234 return $self->_error (&Errno::EIO, 1); 1343 return $self->_error (&Errno::EIO, 1);
1235 } 1344 }
1236 1345
1237 # all others are fine for our purposes 1346 # all others are fine for our purposes
1238 } 1347 }
1348
1349 if (length ($buf = Net::SSLeay::BIO_read ($self->{_wbio}))) {
1350 $self->{wbuf} .= $buf;
1351 $self->_drain_wbuf;
1352 }
1239} 1353}
1240 1354
1241=item $handle->starttls ($tls[, $tls_ctx]) 1355=item $handle->starttls ($tls[, $tls_ctx])
1242 1356
1243Instead of starting TLS negotiation immediately when the AnyEvent::Handle 1357Instead of starting TLS negotiation immediately when the AnyEvent::Handle
1252 1366
1253The TLS connection object will end up in C<< $handle->{tls} >> after this 1367The TLS connection object will end up in C<< $handle->{tls} >> after this
1254call and can be used or changed to your liking. Note that the handshake 1368call and can be used or changed to your liking. Note that the handshake
1255might have already started when this function returns. 1369might have already started when this function returns.
1256 1370
1371If it an error to start a TLS handshake more than once per
1372AnyEvent::Handle object (this is due to bugs in OpenSSL).
1373
1257=cut 1374=cut
1258 1375
1259sub starttls { 1376sub starttls {
1260 my ($self, $ssl, $ctx) = @_; 1377 my ($self, $ssl, $ctx) = @_;
1261 1378
1262 $self->stoptls; 1379 Carp::croak "it is an error to call starttls more than once on an Anyevent::Handle object"
1263 1380 if $self->{tls};
1381
1264 if ($ssl eq "accept") { 1382 if ($ssl eq "accept") {
1265 $ssl = Net::SSLeay::new ($ctx || TLS_CTX ()); 1383 $ssl = Net::SSLeay::new ($ctx || TLS_CTX ());
1266 Net::SSLeay::set_accept_state ($ssl); 1384 Net::SSLeay::set_accept_state ($ssl);
1267 } elsif ($ssl eq "connect") { 1385 } elsif ($ssl eq "connect") {
1268 $ssl = Net::SSLeay::new ($ctx || TLS_CTX ()); 1386 $ssl = Net::SSLeay::new ($ctx || TLS_CTX ());
1274 # basically, this is deep magic (because SSL_read should have the same issues) 1392 # basically, this is deep magic (because SSL_read should have the same issues)
1275 # but the openssl maintainers basically said: "trust us, it just works". 1393 # but the openssl maintainers basically said: "trust us, it just works".
1276 # (unfortunately, we have to hardcode constants because the abysmally misdesigned 1394 # (unfortunately, we have to hardcode constants because the abysmally misdesigned
1277 # and mismaintained ssleay-module doesn't even offer them). 1395 # and mismaintained ssleay-module doesn't even offer them).
1278 # http://www.mail-archive.com/openssl-dev@openssl.org/msg22420.html 1396 # http://www.mail-archive.com/openssl-dev@openssl.org/msg22420.html
1397 #
1398 # in short: this is a mess.
1399 #
1400 # note that we do not try to kepe the length constant between writes as we are required to do.
1401 # we assume that most (but not all) of this insanity only applies to non-blocking cases,
1402 # and we drive openssl fully in blocking mode here.
1279 Net::SSLeay::CTX_set_mode ($self->{tls}, 1403 Net::SSLeay::CTX_set_mode ($self->{tls},
1280 (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ENABLE_PARTIAL_WRITE () } || 1) 1404 (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ENABLE_PARTIAL_WRITE () } || 1)
1281 | (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ACCEPT_MOVING_WRITE_BUFFER () } || 2)); 1405 | (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ACCEPT_MOVING_WRITE_BUFFER () } || 2));
1282 1406
1283 $self->{_rbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ()); 1407 $self->{_rbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ());
1291 }; 1415 };
1292 $self->{filter_r} = sub { 1416 $self->{filter_r} = sub {
1293 Net::SSLeay::BIO_write ($_[0]{_rbio}, ${$_[1]}); 1417 Net::SSLeay::BIO_write ($_[0]{_rbio}, ${$_[1]});
1294 &_dotls; 1418 &_dotls;
1295 }; 1419 };
1420
1421 &_dotls; # need to trigger the initial negotiation exchange
1296} 1422}
1297 1423
1298=item $handle->stoptls 1424=item $handle->stoptls
1299 1425
1300Destroys the SSL connection, if any. Partial read or write data will be 1426Shuts down the SSL connection - this makes a proper EOF handshake by
1301lost. 1427sending a close notify to the other side, but since OpenSSL doesn't
1428support non-blocking shut downs, it is not possible to re-use the stream
1429afterwards.
1302 1430
1303=cut 1431=cut
1304 1432
1305sub stoptls { 1433sub stoptls {
1306 my ($self) = @_; 1434 my ($self) = @_;
1307 1435
1436 if ($self->{tls}) {
1437 Net::SSLeay::shutdown $self->{tls};
1438
1439 &_dotls;
1440
1441 # we don't give a shit. no, we do, but we can't. no...
1442 # we, we... have to use openssl :/
1443 &_freetls;
1444 }
1445}
1446
1447sub _freetls {
1448 my ($self) = @_;
1449
1450 return unless $self->{tls};
1451
1308 Net::SSLeay::free (delete $self->{tls}) if $self->{tls}; 1452 Net::SSLeay::free (delete $self->{tls});
1309 1453
1310 delete $self->{_rbio}; 1454 delete @$self{qw(_rbio filter_w _wbio filter_r)};
1311 delete $self->{_wbio};
1312 delete $self->{_tls_wbuf};
1313 delete $self->{filter_r};
1314 delete $self->{filter_w};
1315} 1455}
1316 1456
1317sub DESTROY { 1457sub DESTROY {
1318 my $self = shift; 1458 my $self = shift;
1319 1459
1320 $self->stoptls; 1460 &_freetls;
1321 1461
1322 my $linger = exists $self->{linger} ? $self->{linger} : 3600; 1462 my $linger = exists $self->{linger} ? $self->{linger} : 3600;
1323 1463
1324 if ($linger && length $self->{wbuf}) { 1464 if ($linger && length $self->{wbuf}) {
1325 my $fh = delete $self->{fh}; 1465 my $fh = delete $self->{fh};
1389=over 4 1529=over 4
1390 1530
1391=item * all constructor arguments become object members. 1531=item * all constructor arguments become object members.
1392 1532
1393At least initially, when you pass a C<tls>-argument to the constructor it 1533At least initially, when you pass a C<tls>-argument to the constructor it
1394will end up in C<< $handle->{tls} >>. Those members might be changes or 1534will end up in C<< $handle->{tls} >>. Those members might be changed or
1395mutated later on (for example C<tls> will hold the TLS connection object). 1535mutated later on (for example C<tls> will hold the TLS connection object).
1396 1536
1397=item * other object member names are prefixed with an C<_>. 1537=item * other object member names are prefixed with an C<_>.
1398 1538
1399All object members not explicitly documented (internal use) are prefixed 1539All object members not explicitly documented (internal use) are prefixed

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines