Successful builds against newer network package

Built against both network-3.0.1.0 and network-3.1.0.0

Note, due to upstream issue, getting network-bsd-2.8.1.0 to cooperate with
network-3.0.1.0 requires a little finessing. The network-bsd package expects a
header(HsNetConfig.h) that network fails to provide. A simple work around is to
copy the header after running a newer version of the network configure script
from github.

Similar for network-3.1.0.0, but this time the header is HsNetworkConfig.h.

2 files changed, 3 insertions, 1 deletions

diff --git a/dht/Presence/LocalPeerCred.hs b/dht/Presence/LocalPeerCred.hs
index f68557e8..a7344434 100644
--- a/dht/Presence/LocalPeerCred.hs
+++ b/dht/Presence/LocalPeerCred.hs
@@ -62,6 +62,7 @@ getLocalPeerCred' (unmap6mapped4 -> addr@(SockAddrUnix _)) =
     -- see also: Network.Socket.getPeerCred
     return Nothing
 
+{- // Removed due to no call-sites
 getLocalPeerCred :: SocketLike sock => sock -> IO (Maybe UserID)
 getLocalPeerCred sock = do
     addr <- getPeerName sock
@@ -72,6 +73,7 @@ getLocalPeerCred sock = do
                      where sndOf3 (pid,uid,gid) = uid
  where
     validate uid = Just uid -- TODO
+-}
 
 from16 :: Word16 -> Int
 from16 = fromEnum
diff --git a/dht/Presence/XMPPServer.hs b/dht/Presence/XMPPServer.hs
index fe099fb8..e98b9a2e 100644
--- a/dht/Presence/XMPPServer.hs
+++ b/dht/Presence/XMPPServer.hs
@@ -1101,7 +1101,7 @@ peerKey :: SocketLike sock => Maybe SockAddr -> sock -> IO (PeerAddress,Connecti
 peerKey bind_addr sock = do
     laddr <- getSocketName sock
     raddr <-
-      sIsConnected sock >>= \c ->
+      isValidSocket sock >>= \(sock,c) ->
         if c then getPeerName sock -- addr is normally socketName
              else return laddr     -- Weird hack: addr is would-be peer name
     -- Assume remote peers are listening on the same port that we do.