From f3fd0c54da64c54d77e1f86ce27b6873ba88c6ce Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Wed, 3 Aug 2016 16:21:46 +0300
Subject: [PATCH 01/56] ..

---
 Makefile       | 6 +++---
 cronosagent.sh | 5 ++---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index a6f8202..ba15702 100644
--- a/Makefile
+++ b/Makefile
@@ -13,9 +13,9 @@ ifeq ($(OS), Linux)
 endif
 
 ifeq ($(OS), Darwin)
-#  CFLAGS += \
-#    -Wno-deprecated-declarations \
-#    -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdk/MacOSX.sdk/usr/include/
+  CFLAGS += \
+    -Wno-deprecated-declarations
+#   -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdk/MacOSX.sdk/usr/include/
 #  LIBRARIES += \
 #    crypto
 endif
diff --git a/cronosagent.sh b/cronosagent.sh
index 64c4f5a..b5de2e5 100755
--- a/cronosagent.sh
+++ b/cronosagent.sh
@@ -1,7 +1,6 @@
-#!/bin/bash
+#!/bin/sh
 
-SCRIPT=$(readlink -f $0)
-DIRECTORY=$(dirname $SCRIPT)
+DIRECTORY=$(dirname $0)
 
 if [ -f $DIRECTORY/cronosagent.conf ]
 then

From f36fa3f32b034fef68720ab715ff53830724861f Mon Sep 17 00:00:00 2001
From: cyanide-burnout <cyanide.burnout@gmail.com>
Date: Wed, 3 Aug 2016 18:41:44 +0400
Subject: [PATCH 02/56] Enhanced cross-platform compatibility

---
 CronosAgent.c  |  5 ++++-
 Makefile       | 40 ++++++++++++++++++++++------------------
 cronosagent.sh |  3 ++-
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/CronosAgent.c b/CronosAgent.c
index 67ff0df..c8adb24 100644
--- a/CronosAgent.c
+++ b/CronosAgent.c
@@ -17,7 +17,10 @@
 #include <sys/time.h>
 #include <sys/socket.h>
 
-// #include <openssl/sha.h>
+#ifdef USE_OPENSSL
+#include <openssl/sha.h>
+#endif
+
 #ifndef HEADER_SHA_H
 #include "sha256.h"
 #define SHA256_DIGEST_LENGTH  SHA256_BLOCK_SIZE
diff --git a/Makefile b/Makefile
index ba15702..4bdb57f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,37 +1,41 @@
+USE_OPENSSL := no
+
 BUILD := $(shell date -u +%Y%m%d-%H%M%S)
 OS := $(shell uname -s)
 
 PREFIX = $(DESTDIR)/opt/CronosAgent
 
-DIRECTORIES = 
-
 ifeq ($(OS), Linux)
-  LIBRARIES += \
-    rt
-#  DEPENDENCIES = \
-#    openssl
+  FLAGS += -rdynamic
+  LIBRARIES += rt
+ifeq ($(USE_OPENSSL), yes)
+  FLAGS += -DUSE_OPENSSL
+  DEPENDENCIES += openssl
+endif
 endif
 
 ifeq ($(OS), Darwin)
-  CFLAGS += \
-    -Wno-deprecated-declarations
-#   -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdk/MacOSX.sdk/usr/include/
-#  LIBRARIES += \
-#    crypto
+  FLAGS += -Wno-deprecated-declarations
+ifeq ($(USE_OPENSSL), yes)
+  FLAGS += -DUSE_OPENSSL -I/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift-migrator/sdk/MacOSX.sdk/usr/include/
+  LIBRARIES += crypto
+endif
 endif
 
-OBJECTS = \
-  sha256.o \
-  CronosAgent.o
+OBJECTS = CronosAgent.o
 
-FLAGS := -g -fno-omit-frame-pointer -O3 -MMD $(foreach directory, $(DIRECTORIES), -I$(directory)) -DBUILD=\"$(BUILD)\"
-LIBS := $(foreach library, $(LIBRARIES), -l$(library))
+ifneq ($(USE_OPENSSL), yes)
+  OBJECTS += sha256.o
+endif
+
+FLAGS += -g -fno-omit-frame-pointer -O3 -MMD $(foreach directory, $(DIRECTORIES), -I$(directory)) -DBUILD=\"$(BUILD)\"
+LIBS += $(foreach library, $(LIBRARIES), -l$(library))
 
 CC = gcc
 CFLAGS += $(FLAGS) -std=gnu99
 
-ifeq ($(OS), Linux)
-  FLAGS += $(shell pkg-config --cflags $(DEPENDENCIES)) -rdynamic
+ifneq ($(strip $(DEPENDENCIES)),)
+  FLAGS += $(shell pkg-config --cflags $(DEPENDENCIES))
   LIBS += $(shell pkg-config --libs $(DEPENDENCIES))
 endif
 
diff --git a/cronosagent.sh b/cronosagent.sh
index b5de2e5..37bb4d5 100755
--- a/cronosagent.sh
+++ b/cronosagent.sh
@@ -5,7 +5,8 @@ DIRECTORY=$(dirname $0)
 if [ -f $DIRECTORY/cronosagent.conf ]
 then
   # Read configuration from text file
-  source $DIRECTORY/cronosagent.conf
+  # Dot is equivalent of bash's source
+  . $DIRECTORY/cronosagent.conf
 fi
 
 if [ -f /etc/config/cronosagent ]

From 06f9a400f66b3ae8c09ee4c14e8d7558ac50f0ee Mon Sep 17 00:00:00 2001
From: cyanide-burnout <cyanide.burnout@gmail.com>
Date: Wed, 3 Aug 2016 18:58:32 +0400
Subject: [PATCH 03/56] Removed unused dependencies

---
 OpenWRT/Makefile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index e6a1e81..93c73f4 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=cronosagent
 PKG_VERSION:=$(shell grep -o -E '[0-9]+' source/Version.h)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=+libstdcpp +libopenssl
+PKG_BUILD_DEPENDS:=
 X_SOURCE_DIR:=$(CURDIR)/source
 
 include $(INCLUDE_DIR)/package.mk
@@ -62,4 +62,3 @@ define Package/cronosagent/install
 endef
 
 $(eval $(call BuildPackage,cronosagent))
-

From 088035955e3a4b5047005bba3d2cd3479606c318 Mon Sep 17 00:00:00 2001
From: cyanide-burnout <cyanide.burnout@gmail.com>
Date: Wed, 3 Aug 2016 18:59:50 +0400
Subject: [PATCH 04/56] Clean up

---
 OpenWRT/Makefile | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index 93c73f4..87bd805 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -24,15 +24,10 @@ define Package/cronosagent/description
 endef
 
 define Build/Prepare
