Revert "Add connectionAddr and pendingAddr to connection data type"

This reverts commit 9035faf.

src/Network/WebSockets/Client.hs

@@ -108,7 +108,6 @@ runClientWithStream stream host path opts customHeaders app = do
         , connectionParse     = parse
         , connectionWrite     = write
         , connectionSentClose = sentRef
-        , connectionAddr      = S.SockAddrUnix "No address"
         }
   where
     protocol = defaultProtocol  -- TODO

src/Network/WebSockets/Connection.hs

@@ -42,7 +42,6 @@ import           Data.List                   (find)
 import qualified Data.Text                   as T
 import           Data.Word                   (Word16)
 
-import qualified Network.Socket                 as S
 
 --------------------------------------------------------------------------------
 import           Network.WebSockets.Http
@@ -65,8 +64,6 @@ data PendingConnection = PendingConnection
     -- the accepting response is sent to the client.
     , pendingStream   :: !Stream
     -- ^ Input/output stream
-    , pendingAddr     :: !S.SockAddr
-    -- ^ Peer socket address
     }
 
 
@@ -112,7 +109,6 @@ acceptRequestWith pc ar = case find (flip compatible request) protocols of
                 , connectionParse     = parse
                 , connectionWrite     = write
                 , connectionSentClose = sentRef
-                , connectionAddr      = pendingAddr pc
                 }
 
         pendingOnAccept pc connection
@@ -141,8 +137,6 @@ data Connection = Connection
     -- the first close message but then the other party must respond.  Finally,
     -- the server is in charge of closing the TCP connection.  This IORef tracks
     -- if we have sent a close message and are waiting for the peer to respond.
-    , connectionAddr      :: !S.SockAddr
-    -- ^ Peer socket address
     }
 
 

src/Network/WebSockets/Server.hs

@@ -97,16 +97,15 @@ runApp socket opts app =
 makePendingConnection
     :: Socket -> ConnectionOptions -> IO PendingConnection
 makePendingConnection socket opts = do
-    addr <- S.getPeerName socket
     stream <- Stream.makeSocketStream socket
-    makePendingConnectionFromStream stream addr opts
+    makePendingConnectionFromStream stream opts
 
 
 -- | More general version of 'makePendingConnection' for 'Stream.Stream'
 -- instead of a 'Socket'.
 makePendingConnectionFromStream
-    :: Stream.Stream -> S.SockAddr -> ConnectionOptions -> IO PendingConnection
-makePendingConnectionFromStream stream addr opts = do
+    :: Stream.Stream -> ConnectionOptions -> IO PendingConnection
+makePendingConnectionFromStream stream opts = do
     -- TODO: we probably want to send a 40x if the request is bad?
     mbRequest <- Stream.parse stream (decodeRequestHead False)
     case mbRequest of
@@ -116,5 +115,4 @@ makePendingConnectionFromStream stream addr opts = do
             , pendingRequest  = request
             , pendingOnAccept = \_ -> return ()
             , pendingStream   = stream
-            , pendingAddr     = addr
             }

tests/haskell/Network/WebSockets/Handshake/Tests.hs

@@ -16,7 +16,6 @@ import           Test.Framework                 (Test, testGroup)
 import           Test.Framework.Providers.HUnit (testCase)
 import           Test.HUnit                     (Assertion, assert, (@?=))
 
-import qualified Network.Socket                 as S
 
 --------------------------------------------------------------------------------
 import           Network.WebSockets
@@ -40,7 +39,7 @@ testHandshake :: RequestHead -> (PendingConnection -> IO a) -> IO ResponseHead
 testHandshake rq app = do
     echo <- Stream.makeEchoStream
     _    <- forkIO $ do
-        _ <- app (PendingConnection defaultConnectionOptions rq nullify echo addr)
+        _ <- app (PendingConnection defaultConnectionOptions rq nullify echo)
         return ()
     mbRh <- Stream.parse echo decodeResponseHead
     Stream.close echo
@@ -49,7 +48,6 @@ testHandshake rq app = do
         Just rh -> return rh
   where
     nullify _ = return ()
-    addr = S.SockAddrUnix "No Address"
 
 
 --------------------------------------------------------------------------------