sctp-socket 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d41294806b8cc4ed6b74131f494a4a4309cac02ba490e3bbe20ef0f2cb89a09e
-  data.tar.gz: 3a8d7207263715d37f7a42986ee734dd225af23e3e071daefcb35f0c53786cfe
+  metadata.gz: 8f9f0ecd09038bfc074d38f36b387c26a5f203c3d57ae5d6ad7f5b2c085e945f
+  data.tar.gz: 563a9e79224c46e71872de30a59a17ece441113dcab2cc8d4e153a7a89313b97
 SHA512:
-  metadata.gz: 60fa99a73f494affaf1b6f68ce35178e64642e4c26feff61f349db97bec4f0240c268ef406150e0bc78fb78a6634ec7d5876490b722d84aef858f9e030085a0f
-  data.tar.gz: '0925c76359dd0f1168c08556673a4f4d5db03bc891699042458e69f10509baf242ed95084ba97722f6a4ba24e5f88e43be39c1f9bb21a22fd6fbf8801f3446b9'
+  metadata.gz: 714abd0b5f6ecb95778ddf81d03dbfc6d23f1bfcfdebe62d4bed25cf3aaecc869e1235f6e5c04a5de123b0022ed9b6bdcb39d13a340d0aae3f3e50340c10ad26
+  data.tar.gz: c88bcdc5f0f456e4ef3a75f9c06f52ba60600959bfe7d654d398dfe0a3c8f9a19d76ee4d577c119a0b367c525b6395172a86ff6e6259fff8e697b345e122f616

data/CHANGES.md

@@ -1,3 +1,8 @@
+## 0.2.2 - 7-Jan-2026
+* Added IPv6 support.
+* Some internal refactoring and updates, potential memory leak fixes, etc.
+* Some specs skipped unless root.
+
 ## 0.2.1 - 17-Aug-2025
 * Several auth related methods were fixed.
 * The recvv and recvmsg methods now allow for an optional buffer size argument.

data/README.md

@@ -167,7 +167,7 @@ Apache-2.0
 
 ## Copyright
 
-(C) 2020-2025, Daniel J. Berger
+(C) 2020-2026, Daniel J. Berger
 Al Rights Reserved
 
 ## Author

data/ext/sctp/socket.c

@@ -63,6 +63,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 +256,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 +280,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);
-
-      for(i = 0; i < snp->sn_send_failed_event.ssfe_length; i++){
-        v_temp[i] = UINT2NUM(snp->sn_send_failed_event.ssfe_data[i]);
-      }
+      {
+        size_t data_len = 0;
+        VALUE v_data_ary;
 
-      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:
@@ -451,14 +583,11 @@ 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;
   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,37 +614,51 @@ 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"));
 
-  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);
-#endif
-    }
-  }
-  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
-  }
-
   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(sctp_bindx(fileno, (struct sockaddr *) addrs, num_ip, flags) != 0)
-    rb_raise(rb_eSystemCallError, "sctp_bindx: %s", strerror(errno));
+  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_bindx(fileno, (struct sockaddr *)addrs6, num_ip, flags) != 0)
+      rb_raise(rb_eSystemCallError, "sctp_bindx: %s", strerror(errno));
+  }
+  else{
+    struct sockaddr_in addrs[MAX_IP_ADDRESSES];
+    bzero(&addrs, sizeof(addrs));
+
+    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(port == 0){
     struct sockaddr_in sin;
@@ -550,10 +693,9 @@ 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;
+  int i, num_ip, fileno, 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 +713,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 = NUM2INT(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_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_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));
 
@@ -731,8 +889,18 @@ static VALUE rsctp_getpeernames(int argc, VALUE* argv, VALUE self){
   }
 
   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));
   }
 
@@ -792,8 +960,18 @@ static VALUE rsctp_getlocalnames(int argc, VALUE* argv, VALUE self){
   }
 
   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));
   }
 
@@ -832,9 +1010,8 @@ 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;
+  int i, fileno, size, num_ip, domain, port;
   ssize_t num_bytes;
 
   Check_Type(v_options, T_HASH);
@@ -856,10 +1033,11 @@ 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;
   }
 
