Changeset 331 for EcnlProtoTool/trunk/mrbgems/mruby-socket

Timestamp:

Jan 21, 2018, 12:10:09 AM (6 years ago)

Author:

coas-nagasima

Message:

prototoolに関連するプロジェクトをnewlibからmuslを使うよう変更・更新
ntshellをnewlibの下位の実装から、muslのsyscallの実装に変更・更新
以下のOSSをアップデート
・mruby-1.3.0
・musl-1.1.18
・onigmo-6.1.3
・tcc-0.9.27
以下のOSSを追加
・openssl-1.1.0e
・curl-7.57.0
・zlib-1.2.11
以下のmrbgemsを追加
・iij/mruby-digest
・iij/mruby-env
・iij/mruby-errno
・iij/mruby-iijson
・iij/mruby-ipaddr
・iij/mruby-mock
・iij/mruby-require
・iij/mruby-tls-openssl

Location:

EcnlProtoTool/trunk/mrbgems/mruby-socket

Files:

• README.md (modified) (1 diff)
• mrbgem.rake (modified) (1 diff)
• mrblib/socket.rb (modified) (3 diffs)
• src/const.def (modified) (1 prop)
• src/socket.c (modified) (37 diffs)

EcnlProtoTool/trunk/mrbgems/mruby-socket/README.md

@@ -37 +37 @@
 Copyright (c) 2013 Internet Initiative Japan Inc.
 
-Permission is hereby granted, free of charge, to any person obtaining a 
-copy of this software and associated documentation files (the "Software"), 
-to deal in the Software without restriction, including without limitation 
-the rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons to whom the 
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
 Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in 
+The above copyright notice and this permission notice shall be included in
 all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.

EcnlProtoTool/trunk/mrbgems/mruby-socket/mrbgem.rake

@@ -4 +4 @@
 
   spec.cc.include_paths << "#{build.root}/src"
-  
+
   # If Windows, use winsock
   if ( /mswin|mingw|win32/ =~ RUBY_PLATFORM ) then

EcnlProtoTool/trunk/mrbgems/mruby-socket/mrblib/socket.rb

@@ -155 +155 @@
   end
 
-  def to_sockaddr 
+  def to_sockaddr
     @sockaddr
   end
@@ -234 +234 @@
       s = nil
       e = SocketError
-      Addrinfo.foreach(host, service) { |ai|
+      Addrinfo.foreach(host, service, nil, Socket::SOCK_STREAM, Socket::IPPROTO_TCP) do |ai|
         begin
           s = Socket._socket(ai.afamily, Socket::SOCK_STREAM, 0)
@@ -245 +245 @@
           Socket._connect(s, ai.to_sockaddr)
           super(s, "r+")
-          return
+          e = nil
+          break
         rescue => e0
           e = e0
         end
-      }
-      raise e
+      end
+      if e != nil
+        raise e
+      end
     end
   end

EcnlProtoTool/trunk/mrbgems/mruby-socket/src/socket.c

@@ -4 +4 @@
 ** See Copyright Notice in mruby.h
 */
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <fcntl.h>
-#include <netdb.h>
-#include <unistd.h>
+
+#ifdef _WIN32
+  #define _WIN32_WINNT 0x0501
+
+  #include <winsock2.h>
+  #include <ws2tcpip.h>
+  #include <windows.h>
+
+  #define SHUT_RDWR SD_BOTH
+#else
+  #include <sys/types.h>
+  #include <sys/socket.h>
+  #include <sys/un.h>
+  #include <netinet/in.h>
+  #include <netinet/tcp.h>
+  #include <arpa/inet.h>
+  #include <fcntl.h>
+  #include <netdb.h>
+  #include <unistd.h>
+#endif
+
 #include <stddef.h>
 #include <string.h>
-
-/*#include <unistd.h>*/
-extern int gethostname(char *name, size_t len);
 
 #include "mruby.h"
@@ -27 +36 @@
 #include "error.h"
 
-#ifndef NI_MAXHOST
-#define NI_MAXHOST 255
-#endif
-#ifndef NI_MAXSERV
-#define NI_MAXSERV 32
-#endif
 #define E_SOCKET_ERROR             (mrb_class_get(mrb, "SocketError"))
 
@@ -41 +44 @@
 #endif
 
