From 748e286da40e5026db7723d32a0d436a054bc3d7 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Mon, 13 Dec 2021 09:09:08 +0100
Subject: [PATCH 01/41] [MISC] Integrate data exporter code with OpenWrt build
 system

---
 Jenkinsfile                                   | 64 -------------------
 Makefile                                      | 47 ++++++++++++++
 CMakeLists.txt => src/CMakeLists.txt          |  0
 .../backend_event_loop.c                      |  0
 .../backend_event_loop.h                      |  0
 .../metadata_exporter.c                       |  0
 .../metadata_exporter.h                       |  0
 .../metadata_exporter_log.h                   |  0
 .../metadata_input_gps_nsb.c                  |  0
 .../metadata_input_gps_nsb.h                  |  0
 .../metadata_input_gpsd.c                     |  0
 .../metadata_input_gpsd.h                     |  0
 .../metadata_input_iface_test.h               |  0
 .../metadata_input_munin.c                    |  0
 .../metadata_input_munin.h                    |  0
 .../metadata_input_nl_zmq_common.c            |  0
 .../metadata_input_nl_zmq_common.h            |  0
 .../metadata_input_sysevent.c                 |  0
 .../metadata_input_sysevent.h                 |  0
 .../metadata_input_zeromq.c                   |  0
 .../metadata_input_zeromq.h                   |  0
 metadata_utils.c => src/metadata_utils.c      |  0
 metadata_utils.h => src/metadata_utils.h      |  0
 .../metadata_writer_file.c                    |  0
 .../metadata_writer_file.h                    |  0
 .../metadata_writer_inventory_conn.c          |  0
 .../metadata_writer_inventory_conn.h          |  0
 .../metadata_writer_inventory_gps.c           |  0
 .../metadata_writer_inventory_gps.h           |  0
 .../metadata_writer_inventory_system.c        |  0
 .../metadata_writer_inventory_system.h        |  0
 .../metadata_writer_json_helpers.c            |  0
 .../metadata_writer_json_helpers.h            |  0
 .../metadata_writer_neat.c                    |  0
 .../metadata_writer_neat.h                    |  0
 .../metadata_writer_nne.c                     |  0
 .../metadata_writer_nne.h                     |  0
 .../metadata_writer_sqlite.c                  |  0
 .../metadata_writer_sqlite.h                  |  0
 .../metadata_writer_sqlite_helpers.c          |  0
 .../metadata_writer_sqlite_helpers.h          |  0
 .../metadata_writer_sqlite_monitor.c          |  0
 .../metadata_writer_sqlite_monitor.h          |  0
 .../metadata_writer_zeromq.c                  |  0
 .../metadata_writer_zeromq.h                  |  0
 .../metadata_writer_zeromq_monroe.c           |  0
 .../metadata_writer_zeromq_nne.c              |  0
 system_helpers.c => src/system_helpers.c      |  0
 system_helpers.h => src/system_helpers.h      |  0
 49 files changed, 47 insertions(+), 64 deletions(-)
 delete mode 100644 Jenkinsfile
 create mode 100644 Makefile
 rename CMakeLists.txt => src/CMakeLists.txt (100%)
 rename backend_event_loop.c => src/backend_event_loop.c (100%)
 rename backend_event_loop.h => src/backend_event_loop.h (100%)
 rename metadata_exporter.c => src/metadata_exporter.c (100%)
 rename metadata_exporter.h => src/metadata_exporter.h (100%)
 rename metadata_exporter_log.h => src/metadata_exporter_log.h (100%)
 rename metadata_input_gps_nsb.c => src/metadata_input_gps_nsb.c (100%)
 rename metadata_input_gps_nsb.h => src/metadata_input_gps_nsb.h (100%)
 rename metadata_input_gpsd.c => src/metadata_input_gpsd.c (100%)
 rename metadata_input_gpsd.h => src/metadata_input_gpsd.h (100%)
 rename metadata_input_iface_test.h => src/metadata_input_iface_test.h (100%)
 rename metadata_input_munin.c => src/metadata_input_munin.c (100%)
 rename metadata_input_munin.h => src/metadata_input_munin.h (100%)
 rename metadata_input_nl_zmq_common.c => src/metadata_input_nl_zmq_common.c (100%)
 rename metadata_input_nl_zmq_common.h => src/metadata_input_nl_zmq_common.h (100%)
 rename metadata_input_sysevent.c => src/metadata_input_sysevent.c (100%)
 rename metadata_input_sysevent.h => src/metadata_input_sysevent.h (100%)
 rename metadata_input_zeromq.c => src/metadata_input_zeromq.c (100%)
 rename metadata_input_zeromq.h => src/metadata_input_zeromq.h (100%)
 rename metadata_utils.c => src/metadata_utils.c (100%)
 rename metadata_utils.h => src/metadata_utils.h (100%)
 rename metadata_writer_file.c => src/metadata_writer_file.c (100%)
 rename metadata_writer_file.h => src/metadata_writer_file.h (100%)
 rename metadata_writer_inventory_conn.c => src/metadata_writer_inventory_conn.c (100%)
 rename metadata_writer_inventory_conn.h => src/metadata_writer_inventory_conn.h (100%)
 rename metadata_writer_inventory_gps.c => src/metadata_writer_inventory_gps.c (100%)
 rename metadata_writer_inventory_gps.h => src/metadata_writer_inventory_gps.h (100%)
 rename metadata_writer_inventory_system.c => src/metadata_writer_inventory_system.c (100%)
 rename metadata_writer_inventory_system.h => src/metadata_writer_inventory_system.h (100%)
 rename metadata_writer_json_helpers.c => src/metadata_writer_json_helpers.c (100%)
 rename metadata_writer_json_helpers.h => src/metadata_writer_json_helpers.h (100%)
 rename metadata_writer_neat.c => src/metadata_writer_neat.c (100%)
 rename metadata_writer_neat.h => src/metadata_writer_neat.h (100%)
 rename metadata_writer_nne.c => src/metadata_writer_nne.c (100%)
 rename metadata_writer_nne.h => src/metadata_writer_nne.h (100%)
 rename metadata_writer_sqlite.c => src/metadata_writer_sqlite.c (100%)
 rename metadata_writer_sqlite.h => src/metadata_writer_sqlite.h (100%)
 rename metadata_writer_sqlite_helpers.c => src/metadata_writer_sqlite_helpers.c (100%)
 rename metadata_writer_sqlite_helpers.h => src/metadata_writer_sqlite_helpers.h (100%)
 rename metadata_writer_sqlite_monitor.c => src/metadata_writer_sqlite_monitor.c (100%)
 rename metadata_writer_sqlite_monitor.h => src/metadata_writer_sqlite_monitor.h (100%)
 rename metadata_writer_zeromq.c => src/metadata_writer_zeromq.c (100%)
 rename metadata_writer_zeromq.h => src/metadata_writer_zeromq.h (100%)
 rename metadata_writer_zeromq_monroe.c => src/metadata_writer_zeromq_monroe.c (100%)
 rename metadata_writer_zeromq_nne.c => src/metadata_writer_zeromq_nne.c (100%)
 rename system_helpers.c => src/system_helpers.c (100%)
 rename system_helpers.h => src/system_helpers.h (100%)

