Maj ghc 8.0 + add sock5 types

This commit is contained in:
Erèbe 2016-06-13 14:04:01 +02:00
parent dce0372c4b
commit 0bd70fd006
4 changed files with 11 additions and 12 deletions

View file

@ -6,8 +6,7 @@ module Main where
import Tunnel import Tunnel
import ClassyPrelude (ByteString, guard, readMay, import ClassyPrelude (ByteString, guard, readMay)
traceShowId)
import qualified Data.ByteString.Char8 as BC import qualified Data.ByteString.Char8 as BC
import Data.Maybe (fromMaybe) import Data.Maybe (fromMaybe)
import System.Console.CmdArgs import System.Console.CmdArgs

View file

@ -31,7 +31,6 @@ deriving instance Hashable N.SockAddr
data Protocol = UDP | TCP deriving (Show, Read) data Protocol = UDP | TCP deriving (Show, Read)
data UdpAppData = UdpAppData data UdpAppData = UdpAppData
{ appAddr :: N.SockAddr { appAddr :: N.SockAddr
, appSem :: MVar ByteString , appSem :: MVar ByteString

View file

@ -15,7 +15,7 @@
# resolver: # resolver:
# name: custom-snapshot # name: custom-snapshot
# location: "./custom-snapshot.yaml" # location: "./custom-snapshot.yaml"
resolver: lts-5.17 resolver: nightly-2016-06-12
# User packages to be built. # User packages to be built.
# Various formats can be used as shown in the example below. # Various formats can be used as shown in the example below.

View file

@ -28,6 +28,7 @@ library
, connection , connection
, hslogger , hslogger
, base64-bytestring >= 1.0 , base64-bytestring >= 1.0
, binary >= 0.7
default-language: Haskell2010 default-language: Haskell2010