From 43f42bd29d9c3aa304785f32c228c4fa23b8c959 Mon Sep 17 00:00:00 2001 From: Baylac-Jacqué Félix Date: Wed, 13 Sep 2017 15:35:23 +0200 Subject: Implemented RPC set's payload parser. --- src/Network/WireGuard/Internal/Data/RpcTypes.hs | 2 +- src/Network/WireGuard/Internal/RpcParsers.hs | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'src/Network/WireGuard') diff --git a/src/Network/WireGuard/Internal/Data/RpcTypes.hs b/src/Network/WireGuard/Internal/Data/RpcTypes.hs index d45d38e..a78d9df 100644 --- a/src/Network/WireGuard/Internal/Data/RpcTypes.hs +++ b/src/Network/WireGuard/Internal/Data/RpcTypes.hs @@ -31,7 +31,7 @@ data RpcRequest = RpcRequest { data RpcSetPayload = RpcSetPayload { devicePayload :: !RpcDevicePayload, peersPayload :: [RpcPeerPayload] -} +} deriving (Eq, Show) -- | Device related payload sent together with a set RPC operation. data RpcDevicePayload = RpcDevicePayload { diff --git a/src/Network/WireGuard/Internal/RpcParsers.hs b/src/Network/WireGuard/Internal/RpcParsers.hs index c5179c8..e5e38d1 100644 --- a/src/Network/WireGuard/Internal/RpcParsers.hs +++ b/src/Network/WireGuard/Internal/RpcParsers.hs @@ -3,7 +3,8 @@ module Network.WireGuard.Internal.RpcParsers( requestParser, deviceParser, - peerParser + peerParser, + setPayloadParser ) where import Control.Applicative ((*>), (<|>)) import Control.Monad (join) @@ -48,7 +49,10 @@ requestTypeParser = "get=1" *> return Get <|> "set=1" *> return Set setPayloadParser :: Parser RpcSetPayload -setPayloadParser = undefined +setPayloadParser = do + dev <- deviceParser + peers <- many' peerParser + return $ RpcSetPayload dev peers deviceParser :: Parser RpcDevicePayload deviceParser = do -- cgit v1.2.3-59-g8ed1b