diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/socket/getnameinfo.c | 18 | ||||
| -rw-r--r-- | ext/socket/option.c | 6 | ||||
| -rw-r--r-- | ext/socket/rubysocket.h | 8 | ||||
| -rw-r--r-- | version.h | 2 |
5 files changed, 15 insertions, 24 deletions
@@ -1,3 +1,8 @@ +Tue Aug 16 13:59:34 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/socket/option.c, ext/socket/rubysocket.h (inet_ntop): share + the fallback definition. [ruby-core:76646] [Bug #12645] + Tue Aug 16 13:52:42 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * vm.c (vm_set_main_stack): remove unnecessary check. toplevel diff --git a/ext/socket/getnameinfo.c b/ext/socket/getnameinfo.c index 4da9680ccb..c238c8e501 100644 --- a/ext/socket/getnameinfo.c +++ b/ext/socket/getnameinfo.c @@ -118,24 +118,6 @@ static struct afd { #define ENI_FAMILY 5 #define ENI_SALEN 6 -#ifndef HAVE_INET_NTOP -static const char * -inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len) -{ -#ifdef HAVE_INET_NTOA - struct in_addr in; - memcpy(&in.s_addr, addr, sizeof(in.s_addr)); - snprintf(numaddr, numaddr_len, "%s", inet_ntoa(in)); -#else - unsigned long x = ntohl(*(unsigned long*)addr); - snprintf(numaddr, numaddr_len, "%d.%d.%d.%d", - (int) (x>>24) & 0xff, (int) (x>>16) & 0xff, - (int) (x>> 8) & 0xff, (int) (x>> 0) & 0xff); -#endif - return numaddr; -} -#endif - int getnameinfo(const struct sockaddr *sa, socklen_t salen, char *host, socklen_t hostlen, char *serv, socklen_t servlen, int flags) { diff --git a/ext/socket/option.c b/ext/socket/option.c index c6f5717a44..ebec81ad13 100644 --- a/ext/socket/option.c +++ b/ext/socket/option.c @@ -648,7 +648,7 @@ inspect_timeval_as_interval(int level, int optname, VALUE data, VALUE ret) */ #if !defined HAVE_INET_NTOP && ! defined _WIN32 -static const char * +const char * inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len) { #ifdef HAVE_INET_NTOA @@ -663,10 +663,6 @@ inet_ntop(int af, const void *addr, char *numaddr, size_t numaddr_len) #endif return numaddr; } -#elif defined __MINGW32__ -# define inet_ntop(f,a,n,l) rb_w32_inet_ntop(f,a,n,l) -#elif defined _MSC_VER && RUBY_MSVCRT_VERSION < 90 -const char *WSAAPI inet_ntop(int, const void *, char *, size_t); #endif /* Although the buffer size needed depends on the prefixes, "%u" may generate "4294967295". */ diff --git a/ext/socket/rubysocket.h b/ext/socket/rubysocket.h index 8beffd2e76..84b971c04e 100644 --- a/ext/socket/rubysocket.h +++ b/ext/socket/rubysocket.h @@ -412,4 +412,12 @@ static inline void rsock_maybe_wait_fd(int fd) { } # define rsock_maybe_wait_fd(fd) rb_thread_wait_fd((fd)) #endif +#if !defined HAVE_INET_NTOP && ! defined _WIN32 +const char *inet_ntop(int, const void *, char *, size_t); +#elif defined __MINGW32__ +# define inet_ntop(f,a,n,l) rb_w32_inet_ntop(f,a,n,l) +#elif defined _MSC_VER && RUBY_MSVCRT_VERSION < 90 +const char *WSAAPI inet_ntop(int, const void *, char *, size_t); +#endif + #endif @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.6" #define RUBY_RELEASE_DATE "2016-08-16" -#define RUBY_PATCHLEVEL 354 +#define RUBY_PATCHLEVEL 355 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 8 |