projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move RSA key generation into the wrappers.
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
c12ed93
..
116d858
100644
(file)
--- a/
src/netutl.c
+++ b/
src/netutl.c
@@
-1,7
+1,7
@@
/*
netutl.c -- some supporting network utility code
/*
netutl.c -- some supporting network utility code
- Copyright (C) 1998-200
3 Ivo Timmermans <ivo@o2w.nl>
- 2000-200
3 Guus Sliepen <guus@sliepen.eu
.org>
+ Copyright (C) 1998-200
5 Ivo Timmermans
+ 2000-200
6 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
@@
-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
: netutl.c,v 1.12.4.54 2003/08/22 15:03:59 guus Exp
$
+ $Id$
*/
#include "system.h"
*/
#include "system.h"
@@
-34,8
+34,7
@@
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;
@@
-55,8
+54,7
@@
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;
@@
-78,14
+76,13
@@
sockaddr_t str2sockaddr(const char *address, const char *port)
return result;
}
return result;
}
-
result = *(sockaddr_t *) ai->ai_addr
;
+
memcpy(&result, ai->ai_addr, ai->ai_addrlen)
;
freeaddrinfo(ai);
return result;
}
freeaddrinfo(ai);
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;
char address[NI_MAXHOST];
char port[NI_MAXSERV];
char *scopeid;
@@
-99,7
+96,7
@@
void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr)
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) {
logger(LOG_ERR, _("Error while translating addresses: %s"),
if(err) {
logger(LOG_ERR, _("Error while translating addresses: %s"),
@@
-118,8
+115,7
@@
void sockaddr2str(const sockaddr_t *sa, char **addrstr, char **portstr)
*portstr = xstrdup(port);
}
*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";
char *str;
char address[NI_MAXHOST] = "unknown";
char port[NI_MAXSERV] = "unknown";
@@
-132,7
+128,7
@@
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) {
logger(LOG_ERR, _("Error while looking up hostname: %s"),
hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
if(err) {
logger(LOG_ERR, _("Error while looking up hostname: %s"),
@@
-144,8
+140,7
@@
char *sockaddr2hostname(const sockaddr_t *sa)
return str;
}
return str;
}
-int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b)
-{
+int sockaddrcmp(const sockaddr_t *a, const sockaddr_t *b) {
int result;
cp();
int result;
cp();
@@
-168,20
+163,20
@@
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:
logger(LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"),
default:
logger(LOG_ERR, _("sockaddrcmp() was called with unknown address family %d, exitting!"),
@@
-213,8
+208,7
@@
void sockaddrfree(sockaddr_t *a) {
}
}
}
}
-void sockaddrunmap(sockaddr_t *sa)
-{
+void sockaddrunmap(sockaddr_t *sa) {
cp();
if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr)) {
cp();
if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr)) {
@@
-225,8
+219,7
@@
void sockaddrunmap(sockaddr_t *sa)
/* Subnet mask handling */
/* Subnet mask handling */
-int maskcmp(const void *va, const void *vb, int masklen, int len)
-{
+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;
@@
-246,8
+239,7
@@
int maskcmp(const void *va, const void *vb, int masklen, int len)
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;
@@
-257,14
+249,13
@@
void mask(void *va, int masklen, int len)
masklen %= 8;
if(masklen)
masklen %= 8;
if(masklen)
- a[i++] &= (0x100 - (1 <<
masklen
));
+ a[i++] &= (0x100 - (1 <<
(8 - masklen)
));
for(; i < len; i++)
a[i] = 0;
}
for(; i < len; i++)
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;
@@
-275,7
+266,7
@@
void maskcpy(void *va, const void *vb, int masklen, int len)
a[i] = b[i];
if(m) {
a[i] = b[i];
if(m) {
- a[i] = b[i] & (0x100 - (1 <<
m
));
+ a[i] = b[i] & (0x100 - (1 <<
(8 - m)
));
i++;
}
i++;
}
@@
-283,8
+274,7
@@
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;