Allow using IPv6 sockets with mirrord (#2808)

metalbear-co · Oct 9, 2024 · 4f82caa · 4f82caa
1 parent 8b83694
commit 4f82caa
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/changelog.d/2807.fixed.md b/changelog.d/2807.fixed.md
@@ -0,0 +1 @@
+Allow using IPv6 sockets with mirrord
diff --git a/mirrord/layer/src/error.rs b/mirrord/layer/src/error.rs
@@ -75,9 +75,6 @@ pub(crate) enum HookError {
     #[error("mirrord-layer: SIP patch failed with error `{0}`!")]
     FailedSipPatch(#[from] SipError),
 
-    #[error("mirrord-layer: IPv6 can't be used with mirrord")]
-    SocketUnsuportedIpv6,
-
     // `From` implemented below, not with `#[from]` so that when new variants of
     // `SerializationError` are added, they are mapped into different variants of
     // `LayerError`.
@@ -221,9 +218,6 @@ impl From<HookError> for i64 {
             HookError::FileNotFound => {
                 info!("mirrord file not found triggered")
             }
-            HookError::SocketUnsuportedIpv6 => {
-                info!("{fail}")
-            }
             HookError::ProxyError(ref err) => {
                 graceful_exit!(
                     r"Proxy error, connectivity issue or a bug.
@@ -292,7 +286,6 @@ impl From<HookError> for i64 {
             HookError::LocalFileCreation(_) => libc::EINVAL,
             #[cfg(target_os = "macos")]
             HookError::FailedSipPatch(_) => libc::EACCES,
-            HookError::SocketUnsuportedIpv6 => libc::EAFNOSUPPORT,
             HookError::UnsupportedSocketType => libc::EAFNOSUPPORT,
             HookError::BadPointer => libc::EFAULT,
             HookError::AddressAlreadyBound(_) => libc::EADDRINUSE,

diff --git a/mirrord/layer/src/socket/ops.rs b/mirrord/layer/src/socket/ops.rs
@@ -129,10 +129,6 @@ pub(super) fn socket(domain: c_int, type_: c_int, protocol: c_int) -> Detour<Raw
         Ok(())
     }?;
 
-    if domain == libc::AF_INET6 {
-        return Detour::Error(HookError::SocketUnsuportedIpv6);
-    }
-
     let socket_result = unsafe { FN_SOCKET(domain, type_, protocol) };
 
     let socket_fd = if socket_result == -1 {