--- libelwix/inc/elwix/anet.h 2016/08/11 13:19:16 1.13.2.1 +++ libelwix/inc/elwix/anet.h 2020/05/27 15:02:33 1.15.26.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: anet.h,v 1.13.2.1 2016/08/11 13:19:16 misho Exp $ +* $Id: anet.h,v 1.15.26.1 2020/05/27 15:02:33 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 - 2016 +Copyright 2004 - 2020 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -68,10 +68,10 @@ typedef union { #define E_SOCKADDR_MAX MIN(sizeof(sockaddr_t), 0xff) typedef union { - union { - in_addr_t s_addr; + struct in4_addr { u_char s4_addr[sizeof(in_addr_t)]; - } in; + } in4; + struct in_addr in; struct in6_addr in6; } inaddr_t; @@ -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