diff --git a/Jenkinsfile b/Jenkinsfile
deleted file mode 100644
index 0bb7194..0000000
--- a/Jenkinsfile
+++ /dev/null
@@ -1,64 +0,0 @@
-import java.text.SimpleDateFormat
-jobName = "metadata-exporter"
-version = "0.1.50"
-build_dir = "build"
-buildPackageName = "meta-exporter"
-
-node ('dockerslave') {
-    // Be sure that workspace is cleaned
-    deleteDir()
-    stage ('Git') {
-        git branch: 'master', url: 'git@github.com:MONROE-PROJECT/Utilities.git'
-
-        checkout([$class: 'GitSCM',
-            branches: [[name: 'master']],
-            doGenerateSubmoduleConfigurations: false,
-            extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'metadata-exporter-alt']],
-            submoduleCfg: [],
-            userRemoteConfigs: [[url: 'git@github.com:kristrev/data-exporter.git']]])
-        gitCommit = sh(returnStdout: true, script: 'git rev-parse HEAD').trim()
-        shortCommit = gitCommit.take(6)
-        commitChangeset = sh(returnStdout: true, script: 'git diff-tree --no-commit-id --name-status -r HEAD').trim()
-        commitMessage = sh(returnStdout: true, script: "git show ${gitCommit} --format=%B --name-status").trim()
-        sh """echo "${commitMessage}" > CHANGELIST"""
-        def dateFormat = new SimpleDateFormat("yyyyMMddHHmm")
-        def date = new Date()
-        def timestamp = dateFormat.format(date).toString()
-
-        checkout([$class: 'GitSCM',
-                branches: [[name: 'monroe']],
-                doGenerateSubmoduleConfigurations: false,
-                extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'versionize']],
-                submoduleCfg: [],
-                userRemoteConfigs: [[url: 'git@github.com:Celerway/celerway-jenkins.git']]])
-    }
-
-    stage ('Build') {
-        dir(build_dir) {
-            sh "cmake ../metadata-exporter-alt -DNNE=1 -DSQLITE3=1 -DZEROMQ_WRITER=1 -DGPS_NSB=1 -DMUNIN=1 -DSYSEVENT=1 && make && make package"
-        }
-        sh "chmod +x versionize/versionize.sh; cp versionize/versionize.sh build/"
-        dir(build_dir) {
-            sh "mv meta_exporter-0.1.0-Linux.deb meta-exporter-0.1.0-Linux.deb"
-            sh "./versionize.sh meta-exporter-0.1.0-Linux.deb ${buildPackageName} ${version} ${shortCommit} || true"
-            sh "rm meta-exporter-0.1.0-Linux.deb"
-        }
-    }
-
-    stage ('Configure') {
-        dir(build_dir) {
-            sh """echo `cat pk_${buildPackageName}/DEBIAN/control |grep Version|sed -e 's/Version: //'` > pkgver"""
-        }
-        sh """cp -an metadata-exporter/* build/pk_${buildPackageName}/"""
-        dir(build_dir) {
-            sh """sed -i -e 's/${buildPackageName}/metadata-exporter/g' pk_${buildPackageName}/DEBIAN/md5sums pk_${buildPackageName}/DEBIAN/control"""
-            sh """mkdir -p pk_${buildPackageName}/usr/sbin && mv pk_${buildPackageName}/usr/sbin/meta_exporter pk_${buildPackageName}/usr/sbin/metadata-exporter"""
-            sh '''PKGVER=`cat pkgver` ;dpkg -b pk_meta-exporter metadata-exporter-${PKGVER}-Linux.deb'''
-            sh "rm meta-exporter*.deb"
-        }
-    }
-
-    stage ('Archive artifacts') {
-        archiveArtifacts "${build_dir}/*.deb"
-    }
-}
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..69a78e5
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,47 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=data-exporter
+PKG_VERSION:=2021-12-13
+PKG_RELEASE=1.4
+
+CMAKE_INSTALL:=1
+
+PKG_LICENSE:=LGPLv2.1
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Lukasz Baj <l.baj@celerway.com>
+PKG_BUILD_PARALLEL:=1
+
+COMMIT_NO := $(shell git log --pretty=%H -1)
+CMAKE_OPTIONS += -DVER=$(COMMIT_NO)
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	cp -r src/* $(PKG_BUILD_DIR)/
+endef
+
+define Package/data-exporter
+  SECTION:=celerway
+  CATEGORY:=Celerway
+  DEPENDS:=+libjson-c +libmnl +libsqlite3 +libpthread +libuci
+  TITLE:=Utility for exporting metadata
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
+CMAKE_OPTIONS += -DTARGET_OWRT=1 -DSQLITE3=1 -DFILE=1
+
+define Package/data-exporter/install
+	$(INSTALL_DIR) $(1)/bin
+	(CP) $(PKG_INSTALL_DIR)/usr/bin/meta_exporter $(1)/bin/
+	(INSTALL_BIN) ./files/metadata_exporter_timeloop.sh $(1)/bin/
+	(INSTALL_DIR) $(1)/etc/init.d
+	(INSTALL_BIN) ./files/metadata.init $(1)/etc/init.d/metadata
+	(INSTALL_BIN) ./files/metadataloop.init $(1)/etc/init.d/metadataloop
+	(INSTALL_DIR) $(1)/etc/config
+	(INSTALL_BIN) ./files/metadata.config $(1)/etc/config/metadata
+endef
+
+$(eval $(call BuildPackage,data-exporter))
diff --git a/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/backend_event_loop.c b/src/backend_event_loop.c
similarity index 100%
rename from backend_event_loop.c
rename to src/backend_event_loop.c
diff --git a/backend_event_loop.h b/src/backend_event_loop.h
similarity index 100%
rename from backend_event_loop.h
rename to src/backend_event_loop.h
diff --git a/metadata_exporter.c b/src/metadata_exporter.c
similarity index 100%
rename from metadata_exporter.c
rename to src/metadata_exporter.c
diff --git a/metadata_exporter.h b/src/metadata_exporter.h
similarity index 100%
rename from metadata_exporter.h
rename to src/metadata_exporter.h
diff --git a/metadata_exporter_log.h b/src/metadata_exporter_log.h
similarity index 100%
rename from metadata_exporter_log.h
rename to src/metadata_exporter_log.h
diff --git a/metadata_input_gps_nsb.c b/src/metadata_input_gps_nsb.c
similarity index 100%
rename from metadata_input_gps_nsb.c
rename to src/metadata_input_gps_nsb.c
diff --git a/metadata_input_gps_nsb.h b/src/metadata_input_gps_nsb.h
similarity index 100%
rename from metadata_input_gps_nsb.h
rename to src/metadata_input_gps_nsb.h
diff --git a/metadata_input_gpsd.c b/src/metadata_input_gpsd.c
similarity index 100%
rename from metadata_input_gpsd.c
rename to src/metadata_input_gpsd.c
diff --git a/metadata_input_gpsd.h b/src/metadata_input_gpsd.h
similarity index 100%
rename from metadata_input_gpsd.h
rename to src/metadata_input_gpsd.h
diff --git a/metadata_input_iface_test.h b/src/metadata_input_iface_test.h
similarity index 100%
rename from metadata_input_iface_test.h
rename to src/metadata_input_iface_test.h
diff --git a/metadata_input_munin.c b/src/metadata_input_munin.c
similarity index 100%
rename from metadata_input_munin.c
rename to src/metadata_input_munin.c
diff --git a/metadata_input_munin.h b/src/metadata_input_munin.h
similarity index 100%
rename from metadata_input_munin.h
rename to src/metadata_input_munin.h
diff --git a/metadata_input_nl_zmq_common.c b/src/metadata_input_nl_zmq_common.c
similarity index 100%
rename from metadata_input_nl_zmq_common.c
rename to src/metadata_input_nl_zmq_common.c
diff --git a/metadata_input_nl_zmq_common.h b/src/metadata_input_nl_zmq_common.h
similarity index 100%
rename from metadata_input_nl_zmq_common.h
rename to src/metadata_input_nl_zmq_common.h
diff --git a/metadata_input_sysevent.c b/src/metadata_input_sysevent.c
similarity index 100%
rename from metadata_input_sysevent.c
rename to src/metadata_input_sysevent.c
diff --git a/metadata_input_sysevent.h b/src/metadata_input_sysevent.h
similarity index 100%
rename from metadata_input_sysevent.h
rename to src/metadata_input_sysevent.h
diff --git a/metadata_input_zeromq.c b/src/metadata_input_zeromq.c
similarity index 100%
rename from metadata_input_zeromq.c
rename to src/metadata_input_zeromq.c
diff --git a/metadata_input_zeromq.h b/src/metadata_input_zeromq.h
similarity index 100%
rename from metadata_input_zeromq.h
rename to src/metadata_input_zeromq.h
diff --git a/metadata_utils.c b/src/metadata_utils.c
similarity index 100%
rename from metadata_utils.c
rename to src/metadata_utils.c
diff --git a/metadata_utils.h b/src/metadata_utils.h
similarity index 100%
rename from metadata_utils.h
rename to src/metadata_utils.h
diff --git a/metadata_writer_file.c b/src/metadata_writer_file.c
similarity index 100%
rename from metadata_writer_file.c
rename to src/metadata_writer_file.c
diff --git a/metadata_writer_file.h b/src/metadata_writer_file.h
similarity index 100%
rename from metadata_writer_file.h
rename to src/metadata_writer_file.h
diff --git a/metadata_writer_inventory_conn.c b/src/metadata_writer_inventory_conn.c
similarity index 100%
rename from metadata_writer_inventory_conn.c
rename to src/metadata_writer_inventory_conn.c
diff --git a/metadata_writer_inventory_conn.h b/src/metadata_writer_inventory_conn.h
similarity index 100%
rename from metadata_writer_inventory_conn.h
rename to src/metadata_writer_inventory_conn.h
diff --git a/metadata_writer_inventory_gps.c b/src/metadata_writer_inventory_gps.c
similarity index 100%
rename from metadata_writer_inventory_gps.c
rename to src/metadata_writer_inventory_gps.c
diff --git a/metadata_writer_inventory_gps.h b/src/metadata_writer_inventory_gps.h
similarity index 100%
rename from metadata_writer_inventory_gps.h
rename to src/metadata_writer_inventory_gps.h
diff --git a/metadata_writer_inventory_system.c b/src/metadata_writer_inventory_system.c
similarity index 100%
rename from metadata_writer_inventory_system.c
rename to src/metadata_writer_inventory_system.c
diff --git a/metadata_writer_inventory_system.h b/src/metadata_writer_inventory_system.h
similarity index 100%
rename from metadata_writer_inventory_system.h
rename to src/metadata_writer_inventory_system.h
diff --git a/metadata_writer_json_helpers.c b/src/metadata_writer_json_helpers.c
similarity index 100%
rename from metadata_writer_json_helpers.c
rename to src/metadata_writer_json_helpers.c
diff --git a/metadata_writer_json_helpers.h b/src/metadata_writer_json_helpers.h
similarity index 100%
rename from metadata_writer_json_helpers.h
rename to src/metadata_writer_json_helpers.h
diff --git a/metadata_writer_neat.c b/src/metadata_writer_neat.c
similarity index 100%
rename from metadata_writer_neat.c
rename to src/metadata_writer_neat.c
diff --git a/metadata_writer_neat.h b/src/metadata_writer_neat.h
similarity index 100%
rename from metadata_writer_neat.h
rename to src/metadata_writer_neat.h
diff --git a/metadata_writer_nne.c b/src/metadata_writer_nne.c
similarity index 100%
rename from metadata_writer_nne.c
rename to src/metadata_writer_nne.c
diff --git a/metadata_writer_nne.h b/src/metadata_writer_nne.h
similarity index 100%
rename from metadata_writer_nne.h
rename to src/metadata_writer_nne.h
diff --git a/metadata_writer_sqlite.c b/src/metadata_writer_sqlite.c
similarity index 100%
rename from metadata_writer_sqlite.c
rename to src/metadata_writer_sqlite.c
diff --git a/metadata_writer_sqlite.h b/src/metadata_writer_sqlite.h
similarity index 100%
rename from metadata_writer_sqlite.h
rename to src/metadata_writer_sqlite.h
diff --git a/metadata_writer_sqlite_helpers.c b/src/metadata_writer_sqlite_helpers.c
similarity index 100%
rename from metadata_writer_sqlite_helpers.c
rename to src/metadata_writer_sqlite_helpers.c
diff --git a/metadata_writer_sqlite_helpers.h b/src/metadata_writer_sqlite_helpers.h
similarity index 100%
rename from metadata_writer_sqlite_helpers.h
rename to src/metadata_writer_sqlite_helpers.h
diff --git a/metadata_writer_sqlite_monitor.c b/src/metadata_writer_sqlite_monitor.c
similarity index 100%
rename from metadata_writer_sqlite_monitor.c
rename to src/metadata_writer_sqlite_monitor.c
diff --git a/metadata_writer_sqlite_monitor.h b/src/metadata_writer_sqlite_monitor.h
similarity index 100%
rename from metadata_writer_sqlite_monitor.h
rename to src/metadata_writer_sqlite_monitor.h
diff --git a/metadata_writer_zeromq.c b/src/metadata_writer_zeromq.c
similarity index 100%
rename from metadata_writer_zeromq.c
rename to src/metadata_writer_zeromq.c
diff --git a/metadata_writer_zeromq.h b/src/metadata_writer_zeromq.h
similarity index 100%
rename from metadata_writer_zeromq.h
rename to src/metadata_writer_zeromq.h
diff --git a/metadata_writer_zeromq_monroe.c b/src/metadata_writer_zeromq_monroe.c
similarity index 100%
rename from metadata_writer_zeromq_monroe.c
rename to src/metadata_writer_zeromq_monroe.c
diff --git a/metadata_writer_zeromq_nne.c b/src/metadata_writer_zeromq_nne.c
similarity index 100%
rename from metadata_writer_zeromq_nne.c
rename to src/metadata_writer_zeromq_nne.c
diff --git a/system_helpers.c b/src/system_helpers.c
similarity index 100%
rename from system_helpers.c
rename to src/system_helpers.c
diff --git a/system_helpers.h b/src/system_helpers.h
similarity index 100%
rename from system_helpers.h
rename to src/system_helpers.h

From 86885451b09e389b69aba12eb92c0150274d1c73 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Mon, 13 Dec 2021 10:14:40 +0100
Subject: [PATCH 02/41] [FIX] Move lib to src dir

---
 {lib => src/lib}/minmea.c | 0
 {lib => src/lib}/minmea.h | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {lib => src/lib}/minmea.c (100%)
 rename {lib => src/lib}/minmea.h (100%)

diff --git a/lib/minmea.c b/src/lib/minmea.c
similarity index 100%
rename from lib/minmea.c
rename to src/lib/minmea.c
diff --git a/lib/minmea.h b/src/lib/minmea.h
similarity index 100%
rename from lib/minmea.h
rename to src/lib/minmea.h

From 61668d6676d3af1415b0ab0f0a7a252feef43bfd Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Mon, 13 Dec 2021 10:21:27 +0100
Subject: [PATCH 03/41] [FIX] Build issues, add missing files

---
 Makefile                            |  14 +--
 files/metadata.config               |   3 +
 files/metadata.init                 | 113 +++++++++++++++++++++
 files/metadata_exporter_timeloop.sh | 149 ++++++++++++++++++++++++++++
 files/metadataloop.init             |  27 +++++
 5 files changed, 299 insertions(+), 7 deletions(-)
 create mode 100644 files/metadata.config
 create mode 100755 files/metadata.init
 create mode 100755 files/metadata_exporter_timeloop.sh
 create mode 100755 files/metadataloop.init

diff --git a/Makefile b/Makefile
index 69a78e5..873c1ca 100644
--- a/Makefile
+++ b/Makefile
@@ -35,13 +35,13 @@ CMAKE_OPTIONS += -DTARGET_OWRT=1 -DSQLITE3=1 -DFILE=1
 
 define Package/data-exporter/install
 	$(INSTALL_DIR) $(1)/bin
-	(CP) $(PKG_INSTALL_DIR)/usr/bin/meta_exporter $(1)/bin/
-	(INSTALL_BIN) ./files/metadata_exporter_timeloop.sh $(1)/bin/
-	(INSTALL_DIR) $(1)/etc/init.d
-	(INSTALL_BIN) ./files/metadata.init $(1)/etc/init.d/metadata
-	(INSTALL_BIN) ./files/metadataloop.init $(1)/etc/init.d/metadataloop
-	(INSTALL_DIR) $(1)/etc/config
-	(INSTALL_BIN) ./files/metadata.config $(1)/etc/config/metadata
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/meta_exporter $(1)/bin/
+	$(INSTALL_BIN) ./files/metadata_exporter_timeloop.sh $(1)/bin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/metadata.init $(1)/etc/init.d/metadata
+	$(INSTALL_BIN) ./files/metadataloop.init $(1)/etc/init.d/metadataloop
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_BIN) ./files/metadata.config $(1)/etc/config/metadata
 endef
 
 $(eval $(call BuildPackage,data-exporter))
diff --git a/files/metadata.config b/files/metadata.config
new file mode 100644
index 0000000..1d0596d
--- /dev/null
+++ b/files/metadata.config
@@ -0,0 +1,3 @@
+config section metadata
+    option version '2'
+    option disabled '0'
diff --git a/files/metadata.init b/files/metadata.init
new file mode 100755
index 0000000..8e3c627
--- /dev/null
+++ b/files/metadata.init
@@ -0,0 +1,113 @@
+#!/bin/sh /etc/rc.common
+
+. /lib/config/uci.sh
+. /usr/share/libubox/jshn.sh
+
+START=96
+
+METADATAPATH="/bin"
+METADATANAME="meta_exporter"
+METADATADB="/tmp/metadata.db"
+METADATAPREFIX="/tmp/metatemp"
+USAGEPREFIX="/tmp/usage"
+GPSPREFIX="/tmp/metadata-gps"
+CONF_PATH="/tmp/meta_exporter.conf"
+SESSION_ID_PATH="/tmp/bootcnt"
+TSTAMP_DUMP_PATH="/tmp/last_conn_tstamp"
+USE_PROCD=1
+
+create_config()
+{
+	METADATANODEID=$(uci_get backend inventory id)
+    API_VERSION=$(uci_get backend inventory api_version)
+    SQLITE_INTERVAL=$(uci_get backend metadata sqlite_interval)
+    SQLITE_EVENTS=$(uci_get backend metadata sqlite_events)
+    EXPORT_GPS=$(uci_get cwy_router_settings metadata export_gps 1)
+    #The reason we use the default board name here, is that we need to separate between old and new Arcus. The new Arcus
+    #have a valid identifier stored in the DMI
+    BOARD_NAME=`cat /tmp/sysinfo/board_name`
+
+	if [ -z "$METADATANODEID" ]; then
+		METADATANODEID=0
+	fi
+
+    if [ -z "$API_VERSION" ];
+    then
+        API_VERSION=2
+    fi
+
+    json_init
+
+    #Add zmq options
+    json_add_object "zmq_input"
+        json_add_boolean "conn" 1
+
+        if [ "$EXPORT_GPS" -eq 1 ];
+        then
+            json_add_boolean "pos" 1
+        fi
+    json_close_object
+
+    json_add_object "sqlite"
+        json_add_string "database" "$METADATADB"
+        json_add_int "nodeid" "$METADATANODEID"
+        json_add_string "meta_prefix" "$METADATAPREFIX"
+        json_add_string "usage_prefix" "$USAGEPREFIX"
+
+        if [ "$EXPORT_GPS" -eq 1 ];
+        then
+            json_add_string "gps_prefix" "$GPSPREFIX"
+        fi
+
+        json_add_string "session_id" "$SESSION_ID_PATH"
+        json_add_int "api_version" "$API_VERSION"
+
+        if [ -n "$SQLITE_INTERVAL" ];
+        then
+            json_add_int "interval" "$SQLITE_INTERVAL"
+        fi
+
+        if [ -n "$SQLITE_EVENTS" ];
+        then
+            json_add_int "events" "$SQLITE_EVENTS"
+        fi
+
+        json_add_string "last_conn_tstamp_path" "$TSTAMP_DUMP_PATH"
+        json_add_string "output_format" "json"
+        json_add_string "ntp_fix_file" "/tmp/ntp-fix-obtained"
+
+    json_close_object
+
+    if [ "$EXPORT_GPS" -eq 1 ];
+    then
+        if [ "$BOARD_NAME" == "celerway-arcus" ];
+        then
+            json_add_object "gpsd"
+                json_add_string "address" "127.0.0.1"
+                json_add_string "port" "2947"
+            json_close_object
+        fi
+    fi
+
+    echo "$(json_dump)" > "$CONF_PATH"
+}
+
+start_service()
+{
+    DISABLED=$(uci_get cwy_router_settings metadata disabled);
+
+    #Unless there is anywhere to store data, then don't run metadata collector.
+    #The reason for this check, is that we can avoid having to install metadata
+    #later. All we need to provide is a backend-config
+    if [ ! -f "/etc/config/backend" -o $DISABLED -eq 1 ];
+    then
+        exit 0;
+    fi
+
+    create_config
+
+	procd_open_instance
+	procd_set_param command "$METADATAPATH/$METADATANAME" -c "$CONF_PATH"
+	procd_set_param respawn 0 5 0
+	procd_close_instance
+}
diff --git a/files/metadata_exporter_timeloop.sh b/files/metadata_exporter_timeloop.sh
new file mode 100755
index 0000000..c420a28
--- /dev/null
+++ b/files/metadata_exporter_timeloop.sh
@@ -0,0 +1,149 @@
+#!/bin/sh
+
+. /lib/config/uci.sh
+
+INTVL=30;
+SLEEP_TIME=0;
+NUM_USAGE_LIMIT=100;
+NUM_USAGE_DELETE=;
+NUM_METADATA_LIMIT=100;
+NUM_METADATA_DELETE=;
+NUM_GPS_LIMIT=100;
+NUM_GPS_DELETE=;
+RSYNC_PATH="/usr/bin/rsync";
+RSYNC_META_LOCAL="/tmp/metatemp*.json";
+RSYNC_USAGE_LOCAL="/tmp/usage*.json";
+RSYNC_GPS_LOCAL="/tmp/metadata-gps*.json";
+RSYNC_LOCAL="/tmp/metatemp*.json /tmp/usage*.json /tmp/metadata-gps*.json";
+RSYNC_SERVER=$(uci_get backend metadata server);
+RSYNC_USER="$(uci_get backend metadata user)-cert";
+RSYNC_DST_PORT=$(uci_get backend metadata dst_port);
+SSH_KEY_FILE="/tmp/ssh-keys/id_rsa"
+SSH_KNOWN_HOSTS="/tmp/ssh-keys/known_hosts"
+
+RSYNC_REMOTE_PREFIX="$RSYNC_USER@$RSYNC_SERVER:/home/metadata/data";
+
+while true;
+do
+    #This $VAR:-text is som fancy Bash parameter expansion. It means that if
+    #variable is not set, then "return" the string. See:
+    #http://www.gnu.org/software/bash/manual/bash.html#Shell-Parameter-Expansion
+    CWY_VER=$(uci_get cwy_router_settings metadata version)
+    if [ "${CWY_VER:-error_1}" = "error_1" ]
+    then
+        echo "CWY_VER must be set";
+        logger -t metadata_exporter "CWY_VER must be set";
+        sleep $INTVL;
+        continue;
+    fi
+
+    CWY_NODEID=$(uci_get backend inventory id)
+    if [ "${CWY_NODEID:-error_2}" = "error_2" ]
+    then
+        echo "CWY_NODEID must be set";
+        logger -t metadata_exporter "CWY_NODEID must be set";
+        sleep $INTVL;
+        continue;
+    fi
+
+    NUM_METADATA_FILES=$(/bin/ls -l $RSYNC_META_LOCAL | wc -l)
+    if [ "$NUM_METADATA_FILES" -gt "$NUM_METADATA_LIMIT" ];
+    then
+        NUM_METADATA_DELETE=$(( NUM_METADATA_FILES - NUM_METADATA_LIMIT ))
+        logger -t metadata_exporter "Found $NUM_METADATA_FILES number of metadata files, will remove $NUM_METADATA_DELETE";
+        #Delete the X most recent usage files, as they are the least relevant
+        find $RSYNC_META_LOCAL -maxdepth 1 -exec stat -c " %Y %n" {} \; | sort -n | head -"$NUM_METADATA_DELETE" | cut -d " " -f 3 | xargs -- rm
+    fi
+
+    NUM_USAGE_FILES=$(/bin/ls -l $RSYNC_USAGE_LOCAL | wc -l)
+    if [ "$NUM_USAGE_FILES" -gt "$NUM_USAGE_LIMIT" ];
+    then
+        NUM_USAGE_DELETE=$(( NUM_USAGE_FILES - NUM_USAGE_LIMIT ))
+        logger -t metadata_exporter "Found $NUM_USAGE_FILES number of usage files, will remove $NUM_USAGE_DELETE";
+        #Delete the X most recent usage files, as they are the least relevant
+        find $RSYNC_USAGE_LOCAL -maxdepth 1 -exec stat -c " %Y %n" {} \; | sort -n | head -"$NUM_USAGE_DELETE" | cut -d " " -f 3 | xargs -- rm
+    fi
+
+    NUM_GPS_FILES=$(/bin/ls -l $RSYNC_GPS_LOCAL | wc -l)
+    if [ "$NUM_GPS_FILES" -gt "$NUM_GPS_LIMIT" ];
+    then
+        NUM_GPS_DELETE=$(( NUM_GPS_FILES - NUM_GPS_LIMIT ))
+        logger -t metadata_exporter "Found $NUM_GPS_FILES number of usage files, will remove $NUM_GPS_DELETE";
+        #Delete the X most recent usage files, as they are the least relevant
+        find $RSYNC_GPS_LOCAL -maxdepth 1 -exec stat -c " %Y %n" {} \; | sort -n | head -"$NUM_GPS_DELETE" | cut -d " " -f 3 | xargs -- rm
+    fi
+
+    #TODO: Consider wrapping in a conditional
+    #sed -i "s/xxxxxx/$CWY_NODEID/g" $RSYNC_LOCAL
+    NUM_FILES=$(/bin/ls -l $RSYNC_LOCAL | wc -l)
+
+    if [ "$NUM_FILES" -eq 0 ]
+    then
+        sleep 5
+        continue
+    fi
+
+    #rsync deletes files as they are copied (batch), so we don't risk copying (all)
+    #the same data multiple times if a copy fails
+    #use -t to preseve timestamp, so that we can sort files correctly on server.
+    #This is a good enough way to ensure that we get queries in order (we need to do
+    #INSERT before UPDATE). We might get problems if the same router reboots many
+    #times and we dont have a proper clock, but we will be saved by update
+    BEFORE_TIME=$(date '+%s');
+    timeout -s KILL 40 "$RSYNC_PATH" -t --remove-source-files --stats --timeout=30 --perms --chmod=Dg=rw,Fg=rwx \
+        -e "ssh -p $RSYNC_DST_PORT -i ${SSH_KEY_FILE} -o UserKnownHostsFile=${SSH_KNOWN_HOSTS} -o ConnectTimeout=10 -o PreferredAuthentications=publickey -o PasswordAuthentication=no -o PubkeyAuthentication=yes -S '/tmp/metassh-inv-%r@%h:%p' " \
+        $RSYNC_LOCAL "$RSYNC_REMOTE_PREFIX/$CWY_VER/$CWY_NODEID/";
+    RETVAL=$?
+    AFTER_TIME=$(date '+%s');
+
+    if [ "$RETVAL" -eq 30 ];
+    then
+        logger -t metadata_exporter "metadata exporting timed out, kill SSH connection";
+        metassh_pid=$(pgrep -f metassh);
+
+        if [ -n "$metassh_pid" ];
+        then
+            kill -9 "$metassh_pid"
+        fi
+    elif [ "$RETVAL" -ne 0 ] && [ "$RETVAL" -ne 23 ]
+    then
+        #23 is partial success, which we count as success since it most of the
+        #time will be because of missing metadata (gps) files
+        logger -t metadata_exporter "Copying metadata failed with code $RETVAL";
+        /etc/init.d/ssh_key_manager restart
+
+        #Kill SSH connection in case of failure too, might be that we end up
+        #with this weird I/O error that only seems to be resolved by re-establishing
+        #connection
+        metassh_pid=$(pgrep -f metassh);
+        if [ -n "$metassh_pid" ];
+        then
+            kill -9 "$metassh_pid"
+        fi
+    else
+        logger -t metadata_exporter "Done copying files to server";
+        date +%s > /tmp/last_meta_export
+    fi
+
+    #Time can move backwards. Not very likely, but handle it in case of failure
+    #+ ntp happening at the same time
+    if [ "$AFTER_TIME" -lt "$BEFORE_TIME" ]
+    then
+        SLEEP_TIME="$INTVL";
+    else
+        TDIFF=$(( AFTER_TIME - BEFORE_TIME ));
+
+        #Make sure we don't end up in inifinte loop by always sleeping a minimum
+        #amount of time
+        if [ "$TDIFF" -ge "$INTVL" ]
+        then
+            SLEEP_TIME=1;
+        else
+            SLEEP_TIME=$(( INTVL - TDIFF ));
+        fi
+    fi
+
+    sleep "$SLEEP_TIME";
+
+done;
+exit 0;
diff --git a/files/metadataloop.init b/files/metadataloop.init
new file mode 100755
index 0000000..5b57ea7
--- /dev/null
+++ b/files/metadataloop.init
@@ -0,0 +1,27 @@
+#!/bin/sh /etc/rc.common
+
+. /lib/config/uci.sh
+
+START=96
+USE_PROCD=1
+
+METADATALOOPPATH=/bin
+METADATALOOPNAME=metadata_exporter_timeloop.sh
+
+start_service()
+{
+    DISABLED=$(uci_get cwy_router_settings metadata disabled);
+
+    #Unless there is anywhere to store data, then don't run metadata collector.
+    #The reason for this check, is that we can avoid having to install metadata
+    #later. All we need to provide is a backend-config
+    if [ ! -f "/etc/config/backend" -o $DISABLED -eq 1 ];
+    then
+        exit 0;
+    fi
+
+	procd_open_instance
+	procd_set_param command "$METADATALOOPPATH/$METADATALOOPNAME"
+	procd_set_param respawn 0 5 0
+	procd_close_instance
+}

From 852b950d209dc97886404292e50ef692d6aa3b11 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Mon, 13 Dec 2021 10:40:41 +0100
Subject: [PATCH 04/41] [FIX] Compile zmq code when it's enabled

---
 src/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ea466c6..fe3d259 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -10,7 +10,6 @@ set(SOURCE
     backend_event_loop.c
     metadata_utils.c
     system_helpers.c
-    metadata_input_nl_zmq_common.c
     lib/minmea.c)
 
 
@@ -74,7 +73,8 @@ endif()
 if (ZEROMQ_INPUT)
     set(LIBS ${LIBS} zmq)
     set(SOURCE ${SOURCE}
-        metadata_input_zeromq.c)
+        metadata_input_zeromq.c
+        metadata_input_nl_zmq_common.c)
     add_definitions("-DZEROMQ_SUPPORT_INPUT")
 endif()
 

From dc5c7c36bc154dafcdf72ea6bf47d69e2f45707a Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Mon, 13 Dec 2021 10:46:58 +0100
Subject: [PATCH 05/41] [FIX] Formatting

---
 files/metadata.init | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/files/metadata.init b/files/metadata.init
index 8e3c627..e252cca 100755
--- a/files/metadata.init
+++ b/files/metadata.init
@@ -18,7 +18,7 @@ USE_PROCD=1
 
 create_config()
 {
-	METADATANODEID=$(uci_get backend inventory id)
+    METADATANODEID=$(uci_get backend inventory id)
     API_VERSION=$(uci_get backend inventory api_version)
     SQLITE_INTERVAL=$(uci_get backend metadata sqlite_interval)
     SQLITE_EVENTS=$(uci_get backend metadata sqlite_events)
@@ -27,9 +27,9 @@ create_config()
     #have a valid identifier stored in the DMI
     BOARD_NAME=`cat /tmp/sysinfo/board_name`
 
-	if [ -z "$METADATANODEID" ]; then
-		METADATANODEID=0
-	fi
+    if [ -z "$METADATANODEID" ]; then
+        METADATANODEID=0
+    fi
 
     if [ -z "$API_VERSION" ];
     then
@@ -106,8 +106,8 @@ start_service()
 
     create_config
 
-	procd_open_instance
-	procd_set_param command "$METADATAPATH/$METADATANAME" -c "$CONF_PATH"
-	procd_set_param respawn 0 5 0
-	procd_close_instance
+    procd_open_instance
+    procd_set_param command "$METADATAPATH/$METADATANAME" -c "$CONF_PATH"
+    procd_set_param respawn 0 5 0
+    procd_close_instance
 }

From 597e040ef8aa99e0542f18681b2026ad7a3bce6e Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Mon, 13 Dec 2021 11:45:20 +0100
Subject: [PATCH 06/41] [SRC] Add UBUS input support

---
 Makefile                  |  2 +-
 files/metadata.init       |  2 +-
 src/CMakeLists.txt        |  6 +++
 src/metadata_exporter.c   | 20 ++++++++-
 src/metadata_exporter.h   |  1 +
 src/metadata_input_ubus.c | 88 +++++++++++++++++++++++++++++++++++++++
 src/metadata_input_ubus.h | 51 +++++++++++++++++++++++
 7 files changed, 167 insertions(+), 3 deletions(-)
 create mode 100644 src/metadata_input_ubus.c
 create mode 100644 src/metadata_input_ubus.h

diff --git a/Makefile b/Makefile
index 873c1ca..282eeb3 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ define Package/data-exporter
 endef
 
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include
-CMAKE_OPTIONS += -DTARGET_OWRT=1 -DSQLITE3=1 -DFILE=1
+CMAKE_OPTIONS += -DTARGET_OWRT=1 -DSQLITE3=1 -DFILE=1 -DUBUS=1
 
 define Package/data-exporter/install
 	$(INSTALL_DIR) $(1)/bin
diff --git a/files/metadata.init b/files/metadata.init
index e252cca..40bbb79 100755
--- a/files/metadata.init
+++ b/files/metadata.init
@@ -39,7 +39,7 @@ create_config()
     json_init
 
     #Add zmq options
-    json_add_object "zmq_input"
+    json_add_object "ubus_input"
         json_add_boolean "conn" 1
 
         if [ "$EXPORT_GPS" -eq 1 ];
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe3d259..4015900 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -103,6 +103,12 @@ if (GPS_NSB)
     add_definitions("-DGPS_NSB_SUPPORT")
 endif()
 
+if (UBUS)
+    set(SOURCE ${SOURCE}
+        metadata_input_ubus.c)
+    add_definitions("-DUBUS_INPUT_SUPPORT")
+endif()
+
 set(CPACK_GENERATOR "DEB")
 set(CPACK_PACKAGE_VERSION_MAJOR "0")
 set(CPACK_PACKAGE_VERSION_MINOR "1")
diff --git a/src/metadata_exporter.c b/src/metadata_exporter.c
index 8745dbb..c57e022 100644
--- a/src/metadata_exporter.c
+++ b/src/metadata_exporter.c
@@ -69,10 +69,12 @@
 #ifdef NEAT_SUPPORT
     #include "metadata_writer_neat.h"
 #endif
-
 #ifdef FILE_SUPPORT
     #include "metadata_writer_file.h"
 #endif
+#ifdef UBUS_INPUT_SUPPORT
+    #include "metadata_input_ubus.h"
+#endif
 
 #include "backend_event_loop.h"
 #include "metadata_exporter_log.h"
@@ -189,6 +191,9 @@ static void print_usage()
 #endif
 #ifdef SYSEVENT_SUPPORT
     md_sysevent_usage();
+#endif
+#ifdef UBUS_INPUT_SUPPORT
+    md_ubus_input_usage();
 #endif
     fprintf(stderr, "WRITERS:\n");
 #ifdef NEAT_SUPPORT
@@ -306,6 +311,19 @@ int main(int argc, char *argv[])
             num_inputs++;
         }
 #endif
+#ifdef UBUS_INPUT_SUPPORT
+        else if (!strcmp(key, "ubus_input")) {
+            mde->md_inputs[MD_INPUT_UBUS] = calloc(sizeof(struct md_input_ubus), 1);
+
+            if (mde->md_inputs[MD_INPUT_UBUS] == NULL) {
+                META_PRINT_SYSLOG(mde, LOG_ERR, "Could not allocate UBUS input\n");
+                exit(EXIT_FAILURE);
+            }
+
+            md_ubus_input_setup(mde, (struct md_input_ubus*) mde->md_inputs[MD_INPUT_UBUS]);
+            num_inputs++;
+        }
+#endif
 #ifdef NNE_SUPPORT
         else if (!strcmp(key, "nne")) {
             mde->md_writers[MD_WRITER_NNE] = calloc(sizeof(struct md_writer_nne), 1);
diff --git a/src/metadata_exporter.h b/src/metadata_exporter.h
index 0d62462..3e35cf5 100644
--- a/src/metadata_exporter.h
+++ b/src/metadata_exporter.h
@@ -127,6 +127,7 @@ enum md_inputs {
     MD_INPUT_MUNIN,
     MD_INPUT_SYSEVENT,
     MD_INPUT_ZEROMQ,
+    MD_INPUT_UBUS,
     __MD_INPUT_MAX
 };
 
diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
new file mode 100644
index 0000000..1bd0bf8
--- /dev/null
+++ b/src/metadata_input_ubus.c
@@ -0,0 +1,88 @@
+/* Copyright (c) 2021, Celerway, Lukasz Baj <l.baj@celerway.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <string.h>
+
+#include "metadata_exporter_log.h"
+#include "metadata_input_ubus.h"
+
+static uint8_t md_input_ubus_config(struct md_input_ubus *miu)
+{
+    return RETVAL_SUCCESS;
+}
+
+static uint8_t md_input_ubus_init(void *ptr, json_object* config)
+{
+    struct md_input_ubus *miu = ptr;
+    miu->md_ubus_mask = 0;
+
+    json_object* subconfig;
+    if (json_object_object_get_ex(config, "ubus_input", &subconfig)) {
+        json_object_object_foreach(subconfig, key, val) {
+            if (!strcmp(key, "conn")) {
+                miu->md_ubus_mask |= META_TYPE_CONNECTION;	    
+	        }   
+        }
+    }
+
+    if (!miu->md_ubus_mask) {
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "At least one UBUS event type must be present\n");
+        return RETVAL_FAILURE;
+    }
+
+    return md_input_ubus_config(miu);
+}
+
+void md_ubus_input_usage()
+{
+
+}
+
+void md_ubus_input_setup(struct md_exporter *mde, struct md_input_ubus *miu)
+{
+    miu->parent = mde;    
+    miu->init = md_input_ubus_init;
+}
+
+/*
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+#include <libmnl/libmnl.h>
+#include JSON_LOC
+#include <getopt.h>
+#include <sys/time.h>
+#include <zmq.h>
+
+#include "metadata_exporter.h"
+#include "metadata_input_nl_zmq_common.h"
+#include "metadata_input_zeromq.h"
+#include "backend_event_loop.h"
+
+#include "lib/minmea.h"
+
+*/
\ No newline at end of file
diff --git a/src/metadata_input_ubus.h b/src/metadata_input_ubus.h
new file mode 100644
index 0000000..74f0efd
--- /dev/null
+++ b/src/metadata_input_ubus.h
@@ -0,0 +1,51 @@
+/* Copyright (c) 2021, Celerway, Lukasz Baj <l.baj@celerway.com>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef METADATA_INPUT_UBUS
+#define METADATA_INPUT_UBUS
+
+#include "metadata_exporter.h"
+
+struct backend_epoll_handle;
+
+struct md_input_ubus {
+    MD_INPUT;
+    struct backend_epoll_handle *event_handle;
+    uint32_t md_ubus_mask;
+/*
+    void* zmq_ctx;
+    void* zmq_socket;
+    int zmq_fd;
+    struct md_conn_event *mce;
+    struct md_iface_event *mie;
+    struct md_radio_event *mre;
+    md_system_event_t *mse;*/
+};
+
+void md_ubus_input_usage();
+void md_ubus_input_setup(struct md_exporter *mde, struct md_input_ubus *miu);
+
+#endif
\ No newline at end of file

