2 files changed, 19 insertions, 45 deletions

diff --git a/dht/dht-client.cabal b/dht/dht-client.cabal
index 3a513280..3569c6dd 100644
--- a/dht/dht-client.cabal
+++ b/dht/dht-client.cabal
@@ -32,10 +32,17 @@ flag network-uri
   description:         Use network-uri package.
   default:             True
 
-flag network-bsd
+-- supports network-2.7, 2.8, with deprecation warnings
+flag old-network-bsd
   description:         Use network-bsd package.
   default:             True
 
+-- TODO: Due to removed functions, this flag doesn't actually build.
+-- In the future, this flag should support network >3.0
+flag new-network-bsd
+  description:         Use newer network-bsd package.
+  default:             False
+
 flag builder
   description: Use older bytestring package and bytestring-builder.
   default: False
@@ -223,11 +230,16 @@ library
   if impl(ghc < 8)
       Build-depends:  transformers
 
-  if flag(network-bsd)
-      Build-depends:  network      >= 3.0
-                    , network-uri  >= 2.6
-                    , network-bsd
+  if flag(old-network-bsd)
+    Build-depends:  network < 3.0
+                  , network-uri  >= 2.6
+                  , network-bsd < 2.8.1.0
   else
+   if flag(new-network-bsd)
+    Build-depends:  network >= 3.0
+                  , network-uri  >= 2.6
+                  , network-bsd >= 2.8.1.0
+   else
     if flag(network-uri)
       Build-depends:  network      >= 2.6 && < 3.0
                     , network-uri  >= 2.6
diff --git a/dht/src/Network/SocketLike.hs b/dht/src/Network/SocketLike.hs
index d533dd7f..27f6f492 100644
--- a/dht/src/Network/SocketLike.hs
+++ b/dht/src/Network/SocketLike.hs
@@ -44,50 +44,23 @@ class SocketLike sock where
     getPeerName   :: sock -> IO SockAddr
     -- | See 'NS.getPeerCred'
     getPeerCred   :: sock -> IO (CUInt, CUInt, CUInt)
-    -- | See 'NS.socketPort'
-    socketPort    :: sock -> IO PortNumber
-    -- | See 'NS.sIsConnected'
-    --
-    -- __Warning__: Don't rely on this method if it's possible the socket was
-    -- converted into a 'Handle'.
+
+    -- | Is the socket still valid? Connected
     sIsConnected  :: sock -> IO Bool
-    -- | See 'NS.sIsBound'
-    sIsBound      :: sock -> IO Bool
-    -- | See 'NS.sIsListening'
-    sIsListening  :: sock -> IO Bool
-    -- | See 'NS.sIsReadable'
-    sIsReadable   :: sock -> IO Bool
-    -- | See 'NS.sIsWritable'
-    sIsWritable   :: sock -> IO Bool
 
-    -- | This is the only exposed write-access method to the
-    -- underlying state.  Usually implemented by 'NS.close'
-    sClose        :: sock -> IO ()
 
 instance SocketLike NS.Socket where
     getSocketName = NS.getSocketName
     getPeerName   = NS.getPeerName
     getPeerCred   = NS.getPeerCred
-    socketPort    = NS.socketPort
 #if MIN_VERSION_network(2,4,0)
     sIsConnected  = NS.isConnected -- warning: this is always False if the socket
                                    --          was converted to a Handle
-    sIsBound      = NS.isBound
-    sIsListening  = NS.isListening
-    sIsReadable   = NS.isReadable
-    sIsWritable   = NS.isWritable
-    sClose        = NS.close
 #else
     sIsConnected  = NS.sIsConnected -- warning: this is always False if the socket
                                     --          was converted to a Handle
-    sIsBound      = NS.sIsBound
-    sIsListening  = NS.sIsListening
-    sIsReadable   = NS.sIsReadable
-    sIsWritable   = NS.sIsWritable
-    sClose        = NS.sClose
 #endif
 
-
 -- | An encapsulated socket.  Data reads and writes are not possible.
 data RestrictedSocket = Restricted (Maybe Handle) NS.Socket deriving Show
 
@@ -95,21 +68,10 @@ instance SocketLike RestrictedSocket where
     getSocketName (Restricted mb sock) = NS.getSocketName sock
     getPeerName   (Restricted mb sock) = NS.getPeerName sock
     getPeerCred   (Restricted mb sock) = NS.getPeerCred sock
-    socketPort    (Restricted mb sock) = NS.socketPort sock
 #if MIN_VERSION_network(2,4,0)
     sIsConnected  (Restricted mb sock) = maybe (NS.isConnected sock) (hIsOpen) mb
-    sIsBound      (Restricted mb sock) = NS.isBound sock
-    sIsListening  (Restricted mb sock) = NS.isListening sock
-    sIsReadable   (Restricted mb sock) = NS.isReadable sock
-    sIsWritable   (Restricted mb sock) = NS.isWritable sock
-    sClose        (Restricted mb sock) = maybe (NS.close sock) (\h -> hClose h >> NS.close sock) mb
 #else
     sIsConnected  (Restricted mb sock) = maybe (NS.sIsConnected sock) (hIsOpen) mb
-    sIsBound      (Restricted mb sock) = NS.sIsBound sock
-    sIsListening  (Restricted mb sock) = NS.sIsListening sock
-    sIsReadable   (Restricted mb sock) = NS.sIsReadable sock
-    sIsWritable   (Restricted mb sock) = NS.sIsWritable sock
-    sClose        (Restricted mb sock) = maybe (NS.sClose sock) (\h -> hClose h >> NS.sClose sock) mb
 #endif
 
 -- | Create a 'RestrictedSocket' that explicitly disallows sending or