--- libelwix/inc/elwix/anet.h	2014/11/26 00:30:36	1.7.16.4
+++ libelwix/inc/elwix/anet.h	2024/04/15 10:39:49	1.16.30.1
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: anet.h,v 1.7.16.4 2014/11/26 00:30:36 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 <info@elwix.org>
 
-Copyright 2004 - 2014
+Copyright 2004 - 2020
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -48,7 +48,7 @@ SUCH DAMAGE.
 
 
 struct e_ether_addr {
-	u_int8_t ether_addr_octet[6];
+	u_int8_t octet[6];
 };
 typedef struct e_ether_addr ether_addr_t;
 
@@ -58,15 +58,20 @@ typedef union {
 	struct sockaddr_un	sun;
 	struct sockaddr_in	sin;
 	struct sockaddr_in6	sin6;
+#ifndef __linux__
 	struct sockaddr_dl	sdl;
+#else
+	struct sockaddr_ll	sll;
+#endif
 } sockaddr_t;
 #define E_SOCKADDR_INIT	{ .ss = { 0 } }
+#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;
 
@@ -74,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))
 
 
 /*
@@ -84,6 +89,7 @@ typedef struct {
  * return: -1 interrupted by signal or 0 ok
  */
 int e_usleep(unsigned int usec);
+#ifndef __linux__
 /*
  * e_link_addr() - String ethernet address to link address
  *
@@ -99,6 +105,7 @@ int e_link_addr(const char *mac, struct sockaddr_dl * 
  * return: =NULL error or !=NULL ethernet address, should be e_free()
  */
 char *e_link_ntoa(const struct sockaddr_dl *sdl);
+#endif
 /*
  * e_ether_ntoa() - Convert ethernet address to string
  *
@@ -137,11 +144,18 @@ const char *e_n2addr(sockaddr_t * __restrict addr, ait
  * @psHost = Hostname
  * @port = Port
  * @addr = Network address structure
- * return: NULL error or !=NULL network structure
+ * return: 0 is error or >0 length of network structure
  */
-sockaddr_t *e_gethostbyname(const char *psHost, unsigned short port, 
+socklen_t e_gethostbyname(const char *psHost, unsigned short port, 
 		sockaddr_t * __restrict addr);
 /*
+ * e_addrlen() - Get address length from network structure
+ *
+ * @addr = address
+ * return: 0 is error or >0 length of network structure
+ */
+socklen_t e_addrlen(const sockaddr_t *addr);
+/*
  * e_addrcmp() - Compare network addresses
  *
  * @a = 1st address
@@ -169,8 +183,8 @@ 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 should be e_free()
+ * @addr = if addr is !=NULL then set new ethernet address
+ * return: NULL error or !=NULL get current ethernet address should be e_free()
  */
 ether_addr_t *e_ether_addr(const char *ifname, ether_addr_t * __restrict addr);
 /*
@@ -181,6 +195,7 @@ ether_addr_t *e_ether_addr(const char *ifname, ether_a
  * return: -1 error or 0 ok
  */
 int e_get1stiface(char *szIface, int iflen);
+#ifndef __linux__
 /*
  * e_getifacebyname() - Get interface and make network structure
  *
@@ -197,6 +212,29 @@ sockaddr_t *e_getifacebyname(const char *psIface, sock
  * return: NULL error or !=NULL network structure
  */
 sockaddr_t *e_getlinkbyname(const char *psHost, sockaddr_t * __restrict addr);
+/*
+ * e_getlinkbyether() - Get ethernet address and make network structure
+ *
+ * @mac = Ethernet address
+ * @idx = Interface index
+ * @type = Interface type
+ * @iface = Interface name
+ * @addr = Network address structure
+ * return: NULL error or !=NULL network structure
+ */
+sockaddr_t *e_getlinkbyether(const ether_addr_t * __restrict mac, unsigned short idx, 
+		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