Mercurial > dovecot > core-2.2
diff src/director/director-connection.c @ 14681:ca37d1577291
Added o_stream_nsend*() and related functions to make delayed error handling safer.
Once o_stream_nsend*() is called, o_stream_nfinish() must be called before
stream is destroyed to finish checking if there were any errors. If
something failed and the stream is just wanted to be closed,
o_stream_ignore_last_errors() can be called.
For streams where errors don't really make any difference (network sockets)
you can call o_stream_set_no_error_handling() immediately after creating the
stream.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Mon, 25 Jun 2012 00:01:59 +0300 |
| parents | efd276ab2577 |
| children | d0d7b810646b |
line wrap: on
line diff
--- a/src/director/director-connection.c Sun Jun 24 21:43:48 2012 +0300 +++ b/src/director/director-connection.c Mon Jun 25 00:01:59 2012 +0300 @@ -183,7 +183,6 @@ connect_str = t_strdup_printf("CONNECT\t%s\t%u\n", net_ip2addr(&host->ip), host->port); director_connection_send(conn, connect_str); - (void)o_stream_flush(conn->output); o_stream_uncork(conn->output); conn->to_disconnect = @@ -1388,6 +1387,7 @@ conn->dir = dir; conn->input = i_stream_create_fd(conn->fd, MAX_INBUF_SIZE, FALSE); conn->output = o_stream_create_fd(conn->fd, MAX_OUTBUF_SIZE, FALSE); + o_stream_set_no_error_handling(conn->output, TRUE); conn->to_ping = timeout_add(DIRECTOR_CONNECTION_ME_TIMEOUT_MSECS, director_connection_init_timeout, conn); array_append(&dir->connections, &conn, 1);