--- libaitio/inc/aitio.h 2013/06/26 22:48:53 1.32 +++ libaitio/inc/aitio.h 2013/11/22 13:49:14 1.37 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.32 2013/06/26 22:48:53 misho Exp $ +* $Id: aitio.h,v 1.37 2013/11/22 13:49:14 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -59,14 +59,63 @@ SUCH DAMAGE. #include #include #include +#include #include +#include +#include #ifndef STRSIZ -#define STRSIZ 256 +#define STRSIZ 256 #endif +#define IO_SOCK_ROLE_CLIENT 0 +#define IO_SOCK_ROLE_SERVER 1 +#define IO_ETHER_FILTER_PROMISC 0 +#define IO_ETHER_FILTER_NOTREAD -1 +#define IO_ETHER_FILTER_READ 1 +#define IO_ETHER_FILTER_WRITE 2 + + +typedef struct tagCliSock sock_cli_t; +typedef void *(*sock_cb_t)(sock_cli_t*); +struct tagCliSock { + void *cli_parent; + int cli_fd; + int cli_pty; + sockaddr_t cli_addr; + char cli_name[64]; + char cli_cmdline[PATH_MAX]; + pid_t cli_pid; + + sched_task_func_t cli_func; + + ait_val_t cli_buf[2]; + + TAILQ_ENTRY(tagCliSock) cli_node; +}; + +typedef struct { + int sock_role; + int sock_backq; + int sock_type; + int sock_proto; + int sock_fd; + struct timespec sock_timeout; + sockaddr_t sock_addr; + sockaddr_t sock_peer; + + ait_val_t sock_buf; + + volatile intptr_t sock_kill; + sched_root_task_t *sock_root; + + pthread_mutex_t sock_mtx; + TAILQ_HEAD(, tagCliSock) sock_cli; +} sock_t; + + // io_GetErrno() Get error code of last operation int io_GetErrno(); // io_GetError() Get error text of last operation @@ -74,6 +123,68 @@ const char *io_GetError(); /* + * ioInitSocket() - Init socket and allocate resources + * + * @role = Socket role + * @type = Socket type + * @proto = Socket protocol + * @addr = Bind to address + * @port = Bind to port + * @buflen = Socket buffer, optional if =0 == BUFSIZ + * return: NULL error or !=NULL created socket + */ +sock_t *ioInitSocket(int role, int type, int proto, + const char *addr, unsigned short port, size_t buflen); +/* + * ioCloseSocket() - Close socket and free resources + * + * @s = Socket + * return: none + */ +void ioCloseSocket(sock_t ** __restrict s); +#define ioKillSocket(x) (assert((x)), (x)->sock_kill = 1) +/* + * ioCloseClient() - Close client socket + * + * @c = Client socket + * return: 0 ok or !=0 error + */ +int ioCloseClient(sock_cli_t * __restrict c); +/* + * ioUpSocket() - Setup socket for use + * + * @s = Socket + * @arg = Server role = listen backlog queue and Client role = peer address + * @timeout = Socket timeout in ms (default -1 infinit) + * return: -1 error or 0 ok + */ +int ioUpSocket(sock_t * __restrict s, void *arg, int timeout); +/* + * ioUpdTimerSocket() - Update timeout of socket + * + * @c = Client socket + * @arg = Optional data argument + * return: none + */ +void ioUpdTimerSocket(sock_cli_t * __restrict c, void *arg); +/* + * ioLoopSocket() - Start socket scheduler + * + * @s = Socket + * @rcb = Read callback + * return: -1 error or return result from scheduler + */ +int ioLoopSocket(sock_t * __restrict s, sched_task_func_t rcb); +/* + * ioBridgeProg2Socket() - Start socket scheduler and bridge program to socket + * + * @s = Socket + * @prgname = Program name + * return: 0 ok or !=0 error + */ +int ioBridgeProg2Socket(sock_t * __restrict s, const char *prgname); + +/* * 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 @@ -82,7 +193,8 @@ const char *io_GetError(); * @dataLen = Length of data * return: 0 EOF; -1 error:: can`t read; >0 count of readed chars */ -int ioPromptRead(int *h, const char *csPrompt, char * __restrict psData, int dataLen); +int ioPromptRead(int *h, const char *csPrompt, + char * __restrict psData, int dataLen); /* * ioPromptPassword() - Read password from input h[0] with prompt to output h[1] * @@ -93,7 +205,8 @@ int ioPromptRead(int *h, const char *csPrompt, char * * @confirm = Confirm password, 0 - get password, !=0 Ask for confirmation * return: 0 EOF; -1 error:: can`t read; >0 count of readed chars */ -int ioPromptPassword(int *h, const char *csPrompt, char * __restrict psPass, int passLen, int confirm); +int ioPromptPassword(int *h, const char *csPrompt, + char * __restrict psPass, int passLen, int confirm); /* @@ -401,11 +514,12 @@ int io_get1stiface(char *szIface, int iflen); * @csIface = interface name * @flags = open flags * @whdr = with complete headers + * @wdlt = with data link type * @buflen = buffer length * @zcbuf = zero copy buffer, if BPF supports it and isn't NULL * return: -1 error or >-1 bpf handle */ -int io_etherOpen(const char *csIface, int flags, int whdr, +int io_etherOpen(const char *csIface, int flags, int whdr, int wdlt, unsigned int *buflen, void **zcbuf); /* * io_etherClose() - Close BPF interface @@ -415,6 +529,18 @@ int io_etherOpen(const char *csIface, int flags, int w * return: none */ void io_etherClose(int eth, void **zcbuf); + +/* + * io_etherFilter() - BPF filter routine + * + * @eth = bpf handle + * @io = filter direction + * (IO_ETHER_FILTER_PROMISC|IO_ETHER_FILTER_NOTREAD|IO_ETHER_FILTER_READ|IO_ETHER_FILTER_WRITE) + * @insn = BPF filter instruction array + * @insnlen = Length of BPF filter instruction array + * return: -1 error or 0 ok + */ +int io_etherFilter(int eth, int io, struct bpf_insn * __restrict insn, size_t insnlen); /* * io_etherSend() - Send packet to bpf