diff options
Diffstat (limited to 'dht/Presence')
-rw-r--r-- | dht/Presence/LocalPeerCred.hs | 2 | ||||
-rw-r--r-- | dht/Presence/XMPPServer.hs | 2 |
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 _)) = | |||
62 | -- see also: Network.Socket.getPeerCred | 62 | -- see also: Network.Socket.getPeerCred |
63 | return Nothing | 63 | return Nothing |
64 | 64 | ||
65 | {- // Removed due to no call-sites | ||
65 | getLocalPeerCred :: SocketLike sock => sock -> IO (Maybe UserID) | 66 | getLocalPeerCred :: SocketLike sock => sock -> IO (Maybe UserID) |
66 | getLocalPeerCred sock = do | 67 | getLocalPeerCred sock = do |
67 | addr <- getPeerName sock | 68 | addr <- getPeerName sock |
@@ -72,6 +73,7 @@ getLocalPeerCred sock = do | |||
72 | where sndOf3 (pid,uid,gid) = uid | 73 | where sndOf3 (pid,uid,gid) = uid |
73 | where | 74 | where |
74 | validate uid = Just uid -- TODO | 75 | validate uid = Just uid -- TODO |
76 | -} | ||
75 | 77 | ||
76 | from16 :: Word16 -> Int | 78 | from16 :: Word16 -> Int |
77 | from16 = fromEnum | 79 | 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 | |||
1101 | peerKey bind_addr sock = do | 1101 | peerKey bind_addr sock = do |
1102 | laddr <- getSocketName sock | 1102 | laddr <- getSocketName sock |
1103 | raddr <- | 1103 | raddr <- |
1104 | sIsConnected sock >>= \c -> | 1104 | isValidSocket sock >>= \(sock,c) -> |
1105 | if c then getPeerName sock -- addr is normally socketName | 1105 | if c then getPeerName sock -- addr is normally socketName |
1106 | else return laddr -- Weird hack: addr is would-be peer name | 1106 | else return laddr -- Weird hack: addr is would-be peer name |
1107 | -- Assume remote peers are listening on the same port that we do. | 1107 | -- Assume remote peers are listening on the same port that we do. |