projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
b8ecdd1
..
340a2da
100644
(file)
--- a/
src/netutl.c
+++ b/
src/netutl.c
@@
-1,7
+1,7
@@
/*
netutl.c -- some supporting network utility code
Copyright (C) 1998-2005 Ivo Timmermans
/*
netutl.c -- some supporting network utility code
Copyright (C) 1998-2005 Ivo Timmermans
- 2000-20
09
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-20
11
Guus Sliepen <guus@tinc-vpn.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
@@
-42,7
+42,7
@@
struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
err = getaddrinfo(address, service, &hint, &ai);
if(err) {
err = getaddrinfo(address, service, &hint, &ai);
if(err) {
- logger(LOG_WARNING, "Error looking up %s port %s: %s", address,
+ logger(
DEBUG_ALWAYS,
LOG_WARNING, "Error looking up %s port %s: %s", address,
service, gai_strerror(err));
return NULL;
}
service, gai_strerror(err));
return NULL;
}
@@
-62,8
+62,7
@@
sockaddr_t str2sockaddr(const char *address, const char *port) {
err = getaddrinfo(address, port, &hint, &ai);
if(err || !ai) {
err = getaddrinfo(address, port, &hint, &ai);
if(err || !ai) {
- ifdebug(SCARY_THINGS)
- logger(LOG_DEBUG, "Unknown type address %s port %s", address, port);
+ logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Unknown type address %s port %s", address, port);
result.sa.sa_family = AF_UNKNOWN;
result.unknown.address = xstrdup(address);
result.unknown.port = xstrdup(port);
result.sa.sa_family = AF_UNKNOWN;
result.unknown.address = xstrdup(address);
result.unknown.port = xstrdup(port);
@@
-83,18
+82,19
@@
void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
int err;
if(sa->sa.sa_family == AF_UNKNOWN) {
int err;
if(sa->sa.sa_family == AF_UNKNOWN) {
- *addrstr = xstrdup(sa->unknown.address);
- *portstr = xstrdup(sa->unknown.port);
+ if(addrstr)
+ *addrstr = xstrdup(sa->unknown.address);
+ if(portstr)
+ *portstr = xstrdup(sa->unknown.port);
return;
}
return;
}
- err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof
(address), port, sizeof(port)
, NI_NUMERICHOST | NI_NUMERICSERV);
+ err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof
address, port, sizeof port
, NI_NUMERICHOST | NI_NUMERICSERV);
if(err) {
if(err) {
- logger(LOG_ERR, "Error while translating addresses: %s",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Error while translating addresses: %s",
gai_strerror(err));
gai_strerror(err));
- raise(SIGFPE);
- exit(0);
+ abort();
}
scopeid = strchr(address, '%');
}
scopeid = strchr(address, '%');
@@
-102,8
+102,10
@@
void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
if(scopeid)
*scopeid = '\0'; /* Descope. */
if(scopeid)
*scopeid = '\0'; /* Descope. */
- *addrstr = xstrdup(address);
- *portstr = xstrdup(port);
+ if(addrstr)
+ *addrstr = xstrdup(address);
+ if(portstr)
+ *portstr = xstrdup(port);
}
char *sockaddr2hostname(const sockaddr_t *sa) {
}
char *sockaddr2hostname(const sockaddr_t *sa) {
@@
-117,10
+119,10
@@
char *sockaddr2hostname(const sockaddr_t *sa) {
return str;
}
return str;
}
- err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof
(address), port, sizeof(port)
,
+ err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof
address, port, sizeof port
,
hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
if(err) {
hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
if(err) {
- logger(LOG_ERR, "Error while looking up hostname: %s",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "Error while looking up hostname: %s",
gai_strerror(err));
}
gai_strerror(err));
}
@@
-151,10
+153,9
@@
int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b) {
return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
default:
return memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
default:
- logger(LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
a->sa.sa_family);
a->sa.sa_family);
- raise(SIGFPE);
- exit(0);
+ abort();
}
}
}
}
@@
-179,26
+180,25
@@
int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
return strcmp(a->unknown.port, b->unknown.port);
case AF_INET:
return strcmp(a->unknown.port, b->unknown.port);
case AF_INET:
- result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof
(a->in.sin_addr)
);
+ result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof
a->in.sin_addr
);
if(result)
return result;
if(result)
return result;
- return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof
(a->in.sin_port)
);
+ return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof
a->in.sin_port
);
case AF_INET6:
case AF_INET6:
- result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof
(a->in6.sin6_addr)
);
+ result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof
a->in6.sin6_addr
);
if(result)
return result;
if(result)
return result;
- return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof
(a->in6.sin6_port)
);
+ return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof
a->in6.sin6_port
);
default:
default:
- logger(LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
+ logger(
DEBUG_ALWAYS,
LOG_ERR, "sockaddrcmp() was called with unknown address family %d, exitting!",
a->sa.sa_family);
a->sa.sa_family);
- raise(SIGFPE);
- exit(0);
+ abort();
}
}
}
}