Merge branch 'develop' into master

CHANGELOG.md

@@ -0,0 +1,62 @@
+# Change Log
+
+## 2.2.0
+
+Features:
+* Introducing [microservices](README.md#microservices), base components for client features
+* #20 Enable/disable microservices in [configuration file](README.md#configuration-file)
+* #24 Gateway ports. Allow client to specify network listening interface on client features:
+  `-g` command line option or `gateway_ports` microservice options (`stream_listener` and `datagram_listener`)
+* Server as relay only: `-R` command line option
+
+Fixed bugs:
+* #23 Delegate server hostname resolution to proxy
+* #25 Fix server DOS on bogus connection
+* #26 Fix a hang when the client stops during the connection stage
+
+File configuration:
+* `http_proxy.credentials.reuse_ntlm` and `http_proxy.credentials.reuse_kerb`: boolean instead of string
+
+## 2.1.0
+
+Features:
+* TLS layer over circuit layer
+* HTTP proxy support (CONNECT method), cf. configuration file
+* HTTP proxy authentication support (Basic, Digest, NTLM [windows only], Negotiate), cf. configuration file
+* Basic shell through socket (-X and -Y options)
+* Server network interface option
+
+Fixed bugs:
+* Linux static link to libstdc++
+* Linux dependency to GLIBC2.14 (memcpy)
+* Stop behavior (signal instead of user input)
+* Port forwarding listening side on localhost only
+
+## 2.0.0
+
+/!\ BC break with version 1.\*.\*
+
+Features:
+* New network layer based on SSF network framework
+
+## 1.1.0
+Features:
+* ssfcp: file copy between client and server
+* Rename executables:
+  * SSF_Client -> ssfc
+  * SSF_Server -> ssfs
+
+Fixed bugs:
+* Crash issue due to exception when resolving endpoint
+* Exception safety
+* Windows compilation warnings (64bits)
+
+## 1.0.0
+Features:
+* Local and remote TCP port forwarding (-L and -R options)
+* Local and remote UDP port forwarding (-U and -V options)
+* Local and remote SOCKS server (-D and -F options)
+* Native relay protocol (-b option)
+* Multi platform (Windows, Linux and OSX)
+* TLS connection with the strongest cipher-suites
+* Standalone executables

CMakeLists.txt

@@ -3,14 +3,16 @@ set(project_name "SSF")
 project(${project_name})
 
 set(SSF_VERSION_MAJOR 2)
-set(SSF_VERSION_MINOR 1)
+set(SSF_VERSION_MINOR 2)
 set(SSF_VERSION_FIX 0)
 set(SSF_VERSION_BOUNCE 2)
 set(SSF_VERSION_TRANSPORT 1)
 
 set(SSF_VERSION "${SSF_VERSION_MAJOR}.${SSF_VERSION_MINOR}.${SSF_VERSION_FIX}")
 
-message("** SSF_VERSION ${SSF_VERSION}")
+message("** SSF_VERSION: ${SSF_VERSION}")
+
+message("** BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 
 # --- Options
 option(BUILD_UNIT_TESTS "Build SSF unit tests" ON)