--- libelwix/inc/elwix/anet.h	2013/06/03 11:41:45	1.2.2.2
+++ libelwix/inc/elwix/anet.h	2013/06/03 22:25:09	1.3.2.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: anet.h,v 1.2.2.2 2013/06/03 11:41:45 misho Exp $
+* $Id: anet.h,v 1.3.2.1 2013/06/03 22:25:09 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -63,7 +63,10 @@ typedef union {
 #define E_SOCKADDR_INIT	{ .ss = { 0 } }
 
 typedef union {
-	struct in_addr	in;
+	union {
+		in_addr_t	s_addr;
+		u_char		s4_addr[sizeof(in_addr_t)];
+	}		in;
 	struct in6_addr	in6;
 } inaddr_t;
 
@@ -71,10 +74,9 @@ 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)	((((1 << (x)) - 1) << (32 - (x))) & 0xFFFFFFFF)
 
-
 /*
  * e_usleep() - usleep() replacement for ELWIX
  *
@@ -140,7 +142,14 @@ int e_addrcmp(sockaddr_t * __restrict a, sockaddr_t * 
  * @addr = address
  * return: -1 error, 0 match or 1 not match
  */
-int e_innet(netaddr_t * __restrict net, netaddr_t * __restrict addr);
+int e_innet(netaddr_t * __restrict net, inaddr_t * __restrict addr);
+/*
+ * e_getnet() - Get network from string
+ *
+ * @net = Network string (format: <net[/cidr]>)
+ * return: NULL error or !=NULL network should be e_free()
+ */
+netaddr_t *e_getnet(const char *net);
 
 
 #endif