--- libelwix/inc/elwix/anet.h 2016/05/14 13:12:43 1.9.4.3 +++ libelwix/inc/elwix/anet.h 2017/01/09 12:53:18 1.14 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: anet.h,v 1.9.4.3 2016/05/14 13:12:43 misho Exp $ +* $Id: anet.h,v 1.14 2017/01/09 12:53:18 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 @@ -60,9 +60,12 @@ typedef union { 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 { @@ -141,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 @@ -173,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); /*