--- libaitio/inc/aitio.h 2011/10/31 14:13:02 1.12.2.1 +++ libaitio/inc/aitio.h 2011/11/03 14:17:39 1.12.2.5 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.12.2.1 2011/10/31 14:13:02 misho Exp $ +* $Id: aitio.h,v 1.12.2.5 2011/11/03 14:17:39 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -124,6 +124,7 @@ typedef enum { typedef struct { uint8_t val_type; + uint8_t val_pad[3]; uint32_t val_len; union { uint64_t net; @@ -239,6 +240,7 @@ 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; @@ -310,6 +312,19 @@ int io_vals2map(u_char *buf, int buflen, array_t *vars array_t *io_map2vals(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_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 @@ -879,6 +894,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