--- libaitio/inc/aitio.h 2013/12/08 20:57:32 1.38.10.10 +++ libaitio/inc/aitio.h 2013/12/12 15:23:44 1.38.10.15 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.38.10.10 2013/12/08 20:57:32 misho Exp $ +* $Id: aitio.h,v 1.38.10.15 2013/12/12 15:23:44 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -78,6 +78,17 @@ SUCH DAMAGE. #define IO_ETHER_FILTER_WRITE 2 +typedef struct { + unsigned int prog_inin; /* init progs */ + unsigned int prog_maxn; /* max progs */ + unsigned int prog_cnum; /* current progs */ + char prog_name[PATH_MAX]; + + pthread_mutex_t prog_mtx; + array_t *prog_fds; + unsigned int *prog_used; +} prog_t; + typedef struct tagCliSock sock_cli_t; typedef void *(*sock_cb_t)(sock_cli_t*); struct tagCliSock { @@ -107,6 +118,7 @@ typedef struct { sockaddr_t sock_peer; ait_val_t sock_buf; + prog_t *sock_prog; volatile intptr_t sock_kill; sched_root_task_t *sock_root; @@ -115,18 +127,7 @@ typedef struct { TAILQ_HEAD(, tagCliSock) sock_cli; } sock_t; -typedef struct { - unsigned int prog_inin; /* init progs */ - unsigned int prog_maxn; /* max progs */ - unsigned int prog_cnum; /* current progs */ - char prog_name[PATH_MAX]; - pthread_mutex_t prog_mtx; - array_t *prog_fds; - unsigned int *prog_used; -} prog_t; - - // io_GetErrno() Get error code of last operation int io_GetErrno(); // io_GetError() Get error text of last operation @@ -156,7 +157,8 @@ int io_progOpen(prog_t * __restrict prg, unsigned int * * @prg = program pool * @toNum = execute to number of programs (0 max) - * return: 0 error, >0 executed programs and abs(<0) executed programs with logged error + * return: 0 error or nothing to do, + * >0 executed programs and abs(<0) executed programs with logged error */ int io_progGrow(prog_t * __restrict prg, unsigned int toNum); /* @@ -204,12 +206,13 @@ int io_progCheck(prog_t * __restrict prg, int re); * io_progAttach() - Attach to open program * * @prg = program pool + * @newOne = Execute new one program after attach * return: NULL error or !=NULL attached program handle */ #ifdef POPEN_STREAM -FILE *io_progAttach(prog_t * __restrict prg); +FILE *io_progAttach(prog_t * __restrict prg, int newOne); #else -int io_progAttach(prog_t * __restrict prg); +int io_progAttach(prog_t * __restrict prg, int newOne); #endif /* * io_progDetach() - Detch from open program @@ -253,6 +256,14 @@ void ioCloseSocket(sock_t ** __restrict s); * return: 0 ok or !=0 error */ int ioCloseClient(sock_cli_t * __restrict c); +/* + * ioSetupProg2Socket() - Setup program pool to socket server + * + * @s = Socket + * @p = Program pool + * return: -1 error or 0 ok + */ +int ioSetupProg2Socket(sock_t * __restrict s, prog_t * __restrict p); /* * ioUpSocket() - Setup socket for use *