--- libelwix/src/net.c 2016/08/02 11:25:58 1.14 +++ libelwix/src/net.c 2020/05/27 15:03:28 1.21 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: net.c,v 1.14 2016/08/02 11:25:58 misho Exp $ +* $Id: net.c,v 1.21 2020/05/27 15:03:28 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 - 2020 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -49,6 +49,88 @@ SUCH DAMAGE. #ifndef __linux__ static char hexlist[] = "0123456789abcdef"; +#ifndef HAVE_LINK_ADDR + +/* States*/ +#define NAMING 0 +#define GOTONE 1 +#define GOTTWO 2 +#define RESET 3 +/* Inputs */ +#define DIGIT (4*0) +#define END (4*1) +#define DELIM (4*2) +#define LETTER (4*3) + +void +link_addr(const char *addr, struct sockaddr_dl *sdl) +{ + char *cp = sdl->sdl_data; + char *cplim = sdl->sdl_len + (char *)sdl; + int byte = 0, state = NAMING, new = 0; + + bzero((char *)&sdl->sdl_family, sdl->sdl_len - 1); + sdl->sdl_family = AF_LINK; + do { + state &= ~LETTER; + if ((*addr >= '0') && (*addr <= '9')) { + new = *addr - '0'; + } else if ((*addr >= 'a') && (*addr <= 'f')) { + new = *addr - 'a' + 10; + } else if ((*addr >= 'A') && (*addr <= 'F')) { + new = *addr - 'A' + 10; + } else if (*addr == 0) { + state |= END; + } else if (state == NAMING && + (((*addr >= 'A') && (*addr <= 'Z')) || + ((*addr >= 'a') && (*addr <= 'z')))) + state |= LETTER; + else + state |= DELIM; + addr++; + switch (state /* | INPUT */) { + case NAMING | DIGIT: + case NAMING | LETTER: + *cp++ = addr[-1]; + continue; + case NAMING | DELIM: + state = RESET; + sdl->sdl_nlen = cp - sdl->sdl_data; + continue; + case GOTTWO | DIGIT: + *cp++ = byte; + /* FALLTHROUGH */ + case RESET | DIGIT: + state = GOTONE; + byte = new; + continue; + case GOTONE | DIGIT: + state = GOTTWO; + byte = new + (byte << 4); + continue; + default: /* | DELIM */ + state = RESET; + *cp++ = byte; + byte = 0; + continue; + case GOTONE | END: + case GOTTWO | END: + *cp++ = byte; + /* FALLTHROUGH */ + case RESET | END: + break; + } + break; + } while (cp < cplim); + sdl->sdl_alen = cp - LLADDR(sdl); + new = cp - (char *)sdl; + if (new > sizeof(*sdl)) + sdl->sdl_len = new; + return; +} +#endif + + /* * e_link_ntoa() - String ethernet address from link address * @@ -256,7 +338,7 @@ e_n2addr(sockaddr_t * __restrict addr, ait_val_t * __r * @psHost = Hostname * @port = Port * @addr = Network address structure - * return: 0 error or >0 network structure length + * return: 0 is error or >0 length of network structure */ socklen_t e_gethostbyname(const char *psHost, u_short port, sockaddr_t * __restrict addr) @@ -316,6 +398,34 @@ e_gethostbyname(const char *psHost, u_short port, sock } /* + * 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) +{ + if (!addr) + return 0; + + switch (addr->sa.sa_family) { + case AF_INET: + return sizeof addr->sin; + case AF_INET6: + return sizeof addr->sin6; + case AF_LOCAL: + return sizeof addr->sun; +#ifndef __linux__ + case AF_LINK: + return sizeof addr->sdl; +#endif + } + + return E_SOCKADDR_MAX; +} + +/* * e_addrcmp() - Compare network addresses * * @a = 1st address @@ -388,8 +498,8 @@ e_innet(netaddr_t * __restrict net, inaddr_t * __restr case AF_INET: for (i = 0; i < sizeof(struct in_addr); i++) { ret = ((caddr_t) &net->addr.sin.sin_addr.s_addr)[i] & - net->mask.in.s4_addr[i]; - ret -= addr->in.s4_addr[i] & net->mask.in.s4_addr[i]; + net->mask.in4.s4_addr[i]; + ret -= addr->in4.s4_addr[i] & net->mask.in4.s4_addr[i]; if (ret) break; } @@ -453,7 +563,7 @@ e_getnet(const char *net) #endif n->addr.sin.sin_family = host->h_addrtype; memcpy(&n->addr.sin.sin_addr, host->h_addr, sizeof n->addr.sin.sin_addr); - if (wrk) + if (wrk && strtol(wrk, NULL, 10) != 32) n->mask.in.s_addr = E_CIDRMASK(strtol(wrk, NULL, 10)); else n->mask.in.s_addr = 0xFFFFFFFF; @@ -668,3 +778,72 @@ e_getlinkbyether(const ether_addr_t * __restrict mac, return a; } #endif + +/* + * e_network() - Get network from address string + * + * @csAddr = Address string with CIDR mask /xx + * @net = Network information structure + * return: -1 error, 1 nothing for return or 0 ok + */ +int +e_network(const char *csAddr, netaddr_t * __restrict net) +{ + int ret = 0; + u_char mask = 0; + inaddr_t a; + char *pos, szAddr[STRSIZ]; + register int i; + + if (!csAddr || !net) + return -1; + else + strlcpy(szAddr, csAddr, sizeof szAddr); + + memset(net, 0, sizeof(netaddr_t)); + + pos = strrchr(szAddr, '/'); + if (pos) { + *pos++ = 0; + mask = (u_char) strtol(pos, NULL, 10); + } else + return 1; + + if (strchr(szAddr, ':')) { + if (mask > 128) + return -1; + else { + for (i = 0; i < 4 && (mask / 32); i++, mask -= 32) + net->mask.in6.__u6_addr.__u6_addr32[i] = 0xFFFFFFFF; + if (mask) + net->mask.in6.__u6_addr.__u6_addr32[i] = E_CIDRMASK(mask % 32); + } + + inet_pton(AF_INET6, szAddr, &a.in6); + +#ifndef __linux__ + net->addr.sin6.sin6_len = sizeof net->addr.sin6; +#endif + for (i = 0; i < 4; i++) + net->addr.sin6.sin6_addr.__u6_addr.__u6_addr32[i] = + a.in6.__u6_addr.__u6_addr32[i] & net->mask.in6.__u6_addr.__u6_addr32[i]; + } else { + if (mask > 32) + return -1; + else { + if (mask == 32) + net->mask.in.s_addr = 0xFFFFFFFF; + else + net->mask.in.s_addr = E_CIDRMASK(mask); + } + + inet_pton(AF_INET, szAddr, &a.in4); + +#ifndef __linux__ + net->addr.sin.sin_len = sizeof net->addr.sin; +#endif + net->addr.sin.sin_addr.s_addr = a.in.s_addr & net->mask.in.s_addr; + } + + return ret; +}