projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Read MaxTimeout from tinc.conf like the manpage says.
[tinc]
/
src
/
net_socket.c
diff --git
a/src/net_socket.c
b/src/net_socket.c
index
5f9e217
..
10f2ca0
100644
(file)
--- a/
src/net_socket.c
+++ b/
src/net_socket.c
@@
-17,7
+17,7
@@
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id: net_socket.c,v 1.1.2.3
2 2003/07/28 22:06:09
guus Exp $
+ $Id: net_socket.c,v 1.1.2.3
4 2003/10/06 14:41:45
guus Exp $
*/
#include "system.h"
*/
#include "system.h"
@@
-62,7
+62,7
@@
int setup_listen_socket(const sockaddr_t *sa)
nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
if(nfd < 0) {
nfd = socket(sa->sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
if(nfd < 0) {
- logger(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno));
+
ifdebug(STATUS)
logger(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno));
return -1;
}
return -1;
}
@@
-70,7
+70,7
@@
int setup_listen_socket(const sockaddr_t *sa)
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
- close(nfd);
+ close
socket
(nfd);
logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
strerror(errno));
return -1;
logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
strerror(errno));
return -1;
@@
-98,7
+98,7
@@
int setup_listen_socket(const sockaddr_t *sa)
strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
- close(nfd);
+ close
socket
(nfd);
logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
strerror(errno));
return -1;
logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
strerror(errno));
return -1;
@@
-109,7
+109,7
@@
int setup_listen_socket(const sockaddr_t *sa)
}
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
}
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
- close(nfd);
+ close
socket
(nfd);
addrstr = sockaddr2hostname(sa);
logger(LOG_ERR, _("Can't bind to %s/tcp: %s"), addrstr,
strerror(errno));
addrstr = sockaddr2hostname(sa);
logger(LOG_ERR, _("Can't bind to %s/tcp: %s"), addrstr,
strerror(errno));
@@
-118,7
+118,7
@@
int setup_listen_socket(const sockaddr_t *sa)
}
if(listen(nfd, 3)) {
}
if(listen(nfd, 3)) {
- close(nfd);
+ close
socket
(nfd);
logger(LOG_ERR, _("System call `%s' failed: %s"), "listen",
strerror(errno));
return -1;
logger(LOG_ERR, _("System call `%s' failed: %s"), "listen",
strerror(errno));
return -1;
@@
-149,7
+149,7
@@
int setup_vpn_in_socket(const sockaddr_t *sa)
#ifdef O_NONBLOCK
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
#ifdef O_NONBLOCK
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
- close(nfd);
+ close
socket
(nfd);
logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
strerror(errno));
return -1;
logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
strerror(errno));
return -1;
@@
-166,7
+166,7
@@
int setup_vpn_in_socket(const sockaddr_t *sa)
strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
strncpy(ifr.ifr_ifrn.ifrn_name, iface, IFNAMSIZ);
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
- close(nfd);
+ close
socket
(nfd);
logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
strerror(errno));
return -1;
logger(LOG_ERR, _("Can't bind to interface %s: %s"), iface,
strerror(errno));
return -1;
@@
-175,7
+175,7
@@
int setup_vpn_in_socket(const sockaddr_t *sa)
#endif
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
#endif
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
- close(nfd);
+ close
socket
(nfd);
addrstr = sockaddr2hostname(sa);
logger(LOG_ERR, _("Can't bind to %s/udp: %s"), addrstr,
strerror(errno));
addrstr = sockaddr2hostname(sa);
logger(LOG_ERR, _("Can't bind to %s/udp: %s"), addrstr,
strerror(errno));
@@
-308,7
+308,7
@@
begin:
return;
}
return;
}
- close(c->socket);
+ close
socket
(c->socket);
ifdebug(CONNECTIONS) logger(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));
ifdebug(CONNECTIONS) logger(LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));