projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update Dutch translation.
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
c12ed93
..
83e19ed
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"
@@
-78,7
+78,7
@@
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;
@@
-225,7
+225,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;
{
int i, m, result;
const char *a = va;
@@
-257,7
+257,7
@@
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;
@@
-275,7
+275,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++;
}