X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fadns.h;fp=src%2Fadns.h;h=78b78326819b33318ada8aef86136de95d24b21c;hb=b0f1ed648e2df035f8c391ccd4fcbd3410cb1af9;hp=63a46e8b71a3e4841e9918897e3a05500e0dcff7;hpb=504877d15de6fffb18b6f0f286e6cda83fdd01b2;p=adns.git

diff --git a/src/adns.h b/src/adns.h
index 63a46e8..78b7832 100644
--- a/src/adns.h
+++ b/src/adns.h
@@ -684,19 +684,22 @@ void adns_finish(adns_state ads);
 
 #define ADNS_ADDR2TEXT_BUFLEN (INET6_ADDRSTRLEN +1/*%*/ +9/*uint32*/ +1/*nul*/)
 
-int adns_addr2text(adns_state ads /* may be 0!  used for debug log only */,
-		   const struct sockaddr *sa, socklen_t salen,
+int adns_text2addr(const char *addr, uint16_t port, struct sockaddr *sa,
+		   socklen_t *salen /* set if OK or ENOSPC; otherwise undef */);
+int adns_addr2text(const struct sockaddr *sa,
 		   char *addr_buffer, int *addr_buflen /* set iff ENOSPC */,
-		   int *port_r);
-int adns_text2addr(adns_state ads /* may be 0!  used for debug log only */,
-		   const char *addr, int port, struct sockaddr *sa,
-		   socklen_t *salen /* set if OK or ENOSPC */);
+		   int *port_r /* may be 0 */);
   /* These DO NOT return an adns_status.  Instead, 0 on success,
    * or an errno value on failure.  Error values are:
    *   EAFNOSUPPORT addr2text only
-   *   EINVAL       addr has invalid syntax
+   *   EINVAL       text2addr only: addr has invalid syntax
    *   ENOSPC       only if *buflen < _BUFLEN or *salen < sizeof(adns_sockaddr)
-   *   ENXIO        addr specifies a scope name and if_nametoindex failed
+   * Extra errors are possible from text2addr if addr specifies a scope
+   * name suffix (ie, it has a "%" and the scope suffix is not numeric):
+   *   ENOSYS       address is not link local
+   *   ENXIO        if_nametoindex said it wasn't a valid name
+   *   EIO          if_nametoindex went crazy (adns prints a message to stderr)
+   *   any other    if_nametoindex failed
    * port is always in host byte order and is simply copied to and
    * from the appropriate sockaddr field (byteswapped as necessary).
    */