From 8211f5c09014640942d5e57a9280a547cfd80332 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Mon, 13 Dec 2021 14:20:05 +0100
Subject: [PATCH 07/41] [SRC] Add UBUS subscriber and event handler

---
 Makefile                  |   2 +-
 files/metadata.init       |   2 +
 src/CMakeLists.txt        |   1 +
 src/metadata_input_ubus.c | 127 +++++++++++++++++++++++++++++++-------
 src/metadata_input_ubus.h |   6 +-
 5 files changed, 113 insertions(+), 25 deletions(-)

diff --git a/Makefile b/Makefile
index 282eeb3..da49faf 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endef
 define Package/data-exporter
   SECTION:=celerway
   CATEGORY:=Celerway
-  DEPENDS:=+libjson-c +libmnl +libsqlite3 +libpthread +libuci
+  DEPENDS:=+libjson-c +libmnl +libsqlite3 +libpthread +libuci +libubus
   TITLE:=Utility for exporting metadata
 endef
 
diff --git a/files/metadata.init b/files/metadata.init
index 40bbb79..0e50dfe 100755
--- a/files/metadata.init
+++ b/files/metadata.init
@@ -38,6 +38,8 @@ create_config()
 
     json_init
 
+    json_add_string "logfile" "/tmp/meta_exporter.log"
+
     #Add zmq options
     json_add_object "ubus_input"
         json_add_boolean "conn" 1
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4015900..90101d8 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -104,6 +104,7 @@ if (GPS_NSB)
 endif()
 
 if (UBUS)
+    set(LIBS ${LIBS} ubus)
     set(SOURCE ${SOURCE}
         metadata_input_ubus.c)
     add_definitions("-DUBUS_INPUT_SUPPORT")
diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index 1bd0bf8..d4e663a 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -24,13 +24,118 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <fcntl.h>
 #include <string.h>
 
+#include "backend_event_loop.h"
 #include "metadata_exporter_log.h"
 #include "metadata_input_ubus.h"
 
+static struct ubus_subscriber md_ubus_subscriber;
+static struct ubus_event_handler md_ubus_event_handler;
+
+static int md_input_ubus_subscriber_cb(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req,
+                          const char *method, struct blob_attr *msg)
+{
+    return UBUS_STATUS_OK;
+}
+
+static void md_input_ubus_event_handler(struct ubus_context *ctx, struct ubus_event_handler *ev, const char *type, struct blob_attr *msg)
+{
+
+}
+
+static void md_input_ubus_handle_event(void *ptr, int32_t fd, uint32_t events)
+{
+    struct md_input_ubus *miu = (struct md_input_ubus *)ptr;
+
+    ubus_handle_event(miu->ubus_ctx);
+}
+
+static uint8_t md_input_ubus_connect(struct md_input_ubus *miu)
+{
+    struct sigaction sig_action_int, sig_action_term;
+
+    //save old sighandlers
+    if (sigaction(SIGINT, NULL, &sig_action_int) == -1 || sigaction(SIGTERM, NULL, &sig_action_term) == -1) {
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Could not replace signal handlers\n");
+        return RETVAL_FAILURE;
+    }
+
+    if (!(miu->ubus_ctx = ubus_connect(NULL))) {
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Could not connect to ubus\n");
+        return 0;
+    }
+
+    if (fcntl(miu->ubus_ctx->sock.fd, F_SETFD, FD_CLOEXEC) == -1) {
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Could not set FD_CLOEXEC to ubus fd\n");
+        return RETVAL_FAILURE;
+    }
+
+    //restore original sighandlers
+    if (sigaction(SIGINT, &sig_action_int, NULL) == -1 || sigaction(SIGTERM, &sig_action_term, NULL) == -1) {
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Could not replace signal handlers\n");
+        return RETVAL_FAILURE;
+    }
+
+    META_PRINT_SYSLOG(miu->parent, LOG_INFO, "Ubus connection has been initialized: %d\n", miu->ubus_ctx->sock.fd);
+    return RETVAL_SUCCESS;
+}
+
+static uint8_t md_input_ubus_subscribe(struct ubus_context *ubus_ctx)
+{
+    uint32_t dlb_id;
+
+    if (ubus_lookup_id(ubus_ctx, "celerway.dlb", &dlb_id)) {
+        return RETVAL_FAILURE;
+    }
+
+    // Only call register once per object
+    if (!md_ubus_subscriber.obj.id && ubus_register_subscriber(ubus_ctx, &md_ubus_subscriber)) {
+        return RETVAL_FAILURE;
+    }
+
+    if (ubus_subscribe(ubus_ctx, &md_ubus_subscriber, dlb_id)) {
+        return RETVAL_FAILURE;
+    }
+
+    return RETVAL_SUCCESS;
+}
+
+static uint8_t md_input_ubus_register_event_handler(struct md_input_ubus *miu)
+{
+    if (ubus_register_event_handler(miu->ubus_ctx, &md_ubus_event_handler, "ubus.object.add")) {
+        return RETVAL_FAILURE;
+    }
+
+    return RETVAL_SUCCESS;
+}
+
 static uint8_t md_input_ubus_config(struct md_input_ubus *miu)
 {
+    if (md_input_ubus_connect(miu) != RETVAL_SUCCESS) {
+        return RETVAL_FAILURE;
+    }
+
+    if(!(miu->event_handle = backend_create_epoll_handle(miu, miu->ubus_ctx->sock.fd, md_input_ubus_handle_event))) {
+        return RETVAL_FAILURE;
+    }
+
+    backend_event_loop_update(miu->parent->event_loop, EPOLLIN, EPOLL_CTL_ADD, miu->ubus_ctx->sock.fd, miu->event_handle);
+
+    memset(&md_ubus_event_handler, 0, sizeof(struct ubus_event_handler));
+    md_ubus_event_handler.cb = md_input_ubus_event_handler;
+    if (md_input_ubus_register_event_handler(miu) != RETVAL_SUCCESS) {
+        META_PRINT_SYSLOG(miu->parent, LOG_INFO, "Failed to register UBUS event handler\n");
+        return RETVAL_FAILURE;
+    }
+
+    memset(&md_ubus_subscriber, 0, sizeof(struct ubus_subscriber));
+    md_ubus_subscriber.cb = md_input_ubus_subscriber_cb;
+    if (md_input_ubus_subscribe(miu->ubus_ctx) != RETVAL_SUCCESS) {
+         META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Failed to subscribe to the UBUS object. Will retry on UBUS add event.\n");
+    }
+
     return RETVAL_SUCCESS;
 }
 
