[dovecot-cvs] dovecot/src/lib network.c,1.16,1.17
cras at procontrol.fi
cras at procontrol.fi
Tue Mar 4 04:18:11 EET 2003
Update of /home/cvs/dovecot/src/lib
In directory danu:/tmp/cvs-serv17371/lib
Modified Files:
network.c
Log Message:
net_* functions don't anymore set sockets to non-blocking by default.
Index: network.c
===================================================================
RCS file: /home/cvs/dovecot/src/lib/network.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- network.c 5 Jan 2003 13:09:51 -0000 1.16
+++ network.c 4 Mar 2003 02:18:09 -0000 1.17
@@ -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;
}
More information about the dovecot-cvs
mailing list