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.27 2002/02/20 22:37:38 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>
{
char address[NI_MAXHOST];
char port[NI_MAXSERV];
+ char *scopeid;
int err;
cp
if((err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST|NI_NUMERICSERV)))
exit(0);
}
+#ifdef HAVE_LINUX
+ if((scopeid = strchr(address, '%')))
+ *scopeid = '\0'; /* Descope. */
+#endif
+
*addrstr = xstrdup(address);
*portstr = xstrdup(port);
cp
case AF_UNSPEC:
return 0;
case AF_INET:
- return memcmp(&a->in, &b->in, sizeof(a->in));
+ result = memcmp(&a->in.sin_addr, &b->in.sin_addr, sizeof(a->in.sin_addr));
+ if(result)
+ return result;
+ return memcmp(&a->in.sin_port, &b->in.sin_port, sizeof(a->in.sin_port));
case AF_INET6:
- return memcmp(&a->in6, &b->in6, sizeof(a->in6));
+ result = memcmp(&a->in6.sin6_addr, &b->in6.sin6_addr, sizeof(a->in6.sin6_addr));
+ if(result)
+ return result;
+ 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!"), a->sa.sa_family);
cp_trace();
cp
}
+void sockaddrunmap(sockaddr_t *sa)
+{
+ if(sa->sa.sa_family == AF_INET6 && IN6_IS_ADDR_V4MAPPED(&sa->in6.sin6_addr))
+ {
+ sa->in.sin_addr.s_addr = ((uint32_t *)&sa->in6.sin6_addr)[3];
+ sa->in.sin_family = AF_INET;
+ }
+}
+
/* Subnet mask handling */
int maskcmp(char *a, char *b, int masklen, int len)
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++)