@@ -65,24 +170,4 @@ void md_ubus_input_setup(struct md_exporter *mde, struct md_input_ubus *miu)
 {
     miu->parent = mde;    
     miu->init = md_input_ubus_init;
-}
-
-/*
-#include <stdio.h>
-#include <stdint.h>
-#include <stdlib.h>
-
-#include <libmnl/libmnl.h>
-#include JSON_LOC
-#include <getopt.h>
-#include <sys/time.h>
-#include <zmq.h>
-
-#include "metadata_exporter.h"
-#include "metadata_input_nl_zmq_common.h"
-#include "metadata_input_zeromq.h"
-#include "backend_event_loop.h"
-
-#include "lib/minmea.h"
-
-*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/metadata_input_ubus.h b/src/metadata_input_ubus.h
index 74f0efd..61bd120 100644
--- a/src/metadata_input_ubus.h
+++ b/src/metadata_input_ubus.h
@@ -27,6 +27,8 @@
 #ifndef METADATA_INPUT_UBUS
 #define METADATA_INPUT_UBUS
 
+#include <libubus.h>
+
 #include "metadata_exporter.h"
 
 struct backend_epoll_handle;
@@ -35,10 +37,8 @@ struct md_input_ubus {
     MD_INPUT;
     struct backend_epoll_handle *event_handle;
     uint32_t md_ubus_mask;
+    struct ubus_context *ubus_ctx;
 /*
-    void* zmq_ctx;
-    void* zmq_socket;
-    int zmq_fd;
     struct md_conn_event *mce;
     struct md_iface_event *mie;
     struct md_radio_event *mre;

From f7389da31778a1ab9b809dd908ea07060b9f2c57 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Mon, 13 Dec 2021 15:15:42 +0100
Subject: [PATCH 08/41] [SRC] Resubscribe to celerway.dlb

---
 Makefile                  |  2 +-
 src/CMakeLists.txt        |  2 +-
 src/metadata_input_ubus.c | 69 +++++++++++++++++++++++++++++----------
 src/metadata_input_ubus.h |  5 ++-
 4 files changed, 57 insertions(+), 21 deletions(-)

diff --git a/Makefile b/Makefile
index da49faf..0e9d311 100644
--- a/Makefile
+++ b/Makefile
@@ -26,7 +26,7 @@ endef
 define Package/data-exporter
   SECTION:=celerway
   CATEGORY:=Celerway
-  DEPENDS:=+libjson-c +libmnl +libsqlite3 +libpthread +libuci +libubus
+  DEPENDS:=+libjson-c +libmnl +libsqlite3 +libpthread +libuci +libubus +libubox
   TITLE:=Utility for exporting metadata
 endef
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 90101d8..ce6a72b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -104,7 +104,7 @@ if (GPS_NSB)
 endif()
 
 if (UBUS)
-    set(LIBS ${LIBS} ubus)
+    set(LIBS ${LIBS} ubus ubox)
     set(SOURCE ${SOURCE}
         metadata_input_ubus.c)
     add_definitions("-DUBUS_INPUT_SUPPORT")
diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index d4e663a..e0ca345 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -31,18 +31,50 @@
 #include "metadata_exporter_log.h"
 #include "metadata_input_ubus.h"
 
-static struct ubus_subscriber md_ubus_subscriber;
-static struct ubus_event_handler md_ubus_event_handler;
+struct md_input_ubus *miu;
+
+static uint8_t md_input_ubus_subscribe();
+
+ // Policy for the object add event
+enum
+{
+    PATH,
+    __UBUS_OBJ_ADD_MAX
+};
+
+static struct blobmsg_policy ubus_obj_add_policy[__UBUS_OBJ_ADD_MAX] = {
+    [PATH] = {.name = "path", .type = BLOBMSG_TYPE_STRING}
+};
 
 static int md_input_ubus_subscriber_cb(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req,
                           const char *method, struct blob_attr *msg)
 {
+    // We parse only metadata messages
+    if (strcmp(method, "metadata")) {
+        return UBUS_STATUS_OK;
+    }
+
     return UBUS_STATUS_OK;
 }
 
 static void md_input_ubus_event_handler(struct ubus_context *ctx, struct ubus_event_handler *ev, const char *type, struct blob_attr *msg)
 {
+    struct blob_attr* tb[__UBUS_OBJ_ADD_MAX] = {0};
 
+    if (blobmsg_parse(ubus_obj_add_policy, __UBUS_OBJ_ADD_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg))) {
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Can't parse path\n");
+        return;
+    }
+
+    if (!tb[PATH]) {
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "No path in the object\n");
+        return;
+    }
+
+    // Resubscribe to the UBUS object if needed
+    if (!strcmp(blobmsg_get_string(tb[PATH]), "celerway.dlb")) {
+        md_input_ubus_subscribe();
+    }
 }
 
 static void md_input_ubus_handle_event(void *ptr, int32_t fd, uint32_t events)
@@ -52,7 +84,7 @@ static void md_input_ubus_handle_event(void *ptr, int32_t fd, uint32_t events)
     ubus_handle_event(miu->ubus_ctx);
 }
 
-static uint8_t md_input_ubus_connect(struct md_input_ubus *miu)
+static uint8_t md_input_ubus_connect()
 {
     struct sigaction sig_action_int, sig_action_term;
 
@@ -82,38 +114,38 @@ static uint8_t md_input_ubus_connect(struct md_input_ubus *miu)
     return RETVAL_SUCCESS;
 }
 
-static uint8_t md_input_ubus_subscribe(struct ubus_context *ubus_ctx)
+static uint8_t md_input_ubus_subscribe()
 {
     uint32_t dlb_id;
 
-    if (ubus_lookup_id(ubus_ctx, "celerway.dlb", &dlb_id)) {
+    if (ubus_lookup_id(miu->ubus_ctx, "celerway.dlb", &dlb_id)) {
         return RETVAL_FAILURE;
     }
 
     // Only call register once per object
-    if (!md_ubus_subscriber.obj.id && ubus_register_subscriber(ubus_ctx, &md_ubus_subscriber)) {
+    if (!miu->ubus_subscriber.obj.id && ubus_register_subscriber(miu->ubus_ctx, &miu->ubus_subscriber)) {
         return RETVAL_FAILURE;
     }
 
-    if (ubus_subscribe(ubus_ctx, &md_ubus_subscriber, dlb_id)) {
+    if (ubus_subscribe(miu->ubus_ctx, &miu->ubus_subscriber, dlb_id)) {
         return RETVAL_FAILURE;
     }
 
     return RETVAL_SUCCESS;
 }
 
-static uint8_t md_input_ubus_register_event_handler(struct md_input_ubus *miu)
+static uint8_t md_input_ubus_register_event_handler()
 {
-    if (ubus_register_event_handler(miu->ubus_ctx, &md_ubus_event_handler, "ubus.object.add")) {
+    if (ubus_register_event_handler(miu->ubus_ctx, &miu->ubus_event_handler, "ubus.object.add")) {
         return RETVAL_FAILURE;
     }
 
     return RETVAL_SUCCESS;
 }
 
-static uint8_t md_input_ubus_config(struct md_input_ubus *miu)
+static uint8_t md_input_ubus_config()
 {
-    if (md_input_ubus_connect(miu) != RETVAL_SUCCESS) {
+    if (md_input_ubus_connect() != RETVAL_SUCCESS) {
         return RETVAL_FAILURE;
     }
 
@@ -123,16 +155,16 @@ static uint8_t md_input_ubus_config(struct md_input_ubus *miu)
 
     backend_event_loop_update(miu->parent->event_loop, EPOLLIN, EPOLL_CTL_ADD, miu->ubus_ctx->sock.fd, miu->event_handle);
 
-    memset(&md_ubus_event_handler, 0, sizeof(struct ubus_event_handler));
-    md_ubus_event_handler.cb = md_input_ubus_event_handler;
-    if (md_input_ubus_register_event_handler(miu) != RETVAL_SUCCESS) {
+    memset(&miu->ubus_event_handler, 0, sizeof(struct ubus_event_handler));
+    miu->ubus_event_handler.cb = md_input_ubus_event_handler;
+    if (md_input_ubus_register_event_handler() != RETVAL_SUCCESS) {
         META_PRINT_SYSLOG(miu->parent, LOG_INFO, "Failed to register UBUS event handler\n");
         return RETVAL_FAILURE;
     }
 
-    memset(&md_ubus_subscriber, 0, sizeof(struct ubus_subscriber));
-    md_ubus_subscriber.cb = md_input_ubus_subscriber_cb;
-    if (md_input_ubus_subscribe(miu->ubus_ctx) != RETVAL_SUCCESS) {
+    memset(&miu->ubus_subscriber, 0, sizeof(struct ubus_subscriber));
+    miu->ubus_subscriber.cb = md_input_ubus_subscriber_cb;
+    if (md_input_ubus_subscribe() != RETVAL_SUCCESS) {
          META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Failed to subscribe to the UBUS object. Will retry on UBUS add event.\n");
     }
 
@@ -166,8 +198,9 @@ void md_ubus_input_usage()
 
 }
 
-void md_ubus_input_setup(struct md_exporter *mde, struct md_input_ubus *miu)
+void md_ubus_input_setup(struct md_exporter *mde, struct md_input_ubus *input)
 {
+    miu = input;
     miu->parent = mde;    
     miu->init = md_input_ubus_init;
 }
\ No newline at end of file
diff --git a/src/metadata_input_ubus.h b/src/metadata_input_ubus.h
index 61bd120..a55b511 100644
--- a/src/metadata_input_ubus.h
+++ b/src/metadata_input_ubus.h
@@ -38,6 +38,9 @@ struct md_input_ubus {
     struct backend_epoll_handle *event_handle;
     uint32_t md_ubus_mask;
     struct ubus_context *ubus_ctx;
+    struct ubus_subscriber ubus_subscriber;
+    struct ubus_event_handler ubus_event_handler;
+
 /*
     struct md_conn_event *mce;
     struct md_iface_event *mie;
@@ -46,6 +49,6 @@ struct md_input_ubus {
 };
 
 void md_ubus_input_usage();
-void md_ubus_input_setup(struct md_exporter *mde, struct md_input_ubus *miu);
+void md_ubus_input_setup(struct md_exporter *mde, struct md_input_ubus *input);
 
 #endif
\ No newline at end of file

From 9f1547c8f3e1116ca39d723af8647d0cdff7b0bc Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Mon, 13 Dec 2021 19:10:59 +0100
Subject: [PATCH 09/41] [SRC] Parse data from the UBUS

---
 src/metadata_input_ubus.c | 212 +++++++++++++++++++++++++++++++++++++-
 src/metadata_input_ubus.h |   5 -
 2 files changed, 208 insertions(+), 9 deletions(-)

diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index e0ca345..596dfd0 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -46,14 +46,215 @@ static struct blobmsg_policy ubus_obj_add_policy[__UBUS_OBJ_ADD_MAX] = {
     [PATH] = {.name = "path", .type = BLOBMSG_TYPE_STRING}
 };
 
+// Metaupdate object policy
+enum
+{
+    TIMESTAMP,
+    EVENT_TYPE,
+    INTERFACE_ID_TYPE,
+    INTERFACE_ID,
+    INTERFACE_NAME,
+    IMEI,
+    IMSI,
+    INTERFACE_TYPE,
+    NETWORK_ADDRESS_FAMILY,
+    NETWORK_ADDRESS,
+    NETWORK_PROVIDER,
+    EVENT_PARAM,
+    L3_SESSION_ID,
+    L4_SESSION_ID,
+    SIGNAL_STRENGTH,
+    RX_BYTES,
+    TX_BYTES,
+    HAS_IP,
+    CONNECTIVITY,
+    CONNECTION_MODE,
+    QUALITY,
+    __METADATA_MAX
+};
+
+static struct blobmsg_policy metadata_policy[__METADATA_MAX] = {
+    [TIMESTAMP] = {.name = "timestamp", .type = BLOBMSG_TYPE_INT64},
+    [EVENT_TYPE] = {.name = "event_type", .type = BLOBMSG_TYPE_INT8},
+    [INTERFACE_ID_TYPE] = {.name = "interface_id_type", .type = BLOBMSG_TYPE_INT8},
+    [INTERFACE_ID] = {.name = "interface_id", .type = BLOBMSG_TYPE_STRING},
+    [INTERFACE_NAME] = {.name = "interface_name", .type = BLOBMSG_TYPE_STRING},
+    [IMEI] = {.name = "imei", .type = BLOBMSG_TYPE_STRING},
+    [IMSI] = {.name = "imsi", .type = BLOBMSG_TYPE_STRING},
+    [INTERFACE_TYPE] = {.name = "interface_type", .type = BLOBMSG_TYPE_INT8},
+    [NETWORK_ADDRESS_FAMILY] = {.name = "network_address_family", .type = BLOBMSG_TYPE_INT8},
+    [NETWORK_ADDRESS] = {.name = "network_address", .type = BLOBMSG_TYPE_STRING},
+    [NETWORK_PROVIDER] = {.name = "network_provider", .type = BLOBMSG_TYPE_INT32},
+    [EVENT_PARAM] = {.name = "event_param", .type = BLOBMSG_TYPE_INT8},
+    [L3_SESSION_ID] = {.name = "l3_session_id", .type = BLOBMSG_TYPE_INT64},
+    [L4_SESSION_ID] = {.name = "l4_session_id", .type = BLOBMSG_TYPE_INT64},
+    [SIGNAL_STRENGTH] = {.name = "signal_strength", .type = BLOBMSG_TYPE_INT8},
+    [RX_BYTES] = {.name = "rx_bytes", .type = BLOBMSG_TYPE_INT64},
+    [TX_BYTES] = {.name = "tx_bytes", .type = BLOBMSG_TYPE_INT64},
+    [HAS_IP] = {.name = "has_ip", .type = BLOBMSG_TYPE_INT8},
+    [CONNECTIVITY] = {.name = "connectivity", .type = BLOBMSG_TYPE_INT8},
+    [CONNECTION_MODE] = {.name = "connection_mode", .type = BLOBMSG_TYPE_INT8},
+    [QUALITY] = {.name = "quality", .type = BLOBMSG_TYPE_INT8},
+};
+
+static void md_input_ubus_handle_conn_event(struct blob_attr *tb[])
+{
+    struct md_conn_event *mce = miu->mce;
+
+    // Init connectivity event
+    memset(mce, 0, sizeof(struct md_conn_event));
+    mce->md_type = META_TYPE_CONNECTION;
+    //255 is reserved value used to indicate that there is no value to export
+    //(look at writers)
+    mce->event_value = UINT8_MAX;
+
+    //We are inserting a sequence number. Sequence is so that we can
+    //see the order in which events arrived at the
+    //metadata exporter, making it easier to correlate events between
+    //applications. The different applications publishing data might also insert
+    //their own sequence number
+    mce->sequence = mde_inc_seq(miu->parent);
+
+    if (!tb[TIMESTAMP]) {
+        mce->tstamp = blobmsg_get_u64(tb[TIMESTAMP]);
+    }
+
+    if (!tb[EVENT_TYPE]) {
+        mce->event_type = blobmsg_get_u8(tb[EVENT_TYPE]);
+    }
+
+    if (!tb[EVENT_PARAM]) {
+        mce->event_param = blobmsg_get_u8(tb[EVENT_PARAM]);
+    }
+
+    if (!tb[INTERFACE_ID_TYPE]) {
+        mce->interface_id_type = blobmsg_get_u8(tb[INTERFACE_ID_TYPE]);
+    }
+
+    if (!tb[INTERFACE_ID]) {
+        mce->interface_id = blobmsg_get_string(tb[INTERFACE_ID]);
+    }
+
+    if (!tb[IMEI]) {
+        mce->imei = blobmsg_get_string(tb[IMEI]);
+    }
+
+    if (!tb[IMSI]) {
+        mce->imsi = blobmsg_get_string(tb[IMSI]);
+    }
+
+    if (!tb[INTERFACE_NAME]) {
+        mce->interface_name = blobmsg_get_string(tb[INTERFACE_NAME]);
+    }
+
+    if (!tb[INTERFACE_TYPE]) {
+        mce->interface_type = blobmsg_get_u8(tb[INTERFACE_TYPE]);
+    }
+
+    if (!tb[NETWORK_ADDRESS_FAMILY]) {
+        mce->network_address_family = blobmsg_get_u8(tb[NETWORK_ADDRESS_FAMILY]);
+    }
+
+    if (!tb[NETWORK_ADDRESS]) {
+        mce->network_address = blobmsg_get_string(tb[NETWORK_ADDRESS]);
+    }
+
+    if (!tb[NETWORK_PROVIDER]) {
+        mce->network_provider = blobmsg_get_u32(tb[NETWORK_PROVIDER]);
+    }
+
+    if (!tb[L3_SESSION_ID]) {
+        mce->l3_session_id = blobmsg_get_u64(tb[L3_SESSION_ID]);
+    }
+
+    if (!tb[L4_SESSION_ID]) {
+        mce->l4_session_id = blobmsg_get_u64(tb[L4_SESSION_ID]);
+    }
+
+    if (!tb[SIGNAL_STRENGTH]) {
+        mce->signal_strength = (int8_t) blobmsg_get_u8(tb[SIGNAL_STRENGTH]);
+    }
+
+    if (!tb[RX_BYTES]) {
+        mce->rx_bytes = blobmsg_get_u64(tb[RX_BYTES]);
+    }
+
+    if (!tb[TX_BYTES]) {
+        mce->tx_bytes = blobmsg_get_u64(tb[TX_BYTES]);
+    }
+
+    if (!tb[HAS_IP]) {
+        mce->has_ip = (int8_t) blobmsg_get_u8(tb[HAS_IP]);
+    }
+
+    if (!tb[CONNECTIVITY]) {
+        mce->connectivity = (int8_t) blobmsg_get_u8(tb[CONNECTIVITY]);
+    }
+
+    if (!tb[CONNECTION_MODE]) {
+        mce->connection_mode = (int8_t) blobmsg_get_u8(tb[CONNECTION_MODE]);
+    }
+
+    if (!tb[QUALITY]) {
+        mce->quality = (int8_t) blobmsg_get_u8(tb[QUALITY]);
+    }
+
+    if (mce->event_param == CONN_EVENT_DATA_USAGE_UPDATE) {
+        if (!mce->tstamp || !mce->event_param || !mce->interface_id || (mce->imei && !mce->imsi) ||
+            (mce->imsi && !mce->imei)) {
+            META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Missing required argument in usage UBUS message\n");
+            return;
+        }
+    }
+
+    if (!mce->tstamp || !mce->sequence ||
+        !mce->l3_session_id || !mce->event_param ||
+        !mce->interface_type || !mce->network_address_family ||
+        !mce->network_address || !mce->interface_id ||
+        !mce->interface_id_type) {
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Missing required argument in UBUS message\n");
+        return;
+    }
+
+    mde_publish_event_obj(miu->parent, (struct md_event*) mce);
+}
+
 static int md_input_ubus_subscriber_cb(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req,
                           const char *method, struct blob_attr *msg)
 {
-    // We parse only metadata messages
-    if (strcmp(method, "metadata")) {
+    struct blob_attr* tb[__METADATA_MAX] = {0};
+    uint8_t event_type = 0;
+
+    // We parse metadata and datausage messages only
+    if (strcmp(method, "metadata") && strcmp(method, "datausage")) {
         return UBUS_STATUS_OK;
     }
 
+    if (blobmsg_parse(metadata_policy, __METADATA_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg))) {
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Can't parse %s message\n", method);
+        return UBUS_STATUS_NO_DATA;
+    }
+
+    if (!tb[EVENT_TYPE]) {
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Missing event type");
+        return UBUS_STATUS_OK;
+    }
+
+    if (!(event_type & miu->md_ubus_mask)) {
+        return UBUS_STATUS_OK;
+    }
+
+    switch (event_type)
+    {
+        case META_TYPE_CONNECTION:
+            md_input_ubus_handle_conn_event(tb);
+            break;
+
+         default:
+            META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Unknown event type\n");
+            break;
+    }
+
     return UBUS_STATUS_OK;
 }
 
@@ -62,7 +263,7 @@ static void md_input_ubus_event_handler(struct ubus_context *ctx, struct ubus_ev
     struct blob_attr* tb[__UBUS_OBJ_ADD_MAX] = {0};
 
     if (blobmsg_parse(ubus_obj_add_policy, __UBUS_OBJ_ADD_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg))) {
-        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Can't parse path\n");
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Can't parse ubus.object.add event\n");
         return;
     }
 
@@ -180,7 +381,10 @@ static uint8_t md_input_ubus_init(void *ptr, json_object* config)
     if (json_object_object_get_ex(config, "ubus_input", &subconfig)) {
         json_object_object_foreach(subconfig, key, val) {
             if (!strcmp(key, "conn")) {
-                miu->md_ubus_mask |= META_TYPE_CONNECTION;	    
+                miu->md_ubus_mask |= META_TYPE_CONNECTION;
+                miu->mce = calloc(sizeof(struct md_conn_event), 1);
+                if (miu->mce == NULL)
+                    return RETVAL_FAILURE;
 	        }   
         }
     }
diff --git a/src/metadata_input_ubus.h b/src/metadata_input_ubus.h
index a55b511..6f9772a 100644
--- a/src/metadata_input_ubus.h
+++ b/src/metadata_input_ubus.h
@@ -40,12 +40,7 @@ struct md_input_ubus {
     struct ubus_context *ubus_ctx;
     struct ubus_subscriber ubus_subscriber;
     struct ubus_event_handler ubus_event_handler;
-
-/*
     struct md_conn_event *mce;
-    struct md_iface_event *mie;
-    struct md_radio_event *mre;
-    md_system_event_t *mse;*/
 };
 
 void md_ubus_input_usage();

