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.121 by root, Fri Mar 27 10:49:50 2009 UTC vs.
Revision 1.142 by root, Mon Jul 6 20:24:47 2009 UTC

… …
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.35; 19our $VERSION = 4.452;
20 20
21=head1 SYNOPSIS 21=head1 SYNOPSIS
22 22
23 use AnyEvent; 23 use AnyEvent;
24 use AnyEvent::Handle; 24 use AnyEvent::Handle;
… …
63 63
64=head1 METHODS 64=head1 METHODS
65 65
66=over 4 66=over 4
67 67
68=item B<new (%args)> 68=item $handle = B<new> AnyEvent::TLS fh => $filehandle, key => value...
69 69
70The constructor supports these arguments (all as key => value pairs). 70The constructor supports these arguments (all as C<< key => value >> pairs).
71 71
72=over 4 72=over 4
73 73
74=item fh => $filehandle [MANDATORY] 74=item fh => $filehandle [MANDATORY]
75 75
… …
95waiting for data. 95waiting for data.
96 96
97If an EOF condition has been detected but no C<on_eof> callback has been 97If an EOF condition has been detected but no C<on_eof> callback has been
98set, then a fatal error will be raised with C<$!> set to <0>. 98set, then a fatal error will be raised with C<$!> set to <0>.
99 99
100=item on_error => $cb->($handle, $fatal) 100=item on_error => $cb->($handle, $fatal, $message)
101 101
102This is the error callback, which is called when, well, some error 102This is the error callback, which is called when, well, some error
103occured, such as not being able to resolve the hostname, failure to 103occured, such as not being able to resolve the hostname, failure to
104connect or a read error. 104connect or a read error.
105 105
… …
107fatal errors the handle object will be shut down and will not be usable 107fatal errors the handle object will be shut down and will not be usable
108(but you are free to look at the current C<< ->rbuf >>). Examples of fatal 108(but you are free to look at the current C<< ->rbuf >>). Examples of fatal
109errors are an EOF condition with active (but unsatisifable) read watchers 109errors are an EOF condition with active (but unsatisifable) read watchers
110(C<EPIPE>) or I/O errors. 110(C<EPIPE>) or I/O errors.
111 111
112AnyEvent::Handle tries to find an appropriate error code for you to check
113against, but in some cases (TLS errors), this does not work well. It is
114recommended to always output the C<$message> argument in human-readable
115error messages (it's usually the same as C<"$!">).
116
112Non-fatal errors can be retried by simply returning, but it is recommended 117Non-fatal errors can be retried by simply returning, but it is recommended
113to simply ignore this parameter and instead abondon the handle object 118to simply ignore this parameter and instead abondon the handle object
114when this callback is invoked. Examples of non-fatal errors are timeouts 119when this callback is invoked. Examples of non-fatal errors are timeouts
115C<ETIMEDOUT>) or badly-formatted data (C<EBADMSG>). 120C<ETIMEDOUT>) or badly-formatted data (C<EBADMSG>).
116 121
117On callback entrance, the value of C<$!> contains the operating system 122On callback entrance, the value of C<$!> contains the operating system
118error (or C<ENOSPC>, C<EPIPE>, C<ETIMEDOUT> or C<EBADMSG>). 123error code (or C<ENOSPC>, C<EPIPE>, C<ETIMEDOUT>, C<EBADMSG> or
124C<EPROTO>).
119 125
120While not mandatory, it is I<highly> recommended to set this callback, as 126While not mandatory, it is I<highly> recommended to set this callback, as
121you will not be notified of errors otherwise. The default simply calls 127you will not be notified of errors otherwise. The default simply calls
122C<croak>. 128C<croak>.
123 129
… …
127and no read request is in the queue (unlike read queue callbacks, this 133and no read request is in the queue (unlike read queue callbacks, this
128callback will only be called when at least one octet of data is in the 134callback will only be called when at least one octet of data is in the
129read buffer). 135read buffer).
130 136
131To access (and remove data from) the read buffer, use the C<< ->rbuf >> 137To access (and remove data from) the read buffer, use the C<< ->rbuf >>
132method or access the C<$handle->{rbuf}> member directly. Note that you 138method or access the C<< $handle->{rbuf} >> member directly. Note that you
133must not enlarge or modify the read buffer, you can only remove data at 139must not enlarge or modify the read buffer, you can only remove data at
134the beginning from it. 140the beginning from it.
135 141
136When an EOF condition is detected then AnyEvent::Handle will first try to 142When an EOF condition is detected then AnyEvent::Handle will first try to
137feed all the remaining data to the queued callbacks and C<on_read> before 143feed all the remaining data to the queued callbacks and C<on_read> before
… …
237 243
238This will not work for partial TLS data that could not be encoded 244This will not work for partial TLS data that could not be encoded
239yet. This data will be lost. Calling the C<stoptls> method in time might 245yet. This data will be lost. Calling the C<stoptls> method in time might
240help. 246help.
241 247
248=item peername => $string
249
250A string used to identify the remote site - usually the DNS hostname
251(I<not> IDN!) used to create the connection, rarely the IP address.
252
253Apart from being useful in error messages, this string is also used in TLS
254peername verification (see C<verify_peername> in L<AnyEvent::TLS>).
255
242=item tls => "accept" | "connect" | Net::SSLeay::SSL object 256=item tls => "accept" | "connect" | Net::SSLeay::SSL object
243 257
244When this parameter is given, it enables TLS (SSL) mode, that means 258When this parameter is given, it enables TLS (SSL) mode, that means
245AnyEvent will start a TLS handshake as soon as the conenction has been 259AnyEvent will start a TLS handshake as soon as the conenction has been
246established and will transparently encrypt/decrypt data afterwards. 260established and will transparently encrypt/decrypt data afterwards.
261
262All TLS protocol errors will be signalled as C<EPROTO>, with an
263appropriate error message.
247 264
248TLS mode requires Net::SSLeay to be installed (it will be loaded 265TLS mode requires Net::SSLeay to be installed (it will be loaded
249automatically when you try to create a TLS handle): this module doesn't 266automatically when you try to create a TLS handle): this module doesn't
250have a dependency on that module, so if your module requires it, you have 267have a dependency on that module, so if your module requires it, you have
251to add the dependency yourself. 268to add the dependency yourself.
… …
255mode. 272mode.
256 273
257You can also provide your own TLS connection object, but you have 274You can also provide your own TLS connection object, but you have
258to make sure that you call either C<Net::SSLeay::set_connect_state> 275to make sure that you call either C<Net::SSLeay::set_connect_state>
259or C<Net::SSLeay::set_accept_state> on it before you pass it to 276or C<Net::SSLeay::set_accept_state> on it before you pass it to
260AnyEvent::Handle. 277AnyEvent::Handle. Also, this module will take ownership of this connection
278object.
279
280At some future point, AnyEvent::Handle might switch to another TLS
281implementation, then the option to use your own session object will go
282away.
261 283
262B<IMPORTANT:> since Net::SSLeay "objects" are really only integers, 284B<IMPORTANT:> since Net::SSLeay "objects" are really only integers,
263passing in the wrong integer will lead to certain crash. This most often 285passing in the wrong integer will lead to certain crash. This most often
264happens when one uses a stylish C<< tls => 1 >> and is surprised about the 286happens when one uses a stylish C<< tls => 1 >> and is surprised about the
265segmentation fault. 287segmentation fault.
266 288
267See the C<< ->starttls >> method for when need to start TLS negotiation later. 289See the C<< ->starttls >> method for when need to start TLS negotiation later.
268 290
269=item tls_ctx => $ssl_ctx 291=item tls_ctx => $anyevent_tls
270 292
271Use the given C<Net::SSLeay::CTX> object to create the new TLS connection 293Use the given C<AnyEvent::TLS> object to create the new TLS connection
272(unless a connection object was specified directly). If this parameter is 294(unless a connection object was specified directly). If this parameter is
273missing, then AnyEvent::Handle will use C<AnyEvent::Handle::TLS_CTX>. 295missing, then AnyEvent::Handle will use C<AnyEvent::Handle::TLS_CTX>.
296
297Instead of an object, you can also specify a hash reference with C<< key
298=> value >> pairs. Those will be passed to L<AnyEvent::TLS> to create a
299new TLS context object.
300
301=item on_starttls => $cb->($handle, $success)
302
303This callback will be invoked when the TLS/SSL handshake has finished. If
304C<$success> is true, then the TLS handshake succeeded, otherwise it failed
305(C<on_stoptls> will not be called in this case).
306
307The session in C<< $handle->{tls} >> can still be examined in this
308callback, even when the handshake was not successful.
309
310=item on_stoptls => $cb->($handle)
311
312When a SSLv3/TLS shutdown/close notify/EOF is detected and this callback is
313set, then it will be invoked after freeing the TLS session. If it is not,
314then a TLS shutdown condition will be treated like a normal EOF condition
315on the handle.
316
317The session in C<< $handle->{tls} >> can still be examined in this
318callback.
319
320This callback will only be called on TLS shutdowns, not when the
321underlying handle signals EOF.
274 322
275=item json => JSON or JSON::XS object 323=item json => JSON or JSON::XS object
276 324
277This is the json coder object used by the C<json> read and write types. 325This is the json coder object used by the C<json> read and write types.
278 326
… …
287 335
288=cut 336=cut
289 337
290sub new { 338sub new {
291 my $class = shift; 339 my $class = shift;
292
293 my $self = bless { @_ }, $class; 340 my $self = bless { @_ }, $class;
294 341
295 $self->{fh} or Carp::croak "mandatory argument fh is missing"; 342 $self->{fh} or Carp::croak "mandatory argument fh is missing";
296 343
297 AnyEvent::Util::fh_nonblocking $self->{fh}, 1; 344 AnyEvent::Util::fh_nonblocking $self->{fh}, 1;
345
346 $self->{_activity} = AnyEvent->now;
347 $self->_timeout;
348
349 $self->no_delay (delete $self->{no_delay}) if exists $self->{no_delay};
298 350
299 $self->starttls (delete $self->{tls}, delete $self->{tls_ctx}) 351 $self->starttls (delete $self->{tls}, delete $self->{tls_ctx})
300 if $self->{tls}; 352 if $self->{tls};
301 353
302 $self->{_activity} = AnyEvent->now;
303 $self->_timeout;
304
305 $self->on_drain (delete $self->{on_drain}) if exists $self->{on_drain}; 354 $self->on_drain (delete $self->{on_drain}) if exists $self->{on_drain};
306 $self->no_delay (delete $self->{no_delay}) if exists $self->{no_delay};
307 355
308 $self->start_read 356 $self->start_read
309 if $self->{on_read}; 357 if $self->{on_read};
310 358
311 $self 359 $self->{fh} && $self
312} 360}
313 361
314sub _shutdown { 362sub _shutdown {
315 my ($self) = @_; 363 my ($self) = @_;
316 364
317 delete $self->{_tw}; 365 delete @$self{qw(_tw _rw _ww fh wbuf on_read _queue)};
318 delete $self->{_rw}; 366 $self->{_eof} = 1; # tell starttls et. al to stop trying
319 delete $self->{_ww};
320 delete $self->{fh};
321 367
322 &_freetls; 368 &_freetls;
323
324 delete $self->{on_read};
325 delete $self->{_queue};
326} 369}
327 370
328sub _error { 371sub _error {
329 my ($self, $errno, $fatal) = @_; 372 my ($self, $errno, $fatal, $message) = @_;
330 373
331 $self->_shutdown 374 $self->_shutdown
332 if $fatal; 375 if $fatal;
333 376
334 $! = $errno; 377 $! = $errno;
378 $message ||= "$!";
335 379
336 if ($self->{on_error}) { 380 if ($self->{on_error}) {
337 $self->{on_error}($self, $fatal); 381 $self->{on_error}($self, $fatal, $message);
338 } elsif ($self->{fh}) { 382 } elsif ($self->{fh}) {
339 Carp::croak "AnyEvent::Handle uncaught error: $!"; 383 Carp::croak "AnyEvent::Handle uncaught error: $message";
340 } 384 }
341} 385}
342 386
343=item $fh = $handle->fh 387=item $fh = $handle->fh
344 388
… …
403 447
404 eval { 448 eval {
405 local $SIG{__DIE__}; 449 local $SIG{__DIE__};
406 setsockopt $_[0]{fh}, &Socket::IPPROTO_TCP, &Socket::TCP_NODELAY, int $_[1]; 450 setsockopt $_[0]{fh}, &Socket::IPPROTO_TCP, &Socket::TCP_NODELAY, int $_[1];
407 }; 451 };
452}
453
454=item $handle->on_starttls ($cb)
455
456Replace the current C<on_starttls> callback (see the C<on_starttls> constructor argument).
457
458=cut
459
460sub on_starttls {
461 $_[0]{on_starttls} = $_[1];
462}
463
464=item $handle->on_stoptls ($cb)
465
466Replace the current C<on_stoptls> callback (see the C<on_stoptls> constructor argument).
467
468=cut
469
470sub on_starttls {
471 $_[0]{on_stoptls} = $_[1];
408} 472}
409 473
410############################################################################# 474#############################################################################
411 475
412=item $handle->timeout ($seconds) 476=item $handle->timeout ($seconds)
… …
656 720
657 pack "w/a*", Storable::nfreeze ($ref) 721 pack "w/a*", Storable::nfreeze ($ref)
658}; 722};
659 723
660=back 724=back
725
726=item $handle->push_shutdown
727
728Sometimes you know you want to close the socket after writing your data
729before it was actually written. One way to do that is to replace your
730C<on_drain> handler by a callback that shuts down the socket (and set
731C<low_water_mark> to C<0>). This method is a shorthand for just that, and
732replaces the C<on_drain> callback with:
733
734 sub { shutdown $_[0]{fh}, 1 } # for push_shutdown
735
736This simply shuts down the write side and signals an EOF condition to the
737the peer.
738
739You can rely on the normal read queue and C<on_eof> handling
740afterwards. This is the cleanest way to close a connection.
741
742=cut
743
744sub push_shutdown {
745 my ($self) = @_;
746
747 delete $self->{low_water_mark};
748 $self->on_drain (sub { shutdown $_[0]{fh}, 1 });
749}
661 750
662=item AnyEvent::Handle::register_write_type type => $coderef->($handle, @args) 751=item AnyEvent::Handle::register_write_type type => $coderef->($handle, @args)
663 752
664This function (not method) lets you add your own types to C<push_write>. 753This function (not method) lets you add your own types to C<push_write>.
665Whenever the given C<type> is used, C<push_write> will invoke the code 754Whenever the given C<type> is used, C<push_write> will invoke the code
… …
813 902
814 if ($self->{_eof}) { 903 if ($self->{_eof}) {
815 if ($self->{on_eof}) { 904 if ($self->{on_eof}) {
816 $self->{on_eof}($self) 905 $self->{on_eof}($self)
817 } else { 906 } else {
818 $self->_error (0, 1); 907 $self->_error (0, 1, "Unexpected end-of-file");
819 } 908 }
820 } 909 }
821 910
822 # may need to restart read watcher 911 # may need to restart read watcher
823 unless ($self->{_rw}) { 912 unless ($self->{_rw}) {
… …
1173=cut 1262=cut
1174 1263
1175register_read_type json => sub { 1264register_read_type json => sub {
1176 my ($self, $cb) = @_; 1265 my ($self, $cb) = @_;
1177 1266
1178 require JSON; 1267 my $json = $self->{json} ||=
1268 eval { require JSON::XS; JSON::XS->new->utf8 }
1269 || do { require JSON; JSON->new->utf8 };
1179 1270
1180 my $data; 1271 my $data;
1181 my $rbuf = \$self->{rbuf}; 1272 my $rbuf = \$self->{rbuf};
1182
1183 my $json = $self->{json} ||= JSON->new->utf8;
1184 1273
1185 sub { 1274 sub {
1186 my $ref = eval { $json->incr_parse ($self->{rbuf}) }; 1275 my $ref = eval { $json->incr_parse ($self->{rbuf}) };
1187 1276
1188 if ($ref) { 1277 if ($ref) {
… …
1332 } 1421 }
1333 }); 1422 });
1334 } 1423 }
1335} 1424}
1336 1425
1426our $ERROR_SYSCALL;
1427our $ERROR_WANT_READ;
1428
1429sub _tls_error {
1430 my ($self, $err) = @_;
1431
1432 return $self->_error ($!, 1)
1433 if $err == Net::SSLeay::ERROR_SYSCALL ();
1434
1435 my $err =Net::SSLeay::ERR_error_string (Net::SSLeay::ERR_get_error ());
1436
1437 # reduce error string to look less scary
1438 $err =~ s/^error:[0-9a-fA-F]{8}:[^:]+:([^:]+):/\L$1: /;
1439
1440 $self->_error (&Errno::EPROTO, 1, $err);
1441}
1442
1337# poll the write BIO and send the data if applicable 1443# poll the write BIO and send the data if applicable
1444# also decode read data if possible
1445# this is basiclaly our TLS state machine
1446# more efficient implementations are possible with openssl,
1447# but not with the buggy and incomplete Net::SSLeay.
1338sub _dotls { 1448sub _dotls {
1339 my ($self) = @_; 1449 my ($self) = @_;
1340 1450
1341 my $tmp; 1451 my $tmp;
1342 1452
1343 if (length $self->{_tls_wbuf}) { 1453 if (length $self->{_tls_wbuf}) {
1344 while (($tmp = Net::SSLeay::write ($self->{tls}, $self->{_tls_wbuf})) > 0) { 1454 while (($tmp = Net::SSLeay::write ($self->{tls}, $self->{_tls_wbuf})) > 0) {
1345 substr $self->{_tls_wbuf}, 0, $tmp, ""; 1455 substr $self->{_tls_wbuf}, 0, $tmp, "";
1346 } 1456 }
1457
1458 $tmp = Net::SSLeay::get_error ($self->{tls}, $tmp);
1459 return $self->_tls_error ($tmp)
1460 if $tmp != $ERROR_WANT_READ
1461 && ($tmp != $ERROR_SYSCALL || $!);
1347 } 1462 }
1348 1463
1349 while (defined ($tmp = Net::SSLeay::read ($self->{tls}))) { 1464 while (defined ($tmp = Net::SSLeay::read ($self->{tls}))) {
1350 unless (length $tmp) { 1465 unless (length $tmp) {
1351 # let's treat SSL-eof as we treat normal EOF
1352 delete $self->{_rw};
1353 $self->{_eof} = 1;
1354 &_freetls; 1466 &_freetls;
1467 if ($self->{on_stoptls}) {
1468 $self->{on_stoptls}($self);
1469 return;
1470 } else {
1471 # let's treat SSL-eof as we treat normal EOF
1472 delete $self->{_rw};
1473 $self->{_eof} = 1;
1474 }
1355 } 1475 }
1356 1476
1357 $self->{_tls_rbuf} .= $tmp; 1477 $self->{_tls_rbuf} .= $tmp;
1358 $self->_drain_rbuf unless $self->{_in_drain}; 1478 $self->_drain_rbuf unless $self->{_in_drain};
1359 $self->{tls} or return; # tls session might have gone away in callback 1479 $self->{tls} or return; # tls session might have gone away in callback
1360 } 1480 }
1361 1481
1362 $tmp = Net::SSLeay::get_error ($self->{tls}, -1); 1482 $tmp = Net::SSLeay::get_error ($self->{tls}, -1);
1363
1364 if ($tmp != Net::SSLeay::ERROR_WANT_READ ()) {
1365 if ($tmp == Net::SSLeay::ERROR_SYSCALL ()) {
1366 return $self->_error ($!, 1); 1483 return $self->_tls_error ($tmp)
1367 } elsif ($tmp == Net::SSLeay::ERROR_SSL ()) { 1484 if $tmp != $ERROR_WANT_READ
1368 return $self->_error (&Errno::EIO, 1); 1485 && ($tmp != $ERROR_SYSCALL || $!);
1369 }
1370
1371 # all other errors are fine for our purposes
1372 }
1373 1486
1374 while (length ($tmp = Net::SSLeay::BIO_read ($self->{_wbio}))) { 1487 while (length ($tmp = Net::SSLeay::BIO_read ($self->{_wbio}))) {
1375 $self->{wbuf} .= $tmp; 1488 $self->{wbuf} .= $tmp;
1376 $self->_drain_wbuf; 1489 $self->_drain_wbuf;
1377 } 1490 }
1491
1492 $self->{_on_starttls}
1493 and Net::SSLeay::state ($self->{tls}) == Net::SSLeay::ST_OK ()
1494 and (delete $self->{_on_starttls})->($self, 1);
1378} 1495}
1379 1496
1380=item $handle->starttls ($tls[, $tls_ctx]) 1497=item $handle->starttls ($tls[, $tls_ctx])
1381 1498
1382Instead of starting TLS negotiation immediately when the AnyEvent::Handle 1499Instead of starting TLS negotiation immediately when the AnyEvent::Handle
… …
1384C<starttls>. 1501C<starttls>.
1385 1502
1386The first argument is the same as the C<tls> constructor argument (either 1503The first argument is the same as the C<tls> constructor argument (either
1387C<"connect">, C<"accept"> or an existing Net::SSLeay object). 1504C<"connect">, C<"accept"> or an existing Net::SSLeay object).
1388 1505
1389The second argument is the optional C<Net::SSLeay::CTX> object that is 1506The second argument is the optional C<AnyEvent::TLS> object that is used
1390used when AnyEvent::Handle has to create its own TLS connection object. 1507when AnyEvent::Handle has to create its own TLS connection object, or
1508a hash reference with C<< key => value >> pairs that will be used to
1509construct a new context.
1391 1510
1392The TLS connection object will end up in C<< $handle->{tls} >> after this 1511The TLS connection object will end up in C<< $handle->{tls} >>, the TLS
1393call and can be used or changed to your liking. Note that the handshake 1512context in C<< $handle->{tls_ctx} >> after this call and can be used or
1394might have already started when this function returns. 1513changed to your liking. Note that the handshake might have already started
1514when this function returns.
1395 1515
1396If it an error to start a TLS handshake more than once per 1516If it an error to start a TLS handshake more than once per
1397AnyEvent::Handle object (this is due to bugs in OpenSSL). 1517AnyEvent::Handle object (this is due to bugs in OpenSSL).
1398 1518
1399=cut 1519=cut
1400 1520
1521our %TLS_CACHE; #TODO not yet documented, should we?
1522
1401sub starttls { 1523sub starttls {
1402 my ($self, $ssl, $ctx) = @_; 1524 my ($self, $ssl, $ctx) = @_;
1403 1525
1404 require Net::SSLeay; 1526 require Net::SSLeay;
1405 1527
1406 Carp::croak "it is an error to call starttls more than once on an AnyEvent::Handle object" 1528 Carp::croak "it is an error to call starttls more than once on an AnyEvent::Handle object"
1407 if $self->{tls}; 1529 if $self->{tls};
1530
1531 $ERROR_SYSCALL = Net::SSLeay::ERROR_SYSCALL ();
1532 $ERROR_WANT_READ = Net::SSLeay::ERROR_WANT_READ ();
1533
1534 $ctx ||= $self->{tls_ctx};
1535
1536 if ("HASH" eq ref $ctx) {
1537 require AnyEvent::TLS;
1538
1539 local $Carp::CarpLevel = 1; # skip ourselves when creating a new context
1540
1541 if ($ctx->{cache}) {
1542 my $key = $ctx+0;
1543 $ctx = $TLS_CACHE{$key} ||= new AnyEvent::TLS %$ctx;
1544 } else {
1545 $ctx = new AnyEvent::TLS %$ctx;
1546 }
1547 }
1408 1548
1409 if ($ssl eq "accept") { 1549 $self->{tls_ctx} = $ctx || TLS_CTX ();
1410 $ssl = Net::SSLeay::new ($ctx || TLS_CTX ()); 1550 $self->{tls} = $ssl = $self->{tls_ctx}->_get_session ($ssl, $self, $self->{peername});
1411 Net::SSLeay::set_accept_state ($ssl);
1412 } elsif ($ssl eq "connect") {
1413 $ssl = Net::SSLeay::new ($ctx || TLS_CTX ());
1414 Net::SSLeay::set_connect_state ($ssl);
1415 }
1416
1417 $self->{tls} = $ssl;
1418 1551
1419 # basically, this is deep magic (because SSL_read should have the same issues) 1552 # basically, this is deep magic (because SSL_read should have the same issues)
1420 # but the openssl maintainers basically said: "trust us, it just works". 1553 # but the openssl maintainers basically said: "trust us, it just works".
1421 # (unfortunately, we have to hardcode constants because the abysmally misdesigned 1554 # (unfortunately, we have to hardcode constants because the abysmally misdesigned
1422 # and mismaintained ssleay-module doesn't even offer them). 1555 # and mismaintained ssleay-module doesn't even offer them).
… …
1426 # 1559 #
1427 # note that we do not try to keep the length constant between writes as we are required to do. 1560 # note that we do not try to keep the length constant between writes as we are required to do.
1428 # we assume that most (but not all) of this insanity only applies to non-blocking cases, 1561 # we assume that most (but not all) of this insanity only applies to non-blocking cases,
1429 # and we drive openssl fully in blocking mode here. Or maybe we don't - openssl seems to 1562 # and we drive openssl fully in blocking mode here. Or maybe we don't - openssl seems to
1430 # have identity issues in that area. 1563 # have identity issues in that area.
1431 Net::SSLeay::CTX_set_mode ($self->{tls}, 1564# Net::SSLeay::CTX_set_mode ($ssl,
1432 (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ENABLE_PARTIAL_WRITE () } || 1) 1565# (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ENABLE_PARTIAL_WRITE () } || 1)
1433 | (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ACCEPT_MOVING_WRITE_BUFFER () } || 2)); 1566# | (eval { local $SIG{__DIE__}; Net::SSLeay::MODE_ACCEPT_MOVING_WRITE_BUFFER () } || 2));
1567 Net::SSLeay::CTX_set_mode ($ssl, 1|2);
1434 1568
1435 $self->{_rbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ()); 1569 $self->{_rbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ());
1436 $self->{_wbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ()); 1570 $self->{_wbio} = Net::SSLeay::BIO_new (Net::SSLeay::BIO_s_mem ());
1437 1571
1438 Net::SSLeay::set_bio ($ssl, $self->{_rbio}, $self->{_wbio}); 1572 Net::SSLeay::set_bio ($ssl, $self->{_rbio}, $self->{_wbio});
1573
1574 $self->{_on_starttls} = sub { $_[0]{on_starttls}(@_) }
1575 if exists $self->{on_starttls};
1439 1576
1440 &_dotls; # need to trigger the initial handshake 1577 &_dotls; # need to trigger the initial handshake
1441 $self->start_read; # make sure we actually do read 1578 $self->start_read; # make sure we actually do read
1442} 1579}
1443 1580
… …
1456 if ($self->{tls}) { 1593 if ($self->{tls}) {
1457 Net::SSLeay::shutdown ($self->{tls}); 1594 Net::SSLeay::shutdown ($self->{tls});
1458 1595
1459 &_dotls; 1596 &_dotls;
1460 1597
1461 # we don't give a shit. no, we do, but we can't. no... 1598# # we don't give a shit. no, we do, but we can't. no...#d#
1462 # we, we... have to use openssl :/ 1599# # we, we... have to use openssl :/#d#
1463 &_freetls; 1600# &_freetls;#d#
1464 } 1601 }
1465} 1602}
1466 1603
1467sub _freetls { 1604sub _freetls {
1468 my ($self) = @_; 1605 my ($self) = @_;
1469 1606
1470 return unless $self->{tls}; 1607 return unless $self->{tls};
1471 1608
1472 Net::SSLeay::free (delete $self->{tls}); 1609 $self->{_on_starttls}
1610 and (delete $self->{_on_starttls})->($self, undef);
1611
1612 $self->{tls_ctx}->_put_session (delete $self->{tls});
1473 1613
1474 delete @$self{qw(_rbio _wbio _tls_wbuf)}; 1614 delete @$self{qw(_rbio _wbio _tls_wbuf)};
1475} 1615}
1476 1616
1477sub DESTROY { 1617sub DESTROY {
… …
1503} 1643}
1504 1644
1505=item $handle->destroy 1645=item $handle->destroy
1506 1646
1507Shuts down the handle object as much as possible - this call ensures that 1647Shuts down the handle object as much as possible - this call ensures that
1508no further callbacks will be invoked and resources will be freed as much 1648no further callbacks will be invoked and as many resources as possible
1509as possible. You must not call any methods on the object afterwards. 1649will be freed. You must not call any methods on the object afterwards.
1510 1650
1511Normally, you can just "forget" any references to an AnyEvent::Handle 1651Normally, you can just "forget" any references to an AnyEvent::Handle
1512object and it will simply shut down. This works in fatal error and EOF 1652object and it will simply shut down. This works in fatal error and EOF
1513callbacks, as well as code outside. It does I<NOT> work in a read or write 1653callbacks, as well as code outside. It does I<NOT> work in a read or write
1514callback, so when you want to destroy the AnyEvent::Handle object from 1654callback, so when you want to destroy the AnyEvent::Handle object from
… …
1527 %$self = (); 1667 %$self = ();
1528} 1668}
1529 1669
1530=item AnyEvent::Handle::TLS_CTX 1670=item AnyEvent::Handle::TLS_CTX
1531 1671
1532This function creates and returns the Net::SSLeay::CTX object used by 1672This function creates and returns the AnyEvent::TLS object used by default
1533default for TLS mode. 1673for TLS mode.
1534 1674
1535The context is created like this: 1675The context is created by calling L<AnyEvent::TLS> without any arguments.
1536
1537 Net::SSLeay::load_error_strings;
1538 Net::SSLeay::SSLeay_add_ssl_algorithms;
1539 Net::SSLeay::randomize;
1540
1541 my $CTX = Net::SSLeay::CTX_new;
1542
1543 Net::SSLeay::CTX_set_options $CTX, Net::SSLeay::OP_ALL
1544 1676
1545=cut 1677=cut
1546 1678
1547our $TLS_CTX; 1679our $TLS_CTX;
1548 1680
1549sub TLS_CTX() { 1681sub TLS_CTX() {
1550 $TLS_CTX || do { 1682 $TLS_CTX ||= do {
1551 require Net::SSLeay; 1683 require AnyEvent::TLS;
1552 1684
1553 Net::SSLeay::load_error_strings (); 1685 new AnyEvent::TLS
1554 Net::SSLeay::SSLeay_add_ssl_algorithms ();
1555 Net::SSLeay::randomize ();
1556
1557 $TLS_CTX = Net::SSLeay::CTX_new ();
1558
1559 Net::SSLeay::CTX_set_options ($TLS_CTX, Net::SSLeay::OP_ALL ());
1560
1561 $TLS_CTX
1562 } 1686 }
1563} 1687}
1564 1688
1565=back 1689=back
1566 1690

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines