[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.10 and 1.12.2.3

version 1.11.2.10, 2011/09/01 08:13:10 version 1.12.2.3, 2011/11/02 13:13:48
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 160  typedef struct { Line 169  typedef struct {
                                                         __val->val_type = buffer; AIT_LEN(__val) = _len; \                                                          __val->val_type = buffer; AIT_LEN(__val) = _len; \
                                                         memcpy(__val->val.buffer, (_v), _len); \                                                          memcpy(__val->val.buffer, (_v), _len); \
                                                 } } while (0)                                                  } } while (0)
#define AIT_SET_STR(_vl, _v)            do { ait_val_t *__val = (_vl); assert(__val); \#define AIT_SET_STR(_vl, _v)            do { ait_val_t *__val = (_vl); assert(__val); assert((_v)); \
                                                 __val->val.string = (int8_t*) strdup((_v)); \                                                  __val->val.string = (int8_t*) strdup((_v)); \
                                                 if (__val->val.string) { \                                                  if (__val->val.string) { \
                                                         __val->val_type = string; \                                                          __val->val_type = string; \
Line 172  typedef struct { Line 181  typedef struct {
 #define AIT_SET_BLOB2(_vl, _bv)         do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \  #define AIT_SET_BLOB2(_vl, _bv)         do { ait_val_t *__val = (_vl); assert(__val); assert((_bv)); \
                                                 __val->val_type = blob; AIT_LEN(__val) = (_bv)->blob_len; \                                                  __val->val_type = blob; AIT_LEN(__val) = (_bv)->blob_len; \
                                                 __val->val.blob = (_bv)->blob_var; } while (0)                                                  __val->val.blob = (_bv)->blob_var; } while (0)
   #define AIT_NEW_BLOB(_vl, _len)         AIT_SET_BLOB((_vl), 0, _len)
   
 #define AIT_SET_U8(_vl, _n)             do { ait_val_t *__val = (_vl); assert(__val); \  #define AIT_SET_U8(_vl, _n)             do { ait_val_t *__val = (_vl); assert(__val); \
                                                 __val->val_type = u8; __val->val.u8 = _n; \                                                  __val->val_type = u8; __val->val.u8 = _n; \
Line 226  typedef struct { Line 236  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 234  inline const char *io_GetError(); Line 258  inline const char *io_GetError();
   
   
 /*  /*
    * 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_vals2buffer() Marshaling data from array with variables to buffer   * io_vals2buffer() Marshaling data from array with variables to buffer
  * @buf = Buffer   * @buf = Buffer
  * @buflen = Size of buffer   * @buflen = Size of buffer
Line 251  int io_vals2buffer(unsigned char *buf, int buflen, arr Line 291  int io_vals2buffer(unsigned char *buf, int buflen, arr
  * 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_buffer2vals(unsigned char *buf, int buflen, int vnum, int zcpy);
   /*
    * io_vals2map() Marshaling data from array with variables to memory map
    * @buf = Buffer
    * @buflen = Size of buffer
    * @vars = Variable array
    * return: -1 error, 0 nothing done or >0 size of marshaled data
    */
   int io_vals2map(u_char *buf, int buflen, array_t *vars);
   /*
    * io_map2vals() De-marshaling data from memory map to array with variables
    * @buf = Buffer
    * @buflen = Size of buffer
    * @vnum = Number of variables into buffer
    * @zcpy = Zero-copy for variables, if !=0 don't use io_arrayFree() for free variables and 
                   *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()
    */
   array_t *io_map2vals(u_char *buf, int buflen, int vnum, int zcpy);
   
 /*  /*
  * 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]
Line 730  int ioCipher(unsigned char *pInput, int inLen, unsigne Line 788  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 and TTY
    * @ptyfd = master fd, pty
    * @ttyfd = slave fd, tty
    * @name = tty device name if not null
    * @namesiz = name length, must be above 63 bytes.
    * @term = termios for terminal
    * @winz = winsize for terminal
    * return: -1 error or 0 ok
    */
   inline int ioAllocPTY(int *ptyfd, int *ttyfd, char * __restrict name, int namesiz, 
                   struct termios * __restrict term, struct winsize * __restrict winz);
   /*
    * ioFreePTY() Release PTY and TTY device
    * @ptyfd = master fd, pty (==-1 skip closing pty)
    * @ttyname = tty filename
    * return: none
    */
   inline void ioFreePTY(int ptyfd, const char *ttyname);
   /*
    * ioChgWinPTY() Change window size of PTY
    * @ptyfd = master fd, pty
    * @row = row
    * @col = col
    * @xpxl = x pixels
    * @ypxl = y pixels
    * return: -1 error or 0 ok
    */
   inline int ioChgWinPTY(int ptyfd, unsigned short row, unsigned short col, 
                   unsigned short xpxl, unsigned short ypxl);
   /*
    * ioSetOwnerTTY() Set owner to TTY
    * @ttyname = tty filename
    * @UID = uid
    * @GID = gid
    * return: -1 error or 0 ok
    */
   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
    * return: 0 error, >0 ok, sended bytes
    */
   size_t ioSendFile(int s, const char *csFile, size_t sendLen, off_t offset);
   /*
    * 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
    * return: 0 error, >0 ok, received bytes
    */
   size_t ioRecvFile(int s, const char *csFile, size_t recvLen, int over);
   
   
 #endif  #endif
Removed from v.1.11.2.10  
changed lines
  Added in v.1.12.2.3

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