- tor-commits - lists.torproject.org

[tordnsel/master] reign in over the extensions
by arlo＠torproject.org 05 Mar '16

05 Mar '16

commit 1c90be2dc4d3b275f434bb4e9ea63f169ae46f3e Author: David Kaloper <david(a)numm.org> Date: Wed Sep 4 05:30:41 2013 +0200 reign in over the extensions --- src/TorDNSEL/Config/Internals.hs | 2 - src/TorDNSEL/Control/Concurrent/Link/Internals.hs | 1 - src/TorDNSEL/DNS/Internals.hs | 1 - src/TorDNSEL/DNS/Server/Internals.hs | 1 - src/TorDNSEL/Directory/Internals.hs | 2 - src/TorDNSEL/Directory/Tests.hs | 2 - src/TorDNSEL/Document.hs | 1 - src/TorDNSEL/ExitTest/Initiator/Internals.hs | 9 +-- src/TorDNSEL/ExitTest/Server/Internals.hs | 1 - src/TorDNSEL/Log/Internals.hsc | 3 +- src/TorDNSEL/Main.hsc | 2 +- src/TorDNSEL/NetworkState/Internals.hs | 1 - src/TorDNSEL/NetworkState/Storage/Internals.hs | 1 - src/TorDNSEL/Random.hs | 2 +- src/TorDNSEL/Socks/Internals.hs | 1 - src/TorDNSEL/Statistics/Internals.hs | 3 +- src/TorDNSEL/TorControl/Internals.hs | 12 +-- src/TorDNSEL/Util.hsc | 5 +- tordnsel.cabal | 99 +++++++++++++---------- 19 files changed, 64 insertions(+), 85 deletions(-) diff --git a/src/TorDNSEL/Config/Internals.hs b/src/TorDNSEL/Config/Internals.hs index 5458813..c8aa790 100644 --- a/src/TorDNSEL/Config/Internals.hs +++ b/src/TorDNSEL/Config/Internals.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE PatternGuards, BangPatterns, TypeSynonymInstances, - FlexibleInstances, FlexibleContexts #-} {-# OPTIONS_GHC -fno-warn-incomplete-patterns #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Control/Concurrent/Link/Internals.hs b/src/TorDNSEL/Control/Concurrent/Link/Internals.hs index 8107481..cf83cba 100644 --- a/src/TorDNSEL/Control/Concurrent/Link/Internals.hs +++ b/src/TorDNSEL/Control/Concurrent/Link/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-ignore-asserts #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/DNS/Internals.hs b/src/TorDNSEL/DNS/Internals.hs index 735d7a8..b80b170 100644 --- a/src/TorDNSEL/DNS/Internals.hs +++ b/src/TorDNSEL/DNS/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards #-} {-# OPTIONS_GHC -fno-warn-unused-imports #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/DNS/Server/Internals.hs b/src/TorDNSEL/DNS/Server/Internals.hs index 622de9b..8ab3637 100644 --- a/src/TorDNSEL/DNS/Server/Internals.hs +++ b/src/TorDNSEL/DNS/Server/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-warn-incomplete-patterns #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Directory/Internals.hs b/src/TorDNSEL/Directory/Internals.hs index 7dc1eb2..154b30c 100644 --- a/src/TorDNSEL/Directory/Internals.hs +++ b/src/TorDNSEL/Directory/Internals.hs @@ -1,5 +1,3 @@ -{-# LANGUAGE PatternGuards, TypeSynonymInstances, FlexibleContexts #-} - ----------------------------------------------------------------------------- -- | -- Module : TorDNSEL.Directory.Internals diff --git a/src/TorDNSEL/Directory/Tests.hs b/src/TorDNSEL/Directory/Tests.hs index 9a895b6..f9b8c45 100644 --- a/src/TorDNSEL/Directory/Tests.hs +++ b/src/TorDNSEL/Directory/Tests.hs @@ -1,5 +1,3 @@ -{-# OPTIONS_GHC -fglasgow-exts #-} - ----------------------------------------------------------------------------- -- | -- Module : TorDNSEL.Directory.Tests diff --git a/src/TorDNSEL/Document.hs b/src/TorDNSEL/Document.hs index 52ea9c9..50c986c 100644 --- a/src/TorDNSEL/Document.hs +++ b/src/TorDNSEL/Document.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, FlexibleContexts #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/ExitTest/Initiator/Internals.hs b/src/TorDNSEL/ExitTest/Initiator/Internals.hs index a63e25f..d4538df 100644 --- a/src/TorDNSEL/ExitTest/Initiator/Internals.hs +++ b/src/TorDNSEL/ExitTest/Initiator/Internals.hs @@ -1,11 +1,4 @@ -{-# LANGUAGE PatternGuards, BangPatterns, Rank2Types #-} -{-# OPTIONS_GHC -fno-warn-type-defaults -fglasgow-exts #-} --- XXX: We use -fglasgow-exts here as it is not possible to specify LANGUAGE --- pragmas for different GHC versions using CPP. --- Otherwise, we would add on GHC 6.10: --- ScopedTypeVariables --- and on GHC 6.8: --- PatternSignatures +{-# OPTIONS_GHC -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/ExitTest/Server/Internals.hs b/src/TorDNSEL/ExitTest/Server/Internals.hs index b6aa705..97d1f8e 100644 --- a/src/TorDNSEL/ExitTest/Server/Internals.hs +++ b/src/TorDNSEL/ExitTest/Server/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, BangPatterns #-} {-# OPTIONS_GHC -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Log/Internals.hsc b/src/TorDNSEL/Log/Internals.hsc index 7c5b490..0b26873 100644 --- a/src/TorDNSEL/Log/Internals.hsc +++ b/src/TorDNSEL/Log/Internals.hsc @@ -1,5 +1,4 @@ -{-# LANGUAGE ForeignFunctionInterface, TypeSynonymInstances, - OverlappingInstances, FlexibleInstances #-} +{-# LANGUAGE ForeignFunctionInterface, OverlappingInstances #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Main.hsc b/src/TorDNSEL/Main.hsc index 4d4092e..e612de0 100644 --- a/src/TorDNSEL/Main.hsc +++ b/src/TorDNSEL/Main.hsc @@ -1,4 +1,4 @@ -{-# LANGUAGE PatternGuards, BangPatterns, ForeignFunctionInterface, CPP #-} +{-# LANGUAGE ForeignFunctionInterface, CPP #-} {-# OPTIONS_GHC -fno-warn-type-defaults -fno-warn-missing-fields -fno-warn-orphans #-} diff --git a/src/TorDNSEL/NetworkState/Internals.hs b/src/TorDNSEL/NetworkState/Internals.hs index 32b4a42..c42cae7 100644 --- a/src/TorDNSEL/NetworkState/Internals.hs +++ b/src/TorDNSEL/NetworkState/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, BangPatterns #-} {-# OPTIONS_GHC -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/NetworkState/Storage/Internals.hs b/src/TorDNSEL/NetworkState/Storage/Internals.hs index fd9a04b..79481f6 100644 --- a/src/TorDNSEL/NetworkState/Storage/Internals.hs +++ b/src/TorDNSEL/NetworkState/Storage/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE PatternGuards, FlexibleContexts #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Random.hs b/src/TorDNSEL/Random.hs index 69c254d..a9f5a8c 100644 --- a/src/TorDNSEL/Random.hs +++ b/src/TorDNSEL/Random.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE ForeignFunctionInterface, ScopedTypeVariables #-} +{-# LANGUAGE ForeignFunctionInterface #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Socks/Internals.hs b/src/TorDNSEL/Socks/Internals.hs index d6c91f7..f514c44 100644 --- a/src/TorDNSEL/Socks/Internals.hs +++ b/src/TorDNSEL/Socks/Internals.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE GeneralizedNewtypeDeriving, DeriveDataTypeable #-} {-# OPTIONS_GHC -fno-warn-unused-binds #-} ----------------------------------------------------------------------------- diff --git a/src/TorDNSEL/Statistics/Internals.hs b/src/TorDNSEL/Statistics/Internals.hs index e24c745..cc0f799 100644 --- a/src/TorDNSEL/Statistics/Internals.hs +++ b/src/TorDNSEL/Statistics/Internals.hs @@ -1,5 +1,4 @@ -{-# LANGUAGE BangPatterns #-} -{-# OPTIONS_GHC -fglasgow-exts -fno-warn-type-defaults #-} +{-# OPTIONS_GHC -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/TorControl/Internals.hs b/src/TorDNSEL/TorControl/Internals.hs index dba1e85..2ea2e16 100644 --- a/src/TorDNSEL/TorControl/Internals.hs +++ b/src/TorDNSEL/TorControl/Internals.hs @@ -1,13 +1,5 @@ -{-# LANGUAGE PatternGuards, MultiParamTypeClasses, ExistentialQuantification, - FlexibleContexts, FlexibleInstances, - DeriveDataTypeable #-} -{-# OPTIONS_GHC -fno-warn-type-defaults -fglasgow-exts #-} --- XXX: We use -fglasgow-exts here as it is not possible to specify LANGUAGE --- pragmas for different GHC versions using CPP. --- Otherwise, we would add on GHC 6.10: --- ScopedTypeVariables --- and on GHC 6.8: --- PatternSignatures +{-# LANGUAGE ExistentialQuantification #-} +{-# OPTIONS_GHC -fno-warn-type-defaults #-} ----------------------------------------------------------------------------- -- | diff --git a/src/TorDNSEL/Util.hsc b/src/TorDNSEL/Util.hsc index 89837cd..57ada86 100644 --- a/src/TorDNSEL/Util.hsc +++ b/src/TorDNSEL/Util.hsc @@ -1,7 +1,4 @@ -{-# LANGUAGE PatternGuards, BangPatterns, ForeignFunctionInterface, - TypeSynonymInstances, OverlappingInstances, - UndecidableInstances, FlexibleInstances, MultiParamTypeClasses, - GeneralizedNewtypeDeriving, FlexibleContexts #-} +{-# LANGUAGE ForeignFunctionInterface, OverlappingInstances, UndecidableInstances #-} {-# OPTIONS_GHC -fno-warn-type-defaults -fno-warn-orphans -Wwarn #-} -- ^^^^^^ -- XXX: findSubstrings is deprecated diff --git a/tordnsel.cabal b/tordnsel.cabal index 23fa628..7e8d015 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -1,71 +1,84 @@ Name: TorDNSEL Version: 0.1.1-dev Synopsis: provides a DNSBL-style interface for detecting Tor exit nodes -Description: TorDNSEL implements a design for a DNSBL-style interface for - detecting connections exiting the Tor network. This design and its rationale - is described at <https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt>. +Description: + TorDNSEL implements a design for a DNSBL-style interface for detecting + connections exiting the Tor network. This design and its rationale is + described at + <https://gitweb.torproject.org/tordnsel.git/tree/doc/torel-design.txt>. License: PublicDomain License-File: LICENSE Homepage: http://p56soo2ibjkx23xo.onion/ -Package-URL: https://archive.torproject.org/tor-package-archive/tordnsel/tordnsel-0.1.1.… +Package-URL: https://archive.torproject.org/tor-package-archive/tordnsel/tordnsel-0.1.1.… Author: tup Maintainer: tup.tuple(a)googlemail.com, lunar(a)debian.org, andrew(a)torproject.org Build-Type: Simple Build-Depends: base>=2.0, network>=2.0, mtl>=1.0, unix>=1.0, stm>=2.0, - time>=1.0, HUnit>=1.1, binary>=0.4, bytestring>=0.9, array>=0.1, directory>=1.0, - containers>=0.1, deepseq >= 1.3 + time>=1.0, HUnit>=1.1, binary>=0.4, bytestring>=0.9, array>=0.1, directory>=1.0, + containers>=0.1, deepseq >= 1.3 Tested-With: GHC==6.6, GHC==6.8, GHC==6.10, GHC==6.12 Data-Files: config/tordnsel.conf.sample, contrib/cacti-input.pl, - contrib/tordnsel-init.d-script.sample, doc/tordnsel.8 + contrib/tordnsel-init.d-script.sample, doc/tordnsel.8 Executable: tordnsel Main-Is: tordnsel.hs -Other-Modules: TorDNSEL.Config, - TorDNSEL.Config.Internals, - TorDNSEL.Control.Concurrent.Link, - TorDNSEL.Control.Concurrent.Link.Internals, - TorDNSEL.Control.Concurrent.Util, - TorDNSEL.Directory, - TorDNSEL.Directory.Internals, - TorDNSEL.DistinctQueue, - TorDNSEL.DNS, - TorDNSEL.DNS.Internals, - TorDNSEL.DNS.Server, - TorDNSEL.DNS.Server.Internals, - TorDNSEL.Document, - TorDNSEL.ExitTest.Initiator, - TorDNSEL.ExitTest.Initiator.Internals, - TorDNSEL.ExitTest.Request, - TorDNSEL.ExitTest.Server, - TorDNSEL.ExitTest.Server.Internals, - TorDNSEL.Log, - TorDNSEL.Log.Internals, - TorDNSEL.Main, - TorDNSEL.NetworkState, - TorDNSEL.NetworkState.Internals, - TorDNSEL.NetworkState.Storage, - TorDNSEL.NetworkState.Storage.Internals, - TorDNSEL.NetworkState.Types, - TorDNSEL.Random, - TorDNSEL.Socks, - TorDNSEL.Socks.Internals, - TorDNSEL.Statistics, - TorDNSEL.Statistics.Internals, - TorDNSEL.TorControl, - TorDNSEL.TorControl.Internals, +Other-Modules: TorDNSEL.Config + TorDNSEL.Config.Internals + TorDNSEL.Control.Concurrent.Link + TorDNSEL.Control.Concurrent.Link.Internals + TorDNSEL.Control.Concurrent.Util + TorDNSEL.Directory + TorDNSEL.Directory.Internals + TorDNSEL.DistinctQueue + TorDNSEL.DNS + TorDNSEL.DNS.Internals + TorDNSEL.DNS.Server + TorDNSEL.DNS.Server.Internals + TorDNSEL.Document + TorDNSEL.ExitTest.Initiator + TorDNSEL.ExitTest.Initiator.Internals + TorDNSEL.ExitTest.Request + TorDNSEL.ExitTest.Server + TorDNSEL.ExitTest.Server.Internals + TorDNSEL.Log + TorDNSEL.Log.Internals + TorDNSEL.Main + TorDNSEL.NetworkState + TorDNSEL.NetworkState.Internals + TorDNSEL.NetworkState.Storage + TorDNSEL.NetworkState.Storage.Internals + TorDNSEL.NetworkState.Types + TorDNSEL.Random + TorDNSEL.Socks + TorDNSEL.Socks.Internals + TorDNSEL.Statistics + TorDNSEL.Statistics.Internals + TorDNSEL.TorControl + TorDNSEL.TorControl.Internals TorDNSEL.Util HS-Source-Dirs: src Includes: sys/types.h, unistd.h, sysexits.h, netinet/in.h, openssl/rand.h Extra-Libraries: crypto GHC-Options: -O2 -Wall -Werror CPP-Options: -DVERSION="0.1.1-dev" +Extensions: FlexibleContexts + FlexibleInstances + TypeSynonymInstances + MultiParamTypeClasses + PatternGuards + BangPatterns + ViewPatterns + ScopedTypeVariables + DeriveDataTypeable + GeneralizedNewtypeDeriving + Rank2Types Executable: runtests Buildable: False Main-Is: runtests.hs -Other-Modules: TorDNSEL.Config.Tests, - TorDNSEL.Directory.Tests, - TorDNSEL.DNS.Tests, +Other-Modules: TorDNSEL.Config.Tests + TorDNSEL.Directory.Tests + TorDNSEL.DNS.Tests TorDNSEL.DNS.Server.Tests HS-Source-Dirs: src Includes: netinet/in.h, openssl/rand.h

1 0

[tordnsel/master] network-2.3 compat
by arlo＠torproject.org 05 Mar '16

05 Mar '16

commit 921f6d9889335da34271efae48e1d27dc86420fe Author: Arlo Breault <arlolra(a)gmail.com> Date: Fri Mar 4 12:53:16 2016 -0800 network-2.3 compat --- src/TorDNSEL/Util.hsc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/TorDNSEL/Util.hsc b/src/TorDNSEL/Util.hsc index beee747..89837cd 100644 --- a/src/TorDNSEL/Util.hsc +++ b/src/TorDNSEL/Util.hsc @@ -531,6 +531,10 @@ bindListeningUnixDomainStreamSocket sockPath mode = do listen sock sOMAXCONN return sock +-- network-2.3 compat +-- +deriving instance Ord SockAddr + -------------------------------------------------------------------------------- -- Monads

1 0

[tordnsel/master] import CInt constructors
by arlo＠torproject.org 05 Mar '16

05 Mar '16

commit 3b1cf52e377f0ef9fe3daae3f396f545668897f8 Author: David Kaloper <david(a)numm.org> Date: Fri Oct 11 18:45:25 2013 +0200 import CInt constructors --- src/TorDNSEL/Log/Internals.hsc | 2 +- src/TorDNSEL/Main.hsc | 2 +- src/TorDNSEL/Random.hs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/TorDNSEL/Log/Internals.hsc b/src/TorDNSEL/Log/Internals.hsc index 7d7a2d8..7c5b490 100644 --- a/src/TorDNSEL/Log/Internals.hsc +++ b/src/TorDNSEL/Log/Internals.hsc @@ -33,7 +33,7 @@ import Data.Bits ((.|.)) import qualified Data.ByteString.Char8 as B import Data.List (foldl') import Data.Time (UTCTime, getCurrentTime) -import Foreign.C (CString, CInt, withCString) +import Foreign.C (CString, CInt(..), withCString) import System.IO (Handle, stdout, stderr, openFile, IOMode(AppendMode), hFlush, hClose) import System.IO.Unsafe (unsafePerformIO) diff --git a/src/TorDNSEL/Main.hsc b/src/TorDNSEL/Main.hsc index 3037ee7..4d4092e 100644 --- a/src/TorDNSEL/Main.hsc +++ b/src/TorDNSEL/Main.hsc @@ -108,7 +108,7 @@ import System.Posix.Types (UserID, GroupID) import System.Posix.User ( getEffectiveUserID, UserEntry(userID), GroupEntry(groupID) , getUserEntryForName, getGroupEntryForName, setUserID, setGroupID ) -import Foreign.C (CString, CInt, withCString) +import Foreign.C (CString, CInt(..), withCString) import TorDNSEL.Config import TorDNSEL.Control.Concurrent.Link diff --git a/src/TorDNSEL/Random.hs b/src/TorDNSEL/Random.hs index 8464223..69c254d 100644 --- a/src/TorDNSEL/Random.hs +++ b/src/TorDNSEL/Random.hs @@ -26,7 +26,7 @@ import System.Directory (doesFileExist) import System.IO (Handle, openFile, IOMode(ReadMode)) import Foreign (Ptr, Word8, withForeignPtr, plusPtr) -import Foreign.C.Types (CInt) +import Foreign.C.Types (CInt(..)) import TorDNSEL.Util

1 0

[tordnsel/master] remove the extra Ord instance
by arlo＠torproject.org 05 Mar '16

05 Mar '16

commit ead3f98a9d38c1221c6af096ca10f8e1479cee9c Author: David Kaloper <david(a)numm.org> Date: Thu Aug 8 04:07:08 2013 +0200 remove the extra Ord instance --- src/TorDNSEL/Util.hsc | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/TorDNSEL/Util.hsc b/src/TorDNSEL/Util.hsc index 76c6525..beee747 100644 --- a/src/TorDNSEL/Util.hsc +++ b/src/TorDNSEL/Util.hsc @@ -531,15 +531,6 @@ bindListeningUnixDomainStreamSocket sockPath mode = do listen sock sOMAXCONN return sock -instance Ord SockAddr where - SockAddrInet port1 addr1 `compare` SockAddrInet port2 addr2 = - case addr1 `compare` addr2 of - EQ -> port1 `compare` port2 - other -> other - SockAddrUnix path1 `compare` SockAddrUnix path2 = path1 `compare` path2 - SockAddrInet _ _ `compare` SockAddrUnix _ = LT - SockAddrUnix _ `compare` SockAddrInet _ _ = GT - -------------------------------------------------------------------------------- -- Monads

1 0

[tordnsel/master] remove internal Control.DeepSeq
by arlo＠torproject.org 05 Mar '16

05 Mar '16

commit d210b013e36b46d1c16927aa22e45c7fe05bd7f5 Author: David Kaloper <david(a)numm.org> Date: Tue Oct 29 05:09:36 2013 +0100 remove internal Control.DeepSeq --- src/TorDNSEL/DNS/Internals.hs | 61 ++++++++++++++++++----------------------- src/TorDNSEL/DeepSeq.hs | 39 -------------------------- src/TorDNSEL/Socks/Internals.hs | 8 ++---- src/TorDNSEL/Util.hsc | 14 +--------- tordnsel.cabal | 3 +- 5 files changed, 31 insertions(+), 94 deletions(-) diff --git a/src/TorDNSEL/DNS/Internals.hs b/src/TorDNSEL/DNS/Internals.hs index 54d1c08..735d7a8 100644 --- a/src/TorDNSEL/DNS/Internals.hs +++ b/src/TorDNSEL/DNS/Internals.hs @@ -63,6 +63,7 @@ import qualified Control.Exception as E import Control.Monad (when, unless, replicateM, liftM2, liftM3, forM) import qualified Control.Monad.State as S import Control.Monad.Trans (lift) +import Control.DeepSeq import Data.Bits ((.|.), (.&.), xor, shiftL, shiftR, testBit, setBit) import Data.List (foldl') import qualified Data.ByteString as B @@ -81,7 +82,6 @@ import Data.Binary.Get (runGet, getWord16be, getByteString, bytesRead, lookAhead, skip, isEmpty) import Data.Binary.Put (runPut, putWord16be, putByteString, PutM) -import TorDNSEL.DeepSeq import TorDNSEL.Util -------------------------------------------------------------------------------- @@ -295,11 +295,11 @@ data Message = Message msgAdditional :: {-# UNPACK #-} ![ResourceRecord] } deriving (Eq, Show) -instance DeepSeq Message where - deepSeq (Message a b c d e f g h i j k l m n) = - deepSeq a . deepSeq b . deepSeq c . deepSeq d . deepSeq e . deepSeq f . - deepSeq g . deepSeq h . deepSeq i . deepSeq j . deepSeq k . deepSeq l . - deepSeq m $ deepSeq n +instance NFData Message where + rnf !msg = msgQuestion msg `deepseq` + msgAnswers msg `deepseq` + msgAuthority msg `deepseq` + msgAdditional msg `deepseq` () instance BinaryPacket Message where getPacket pkt = do @@ -365,8 +365,8 @@ data Question = Question qClass :: {-# UNPACK #-} !Class } deriving (Eq, Show) -instance DeepSeq Question where - deepSeq (Question a b c) = deepSeq a . deepSeq b $ deepSeq c +instance NFData Question where + rnf !q = rnf (qName q) instance BinaryPacket Question where getPacket pkt = liftM3 Question (getPacket pkt) get get @@ -436,6 +436,14 @@ data ResourceRecord rrData :: {-# UNPACK #-} !ByteString } deriving (Eq, Show) +instance NFData ResourceRecord where + rnf !rr = rrName rr `deepseq` + case rr of + A{} -> aAddr rr `deepseq` () + NS{} -> nsDName rr `deepseq` () + SOA{} -> soaMName rr `deepseq` soaRName rr `deepseq` () + _ -> () + instance BinaryPacket ResourceRecord where getPacket pkt = do name <- getPacket pkt @@ -493,21 +501,12 @@ instance BinaryPacket ResourceRecord where putByteString rData incrOffset (10 + B.length rData) -instance DeepSeq ResourceRecord where - deepSeq (A a b c) = deepSeq a . deepSeq b $ deepSeq c - deepSeq (NS a b c) = deepSeq a . deepSeq b $ deepSeq c - deepSeq (SOA a b c d e f g h i) = - deepSeq a . deepSeq b . deepSeq c . deepSeq d . deepSeq e . - deepSeq f . deepSeq g . deepSeq h $ deepSeq i - deepSeq (UnsupportedResourceRecord a b c d e) = - deepSeq a . deepSeq b . deepSeq c . deepSeq d $ deepSeq e - -- | A domain name. newtype DomainName = DomainName [Label] deriving (Eq, Show) -instance DeepSeq DomainName where - deepSeq (DomainName ls) = deepSeq ls +instance NFData DomainName where + rnf (DomainName ls) = rnf ls instance BinaryPacket DomainName where -- Read a DomainName as a sequence of 'Label's ending with either a null label @@ -545,6 +544,8 @@ instance BinaryPacket DomainName where newtype Label = Label { unLabel :: ByteString } deriving (Eq, Ord, Show) +instance NFData Label where + instance Binary Label where get = do len <- getWord8 @@ -554,9 +555,6 @@ instance Binary Label where putWord8 . fromIntegral . B.length $ label putByteString label -instance DeepSeq Label where - deepSeq (Label bs) = deepSeq bs - -- | A response code set by the name server. data RCode = NoError -- ^ No error condition. @@ -570,7 +568,7 @@ data RCode -- operation for policy reasons. deriving (Eq, Show) -instance DeepSeq RCode where deepSeq = seq +instance NFData RCode where -- | Specifies the kind of query in a message set by the originator. data OpCode @@ -579,7 +577,7 @@ data OpCode | ServerStatusRequest -- ^ A server status request. deriving (Eq, Show) -instance DeepSeq OpCode where deepSeq = seq +instance NFData OpCode where -- | The TYPE or QTYPE values that appear in resource records or questions, -- respectively. @@ -591,6 +589,8 @@ data Type | UnsupportedType {-# UNPACK #-} !Word16 -- ^ Any other type. deriving (Eq, Show) +instance NFData Type where + instance Binary Type where get = do t <- get @@ -607,13 +607,6 @@ instance Binary Type where put TAny = putWord16be 255 put (UnsupportedType t) = put t -instance DeepSeq Type where - deepSeq TA = id - deepSeq TNS = id - deepSeq TAny = id - deepSeq TSOA = id - deepSeq (UnsupportedType t) = deepSeq t - -- | The CLASS or QCLASS values that appear in resource records or questions, -- respectively. data Class @@ -622,6 +615,8 @@ data Class deriving (Eq, Show) -- XXX support * +instance NFData Class where + instance Binary Class where get = do c <- get @@ -631,7 +626,3 @@ instance Binary Class where put IN = putWord16be 1 put (UnsupportedClass c) = put c - -instance DeepSeq Class where - deepSeq IN = id - deepSeq (UnsupportedClass c) = deepSeq c diff --git a/src/TorDNSEL/DeepSeq.hs b/src/TorDNSEL/DeepSeq.hs deleted file mode 100644 index 8e28314..0000000 --- a/src/TorDNSEL/DeepSeq.hs +++ /dev/null @@ -1,39 +0,0 @@ ------------------------------------------------------------------------------ --- | --- Module : TorDNSEL.DeepSeq --- License : Public domain (see LICENSE) --- --- Maintainer : tup.tuple(a)googlemail.com --- Stability : alpha --- Portability : portable --- --- Deep strict evaluation. --- ------------------------------------------------------------------------------ - -module TorDNSEL.DeepSeq ( - DeepSeq(..) - , ($!!) - ) where - -import Data.ByteString (ByteString) -import Data.List (foldl') -import Data.Word (Word16, Word32) - --- | Deep strict evaluation. This is mainly used here to force any exceptional --- values contained in a data structure to show themselves. -class DeepSeq a where - deepSeq :: a -> b -> b - -infixr 0 `deepSeq`, $!! - -instance DeepSeq Bool where deepSeq = seq -instance DeepSeq Word16 where deepSeq = seq -instance DeepSeq Word32 where deepSeq = seq -instance DeepSeq ByteString where deepSeq = seq -instance DeepSeq a => DeepSeq [a] where - deepSeq = flip . foldl' . flip $ deepSeq - --- | Strict application, defined in terms of 'deepSeq'. -($!!) :: DeepSeq a => (a -> b) -> a -> b -f $!! x = x `deepSeq` f x diff --git a/src/TorDNSEL/Socks/Internals.hs b/src/TorDNSEL/Socks/Internals.hs index e556bf9..d6c91f7 100644 --- a/src/TorDNSEL/Socks/Internals.hs +++ b/src/TorDNSEL/Socks/Internals.hs @@ -49,11 +49,12 @@ import Data.Typeable (Typeable) import Network.Socket (HostAddress) import System.IO (Handle, BufferMode(NoBuffering), hClose, hSetBuffering) +import Control.DeepSeq + import Data.Binary (Binary(..), getWord8, putWord8) import Data.Binary.Get (runGet) import Data.Binary.Put (runPut, putWord32be, putByteString) -import TorDNSEL.DeepSeq import TorDNSEL.Util -------------------------------------------------------------------------------- @@ -97,8 +98,7 @@ data Response = Response , soRespPort :: {-# UNPACK #-} !Port -- ^ The destination port. } -instance DeepSeq Response where - deepSeq (Response a b c) = deepSeq a . deepSeq b $ deepSeq c +instance NFData Response where -- | A Socks4 result code. data Result @@ -118,8 +118,6 @@ instance Show Result where show IdentdMismatch = "Request rejected because the client program and \ \identd report different user-ids" -instance DeepSeq Result where deepSeq = seq - -------------------------------------------------------------------------------- -- Serialization diff --git a/src/TorDNSEL/Util.hsc b/src/TorDNSEL/Util.hsc index a2357d8..76c6525 100644 --- a/src/TorDNSEL/Util.hsc +++ b/src/TorDNSEL/Util.hsc @@ -132,22 +132,13 @@ import Network.Socket import System.Directory (doesFileExist, removeFile) import System.Environment (getProgName) import System.Exit (exitWith, ExitCode) -import System.IO (hPutStr) +import System.IO (Handle, hPutStr) import System.IO.Error (isEOFError) import System.Posix.Files (setFileMode) import System.Posix.Types (FileMode) import Text.Printf (printf) - -import GHC.Handle - (wantReadableHandle, fillReadBuffer, readCharFromBuffer, ioe_EOF) -import GHC.IOBase - ( Handle, Handle__(..), Buffer(..), readIORef, writeIORef - , BufferMode(NoBuffering) ) - import Data.Binary (Binary(..)) -import TorDNSEL.DeepSeq - #include <netinet/in.h> -------------------------------------------------------------------------------- @@ -613,9 +604,6 @@ instance Binary Port where get = Port `fmap` get put = put . unPort -instance DeepSeq Port where - deepSeq = seq . unPort - -- | Parse a port, returning the result or 'throwError' in the monad if parsing -- fails. parsePort :: MonadError ShowS m => ByteString -> m Port diff --git a/tordnsel.cabal b/tordnsel.cabal index c27fa2b..23fa628 100644 --- a/tordnsel.cabal +++ b/tordnsel.cabal @@ -13,7 +13,7 @@ Maintainer: tup.tuple(a)googlemail.com, lunar(a)debian.org, andrew(a)torproject.o Build-Type: Simple Build-Depends: base>=2.0, network>=2.0, mtl>=1.0, unix>=1.0, stm>=2.0, time>=1.0, HUnit>=1.1, binary>=0.4, bytestring>=0.9, array>=0.1, directory>=1.0, - containers>=0.1 + containers>=0.1, deepseq >= 1.3 Tested-With: GHC==6.6, GHC==6.8, GHC==6.10, GHC==6.12 Data-Files: config/tordnsel.conf.sample, contrib/cacti-input.pl, contrib/tordnsel-init.d-script.sample, doc/tordnsel.8 @@ -25,7 +25,6 @@ Other-Modules: TorDNSEL.Config, TorDNSEL.Control.Concurrent.Link, TorDNSEL.Control.Concurrent.Link.Internals, TorDNSEL.Control.Concurrent.Util, - TorDNSEL.DeepSeq, TorDNSEL.Directory, TorDNSEL.Directory.Internals, TorDNSEL.DistinctQueue,

1 0

[translation/torbutton-abouttbupdatedtd_completed] Update translations for torbutton-abouttbupdatedtd_completed
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit 57592b13377d2db50ab5d8bc599ced6431b704df Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 4 18:17:02 2016 +0000 Update translations for torbutton-abouttbupdatedtd_completed --- el/abouttbupdate.dtd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/el/abouttbupdate.dtd b/el/abouttbupdate.dtd new file mode 100644 index 0000000..2462974 --- /dev/null +++ b/el/abouttbupdate.dtd @@ -0,0 +1,6 @@ +<!ENTITY aboutTBUpdate.title "Αναβάθμιση του Tor Browser"> +<!ENTITY aboutTBUpdate.updated "Ο Tor Browser αναβαθμίστηκε."> +<!ENTITY aboutTBUpdate.linkPrefix "Για τις πιο πρόσφατες πληροφορίες για αυτή την έκδοση,"> +<!ENTITY aboutTBUpdate.linkLabel "επισκεφθείτε την ιστοσελίδα μας"> +<!ENTITY aboutTBUpdate.linkSuffix "."> +<!ENTITY aboutTBUpdate.changeLogHeading "Αλλαγές:">

1 0

[translation/torbutton-abouttbupdatedtd] Update translations for torbutton-abouttbupdatedtd
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit 12b843ba4ae87682687a803f2c2282f5567ddffb Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 4 18:16:58 2016 +0000 Update translations for torbutton-abouttbupdatedtd --- el/abouttbupdate.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/el/abouttbupdate.dtd b/el/abouttbupdate.dtd index 565f3cf..2462974 100644 --- a/el/abouttbupdate.dtd +++ b/el/abouttbupdate.dtd @@ -1,6 +1,6 @@ -<!ENTITY aboutTBUpdate.title "Tor Browser Update"> -<!ENTITY aboutTBUpdate.updated "Tor Browser has been updated."> -<!ENTITY aboutTBUpdate.linkPrefix "Για τις πιο πρόοσφατες πληροφορίες για αυτή την έκδοση,"> +<!ENTITY aboutTBUpdate.title "Αναβάθμιση του Tor Browser"> +<!ENTITY aboutTBUpdate.updated "Ο Tor Browser αναβαθμίστηκε."> +<!ENTITY aboutTBUpdate.linkPrefix "Για τις πιο πρόσφατες πληροφορίες για αυτή την έκδοση,"> <!ENTITY aboutTBUpdate.linkLabel "επισκεφθείτε την ιστοσελίδα μας"> <!ENTITY aboutTBUpdate.linkSuffix "."> -<!ENTITY aboutTBUpdate.changeLogHeading "Changelog:"> +<!ENTITY aboutTBUpdate.changeLogHeading "Αλλαγές:">

1 0

[translation/abouttor-homepage_completed] Update translations for abouttor-homepage_completed
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit 87b56f61fd557e9cc1277ba5db52d3caa6ea508c Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 4 18:15:52 2016 +0000 Update translations for abouttor-homepage_completed --- el/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd index 25be8b3..9e39dcc 100644 --- a/el/aboutTor.dtd +++ b/el/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Σχετικά με το Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "ΟΜΩΣ, αυτός ο browser είναι παλιά έκδοση."> +<!ENTITY aboutTor.outOfDateTorOn.label "ΠΡΟΣΟΧΗ: αυτός ο browser είναι ξεπερασμένος."> <!ENTITY aboutTor.outOfDateTorOff.label "ΕΠΙΣΗΣ, αυτός ο browser είναι παλιά έκδοση."> <!ENTITY aboutTor.outOfDate2.label "Πατήστε το κρεμμύδι και μετά επιλέξτε "Έλεγχος για Αναβάθμιση του Tor Browser". "> <!ENTITY aboutTor.check.label "Δοκιμή Ρυθμίσεων του Δικτύου Tor"> -<!ENTITY aboutTor.success.label "Συγχαρητήρια!"> -<!ENTITY aboutTor.success2.label "Αυτός ο browser είναι ρυθμισμένος να χρησιμοποιεί το Tor."> +<!ENTITY aboutTor.success.label "Καλωσήλθες στον Tor Browser"> +<!ENTITY aboutTor.success2.label "Συνδεθήκαμε στο δίκτυο Tor."> <!ENTITY aboutTor.success3.label "Είστε πλέον ελεύθερος να πλογηθείτε ανώνυμα στο Διαδίκτυο."> <!ENTITY aboutTor.failure.label "Κάτι πήγε στραβά!"> <!ENTITY aboutTor.failure2.label "Το Tor δεν λειτουργεί σε αυτόν τον browser.">

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit 8138d6c7ba49d1a565e7604a7074bf794da941b8 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 4 18:15:48 2016 +0000 Update translations for abouttor-homepage --- el/aboutTor.dtd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/el/aboutTor.dtd b/el/aboutTor.dtd index c0dae05..9e39dcc 100644 --- a/el/aboutTor.dtd +++ b/el/aboutTor.dtd @@ -6,14 +6,14 @@ <!ENTITY aboutTor.title "Σχετικά με το Tor"> -<!ENTITY aboutTor.outOfDateTorOn.label "WARNING: this browser is out of date."> +<!ENTITY aboutTor.outOfDateTorOn.label "ΠΡΟΣΟΧΗ: αυτός ο browser είναι ξεπερασμένος."> <!ENTITY aboutTor.outOfDateTorOff.label "ΕΠΙΣΗΣ, αυτός ο browser είναι παλιά έκδοση."> <!ENTITY aboutTor.outOfDate2.label "Πατήστε το κρεμμύδι και μετά επιλέξτε "Έλεγχος για Αναβάθμιση του Tor Browser". "> <!ENTITY aboutTor.check.label "Δοκιμή Ρυθμίσεων του Δικτύου Tor"> -<!ENTITY aboutTor.success.label "Welcome to Tor Browser"> -<!ENTITY aboutTor.success2.label "Connected to the Tor network."> +<!ENTITY aboutTor.success.label "Καλωσήλθες στον Tor Browser"> +<!ENTITY aboutTor.success2.label "Συνδεθήκαμε στο δίκτυο Tor."> <!ENTITY aboutTor.success3.label "Είστε πλέον ελεύθερος να πλογηθείτε ανώνυμα στο Διαδίκτυο."> <!ENTITY aboutTor.failure.label "Κάτι πήγε στραβά!"> <!ENTITY aboutTor.failure2.label "Το Tor δεν λειτουργεί σε αυτόν τον browser.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 05 Mar '16

05 Mar '16

commit ced7f322780547e00b43f2a67ff4e018b2c8273d Author: Translation commit bot <translation(a)torproject.org> Date: Fri Mar 4 18:15:39 2016 +0000 Update translations for tor-launcher-network-settings --- el/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/el/network-settings.dtd b/el/network-settings.dtd index d776892..5b71f94 100644 --- a/el/network-settings.dtd +++ b/el/network-settings.dtd @@ -15,7 +15,7 @@ <!ENTITY torSettings.configurePrompt1 "Σύνδεση στο Internet αυτού του υπολογιστή λογοκρίνεται ή προσεγγίζεται"> <!ENTITY torSettings.configurePrompt2 "I need to configure bridge or local proxy settings before I connect to the Tor network."> <!ENTITY torSettings.configure "Ρύθμιση "> -<!ENTITY torSettings.connectPrompt2 "I would like to make a direct connection to the Tor network."> +<!ENTITY torSettings.connectPrompt2 "Θέλω να συνδεθώ απ'ευθείας στο δίκτυο Tor."> <!ENTITY torSettings.connectPrompt3 "Αυτό θα λειτουργήσει στις περισσότερες περιπτώσεις."> <!ENTITY torSettings.connect "Σύνδεση">

1 0