projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This should work much better.
[tinc]
/
src
/
netutl.c
diff --git
a/src/netutl.c
b/src/netutl.c
index
95a168c
..
4d91bf4
100644
(file)
--- a/
src/netutl.c
+++ b/
src/netutl.c
@@
-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.
29 2002/03/17 15:59:29 guus
Exp $
+ $Id: netutl.c,v 1.12.4.
37 2002/06/07 11:14:05 wsl
Exp $
*/
#include "config.h"
*/
#include "config.h"
@@
-27,6
+27,9
@@
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
+#ifndef HAVE_NETBSD
+ #include <stdint.h>
+#endif
#include <string.h>
#include <signal.h>
#include <sys/socket.h>
#include <string.h>
#include <signal.h>
#include <sys/socket.h>
@@
-173,9
+176,9
@@
cp
void sockaddrunmap(sockaddr_t *sa)
{
void sockaddrunmap(sockaddr_t *sa)
{
- if(IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr))
+ if(
sa->sa.sa_family == AF_INET6 &&
IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr))
{
{
- sa->in.sin_addr.s_addr =
sa->in6.sin6_addr.s6_addr32
[3];
+ sa->in.sin_addr.s_addr =
((uint32_t *)&sa->in6.sin6_addr)
[3];
sa->in.sin_family = AF_INET;
}
}
sa->in.sin_family = AF_INET;
}
}
@@
-191,7
+194,7
@@
cp
return result;
if(m)
return result;
if(m)
- return (a[i] & (0x100 - (
m << 1))) - (b[i] & (0x100 - (m << 1
)));
+ return (a[i] & (0x100 - (
1 << (8 - m)))) - (b[i] & (0x100 - (1 << (8 - m)
)));
return 0;
}
return 0;
}
@@
-204,7
+207,7
@@
cp
masklen %= 8;
if(masklen)
masklen %= 8;
if(masklen)
- a[i++] &= (0x100 - (
masklen << 1
));
+ a[i++] &= (0x100 - (
1 << masklen
));
for(; i < len; i++)
a[i] = 0;
for(; i < len; i++)
a[i] = 0;
@@
-219,7
+222,7
@@
cp
if(m)
{
if(m)
{
- a[i] = b[i] & (0x100 - (
m << 1
));
+ a[i] = b[i] & (0x100 - (
1 << m
));
i++;
}
i++;
}
@@
-233,14
+236,13
@@
int maskcheck(char *a, int masklen, int len)
cp
i = masklen / 8;
masklen %= 8;
cp
i = masklen / 8;
masklen %= 8;
-
- if(masklen)
- if(a[i++] & ~(0x100 - (masklen << 1)))
- return -1;
-
+
+ if(a[i++] & (0xff >> masklen))
+ return -1;
+
for(; i < len; i++)
if(a[i] != 0)
for(; i < len; i++)
if(a[i] != 0)
- return -
1
;
+ return -
2
;
return 0;
}
return 0;
}