--- libaitio/src/Attic/tools.c 2012/05/14 12:49:21 1.11 +++ libaitio/src/Attic/tools.c 2012/11/19 21:12:03 1.19 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: tools.c,v 1.11 2012/05/14 12:49:21 misho Exp $ +* $Id: tools.c,v 1.19 2012/11/19 21:12:03 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -123,7 +123,7 @@ io_UnquotStr(char * __restrict psLine) return 0; if (*psLine == '"' || *psLine == '\'') { - str = strdup(psLine + 1); + str = io_strdup(psLine + 1); for (pos = str, flg = 0; *pos; flg = ('\\' == *pos), pos++) { if (!flg && *pos == *psLine) { *pos = 0; @@ -131,7 +131,7 @@ io_UnquotStr(char * __restrict psLine) break; } } - free(str); + io_free(str); return 1; } @@ -143,7 +143,7 @@ io_UnquotStr(char * __restrict psLine) * * @psLine = Text string * @lineLen = Length of Text string - * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be free) + * return: NULL nothing to do or error; !=0 Allocated new converted data without term\0 (must be io_free) */ inline u_char * io_Ch2Hex(u_char *psLine, int lineLen) @@ -155,7 +155,7 @@ io_Ch2Hex(u_char *psLine, int lineLen) if (!psLine || !*psLine || !lineLen) return NULL; - str = malloc(lineLen / 2); + str = io_malloc(lineLen / 2); if (!str) { LOGERR; return NULL; @@ -176,7 +176,7 @@ io_Ch2Hex(u_char *psLine, int lineLen) * * @psLine = Text string * @lineLen = Length of Text string - * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free) + * return: NULL nothing to do or error; !=0 Allocated new converted string(must be io_free) */ inline char * io_Hex2Ch(u_char *psLine, int lineLen) @@ -187,7 +187,7 @@ io_Hex2Ch(u_char *psLine, int lineLen) if (!psLine || !*psLine || !lineLen) return NULL; - str = malloc(lineLen * 2 + 1); + str = io_malloc(lineLen * 2 + 1); if (!str) { LOGERR; return NULL; @@ -207,7 +207,7 @@ io_Hex2Ch(u_char *psLine, int lineLen) * io_CopyEnv() - Copy environment to new environment array; * * @oldenv = Environment array - * return: NULL error; !=NULL Allocated new environment array(must be free) + * return: NULL error; !=NULL Allocated new environment array(must be io_free) */ char ** io_CopyEnv(const char **oldenv) @@ -226,7 +226,7 @@ io_CopyEnv(const char **oldenv) num++; /* create and copy new environment */ - newenv = calloc(num + 1, sizeof(char*)); + newenv = io_calloc(num + 1, sizeof(char*)); if (!newenv) { LOGERR; return NULL; @@ -235,7 +235,7 @@ io_CopyEnv(const char **oldenv) for (i = 0; oldenv[i]; i++) if (*strchr(oldenv[i], '=')) { - *el = strdup(oldenv[i]); + *el = io_strdup(oldenv[i]); el++; } *el = NULL; @@ -248,7 +248,7 @@ io_CopyEnv(const char **oldenv) * * @psProg = Program name for execute * @oldarg = Arguments array - * return: NULL error; !=NULL Allocated execution array(must be free) + * return: NULL error; !=NULL Allocated execution array(must be io_free) */ char ** io_ExecArgs(const char *psProg, const char **oldarg) @@ -265,18 +265,18 @@ io_ExecArgs(const char *psProg, const char **oldarg) for (num = 0; oldarg[num]; num++); /* create and copy new arguments */ - newarg = calloc(num + 2, sizeof(char*)); + newarg = io_calloc(num + 2, sizeof(char*)); if (!newarg) { LOGERR; return NULL; } else el = newarg; - *el = strdup(psProg); + *el = io_strdup(psProg); el++; for (i = 0; oldarg[i]; i++, el++) - *el = strdup(oldarg[i]); + *el = io_strdup(oldarg[i]); *el = NULL; return newarg; @@ -296,13 +296,120 @@ io_FreeNullTerm(char *** __restrict arr) if (arr && *arr) { a = *arr; while (a && *a) - free(*a++); - free(*arr); + io_free(*a++); + io_free(*arr); *arr = NULL; } } /* + * 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 + * @csDelim = Delimiter for separate + * @psAttr = Output Attribute + * @attrLen = Size of attribute array + * @psValue = Output Value, if ==NULL this element not present value or not wanted for return + * @valLen = Size of value array + * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items +*/ +int +io_MakeAV(const char * __restrict csArgs, const char *csDelim, + char * __restrict psAttr, int attrLen, char * __restrict psValue, int valLen) +{ + register int ret = 0; + char *pos, *psBuf; + + if (!csArgs || !csDelim || !psAttr || !attrLen) + return -1; + if (psValue && !valLen) + return -1; + else + memset(psValue, 0, valLen); + psBuf = io_strdup(csArgs); + if (!psBuf) { + LOGERR; + return -1; + } + + pos = strpbrk(psBuf, csDelim); + if (pos) + *pos++ = 0; + ret++; + strlcpy(psAttr, psBuf, attrLen); + + if (pos && *pos) { + ret++; + if (psValue) + strlcpy(psValue, pos, valLen); + } + + io_free(psBuf); + return ret; +} + +/* + * io_MakeAV2() Parse and make attribute/value pair over input string + * + * @csArgs = Input argument line, will be modified! + * @csDelim = Delimiter for separate + * @psAttr = Output Attribute + * @psValue = Output Value, if ==NULL this element not present value or not wanted for return + * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items +*/ +int +io_MakeAV2(char * __restrict psArgs, const char *csDelim, + char ** __restrict psAttr, char ** __restrict psValue) +{ + register int ret = 0; + char *pos; + + if (!psArgs || !csDelim) + return -1; + + pos = strpbrk(psArgs, csDelim); + if (pos) { + *pos++ = 0; + ret++; + if (psAttr) + *psAttr = psArgs; + } else + return 0; + + if (psValue) { + if (pos && *pos) { + ret++; + *psValue = pos; + } else + *psValue = NULL; + } + + return ret; +} + +/* * io_Path2File() - Parse and make path/filename pair * * @csArgs = Input argument line @@ -323,7 +430,7 @@ io_Path2File(const char * __restrict csArgs, char * __ if (psPath && !pathLen) return -1; - psBuf = strdup(csArgs); + psBuf = io_strdup(csArgs); if (!psBuf) { LOGERR; return -1; @@ -333,7 +440,7 @@ io_Path2File(const char * __restrict csArgs, char * __ if (!pos) { strlcpy(psFile, psBuf, fileLen); - free(psBuf); + io_free(psBuf); return 1; } else *pos++ = 0; @@ -342,7 +449,7 @@ io_Path2File(const char * __restrict csArgs, char * __ if (psPath) strlcpy(psPath, psBuf, pathLen); - free(psBuf); + io_free(psBuf); return 2; } @@ -420,8 +527,6 @@ io_n2port(io_sockaddr_t * __restrict addr) case AF_INET6: return ntohs(addr->sin6.sin6_port); default: - io_SetErr(ESOCKTNOSUPPORT, "Unsuported address family %d", - addr->sa.sa_family); break; } @@ -444,6 +549,7 @@ io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * if (!addr || !val) return ret; + AIT_INIT_VAL(val); switch (addr->sa.sa_family) { case AF_INET: if (!inet_ntop(AF_INET, &addr->sin.sin_addr, str, INET_ADDRSTRLEN)) { @@ -459,6 +565,9 @@ io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * } else ret = str; break; + case AF_LOCAL: + ret = addr->sun.sun_path; + break; default: io_SetErr(EPROTONOSUPPORT, "Unsuported address family %d", addr->sa.sa_family); @@ -480,23 +589,31 @@ io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * io_sockaddr_t * io_gethostbyname(const char *psHost, u_short port, io_sockaddr_t * __restrict addr) { - struct hostent *host; + struct hostent *host = NULL; if (!psHost || !addr) return NULL; - /* resolver */ - if (!addr->sa.sa_family) - host = gethostbyname(psHost); - else - host = gethostbyname2(psHost, addr->sa.sa_family); - if (!host) { - io_SetErr(EINVAL, "Resolver #%d - %s", h_errno, hstrerror(h_errno)); - return NULL; + if (*psHost != '/') { + /* resolver */ + if (!addr->sa.sa_family) + host = gethostbyname(psHost); + else + host = gethostbyname2(psHost, addr->sa.sa_family); + if (!host) { + io_SetErr(EINVAL, "Resolver #%d - %s", h_errno, hstrerror(h_errno)); + return NULL; + } else { + memset(addr, 0, sizeof(io_sockaddr_t)); + addr->sa.sa_family = host->h_addrtype; + } + } else { + memset(addr, 0, sizeof(io_sockaddr_t)); + addr->sa.sa_family = AF_LOCAL; } + - memset(addr, 0, sizeof(io_sockaddr_t)); - switch (host->h_addrtype) { + switch (addr->sa.sa_family) { case AF_INET: addr->sin.sin_len = sizeof(struct sockaddr_in); addr->sin.sin_family = AF_INET; @@ -509,11 +626,65 @@ io_gethostbyname(const char *psHost, u_short port, io_ addr->sin6.sin6_port = htons(port); memcpy(&addr->sin6.sin6_addr, host->h_addr, sizeof addr->sin6.sin6_addr); return addr; + case AF_LOCAL: + addr->sun.sun_len = sizeof(struct sockaddr_un); + addr->sun.sun_family = AF_LOCAL; + memset(addr->sun.sun_path, 0, sizeof addr->sun.sun_path); + snprintf(addr->sun.sun_path, sizeof addr->sun.sun_path, "%s-%hu", psHost, port); + return addr; default: - io_SetErr(EPROTONOSUPPORT, "Unsuported address family %d", - host->h_addrtype); + io_SetErr(EPROTONOSUPPORT, "Unsuported address family %d", addr->sa.sa_family); break; } 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); }