1 files changed, 29 insertions, 5 deletions

diff --git a/src/Network/Address.hs b/src/Network/Address.hs
index 246463c0..e1cec34d 100644
--- a/src/Network/Address.hs
+++ b/src/Network/Address.hs
@@ -84,6 +84,9 @@ module Network.Address
        , sockAddrPort
        , setPort
        , getBindAddress
+       , localhost4
+       , localhost6
+       , linesBy
        ) where
 
 import Control.Applicative
@@ -109,7 +112,6 @@ import Data.IP hiding (fromSockAddr)
 import Data.IP
 #endif
 import Data.List as L
-import Data.List.Split as L
 import Data.Maybe       (fromMaybe, catMaybes)
 import Data.Monoid
 import Data.Hashable
@@ -212,7 +214,8 @@ instance Serialize a => Serialize (NodeAddr a) where
 --
 instance IsString (NodeAddr IPv4) where
   fromString str
-    | [hostAddrStr, portStr] <- splitWhen (== ':') str
+    | (hostAddrStr, portStr0) <- L.break (== ':') str
+    , let portStr = L.drop 1 portStr0
     , Just hostAddr <- readMaybe hostAddrStr
     , Just portNum  <- toEnum <$> readMaybe portStr
                 = NodeAddr hostAddr portNum
@@ -540,7 +543,8 @@ instance Default PeerAddr where
 --
 instance IsString PeerAddr where
   fromString str
-    | [hostAddrStr, portStr] <- splitWhen (== ':') str
+    | (hostAddrStr, portStr0) <- L.break (== ':') str
+    , let portStr = L.drop 1 portStr0
     , Just hostAddr <- readMaybe hostAddrStr
     , Just portNum  <- toEnum <$> readMaybe portStr
                 = PeerAddr Nothing (IPv4 hostAddr) portNum
@@ -958,6 +962,20 @@ instance Default Version where
   def = Version [0] []
   {-# INLINE def #-}
 
+dropLastIf :: (a -> Bool) -> [a] -> [a]
+dropLastIf pred []                 =  []
+dropLastIf pred (x:xs)             =  init' x xs
+  where init' y [] | pred y = []
+        init' y []          = [y]
+        init' y (z:zs)      = y : init' z zs
+
+linesBy :: (a -> Bool) -> [a] -> [[a]]
+linesBy pred ys = dropLastIf L.null $ L.map dropDelim $ L.groupBy (\_ x -> not $ pred x) ys
+ where
+    dropDelim []                 = []
+    dropDelim (x:xs) | pred x    = xs
+                     | otherwise = x:xs
+
 -- | For dot delimited version strings.
 --   Example: @fromString \"0.1.0.2\" == Version [0, 1, 0, 2]@
 --
@@ -966,7 +984,7 @@ instance IsString Version where
     | Just nums <- chunkNums str = Version nums []
     | otherwise = error $ "fromString: invalid version string " ++ str
     where
-      chunkNums = sequence . L.map readMaybe . L.linesBy ('.' ==)
+      chunkNums = sequence . L.map readMaybe . linesBy ('.' ==)
 
 instance Pretty Version where
   pPrint = text . showVersion
@@ -1120,7 +1138,7 @@ fingerprint pid = either (const def) id $ runGet getCI (getPeerId pid)
 
     getMainlineVersion = do
       str <- BC.unpack <$> getByteString 7
-      let mnums = L.filter (not . L.null) $ L.linesBy ('-' ==) str
+      let mnums = L.filter (not . L.null) $ linesBy ('-' ==) str
       return $ Version (fromMaybe [] $ sequence $ L.map readMaybe mnums) []
 
     getAzureusImpl    = parseSoftware <$> getByteString 2
@@ -1227,3 +1245,9 @@ either4or6 a6@(SockAddrInet6 port _ addr _)
 data WantIP = Want_IP4 | Want_IP6 | Want_Both
  deriving (Eq, Enum, Ord, Show)
 
+localhost6 :: SockAddr
+localhost6 = SockAddrInet6 0 0 (0,0,0,1) 0 -- [::1]:0
+
+localhost4 :: SockAddr
+localhost4 = SockAddrInet 0 16777343 -- 127.0.0.1:0
+