--- libaitio/src/Attic/tools.c 2012/07/30 11:49:46 1.16.4.1 +++ libaitio/src/Attic/tools.c 2012/11/16 13:28:28 1.18.4.2 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tools.c,v 1.16.4.1 2012/07/30 11:49:46 misho Exp $ +* $Id: tools.c,v 1.18.4.2 2012/11/16 13:28:28 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -303,6 +303,28 @@ io_FreeNullTerm(char *** __restrict arr) } /* + * io_argsNum() Parse and calculate number of arguments + * + * @csArgs = Input arguments line + * @csDelim = Delimiter(s) for separate + * return: 0 error format; -1 error:: can`t read; >0 ok, number of items + */ +inline int +io_argsNum(const char *csArgs, const char *csDelim) +{ + register int res; + char *pos; + + assert(csArgs); + assert(csDelim); + if (!csArgs || !csDelim) + return -1; + + for (res = 1, pos = (char*) csArgs; (pos = strpbrk(pos, csDelim)); res++, pos++); + return res; +} + +/* * io_MakeAV() Parse and make attribute/value pair * * @csArgs = Input argument line @@ -616,4 +638,53 @@ io_gethostbyname(const char *psHost, u_short port, io_ } return NULL; +} + +/* + * io_addrcmp() - Compare network addresses + * + * @a = 1st address + * @b = 2nd address + * @p = compare and ports, if family is AF_INET or AF_INET6 + * return: 0 is equal or !=0 is different + */ +int +io_addrcmp(io_sockaddr_t * __restrict a, io_sockaddr_t * __restrict b, int p) +{ + if (a && b && a->sa.sa_family == b->sa.sa_family) + switch (a->sa.sa_family) { + case AF_LOCAL: + return strcmp(a->sun.sun_path, b->sun.sun_path); + case AF_INET: + if (p && (a->sin.sin_port - b->sin.sin_port)) + return (int) !!(a->sin.sin_port - b->sin.sin_port); + else + return memcmp(&a->sin.sin_addr, &b->sin.sin_addr, + sizeof a->sin.sin_addr); + case AF_INET6: + if (p && (a->sin6.sin6_port - b->sin6.sin6_port)) + return (int) !!(a->sin6.sin6_port - b->sin6.sin6_port); + else + return memcmp(&a->sin6.sin6_addr, &b->sin6.sin6_addr, + sizeof a->sin6.sin6_addr); + case AF_LINK: + return memcmp(&a->sdl.sdl_data, &b->sdl.sdl_data, + sizeof a->sdl.sdl_data); + } + + return (int) !!(a - b); +} + +/* + * io_usleep() - usleep() replacement for ELWIX + * + * @usec = microseconds for sleep + * return: -1 interrupted by signal or 0 ok + */ +inline int +io_usleep(u_int usec) +{ + struct timeval tv = { (time_t) (usec / 1000000), (long) (usec % 1000000) }; + + return select(0, NULL, NULL, NULL, &tv); }