--- libelwix/inc/elwix/anet.h	2013/06/03 11:41:45	1.2.2.2
+++ libelwix/inc/elwix/anet.h	2013/07/09 00:18:19	1.6
@@ -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.6 2013/07/09 00:18:19 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
  *
@@ -83,6 +85,13 @@ typedef struct {
  */
 int e_usleep(unsigned int usec);
 /*
+ * e_link_ntoa() - String ethernet address from link address
+ *
+ * @sdl = link address
+ * return: =NULL error or !=NULL ethernet address, should be e_free()
+ */
+char *e_link_ntoa(const struct sockaddr_dl *sdl);
+/*
  * e_ether_ntoa() - Convert ethernet address to string
  *
  * @n = ethernet address structure, like struct ether_addr
@@ -90,7 +99,7 @@ int e_usleep(unsigned int usec);
  * @len = string length
  * return: NULL error or !=NULL string a
  */
-char *e_ether_ntoa(const struct e_ether_addr *n, char * __restrict a, int len);
+char *e_ether_ntoa(const ether_addr_t * __restrict n, char * __restrict a, int len);
 /*
  * e_ether_aton() - Convert string to ethernet address
  *
@@ -98,7 +107,7 @@ char *e_ether_ntoa(const struct e_ether_addr *n, char 
  * @e = ethernet address structure, like struct ether_addr
  * return: NULL error or !=NULL ethernet address structure
  */
-struct e_ether_addr *e_ether_aton(const char *a, struct e_ether_addr *e);
+ether_addr_t *e_ether_aton(const char *a, ether_addr_t * __restrict e);
 /*
  * e_n2port() - Extract port from network structure
  *
@@ -140,7 +149,22 @@ 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);
+/*
+ * e_ether_addr() - Get or set ethernet address from interface name
+ *
+ * @ifname = interface name
+ * @addr = if addr is !=NULL then set this for new address
+ * return: NULL error or !=NULL get ethernet address
+ */
+ether_addr_t *e_ether_addr(const char *ifname, ether_addr_t * __restrict addr);
 
 
 #endif