--- libelwix/src/net.c 2013/07/08 01:11:34 1.6.4.1 +++ libelwix/src/net.c 2014/01/29 14:11:45 1.8.12.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: net.c,v 1.6.4.1 2013/07/08 01:11:34 misho Exp $ +* $Id: net.c,v 1.8.12.1 2014/01/29 14:11:45 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; @@ -100,13 +103,13 @@ e_link_ntoa(const struct sockaddr_dl *sdl) * return: NULL error or !=NULL string a */ char * -e_ether_ntoa(const struct e_ether_addr *n, char * __restrict a, int len) +e_ether_ntoa(const ether_addr_t * __restrict n, char * __restrict a, int len) { if (!n || !a) 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) @@ -122,26 +125,24 @@ e_ether_ntoa(const struct e_ether_addr *n, char * __re * @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) { 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; } @@ -462,8 +463,8 @@ e_ether_addr(const char *ifname, ether_addr_t * __rest memset(a, 0, sizeof(ether_addr_t)); getifaddrs(&ifa); - for (p = ifa; p; p++) - if (!strcmp(p->ifa_name, ifname) && p->ifa_addr && + for (p = ifa; p && p->ifa_name; p++) + if (p->ifa_name && !strcmp(p->ifa_name, ifname) && p->ifa_addr && p->ifa_addr->sa_family == AF_LINK) { memcpy(a, LLADDR((struct sockaddr_dl*) p->ifa_addr), sizeof(ether_addr_t)); break;