1998-01-16 07:13:05 -05:00
|
|
|
/************************************************
|
|
|
|
|
|
|
|
socket.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
$Date$
|
|
|
|
created at: Thu Mar 31 12:21:29 JST 1994
|
|
|
|
|
2001-02-15 01:01:00 -05:00
|
|
|
Copyright (C) 1993-2001 Yukihiro Matsumoto
|
2000-05-09 00:53:16 -04:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
************************************************/
|
|
|
|
|
|
|
|
#include "ruby.h"
|
1999-01-19 23:59:39 -05:00
|
|
|
#include "rubyio.h"
|
|
|
|
#include "rubysig.h"
|
* gc.c (Init_stack): stack region is far smaller than usual if
pthread is used.
* marshal.c (w_extended): singleton methods should not be checked
when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
* file.c (getcwdofdrv): avoid using getcwd() directly, use
my_getcwd() instead.
* merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
<sunshine@sunshineco.com>. [ruby-core:01596]
* marshal.c (w_object): LINK check earlier than anything else,
i.e. do not dump TYPE_IVAR for already dumped objects.
(ruby-bugs PR#1220)
* eval.c (rb_eval): call "inherited" only when a new class is
generated; not on reopening.
* eval.c (eval): prepend error position in evaluating string to
* configure.in: revived NextStep, OpenStep, and Rhapsody ports which
had become unbuildable; enhanced --enable-fat-binary option so that
it accepts a list of desired architectures (rather than assuming a
fixed list), or defaults to a platform-appropriate list if user does
not provide an explicit list; made the default list of architectures
for MAB (fat binary) more comprehensive; now uses -fno-common even
when building the interpreter (in addition to using it for
extensions), thus allowing the interpreter to be embedded into a
plugin module of an external project (in addition to allowing
embedding directly into an application); added checks for
<netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
ensures that -I/usr/local/include is employed when extensions'
extconf.rb scripts invoke have_header() since extension checks on
NextStep and OpenStep will fail without it if the desired resource
resides in the /usr/local tree; fixed formatting of --help message.
* Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
(see configure's --enable-fat-binary option); added rule for new
missing/getcwd.c.
* defines.h: fixed endian handling during MAB build (see configure's
--enable-fat-binary option) to ensure that all portions of the
project see the correct WORDS_BIGENDIAN value (some extension modules
were getting the wrong endian setting); added missing constants
GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
define in NeXT section.
* dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
NextStep since, on some installations, this value always resolves
uselessly to zero.
* dln.c: added error reporting to NextStep extension loader since the
previous behavior of failing silently was not useful; now ensures
that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
on Rhapsody since this header lacks multiple-include protection,
which resulted in "redefinition" compilation errors.
* main.c: also create hard reference to objc_msgSend() on NeXT
platforms (in addition to Apple platforms).
* lib/mkmf.rb: now exports XCFLAGS from configure script to extension
makefiles so that extensions can be built MAB (see configure's
--enable-fat-binary option); also utilize XCFLAGS in cc_command()
(but not cpp_command() because MAB flags are incompatible with
direct invocation of `cpp').
* ext/curses/extconf.rb: now additionally checks for presence of these
curses functions which are not present on NextStep or Openstep:
bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
wscrl(), wsetscrreg()
* ext/curses/curses.c: added appropriate #ifdef's for additional set of
curses functions now checked by extconf.rb; fixed curses_bkgd() and
window_bkgd() to correctly return boolean result rather than numeric
result; fixed window_getbkgd() to correctly signal an error by
returning nil rather than -1.
* ext/etc/etc.c: setup_passwd() and setup_group() now check for null
pointers before invoking rb_tainted_str_new2() upon fields extracted
from `struct passwd' and `struct group' since null pointers in some
fields are common on NextStep/OpenStep (especially so for the
`pw_comment' field) and rb_tainted_str_new2() throws an exception
when it receives a null pointer.
* ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
* ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
gethostbyaddr(), and gethostbyname() from (const char*) to non-const
(char*) for older platforms such as NextStep and OpenStep.
* ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup(); include
<netinet/in_systm.h> if present for NextStep and OpenStep; cast first
argument of gethostbyaddr() and getservbyname() from (const char*) to
non-const (char*) for older platforms.
* ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-21 23:00:03 -05:00
|
|
|
#include "util.h"
|
1998-01-16 07:13:05 -05:00
|
|
|
#include <stdio.h>
|
|
|
|
#include <sys/types.h>
|
2000-05-12 05:07:57 -04:00
|
|
|
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
#include <unistd.h>
|
|
|
|
#endif
|
|
|
|
|
2002-02-28 16:31:35 -05:00
|
|
|
#ifdef HAVE_SYS_UIO_H
|
|
|
|
#include <sys/uio.h>
|
|
|
|
#endif
|
|
|
|
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-14 22:18:08 -05:00
|
|
|
#ifndef _WIN32
|
2000-07-10 00:49:24 -04:00
|
|
|
#if defined(__BEOS__)
|
|
|
|
# include <net/socket.h>
|
|
|
|
#else
|
|
|
|
# include <sys/socket.h>
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
#include <netinet/in.h>
|
* gc.c (Init_stack): stack region is far smaller than usual if
pthread is used.
* marshal.c (w_extended): singleton methods should not be checked
when dumping via marshal_dump() or _dump(). [ruby-talk:85909]
* file.c (getcwdofdrv): avoid using getcwd() directly, use
my_getcwd() instead.
* merged NeXT, OpenStep, Rhapsody ports patch from Eric Sunshine
<sunshine@sunshineco.com>. [ruby-core:01596]
* marshal.c (w_object): LINK check earlier than anything else,
i.e. do not dump TYPE_IVAR for already dumped objects.
(ruby-bugs PR#1220)
* eval.c (rb_eval): call "inherited" only when a new class is
generated; not on reopening.
* eval.c (eval): prepend error position in evaluating string to
* configure.in: revived NextStep, OpenStep, and Rhapsody ports which
had become unbuildable; enhanced --enable-fat-binary option so that
it accepts a list of desired architectures (rather than assuming a
fixed list), or defaults to a platform-appropriate list if user does
not provide an explicit list; made the default list of architectures
for MAB (fat binary) more comprehensive; now uses -fno-common even
when building the interpreter (in addition to using it for
extensions), thus allowing the interpreter to be embedded into a
plugin module of an external project (in addition to allowing
embedding directly into an application); added checks for
<netinet/in_systm.h> (needed by `socket' extension) and getcwd(); now
ensures that -I/usr/local/include is employed when extensions'
extconf.rb scripts invoke have_header() since extension checks on
NextStep and OpenStep will fail without it if the desired resource
resides in the /usr/local tree; fixed formatting of --help message.
* Makefile.in: $(LIBRUBY_A) rule now deletes the archive before
invoking $(AR) since `ar' on Apple/NeXT can not "update" MAB archives
(see configure's --enable-fat-binary option); added rule for new
missing/getcwd.c.
* defines.h: fixed endian handling during MAB build (see configure's
--enable-fat-binary option) to ensure that all portions of the
project see the correct WORDS_BIGENDIAN value (some extension modules
were getting the wrong endian setting); added missing constants
GETPGRP_VOID, WNOHANG, WUNTRACED, X_OK, and type pid_t for NextStep
and OpenStep; removed unnecessary and problematic HAVE_SYS_WAIT_H
define in NeXT section.
* dir.c: do not allow NAMLEN() macro to trust dirent::d_namlen on
NextStep since, on some installations, this value always resolves
uselessly to zero.
* dln.c: added error reporting to NextStep extension loader since the
previous behavior of failing silently was not useful; now ensures
that NSLINKMODULE_OPTION_BINDNOW compatibility constant is defined
for OpenStep and Rhapsody; no longer includes <mach-o/dyld.h> twice
on Rhapsody since this header lacks multiple-include protection,
which resulted in "redefinition" compilation errors.
* main.c: also create hard reference to objc_msgSend() on NeXT
platforms (in addition to Apple platforms).
* lib/mkmf.rb: now exports XCFLAGS from configure script to extension
makefiles so that extensions can be built MAB (see configure's
--enable-fat-binary option); also utilize XCFLAGS in cc_command()
(but not cpp_command() because MAB flags are incompatible with
direct invocation of `cpp').
* ext/curses/extconf.rb: now additionally checks for presence of these
curses functions which are not present on NextStep or Openstep:
bkgd(), bkgdset(), color(), curs(), getbkgd(), init(), scrl(), set(),
setscrreg(), wattroff(), wattron(), wattrset(), wbkgd(), wbkgdset(),
wscrl(), wsetscrreg()
* ext/curses/curses.c: added appropriate #ifdef's for additional set of
curses functions now checked by extconf.rb; fixed curses_bkgd() and
window_bkgd() to correctly return boolean result rather than numeric
result; fixed window_getbkgd() to correctly signal an error by
returning nil rather than -1.
* ext/etc/etc.c: setup_passwd() and setup_group() now check for null
pointers before invoking rb_tainted_str_new2() upon fields extracted
from `struct passwd' and `struct group' since null pointers in some
fields are common on NextStep/OpenStep (especially so for the
`pw_comment' field) and rb_tainted_str_new2() throws an exception
when it receives a null pointer.
* ext/pty/pty.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
* ext/socket/getaddrinfo.c: cast first argument of getservbyname(),
gethostbyaddr(), and gethostbyname() from (const char*) to non-const
(char*) for older platforms such as NextStep and OpenStep.
* ext/socket/socket.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup(); include
<netinet/in_systm.h> if present for NextStep and OpenStep; cast first
argument of gethostbyaddr() and getservbyname() from (const char*) to
non-const (char*) for older platforms.
* ext/syslog/syslog.c: include "util.h" for strdup()/ruby_strdup() for
platforms such as NextStep and OpenStep which lack strdup().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5002 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2003-11-21 23:00:03 -05:00
|
|
|
#ifdef HAVE_NETINET_IN_SYSTM_H
|
|
|
|
# include <netinet/in_systm.h>
|
|
|
|
#endif
|
1999-10-20 03:10:23 -04:00
|
|
|
#ifdef HAVE_NETINET_TCP_H
|
1999-10-12 00:53:36 -04:00
|
|
|
# include <netinet/tcp.h>
|
|
|
|
#endif
|
1999-10-20 03:10:23 -04:00
|
|
|
#ifdef HAVE_NETINET_UDP_H
|
1999-10-12 00:53:36 -04:00
|
|
|
# include <netinet/udp.h>
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
#include <netdb.h>
|
1998-01-16 07:19:22 -05:00
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
#include <errno.h>
|
|
|
|
#ifdef HAVE_SYS_UN_H
|
|
|
|
#include <sys/un.h>
|
|
|
|
#endif
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
#if defined(HAVE_FCNTL)
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef HAVE_SYS_SELECT_H
|
|
|
|
#include <sys/select.h>
|
|
|
|
#endif
|
2004-09-06 23:52:15 -04:00
|
|
|
#ifdef HAVE_SYS_TYPES_H
|
1998-01-16 07:13:05 -05:00
|
|
|
#include <sys/types.h>
|
2004-09-06 23:52:15 -04:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_SYS_TIME_H
|
1998-01-16 07:13:05 -05:00
|
|
|
#include <sys/time.h>
|
2004-09-06 23:52:15 -04:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_FCNTL_H
|
1998-01-16 07:13:05 -05:00
|
|
|
#include <fcntl.h>
|
|
|
|
#endif
|
2004-09-06 23:52:15 -04:00
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifndef EWOULDBLOCK
|
|
|
|
#define EWOULDBLOCK EAGAIN
|
|
|
|
#endif
|
1999-08-13 01:37:52 -04:00
|
|
|
#ifndef HAVE_GETADDRINFO
|
|
|
|
# include "addrinfo.h"
|
|
|
|
#endif
|
|
|
|
#include "sockport.h"
|
|
|
|
|
|
|
|
static int do_not_reverse_lookup = 0;
|
2004-04-01 21:15:25 -05:00
|
|
|
#define FMODE_NOREVLOOKUP 0x100
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE rb_cBasicSocket;
|
1999-08-13 01:37:52 -04:00
|
|
|
VALUE rb_cIPSocket;
|
|
|
|
VALUE rb_cTCPSocket;
|
|
|
|
VALUE rb_cTCPServer;
|
|
|
|
VALUE rb_cUDPSocket;
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef AF_UNIX
|
1999-08-13 01:37:52 -04:00
|
|
|
VALUE rb_cUNIXSocket;
|
|
|
|
VALUE rb_cUNIXServer;
|
1998-01-16 07:13:05 -05:00
|
|
|
#endif
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE rb_cSocket;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE rb_eSocket;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
#ifdef SOCKS
|
1999-08-13 01:37:52 -04:00
|
|
|
VALUE rb_cSOCKSSocket;
|
1999-09-22 00:30:11 -04:00
|
|
|
#ifdef SOCKS5
|
|
|
|
#include <socks.h>
|
|
|
|
#else
|
1998-01-16 07:13:05 -05:00
|
|
|
void SOCKSinit();
|
|
|
|
int Rconnect();
|
|
|
|
#endif
|
1999-09-22 00:30:11 -04:00
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
#define INET_CLIENT 0
|
|
|
|
#define INET_SERVER 1
|
|
|
|
#define INET_SOCKS 2
|
|
|
|
|
2000-01-31 22:12:21 -05:00
|
|
|
#ifndef HAVE_SOCKADDR_STORAGE
|
|
|
|
/*
|
|
|
|
* RFC 2553: protocol-independent placeholder for socket addresses
|
|
|
|
*/
|
|
|
|
#define _SS_MAXSIZE 128
|
2000-02-17 02:11:22 -05:00
|
|
|
#define _SS_ALIGNSIZE (sizeof(double))
|
2000-01-31 22:12:21 -05:00
|
|
|
#define _SS_PAD1SIZE (_SS_ALIGNSIZE - sizeof(unsigned char) * 2)
|
|
|
|
#define _SS_PAD2SIZE (_SS_MAXSIZE - sizeof(unsigned char) * 2 - \
|
|
|
|
_SS_PAD1SIZE - _SS_ALIGNSIZE)
|
|
|
|
|
|
|
|
struct sockaddr_storage {
|
|
|
|
#ifdef HAVE_SA_LEN
|
|
|
|
unsigned char ss_len; /* address length */
|
|
|
|
unsigned char ss_family; /* address family */
|
|
|
|
#else
|
|
|
|
unsigned short ss_family;
|
|
|
|
#endif
|
|
|
|
char __ss_pad1[_SS_PAD1SIZE];
|
2000-02-17 02:11:22 -05:00
|
|
|
double __ss_align; /* force desired structure storage alignment */
|
2000-01-31 22:12:21 -05:00
|
|
|
char __ss_pad2[_SS_PAD2SIZE];
|
|
|
|
};
|
1999-08-13 01:37:52 -04:00
|
|
|
#endif
|
|
|
|
|
2000-06-29 03:46:56 -04:00
|
|
|
#if defined(INET6) && (defined(LOOKUP_ORDER_HACK_INET) || defined(LOOKUP_ORDER_HACK_INET6))
|
2000-05-18 00:32:13 -04:00
|
|
|
#define LOOKUP_ORDERS 3
|
2000-05-30 00:24:17 -04:00
|
|
|
static int lookup_order_table[LOOKUP_ORDERS] = {
|
|
|
|
#if defined(LOOKUP_ORDER_HACK_INET)
|
|
|
|
PF_INET, PF_INET6, PF_UNSPEC,
|
|
|
|
#elif defined(LOOKUP_ORDER_HACK_INET6)
|
|
|
|
PF_INET6, PF_INET, PF_UNSPEC,
|
|
|
|
#else
|
|
|
|
/* should not happen */
|
|
|
|
#endif
|
2000-05-18 00:32:13 -04:00
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
2002-03-25 01:18:07 -05:00
|
|
|
ruby_getaddrinfo(nodename, servname, hints, res)
|
2000-05-18 00:32:13 -04:00
|
|
|
char *nodename;
|
|
|
|
char *servname;
|
|
|
|
struct addrinfo *hints;
|
|
|
|
struct addrinfo **res;
|
|
|
|
{
|
|
|
|
struct addrinfo tmp_hints;
|
|
|
|
int i, af, error;
|
|
|
|
|
2000-05-30 00:24:17 -04:00
|
|
|
if (hints->ai_family != PF_UNSPEC) {
|
|
|
|
return getaddrinfo(nodename, servname, hints, res);
|
|
|
|
}
|
|
|
|
|
2000-05-18 00:32:13 -04:00
|
|
|
for (i = 0; i < LOOKUP_ORDERS; i++) {
|
2000-05-30 00:24:17 -04:00
|
|
|
af = lookup_order_table[i];
|
2000-05-18 00:32:13 -04:00
|
|
|
MEMCPY(&tmp_hints, hints, struct addrinfo, 1);
|
|
|
|
tmp_hints.ai_family = af;
|
|
|
|
error = getaddrinfo(nodename, servname, &tmp_hints, res);
|
|
|
|
if (error) {
|
|
|
|
if (tmp_hints.ai_family == PF_UNSPEC) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return error;
|
|
|
|
}
|
2002-03-25 01:18:07 -05:00
|
|
|
#define getaddrinfo(node,serv,hints,res) ruby_getaddrinfo((node),(serv),(hints),(res))
|
2000-05-18 00:32:13 -04:00
|
|
|
#endif
|
|
|
|
|
2002-06-03 11:52:28 -04:00
|
|
|
#ifdef HAVE_CLOSESOCKET
|
|
|
|
#undef close
|
|
|
|
#define close closesocket
|
|
|
|
#endif
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2002-01-17 03:05:01 -05:00
|
|
|
init_sock(sock, fd)
|
|
|
|
VALUE sock;
|
1998-01-16 07:13:05 -05:00
|
|
|
int fd;
|
|
|
|
{
|
|
|
|
OpenFile *fp;
|
|
|
|
|
|
|
|
MakeOpenFile(sock, fp);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
fp->fd = fd;
|
2004-12-23 05:12:35 -05:00
|
|
|
fp->mode = FMODE_READWRITE|FMODE_DUPLEX;
|
2004-04-01 21:15:25 -05:00
|
|
|
if (do_not_reverse_lookup) {
|
|
|
|
fp->mode |= FMODE_NOREVLOOKUP;
|
|
|
|
}
|
1999-09-20 03:14:18 -04:00
|
|
|
rb_io_synchronized(fp);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2001-10-03 03:19:19 -04:00
|
|
|
return sock;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2002-02-05 02:56:31 -05:00
|
|
|
static VALUE
|
|
|
|
bsock_s_for_fd(klass, fd)
|
|
|
|
VALUE klass, fd;
|
|
|
|
{
|
2002-04-01 03:31:49 -05:00
|
|
|
OpenFile *fptr;
|
|
|
|
VALUE sock = init_sock(rb_obj_alloc(klass), NUM2INT(fd));
|
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
|
|
|
|
return sock;
|
2002-02-05 02:56:31 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
|
|
|
bsock_shutdown(argc, argv, sock)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
VALUE howto;
|
|
|
|
int how;
|
|
|
|
OpenFile *fptr;
|
|
|
|
|
1999-12-14 01:50:43 -05:00
|
|
|
if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
|
|
|
|
rb_raise(rb_eSecurityError, "Insecure: can't shutdown socket");
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_scan_args(argc, argv, "01", &howto);
|
|
|
|
if (howto == Qnil)
|
|
|
|
how = 2;
|
|
|
|
else {
|
|
|
|
how = NUM2INT(howto);
|
1999-01-19 23:59:39 -05:00
|
|
|
if (how < 0 || 2 < how) {
|
|
|
|
rb_raise(rb_eArgError, "`how' should be either 0, 1, 2");
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (shutdown(fptr->fd, how) == -1)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail(0);
|
|
|
|
|
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
|
|
|
bsock_close_read(sock)
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
|
1999-12-14 01:50:43 -05:00
|
|
|
if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
|
|
|
|
rb_raise(rb_eSecurityError, "Insecure: can't close socket");
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
shutdown(fptr->fd, 0);
|
2001-02-13 00:09:11 -05:00
|
|
|
if (!(fptr->mode & FMODE_WRITABLE)) {
|
1999-01-19 23:59:39 -05:00
|
|
|
return rb_io_close(sock);
|
|
|
|
}
|
|
|
|
fptr->mode &= ~FMODE_READABLE;
|
|
|
|
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
bsock_close_write(sock)
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
|
1999-12-14 01:50:43 -05:00
|
|
|
if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
|
|
|
|
rb_raise(rb_eSecurityError, "Insecure: can't close socket");
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
GetOpenFile(sock, fptr);
|
2001-02-13 00:09:11 -05:00
|
|
|
if (!(fptr->mode & FMODE_READABLE)) {
|
1999-01-19 23:59:39 -05:00
|
|
|
return rb_io_close(sock);
|
|
|
|
}
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
shutdown(fptr->fd, 1);
|
1999-01-19 23:59:39 -05:00
|
|
|
fptr->mode &= ~FMODE_WRITABLE;
|
|
|
|
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2005-03-09 04:29:52 -05:00
|
|
|
/*
|
|
|
|
* Document-method: setsockopt
|
|
|
|
* call-seq: setsockopt(level, optname, optval)
|
|
|
|
*
|
|
|
|
* Sets a socket option. These are protocol and system specific, see your
|
|
|
|
* local sytem documentation for details.
|
|
|
|
*
|
|
|
|
* === Parameters
|
|
|
|
* * +level+ is an integer, usually one of the SOL_ constants such as
|
|
|
|
* Socket::SOL_SOCKET, or a protocol level.
|
|
|
|
* * +optname+ is an integer, usually one of the SO_ constants, such
|
|
|
|
* as Socket::SO_REUSEADDR.
|
|
|
|
* * +optval+ is the value of the option, it is passed to the underlying
|
|
|
|
* setsockopt() as a pointer to a certain number of bytes. How this is
|
|
|
|
* done depends on the type:
|
|
|
|
* - Fixnum: value is assigned to an int, and a pointer to the int is
|
|
|
|
* passed, with length of sizeof(int).
|
|
|
|
* - true or false: 1 or 0 (respectively) is assigned to an int, and the
|
|
|
|
* int is passed as for a Fixnum. Note that +false+ must be passed,
|
|
|
|
* not +nil+.
|
|
|
|
* - String: the string's data and length is passed to the socket.
|
|
|
|
*
|
|
|
|
* === Examples
|
|
|
|
*
|
|
|
|
* Some socket options are integers with boolean values, in this case
|
|
|
|
* #setsockopt could be called like this:
|
|
|
|
* sock.setsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR, true)
|
|
|
|
*
|
|
|
|
* Some socket options are integers with numeric values, in this case
|
|
|
|
* #setsockopt could be called like this:
|
|
|
|
* sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_TTL, 255)
|
|
|
|
*
|
|
|
|
* Option values may be structs. Passing them can be complex as it involves
|
|
|
|
* examining your system headers to determine the correct definition. An
|
|
|
|
* example is an +ip_mreq+, which may be defined in your system headers as:
|
|
|
|
* struct ip_mreq {
|
|
|
|
* struct in_addr imr_multiaddr;
|
|
|
|
* struct in_addr imr_interface;
|
|
|
|
* };
|
|
|
|
*
|
|
|
|
* In this case #setsockopt could be called like this:
|
|
|
|
* optval = IPAddr.new("224.0.0.251") + Socket::INADDR_ANY
|
|
|
|
* sock.setsockopt(Socket::IPPROTO_IP, Socket::IP_ADD_MEMBERSHIP, optval)
|
|
|
|
*
|
|
|
|
*/
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
|
|
|
bsock_setsockopt(sock, lev, optname, val)
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE sock, lev, optname, val;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
int level, option;
|
|
|
|
OpenFile *fptr;
|
|
|
|
int i;
|
|
|
|
char *v;
|
|
|
|
int vlen;
|
|
|
|
|
2000-05-22 01:30:25 -04:00
|
|
|
rb_secure(2);
|
1998-01-16 07:13:05 -05:00
|
|
|
level = NUM2INT(lev);
|
|
|
|
option = NUM2INT(optname);
|
2004-10-19 15:17:33 -04:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
switch (TYPE(val)) {
|
|
|
|
case T_FIXNUM:
|
|
|
|
i = FIX2INT(val);
|
|
|
|
goto numval;
|
|
|
|
case T_FALSE:
|
|
|
|
i = 0;
|
|
|
|
goto numval;
|
|
|
|
case T_TRUE:
|
|
|
|
i = 1;
|
|
|
|
numval:
|
|
|
|
v = (char*)&i; vlen = sizeof(i);
|
|
|
|
break;
|
|
|
|
default:
|
2001-05-06 11:06:00 -04:00
|
|
|
StringValue(val);
|
|
|
|
v = RSTRING(val)->ptr;
|
|
|
|
vlen = RSTRING(val)->len;
|
|
|
|
break;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-12-06 10:31:26 -05:00
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (setsockopt(fptr->fd, level, option, v, vlen) < 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail(fptr->path);
|
|
|
|
|
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
|
2005-03-09 04:29:52 -05:00
|
|
|
/*
|
|
|
|
* Document-method: getsockopt
|
|
|
|
* call-seq: getsockopt(level, optname)
|
|
|
|
*
|
|
|
|
* Gets a socket option. These are protocol and system specific, see your
|
|
|
|
* local sytem documentation for details. The option is returned as
|
|
|
|
* a String with the data being the binary value of the socket option.
|
|
|
|
*
|
|
|
|
* === Parameters
|
|
|
|
* * +level+ is an integer, usually one of the SOL_ constants such as
|
|
|
|
* Socket::SOL_SOCKET, or a protocol level.
|
|
|
|
* * +optname+ is an integer, usually one of the SO_ constants, such
|
|
|
|
* as Socket::SO_REUSEADDR.
|
|
|
|
*
|
|
|
|
* === Examples
|
|
|
|
*
|
|
|
|
* Some socket options are integers with boolean values, in this case
|
|
|
|
* #getsockopt could be called like this:
|
|
|
|
* optval = sock.getsockopt(Socket::SOL_SOCKET,Socket::SO_REUSEADDR)
|
|
|
|
* optval = optval.unpack "i"
|
|
|
|
* reuseaddr = optval[0] == 0 ? false : true
|
|
|
|
*
|
|
|
|
* Some socket options are integers with numeric values, in this case
|
|
|
|
* #getsockopt could be called like this:
|
|
|
|
* optval = sock.getsockopt(Socket::IPPROTO_IP, Socket::IP_TTL)
|
|
|
|
* ipttl = optval.unpack("i")[0]
|
|
|
|
*
|
|
|
|
* Option values may be structs. Decoding them can be complex as it involves
|
|
|
|
* examining your system headers to determine the correct definition. An
|
|
|
|
* example is a +struct linger+, which may be defined in your system headers
|
|
|
|
* as:
|
|
|
|
* struct linger {
|
|
|
|
* int l_onoff;
|
|
|
|
* int l_linger;
|
|
|
|
* };
|
|
|
|
*
|
|
|
|
* In this case #getsockopt could be called like this:
|
|
|
|
* optval = sock.getsockopt(Socket::SOL_SOCKET, Socket::SO_LINGER)
|
|
|
|
* onoff, linger = optval.unpack "ii"
|
|
|
|
*/
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
|
|
|
bsock_getsockopt(sock, lev, optname)
|
|
|
|
VALUE sock, lev, optname;
|
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
#if !defined(__BEOS__)
|
2000-05-01 05:42:38 -04:00
|
|
|
int level, option;
|
|
|
|
socklen_t len;
|
1998-01-16 07:13:05 -05:00
|
|
|
char *buf;
|
|
|
|
OpenFile *fptr;
|
|
|
|
|
|
|
|
level = NUM2INT(lev);
|
|
|
|
option = NUM2INT(optname);
|
|
|
|
len = 256;
|
|
|
|
buf = ALLOCA_N(char,len);
|
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (getsockopt(fptr->fd, level, option, buf, &len) < 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail(fptr->path);
|
|
|
|
|
2002-06-11 03:02:23 -04:00
|
|
|
return rb_str_new(buf, len);
|
1999-01-19 23:59:39 -05:00
|
|
|
#else
|
|
|
|
rb_notimplement();
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
bsock_getsockname(sock)
|
2003-05-16 11:18:14 -04:00
|
|
|
VALUE sock;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
char buf[1024];
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t len = sizeof buf;
|
1998-01-16 07:13:05 -05:00
|
|
|
OpenFile *fptr;
|
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (getsockname(fptr->fd, (struct sockaddr*)buf, &len) < 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail("getsockname(2)");
|
2002-06-11 03:02:23 -04:00
|
|
|
return rb_str_new(buf, len);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
bsock_getpeername(sock)
|
2003-05-16 11:18:14 -04:00
|
|
|
VALUE sock;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
char buf[1024];
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t len = sizeof buf;
|
1998-01-16 07:13:05 -05:00
|
|
|
OpenFile *fptr;
|
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (getpeername(fptr->fd, (struct sockaddr*)buf, &len) < 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail("getpeername(2)");
|
2002-06-11 03:02:23 -04:00
|
|
|
return rb_str_new(buf, len);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
bsock_send(argc, argv, sock)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
VALUE sock;
|
|
|
|
{
|
2001-05-06 11:06:00 -04:00
|
|
|
VALUE mesg, to;
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE flags;
|
|
|
|
OpenFile *fptr;
|
|
|
|
int fd, n;
|
|
|
|
|
|
|
|
rb_secure(4);
|
2001-05-06 11:06:00 -04:00
|
|
|
rb_scan_args(argc, argv, "21", &mesg, &flags, &to);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-12-06 10:31:26 -05:00
|
|
|
StringValue(mesg);
|
|
|
|
if (!NIL_P(to)) StringValue(to);
|
1998-01-16 07:13:05 -05:00
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
fd = fptr->fd;
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_thread_fd_writable(fd);
|
2002-10-02 10:13:58 -04:00
|
|
|
retry:
|
2000-06-29 03:46:56 -04:00
|
|
|
if (!NIL_P(to)) {
|
2001-05-06 11:06:00 -04:00
|
|
|
n = sendto(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
|
|
|
|
(struct sockaddr*)RSTRING(to)->ptr, RSTRING(to)->len);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
else {
|
2001-05-06 11:06:00 -04:00
|
|
|
n = send(fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags));
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
if (n < 0) {
|
2002-10-02 10:13:58 -04:00
|
|
|
if (rb_io_wait_writable(fd)) {
|
1999-08-13 01:37:52 -04:00
|
|
|
goto retry;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
rb_sys_fail("send(2)");
|
|
|
|
}
|
|
|
|
return INT2FIX(n);
|
|
|
|
}
|
|
|
|
|
2004-04-01 21:15:25 -05:00
|
|
|
static VALUE
|
|
|
|
bsock_do_not_reverse_lookup(sock)
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
return (fptr->mode & FMODE_NOREVLOOKUP) ? Qtrue : Qfalse;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
bsock_do_not_reverse_lookup_set(sock, state)
|
|
|
|
VALUE sock;
|
|
|
|
VALUE state;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
|
|
|
|
rb_secure(4);
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
if (RTEST(state)) {
|
|
|
|
fptr->mode |= FMODE_NOREVLOOKUP;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
fptr->mode &= ~FMODE_NOREVLOOKUP;
|
|
|
|
}
|
|
|
|
return sock;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE ipaddr _((struct sockaddr*, int));
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef HAVE_SYS_UN_H
|
2002-03-22 02:26:42 -05:00
|
|
|
static VALUE unixaddr _((struct sockaddr_un*));
|
1998-01-16 07:13:05 -05:00
|
|
|
#endif
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
enum sock_recv_type {
|
|
|
|
RECV_RECV, /* BasicSocket#recv(no from) */
|
2000-06-28 04:31:35 -04:00
|
|
|
RECV_IP, /* IPSocket#recvfrom */
|
1999-08-13 01:37:52 -04:00
|
|
|
RECV_UNIX, /* UNIXSocket#recvfrom */
|
2001-01-18 03:43:14 -05:00
|
|
|
RECV_SOCKET /* Socket#recvfrom */
|
1998-01-16 07:19:22 -05:00
|
|
|
};
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2000-06-28 04:31:35 -04:00
|
|
|
s_recvfrom(sock, argc, argv, from)
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE sock;
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
1998-01-16 07:19:22 -05:00
|
|
|
enum sock_recv_type from;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
1998-01-16 07:19:22 -05:00
|
|
|
VALUE str;
|
1998-01-16 07:13:05 -05:00
|
|
|
char buf[1024];
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t alen = sizeof buf;
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE len, flg;
|
2004-01-26 21:09:34 -05:00
|
|
|
long buflen;
|
2002-08-01 05:42:38 -04:00
|
|
|
long slen;
|
2000-05-01 05:42:38 -04:00
|
|
|
int fd, flags;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "11", &len, &flg);
|
|
|
|
|
|
|
|
if (flg == Qnil) flags = 0;
|
|
|
|
else flags = NUM2INT(flg);
|
2004-12-06 10:31:26 -05:00
|
|
|
buflen = NUM2INT(len);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (rb_io_read_pending(fptr)) {
|
2000-01-17 03:37:53 -05:00
|
|
|
rb_raise(rb_eIOError, "recv for buffered IO");
|
|
|
|
}
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
fd = fptr->fd;
|
2000-01-17 03:37:53 -05:00
|
|
|
|
2004-01-26 21:09:34 -05:00
|
|
|
str = rb_tainted_str_new(0, buflen);
|
2000-01-17 03:37:53 -05:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
retry:
|
2001-09-05 02:54:57 -04:00
|
|
|
rb_thread_wait_fd(fd);
|
2004-12-06 10:31:26 -05:00
|
|
|
rb_io_check_closed(fptr);
|
|
|
|
if (RSTRING(str)->len != buflen) {
|
|
|
|
rb_raise(rb_eRuntimeError, "buffer string modified");
|
|
|
|
}
|
2000-02-08 03:54:01 -05:00
|
|
|
TRAP_BEG;
|
2004-01-26 21:09:34 -05:00
|
|
|
slen = recvfrom(fd, RSTRING(str)->ptr, buflen, flags, (struct sockaddr*)buf, &alen);
|
1998-01-16 07:13:05 -05:00
|
|
|
TRAP_END;
|
|
|
|
|
2002-08-01 05:42:38 -04:00
|
|
|
if (slen < 0) {
|
2002-10-02 10:13:58 -04:00
|
|
|
if (rb_io_wait_readable(fd)) {
|
1999-08-13 01:37:52 -04:00
|
|
|
goto retry;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
rb_sys_fail("recvfrom(2)");
|
|
|
|
}
|
2002-08-01 05:42:38 -04:00
|
|
|
if (slen < RSTRING(str)->len) {
|
|
|
|
RSTRING(str)->len = slen;
|
|
|
|
RSTRING(str)->ptr[slen] = '\0';
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_obj_taint(str);
|
1998-01-16 07:13:05 -05:00
|
|
|
switch (from) {
|
1998-01-16 07:19:22 -05:00
|
|
|
case RECV_RECV:
|
1998-01-16 07:13:05 -05:00
|
|
|
return (VALUE)str;
|
2000-06-28 04:31:35 -04:00
|
|
|
case RECV_IP:
|
1999-08-13 01:37:52 -04:00
|
|
|
#if 0
|
1998-01-16 07:13:05 -05:00
|
|
|
if (alen != sizeof(struct sockaddr_in)) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
#endif
|
2004-06-23 09:23:55 -04:00
|
|
|
if (alen) /* OSX doesn't return a from result for connection-oriented sockets */
|
|
|
|
return rb_assoc_new(str, ipaddr((struct sockaddr*)buf, fptr->mode & FMODE_NOREVLOOKUP));
|
|
|
|
else
|
|
|
|
return rb_assoc_new(str, Qnil);
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef HAVE_SYS_UN_H
|
1998-01-16 07:19:22 -05:00
|
|
|
case RECV_UNIX:
|
2002-03-22 02:26:42 -05:00
|
|
|
return rb_assoc_new(str, unixaddr((struct sockaddr_un*)buf));
|
1998-01-16 07:13:05 -05:00
|
|
|
#endif
|
1998-01-16 07:19:22 -05:00
|
|
|
case RECV_SOCKET:
|
2002-06-11 03:02:23 -04:00
|
|
|
return rb_assoc_new(str, rb_str_new(buf, alen));
|
2001-08-15 20:54:54 -04:00
|
|
|
default:
|
2001-08-16 00:54:31 -04:00
|
|
|
rb_bug("s_recvfrom called with bad value");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
bsock_recv(argc, argv, sock)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
VALUE sock;
|
|
|
|
{
|
2000-06-28 04:31:35 -04:00
|
|
|
return s_recvfrom(sock, argc, argv, RECV_RECV);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
1999-08-13 01:37:52 -04:00
|
|
|
bsock_do_not_rev_lookup()
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
1999-08-13 01:37:52 -04:00
|
|
|
return do_not_reverse_lookup?Qtrue:Qfalse;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
1999-08-13 01:37:52 -04:00
|
|
|
bsock_do_not_rev_lookup_set(self, val)
|
2003-06-23 10:55:09 -04:00
|
|
|
VALUE self, val;
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2002-03-25 01:18:07 -05:00
|
|
|
rb_secure(4);
|
1999-08-13 01:37:52 -04:00
|
|
|
do_not_reverse_lookup = RTEST(val);
|
|
|
|
return val;
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2004-04-06 00:13:24 -04:00
|
|
|
NORETURN(static void raise_socket_error _((char *, int)));
|
2004-04-01 21:15:25 -05:00
|
|
|
static void
|
|
|
|
raise_socket_error(reason, error)
|
|
|
|
char *reason;
|
|
|
|
int error;
|
|
|
|
{
|
2004-04-04 23:14:05 -04:00
|
|
|
#ifdef EAI_SYSTEM
|
2004-04-01 21:15:25 -05:00
|
|
|
if (error == EAI_SYSTEM) rb_sys_fail(reason);
|
2004-04-04 23:14:05 -04:00
|
|
|
#endif
|
2004-04-01 21:15:25 -05:00
|
|
|
rb_raise(rb_eSocket, "%s: %s", reason, gai_strerror(error));
|
|
|
|
}
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
static void
|
2003-10-01 09:41:35 -04:00
|
|
|
make_ipaddr0(addr, buf, len)
|
1999-08-13 01:37:52 -04:00
|
|
|
struct sockaddr *addr;
|
|
|
|
char *buf;
|
|
|
|
size_t len;
|
|
|
|
{
|
|
|
|
int error;
|
|
|
|
|
2000-05-22 01:30:25 -04:00
|
|
|
error = getnameinfo(addr, SA_LEN(addr), buf, len, NULL, 0, NI_NUMERICHOST);
|
1999-08-13 01:37:52 -04:00
|
|
|
if (error) {
|
2004-04-01 21:15:25 -05:00
|
|
|
raise_socket_error("getnameinfo", error);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
static VALUE
|
2003-10-01 09:41:35 -04:00
|
|
|
make_ipaddr(addr)
|
1999-08-13 01:37:52 -04:00
|
|
|
struct sockaddr *addr;
|
|
|
|
{
|
|
|
|
char buf[1024];
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2003-10-01 09:41:35 -04:00
|
|
|
make_ipaddr0(addr, buf, sizeof(buf));
|
2002-06-11 03:02:23 -04:00
|
|
|
return rb_str_new2(buf);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
static void
|
2003-10-01 09:41:35 -04:00
|
|
|
make_inetaddr(host, buf, len)
|
1999-08-13 01:37:52 -04:00
|
|
|
long host;
|
|
|
|
char *buf;
|
|
|
|
size_t len;
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
1999-08-13 01:37:52 -04:00
|
|
|
struct sockaddr_in sin;
|
|
|
|
|
|
|
|
MEMZERO(&sin, struct sockaddr_in, 1);
|
|
|
|
sin.sin_family = AF_INET;
|
|
|
|
SET_SIN_LEN(&sin, sizeof(sin));
|
|
|
|
sin.sin_addr.s_addr = host;
|
2003-10-01 09:41:35 -04:00
|
|
|
make_ipaddr0((struct sockaddr*)&sin, buf, len);
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
2002-07-26 02:17:44 -04:00
|
|
|
static int
|
|
|
|
str_isnumber(p)
|
|
|
|
const char *p;
|
|
|
|
{
|
|
|
|
char *ep;
|
|
|
|
|
|
|
|
if (!p || *p == '\0')
|
|
|
|
return 0;
|
|
|
|
ep = NULL;
|
|
|
|
(void)strtoul(p, &ep, 10);
|
|
|
|
if (ep && *ep == '\0')
|
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2003-10-01 09:41:35 -04:00
|
|
|
static char *
|
|
|
|
host_str(host, hbuf, len)
|
|
|
|
VALUE host;
|
|
|
|
char *hbuf;
|
|
|
|
size_t len;
|
1999-08-13 01:37:52 -04:00
|
|
|
{
|
|
|
|
if (NIL_P(host)) {
|
2003-10-01 09:41:35 -04:00
|
|
|
return NULL;
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
else if (rb_obj_is_kind_of(host, rb_cInteger)) {
|
|
|
|
long i = NUM2LONG(host);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2003-10-01 09:41:35 -04:00
|
|
|
make_inetaddr(htonl(i), hbuf, len);
|
|
|
|
return hbuf;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
else {
|
2000-05-22 01:30:25 -04:00
|
|
|
char *name;
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2001-12-18 03:47:06 -05:00
|
|
|
SafeStringValue(host);
|
2000-05-22 01:30:25 -04:00
|
|
|
name = RSTRING(host)->ptr;
|
2003-05-27 07:07:57 -04:00
|
|
|
if (!name || *name == 0 || (name[0] == '<' && strcmp(name, "<any>") == 0)) {
|
2003-10-01 09:41:35 -04:00
|
|
|
make_inetaddr(INADDR_ANY, hbuf, len);
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
else if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
|
2003-10-01 09:41:35 -04:00
|
|
|
make_inetaddr(INADDR_BROADCAST, hbuf, len);
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
2003-10-01 09:41:35 -04:00
|
|
|
else if (strlen(name) >= len) {
|
2000-03-05 23:15:42 -05:00
|
|
|
rb_raise(rb_eArgError, "hostname too long (%d)", strlen(name));
|
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
else {
|
|
|
|
strcpy(hbuf, name);
|
|
|
|
}
|
2003-10-01 09:41:35 -04:00
|
|
|
return hbuf;
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
2003-10-01 09:41:35 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static char *
|
|
|
|
port_str(port, pbuf, len)
|
|
|
|
VALUE port;
|
|
|
|
char *pbuf;
|
|
|
|
size_t len;
|
|
|
|
{
|
1999-08-13 01:37:52 -04:00
|
|
|
if (NIL_P(port)) {
|
2003-10-01 09:41:35 -04:00
|
|
|
return 0;
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
else if (FIXNUM_P(port)) {
|
2003-12-10 21:39:59 -05:00
|
|
|
snprintf(pbuf, len, "%ld", FIX2LONG(port));
|
2003-10-01 09:41:35 -04:00
|
|
|
return pbuf;
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
else {
|
2003-10-01 09:41:35 -04:00
|
|
|
char *serv;
|
|
|
|
|
2001-05-06 11:06:00 -04:00
|
|
|
SafeStringValue(port);
|
2003-10-01 09:41:35 -04:00
|
|
|
serv = RSTRING(port)->ptr;
|
|
|
|
if (strlen(serv) >= len) {
|
|
|
|
rb_raise(rb_eArgError, "service name too long (%d)", strlen(serv));
|
|
|
|
}
|
|
|
|
strcpy(pbuf, serv);
|
|
|
|
return pbuf;
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
2003-10-01 09:41:35 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifndef NI_MAXHOST
|
|
|
|
# define 1025
|
|
|
|
#endif
|
|
|
|
#ifndef NI_MAXSERV
|
|
|
|
# define 32
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static struct addrinfo*
|
|
|
|
sock_addrinfo(host, port, socktype, flags)
|
|
|
|
VALUE host, port;
|
|
|
|
int socktype, flags;
|
|
|
|
{
|
2004-04-01 18:13:39 -05:00
|
|
|
struct addrinfo hints;
|
|
|
|
struct addrinfo* res = NULL;
|
2003-10-01 09:41:35 -04:00
|
|
|
char *hostp, *portp;
|
|
|
|
int error;
|
|
|
|
char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
|
|
|
|
|
|
|
|
hostp = host_str(host, hbuf, sizeof(hbuf));
|
|
|
|
portp = port_str(port, pbuf, sizeof(pbuf));
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2002-07-26 02:17:44 -04:00
|
|
|
if (socktype == 0 && flags == 0 && str_isnumber(portp)) {
|
|
|
|
socktype = SOCK_DGRAM;
|
2002-03-28 04:17:54 -05:00
|
|
|
}
|
2002-07-26 02:17:44 -04:00
|
|
|
|
|
|
|
MEMZERO(&hints, struct addrinfo, 1);
|
2004-04-01 18:13:39 -05:00
|
|
|
hints.ai_family = AF_UNSPEC;
|
2002-07-26 02:17:44 -04:00
|
|
|
hints.ai_socktype = socktype;
|
|
|
|
hints.ai_flags = flags;
|
2004-04-01 18:13:39 -05:00
|
|
|
error = getaddrinfo(hostp, portp, &hints, &res);
|
1999-08-13 01:37:52 -04:00
|
|
|
if (error) {
|
2000-03-05 23:15:42 -05:00
|
|
|
if (hostp && hostp[strlen(hostp)-1] == '\n') {
|
|
|
|
rb_raise(rb_eSocket, "newline at the end of hostname");
|
|
|
|
}
|
2004-04-01 21:15:25 -05:00
|
|
|
raise_socket_error("getaddrinfo", error);
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
2004-03-10 02:05:19 -05:00
|
|
|
#if defined(__APPLE__) && defined(__MACH__)
|
|
|
|
{
|
|
|
|
struct addrinfo *r;
|
|
|
|
r = res;
|
|
|
|
while (r) {
|
|
|
|
if (! r->ai_socktype) r->ai_socktype = hints.ai_socktype;
|
|
|
|
if (! r->ai_protocol) {
|
|
|
|
if (r->ai_socktype == SOCK_DGRAM) {
|
|
|
|
r->ai_protocol = IPPROTO_UDP;
|
|
|
|
} else if (r->ai_socktype == SOCK_STREAM) {
|
|
|
|
r->ai_protocol = IPPROTO_TCP;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
r = r->ai_next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif
|
1999-08-13 01:37:52 -04:00
|
|
|
return res;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
static VALUE
|
2004-04-01 21:15:25 -05:00
|
|
|
ipaddr(sockaddr, norevlookup)
|
1999-08-13 01:37:52 -04:00
|
|
|
struct sockaddr *sockaddr;
|
2004-04-01 21:15:25 -05:00
|
|
|
int norevlookup;
|
1999-08-13 01:37:52 -04:00
|
|
|
{
|
|
|
|
VALUE family, port, addr1, addr2;
|
|
|
|
VALUE ary;
|
|
|
|
int error;
|
|
|
|
char hbuf[1024], pbuf[1024];
|
|
|
|
|
|
|
|
switch (sockaddr->sa_family) {
|
2000-06-28 04:31:35 -04:00
|
|
|
case AF_UNSPEC:
|
|
|
|
family = rb_str_new2("AF_UNSPEC");
|
|
|
|
break;
|
1999-08-13 01:37:52 -04:00
|
|
|
case AF_INET:
|
|
|
|
family = rb_str_new2("AF_INET");
|
|
|
|
break;
|
|
|
|
#ifdef INET6
|
|
|
|
case AF_INET6:
|
|
|
|
family = rb_str_new2("AF_INET6");
|
|
|
|
break;
|
2000-06-28 04:31:35 -04:00
|
|
|
#endif
|
|
|
|
#ifdef AF_LOCAL
|
|
|
|
case AF_LOCAL:
|
|
|
|
family = rb_str_new2("AF_LOCAL");
|
|
|
|
break;
|
|
|
|
#elif AF_UNIX
|
|
|
|
case AF_UNIX:
|
|
|
|
family = rb_str_new2("AF_UNIX");
|
|
|
|
break;
|
1999-08-13 01:37:52 -04:00
|
|
|
#endif
|
|
|
|
default:
|
2000-06-28 04:31:35 -04:00
|
|
|
sprintf(pbuf, "unknown:%d", sockaddr->sa_family);
|
|
|
|
family = rb_str_new2(pbuf);
|
1999-08-13 01:37:52 -04:00
|
|
|
break;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2004-05-06 09:28:23 -04:00
|
|
|
|
|
|
|
addr1 = Qnil;
|
2004-04-01 21:15:25 -05:00
|
|
|
if (!norevlookup) {
|
1999-08-13 01:37:52 -04:00
|
|
|
error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
|
|
|
|
NULL, 0, 0);
|
2004-05-06 09:28:23 -04:00
|
|
|
if (! error) {
|
|
|
|
addr1 = rb_str_new2(hbuf);
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
error = getnameinfo(sockaddr, SA_LEN(sockaddr), hbuf, sizeof(hbuf),
|
|
|
|
pbuf, sizeof(pbuf), NI_NUMERICHOST | NI_NUMERICSERV);
|
|
|
|
if (error) {
|
2004-04-01 21:15:25 -05:00
|
|
|
raise_socket_error("getnameinfo", error);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2002-06-11 03:02:23 -04:00
|
|
|
addr2 = rb_str_new2(hbuf);
|
2004-05-06 09:28:23 -04:00
|
|
|
if (addr1 == Qnil) {
|
1999-08-13 01:37:52 -04:00
|
|
|
addr1 = addr2;
|
|
|
|
}
|
|
|
|
port = INT2FIX(atoi(pbuf));
|
|
|
|
ary = rb_ary_new3(4, family, port, addr1, addr2);
|
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
ruby_socket(domain, type, proto)
|
|
|
|
int domain, type, proto;
|
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
|
|
|
|
fd = socket(domain, type, proto);
|
|
|
|
if (fd < 0) {
|
|
|
|
if (errno == EMFILE || errno == ENFILE) {
|
|
|
|
rb_gc();
|
|
|
|
fd = socket(domain, type, proto);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
return fd;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2004-09-06 23:52:15 -04:00
|
|
|
static int
|
2005-06-03 10:23:17 -04:00
|
|
|
wait_connectable0(fd, fds_w, fds_e)
|
2000-05-18 00:32:13 -04:00
|
|
|
int fd;
|
2005-06-03 10:23:17 -04:00
|
|
|
rb_fdset_t *fds_w, *fds_e;
|
2000-05-18 00:32:13 -04:00
|
|
|
{
|
2004-09-06 23:52:15 -04:00
|
|
|
int sockerr, sockerrlen;
|
|
|
|
|
|
|
|
for (;;) {
|
2005-06-03 10:23:17 -04:00
|
|
|
rb_fd_zero(fds_w);
|
|
|
|
rb_fd_zero(fds_e);
|
2004-09-06 23:52:15 -04:00
|
|
|
|
2005-06-03 10:23:17 -04:00
|
|
|
rb_fd_set(fd, fds_w);
|
|
|
|
rb_fd_set(fd, fds_e);
|
2000-05-18 00:32:13 -04:00
|
|
|
|
2005-06-03 10:23:17 -04:00
|
|
|
rb_thread_select(fd+1, 0, rb_fd_ptr(fds_w), rb_fd_ptr(fds_e), 0);
|
2004-09-06 23:52:15 -04:00
|
|
|
|
2005-06-03 10:23:17 -04:00
|
|
|
if (rb_fd_isset(fd, fds_w)) {
|
2004-09-06 23:52:15 -04:00
|
|
|
return 0;
|
|
|
|
}
|
2005-06-03 10:23:17 -04:00
|
|
|
else if (rb_fd_isset(fd, fds_e)) {
|
2004-09-06 23:52:15 -04:00
|
|
|
sockerrlen = sizeof(sockerr);
|
|
|
|
if (getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr,
|
2005-02-09 02:34:56 -05:00
|
|
|
&sockerrlen) == 0) {
|
|
|
|
if (sockerr == 0)
|
|
|
|
continue; /* workaround for winsock */
|
2004-09-06 23:52:15 -04:00
|
|
|
errno = sockerr;
|
2005-02-09 02:34:56 -05:00
|
|
|
}
|
2004-09-06 23:52:15 -04:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
2000-05-18 00:32:13 -04:00
|
|
|
}
|
|
|
|
|
2005-06-03 10:23:17 -04:00
|
|
|
struct wait_connectable_arg {
|
|
|
|
int fd;
|
|
|
|
rb_fdset_t fds_w;
|
|
|
|
rb_fdset_t fds_e;
|
|
|
|
};
|
|
|
|
|
|
|
|
#ifdef HAVE_RB_FD_INIT
|
|
|
|
static VALUE
|
|
|
|
try_wait_connectable(arg)
|
|
|
|
VALUE arg;
|
|
|
|
{
|
|
|
|
struct wait_connectable_arg *p = (struct wait_connectable_arg *)arg;
|
|
|
|
return (VALUE)wait_connectable0(p->fd, &p->fds_w, &p->fds_e);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
wait_connectable_ensure(arg)
|
|
|
|
VALUE arg;
|
|
|
|
{
|
|
|
|
struct wait_connectable_arg *p = (struct wait_connectable_arg *)arg;
|
|
|
|
rb_fd_term(&p->fds_w);
|
|
|
|
rb_fd_term(&p->fds_e);
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static int
|
|
|
|
wait_connectable(fd)
|
|
|
|
int fd;
|
|
|
|
{
|
|
|
|
struct wait_connectable_arg arg;
|
|
|
|
|
|
|
|
rb_fd_init(&arg.fds_w);
|
|
|
|
rb_fd_init(&arg.fds_e);
|
|
|
|
#ifdef HAVE_RB_FD_INIT
|
|
|
|
arg.fd = fd;
|
|
|
|
return (int)rb_ensure(try_wait_connectable, (VALUE)&arg,
|
|
|
|
wait_connectable_ensure,(VALUE)&arg);
|
|
|
|
#else
|
|
|
|
return wait_connectable0(fd, &arg.fds_w, &arg.fds_e);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2003-05-16 11:18:14 -04:00
|
|
|
#ifdef __CYGWIN__
|
|
|
|
#define WAIT_IN_PROGRESS 10
|
|
|
|
#endif
|
|
|
|
#ifdef __APPLE__
|
|
|
|
#define WAIT_IN_PROGRESS 10
|
|
|
|
#endif
|
2003-08-20 03:44:53 -04:00
|
|
|
#ifdef __linux__
|
|
|
|
/* returns correct error */
|
|
|
|
#define WAIT_IN_PROGRESS 0
|
|
|
|
#endif
|
|
|
|
#ifndef WAIT_IN_PROGRESS
|
|
|
|
/* BSD origin code apparently has a problem */
|
|
|
|
#define WAIT_IN_PROGRESS 1
|
|
|
|
#endif
|
2003-05-16 11:18:14 -04:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static int
|
1999-08-13 01:37:52 -04:00
|
|
|
ruby_connect(fd, sockaddr, len, socks)
|
1998-01-16 07:13:05 -05:00
|
|
|
int fd;
|
|
|
|
struct sockaddr *sockaddr;
|
|
|
|
int len;
|
1999-08-13 01:37:52 -04:00
|
|
|
int socks;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
int status;
|
|
|
|
int mode;
|
2003-08-20 03:44:53 -04:00
|
|
|
#if WAIT_IN_PROGRESS > 0
|
2001-07-12 02:16:49 -04:00
|
|
|
int wait_in_progress = -1;
|
2003-08-20 03:44:53 -04:00
|
|
|
int sockerr, sockerrlen;
|
2001-07-12 02:16:49 -04:00
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
#if defined(HAVE_FCNTL)
|
2004-09-06 23:52:15 -04:00
|
|
|
# if defined(F_GETFL)
|
1998-01-16 07:13:05 -05:00
|
|
|
mode = fcntl(fd, F_GETFL, 0);
|
2004-09-06 23:52:15 -04:00
|
|
|
# else
|
|
|
|
mode = 0;
|
|
|
|
# endif
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2001-07-31 04:04:13 -04:00
|
|
|
#ifdef O_NDELAY
|
1998-01-16 07:13:05 -05:00
|
|
|
# define NONBLOCKING O_NDELAY
|
|
|
|
#else
|
|
|
|
#ifdef O_NBIO
|
|
|
|
# define NONBLOCKING O_NBIO
|
|
|
|
#else
|
|
|
|
# define NONBLOCKING O_NONBLOCK
|
|
|
|
#endif
|
1999-09-22 00:30:11 -04:00
|
|
|
#endif
|
|
|
|
#ifdef SOCKS5
|
|
|
|
if (!socks)
|
1998-01-16 07:13:05 -05:00
|
|
|
#endif
|
|
|
|
fcntl(fd, F_SETFL, mode|NONBLOCKING);
|
1999-08-13 01:37:52 -04:00
|
|
|
#endif /* HAVE_FCNTL */
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
for (;;) {
|
1999-09-22 00:30:11 -04:00
|
|
|
#if defined(SOCKS) && !defined(SOCKS5)
|
1999-08-13 01:37:52 -04:00
|
|
|
if (socks) {
|
1998-01-16 07:13:05 -05:00
|
|
|
status = Rconnect(fd, sockaddr, len);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif
|
|
|
|
{
|
|
|
|
status = connect(fd, sockaddr, len);
|
|
|
|
}
|
|
|
|
if (status < 0) {
|
|
|
|
switch (errno) {
|
1999-08-13 01:37:52 -04:00
|
|
|
case EAGAIN:
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef EINPROGRESS
|
|
|
|
case EINPROGRESS:
|
2003-05-16 11:18:14 -04:00
|
|
|
#endif
|
2003-08-20 03:44:53 -04:00
|
|
|
#if WAIT_IN_PROGRESS > 0
|
|
|
|
sockerrlen = sizeof(sockerr);
|
2003-09-26 12:35:07 -04:00
|
|
|
status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
|
2003-08-20 03:44:53 -04:00
|
|
|
if (status) break;
|
|
|
|
if (sockerr) {
|
|
|
|
status = -1;
|
|
|
|
errno = sockerr;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
#endif
|
2003-05-16 11:18:14 -04:00
|
|
|
#ifdef EALREADY
|
2001-10-04 01:32:09 -04:00
|
|
|
case EALREADY:
|
2001-06-22 10:44:44 -04:00
|
|
|
#endif
|
2003-08-20 03:44:53 -04:00
|
|
|
#if WAIT_IN_PROGRESS > 0
|
2003-05-16 11:18:14 -04:00
|
|
|
wait_in_progress = WAIT_IN_PROGRESS;
|
1998-01-16 07:13:05 -05:00
|
|
|
#endif
|
2004-09-06 23:52:15 -04:00
|
|
|
status = wait_connectable(fd);
|
|
|
|
if (status) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
errno = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
continue;
|
|
|
|
|
2003-08-20 03:44:53 -04:00
|
|
|
#if WAIT_IN_PROGRESS > 0
|
2001-07-12 02:16:49 -04:00
|
|
|
case EINVAL:
|
2001-10-04 01:32:09 -04:00
|
|
|
if (wait_in_progress-- > 0) {
|
2003-05-16 11:18:14 -04:00
|
|
|
/*
|
|
|
|
* connect() after EINPROGRESS returns EINVAL on
|
|
|
|
* some platforms, need to check true error
|
|
|
|
* status.
|
|
|
|
*/
|
2003-08-20 03:44:53 -04:00
|
|
|
sockerrlen = sizeof(sockerr);
|
2003-09-26 12:35:07 -04:00
|
|
|
status = getsockopt(fd, SOL_SOCKET, SO_ERROR, (void *)&sockerr, &sockerrlen);
|
2003-05-16 11:18:14 -04:00
|
|
|
if (!status && !sockerr) {
|
|
|
|
struct timeval tv = {0, 100000};
|
|
|
|
rb_thread_wait_for(tv);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
status = -1;
|
|
|
|
errno = sockerr;
|
2001-07-12 02:16:49 -04:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef EISCONN
|
|
|
|
case EISCONN:
|
|
|
|
status = 0;
|
|
|
|
errno = 0;
|
|
|
|
break;
|
|
|
|
#endif
|
2001-07-18 01:56:05 -04:00
|
|
|
default:
|
|
|
|
break;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
#ifdef HAVE_FCNTL
|
1998-01-16 07:13:05 -05:00
|
|
|
fcntl(fd, F_SETFL, mode);
|
1999-08-13 01:37:52 -04:00
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
return status;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2002-06-03 11:52:28 -04:00
|
|
|
struct inetsock_arg
|
|
|
|
{
|
|
|
|
VALUE sock;
|
|
|
|
struct {
|
|
|
|
VALUE host, serv;
|
|
|
|
struct addrinfo *res;
|
|
|
|
} remote, local;
|
2001-02-08 04:19:27 -05:00
|
|
|
int type;
|
2002-06-03 11:52:28 -04:00
|
|
|
int fd;
|
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
inetsock_cleanup(arg)
|
|
|
|
struct inetsock_arg *arg;
|
|
|
|
{
|
|
|
|
if (arg->remote.res) {
|
|
|
|
freeaddrinfo(arg->remote.res);
|
|
|
|
arg->remote.res = 0;
|
|
|
|
}
|
|
|
|
if (arg->local.res) {
|
|
|
|
freeaddrinfo(arg->local.res);
|
|
|
|
arg->local.res = 0;
|
|
|
|
}
|
|
|
|
if (arg->fd >= 0) {
|
|
|
|
close(arg->fd);
|
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
init_inetsock_internal(arg)
|
|
|
|
struct inetsock_arg *arg;
|
2001-02-08 04:19:27 -05:00
|
|
|
{
|
2002-06-03 11:52:28 -04:00
|
|
|
int type = arg->type;
|
2003-01-16 02:38:40 -05:00
|
|
|
struct addrinfo *res;
|
2003-12-10 21:39:59 -05:00
|
|
|
int fd, status = 0;
|
2001-02-08 04:19:27 -05:00
|
|
|
char *syscall;
|
|
|
|
|
2002-06-03 11:52:28 -04:00
|
|
|
arg->remote.res = sock_addrinfo(arg->remote.host, arg->remote.serv, SOCK_STREAM,
|
|
|
|
(type == INET_SERVER) ? AI_PASSIVE : 0);
|
2001-02-08 04:19:27 -05:00
|
|
|
/*
|
|
|
|
* Maybe also accept a local address
|
|
|
|
*/
|
|
|
|
|
2002-06-03 11:52:28 -04:00
|
|
|
if (type != INET_SERVER && (!NIL_P(arg->local.host) || !NIL_P(arg->local.serv))) {
|
|
|
|
arg->local.res = sock_addrinfo(arg->local.host, arg->local.serv, SOCK_STREAM, 0);
|
2002-03-25 01:18:07 -05:00
|
|
|
}
|
2001-07-31 04:04:13 -04:00
|
|
|
|
2002-06-03 11:52:28 -04:00
|
|
|
arg->fd = fd = -1;
|
|
|
|
for (res = arg->remote.res; res; res = res->ai_next) {
|
1999-08-13 01:37:52 -04:00
|
|
|
status = ruby_socket(res->ai_family,res->ai_socktype,res->ai_protocol);
|
|
|
|
syscall = "socket(2)";
|
|
|
|
fd = status;
|
|
|
|
if (fd < 0) {
|
|
|
|
continue;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2002-06-03 11:52:28 -04:00
|
|
|
arg->fd = fd;
|
1999-08-13 01:37:52 -04:00
|
|
|
if (type == INET_SERVER) {
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-14 22:18:08 -05:00
|
|
|
#ifndef _WIN32
|
1999-08-13 01:37:52 -04:00
|
|
|
status = 1;
|
|
|
|
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR,
|
|
|
|
(char*)&status, sizeof(status));
|
2001-10-29 00:07:26 -05:00
|
|
|
#endif
|
1999-08-13 01:37:52 -04:00
|
|
|
status = bind(fd, res->ai_addr, res->ai_addrlen);
|
|
|
|
syscall = "bind(2)";
|
|
|
|
}
|
|
|
|
else {
|
2002-06-03 11:52:28 -04:00
|
|
|
if (arg->local.res) {
|
|
|
|
status = bind(fd, arg->local.res->ai_addr, arg->local.res->ai_addrlen);
|
2001-02-08 04:19:27 -05:00
|
|
|
syscall = "bind(2)";
|
|
|
|
}
|
|
|
|
|
|
|
|
if (status >= 0) {
|
|
|
|
status = ruby_connect(fd, res->ai_addr, res->ai_addrlen,
|
|
|
|
(type == INET_SOCKS));
|
|
|
|
syscall = "connect(2)";
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
if (status < 0) {
|
|
|
|
close(fd);
|
2002-06-03 11:52:28 -04:00
|
|
|
arg->fd = fd = -1;
|
1999-08-13 01:37:52 -04:00
|
|
|
continue;
|
|
|
|
} else
|
|
|
|
break;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
if (status < 0) {
|
|
|
|
rb_sys_fail(syscall);
|
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
|
2002-06-03 11:52:28 -04:00
|
|
|
arg->fd = -1;
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
if (type == INET_SERVER)
|
|
|
|
listen(fd, 5);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
/* create new instance */
|
2002-06-03 11:52:28 -04:00
|
|
|
return init_sock(arg->sock, fd);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
init_inetsock(sock, remote_host, remote_serv, local_host, local_serv, type)
|
|
|
|
VALUE sock, remote_host, remote_serv, local_host, local_serv;
|
|
|
|
int type;
|
|
|
|
{
|
|
|
|
struct inetsock_arg arg;
|
|
|
|
arg.sock = sock;
|
|
|
|
arg.remote.host = remote_host;
|
|
|
|
arg.remote.serv = remote_serv;
|
|
|
|
arg.remote.res = 0;
|
|
|
|
arg.local.host = local_host;
|
|
|
|
arg.local.serv = local_serv;
|
|
|
|
arg.local.res = 0;
|
|
|
|
arg.type = type;
|
|
|
|
arg.fd = -1;
|
|
|
|
return rb_ensure(init_inetsock_internal, (VALUE)&arg,
|
|
|
|
inetsock_cleanup, (VALUE)&arg);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2002-01-17 03:05:01 -05:00
|
|
|
tcp_init(argc, argv, sock)
|
2001-02-08 04:19:27 -05:00
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
2002-01-17 03:05:01 -05:00
|
|
|
VALUE sock;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2001-02-08 04:19:27 -05:00
|
|
|
VALUE remote_host, remote_serv;
|
|
|
|
VALUE local_host, local_serv;
|
2001-07-31 04:04:13 -04:00
|
|
|
|
2003-01-16 02:38:40 -05:00
|
|
|
rb_scan_args(argc, argv, "22", &remote_host, &remote_serv,
|
|
|
|
&local_host, &local_serv);
|
2001-02-08 04:19:27 -05:00
|
|
|
|
2002-01-17 03:05:01 -05:00
|
|
|
return init_inetsock(sock, remote_host, remote_serv,
|
2003-01-16 02:38:40 -05:00
|
|
|
local_host, local_serv, INET_CLIENT);
|
2002-01-17 03:05:01 -05:00
|
|
|
}
|
2001-02-08 04:19:27 -05:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef SOCKS
|
|
|
|
static VALUE
|
2002-01-17 03:05:01 -05:00
|
|
|
socks_init(sock, host, serv)
|
|
|
|
VALUE sock, host, serv;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
static init = 0;
|
|
|
|
|
|
|
|
if (init == 0) {
|
|
|
|
SOCKSinit("ruby");
|
|
|
|
init = 1;
|
|
|
|
}
|
2001-07-31 04:04:13 -04:00
|
|
|
|
2003-07-29 14:26:55 -04:00
|
|
|
return init_inetsock(sock, host, serv, Qnil, Qnil, INET_SOCKS);
|
2002-01-17 03:05:01 -05:00
|
|
|
}
|
|
|
|
|
1999-10-04 00:51:08 -04:00
|
|
|
#ifdef SOCKS5
|
|
|
|
static VALUE
|
|
|
|
socks_s_close(sock)
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
|
1999-12-14 01:50:43 -05:00
|
|
|
if (rb_safe_level() >= 4 && !OBJ_TAINTED(sock)) {
|
|
|
|
rb_raise(rb_eSecurityError, "Insecure: can't close socket");
|
|
|
|
}
|
1999-10-04 00:51:08 -04:00
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
shutdown(fptr->fd, 2);
|
1999-10-04 00:51:08 -04:00
|
|
|
return rb_io_close(sock);
|
|
|
|
}
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
#endif
|
|
|
|
|
2004-04-01 18:13:39 -05:00
|
|
|
struct hostent_arg {
|
2004-01-21 11:47:23 -05:00
|
|
|
VALUE host;
|
2004-04-01 18:13:39 -05:00
|
|
|
struct addrinfo* addr;
|
|
|
|
VALUE (*ipaddr)_((struct sockaddr*, size_t));
|
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
make_hostent_internal(arg)
|
|
|
|
struct hostent_arg *arg;
|
2002-03-25 01:18:07 -05:00
|
|
|
{
|
2004-04-01 18:13:39 -05:00
|
|
|
VALUE host = arg->host;
|
|
|
|
struct addrinfo* addr = arg->addr;
|
|
|
|
VALUE (*ipaddr)_((struct sockaddr*, size_t)) = arg->ipaddr;
|
|
|
|
|
2003-10-01 09:41:35 -04:00
|
|
|
struct addrinfo *ai;
|
|
|
|
struct hostent *h;
|
2002-03-25 01:18:07 -05:00
|
|
|
VALUE ary, names;
|
|
|
|
char **pch;
|
2004-04-01 18:13:39 -05:00
|
|
|
const char* hostp;
|
|
|
|
char hbuf[NI_MAXHOST];
|
2002-03-25 01:18:07 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
ary = rb_ary_new();
|
2004-01-10 12:39:07 -05:00
|
|
|
if (addr->ai_canonname) {
|
2004-04-01 18:13:39 -05:00
|
|
|
hostp = addr->ai_canonname;
|
2004-01-10 12:39:07 -05:00
|
|
|
}
|
|
|
|
else {
|
2004-04-01 18:13:39 -05:00
|
|
|
hostp = host_str(host, hbuf, sizeof(hbuf));
|
2004-01-10 12:39:07 -05:00
|
|
|
}
|
2004-04-01 18:13:39 -05:00
|
|
|
rb_ary_push(ary, rb_str_new2(hostp));
|
2003-10-01 09:41:35 -04:00
|
|
|
|
2004-04-01 18:13:39 -05:00
|
|
|
if (addr->ai_canonname && (h = gethostbyname(addr->ai_canonname))) {
|
2004-01-21 11:47:23 -05:00
|
|
|
names = rb_ary_new();
|
|
|
|
if (h->h_aliases != NULL) {
|
|
|
|
for (pch = h->h_aliases; *pch; pch++) {
|
|
|
|
rb_ary_push(names, rb_str_new2(*pch));
|
2003-11-06 20:23:27 -05:00
|
|
|
}
|
2004-01-21 11:47:23 -05:00
|
|
|
}
|
2003-11-06 20:23:27 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
names = rb_ary_new2(0);
|
|
|
|
}
|
|
|
|
rb_ary_push(ary, names);
|
2003-10-01 09:41:35 -04:00
|
|
|
rb_ary_push(ary, INT2NUM(addr->ai_family));
|
|
|
|
for (ai = addr; ai; ai = ai->ai_next) {
|
|
|
|
rb_ary_push(ary, (*ipaddr)(ai->ai_addr, ai->ai_addrlen));
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2004-04-01 18:13:39 -05:00
|
|
|
static VALUE
|
|
|
|
make_hostent(host, addr, ipaddr)
|
|
|
|
VALUE host;
|
|
|
|
struct addrinfo* addr;
|
|
|
|
VALUE (*ipaddr)_((struct sockaddr*, size_t));
|
|
|
|
{
|
|
|
|
struct hostent_arg arg;
|
|
|
|
|
|
|
|
arg.host = host;
|
|
|
|
arg.addr = addr;
|
|
|
|
arg.ipaddr = ipaddr;
|
2004-04-06 00:13:24 -04:00
|
|
|
return rb_ensure(make_hostent_internal, (VALUE)&arg,
|
|
|
|
RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)addr);
|
2004-04-01 18:13:39 -05:00
|
|
|
}
|
|
|
|
|
2003-10-01 09:41:35 -04:00
|
|
|
VALUE
|
|
|
|
tcp_sockaddr(addr, len)
|
|
|
|
struct sockaddr *addr;
|
|
|
|
size_t len;
|
|
|
|
{
|
|
|
|
return make_ipaddr(addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
tcp_s_gethostbyname(obj, host)
|
|
|
|
VALUE obj, host;
|
|
|
|
{
|
|
|
|
rb_secure(3);
|
2004-04-01 18:13:39 -05:00
|
|
|
return make_hostent(host, sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), tcp_sockaddr);
|
2003-10-01 09:41:35 -04:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2002-01-17 03:05:01 -05:00
|
|
|
tcp_svr_init(argc, argv, sock)
|
1998-01-16 07:13:05 -05:00
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
2002-01-17 03:05:01 -05:00
|
|
|
VALUE sock;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
VALUE arg1, arg2;
|
|
|
|
|
|
|
|
if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2)
|
2002-12-29 15:14:51 -05:00
|
|
|
return init_inetsock(sock, arg1, arg2, Qnil, Qnil, INET_SERVER);
|
1998-01-16 07:13:05 -05:00
|
|
|
else
|
2002-12-29 15:14:51 -05:00
|
|
|
return init_inetsock(sock, Qnil, arg1, Qnil, Qnil, INET_SERVER);
|
2002-01-17 03:05:01 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2002-01-17 03:05:01 -05:00
|
|
|
s_accept(klass, fd, sockaddr, len)
|
|
|
|
VALUE klass;
|
1998-01-16 07:13:05 -05:00
|
|
|
int fd;
|
|
|
|
struct sockaddr *sockaddr;
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t *len;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
int fd2;
|
2000-08-24 02:21:43 -04:00
|
|
|
int retry = 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-05-22 01:30:25 -04:00
|
|
|
rb_secure(3);
|
1998-01-16 07:13:05 -05:00
|
|
|
retry:
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_thread_wait_fd(fd);
|
2001-09-05 02:54:57 -04:00
|
|
|
#if defined(_nec_ews)
|
|
|
|
fd2 = accept(fd, sockaddr, len);
|
|
|
|
#else
|
1998-01-16 07:13:05 -05:00
|
|
|
TRAP_BEG;
|
|
|
|
fd2 = accept(fd, sockaddr, len);
|
|
|
|
TRAP_END;
|
2001-09-05 02:54:57 -04:00
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
if (fd2 < 0) {
|
|
|
|
switch (errno) {
|
2000-08-24 02:21:43 -04:00
|
|
|
case EMFILE:
|
|
|
|
case ENFILE:
|
|
|
|
if (retry) break;
|
|
|
|
rb_gc();
|
|
|
|
retry = 1;
|
|
|
|
goto retry;
|
2004-09-29 01:15:33 -04:00
|
|
|
case EWOULDBLOCK:
|
|
|
|
break;
|
2002-10-02 10:13:58 -04:00
|
|
|
default:
|
|
|
|
if (!rb_io_wait_readable(fd)) break;
|
|
|
|
retry = 0;
|
1999-08-13 01:37:52 -04:00
|
|
|
goto retry;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
rb_sys_fail(0);
|
|
|
|
}
|
2002-05-23 01:35:32 -04:00
|
|
|
if (!klass) return INT2NUM(fd2);
|
2002-01-17 03:05:01 -05:00
|
|
|
return init_sock(rb_obj_alloc(klass), fd2);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
tcp_accept(sock)
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
1999-08-13 01:37:52 -04:00
|
|
|
struct sockaddr_storage from;
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t fromlen;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
1999-08-13 01:37:52 -04:00
|
|
|
fromlen = sizeof(from);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
return s_accept(rb_cTCPSocket, fptr->fd,
|
1998-01-16 07:13:05 -05:00
|
|
|
(struct sockaddr*)&from, &fromlen);
|
|
|
|
}
|
|
|
|
|
2002-05-23 01:35:32 -04:00
|
|
|
static VALUE
|
|
|
|
tcp_sysaccept(sock)
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
struct sockaddr_storage from;
|
|
|
|
socklen_t fromlen;
|
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
fromlen = sizeof(from);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
return s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen);
|
2002-05-23 01:35:32 -04:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef HAVE_SYS_UN_H
|
2002-06-03 11:52:28 -04:00
|
|
|
struct unixsock_arg {
|
|
|
|
struct sockaddr_un *sockaddr;
|
|
|
|
int fd;
|
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
unixsock_connect_internal(arg)
|
|
|
|
struct unixsock_arg *arg;
|
|
|
|
{
|
2004-11-04 07:27:57 -05:00
|
|
|
return (VALUE)ruby_connect(arg->fd, arg->sockaddr, sizeof(*arg->sockaddr), 0);
|
2002-06-03 11:52:28 -04:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2002-01-17 03:05:01 -05:00
|
|
|
init_unixsock(sock, path, server)
|
|
|
|
VALUE sock;
|
2001-12-18 03:47:06 -05:00
|
|
|
VALUE path;
|
1998-01-16 07:13:05 -05:00
|
|
|
int server;
|
|
|
|
{
|
|
|
|
struct sockaddr_un sockaddr;
|
|
|
|
int fd, status;
|
|
|
|
OpenFile *fptr;
|
|
|
|
|
2001-12-18 03:47:06 -05:00
|
|
|
SafeStringValue(path);
|
1999-08-13 01:37:52 -04:00
|
|
|
fd = ruby_socket(AF_UNIX, SOCK_STREAM, 0);
|
|
|
|
if (fd < 0) {
|
|
|
|
rb_sys_fail("socket(2)");
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
MEMZERO(&sockaddr, struct sockaddr_un, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
sockaddr.sun_family = AF_UNIX;
|
2001-12-18 03:47:06 -05:00
|
|
|
strncpy(sockaddr.sun_path, RSTRING(path)->ptr, sizeof(sockaddr.sun_path)-1);
|
1998-01-16 07:13:05 -05:00
|
|
|
sockaddr.sun_path[sizeof(sockaddr.sun_path)-1] = '\0';
|
|
|
|
|
|
|
|
if (server) {
|
|
|
|
status = bind(fd, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
|
|
|
|
}
|
|
|
|
else {
|
2002-06-03 11:52:28 -04:00
|
|
|
int prot;
|
|
|
|
struct unixsock_arg arg;
|
|
|
|
arg.sockaddr = &sockaddr;
|
|
|
|
arg.fd = fd;
|
|
|
|
status = rb_protect(unixsock_connect_internal, (VALUE)&arg, &prot);
|
|
|
|
if (prot) {
|
|
|
|
close(fd);
|
|
|
|
rb_jump_tag(prot);
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
if (status < 0) {
|
|
|
|
close(fd);
|
|
|
|
rb_sys_fail(sockaddr.sun_path);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (server) listen(fd, 5);
|
|
|
|
|
2002-01-17 03:05:01 -05:00
|
|
|
init_sock(sock, fd);
|
1998-01-16 07:13:05 -05:00
|
|
|
GetOpenFile(sock, fptr);
|
2001-12-18 03:47:06 -05:00
|
|
|
fptr->path = strdup(RSTRING(path)->ptr);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
return sock;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static VALUE
|
1998-01-16 07:19:22 -05:00
|
|
|
ip_addr(sock)
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
1999-08-13 01:37:52 -04:00
|
|
|
struct sockaddr_storage addr;
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t len = sizeof addr;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail("getsockname(2)");
|
2004-04-01 21:15:25 -05:00
|
|
|
return ipaddr((struct sockaddr*)&addr, fptr->mode & FMODE_NOREVLOOKUP);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
1998-01-16 07:19:22 -05:00
|
|
|
ip_peeraddr(sock)
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
1999-08-13 01:37:52 -04:00
|
|
|
struct sockaddr_storage addr;
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t len = sizeof addr;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail("getpeername(2)");
|
2004-04-01 21:15:25 -05:00
|
|
|
return ipaddr((struct sockaddr*)&addr, fptr->mode & FMODE_NOREVLOOKUP);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2000-06-29 03:46:56 -04:00
|
|
|
static VALUE
|
|
|
|
ip_recvfrom(argc, argv, sock)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
return s_recvfrom(sock, argc, argv, RECV_IP);
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
1998-01-16 07:19:22 -05:00
|
|
|
ip_s_getaddress(obj, host)
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE obj, host;
|
|
|
|
{
|
1999-08-13 01:37:52 -04:00
|
|
|
struct sockaddr_storage addr;
|
2003-10-01 09:41:35 -04:00
|
|
|
struct addrinfo *res = sock_addrinfo(host, Qnil, SOCK_STREAM, 0);
|
|
|
|
|
|
|
|
/* just take the first one */
|
|
|
|
memcpy(&addr, res->ai_addr, res->ai_addrlen);
|
|
|
|
freeaddrinfo(res);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2003-10-01 09:41:35 -04:00
|
|
|
return make_ipaddr((struct sockaddr*)&addr);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
static VALUE
|
2002-01-17 03:05:01 -05:00
|
|
|
udp_init(argc, argv, sock)
|
1999-08-13 01:37:52 -04:00
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
2002-01-17 03:05:01 -05:00
|
|
|
VALUE sock;
|
1998-01-16 07:19:22 -05:00
|
|
|
{
|
1999-08-13 01:37:52 -04:00
|
|
|
VALUE arg;
|
|
|
|
int socktype = AF_INET;
|
|
|
|
int fd;
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2000-05-22 01:30:25 -04:00
|
|
|
rb_secure(3);
|
1999-08-13 01:37:52 -04:00
|
|
|
if (rb_scan_args(argc, argv, "01", &arg) == 1) {
|
|
|
|
socktype = NUM2INT(arg);
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
fd = ruby_socket(socktype, SOCK_DGRAM, 0);
|
|
|
|
if (fd < 0) {
|
|
|
|
rb_sys_fail("socket(2) - udp");
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
|
2002-01-17 03:05:01 -05:00
|
|
|
return init_sock(sock, fd);
|
|
|
|
}
|
|
|
|
|
2002-06-03 11:52:28 -04:00
|
|
|
struct udp_arg
|
|
|
|
{
|
|
|
|
struct addrinfo *res;
|
|
|
|
int fd;
|
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
udp_connect_internal(arg)
|
|
|
|
struct udp_arg *arg;
|
|
|
|
{
|
|
|
|
int fd = arg->fd;
|
|
|
|
struct addrinfo *res;
|
|
|
|
|
|
|
|
for (res = arg->res; res; res = res->ai_next) {
|
|
|
|
if (ruby_connect(fd, res->ai_addr, res->ai_addrlen, 0) >= 0) {
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
static VALUE
|
|
|
|
udp_connect(sock, host, port)
|
|
|
|
VALUE sock, host, port;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
2002-06-03 11:52:28 -04:00
|
|
|
struct udp_arg arg;
|
|
|
|
VALUE ret;
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2000-05-22 01:30:25 -04:00
|
|
|
rb_secure(3);
|
2002-06-03 11:52:28 -04:00
|
|
|
arg.res = sock_addrinfo(host, port, SOCK_DGRAM, 0);
|
2004-12-06 10:31:26 -05:00
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
arg.fd = fptr->fd;
|
2002-06-03 11:52:28 -04:00
|
|
|
ret = rb_ensure(udp_connect_internal, (VALUE)&arg,
|
|
|
|
RUBY_METHOD_FUNC(freeaddrinfo), (VALUE)arg.res);
|
|
|
|
if (!ret) rb_sys_fail("connect(2)");
|
1998-01-16 07:19:22 -05:00
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
udp_bind(sock, host, port)
|
|
|
|
VALUE sock, host, port;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
1999-08-13 01:37:52 -04:00
|
|
|
struct addrinfo *res0, *res;
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2000-05-22 01:30:25 -04:00
|
|
|
rb_secure(3);
|
2002-03-28 04:17:54 -05:00
|
|
|
res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
|
2004-12-06 10:31:26 -05:00
|
|
|
GetOpenFile(sock, fptr);
|
1999-08-13 01:37:52 -04:00
|
|
|
for (res = res0; res; res = res->ai_next) {
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (bind(fptr->fd, res->ai_addr, res->ai_addrlen) < 0) {
|
1999-08-13 01:37:52 -04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
freeaddrinfo(res0);
|
|
|
|
return INT2FIX(0);
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
freeaddrinfo(res0);
|
|
|
|
rb_sys_fail("bind(2)");
|
1998-01-16 07:19:22 -05:00
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
udp_send(argc, argv, sock)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
VALUE mesg, flags, host, port;
|
|
|
|
OpenFile *fptr;
|
|
|
|
int n;
|
1999-08-13 01:37:52 -04:00
|
|
|
struct addrinfo *res0, *res;
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2000-06-29 03:46:56 -04:00
|
|
|
if (argc == 2 || argc == 3) {
|
1998-01-16 07:19:22 -05:00
|
|
|
return bsock_send(argc, argv, sock);
|
|
|
|
}
|
2000-05-22 01:30:25 -04:00
|
|
|
rb_secure(4);
|
1998-01-16 07:19:22 -05:00
|
|
|
rb_scan_args(argc, argv, "4", &mesg, &flags, &host, &port);
|
|
|
|
|
2001-05-06 11:06:00 -04:00
|
|
|
StringValue(mesg);
|
2004-12-06 10:31:26 -05:00
|
|
|
res0 = sock_addrinfo(host, port, SOCK_DGRAM, 0);
|
|
|
|
GetOpenFile(sock, fptr);
|
1999-08-13 01:37:52 -04:00
|
|
|
for (res = res0; res; res = res->ai_next) {
|
2000-05-22 01:30:25 -04:00
|
|
|
retry:
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
n = sendto(fptr->fd, RSTRING(mesg)->ptr, RSTRING(mesg)->len, NUM2INT(flags),
|
2001-05-06 11:06:00 -04:00
|
|
|
res->ai_addr, res->ai_addrlen);
|
1999-08-13 01:37:52 -04:00
|
|
|
if (n >= 0) {
|
|
|
|
freeaddrinfo(res0);
|
|
|
|
return INT2FIX(n);
|
|
|
|
}
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (rb_io_wait_writable(fptr->fd)) {
|
1999-08-13 01:37:52 -04:00
|
|
|
goto retry;
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
freeaddrinfo(res0);
|
|
|
|
rb_sys_fail("sendto(2)");
|
1998-01-16 07:19:22 -05:00
|
|
|
return INT2FIX(n);
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef HAVE_SYS_UN_H
|
2002-01-17 03:05:01 -05:00
|
|
|
static VALUE
|
|
|
|
unix_init(sock, path)
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE sock, path;
|
|
|
|
{
|
2002-01-17 03:05:01 -05:00
|
|
|
return init_unixsock(sock, path, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
unix_path(sock)
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
if (fptr->path == 0) {
|
|
|
|
struct sockaddr_un addr;
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t len = sizeof(addr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail(0);
|
|
|
|
fptr->path = strdup(addr.sun_path);
|
|
|
|
}
|
2002-06-11 03:02:23 -04:00
|
|
|
return rb_str_new2(fptr->path);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2002-01-17 03:05:01 -05:00
|
|
|
static VALUE
|
|
|
|
unix_svr_init(sock, path)
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE sock, path;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2002-01-19 09:22:27 -05:00
|
|
|
return init_unixsock(sock, path, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
unix_recvfrom(argc, argv, sock)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
VALUE sock;
|
|
|
|
{
|
2000-06-28 04:31:35 -04:00
|
|
|
return s_recvfrom(sock, argc, argv, RECV_UNIX);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-05-20 02:04:39 -04:00
|
|
|
#if defined(HAVE_ST_MSG_CONTROL) && defined(SCM_RIGHTS)
|
|
|
|
#define FD_PASSING_BY_MSG_CONTROL 1
|
|
|
|
#else
|
|
|
|
#define FD_PASSING_BY_MSG_CONTROL 0
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(HAVE_ST_MSG_ACCRIGHTS)
|
|
|
|
#define FD_PASSING_BY_MSG_ACCRIGHTS 1
|
|
|
|
#else
|
|
|
|
#define FD_PASSING_BY_MSG_ACCRIGHTS 0
|
|
|
|
#endif
|
|
|
|
|
2002-02-28 16:31:35 -05:00
|
|
|
static VALUE
|
|
|
|
unix_send_io(sock, val)
|
|
|
|
VALUE sock, val;
|
|
|
|
{
|
2004-05-20 02:04:39 -04:00
|
|
|
#if defined(HAVE_SENDMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
|
2002-02-28 16:31:35 -05:00
|
|
|
int fd;
|
|
|
|
OpenFile *fptr;
|
|
|
|
struct msghdr msg;
|
|
|
|
struct iovec vec[1];
|
|
|
|
char buf[1];
|
|
|
|
|
2004-05-20 02:04:39 -04:00
|
|
|
#if FD_PASSING_BY_MSG_CONTROL
|
2002-02-28 16:31:35 -05:00
|
|
|
struct {
|
|
|
|
struct cmsghdr hdr;
|
|
|
|
int fd;
|
|
|
|
} cmsg;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (rb_obj_is_kind_of(val, rb_cIO)) {
|
|
|
|
OpenFile *valfptr;
|
|
|
|
GetOpenFile(val, valfptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
fd = valfptr->fd;
|
2002-02-28 16:31:35 -05:00
|
|
|
}
|
|
|
|
else if (FIXNUM_P(val)) {
|
|
|
|
fd = FIX2INT(val);
|
|
|
|
}
|
|
|
|
else {
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eTypeError, "neither IO nor file descriptor");
|
2002-02-28 16:31:35 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
|
|
|
|
msg.msg_name = NULL;
|
|
|
|
msg.msg_namelen = 0;
|
|
|
|
|
|
|
|
/* Linux and Solaris doesn't work if msg_iov is NULL. */
|
|
|
|
buf[0] = '\0';
|
|
|
|
vec[0].iov_base = buf;
|
|
|
|
vec[0].iov_len = 1;
|
|
|
|
msg.msg_iov = vec;
|
|
|
|
msg.msg_iovlen = 1;
|
|
|
|
|
2004-05-20 02:04:39 -04:00
|
|
|
#if FD_PASSING_BY_MSG_CONTROL
|
2002-02-28 16:31:35 -05:00
|
|
|
msg.msg_control = (caddr_t)&cmsg;
|
|
|
|
msg.msg_controllen = sizeof(struct cmsghdr) + sizeof(int);
|
|
|
|
msg.msg_flags = 0;
|
|
|
|
cmsg.hdr.cmsg_len = sizeof(struct cmsghdr) + sizeof(int);
|
|
|
|
cmsg.hdr.cmsg_level = SOL_SOCKET;
|
|
|
|
cmsg.hdr.cmsg_type = SCM_RIGHTS;
|
|
|
|
cmsg.fd = fd;
|
|
|
|
#else
|
|
|
|
msg.msg_accrights = (caddr_t)&fd;
|
|
|
|
msg.msg_accrightslen = sizeof(fd);
|
|
|
|
#endif
|
|
|
|
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (sendmsg(fptr->fd, &msg, 0) == -1)
|
2002-02-28 16:31:35 -05:00
|
|
|
rb_sys_fail("sendmsg(2)");
|
|
|
|
|
|
|
|
return Qnil;
|
|
|
|
#else
|
|
|
|
rb_notimplement();
|
2003-08-01 03:02:54 -04:00
|
|
|
return Qnil; /* not reached */
|
2002-02-28 16:31:35 -05:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
unix_recv_io(argc, argv, sock)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
VALUE sock;
|
|
|
|
{
|
2004-05-20 02:04:39 -04:00
|
|
|
#if defined(HAVE_RECVMSG) && (FD_PASSING_BY_MSG_CONTROL || FD_PASSING_BY_MSG_ACCRIGHTS)
|
2002-02-28 16:31:35 -05:00
|
|
|
VALUE klass, mode;
|
|
|
|
OpenFile *fptr;
|
|
|
|
struct msghdr msg;
|
|
|
|
struct iovec vec[2];
|
|
|
|
char buf[1];
|
|
|
|
|
|
|
|
int fd;
|
2004-05-20 02:04:39 -04:00
|
|
|
#if FD_PASSING_BY_MSG_CONTROL
|
2002-02-28 16:31:35 -05:00
|
|
|
struct {
|
|
|
|
struct cmsghdr hdr;
|
|
|
|
int fd;
|
|
|
|
} cmsg;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "02", &klass, &mode);
|
|
|
|
if (argc == 0)
|
|
|
|
klass = rb_cIO;
|
|
|
|
if (argc <= 1)
|
|
|
|
mode = Qnil;
|
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
|
2005-06-03 10:23:17 -04:00
|
|
|
rb_io_wait_readable(fptr->fd);
|
2002-02-28 16:31:35 -05:00
|
|
|
|
|
|
|
msg.msg_name = NULL;
|
|
|
|
msg.msg_namelen = 0;
|
|
|
|
|
|
|
|
vec[0].iov_base = buf;
|
|
|
|
vec[0].iov_len = sizeof(buf);
|
|
|
|
msg.msg_iov = vec;
|
|
|
|
msg.msg_iovlen = 1;
|
|
|
|
|
2004-05-20 02:04:39 -04:00
|
|
|
#if FD_PASSING_BY_MSG_CONTROL
|
2002-02-28 16:31:35 -05:00
|
|
|
msg.msg_control = (caddr_t)&cmsg;
|
|
|
|
msg.msg_controllen = sizeof(struct cmsghdr) + sizeof(int);
|
|
|
|
msg.msg_flags = 0;
|
|
|
|
cmsg.hdr.cmsg_len = sizeof(struct cmsghdr) + sizeof(int);
|
|
|
|
cmsg.hdr.cmsg_level = SOL_SOCKET;
|
|
|
|
cmsg.hdr.cmsg_type = SCM_RIGHTS;
|
|
|
|
cmsg.fd = -1;
|
|
|
|
#else
|
|
|
|
msg.msg_accrights = (caddr_t)&fd;
|
|
|
|
msg.msg_accrightslen = sizeof(fd);
|
|
|
|
fd = -1;
|
|
|
|
#endif
|
|
|
|
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (recvmsg(fptr->fd, &msg, 0) == -1)
|
2002-02-28 16:31:35 -05:00
|
|
|
rb_sys_fail("recvmsg(2)");
|
|
|
|
|
|
|
|
if (
|
2004-05-20 02:04:39 -04:00
|
|
|
#if FD_PASSING_BY_MSG_CONTROL
|
2002-02-28 16:31:35 -05:00
|
|
|
msg.msg_controllen != sizeof(struct cmsghdr) + sizeof(int) ||
|
|
|
|
cmsg.hdr.cmsg_len != sizeof(struct cmsghdr) + sizeof(int) ||
|
|
|
|
cmsg.hdr.cmsg_level != SOL_SOCKET ||
|
|
|
|
cmsg.hdr.cmsg_type != SCM_RIGHTS
|
|
|
|
#else
|
|
|
|
msg.msg_accrightslen != sizeof(fd)
|
|
|
|
#endif
|
|
|
|
) {
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eSocket, "file descriptor was not passed");
|
2002-02-28 16:31:35 -05:00
|
|
|
}
|
|
|
|
|
2004-05-20 02:04:39 -04:00
|
|
|
#if FD_PASSING_BY_MSG_CONTROL
|
2002-02-28 16:31:35 -05:00
|
|
|
fd = cmsg.fd;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
if (klass == Qnil)
|
|
|
|
return INT2FIX(fd);
|
|
|
|
else {
|
|
|
|
static ID for_fd = 0;
|
|
|
|
int ff_argc;
|
|
|
|
VALUE ff_argv[2];
|
|
|
|
if (!for_fd)
|
|
|
|
for_fd = rb_intern("for_fd");
|
|
|
|
ff_argc = mode == Qnil ? 1 : 2;
|
|
|
|
ff_argv[0] = INT2FIX(fd);
|
|
|
|
ff_argv[1] = mode;
|
|
|
|
return rb_funcall2(klass, for_fd, ff_argc, ff_argv);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
rb_notimplement();
|
2003-08-01 03:02:54 -04:00
|
|
|
return Qnil; /* not reached */
|
2002-02-28 16:31:35 -05:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
|
|
|
unix_accept(sock)
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
struct sockaddr_un from;
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t fromlen;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
fromlen = sizeof(struct sockaddr_un);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
return s_accept(rb_cUNIXSocket, fptr->fd,
|
1998-01-16 07:13:05 -05:00
|
|
|
(struct sockaddr*)&from, &fromlen);
|
|
|
|
}
|
|
|
|
|
2002-05-23 01:35:32 -04:00
|
|
|
static VALUE
|
|
|
|
unix_sysaccept(sock)
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
struct sockaddr_un from;
|
|
|
|
socklen_t fromlen;
|
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
fromlen = sizeof(struct sockaddr_un);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
return s_accept(0, fptr->fd, (struct sockaddr*)&from, &fromlen);
|
2002-05-23 01:35:32 -04:00
|
|
|
}
|
|
|
|
|
2004-04-01 21:15:25 -05:00
|
|
|
#ifdef HAVE_SYS_UN_H
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
|
|
|
unixaddr(sockaddr)
|
|
|
|
struct sockaddr_un *sockaddr;
|
|
|
|
{
|
2000-05-22 01:30:25 -04:00
|
|
|
return rb_assoc_new(rb_str_new2("AF_UNIX"),
|
2002-06-11 03:02:23 -04:00
|
|
|
rb_str_new2(sockaddr->sun_path));
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2004-04-01 21:15:25 -05:00
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
static VALUE
|
|
|
|
unix_addr(sock)
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
struct sockaddr_un addr;
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t len = sizeof addr;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (getsockname(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail("getsockname(2)");
|
2001-10-02 00:31:23 -04:00
|
|
|
if (len == 0)
|
|
|
|
addr.sun_path[0] = '\0';
|
1998-01-16 07:13:05 -05:00
|
|
|
return unixaddr(&addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
unix_peeraddr(sock)
|
|
|
|
VALUE sock;
|
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
struct sockaddr_un addr;
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t len = sizeof addr;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
|
|
|
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (getpeername(fptr->fd, (struct sockaddr*)&addr, &len) < 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail("getsockname(2)");
|
2001-10-02 00:31:23 -04:00
|
|
|
if (len == 0)
|
|
|
|
addr.sun_path[0] = '\0';
|
1998-01-16 07:13:05 -05:00
|
|
|
return unixaddr(&addr);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static void
|
|
|
|
setup_domain_and_type(domain, dv, type, tv)
|
|
|
|
VALUE domain, type;
|
|
|
|
int *dv, *tv;
|
|
|
|
{
|
2004-05-17 03:18:29 -04:00
|
|
|
VALUE tmp;
|
1998-01-16 07:13:05 -05:00
|
|
|
char *ptr;
|
|
|
|
|
2004-05-17 03:18:29 -04:00
|
|
|
tmp = rb_check_string_type(domain);
|
|
|
|
if (!NIL_P(tmp)) {
|
|
|
|
domain = tmp;
|
|
|
|
rb_check_safe_obj(domain);
|
1998-01-16 07:13:05 -05:00
|
|
|
ptr = RSTRING(domain)->ptr;
|
1998-01-16 07:19:22 -05:00
|
|
|
if (strcmp(ptr, "AF_INET") == 0)
|
|
|
|
*dv = AF_INET;
|
|
|
|
#ifdef AF_UNIX
|
|
|
|
else if (strcmp(ptr, "AF_UNIX") == 0)
|
|
|
|
*dv = AF_UNIX;
|
|
|
|
#endif
|
|
|
|
#ifdef AF_ISO
|
|
|
|
else if (strcmp(ptr, "AF_ISO") == 0)
|
|
|
|
*dv = AF_ISO;
|
|
|
|
#endif
|
|
|
|
#ifdef AF_NS
|
|
|
|
else if (strcmp(ptr, "AF_NS") == 0)
|
|
|
|
*dv = AF_NS;
|
|
|
|
#endif
|
|
|
|
#ifdef AF_IMPLINK
|
|
|
|
else if (strcmp(ptr, "AF_IMPLINK") == 0)
|
|
|
|
*dv = AF_IMPLINK;
|
|
|
|
#endif
|
1999-01-19 23:59:39 -05:00
|
|
|
#ifdef PF_INET
|
1998-01-16 07:19:22 -05:00
|
|
|
else if (strcmp(ptr, "PF_INET") == 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
*dv = PF_INET;
|
1999-01-19 23:59:39 -05:00
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef PF_UNIX
|
|
|
|
else if (strcmp(ptr, "PF_UNIX") == 0)
|
|
|
|
*dv = PF_UNIX;
|
|
|
|
#endif
|
|
|
|
#ifdef PF_IMPLINK
|
|
|
|
else if (strcmp(ptr, "PF_IMPLINK") == 0)
|
|
|
|
*dv = PF_IMPLINK;
|
1998-01-16 07:19:22 -05:00
|
|
|
else if (strcmp(ptr, "AF_IMPLINK") == 0)
|
|
|
|
*dv = AF_IMPLINK;
|
1998-01-16 07:13:05 -05:00
|
|
|
#endif
|
|
|
|
#ifdef PF_AX25
|
|
|
|
else if (strcmp(ptr, "PF_AX25") == 0)
|
|
|
|
*dv = PF_AX25;
|
|
|
|
#endif
|
|
|
|
#ifdef PF_IPX
|
|
|
|
else if (strcmp(ptr, "PF_IPX") == 0)
|
|
|
|
*dv = PF_IPX;
|
|
|
|
#endif
|
|
|
|
else
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eSocket, "unknown socket domain %s", ptr);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
*dv = NUM2INT(domain);
|
|
|
|
}
|
2004-05-17 03:18:29 -04:00
|
|
|
tmp = rb_check_string_type(type);
|
|
|
|
if (!NIL_P(tmp)) {
|
|
|
|
type = tmp;
|
|
|
|
rb_check_safe_obj(type);
|
1998-01-16 07:13:05 -05:00
|
|
|
ptr = RSTRING(type)->ptr;
|
|
|
|
if (strcmp(ptr, "SOCK_STREAM") == 0)
|
|
|
|
*tv = SOCK_STREAM;
|
|
|
|
else if (strcmp(ptr, "SOCK_DGRAM") == 0)
|
|
|
|
*tv = SOCK_DGRAM;
|
|
|
|
#ifdef SOCK_RAW
|
|
|
|
else if (strcmp(ptr, "SOCK_RAW") == 0)
|
|
|
|
*tv = SOCK_RAW;
|
|
|
|
#endif
|
|
|
|
#ifdef SOCK_SEQPACKET
|
|
|
|
else if (strcmp(ptr, "SOCK_SEQPACKET") == 0)
|
|
|
|
*tv = SOCK_SEQPACKET;
|
|
|
|
#endif
|
|
|
|
#ifdef SOCK_RDM
|
|
|
|
else if (strcmp(ptr, "SOCK_RDM") == 0)
|
|
|
|
*tv = SOCK_RDM;
|
|
|
|
#endif
|
|
|
|
#ifdef SOCK_PACKET
|
|
|
|
else if (strcmp(ptr, "SOCK_PACKET") == 0)
|
|
|
|
*tv = SOCK_PACKET;
|
|
|
|
#endif
|
|
|
|
else
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eSocket, "unknown socket type %s", ptr);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
*tv = NUM2INT(type);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2003-07-29 20:32:03 -04:00
|
|
|
sock_initialize(sock, domain, type, protocol)
|
2002-01-17 03:05:01 -05:00
|
|
|
VALUE sock, domain, type, protocol;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
int fd;
|
|
|
|
int d, t;
|
|
|
|
|
2000-05-22 01:30:25 -04:00
|
|
|
rb_secure(3);
|
1998-01-16 07:13:05 -05:00
|
|
|
setup_domain_and_type(domain, &d, type, &t);
|
1999-08-13 01:37:52 -04:00
|
|
|
fd = ruby_socket(d, t, NUM2INT(protocol));
|
1998-01-16 07:13:05 -05:00
|
|
|
if (fd < 0) rb_sys_fail("socket(2)");
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2002-01-17 03:05:01 -05:00
|
|
|
return init_sock(sock, fd);
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2002-01-17 03:05:01 -05:00
|
|
|
sock_s_socketpair(klass, domain, type, protocol)
|
|
|
|
VALUE klass, domain, type, protocol;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-14 22:18:08 -05:00
|
|
|
#if !defined(_WIN32) && !defined(__BEOS__) && !defined(__EMX__) && !defined(__QNXNTO__)
|
1998-01-16 07:13:05 -05:00
|
|
|
int d, t, sp[2];
|
|
|
|
|
|
|
|
setup_domain_and_type(domain, &d, type, &t);
|
1999-08-13 01:37:52 -04:00
|
|
|
again:
|
|
|
|
if (socketpair(d, t, NUM2INT(protocol), sp) < 0) {
|
|
|
|
if (errno == EMFILE || errno == ENFILE) {
|
|
|
|
rb_gc();
|
|
|
|
goto again;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail("socketpair(2)");
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2002-01-19 09:22:27 -05:00
|
|
|
return rb_assoc_new(init_sock(rb_obj_alloc(klass), sp[0]),
|
|
|
|
init_sock(rb_obj_alloc(klass), sp[1]));
|
1998-01-16 07:13:05 -05:00
|
|
|
#else
|
|
|
|
rb_notimplement();
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2002-02-28 16:31:35 -05:00
|
|
|
#ifdef HAVE_SYS_UN_H
|
|
|
|
static VALUE
|
|
|
|
unix_s_socketpair(argc, argv, klass)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
VALUE klass;
|
|
|
|
{
|
|
|
|
VALUE domain, type, protocol;
|
|
|
|
domain = INT2FIX(PF_UNIX);
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "02", &type, &protocol);
|
|
|
|
if (argc == 0)
|
|
|
|
type = INT2FIX(SOCK_STREAM);
|
|
|
|
if (argc <= 1)
|
|
|
|
protocol = INT2FIX(0);
|
|
|
|
|
|
|
|
return sock_s_socketpair(klass, domain, type, protocol);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
|
|
|
sock_connect(sock, addr)
|
1998-01-16 07:19:22 -05:00
|
|
|
VALUE sock, addr;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
2004-11-04 07:27:57 -05:00
|
|
|
int fd, n;
|
2004-12-06 10:31:26 -05:00
|
|
|
volatile VALUE tmpaddr;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2001-12-18 03:47:06 -05:00
|
|
|
StringValue(addr);
|
2004-12-06 10:31:26 -05:00
|
|
|
addr = rb_str_new4(addr);
|
1998-01-16 07:13:05 -05:00
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
fd = fptr->fd;
|
2004-11-04 07:27:57 -05:00
|
|
|
n = ruby_connect(fd, (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len, 0);
|
|
|
|
if (n < 0) {
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail("connect(2)");
|
|
|
|
}
|
|
|
|
|
2004-11-04 07:27:57 -05:00
|
|
|
return INT2FIX(n);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
sock_bind(sock, addr)
|
1998-01-16 07:19:22 -05:00
|
|
|
VALUE sock, addr;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
|
2001-12-18 03:47:06 -05:00
|
|
|
StringValue(addr);
|
1998-01-16 07:13:05 -05:00
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
if (bind(fptr->fd, (struct sockaddr*)RSTRING(addr)->ptr, RSTRING(addr)->len) < 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail("bind(2)");
|
|
|
|
|
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
sock_listen(sock, log)
|
2003-05-16 11:18:14 -04:00
|
|
|
VALUE sock, log;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
2004-12-09 18:39:57 -05:00
|
|
|
int backlog;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-05-22 01:30:25 -04:00
|
|
|
rb_secure(4);
|
2004-12-09 18:39:57 -05:00
|
|
|
backlog = NUM2INT(log);
|
1998-01-16 07:13:05 -05:00
|
|
|
GetOpenFile(sock, fptr);
|
2004-12-09 18:39:57 -05:00
|
|
|
if (listen(fptr->fd, backlog) < 0)
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_sys_fail("listen(2)");
|
|
|
|
|
|
|
|
return INT2FIX(0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
sock_recvfrom(argc, argv, sock)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
VALUE sock;
|
|
|
|
{
|
2000-06-28 04:31:35 -04:00
|
|
|
return s_recvfrom(sock, argc, argv, RECV_SOCKET);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
sock_accept(sock)
|
2003-05-16 11:18:14 -04:00
|
|
|
VALUE sock;
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
1999-08-13 01:37:52 -04:00
|
|
|
VALUE sock2;
|
1998-01-16 07:13:05 -05:00
|
|
|
char buf[1024];
|
2000-05-01 05:42:38 -04:00
|
|
|
socklen_t len = sizeof buf;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
sock2 = s_accept(rb_cSocket,fptr->fd,(struct sockaddr*)buf,&len);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2002-06-11 03:02:23 -04:00
|
|
|
return rb_assoc_new(sock2, rb_str_new(buf, len));
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2002-05-23 01:35:32 -04:00
|
|
|
static VALUE
|
|
|
|
sock_sysaccept(sock)
|
2003-05-16 11:18:14 -04:00
|
|
|
VALUE sock;
|
2002-05-23 01:35:32 -04:00
|
|
|
{
|
|
|
|
OpenFile *fptr;
|
|
|
|
VALUE sock2;
|
|
|
|
char buf[1024];
|
|
|
|
socklen_t len = sizeof buf;
|
|
|
|
|
|
|
|
GetOpenFile(sock, fptr);
|
* rubyio.h, intern.h, io.c, file.c, process.c, ext/socket/socket.c,
ext/pty/pty.c, ext/io/wait/wait.c, ext/openssl/ossl_ssl.c:
Use own buffering mechanism instead of stdio.
* io.c, ext/stringio/stringio.c, test/ruby/ut_eof.rb:
EOF flag removed.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7473 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2004-12-06 03:40:30 -05:00
|
|
|
sock2 = s_accept(0,fptr->fd,(struct sockaddr*)buf,&len);
|
2002-05-23 01:35:32 -04:00
|
|
|
|
2002-06-11 03:02:23 -04:00
|
|
|
return rb_assoc_new(sock2, rb_str_new(buf, len));
|
2002-05-23 01:35:32 -04:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef HAVE_GETHOSTNAME
|
|
|
|
static VALUE
|
|
|
|
sock_gethostname(obj)
|
|
|
|
VALUE obj;
|
|
|
|
{
|
|
|
|
char buf[1024];
|
|
|
|
|
2000-05-22 01:30:25 -04:00
|
|
|
rb_secure(3);
|
1998-01-16 07:13:05 -05:00
|
|
|
if (gethostname(buf, (int)sizeof buf - 1) < 0)
|
|
|
|
rb_sys_fail("gethostname");
|
|
|
|
|
|
|
|
buf[sizeof buf - 1] = '\0';
|
2002-06-11 03:02:23 -04:00
|
|
|
return rb_str_new2(buf);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
#ifdef HAVE_UNAME
|
|
|
|
|
|
|
|
#include <sys/utsname.h>
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
sock_gethostname(obj)
|
|
|
|
VALUE obj;
|
|
|
|
{
|
2000-05-22 01:30:25 -04:00
|
|
|
struct utsname un;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-05-22 01:30:25 -04:00
|
|
|
rb_secure(3);
|
|
|
|
uname(&un);
|
2002-06-11 03:02:23 -04:00
|
|
|
return rb_str_new2(un.nodename);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
static VALUE
|
|
|
|
sock_gethostname(obj)
|
|
|
|
VALUE obj;
|
|
|
|
{
|
|
|
|
rb_notimplement();
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static VALUE
|
2003-10-01 09:41:35 -04:00
|
|
|
make_addrinfo(res0)
|
1999-08-13 01:37:52 -04:00
|
|
|
struct addrinfo *res0;
|
|
|
|
{
|
|
|
|
VALUE base, ary;
|
|
|
|
struct addrinfo *res;
|
|
|
|
|
|
|
|
if (res0 == NULL) {
|
|
|
|
rb_raise(rb_eSocket, "host not found");
|
|
|
|
}
|
|
|
|
base = rb_ary_new();
|
|
|
|
for (res = res0; res; res = res->ai_next) {
|
2004-04-01 21:15:25 -05:00
|
|
|
ary = ipaddr(res->ai_addr, do_not_reverse_lookup);
|
|
|
|
if (res->ai_canonname) {
|
|
|
|
RARRAY(ary)->ptr[2] = rb_str_new2(res->ai_canonname);
|
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_ary_push(ary, INT2FIX(res->ai_family));
|
|
|
|
rb_ary_push(ary, INT2FIX(res->ai_socktype));
|
|
|
|
rb_ary_push(ary, INT2FIX(res->ai_protocol));
|
|
|
|
rb_ary_push(base, ary);
|
|
|
|
}
|
|
|
|
return base;
|
|
|
|
}
|
|
|
|
|
2003-10-01 09:41:35 -04:00
|
|
|
VALUE
|
|
|
|
sock_sockaddr(addr, len)
|
|
|
|
struct sockaddr *addr;
|
|
|
|
size_t len;
|
|
|
|
{
|
2004-06-24 19:10:55 -04:00
|
|
|
char *ptr;
|
|
|
|
|
|
|
|
switch (addr->sa_family) {
|
|
|
|
case AF_INET:
|
|
|
|
ptr = (char*)&((struct sockaddr_in*)addr)->sin_addr.s_addr;
|
|
|
|
len = sizeof(((struct sockaddr_in*)addr)->sin_addr.s_addr);
|
|
|
|
break;
|
|
|
|
#ifdef INET6
|
|
|
|
case AF_INET6:
|
|
|
|
ptr = (char*)&((struct sockaddr_in6*)addr)->sin6_addr.s6_addr;
|
|
|
|
len = sizeof(((struct sockaddr_in6*)addr)->sin6_addr.s6_addr);
|
|
|
|
break;
|
|
|
|
#endif
|
|
|
|
default:
|
|
|
|
rb_raise(rb_eSocket, "unknown socket family:%d", addr->sa_family);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return rb_str_new(ptr, len);
|
2003-10-01 09:41:35 -04:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
|
|
|
sock_s_gethostbyname(obj, host)
|
|
|
|
VALUE obj, host;
|
|
|
|
{
|
2003-10-01 09:41:35 -04:00
|
|
|
rb_secure(3);
|
2004-04-01 18:13:39 -05:00
|
|
|
return make_hostent(host, sock_addrinfo(host, Qnil, SOCK_STREAM, AI_CANONNAME), sock_sockaddr);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
sock_s_gethostbyaddr(argc, argv)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
{
|
2001-05-06 11:06:00 -04:00
|
|
|
VALUE addr, type;
|
1998-01-16 07:13:05 -05:00
|
|
|
struct hostent *h;
|
2001-08-05 23:05:23 -04:00
|
|
|
struct sockaddr *sa;
|
2003-10-01 09:41:35 -04:00
|
|
|
char **pch;
|
|
|
|
VALUE ary, names;
|
2001-08-05 23:05:23 -04:00
|
|
|
int t = AF_INET;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2001-05-06 11:06:00 -04:00
|
|
|
rb_scan_args(argc, argv, "11", &addr, &type);
|
2001-08-05 23:05:23 -04:00
|
|
|
sa = (struct sockaddr*)StringValuePtr(addr);
|
|
|
|
if (!NIL_P(type)) {
|
|
|
|
t = NUM2INT(type);
|
|
|
|
}
|
|
|
|
#ifdef INET6
|
|
|
|
else if (RSTRING(addr)->len == 16) {
|
|
|
|
t = AF_INET6;
|
|
|
|
}
|
|
|
|
#endif
|
2004-10-19 15:17:33 -04:00
|
|
|
h = gethostbyaddr(RSTRING(addr)->ptr, RSTRING(addr)->len, t);
|
2003-10-01 09:41:35 -04:00
|
|
|
if (h == NULL) {
|
|
|
|
#ifdef HAVE_HSTRERROR
|
|
|
|
extern int h_errno;
|
|
|
|
rb_raise(rb_eSocket, "%s", (char*)hstrerror(h_errno));
|
|
|
|
#else
|
|
|
|
rb_raise(rb_eSocket, "host not found");
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
ary = rb_ary_new();
|
|
|
|
rb_ary_push(ary, rb_str_new2(h->h_name));
|
|
|
|
names = rb_ary_new();
|
|
|
|
rb_ary_push(ary, names);
|
2003-10-19 22:06:42 -04:00
|
|
|
if (h->h_aliases != NULL) {
|
|
|
|
for (pch = h->h_aliases; *pch; pch++) {
|
|
|
|
rb_ary_push(names, rb_str_new2(*pch));
|
|
|
|
}
|
2003-10-01 09:41:35 -04:00
|
|
|
}
|
|
|
|
rb_ary_push(ary, INT2NUM(h->h_addrtype));
|
|
|
|
#ifdef h_addr
|
|
|
|
for (pch = h->h_addr_list; *pch; pch++) {
|
|
|
|
rb_ary_push(ary, rb_str_new(*pch, h->h_length));
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
rb_ary_push(ary, rb_str_new(h->h_addr, h->h_length));
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2003-10-01 09:41:35 -04:00
|
|
|
return ary;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
sock_s_getservbyname(argc, argv)
|
1998-01-16 07:13:05 -05:00
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
{
|
2004-10-19 06:25:23 -04:00
|
|
|
VALUE service, proto;
|
1998-01-16 07:13:05 -05:00
|
|
|
struct servent *sp;
|
|
|
|
int port;
|
|
|
|
|
2004-10-19 06:25:23 -04:00
|
|
|
rb_scan_args(argc, argv, "11", &service, &proto);
|
|
|
|
if (NIL_P(proto)) proto = rb_str_new2("tcp");
|
2004-10-19 15:17:33 -04:00
|
|
|
StringValue(service);
|
|
|
|
StringValue(proto);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-10-19 15:17:33 -04:00
|
|
|
sp = getservbyname(StringValueCStr(service), StringValueCStr(proto));
|
1999-01-19 23:59:39 -05:00
|
|
|
if (sp) {
|
|
|
|
port = ntohs(sp->s_port);
|
|
|
|
}
|
|
|
|
else {
|
2004-10-19 15:17:33 -04:00
|
|
|
char *s = RSTRING(service)->ptr;
|
1999-01-19 23:59:39 -05:00
|
|
|
char *end;
|
|
|
|
|
|
|
|
port = strtoul(s, &end, 0);
|
|
|
|
if (*end != '\0') {
|
2004-10-19 06:25:23 -04:00
|
|
|
rb_raise(rb_eSocket, "no such service %s/%s", s, RSTRING(proto)->ptr);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return INT2FIX(port);
|
|
|
|
}
|
|
|
|
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
static VALUE
|
|
|
|
sock_s_getservbyport(argc, argv)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
{
|
|
|
|
VALUE port, proto;
|
|
|
|
struct servent *sp;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "11", &port, &proto);
|
|
|
|
if (NIL_P(proto)) proto = rb_str_new2("tcp");
|
|
|
|
StringValue(proto);
|
|
|
|
|
|
|
|
sp = getservbyport(NUM2INT(port), StringValueCStr(proto));
|
|
|
|
if (!sp) {
|
|
|
|
rb_raise(rb_eSocket, "no such service for port %d/%s", NUM2INT(port), RSTRING(proto)->ptr);
|
|
|
|
}
|
|
|
|
return rb_tainted_str_new2(sp->s_name);
|
|
|
|
}
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
static VALUE
|
|
|
|
sock_s_getaddrinfo(argc, argv)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
{
|
|
|
|
VALUE host, port, family, socktype, protocol, flags, ret;
|
|
|
|
char hbuf[1024], pbuf[1024];
|
2002-08-30 06:42:09 -04:00
|
|
|
char *hptr, *pptr, *ap;
|
1999-08-13 01:37:52 -04:00
|
|
|
struct addrinfo hints, *res;
|
|
|
|
int error;
|
|
|
|
|
|
|
|
host = port = family = socktype = protocol = flags = Qnil;
|
2000-05-18 00:32:13 -04:00
|
|
|
rb_scan_args(argc, argv, "24", &host, &port, &family, &socktype, &protocol, &flags);
|
1999-08-13 01:37:52 -04:00
|
|
|
if (NIL_P(host)) {
|
|
|
|
hptr = NULL;
|
|
|
|
}
|
|
|
|
else {
|
2001-05-06 11:06:00 -04:00
|
|
|
strncpy(hbuf, StringValuePtr(host), sizeof(hbuf));
|
1999-08-13 01:37:52 -04:00
|
|
|
hbuf[sizeof(hbuf) - 1] = '\0';
|
|
|
|
hptr = hbuf;
|
|
|
|
}
|
|
|
|
if (NIL_P(port)) {
|
|
|
|
pptr = NULL;
|
|
|
|
}
|
|
|
|
else if (FIXNUM_P(port)) {
|
2003-12-10 21:39:59 -05:00
|
|
|
snprintf(pbuf, sizeof(pbuf), "%ld", FIX2LONG(port));
|
1999-08-13 01:37:52 -04:00
|
|
|
pptr = pbuf;
|
|
|
|
}
|
|
|
|
else {
|
2001-05-06 11:06:00 -04:00
|
|
|
strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
|
1999-08-13 01:37:52 -04:00
|
|
|
pbuf[sizeof(pbuf) - 1] = '\0';
|
|
|
|
pptr = pbuf;
|
|
|
|
}
|
|
|
|
|
|
|
|
MEMZERO(&hints, struct addrinfo, 1);
|
2000-06-28 04:31:35 -04:00
|
|
|
if (NIL_P(family)) {
|
1999-08-13 01:37:52 -04:00
|
|
|
hints.ai_family = PF_UNSPEC;
|
|
|
|
}
|
2000-06-28 04:31:35 -04:00
|
|
|
else if (FIXNUM_P(family)) {
|
|
|
|
hints.ai_family = FIX2INT(family);
|
|
|
|
}
|
2002-08-30 06:42:09 -04:00
|
|
|
else if ((ap = StringValuePtr(family)) != 0) {
|
|
|
|
if (strcmp(ap, "AF_INET") == 0) {
|
2001-05-06 11:06:00 -04:00
|
|
|
hints.ai_family = PF_INET;
|
|
|
|
}
|
2000-06-28 04:31:35 -04:00
|
|
|
#ifdef INET6
|
2002-08-30 06:42:09 -04:00
|
|
|
else if (strcmp(ap, "AF_INET6") == 0) {
|
2001-05-06 11:06:00 -04:00
|
|
|
hints.ai_family = PF_INET6;
|
|
|
|
}
|
2000-06-28 04:31:35 -04:00
|
|
|
#endif
|
2001-05-06 11:06:00 -04:00
|
|
|
}
|
2000-06-28 04:31:35 -04:00
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
if (!NIL_P(socktype)) {
|
|
|
|
hints.ai_socktype = NUM2INT(socktype);
|
|
|
|
}
|
|
|
|
if (!NIL_P(protocol)) {
|
|
|
|
hints.ai_protocol = NUM2INT(protocol);
|
|
|
|
}
|
|
|
|
if (!NIL_P(flags)) {
|
|
|
|
hints.ai_flags = NUM2INT(flags);
|
|
|
|
}
|
|
|
|
error = getaddrinfo(hptr, pptr, &hints, &res);
|
|
|
|
if (error) {
|
2004-04-01 21:15:25 -05:00
|
|
|
raise_socket_error("getaddrinfo", error);
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
2003-10-01 09:41:35 -04:00
|
|
|
ret = make_addrinfo(res);
|
1999-08-13 01:37:52 -04:00
|
|
|
freeaddrinfo(res);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
sock_s_getnameinfo(argc, argv)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
{
|
2004-05-17 03:18:29 -04:00
|
|
|
VALUE sa, af = Qnil, host = Qnil, port = Qnil, flags, tmp;
|
1999-08-13 01:37:52 -04:00
|
|
|
char *hptr, *pptr;
|
2000-05-30 00:24:17 -04:00
|
|
|
char hbuf[1024], pbuf[1024];
|
1999-08-13 01:37:52 -04:00
|
|
|
int fl;
|
2000-05-30 00:24:17 -04:00
|
|
|
struct addrinfo hints, *res = NULL, *r;
|
1999-08-13 01:37:52 -04:00
|
|
|
int error;
|
|
|
|
struct sockaddr_storage ss;
|
|
|
|
struct sockaddr *sap;
|
2003-01-16 02:38:40 -05:00
|
|
|
char *ap;
|
1999-08-13 01:37:52 -04:00
|
|
|
|
|
|
|
sa = flags = Qnil;
|
|
|
|
rb_scan_args(argc, argv, "11", &sa, &flags);
|
|
|
|
|
2000-05-25 01:55:12 -04:00
|
|
|
fl = 0;
|
|
|
|
if (!NIL_P(flags)) {
|
|
|
|
fl = NUM2INT(flags);
|
|
|
|
}
|
2004-05-17 03:18:29 -04:00
|
|
|
tmp = rb_check_string_type(sa);
|
|
|
|
if (!NIL_P(tmp)) {
|
|
|
|
sa = tmp;
|
1999-08-13 01:37:52 -04:00
|
|
|
if (sizeof(ss) < RSTRING(sa)->len) {
|
|
|
|
rb_raise(rb_eTypeError, "sockaddr length too big");
|
|
|
|
}
|
|
|
|
memcpy(&ss, RSTRING(sa)->ptr, RSTRING(sa)->len);
|
2002-03-22 02:26:42 -05:00
|
|
|
if (RSTRING(sa)->len != SA_LEN((struct sockaddr*)&ss)) {
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_raise(rb_eTypeError, "sockaddr size differs - should not happen");
|
|
|
|
}
|
2002-03-22 02:26:42 -05:00
|
|
|
sap = (struct sockaddr*)&ss;
|
2004-05-17 03:18:29 -04:00
|
|
|
goto call_nameinfo;
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
2004-05-17 03:18:29 -04:00
|
|
|
tmp = rb_check_array_type(sa);
|
|
|
|
if (!NIL_P(tmp)) {
|
|
|
|
sa = tmp;
|
2000-05-30 00:24:17 -04:00
|
|
|
MEMZERO(&hints, struct addrinfo, 1);
|
1999-08-13 01:37:52 -04:00
|
|
|
if (RARRAY(sa)->len == 3) {
|
|
|
|
af = RARRAY(sa)->ptr[0];
|
|
|
|
port = RARRAY(sa)->ptr[1];
|
|
|
|
host = RARRAY(sa)->ptr[2];
|
|
|
|
}
|
|
|
|
else if (RARRAY(sa)->len >= 4) {
|
|
|
|
af = RARRAY(sa)->ptr[0];
|
|
|
|
port = RARRAY(sa)->ptr[1];
|
|
|
|
host = RARRAY(sa)->ptr[3];
|
|
|
|
if (NIL_P(host)) {
|
|
|
|
host = RARRAY(sa)->ptr[2];
|
|
|
|
}
|
2000-05-30 00:24:17 -04:00
|
|
|
else {
|
|
|
|
/*
|
|
|
|
* 4th element holds numeric form, don't resolve.
|
|
|
|
* see ipaddr().
|
|
|
|
*/
|
|
|
|
hints.ai_flags |= AI_NUMERICHOST;
|
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
2000-05-12 05:07:57 -04:00
|
|
|
else {
|
2002-10-29 16:35:28 -05:00
|
|
|
rb_raise(rb_eArgError, "array size should be 3 or 4, %ld given",
|
2000-05-12 05:07:57 -04:00
|
|
|
RARRAY(sa)->len);
|
|
|
|
}
|
2000-05-30 00:24:17 -04:00
|
|
|
/* host */
|
1999-08-13 01:37:52 -04:00
|
|
|
if (NIL_P(host)) {
|
|
|
|
hptr = NULL;
|
|
|
|
}
|
|
|
|
else {
|
2001-05-06 11:06:00 -04:00
|
|
|
strncpy(hbuf, StringValuePtr(host), sizeof(hbuf));
|
1999-08-13 01:37:52 -04:00
|
|
|
hbuf[sizeof(hbuf) - 1] = '\0';
|
|
|
|
hptr = hbuf;
|
|
|
|
}
|
2000-05-30 00:24:17 -04:00
|
|
|
/* port */
|
1999-08-13 01:37:52 -04:00
|
|
|
if (NIL_P(port)) {
|
|
|
|
strcpy(pbuf, "0");
|
|
|
|
pptr = NULL;
|
|
|
|
}
|
2000-05-25 01:55:12 -04:00
|
|
|
else if (FIXNUM_P(port)) {
|
2003-12-10 21:39:59 -05:00
|
|
|
snprintf(pbuf, sizeof(pbuf), "%ld", NUM2LONG(port));
|
1999-08-13 01:37:52 -04:00
|
|
|
pptr = pbuf;
|
|
|
|
}
|
|
|
|
else {
|
2001-05-06 11:06:00 -04:00
|
|
|
strncpy(pbuf, StringValuePtr(port), sizeof(pbuf));
|
1999-08-13 01:37:52 -04:00
|
|
|
pbuf[sizeof(pbuf) - 1] = '\0';
|
|
|
|
pptr = pbuf;
|
|
|
|
}
|
2000-05-30 00:24:17 -04:00
|
|
|
hints.ai_socktype = (fl & NI_DGRAM) ? SOCK_DGRAM : SOCK_STREAM;
|
|
|
|
/* af */
|
|
|
|
if (NIL_P(af)) {
|
|
|
|
hints.ai_family = PF_UNSPEC;
|
|
|
|
}
|
|
|
|
else if (FIXNUM_P(af)) {
|
|
|
|
hints.ai_family = FIX2INT(af);
|
|
|
|
}
|
2002-08-30 06:42:09 -04:00
|
|
|
else if ((ap = StringValuePtr(af)) != 0) {
|
|
|
|
if (strcmp(ap, "AF_INET") == 0) {
|
2001-05-06 11:06:00 -04:00
|
|
|
hints.ai_family = PF_INET;
|
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
#ifdef INET6
|
2002-08-30 10:34:57 -04:00
|
|
|
else if (strcmp(ap, "AF_INET6") == 0) {
|
2001-05-06 11:06:00 -04:00
|
|
|
hints.ai_family = PF_INET6;
|
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
#endif
|
2001-05-06 11:06:00 -04:00
|
|
|
}
|
1999-08-13 01:37:52 -04:00
|
|
|
error = getaddrinfo(hptr, pptr, &hints, &res);
|
2000-07-04 00:17:26 -04:00
|
|
|
if (error) goto error_exit_addr;
|
1999-08-13 01:37:52 -04:00
|
|
|
sap = res->ai_addr;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_raise(rb_eTypeError, "expecting String or Array");
|
|
|
|
}
|
|
|
|
|
2004-05-17 03:18:29 -04:00
|
|
|
call_nameinfo:
|
1999-08-13 01:37:52 -04:00
|
|
|
error = getnameinfo(sap, SA_LEN(sap), hbuf, sizeof(hbuf),
|
|
|
|
pbuf, sizeof(pbuf), fl);
|
2000-07-04 00:17:26 -04:00
|
|
|
if (error) goto error_exit_name;
|
2000-06-28 04:31:35 -04:00
|
|
|
if (res) {
|
|
|
|
for (r = res->ai_next; r; r = r->ai_next) {
|
|
|
|
char hbuf2[1024], pbuf2[1024];
|
|
|
|
|
|
|
|
sap = r->ai_addr;
|
|
|
|
error = getnameinfo(sap, SA_LEN(sap), hbuf2, sizeof(hbuf2),
|
|
|
|
pbuf2, sizeof(pbuf2), fl);
|
2000-07-04 00:17:26 -04:00
|
|
|
if (error) goto error_exit_name;
|
2000-06-28 04:31:35 -04:00
|
|
|
if (strcmp(hbuf, hbuf2) != 0|| strcmp(pbuf, pbuf2) != 0) {
|
|
|
|
freeaddrinfo(res);
|
|
|
|
rb_raise(rb_eSocket, "sockaddr resolved to multiple nodename");
|
|
|
|
}
|
2000-05-30 00:24:17 -04:00
|
|
|
}
|
2000-06-28 04:31:35 -04:00
|
|
|
freeaddrinfo(res);
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
2002-06-11 03:02:23 -04:00
|
|
|
return rb_assoc_new(rb_str_new2(hbuf), rb_str_new2(pbuf));
|
2000-05-30 00:24:17 -04:00
|
|
|
|
2000-07-04 00:17:26 -04:00
|
|
|
error_exit_addr:
|
2000-05-30 00:24:17 -04:00
|
|
|
if (res) freeaddrinfo(res);
|
2004-04-01 21:15:25 -05:00
|
|
|
raise_socket_error("getaddrinfo", error);
|
2000-07-04 00:17:26 -04:00
|
|
|
|
|
|
|
error_exit_name:
|
|
|
|
if (res) freeaddrinfo(res);
|
2004-04-01 21:15:25 -05:00
|
|
|
raise_socket_error("getnameinfo", error);
|
1999-08-13 01:37:52 -04:00
|
|
|
}
|
|
|
|
|
2001-08-05 23:05:23 -04:00
|
|
|
static VALUE
|
|
|
|
sock_s_pack_sockaddr_in(self, port, host)
|
|
|
|
VALUE self, port, host;
|
|
|
|
{
|
2002-03-28 04:17:54 -05:00
|
|
|
struct addrinfo *res = sock_addrinfo(host, port, 0, 0);
|
2001-08-05 23:05:23 -04:00
|
|
|
VALUE addr = rb_str_new((char*)res->ai_addr, res->ai_addrlen);
|
|
|
|
|
|
|
|
freeaddrinfo(res);
|
|
|
|
OBJ_INFECT(addr, port);
|
|
|
|
OBJ_INFECT(addr, host);
|
|
|
|
|
|
|
|
return addr;
|
|
|
|
}
|
|
|
|
|
2001-08-06 02:10:10 -04:00
|
|
|
static VALUE
|
|
|
|
sock_s_unpack_sockaddr_in(self, addr)
|
|
|
|
VALUE self, addr;
|
|
|
|
{
|
|
|
|
struct sockaddr_in * sockaddr;
|
2002-06-11 03:02:23 -04:00
|
|
|
VALUE host;
|
2001-08-06 02:10:10 -04:00
|
|
|
|
|
|
|
sockaddr = (struct sockaddr_in*)StringValuePtr(addr);
|
2003-10-01 09:41:35 -04:00
|
|
|
host = make_ipaddr((struct sockaddr*)sockaddr);
|
2002-06-11 03:02:23 -04:00
|
|
|
OBJ_INFECT(host, addr);
|
|
|
|
return rb_assoc_new(INT2NUM(ntohs(sockaddr->sin_port)), host);
|
2001-08-06 02:10:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
#ifdef HAVE_SYS_UN_H
|
2001-08-05 23:05:23 -04:00
|
|
|
static VALUE
|
|
|
|
sock_s_pack_sockaddr_un(self, path)
|
|
|
|
VALUE self, path;
|
|
|
|
{
|
|
|
|
struct sockaddr_un sockaddr;
|
|
|
|
VALUE addr;
|
|
|
|
|
|
|
|
MEMZERO(&sockaddr, struct sockaddr_un, 1);
|
|
|
|
sockaddr.sun_family = AF_UNIX;
|
|
|
|
strncpy(sockaddr.sun_path, StringValuePtr(path), sizeof(sockaddr.sun_path)-1);
|
|
|
|
addr = rb_str_new((char*)&sockaddr, sizeof(sockaddr));
|
|
|
|
OBJ_INFECT(addr, path);
|
|
|
|
|
|
|
|
return addr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
sock_s_unpack_sockaddr_un(self, addr)
|
|
|
|
VALUE self, addr;
|
|
|
|
{
|
|
|
|
struct sockaddr_un * sockaddr;
|
2002-06-11 03:02:23 -04:00
|
|
|
VALUE path;
|
2001-08-05 23:05:23 -04:00
|
|
|
|
|
|
|
sockaddr = (struct sockaddr_un*)StringValuePtr(addr);
|
2002-04-10 04:45:26 -04:00
|
|
|
if (RSTRING(addr)->len != sizeof(struct sockaddr_un)) {
|
2002-10-29 16:35:28 -05:00
|
|
|
rb_raise(rb_eTypeError, "sockaddr_un size differs - %ld required; %d given",
|
2002-04-10 04:45:26 -04:00
|
|
|
RSTRING(addr)->len, sizeof(struct sockaddr_un));
|
|
|
|
}
|
2001-08-05 23:05:23 -04:00
|
|
|
/* xxx: should I check against sun_path size? */
|
2002-06-11 03:02:23 -04:00
|
|
|
path = rb_str_new2(sockaddr->sun_path);
|
|
|
|
OBJ_INFECT(path, addr);
|
|
|
|
return path;
|
2001-08-05 23:05:23 -04:00
|
|
|
}
|
2001-08-06 02:10:10 -04:00
|
|
|
#endif
|
2001-08-05 23:05:23 -04:00
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
static VALUE mConst;
|
|
|
|
|
|
|
|
static void
|
1999-08-13 01:37:52 -04:00
|
|
|
sock_define_const(name, value)
|
1998-01-16 07:19:22 -05:00
|
|
|
char *name;
|
1999-01-19 23:59:39 -05:00
|
|
|
int value;
|
1998-01-16 07:19:22 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_const(rb_cSocket, name, INT2FIX(value));
|
1998-01-16 07:19:22 -05:00
|
|
|
rb_define_const(mConst, name, INT2FIX(value));
|
|
|
|
}
|
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
void
|
1998-01-16 07:13:05 -05:00
|
|
|
Init_socket()
|
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_eSocket = rb_define_class("SocketError", rb_eStandardError);
|
|
|
|
|
|
|
|
rb_cBasicSocket = rb_define_class("BasicSocket", rb_cIO);
|
2002-01-17 03:05:01 -05:00
|
|
|
rb_undef_method(rb_cBasicSocket, "initialize");
|
1999-08-13 01:37:52 -04:00
|
|
|
|
|
|
|
rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup",
|
|
|
|
bsock_do_not_rev_lookup, 0);
|
|
|
|
rb_define_singleton_method(rb_cBasicSocket, "do_not_reverse_lookup=",
|
|
|
|
bsock_do_not_rev_lookup_set, 1);
|
2002-02-05 02:56:31 -05:00
|
|
|
rb_define_singleton_method(rb_cBasicSocket, "for_fd", bsock_s_for_fd, 1);
|
1999-08-13 01:37:52 -04:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cBasicSocket, "close_read", bsock_close_read, 0);
|
|
|
|
rb_define_method(rb_cBasicSocket, "close_write", bsock_close_write, 0);
|
|
|
|
rb_define_method(rb_cBasicSocket, "shutdown", bsock_shutdown, -1);
|
|
|
|
rb_define_method(rb_cBasicSocket, "setsockopt", bsock_setsockopt, 3);
|
|
|
|
rb_define_method(rb_cBasicSocket, "getsockopt", bsock_getsockopt, 2);
|
|
|
|
rb_define_method(rb_cBasicSocket, "getsockname", bsock_getsockname, 0);
|
|
|
|
rb_define_method(rb_cBasicSocket, "getpeername", bsock_getpeername, 0);
|
|
|
|
rb_define_method(rb_cBasicSocket, "send", bsock_send, -1);
|
|
|
|
rb_define_method(rb_cBasicSocket, "recv", bsock_recv, -1);
|
2004-04-01 21:15:25 -05:00
|
|
|
rb_define_method(rb_cBasicSocket, "do_not_reverse_lookup", bsock_do_not_reverse_lookup, 0);
|
|
|
|
rb_define_method(rb_cBasicSocket, "do_not_reverse_lookup=", bsock_do_not_reverse_lookup_set, 1);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_cIPSocket = rb_define_class("IPSocket", rb_cBasicSocket);
|
|
|
|
rb_define_global_const("IPsocket", rb_cIPSocket);
|
|
|
|
rb_define_method(rb_cIPSocket, "addr", ip_addr, 0);
|
|
|
|
rb_define_method(rb_cIPSocket, "peeraddr", ip_peeraddr, 0);
|
2000-06-28 04:31:35 -04:00
|
|
|
rb_define_method(rb_cIPSocket, "recvfrom", ip_recvfrom, -1);
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_define_singleton_method(rb_cIPSocket, "getaddress", ip_s_getaddress, 1);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_cTCPSocket = rb_define_class("TCPSocket", rb_cIPSocket);
|
|
|
|
rb_define_global_const("TCPsocket", rb_cTCPSocket);
|
|
|
|
rb_define_singleton_method(rb_cTCPSocket, "gethostbyname", tcp_s_gethostbyname, 1);
|
2002-01-17 03:05:01 -05:00
|
|
|
rb_define_method(rb_cTCPSocket, "initialize", tcp_init, -1);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
#ifdef SOCKS
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_cSOCKSSocket = rb_define_class("SOCKSSocket", rb_cTCPSocket);
|
|
|
|
rb_define_global_const("SOCKSsocket", rb_cSOCKSSocket);
|
2002-01-17 03:05:01 -05:00
|
|
|
rb_define_method(rb_cSOCKSSocket, "initialize", socks_init, 2);
|
1999-10-04 00:51:08 -04:00
|
|
|
#ifdef SOCKS5
|
|
|
|
rb_define_method(rb_cSOCKSSocket, "close", socks_s_close, 0);
|
|
|
|
#endif
|
1999-08-13 01:37:52 -04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
rb_cTCPServer = rb_define_class("TCPServer", rb_cTCPSocket);
|
|
|
|
rb_define_global_const("TCPserver", rb_cTCPServer);
|
|
|
|
rb_define_method(rb_cTCPServer, "accept", tcp_accept, 0);
|
2002-05-23 01:35:32 -04:00
|
|
|
rb_define_method(rb_cTCPServer, "sysaccept", tcp_sysaccept, 0);
|
2002-01-17 03:05:01 -05:00
|
|
|
rb_define_method(rb_cTCPServer, "initialize", tcp_svr_init, -1);
|
2001-12-19 02:48:32 -05:00
|
|
|
rb_define_method(rb_cTCPServer, "listen", sock_listen, 1);
|
1999-08-13 01:37:52 -04:00
|
|
|
|
|
|
|
rb_cUDPSocket = rb_define_class("UDPSocket", rb_cIPSocket);
|
|
|
|
rb_define_global_const("UDPsocket", rb_cUDPSocket);
|
2002-01-17 03:05:01 -05:00
|
|
|
rb_define_method(rb_cUDPSocket, "initialize", udp_init, -1);
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_define_method(rb_cUDPSocket, "connect", udp_connect, 2);
|
|
|
|
rb_define_method(rb_cUDPSocket, "bind", udp_bind, 2);
|
|
|
|
rb_define_method(rb_cUDPSocket, "send", udp_send, -1);
|
1998-01-16 07:19:22 -05:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
#ifdef HAVE_SYS_UN_H
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_cUNIXSocket = rb_define_class("UNIXSocket", rb_cBasicSocket);
|
|
|
|
rb_define_global_const("UNIXsocket", rb_cUNIXSocket);
|
2002-01-17 03:05:01 -05:00
|
|
|
rb_define_method(rb_cUNIXSocket, "initialize", unix_init, 1);
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_define_method(rb_cUNIXSocket, "path", unix_path, 0);
|
|
|
|
rb_define_method(rb_cUNIXSocket, "addr", unix_addr, 0);
|
|
|
|
rb_define_method(rb_cUNIXSocket, "peeraddr", unix_peeraddr, 0);
|
|
|
|
rb_define_method(rb_cUNIXSocket, "recvfrom", unix_recvfrom, -1);
|
2002-02-28 16:31:35 -05:00
|
|
|
rb_define_method(rb_cUNIXSocket, "send_io", unix_send_io, 1);
|
|
|
|
rb_define_method(rb_cUNIXSocket, "recv_io", unix_recv_io, -1);
|
|
|
|
rb_define_singleton_method(rb_cUNIXSocket, "socketpair", unix_s_socketpair, -1);
|
|
|
|
rb_define_singleton_method(rb_cUNIXSocket, "pair", unix_s_socketpair, -1);
|
1999-08-13 01:37:52 -04:00
|
|
|
|
|
|
|
rb_cUNIXServer = rb_define_class("UNIXServer", rb_cUNIXSocket);
|
|
|
|
rb_define_global_const("UNIXserver", rb_cUNIXServer);
|
2002-01-17 03:05:01 -05:00
|
|
|
rb_define_method(rb_cUNIXServer, "initialize", unix_svr_init, 1);
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_define_method(rb_cUNIXServer, "accept", unix_accept, 0);
|
2002-05-23 01:35:32 -04:00
|
|
|
rb_define_method(rb_cUNIXServer, "sysaccept", unix_sysaccept, 0);
|
2001-12-19 02:48:32 -05:00
|
|
|
rb_define_method(rb_cUNIXServer, "listen", sock_listen, 1);
|
1999-01-19 23:59:39 -05:00
|
|
|
#endif
|
|
|
|
|
|
|
|
rb_cSocket = rb_define_class("Socket", rb_cBasicSocket);
|
|
|
|
|
2003-07-29 20:32:03 -04:00
|
|
|
rb_define_method(rb_cSocket, "initialize", sock_initialize, 3);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cSocket, "connect", sock_connect, 1);
|
|
|
|
rb_define_method(rb_cSocket, "bind", sock_bind, 1);
|
|
|
|
rb_define_method(rb_cSocket, "listen", sock_listen, 1);
|
|
|
|
rb_define_method(rb_cSocket, "accept", sock_accept, 0);
|
2002-05-23 01:35:32 -04:00
|
|
|
rb_define_method(rb_cSocket, "sysaccept", sock_sysaccept, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
rb_define_method(rb_cSocket, "recvfrom", sock_recvfrom, -1);
|
|
|
|
|
|
|
|
rb_define_singleton_method(rb_cSocket, "socketpair", sock_s_socketpair, 3);
|
|
|
|
rb_define_singleton_method(rb_cSocket, "pair", sock_s_socketpair, 3);
|
|
|
|
rb_define_singleton_method(rb_cSocket, "gethostname", sock_gethostname, 0);
|
|
|
|
rb_define_singleton_method(rb_cSocket, "gethostbyname", sock_s_gethostbyname, 1);
|
|
|
|
rb_define_singleton_method(rb_cSocket, "gethostbyaddr", sock_s_gethostbyaddr, -1);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_define_singleton_method(rb_cSocket, "getservbyname", sock_s_getservbyname, -1);
|
|
|
|
rb_define_singleton_method(rb_cSocket, "getservbyport", sock_s_getservbyport, -1);
|
1999-08-13 01:37:52 -04:00
|
|
|
rb_define_singleton_method(rb_cSocket, "getaddrinfo", sock_s_getaddrinfo, -1);
|
|
|
|
rb_define_singleton_method(rb_cSocket, "getnameinfo", sock_s_getnameinfo, -1);
|
2001-08-05 23:05:23 -04:00
|
|
|
rb_define_singleton_method(rb_cSocket, "sockaddr_in", sock_s_pack_sockaddr_in, 2);
|
|
|
|
rb_define_singleton_method(rb_cSocket, "pack_sockaddr_in", sock_s_pack_sockaddr_in, 2);
|
|
|
|
rb_define_singleton_method(rb_cSocket, "unpack_sockaddr_in", sock_s_unpack_sockaddr_in, 1);
|
2001-08-06 02:10:10 -04:00
|
|
|
#ifdef HAVE_SYS_UN_H
|
|
|
|
rb_define_singleton_method(rb_cSocket, "sockaddr_un", sock_s_pack_sockaddr_un, 1);
|
|
|
|
rb_define_singleton_method(rb_cSocket, "pack_sockaddr_un", sock_s_pack_sockaddr_un, 1);
|
2001-08-05 23:05:23 -04:00
|
|
|
rb_define_singleton_method(rb_cSocket, "unpack_sockaddr_un", sock_s_unpack_sockaddr_un, 1);
|
2001-08-06 02:10:10 -04:00
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
/* constants */
|
1999-01-19 23:59:39 -05:00
|
|
|
mConst = rb_define_module_under(rb_cSocket, "Constants");
|
2005-02-28 09:18:41 -05:00
|
|
|
#include "constants.h"
|
|
|
|
#ifdef INET6 /* IPv6 is not supported although AF_INET6 is defined on bcc32/mingw */
|
|
|
|
sock_define_const("AF_INET6", AF_INET6);
|
|
|
|
sock_define_const("PF_INET6", PF_INET6);
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|