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.35 2002/04/19 14:06:40 guus Exp $
*/
#include "config.h"
#include <netinet/in.h>
#include <stdio.h>
#include <stdlib.h>
+#include <stdint.h>
#include <string.h>
#include <signal.h>
#include <sys/socket.h>
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;
}
}
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;
}
masklen %= 8;
if(masklen)
- a[i++] &= (0x100 - (masklen << 1));
+ a[i++] &= (0x100 - (1 << masklen));
for(; i < len; i++)
a[i] = 0;
if(m)
{
- a[i] = b[i] & (0x100 - (m << 1));
+ a[i] = b[i] & (0x100 - (1 << m));
i++;
}
masklen %= 8;
if(masklen)
- if(a[i++] & ~(0x100 - (masklen << 1)))
+ if(a[i++] & (char)~(0x100 - (1 << masklen)))
return -1;
for(; i < len; i++)