Require OpenSSL 1.1.0 or later.

[tinc] / src / fake-getnameinfo.c

diff --git a/src/fake-getnameinfo.c b/src/fake-getnameinfo.c
index 8047173..e51bce2 100644 (file)
--- a/src/fake-getnameinfo.c
+++ b/src/fake-getnameinfo.c
@@ -2,10 +2,10 @@
  * fake library for ssh
  *
  * This file includes getnameinfo().
- * These funtions are defined in rfc2133.
+ * These functions are defined in rfc2133.
  *
  * But these functions are not implemented correctly. The minimum subset
- * is implemented for ssh use only. For exapmle, this routine assumes
+ * is implemented for ssh use only. For example, this routine assumes
  * that ai_family is AF_INET. Don't use it for another purpose.
  */
 
@@ -16,39 +16,48 @@
 
 #if !HAVE_DECL_GETNAMEINFO
 
-int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags)
-{
+int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags) {
        struct sockaddr_in *sin = (struct sockaddr_in *)sa;
        struct hostent *hp;
        int len;
 
-       if(sa->sa_family != AF_INET)
+       if(sa->sa_family != AF_INET) {
                return EAI_FAMILY;
+       }
 
        if(serv && servlen) {
                len = snprintf(serv, servlen, "%d", ntohs(sin->sin_port));
-               if(len < 0 || len >= servlen)
+
+               if(len < 0 || len >= servlen) {
                        return EAI_MEMORY;
+               }
        }
 
-       if(!host || !hostlen)
+       if(!host || !hostlen) {
                return 0;
+       }
 
        if(flags & NI_NUMERICHOST) {
                len = snprintf(host, hostlen, "%s", inet_ntoa(sin->sin_addr));
-               if(len < 0 || len >= hostlen)
+
+               if(len < 0 || len >= hostlen) {
                        return EAI_MEMORY;
+               }
+
                return 0;
        }
 
        hp = gethostbyaddr((char *)&sin->sin_addr, sizeof(struct in_addr), AF_INET);
-       
-       if(!hp || !hp->h_name || !hp->h_name[0])
+
+       if(!hp || !hp->h_name || !hp->h_name[0]) {
                return EAI_NODATA;
-       
+       }
+
        len = snprintf(host, hostlen, "%s", hp->h_name);
-       if(len < 0 || len >= hostlen)
+
+       if(len < 0 || len >= hostlen) {
                return EAI_MEMORY;
+       }
 
        return 0;
 }