RubyGems - sctp-socket - Versions diffs - 0.2.1 → 0.3.0 - Mend

sctp-socket 0.2.1 → 0.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

data/ext/sctp/socket.c CHANGED Viewed

@@ -1,13 +1,15 @@
 #include "ruby.h"
+#include <ruby/thread.h>
 #include <string.h>
 #include <errno.h>
 #include <arpa/inet.h>
-#include <netinet/sctp.h>
 #ifdef HAVE_SYS_PARAM_H
 #include <sys/param.h>
 #endif
+#include "sctp_compat.h"
 VALUE mSCTP;
 VALUE cSocket;
 VALUE v_sndrcv_struct;
@@ -41,7 +43,7 @@ VALUE v_sctp_initmsg_struct;
 // Memory safety and error handling macros
 #define CHECK_FILENO_VALID(fileno) do { \
-  if ((fileno) < 0) { \
+  if (SCTP_FD_INVALID(fileno)) { \
     rb_raise(rb_eSystemCallError, "invalid file descriptor"); \
   } \
 } while(0)
@@ -54,8 +56,7 @@ VALUE v_sctp_initmsg_struct;
 } while(0)
 #define CHECK_SOCKET_CLOSED(self) do { \
-  VALUE v_fileno = rb_iv_get((self), "@fileno"); \
-  if (NIL_P(v_fileno) || NUM2INT(v_fileno) < 0) { \
+  if (NIL_P(rb_iv_get((self), "@fileno"))) { \
     rb_raise(rb_eIOError, "socket is closed"); \
   } \
 } while(0)
@@ -63,6 +64,65 @@ VALUE v_sctp_initmsg_struct;
 #define MAX_IP_ADDRESSES 8
 #define DEFAULT_BUFFER_SIZE 1024
 #define IP_BUFFER_SIZE INET6_ADDRSTRLEN