@@ -877,8 +1055,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 +1073,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_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_sendv(
+        fileno,
+        iov,
+        size,
+        (struct sockaddr*)addrs,
+        num_ip,
+        &spa,
+        sizeof(spa),
+        SCTP_SENDV_SPA,
+        0
+      );
+    }
+  }
+  else{
+    num_bytes = (ssize_t)sctp_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));
@@ -970,6 +1181,8 @@ static VALUE rsctp_recvv(int argc, VALUE* argv, VALUE self){
 
   rb_scan_args(argc, argv, "02", &v_flags, &v_buffer_size);
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
 
   if(NIL_P(v_flags))
@@ -1116,6 +1329,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;
@@ -1176,13 +1391,10 @@ 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;
+  int fileno, 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 +1434,21 @@ static VALUE rsctp_sendmsg(VALUE self, VALUE v_options){
   else
     context = NUM2INT(v_context);
 
+  CHECK_SOCKET_CLOSED(self);
+
+  fileno = NUM2INT(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 +1456,92 @@ 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));
+    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]);
+      }
+
 #ifdef BSD
-      addrs[i].sin_len = sizeof(struct sockaddr_in);
+      num_bytes = (ssize_t)sctp_sendmsgx(
+        fileno,
+        StringValueCStr(v_msg),
+        RSTRING_LEN(v_msg),
+        (struct sockaddr*)addrs6,
+        num_ip,
+        ppid,
+        flags,
+        stream,
+        ttl,
+        context
+      );
+#else
+      num_bytes = (ssize_t)sctp_sendmsg(
+        fileno,
+        StringValueCStr(v_msg),
+        RSTRING_LEN(v_msg),
+        (struct sockaddr*)addrs6,
+        num_ip * sizeof(struct sockaddr_in6),
+        ppid,
+        flags,
+        stream,
+        ttl,
+        context
+      );
 #endif
     }
