--- libelwix/src/net.c 2013/07/08 11:45:01 1.6.4.2 +++ libelwix/src/net.c 2014/11/17 22:38:09 1.10.10.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: net.c,v 1.6.4.2 2013/07/08 11:45:01 misho Exp $ +* $Id: net.c,v 1.10.10.2 2014/11/17 22:38:09 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 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -76,12 +76,15 @@ e_link_ntoa(const struct sockaddr_dl *sdl) firsttime ^= firsttime; else *out++ = ':'; + i = *in++; if (i > 0xf) { out[1] = hexlist[i & 0xf]; i >>= 4; - } else - out[1] = hexlist[0]; + } else { + out[1] = hexlist[i]; + i = 0; + } out[0] = hexlist[i]; out += 2; @@ -106,7 +109,7 @@ e_ether_ntoa(const ether_addr_t * __restrict n, char * return NULL; memset(a, 0, len); - if (snprintf(a, len, "%02x:%02x:%02x:%02x:%02x:%02x", + if (snprintf(a, len, "%02hhx:%02hhx:%02hhx:%02hhx:%02hhx:%02hhx", n->ether_addr_octet[0], n->ether_addr_octet[1], n->ether_addr_octet[2], n->ether_addr_octet[3], n->ether_addr_octet[4], n->ether_addr_octet[5]) < 17) @@ -126,22 +129,20 @@ ether_addr_t * e_ether_aton(const char *a, ether_addr_t * __restrict e) { int i; - u_int o0, o1, o2, o3, o4, o5; if (!a || !e) return NULL; - i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5); + i = sscanf(a, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", + &e->ether_addr_octet[0], + &e->ether_addr_octet[1], + &e->ether_addr_octet[2], + &e->ether_addr_octet[3], + &e->ether_addr_octet[4], + &e->ether_addr_octet[5]); if (i != 6) return NULL; - e->ether_addr_octet[0] = o0; - e->ether_addr_octet[1] = o1; - e->ether_addr_octet[2] = o2; - e->ether_addr_octet[3] = o3; - e->ether_addr_octet[4] = o4; - e->ether_addr_octet[5] = o5; - return e; } @@ -241,10 +242,7 @@ e_gethostbyname(const char *psHost, u_short port, sock if (*psHost != '/') { /* resolver */ - if (!addr->sa.sa_family) - host = gethostbyname(psHost); - else - host = gethostbyname2(psHost, addr->sa.sa_family); + host = gethostbyname2(psHost, !strchr(psHost, ':') ? AF_INET : AF_INET6); if (!host) { elwix_SetErr(EINVAL, "Resolver #%d - %s", h_errno, hstrerror(h_errno)); return NULL; @@ -444,7 +442,7 @@ e_getnet(const char *net) * * @ifname = interface name * @addr = if addr is !=NULL then set this for new address - * return: NULL error or !=NULL get ethernet address + * return: NULL error or !=NULL get ethernet address should be e_free() */ ether_addr_t * e_ether_addr(const char *ifname, ether_addr_t * __restrict addr) @@ -471,4 +469,25 @@ e_ether_addr(const char *ifname, ether_addr_t * __rest freeifaddrs(ifa); return a; +} + +/* + * 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) +{ + struct ifaddrs *ifa; + + if (!szIface || !iflen) + return -1; + + getifaddrs(&ifa); + strlcpy(szIface, ifa->ifa_name, iflen); + freeifaddrs(ifa); + return 0; }