--- libelwix/inc/elwix/anet.h 2016/05/14 19:55:52 1.9.4.4 +++ libelwix/inc/elwix/anet.h 2018/04/04 01:22:14 1.14.12.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: anet.h,v 1.9.4.4 2016/05/14 19:55:52 misho Exp $ +* $Id: anet.h,v 1.14.12.1 2018/04/04 01:22:14 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 - 2016 +Copyright 2004 - 2018 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -60,15 +60,18 @@ 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 { - 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; @@ -141,10 +144,17 @@ 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 *