transport: Fix orig-dst compilation on non-Linux targets (#974)

ihciah · olix0r · commit 8c3e39de8d7c · 2021-04-29T14:41:10.000Z
The `orig_dst_addr` helper function does not compile when the target OS
is not Linux. This change fixes the signature and return value of the helper
for non-Linux targets
diff --git a/linkerd/proxy/transport/src/orig_dst.rs b/linkerd/proxy/transport/src/orig_dst.rs
@@ -86,11 +86,11 @@ fn orig_dst_addr(sock: &TcpStream) -> io::Result<OrigDstAddr> {
 }
 
 #[cfg(not(target_os = "linux"))]
-fn orig_dst_addr(&self, _: &TcpStream) -> io::Result<OrigDstAddr> {
-    io::Error::new(
+fn orig_dst_addr(_: &TcpStream) -> io::Result<OrigDstAddr> {
+    Err(io::Error::new(
         io::ErrorKind::Other,
         "SO_ORIGINAL_DST not supported on this operating system",
-    )
+    ))
 }
 
 #[cfg(target_os = "linux")]

Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,11 @@ fn orig_dst_addr(sock: &TcpStream) -> io::Result<OrigDstAddr> {`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`#[cfg(not(target_os = "linux"))]`
`89`		`-fn orig_dst_addr(&self, _: &TcpStream) -> io::Result<OrigDstAddr> {`
`90`		`- io::Error::new(`
	`89`	`+fn orig_dst_addr(_: &TcpStream) -> io::Result<OrigDstAddr> {`
	`90`	`+ Err(io::Error::new(`
`91`	`91`	`io::ErrorKind::Other,`
`92`	`92`	`"SO_ORIGINAL_DST not supported on this operating system",`
`93`		`- )`
	`93`	`+ ))`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`#[cfg(target_os = "linux")]`