Diff for /libaitio/inc/aitio.h between versions 1.40 and 1.42.2.2

version 1.40, 2014/02/08 22:06:16 version 1.42.2.2, 2019/10/08 13:00:42
Line 12  terms: Line 12  terms:
 All of the documentation and software included in the ELWIX and AITNET  All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>  Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
   
Copyright 2004 - 2014Copyright 2004 - 2019
         by Michael Pounov <misho@elwix.org>.  All rights reserved.          by Michael Pounov <misho@elwix.org>.  All rights reserved.
   
 Redistribution and use in source and binary forms, with or without  Redistribution and use in source and binary forms, with or without
Line 51  SUCH DAMAGE. Line 51  SUCH DAMAGE.
   
 #include <assert.h>  #include <assert.h>
 #include <syslog.h>  #include <syslog.h>
#include <openssl/evp.h>#include <openssl/crypto.h>
 #include <openssl/aes.h>  #include <openssl/aes.h>
#include <sys/tty.h>#include <openssl/evp.h>
#include <sys/ioctl_compat.h>#if OPENSSL_VERSION_NUMBER >= 0x10100000L
         #include <openssl/modes.h>
 #endif
 #include <sys/socket.h>  #include <sys/socket.h>
 #include <sys/un.h>  #include <sys/un.h>
 #include <sys/uio.h>  #include <sys/uio.h>
   #ifndef __linux__
   #include <sys/tty.h>
   #include <sys/ioctl_compat.h>
 #include <net/if_dl.h>  #include <net/if_dl.h>
 #include <net/bpf.h>  #include <net/bpf.h>
   #endif
 #include <netinet/in.h>  #include <netinet/in.h>
 #include <elwix.h>  #include <elwix.h>
 #include <aitsched.h>  #include <aitsched.h>
   
   
   #if OPENSSL_VERSION_NUMBER >= 0x10100000L
   #ifndef evp_cipher_ctx_st
   struct evp_cipher_ctx_st {
       const EVP_CIPHER *cipher;
       ENGINE *engine;             /* functional reference if 'cipher' is
                                    * ENGINE-provided */
       int encrypt;                /* encrypt or decrypt */
       int buf_len;                /* number we have left */
       unsigned char oiv[EVP_MAX_IV_LENGTH]; /* original iv */
       unsigned char iv[EVP_MAX_IV_LENGTH]; /* working iv */
       unsigned char buf[EVP_MAX_BLOCK_LENGTH]; /* saved partial block */
       int num;                    /* used by cfb/ofb/ctr mode */
       /* FIXME: Should this even exist? It appears unused */
       void *app_data;             /* application stuff */
       int key_len;                /* May change for variable length cipher */
       unsigned long flags;        /* Various flags */
       void *cipher_data;          /* per EVP data */
       int final_used;
       int block_mask;
       unsigned char final[EVP_MAX_BLOCK_LENGTH]; /* possible final block */
   } /* EVP_CIPHER_CTX */ ;
   #endif
   #endif
   
 #ifndef STRSIZ  #ifndef STRSIZ
 #define STRSIZ                  256  #define STRSIZ                  256
 #endif  #endif
Line 631  FILE *io_fd2buf(int fd, const char *mode); Line 661  FILE *io_fd2buf(int fd, const char *mode);
  * return: -1 error or open file handle   * return: -1 error or open file handle
  */   */
 int io_dumbFile(const char *csFile, int mode, off_t size);  int io_dumbFile(const char *csFile, int mode, off_t size);
   #define io_emptyFile io_dumbFile
   
   
 /*  /*
  * io_get1stiface() - Get first interface of host  
  *  
  * @szIface = interface string buffer  
  * @iflen = size of interface buffer  
  * 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   * io_etherOpen() - Open BPF interface to device
  *   *
  * @csIface = interface name   * @csIface = interface name
  * @flags = open flags   * @flags = open flags
  * @whdr = with complete headers   * @whdr = with complete headers
 * @wdlt = with data link type * @wdlt = with data link type, on Linux is protocol number
  * @buflen = buffer length   * @buflen = buffer length
  * @zcbuf = zero copy buffer, if BPF supports it and isn't NULL   * @zcbuf = zero copy buffer, if BPF supports it and isn't NULL
  * return: -1 error or >-1 bpf handle   * return: -1 error or >-1 bpf handle
Line 671  int io_etherOpen(const char *csIface, int flags, unsig Line 686  int io_etherOpen(const char *csIface, int flags, unsig
  */   */
 void io_etherClose(int eth, void **zcbuf);  void io_etherClose(int eth, void **zcbuf);
   
   #ifndef __linux__
 /*  /*
  * io_etherFilter() - BPF filter routine   * io_etherFilter() - BPF filter routine
  *   *
Line 682  void io_etherClose(int eth, void **zcbuf); Line 698  void io_etherClose(int eth, void **zcbuf);
  * return: -1 error or 0 ok   * return: -1 error or 0 ok
  */   */
 int io_etherFilter(int eth, int io, struct bpf_insn * __restrict insn, size_t insnlen);  int io_etherFilter(int eth, int io, struct bpf_insn * __restrict insn, size_t insnlen);
   #endif
   
 /*  /*
  * io_etherSend() - Send packet to bpf   * io_etherSend() - Send packet to bpf

Removed from v.1.40  
changed lines
  Added in v.1.42.2.2


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