-	echo $(X_SOURCE_DIR)
 	mkdir -p $(PKG_BUILD_DIR)
 	$(CP) -R $(X_SOURCE_DIR)/* $(PKG_BUILD_DIR)/
 endef
 
-#define Build/Compile
-#	$(call Build/Compile/Default, -C $(PKG_BUILD_DIR) )
-#endef
-
 define Package/cronosagent/conffiles
 	/etc/config/cronosagent
 endef

From 3d79575f035041cef59845d69cc44b28dad48f5e Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@phi>
Date: Wed, 3 Aug 2016 18:33:47 +0300
Subject: [PATCH 05/56] Fixes

---
 Makefile         | 1 -
 OpenWRT/Makefile | 2 +-
 OpenWRT/build.sh | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 4bdb57f..25aa0b7 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ PREFIX = $(DESTDIR)/opt/CronosAgent
 
 ifeq ($(OS), Linux)
   FLAGS += -rdynamic
-  LIBRARIES += rt
 ifeq ($(USE_OPENSSL), yes)
   FLAGS += -DUSE_OPENSSL
   DEPENDENCIES += openssl
diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index 87bd805..4b49357 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cronosagent
-PKG_VERSION:=$(shell grep -o -E '[0-9]+' source/Version.h)
+PKG_VERSION:=$(shell grep -o -E '[0-9]+' $(CURDIR)/source/Version.h)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=
 X_SOURCE_DIR:=$(CURDIR)/source
diff --git a/OpenWRT/build.sh b/OpenWRT/build.sh
index 0336b1c..cb52553 100755
--- a/OpenWRT/build.sh
+++ b/OpenWRT/build.sh
@@ -39,7 +39,7 @@ then
 fi
 
 # Build package
-make package/$PACKAGE/compile V=99 2>&1 | tee $PROJECT/../build.log | grep -i error
+make package/$PACKAGE/compile V=ws 2>&1 | tee $PROJECT/../build.log | grep -i error
 
 # Copy built packages
 find bin -name ${PACKAGE}*.ipk | xargs -l -I {} mv {} $PROJECT/.. 

From ec037a2e0038d2abe576b6488bf3c1ca0a7e65c5 Mon Sep 17 00:00:00 2001
From: cyanide-burnout <cyanide.burnout@gmail.com>
Date: Thu, 4 Aug 2016 11:52:45 +0400
Subject: [PATCH 06/56] Finally to production

---
 OpenWRT/Makefile                            | 39 +++++++++++----------
 OpenWRT/controller/cronosagent.lua          |  1 -
 OpenWRT/init.d/cronosagent                  |  4 +++
 OpenWRT/model/cbi/cronosagent/configure.lua | 17 ++++++---
 Version.h                                   |  2 +-
 5 files changed, 38 insertions(+), 25 deletions(-)

diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index 4b49357..2a24bb2 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -17,10 +17,10 @@ DEPENDS:=
 endef
 
 define Package/cronosagent/description
-	CronosAgent for BrandMeister DMR Master Server
-	Allows to connect Radio Activity KAIROS Repetaters to BrandMeister DMR Master Server
-	Radio Activity KAIROS should have built-in feature of External Server Access
-	which is available on firmware customization 008 (Radio Amateur community)
+ CronosAgent for BrandMeister DMR Master Server
+ Allows to connect Radio Activity KAIROS Repetaters to BrandMeister DMR Master Server
+ Radio Activity KAIROS should have built-in feature of External Server Access
+ which is available on firmware customization 008 (Radio Amateur community)
 endef
 
 define Build/Prepare
@@ -28,20 +28,6 @@ define Build/Prepare
 	$(CP) -R $(X_SOURCE_DIR)/* $(PKG_BUILD_DIR)/
 endef
 
-define Package/cronosagent/conffiles
-	/etc/config/cronosagent
-endef
-
-define Package/cronosagent/postinst
-	#!/bin/sh
-	/etc/init.d/cronosagent enable
-endef
-
-define Package/cronosagent/prerm
-	#!/bin/sh
-	/etc/init.d/cronosagent disable
-endef
-
 define Package/cronosagent/install
 	$(INSTALL_DIR) $(1)/opt/CronosAgent
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -56,4 +42,21 @@ define Package/cronosagent/install
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/model/cbi/cronosagent/configure.lua $(1)/usr/lib/lua/luci/model/cbi/cronosagent/
 endef
 
+define Package/cronosagent/conffiles
+/etc/config/cronosagent
+endef
+
+define Package/cronosagent/postinst
+#!/bin/sh
+/etc/init.d/cronosagent enable
+exit 0
+endef
+
+define Package/cronosagent/prerm
+#!/bin/sh
+/etc/init.d/cronosagent stop
+/etc/init.d/cronosagent disable
+exit 0
+endef
+
 $(eval $(call BuildPackage,cronosagent))
diff --git a/OpenWRT/controller/cronosagent.lua b/OpenWRT/controller/cronosagent.lua
index 830fed0..d124873 100644
--- a/OpenWRT/controller/cronosagent.lua
+++ b/OpenWRT/controller/cronosagent.lua
@@ -10,5 +10,4 @@ function restartCronosAgent()
   luci.sys.init.stop("cronosagent")
   luci.sys.init.start("cronosagent")
   luci.http.write("Done!")
-  -- luci.http.redirect("/")
 end
diff --git a/OpenWRT/init.d/cronosagent b/OpenWRT/init.d/cronosagent
index c1dd6f7..29c63fe 100644
--- a/OpenWRT/init.d/cronosagent
+++ b/OpenWRT/init.d/cronosagent
@@ -10,3 +10,7 @@ start() {
 stop() {
   killall cronosagent
 }
+
+reload() {
+  restart
+}
\ No newline at end of file
diff --git a/OpenWRT/model/cbi/cronosagent/configure.lua b/OpenWRT/model/cbi/cronosagent/configure.lua
index a4043e4..b9056a4 100644
--- a/OpenWRT/model/cbi/cronosagent/configure.lua
+++ b/OpenWRT/model/cbi/cronosagent/configure.lua
@@ -1,4 +1,9 @@
 
+local function handleAferCommit()
+  luci.sys.init.stop("cronosagent")
+  luci.sys.init.start("cronosagent")
+end
+
 local map      = Map("cronosagent", "CronosAgent")
 local section  = map:section(TypedSection, "cronosagent", "Configuration")
 
@@ -7,11 +12,13 @@ local repeater = section:option(Value, "repeaterAddress", "Repeater Address", "A
 local server   = section:option(Value, "serverAddress",   "Server address",   "Address of BrandMeister DMR Server")
 local password = section:option(Value, "serverPassword",  "Password",         "Password to login to the server"   )
 
-number.datatype   = "range(1,16777215)"
-repeater.datatype = "ip4addr"
+number.datatype     = "range(1,16777215)"
+repeater.datatype   = "ip4addr"
 
-server.datatype   = "host"
-password.datatype = "string"
-password.password = true
+server.datatype     = "host"
+password.datatype   = "string"
+password.password   = true
+
+map.on_after_commit = handleAferCommit
 
 return map
\ No newline at end of file
diff --git a/Version.h b/Version.h
index 0322a78..e44780b 100644
--- a/Version.h
+++ b/Version.h
@@ -1 +1 @@
-#define VERSION 20160731
+#define VERSION 20160804

From 58afe56725cd7bff1b508ebc56d17fdaeb2f7ab5 Mon Sep 17 00:00:00 2001
From: cyanide-burnout <cyanide.burnout@gmail.com>
Date: Thu, 4 Aug 2016 11:53:20 +0400
Subject: [PATCH 07/56] Finally to production

---
 debian/changelog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bcdcaf1..6768df9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-cronosagent (20160731) none; urgency=low
+cronosagent (20160804) none; urgency=low
 
   * Daily build
 
- -- Artem Prilutskiy <cyanide.burnout@gmail.com>  Mon, 01 Aug 2016 14:12:35 +0400
+ -- Artem Prilutskiy <cyanide.burnout@gmail.com>  Thu, 04 Aug 2016 11:53:09 +0400
 

From 1df172463ecdf6764ef3f04f130f8120f5d8aafb Mon Sep 17 00:00:00 2001
From: cyanide-burnout <cyanide.burnout@gmail.com>
Date: Thu, 4 Aug 2016 12:05:45 +0400
Subject: [PATCH 08/56] Clean up

---
 OpenWRT/controller/cronosagent.lua          |  3 +--
 OpenWRT/model/cbi/cronosagent/configure.lua | 10 +++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/OpenWRT/controller/cronosagent.lua b/OpenWRT/controller/cronosagent.lua
index d124873..81b65ce 100644
--- a/OpenWRT/controller/cronosagent.lua
+++ b/OpenWRT/controller/cronosagent.lua
@@ -7,7 +7,6 @@ function index()
 end
 
 function restartCronosAgent()
-  luci.sys.init.stop("cronosagent")
-  luci.sys.init.start("cronosagent")
+  luci.sys.call("/etc/init.d/cronosagent restart")
   luci.http.write("Done!")
 end
diff --git a/OpenWRT/model/cbi/cronosagent/configure.lua b/OpenWRT/model/cbi/cronosagent/configure.lua
index b9056a4..f83fb6c 100644
--- a/OpenWRT/model/cbi/cronosagent/configure.lua
+++ b/OpenWRT/model/cbi/cronosagent/configure.lua
@@ -1,9 +1,4 @@
 
-local function handleAferCommit()
-  luci.sys.init.stop("cronosagent")
-  luci.sys.init.start("cronosagent")
-end
-
 local map      = Map("cronosagent", "CronosAgent")
 local section  = map:section(TypedSection, "cronosagent", "Configuration")
 
@@ -19,6 +14,7 @@ server.datatype     = "host"
 password.datatype   = "string"
 password.password   = true
 
-map.on_after_commit = handleAferCommit
-
+function map.on_after_commit(self)
+  luci.sys.call("/etc/init.d/cronosagent restart")
+end
 return map
\ No newline at end of file

From afd11a5218edcf7aaa17ce45291c15b418ef5f47 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@bucket.local>
Date: Thu, 4 Aug 2016 11:10:00 +0300
Subject: [PATCH 09/56] ..

---
 OpenWRT/model/cbi/cronosagent/configure.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenWRT/model/cbi/cronosagent/configure.lua b/OpenWRT/model/cbi/cronosagent/configure.lua
index f83fb6c..91e5c93 100644
--- a/OpenWRT/model/cbi/cronosagent/configure.lua
+++ b/OpenWRT/model/cbi/cronosagent/configure.lua
@@ -17,4 +17,5 @@ password.password   = true
 function map.on_after_commit(self)
   luci.sys.call("/etc/init.d/cronosagent restart")
 end
+
 return map
\ No newline at end of file

From 973e19240f51df9c38273e52603a2e83fa564de4 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@phi>
Date: Thu, 4 Aug 2016 11:18:57 +0300
Subject: [PATCH 10/56] Improved build.sh

---
 OpenWRT/build.sh | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/OpenWRT/build.sh b/OpenWRT/build.sh
index cb52553..8a45e25 100755
--- a/OpenWRT/build.sh
+++ b/OpenWRT/build.sh
@@ -6,9 +6,7 @@ PROJECT=$(pwd)/..
 OPENWRT=${HOME}/openwrt
 
 test -d $OPENWRT/package/$PACKAGE
-STATE=$?
-
-if [ "$STATE" -eq "0" ]
+if [ "$?" -eq "0" ]
 then
   # Remove existing package in buildroot
   rm -rf $OPENWRT/package/$PACKAGE
@@ -23,19 +21,15 @@ pushd . > /dev/null
 
 cd $OPENWRT
 
-if [ "$STATE" -eq "1" ]
-then
-  # Build predefined packages for the first run
-  make
-fi
-
 # Make Makefile visible to Buildroot
 mv package/$PACKAGE/source/OpenWRT/Makefile package/$PACKAGE
 
-if [ "$STATE" -eq "1" ]
+grep "CONFIG_PACKAGE_${PACKAGE}=m" .config > /dev/null
+if [ "$?" -ne "0" ]
 then
   # Give user to choose package $PACKAGE
   make menuconfig
+  make
 fi
 
 # Build package

From 442dfe2aa34e9fd3d49926a50e61b180e24f7852 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@bucket.local>
Date: Thu, 4 Aug 2016 11:56:17 +0300
Subject: [PATCH 11/56] Final change

---
 OpenWRT/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index 2a24bb2..366224a 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -49,6 +49,7 @@ endef
 define Package/cronosagent/postinst
 #!/bin/sh
 /etc/init.d/cronosagent enable
+/etc/init.d/cronosagent start
 exit 0
 endef
 

From 226d4ecd0a9fed7003eb4ca59cf38ba7ef27c521 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@phi>
Date: Thu, 4 Aug 2016 13:35:38 +0300
Subject: [PATCH 12/56] OpenWRT/readme.txt removed

---
 OpenWRT/readme.txt | 8 --------
 1 file changed, 8 deletions(-)
 delete mode 100644 OpenWRT/readme.txt

diff --git a/OpenWRT/readme.txt b/OpenWRT/readme.txt
deleted file mode 100644
index 17797da..0000000
--- a/OpenWRT/readme.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-/usr/lib/lua/luci/controller/cronosagent.lua
-/usr/lib/lua/luci/model/cbi/cronosagent/configure.lua
-/etc/config/cronosagent
-/etc/init.d/cronosagent
-
-Copy OpenWRT/package/Makefile -> ~/openwrt/packages/cronosagent/Makefile
-Copy * -> ~/openwrt/packages/cronosagent/source/*
-Remove ~/openwrt/packages/cronosagent/source/OpenWRT/package/Makefile
\ No newline at end of file

From e256328ee7d7da7884b02aaa840df6495ed14ea0 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@phi>
Date: Thu, 4 Aug 2016 13:39:24 +0300
Subject: [PATCH 13/56] build.sh improved :)

---
 OpenWRT/build.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/OpenWRT/build.sh b/OpenWRT/build.sh
index 8a45e25..72e4f06 100755
--- a/OpenWRT/build.sh
+++ b/OpenWRT/build.sh
@@ -3,10 +3,9 @@
 PACKAGE=cronosagent
 
 PROJECT=$(pwd)/..
-OPENWRT=${HOME}/openwrt
+OPENWRT=$HOME/openwrt
 
-test -d $OPENWRT/package/$PACKAGE
-if [ "$?" -eq "0" ]
+if [ -d $OPENWRT/package/$PACKAGE ]
 then
   # Remove existing package in buildroot
   rm -rf $OPENWRT/package/$PACKAGE

From b62c38088e6a0486d5c17f5f5625734b428c4169 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@phi>
Date: Thu, 4 Aug 2016 13:44:43 +0300
Subject: [PATCH 14/56] Fixed issue with path which was happened on Rudy's
 machine

---
 OpenWRT/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenWRT/build.sh b/OpenWRT/build.sh
index 72e4f06..05aca74 100755
--- a/OpenWRT/build.sh
+++ b/OpenWRT/build.sh
@@ -2,7 +2,7 @@
 
 PACKAGE=cronosagent
 
-PROJECT=$(pwd)/..
+PROJECT=$(readlink -f $0 | xargs dirname)/..
 OPENWRT=$HOME/openwrt
 
 if [ -d $OPENWRT/package/$PACKAGE ]

From 9ca35923fa53f41be9d043c9d5f8c3e9dfd8e42b Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@phi>
Date: Thu, 4 Aug 2016 13:46:04 +0300
Subject: [PATCH 15/56] -j 4

---
 OpenWRT/build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenWRT/build.sh b/OpenWRT/build.sh
index 05aca74..e349161 100755
--- a/OpenWRT/build.sh
+++ b/OpenWRT/build.sh
@@ -28,7 +28,7 @@ if [ "$?" -ne "0" ]
 then
   # Give user to choose package $PACKAGE
   make menuconfig
-  make
+  make -j 4
 fi
 
 # Build package

From 830f13fc8248739b8b4589fefc65d3b6e63697e0 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@bucket.local>
Date: Thu, 4 Aug 2016 14:03:20 +0300
Subject: [PATCH 16/56] Memory leak fixed

---
 CronosAgent.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CronosAgent.c b/CronosAgent.c
index c8adb24..b10de75 100644
--- a/CronosAgent.c
+++ b/CronosAgent.c
@@ -475,7 +475,9 @@ int main(int argc, const char* argv[])
 
 #endif
 
-  // Prepare uplink buffers
+  // Prepare buffers
+
+  void* controlBuffer = alloca(BUFFER_SIZE);
 
   struct RewindData* incomingBuffer = (struct RewindData*)alloca(sizeof(struct RewindData) + BUFFER_SIZE);
   struct RewindData* outgoingBuffer = (struct RewindData*)alloca(sizeof(struct RewindData) + BUFFER_SIZE);
@@ -649,7 +651,7 @@ int main(int argc, const char* argv[])
         message.msg_namelen = sizeof(address);
         message.msg_iov = &vector;
         message.msg_iovlen = 1;
-        message.msg_control = alloca(BUFFER_SIZE);
+        message.msg_control = controlBuffer;
         message.msg_controllen = BUFFER_SIZE;
         message.msg_flags = 0;
 

From 55bbf89f60512742ecdbadaf536bcb9a2e4a713a Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@bucket.local>
Date: Thu, 4 Aug 2016 14:52:08 +0300
Subject: [PATCH 17/56] More automation

---
 CronosAgent.c    | 2 +-
 OpenWRT/build.sh | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/CronosAgent.c b/CronosAgent.c
index b10de75..78a78dc 100644
--- a/CronosAgent.c
+++ b/CronosAgent.c
@@ -119,7 +119,7 @@
 
 #define EVENT_LIST_LENGTH  (4 + 1 + 4)
 
-#define BUFFER_SIZE        4096
+#define BUFFER_SIZE        2048
 #define EXPIRATION_TIME    20
 
 
diff --git a/OpenWRT/build.sh b/OpenWRT/build.sh
index e349161..5ba5a57 100755
--- a/OpenWRT/build.sh
+++ b/OpenWRT/build.sh
@@ -26,9 +26,10 @@ mv package/$PACKAGE/source/OpenWRT/Makefile package/$PACKAGE
 grep "CONFIG_PACKAGE_${PACKAGE}=m" .config > /dev/null
 if [ "$?" -ne "0" ]
 then
-  # Give user to choose package $PACKAGE
-  make menuconfig
-  make -j 4
+  # Simulate user selection of package $PACKAGE
+  echo "CONFIG_PACKAGE_${PACKAGE}=m" >> .config
+  # 
+  # make -j 4
 fi
 
 # Build package

From 3603feaf6875560efef099331cc4160cbd0c2f78 Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Thu, 4 Aug 2016 18:11:00 +0000
Subject: [PATCH 18/56] Add .gitlab-ci.yml

---
 .gitlab-ci.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..87c9eb5
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,17 @@
+before_script:
+  - apt-get update -qq && apt-get install -y -qq build-essential
+stages:
+  - build
+
+
+build_project:
+  stage: build
+  script:
+    - dpkg-buildpackage
+  only:
+    - master
+  artifacts:
+    paths:
+    - ../cronos*.deb
+  tags:
+    - debian
\ No newline at end of file

From 455a4b604f60affecb306015373096db77e9bf4b Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Thu, 4 Aug 2016 18:11:57 +0000
Subject: [PATCH 19/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 87c9eb5..8ab7edf 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 before_script:
-  - apt-get update -qq && apt-get install -y -qq build-essential
+  - apt-get update -qq && apt-get install -y -qq build-essential dpkg-dev
 stages:
   - build
 

From 63542dd7d7319fc068b37379d255fa3ec9c271a3 Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Thu, 4 Aug 2016 18:13:48 +0000
Subject: [PATCH 20/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ab7edf..43f814a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 before_script:
-  - apt-get update -qq && apt-get install -y -qq build-essential dpkg-dev
+  - sudo apt-get update -qq && sudo apt-get install -y -qq build-essential dpkg-dev
 stages:
   - build
 

From bb048d2869e521ef4d3943b8e5027f8e715506cf Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Thu, 4 Aug 2016 18:15:52 +0000
Subject: [PATCH 21/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 43f814a..1802ca3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 before_script:
-  - sudo apt-get update -qq && sudo apt-get install -y -qq build-essential dpkg-dev
+  - sudo apt-get update -qq && sudo apt-get install -y -qq build-essential dpkg-dev libssl-dev
 stages:
   - build
 

From b76db7ed852b4407e791bec59e31dfb377368187 Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Thu, 4 Aug 2016 18:16:26 +0000
Subject: [PATCH 22/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1802ca3..e3a8bf7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 before_script:
-  - sudo apt-get update -qq && sudo apt-get install -y -qq build-essential dpkg-dev libssl-dev
+  - sudo apt-get update -qq && sudo apt-get install -y -qq build-essential dpkg-dev libssl-dev debhelper
 stages:
   - build
 

From ea91e980c865e78d42f4fb132775da970e5bdb72 Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Thu, 4 Aug 2016 18:22:15 +0000
Subject: [PATCH 23/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3a8bf7..74b82fd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ build_project:
   stage: build
   script:
     - dpkg-buildpackage
+    - cp ../cronos*.deb .
   only:
     - master
   artifacts:

From d2e30e4ecd997ec51eca29369205fd76db431812 Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Thu, 4 Aug 2016 18:22:28 +0000
Subject: [PATCH 24/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 74b82fd..3e4a475 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,6 +13,6 @@ build_project:
     - master
   artifacts:
     paths:
-    - ../cronos*.deb
+    - cronos*.deb
   tags:
     - debian
\ No newline at end of file

From 4010ddcde362ec1c40c33d2d419398b010a5a961 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Thu, 4 Aug 2016 21:35:16 +0300
Subject: [PATCH 25/56] Fixed reconnect issue

---
 CronosAgent.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CronosAgent.c b/CronosAgent.c
index 78a78dc..6ad260d 100644
--- a/CronosAgent.c
+++ b/CronosAgent.c
@@ -585,6 +585,10 @@ int main(int argc, const char* argv[])
             outgoingBuffer->length = htole16(SHA256_DIGEST_LENGTH);
 
             sendto(uplinkHandle, outgoingBuffer, sizeof(struct RewindData) + SHA256_DIGEST_LENGTH, 0, serverAddress->ai_addr, serverAddress->ai_addrlen);
+
+            socketOptionValue = true;
+            setsockopt(remoteHandle, IPPROTO_IP, IP_PKTINFO, &socketOptionValue, sizeof(socketOptionValue));
+
             continue;
           }
 
@@ -797,10 +801,6 @@ int main(int argc, const char* argv[])
           break;
         }
 
-        // SIGHUP
-
-        socketOptionValue = true;
-        setsockopt(remoteHandle, IPPROTO_IP, IP_PKTINFO, &socketOptionValue, sizeof(socketOptionValue));
       }
     }
   }

From d9968ddfacae5ffc662f11e6c678a8f3a8e363ff Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Thu, 4 Aug 2016 23:11:32 +0300
Subject: [PATCH 26/56] Expiration time extended

---
 CronosAgent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CronosAgent.c b/CronosAgent.c
index 6ad260d..d2f8cf3 100644
--- a/CronosAgent.c
+++ b/CronosAgent.c
@@ -120,7 +120,7 @@
 #define EVENT_LIST_LENGTH  (4 + 1 + 4)
 
 #define BUFFER_SIZE        2048
-#define EXPIRATION_TIME    20
+#define EXPIRATION_TIME    60
 
 
 int serviceMode = MODE_CONSOLE;

From 866b7ed470715f1cac20cf187245c13ad954e1d1 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Fri, 5 Aug 2016 20:14:33 +0300
Subject: [PATCH 27/56] Added stuff to OpenWRT

---
 OpenWRT/Makefile                            | 3 +++
 OpenWRT/crontabs/cronosagent                | 1 +
 OpenWRT/model/cbi/cronosagent/configure.lua | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 OpenWRT/crontabs/cronosagent

diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index 366224a..56c8b0f 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -38,6 +38,7 @@ define Package/cronosagent/install
 	$(INSTALL_BIN) $(X_SOURCE_DIR)/cronosagent.sh $(1)/opt/CronosAgent/
 	$(INSTALL_BIN) $(X_SOURCE_DIR)/OpenWRT/init.d/cronosagent $(1)/etc/init.d/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/config/cronosagent $(1)/etc/config/
+	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/crontabs/cronosagent $(1)/etc/crontabs/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/controller/cronosagent.lua $(1)/usr/lib/lua/luci/controller/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/model/cbi/cronosagent/configure.lua $(1)/usr/lib/lua/luci/model/cbi/cronosagent/
 endef
@@ -50,6 +51,8 @@ define Package/cronosagent/postinst
 #!/bin/sh
 /etc/init.d/cronosagent enable
 /etc/init.d/cronosagent start
+/etc/init.d/cron enable
+/etc/init.d/cron start
 exit 0
 endef
 
diff --git a/OpenWRT/crontabs/cronosagent b/OpenWRT/crontabs/cronosagent
new file mode 100644
index 0000000..a045fe9
--- /dev/null
+++ b/OpenWRT/crontabs/cronosagent
@@ -0,0 +1 @@
+*/10 * * * * test -n "$(ls /etc/rc.d/S??cronosagent)" -a -z "$(pidof cronosagent)" && /etc/init.d/cronosagent start
diff --git a/OpenWRT/model/cbi/cronosagent/configure.lua b/OpenWRT/model/cbi/cronosagent/configure.lua
index 91e5c93..c7dc24a 100644
--- a/OpenWRT/model/cbi/cronosagent/configure.lua
+++ b/OpenWRT/model/cbi/cronosagent/configure.lua
@@ -3,7 +3,7 @@ local map      = Map("cronosagent", "CronosAgent")
 local section  = map:section(TypedSection, "cronosagent", "Configuration")
 
 local number   = section:option(Value, "number",          "Repeater ID",      "DMR ID assigned to your repeater"  )
