From c713d75d0d616f1f6e2662396bd49e272fb0e5a7 Mon Sep 17 00:00:00 2001
From: Jake McGinty <me@jake.su>
Date: Fri, 13 Apr 2018 21:02:53 -0700
Subject: udp: parse in(6)_pktinfo cmsgs

---
 src/udp/frame.rs | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'src/udp/frame.rs')

diff --git a/src/udp/frame.rs b/src/udp/frame.rs
index f04b004..e8f3b69 100644
--- a/src/udp/frame.rs
+++ b/src/udp/frame.rs
@@ -140,27 +140,12 @@ pub type PeerServerMessage = (SocketAddr, Vec<u8>);
 pub struct VecUdpCodec;
 impl VecUdpCodec {
     fn decode(&mut self, src: &SocketAddr, buf: &[u8]) -> io::Result<PeerServerMessage> {
-        let unmapped_ip = match src.ip() {
-            IpAddr::V6(v6addr) => {
-                if let Some(v4addr) = v6_mapped_to_v4(v6addr) {
-                    IpAddr::V4(v4addr)
-                } else {
-                    IpAddr::V6(v6addr)
-                }
-            }
-            v4addr => v4addr
-        };
-        Ok((SocketAddr::new(unmapped_ip, src.port()), buf.to_vec()))
+        Ok((*src, buf.to_vec()))
     }
 
     fn encode(&mut self, msg: PeerServerMessage, buf: &mut Vec<u8>) -> SocketAddr {
         let (mut addr, mut data) = msg;
         buf.append(&mut data);
-        let mapped_ip = match addr.ip() {
-            IpAddr::V4(v4addr) => IpAddr::V6(v4addr.to_ipv6_mapped()),
-            v6addr => v6addr
-        };
-        addr.set_ip(mapped_ip);
         addr
     }
 }
-- 
cgit v1.2.3-59-g8ed1b