projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Native Windows support.
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
c977316
..
1ec6e5a
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
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,84
+17,62
@@
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.
44 2002/09/09 22:32:44
guus Exp $
+ $Id: netutl.c,v 1.12.4.
50 2003/07/29 22:59:00
guus Exp $
*/
*/
-#include "config.h"
-
-#include <fcntl.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <stdio.h>
-#include <stdlib.h>
-#ifdef HAVE_INTTYPES_H
-#include <inttypes.h>
-#endif
-#include <string.h>
-#include <signal.h>
-#include <sys/socket.h>
-#include <syslog.h>
-#include <arpa/inet.h>
-
-#include <utils.h>
-#include <xalloc.h>
-
-#include "errno.h"
-#include "conf.h"
+#include "system.h"
+
#include "net.h"
#include "netutl.h"
#include "net.h"
#include "netutl.h"
+#include "logger.h"
+#include "utils.h"
+#include "xalloc.h"
-#include "system.h"
-
-int hostnames = 0;
+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(c
har *address,
char *service, int socktype)
+struct addrinfo *str2addrinfo(c
onst char *address, const
char *service, int socktype)
{
{
- struct addrinfo hint, *ai;
+ struct addrinfo *ai;
+ struct addrinfo hint = {
+ .ai_family = addressfamily,
+ .ai_socktype = socktype,
+ };
int err;
cp();
int err;
cp();
- memset(&hint, 0, sizeof(hint));
-
- hint.ai_family = addressfamily;
- hint.ai_socktype = socktype;
-
err = getaddrinfo(address, service, &hint, &ai);
if(err) {
err = getaddrinfo(address, service, &hint, &ai);
if(err) {
- if(debug_lvl >= DEBUG_ERROR)
- syslog(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address,
+ logger(LOG_WARNING, _("Error looking up %s port %s: %s\n"), address,
service, gai_strerror(err));
service, gai_strerror(err));
- cp_trace();
return NULL;
}
return ai;
}
return NULL;
}
return ai;
}
-sockaddr_t str2sockaddr(c
har *address,
char *port)
+sockaddr_t str2sockaddr(c
onst char *address, const
char *port)
{
{
- struct addrinfo hint, *ai;
+ struct addrinfo *ai;
+ struct addrinfo hint = {
+ .ai_family = AF_UNSPEC,
+ .ai_flags = AI_NUMERICHOST,
+ .ai_socktype = SOCK_STREAM,
+ };
sockaddr_t result;
int err;
cp();
sockaddr_t result;
int err;
cp();
- memset(&hint, 0, sizeof(hint));
-
- hint.ai_family = AF_UNSPEC;
- hint.ai_flags = AI_NUMERICHOST;
- hint.ai_socktype = SOCK_STREAM;
-
err = getaddrinfo(address, port, &hint, &ai);
if(err || !ai) {
err = getaddrinfo(address, port, &hint, &ai);
if(err || !ai) {
-
syslog
(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port,
+
logger
(LOG_ERR, _("Error looking up %s port %s: %s\n"), address, port,
gai_strerror(err));
cp_trace();
raise(SIGFPE);
gai_strerror(err));
cp_trace();
raise(SIGFPE);
@@
-107,7
+85,7
@@
sockaddr_t str2sockaddr(char *address, char *port)
return result;
}
return result;
}
-void sockaddr2str(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 address[NI_MAXHOST];
char port[NI_MAXSERV];
@@
-119,7
+97,7
@@
void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr)
err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
if(err) {
err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
if(err) {
-
syslog
(LOG_ERR, _("Error while translating addresses: %s"),
+
logger
(LOG_ERR, _("Error while translating addresses: %s"),
gai_strerror(err));
cp_trace();
raise(SIGFPE);
gai_strerror(err));
cp_trace();
raise(SIGFPE);
@@
-135,7
+113,7
@@
void sockaddr2str(sockaddr_t *sa, char **addrstr, char **portstr)
*portstr = xstrdup(port);
}
*portstr = xstrdup(port);
}
-char *sockaddr2hostname(sockaddr_t *sa)
+char *sockaddr2hostname(
const
sockaddr_t *sa)
{
char *str;
char address[NI_MAXHOST] = "unknown";
{
char *str;
char address[NI_MAXHOST] = "unknown";
@@
-147,7
+125,7
@@
char *sockaddr2hostname(sockaddr_t *sa)
err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port),
hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
if(err) {
err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port),
hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
if(err) {
-
syslog
(LOG_ERR, _("Error while looking up hostname: %s"),
+
logger
(LOG_ERR, _("Error while looking up hostname: %s"),
gai_strerror(err));
}
gai_strerror(err));
}
@@
-156,7
+134,7
@@
char *sockaddr2hostname(sockaddr_t *sa)
return str;
}
return str;
}
-int sockaddrcmp(
sockaddr_t *a,
sockaddr_t *b)
+int sockaddrcmp(
const sockaddr_t *a, const
sockaddr_t *b)
{
int result;
{
int result;
@@
-188,7
+166,7
@@
int sockaddrcmp(sockaddr_t *a, sockaddr_t *b)
return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof(a->in6.sin6_port));
default:
return memcmp(&a->in6.sin6_port, &b->in6.sin6_port, sizeof(a->in6.sin6_port));
default:
-
syslog
(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);
cp_trace();
raise(SIGFPE);
a->sa.sa_family);
cp_trace();
raise(SIGFPE);
@@
-206,11
+184,11
@@
void sockaddrunmap(sockaddr_t *sa)
/* Subnet mask handling */
/* Subnet mask handling */
-int maskcmp(
void *va,
void *vb, int masklen, int len)
+int maskcmp(
const void *va, const
void *vb, int masklen, int len)
{
int i, m, result;
{
int i, m, result;
- char *a = va;
- char *b = vb;
+ c
onst c
har *a = va;
+ c
onst c
har *b = vb;
cp();
cp();
@@
-244,11
+222,11
@@
void mask(void *va, int masklen, int len)
a[i] = 0;
}
a[i] = 0;
}
-void maskcpy(void *va, void *vb, int masklen, int len)
+void maskcpy(void *va,
const
void *vb, int masklen, int len)
{
int i, m;
char *a = va;
{
int i, m;
char *a = va;
- char *b = vb;
+ c
onst c
har *b = vb;
cp();
cp();
@@
-264,10
+242,10
@@
void maskcpy(void *va, void *vb, int masklen, int len)
a[i] = 0;
}
a[i] = 0;
}
-
int maskcheck(
void *va, int masklen, int len)
+
bool maskcheck(const
void *va, int masklen, int len)
{
int i;
{
int i;
- char *a = va;
+ c
onst c
har *a = va;
cp();
cp();
@@
-275,11
+253,11
@@
int maskcheck(void *va, int masklen, int len)
masklen %= 8;
if(masklen && a[i++] & (0xff >> masklen))
masklen %= 8;
if(masklen && a[i++] & (0xff >> masklen))
- return
-1
;
+ return
false
;
for(; i < len; i++)
if(a[i] != 0)
for(; i < len; i++)
if(a[i] != 0)
- return
-2
;
+ return
false
;
- return
0
;
+ return
true
;
}
}