-local repeater = section:option(Value, "repeaterAddress", "Repeater Address", "Address of your KAIROS repeater"   )
+local repeater = section:option(Value, "repeaterAddress", "Repeater address", "Address of your KAIROS repeater"   )
 local server   = section:option(Value, "serverAddress",   "Server address",   "Address of BrandMeister DMR Server")
 local password = section:option(Value, "serverPassword",  "Password",         "Password to login to the server"   )
 

From 5f010c1e3741083ffd7c9c2647a6acc74efa8b66 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Fri, 5 Aug 2016 20:15:53 +0300
Subject: [PATCH 28/56] Added stuff to OpenWRT

---
 cronosagent.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/cronosagent.sh b/cronosagent.sh
index 37bb4d5..54f2110 100755
--- a/cronosagent.sh
+++ b/cronosagent.sh
@@ -1,5 +1,11 @@
 #!/bin/sh
 
+if [ -e /bin/pidof -a -n "$(pidof cronosagent)" ]
+then
+  # Should we do something?
+  exit
+fi
+
 DIRECTORY=$(dirname $0)
 
 if [ -f $DIRECTORY/cronosagent.conf ]

From 832b9012e7bd11d0a886834c744b92f845ebcc5b Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Fri, 5 Aug 2016 20:29:50 +0300
Subject: [PATCH 29/56] ..

