--- libaitio/inc/aitio.h 2011/10/31 13:53:51 1.12 +++ libaitio/inc/aitio.h 2011/11/02 13:13:48 1.12.2.3 @@ -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.3 2011/11/02 13:13: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 @@ -235,8 +239,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 @@ -866,6 +880,25 @@ 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 + * return: 0 error, >0 ok, sended bytes + */ +size_t ioSendFile(int s, const char *csFile, size_t sendLen, off_t offset); +/* + * 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 + * return: 0 error, >0 ok, received bytes + */ +size_t ioRecvFile(int s, const char *csFile, size_t recvLen, int over); #endif