--- libaitio/inc/aitio.h 2011/10/31 13:53:51 1.12 +++ libaitio/inc/aitio.h 2011/11/03 14:56:48 1.12.2.7 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.12 2011/10/31 13:53:51 misho Exp $ +* $Id: aitio.h,v 1.12.2.7 2011/11/03 14:56:48 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; @@ -235,8 +240,18 @@ typedef struct { 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 @@ -260,15 +275,15 @@ inline char *io_ether_ntoa(const struct io_ether_addr inline struct io_ether_addr *io_ether_aton(const char *a, struct io_ether_addr *e); /* - * io_vals2buffer() Marshaling data from array with variables to buffer + * 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 @@ -276,17 +291,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(u_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 @@ -294,9 +309,28 @@ 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(u_char *buf, int buflen, int vnum, int zcpy); /* + * io_allocVars() Allocate ait_val_t array + * @varnum = Number of variables + * return: =NULL error or !=NULL allocated array + */ +inline array_t *io_allocVars(u_int varnum); +/* + * io_clrVars() Clear ait_val_t elements from array + * @vars = Variable array + * return: none + */ +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 @@ -344,11 +378,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 @@ -866,6 +900,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