--- libelwix/inc/elwix/anet.h 2013/06/03 11:41:45 1.2.2.2 +++ libelwix/inc/elwix/anet.h 2016/08/02 11:23:31 1.10.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: anet.h,v 1.2.2.2 2013/06/03 11:41:45 misho Exp $ +* $Id: anet.h,v 1.10.2.1 2016/08/02 11:23:31 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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2016 by Michael Pounov . 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,12 +58,17 @@ typedef union { struct sockaddr_un sun; struct sockaddr_in sin; struct sockaddr_in6 sin6; +#ifndef __linux__ struct sockaddr_dl sdl; +#endif } sockaddr_t; #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 +76,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 * @@ -82,7 +86,24 @@ 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 + * + * @mac = ethernet address + * @sdl = link address + * return: -1 error or 0 ok + */ +int e_link_addr(const char *mac, struct sockaddr_dl * __restrict sdl); +/* + * 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); +#endif +/* * e_ether_ntoa() - Convert ethernet address to string * * @n = ethernet address structure, like struct ether_addr @@ -90,7 +111,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 +119,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 * @@ -120,9 +141,9 @@ 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 error or >0 network structure length */ -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_addrcmp() - Compare network addresses @@ -140,7 +161,61 @@ 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: ) + * 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 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); +/* + * e_get1stiface() - Get first interface of host + * + * @szIface = interface string buffer + * @iflen = size of interface buffer + * return: -1 error or 0 ok + */ +int e_get1stiface(char *szIface, int iflen); +#ifndef __linux__ +/* + * e_getifacebyname() - Get interface and make network structure + * + * @psIface = Interface, if =NULL first interface + * @addr = Network address structure + * return: NULL error or !=NULL network structure + */ +sockaddr_t *e_getifacebyname(const char *psIface, sockaddr_t * __restrict addr); +/* + * e_getlinkbyname() - Get host ethernet address and make network structure + * + * @psHost = Host ethernet address + * @addr = Network address structure + * 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 #endif