+#define MAX_NOTIFICATION_DATA 8192
+/*
+ * Helper function to parse an IP address string and fill a sockaddr_in or sockaddr_in6 structure.
+ * Supports both IPv4 and IPv6 addresses.
+ *
+ * @param addr_str The IP address string to parse
+ * @param port The port number (in host byte order)
+ * @param sin Pointer to sockaddr_in to fill (for IPv4)
+ * @param sin6 Pointer to sockaddr_in6 to fill (for IPv6)
+ * @param domain The address family (AF_INET or AF_INET6)
+ */
+static void parse_ip_address_v4(const char* addr_str, int port, struct sockaddr_in* sin){
+  bzero(sin, sizeof(*sin));
+  sin->sin_family = AF_INET;
+  sin->sin_port = htons(port);
+  if(inet_pton(AF_INET, addr_str, &sin->sin_addr) != 1)
+    rb_raise(rb_eArgError, "invalid IPv4 address: %s", addr_str);
+#ifdef BSD
+  sin->sin_len = sizeof(struct sockaddr_in);
+#endif
+}
+static void parse_ip_address_v6(const char* addr_str, int port, struct sockaddr_in6* sin6){
+  bzero(sin6, sizeof(*sin6));
+  sin6->sin6_family = AF_INET6;
+  sin6->sin6_port = htons(port);
+  if(inet_pton(AF_INET6, addr_str, &sin6->sin6_addr) != 1)
+    rb_raise(rb_eArgError, "invalid IPv6 address: %s", addr_str);
+#ifdef BSD
+  sin6->sin6_len = sizeof(struct sockaddr_in6);
+#endif
+}
+/*
+ * Helper function to set INADDR_ANY for IPv4.
+ */
+static void set_any_address_v4(int port, struct sockaddr_in* sin){
+  bzero(sin, sizeof(*sin));
+  sin->sin_family = AF_INET;
+  sin->sin_port = htons(port);
+  sin->sin_addr.s_addr = htonl(INADDR_ANY);
+#ifdef BSD
+  sin->sin_len = sizeof(struct sockaddr_in);
+#endif
+}
+/*
+ * Helper function to set IN6ADDR_ANY for IPv6.
+ */
+static void set_any_address_v6(int port, struct sockaddr_in6* sin6){
+  bzero(sin6, sizeof(*sin6));
+  sin6->sin6_family = AF_INET6;
+  sin6->sin6_port = htons(port);
+  sin6->sin6_addr = in6addr_any;
+#ifdef BSD
+  sin6->sin6_len = sizeof(struct sockaddr_in6);
+#endif
+}
 /*
  * Convert a sockaddr_in structure to a Ruby struct.
@@ -197,12 +257,18 @@ VALUE get_notification_info(char* buffer){
           v_str = rb_str_new2("unknown");
       }
-      inet_ntop(
-        ((struct sockaddr_in *)&snp->sn_paddr_change.spc_aaddr)->sin_family,
-        &(((struct sockaddr_in *)&snp->sn_paddr_change.spc_aaddr)->sin_addr),
-        str,
-        sizeof(str)
-      );
+      {
+        struct sockaddr* sa = (struct sockaddr*)&snp->sn_paddr_change.spc_aaddr;
+        if(sa->sa_family == AF_INET6){
+          struct sockaddr_in6* sin6 = (struct sockaddr_in6*)sa;
+          inet_ntop(AF_INET6, &sin6->sin6_addr, str, sizeof(str));
+        }
+        else{
+          struct sockaddr_in* sin = (struct sockaddr_in*)sa;
+          inet_ntop(AF_INET, &sin->sin_addr, str, sizeof(str));
+        }
+      }
       v_notification = rb_struct_new(v_peeraddr_change_struct,
         UINT2NUM(snp->sn_paddr_change.spc_type),
@@ -215,83 +281,150 @@ VALUE get_notification_info(char* buffer){
       );
       break;
     case SCTP_REMOTE_ERROR:
-      v_temp = ALLOCA_N(VALUE, snp->sn_remote_error.sre_length);
-      for(i = 0; i < snp->sn_remote_error.sre_length; i++){
-        v_temp[i] = UINT2NUM(snp->sn_remote_error.sre_data[i]);
+      {
+        size_t data_len = 0;
+        VALUE v_data_ary;
+        // Calculate actual data length (total length minus fixed header)
+        if(snp->sn_remote_error.sre_length > offsetof(struct sctp_remote_error, sre_data))
+          data_len = snp->sn_remote_error.sre_length - offsetof(struct sctp_remote_error, sre_data);
+        // Bounds check to prevent stack overflow
+        if(data_len > MAX_NOTIFICATION_DATA)
+          data_len = MAX_NOTIFICATION_DATA;
+        if(data_len > 0){
+          v_temp = ALLOCA_N(VALUE, data_len);
+          for(i = 0; i < data_len; i++){
+            v_temp[i] = UINT2NUM(snp->sn_remote_error.sre_data[i]);
+          }
+          v_data_ary = rb_ary_new4(data_len, v_temp);
+        }
+        else{
+          v_data_ary = rb_ary_new();
+        }
+        v_notification = rb_struct_new(v_remote_error_struct,
+          UINT2NUM(snp->sn_remote_error.sre_type),
+          UINT2NUM(snp->sn_remote_error.sre_flags),
+          UINT2NUM(snp->sn_remote_error.sre_length),
+          UINT2NUM(snp->sn_remote_error.sre_error),
+          UINT2NUM(snp->sn_remote_error.sre_assoc_id),
+          v_data_ary
+        );
       }
-      v_notification = rb_struct_new(v_remote_error_struct,
-        UINT2NUM(snp->sn_remote_error.sre_type),
-        UINT2NUM(snp->sn_remote_error.sre_flags),
-        UINT2NUM(snp->sn_remote_error.sre_length),
-        UINT2NUM(snp->sn_remote_error.sre_error),
-        UINT2NUM(snp->sn_remote_error.sre_assoc_id),
-        rb_ary_new4(snp->sn_remote_error.sre_length, v_temp)
-      );
       break;
 #ifdef SCTP_SEND_FAILED_EVENT
     case SCTP_SEND_FAILED_EVENT:
-#ifdef HAVE_STRUCT_SCTP_SEND_FAILED_EVENT_SSFE_LENGTH
-      v_temp = ALLOCA_N(VALUE, snp->sn_send_failed_event.ssfe_length);
+      {
+        size_t data_len = 0;
+        VALUE v_data_ary;
-      for(i = 0; i < snp->sn_send_failed_event.ssfe_length; i++){
-        v_temp[i] = UINT2NUM(snp->sn_send_failed_event.ssfe_data[i]);
-      }
-      v_notification = rb_struct_new(v_send_failed_event_struct,
-        UINT2NUM(snp->sn_send_failed_event.ssfe_type),
-        UINT2NUM(snp->sn_send_failed_event.ssfe_length),
-        UINT2NUM(snp->sn_send_failed_event.ssfe_error),
-        rb_struct_new(v_sndinfo_struct,
-          UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_sid),
-          UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_flags),
-          UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_ppid),
-          UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_context),
-          UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_assoc_id)
-        ),
-        UINT2NUM(snp->sn_send_failed_event.ssfe_assoc_id),
-        rb_ary_new4(snp->sn_send_failed_event.ssfe_length, v_temp)
-      );
+#ifdef HAVE_STRUCT_SCTP_SEND_FAILED_EVENT_SSFE_LENGTH
+        // Calculate actual data length (total length minus fixed header)
+        if(snp->sn_send_failed_event.ssfe_length > offsetof(struct sctp_send_failed_event, ssfe_data))
+          data_len = snp->sn_send_failed_event.ssfe_length - offsetof(struct sctp_send_failed_event, ssfe_data);
+        // Bounds check to prevent stack overflow
+        if(data_len > MAX_NOTIFICATION_DATA)
+          data_len = MAX_NOTIFICATION_DATA;
+        if(data_len > 0){
+          v_temp = ALLOCA_N(VALUE, data_len);
+          for(i = 0; i < data_len; i++){
+            v_temp[i] = UINT2NUM(snp->sn_send_failed_event.ssfe_data[i]);
+          }
+          v_data_ary = rb_ary_new4(data_len, v_temp);
+        }
+        else{
+          v_data_ary = rb_ary_new();
+        }
+        v_notification = rb_struct_new(v_send_failed_event_struct,
+          UINT2NUM(snp->sn_send_failed_event.ssfe_type),
+          UINT2NUM(snp->sn_send_failed_event.ssfe_length),
+          UINT2NUM(snp->sn_send_failed_event.ssfe_error),
+          rb_struct_new(v_sndinfo_struct,
+            UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_sid),
+            UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_flags),
+            UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_ppid),
+            UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_context),
+            UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_assoc_id)
+          ),
+          UINT2NUM(snp->sn_send_failed_event.ssfe_assoc_id),
+          v_data_ary
+        );
 #else
-      v_temp = ALLOCA_N(VALUE, snp->sn_send_failed_event.ssf_length);
-      for(i = 0; i < snp->sn_send_failed_event.ssf_length; i++){
-        v_temp[i] = UINT2NUM(snp->sn_send_failed_event.ssf_data[i]);
-      }
-      v_notification = rb_struct_new(v_send_failed_event_struct,
-        UINT2NUM(snp->sn_send_failed_event.ssf_type),
-        UINT2NUM(snp->sn_send_failed_event.ssf_length),
-        UINT2NUM(snp->sn_send_failed_event.ssf_error),
-        rb_struct_new(v_sndinfo_struct,
-          UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_sid),
-          UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_flags),
-          UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_ppid),
-          UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_context),
-          UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_assoc_id)
-        ),
-        UINT2NUM(snp->sn_send_failed_event.ssf_assoc_id),
-        rb_ary_new4(snp->sn_send_failed_event.ssf_length, v_temp)
-      );
+        // Calculate actual data length (total length minus fixed header)
+        if(snp->sn_send_failed_event.ssf_length > offsetof(struct sctp_send_failed_event, ssf_data))
+          data_len = snp->sn_send_failed_event.ssf_length - offsetof(struct sctp_send_failed_event, ssf_data);
+        // Bounds check to prevent stack overflow
+        if(data_len > MAX_NOTIFICATION_DATA)
+          data_len = MAX_NOTIFICATION_DATA;
+        if(data_len > 0){
+          v_temp = ALLOCA_N(VALUE, data_len);
+          for(i = 0; i < data_len; i++){
+            v_temp[i] = UINT2NUM(snp->sn_send_failed_event.ssf_data[i]);
+          }
+          v_data_ary = rb_ary_new4(data_len, v_temp);
+        }
+        else{
+          v_data_ary = rb_ary_new();
+        }
+        v_notification = rb_struct_new(v_send_failed_event_struct,
+          UINT2NUM(snp->sn_send_failed_event.ssf_type),
+          UINT2NUM(snp->sn_send_failed_event.ssf_length),
+          UINT2NUM(snp->sn_send_failed_event.ssf_error),
+          rb_struct_new(v_sndinfo_struct,
+            UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_sid),
+            UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_flags),
+            UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_ppid),
+            UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_context),
+            UINT2NUM(snp->sn_send_failed_event.ssfe_info.snd_assoc_id)
+          ),
+          UINT2NUM(snp->sn_send_failed_event.ssf_assoc_id),
+          v_data_ary
+        );
 #endif
+      }
       break;
 #else
     case SCTP_SEND_FAILED:
-      v_temp = ALLOCA_N(VALUE, snp->sn_send_failed.ssf_length);
-      for(i = 0; i < snp->sn_send_failed.ssf_length; i++){
-        v_temp[i] = UINT2NUM(snp->sn_send_failed.ssf_data[i]);
+      {
+        size_t data_len = 0;
+        VALUE v_data_ary;
+        // Calculate actual data length (total length minus fixed header)
+        if(snp->sn_send_failed.ssf_length > offsetof(struct sctp_send_failed, ssf_data))
+          data_len = snp->sn_send_failed.ssf_length - offsetof(struct sctp_send_failed, ssf_data);
+        // Bounds check to prevent stack overflow
+        if(data_len > MAX_NOTIFICATION_DATA)
+          data_len = MAX_NOTIFICATION_DATA;
+        if(data_len > 0){
+          v_temp = ALLOCA_N(VALUE, data_len);
+          for(i = 0; i < data_len; i++){
+            v_temp[i] = UINT2NUM(snp->sn_send_failed.ssf_data[i]);
+          }
+          v_data_ary = rb_ary_new4(data_len, v_temp);
+        }
+        else{
+          v_data_ary = rb_ary_new();
+        }
+        v_notification = rb_struct_new(v_send_failed_event_struct,
+          UINT2NUM(snp->sn_send_failed.ssf_type),
+          UINT2NUM(snp->sn_send_failed.ssf_length),
+          UINT2NUM(snp->sn_send_failed.ssf_error),
+          Qnil,
+          UINT2NUM(snp->sn_send_failed.ssf_assoc_id),
+          v_data_ary
+        );
       }
-      v_notification = rb_struct_new(v_send_failed_event_struct,
-        UINT2NUM(snp->sn_send_failed.ssf_type),
-        UINT2NUM(snp->sn_send_failed.ssf_length),
-        UINT2NUM(snp->sn_send_failed.ssf_error),
-        Qnil,
-        UINT2NUM(snp->sn_send_failed.ssf_assoc_id),
-        rb_ary_new4(snp->sn_send_failed.ssf_length, v_temp)
-      );
       break;
 #endif
     case SCTP_SHUTDOWN_EVENT:
@@ -370,7 +503,7 @@ VALUE get_notification_info(char* buffer){
  *   socket2 = SCTP::Socket.new(Socket::AF_INET, Socket::SOCK_STREAM)
  */
 static VALUE rsctp_init(int argc, VALUE* argv, VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   VALUE v_domain, v_type;
   rb_scan_args(argc, argv, "02", &v_domain, &v_type);
@@ -394,14 +527,14 @@ static VALUE rsctp_init(int argc, VALUE* argv, VALUE self){
       rb_raise(rb_eArgError, "unsupported socket type: %d", type);
   }
-  fileno = socket(NUM2INT(v_domain), NUM2INT(v_type), IPPROTO_SCTP);
+  fileno = sctp_sys_socket(NUM2INT(v_domain), NUM2INT(v_type), IPPROTO_SCTP);
-  if(fileno < 0)
+  if(SCTP_FD_INVALID(fileno))
     rb_raise(rb_eSystemCallError, "socket: %s", strerror(errno));
   rb_iv_set(self, "@domain", v_domain);
   rb_iv_set(self, "@type", v_type);
-  rb_iv_set(self, "@fileno", INT2NUM(fileno));
+  rb_iv_set(self, "@fileno", SCTP_FD_TO_NUM(fileno));
   rb_iv_set(self, "@association_id", INT2NUM(0));
   return self;
@@ -451,14 +584,12 @@ static VALUE rsctp_init(int argc, VALUE* argv, VALUE self){
  * Returns the port that it was bound to.
  */
 static VALUE rsctp_bindx(int argc, VALUE* argv, VALUE self){
-  struct sockaddr_in addrs[MAX_IP_ADDRESSES];
-  int i, fileno, num_ip, flags, domain, port, on;
+  sctp_sock_t fileno;
+  int i, num_ip, flags, domain, port, on;
   VALUE v_addresses, v_port, v_flags, v_address, v_reuse_addr, v_options;
   rb_scan_args(argc, argv, "01", &v_options);
-  bzero(&addrs, sizeof(addrs));
   if(NIL_P(v_options))
     v_options = rb_hash_new();
@@ -485,44 +616,63 @@ static VALUE rsctp_bindx(int argc, VALUE* argv, VALUE self){
   if(num_ip > MAX_IP_ADDRESSES)
     rb_raise(rb_eArgError, "too many IP addresses to bind, maximum is eight");
+  CHECK_SOCKET_CLOSED(self);
   domain = NUM2INT(rb_iv_get(self, "@domain"));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
-  if(!NIL_P(v_addresses)){
-    for(i = 0; i < num_ip; i++){
-      v_address = RARRAY_PTR(v_addresses)[i];
-      addrs[i].sin_family = domain;
-      addrs[i].sin_port = htons(port);
-      addrs[i].sin_addr.s_addr = inet_addr(StringValueCStr(v_address));
-#ifdef BSD
-      addrs[i].sin_len = sizeof(struct sockaddr_in);
+  if(v_reuse_addr == Qtrue){
+    on = 1;
+#ifdef HAVE_USRSCTP_H
+    /* usrsctp runs in userspace; address reuse is not needed/supported. Silently skip. */
+    (void)on;
+#else
+    if(sctp_sys_setsockopt(fileno, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
+      rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
 #endif
+  }
+  if(domain == AF_INET6){
+    struct sockaddr_in6 addrs6[MAX_IP_ADDRESSES];
+    bzero(&addrs6, sizeof(addrs6));
+    if(!NIL_P(v_addresses)){
+      for(i = 0; i < num_ip; i++){
+        v_address = RARRAY_AREF(v_addresses, i);
+        parse_ip_address_v6(StringValueCStr(v_address), port, &addrs6[i]);
+      }
     }
+    else{
+      set_any_address_v6(port, &addrs6[0]);
+    }
+    if(sctp_sys_bindx(fileno, (struct sockaddr *)addrs6, num_ip, flags) != 0)
+      rb_raise(rb_eSystemCallError, "sctp_bindx: %s", strerror(errno));
   }
   else{
-    addrs[0].sin_family = domain;
-    addrs[0].sin_port = htons(port);
-    addrs[0].sin_addr.s_addr = htonl(INADDR_ANY);
-#ifdef BSD
-    addrs[0].sin_len = sizeof(struct sockaddr_in);
-#endif
-  }
+    struct sockaddr_in addrs[MAX_IP_ADDRESSES];
+    bzero(&addrs, sizeof(addrs));
-  if(v_reuse_addr == Qtrue){
-    on = 1;
-    if(setsockopt(fileno, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(on)) < 0)
-      rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
-  }
+    if(!NIL_P(v_addresses)){
+      for(i = 0; i < num_ip; i++){
+        v_address = RARRAY_AREF(v_addresses, i);
+        parse_ip_address_v4(StringValueCStr(v_address), port, &addrs[i]);
+      }
+    }
+    else{
+      set_any_address_v4(port, &addrs[0]);
+    }
-  if(sctp_bindx(fileno, (struct sockaddr *) addrs, num_ip, flags) != 0)
-    rb_raise(rb_eSystemCallError, "sctp_bindx: %s", strerror(errno));
+    if(sctp_sys_bindx(fileno, (struct sockaddr *)addrs, num_ip, flags) != 0)
+      rb_raise(rb_eSystemCallError, "sctp_bindx: %s", strerror(errno));
+  }
   if(port == 0){
     struct sockaddr_in sin;
     socklen_t len = sizeof(sin);
     bzero(&sin, len);
-    if(getsockname(fileno, (struct sockaddr *)&sin, &len) == -1)
+    if(sctp_sys_getsockname(fileno, (struct sockaddr *)&sin, &len) == -1)
       rb_raise(rb_eSystemCallError, "getsockname: %s", strerror(errno));
     port = sin.sin_port;
@@ -550,10 +700,10 @@ static VALUE rsctp_bindx(int argc, VALUE* argv, VALUE self){
  * methods will automatically establish associations.
  */
 static VALUE rsctp_connectx(int argc, VALUE* argv, VALUE self){
-  struct sockaddr_in addrs[MAX_IP_ADDRESSES];
-  int i, num_ip, fileno;
+  sctp_sock_t fileno;
+  int i, num_ip, domain, port;
   sctp_assoc_t assoc;
-  VALUE v_address, v_domain, v_options, v_addresses, v_port;
+  VALUE v_address, v_options, v_addresses, v_port;
   rb_scan_args(argc, argv, "01", &v_options);
@@ -571,25 +721,41 @@ static VALUE rsctp_connectx(int argc, VALUE* argv, VALUE self){
   if(NIL_P(v_port))
     rb_raise(rb_eArgError, "you must specify a port");
-  v_domain = rb_iv_get(self, "@domain");
+  CHECK_SOCKET_CLOSED(self);
+  domain = NUM2INT(rb_iv_get(self, "@domain"));
+  port = NUM2INT(v_port);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   num_ip = (int)RARRAY_LEN(v_addresses);
-  bzero(&addrs, sizeof(addrs));
-  for(i = 0; i < num_ip; i++){
-    v_address = RARRAY_PTR(v_addresses)[i];
-    addrs[i].sin_family = NUM2INT(v_domain);
-    addrs[i].sin_port = htons(NUM2INT(v_port));
-    addrs[i].sin_addr.s_addr = inet_addr(StringValueCStr(v_address));
-#ifdef BSD
-    addrs[i].sin_len = sizeof(struct sockaddr_in);
-#endif
+  if(num_ip > MAX_IP_ADDRESSES)
+    rb_raise(rb_eArgError, "too many IP addresses, maximum is eight");
+  if(domain == AF_INET6){
+    struct sockaddr_in6 addrs6[MAX_IP_ADDRESSES];
+    bzero(&addrs6, sizeof(addrs6));
+    for(i = 0; i < num_ip; i++){
+      v_address = RARRAY_AREF(v_addresses, i);
+      parse_ip_address_v6(StringValueCStr(v_address), port, &addrs6[i]);
+    }
+    if(sctp_sys_connectx(fileno, (struct sockaddr *)addrs6, num_ip, &assoc) < 0)
+      rb_raise(rb_eSystemCallError, "sctp_connectx: %s", strerror(errno));
   }
+  else{
+    struct sockaddr_in addrs[MAX_IP_ADDRESSES];
+    bzero(&addrs, sizeof(addrs));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+    for(i = 0; i < num_ip; i++){
+      v_address = RARRAY_AREF(v_addresses, i);
+      parse_ip_address_v4(StringValueCStr(v_address), port, &addrs[i]);
+    }
-  if(sctp_connectx(fileno, (struct sockaddr *) addrs, num_ip, &assoc) < 0)
-    rb_raise(rb_eSystemCallError, "sctp_connectx: %s", strerror(errno));
+    if(sctp_sys_connectx(fileno, (struct sockaddr *)addrs, num_ip, &assoc) < 0)
+      rb_raise(rb_eSystemCallError, "sctp_connectx: %s", strerror(errno));
+  }
   rb_iv_set(self, "@association_id", INT2NUM(assoc));
@@ -619,7 +785,7 @@ static VALUE rsctp_connectx(int argc, VALUE* argv, VALUE self){
  */
 static VALUE rsctp_close(int argc, VALUE* argv, VALUE self){
   VALUE v_options, v_linger, v_fileno;
-  int fileno;
+  sctp_sock_t fileno;
   rb_scan_args(argc, argv, "01", &v_options);
@@ -634,9 +800,13 @@ static VALUE rsctp_close(int argc, VALUE* argv, VALUE self){
   if(NIL_P(v_fileno)) // Already closed
     return self;
-  fileno = NUM2INT(v_fileno);
+  fileno = NUM_TO_SCTP_FD(v_fileno);
   if(!NIL_P(v_linger)){
+#ifdef HAVE_USRSCTP_H
+    /* usrsctp doesn't support SOL_SOCKET options; linger is not available */
+    (void)v_linger;
+#else
     struct linger lin;
     int linger_time = NUM2INT(v_linger);
@@ -646,11 +816,12 @@ static VALUE rsctp_close(int argc, VALUE* argv, VALUE self){
     lin.l_onoff = 1;
     lin.l_linger = linger_time;
-    if(setsockopt(fileno, SOL_SOCKET, SO_LINGER, &lin, sizeof(struct linger)) < 0)
+    if(sctp_sys_setsockopt(fileno, SOL_SOCKET, SO_LINGER, &lin, sizeof(struct linger)) < 0)
       rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
+#endif
   }
-  if(close(fileno) < 0)
+  if(sctp_sys_close(fileno) < 0)
     rb_raise(rb_eSystemCallError, "close: %s", strerror(errno));
   // Mark socket as closed
@@ -700,7 +871,8 @@ static VALUE rsctp_closed_p(VALUE self){
 static VALUE rsctp_getpeernames(int argc, VALUE* argv, VALUE self){
   sctp_assoc_t assoc_id;
   struct sockaddr* addrs = NULL;
-  int i, fileno, num_addrs;
+  sctp_sock_t fileno;
+  int i, num_addrs;
   char str[IP_BUFFER_SIZE];
   VALUE v_fileno, v_association_id;
   VALUE v_array = rb_ary_new();
@@ -709,10 +881,10 @@ static VALUE rsctp_getpeernames(int argc, VALUE* argv, VALUE self){
   if(NIL_P(v_fileno)){
     CHECK_SOCKET_CLOSED(self);
-    fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+    fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   }
   else{
-    fileno = NUM2INT(v_fileno);
+    fileno = NUM_TO_SCTP_FD(v_fileno);
     CHECK_FILENO_VALID(fileno);
   }
@@ -721,22 +893,32 @@ static VALUE rsctp_getpeernames(int argc, VALUE* argv, VALUE self){
   else
     assoc_id = NUM2INT(v_association_id);
-  num_addrs = sctp_getpaddrs(fileno, assoc_id, &addrs);
+  num_addrs = sctp_sys_getpaddrs(fileno, assoc_id, &addrs);
   if(num_addrs < 0){
     if(addrs != NULL)
-      sctp_freepaddrs(addrs);
+      sctp_sys_freepaddrs(addrs);
     rb_raise(rb_eSystemCallError, "sctp_getpaddrs: %s", strerror(errno));
   }
   for(i = 0; i < num_addrs; i++){
+    struct sockaddr* sa = &addrs[i];
     bzero(&str, sizeof(str));
-    inet_ntop(AF_INET, &(((struct sockaddr_in *)&addrs[i])->sin_addr), str, sizeof(str));
+    if(sa->sa_family == AF_INET6){
+      struct sockaddr_in6* sin6 = (struct sockaddr_in6*)sa;
+      inet_ntop(AF_INET6, &sin6->sin6_addr, str, sizeof(str));
+    }
+    else{
+      struct sockaddr_in* sin = (struct sockaddr_in*)sa;
+      inet_ntop(AF_INET, &sin->sin_addr, str, sizeof(str));
+    }
     rb_ary_push(v_array, rb_str_new2(str));
   }
-  sctp_freepaddrs(addrs);
+  sctp_sys_freepaddrs(addrs);
   return v_array;
 }
@@ -761,7 +943,8 @@ static VALUE rsctp_getpeernames(int argc, VALUE* argv, VALUE self){
 static VALUE rsctp_getlocalnames(int argc, VALUE* argv, VALUE self){
   sctp_assoc_t assoc_id;
   struct sockaddr* addrs = NULL;
-  int i, fileno, num_addrs;
+  sctp_sock_t fileno;
+  int i, num_addrs;
   char str[IP_BUFFER_SIZE];
   VALUE v_assoc_fileno, v_assoc_id;
   VALUE v_array = rb_ary_new();
@@ -770,10 +953,10 @@ static VALUE rsctp_getlocalnames(int argc, VALUE* argv, VALUE self){
   if(NIL_P(v_assoc_fileno)){
     CHECK_SOCKET_CLOSED(self);
-    fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+    fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   }
   else{
-    fileno = NUM2INT(v_assoc_fileno);
+    fileno = NUM_TO_SCTP_FD(v_assoc_fileno);
     CHECK_FILENO_VALID(fileno);
   }
@@ -782,22 +965,32 @@ static VALUE rsctp_getlocalnames(int argc, VALUE* argv, VALUE self){
   else
     assoc_id = NUM2INT(v_assoc_id);
-  num_addrs = sctp_getladdrs(fileno, assoc_id, &addrs);
+  num_addrs = sctp_sys_getladdrs(fileno, assoc_id, &addrs);
   if(num_addrs < 0){
     if(addrs != NULL)
-      sctp_freeladdrs(addrs);
+      sctp_sys_freeladdrs(addrs);
     rb_raise(rb_eSystemCallError, "sctp_getladdrs: %s", strerror(errno));
   }
   for(i = 0; i < num_addrs; i++){
+    struct sockaddr* sa = &addrs[i];
     bzero(&str, sizeof(str));
-    inet_ntop(AF_INET, &(((struct sockaddr_in *)&addrs[i])->sin_addr), str, sizeof(str));
+    if(sa->sa_family == AF_INET6){
+      struct sockaddr_in6* sin6 = (struct sockaddr_in6*)sa;
+      inet_ntop(AF_INET6, &sin6->sin6_addr, str, sizeof(str));
+    }
+    else{
+      struct sockaddr_in* sin = (struct sockaddr_in*)sa;
+      inet_ntop(AF_INET, &sin->sin_addr, str, sizeof(str));
+    }
     rb_ary_push(v_array, rb_str_new2(str));
   }
-  sctp_freeladdrs(addrs);
+  sctp_sys_freeladdrs(addrs);
   return v_array;
 }
@@ -832,9 +1025,9 @@ static VALUE rsctp_getlocalnames(int argc, VALUE* argv, VALUE self){
 static VALUE rsctp_sendv(VALUE self, VALUE v_options){
   VALUE v_msg, v_message, v_addresses;
   struct iovec iov[IOV_MAX];
-  struct sockaddr_in* addrs;
   struct sctp_sendv_spa spa;
-  int i, fileno, size, num_ip;
+  sctp_sock_t fileno;
+  int i, size, num_ip, domain, port;
   ssize_t num_bytes;
   Check_Type(v_options, T_HASH);
@@ -856,14 +1049,15 @@ static VALUE rsctp_sendv(VALUE self, VALUE v_options){
   if(!NIL_P(v_addresses)){
     Check_Type(v_addresses, T_ARRAY);
     num_ip = (int)RARRAY_LEN(v_addresses);
-    addrs = (struct sockaddr_in*)alloca(num_ip * sizeof(*addrs));
+    if(num_ip > MAX_IP_ADDRESSES)
+      rb_raise(rb_eArgError, "too many IP addresses, maximum is eight");
   }
   else{
-    addrs = NULL;
     num_ip = 0;
   }
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   size = (int)RARRAY_LEN(v_message);
   if(!size)
@@ -877,8 +1071,15 @@ static VALUE rsctp_sendv(VALUE self, VALUE v_options){
   spa.sendv_sndinfo.snd_flags = SCTP_UNORDERED;
   spa.sendv_sndinfo.snd_assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
-  if(!NIL_P(v_addresses)){
-    int i, port, domain;
+  for(i = 0; i < size; i++){
+    v_msg = RARRAY_AREF(v_message, i);
+    iov[i].iov_base = StringValueCStr(v_msg);
+    iov[i].iov_len = RSTRING_LEN(v_msg);
+  }
+  domain = NUM2INT(rb_iv_get(self, "@domain"));
+  if(num_ip > 0){
     VALUE v_address, v_port;
     v_port = rb_iv_get(self, "@port");
@@ -888,36 +1089,62 @@ static VALUE rsctp_sendv(VALUE self, VALUE v_options){
     else
       port = NUM2INT(v_port);
-    domain = NUM2INT(rb_iv_get(self, "@domain"));
+    if(domain == AF_INET6){
+      struct sockaddr_in6* addrs6 = (struct sockaddr_in6*)alloca(num_ip * sizeof(struct sockaddr_in6));
+      bzero(addrs6, num_ip * sizeof(struct sockaddr_in6));
-    for(i = 0; i < num_ip; i++){
-      v_address = RARRAY_PTR(v_addresses)[i];
-      addrs[i].sin_family = domain;
-      addrs[i].sin_port = htons(port);
-      addrs[i].sin_addr.s_addr = inet_addr(StringValueCStr(v_address));
-#ifdef BSD
-      addrs[i].sin_len = sizeof(struct sockaddr_in);
-#endif
+      for(i = 0; i < num_ip; i++){
+        v_address = RARRAY_AREF(v_addresses, i);
+        parse_ip_address_v6(StringValueCStr(v_address), port, &addrs6[i]);
+      }
+      num_bytes = (ssize_t)sctp_sys_sendv(
+        fileno,
+        iov,
+        size,
+        (struct sockaddr*)addrs6,
+        num_ip,
+        &spa,
+        sizeof(spa),
+        SCTP_SENDV_SPA,
+        0
+      );
     }
-  }
+    else{
+      struct sockaddr_in* addrs = (struct sockaddr_in*)alloca(num_ip * sizeof(struct sockaddr_in));
+      bzero(addrs, num_ip * sizeof(struct sockaddr_in));
-  for(i = 0; i < size; i++){
-    v_msg = RARRAY_PTR(v_message)[i];
-    iov[i].iov_base = StringValueCStr(v_msg);
-    iov[i].iov_len = RSTRING_LEN(v_msg);
-  }
+      for(i = 0; i < num_ip; i++){
+        v_address = RARRAY_AREF(v_addresses, i);
+        parse_ip_address_v4(StringValueCStr(v_address), port, &addrs[i]);
+      }
-  num_bytes = (ssize_t)sctp_sendv(
-    fileno,
-    iov,
-    size,
-    (struct sockaddr*)addrs,
-    num_ip,
-    &spa,
-    sizeof(spa),
-    SCTP_SENDV_SPA,
-    0
-  );
+      num_bytes = (ssize_t)sctp_sys_sendv(
+        fileno,
+        iov,
+        size,
+        (struct sockaddr*)addrs,
+        num_ip,
+        &spa,
+        sizeof(spa),
+        SCTP_SENDV_SPA,
+        0
+      );
+    }
+  }
+  else{
+    num_bytes = (ssize_t)sctp_sys_sendv(
+      fileno,
+      iov,
+      size,
+      NULL,
+      0,
+      &spa,
+      sizeof(spa),
+      SCTP_SENDV_SPA,
+      0
+    );
+  }
   if(num_bytes < 0)
     rb_raise(rb_eSystemCallError, "sctp_sendv: %s", strerror(errno));
@@ -926,6 +1153,80 @@ static VALUE rsctp_sendv(VALUE self, VALUE v_options){
 }
 #endif
+/*
+ * GVL-release helpers for blocking receive calls.
+ *
+ * usrsctp_recvv blocks on internal userspace locks, not real system calls,
+ * so Ruby's signal-handling thread never gets a chance to run.  By releasing
+ * the GVL around the blocking call, other Ruby threads (including the signal
+ * thread) can execute.  The UBF (unblock function) is invoked by Ruby when
+ * it needs to interrupt the blocking call (e.g. Ctrl-C).
+ *
+ * For native SCTP we use RUBY_UBF_IO which sends a signal that interrupts
+ * the real recvmsg() syscall.  For usrsctp we shut down the read side of
+ * the socket, which causes usrsctp_recvv to return with an error.
+ */
+/* --- recvmsg (sctp_recvmsg / usrsctp_recvv via sctp_sys_recvmsg) --- */
+struct recvmsg_nogvl_args {
+  sctp_sock_t fd;
+  void       *buf;
+  size_t      len;
+  struct sockaddr *from;
+  socklen_t       *fromlen;
+  struct sctp_sndrcvinfo *sinfo;
+  int        *msg_flags;
+  ssize_t     result;
+  int         saved_errno;
+};
+static void *recvmsg_nogvl(void *arg){
+  struct recvmsg_nogvl_args *a = (struct recvmsg_nogvl_args *)arg;
+  a->result = sctp_sys_recvmsg(a->fd, a->buf, a->len,
+      a->from, a->fromlen, a->sinfo, a->msg_flags);
+  a->saved_errno = errno;
+  return NULL;
+}
+#ifdef HAVE_USRSCTP_H
+static void recvmsg_ubf(void *arg){
+  struct recvmsg_nogvl_args *a = (struct recvmsg_nogvl_args *)arg;
+  usrsctp_shutdown(a->fd, SHUT_RD);
+}
+#endif
+/* --- recvv (sctp_recvv / usrsctp_recvv via sctp_sys_recvv) --- */
+struct recvv_nogvl_args {
+  sctp_sock_t fd;
+  const struct iovec *iov;
+  int          iovcnt;
+  struct sockaddr *from;
+  socklen_t       *fromlen;
+  void            *info;
+  socklen_t       *infolen;
+  unsigned int    *infotype;
+  int             *flags;
+  ssize_t          result;
+  int              saved_errno;
+};
+static void *recvv_nogvl(void *arg){
+  struct recvv_nogvl_args *a = (struct recvv_nogvl_args *)arg;
+  a->result = sctp_sys_recvv(a->fd, a->iov, a->iovcnt,
+      a->from, a->fromlen, a->info, a->infolen, a->infotype, a->flags);
+  a->saved_errno = errno;
+  return NULL;
+}
+#ifdef HAVE_USRSCTP_H
+static void recvv_ubf(void *arg){
+  struct recvv_nogvl_args *a = (struct recvv_nogvl_args *)arg;
+  usrsctp_shutdown(a->fd, SHUT_RD);
+}
+#endif
 #ifdef HAVE_SCTP_RECVV
 /*
  * call-seq:
@@ -957,7 +1258,8 @@ static VALUE rsctp_sendv(VALUE self, VALUE v_options){
  */
 static VALUE rsctp_recvv(int argc, VALUE* argv, VALUE self){
   VALUE v_flags, v_buffer_size;
-  int fileno, flags, on, buffer_size;
+  sctp_sock_t fileno;
+  int flags, on, buffer_size;
   ssize_t bytes;
   uint infotype;
   socklen_t infolen;
@@ -970,7 +1272,9 @@ static VALUE rsctp_recvv(int argc, VALUE* argv, VALUE self){
   rb_scan_args(argc, argv, "02", &v_flags, &v_buffer_size);
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   if(NIL_P(v_flags))
     flags = 0;
@@ -995,7 +1299,7 @@ static VALUE rsctp_recvv(int argc, VALUE* argv, VALUE self){
 	iov->iov_len = buffer_size;
   on = 1;
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_RECVRCVINFO, &on, sizeof(on)) < 0){
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_RECVRCVINFO, &on, sizeof(on)) < 0){
     free(buffer);
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
   }
@@ -1003,17 +1307,27 @@ static VALUE rsctp_recvv(int argc, VALUE* argv, VALUE self){
   infolen = sizeof(struct sctp_rcvinfo);
   infotype = 0;
-  bytes = (ssize_t)sctp_recvv(
-    fileno,
-    iov,
-    1,
-    NULL,
-    NULL,
-    &info,
-    &infolen,
-    &infotype,
-    &flags
-  );
+  {
+    struct recvv_nogvl_args recv_args;
+    recv_args.fd       = fileno;
+    recv_args.iov      = iov;
+    recv_args.iovcnt   = 1;
+    recv_args.from     = NULL;
+    recv_args.fromlen  = NULL;
+    recv_args.info     = &info;
+    recv_args.infolen  = &infolen;
+    recv_args.infotype = &infotype;
+    recv_args.flags    = &flags;
+#ifdef HAVE_USRSCTP_H
+    rb_thread_call_without_gvl(recvv_nogvl, &recv_args, recvv_ubf, &recv_args);
+#else
+    rb_thread_call_without_gvl(recvv_nogvl, &recv_args, RUBY_UBF_IO, NULL);
+#endif
+    bytes = recv_args.result;
+    errno = recv_args.saved_errno;
+  }
   if(bytes < 0){
     free(buffer);
@@ -1062,7 +1376,7 @@ static VALUE rsctp_send(VALUE self, VALUE v_options){
   uint16_t stream;
   uint32_t ppid, send_flags, ctrl_flags, ttl, context;
   ssize_t num_bytes;
-  int fileno;
+  sctp_sock_t fileno;
   sctp_assoc_t assoc_id;
   struct sctp_sndrcvinfo info;
   VALUE v_msg, v_stream, v_ppid, v_context, v_send_flags, v_ctrl_flags, v_ttl, v_assoc_id;
@@ -1116,6 +1430,8 @@ static VALUE rsctp_send(VALUE self, VALUE v_options){
   else
     assoc_id = NUM2INT(v_assoc_id);
+  CHECK_SOCKET_CLOSED(self);
   info.sinfo_stream = stream;
   info.sinfo_flags = send_flags;
   info.sinfo_ppid = ppid;
@@ -1123,9 +1439,9 @@ static VALUE rsctp_send(VALUE self, VALUE v_options){
   info.sinfo_timetolive = ttl;
   info.sinfo_assoc_id = assoc_id;
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
-  num_bytes = (ssize_t)sctp_send(
+  num_bytes = (ssize_t)sctp_sys_send(
     fileno,
     StringValueCStr(v_msg),
     RSTRING_LEN(v_msg),
@@ -1176,13 +1492,11 @@ static VALUE rsctp_sendmsg(VALUE self, VALUE v_options){
   uint16_t stream;
   uint32_t ppid, flags, ttl, context;
   ssize_t num_bytes;
-  struct sockaddr_in addrs[MAX_IP_ADDRESSES];
-  int fileno, size, num_ip;
+  sctp_sock_t fileno;
+  int num_ip, domain;
   Check_Type(v_options, T_HASH);
-  bzero(&addrs, sizeof(addrs));
   v_msg       = rb_hash_aref2(v_options, "message");
   v_stream    = rb_hash_aref2(v_options, "stream");
   v_ppid      = rb_hash_aref2(v_options, "ppid");
@@ -1222,12 +1536,21 @@ static VALUE rsctp_sendmsg(VALUE self, VALUE v_options){
   else
     context = NUM2INT(v_context);
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
+  domain = NUM2INT(rb_iv_get(self, "@domain"));
   if(!NIL_P(v_addresses)){
     int i, port;
     VALUE v_address, v_port;
     Check_Type(v_addresses, T_ARRAY);
     num_ip = (int)RARRAY_LEN(v_addresses);
+    if(num_ip > MAX_IP_ADDRESSES)
+      rb_raise(rb_eArgError, "too many IP addresses, maximum is eight");
     v_port = rb_hash_aref2(v_options, "port");
     if(NIL_P(v_port))
@@ -1235,47 +1558,62 @@ static VALUE rsctp_sendmsg(VALUE self, VALUE v_options){
     else
       port = NUM2INT(v_port);
-    for(i = 0; i < num_ip; i++){
-      v_address = RARRAY_PTR(v_addresses)[i];
-      addrs[i].sin_family = NUM2INT(rb_iv_get(self, "@domain"));
-      addrs[i].sin_port = htons(port);
-      addrs[i].sin_addr.s_addr = inet_addr(StringValueCStr(v_address));
-#ifdef BSD
-      addrs[i].sin_len = sizeof(struct sockaddr_in);
-#endif
+    if(domain == AF_INET6){
+      struct sockaddr_in6 addrs6[MAX_IP_ADDRESSES];
+      bzero(&addrs6, sizeof(addrs6));
+      for(i = 0; i < num_ip; i++){
+        v_address = RARRAY_AREF(v_addresses, i);
+        parse_ip_address_v6(StringValueCStr(v_address), port, &addrs6[i]);
+      }
+      num_bytes = (ssize_t)sctp_sys_sendmsg(
+        fileno,
+        StringValueCStr(v_msg),
+        RSTRING_LEN(v_msg),
+        (struct sockaddr*)addrs6,
+        num_ip,
+        ppid,
+        flags,
+        stream,
+        ttl,
+        context
+      );
     }
+    else{
+      struct sockaddr_in addrs[MAX_IP_ADDRESSES];
-    size = sizeof(addrs);
-  }
-  else{
-    num_ip = 0;
-    size = 0;
-  }
+      bzero(&addrs, sizeof(addrs));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+      for(i = 0; i < num_ip; i++){
+        v_address = RARRAY_AREF(v_addresses, i);
+        parse_ip_address_v4(StringValueCStr(v_address), port, &addrs[i]);
+      }
-#ifdef BSD
-  if(num_ip){
-    num_bytes = (ssize_t)sctp_sendmsgx(
-      fileno,
-      StringValueCStr(v_msg),
-      RSTRING_LEN(v_msg),
-      (struct sockaddr*)addrs,
-      num_ip,
-      ppid,
-      flags,
-      stream,
-      ttl,
-      context
-    );
+      num_bytes = (ssize_t)sctp_sys_sendmsg(
+        fileno,
+        StringValueCStr(v_msg),
+        RSTRING_LEN(v_msg),
+        (struct sockaddr*)addrs,
+        num_ip,
+        ppid,
+        flags,
+        stream,
+        ttl,
+        context
+      );
+    }
   }
   else{
-    num_bytes = (ssize_t)sctp_sendmsg(
+    // No addresses - use empty addrs
+    num_ip = 0;
+    num_bytes = (ssize_t)sctp_sys_sendmsg(
       fileno,
       StringValueCStr(v_msg),
       RSTRING_LEN(v_msg),
-      (struct sockaddr*)addrs,
-      size,
+      NULL,
+      0,
       ppid,
       flags,
       stream,
@@ -1283,31 +1621,9 @@ static VALUE rsctp_sendmsg(VALUE self, VALUE v_options){
       context
     );
   }
-#else
-  num_bytes = (ssize_t)sctp_sendmsg(
-    fileno,
-    StringValueCStr(v_msg),
-    RSTRING_LEN(v_msg),
-    (struct sockaddr*)addrs,
-    size,
-    ppid,
-    flags,
-    stream,
-    ttl,
-    context
-  );
-#endif
-  if(num_bytes < 0){
-#ifdef BSD
-    if(num_ip > 0)
-      rb_raise(rb_eSystemCallError, "sctp_sendmsgx: %s", strerror(errno));
-    else
-      rb_raise(rb_eSystemCallError, "sctp_sendmsg: %s", strerror(errno));
-#else
+  if(num_bytes < 0)
     rb_raise(rb_eSystemCallError, "sctp_sendmsg: %s", strerror(errno));
-#endif
-  }
   return LONG2NUM(num_bytes);
 }
@@ -1345,7 +1661,8 @@ static VALUE rsctp_recvmsg(int argc, VALUE* argv, VALUE self){
   VALUE v_flags, v_buffer_size, v_notification, v_message;
   struct sctp_sndrcvinfo sndrcvinfo;
   struct sockaddr_in clientaddr;
-  int flags, fileno, buffer_size;
+  sctp_sock_t fileno;
+  int flags, buffer_size;
   ssize_t bytes;
   char *buffer;
   socklen_t length;
@@ -1369,22 +1686,34 @@ static VALUE rsctp_recvmsg(int argc, VALUE* argv, VALUE self){
   if(buffer == NULL)
     rb_raise(rb_eNoMemError, "failed to allocate buffer");
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   length = sizeof(struct sockaddr_in);
   bzero(buffer, buffer_size);
   bzero(&clientaddr, sizeof(clientaddr));
   bzero(&sndrcvinfo, sizeof(sndrcvinfo));
-  bytes = (ssize_t)sctp_recvmsg(
-    fileno,
-    buffer,
-    buffer_size,
-    (struct sockaddr*)&clientaddr,
-    &length,
-    &sndrcvinfo,
-    &flags
-  );
+  {
+    struct recvmsg_nogvl_args recv_args;
+    recv_args.fd       = fileno;
+    recv_args.buf      = buffer;
+    recv_args.len      = buffer_size;
+    recv_args.from     = (struct sockaddr*)&clientaddr;
+    recv_args.fromlen  = &length;
+    recv_args.sinfo    = &sndrcvinfo;
+    recv_args.msg_flags = &flags;
+#ifdef HAVE_USRSCTP_H
+    rb_thread_call_without_gvl(recvmsg_nogvl, &recv_args, recvmsg_ubf, &recv_args);
+#else
+    rb_thread_call_without_gvl(recvmsg_nogvl, &recv_args, RUBY_UBF_IO, NULL);
+#endif
+    bytes = recv_args.result;
+    errno = recv_args.saved_errno;
+  }
   if(bytes < 0){
     free(buffer);
@@ -1437,18 +1766,20 @@ static VALUE rsctp_recvmsg(int argc, VALUE* argv, VALUE self){
  * By default these values are set to zero (i.e. ignored).
  */
 static VALUE rsctp_set_initmsg(VALUE self, VALUE v_options){
-  int fileno;
+  sctp_sock_t fileno;
   struct sctp_initmsg initmsg;
   VALUE v_output, v_input, v_attempts, v_timeout;
   bzero(&initmsg, sizeof(initmsg));
+  CHECK_SOCKET_CLOSED(self);
   v_output   = rb_hash_aref2(v_options, "output_streams");
   v_input    = rb_hash_aref2(v_options, "input_streams");
   v_attempts = rb_hash_aref2(v_options, "max_attempts");
   v_timeout  = rb_hash_aref2(v_options, "timeout");
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   if(!NIL_P(v_output))
     initmsg.sinit_num_ostreams = NUM2INT(v_output);
@@ -1462,7 +1793,7 @@ static VALUE rsctp_set_initmsg(VALUE self, VALUE v_options){
   if(!NIL_P(v_timeout))
     initmsg.sinit_max_init_timeo = NUM2INT(v_timeout);
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_INITMSG, &initmsg, sizeof(initmsg)) < 0)
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_INITMSG, &initmsg, sizeof(initmsg)) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
   return self;
@@ -1507,13 +1838,15 @@ static VALUE rsctp_set_initmsg(VALUE self, VALUE v_options){
  *   socket.subscribe(:data_io => true, :shutdown => true, :send_failure => true)
  */
 static VALUE rsctp_subscribe(VALUE self, VALUE v_options){
-  int fileno;
+  sctp_sock_t fileno;
   struct sctp_event_subscribe events;
   bzero(&events, sizeof(events));
   Check_Type(v_options, T_HASH);
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   if(RTEST(rb_hash_aref2(v_options, "data_io")))
     events.sctp_data_io_event = 1;
@@ -1549,8 +1882,43 @@ static VALUE rsctp_subscribe(VALUE self, VALUE v_options){
   if(RTEST(rb_hash_aref2(v_options, "sender_dry")))
     events.sctp_sender_dry_event = 1;
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_EVENTS, &events, sizeof(events)) < 0)
+#ifdef HAVE_USRSCTP_H
+  /* usrsctp uses SCTP_EVENT + struct sctp_event for per-event subscription */
+  {
+    struct sctp_event se;
+    memset(&se, 0, sizeof(se));
+    se.se_assoc_id = 0;
+    /* data_io: enable via SCTP_RECVRCVINFO sockopt */
+    if(events.sctp_data_io_event){
+      int on = 1;
+      if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_RECVRCVINFO, &on, sizeof(on)) < 0)
+        rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
+    }
+#define SUBSCRIBE_EVENT(field, type) \
+    if(events.field){ \
+      se.se_type = (type); se.se_on = 1; \
+      if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_EVENT, &se, sizeof(se)) < 0) \
+        rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno)); \
+    }
+    SUBSCRIBE_EVENT(sctp_association_event,       SCTP_ASSOC_CHANGE)
+    SUBSCRIBE_EVENT(sctp_address_event,           SCTP_PEER_ADDR_CHANGE)
+    SUBSCRIBE_EVENT(sctp_send_failure_event,      SCTP_SEND_FAILED)
+    SUBSCRIBE_EVENT(sctp_peer_error_event,        SCTP_REMOTE_ERROR)
+    SUBSCRIBE_EVENT(sctp_shutdown_event,          SCTP_SHUTDOWN_EVENT)
+    SUBSCRIBE_EVENT(sctp_partial_delivery_event,  SCTP_PARTIAL_DELIVERY_EVENT)
+    SUBSCRIBE_EVENT(sctp_adaptation_layer_event,  SCTP_ADAPTATION_INDICATION)
+    SUBSCRIBE_EVENT(sctp_authentication_event,    SCTP_AUTHENTICATION_EVENT)
+    SUBSCRIBE_EVENT(sctp_sender_dry_event,        SCTP_SENDER_DRY_EVENT)
+#undef SUBSCRIBE_EVENT
+  }
+#else
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_EVENTS, &events, sizeof(events)) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
+#endif
   return self;
 }
@@ -1581,7 +1949,8 @@ static VALUE rsctp_subscribe(VALUE self, VALUE v_options){
  */
 static VALUE rsctp_listen(int argc, VALUE* argv, VALUE self){
   VALUE v_backlog;
-  int backlog, fileno;
+  sctp_sock_t fileno;
+  int backlog;
   rb_scan_args(argc, argv, "01", &v_backlog);
@@ -1593,9 +1962,11 @@ static VALUE rsctp_listen(int argc, VALUE* argv, VALUE self){
   if(backlog > SOMAXCONN)
     rb_raise(rb_eArgError, "backlog value exceeds maximum value of: %i", SOMAXCONN);
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
-  if(listen(fileno, backlog) < 0)
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
+  if(sctp_sys_listen(fileno, backlog) < 0)
     rb_raise(rb_eSystemCallError, "listen: %s", strerror(errno));
   return self;
@@ -1620,18 +1991,20 @@ static VALUE rsctp_listen(int argc, VALUE* argv, VALUE self){
  *   end
  */
 static VALUE rsctp_peeloff(VALUE self, VALUE v_assoc_id){
-  int fileno, assoc_fileno;
+  sctp_sock_t fileno, assoc_fileno;
   sctp_assoc_t assoc_id;
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(v_assoc_id);
-  assoc_fileno = sctp_peeloff(fileno, assoc_id);
+  assoc_fileno = sctp_sys_peeloff(fileno, assoc_id);
-  if(assoc_fileno < 0)
+  if(SCTP_FD_INVALID(assoc_fileno))
     rb_raise(rb_eSystemCallError, "sctp_peeloff: %s", strerror(errno));
-  return INT2NUM(assoc_fileno);
+  return SCTP_FD_TO_NUM(assoc_fileno);
 }
 /*
@@ -1653,32 +2026,60 @@ static VALUE rsctp_peeloff(VALUE self, VALUE v_assoc_id){
  *  * association_id
  */
 static VALUE rsctp_get_default_send_params(VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   sctp_assoc_t assoc_id;
-  struct sctp_sndrcvinfo sndrcv;
-  bzero(&sndrcv, sizeof(sndrcv));
+  CHECK_SOCKET_CLOSED(self);
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
-  size = sizeof(struct sctp_sndrcvinfo);
-  if(sctp_opt_info(fileno, assoc_id, SCTP_DEFAULT_SEND_PARAM, (void*)&sndrcv, &size) < 0)
-    rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
-  return rb_struct_new(
-    v_sctp_default_send_params_struct,
-    INT2NUM(sndrcv.sinfo_stream),
-    INT2NUM(sndrcv.sinfo_ssn),
-    INT2NUM(sndrcv.sinfo_flags),
-    INT2NUM(sndrcv.sinfo_ppid),
-    INT2NUM(sndrcv.sinfo_context),
-    INT2NUM(sndrcv.sinfo_timetolive),
-    INT2NUM(sndrcv.sinfo_tsn),
-    INT2NUM(sndrcv.sinfo_cumtsn),
-    INT2NUM(sndrcv.sinfo_assoc_id)
-  );
+#ifdef HAVE_USRSCTP_H
+  {
+    struct sctp_sndinfo sndinfo;
+    bzero(&sndinfo, sizeof(sndinfo));
+    size = sizeof(sndinfo);
+    if(sctp_sys_opt_info(fileno, assoc_id, SCTP_DEFAULT_SNDINFO, (void*)&sndinfo, &size) < 0)
+      rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
+    return rb_struct_new(
+      v_sctp_default_send_params_struct,
+      INT2NUM(sndinfo.snd_sid),
+      INT2NUM(0),  /* ssn - not available via sndinfo */
+      INT2NUM(sndinfo.snd_flags),
+      INT2NUM(sndinfo.snd_ppid),
+      INT2NUM(sndinfo.snd_context),
+      INT2NUM(0),  /* timetolive - not available via sndinfo */
+      INT2NUM(0),  /* tsn - not available via sndinfo */
+      INT2NUM(0),  /* cumtsn - not available via sndinfo */
+      INT2NUM(sndinfo.snd_assoc_id)
+    );
+  }
+#else
+  {
+    struct sctp_sndrcvinfo sndrcv;
+    bzero(&sndrcv, sizeof(sndrcv));
+    size = sizeof(struct sctp_sndrcvinfo);
+    if(sctp_sys_opt_info(fileno, assoc_id, SCTP_DEFAULT_SEND_PARAM, (void*)&sndrcv, &size) < 0)
+      rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
+    return rb_struct_new(
+      v_sctp_default_send_params_struct,
+      INT2NUM(sndrcv.sinfo_stream),
+      INT2NUM(sndrcv.sinfo_ssn),
+      INT2NUM(sndrcv.sinfo_flags),
+      INT2NUM(sndrcv.sinfo_ppid),
+      INT2NUM(sndrcv.sinfo_context),
+      INT2NUM(sndrcv.sinfo_timetolive),
+      INT2NUM(sndrcv.sinfo_tsn),
+      INT2NUM(sndrcv.sinfo_cumtsn),
+      INT2NUM(sndrcv.sinfo_assoc_id)
+    );
+  }
+#endif
 }
 /*
@@ -1698,18 +2099,20 @@ static VALUE rsctp_get_default_send_params(VALUE self){
  *  All values that refer to time values are measured in milliseconds.
  */
 static VALUE rsctp_get_association_info(VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   sctp_assoc_t assoc_id;
   struct sctp_assocparams assoc;
   bzero(&assoc, sizeof(assoc));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_assocparams);
-  if(sctp_opt_info(fileno, assoc_id, SCTP_ASSOCINFO, (void*)&assoc, &size) < 0)
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_ASSOCINFO, (void*)&assoc, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
   return rb_struct_new(
@@ -1741,13 +2144,15 @@ static VALUE rsctp_get_association_info(VALUE self){
  */
 static VALUE rsctp_set_association_info(VALUE self, VALUE v_options){
   VALUE v_assoc_id, v_max_rxt, v_nbr_peer, v_peer_rw, v_local_rw, v_cookie;
-  int fileno;
+  sctp_sock_t fileno;
   sctp_assoc_t assoc_id;
   struct sctp_assocparams assoc;
   bzero(&assoc, sizeof(assoc));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   v_assoc_id = rb_hash_aref2(v_options, "association_id");
   v_max_rxt  = rb_hash_aref2(v_options, "max_retransmission_count");
@@ -1778,7 +2183,7 @@ static VALUE rsctp_set_association_info(VALUE self, VALUE v_options){
   if(!NIL_P(v_cookie))
     assoc.sasoc_cookie_life = NUM2INT(v_cookie);
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_ASSOCINFO, &assoc, sizeof(assoc)) < 0)
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_ASSOCINFO, &assoc, sizeof(assoc)) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
   return rb_struct_new(
@@ -1808,10 +2213,13 @@ static VALUE rsctp_set_association_info(VALUE self, VALUE v_options){
  *  The default is SHUT_RDWR.
  */
 static VALUE rsctp_shutdown(int argc, VALUE* argv, VALUE self){
-  int how, fileno;
+  sctp_sock_t fileno;
+  int how;
   VALUE v_how;
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   rb_scan_args(argc, argv, "01", &v_how);
@@ -1823,7 +2231,7 @@ static VALUE rsctp_shutdown(int argc, VALUE* argv, VALUE self){
     how = NUM2INT(v_how);
   }
-  if(shutdown(fileno, how) < 0)
+  if(sctp_sys_shutdown(fileno, how) < 0)
     rb_raise(rb_eSystemCallError, "shutdown: %s", strerror(errno));
   return self;
@@ -1843,18 +2251,20 @@ static VALUE rsctp_shutdown(int argc, VALUE* argv, VALUE self){
  *  * min
  */
 static VALUE rsctp_get_retransmission_info(VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   sctp_assoc_t assoc_id;
   struct sctp_rtoinfo rto;
   bzero(&rto, sizeof(rto));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_rtoinfo);
-  if(sctp_opt_info(fileno, assoc_id, SCTP_RTOINFO, (void*)&rto, &size) < 0)
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_RTOINFO, (void*)&rto, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
   return rb_struct_new(
@@ -1883,13 +2293,15 @@ static VALUE rsctp_get_retransmission_info(VALUE self){
  */
 static VALUE rsctp_set_retransmission_info(VALUE self, VALUE v_options){
   VALUE v_assoc_id, v_initial, v_max, v_min;
-  int fileno;
+  sctp_sock_t fileno;
   sctp_assoc_t assoc_id;
   struct sctp_rtoinfo rto;
   bzero(&rto, sizeof(rto));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   v_assoc_id = rb_hash_aref2(v_options, "association_id");
   v_initial = rb_hash_aref2(v_options, "initial");
@@ -1912,7 +2324,7 @@ static VALUE rsctp_set_retransmission_info(VALUE self, VALUE v_options){
   if(!NIL_P(v_min))
     rto.srto_min = NUM2INT(v_min);
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_RTOINFO, &rto, sizeof(rto)) < 0)
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_RTOINFO, &rto, sizeof(rto)) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
   return rb_struct_new(
@@ -1949,20 +2361,22 @@ static VALUE rsctp_set_retransmission_info(VALUE self, VALUE v_options){
  *  * primary (IP)
  */
 static VALUE rsctp_get_status(VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   sctp_assoc_t assoc_id;
   struct sctp_status status;
   struct sctp_paddrinfo* spinfo;
-  char tmpname[INET_ADDRSTRLEN];
+  char tmpname[INET6_ADDRSTRLEN];
   bzero(&status, sizeof(status));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_status);
-  if(sctp_opt_info(fileno, assoc_id, SCTP_STATUS, (void*)&status, &size) < 0)
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_STATUS, (void*)&status, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
   spinfo = &status.sstat_primary;
@@ -2015,19 +2429,64 @@ static VALUE rsctp_get_status(VALUE self){
  *  * send_failure_event
  */
 static VALUE rsctp_get_subscriptions(VALUE self){
-  int fileno;
-  socklen_t size;
+  sctp_sock_t fileno;
   sctp_assoc_t assoc_id;
   struct sctp_event_subscribe events;
+#ifndef HAVE_USRSCTP_H
+  socklen_t size;
+#endif
   bzero(&events, sizeof(events));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
-  size = sizeof(struct sctp_event_subscribe);
-  if(sctp_opt_info(fileno, assoc_id, SCTP_EVENTS, (void*)&events, &size) < 0)
+#ifdef HAVE_USRSCTP_H
+  /* usrsctp uses SCTP_EVENT + struct sctp_event for per-event query */
+  {
+    struct sctp_event se;
+    socklen_t se_size;
+    memset(&events, 0, sizeof(events));
+    /* data_io: check SCTP_RECVRCVINFO sockopt */
+    {
+      int on = 0;
+      socklen_t on_size = sizeof(on);
+      if(sctp_sys_getsockopt(fileno, IPPROTO_SCTP, SCTP_RECVRCVINFO, &on, &on_size) == 0 && on)
+        events.sctp_data_io_event = 1;
+    }
+#define QUERY_EVENT(field, type) \
+    memset(&se, 0, sizeof(se)); \
+    se.se_assoc_id = assoc_id; \
+    se.se_type = (type); \
+    se_size = sizeof(se); \
+    if(sctp_sys_getsockopt(fileno, IPPROTO_SCTP, SCTP_EVENT, &se, &se_size) == 0 && se.se_on) \
+      events.field = 1;
+    QUERY_EVENT(sctp_association_event,       SCTP_ASSOC_CHANGE)
+    QUERY_EVENT(sctp_address_event,           SCTP_PEER_ADDR_CHANGE)
+    QUERY_EVENT(sctp_send_failure_event,      SCTP_SEND_FAILED)
+    QUERY_EVENT(sctp_peer_error_event,        SCTP_REMOTE_ERROR)
+    QUERY_EVENT(sctp_shutdown_event,          SCTP_SHUTDOWN_EVENT)
+    QUERY_EVENT(sctp_partial_delivery_event,  SCTP_PARTIAL_DELIVERY_EVENT)
+    QUERY_EVENT(sctp_adaptation_layer_event,  SCTP_ADAPTATION_INDICATION)
+    QUERY_EVENT(sctp_authentication_event,    SCTP_AUTHENTICATION_EVENT)
+    QUERY_EVENT(sctp_sender_dry_event,        SCTP_SENDER_DRY_EVENT)
+#ifdef HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE_SCTP_STREAM_RESET_EVENT
+    QUERY_EVENT(sctp_stream_reset_event,      SCTP_STREAM_RESET_EVENT)
+#endif
+#undef QUERY_EVENT
+  }
+#else
+  size = sizeof(struct sctp_event_subscribe);
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_EVENTS, (void*)&events, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
+#endif
   return rb_struct_new(
     v_sctp_event_subscribe_struct,
@@ -2078,7 +2537,7 @@ static VALUE rsctp_get_subscriptions(VALUE self){
  * * ipv6_flowlabel
  */
 static VALUE rsctp_get_peer_address_params(VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   char str[IP_BUFFER_SIZE];
   socklen_t size;
   sctp_assoc_t assoc_id;
@@ -2087,14 +2546,27 @@ static VALUE rsctp_get_peer_address_params(VALUE self){
   bzero(&paddr, sizeof(paddr));
   bzero(&str, sizeof(str));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_paddrparams);
-  if(sctp_opt_info(fileno, assoc_id, SCTP_PEER_ADDR_PARAMS, (void*)&paddr, &size) < 0)
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_PEER_ADDR_PARAMS, (void*)&paddr, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
-  inet_ntop(AF_INET, ((struct sockaddr_in*)&paddr.spp_address), str, sizeof(str));
+  {
+    struct sockaddr* sa = (struct sockaddr*)&paddr.spp_address;
+    if(sa->sa_family == AF_INET6){
+      struct sockaddr_in6* sin6 = (struct sockaddr_in6*)sa;
+      inet_ntop(AF_INET6, &sin6->sin6_addr, str, sizeof(str));
+    }
+    else{
+      struct sockaddr_in* sin = (struct sockaddr_in*)sa;
+      inet_ntop(AF_INET, &sin->sin_addr, str, sizeof(str));
+    }
+  }
   return rb_struct_new(
     v_sctp_peer_addr_params_struct,
@@ -2127,18 +2599,20 @@ static VALUE rsctp_get_peer_address_params(VALUE self){
  *     (in milliseconds) to use in attempting an INIT.
  */
 static VALUE rsctp_get_init_msg(VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   sctp_assoc_t assoc_id;
   struct sctp_initmsg initmsg;
   bzero(&initmsg, sizeof(initmsg));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_initmsg);
-  if(sctp_opt_info(fileno, assoc_id, SCTP_INITMSG, (void*)&initmsg, &size) < 0)
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_INITMSG, (void*)&initmsg, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
   return rb_struct_new(
@@ -2157,16 +2631,18 @@ static VALUE rsctp_get_init_msg(VALUE self){
  * Returns whether or not the nodelay option has been set.
  */
 static VALUE rsctp_get_nodelay(VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   sctp_assoc_t assoc_id;
   int value;
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(int);
-  if(sctp_opt_info(fileno, assoc_id, SCTP_NODELAY, (void*)&value, &size) < 0)
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_NODELAY, (void*)&value, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
   if(value)
@@ -2184,11 +2660,13 @@ static VALUE rsctp_get_nodelay(VALUE self){
  * cost of more packets in the network.
  */
 static VALUE rsctp_set_nodelay(VALUE self, VALUE v_bool){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   int value;
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   size = sizeof(int);
   if(NIL_P(v_bool) || v_bool == Qfalse)
@@ -2196,7 +2674,7 @@ static VALUE rsctp_set_nodelay(VALUE self, VALUE v_bool){
   else
     value = 1;
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_NODELAY, &value, size) < 0)
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_NODELAY, &value, size) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
   if(value)
@@ -2216,12 +2694,14 @@ static VALUE rsctp_set_nodelay(VALUE self, VALUE v_bool){
  * instead a error will be indicated to the user.
  */
 static VALUE rsctp_disable_fragments(VALUE self, VALUE v_bool){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   sctp_assoc_t assoc_id;
   int value;
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(int);
@@ -2230,7 +2710,7 @@ static VALUE rsctp_disable_fragments(VALUE self, VALUE v_bool){
   else
     value = 1;
-  if(sctp_opt_info(fileno, assoc_id, SCTP_DISABLE_FRAGMENTS, (void*)&value, &size) < 0)
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_DISABLE_FRAGMENTS, (void*)&value, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
   if(value)
@@ -2247,16 +2727,18 @@ static VALUE rsctp_disable_fragments(VALUE self, VALUE v_bool){
  * shut down.
  */
 static VALUE rsctp_get_autoclose(VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   sctp_assoc_t assoc_id;
   int value;
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(int);
-  if(sctp_opt_info(fileno, assoc_id, SCTP_AUTOCLOSE, (void*)&value, &size) < 0)
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_AUTOCLOSE, (void*)&value, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
   return INT2NUM(value);
@@ -2285,13 +2767,15 @@ static VALUE rsctp_get_autoclose(VALUE self){
  * This socket option is applicable to the one-to-many style socket only.
  */
 static VALUE rsctp_set_autoclose(VALUE self, VALUE v_seconds){
-  int fileno;
+  sctp_sock_t fileno;
   int value;
+  CHECK_SOCKET_CLOSED(self);
   value = NUM2INT(v_seconds);
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_AUTOCLOSE, &value, sizeof(value)) < 0)
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_AUTOCLOSE, &value, sizeof(value)) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
   return INT2NUM(value);
@@ -2304,7 +2788,7 @@ static VALUE rsctp_set_autoclose(VALUE self, VALUE v_seconds){
  * Enables auth for future associations.
  */
 static VALUE rsctp_enable_auth_support(int argc, VALUE* argv, VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   sctp_assoc_t assoc_id;
   struct sctp_assoc_value assoc_value;
@@ -2314,7 +2798,7 @@ static VALUE rsctp_enable_auth_support(int argc, VALUE* argv, VALUE self){
   CHECK_SOCKET_CLOSED(self);
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   size = sizeof(struct sctp_assoc_value);
   if(NIL_P(v_assoc_id))
@@ -2325,7 +2809,7 @@ static VALUE rsctp_enable_auth_support(int argc, VALUE* argv, VALUE self){
   assoc_value.assoc_id = assoc_id;
   assoc_value.assoc_value = 1;
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_AUTH_SUPPORTED, (void*)&assoc_value, size) < 0)
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_AUTH_SUPPORTED, (void*)&assoc_value, size) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
   return self;
@@ -2339,7 +2823,7 @@ static VALUE rsctp_enable_auth_support(int argc, VALUE* argv, VALUE self){
  * Returns true if auth support is enabled, false otherwise.
  */
 static VALUE rsctp_get_auth_support(int argc, VALUE* argv, VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   sctp_assoc_t assoc_id;
   struct sctp_assoc_value assoc_value;
@@ -2349,7 +2833,7 @@ static VALUE rsctp_get_auth_support(int argc, VALUE* argv, VALUE self){
   CHECK_SOCKET_CLOSED(self);
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   size = sizeof(struct sctp_assoc_value);
   if(NIL_P(v_assoc_id))
@@ -2359,7 +2843,7 @@ static VALUE rsctp_get_auth_support(int argc, VALUE* argv, VALUE self){
   assoc_value.assoc_id = assoc_id;
-  if(sctp_opt_info(fileno, assoc_id, SCTP_AUTH_SUPPORTED, (void*)&assoc_value, &size) < 0)
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_AUTH_SUPPORTED, (void*)&assoc_value, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
   if(assoc_value.assoc_value)
@@ -2395,7 +2879,7 @@ static VALUE rsctp_get_auth_support(int argc, VALUE* argv, VALUE self){
  *  otherwise this will set a key on the endpoint.
 */
 static VALUE rsctp_set_shared_key(int argc, VALUE* argv, VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   size_t len;
   char* key;
   uint keynum;
@@ -2408,7 +2892,7 @@ static VALUE rsctp_set_shared_key(int argc, VALUE* argv, VALUE self){
   CHECK_SOCKET_CLOSED(self);
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   key = StringValuePtr(v_key);
   len = RSTRING_LEN(v_key); // Use Ruby's string length, not strlen
@@ -2423,7 +2907,7 @@ static VALUE rsctp_set_shared_key(int argc, VALUE* argv, VALUE self){
     keynum = NUM2INT(v_keynumber);
   // Allocate the structure with space for the key
-  size = sizeof(struct sctp_authkey) + len;
+  size = (socklen_t)(sizeof(struct sctp_authkey) + len);
   auth_key = malloc(size);
   if (auth_key == NULL)
@@ -2434,7 +2918,7 @@ static VALUE rsctp_set_shared_key(int argc, VALUE* argv, VALUE self){
   auth_key->sca_keylength = len;
   memcpy(auth_key->sca_key, key, len);
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_AUTH_KEY, (void*)auth_key, size) < 0) {
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_AUTH_KEY, (void*)auth_key, size) < 0) {
     int err = errno;
     free(auth_key);
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(err));
@@ -2451,7 +2935,7 @@ static VALUE rsctp_set_shared_key(int argc, VALUE* argv, VALUE self){
  * Gets the active shared key to be used to build the association shared key.
  */
 static VALUE rsctp_get_active_shared_key(int argc, VALUE* argv, VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   struct sctp_authkeyid authkey;
   sctp_assoc_t assoc_id;
@@ -2460,6 +2944,8 @@ static VALUE rsctp_get_active_shared_key(int argc, VALUE* argv, VALUE self){
   rb_scan_args(argc, argv, "11", &v_keynum, &v_assoc_id);
+  CHECK_SOCKET_CLOSED(self);
   bzero(&authkey, sizeof(authkey));
   // Cast it later, we want to force a validity check.
@@ -2468,7 +2954,7 @@ static VALUE rsctp_get_active_shared_key(int argc, VALUE* argv, VALUE self){
   if(keynum < 0)
     rb_raise(rb_eArgError, "invalid keynum value");
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   if(NIL_P(v_assoc_id))
     assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
@@ -2480,7 +2966,7 @@ static VALUE rsctp_get_active_shared_key(int argc, VALUE* argv, VALUE self){
   size = sizeof(struct sctp_authkeyid);
-  if(sctp_opt_info(fileno, assoc_id, SCTP_AUTH_ACTIVE_KEY, (void*)&authkey, &size) < 0)
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_AUTH_ACTIVE_KEY, (void*)&authkey, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
   return INT2NUM(authkey.scact_keynumber);
@@ -2509,7 +2995,7 @@ static VALUE rsctp_get_active_shared_key(int argc, VALUE* argv, VALUE self){
  * By default, the association_id is the result of SCTP::Socket#association_id.
  */
 static VALUE rsctp_set_active_shared_key(int argc, VALUE* argv, VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   struct sctp_authkeyid authkey;
   sctp_assoc_t assoc_id;
@@ -2518,12 +3004,14 @@ static VALUE rsctp_set_active_shared_key(int argc, VALUE* argv, VALUE self){
   rb_scan_args(argc, argv, "11", &v_keynum, &v_assoc_id);
+  CHECK_SOCKET_CLOSED(self);
   keynum = FIX2INT(v_keynum);
   if(keynum < 0)
     rb_raise(rb_eArgError, "invalid keynum value");
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   if(NIL_P(v_assoc_id))
     assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
@@ -2534,7 +3022,7 @@ static VALUE rsctp_set_active_shared_key(int argc, VALUE* argv, VALUE self){
   authkey.scact_keynumber = (uint)keynum;
   size = sizeof(struct sctp_authkeyid);
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, (void*)&authkey, size) < 0)
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_AUTH_ACTIVE_KEY, (void*)&authkey, size) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
   return self;
@@ -2566,7 +3054,7 @@ static VALUE rsctp_set_active_shared_key(int argc, VALUE* argv, VALUE self){
  * otherwise this will delete the key from the endpoint.
  */
 static VALUE rsctp_delete_shared_key(int argc, VALUE* argv, VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   struct sctp_authkeyid authkey;
   sctp_assoc_t assoc_id;
@@ -2579,7 +3067,7 @@ static VALUE rsctp_delete_shared_key(int argc, VALUE* argv, VALUE self){
   bzero(&authkey, sizeof(authkey));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   keynum = NUM2UINT(v_keynum);
   if(NIL_P(v_assoc_id))
@@ -2592,7 +3080,7 @@ static VALUE rsctp_delete_shared_key(int argc, VALUE* argv, VALUE self){
   size = sizeof(struct sctp_authkeyid);
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_AUTH_DELETE_KEY, (void*)&authkey, size) < 0)
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_AUTH_DELETE_KEY, (void*)&authkey, size) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
   return INT2NUM(authkey.scact_keynumber);
@@ -2612,15 +3100,18 @@ static VALUE rsctp_delete_shared_key(int argc, VALUE* argv, VALUE self){
  * a no-op.
  */
 static VALUE rsctp_map_ipv4(VALUE self, VALUE v_bool){
-  int fileno, boolean;
+  sctp_sock_t fileno;
+  int boolean;
+  CHECK_SOCKET_CLOSED(self);
   boolean = 0;
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   if(v_bool == Qtrue)
     boolean = 1;
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_I_WANT_MAPPED_V4_ADDR, (void*)&boolean, sizeof(boolean)) < 0)
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_I_WANT_MAPPED_V4_ADDR, (void*)&boolean, sizeof(boolean)) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
   return v_bool;
@@ -2634,18 +3125,18 @@ static VALUE rsctp_map_ipv4(VALUE self, VALUE v_bool){
  * for PF_INET6 sockets. Returns true if mapping is enabled, false otherwise.
  */
 static VALUE rsctp_get_map_ipv4(VALUE self){
-  int fileno;
+  sctp_sock_t fileno;
   socklen_t size;
   sctp_assoc_t assoc_id;
   int value;
   CHECK_SOCKET_CLOSED(self);
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(int);
-  if(sctp_opt_info(fileno, assoc_id, SCTP_I_WANT_MAPPED_V4_ADDR, (void*)&value, &size) < 0)
+  if(sctp_sys_opt_info(fileno, assoc_id, SCTP_I_WANT_MAPPED_V4_ADDR, (void*)&value, &size) < 0)
     rb_raise(rb_eSystemCallError, "sctp_opt_info: %s", strerror(errno));
   if(value)
@@ -2679,7 +3170,7 @@ static VALUE rsctp_get_map_ipv4(VALUE self){
  */
 static VALUE rsctp_set_default_send_params(VALUE self, VALUE v_options){
   VALUE v_stream, v_ssn, v_flags, v_ppid, v_context, v_ttl, v_tsn, v_cumtsn, v_assoc_id;
-  int fileno;
+  sctp_sock_t fileno;
   sctp_assoc_t assoc_id;
   struct sctp_sndrcvinfo sndrcv;
@@ -2688,7 +3179,9 @@ static VALUE rsctp_set_default_send_params(VALUE self, VALUE v_options){
   bzero(&sndrcv, sizeof(sndrcv));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
   v_stream = rb_hash_aref2(v_options, "stream");
   v_ssn = rb_hash_aref2(v_options, "ssn");
@@ -2730,8 +3223,23 @@ static VALUE rsctp_set_default_send_params(VALUE self, VALUE v_options){
   if(!NIL_P(v_cumtsn))
     sndrcv.sinfo_cumtsn = NUM2INT(v_cumtsn);
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_DEFAULT_SEND_PARAM, &sndrcv, sizeof(sndrcv)) < 0)
+#ifdef HAVE_USRSCTP_H
+  {
+    struct sctp_sndinfo sndinfo;
+    bzero(&sndinfo, sizeof(sndinfo));
+    sndinfo.snd_sid = sndrcv.sinfo_stream;
+    sndinfo.snd_flags = sndrcv.sinfo_flags;
+    sndinfo.snd_ppid = sndrcv.sinfo_ppid;
+    sndinfo.snd_context = sndrcv.sinfo_context;
+    sndinfo.snd_assoc_id = sndrcv.sinfo_assoc_id;
+    if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_DEFAULT_SNDINFO, &sndinfo, sizeof(sndinfo)) < 0)
+      rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
+  }
+#else
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_DEFAULT_SEND_PARAM, &sndrcv, sizeof(sndrcv)) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
+#endif
   return rb_struct_new(
     v_sctp_default_send_params_struct,
@@ -2771,17 +3279,20 @@ static VALUE rsctp_set_default_send_params(VALUE self, VALUE v_options){
  */
 static VALUE rsctp_set_peer_address_params(VALUE self, VALUE v_options){
   VALUE v_assoc_id, v_address, v_hbinterval, v_pathmaxrxt, v_pathmtu, v_flags, v_ipv6_flowlabel;
-  int fileno;
+  sctp_sock_t fileno;
+  int domain;
   sctp_assoc_t assoc_id;
   struct sctp_paddrparams paddr;
-  struct sockaddr_in* sin;
   if(!RB_TYPE_P(v_options, T_HASH))
     rb_raise(rb_eTypeError, "options must be a hash");
   bzero(&paddr, sizeof(paddr));
-  fileno = NUM2INT(rb_iv_get(self, "@fileno"));
+  CHECK_SOCKET_CLOSED(self);
+  fileno = NUM_TO_SCTP_FD(rb_iv_get(self, "@fileno"));
+  domain = NUM2INT(rb_iv_get(self, "@domain"));
   v_assoc_id = rb_hash_aref2(v_options, "association_id");
   v_address = rb_hash_aref2(v_options, "address");
@@ -2797,12 +3308,28 @@ static VALUE rsctp_set_peer_address_params(VALUE self, VALUE v_options){
   assoc_id = NUM2INT(v_assoc_id);
   paddr.spp_assoc_id = assoc_id;
-  // If address is provided, set up the sockaddr structure
+  // If address is provided, set up the sockaddr structure based on domain
   if(!NIL_P(v_address)){
-    sin = (struct sockaddr_in*)&paddr.spp_address;
-    sin->sin_family = AF_INET;
-    if(inet_pton(AF_INET, StringValueCStr(v_address), &sin->sin_addr) <= 0)
-      rb_raise(rb_eArgError, "invalid IP address");
+    const char* addr_str = StringValueCStr(v_address);
+    if(domain == AF_INET6){
+      struct sockaddr_in6* sin6 = (struct sockaddr_in6*)&paddr.spp_address;
+      sin6->sin6_family = AF_INET6;
+      if(inet_pton(AF_INET6, addr_str, &sin6->sin6_addr) <= 0)
+        rb_raise(rb_eArgError, "invalid IPv6 address: %s", addr_str);
+#ifdef BSD
+      sin6->sin6_len = sizeof(struct sockaddr_in6);
+#endif
+    }
+    else{
+      struct sockaddr_in* sin = (struct sockaddr_in*)&paddr.spp_address;
+      sin->sin_family = AF_INET;
+      if(inet_pton(AF_INET, addr_str, &sin->sin_addr) <= 0)
+        rb_raise(rb_eArgError, "invalid IPv4 address: %s", addr_str);
+#ifdef BSD
+      sin->sin_len = sizeof(struct sockaddr_in);
+#endif
+    }
   }
   if(!NIL_P(v_hbinterval))
@@ -2820,7 +3347,7 @@ static VALUE rsctp_set_peer_address_params(VALUE self, VALUE v_options){
   if(!NIL_P(v_ipv6_flowlabel))
     paddr.spp_ipv6_flowlabel = NUM2INT(v_ipv6_flowlabel);
-  if(setsockopt(fileno, IPPROTO_SCTP, SCTP_PEER_ADDR_PARAMS, &paddr, sizeof(paddr)) < 0)
+  if(sctp_sys_setsockopt(fileno, IPPROTO_SCTP, SCTP_PEER_ADDR_PARAMS, &paddr, sizeof(paddr)) < 0)
     rb_raise(rb_eSystemCallError, "setsockopt: %s", strerror(errno));
   return rb_struct_new(
@@ -2920,7 +3447,7 @@ void Init_socket(void){
   v_sctp_receive_info_struct = rb_struct_define(
     "ReceiveInfo", "message", "sid", "ssn", "flags", "ppid", "tsn",
-    "cumtsn", "context", "assocation_id", NULL
+    "cumtsn", "context", "association_id", NULL
   );
   v_sctp_peer_addr_params_struct = rb_struct_define(
@@ -2993,8 +3520,8 @@ void Init_socket(void){
   rb_define_attr(cSocket, "association_id", 1, 1);
   rb_define_attr(cSocket, "port", 1, 1);
-  /* 0.2.0: The version of this library */
-  rb_define_const(cSocket, "VERSION", rb_str_new2("0.2.1"));
+  /* 0.3.0: The version of this library */
+  rb_define_const(cSocket, "VERSION", rb_str_new2("0.3.0"));
   /* send flags */