SEnd addresses on the wire between peers rather than domain names.

1 files changed, 20 insertions, 11 deletions

diff --git a/Presence/LocalPeerCred.hs b/Presence/LocalPeerCred.hs
index b544af97..ee1a4a0f 100644
--- a/Presence/LocalPeerCred.hs
+++ b/Presence/LocalPeerCred.hs
@@ -1,5 +1,11 @@
 module LocalPeerCred where
 
+{- for main
+import System.Environment
+import Control.Monad
+-}
+
+import System.Endian
 import Data.ByteString.Lazy.Char8 as L hiding (map,putStrLn,tail,splitAt,tails,filter)
 import qualified Data.ByteString.Lazy.Char8 as L (splitAt)
 import qualified Data.ByteString.Lazy as W8
@@ -38,7 +44,9 @@ getLocalPeerCred' (SockAddrInet portn host) = do
 
 getLocalPeerCred' (SockAddrInet6 portn flow host scope) = do
     let port = fromEnum portn
-    trace "tcp6" $ withFile "/proc/net/tcp6" ReadMode (parseProcNet port host)
+        (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 _) =
     -- TODO:  parse /proc/net/unix
@@ -81,20 +89,21 @@ parseProcNet port host h = do
                     fmap snd . listToMaybe $ filter ((==(port,host)).fst) rs 
         {- trace ("found: "++show u) -} 
         u `seq` return u
-{-
+ {-
  where
     a === b = let r= a==b in  trace ("Comparing "++show (a,b)++"-->"++show r) r
--}
+    -}
 
 {-
 main = do
     args <- getArgs
-    let addr = fromJust $ do
-         port <- args ?? 0
-         host <- args ?? 1
-         return $ SockAddrInet (toEnum . fromIntegral . readInt $ port) (toEnum (read host::Int))
-        readInt x = read x :: Int
-
-    r <- getLocalPeerCred' addr
-    putStrLn $ "r = " ++ show r
+    let addr_str = fromJust (args??0)
+        port_str = fromJust (args??1)
+    info <- getAddrInfo (Just $ defaultHints { addrFlags = [ AI_NUMERICHOST ] }) 
+                        (Just addr_str) 
+                        (Just port_str)
+    let addrs = map addrAddress info
+    forM_ addrs $ \addr -> do
+        r <- getLocalPeerCred' addr
+        putStrLn $ "r{"++show addr++"} = " ++ show r
 -}