--- libelwix/inc/elwix/anet.h 2013/05/30 09:07:33 1.2 +++ libelwix/inc/elwix/anet.h 2013/06/03 14:00:26 1.3 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: anet.h,v 1.2 2013/05/30 09:07:33 misho Exp $ +* $Id: anet.h,v 1.3 2013/06/03 14:00:26 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -62,7 +62,21 @@ typedef union { } sockaddr_t; #define E_SOCKADDR_INIT { .ss = { 0 } } +typedef union { + union { + in_addr_t s_addr; + u_char s4_addr[sizeof(in_addr_t)]; + } in; + struct in6_addr in6; +} inaddr_t; +typedef struct { + sockaddr_t addr; + inaddr_t mask; +} netaddr_t; +#define E_CIDRMASK(x) htonl((((1 << (x)) - 1) << (32 - (x))) & 0xFFFFFFFF) + + /* * e_usleep() - usleep() replacement for ELWIX * @@ -121,6 +135,14 @@ sockaddr_t *e_gethostbyname(const char *psHost, unsign * return: 0 is equal or !=0 is different */ int e_addrcmp(sockaddr_t * __restrict a, sockaddr_t * __restrict b, int p); +/* + * e_innet() - Test address match in network + * + * @net = network + * @addr = address + * return: -1 error, 0 match or 1 not match + */ +int e_innet(netaddr_t * __restrict net, inaddr_t * __restrict addr); #endif