Maj ghc 8.0 + add sock5 types

app/Main.hs

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

src/Protocols.hs

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

stack.yaml

@@ -1,5 +1,5 @@
 # This file was automatically generated by 'stack init'
-# 
+#
 # Some commonly used options have been documented as comments in this file.
 # For advanced use and comprehensive documentation of the format, please see:
 # http://docs.haskellstack.org/en/stable/yaml_configuration/
@@ -7,7 +7,7 @@
 # Resolver to choose a 'specific' stackage snapshot or a compiler version.
 # A snapshot resolver dictates the compiler version and the set of packages
 # to be used for project dependencies. For example:
-# 
+#
 # resolver: lts-3.5
 # resolver: nightly-2015-09-21
 # resolver: ghc-7.10.2
@@ -15,11 +15,11 @@
 # resolver:
 #  name: custom-snapshot
 #  location: "./custom-snapshot.yaml"
-resolver: lts-5.17
+resolver: nightly-2016-06-12
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.
-# 
+#
 # packages:
 # - some-directory
 # - https://example.com/foo/bar/baz-0.0.2.tar.gz
@@ -31,7 +31,7 @@ resolver: lts-5.17
 #  subdirs:
 #  - auto-update
 #  - wai
-# 
+#
 # A package marked 'extra-dep: true' will only be built if demanded by a
 # non-dependency (i.e. a user package), and its test suites and benchmarks
 # will not be run. This is useful for tweaking upstream packages.
@@ -49,18 +49,18 @@ extra-package-dbs: []
 
 # Control whether we use the GHC we find on the path
 # system-ghc: true
-# 
+#
 # Require a specific version of stack, using version ranges
 # require-stack-version: -any # Default
 # require-stack-version: ">=1.1"
-# 
+#
 # Override the architecture used by stack, especially useful on Windows
 # arch: i386
 # arch: x86_64
-# 
+#
 # Extra directories used by stack for building
 # extra-include-dirs: [/path/to/dir]
 # extra-lib-dirs: [/path/to/dir]
-# 
+#
 # Allow a newer minor version of GHC than the snapshot specifies
 # compiler-check: newer-minor

wstunnel.cabal

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