--- libelwix/inc/elwix/anet.h 2018/04/04 01:22:14 1.14.12.1 +++ libelwix/inc/elwix/anet.h 2024/04/15 10:39:49 1.16.30.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: anet.h,v 1.14.12.1 2018/04/04 01:22:14 misho Exp $ +* $Id: anet.h,v 1.16.30.1 2024/04/15 10:39:49 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004 - 2018 +Copyright 2004 - 2020 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -79,7 +79,7 @@ typedef struct { sockaddr_t addr; inaddr_t mask; } netaddr_t; -#define E_CIDRMASK(x) htonl((((1 << (x)) - 1) << (32 - (x))) & 0xFFFFFFFF) +#define E_CIDRMASK(x) htonl((((unsigned int)(((unsigned long)(1 << (x))) - 1) << (32 - (x))) & 0xFFFFFFFF)) /* @@ -226,6 +226,15 @@ sockaddr_t *e_getlinkbyether(const ether_addr_t * __re unsigned char type, const char *iface, sockaddr_t * __restrict addr); #define e_getlinkbymac(_mac, _addr) e_getlinkbyether((_mac), 0, 0, NULL, (_addr)) #endif + +/* + * e_network() - Get network from address string + * + * @csAddr = Address string with CIDR mask /xx + * @net = Network information structure + * return: -1 error, 1 nothing for return or 0 ok + */ +int e_network(const char *csAddr, netaddr_t * __restrict net); #endif