diff options
-rwxr-xr-x | g | 5 | ||||
-rw-r--r-- | src/Data/PacketQueue.hs | 5 | ||||
-rw-r--r-- | src/Network/Tox/Crypto/Transport.hs | 2 |
3 files changed, 7 insertions, 5 deletions
@@ -2,6 +2,7 @@ | |||
2 | 2 | ||
3 | rootname=$(cat /etc/debian_chroot 2>/dev/null) | 3 | rootname=$(cat /etc/debian_chroot 2>/dev/null) |
4 | echo $PATH | grep '\.stack' >/dev/null && rootname="stack" | 4 | echo $PATH | grep '\.stack' >/dev/null && rootname="stack" |
5 | BUILDB=build/b | ||
5 | 6 | ||
6 | warn="-freverse-errors -fwarn-unused-imports -Wmissing-signatures -fdefer-typed-holes" | 7 | warn="-freverse-errors -fwarn-unused-imports -Wmissing-signatures -fdefer-typed-holes" |
7 | exts="-XOverloadedStrings -XRecordWildCards" | 8 | exts="-XOverloadedStrings -XRecordWildCards" |
@@ -19,7 +20,7 @@ if [ "$rootname" == "stretch" ] | |||
19 | then | 20 | then |
20 | echo "Building with cryptonite backport. (chroot = $rootname)" | 21 | echo "Building with cryptonite backport. (chroot = $rootname)" |
21 | defs="$defs -DCRYPTONITE_BACKPORT -icryptonite-backport" | 22 | defs="$defs -DCRYPTONITE_BACKPORT -icryptonite-backport" |
22 | warn="build/b/cbits/cryptonite_salsa.o build/b/cbits/cryptonite_xsalsa.o $warn" | 23 | warn="$BUILDB/cbits/cryptonite_salsa.o $BUILDB/cbits/cryptonite_xsalsa.o $warn" |
23 | fi | 24 | fi |
24 | 25 | ||
25 | root=${0%/*} | 26 | root=${0%/*} |
@@ -35,6 +36,6 @@ ghc -threaded \ | |||
35 | -iPresence \ | 36 | -iPresence \ |
36 | -iArchive \ | 37 | -iArchive \ |
37 | -isrc \ | 38 | -isrc \ |
38 | build/b/Presence/monitortty.o \ | 39 | $BUILDB/Presence/monitortty.o \ |
39 | $warn \ | 40 | $warn \ |
40 | "$@" | 41 | "$@" |
diff --git a/src/Data/PacketQueue.hs b/src/Data/PacketQueue.hs index 8182706e..b5d8a756 100644 --- a/src/Data/PacketQueue.hs +++ b/src/Data/PacketQueue.hs | |||
@@ -220,11 +220,12 @@ getRequested getExtra pktoq snum ns = do | |||
220 | toIndex = (`mod` qsize (pktoOutPQ pktoq)) | 220 | toIndex = (`mod` qsize (pktoOutPQ pktoq)) |
221 | 221 | ||
222 | toPNums :: Word32 -> [Word8] -> [Word32] | 222 | toPNums :: Word32 -> [Word8] -> [Word32] |
223 | toPNums snum ns = reverse . snd $ foldl doOne ((snum - 1),[]) ns | 223 | toPNums snum ns = reverse . snd $ foldl doOne (snum,[]) ns |
224 | where | 224 | where |
225 | doOne :: (Word32,[Word32]) -> Word8 -> (Word32,[Word32]) | 225 | doOne :: (Word32,[Word32]) -> Word8 -> (Word32,[Word32]) |
226 | doOne (addend,as) 0 = (addend+255,as) | 226 | doOne (addend,as) 0 = (addend+255,as) |
227 | doOne (addend,as) x = (addend,(fromIntegral x + addend):as) | 227 | doOne (addend,as) x = let y = fromIntegral x + addend |
228 | in (y,y:as) | ||
228 | 229 | ||
229 | peekPacket :: STM extra -> PacketOutQueue extra msg wire fromwire -> msg -> STM (Maybe (wire,Word32)) | 230 | peekPacket :: STM extra -> PacketOutQueue extra msg wire fromwire -> msg -> STM (Maybe (wire,Word32)) |
230 | peekPacket getExtra q@(PacketOutQueue { pktoInPQ, pktoOutPQ, pktoPacketNo, pktoToWireIO, pktoToWire }) msg | 231 | peekPacket getExtra q@(PacketOutQueue { pktoInPQ, pktoOutPQ, pktoPacketNo, pktoToWireIO, pktoToWire }) msg |
diff --git a/src/Network/Tox/Crypto/Transport.hs b/src/Network/Tox/Crypto/Transport.hs index 67950854..678bb16d 100644 --- a/src/Network/Tox/Crypto/Transport.hs +++ b/src/Network/Tox/Crypto/Transport.hs | |||
@@ -185,7 +185,7 @@ data CryptoData = CryptoData | |||
185 | , bufferEnd :: Word32 | 185 | , bufferEnd :: Word32 |
186 | -- | [data] (TODO See Note [Padding]) | 186 | -- | [data] (TODO See Note [Padding]) |
187 | , bufferData :: CryptoMessage | 187 | , bufferData :: CryptoMessage |
188 | } | 188 | } deriving (Eq,Show) |
189 | 189 | ||
190 | {- | 190 | {- |
191 | Note [Padding] | 191 | Note [Padding] |