+    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_sendmsgx(
+        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(
+        fileno,
+        StringValueCStr(v_msg),
+        RSTRING_LEN(v_msg),
+        (struct sockaddr*)addrs,
+        num_ip * sizeof(struct sockaddr_in),
+        ppid,
+        flags,
+        stream,
+        ttl,
+        context
+      );
+#endif
+    }
   }
   else{
+    // No addresses - use empty addrs
+    num_ip = 0;
     num_bytes = (ssize_t)sctp_sendmsg(
       fileno,
       StringValueCStr(v_msg),
       RSTRING_LEN(v_msg),
-      (struct sockaddr*)addrs,
-      size,
+      NULL,
+      0,
       ppid,
       flags,
       stream,
@@ -1283,20 +1549,6 @@ 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
@@ -1369,6 +1621,8 @@ static VALUE rsctp_recvmsg(int argc, VALUE* argv, VALUE self){
   if(buffer == NULL)
     rb_raise(rb_eNoMemError, "failed to allocate buffer");
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   length = sizeof(struct sockaddr_in);
 
@@ -1443,6 +1697,8 @@ static VALUE rsctp_set_initmsg(VALUE self, VALUE v_options){
 
   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");
@@ -1513,6 +1769,8 @@ static VALUE rsctp_subscribe(VALUE self, VALUE v_options){
   bzero(&events, sizeof(events));
   Check_Type(v_options, T_HASH);
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
 
   if(RTEST(rb_hash_aref2(v_options, "data_io")))
@@ -1593,6 +1851,8 @@ 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);
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
 
   if(listen(fileno, backlog) < 0)
@@ -1623,6 +1883,8 @@ static VALUE rsctp_peeloff(VALUE self, VALUE v_assoc_id){
   int fileno, assoc_fileno;
   sctp_assoc_t assoc_id;
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(v_assoc_id);
 
@@ -1660,6 +1922,8 @@ static VALUE rsctp_get_default_send_params(VALUE self){
 
   bzero(&sndrcv, sizeof(sndrcv));
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_sndrcvinfo);
@@ -1705,6 +1969,8 @@ static VALUE rsctp_get_association_info(VALUE self){
 
   bzero(&assoc, sizeof(assoc));
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_assocparams);
@@ -1747,6 +2013,8 @@ static VALUE rsctp_set_association_info(VALUE self, VALUE v_options){
 
   bzero(&assoc, sizeof(assoc));
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
 
   v_assoc_id = rb_hash_aref2(v_options, "association_id");
@@ -1811,6 +2079,8 @@ static VALUE rsctp_shutdown(int argc, VALUE* argv, VALUE self){
   int how, fileno;
   VALUE v_how;
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
 
   rb_scan_args(argc, argv, "01", &v_how);
@@ -1850,6 +2120,8 @@ static VALUE rsctp_get_retransmission_info(VALUE self){
 
   bzero(&rto, sizeof(rto));
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_rtoinfo);
@@ -1889,6 +2161,8 @@ static VALUE rsctp_set_retransmission_info(VALUE self, VALUE v_options){
 
   bzero(&rto, sizeof(rto));
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
 
   v_assoc_id = rb_hash_aref2(v_options, "association_id");
@@ -1954,10 +2228,12 @@ static VALUE rsctp_get_status(VALUE self){
   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));
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_status);
@@ -2022,6 +2298,8 @@ static VALUE rsctp_get_subscriptions(VALUE self){
 
   bzero(&events, sizeof(events));
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_event_subscribe);
@@ -2087,6 +2365,8 @@ static VALUE rsctp_get_peer_address_params(VALUE self){
   bzero(&paddr, sizeof(paddr));
   bzero(&str, sizeof(str));
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_paddrparams);
@@ -2094,7 +2374,18 @@ static VALUE rsctp_get_peer_address_params(VALUE self){
   if(sctp_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,
@@ -2134,6 +2425,8 @@ static VALUE rsctp_get_init_msg(VALUE self){
 
   bzero(&initmsg, sizeof(initmsg));
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(struct sctp_initmsg);
@@ -2162,6 +2455,8 @@ static VALUE rsctp_get_nodelay(VALUE self){
   sctp_assoc_t assoc_id;
   int value;
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(int);
@@ -2188,6 +2483,8 @@ static VALUE rsctp_set_nodelay(VALUE self, VALUE v_bool){
   socklen_t size;
   int value;
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   size = sizeof(int);
 
@@ -2221,6 +2518,8 @@ static VALUE rsctp_disable_fragments(VALUE self, VALUE v_bool){
   sctp_assoc_t assoc_id;
   int value;
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(int);
@@ -2252,6 +2551,8 @@ static VALUE rsctp_get_autoclose(VALUE self){
   sctp_assoc_t assoc_id;
   int value;
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
   assoc_id = NUM2INT(rb_iv_get(self, "@association_id"));
   size = sizeof(int);
@@ -2288,6 +2589,8 @@ static VALUE rsctp_set_autoclose(VALUE self, VALUE v_seconds){
   int fileno;
   int value;
 
+  CHECK_SOCKET_CLOSED(self);
+
   value = NUM2INT(v_seconds);
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
 
@@ -2399,7 +2702,7 @@ static VALUE rsctp_set_shared_key(int argc, VALUE* argv, VALUE self){
   size_t len;
   char* key;
   uint keynum;
-  socklen_t size;
+  size_t size;
   sctp_assoc_t assoc_id;
   struct sctp_authkey* auth_key;
   VALUE v_key, v_keynumber, v_assoc_id;
@@ -2460,6 +2763,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.
@@ -2518,6 +2823,8 @@ 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)
@@ -2614,6 +2921,8 @@ static VALUE rsctp_delete_shared_key(int argc, VALUE* argv, VALUE self){
 static VALUE rsctp_map_ipv4(VALUE self, VALUE v_bool){
   int fileno, boolean;
 
+  CHECK_SOCKET_CLOSED(self);
+
   boolean = 0;
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
 
@@ -2688,6 +2997,8 @@ static VALUE rsctp_set_default_send_params(VALUE self, VALUE v_options){
 
   bzero(&sndrcv, sizeof(sndrcv));
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(rb_iv_get(self, "@fileno"));
 
   v_stream = rb_hash_aref2(v_options, "stream");
@@ -2771,17 +3082,19 @@ 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;
+  int fileno, 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));
 
+  CHECK_SOCKET_CLOSED(self);
+
   fileno = NUM2INT(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 +3110,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))
@@ -2920,7 +3249,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 +3322,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.2.2: The version of this library */
+  rb_define_const(cSocket, "VERSION", rb_str_new2("0.2.2"));
 
   /* send flags */
 

data/sctp-socket.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name        = 'sctp-socket'
-  spec.version     = '0.2.1'
+  spec.version     = '0.2.2'
   spec.author      = 'Daniel Berger'
   spec.email       = 'djberg96@gmail.com'
   spec.summary     = 'Ruby bindings for SCTP sockets'

metadata

@@ -1,11 +1,10 @@
 --- !ruby/object:Gem::Specification
 name: sctp-socket
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Daniel Berger
-autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +34,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 2025-08-17 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -132,7 +131,6 @@ metadata:
   wiki_uri: https://github.com/djberg96/sctp-socket/wiki
   rubygems_mfa_required: 'true'
   funding_uri: https://github.com/sponsors/djberg96
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,8 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Ruby bindings for SCTP sockets
 test_files: []