From 51393e11654981de0350ad5f800d0b5a2c52dfc5 Mon Sep 17 00:00:00 2001
From: Michael Zillgith <michael.zillgith@mz-automation.de>
Date: Mon, 9 Dec 2019 16:38:28 +0100
Subject: [PATCH] - updated version number to 2.2.1

---
 CHANGELOG                                | 10 ++++++++++
 lib60870-C/CMakeLists.txt                |  2 +-
 lib60870-C/src/inc/api/iec60870_common.h |  4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index fdcca10d..47bb4375 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+Changes to version 2.2.1
+------------------------
+- CS104 slave: fixed problems in queue handling (#67)
+- added missing return statement in CS101_ASDU_addPayload(#68)
+- CS101_ASDU_addInformationObject now checks for correct object type
+- windows socket driver: fixed - fail to detect peer close when read from socket
+- fixed bug in BitString32 encoding (see #65)
+- fixed - null pointer access when calling CS104_Slave_destroy without server running before (issue #64)
+- added Bitstring32X_createEx functions to keep API backward compatible and allow setting of quality (issue #63)
+
 Changes to version 2.2.0
 ------------------------
 - CS 101/104 slave: improved stability when receiving corrupted messages
diff --git a/lib60870-C/CMakeLists.txt b/lib60870-C/CMakeLists.txt
index 6100d6b5..aa5efacb 100644
--- a/lib60870-C/CMakeLists.txt
+++ b/lib60870-C/CMakeLists.txt
@@ -12,7 +12,7 @@ ENABLE_TESTING()
 
 set(LIB_VERSION_MAJOR "2")
 set(LIB_VERSION_MINOR "2")
-set(LIB_VERSION_PATCH "0")
+set(LIB_VERSION_PATCH "1")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/third_party/cmake/modules/")
 
diff --git a/lib60870-C/src/inc/api/iec60870_common.h b/lib60870-C/src/inc/api/iec60870_common.h
index 045a3409..ec458e09 100644
--- a/lib60870-C/src/inc/api/iec60870_common.h
+++ b/lib60870-C/src/inc/api/iec60870_common.h
@@ -46,8 +46,8 @@ extern "C" {
 #define IEC_60870_5_104_DEFAULT_TLS_PORT 19998
 
 #define LIB60870_VERSION_MAJOR 2
-#define LIB60870_VERSION_MINOR 1
-#define LIB60870_VERSION_PATCH 0
+#define LIB60870_VERSION_MINOR 2
+#define LIB60870_VERSION_PATCH 1
 
 /**
  * \brief lib60870 version information