---
 OpenWRT/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index 56c8b0f..2ca5085 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -17,10 +17,10 @@ DEPENDS:=
 endef
 
 define Package/cronosagent/description
- CronosAgent for BrandMeister DMR Master Server
- Allows to connect Radio Activity KAIROS Repetaters to BrandMeister DMR Master Server
- Radio Activity KAIROS should have built-in feature of External Server Access
- which is available on firmware customization 008 (Radio Amateur community)
+  CronosAgent for BrandMeister DMR Master Server
+  Allows to connect Radio Activity KAIROS Repetaters to BrandMeister DMR Master Server
+  Radio Activity KAIROS should have built-in feature of External Server Access
+  which is available on firmware customization 008 (Radio Amateur community)
 endef
 
 define Build/Prepare

From 1ca687d0584528289fe941c6bb1c82d4292b97c2 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Fri, 5 Aug 2016 20:31:57 +0300
Subject: [PATCH 30/56] ..

---
 OpenWRT/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index 2ca5085..7172809 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -32,6 +32,7 @@ define Package/cronosagent/install
 	$(INSTALL_DIR) $(1)/opt/CronosAgent
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/crontabs
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/cronosagent
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cronosagent $(1)/opt/CronosAgent/

From b02a7fe669618d829df5a9c269ff2d32286241df Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Fri, 5 Aug 2016 20:55:43 +0300
Subject: [PATCH 31/56] ..

---
 OpenWRT/init.d/cronosagent | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenWRT/init.d/cronosagent b/OpenWRT/init.d/cronosagent
