Fixed handling ipv4 encoded as ipv6

1 files changed, 8 insertions, 3 deletions

diff --git a/Presence/LocalPeerCred.hs b/Presence/LocalPeerCred.hs
index b6ec9491..0122b5d0 100644
--- a/Presence/LocalPeerCred.hs
+++ b/Presence/LocalPeerCred.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE ViewPatterns #-}
 module LocalPeerCred where
 
 {- for main
@@ -37,18 +38,18 @@ parseHex bs = L.concat . parseHex' $ bs
               then []
               else parseHex' ts
 
-getLocalPeerCred' (SockAddrInet portn host) = do
+getLocalPeerCred' (unmap6mapped4 -> SockAddrInet portn host) = do
     let port = fromEnum portn
     {- trace ("tcp4 "++show(port,host)) $ -} 
     withFile "/proc/net/tcp"  ReadMode (parseProcNet port host)
 
-getLocalPeerCred' (SockAddrInet6 portn flow host scope) = do
+getLocalPeerCred' (unmap6mapped4 -> SockAddrInet6 portn flow host scope) = do
     let port = fromEnum portn
         (a,b,c,d) = host
         host' = (toBE32 a, toBE32 b, toBE32 c, toBE32 d)
     withFile "/proc/net/tcp6" ReadMode (parseProcNet port host')
 
-getLocalPeerCred' addr@(SockAddrUnix _) =
+getLocalPeerCred' (unmap6mapped4 -> addr@(SockAddrUnix _)) =
     -- TODO:  parse /proc/net/unix
     -- see also: Network.Socket.getPeerCred
     return Nothing
@@ -109,3 +110,7 @@ main = do
         r <- getLocalPeerCred' addr
         putStrLn $ "r{"++show addr++"} = " ++ show r
 -}
+
+-- PEER NAME: [::ffff:127.0.0.1]:34307
+unmap6mapped4 addr@(SockAddrInet6 port _ (0,0,0xFFFF,a) _) = SockAddrInet port (toBE32 a)
+unmap6mapped4 addr = addr