mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
667af1ee31
* ext/socket: Wrap struct addrinfo by struct rb_addrinfo. * ext/socket: Bypass getaddrinfo() if node and serv are numeric. Reporeted by Naotoshi Seo. [ruby-core:60801] [Bug #9525] * ext/socket/extconf.rb: Detect struct sockaddr_in6.sin6_len. * ext/socket/sockport.h (SET_SIN6_LEN): New macro. (INIT_SOCKADDR_IN6): Ditto. * ext/socket/rubysocket.h (struct rb_addrinfo): Add allocated_by_malloc field. * ext/socket/raddrinfo.c (numeric_getaddrinfo): New function. (rb_getaddrinfo): Call numeric_getaddrinfo at first. (rb_freeaddrinfo): Free struct addrinfo properly when it is allocated by numeric_getaddrinfo. * ext/socket/raddrinfo.c (numeric_getaddrinfo): Use xcalloc. Suggested by Eric Wong. https://bugs.ruby-lang.org/issues/9525#note-14 * ext/socket/raddrinfo.c (rb_getaddrinfo): second argument of MEMZERO is type. Coverity Scan found this bug. * include/ruby/win32.h, win32/win32.c (rb_w32_inet_pton): add a wrapper function for inet_pton minimum supported client is Vista, as well as inet_ntop. * ext/socket/option.c (inet_pton): use rb_w32_inet_pton, instead of inet_ntop directly, which is unavailable on older version Windows. * ext/socket/raddrinfo.c (inet_pton): use rb_w32_inet_pton, instead of inet_pton directly, which is unavailable on older version Windows. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@47415 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
116 lines
3.1 KiB
C
116 lines
3.1 KiB
C
/************************************************
|
|
|
|
sockport.h -
|
|
|
|
$Author$
|
|
created at: Fri Apr 30 23:19:34 JST 1999
|
|
|
|
************************************************/
|
|
|
|
#ifndef SOCKPORT_H
|
|
#define SOCKPORT_H
|
|
|
|
#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
|
|
# define VALIDATE_SOCKLEN(addr, len) ((addr)->sa_len == (len))
|
|
#else
|
|
# define VALIDATE_SOCKLEN(addr, len) ((void)(addr), (void)(len), 1)
|
|
#endif
|
|
|
|
#ifdef HAVE_STRUCT_SOCKADDR_SA_LEN
|
|
# define SET_SA_LEN(sa, len) (void)((sa)->sa_len = (len))
|
|
#else
|
|
# define SET_SA_LEN(sa, len) (void)(len)
|
|
#endif
|
|
|
|
/* for strict-aliasing rule */
|
|
#ifdef HAVE_STRUCT_SOCKADDR_IN_SIN_LEN
|
|
# define SET_SIN_LEN(sa, len) (void)((sa)->sin_len = (len))
|
|
#else
|
|
# define SET_SIN_LEN(sa, len) SET_SA_LEN((struct sockaddr *)(sa), (len))
|
|
#endif
|
|
|
|
#ifdef HAVE_STRUCT_SOCKADDR_IN6_SIN6_LEN
|
|
# define SET_SIN6_LEN(sa, len) (void)((sa)->sin6_len = (len))
|
|
#else
|
|
# define SET_SIN6_LEN(sa, len) SET_SA_LEN((struct sockaddr *)(sa), (len))
|
|
#endif
|
|
|
|
#define INIT_SOCKADDR(addr, family, len) \
|
|
do { \
|
|
struct sockaddr *init_sockaddr_ptr = (addr); \
|
|
socklen_t init_sockaddr_len = (len); \
|
|
memset(init_sockaddr_ptr, 0, init_sockaddr_len); \
|
|
init_sockaddr_ptr->sa_family = (family); \
|
|
SET_SA_LEN(init_sockaddr_ptr, init_sockaddr_len); \
|
|
} while (0)
|
|
|
|
#define INIT_SOCKADDR_IN(addr, len) \
|
|
do { \
|
|
struct sockaddr_in *init_sockaddr_ptr = (addr); \
|
|
socklen_t init_sockaddr_len = (len); \
|
|
memset(init_sockaddr_ptr, 0, init_sockaddr_len); \
|
|
init_sockaddr_ptr->sin_family = AF_INET; \
|
|
SET_SIN_LEN(init_sockaddr_ptr, init_sockaddr_len); \
|
|
} while (0)
|
|
|
|
#define INIT_SOCKADDR_IN6(addr, len) \
|
|
do { \
|
|
struct sockaddr_in6 *init_sockaddr_ptr = (addr); \
|
|
socklen_t init_sockaddr_len = (len); \
|
|
memset(init_sockaddr_ptr, 0, init_sockaddr_len); \
|
|
init_sockaddr_ptr->sin6_family = AF_INET6; \
|
|
SET_SIN6_LEN(init_sockaddr_ptr, init_sockaddr_len); \
|
|
} while (0)
|
|
|
|
|
|
/* for strict-aliasing rule */
|
|
#ifdef HAVE_TYPE_STRUCT_SOCKADDR_UN
|
|
# ifdef HAVE_STRUCT_SOCKADDR_IN_SUN_LEN
|
|
# define SET_SUN_LEN(sa, len) (void)((sa)->sun_len = (len))
|
|
# else
|
|
# define SET_SUN_LEN(sa, len) SET_SA_LEN((struct sockaddr *)(sa), (len))
|
|
# endif
|
|
# define INIT_SOCKADDR_UN(addr, len) \
|
|
do { \
|
|
struct sockaddr_un *init_sockaddr_ptr = (addr); \
|
|
socklen_t init_sockaddr_len = (len); \
|
|
memset(init_sockaddr_ptr, 0, init_sockaddr_len); \
|
|
init_sockaddr_ptr->sun_family = AF_UNIX; \
|
|
SET_SUN_LEN(init_sockaddr_ptr, init_sockaddr_len); \
|
|
} while (0)
|
|
#endif
|
|
|
|
#ifndef IN_MULTICAST
|
|
# define IN_CLASSD(i) (((long)(i) & 0xf0000000) == 0xe0000000)
|
|
# define IN_MULTICAST(i) IN_CLASSD(i)
|
|
#endif
|
|
|
|
#ifndef IN_EXPERIMENTAL
|
|
# define IN_EXPERIMENTAL(i) ((((long)(i)) & 0xe0000000) == 0xe0000000)
|
|
#endif
|
|
|
|
#ifndef IN_CLASSA_NSHIFT
|
|
# define IN_CLASSA_NSHIFT 24
|
|
#endif
|
|
|
|
#ifndef IN_LOOPBACKNET
|
|
# define IN_LOOPBACKNET 127
|
|
#endif
|
|
|
|
#ifndef AF_UNSPEC
|
|
# define AF_UNSPEC 0
|
|
#endif
|
|
|
|
#ifndef PF_UNSPEC
|
|
# define PF_UNSPEC AF_UNSPEC
|
|
#endif
|
|
|
|
#ifndef PF_INET
|
|
# define PF_INET AF_INET
|
|
#endif
|
|
|
|
#if defined(HOST_NOT_FOUND) && !defined(h_errno) && !defined(__CYGWIN__)
|
|
extern int h_errno;
|
|
#endif
|
|
|
|
#endif
|