--- libelwix/inc/elwix/anet.h 2013/01/17 10:05:35 1.1.1.1 +++ libelwix/inc/elwix/anet.h 2013/06/03 10:52:28 1.2.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: anet.h,v 1.1.1.1 2013/01/17 10:05:35 misho Exp $ +* $Id: anet.h,v 1.2.2.1 2013/06/03 10:52:28 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -62,14 +62,16 @@ typedef union { } sockaddr_t; #define E_SOCKADDR_INIT { .ss = { 0 } } +#define E_CIDRMASK(x) ((((1 << (x)) - 1) << (32 - (x))) & 0xFFFFFFFF) + /* * e_usleep() - usleep() replacement for ELWIX * * @usec = microseconds for sleep * return: -1 interrupted by signal or 0 ok */ -inline int e_usleep(unsigned int usec); +int e_usleep(unsigned int usec); /* * e_ether_ntoa() - Convert ethernet address to string * @@ -78,7 +80,7 @@ inline int e_usleep(unsigned int usec); * @len = string length * return: NULL error or !=NULL string a */ -inline char *e_ether_ntoa(const struct e_ether_addr *n, char * __restrict a, int len); +char *e_ether_ntoa(const struct e_ether_addr *n, char * __restrict a, int len); /* * e_ether_aton() - Convert string to ethernet address * @@ -86,14 +88,14 @@ inline char *e_ether_ntoa(const struct e_ether_addr *n * @e = ethernet address structure, like struct ether_addr * return: NULL error or !=NULL ethernet address structure */ -inline struct e_ether_addr *e_ether_aton(const char *a, struct e_ether_addr *e); +struct e_ether_addr *e_ether_aton(const char *a, struct e_ether_addr *e); /* * e_n2port() - Extract port from network structure * * @addr = Address * return: 0 not supported family type or port number */ -inline unsigned short e_n2port(sockaddr_t * __restrict addr); +unsigned short e_n2port(sockaddr_t * __restrict addr); /* * e_n2addr() - Extract address from network structure *