index 29c63fe..f080784 100644
--- a/OpenWRT/init.d/cronosagent
+++ b/OpenWRT/init.d/cronosagent
@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=10
+START=40
 STOP=15
 
 start() {

From 41fe7704b3ee4459ac61ac1d6a48979b7d895d6a Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Fri, 5 Aug 2016 21:02:23 +0300
Subject: [PATCH 32/56] ..

---
 cronosagent.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/cronosagent.sh b/cronosagent.sh
index 54f2110..37bb4d5 100755
--- a/cronosagent.sh
+++ b/cronosagent.sh
@@ -1,11 +1,5 @@
 #!/bin/sh
 
-if [ -e /bin/pidof -a -n "$(pidof cronosagent)" ]
-then
-  # Should we do something?
-  exit
-fi
-
 DIRECTORY=$(dirname $0)
 
 if [ -f $DIRECTORY/cronosagent.conf ]

From 52422cebf0e513f7c6f25a3b44a35d05a7fe2c13 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Sat, 6 Aug 2016 14:30:27 +0300
Subject: [PATCH 33/56] Added implementation of RingBuffer to compensate
 existing issues on RA side

---
 CronosAgent.c | 82 ++++++++++++++++++++++++++++++++++++++++++++-------
 Makefile      |  5 ++--
 RingBuffer.c  | 47 +++++++++++++++++++++++++++++
 RingBuffer.h  | 37 +++++++++++++++++++++++
 Version.h     |  2 +-
 5 files changed, 159 insertions(+), 14 deletions(-)
 create mode 100644 RingBuffer.c
 create mode 100644 RingBuffer.h

diff --git a/CronosAgent.c b/CronosAgent.c
index d2f8cf3..b0e6185 100644
--- a/CronosAgent.c
+++ b/CronosAgent.c
@@ -53,6 +53,13 @@
 #include "Rewind.h"
 #include "Version.h"
 
+#include "RingBuffer.h"
+
+// #include "DMR.h"
+#ifndef DMR_H
+#define TDMA_FRAME_DURATION  60
+#endif
+
 // #include "ASNTools.h"
 #ifndef ASNTOOLS_H
 #define ASN_SEQUENCE      0x10
@@ -117,7 +124,7 @@
 #define MODE_SYSLOG  (1 << 1)
 #define MODE_DAEMON  (1 << 2)
 
-#define EVENT_LIST_LENGTH  (4 + 1 + 4)
+#define EVENT_LIST_LENGTH  (4 + 2 + 4)
 
 #define BUFFER_SIZE        2048
 #define EXPIRATION_TIME    60
@@ -359,15 +366,22 @@ int main(int argc, const char* argv[])
   
   // Initialize timer handle
 
-  int timerHandle;
+  int timerHandle1;
+  int timerHandle2;
   struct itimerspec timerInterval;
-
   memset(&timerInterval, 0, sizeof(timerInterval));
-  timerInterval.it_interval.tv_sec = REWIND_KEEP_ALIVE_INTERVAL;
-  timerInterval.it_value.tv_sec = REWIND_KEEP_ALIVE_INTERVAL;
 
-  timerHandle = timerfd_create(CLOCK_MONOTONIC, 0);
-  timerfd_settime(timerHandle, 0, &timerInterval, NULL);
+  timerInterval.it_value.tv_sec = REWIND_KEEP_ALIVE_INTERVAL;
+  timerInterval.it_interval.tv_sec = REWIND_KEEP_ALIVE_INTERVAL;
+
+  timerHandle1 = timerfd_create(CLOCK_MONOTONIC, 0);
+  timerfd_settime(timerHandle1, 0, &timerInterval, NULL);
+
+  timerInterval.it_interval.tv_sec = 0;
+  timerInterval.it_interval.tv_nsec = TDMA_FRAME_DURATION * 1000000;
+
+  timerHandle2 = timerfd_create(CLOCK_MONOTONIC, 0);
+  timerfd_settime(timerHandle2, 0, &timerInterval, NULL);
 
   // Initialize signal handle
 
@@ -407,7 +421,11 @@ int main(int argc, const char* argv[])
   epoll_ctl(pollHandle, EPOLL_CTL_ADD, event.data.fd, &event);
 
   event.events = EPOLLIN;
-  event.data.fd = timerHandle;
+  event.data.fd = timerHandle1;
+  epoll_ctl(pollHandle, EPOLL_CTL_ADD, event.data.fd, &event);
+
+  event.events = EPOLLIN;
+  event.data.fd = timerHandle2;
   epoll_ctl(pollHandle, EPOLL_CTL_ADD, event.data.fd, &event);
 
   event.events = EPOLLIN;
@@ -453,6 +471,9 @@ int main(int argc, const char* argv[])
   EV_SET(change, 1, EVFILT_TIMER, EV_ADD | EV_ENABLE, NOTE_SECONDS, REWIND_KEEP_ALIVE_INTERVAL, 0);
   change ++;
 
+  EV_SET(change, 2, EVFILT_TIMER, EV_ADD | EV_ENABLE, NOTE_USECONDS, TDMA_FRAME_DURATION, 0);
+  change ++;
+
   EV_SET(change, SIGINT, EVFILT_SIGNAL, EV_ADD | EV_ENABLE, 0, 0, 0);
   change ++;
 
@@ -488,6 +509,9 @@ int main(int argc, const char* argv[])
   size_t passwordLength = strlen(serverPassword);
   time_t watchDog = now.tv_sec + EXPIRATION_TIME;
 
+  struct RingBuffer ringBuffers[2];
+  memset(ringBuffers, 0, sizeof(ringBuffers));
+
   uint32_t sequenceNumbers[] = 
   {
     0,
@@ -547,6 +571,21 @@ int main(int argc, const char* argv[])
 
           if (type == REWIND_TYPE_EXTERNAL_SERVER)
           {
+            uint16_t flags  = le16toh(incomingBuffer->flags);
+            uint32_t number = le32toh(incomingBuffer->number);
+
+            if (flags & REWIND_FLAG_REAL_TIME_1)
+            {
+              PushData(ringBuffers + 0, number, incomingBuffer->data, length);
+              continue;
+            }
+
+            if (flags & REWIND_FLAG_REAL_TIME_2)
+            {
+              PushData(ringBuffers + 1, number, incomingBuffer->data, length);
+              continue;
+            }
+
             repeaterSocketAddress.sin_port = htons(KAIROS_HAM_DEFAULT_PORT);
             sendto(mediaHandle, incomingBuffer->data, length, 0, (struct sockaddr*)&repeaterSocketAddress, sizeof(struct sockaddr_in));
             continue;
@@ -733,7 +772,7 @@ int main(int argc, const char* argv[])
       // Handle timer to transmit keep-alive
 
 #ifdef __linux__
-      if (event->data.fd == timerHandle)
+      if (event->data.fd == timerHandle1)
       {
         uint64_t information;
         read(timerHandle, &information, sizeof(information));
@@ -741,7 +780,8 @@ int main(int argc, const char* argv[])
         clock_gettime(CLOCK_MONOTONIC, &now);
 #endif
 #ifdef __MACH__
-      if (event->filter == EVFILT_TIMER)
+      if ((event->ident  == 1) &&
+          (event->filter == EVFILT_TIMER))
       {
         clock_get_time(clockService, &now);
 #endif
@@ -769,6 +809,25 @@ int main(int argc, const char* argv[])
         continue;
       }
 
+      // Handle timer to process RingBuffer
+
+#ifdef __linux__
+      if (event->data.fd == timerHandle2)
+      {
+        uint64_t information;
+        read(timerHandle, &information, sizeof(information));
+#endif
+#ifdef __MACH__
+      if ((event->ident  == 2) &&
+          (event->filter == EVFILT_TIMER))
+      {
+#endif
+        repeaterSocketAddress.sin_port = htons(KAIROS_HAM_DEFAULT_PORT);
+        ProcessBuffer(ringBuffers + 0, mediaHandle, &repeaterSocketAddress);
+        ProcessBuffer(ringBuffers + 1, mediaHandle, &repeaterSocketAddress);
+        continue;
+      }
+
       // Handle signal from the kernel
 
 #ifdef __linux__
@@ -816,7 +875,8 @@ int main(int argc, const char* argv[])
 
 #ifdef __linux__
   close(pollHandle);
-  close(timerHandle);
+  close(timerHandle1);
+  close(timerHandle2);
   close(signalHandle);
 #endif
 #ifdef __MACH__
diff --git a/Makefile b/Makefile
index 25aa0b7..d9b8ee6 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,9 @@ ifeq ($(USE_OPENSSL), yes)
 endif
 endif
 
-OBJECTS = CronosAgent.o
+OBJECTS = \
+  RingBuffer.o \
+  CronosAgent.o
 
 ifneq ($(USE_OPENSSL), yes)
   OBJECTS += sha256.o
@@ -62,7 +64,6 @@ clean:
 	rm -f *.d
 
 version:
-	# echo "#define VERSION $(shell svn info | grep -E "^Revision:" | grep -o -E "[0-9]+")" > Version.h
 	echo "#define VERSION $(shell date -u +%Y%m%d)" > Version.h
 
 debian-package:
diff --git a/RingBuffer.c b/RingBuffer.c
new file mode 100644
index 0000000..60f9c0c
--- /dev/null
+++ b/RingBuffer.c
@@ -0,0 +1,47 @@
+#include "RingBuffer.h"
+
+#include <string.h>
+#include <unistd.h>
+
+void PushData(struct RingBuffer* buffer, uint32_t number, uint8_t* data, size_t length)
+{
+  number %= BUFFER_LENGTH;
+
+  buffer->delay += (buffer->flags == 0);  // Postpone processing if buffer empty
+  buffer->flags |= (1 << number);         // Set processing flag for the record
+
+  struct BufferRecord* record = buffer->records + number;
+
+  record->length = length;
+  memcpy(record->data, data, length);
+}
+
+void ProcessBuffer(struct RingBuffer* buffer, int handle, struct sockaddr_in* address)
+{
+  if (buffer->flags == 0)
+  {
+  	// Nothing to process
+  	return;
+  }
+
+  if (buffer->delay > 0)
+  {
+  	// Processing was postponed
+    buffer->delay --;
+    return;
+  }
+
+  size_t mask = (1 << buffer->pointer);
+
+  if (buffer->flags & mask)
+  {
+  	// Transmit scheduled data
+    struct BufferRecord* record = buffer->records + buffer->pointer;
+    sendto(handle, record->data, record->length, 0, (struct sockaddr*)address, sizeof(struct sockaddr_in));
+    // Clear processing flag
+    buffer->flags ^= mask;
+  }
+
+  buffer->pointer ++;
+  buffer->pointer %= BUFFER_LENGTH;
+}
diff --git a/RingBuffer.h b/RingBuffer.h
new file mode 100644
index 0000000..748609d
--- /dev/null
+++ b/RingBuffer.h
@@ -0,0 +1,37 @@
+#ifndef RINGBUFFER_H
+#define RINGBUFFER_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include <arpa/inet.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#define DATA_LENGTH    256
+#define BUFFER_LENGTH  8
+
+struct BufferRecord
+{
+  size_t length;
+  uint8_t data[DATA_LENGTH];
+};
+
+struct RingBuffer
+{
+  size_t flags;
+  size_t delay;
+  size_t pointer;
+  struct BufferRecord records[BUFFER_LENGTH];
+};
+
+void PushData(struct RingBuffer* buffer, uint32_t number, uint8_t* data, size_t length);
+void ProcessBuffer(struct RingBuffer* buffer, int handle, struct sockaddr_in* address);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
diff --git a/Version.h b/Version.h
index e44780b..3149507 100644
--- a/Version.h
+++ b/Version.h
@@ -1 +1 @@
-#define VERSION 20160804
+#define VERSION 20160806

From fb9288ef5850409477ce5a601d4e82c1bdb8f708 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Sat, 6 Aug 2016 14:33:22 +0300
Subject: [PATCH 34/56] ..

---
 CronosAgent.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CronosAgent.c b/CronosAgent.c
index b0e6185..ebe76c6 100644
--- a/CronosAgent.c
+++ b/CronosAgent.c
@@ -775,7 +775,7 @@ int main(int argc, const char* argv[])
       if (event->data.fd == timerHandle1)
       {
         uint64_t information;
-        read(timerHandle, &information, sizeof(information));
+        read(timerHandle1, &information, sizeof(information));
 
         clock_gettime(CLOCK_MONOTONIC, &now);
 #endif
@@ -815,7 +815,7 @@ int main(int argc, const char* argv[])
       if (event->data.fd == timerHandle2)
       {
         uint64_t information;
-        read(timerHandle, &information, sizeof(information));
+        read(timerHandle2, &information, sizeof(information));
 #endif
 #ifdef __MACH__
       if ((event->ident  == 2) &&

From 146ef6197d4b5c9f9204a78676b2140500a798fe Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Sat, 6 Aug 2016 19:40:06 +0300
Subject: [PATCH 35/56] ..

---
 CronosAgent.c |  4 ++--
 RingBuffer.c  | 20 ++++++++++----------
 RingBuffer.h  |  6 +++---
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/CronosAgent.c b/CronosAgent.c
index ebe76c6..d912aa6 100644
--- a/CronosAgent.c
+++ b/CronosAgent.c
@@ -576,13 +576,13 @@ int main(int argc, const char* argv[])
 
             if (flags & REWIND_FLAG_REAL_TIME_1)
             {
-              PushData(ringBuffers + 0, number, incomingBuffer->data, length);
+              PokeData(ringBuffers + 0, number, incomingBuffer->data, length);
               continue;
             }
 
             if (flags & REWIND_FLAG_REAL_TIME_2)
             {
-              PushData(ringBuffers + 1, number, incomingBuffer->data, length);
+              PokeData(ringBuffers + 1, number, incomingBuffer->data, length);
               continue;
             }
 
diff --git a/RingBuffer.c b/RingBuffer.c
index 60f9c0c..b5c22aa 100644
--- a/RingBuffer.c
+++ b/RingBuffer.c
@@ -3,12 +3,12 @@
 #include <string.h>
 #include <unistd.h>
 
-void PushData(struct RingBuffer* buffer, uint32_t number, uint8_t* data, size_t length)
+void PokeData(struct RingBuffer* buffer, uint32_t number, uint8_t* data, size_t length)
 {
   number %= BUFFER_LENGTH;
 
-  buffer->delay += (buffer->flags == 0);  // Postpone processing if buffer empty
-  buffer->flags |= (1 << number);         // Set processing flag for the record
+  buffer->delay += buffer->marks == 0;  // Postpone processing if buffer empty
+  buffer->marks |= 1 << number;         // Set processing flag for the record
 
   struct BufferRecord* record = buffer->records + number;
 
@@ -18,7 +18,7 @@ void PushData(struct RingBuffer* buffer, uint32_t number, uint8_t* data, size_t
 
 void ProcessBuffer(struct RingBuffer* buffer, int handle, struct sockaddr_in* address)
 {
-  if (buffer->flags == 0)
+  if (buffer->marks == 0)
   {
   	// Nothing to process
   	return;
@@ -31,17 +31,17 @@ void ProcessBuffer(struct RingBuffer* buffer, int handle, struct sockaddr_in* ad
     return;
   }
 
-  size_t mask = (1 << buffer->pointer);
+  size_t mark = (1 << buffer->index);
 
-  if (buffer->flags & mask)
+  if (buffer->marks & mark)
   {
   	// Transmit scheduled data
-    struct BufferRecord* record = buffer->records + buffer->pointer;
+    struct BufferRecord* record = buffer->records + buffer->index;
     sendto(handle, record->data, record->length, 0, (struct sockaddr*)address, sizeof(struct sockaddr_in));
     // Clear processing flag
-    buffer->flags ^= mask;
+    buffer->marks ^= mark;
   }
 
-  buffer->pointer ++;
-  buffer->pointer %= BUFFER_LENGTH;
+  buffer->index ++;
+  buffer->index %= BUFFER_LENGTH;
 }
diff --git a/RingBuffer.h b/RingBuffer.h
index 748609d..a50e813 100644
--- a/RingBuffer.h
+++ b/RingBuffer.h
@@ -21,13 +21,13 @@ struct BufferRecord
 
 struct RingBuffer
 {
-  size_t flags;
+  size_t marks;
   size_t delay;
-  size_t pointer;
+  size_t index;
   struct BufferRecord records[BUFFER_LENGTH];
 };
 
-void PushData(struct RingBuffer* buffer, uint32_t number, uint8_t* data, size_t length);
+void PokeData(struct RingBuffer* buffer, uint32_t number, uint8_t* data, size_t length);
 void ProcessBuffer(struct RingBuffer* buffer, int handle, struct sockaddr_in* address);
 
 #ifdef __cplusplus

From 78465cfac8b0b6b27409285ac1894152a7ce335c Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Sat, 6 Aug 2016 19:48:13 +0300
Subject: [PATCH 36/56] ..

---
 RingBuffer.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/RingBuffer.c b/RingBuffer.c
index b5c22aa..40aa09c 100644
--- a/RingBuffer.c
+++ b/RingBuffer.c
@@ -8,7 +8,7 @@ void PokeData(struct RingBuffer* buffer, uint32_t number, uint8_t* data, size_t
   number %= BUFFER_LENGTH;
 
   buffer->delay += buffer->marks == 0;  // Postpone processing if buffer empty
-  buffer->marks |= 1 << number;         // Set processing flag for the record
+  buffer->marks |= 1 << number;         // Set processing mark for the record
 
   struct BufferRecord* record = buffer->records + number;
 
@@ -31,14 +31,14 @@ void ProcessBuffer(struct RingBuffer* buffer, int handle, struct sockaddr_in* ad
     return;
   }
 
-  size_t mark = (1 << buffer->index);
+  size_t mark = 1 << buffer->index;
 
   if (buffer->marks & mark)
   {
   	// Transmit scheduled data
     struct BufferRecord* record = buffer->records + buffer->index;
     sendto(handle, record->data, record->length, 0, (struct sockaddr*)address, sizeof(struct sockaddr_in));
-    // Clear processing flag
+    // Clear processing mark
     buffer->marks ^= mark;
   }
 

From 412c3255c27750edf2f59ee7042ed1106bb59812 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Sun, 7 Aug 2016 18:05:48 +0300
Subject: [PATCH 37/56] Trying to solve issue with RA using IPTOS_LOWDELAY

---
 CronosAgent.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/CronosAgent.c b/CronosAgent.c
index d912aa6..3b2ae03 100644
--- a/CronosAgent.c
+++ b/CronosAgent.c
@@ -10,6 +10,7 @@
 
 #include <netdb.h>
 #include <arpa/inet.h>
+#include <netinet/ip.h>
 
 #include <unistd.h>
 #include <syslog.h>
@@ -307,10 +308,10 @@ int main(int argc, const char* argv[])
   int trapHandle;
   int mediaHandle;
   int remoteHandle;
+  int socketOptionValue;
   struct sockaddr_in proxySocketAddress;
 
   socklen_t proxySocketLength = sizeof(proxySocketAddress);
-  int socketOptionValue = true;
 
   proxySocketAddress.sin_family = AF_INET;
   proxySocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);
@@ -324,6 +325,7 @@ int main(int argc, const char* argv[])
     return EXIT_FAILURE;
   }
 
+  socketOptionValue = true;
   proxySocketAddress.sin_port = 0;
   remoteHandle = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
   if((remoteHandle < 0) ||
@@ -334,11 +336,13 @@ int main(int argc, const char* argv[])
     return EXIT_FAILURE;
   }
 
+  socketOptionValue = IPTOS_LOWDELAY;
   proxySocketAddress.sin_port = 0;
   mediaHandle = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
   if((mediaHandle < 0) ||
      (bind(mediaHandle, (struct sockaddr*)&proxySocketAddress, proxySocketLength) < 0) ||
-     (getsockname(mediaHandle, (struct sockaddr*)&proxySocketAddress, &proxySocketLength) < 0))
+     (getsockname(mediaHandle, (struct sockaddr*)&proxySocketAddress, &proxySocketLength) < 0) ||
+     (setsockopt(mediaHandle, IPPROTO_IP, IP_TOS, &socketOptionValue, sizeof(socketOptionValue)) < 0))
   {
     print("Error opening port for External Server\n");
     return EXIT_FAILURE;

From 74de89d2b172fe32d3e8a251178a503e560335bf Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Mon, 8 Aug 2016 11:26:04 +0300
Subject: [PATCH 38/56] ..

---
 Makefile         | 6 +++++-
 debian/changelog | 4 ++--
 debian/control   | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d9b8ee6..f6a1b2b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,10 @@ PREFIX = $(DESTDIR)/opt/CronosAgent
 
 ifeq ($(OS), Linux)
   FLAGS += -rdynamic
+  KIND := $(shell grep -E "^6.0" /etc/debian_version > /dev/null ; echo $?)
+ifneq ($(KIND), 0)
+  LIBRARIES += rt
+endif
 ifeq ($(USE_OPENSSL), yes)
   FLAGS += -DUSE_OPENSSL
   DEPENDENCIES += openssl
@@ -35,7 +39,7 @@ LIBS += $(foreach library, $(LIBRARIES), -l$(library))
 CC = gcc
 CFLAGS += $(FLAGS) -std=gnu99
 
-ifneq ($(strip $(DEPENDENCIES)),)
+ifneq ($(strip $(DEPENDENCIES)), )
   FLAGS += $(shell pkg-config --cflags $(DEPENDENCIES))
   LIBS += $(shell pkg-config --libs $(DEPENDENCIES))
 endif
diff --git a/debian/changelog b/debian/changelog
index 6768df9..2504964 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
-cronosagent (20160804) none; urgency=low
+cronosagent (20160806) none; urgency=low
 
   * Daily build
 
- -- Artem Prilutskiy <cyanide.burnout@gmail.com>  Thu, 04 Aug 2016 11:53:09 +0400
+ -- Artem Prilutskiy <cyanide.burnout@gmail.com>  Mon, 08 Aug 2016 12:24:44 +0400
 
diff --git a/debian/control b/debian/control
index a6fe1b9..e40943e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: unknown
 Priority: extra
 Maintainer: Artem Prilutskiy <cyanide.burnout@gmail.com>
 Build-Depends:
-  debhelper (>= 5), libssl-dev
+  debhelper (>= 5)
 Standards-Version: 3.8.4
 
 Package: cronosagent

From e40a73b8cefc2b093a033cbaae349634688484e7 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Mon, 8 Aug 2016 11:42:27 +0300
Subject: [PATCH 39/56] debian/changelog removed due auto-creation

---
 debian/changelog | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 debian/changelog

diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 2504964..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,6 +0,0 @@
-cronosagent (20160806) none; urgency=low
-
-  * Daily build
-
- -- Artem Prilutskiy <cyanide.burnout@gmail.com>  Mon, 08 Aug 2016 12:24:44 +0400
-

From 14b3512e8db50d174b4b214d9ead9e8c15a3421f Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Mon, 8 Aug 2016 16:12:05 +0000
Subject: [PATCH 40/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3e4a475..fd85370 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ stages:
 build_project:
   stage: build
   script:
-    - dpkg-buildpackage
+    - make debian-package
     - cp ../cronos*.deb .
   only:
     - master

From 43b2107c9c188440977c884993621888fd4e91a1 Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Mon, 8 Aug 2016 20:51:44 +0000
Subject: [PATCH 41/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd85370..a732717 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,11 +4,13 @@ stages:
   - build
 
 
-build_project:
+debian_386_amd64:
   stage: build
   script:
     - make debian-package
+    - ARCH=i386 make debian-package
     - cp ../cronos*.deb .
+    - rm ../cronos*
   only:
     - master
   artifacts:

From bf44f5731603d0b018ce254bb858b79381855251 Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Mon, 8 Aug 2016 20:53:44 +0000
Subject: [PATCH 42/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a732717..0fa945d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,4 +17,6 @@ debian_386_amd64:
     paths:
     - cronos*.deb
   tags:
-    - debian
\ No newline at end of file
+    - debian
+    - i386
+    - amd64
\ No newline at end of file

From cb782cbe6349811b7188fc5de27793cf3d42aa6d Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@bucket.local>
Date: Tue, 9 Aug 2016 14:12:09 +0300
Subject: [PATCH 43/56] Fising issue with crontab

---
 Makefile                     |  3 +++
 OpenWRT/Makefile             | 11 +++++++++--
 OpenWRT/crontabs/cronosagent |  1 -
 3 files changed, 12 insertions(+), 3 deletions(-)
 delete mode 100644 OpenWRT/crontabs/cronosagent

diff --git a/Makefile b/Makefile
index f6a1b2b..cb924ba 100644
--- a/Makefile
+++ b/Makefile
@@ -78,4 +78,7 @@ else
 	dpkg-buildpackage -b -tc
 endif
 
+macos-archive: build
+	zip ../CronosAgent-macOS.zip cronosagent cronosagent.sh cronosagent.conf cronosagent.plist
+
 .PHONY: all build clean install
diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index 7172809..b62948d 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -32,14 +32,12 @@ define Package/cronosagent/install
 	$(INSTALL_DIR) $(1)/opt/CronosAgent
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/crontabs
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/cronosagent
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cronosagent $(1)/opt/CronosAgent/
 	$(INSTALL_BIN) $(X_SOURCE_DIR)/cronosagent.sh $(1)/opt/CronosAgent/
 	$(INSTALL_BIN) $(X_SOURCE_DIR)/OpenWRT/init.d/cronosagent $(1)/etc/init.d/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/config/cronosagent $(1)/etc/config/
-	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/crontabs/cronosagent $(1)/etc/crontabs/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/controller/cronosagent.lua $(1)/usr/lib/lua/luci/controller/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/model/cbi/cronosagent/configure.lua $(1)/usr/lib/lua/luci/model/cbi/cronosagent/
 endef
@@ -52,6 +50,15 @@ define Package/cronosagent/postinst
 #!/bin/sh
 /etc/init.d/cronosagent enable
 /etc/init.d/cronosagent start
+
+grep cronosagent /etc/crontabs/root > /dev/null
+if [ "$?" -eq "1" ]
+then
+cat << EOF >> /etc/crontabs/root
+*/10 * * * * test -n "$(ls /etc/rc.d/S??cronosagent)" -a -z "$(pidof cronosagent)" && /etc/init.d/cronosagent start
+EOF
+fi
+
 /etc/init.d/cron enable
 /etc/init.d/cron start
 exit 0
diff --git a/OpenWRT/crontabs/cronosagent b/OpenWRT/crontabs/cronosagent
deleted file mode 100644
index a045fe9..0000000
--- a/OpenWRT/crontabs/cronosagent
+++ /dev/null
@@ -1 +0,0 @@
-*/10 * * * * test -n "$(ls /etc/rc.d/S??cronosagent)" -a -z "$(pidof cronosagent)" && /etc/init.d/cronosagent start

From 3dba1f05face918b92779c7249fa9d5015828c1d Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@phi>
Date: Tue, 9 Aug 2016 14:20:46 +0300
Subject: [PATCH 44/56] Fixed issue with dependancy on librt

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index cb924ba..4ac91b3 100644
--- a/Makefile
+++ b/Makefile
@@ -7,10 +7,11 @@ PREFIX = $(DESTDIR)/opt/CronosAgent
 
 ifeq ($(OS), Linux)
   FLAGS += -rdynamic
-  KIND := $(shell grep -E "^6.0" /etc/debian_version > /dev/null ; echo $?)
-ifneq ($(KIND), 0)
+ifeq ($(shell lsb_release -i -s), Debian)
+ifeq ($(shell grep -E "^6.0" /etc/debian_version > /dev/null ; echo $?), 0)
   LIBRARIES += rt
 endif
+endif
 ifeq ($(USE_OPENSSL), yes)
   FLAGS += -DUSE_OPENSSL
   DEPENDENCIES += openssl

From 10cebfbb9c406b80f65c4cd6282d837e238ef339 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@phi>
Date: Tue, 9 Aug 2016 14:44:51 +0300
Subject: [PATCH 45/56] ..

---
 OpenWRT/Makefile | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index b62948d..b5cbffc 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -1,10 +1,12 @@
 include $(TOPDIR)/rules.mk
 
+X_DOLLAR:=$$
+X_SOURCE_DIR:=$(CURDIR)/source
+
 PKG_NAME:=cronosagent
 PKG_VERSION:=$(shell grep -o -E '[0-9]+' $(CURDIR)/source/Version.h)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=
-X_SOURCE_DIR:=$(CURDIR)/source
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -52,10 +54,10 @@ define Package/cronosagent/postinst
 /etc/init.d/cronosagent start
 
 grep cronosagent /etc/crontabs/root > /dev/null
-if [ "$?" -eq "1" ]
+if [ "$(X_DOLLAR)?" -eq "1" ]
 then
 cat << EOF >> /etc/crontabs/root
-*/10 * * * * test -n "$(ls /etc/rc.d/S??cronosagent)" -a -z "$(pidof cronosagent)" && /etc/init.d/cronosagent start
+*/10 * * * * test -n "$(X_DOLLAR)(ls /etc/rc.d/S??cronosagent)" -a -z "$(X_DOLLAR)(pidof cronosagent)" && /etc/init.d/cronosagent start
 EOF
 fi
 

From ff52d4e79fb31bdd077d3572747311c879ec6c64 Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Tue, 9 Aug 2016 16:13:58 +0000
Subject: [PATCH 46/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0fa945d..d39c534 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,4 +19,19 @@ debian_386_amd64:
   tags:
     - debian
     - i386
-    - amd64
\ No newline at end of file
+    - amd64
+    
+debian_armv6:
+  stage: build
+  script:
+    - make debian-package
+    - cp ../cronos*.deb .
+    - rm ../cronos*
+  only:
+    - master
+  artifacts:
+    paths:
+    - cronos*.deb
+  tags:
+    - debian
+    - armv6
\ No newline at end of file

From debc15abd58bcb7624ec522e8233f744fc746419 Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Tue, 9 Aug 2016 16:27:18 +0000
Subject: [PATCH 47/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d39c534..ac59f5c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,3 @@
-before_script:
-  - sudo apt-get update -qq && sudo apt-get install -y -qq build-essential dpkg-dev libssl-dev debhelper
-stages:
-  - build
-
-
 debian_386_amd64:
   stage: build
   script:
@@ -21,7 +15,7 @@ debian_386_amd64:
     - i386
     - amd64
     
-debian_armv6:
+debian_armhf:
   stage: build
   script:
     - make debian-package

From 845bae9c3487c71ee1f4a1ef2c397033ab2a33e4 Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Tue, 9 Aug 2016 16:32:40 +0000
Subject: [PATCH 48/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ac59f5c..9f27f27 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,6 @@
 debian_386_amd64:
   stage: build
+  environment: master
   script:
     - make debian-package
     - ARCH=i386 make debian-package
@@ -17,6 +18,7 @@ debian_386_amd64:
     
 debian_armhf:
   stage: build
+  environment: master
   script:
     - make debian-package
     - cp ../cronos*.deb .

From 911195052c93a465d6b72d8e84b465286541cb02 Mon Sep 17 00:00:00 2001
From: PD0ZRY Rudy <zarya@gigafreak.net>
Date: Tue, 9 Aug 2016 16:36:17 +0000
Subject: [PATCH 49/56] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f27f27..a93f8b0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,21 @@
-debian_386_amd64:
+debian_amd64:
   stage: build
-  environment: master
   script:
     - make debian-package
+    - cp ../cronos*.deb .
+    - rm ../cronos*
+  only:
+    - master
+  artifacts:
+    paths:
+    - cronos*.deb
+  tags:
+    - debian
+    - amd64
+    
+debian_386:
+  stage: build
+  script:
     - ARCH=i386 make debian-package
     - cp ../cronos*.deb .
     - rm ../cronos*
@@ -14,11 +27,9 @@ debian_386_amd64:
   tags:
     - debian
     - i386
-    - amd64
-    
+
 debian_armhf:
   stage: build
-  environment: master
   script:
     - make debian-package
     - cp ../cronos*.deb .

From 8798385d4096d5dfcb19a4a0fa83daa398c23019 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Thu, 11 Aug 2016 09:13:10 +0300
Subject: [PATCH 50/56] 1. Fixed issue with length field of keep-alive packet
 2. Extended amount of elements in RingBuffer, reduced item length 3. Added
 system information into keep-alive 4. Updated version number

---
 CronosAgent.c | 20 ++++++++++++++------
 RingBuffer.c  |  8 ++++----
 RingBuffer.h  |  4 ++--
 Version.h     |  2 +-
 4 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/CronosAgent.c b/CronosAgent.c
index 3b2ae03..93619a2 100644
--- a/CronosAgent.c
+++ b/CronosAgent.c
@@ -17,6 +17,7 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/socket.h>
+#include <sys/utsname.h>
 
 #ifdef USE_OPENSSL
 #include <openssl/sha.h>
@@ -121,9 +122,9 @@
 #endif
 
 
-#define MODE_CONSOLE (1 << 0)
-#define MODE_SYSLOG  (1 << 1)
-#define MODE_DAEMON  (1 << 2)
+#define MODE_CONSOLE       (1 << 0)
+#define MODE_SYSLOG        (1 << 1)
+#define MODE_DAEMON        (1 << 2)
 
 #define EVENT_LIST_LENGTH  (4 + 2 + 4)
 
@@ -516,7 +517,7 @@ int main(int argc, const char* argv[])
   struct RingBuffer ringBuffers[2];
   memset(ringBuffers, 0, sizeof(ringBuffers));
 
-  uint32_t sequenceNumbers[] = 
+  uint32_t sequenceNumbers[] =
   {
     0,
     0,
@@ -524,6 +525,9 @@ int main(int argc, const char* argv[])
     0
   };
 
+  struct utsname systemName;
+  uname(&systemName);
+
   // Main loop
 
   bool running = true;
@@ -801,12 +805,16 @@ int main(int argc, const char* argv[])
 
         data->number = htole32(repeaterNumber);
         data->service = REWIND_SERVICE_CRONOS_AGENT;
-        length += sprintf(data->description, "CronosAgent " STRING(VERSION) " " BUILD);
+
+        length += sprintf(data->description,
+          "CronosAgent " STRING(VERSION) " %s %s " BUILD,
+          systemName.sysname,
+          systemName.machine);
 
         outgoingBuffer->type = htole16(REWIND_TYPE_KEEP_ALIVE);
         outgoingBuffer->flags = htole16(REWIND_FLAG_DEFAULT_SET);
         outgoingBuffer->number = htole32(++ sequenceNumbers[0]);
-        outgoingBuffer->length = htobe16(length);
+        outgoingBuffer->length = htole16(length);
         length += sizeof(struct RewindData);
         sendto(uplinkHandle, outgoingBuffer, length, 0, serverAddress->ai_addr, serverAddress->ai_addrlen);
 
diff --git a/RingBuffer.c b/RingBuffer.c
index 40aa09c..b2e830b 100644
--- a/RingBuffer.c
+++ b/RingBuffer.c
@@ -20,13 +20,13 @@ void ProcessBuffer(struct RingBuffer* buffer, int handle, struct sockaddr_in* ad
 {
   if (buffer->marks == 0)
   {
-  	// Nothing to process
-  	return;
+    // Nothing to process
+    return;
   }
 
   if (buffer->delay > 0)
   {
-  	// Processing was postponed
+    // Processing was postponed
     buffer->delay --;
     return;
   }
@@ -35,7 +35,7 @@ void ProcessBuffer(struct RingBuffer* buffer, int handle, struct sockaddr_in* ad
 
   if (buffer->marks & mark)
   {
-  	// Transmit scheduled data
+    // Transmit scheduled data
     struct BufferRecord* record = buffer->records + buffer->index;
     sendto(handle, record->data, record->length, 0, (struct sockaddr*)address, sizeof(struct sockaddr_in));
     // Clear processing mark
diff --git a/RingBuffer.h b/RingBuffer.h
index a50e813..20b9a68 100644
--- a/RingBuffer.h
+++ b/RingBuffer.h
@@ -10,8 +10,8 @@ extern "C"
 {
 #endif
 
-#define DATA_LENGTH    256
-#define BUFFER_LENGTH  8
+#define DATA_LENGTH    48
+#define BUFFER_LENGTH  16
 
 struct BufferRecord
 {
diff --git a/Version.h b/Version.h
index 3149507..6ea5c38 100644
--- a/Version.h
+++ b/Version.h
@@ -1 +1 @@
-#define VERSION 20160806
+#define VERSION 20160811

From 185501b7faf24fdc1f1df3a7fc83aa1c004a5b9b Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Fri, 12 Aug 2016 11:46:57 +0300
Subject: [PATCH 51/56] Changles in LuCI

---
 CronosAgent.c                        | 13 ++++++++++---
 OpenWRT/controller/cronosagent.lua   |  7 +------
 OpenWRT/view/cronosagent/restart.htm |  9 +++++++++
 Version.h                            |  2 +-
 4 files changed, 21 insertions(+), 10 deletions(-)
 create mode 100644 OpenWRT/view/cronosagent/restart.htm

diff --git a/CronosAgent.c b/CronosAgent.c
index 93619a2..459df33 100644
--- a/CronosAgent.c
+++ b/CronosAgent.c
@@ -128,8 +128,9 @@
 
 #define EVENT_LIST_LENGTH  (4 + 2 + 4)
 
-#define BUFFER_SIZE        2048
-#define EXPIRATION_TIME    60
+#define BUFFER_SIZE        2048           // 2 KB
+#define EXPIRATION_TIME    60             // 1 minute
+#define INITIAL_INTERVAL   100 * 1000000  // 100 milliseconds
 
 
 int serviceMode = MODE_CONSOLE;
@@ -247,6 +248,12 @@ int main(int argc, const char* argv[])
     return EXIT_FAILURE;
   }
 
+  if (serviceMode & MODE_SYSLOG)
+  {
+    // Set proper origin for syslog (required by OpenWRT)
+    openlog("CronosAgent", LOG_NOWAIT | LOG_PID, LOG_USER); 
+  }
+
 #ifdef __linux__
   if ((serviceMode & MODE_DAEMON) &&
       (daemon(-1, -1) < 0))
@@ -376,7 +383,7 @@ int main(int argc, const char* argv[])
   struct itimerspec timerInterval;
   memset(&timerInterval, 0, sizeof(timerInterval));
 
-  timerInterval.it_value.tv_sec = REWIND_KEEP_ALIVE_INTERVAL;
+  timerInterval.it_value.tv_nsec = INITIAL_INTERVAL;
   timerInterval.it_interval.tv_sec = REWIND_KEEP_ALIVE_INTERVAL;
 
   timerHandle1 = timerfd_create(CLOCK_MONOTONIC, 0);
diff --git a/OpenWRT/controller/cronosagent.lua b/OpenWRT/controller/cronosagent.lua
index 81b65ce..a3ffcc8 100644
--- a/OpenWRT/controller/cronosagent.lua
+++ b/OpenWRT/controller/cronosagent.lua
@@ -3,10 +3,5 @@ module("luci.controller.cronosagent", package.seeall)
 function index()
   entry({ "admin", "cronosagent"              }, alias("admin", "cronosagent", "configure", "restart"), "CronosAgent")
   entry({ "admin", "cronosagent", "configure" }, cbi("cronosagent/configure"),                          "Configure", 10)
-  entry({ "admin", "cronosagent", "restart"   }, call("restartCronosAgent"),                            "Restart",   20)
-end
-
-function restartCronosAgent()
-  luci.sys.call("/etc/init.d/cronosagent restart")
-  luci.http.write("Done!")
+  entry({ "admin", "cronosagent", "restart"   }, template("cronosagent/restart"),                       "Restart",   20)
 end
diff --git a/OpenWRT/view/cronosagent/restart.htm b/OpenWRT/view/cronosagent/restart.htm
new file mode 100644
index 0000000..1044052
--- /dev/null
+++ b/OpenWRT/view/cronosagent/restart.htm
@@ -0,0 +1,9 @@
+<%
+
+  luci.sys.call("/etc/init.d/cronosagent restart ; sleep 2")
+
+%>
+<%+header%>
+<h2 name="content">CronosAgent</h2>
+<textarea readonly="readonly" wrap="off" rows="20"><%= luci.util.exec("logread | grep CronoSAgent") %></textarea>
+<%+footer%>
diff --git a/Version.h b/Version.h
index 6ea5c38..986bb3b 100644
--- a/Version.h
+++ b/Version.h
@@ -1 +1 @@
-#define VERSION 20160811
+#define VERSION 20160812

From 9ab1f42050d69c332b87317755d71794fa763f38 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Fri, 12 Aug 2016 11:48:27 +0300
Subject: [PATCH 52/56] Changles in LuCI

---
 OpenWRT/view/cronosagent/restart.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenWRT/view/cronosagent/restart.htm b/OpenWRT/view/cronosagent/restart.htm
index 1044052..b262090 100644
--- a/OpenWRT/view/cronosagent/restart.htm
+++ b/OpenWRT/view/cronosagent/restart.htm
@@ -5,5 +5,5 @@
 %>
 <%+header%>
 <h2 name="content">CronosAgent</h2>
-<textarea readonly="readonly" wrap="off" rows="20"><%= luci.util.exec("logread | grep CronoSAgent") %></textarea>
+<textarea readonly="readonly" wrap="off" rows="20"><%= luci.util.exec("logread | grep CronosAgent") %></textarea>
 <%+footer%>

From e538746c1680f4c84c4fd26efc56fd01e55fe9b7 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <cyanide.burnout@gmail.com>
Date: Fri, 12 Aug 2016 11:59:45 +0300
Subject: [PATCH 53/56] Changles in LuCI

---
 OpenWRT/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index b5cbffc..75e848a 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -35,12 +35,14 @@ define Package/cronosagent/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/view/cronosagent
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/cronosagent
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cronosagent $(1)/opt/CronosAgent/
 	$(INSTALL_BIN) $(X_SOURCE_DIR)/cronosagent.sh $(1)/opt/CronosAgent/
 	$(INSTALL_BIN) $(X_SOURCE_DIR)/OpenWRT/init.d/cronosagent $(1)/etc/init.d/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/config/cronosagent $(1)/etc/config/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/controller/cronosagent.lua $(1)/usr/lib/lua/luci/controller/
+	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/view/cronosagent/restart.lua $(1)/usr/lib/lua/luci/view/cronosagent/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/model/cbi/cronosagent/configure.lua $(1)/usr/lib/lua/luci/model/cbi/cronosagent/
 endef
 

From 99a85d6fd90d434d10317dd0dca9d54c1a752193 Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@phi>
Date: Fri, 12 Aug 2016 12:14:54 +0300
Subject: [PATCH 54/56] OpenWRT stuff is fixed

---
 OpenWRT/Makefile                     | 2 +-
 OpenWRT/view/cronosagent/restart.htm | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index 75e848a..cbf7835 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -42,7 +42,7 @@ define Package/cronosagent/install
 	$(INSTALL_BIN) $(X_SOURCE_DIR)/OpenWRT/init.d/cronosagent $(1)/etc/init.d/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/config/cronosagent $(1)/etc/config/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/controller/cronosagent.lua $(1)/usr/lib/lua/luci/controller/
-	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/view/cronosagent/restart.lua $(1)/usr/lib/lua/luci/view/cronosagent/
+	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/view/cronosagent/restart.htm $(1)/usr/lib/lua/luci/view/cronosagent/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/model/cbi/cronosagent/configure.lua $(1)/usr/lib/lua/luci/model/cbi/cronosagent/
 endef
 
diff --git a/OpenWRT/view/cronosagent/restart.htm b/OpenWRT/view/cronosagent/restart.htm
index b262090..fac325f 100644
--- a/OpenWRT/view/cronosagent/restart.htm
+++ b/OpenWRT/view/cronosagent/restart.htm
@@ -4,6 +4,6 @@
 
 %>
 <%+header%>
-<h2 name="content">CronosAgent</h2>
-<textarea readonly="readonly" wrap="off" rows="20"><%= luci.util.exec("logread | grep CronosAgent") %></textarea>
+<h2 name="content">CronosAgent &#9656; Restart</h2>
+<textarea readonly="readonly" wrap="off" rows="20" style="width: 100%"><%= luci.util.exec("logread | grep CronosAgent") %></textarea>
 <%+footer%>

From fe2d1c62a7436345a9643f917165bc3195c96e6b Mon Sep 17 00:00:00 2001
From: Artem Prilutskiy <performer@phi>
Date: Fri, 12 Aug 2016 12:53:13 +0300
Subject: [PATCH 55/56] Improved output of syslog

---
 OpenWRT/view/cronosagent/restart.htm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/OpenWRT/view/cronosagent/restart.htm b/OpenWRT/view/cronosagent/restart.htm
index fac325f..c54045f 100644
--- a/OpenWRT/view/cronosagent/restart.htm
+++ b/OpenWRT/view/cronosagent/restart.htm
@@ -5,5 +5,5 @@
 %>
 <%+header%>
 <h2 name="content">CronosAgent &#9656; Restart</h2>
-<textarea readonly="readonly" wrap="off" rows="20" style="width: 100%"><%= luci.util.exec("logread | grep CronosAgent") %></textarea>
+<textarea readonly="readonly" wrap="off" rows="20" style="width: 100%"><%= luci.util.exec("logread | grep CronosAgent | tail -n 20") %></textarea>
 <%+footer%>

From cdc3d16a18388a7244bf6f7b603ede735329266a Mon Sep 17 00:00:00 2001
From: Rudy Hardeman <zarya@gigafreak.net>
Date: Wed, 14 Sep 2016 13:14:01 +0200
Subject: [PATCH 56/56] Updated gitlab-ci

---
 .gitlab-ci.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a93f8b0..c90399c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,13 +2,14 @@ debian_amd64:
   stage: build
   script:
     - make debian-package
-    - cp ../cronos*.deb .
+    - mkdir build
+    - cp ../cronos*.deb build/ 
     - rm ../cronos*
   only:
     - master
   artifacts:
     paths:
-    - cronos*.deb
+    - build/* 
   tags:
     - debian
     - amd64
@@ -17,13 +18,14 @@ debian_386:
   stage: build
   script:
     - ARCH=i386 make debian-package
-    - cp ../cronos*.deb .
+    - mkdir build
+    - cp ../cronos*.deb build/ 
     - rm ../cronos*
   only:
     - master
   artifacts:
     paths:
-    - cronos*.deb
+    - build/*
   tags:
     - debian
     - i386
@@ -41,4 +43,4 @@ debian_armhf:
     - cronos*.deb
   tags:
     - debian
-    - armv6
\ No newline at end of file
+    - armv6