projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add PRF to derive key material from the ECDH shared secret.
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
8405491
..
8db252d
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
@@
-32,20
+32,17
@@
bool hostnames = false;
Turn a string into a struct addrinfo.
Return NULL on failure.
*/
Turn a string into a struct addrinfo.
Return NULL on failure.
*/
-struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype)
-{
+struct addrinfo *str2addrinfo(const char *address, const char *service, int socktype) {
struct addrinfo *ai, hint = {0};
int err;
struct addrinfo *ai, hint = {0};
int err;
- cp();
-
hint.ai_family = addressfamily;
hint.ai_socktype = socktype;
err = getaddrinfo(address, service, &hint, &ai);
if(err) {
hint.ai_family = addressfamily;
hint.ai_socktype = socktype;
err = getaddrinfo(address, service, &hint, &ai);
if(err) {
- logger(LOG_WARNING,
_("Error looking up %s port %s: %s")
, address,
+ logger(LOG_WARNING,
"Error looking up %s port %s: %s"
, address,
service, gai_strerror(err));
return NULL;
}
service, gai_strerror(err));
return NULL;
}
@@
-53,14
+50,11
@@
struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
return ai;
}
return ai;
}
-sockaddr_t str2sockaddr(const char *address, const char *port)
-{
+sockaddr_t str2sockaddr(const char *address, const char *port) {
struct addrinfo *ai, hint = {0};
sockaddr_t result;
int err;
struct addrinfo *ai, hint = {0};
sockaddr_t result;
int err;
- cp();
-
hint.ai_family = AF_UNSPEC;
hint.ai_flags = AI_NUMERICHOST;
hint.ai_socktype = SOCK_STREAM;
hint.ai_family = AF_UNSPEC;
hint.ai_flags = AI_NUMERICHOST;
hint.ai_socktype = SOCK_STREAM;
@@
-82,29
+76,24
@@
sockaddr_t str2sockaddr(const char *address, const char *port)
return result;
}
return result;
}
-void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr)
-{
+void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr) {
char address[NI_MAXHOST];
char port[NI_MAXSERV];
char *scopeid;
int err;
char address[NI_MAXHOST];
char port[NI_MAXSERV];
char *scopeid;
int err;
- cp();
-
if(sa->sa.sa_family == AF_UNKNOWN) {
*addrstr = xstrdup(sa->unknown.address);
*portstr = xstrdup(sa->unknown.port);
return;
}
if(sa->sa.sa_family == AF_UNKNOWN) {
*addrstr = xstrdup(sa->unknown.address);
*portstr = xstrdup(sa->unknown.port);
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(LOG_ERR,
"Error while translating addresses: %s"
,
gai_strerror(err));
gai_strerror(err));
- cp_trace();
- raise(SIGFPE);
- exit(0);
+ abort();
}
scopeid = strchr(address, '%');
}
scopeid = strchr(address, '%');
@@
-112,42
+101,38
@@
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) {
char *str;
char address[NI_MAXHOST] = "unknown";
char port[NI_MAXSERV] = "unknown";
int err;
char *str;
char address[NI_MAXHOST] = "unknown";
char port[NI_MAXSERV] = "unknown";
int err;
- cp();
-
if(sa->sa.sa_family == AF_UNKNOWN) {
if(sa->sa.sa_family == AF_UNKNOWN) {
- xasprintf(&str,
_("%s port %s")
, sa->unknown.address, sa->unknown.port);
+ xasprintf(&str,
"%s port %s"
, sa->unknown.address, sa->unknown.port);
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(LOG_ERR,
"Error while looking up hostname: %s"
,
gai_strerror(err));
}
gai_strerror(err));
}
- xasprintf(&str,
_("%s port %s")
, address, port);
+ xasprintf(&str,
"%s port %s"
, address, port);
return str;
}
return str;
}
-int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b)
-{
+int sockaddrcmp_noport(const sockaddr_t *a, const sockaddr_t *b) {
int result;
int result;
- cp();
-
result = a->sa.sa_family - b->sa.sa_family;
if(result)
result = a->sa.sa_family - b->sa.sa_family;
if(result)
@@
-167,20
+152,15
@@
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(LOG_ERR,
"sockaddrcmp() was called with unknown address family %d, exitting!"
,
a->sa.sa_family);
a->sa.sa_family);
- cp_trace();
- raise(SIGFPE);
- exit(0);
+ abort();
}
}
}
}
-int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b)
-{
+int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
int result;
int result;
- cp();
-
result = a->sa.sa_family - b->sa.sa_family;
if(result)
result = a->sa.sa_family - b->sa.sa_family;
if(result)
@@
-199,33
+179,29
@@
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(LOG_ERR,
"sockaddrcmp() was called with unknown address family %d, exitting!"
,
a->sa.sa_family);
a->sa.sa_family);
- cp_trace();
- raise(SIGFPE);
- exit(0);
+ abort();
}
}
void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
}
}
void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
- cp();
-
if(b->sa.sa_family != AF_UNKNOWN) {
*a = *b;
} else {
if(b->sa.sa_family != AF_UNKNOWN) {
*a = *b;
} else {
@@
-236,18
+212,13
@@
void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
}
void sockaddrfree(sockaddr_t *a) {
}
void sockaddrfree(sockaddr_t *a) {
- cp();
-
if(a->sa.sa_family == AF_UNKNOWN) {
free(a->unknown.address);
free(a->unknown.port);
}
}
if(a->sa.sa_family == AF_UNKNOWN) {
free(a->unknown.address);
free(a->unknown.port);
}
}
-void sockaddrunmap(sockaddr_t *sa)
-{
- cp();
-
+void sockaddrunmap(sockaddr_t *sa) {
if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr)) {
sa->in.sin_addr.s_addr = ((uint32_t *) & sa->in6.sin6_addr)[3];
sa->in.sin_family = AF_INET;
if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr)) {
sa->in.sin_addr.s_addr = ((uint32_t *) & sa->in6.sin6_addr)[3];
sa->in.sin_family = AF_INET;
@@
-256,14
+227,11
@@
void sockaddrunmap(sockaddr_t *sa)
/* Subnet mask handling */
/* Subnet mask handling */
-int maskcmp(const void *va, const void *vb, int masklen)
-{
+int maskcmp(const void *va, const void *vb, int masklen) {
int i, m, result;
const char *a = va;
const char *b = vb;
int i, m, result;
const char *a = va;
const char *b = vb;
- cp();
-
for(m = masklen, i = 0; m >= 8; m -= 8, i++) {
result = a[i] - b[i];
if(result)
for(m = masklen, i = 0; m >= 8; m -= 8, i++) {
result = a[i] - b[i];
if(result)
@@
-277,13
+245,10
@@
int maskcmp(const void *va, const void *vb, int masklen)
return 0;
}
return 0;
}
-void mask(void *va, int masklen, int len)
-{
+void mask(void *va, int masklen, int len) {
int i;
char *a = va;
int i;
char *a = va;
- cp();
-
i = masklen / 8;
masklen %= 8;
i = masklen / 8;
masklen %= 8;
@@
-294,14
+259,11
@@
void mask(void *va, int masklen, int len)
a[i] = 0;
}
a[i] = 0;
}
-void maskcpy(void *va, const void *vb, int masklen, int len)
-{
+void maskcpy(void *va, const void *vb, int masklen, int len) {
int i, m;
char *a = va;
const char *b = vb;
int i, m;
char *a = va;
const char *b = vb;
- cp();
-
for(m = masklen, i = 0; m >= 8; m -= 8, i++)
a[i] = b[i];
for(m = masklen, i = 0; m >= 8; m -= 8, i++)
a[i] = b[i];
@@
-314,13
+276,10
@@
void maskcpy(void *va, const void *vb, int masklen, int len)
a[i] = 0;
}
a[i] = 0;
}
-bool maskcheck(const void *va, int masklen, int len)
-{
+bool maskcheck(const void *va, int masklen, int len) {
int i;
const char *a = va;
int i;
const char *a = va;
- cp();
-
i = masklen / 8;
masklen %= 8;
i = masklen / 8;
masklen %= 8;