SocketHeld::new refactor (#294)

* `SocketHeld::new` refactor

* Support both ipv4 and ipv6

Author: Jamyw7g

src/shared_socket.rs

@@ -2,7 +2,7 @@ use pyo3::prelude::*;
 
 use log::debug;
 use socket2::{Domain, Protocol, Socket, Type};
-use std::net::SocketAddr;
+use std::net::{IpAddr, SocketAddr};
 
 #[pyclass]
 #[derive(Debug)]
@@ -13,26 +13,19 @@ pub struct SocketHeld {
 #[pymethods]
 impl SocketHeld {
     #[new]
-    #[cfg(not(target_os = "windows"))]
-    pub fn new(address: String, port: i32) -> PyResult<SocketHeld> {
-        let socket = Socket::new(Domain::IPV4, Type::STREAM, Some(Protocol::TCP))?;
-        let address: SocketAddr = format!("{}:{}", address, port).parse()?;
+    pub fn new(ip: String, port: u16) -> PyResult<SocketHeld> {
+        let ip: IpAddr = ip.parse()?;
+        let socket = if ip.is_ipv4() {
+            Socket::new(Domain::IPV4, Type::STREAM, Some(Protocol::TCP))?
+        } else {
+            Socket::new(Domain::IPV6, Type::STREAM, Some(Protocol::TCP))?
+        };
+        let address = SocketAddr::new(ip, port);
         debug!("{}", address);
+        // reuse port is not available on windows
+        #[cfg(not(target_os = "windows"))]
         socket.set_reuse_port(true)?;
-        socket.set_reuse_address(true)?;
-        socket.bind(&address.into())?;
-        socket.listen(1024)?;
-
-        Ok(SocketHeld { socket })
-    }
 
-    #[new]
-    #[cfg(target_os = "windows")]
-    pub fn new(address: String, port: i32) -> PyResult<SocketHeld> {
-        let socket = Socket::new(Domain::IPV4, Type::STREAM, Some(Protocol::TCP))?;
-        let address: SocketAddr = format!("{}:{}", address, port).parse()?;
-        debug!("{}", address);
-        // reuse port is not available on windows
         socket.set_reuse_address(true)?;
         socket.bind(&address.into())?;
         socket.listen(1024)?;