diff options
Diffstat (limited to 'src/Network/WireGuard/Internal')
| -rw-r--r-- | src/Network/WireGuard/Internal/Data/RpcTypes.hs | 2 | ||||
| -rw-r--r-- | src/Network/WireGuard/Internal/Noise.hs | 2 | ||||
| -rw-r--r-- | src/Network/WireGuard/Internal/RpcParsers.hs | 10 | ||||
| -rw-r--r-- | src/Network/WireGuard/Internal/Util.hs | 7 |
4 files changed, 10 insertions, 11 deletions
diff --git a/src/Network/WireGuard/Internal/Data/RpcTypes.hs b/src/Network/WireGuard/Internal/Data/RpcTypes.hs index 088bbb5..7e1c20e 100644 --- a/src/Network/WireGuard/Internal/Data/RpcTypes.hs +++ b/src/Network/WireGuard/Internal/Data/RpcTypes.hs @@ -44,7 +44,7 @@ data RpcDevicePayload = RpcDevicePayload { instance Show RpcDevicePayload where show (RpcDevicePayload kp lp fwM rpp) = show (showKeyPair <$> kp) ++ show lp ++ show fwM ++ show rpp where - showKeyPair (pk, _) = show $ dhSecToBytes pk + showKeyPair (pr, _) = show $ dhSecToBytes pr instance Eq RpcDevicePayload where (==) (RpcDevicePayload pk1 prt1 fw1 rp1) (RpcDevicePayload pk2 prt2 fw2 rp2) = diff --git a/src/Network/WireGuard/Internal/Noise.hs b/src/Network/WireGuard/Internal/Noise.hs index 4084f42..bd85c05 100644 --- a/src/Network/WireGuard/Internal/Noise.hs +++ b/src/Network/WireGuard/Internal/Noise.hs @@ -46,7 +46,7 @@ newNoiseState staticKey presharedKey ephemeralKey remotePub role = sendFirstMessage :: NoiseStateWG -> ScrubbedBytes -> Either SomeException (ByteString, NoiseStateWG) -sendFirstMessage state0 plaintext1 = writeMessage state0 plaintext1 +sendFirstMessage = writeMessage recvFirstMessageAndReply :: NoiseStateWG -> ByteString -> ScrubbedBytes -> Either SomeException (ByteString, ScrubbedBytes, PublicKey, SessionKey) diff --git a/src/Network/WireGuard/Internal/RpcParsers.hs b/src/Network/WireGuard/Internal/RpcParsers.hs index d2eac92..654cf4e 100644 --- a/src/Network/WireGuard/Internal/RpcParsers.hs +++ b/src/Network/WireGuard/Internal/RpcParsers.hs @@ -57,11 +57,11 @@ setPayloadParser = do deviceParser :: Parser RpcDevicePayload deviceParser = do fields <- deviceFieldsParser - let pk = join $ listToMaybe [ pkF | RpcPk pkF <- fields] + let devPk = join $ listToMaybe [ pkF | RpcPk pkF <- fields] let p = head [ pF | RpcPort pF <- fields] let fw = join $ listToMaybe [ fwF | RpcFwMark fwF <- fields] let rmDev = not $ null [True | RpcReplacePeers <- fields] - return $ RpcDevicePayload pk p fw rmDev + return $ RpcDevicePayload devPk p fw rmDev deviceFieldsParser :: Parser [RpcDeviceField] deviceFieldsParser = many' (deviceFieldParser <* endOfLine) @@ -87,8 +87,8 @@ deviceFieldParser = do peerParser :: Parser RpcPeerPayload peerParser = do - pubK <- parsePubKey - fields <- peerFieldsParser + peerPubK <- parsePubKey + fields <- peerFieldsParser let rm = not $ null [rmF | RpcRmFlag rmF <- fields] let psh = listToMaybe [pshF | RpcPsh pshF <- fields] let endPL = [endPF | RpcEndp endPF <- fields] @@ -98,7 +98,7 @@ peerParser = do let ka = fromMaybe 0 $ listToMaybe [kaF | RpcKA kaF <- fields] let rmIps = not $ null [rmIpsF | RpcDelIps rmIpsF <- fields] let allIpR = [ipRF | RpcAllIp ipRF <- fields] - return $ RpcPeerPayload pubK rm psh endP ka rmIps allIpR + return $ RpcPeerPayload peerPubK rm psh endP ka rmIps allIpR where parsePubKey = do _ <- "public_key=" <?> "Peer delimiter" diff --git a/src/Network/WireGuard/Internal/Util.hs b/src/Network/WireGuard/Internal/Util.hs index 6aefee7..fa48d24 100644 --- a/src/Network/WireGuard/Internal/Util.hs +++ b/src/Network/WireGuard/Internal/Util.hs @@ -18,6 +18,7 @@ import Control.Exception (Exception (..), SomeAsyncException, SomeException, throwIO) import Control.Monad.Catch (MonadCatch (..)) +import Data.Foldable (forM_) import System.IO (hPutStrLn, stderr) import Foreign @@ -49,9 +50,7 @@ catchSomeExceptionAnd what m = catch m $ \(_ :: SomeException) -> what withJust :: Monad m => m (Maybe a) -> (a -> m ()) -> m () withJust mma func = do ma <- mma - case ma of - Nothing -> return () - Just a -> func a + forM_ ma func dropUntilM :: Monad m => (a -> Bool) -> m a -> m a dropUntilM cond ma = loop @@ -66,7 +65,7 @@ zeroMemory :: Ptr a -> CSize -> IO () zeroMemory dest nbytes = memset dest 0 (fromIntegral nbytes) copyMemory :: Ptr a -> Ptr b -> CSize -> IO () -copyMemory dest src nbytes = memcpy dest src nbytes +copyMemory = memcpy foreign import ccall unsafe "string.h" memset :: Ptr a -> CInt -> CSize -> IO () foreign import ccall unsafe "string.h" memcpy :: Ptr a -> Ptr b -> CSize -> IO () |