--- libaitio/inc/aitio.h 2011/10/07 10:32:35 1.11.2.24 +++ libaitio/inc/aitio.h 2011/12/16 01:52:39 1.13.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.11.2.24 2011/10/07 10:32:35 misho Exp $ +* $Id: aitio.h,v 1.13.2.7 2011/12/16 01:52:39 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -54,6 +54,10 @@ SUCH DAMAGE. #include #include #include +#include +#include +#include +#include #define VACUUM_LEFT 1 @@ -120,6 +124,7 @@ typedef enum { typedef struct { uint8_t val_type; + uint8_t val_pad[3]; uint32_t val_len; union { uint64_t net; @@ -159,18 +164,26 @@ typedef struct { #define AIT_GET_F32(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == f32), (_vl)->val.f32) #define AIT_GET_F64(_vl) (assert((_vl)), assert(AIT_TYPE((_vl)) == f64), (_vl)->val.f64) -#define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \ +#define AIT_SET_BUF(_vl, _v, _len) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val.buffer = malloc(_len); \ if (__val->val.buffer) { \ __val->val_type = buffer; AIT_LEN(__val) = _len; \ memcpy(__val->val.buffer, (_v), _len); \ } } while (0) -#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \ +#define AIT_SET_STR(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val.string = (int8_t*) strdup((_v)); \ if (__val->val.string) { \ __val->val_type = string; \ AIT_LEN(__val) = strlen((_v)) + 1; \ } } while (0) +#define AIT_SET_STRCAT(_vl, _v) do { ait_val_t *__val = (_vl); assert(__val); \ + assert(AIT_TYPE(__val) == string); \ + void *__p = realloc(AIT_LEN(__val) + strlen((_v))); \ + if (__p) { \ + __val->val.string = __p; \ + AIT_LEN(__val) += strlen((_v)); \ + strlcat(__val->val.string, (_v), AIT_LEN(__val)); \ + } } while (0) #define AIT_SET_BLOB(_vl, _n, _len) do { ait_val_t *__val = (_vl); assert(__val); \ __val->val_type = blob; AIT_LEN(__val) = _len; \ __val->val.blob = _n; } while (0) @@ -211,7 +224,7 @@ typedef struct { AIT_LEN(__val) = sizeof(double); } while (0) /* if attribute zeroCopy is set not execute free() */ -#define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (_vl); assert(__val); \ +#define AIT_FREE_VAL(_vl) do { ait_val_t *__val = (ait_val_t*) (_vl); assert(__val); \ switch (__val->val_type) { \ case buffer: \ if (__val->val.buffer) { \ @@ -232,7 +245,21 @@ typedef struct { AIT_LEN(__val) = 0; \ } while (0) +struct io_ether_addr { + u_int8_t ether_addr_octet[6]; +}; +typedef struct io_ether_addr io_ether_addr_t; +typedef union { + struct sockaddr_storage ss; + struct sockaddr sa; + struct sockaddr_un sun; + struct sockaddr_in sin; + struct sockaddr_in6 sin6; + struct sockaddr_dl sdl; +} io_sockaddr_t; + + // io_GetErrno() Get error code of last operation inline int io_GetErrno(); // io_GetError() Get error text of last operation @@ -240,15 +267,53 @@ inline const char *io_GetError(); /* - * io_vals2buffer() Marshaling data from array with variables to buffer + * 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); +/* + * 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); +/* + * 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); +/* + * 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); +/* + * 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, unsigned short port, + io_sockaddr_t * __restrict addr); + +/* + * io_vars2buffer() Marshaling data from array with variables to buffer * @buf = Buffer * @buflen = Size of buffer * @vars = Variable array * return: -1 error, 0 nothing done or >0 size of marshaled data */ -int io_vals2buffer(unsigned char *buf, int buflen, array_t *vars); +int io_vars2buffer(unsigned char *buf, int buflen, array_t *vars); /* - * io_buffer2vals() De-marshaling data from buffer to array with variables + * io_buffer2vars() De-marshaling data from buffer to array with variables * @buf = Buffer * @buflen = Size of buffer * @vnum = Number of variables into buffer @@ -256,17 +321,17 @@ int io_vals2buffer(unsigned char *buf, int buflen, arr *DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy() * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy() */ -array_t *io_buffer2vals(unsigned char *buf, int buflen, int vnum, int zcpy); +array_t *io_buffer2vars(unsigned char *buf, int buflen, int vnum, int zcpy); /* - * io_vals2map() Marshaling data from array with variables to memory map + * io_vars2map() Marshaling data from array with variables to memory map * @buf = Buffer * @buflen = Size of buffer * @vars = Variable array * return: -1 error, 0 nothing done or >0 size of marshaled data */ -int io_vals2map(u_char *buf, int buflen, array_t *vars); +int io_vars2map(unsigned char *buf, int buflen, array_t *vars); /* - * io_map2vals() De-marshaling data from memory map to array with variables + * io_map2vars() De-marshaling data from memory map to array with variables * @buf = Buffer * @buflen = Size of buffer * @vnum = Number of variables into buffer @@ -274,9 +339,40 @@ int io_vals2map(u_char *buf, int buflen, array_t *vars *DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy() * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy() */ -array_t *io_map2vals(u_char *buf, int buflen, int vnum, int zcpy); +array_t *io_map2vars(unsigned char *buf, int buflen, int vnum, int zcpy); /* + * io_allocVar() Allocate memory for variable + * return: NULL error or new variable, after use free variable with io_freeVar() + */ +inline ait_val_t *io_allocVar(void); +/* + * io_freeVar() Free allocated memory for variable + * @val = Variable + * return: none + */ +inline void io_freeVar(ait_val_t * __restrict val); +/* + * io_allocVars() Allocate ait_val_t array + * @varnum = Number of variables + * return: =NULL error or !=NULL allocated array + */ +inline array_t *io_allocVars(int varnum); +/* + * io_clrVars() Clear ait_val_t elements from array + * @vars = Variable array + * return: -1 error or size of array + */ +inline int io_clrVars(array_t * __restrict vars); +/* + * io_freeVars() Free ait_val_t array + * @vars = Variable array + * return: none + */ +inline void io_freeVars(array_t ** __restrict vars); + + +/* * ioPromptRead() Read data from input h[0] with prompt to output h[1] * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout * @csPrompt = Prompt before input, may be NULL @@ -324,11 +420,11 @@ int ioRegexGet(const char *csRegex, const char *csData char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew); /* - * ioVarAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" + * ioStrAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" * @csString = Input string * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free() */ -char *ioVarAst(const char *csString); +char *ioStrAst(const char *csString); /* * io_Path2File() Parse and make path/filename pair @@ -468,6 +564,14 @@ int io_arrayVacuum(array_t * __restrict arr, int fromW } while (0) /* + * io_arrayElem() - Always GET/PUT element into dynamic array, if not enough elements grow array + * @arr = Array + * @n = Position + * @data = Element, if set NULL GET element at position or !=NULL PUT element at position + * return: -1 error or !=-1 return element at position + */ +inline void *io_arrayElem(array_t * __restrict arr, int n, void *data); +/* * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position * @arr = Array * @data = Element, if set NULL return only first empty position @@ -694,33 +798,50 @@ inline int io_rwrite(int fd, void * __restrict buf, si /* Debug helper macros */ extern int io_Debug; -#define io_initDebug(x) io_Debug = (x); -#define io_addDebug io_Debug++ +#define io_enableDEBUG int io_Debug +#define io_initDebug(x) (io_Debug = (x)) +#define io_incDebug (io_Debug++) +#define io_decDebug (io_Debug--) + +/* Debug macros */ +#define ioVERBOSE(x) if ((x) <= io_Debug) +#define ioTRACE(x) if ((x) <= io_Debug) \ + syslog(LOG_DEBUG, "I'm in %s(%d)", __func__, __LINE__) #define ioDEBUG(x, fmt, ...) do { \ assert((fmt)); \ char str[STRSIZ] = { 0 }; \ snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ if ((x) <= io_Debug) \ - syslog(LOG_DEBUG, "ioDebug(%d):%s(%d): %s\n", \ + syslog(LOG_DEBUG, "Debug(%d):%s(%d): %s\n", \ (x), __func__, __LINE__, str); \ } while (0) +/* Logger macro */ +#define ioLOGGER(x, fmt, ...) do { \ + assert((fmt)); \ + char str[STRSIZ] = { 0 }; \ + snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ + syslog((x), "Logger:%s(%d): %s\n", \ + __func__, __LINE__, str); \ + } while (0) + +/* Error state macros */ #define ioERROR(x, fmt, ...) do { \ assert((fmt)); \ char str[STRSIZ] = { 0 }; \ snprintf(str, sizeof str, (fmt), ##__VA_ARGS__); \ - syslog(LOG_ERR, "ioError():%s(%d): #%d - %s\n", \ + syslog(LOG_ERR, "Error:%s(%d): #%d - %s\n", \ __func__, __LINE__, (x), str); \ } while (0) -#define io_sysERROR(x) do { \ +#define ioLOGERR(x) do { \ if (x > 0 || errno) \ - syslog(LOG_ERR, "ioError(sys):%s(%d): #%d - %s\n", \ + syslog(LOG_ERR, "Error(sys):%s(%d): #%d - %s\n", \ __func__, __LINE__, x > 0 ? x : errno, \ strerror(x > 0 ? x : errno)); \ } while (0) -#define io_aitERROR(ait) do { \ +#define ioLIBERR(ait) do { \ if (ait##_GetErrno()) \ - syslog(LOG_ERR, "ioError(ait):%s(%d): #%d - %s\n", \ + syslog(LOG_ERR, "Error(lib):%s(%d): #%d - %s\n", \ __func__, __LINE__, ait##_GetErrno(), \ ait##_GetError()); \ } while (0) @@ -760,10 +881,11 @@ int io_Blowfish(unsigned char *pInput, int inLen, unsi * @inLen = Input buffer data length * @ppOutput = Output buffer with cipher data, must be free after use * @pKey = Key - * @IV = IVector/Nonce/Counter + * @IV = IVector/Nonce/Counter, Warning: IV must be variable, because we write there!!! * return: -1 error or >-1 how many cipher blocks proceeded */ -int io_ctr_AES(u_char *pInput, int inLen, u_char **ppOutput, u_char *pKey, u_char IV[AES_BLOCK_SIZE]); +int io_ctr_AES(unsigned char *pInput, int inLen, unsigned char **ppOutput, + unsigned char *pKey, unsigned char IV[AES_BLOCK_SIZE]); /* @@ -794,7 +916,8 @@ inline void ioFreePTY(int ptyfd, const char *ttyname); * @ypxl = y pixels * return: -1 error or 0 ok */ -inline int ioChgWinPTY(int ptyfd, u_short row, u_short col, u_short xpxl, u_short ypxl); +inline int ioChgWinPTY(int ptyfd, unsigned short row, unsigned short col, + unsigned short xpxl, unsigned short ypxl); /* * ioSetOwnerTTY() Set owner to TTY * @ttyname = tty filename @@ -844,6 +967,27 @@ pid_t ioForkPTY(int *ptyfd, char * __restrict name, in * return: -1 error or 0 ok */ inline int ioCreatePIDFile(const char *csName, int ifExists); + +/* + * ioSendFile() AITNET sendfile() userland implementation, not dependant from OS + * @s = socket + * @csFile = file for send + * @sendLen = bytes to send, if 0 send all data + * @offset = start file offset + * @sndbuf = SO_SNDBUF value, if 0 use default + * return: 0 error, >0 ok, sended bytes + */ +size_t ioSendFile(int s, const char *csFile, size_t sendLen, off_t offset, int sndbuf); +/* + * ioRecvFile() Receive file from socket, fastest (zero-copy) way + * @s = socket + * @csFile = file for receive + * @recvLen = receive bytes + * @over = overwrite file if exists with mode like 0644 + * @rcvbuf = SO_RCVBUF value, if 0 use default + * return: 0 error, >0 ok, received bytes + */ +size_t ioRecvFile(int s, const char *csFile, size_t recvLen, int over, int rcvbuf); #endif