[BACK]Return to aitio.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libaitio / inc

Diff for /libaitio/inc/aitio.h between versions 1.11.2.15 and 1.12.2.12

version 1.11.2.15, 2011/09/19 22:41:04 version 1.12.2.12, 2011/12/12 15:31:18
Line 47  SUCH DAMAGE. Line 47  SUCH DAMAGE.
 #define __AITIO_H  #define __AITIO_H
   
   
   #define COMPAT_43TTY
   
 #include <assert.h>  #include <assert.h>
 #include <openssl/evp.h>  #include <openssl/evp.h>
   #include <openssl/aes.h>
   #include <sys/tty.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 115  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 227  typedef struct { Line 237  typedef struct {
                                                 AIT_LEN(__val) = 0; \                                                  AIT_LEN(__val) = 0; \
                                         } while (0)                                          } while (0)
   
   struct io_ether_addr {
           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 235  inline const char *io_GetError(); Line 259  inline const char *io_GetError();
   
   
 /*  /*
 * io_vals2buffer() Marshaling data from array with variables to buffer * io_ether_ntoa() Convert ethernet address to string
  * @n = ethernet address structure, like struct ether_addr
  * @a = string
  * @len = string length
  * return: NULL error or !=NULL string a
  */
 inline char *io_ether_ntoa(const struct io_ether_addr *n, char * __restrict a, int len);
 /*
  * io_ether_aton() Convert string to ethernet address
  * @a = string
  * @e = ethernet address structure, like struct ether_addr
  * return: NULL error or !=NULL ethernet address structure
  */
 inline struct io_ether_addr *io_ether_aton(const char *a, struct io_ether_addr *e);
 
 /*
  * 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 251  int io_vals2buffer(unsigned char *buf, int buflen, arr Line 291  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(u_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 269  int io_vals2map(u_char *buf, int buflen, array_t *vars Line 309  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(u_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(u_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 319  int ioRegexGet(const char *csRegex, const char *csData Line 381  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 463  int io_arrayVacuum(array_t * __restrict arr, int fromW Line 525  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 749  int ioCipher(unsigned char *pInput, int inLen, unsigne Line 819  int ioCipher(unsigned char *pInput, int inLen, unsigne
 */  */
 int io_Blowfish(unsigned char *pInput, int inLen, unsigned char **ppOutput,   int io_Blowfish(unsigned char *pInput, int inLen, unsigned char **ppOutput, 
                 unsigned char *pKey, unsigned char *pIV, int nMode);                  unsigned char *pKey, unsigned char *pIV, int nMode);
   /*
    * io_ctr_AES() Encrypt/Decrypt stream cipher CTR_AES
    * @pInput = Input buffer with ASCII
    * @inLen = Input buffer data length
    * @ppOutput = Output buffer with cipher data, must be free after use
    * @pKey = Key
    * @IV = IVector/Nonce/Counter, Warning: IV must be variable, because we write there!!!
    * return: -1 error or >-1 how many cipher blocks proceeded
    */
   int io_ctr_AES(unsigned char *pInput, int inLen, unsigned char **ppOutput, 
                   unsigned char *pKey, unsigned char IV[AES_BLOCK_SIZE]);
   
   
 /*  /*
 * ioAllocPTY() Allocate new PTY * ioAllocPTY() Allocate new PTY and TTY
  * @ptyfd = master fd, pty   * @ptyfd = master fd, pty
  * @ttyfd = slave fd, tty   * @ttyfd = slave fd, tty
  * @name = tty device name if not null   * @name = tty device name if not null
Line 764  int io_Blowfish(unsigned char *pInput, int inLen, unsi Line 845  int io_Blowfish(unsigned char *pInput, int inLen, unsi
 inline int ioAllocPTY(int *ptyfd, int *ttyfd, char * __restrict name, int namesiz,   inline int ioAllocPTY(int *ptyfd, int *ttyfd, char * __restrict name, int namesiz, 
                 struct termios * __restrict term, struct winsize * __restrict winz);                  struct termios * __restrict term, struct winsize * __restrict winz);
 /*  /*
 * ioFreePTY() Release PTY * ioFreePTY() Release PTY and TTY device
  * @ptyfd = master fd, pty (==-1 skip closing pty)
  * @ttyname = tty filename   * @ttyname = tty filename
  * return: none   * return: none
  */   */
inline void ioFreePTY(const char *ttyname);inline void ioFreePTY(int ptyfd, const char *ttyname);
 /*  /*
  * ioChgWinPTY() Change window size of PTY   * ioChgWinPTY() Change window size of PTY
  * @ptyfd = master fd, pty   * @ptyfd = master fd, pty
Line 778  inline void ioFreePTY(const char *ttyname); Line 860  inline void ioFreePTY(const char *ttyname);
  * @ypxl = y pixels   * @ypxl = y pixels
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
inline int ioChgWinPTY(int ptyfd, u_short row, u_short col, u_short xpxl, u_short ypxl);inline int ioChgWinPTY(int ptyfd, unsigned short row, unsigned short col, 
                 unsigned short xpxl, unsigned short ypxl);
 /*  /*
 * ioSetOwnerPTY() Set owner to PTY * ioSetOwnerTTY() Set owner to TTY
  * @ttyname = tty filename   * @ttyname = tty filename
  * @UID = uid   * @UID = uid
  * @GID = gid   * @GID = gid
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
int ioSetOwnerPTY(const char *ttyname, uid_t UID, gid_t GID);int ioSetOwnerTTY(const char *ttyname, uid_t UID, gid_t GID);
 /*
  * ioSetSidTTY() Makes the process's controlling TTY and sets it to sane modes.
  * @ttyfd = slave fd, tty
  * @ttyname = tty filename
  * return: -1 error or 0 ok
  */
 int ioSetSidTTY(int *ttyfd, const char *ttyname);
 /*
  * ioSetRAWMode() Enter into RAW mode
  * @fd = tty fd
  * @otio = saved old termios for later restore if !=NULL
  * return: -1 error or 0 ok
  */
 inline int ioSetRAWMode(int fd, struct termios *otio);
 /*
  * ioRestoreMode() Restore termios to tty fd
  * @fd = tty fd
  * @tio = termios structure for restore
  * return: -1 error or 0 ok
  */
 inline int ioRestoreMode(int fd, struct termios tio);
 /*
  * ioForkPTY() Fork new process with session leader and new TTY
  * @ptyfd = master fd, pty
  * @name = tty device name if not null
  * @namesiz = name length, must be above 63 bytes.
  * @term = termios for terminal
  * @winz = winsize for terminal
  * @otio = old termios structure for restore
  * return: -1 error, 0 child process or >0 parent: pid of child
  */
 pid_t ioForkPTY(int *ptyfd, char * __restrict name, int namesiz, struct termios * __restrict term, 
                 struct winsize * __restrict winz, struct termios * __restrict otio);
 
 /*
  * ioCreatePIDFile() Create PID file
  * @csName = PID filename
  * @ifExists = !=0 if filename exists return error
  * return: -1 error or 0 ok
  */
 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.11.2.15  
changed lines
  Added in v.1.12.2.12

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