From e485a566ed8d5d8670641909319161632f9647c9 Mon Sep 17 00:00:00 2001 From: akr Date: Thu, 1 Jan 2009 11:47:55 +0000 Subject: * ext/socket/socket.c (sock_s_getaddrinfo): use family_to_int. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21247 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/socket/socket.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'ext') diff --git a/ext/socket/socket.c b/ext/socket/socket.c index 6561c89b98..623a5a79fe 100644 --- a/ext/socket/socket.c +++ b/ext/socket/socket.c @@ -3252,14 +3252,10 @@ sock_s_getaddrinfo(int argc, VALUE *argv) hints.ai_family = FIX2INT(family); } else if ((ap = StringValuePtr(family)) != 0) { - if (strcmp(ap, "AF_INET") == 0) { - hints.ai_family = PF_INET; - } -#ifdef INET6 - else if (strcmp(ap, "AF_INET6") == 0) { - hints.ai_family = PF_INET6; - } -#endif + int af; + if (family_to_int(ap, RSTRING_LEN(family), &af) == -1) + rb_raise(rb_eSocket, "unknown socket domain %s", ap); + hints.ai_family = af; } if (!NIL_P(socktype)) { -- cgit v1.2.3