projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Simplify logging, update copyrights and some minor cleanups.
[tinc]
/
src
/
net_socket.c
diff --git
a/src/net_socket.c
b/src/net_socket.c
index
ffc6572
..
1b5c18f
100644
(file)
--- a/
src/net_socket.c
+++ b/
src/net_socket.c
@@
-1,7
+1,7
@@
/*
net_socket.c -- Handle various kinds of sockets.
/*
net_socket.c -- Handle various kinds of sockets.
- Copyright (C) 1998-200
2
Ivo Timmermans <ivo@o2w.nl>,
- 2000-200
2
Guus Sliepen <guus@sliepen.eu.org>
+ Copyright (C) 1998-200
3
Ivo Timmermans <ivo@o2w.nl>,
+ 2000-200
3
Guus Sliepen <guus@sliepen.eu.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-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.2
5 2003/07/06 22:11:32
guus Exp $
+ $Id: net_socket.c,v 1.1.2.2
6 2003/07/12 17:41:46
guus Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-99,7
+99,7
@@
int setup_listen_socket(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(
DEBUG_ALWAYS,
LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno));
+ logger(LOG_ERR, _("Creating metasocket failed: %s"), strerror(errno));
return -1;
}
return -1;
}
@@
-107,7
+107,7
@@
int setup_listen_socket(sockaddr_t *sa)
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
close(nfd);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
close(nfd);
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
strerror(errno));
return -1;
}
strerror(errno));
return -1;
}
@@
-134,19
+134,19
@@
int setup_listen_socket(sockaddr_t *sa)
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
close(nfd);
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
close(nfd);
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("Can't bind to interface %s: %s"), interface,
+ logger(LOG_ERR, _("Can't bind to interface %s: %s"), interface,
strerror(errno));
return -1;
}
#else
strerror(errno));
return -1;
}
#else
- logger(
DEBUG_ALWAYS,
LOG_WARNING, _("BindToInterface not supported on this platform"));
+ logger(LOG_WARNING, _("BindToInterface not supported on this platform"));
#endif
}
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
close(nfd);
addrstr = sockaddr2hostname(sa);
#endif
}
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
close(nfd);
addrstr = sockaddr2hostname(sa);
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("Can't bind to %s/tcp: %s"), addrstr,
+ logger(LOG_ERR, _("Can't bind to %s/tcp: %s"), addrstr,
strerror(errno));
free(addrstr);
return -1;
strerror(errno));
free(addrstr);
return -1;
@@
-154,7
+154,7
@@
int setup_listen_socket(sockaddr_t *sa)
if(listen(nfd, 3)) {
close(nfd);
if(listen(nfd, 3)) {
close(nfd);
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("System call `%s' failed: %s"), "listen",
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "listen",
strerror(errno));
return -1;
}
strerror(errno));
return -1;
}
@@
-177,14
+177,14
@@
int setup_vpn_in_socket(sockaddr_t *sa)
nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
if(nfd < 0) {
nfd = socket(sa->sa.sa_family, SOCK_DGRAM, IPPROTO_UDP);
if(nfd < 0) {
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("Creating UDP socket failed: %s"), strerror(errno));
+ logger(LOG_ERR, _("Creating UDP socket failed: %s"), strerror(errno));
return -1;
}
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
close(nfd);
return -1;
}
flags = fcntl(nfd, F_GETFL);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
close(nfd);
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
+ logger(LOG_ERR, _("System call `%s' failed: %s"), "fcntl",
strerror(errno));
return -1;
}
strerror(errno));
return -1;
}
@@
-200,7
+200,7
@@
int setup_vpn_in_socket(sockaddr_t *sa)
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
close(nfd);
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
close(nfd);
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("Can't bind to interface %s: %s"), interface,
+ logger(LOG_ERR, _("Can't bind to interface %s: %s"), interface,
strerror(errno));
return -1;
}
strerror(errno));
return -1;
}
@@
-210,7
+210,7
@@
int setup_vpn_in_socket(sockaddr_t *sa)
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
close(nfd);
addrstr = sockaddr2hostname(sa);
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
close(nfd);
addrstr = sockaddr2hostname(sa);
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("Can't bind to %s/udp: %s"), addrstr,
+ logger(LOG_ERR, _("Can't bind to %s/udp: %s"), addrstr,
strerror(errno));
free(addrstr);
return -1;
strerror(errno));
free(addrstr);
return -1;
@@
-236,7
+236,7
@@
void retry_outgoing(outgoing_t *outgoing)
event->data = outgoing;
event_add(event);
event->data = outgoing;
event_add(event);
-
logger(DEBUG_CONNECTIONS,
LOG_NOTICE,
+
ifdebug(CONNECTIONS) logger(
LOG_NOTICE,
_("Trying to re-establish outgoing connection in %d seconds"),
outgoing->timeout);
}
_("Trying to re-establish outgoing connection in %d seconds"),
outgoing->timeout);
}
@@
-245,7
+245,7
@@
void finish_connecting(connection_t *c)
{
cp();
{
cp();
-
logger(DEBUG_CONNECTIONS,
LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
+
ifdebug(CONNECTIONS) logger(
LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
c->last_ping_time = now;
c->last_ping_time = now;
@@
-262,7
+262,7
@@
void do_outgoing_connection(connection_t *c)
begin:
if(!c->outgoing->ai) {
if(!c->outgoing->cfg) {
begin:
if(!c->outgoing->ai) {
if(!c->outgoing->cfg) {
-
logger(DEBUG_CONNECTIONS,
LOG_ERR, _("Could not set up a meta connection to %s"),
+
ifdebug(CONNECTIONS) logger(
LOG_ERR, _("Could not set up a meta connection to %s"),
c->name);
c->status.remove = 1;
retry_outgoing(c->outgoing);
c->name);
c->status.remove = 1;
retry_outgoing(c->outgoing);
@@
-297,13
+297,13
@@
begin:
c->hostname = sockaddr2hostname(&c->address);
c->hostname = sockaddr2hostname(&c->address);
-
logger(DEBUG_CONNECTIONS,
LOG_INFO, _("Trying to connect to %s (%s)"), c->name,
+
ifdebug(CONNECTIONS) logger(
LOG_INFO, _("Trying to connect to %s (%s)"), c->name,
c->hostname);
c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
if(c->socket == -1) {
c->hostname);
c->socket = socket(c->address.sa.sa_family, SOCK_STREAM, IPPROTO_TCP);
if(c->socket == -1) {
-
logger(DEBUG_CONNECTIONS,
LOG_ERR, _("Creating socket for %s failed: %s"), c->hostname,
+
ifdebug(CONNECTIONS) logger(
LOG_ERR, _("Creating socket for %s failed: %s"), c->hostname,
strerror(errno));
goto begin;
strerror(errno));
goto begin;
@@
-326,7
+326,7
@@
begin:
flags = fcntl(c->socket, F_GETFL);
if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
flags = fcntl(c->socket, F_GETFL);
if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno));
+ logger(LOG_ERR, _("fcntl for %s: %s"), c->hostname, strerror(errno));
}
/* Connect */
}
/* Connect */
@@
-341,7
+341,7
@@
begin:
close(c->socket);
close(c->socket);
-
logger(DEBUG_CONNECTIONS,
LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));
+
ifdebug(CONNECTIONS) logger(
LOG_ERR, _("%s: %s"), c->hostname, strerror(errno));
goto begin;
}
goto begin;
}
@@
-362,7
+362,7
@@
void setup_outgoing_connection(outgoing_t *outgoing)
if(n)
if(n->connection) {
if(n)
if(n->connection) {
-
logger(DEBUG_CONNECTIONS,
LOG_INFO, _("Already connected to %s"), outgoing->name);
+
ifdebug(CONNECTIONS) logger(
LOG_INFO, _("Already connected to %s"), outgoing->name);
n->connection->outgoing = outgoing;
return;
n->connection->outgoing = outgoing;
return;
@@
-381,7
+381,7
@@
void setup_outgoing_connection(outgoing_t *outgoing)
outgoing->cfg = lookup_config(c->config_tree, "Address");
if(!outgoing->cfg) {
outgoing->cfg = lookup_config(c->config_tree, "Address");
if(!outgoing->cfg) {
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("No address specified for %s"), c->name);
+ logger(LOG_ERR, _("No address specified for %s"), c->name);
free_connection(c);
free(outgoing->name);
free(outgoing);
free_connection(c);
free(outgoing->name);
free(outgoing);
@@
-411,7
+411,7
@@
int handle_new_meta_connection(int sock)
fd = accept(sock, &sa.sa, &len);
if(fd < 0) {
fd = accept(sock, &sa.sa, &len);
if(fd < 0) {
- logger(
DEBUG_ALWAYS,
LOG_ERR, _("Accepting a new connection failed: %s"),
+ logger(LOG_ERR, _("Accepting a new connection failed: %s"),
strerror(errno));
return -1;
}
strerror(errno));
return -1;
}
@@
-429,7
+429,7
@@
int handle_new_meta_connection(int sock)
c->socket = fd;
c->last_ping_time = now;
c->socket = fd;
c->last_ping_time = now;
-
logger(DEBUG_CONNECTIONS,
LOG_NOTICE, _("Connection from %s"), c->hostname);
+
ifdebug(CONNECTIONS) logger(
LOG_NOTICE, _("Connection from %s"), c->hostname);
connection_add(c);
connection_add(c);
@@
-452,7
+452,7
@@
void try_outgoing_connections(void)
get_config_string(cfg, &name);
if(check_id(name)) {
get_config_string(cfg, &name);
if(check_id(name)) {
- logger(
DEBUG_ALWAYS,
LOG_ERR,
+ logger(LOG_ERR,
_("Invalid name for outgoing connection in %s line %d"),
cfg->file, cfg->line);
free(name);
_("Invalid name for outgoing connection in %s line %d"),
cfg->file, cfg->line);
free(name);
projects / tinc / blobdiff