projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop support for localisation.
[tinc]
/
src
/
net_socket.c
diff --git
a/src/net_socket.c
b/src/net_socket.c
index
5f6cd2a
..
21fc017
100644
(file)
--- a/
src/net_socket.c
+++ b/
src/net_socket.c
@@
-61,13
+61,13
@@
static void configure_tcp(connection_t *c) {
int flags = fcntl(c->socket, F_GETFL);
if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
int flags = fcntl(c->socket, F_GETFL);
if(fcntl(c->socket, F_SETFL, flags | O_NONBLOCK) < 0) {
- logger(LOG_ERR,
_("fcntl for %s: %s")
, c->hostname, strerror(errno));
+ logger(LOG_ERR,
"fcntl for %s: %s"
, c->hostname, strerror(errno));
}
#elif defined(WIN32)
unsigned long arg = 1;
if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
}
#elif defined(WIN32)
unsigned long arg = 1;
if(ioctlsocket(c->socket, FIONBIO, &arg) != 0) {
- logger(LOG_ERR,
_("ioctlsocket for %s: WSA error %d")
, c->hostname, WSAGetLastError());
+ logger(LOG_ERR,
"ioctlsocket for %s: WSA error %d"
, c->hostname, WSAGetLastError());
}
#endif
}
#endif
@@
-100,12
+100,12
@@
static bool bind_to_interface(int sd) {
status = setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr));
if(status) {
status = setsockopt(sd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr));
if(status) {
- logger(LOG_ERR,
_("Can't bind to interface %s: %s")
, iface,
+ logger(LOG_ERR,
"Can't bind to interface %s: %s"
, iface,
strerror(errno));
return false;
}
#else /* if !defined(SOL_SOCKET) || !defined(SO_BINDTODEVICE) */
strerror(errno));
return false;
}
#else /* if !defined(SOL_SOCKET) || !defined(SO_BINDTODEVICE) */
- logger(LOG_WARNING,
_("%s not supported on this platform")
, "BindToInterface");
+ logger(LOG_WARNING,
"%s not supported on this platform"
, "BindToInterface");
#endif
return true;
#endif
return true;
@@
-140,8
+140,8
@@
static bool bind_to_address(connection_t *c) {
&ai_hints, &ai_list);
if(status) {
free(node);
&ai_hints, &ai_list);
if(status) {
free(node);
- logger(LOG_WARNING,
_("Error looking up %s port %s: %s")
,
- node,
_("any")
, gai_strerror(status));
+ logger(LOG_WARNING,
"Error looking up %s port %s: %s"
,
+ node,
"any"
, gai_strerror(status));
return false;
}
assert(ai_list != NULL);
return false;
}
assert(ai_list != NULL);
@@
-156,7
+156,7
@@
static bool bind_to_address(connection_t *c) {
if(status) {
if(status) {
- logger(LOG_ERR,
_("Can't bind to %s/tcp: %s")
, node,
+ logger(LOG_ERR,
"Can't bind to %s/tcp: %s"
, node,
strerror(errno));
} else ifdebug(CONNECTIONS) {
logger(LOG_DEBUG, "Successfully bound outgoing "
strerror(errno));
} else ifdebug(CONNECTIONS) {
logger(LOG_DEBUG, "Successfully bound outgoing "
@@
-175,12
+175,10
@@
int setup_listen_socket(const sockaddr_t *sa) {
int option;
char *iface;
int option;
char *iface;
- cp();
-
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) {
- ifdebug(STATUS) logger(LOG_ERR,
_("Creating metasocket failed: %s")
, strerror(errno));
+ ifdebug(STATUS) logger(LOG_ERR,
"Creating metasocket failed: %s"
, strerror(errno));
return -1;
}
return -1;
}
@@
-204,19
+202,19
@@
int setup_listen_socket(const sockaddr_t *sa) {
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
closesocket(nfd);
if(setsockopt(nfd, SOL_SOCKET, SO_BINDTODEVICE, &ifr, sizeof(ifr))) {
closesocket(nfd);
- logger(LOG_ERR,
_("Can't bind to interface %s: %s")
, iface,
+ logger(LOG_ERR,
"Can't bind to interface %s: %s"
, iface,
strerror(errno));
return -1;
}
#else
strerror(errno));
return -1;
}
#else
- logger(LOG_WARNING,
_("%s not supported on this platform")
, "BindToInterface");
+ logger(LOG_WARNING,
"%s not supported on this platform"
, "BindToInterface");
#endif
}
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
closesocket(nfd);
addrstr = sockaddr2hostname(sa);
#endif
}
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
closesocket(nfd);
addrstr = sockaddr2hostname(sa);
- logger(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;
@@
-224,7
+222,7
@@
int setup_listen_socket(const sockaddr_t *sa) {
if(listen(nfd, 3)) {
closesocket(nfd);
if(listen(nfd, 3)) {
closesocket(nfd);
- logger(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;
}
@@
-237,12
+235,10
@@
int setup_vpn_in_socket(const sockaddr_t *sa) {
char *addrstr;
int option;
char *addrstr;
int option;
- cp();
-
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(LOG_ERR,
_("Creating UDP socket failed: %s")
, strerror(errno));
+ logger(LOG_ERR,
"Creating UDP socket failed: %s"
, strerror(errno));
return -1;
}
return -1;
}
@@
-252,7
+248,7
@@
int setup_vpn_in_socket(const sockaddr_t *sa) {
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
closesocket(nfd);
if(fcntl(nfd, F_SETFL, flags | O_NONBLOCK) < 0) {
closesocket(nfd);
- logger(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;
}
@@
-262,7
+258,7
@@
int setup_vpn_in_socket(const sockaddr_t *sa) {
unsigned long arg = 1;
if(ioctlsocket(nfd, FIONBIO, &arg) != 0) {
closesocket(nfd);
unsigned long arg = 1;
if(ioctlsocket(nfd, FIONBIO, &arg) != 0) {
closesocket(nfd);
- logger(LOG_ERR,
_("Call to `%s' failed: WSA error %d")
, "ioctlsocket",
+ logger(LOG_ERR,
"Call to `%s' failed: WSA error %d"
, "ioctlsocket",
WSAGetLastError());
return -1;
}
WSAGetLastError());
return -1;
}
@@
-299,7
+295,7
@@
int setup_vpn_in_socket(const sockaddr_t *sa) {
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
closesocket(nfd);
addrstr = sockaddr2hostname(sa);
if(bind(nfd, &sa->sa, SALEN(sa->sa))) {
closesocket(nfd);
addrstr = sockaddr2hostname(sa);
- logger(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;
@@
-311,8
+307,6
@@
int setup_vpn_in_socket(const sockaddr_t *sa) {
void retry_outgoing(outgoing_t *outgoing) {
event_t *event;
void retry_outgoing(outgoing_t *outgoing) {
event_t *event;
- cp();
-
outgoing->timeout += 5;
if(outgoing->timeout > maxtimeout)
outgoing->timeout += 5;
if(outgoing->timeout > maxtimeout)
@@
-325,14
+319,12
@@
void retry_outgoing(outgoing_t *outgoing) {
event_add(event);
ifdebug(CONNECTIONS) logger(LOG_NOTICE,
event_add(event);
ifdebug(CONNECTIONS) logger(LOG_NOTICE,
-
_("Trying to re-establish outgoing connection in %d seconds")
,
+
"Trying to re-establish outgoing connection in %d seconds"
,
outgoing->timeout);
}
void finish_connecting(connection_t *c) {
outgoing->timeout);
}
void finish_connecting(connection_t *c) {
- cp();
-
- ifdebug(CONNECTIONS) logger(LOG_INFO, _("Connected to %s (%s)"), c->name, c->hostname);
+ ifdebug(CONNECTIONS) logger(LOG_INFO, "Connected to %s (%s)", c->name, c->hostname);
configure_tcp(c);
configure_tcp(c);
@@
-345,12
+337,10
@@
void do_outgoing_connection(connection_t *c) {
char *address, *port;
int result;
char *address, *port;
int result;
- cp();
-
begin:
if(!c->outgoing->ai) {
if(!c->outgoing->cfg) {
begin:
if(!c->outgoing->ai) {
if(!c->outgoing->cfg) {
- ifdebug(CONNECTIONS) logger(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 = true;
retry_outgoing(c->outgoing);
c->name);
c->status.remove = true;
retry_outgoing(c->outgoing);
@@
-385,13
+375,13
@@
begin:
c->hostname = sockaddr2hostname(&c->address);
c->hostname = sockaddr2hostname(&c->address);
- ifdebug(CONNECTIONS) logger(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) {
- ifdebug(CONNECTIONS) logger(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;
@@
-426,7
+416,7
@@
begin:
closesocket(c->socket);
closesocket(c->socket);
- ifdebug(CONNECTIONS) logger(LOG_ERR,
_("%s: %s")
, c->hostname, strerror(errno));
+ ifdebug(CONNECTIONS) logger(LOG_ERR,
"%s: %s"
, c->hostname, strerror(errno));
goto begin;
}
goto begin;
}
@@
-440,13
+430,11
@@
void setup_outgoing_connection(outgoing_t *outgoing) {
connection_t *c;
node_t *n;
connection_t *c;
node_t *n;
- cp();
-
n = lookup_node(outgoing->name);
if(n)
if(n->connection) {
n = lookup_node(outgoing->name);
if(n)
if(n->connection) {
- ifdebug(CONNECTIONS) logger(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;
@@
-465,7
+453,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(LOG_ERR,
_("No address specified for %s")
, c->name);
+ logger(LOG_ERR,
"No address specified for %s"
, c->name);
free_connection(c);
return;
}
free_connection(c);
return;
}
@@
-488,12
+476,10
@@
bool handle_new_meta_connection(int sock) {
int fd;
socklen_t len = sizeof(sa);
int fd;
socklen_t len = sizeof(sa);
- cp();
-
fd = accept(sock, &sa.sa, &len);
if(fd < 0) {
fd = accept(sock, &sa.sa, &len);
if(fd < 0) {
- logger(LOG_ERR,
_("Accepting a new connection failed: %s")
,
+ logger(LOG_ERR,
"Accepting a new connection failed: %s"
,
strerror(errno));
return false;
}
strerror(errno));
return false;
}
@@
-512,7
+498,7
@@
bool handle_new_meta_connection(int sock) {
c->socket = fd;
c->last_ping_time = now;
c->socket = fd;
c->last_ping_time = now;
- ifdebug(CONNECTIONS) logger(LOG_NOTICE,
_("Connection from %s")
, c->hostname);
+ ifdebug(CONNECTIONS) logger(LOG_NOTICE,
"Connection from %s"
, c->hostname);
configure_tcp(c);
configure_tcp(c);
@@
-541,8
+527,6
@@
void try_outgoing_connections(void) {
connection_t *c;
avl_node_t *node;
connection_t *c;
avl_node_t *node;
- cp();
-
if(outgoing_list) {
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
if(outgoing_list) {
for(node = connection_tree->head; node; node = node->next) {
c = node->data;
@@
-559,7
+543,7
@@
void try_outgoing_connections(void) {
if(!check_id(name)) {
logger(LOG_ERR,
if(!check_id(name)) {
logger(LOG_ERR,
-
_("Invalid name for outgoing connection in %s line %d")
,
+
"Invalid name for outgoing connection in %s line %d"
,
cfg->file, cfg->line);
free(name);
continue;
cfg->file, cfg->line);
free(name);
continue;