[BACK]Return to anet.h CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / libelwix / inc / elwix

Diff for /libelwix/inc/elwix/anet.h between versions 1.3 and 1.14

version 1.3, 2013/06/03 14:00:26 version 1.14, 2017/01/09 12:53:18
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, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013Copyright 2004 - 2016
         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 48  SUCH DAMAGE. Line 48  SUCH DAMAGE.
   
   
 struct e_ether_addr {  struct e_ether_addr {
        u_int8_t ether_addr_octet[6];        u_int8_t octet[6];
 };  };
 typedef struct e_ether_addr ether_addr_t;  typedef struct e_ether_addr ether_addr_t;
   
Line 58  typedef union { Line 58  typedef union {
         struct sockaddr_un      sun;          struct sockaddr_un      sun;
         struct sockaddr_in      sin;          struct sockaddr_in      sin;
         struct sockaddr_in6     sin6;          struct sockaddr_in6     sin6;
   #ifndef __linux__
         struct sockaddr_dl      sdl;          struct sockaddr_dl      sdl;
   #else
           struct sockaddr_ll      sll;
   #endif
 } sockaddr_t;  } sockaddr_t;
 #define E_SOCKADDR_INIT { .ss = { 0 } }  #define E_SOCKADDR_INIT { .ss = { 0 } }
   #define E_SOCKADDR_MAX  MIN(sizeof(sockaddr_t), 0xff)
   
 typedef union {  typedef union {
         union {          union {
Line 84  typedef struct { Line 89  typedef struct {
  * return: -1 interrupted by signal or 0 ok   * return: -1 interrupted by signal or 0 ok
  */   */
 int e_usleep(unsigned int usec);  int e_usleep(unsigned int usec);
   #ifndef __linux__
 /*  /*
    * e_link_addr() - String ethernet address to link address
    *
    * @mac = ethernet address
    * @sdl = link address
    * return: -1 error or 0 ok
    */
   int e_link_addr(const char *mac, struct sockaddr_dl * __restrict sdl);
   /*
    * e_link_ntoa() - String ethernet address from link address
    *
    * @sdl = link address
    * return: =NULL error or !=NULL ethernet address, should be e_free()
    */
   char *e_link_ntoa(const struct sockaddr_dl *sdl);
   #endif
   /*
  * e_ether_ntoa() - Convert ethernet address to string   * e_ether_ntoa() - Convert ethernet address to string
  *   *
  * @n = ethernet address structure, like struct ether_addr   * @n = ethernet address structure, like struct ether_addr
Line 92  int e_usleep(unsigned int usec); Line 114  int e_usleep(unsigned int usec);
  * @len = string length   * @len = string length
  * return: NULL error or !=NULL string a   * return: NULL error or !=NULL string a
  */   */
char *e_ether_ntoa(const struct e_ether_addr *n, char * __restrict a, int len);char *e_ether_ntoa(const ether_addr_t * __restrict n, char * __restrict a, int len);
 /*  /*
  * e_ether_aton() - Convert string to ethernet address   * e_ether_aton() - Convert string to ethernet address
  *   *
Line 100  char *e_ether_ntoa(const struct e_ether_addr *n, char  Line 122  char *e_ether_ntoa(const struct e_ether_addr *n, char 
  * @e = ethernet address structure, like struct ether_addr   * @e = ethernet address structure, like struct ether_addr
  * return: NULL error or !=NULL ethernet address structure   * return: NULL error or !=NULL ethernet address structure
  */   */
struct e_ether_addr *e_ether_aton(const char *a, struct e_ether_addr *e);ether_addr_t *e_ether_aton(const char *a, ether_addr_t * __restrict e);
 /*  /*
  * e_n2port() - Extract port from network structure   * e_n2port() - Extract port from network structure
  *   *
Line 122  const char *e_n2addr(sockaddr_t * __restrict addr, ait Line 144  const char *e_n2addr(sockaddr_t * __restrict addr, ait
  * @psHost = Hostname   * @psHost = Hostname
  * @port = Port   * @port = Port
  * @addr = Network address structure   * @addr = Network address structure
 * return: NULL error or !=NULL network structure * return: 0 is error or >0 length of network structure
  */   */
sockaddr_t *e_gethostbyname(const char *psHost, unsigned short port, socklen_t e_gethostbyname(const char *psHost, unsigned short port, 
                 sockaddr_t * __restrict addr);                  sockaddr_t * __restrict addr);
 /*  /*
    * e_addrlen() - Get address length from network structure
    *
    * @addr = address
    * return: 0 is error or >0 length of network structure
    */
   socklen_t e_addrlen(const sockaddr_t *addr);
   /*
  * e_addrcmp() - Compare network addresses   * e_addrcmp() - Compare network addresses
  *   *
  * @a = 1st address   * @a = 1st address
Line 143  int e_addrcmp(sockaddr_t * __restrict a, sockaddr_t *  Line 172  int e_addrcmp(sockaddr_t * __restrict a, sockaddr_t * 
  * return: -1 error, 0 match or 1 not match   * return: -1 error, 0 match or 1 not match
  */   */
 int e_innet(netaddr_t * __restrict net, inaddr_t * __restrict addr);  int e_innet(netaddr_t * __restrict net, inaddr_t * __restrict addr);
   /*
    * e_getnet() - Get network from string
    *
    * @net = Network string (format: <net[/cidr]>)
    * return: NULL error or !=NULL network should be e_free()
    */
   netaddr_t *e_getnet(const char *net);
   /*
    * e_ether_addr() - Get or set ethernet address from interface name
    *
    * @ifname = interface name
    * @addr = if addr is !=NULL then set new ethernet address
    * return: NULL error or !=NULL get current ethernet address should be e_free()
    */
   ether_addr_t *e_ether_addr(const char *ifname, ether_addr_t * __restrict addr);
   /*
    * e_get1stiface() - Get first interface of host
    *
    * @szIface = interface string buffer
    * @iflen = size of interface buffer
    * return: -1 error or 0 ok
    */
   int e_get1stiface(char *szIface, int iflen);
   #ifndef __linux__
   /*
    * e_getifacebyname() - Get interface and make network structure
    *
    * @psIface = Interface, if =NULL first interface
    * @addr = Network address structure
    * return: NULL error or !=NULL network structure
    */
   sockaddr_t *e_getifacebyname(const char *psIface, sockaddr_t * __restrict addr);
   /*
    * e_getlinkbyname() - Get host ethernet address and make network structure
    *
    * @psHost = Host ethernet address
    * @addr = Network address structure
    * return: NULL error or !=NULL network structure
    */
   sockaddr_t *e_getlinkbyname(const char *psHost, sockaddr_t * __restrict addr);
   /*
    * e_getlinkbyether() - Get ethernet address and make network structure
    *
    * @mac = Ethernet address
    * @idx = Interface index
    * @type = Interface type
    * @iface = Interface name
    * @addr = Network address structure
    * return: NULL error or !=NULL network structure
    */
   sockaddr_t *e_getlinkbyether(const ether_addr_t * __restrict mac, unsigned short idx, 
                   unsigned char type, const char *iface, sockaddr_t * __restrict addr);
   #define e_getlinkbymac(_mac, _addr)     e_getlinkbyether((_mac), 0, 0, NULL, (_addr))
   #endif
   
   
 #endif  #endif
Removed from v.1.3  
changed lines
  Added in v.1.14

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