X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Ffake-getaddrinfo.c;h=576d79f464047d051755effbb0af85cc4322902c;hp=37a65b894b46c687277753f95b24d4366dc0c184;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=196806f90f40fcc0cf727abd4bed6bc5aefff5ff diff --git a/src/fake-getaddrinfo.c b/src/fake-getaddrinfo.c index 37a65b89..576d79f4 100644 --- a/src/fake-getaddrinfo.c +++ b/src/fake-getaddrinfo.c @@ -2,10 +2,10 @@ * fake library for ssh * * This file includes getaddrinfo(), freeaddrinfo() and gai_strerror(). - * 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. */ @@ -20,10 +20,13 @@ char *gai_strerror(int ecode) { switch(ecode) { case EAI_NODATA: return "No address associated with hostname"; + case EAI_MEMORY: return "Memory allocation failure"; + case EAI_FAMILY: return "Address family not supported"; + default: return "Unknown error"; } @@ -65,11 +68,13 @@ int getaddrinfo(const char *hostname, const char *servname, const struct addrinf int i; uint16_t port = 0; - if(hints && hints->ai_family != AF_INET && hints->ai_family != AF_UNSPEC) + if(hints && hints->ai_family != AF_INET && hints->ai_family != AF_UNSPEC) { return EAI_FAMILY; + } - if(servname) + if(servname) { port = htons(atoi(servname)); + } if(hints && hints->ai_flags & AI_PASSIVE) { *res = malloc_ai(port, htonl(0x00000000)); @@ -83,14 +88,16 @@ int getaddrinfo(const char *hostname, const char *servname, const struct addrinf hp = gethostbyname(hostname); - if(!hp || !hp->h_addr_list || !hp->h_addr_list[0]) + if(!hp || !hp->h_addr_list || !hp->h_addr_list[0]) { return EAI_NODATA; + } for(i = 0; hp->h_addr_list[i]; i++) { *res = malloc_ai(port, ((struct in_addr *)hp->h_addr_list[i])->s_addr); - if(prev) + if(prev) { prev->ai_next = *res; + } prev = *res; }