1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* ext/socket/ancdata.c (ancillary_unix_rights): raise

Browse Source 
NotImplementedError if no fd passing feature.
  (ancillary_timestamp): raise NotImplementedError if no timestamp
  feature.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22632 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2009-02-25 14:24:10 +00:00
parent 56c52c1da8
commit 1ff020df70
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
Wed Feb 25 23:23:03 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/ancdata.c (ancillary_unix_rights): raise
NotImplementedError if no fd passing feature.
(ancillary_timestamp): raise NotImplementedError if no timestamp
feature.
Wed Feb 25 23:18:53 2009 Tanaka Akira <akr@fsij.org> Wed Feb 25 23:18:53 2009 Tanaka Akira <akr@fsij.org>
* ext/socket/ancdata.c (ancillary_s_unix_rights): new method. * ext/socket/ancdata.c (ancillary_s_unix_rights): new method.

30
ext/socket/ancdata.c
View File

@ -241,8 +241,12 @@ ancillary_s_unix_rights(int argc, VALUE *argv, VALUE klass)
static VALUE static VALUE
ancillary_unix_rights(VALUE self) ancillary_unix_rights(VALUE self)
{ {
#ifdef SCM_RIGHTS
VALUE v = rb_attr_get(self, rb_intern("unix_rights")); VALUE v = rb_attr_get(self, rb_intern("unix_rights"));
return v; return v;
#else
rb_notimplement();
#endif
} }
/* /*
@ -276,6 +280,7 @@ ancillary_unix_rights(VALUE self)
static VALUE static VALUE
ancillary_timestamp(VALUE self) ancillary_timestamp(VALUE self)
{ {
#if defined(SCM_TIMESTAMP) || defined(SCM_TIMESTAMPNS) || defined(SCM_BINTIME)
int level, type; int level, type;
VALUE data; VALUE data;
VALUE result = Qnil; VALUE result = Qnil;
@ -284,25 +289,25 @@ ancillary_timestamp(VALUE self)
type = ancillary_type(self); type = ancillary_type(self);
data = ancillary_data(self); data = ancillary_data(self);
#ifdef SCM_TIMESTAMP # ifdef SCM_TIMESTAMP
if (level == SOL_SOCKET && type == SCM_TIMESTAMP && if (level == SOL_SOCKET && type == SCM_TIMESTAMP &&
RSTRING_LEN(data) == sizeof(struct timeval)) { RSTRING_LEN(data) == sizeof(struct timeval)) {
struct timeval tv; struct timeval tv;
memcpy((char*)&tv, RSTRING_PTR(data), sizeof(tv)); memcpy((char*)&tv, RSTRING_PTR(data), sizeof(tv));
result = rb_time_new(tv.tv_sec, tv.tv_usec); result = rb_time_new(tv.tv_sec, tv.tv_usec);
} }
#endif # endif
#ifdef SCM_TIMESTAMPNS # ifdef SCM_TIMESTAMPNS
if (level == SOL_SOCKET && type == SCM_TIMESTAMPNS && if (level == SOL_SOCKET && type == SCM_TIMESTAMPNS &&
RSTRING_LEN(data) == sizeof(struct timespec)) { RSTRING_LEN(data) == sizeof(struct timespec)) {
struct timespec ts; struct timespec ts;
memcpy((char*)&ts, RSTRING_PTR(data), sizeof(ts)); memcpy((char*)&ts, RSTRING_PTR(data), sizeof(ts));
result = rb_time_nano_new(ts.tv_sec, ts.tv_nsec); result = rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
} }
#endif # endif
#ifdef SCM_BINTIME # ifdef SCM_BINTIME
if (level == SOL_SOCKET && type == SCM_BINTIME && if (level == SOL_SOCKET && type == SCM_BINTIME &&
RSTRING_LEN(data) == sizeof(struct bintime)) { RSTRING_LEN(data) == sizeof(struct bintime)) {
struct bintime bt; struct bintime bt;
@ -311,12 +316,15 @@ ancillary_timestamp(VALUE self)
bintime2timespec(&bt, &ts); bintime2timespec(&bt, &ts);
result = rb_time_nano_new(ts.tv_sec, ts.tv_nsec); result = rb_time_nano_new(ts.tv_sec, ts.tv_nsec);
} }
#endif # endif
if (result == Qnil) if (result == Qnil)
rb_raise(rb_eTypeError, "timestamp ancillary data expected"); rb_raise(rb_eTypeError, "timestamp ancillary data expected");
return result; return result;
#else
rb_notimplement();
#endif
} }
/* /*
@ -1716,16 +1724,16 @@ Init_ancdata(void)
rb_define_method(rb_cAncillaryData, "type", ancillary_type_m, 0); rb_define_method(rb_cAncillaryData, "type", ancillary_type_m, 0);
rb_define_method(rb_cAncillaryData, "data", ancillary_data, 0); rb_define_method(rb_cAncillaryData, "data", ancillary_data, 0);
rb_define_singleton_method(rb_cAncillaryData, "unix_rights", ancillary_s_unix_rights, -1);
rb_define_method(rb_cAncillaryData, "unix_rights", ancillary_unix_rights, 0);
rb_define_method(rb_cAncillaryData, "timestamp", ancillary_timestamp, 0);
rb_define_method(rb_cAncillaryData, "cmsg_is?", ancillary_cmsg_is_p, 2); rb_define_method(rb_cAncillaryData, "cmsg_is?", ancillary_cmsg_is_p, 2);
rb_define_singleton_method(rb_cAncillaryData, "int", ancillary_s_int, 4); rb_define_singleton_method(rb_cAncillaryData, "int", ancillary_s_int, 4);
rb_define_method(rb_cAncillaryData, "int", ancillary_int, 0); rb_define_method(rb_cAncillaryData, "int", ancillary_int, 0);
rb_define_singleton_method(rb_cAncillaryData, "unix_rights", ancillary_s_unix_rights, -1);
rb_define_method(rb_cAncillaryData, "unix_rights", ancillary_unix_rights, 0);
rb_define_method(rb_cAncillaryData, "timestamp", ancillary_timestamp, 0);
rb_define_singleton_method(rb_cAncillaryData, "ip_pktinfo", ancillary_s_ip_pktinfo, -1); rb_define_singleton_method(rb_cAncillaryData, "ip_pktinfo", ancillary_s_ip_pktinfo, -1);
rb_define_method(rb_cAncillaryData, "ip_pktinfo", ancillary_ip_pktinfo, 0); rb_define_method(rb_cAncillaryData, "ip_pktinfo", ancillary_ip_pktinfo, 0);