--- libaitio/inc/aitio.h 2013/12/06 01:03:03 1.38.10.8 +++ libaitio/inc/aitio.h 2014/02/08 22:06:16 1.40 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitio.h,v 1.38.10.8 2013/12/06 01:03:03 misho Exp $ +* $Id: aitio.h,v 1.40 2014/02/08 22:06:16 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 +Copyright 2004 - 2014 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -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; @@ -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 @@ -148,15 +149,23 @@ prog_t *io_progInit(const char *progName, * * @prg = program pool * @execNum = execute program(s) (0 max) - * return: 0 error, >0 executed programs and abs(<0) executed programs with logged error + * 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, >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); /* @@ -168,6 +177,26 @@ int io_progGrow(prog_t * __restrict prg, unsigned int */ 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_progCloseOf() - Close program at pool with certain handle + * + * @prg = program pool + * @h = handle of program + * return: 0 error, >0 closed programs + */ +#ifdef POPEN_STREAM +int io_progCloseOf(prog_t * __restrict prg, FILE *h); +#else +int io_progCloseOf(prog_t * __restrict prg, int h); +#endif +/* * io_progClose() - Close all programs in pool * * @prg = program pool @@ -187,20 +216,22 @@ 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 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 @@ -245,6 +276,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 @@ -621,8 +660,8 @@ int io_getmaciface(const char *csIface, ether_addr_t * * @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 wdlt, - unsigned int *buflen, void **zcbuf); +int io_etherOpen(const char *csIface, int flags, unsigned int whdr, + unsigned int wdlt, unsigned int *buflen, void **zcbuf); /* * io_etherClose() - Close BPF interface *