Mercurial > dovecot > original-hg > dovecot-1.2
changeset 1268:0d9f0e617a1a HEAD
net_* functions don't anymore set sockets to non-blocking by default.
| author | Timo Sirainen <tss@iki.fi> |
|---|---|
| date | Tue, 04 Mar 2003 04:18:09 +0200 |
| parents | 8ceacaf13c9c |
| children | dad400966e72 |
| files | src/auth/main.c src/lib/network.c src/login-common/auth-connection.c src/login-common/ssl-proxy-gnutls.c src/login-common/ssl-proxy-openssl.c src/master/auth-process.c src/master/main.c |
| diffstat | 7 files changed, 7 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auth/main.c Tue Mar 04 03:10:28 2003 +0200 +++ b/src/auth/main.c Tue Mar 04 04:18:09 2003 +0200 @@ -35,6 +35,7 @@ if (fd < -1) i_fatal("accept() failed: %m"); } else { + net_set_nonblock(fd, TRUE); (void)login_connection_create(fd); } }
--- a/src/lib/network.c Tue Mar 04 03:10:28 2003 +0200 +++ b/src/lib/network.c Tue Mar 04 04:18:09 2003 +0200 @@ -147,7 +147,6 @@ return -1; /* set socket options */ - net_set_nonblock(fd, TRUE); setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &opt, sizeof(opt)); @@ -197,9 +196,6 @@ if (fd == -1) return -1; - /* set socket options */ - net_set_nonblock(fd, TRUE); - /* connect */ ret = connect(fd, (struct sockaddr *) &sa, sizeof(sa)); if (ret < 0 && errno != EINPROGRESS) { @@ -283,7 +279,6 @@ return -1; /* set socket options */ - net_set_nonblock(fd, TRUE); setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &opt, sizeof(opt)); setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, &opt, sizeof(opt)); @@ -326,9 +321,6 @@ if (fd == -1) return -1; - /* set socket options */ - net_set_nonblock(fd, TRUE); - /* bind */ if (bind(fd, (struct sockaddr *) &sa, sizeof(sa)) == 0) { /* start listening */ @@ -363,7 +355,6 @@ if (addr != NULL) sin_get_ip(&so, addr); if (port != NULL) *port = sin_get_port(&so); - net_set_nonblock(ret, TRUE); return ret; }
--- a/src/login-common/auth-connection.c Tue Mar 04 03:10:28 2003 +0200 +++ b/src/login-common/auth-connection.c Tue Mar 04 04:18:09 2003 +0200 @@ -58,8 +58,8 @@ return NULL; } - /* we depend on auth process - if it's slow, just wait */ - net_set_nonblock(fd, FALSE); + /* use blocking connection since we depend on auth process - + if it's slow, just wait */ conn = i_new(struct auth_connection, 1); conn->refcount = 1;
--- a/src/login-common/ssl-proxy-gnutls.c Tue Mar 04 03:10:28 2003 +0200 +++ b/src/login-common/ssl-proxy-gnutls.c Tue Mar 04 04:18:09 2003 +0200 @@ -324,6 +324,7 @@ net_set_nonblock(sfd[0], TRUE); net_set_nonblock(sfd[1], TRUE); + net_set_nonblock(fd, TRUE); proxy = i_new(struct ssl_proxy, 1); proxy->refcount = 1;
--- a/src/login-common/ssl-proxy-openssl.c Tue Mar 04 03:10:28 2003 +0200 +++ b/src/login-common/ssl-proxy-openssl.c Tue Mar 04 04:18:09 2003 +0200 @@ -320,6 +320,7 @@ net_set_nonblock(sfd[0], TRUE); net_set_nonblock(sfd[1], TRUE); + net_set_nonblock(fd, TRUE); proxy = i_new(struct ssl_proxy, 1); proxy->refcount = 1;
--- a/src/master/auth-process.c Tue Mar 04 03:10:28 2003 +0200 +++ b/src/master/auth-process.c Tue Mar 04 04:18:09 2003 +0200 @@ -371,6 +371,7 @@ group->listen_fd = net_listen_unix(path); if (group->listen_fd < 0) i_fatal("Can't listen in UNIX socket %s: %m", path); + net_set_nonblock(group->listen_fd, TRUE); fd_close_on_exec(group->listen_fd, TRUE); /* set correct permissions */
--- a/src/master/main.c Tue Mar 04 03:10:28 2003 +0200 +++ b/src/master/main.c Tue Mar 04 04:18:09 2003 +0200 @@ -274,6 +274,7 @@ *fd = port == 0 ? dup(null_fd) : net_listen(ip, &port); if (*fd == -1) i_fatal("listen(%d) failed: %m", port); + net_set_nonblock(*fd, TRUE); fd_close_on_exec(*fd, TRUE); }