-//#ifdef _WIN32
+#ifdef _WIN32
 const char *inet_ntop(int af, const void *src, char *dst, socklen_t cnt)
 {
@@ -59 +62 @@
         memset(&in, 0, sizeof(in));
         in.sin6_family = AF_INET6;
-        memcpy(&in.sin6_addr, src, sizeof(struct in6_addr));
+        memcpy(&in.sin6_addr, src, sizeof(struct in_addr6));
         getnameinfo((struct sockaddr *)&in, sizeof(struct
                     sockaddr_in6), dst, cnt, NULL, 0, NI_NUMERICHOST);
@@ -92 +95 @@
 }
 
-//#endif
+#endif
 
 static mrb_value
@@ -192 +195 @@
 }
 
+#ifndef _WIN32
 static mrb_value
 mrb_addrinfo_unix_path(mrb_state *mrb, mrb_value self)
@@ -202 +206 @@
   return mrb_str_new_cstr(mrb, ((struct sockaddr_un *)RSTRING_PTR(sastr))->sun_path);
 }
+#endif
 
 static mrb_value
@@ -256 +261 @@
 static mrb_value
 mrb_basicsocket_getpeereid(mrb_state *mrb, mrb_value self)
-{ 
+{
 #ifdef HAVE_GETPEEREID
   mrb_value ary;
@@ -262 +267 @@
   uid_t euid;
   int s;
-  
+
   s = socket_fd(mrb, self);
   if (getpeereid(s, &euid, &egid) != 0)
@@ -279 +284 @@
 static mrb_value
 mrb_basicsocket_getpeername(mrb_state *mrb, mrb_value self)
-{ 
+{
   struct sockaddr_storage ss;
   socklen_t salen;
-  
+
   salen = sizeof(ss);
   if (getpeername(socket_fd(mrb, self), (struct sockaddr *)&ss, &salen) != 0)
@@ -292 +297 @@
 static mrb_value
 mrb_basicsocket_getsockname(mrb_state *mrb, mrb_value self)
-{ 
+{
   struct sockaddr_storage ss;
   socklen_t salen;
-  
+
   salen = sizeof(ss);
   if (getsockname(socket_fd(mrb, self), (struct sockaddr *)&ss, &salen) != 0)
@@ -305 +310 @@
 static mrb_value
 mrb_basicsocket_getsockopt(mrb_state *mrb, mrb_value self)
-{ 
+{
   char opt[8];
   int s;
@@ -325 +330 @@
 static mrb_value
 mrb_basicsocket_recv(mrb_state *mrb, mrb_value self)
-{ 
+{
   int n;
   mrb_int maxlen, flags = 0;
@@ -341 +346 @@
 static mrb_value
 mrb_basicsocket_recvfrom(mrb_state *mrb, mrb_value self)
-{ 
+{
   int n;
   mrb_int maxlen, flags = 0;
@@ -364 +369 @@
 static mrb_value
 mrb_basicsocket_send(mrb_state *mrb, mrb_value self)
-{ 
+{
   int n;
   mrb_int flags;
@@ -383 +388 @@
 static mrb_value
 mrb_basicsocket_setnonblock(mrb_state *mrb, mrb_value self)
-{ 
+{
   int fd, flags;
   mrb_value bool;
+#ifdef _WIN32
+  u_long mode = 1;
+#endif
 
   mrb_get_args(mrb, "o", &bool);
   fd = socket_fd(mrb, self);
+#ifdef _WIN32
+  flags = ioctlsocket(fd, FIONBIO, &mode);
+  if (flags != NO_ERROR)
+    mrb_sys_fail(mrb, "ioctlsocket");
+#else
   flags = fcntl(fd, F_GETFL, 0);
   if (flags == 1)
@@ -398 +411 @@
   if (fcntl(fd, F_SETFL, flags) == -1)
     mrb_sys_fail(mrb, "fcntl");
+#endif
   return mrb_nil_value();
 }
@@ -403 +417 @@
 static mrb_value
 mrb_basicsocket_setsockopt(mrb_state *mrb, mrb_value self)
-{ 
+{
   int argc, s;
   mrb_int level = 0, optname;
@@ -420 +434 @@
       optval = mrb_str_new(mrb, (char *)&i, sizeof(i));
     } else if (mrb_fixnum_p(optval)) {
-      mrb_int i = mrb_fixnum(optval);
-      optval = mrb_str_new(mrb, (char *)&i, sizeof(i));
+      if (optname == IP_MULTICAST_TTL || optname == IP_MULTICAST_LOOP) {
+        char uc = mrb_fixnum(optval);
+        optval = mrb_str_new(mrb, &uc, sizeof(uc));
+      } else {
+        mrb_int i = mrb_fixnum(optval);
+        optval = mrb_str_new(mrb, (char *)&i, sizeof(i));
+      }
     } else {
       mrb_raise(mrb, E_ARGUMENT_ERROR, "optval should be true, false, an integer, or a string");
@@ -443 +462 @@
 static mrb_value
 mrb_basicsocket_shutdown(mrb_state *mrb, mrb_value self)
-{ 
+{
   mrb_int how = SHUT_RDWR;
 
@@ -454 +473 @@
 static mrb_value
 mrb_ipsocket_ntop(mrb_state *mrb, mrb_value klass)
-{ 
+{
   mrb_int af, n;
   char *addr, buf[50];
@@ -468 +487 @@
 static mrb_value
 mrb_ipsocket_pton(mrb_state *mrb, mrb_value klass)
-{ 
+{
   mrb_int af, n;
   char *bp, buf[50];
@@ -498 +517 @@
 static mrb_value
 mrb_ipsocket_recvfrom(mrb_state *mrb, mrb_value self)
-{ 
+{
   struct sockaddr_storage ss;
   socklen_t socklen;
@@ -528 +547 @@
   mrb_value buf;
   size_t bufsize;
-  
+
 #ifdef HOST_NAME_MAX
   bufsize = HOST_NAME_MAX + 1;
@@ -568 +587 @@
 {
   mrb_value sastr;
-  int s;
+  mrb_int s;
 
   mrb_get_args(mrb, "iS", &s, &sastr);
-  if (bind(s, (struct sockaddr *)RSTRING_PTR(sastr), (socklen_t)RSTRING_LEN(sastr)) == -1) {
+  if (bind((int)s, (struct sockaddr *)RSTRING_PTR(sastr), (socklen_t)RSTRING_LEN(sastr)) == -1) {
     mrb_sys_fail(mrb, "bind");
   }
@@ -581 +600 @@
 {
   mrb_value sastr;
-  int s;
+  mrb_int s;
 
   mrb_get_args(mrb, "iS", &s, &sastr);
-  if (connect(s, (struct sockaddr *)RSTRING_PTR(sastr), (socklen_t)RSTRING_LEN(sastr)) == -1) {
+  if (connect((int)s, (struct sockaddr *)RSTRING_PTR(sastr), (socklen_t)RSTRING_LEN(sastr)) == -1) {
     mrb_sys_fail(mrb, "connect");
   }
@@ -593 +612 @@
 mrb_socket_listen(mrb_state *mrb, mrb_value klass)
 {
-  int backlog, s;
+  mrb_int backlog, s;
 
   mrb_get_args(mrb, "ii", &s, &backlog);
-  if (listen(s, backlog) == -1) {
+  if (listen((int)s, (int)backlog) == -1) {
     mrb_sys_fail(mrb, "listen");
   }
@@ -623 +642 @@
 mrb_socket_sockaddr_un(mrb_state *mrb, mrb_value klass)
 {
+#ifdef _WIN32
+  mrb_raise(mrb, E_NOTIMP_ERROR, "sockaddr_un unsupported on Windows");
+  return mrb_nil_value();
+#else
   struct sockaddr_un *sunp;
   mrb_value path, s;
-  
+
   mrb_get_args(mrb, "S", &path);
   if (RSTRING_LEN(path) > sizeof(sunp->sun_path) - 1) {
@@ -637 +660 @@
   mrb_str_resize(mrb, s, sizeof(struct sockaddr_un));
   return s;
+#endif
 }
 
@@ -642 +666 @@
 mrb_socket_socketpair(mrb_state *mrb, mrb_value klass)
 {
+#ifdef _WIN32
+  mrb_raise(mrb, E_NOTIMP_ERROR, "socketpair unsupported on Windows");
+  return mrb_nil_value();
+#else
   mrb_value ary;
   mrb_int domain, type, protocol;
@@ -655 +683 @@
   mrb_ary_push(mrb, ary, mrb_fixnum_value(sv[1]));
   return ary;
+#endif
 }
 
@@ -686 +715 @@
  * will break on socket descriptors.
  */
+#ifdef _WIN32
+static mrb_value
+mrb_win32_basicsocket_close(mrb_state *mrb, mrb_value self)
+{
+  if (closesocket(socket_fd(mrb, self)) != NO_ERROR)
+    mrb_raise(mrb, E_SOCKET_ERROR, "closesocket unsuccessful");
+  return mrb_nil_value();
+}
+
+#define E_EOF_ERROR                (mrb_class_get(mrb, "EOFError"))
+static mrb_value
+mrb_win32_basicsocket_sysread(mrb_state *mrb, mrb_value self)
+{
+  int sd, ret;
+  mrb_value buf = mrb_nil_value();
+  mrb_int maxlen;
+
+  mrb_get_args(mrb, "i|S", &maxlen, &buf);
+  if (maxlen < 0) {
+    return mrb_nil_value();
+  }
+
+  if (mrb_nil_p(buf)) {
+    buf = mrb_str_new(mrb, NULL, maxlen);
+  }
+  if (RSTRING_LEN(buf) != maxlen) {
+    buf = mrb_str_resize(mrb, buf, maxlen);
+  }
+
+  sd = socket_fd(mrb, self);
+  ret = recv(sd, RSTRING_PTR(buf), maxlen, 0);
+
+  switch (ret) {
+    case 0: /* EOF */
+      if (maxlen == 0) {
+        buf = mrb_str_new_cstr(mrb, "");
+      } else {
+        mrb_raise(mrb, E_EOF_ERROR, "sysread failed: End of File");
+      }
+      break;
+    case SOCKET_ERROR: /* Error */
+      mrb_sys_fail(mrb, "recv");
+      break;
+    default:
+      if (RSTRING_LEN(buf) != ret) {
+        buf = mrb_str_resize(mrb, buf, ret);
+      }
+      break;
+  }
+
+  return buf;
+}
+
+static mrb_value
+mrb_win32_basicsocket_sysseek(mrb_state *mrb, mrb_value self)
+{
+  mrb_raise(mrb, E_NOTIMP_ERROR, "sysseek not implemented for windows sockets");
+  return mrb_nil_value();
+}
+
+static mrb_value
+mrb_win32_basicsocket_syswrite(mrb_state *mrb, mrb_value self)
+{
+  int n;
+  SOCKET sd;
+  mrb_value str;
+
+  sd = socket_fd(mrb, self);
+  mrb_get_args(mrb, "S", &str);
+  n = send(sd, RSTRING_PTR(str), RSTRING_LEN(str), 0);
+  if (n == SOCKET_ERROR)
+    mrb_sys_fail(mrb, "send");
+  return mrb_fixnum_value(n);
+}
+
+#endif
 
 void
@@ -693 +798 @@
   struct RClass *constants;
 
+#ifdef _WIN32
+  WSADATA wsaData;
+  int result;
+  result = WSAStartup(MAKEWORD(2,2), &wsaData);
+  if (result != NO_ERROR)
+    mrb_raise(mrb, E_RUNTIME_ERROR, "WSAStartup failed");
+#else
   struct RClass *usock;
+#endif
 
   ai = mrb_define_class(mrb, "Addrinfo", mrb->object_class);
@@ -699 +812 @@
   mrb_define_class_method(mrb, ai, "getaddrinfo", mrb_addrinfo_getaddrinfo, MRB_ARGS_REQ(2)|MRB_ARGS_OPT(4));
   mrb_define_method(mrb, ai, "getnameinfo", mrb_addrinfo_getnameinfo, MRB_ARGS_OPT(1));
+#ifndef _WIN32
   mrb_define_method(mrb, ai, "unix_path", mrb_addrinfo_unix_path, MRB_ARGS_NONE());
+#endif
 
   io = mrb_class_get(mrb, "IO");
@@ -746 +861 @@
   //mrb_define_method(mrb, sock, "sysaccept", mrb_socket_accept, MRB_ARGS_NONE());
 
+#ifndef _WIN32
   usock = mrb_define_class(mrb, "UNIXSocket", bsock);
+#endif
   //mrb_define_class_method(mrb, usock, "pair", mrb_unixsocket_open, MRB_ARGS_OPT(2));
   //mrb_define_class_method(mrb, usock, "socketpair", mrb_unixsocket_open, MRB_ARGS_OPT(2));
@@ -755 +872 @@
 
   /* Windows IO Method Overrides on BasicSocket */
+#ifdef _WIN32
+  mrb_define_method(mrb, bsock, "close", mrb_win32_basicsocket_close, MRB_ARGS_NONE());
+  mrb_define_method(mrb, bsock, "sysread", mrb_win32_basicsocket_sysread, MRB_ARGS_REQ(1)|MRB_ARGS_OPT(1));
+  mrb_define_method(mrb, bsock, "sysseek", mrb_win32_basicsocket_sysseek, MRB_ARGS_REQ(1));
+  mrb_define_method(mrb, bsock, "syswrite", mrb_win32_basicsocket_syswrite, MRB_ARGS_REQ(1));
+#endif
 
   constants = mrb_define_module_under(mrb, sock, "Constants");
@@ -774 +897 @@
     freeaddrinfo(mrb_cptr(ai));
   }
-}
+#ifdef _WIN32
+  WSACleanup();
+#endif
+}