--- libelwix/inc/elwix/anet.h 2015/06/25 00:36:47 1.8.4.1 +++ libelwix/inc/elwix/anet.h 2016/08/11 13:19:16 1.13.2.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: anet.h,v 1.8.4.1 2015/06/25 00:36:47 misho Exp $ +* $Id: anet.h,v 1.13.2.1 2016/08/11 13:19:16 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 - 2015 +Copyright 2004 - 2016 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -58,9 +58,14 @@ 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 { @@ -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 * @@ -210,6 +225,7 @@ sockaddr_t *e_getlinkbyname(const char *psHost, sockad 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