--- libaitio/inc/aitio.h 2013/11/22 15:09:17 1.38 +++ libaitio/inc/aitio.h 2013/12/12 21:17:53 1.38.10.16 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.38 2013/11/22 15:09:17 misho Exp $ +* $Id: aitio.h,v 1.38.10.16 2013/12/12 21:17:53 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -78,12 +78,23 @@ 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 { void *cli_parent; int cli_fd; - int cli_pty; + intptr_t cli_pty; sockaddr_t cli_addr; char cli_name[64]; char cli_cmdline[PATH_MAX]; @@ -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; @@ -123,6 +135,107 @@ const char *io_GetError(); /* + * io_progInit() - Init program pool + * + * @progName = program name for execution + * @initNum = initial started programs + * @maxNum = maximum started programs + * return: NULL error or !=NULL allocated pool (must destroied with io_progDestroy()) + */ +prog_t *io_progInit(const char *progName, + unsigned int initNum, unsigned int maxNum); +/* + * io_progOpen() - Execute number of program(s) + * + * @prg = program pool + * @execNum = execute program(s) (0 max) + * return: -1 error, >0 executed programs + */ +int io_progOpen(prog_t * __restrict prg, unsigned int execNum); +/* + * io_progOpen2() - Start program from pool on first unused slot + * + * @prg = program pool + * return: -1 error, >-1 reside at slot + */ +int io_progOpen2(prog_t * __restrict prg); +/* + * io_progGrow() - Execute to number of programs in pool + * + * @prg = program pool + * @toNum = execute to number of programs (0 max) + * 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); +/* + * io_progVacuum() - Vacuum pool to running number of programs + * + * @prg = program pool + * @toNum = vacuum to number of programs (0 to init number) + * return: 0 error or >0 closed programs + */ +int io_progVacuum(prog_t * __restrict prg, unsigned int toNum); +/* + * io_progCloseAt() - Close program at pool of certain position + * + * @prg = program pool + * @idx = index at pool + * return: 0 error or !=0 closed program + */ +int io_progCloseAt(prog_t * __restrict prg, unsigned int idx); +/* + * io_progClose() - Close all programs in pool + * + * @prg = program pool + * @closeNum = close program(s) (0 all) + * return: 0 error, >0 closed programs + */ +int io_progClose(prog_t * __restrict prg, unsigned int closeNum); +/* + * io_progDestroy() - Destroy entire program pool + * + * @pprg = program pool + * return: none + */ +void io_progDestroy(prog_t ** __restrict pprg); + +/* + * io_progCheck() - Check exit status of program pool + * + * @prg = program pool + * @re = resurrect program to init number + * return: -1 error or >-1 exited programs + */ +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, int newOne); +#else +int io_progAttach(prog_t * __restrict prg, int newOne); +#endif +/* + * io_progDetach() - Detch from open program + * + * @prg= program pool + * @pfd = attached program handle + * return: none + */ +#ifdef POPEN_STREAM +void io_progDetach(prog_t * __restrict prg, FILE *pfd); +#else +void io_progDetach(prog_t * __restrict prg, int pfd); +#endif + + +/* * ioInitSocket() - Init socket and allocate resources * * @role = Socket role @@ -151,6 +264,14 @@ void ioCloseSocket(sock_t ** __restrict s); */ 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 * * @s = Socket @@ -183,6 +304,7 @@ int ioLoopSocket(sock_t * __restrict s, sched_task_fun */ int ioBridgeProg2Socket(sock_t * __restrict s, const char *prgname); + /* * ioPromptRead() - Read data from input h[0] with prompt to output h[1] * @@ -507,6 +629,14 @@ int io_dumbFile(const char *csFile, int mode, off_t si * return: -1 error or 0 ok */ int io_get1stiface(char *szIface, int iflen); +/* + * io_getmaciface() - Get MAC address from interface name + * + * @csIface = interface name + * @ea = ethernet address + * return: -1 error, 0 ok or 1 not found + */ +int io_getmaciface(const char *csIface, ether_addr_t * __restrict ea); /* * io_etherOpen() - Open BPF interface to device *