Diff for /libaitio/inc/aitio.h between versions 1.12 and 1.13

version 1.12, 2011/10/31 13:53:51 version 1.13, 2011/12/13 02:23:07
Line 54  SUCH DAMAGE. Line 54  SUCH DAMAGE.
 #include <openssl/aes.h>  #include <openssl/aes.h>
 #include <sys/tty.h>  #include <sys/tty.h>
 #include <sys/ioctl_compat.h>  #include <sys/ioctl_compat.h>
   #include <sys/socket.h>
   #include <sys/un.h>
   #include <net/if_dl.h>
   #include <netinet/in.h>
   
   
 #define VACUUM_LEFT     1  #define VACUUM_LEFT     1
Line 120  typedef enum { Line 124  typedef enum {
   
 typedef struct {  typedef struct {
         uint8_t         val_type;          uint8_t         val_type;
           uint8_t         val_pad[3];
         uint32_t        val_len;          uint32_t        val_len;
         union {          union {
                 uint64_t        net;                  uint64_t        net;
Line 235  typedef struct { Line 240  typedef struct {
 struct io_ether_addr {  struct io_ether_addr {
         u_int8_t ether_addr_octet[6];          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  // io_GetErrno() Get error code of last operation
 inline int io_GetErrno();  inline int io_GetErrno();
 // io_GetError() Get error text of last operation  // io_GetError() Get error text of last operation
Line 258  inline char *io_ether_ntoa(const struct io_ether_addr  Line 273  inline char *io_ether_ntoa(const struct io_ether_addr 
  * return: NULL error or !=NULL ethernet address structure   * return: NULL error or !=NULL ethernet address structure
  */   */
 inline struct io_ether_addr *io_ether_aton(const char *a, struct io_ether_addr *e);  inline struct io_ether_addr *io_ether_aton(const char *a, struct io_ether_addr *e);
   /*
    * io_n2port() Extract port from network structure
    * @addr = Address
    * return: 0 not supported family type or port number
    */
   inline u_short io_n2port(io_sockaddr_t * __restrict addr);
   /*
    * io_n2addr() Extract address from network structure
    * @addr = Address
    * @val = Value for store string address
    * return: NULL error or !=NULL string address from val
    */
   const char *io_n2addr(io_sockaddr_t * __restrict addr, ait_val_t * __restrict val);
   /*
    * io_gethostbyname() Get host and port and make network structure
    * @psHost = Hostname
    * @port = Port
    * @addr = Network address structure
    * return: NULL error or !=NULL network structure
    */
   io_sockaddr_t *io_gethostbyname(const char *psHost, unsigned short port, 
                   io_sockaddr_t * __restrict addr);
   
 /*  /*
 * io_vals2buffer() Marshaling data from array with variables to buffer * io_vars2buffer() Marshaling data from array with variables to buffer
  * @buf = Buffer   * @buf = Buffer
  * @buflen = Size of buffer   * @buflen = Size of buffer
  * @vars = Variable array   * @vars = Variable array
  * return: -1 error, 0 nothing done or >0 size of marshaled data   * return: -1 error, 0 nothing done or >0 size of marshaled data
  */   */
int io_vals2buffer(unsigned char *buf, int buflen, array_t *vars);int io_vars2buffer(unsigned char *buf, int buflen, array_t *vars);
 /*  /*
 * io_buffer2vals() De-marshaling data from buffer to array with variables * io_buffer2vars() De-marshaling data from buffer to array with variables
  * @buf = Buffer   * @buf = Buffer
  * @buflen = Size of buffer   * @buflen = Size of buffer
  * @vnum = Number of variables into buffer   * @vnum = Number of variables into buffer
Line 276  int io_vals2buffer(unsigned char *buf, int buflen, arr Line 313  int io_vals2buffer(unsigned char *buf, int buflen, arr
                 *DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy()                  *DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy()
  * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy()   * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy()
  */   */
array_t *io_buffer2vals(unsigned char *buf, int buflen, int vnum, int zcpy);array_t *io_buffer2vars(unsigned char *buf, int buflen, int vnum, int zcpy);
 /*  /*
 * io_vals2map() Marshaling data from array with variables to memory map * io_vars2map() Marshaling data from array with variables to memory map
  * @buf = Buffer   * @buf = Buffer
  * @buflen = Size of buffer   * @buflen = Size of buffer
  * @vars = Variable array   * @vars = Variable array
  * return: -1 error, 0 nothing done or >0 size of marshaled data   * return: -1 error, 0 nothing done or >0 size of marshaled data
  */   */
int io_vals2map(u_char *buf, int buflen, array_t *vars);int io_vars2map(unsigned char *buf, int buflen, array_t *vars);
 /*  /*
 * io_map2vals() De-marshaling data from memory map to array with variables * io_map2vars() De-marshaling data from memory map to array with variables
  * @buf = Buffer   * @buf = Buffer
  * @buflen = Size of buffer   * @buflen = Size of buffer
  * @vnum = Number of variables into buffer   * @vnum = Number of variables into buffer
Line 294  int io_vals2map(u_char *buf, int buflen, array_t *vars Line 331  int io_vals2map(u_char *buf, int buflen, array_t *vars
                 *DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy()                  *DON'T MODIFY OR DESTROY BUFFER*. =0 call io_arrayFree() before io_arrayDestroy()
  * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy()   * return: =NULL error, !=NULL allocated variable array, after use must free with io_arrayDestroy()
  */   */
array_t *io_map2vals(u_char *buf, int buflen, int vnum, int zcpy);array_t *io_map2vars(unsigned char *buf, int buflen, int vnum, int zcpy);
   
 /*  /*
    * io_allocVars() Allocate ait_val_t array
    * @varnum = Number of variables
    * return: =NULL error or !=NULL allocated array
    */
   inline array_t *io_allocVars(int varnum);
   /*
    * io_clrVars() Clear ait_val_t elements from array
    * @vars = Variable array
    * return: -1 error or size of array
    */
   inline int io_clrVars(array_t * __restrict vars);
   /*
    * io_freeVars() Free ait_val_t array
    * @vars = Variable array
    * return: none
    */
   inline void io_freeVars(array_t ** __restrict vars);
   
   #define io_elemVars(_vars, _n, _val)    ((ait_val_t*) io_arrayElem((_vars), \
                                                           (_n), (void**) (_val)))
   
   /*
  * ioPromptRead() Read data from input h[0] with prompt to output h[1]   * 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   * @h = file handles h[0] = input, h[1] = output, if NULL use stdin, stdout
  * @csPrompt = Prompt before input, may be NULL   * @csPrompt = Prompt before input, may be NULL
Line 344  int ioRegexGet(const char *csRegex, const char *csData Line 403  int ioRegexGet(const char *csRegex, const char *csData
 char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew);  char *ioRegexReplace(const char *csRegex, const char *csData, const char *csNew);
   
 /*  /*
 * ioVarAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}" * ioStrAst() Function for evaluate string like asterisk variable "{text[:[-]#[:#]]}"
  * @csString = Input string   * @csString = Input string
  * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free()   * return: NULL error, !=NULL Allocated new string evaluated from input string, must be free()
 */  */
char *ioVarAst(const char *csString);char *ioStrAst(const char *csString);
   
 /*  /*
  * io_Path2File() Parse and make path/filename pair   * io_Path2File() Parse and make path/filename pair
Line 488  int io_arrayVacuum(array_t * __restrict arr, int fromW Line 547  int io_arrayVacuum(array_t * __restrict arr, int fromW
                                         } while (0)                                          } while (0)
   
 /*  /*
    * io_arrayElem() - Always GET/PUT element into dynamic array, if not enough elements grow array
    * @arr = Array
    * @n = Position
    * @data = Element, if set NULL GET element at position or !=NULL PUT element at position
    * return: -1 error or !=-1 return element at position
    */
   inline void *io_arrayElem(array_t * __restrict arr, int n, void **data);
   /*
  * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position   * io_arrayPush() - Push element into dynamic array like stack manner, place at first empty position
  * @arr = Array   * @arr = Array
  * @data = Element, if set NULL return only first empty position   * @data = Element, if set NULL return only first empty position
Line 866  pid_t ioForkPTY(int *ptyfd, char * __restrict name, in Line 933  pid_t ioForkPTY(int *ptyfd, char * __restrict name, in
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
 inline int ioCreatePIDFile(const char *csName, int ifExists);  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
    * @sndbuf = SO_SNDBUF value, if 0 use default
    * return: 0 error, >0 ok, sended bytes
    */
   size_t ioSendFile(int s, const char *csFile, size_t sendLen, off_t offset, int sndbuf);
   /*
    * 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
    * @rcvbuf = SO_RCVBUF value, if 0 use default
    * return: 0 error, >0 ok, received bytes
    */
   size_t ioRecvFile(int s, const char *csFile, size_t recvLen, int over, int rcvbuf);
   
   
 #endif  #endif

Removed from v.1.12  
changed lines
  Added in v.1.13


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>