--- libaitio/src/Attic/tools.c 2010/04/16 13:25:27 1.2 +++ libaitio/src/Attic/tools.c 2012/03/15 01:52:23 1.9 @@ -1,11 +1,48 @@ /************************************************************************* -* (C) 2008 AITNET ltd - Sofia/Bulgaria - -* by Michael Pounov +* (C) 2008 AITNET ltd - Sofia/Bulgaria - +* by Michael Pounov * * $Author: misho $ -* $Id: tools.c,v 1.2 2010/04/16 13:25:27 misho Exp $ +* $Id: tools.c,v 1.9 2012/03/15 01:52:23 misho Exp $ * -*************************************************************************/ +************************************************************************** +The ELWIX and AITNET software is distributed under the following +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 + by Michael Pounov . All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. All advertising materials mentioning features or use of this software + must display the following acknowledgement: +This product includes software developed by Michael Pounov +ELWIX - Embedded LightWeight unIX and its contributors. +4. Neither the name of AITNET nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY AITNET AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. +*/ #include "global.h" #include "aitio.h" @@ -15,7 +52,8 @@ * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_LTrimStr(u_char *psLine) +inline int +io_LTrimStr(u_char * __restrict psLine) { int pos = 0; u_char *s; @@ -35,7 +73,8 @@ inline int io_LTrimStr(u_char *psLine) * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_RTrimStr(u_char *psLine) +inline int +io_RTrimStr(u_char * __restrict psLine) { u_char *t, *pos; @@ -54,7 +93,8 @@ inline int io_RTrimStr(u_char *psLine) * @psLine = Text string * return: 0 nothing to do; !=0 Removed bytes */ -inline int io_TrimStr(u_char *psLine) +inline int +io_TrimStr(u_char * __restrict psLine) { int ret = 0; @@ -69,7 +109,8 @@ inline int io_TrimStr(u_char *psLine) * @psLine = Text string * return: 0 nothing to do; 1 successful unquoted string */ -inline int io_UnquotStr(u_char *psLine) +inline int +io_UnquotStr(u_char * __restrict psLine) { char *pos, *str = NULL; int flg; @@ -97,30 +138,31 @@ inline int io_UnquotStr(u_char *psLine) } /* - * io_Char2Hex() Convert from Char string to Hex string + * io_Ch2Hex() Convert from Char string to Hex string * @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 data without term\0 (must be free) */ -inline char *io_Char2Hex(u_char *psLine, int lineLen) +inline u_char * +io_Ch2Hex(u_char *psLine, int lineLen) { register int i; - char szWork[3], *str; + char szWork[3]; + u_char *str; if (!psLine || !*psLine || !lineLen) return NULL; - str = malloc(lineLen * 2 + 1); + str = malloc(lineLen / 2); if (!str) { LOGERR; return NULL; } else - memset(str, 0, lineLen * 2 + 1); + memset(str, 0, lineLen / 2); - for (i = 0; i < lineLen && psLine[i]; i++) { - memset(szWork, 0, 3); - snprintf(szWork, 3, "%02X", (u_char) psLine[i]); - strncat(str, szWork, 2); + for (i = 0; i < lineLen && psLine[i * 2]; i++) { + strlcpy(szWork, (char*) &psLine[i * 2], 3); + str[i] = (u_char) strtol(szWork, NULL, 16); } return str; @@ -128,12 +170,13 @@ inline char *io_Char2Hex(u_char *psLine, int lineLen) /* - * io_Hex2Char() Convert from Hex string to Char string + * io_Hex2Ch() Convert from Hex string to Char string * @psLine = Text string * @lineLen = Length of Text string * return: NULL nothing to do or error; !=0 Allocated new converted string(must be free) */ -inline char *io_Hex2Char(u_char *psLine, int lineLen) +inline char * +io_Hex2Ch(u_char *psLine, int lineLen) { register int i; char szWork[3], *str; @@ -141,17 +184,327 @@ inline char *io_Hex2Char(u_char *psLine, int lineLen) if (!psLine || !*psLine || !lineLen) return NULL; - str = malloc(lineLen / 2 + 1); + str = malloc(lineLen * 2 + 1); if (!str) { LOGERR; return NULL; } else - memset(str, 0, lineLen / 2 + 1); + memset(str, 0, lineLen * 2 + 1); - for (i = 0; i < lineLen && psLine[i * 2]; i++) { - strlcpy(szWork, (char*) &psLine[i * 2], 3); - str[i] = (char) strtol(szWork, NULL, 16); + for (i = 0; i <= lineLen; i++) { + memset(szWork, 0, 3); + snprintf(szWork, 3, "%02X", (u_char) psLine[i]); + strncat(str, szWork, 2); } return str; +} + +/* + * io_CopyEnv() Copy environment to new environment array; + * @oldenv = Environment array + * return: NULL error; !=NULL Allocated new environment array(must be free) +*/ +char ** +io_CopyEnv(const char **oldenv) +{ + char **newenv, **el; + register int i, num; + + if (!oldenv) + return NULL; + else + newenv = el = NULL; + + /* count items environment */ + for (i = num = 0; oldenv[i]; i++) + if (*strchr(oldenv[i], '=')) + num++; + + /* create and copy new environment */ + newenv = calloc(num + 1, sizeof(char*)); + if (!newenv) { + LOGERR; + return NULL; + } else + el = newenv; + + for (i = 0; oldenv[i]; i++) + if (*strchr(oldenv[i], '=')) { + *el = strdup(oldenv[i]); + el++; + } + *el = NULL; + + return newenv; +} + +/* + * io_ExecArgs() Build exec arguments from other array + * @psProg = Program name for execute + * @oldarg = Arguments array + * return: NULL error; !=NULL Allocated execution array(must be free) +*/ +char ** +io_ExecArgs(const char *psProg, const char **oldarg) +{ + char **newarg, **el; + register int i, num; + + if (!psProg || !oldarg) + return NULL; + else + newarg = el = NULL; + + /* count items arguments */ + for (num = 0; oldarg[num]; num++); + + /* create and copy new arguments */ + newarg = calloc(num + 2, sizeof(char*)); + if (!newarg) { + LOGERR; + return NULL; + } else + el = newarg; + + *el = strdup(psProg); + el++; + + for (i = 0; oldarg[i]; i++, el++) + *el = strdup(oldarg[i]); + *el = NULL; + + return newarg; +} + +/* + * io_FreeNullTerm() Free dynamic allocated null terminated array with strings + * @arr = Pointer to array for free + * return: none +*/ +inline void +io_FreeNullTerm(char *** __restrict arr) +{ + char **a; + + if (arr && *arr) { + a = *arr; + while (a && *a) + free(*a++); + free(*arr); + *arr = NULL; + } +} + +/* + * io_Path2File() - Parse and make path/filename pair + * + * @csArgs = Input argument line + * @psPath = Output Path, if ==NULL path not returned + * @pathLen = Size of path array + * @psFile = Output File + * @fileLen = Size of file array + * return: 0 error format; -1 error:: can`t read; >0 ok, number of readed items + */ +inline int +io_Path2File(const char * __restrict csArgs, char * __restrict psPath, + int pathLen, char * __restrict psFile, int fileLen) +{ + char *pos, *psBuf; + + if (!csArgs || !psFile || !fileLen) + return -1; + if (psPath && !pathLen) + return -1; + + psBuf = strdup(csArgs); + if (!psBuf) { + LOGERR; + return -1; + } + + pos = strrchr(psBuf, '/'); + if (!pos) { + strlcpy(psFile, psBuf, fileLen); + + free(psBuf); + return 1; + } else + *pos++ = 0; + + strlcpy(psFile, pos, fileLen); + if (psPath) + strlcpy(psPath, psBuf, pathLen); + + free(psBuf); + return 2; +} + +/* + * io_ether_ntoa() Convert ethernet address to string + * @n = ethernet address structure, like struct ether_addr + * @a = string + * @len = string length + * return: NULL error or !=NULL string a + */ +inline char * +io_ether_ntoa(const struct io_ether_addr *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", + 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) + return NULL; + + return a; +} + +/* + * io_ether_aton() Convert string to ethernet address + * @a = string + * @e = ethernet address structure, like struct ether_addr + * return: NULL error or !=NULL ethernet address structure + */ +inline struct io_ether_addr * +io_ether_aton(const char *a, struct io_ether_addr *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); + 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; +} + +/* + * io_n2port() Extract port from network structure + * @addr = Address + * return: 0 not supported family type or port number + */ +inline u_short +io_n2port(io_sockaddr_t * __restrict addr) +{ + u_short port = 0; + + if (!addr) + return port; + + switch (addr->sa.sa_family) { + case AF_INET: + return ntohs(addr->sin.sin_port); + case AF_INET6: + return ntohs(addr->sin6.sin6_port); + default: + io_SetErr(ESOCKTNOSUPPORT, "Unsuported address family %d", + addr->sa.sa_family); + break; + } + + return port; +} + +/* + * io_n2addr() Extract address from network structure + * @addr = Address + * @val = Value for store string address + * return: NULL error or !=NULL string address from val + */ +const char * +io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * __restrict val) +{ + char str[INET6_ADDRSTRLEN] = { 0 }; + const char *ret = NULL; + + if (!addr || !val) + return ret; + + switch (addr->sa.sa_family) { + case AF_INET: + if (!inet_ntop(AF_INET, &addr->sin.sin_addr, str, INET_ADDRSTRLEN)) { + LOGERR; + return ret; + } else + ret = str; + break; + case AF_INET6: + if (!inet_ntop(AF_INET6, &addr->sin6.sin6_addr, str, INET6_ADDRSTRLEN)) { + LOGERR; + return ret; + } else + ret = str; + break; + default: + io_SetErr(EPROTONOSUPPORT, "Unsuported address family %d", + addr->sa.sa_family); + return ret; + } + + if (!AIT_ISEMPTY(val)) + AIT_FREE_VAL(val); + AIT_SET_STR(val, ret); + return (const char*) AIT_GET_STR(val); +} + +/* + * io_gethostbyname() Get host and port and make network structure + * @psHost = Hostname + * @port = Port + * @addr = Network address structure + * return: NULL error or !=NULL network structure + */ +io_sockaddr_t * +io_gethostbyname(const char *psHost, u_short port, io_sockaddr_t * __restrict addr) +{ + struct hostent *host; + + 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; + } + + memset(addr, 0, sizeof(io_sockaddr_t)); + switch (host->h_addrtype) { + case AF_INET: + addr->sin.sin_len = sizeof(struct sockaddr_in); + addr->sin.sin_family = AF_INET; + addr->sin.sin_port = htons(port); + memcpy(&addr->sin.sin_addr, host->h_addr, sizeof addr->sin.sin_addr); + return addr; + case AF_INET6: + addr->sin6.sin6_len = sizeof(struct sockaddr_in6); + addr->sin6.sin6_family = AF_INET6; + addr->sin6.sin6_port = htons(port); + memcpy(&addr->sin6.sin6_addr, host->h_addr, sizeof addr->sin6.sin6_addr); + return addr; + default: + io_SetErr(EPROTONOSUPPORT, "Unsuported address family %d", + host->h_addrtype); + break; + } + + return NULL; }