From d10fe313224cd9ad507ee06bf5514bd83b5a3f50 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Mon, 13 Dec 2021 20:10:02 +0100
Subject: [PATCH 10/41] [FIX] Check if metadata avilable properly

---
 src/metadata_input_ubus.c | 53 +++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 27 deletions(-)

diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index 596dfd0..8363397 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -49,7 +49,7 @@ static struct blobmsg_policy ubus_obj_add_policy[__UBUS_OBJ_ADD_MAX] = {
 // Metaupdate object policy
 enum
 {
-    TIMESTAMP,
+    TIMESTAMP = 0,
     EVENT_TYPE,
     INTERFACE_ID_TYPE,
     INTERFACE_ID,
@@ -101,8 +101,6 @@ static void md_input_ubus_handle_conn_event(struct blob_attr *tb[])
 {
     struct md_conn_event *mce = miu->mce;
 
-    // Init connectivity event
-    memset(mce, 0, sizeof(struct md_conn_event));
     mce->md_type = META_TYPE_CONNECTION;
     //255 is reserved value used to indicate that there is no value to export
     //(look at writers)
@@ -115,87 +113,87 @@ static void md_input_ubus_handle_conn_event(struct blob_attr *tb[])
     //their own sequence number
     mce->sequence = mde_inc_seq(miu->parent);
 
-    if (!tb[TIMESTAMP]) {
+    if (tb[TIMESTAMP]) {
         mce->tstamp = blobmsg_get_u64(tb[TIMESTAMP]);
     }
 
-    if (!tb[EVENT_TYPE]) {
-        mce->event_type = blobmsg_get_u8(tb[EVENT_TYPE]);
+    if (tb[EVENT_PARAM]) {
+        mce->event_param = blobmsg_get_u8(tb[EVENT_PARAM]);
     }
 
-    if (!tb[EVENT_PARAM]) {
-        mce->event_param = blobmsg_get_u8(tb[EVENT_PARAM]);
+    if (tb[EVENT_TYPE]) {
+        mce->event_type = blobmsg_get_u8(tb[EVENT_TYPE]);
     }
 
-    if (!tb[INTERFACE_ID_TYPE]) {
+    if (tb[INTERFACE_ID_TYPE]) {
         mce->interface_id_type = blobmsg_get_u8(tb[INTERFACE_ID_TYPE]);
     }
 
-    if (!tb[INTERFACE_ID]) {
+    if (tb[INTERFACE_ID]) {
         mce->interface_id = blobmsg_get_string(tb[INTERFACE_ID]);
     }
 
-    if (!tb[IMEI]) {
+    if (tb[IMEI]) {
         mce->imei = blobmsg_get_string(tb[IMEI]);
     }
 
-    if (!tb[IMSI]) {
+    if (tb[IMSI]) {
         mce->imsi = blobmsg_get_string(tb[IMSI]);
     }
 
-    if (!tb[INTERFACE_NAME]) {
+    if (tb[INTERFACE_NAME]) {
         mce->interface_name = blobmsg_get_string(tb[INTERFACE_NAME]);
     }
 
-    if (!tb[INTERFACE_TYPE]) {
+    if (tb[INTERFACE_TYPE]) {
         mce->interface_type = blobmsg_get_u8(tb[INTERFACE_TYPE]);
     }
 
-    if (!tb[NETWORK_ADDRESS_FAMILY]) {
+    if (tb[NETWORK_ADDRESS_FAMILY]) {
         mce->network_address_family = blobmsg_get_u8(tb[NETWORK_ADDRESS_FAMILY]);
     }
 
-    if (!tb[NETWORK_ADDRESS]) {
+    if (tb[NETWORK_ADDRESS]) {
         mce->network_address = blobmsg_get_string(tb[NETWORK_ADDRESS]);
     }
 
-    if (!tb[NETWORK_PROVIDER]) {
+    if (tb[NETWORK_PROVIDER]) {
         mce->network_provider = blobmsg_get_u32(tb[NETWORK_PROVIDER]);
     }
 
-    if (!tb[L3_SESSION_ID]) {
+    if (tb[L3_SESSION_ID]) {
         mce->l3_session_id = blobmsg_get_u64(tb[L3_SESSION_ID]);
     }
 
-    if (!tb[L4_SESSION_ID]) {
+    if (tb[L4_SESSION_ID]) {
         mce->l4_session_id = blobmsg_get_u64(tb[L4_SESSION_ID]);
     }
 
-    if (!tb[SIGNAL_STRENGTH]) {
+    if (tb[SIGNAL_STRENGTH]) {
         mce->signal_strength = (int8_t) blobmsg_get_u8(tb[SIGNAL_STRENGTH]);
     }
 
-    if (!tb[RX_BYTES]) {
+    if (tb[RX_BYTES]) {
         mce->rx_bytes = blobmsg_get_u64(tb[RX_BYTES]);
     }
 
-    if (!tb[TX_BYTES]) {
+    if (tb[TX_BYTES]) {
         mce->tx_bytes = blobmsg_get_u64(tb[TX_BYTES]);
     }
 
-    if (!tb[HAS_IP]) {
+    if (tb[HAS_IP]) {
         mce->has_ip = (int8_t) blobmsg_get_u8(tb[HAS_IP]);
     }
 
-    if (!tb[CONNECTIVITY]) {
+    if (tb[CONNECTIVITY]) {
         mce->connectivity = (int8_t) blobmsg_get_u8(tb[CONNECTIVITY]);
     }
 
-    if (!tb[CONNECTION_MODE]) {
+    if (tb[CONNECTION_MODE]) {
         mce->connection_mode = (int8_t) blobmsg_get_u8(tb[CONNECTION_MODE]);
     }
 
-    if (!tb[QUALITY]) {
+    if (tb[QUALITY]) {
         mce->quality = (int8_t) blobmsg_get_u8(tb[QUALITY]);
     }
 
@@ -236,10 +234,11 @@ static int md_input_ubus_subscriber_cb(struct ubus_context *ctx, struct ubus_obj
     }
 
     if (!tb[EVENT_TYPE]) {
-        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Missing event type");
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Event type is missing\n");
         return UBUS_STATUS_OK;
     }
 
+    event_type = blobmsg_get_u8(tb[EVENT_TYPE]);
     if (!(event_type & miu->md_ubus_mask)) {
         return UBUS_STATUS_OK;
     }

From a8ae8e9335b919264a57fa240509459131c8c989 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Mon, 13 Dec 2021 21:37:09 +0100
Subject: [PATCH 11/41] [FIX] Don't log to file

---
 files/metadata.init | 2 --
 1 file changed, 2 deletions(-)

diff --git a/files/metadata.init b/files/metadata.init
index 0e50dfe..40bbb79 100755
--- a/files/metadata.init
+++ b/files/metadata.init
@@ -38,8 +38,6 @@ create_config()
 
     json_init
 
-    json_add_string "logfile" "/tmp/meta_exporter.log"
-
     #Add zmq options
     json_add_object "ubus_input"
         json_add_boolean "conn" 1

From f36d1a5deaddb5ff09045efcc357afffa5cc9af8 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Tue, 14 Dec 2021 10:32:06 +0100
Subject: [PATCH 12/41] [FIX] Quality is exported with a proper value

---
 src/metadata_input_ubus.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index 8363397..464148f 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -94,7 +94,7 @@ static struct blobmsg_policy metadata_policy[__METADATA_MAX] = {
     [HAS_IP] = {.name = "has_ip", .type = BLOBMSG_TYPE_INT8},
     [CONNECTIVITY] = {.name = "connectivity", .type = BLOBMSG_TYPE_INT8},
     [CONNECTION_MODE] = {.name = "connection_mode", .type = BLOBMSG_TYPE_INT8},
-    [QUALITY] = {.name = "quality", .type = BLOBMSG_TYPE_INT8},
+    [QUALITY] = {.name = "quality", .type = BLOBMSG_TYPE_INT16},
 };
 
 static void md_input_ubus_handle_conn_event(struct blob_attr *tb[])
@@ -194,7 +194,7 @@ static void md_input_ubus_handle_conn_event(struct blob_attr *tb[])
     }
 
     if (tb[QUALITY]) {
-        mce->quality = (int8_t) blobmsg_get_u8(tb[QUALITY]);
+        mce->quality = (uint8_t) blobmsg_get_u16(tb[QUALITY]);
     }
 
     if (mce->event_param == CONN_EVENT_DATA_USAGE_UPDATE) {

From a14c42c10f01b694df460b5e904e051a29525614 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Tue, 14 Dec 2021 13:10:38 +0100
Subject: [PATCH 13/41] [SRC] Add ugps support

---
 src/metadata_input_ubus.c | 114 +++++++++++++++++++++++++++++++++-----
 src/metadata_input_ubus.h |   4 +-
 2 files changed, 103 insertions(+), 15 deletions(-)

diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index 464148f..c13b2a8 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -33,7 +33,7 @@
 
 struct md_input_ubus *miu;
 
-static uint8_t md_input_ubus_subscribe();
+static uint8_t md_input_ubus_subscribe(struct ubus_subscriber *subscriber, const char *obj_name);
 
  // Policy for the object add event
 enum
@@ -97,10 +97,30 @@ static struct blobmsg_policy metadata_policy[__METADATA_MAX] = {
     [QUALITY] = {.name = "quality", .type = BLOBMSG_TYPE_INT16},
 };
 
+enum
+{
+    LATITUDE,
+    LONGITUDE,
+    ELEVATION,
+    SPEED,
+    SATELLITES,
+    __GPS_UPDATE_MAX
+};
+
+static struct blobmsg_policy gps_update_policy [__GPS_UPDATE_MAX] = {
+    [LATITUDE]   = {.name = "latitude", .type = BLOBMSG_TYPE_STRING},
+    [LONGITUDE]  = {.name = "longitude", .type = BLOBMSG_TYPE_STRING},
+    [ELEVATION]  = {.name = "elevation", .type = BLOBMSG_TYPE_STRING},
+    [SPEED]      = {.name = "speed", .type = BLOBMSG_TYPE_STRING},
+    [SATELLITES] = {.name = "satellites", .type = BLOBMSG_TYPE_STRING}
+};
+
 static void md_input_ubus_handle_conn_event(struct blob_attr *tb[])
 {
     struct md_conn_event *mce = miu->mce;
 
+    memset(mce, 0, sizeof(struct md_conn_event));
+
     mce->md_type = META_TYPE_CONNECTION;
     //255 is reserved value used to indicate that there is no value to export
     //(look at writers)
@@ -217,7 +237,7 @@ static void md_input_ubus_handle_conn_event(struct blob_attr *tb[])
     mde_publish_event_obj(miu->parent, (struct md_event*) mce);
 }
 
-static int md_input_ubus_subscriber_cb(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req,
+static int md_input_ubus_dlb_subscriber_cb(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req,
                           const char *method, struct blob_attr *msg)
 {
     struct blob_attr* tb[__METADATA_MAX] = {0};
@@ -257,6 +277,53 @@ static int md_input_ubus_subscriber_cb(struct ubus_context *ctx, struct ubus_obj
     return UBUS_STATUS_OK;
 }
 
+static int md_input_ubus_gps_subscriber_cb(struct ubus_context *ctx, struct ubus_object *obj, struct ubus_request_data *req,
+                          const char *method, struct blob_attr *msg)
+{
+    struct blob_attr* tb[__GPS_UPDATE_MAX] = {0};
+    struct md_gps_event *mgps = miu->gps_event;
+
+    if (blobmsg_parse(gps_update_policy, __GPS_UPDATE_MAX, tb, blobmsg_data(msg), blobmsg_data_len(msg))) {
+        META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Can't parse GPS data\n");
+        return UBUS_STATUS_NO_DATA;
+    }
+
+    if (!tb[LONGITUDE] || !tb[LATITUDE] || !tb[SATELLITES]) {
+        return UBUS_STATUS_NO_DATA;
+    }
+
+    memset(mgps, 0, sizeof(struct md_gps_event));
+
+    gettimeofday(&mgps->tstamp_tv, NULL);
+    mgps->md_type = META_TYPE_POS;
+    mgps->minmea_id = MINMEA_UNKNOWN;
+    mgps->sequence = mde_inc_seq(miu->parent);
+
+    if (tb[LONGITUDE]) {
+        mgps->longitude = atof(blobmsg_get_string(tb[LONGITUDE]));
+    }
+
+    if (tb[LATITUDE]) {
+        mgps->latitude = atof(blobmsg_get_string(tb[LATITUDE]));
+    }
+
+    if (tb[SATELLITES]) {
+        mgps->satellites_tracked = atoi(blobmsg_get_string(tb[SATELLITES]));
+    }
+
+    if (tb[ELEVATION]) {
+        mgps->altitude = atof(blobmsg_get_string(tb[ELEVATION]));
+    }
+
+    if (tb[SPEED]) {
+        mgps->speed = atof(blobmsg_get_string(tb[SPEED]));
+    }
+
+    mde_publish_event_obj(miu->parent, (struct md_event *) mgps);
+
+    return UBUS_STATUS_OK;
+}
+
 static void md_input_ubus_event_handler(struct ubus_context *ctx, struct ubus_event_handler *ev, const char *type, struct blob_attr *msg)
 {
     struct blob_attr* tb[__UBUS_OBJ_ADD_MAX] = {0};
@@ -273,7 +340,7 @@ static void md_input_ubus_event_handler(struct ubus_context *ctx, struct ubus_ev
 
     // Resubscribe to the UBUS object if needed
     if (!strcmp(blobmsg_get_string(tb[PATH]), "celerway.dlb")) {
-        md_input_ubus_subscribe();
+        md_input_ubus_subscribe(&miu->ubus_dlb_subscriber, "celerway.dlb");
     }
 }
 
@@ -314,20 +381,20 @@ static uint8_t md_input_ubus_connect()
     return RETVAL_SUCCESS;
 }
 
-static uint8_t md_input_ubus_subscribe()
+static uint8_t md_input_ubus_subscribe(struct ubus_subscriber *subscriber, const char *obj_name)
 {
-    uint32_t dlb_id;
+    uint32_t id;
 
-    if (ubus_lookup_id(miu->ubus_ctx, "celerway.dlb", &dlb_id)) {
+    if (ubus_lookup_id(miu->ubus_ctx, obj_name, &id)) {
         return RETVAL_FAILURE;
     }
 
     // Only call register once per object
-    if (!miu->ubus_subscriber.obj.id && ubus_register_subscriber(miu->ubus_ctx, &miu->ubus_subscriber)) {
+    if (!subscriber->obj.id && ubus_register_subscriber(miu->ubus_ctx, subscriber)) {
         return RETVAL_FAILURE;
     }
 
-    if (ubus_subscribe(miu->ubus_ctx, &miu->ubus_subscriber, dlb_id)) {
+    if (ubus_subscribe(miu->ubus_ctx, subscriber, id)) {
         return RETVAL_FAILURE;
     }
 
@@ -362,10 +429,20 @@ static uint8_t md_input_ubus_config()
         return RETVAL_FAILURE;
     }
 
-    memset(&miu->ubus_subscriber, 0, sizeof(struct ubus_subscriber));
-    miu->ubus_subscriber.cb = md_input_ubus_subscriber_cb;
-    if (md_input_ubus_subscribe() != RETVAL_SUCCESS) {
-         META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Failed to subscribe to the UBUS object. Will retry on UBUS add event.\n");
+    if (miu->md_ubus_mask & META_TYPE_CONNECTION) {
+        memset(&miu->ubus_dlb_subscriber, 0, sizeof(struct ubus_subscriber));
+        miu->ubus_dlb_subscriber.cb = md_input_ubus_dlb_subscriber_cb;
+        if (md_input_ubus_subscribe(&miu->ubus_dlb_subscriber, "celerway.dlb") != RETVAL_SUCCESS) {
+            META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Failed to subscribe to the celerway.dlb object. Will retry on UBUS add event.\n");
+        }
+    }
+
+    if (miu->md_ubus_mask & META_TYPE_POS) {
+        memset(&miu->ubus_gps_subscriber, 0, sizeof(struct ubus_subscriber));
+        miu->ubus_gps_subscriber.cb = md_input_ubus_gps_subscriber_cb;
+        if (md_input_ubus_subscribe(&miu->ubus_gps_subscriber, "gps") != RETVAL_SUCCESS) {
+            META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Failed to subscribe to the gps object. Will retry on UBUS add event.\n");
+        }
     }
 
     return RETVAL_SUCCESS;
@@ -382,9 +459,18 @@ static uint8_t md_input_ubus_init(void *ptr, json_object* config)
             if (!strcmp(key, "conn")) {
                 miu->md_ubus_mask |= META_TYPE_CONNECTION;
                 miu->mce = calloc(sizeof(struct md_conn_event), 1);
-                if (miu->mce == NULL)
+                if (miu->mce == NULL) {
+                    META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Can't allocate conn event struct\n");
+                    return RETVAL_FAILURE;
+                }
+	        } else if (!strcmp(key, "pos")) {
+                miu->md_ubus_mask |= META_TYPE_POS;
+                miu->gps_event = calloc(sizeof(struct md_gps_event), 1);
+                if (miu->gps_event == NULL) {
+                    META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Can't allocate gps event struct\n");
                     return RETVAL_FAILURE;
-	        }   
+                }
+            }
         }
     }
 
diff --git a/src/metadata_input_ubus.h b/src/metadata_input_ubus.h
index 6f9772a..1f8035c 100644
--- a/src/metadata_input_ubus.h
+++ b/src/metadata_input_ubus.h
@@ -38,9 +38,11 @@ struct md_input_ubus {
     struct backend_epoll_handle *event_handle;
     uint32_t md_ubus_mask;
     struct ubus_context *ubus_ctx;
-    struct ubus_subscriber ubus_subscriber;
+    struct ubus_subscriber ubus_dlb_subscriber;
+    struct ubus_subscriber ubus_gps_subscriber;
     struct ubus_event_handler ubus_event_handler;
     struct md_conn_event *mce;
+    struct md_gps_event *gps_event;
 };
 
 void md_ubus_input_usage();

From cbb10d8af484f64e954076735aaa36f37bd2a9a1 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Tue, 14 Dec 2021 13:24:23 +0100
Subject: [PATCH 14/41] [FIX] Export data usage properly

---
 src/metadata_input_ubus.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index c13b2a8..1af4762 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -222,6 +222,9 @@ static void md_input_ubus_handle_conn_event(struct blob_attr *tb[])
             (mce->imsi && !mce->imei)) {
             META_PRINT_SYSLOG(miu->parent, LOG_ERR, "Missing required argument in usage UBUS message\n");
             return;
+        } else {
+            mde_publish_event_obj(miu->parent, (struct md_event*) mce);
+            return;        
         }
     }
 

From 73695cf611e49022a23192fb4b304dbf16e0eb69 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Tue, 14 Dec 2021 16:23:42 +0100
Subject: [PATCH 15/41] [FIX] Add missing event value

---
 src/metadata_input_ubus.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index 1af4762..487afef 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -61,6 +61,7 @@ enum
     NETWORK_ADDRESS,
     NETWORK_PROVIDER,
     EVENT_PARAM,
+    EVENT_VALUE,
     L3_SESSION_ID,
     L4_SESSION_ID,
     SIGNAL_STRENGTH,
@@ -86,6 +87,7 @@ static struct blobmsg_policy metadata_policy[__METADATA_MAX] = {
     [NETWORK_ADDRESS] = {.name = "network_address", .type = BLOBMSG_TYPE_STRING},
     [NETWORK_PROVIDER] = {.name = "network_provider", .type = BLOBMSG_TYPE_INT32},
     [EVENT_PARAM] = {.name = "event_param", .type = BLOBMSG_TYPE_INT8},
+    [EVENT_VALUE] = {.name = "event_value", .type = BLOBMSG_TYPE_INT32},
     [L3_SESSION_ID] = {.name = "l3_session_id", .type = BLOBMSG_TYPE_INT64},
     [L4_SESSION_ID] = {.name = "l4_session_id", .type = BLOBMSG_TYPE_INT64},
     [SIGNAL_STRENGTH] = {.name = "signal_strength", .type = BLOBMSG_TYPE_INT8},
@@ -141,6 +143,10 @@ static void md_input_ubus_handle_conn_event(struct blob_attr *tb[])
         mce->event_param = blobmsg_get_u8(tb[EVENT_PARAM]);
     }
 
+    if (tb[EVENT_VALUE]) {
+        mce->event_value = (uint8_t)blobmsg_get_u32(tb[EVENT_VALUE]);
+    }
+
     if (tb[EVENT_TYPE]) {
         mce->event_type = blobmsg_get_u8(tb[EVENT_TYPE]);
     }

From 86f350d204d648293e967385dc84134503910ed6 Mon Sep 17 00:00:00 2001
From: Lukasz Baj <l.baj@celerway.com>
Date: Wed, 15 Dec 2021 10:50:39 +0100
Subject: [PATCH 16/41] [FIX] Resubscribe to gps UBUS object if needed

---
 src/metadata_input_ubus.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index 487afef..b1ff97a 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -350,6 +350,8 @@ static void md_input_ubus_event_handler(struct ubus_context *ctx, struct ubus_ev
     // Resubscribe to the UBUS object if needed
     if (!strcmp(blobmsg_get_string(tb[PATH]), "celerway.dlb")) {
         md_input_ubus_subscribe(&miu->ubus_dlb_subscriber, "celerway.dlb");
+    } else if (!strcmp(blobmsg_get_string(tb[PATH]), "gps")) {
+        md_input_ubus_subscribe(&miu->ubus_gps_subscriber, "gps");
     }
 }
 

From f17264bbf5a62161aa943e699d5899640029bd82 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 25 May 2022 10:12:01 +0200
Subject: [PATCH 17/41] adjust branch in Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 836ffb0..2a554a9 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -11,7 +11,7 @@ node {
         git branch: 'master', url: 'git@github.com:MONROE-PROJECT/Utilities.git'
 
         checkout([$class: 'GitSCM',
-            branches: [[name: 'nne-iot']],
+            branches: [[name: 'test-merge-ubus']],
             doGenerateSubmoduleConfigurations: false,
             extensions: [[$class: 'RelativeTargetDirectory', relativeTargetDir: 'metadata-exporter-alt']],
             submoduleCfg: [],

From babeee756b499b8c6e1fce63e4f3fa3b39c84dda Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 25 May 2022 10:15:25 +0200
Subject: [PATCH 18/41] adjust path in Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2a554a9..8cb7ea0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,7 +38,7 @@ node {
 
 	    stage ('Build') {
 		dir(build_dir) {
-		    sh "cmake ../metadata-exporter-alt -DNNE=1 -DSQLITE3=1 -DZEROMQ_INPUT=1 -DZEROMQ_WRITER=1 -DZEROMQ_RELAY=1 -DGPS_NSB=1 -DMUNIN=1 -DSYSEVENT=1 -DNEAT=1 && make && make package"
+		    sh "cmake ../metadata-exporter-alt/src -DNNE=1 -DSQLITE3=1 -DZEROMQ_INPUT=1 -DZEROMQ_WRITER=1 -DZEROMQ_RELAY=1 -DGPS_NSB=1 -DMUNIN=1 -DSYSEVENT=1 -DNEAT=1 && make && make package"
 		}
 		sh "chmod +x versionize/versionize.sh; cp versionize/versionize.sh build/"
                 sh "chmod -R g-s ${build_dir}"

From b58e9b3869c8dbce5297a8d652bb2e50f017b1e6 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 25 May 2022 10:15:49 +0200
Subject: [PATCH 19/41] enable ubus in Jenkinsfile

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8cb7ea0..691bd06 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,7 +38,7 @@ node {
 
 	    stage ('Build') {
 		dir(build_dir) {
-		    sh "cmake ../metadata-exporter-alt/src -DNNE=1 -DSQLITE3=1 -DZEROMQ_INPUT=1 -DZEROMQ_WRITER=1 -DZEROMQ_RELAY=1 -DGPS_NSB=1 -DMUNIN=1 -DSYSEVENT=1 -DNEAT=1 && make && make package"
+		    sh "cmake ../metadata-exporter-alt/src -DNNE=1 -DSQLITE3=1 -DZEROMQ_INPUT=1 -DZEROMQ_WRITER=1 -DZEROMQ_RELAY=1 -DGPS_NSB=1 -DMUNIN=1 -DSYSEVENT=1 -DNEAT=1 -DUBUS=1 && make && make package"
 		}
 		sh "chmod +x versionize/versionize.sh; cp versionize/versionize.sh build/"
                 sh "chmod -R g-s ${build_dir}"

From 01b1d8adfccac57943fdaf49385a1d3477af9e4c Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 25 May 2022 10:21:00 +0200
Subject: [PATCH 20/41] install ubus

---
 Jenkinsfile | 62 +++++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 691bd06..e3d58c4 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,36 +36,42 @@ node {
     docker.withRegistry('http://registry:5000') {
         docker.image('registry:5000/jenkins-slave:monroe').inside('-u jenkins') {
 
-	    stage ('Build') {
-		dir(build_dir) {
-		    sh "cmake ../metadata-exporter-alt/src -DNNE=1 -DSQLITE3=1 -DZEROMQ_INPUT=1 -DZEROMQ_WRITER=1 -DZEROMQ_RELAY=1 -DGPS_NSB=1 -DMUNIN=1 -DSYSEVENT=1 -DNEAT=1 -DUBUS=1 && make && make package"
-		}
-		sh "chmod +x versionize/versionize.sh; cp versionize/versionize.sh build/"
-                sh "chmod -R g-s ${build_dir}"
-		dir(build_dir) {
-		    sh "mv meta_exporter-0.1.0-Linux.deb meta-exporter-0.1.0-Linux.deb"
-		    sh "./versionize.sh meta-exporter-0.1.0-Linux.deb ${buildPackageName} ${version} ${shortCommit} || true"
-		    sh "rm meta-exporter-0.1.0-Linux.deb"
-		}
-	    }
+                stage ('Install libubus') {
+                    step([$class: 'CopyArtifact', filter: '**/*.deb', fingerprintArtifacts: true, projectName: 'monroe/ubus', selector: [$class: 'StatusBuildSelector', stable: false]])
+                    sh '''sudo find . -name "*.deb" -exec dpkg -i {} \\;'''
+                    sh "rm ubusd_*_amd64.deb"
+                }
 
-	    stage ('Configure') {
-		dir(build_dir) {
-		    sh """echo `cat pk_${buildPackageName}/DEBIAN/control |grep Version|sed -e 's/Version: //'` > pkgver"""
-		}
-		sh """cp -an metadata-exporter/* build/pk_${buildPackageName}/"""
-		dir(build_dir) {
-		    sh """sed -i -e 's/${buildPackageName}/metadata-exporter/g' pk_${buildPackageName}/DEBIAN/md5sums pk_${buildPackageName}/DEBIAN/control"""
-		    sh """mkdir -p pk_${buildPackageName}/usr/sbin && mv pk_${buildPackageName}/usr/sbin/meta_exporter pk_${buildPackageName}/usr/sbin/metadata-exporter"""
-                    sh "chmod -R g-s pk_meta-exporter"
-		    sh '''PKGVER=`cat pkgver` ;dpkg -b pk_meta-exporter metadata-exporter-${PKGVER}-Linux.deb'''
-		    sh "rm meta-exporter*.deb"
-		}
-	    }
+          	    stage ('Build') {
+ 	                	dir(build_dir) {
+		                    sh "cmake ../metadata-exporter-alt/src -DNNE=1 -DSQLITE3=1 -DZEROMQ_INPUT=1 -DZEROMQ_WRITER=1 -DZEROMQ_RELAY=1 -DGPS_NSB=1 -DMUNIN=1 -DSYSEVENT=1 -DNEAT=1 -DUBUS=1 && make && make package"
+		                }
+		                sh "chmod +x versionize/versionize.sh; cp versionize/versionize.sh build/"
+                    sh "chmod -R g-s ${build_dir}"
+		                dir(build_dir) {
+		                    sh "mv meta_exporter-0.1.0-Linux.deb meta-exporter-0.1.0-Linux.deb"
+		                    sh "./versionize.sh meta-exporter-0.1.0-Linux.deb ${buildPackageName} ${version} ${shortCommit} || true"
+		                    sh "rm meta-exporter-0.1.0-Linux.deb"
+		                }
+	              }
 
-	    stage ('Archive artifacts') {
-		archiveArtifacts "${build_dir}/*.deb"
-            }
+                stage ('Configure') {
+                  dir(build_dir) {
+                      sh """echo `cat pk_${buildPackageName}/DEBIAN/control |grep Version|sed -e 's/Version: //'` > pkgver"""
+                  }
+                  sh """cp -an metadata-exporter/* build/pk_${buildPackageName}/"""
+                  dir(build_dir) {
+                      sh """sed -i -e 's/${buildPackageName}/metadata-exporter/g' pk_${buildPackageName}/DEBIAN/md5sums pk_${buildPackageName}/DEBIAN/control"""
+                      sh """mkdir -p pk_${buildPackageName}/usr/sbin && mv pk_${buildPackageName}/usr/sbin/meta_exporter pk_${buildPackageName}/usr/sbin/metadata-exporter"""
+                      sh "chmod -R g-s pk_meta-exporter"
+                      sh '''PKGVER=`cat pkgver` ;dpkg -b pk_meta-exporter metadata-exporter-${PKGVER}-Linux.deb'''
+                      sh "rm meta-exporter*.deb"
+                  }
+                }
+
+                stage ('Archive artifacts') {
+                    archiveArtifacts "${build_dir}/*.deb"
+                }
         }
     }
 }

From b00f8449351176d18a93825dfea450f561d1d901 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 25 May 2022 10:26:46 +0200
Subject: [PATCH 21/41] install ubox

---
 Jenkinsfile | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Jenkinsfile b/Jenkinsfile
index e3d58c4..44d2270 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -36,6 +36,12 @@ node {
     docker.withRegistry('http://registry:5000') {
         docker.image('registry:5000/jenkins-slave:monroe').inside('-u jenkins') {
 
+                stage ('Install libubox') {
+                    copyArtifacts filter: '**/*.deb', fingerprintArtifacts: true, projectName: 'monroe/libubox', selector: lastSuccessful()
+                    sh '''sudo find . -name "*.deb" -exec dpkg -i {} \\;'''
+                    sh "rm libubox_*_amd64.deb"
+                }
+
                 stage ('Install libubus') {
                     step([$class: 'CopyArtifact', filter: '**/*.deb', fingerprintArtifacts: true, projectName: 'monroe/ubus', selector: [$class: 'StatusBuildSelector', stable: false]])
                     sh '''sudo find . -name "*.deb" -exec dpkg -i {} \\;'''

From 8296b9ca6e891c7f84c3f15ec615b6cc4626a743 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 25 May 2022 10:33:54 +0200
Subject: [PATCH 22/41] restore all inputs

---
 src/metadata_exporter.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/metadata_exporter.h b/src/metadata_exporter.h
index 39ee40c..ac333c6 100644
--- a/src/metadata_exporter.h
+++ b/src/metadata_exporter.h
@@ -137,7 +137,7 @@ enum md_inputs {
     MD_INPUT_MUNIN,
     MD_INPUT_SYSEVENT,
     MD_INPUT_ZEROMQ,
-//    MD_INPUT_ZEROMQ_RELAY,
+    MD_INPUT_ZEROMQ_RELAY,
     MD_INPUT_UBUS,
     __MD_INPUT_MAX
 };

From 4861b95a4138247e8581610e9258c0e42808a6b2 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 25 May 2022 10:42:55 +0200
Subject: [PATCH 23/41] avoid double definition of LIST_HEAD macro

---
 src/backend_event_loop.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/backend_event_loop.h b/src/backend_event_loop.h
index b211587..6470c4c 100644
--- a/src/backend_event_loop.h
+++ b/src/backend_event_loop.h
@@ -30,6 +30,11 @@
 #include <sys/queue.h>
 #include <sys/epoll.h>
 
+#define SQ_LIST_HEAD(name, type)           \
+struct name {               \
+  struct type *lh_first;  /* first element */     \
+}
+
 #define MAX_EPOLL_EVENTS 10
 
 //Any resource used by the callback is stored in the implementing "class".
@@ -58,7 +63,7 @@ struct backend_timeout_handle{
 
 struct backend_event_loop{
     int32_t efd;
-    LIST_HEAD(timeout, backend_timeout_handle) timeout_list;
+    SQ_LIST_HEAD(timeout, backend_timeout_handle) timeout_list;
     backend_itr_cb itr_cb;
     void *itr_data;
 };

From ef75006c071aa74722d6fcad07aabd81f4589d7c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Zieli=C5=84ski?= <fasolens@gmail.com>
Date: Wed, 28 Sep 2022 15:47:52 +0200
Subject: [PATCH 24/41] Update Jenkinsfile

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 44d2270..d90318b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,8 +33,8 @@ node {
                 userRemoteConfigs: [[url: 'git@github.com:Celerway/celerway-jenkins.git']]])
     }
 
-    docker.withRegistry('http://registry:5000') {
-        docker.image('registry:5000/jenkins-slave:monroe').inside('-u jenkins') {
+    withDockerRegistry(credentialsId: 'gcr:nimbus-tools-gcr', url: 'http://eu.gcr.io/nimbus-tools') {
+        docker.image('eu.gcr.io/nimbus-tools/monroe-builder:22.04').inside('-u jenkins') {
 
                 stage ('Install libubox') {
                     copyArtifacts filter: '**/*.deb', fingerprintArtifacts: true, projectName: 'monroe/libubox', selector: lastSuccessful()

From 52526a1cd3a36a010473bad18daac39468c5d546 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Zieli=C5=84ski?=
 <b.zielinski@celerway.com>
Date: Thu, 29 Sep 2022 10:09:26 +0200
Subject: [PATCH 25/41] fix: Change to debian stretch

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

diff --git a/Jenkinsfile b/Jenkinsfile
index 44d2270..3d351ac 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -33,9 +33,8 @@ node {
                 userRemoteConfigs: [[url: 'git@github.com:Celerway/celerway-jenkins.git']]])
     }
 
-    docker.withRegistry('http://registry:5000') {
-        docker.image('registry:5000/jenkins-slave:monroe').inside('-u jenkins') {
-
+        withDockerRegistry(credentialsId: 'gcr:nimbus-tools-gcr', url: 'http://eu.gcr.io/nimbus-tools') {
+            docker.image('eu.gcr.io/nimbus-tools/monroe-builder:stretch').inside('-u jenkins') {
                 stage ('Install libubox') {
                     copyArtifacts filter: '**/*.deb', fingerprintArtifacts: true, projectName: 'monroe/libubox', selector: lastSuccessful()
                     sh '''sudo find . -name "*.deb" -exec dpkg -i {} \\;'''

From ba8d40831e7b8de044e57078111c9ca23aedde03 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Tue, 12 Sep 2023 14:29:55 +0200
Subject: [PATCH 26/41] tooling

---
 src/metadata_input_ubus.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index b1ff97a..8120823 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -253,7 +253,9 @@ static int md_input_ubus_dlb_subscriber_cb(struct ubus_context *ctx, struct ubus
     uint8_t event_type = 0;
 
     // We parse metadata and datausage messages only
+    META_PRINT_SYSLOG(miu->parent, LOG_INFO, "Got ubus method: %s\n", method);
     if (strcmp(method, "metadata") && strcmp(method, "datausage")) {
+        META_PRINT_SYSLOG(miu->parent, LOG_INFO, "Unknown ubus method: %s\n", method);
         return UBUS_STATUS_OK;
     }
 

From 4bb4896561f84b9a910e01e406ae1c53fc1c3df6 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Tue, 12 Sep 2023 14:36:56 +0200
Subject: [PATCH 27/41] tooling

---
 src/metadata_input_ubus.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index 8120823..ce5813a 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -255,7 +255,6 @@ static int md_input_ubus_dlb_subscriber_cb(struct ubus_context *ctx, struct ubus
     // We parse metadata and datausage messages only
     META_PRINT_SYSLOG(miu->parent, LOG_INFO, "Got ubus method: %s\n", method);
     if (strcmp(method, "metadata") && strcmp(method, "datausage")) {
-        META_PRINT_SYSLOG(miu->parent, LOG_INFO, "Unknown ubus method: %s\n", method);
         return UBUS_STATUS_OK;
     }
 
@@ -269,8 +268,11 @@ static int md_input_ubus_dlb_subscriber_cb(struct ubus_context *ctx, struct ubus
         return UBUS_STATUS_OK;
     }
 
+    META_PRINT_SYSLOG(miu->parent, LOG_INFO, "Handling: %s\n", method);
+
     event_type = blobmsg_get_u8(tb[EVENT_TYPE]);
     if (!(event_type & miu->md_ubus_mask)) {
+        META_PRINT_SYSLOG(miu->parent, LOG_INFO, "Mask mismatch: %s\n", method);
         return UBUS_STATUS_OK;
     }
 

From 582b928c8f7f0dc9794f92562437cef64e5458f2 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Tue, 12 Sep 2023 17:07:18 +0200
Subject: [PATCH 28/41] test: handle conn events as iface events

---
 src/metadata_writer_nne.c | 53 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 50 insertions(+), 3 deletions(-)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index d337f57..f945a32 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -271,18 +271,51 @@ static struct nne_value md_iface_parse_oper(struct nne_modem *modem, struct md_i
     return value;
 }
 
+// quick and dirty storage for IP address entries from CONN_EVENTS
+typedef struct {
+    char iface[100];
+    char ip_addr[100];
+} ip_addr_cache_entry;
+
+static ip_addr_cache_entry ip_lookup[16];
+
+static void insert_ip_cache(const char* iface, const char* ip_addr)
+{
+    int i;
+    for (i = 0; i < 16; i++) {
+        if ((ip_lookup[i].iface == NULL) || (strcmp(ip_lookup[i].iface, iface) == 0)) {
+            snprintf(ip_lookup[i].iface, 100, "%s", iface);
+            snprintf(ip_lookup[i].ip_addr, 100, "%s", ip_addr);
+            return;
+        }
+    }
+}
+static char* get_ip_cache(const char* iface)
+{
+    int i;
+    for (i = 0; i < 16; i++) {
+        if ((ip_lookup[i].iface != NULL) && (strcmp(ip_lookup[i].iface, iface) == 0)) {
+            return ip_lookup[i].ip_addr;
+        }
+    }
+    return NULL;
+}
+
+
 static struct nne_value md_iface_parse_ipaddr(struct nne_modem *modem, struct md_iface_event *mie, char *extra, size_t extra_len)
 {
     struct nne_value value;
     value.type = NNE_TYPE_STRING;
-    if (mie->ip_addr != NULL) {
+    char* ip_addr = get_ip_cache(mie->ifname);
+
+    if (ip_addr != NULL) {
         value.u.v_str = strdup("UP");
         // We need to pass ip address to the event message in the extra field;
         // the problem is, though, that it must be the address as seen inside the
         // experiment container, so we construct the address here the same way
         // as nne-lxc-network-manager: 192.168.<netword_id>.<container_id + 100>
         // In the current implementation we have only one container with id 1.
-        snprintf(extra, extra_len, "192.168.%d.101", modem->network_id);
+        snprintf(extra, extra_len, "%s", ip_addr);
     }
     else {
         value.u.v_str = strdup("DOWN");
@@ -771,6 +804,15 @@ static uint32_t md_find_network_id(uint32_t imsi_mccmnc, const char *iccid, cons
     return network_id;
 }
 
+
+static void md_nne_handle_conn_event(struct md_writer_nne *mwn,
+                                     struct md_conn_event *mce) {
+    //only parse ifname and ip_addr
+    if ((mce->interface_id) && (mce->network_address)) {
+        insert_ip_cache(mce->interface_id, mce->network_address);
+    }
+}
+
 static void md_nne_handle_iface_event(struct md_writer_nne *mwn,
                                       struct md_iface_event *mie)
 {
@@ -791,6 +833,8 @@ static void md_nne_handle_iface_event(struct md_writer_nne *mwn,
         "IFACE_EVENT_CELEVEL_CHANGE",
     };
 
+    char *ip_addr = get_ip_cache(mie->ifname);
+
     META_PRINT_SYSLOG(mwn->parent, LOG_ERR, "NNE writer: %s: "
                       "ip_addr=%s, "
                       "ifname=%s, "
@@ -809,7 +853,7 @@ static void md_nne_handle_iface_event(struct md_writer_nne *mwn,
                       "device_mode=%d, "
                       "device_submode=%d\n",
                       iface_event_type[mie->event_param],
-                      mie->ip_addr,
+                      ip_addr,
                       mie->ifname,
                       mie->iccid,
                       mie->imsi,
@@ -1298,6 +1342,9 @@ static void md_nne_handle(struct md_writer *writer, struct md_event *event)
         case META_TYPE_INTERFACE:
             md_nne_handle_iface_event(mwn, (struct md_iface_event*) event);
             break;
+        case META_TYPE_CONNECTION:
+            md_nne_handle_conn_event(mwn, (struct md_conn_event*) event);
+            break;
         case META_TYPE_RADIO:
             md_nne_handle_radio(mwn, (struct md_radio_event*) event);
             break;

From 1ee918d2bfccd509592c50fd5f4a1415d7474716 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Tue, 12 Sep 2023 18:47:02 +0200
Subject: [PATCH 29/41] extra logging

---
 src/metadata_writer_nne.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index f945a32..314a78f 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -808,10 +808,15 @@ static uint32_t md_find_network_id(uint32_t imsi_mccmnc, const char *iccid, cons
 static void md_nne_handle_conn_event(struct md_writer_nne *mwn,
                                      struct md_conn_event *mce) {
     //only parse ifname and ip_addr
+    META_PRINT_SYSLOG(mwn->parent, LOG_INFO, "NNE writer: inserting from CONN_EVENT: "
+                      "ifname=%s, "
+                      "ip_addr=%s\n",
+                      mce->interface_id,
+                      mce->network_address);
     if ((mce->interface_id) && (mce->network_address)) {
         insert_ip_cache(mce->interface_id, mce->network_address);
     }
-}
+}   
 
 static void md_nne_handle_iface_event(struct md_writer_nne *mwn,
                                       struct md_iface_event *mie)
@@ -834,6 +839,12 @@ static void md_nne_handle_iface_event(struct md_writer_nne *mwn,
     };
 
     char *ip_addr = get_ip_cache(mie->ifname);
+    META_PRINT_SYSLOG(mwn->parent, LOG_INFO, "NNE writer: got from from CONN_EVENT: "
+                      "ifname=%s, "
+                      "ip_addr=%s\n",
+                        mie->ifname,
+                        ip_addr);
+
 
     META_PRINT_SYSLOG(mwn->parent, LOG_ERR, "NNE writer: %s: "
                       "ip_addr=%s, "

From 172d3fe1fb79d554c2ec0646a3eb9cac27b0830b Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Tue, 12 Sep 2023 18:52:50 +0200
Subject: [PATCH 30/41] fix: match interface_id / iccid

---
 src/metadata_writer_nne.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index 314a78f..0a62c29 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -807,7 +807,7 @@ static uint32_t md_find_network_id(uint32_t imsi_mccmnc, const char *iccid, cons
 
 static void md_nne_handle_conn_event(struct md_writer_nne *mwn,
                                      struct md_conn_event *mce) {
-    //only parse ifname and ip_addr
+    //only parse ifname and ip_addr, attention: interface_id is still iccid
     META_PRINT_SYSLOG(mwn->parent, LOG_INFO, "NNE writer: inserting from CONN_EVENT: "
                       "ifname=%s, "
                       "ip_addr=%s\n",
@@ -838,7 +838,7 @@ static void md_nne_handle_iface_event(struct md_writer_nne *mwn,
         "IFACE_EVENT_CELEVEL_CHANGE",
     };
 
-    char *ip_addr = get_ip_cache(mie->ifname);
+    char *ip_addr = get_ip_cache(mie->iccid);
     META_PRINT_SYSLOG(mwn->parent, LOG_INFO, "NNE writer: got from from CONN_EVENT: "
                       "ifname=%s, "
                       "ip_addr=%s\n",

From a85a5e46a283b656d2782c4f3cac593dd81e2e0b Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Tue, 12 Sep 2023 19:01:41 +0200
Subject: [PATCH 31/41] delete ip cache when has_ip is false

---
 src/metadata_writer_nne.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index 0a62c29..1117672 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -300,7 +300,17 @@ static char* get_ip_cache(const char* iface)
     }
     return NULL;
 }
-
+static void delete_ip_cache(const char* iface)
+{
+    int i;
+    for (i = 0; i < 16; i++) {
+        if ((ip_lookup[i].iface != NULL) && (strcmp(ip_lookup[i].iface, iface) == 0)) {
+            ip_lookup[i].iface[0] = '\0';
+            ip_lookup[i].ip_addr[0] = '\0';
+            return;
+        }
+    }
+}
 
 static struct nne_value md_iface_parse_ipaddr(struct nne_modem *modem, struct md_iface_event *mie, char *extra, size_t extra_len)
 {
@@ -808,13 +818,15 @@ static uint32_t md_find_network_id(uint32_t imsi_mccmnc, const char *iccid, cons
 static void md_nne_handle_conn_event(struct md_writer_nne *mwn,
                                      struct md_conn_event *mce) {
     //only parse ifname and ip_addr, attention: interface_id is still iccid
-    META_PRINT_SYSLOG(mwn->parent, LOG_INFO, "NNE writer: inserting from CONN_EVENT: "
+    if ((mce->interface_id) && (mce->has_ip)) {
+        META_PRINT_SYSLOG(mwn->parent, LOG_INFO, "NNE writer: inserting from CONN_EVENT: "
                       "ifname=%s, "
                       "ip_addr=%s\n",
                       mce->interface_id,
                       mce->network_address);
-    if ((mce->interface_id) && (mce->network_address)) {
         insert_ip_cache(mce->interface_id, mce->network_address);
+    } else if (!mce->has_ip) {
+        delete_ip_cache(mce->interface_id);        
     }
 }   
 
@@ -842,7 +854,7 @@ static void md_nne_handle_iface_event(struct md_writer_nne *mwn,
     META_PRINT_SYSLOG(mwn->parent, LOG_INFO, "NNE writer: got from from CONN_EVENT: "
                       "ifname=%s, "
                       "ip_addr=%s\n",
-                        mie->ifname,
+                        mie->iccid,
                         ip_addr);
 
 

From b9df2742edc13d9b6e4d59a74501d89f294ca2d3 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Tue, 12 Sep 2023 19:02:09 +0200
Subject: [PATCH 32/41] bump version

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 3d351ac..fa490ef 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -1,6 +1,6 @@
 import java.text.SimpleDateFormat
 jobName = "metadata-exporter"
-version = "0.1.67"
+version = "0.1.68"
 build_dir = "build"
 buildPackageName = "meta-exporter"
 

From b550994b4047f79807d080b3ccb9e44d5f6b399b Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Tue, 12 Sep 2023 19:11:19 +0200
Subject: [PATCH 33/41] init as empty

---
 src/metadata_writer_nne.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index 1117672..9986b5c 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -283,7 +283,7 @@ static void insert_ip_cache(const char* iface, const char* ip_addr)
 {
     int i;
     for (i = 0; i < 16; i++) {
-        if ((ip_lookup[i].iface == NULL) || (strcmp(ip_lookup[i].iface, iface) == 0)) {
+        if ((ip_lookup[i].iface[0] = '\0') || (strcmp(ip_lookup[i].iface, iface) == 0)) {
             snprintf(ip_lookup[i].iface, 100, "%s", iface);
             snprintf(ip_lookup[i].ip_addr, 100, "%s", ip_addr);
             return;
@@ -294,7 +294,7 @@ static char* get_ip_cache(const char* iface)
 {
     int i;
     for (i = 0; i < 16; i++) {
-        if ((ip_lookup[i].iface != NULL) && (strcmp(ip_lookup[i].iface, iface) == 0)) {
+        if (strcmp(ip_lookup[i].iface, iface) == 0) {
             return ip_lookup[i].ip_addr;
         }
     }
@@ -304,7 +304,7 @@ static void delete_ip_cache(const char* iface)
 {
     int i;
     for (i = 0; i < 16; i++) {
-        if ((ip_lookup[i].iface != NULL) && (strcmp(ip_lookup[i].iface, iface) == 0)) {
+        if (strcmp(ip_lookup[i].iface, iface) == 0) {
             ip_lookup[i].iface[0] = '\0';
             ip_lookup[i].ip_addr[0] = '\0';
             return;
@@ -1391,6 +1391,10 @@ void md_nne_setup(struct md_exporter *mde, struct md_writer_nne* mwn)
     mwn->parent = mde;
     mwn->init = md_nne_init;
     mwn->handle = md_nne_handle;
+
+    for (int i=0; i<16; i++) {
+        ip_lookup[i].ip_addr[0] = '\0';
+    }
 }
 
 

From 33a599f9ed933bb8c7c35506696f3fafbb5e86b7 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Tue, 12 Sep 2023 19:15:49 +0200
Subject: [PATCH 34/41] typo

---
 src/metadata_writer_nne.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index 9986b5c..7dc75cf 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -283,7 +283,7 @@ static void insert_ip_cache(const char* iface, const char* ip_addr)
 {
     int i;
     for (i = 0; i < 16; i++) {
-        if ((ip_lookup[i].iface[0] = '\0') || (strcmp(ip_lookup[i].iface, iface) == 0)) {
+        if ((ip_lookup[i].iface[0] == '\0') || (strcmp(ip_lookup[i].iface, iface) == 0)) {
             snprintf(ip_lookup[i].iface, 100, "%s", iface);
             snprintf(ip_lookup[i].ip_addr, 100, "%s", ip_addr);
             return;

From 00cc2d04ac90b3aaed497016c34322d3e901147b Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Tue, 12 Sep 2023 19:25:15 +0200
Subject: [PATCH 35/41] more tooling

---
 src/metadata_writer_nne.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index 7dc75cf..b692abe 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -284,6 +284,7 @@ static void insert_ip_cache(const char* iface, const char* ip_addr)
     int i;
     for (i = 0; i < 16; i++) {
         if ((ip_lookup[i].iface[0] == '\0') || (strcmp(ip_lookup[i].iface, iface) == 0)) {
+            printf("DEBUG: Inserting IP address %s for interface %s into slot %d\n", ip_addr, iface, i);
             snprintf(ip_lookup[i].iface, 100, "%s", iface);
             snprintf(ip_lookup[i].ip_addr, 100, "%s", ip_addr);
             return;
@@ -295,7 +296,10 @@ static char* get_ip_cache(const char* iface)
     int i;
     for (i = 0; i < 16; i++) {
         if (strcmp(ip_lookup[i].iface, iface) == 0) {
+            printf("DEBUG: Returning IP address %s for interface %s from slot %d\n", ip_lookup[i].ip_addr, iface, i);
             return ip_lookup[i].ip_addr;
+        } else {
+            printf("DEBUG: IP address for interface %s not found in slot %d which is %s\n", iface, i, ip_lookup[i].iface);
         }
     }
     return NULL;

From 1f743fe884a67fb0e8f0ba0a400720bab7ab4ef8 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Tue, 12 Sep 2023 19:34:17 +0200
Subject: [PATCH 36/41] test

---
 src/metadata_writer_nne.c | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index b692abe..6682247 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -283,11 +283,11 @@ static void insert_ip_cache(const char* iface, const char* ip_addr)
 {
     int i;
     for (i = 0; i < 16; i++) {
-        if ((ip_lookup[i].iface[0] == '\0') || (strcmp(ip_lookup[i].iface, iface) == 0)) {
-            printf("DEBUG: Inserting IP address %s for interface %s into slot %d\n", ip_addr, iface, i);
-            snprintf(ip_lookup[i].iface, 100, "%s", iface);
-            snprintf(ip_lookup[i].ip_addr, 100, "%s", ip_addr);
-            return;
+        if ((ip_lookup[i].iface[0] == '\0') || (strncmp(ip_lookup[i].iface, iface, 100) == 0)) {
+            printf("DEBUG: inserting %s -> %s into slot %i\n", iface, ip_addr, i);
+            strncpy(ip_lookup[i].iface, iface, 100);
+            strncpy(ip_lookup[i].ip_addr, ip_addr, 100);
+            break;
         }
     }
 }
@@ -295,11 +295,9 @@ static char* get_ip_cache(const char* iface)
 {
     int i;
     for (i = 0; i < 16; i++) {
-        if (strcmp(ip_lookup[i].iface, iface) == 0) {
-            printf("DEBUG: Returning IP address %s for interface %s from slot %d\n", ip_lookup[i].ip_addr, iface, i);
+        if (strncmp(ip_lookup[i].iface, iface, 100) == 0) {
+            printf("DEBUG: returning %s -> %s\n", iface, ip_lookup[i].ip_addr);
             return ip_lookup[i].ip_addr;
-        } else {
-            printf("DEBUG: IP address for interface %s not found in slot %d which is %s\n", iface, i, ip_lookup[i].iface);
         }
     }
     return NULL;
@@ -308,10 +306,11 @@ static void delete_ip_cache(const char* iface)
 {
     int i;
     for (i = 0; i < 16; i++) {
-        if (strcmp(ip_lookup[i].iface, iface) == 0) {
+        if (strncmp(ip_lookup[i].iface, iface, 100) == 0) {
+            printf("DEBUG: deleting %s -> %s\n", iface, ip_lookup[i].ip_addr);
             ip_lookup[i].iface[0] = '\0';
             ip_lookup[i].ip_addr[0] = '\0';
-            return;
+            break;
         }
     }
 }
@@ -320,7 +319,7 @@ static struct nne_value md_iface_parse_ipaddr(struct nne_modem *modem, struct md
 {
     struct nne_value value;
     value.type = NNE_TYPE_STRING;
-    char* ip_addr = get_ip_cache(mie->ifname);
+    char* ip_addr = get_ip_cache(mie->iccid);
 
     if (ip_addr != NULL) {
         value.u.v_str = strdup("UP");

From 1a612a8ea560407f4e53542c6b292465d2277232 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 13 Sep 2023 08:50:58 +0200
Subject: [PATCH 37/41] test

---
 src/metadata_writer_nne.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index 6682247..7b3baf3 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -284,10 +284,12 @@ static void insert_ip_cache(const char* iface, const char* ip_addr)
     int i;
     for (i = 0; i < 16; i++) {
         if ((ip_lookup[i].iface[0] == '\0') || (strncmp(ip_lookup[i].iface, iface, 100) == 0)) {
-            printf("DEBUG: inserting %s -> %s into slot %i\n", iface, ip_addr, i);
+            printf("DEBUG from CONN: inserting  %s -> %s into slot %i\n", iface, ip_addr, i);
             strncpy(ip_lookup[i].iface, iface, 100);
             strncpy(ip_lookup[i].ip_addr, ip_addr, 100);
             break;
+        } else {
+            printf("DEBUG from CONN: mismatch in slot %i: %s -> %s\n", i, ip_lookup[i].iface, ip_lookup[i].ip_addr);
         }
     }
 }
@@ -298,6 +300,8 @@ static char* get_ip_cache(const char* iface)
         if (strncmp(ip_lookup[i].iface, iface, 100) == 0) {
             printf("DEBUG: returning %s -> %s\n", iface, ip_lookup[i].ip_addr);
             return ip_lookup[i].ip_addr;
+        } else {
+            printf("DEBUG: mismatch in slot %i: %s -> %s\n", i, ip_lookup[i].iface, ip_lookup[i].ip_addr);
         }
     }
     return NULL;
@@ -1277,6 +1281,10 @@ static int32_t md_nne_init(void *ptr, json_object* config)
     LIST_INIT(&(mwn->modem_list));
     mwn->timeout_tstamp = 0;
 
+    for (int i=0; i<16; i++) {
+        ip_lookup[i].ip_addr[0] = '\0';
+    }
+
     json_object* subconfig;
     if (json_object_object_get_ex(config, "nne", &subconfig)) {
         json_object_object_foreach(subconfig, key, val) {
@@ -1394,10 +1402,6 @@ void md_nne_setup(struct md_exporter *mde, struct md_writer_nne* mwn)
     mwn->parent = mde;
     mwn->init = md_nne_init;
     mwn->handle = md_nne_handle;
-
-    for (int i=0; i<16; i++) {
-        ip_lookup[i].ip_addr[0] = '\0';
-    }
 }
 
 

From e13f9b5dd00ca5d1f1e42389142bf0dda29057ab Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 13 Sep 2023 08:56:45 +0200
Subject: [PATCH 38/41] trigger on connectivity, not has_ip

---
 src/metadata_writer_nne.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index 7b3baf3..b15e584 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -832,7 +832,7 @@ static void md_nne_handle_conn_event(struct md_writer_nne *mwn,
                       mce->interface_id,
                       mce->network_address);
         insert_ip_cache(mce->interface_id, mce->network_address);
-    } else if (!mce->has_ip) {
+    } else if (!mce->connectivity) {
         delete_ip_cache(mce->interface_id);        
     }
 }   

From 51ceb7876c965911027d04368e349605917e6c15 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 13 Sep 2023 08:59:12 +0200
Subject: [PATCH 39/41] trigger on connectivity, not has_ip

---
 src/metadata_writer_nne.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index b15e584..97525de 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -825,14 +825,14 @@ static uint32_t md_find_network_id(uint32_t imsi_mccmnc, const char *iccid, cons
 static void md_nne_handle_conn_event(struct md_writer_nne *mwn,
                                      struct md_conn_event *mce) {
     //only parse ifname and ip_addr, attention: interface_id is still iccid
-    if ((mce->interface_id) && (mce->has_ip)) {
+    if ((mce->interface_id) && (mce->connectivity)) {
         META_PRINT_SYSLOG(mwn->parent, LOG_INFO, "NNE writer: inserting from CONN_EVENT: "
                       "ifname=%s, "
                       "ip_addr=%s\n",
                       mce->interface_id,
                       mce->network_address);
         insert_ip_cache(mce->interface_id, mce->network_address);
-    } else if (!mce->connectivity) {
+    } else if ((mce->interface_id) && (!mce->connectivity)) {
         delete_ip_cache(mce->interface_id);        
     }
 }   

From 7fa9ebca53c1f4102a605d8cf62fa6c2f251befe Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 13 Sep 2023 09:05:20 +0200
Subject: [PATCH 40/41] trigger on event_type and has_ip

---
 src/metadata_writer_nne.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index 97525de..a09aae3 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -824,15 +824,18 @@ static uint32_t md_find_network_id(uint32_t imsi_mccmnc, const char *iccid, cons
 
 static void md_nne_handle_conn_event(struct md_writer_nne *mwn,
                                      struct md_conn_event *mce) {
+    if (mce->event_param != CONN_EVENT_META_UPDATE) {
+        return;
+    }
     //only parse ifname and ip_addr, attention: interface_id is still iccid
-    if ((mce->interface_id) && (mce->connectivity)) {
+    if ((mce->interface_id) && (mce->has_ip)) {
         META_PRINT_SYSLOG(mwn->parent, LOG_INFO, "NNE writer: inserting from CONN_EVENT: "
                       "ifname=%s, "
                       "ip_addr=%s\n",
                       mce->interface_id,
                       mce->network_address);
         insert_ip_cache(mce->interface_id, mce->network_address);
-    } else if ((mce->interface_id) && (!mce->connectivity)) {
+    } else if ((mce->interface_id) && (!mce->has_ip)) {
         delete_ip_cache(mce->interface_id);        
     }
 }   

From ad58ae7f7363daab5c072bc7be6d3d86fa076de2 Mon Sep 17 00:00:00 2001
From: Thomas Hirsch <thomas.hirsch@celerway.com>
Date: Wed, 13 Sep 2023 09:14:24 +0200
Subject: [PATCH 41/41] remove extra debugging

---
 src/metadata_input_ubus.c |  3 ---
 src/metadata_writer_nne.c | 13 -------------
 2 files changed, 16 deletions(-)

diff --git a/src/metadata_input_ubus.c b/src/metadata_input_ubus.c
index ce5813a..7cb4bab 100644
--- a/src/metadata_input_ubus.c
+++ b/src/metadata_input_ubus.c
@@ -268,11 +268,8 @@ static int md_input_ubus_dlb_subscriber_cb(struct ubus_context *ctx, struct ubus
         return UBUS_STATUS_OK;
     }
 
-    META_PRINT_SYSLOG(miu->parent, LOG_INFO, "Handling: %s\n", method);
-
     event_type = blobmsg_get_u8(tb[EVENT_TYPE]);
     if (!(event_type & miu->md_ubus_mask)) {
-        META_PRINT_SYSLOG(miu->parent, LOG_INFO, "Mask mismatch: %s\n", method);
         return UBUS_STATUS_OK;
     }
 
diff --git a/src/metadata_writer_nne.c b/src/metadata_writer_nne.c
index a09aae3..6cf2247 100644
--- a/src/metadata_writer_nne.c
+++ b/src/metadata_writer_nne.c
@@ -284,12 +284,9 @@ static void insert_ip_cache(const char* iface, const char* ip_addr)
     int i;
     for (i = 0; i < 16; i++) {
         if ((ip_lookup[i].iface[0] == '\0') || (strncmp(ip_lookup[i].iface, iface, 100) == 0)) {
-            printf("DEBUG from CONN: inserting  %s -> %s into slot %i\n", iface, ip_addr, i);
             strncpy(ip_lookup[i].iface, iface, 100);
             strncpy(ip_lookup[i].ip_addr, ip_addr, 100);
             break;
-        } else {
-            printf("DEBUG from CONN: mismatch in slot %i: %s -> %s\n", i, ip_lookup[i].iface, ip_lookup[i].ip_addr);
         }
     }
 }
@@ -298,10 +295,7 @@ static char* get_ip_cache(const char* iface)
     int i;
     for (i = 0; i < 16; i++) {
         if (strncmp(ip_lookup[i].iface, iface, 100) == 0) {
-            printf("DEBUG: returning %s -> %s\n", iface, ip_lookup[i].ip_addr);
             return ip_lookup[i].ip_addr;
-        } else {
-            printf("DEBUG: mismatch in slot %i: %s -> %s\n", i, ip_lookup[i].iface, ip_lookup[i].ip_addr);
         }
     }
     return NULL;
@@ -311,7 +305,6 @@ static void delete_ip_cache(const char* iface)
     int i;
     for (i = 0; i < 16; i++) {
         if (strncmp(ip_lookup[i].iface, iface, 100) == 0) {
-            printf("DEBUG: deleting %s -> %s\n", iface, ip_lookup[i].ip_addr);
             ip_lookup[i].iface[0] = '\0';
             ip_lookup[i].ip_addr[0] = '\0';
             break;
@@ -861,12 +854,6 @@ static void md_nne_handle_iface_event(struct md_writer_nne *mwn,
     };
 
     char *ip_addr = get_ip_cache(mie->iccid);
-    META_PRINT_SYSLOG(mwn->parent, LOG_INFO, "NNE writer: got from from CONN_EVENT: "
-                      "ifname=%s, "
-                      "ip_addr=%s\n",
-                        mie->iccid,
-                        ip_addr);
-
 
     META_PRINT_SYSLOG(mwn->parent, LOG_ERR, "NNE writer: %s: "
                       "ip_addr=%s, "