Re: [PATCH] Move timeout from ConnOpener::connect to ConnOpener::timeout

On 21/01/2013 9:21 a.m., Rainer Weikusat wrote:
> The attached patch removes the timeout checking code from
> ConnOpener::connect and changes ConnOpener::timeout to actually force
> the connection attempt to be terminated with 'a timeout error' instead
> of invoking the connect method. The main motivation for this is that a
> timeout occuring for a 'server first' SSL bumped connection attempt
> would otherwise trigger an assert in forward.cc because of the lack
> of either 'an I/O result' or an error state after the
> comm_connect_addr routine invoked from connect after the connect call
> from timeout had erroneously signalled that the connection was
> successfully established to its caller.

+1 with tweaks: the definitions of *F and *prt need to be inside their
relevant if() scopes. But otherwise this looks fine for the timeout move.

Amos
Received on Sun Jan 20 2013 - 21:30:49 MST