Add github actions CI.

.github/workflows/ccpp.yml

@@ -1,6 +1,6 @@
 name: C/C++ CI
 
-on: [push, pull_request]
+on: [push]
 
 jobs:
   build:
@@ -25,7 +25,5 @@ jobs:
       run: make -j8
     - name: check
       run: make check
-    - name: valgrind memcheck
-      run: make check-valgrind
     - name: make distcheck
       run: make distcheck

.gitignore

@@ -35,11 +35,11 @@ build-aux/m4/ltversion.m4
 /tags
 telemprobd
 telempostd
-telemctl
 autoscan.log
 configure.scan
 tprobe
 hprobe
+bertprobe
 crashprobe
 journalprobe
 telem-record-gen
@@ -57,6 +57,7 @@ tests/check_config
 tests/check_daemon
 tests/check_journal
 tests/check_libtelemetry
+tests/check_ncb64
 tests/check_postd
 tests/check_probd
 tests/check_probes

.travis.yml

@@ -0,0 +1,35 @@
+dist: trusty
+
+compiler:
+    - gcc
+
+os:
+    - linux
+
+before_script:
+    ./autogen.sh
+
+language: c
+
+addons:
+    apt:
+        sources:
+            - ubuntu-toolchain-r-test
+        packages:
+            - libcurl4-gnutls-dev
+            - valgrind
+            - autoconf 
+            - automake
+            - check
+            - libelf-dev
+            - libdw-dev
+
+install:
+        - wget https://github.com/libcheck/check/releases/download/0.12.0/check-0.12.0.tar.gz
+        - tar -xvf check-0.12.0.tar.gz
+        - pushd check-0.12.0 && ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu && make -j48 && sudo make install && popd
+
+script:
+    - ./configure && make && make check
+
+after_failure: cat test-suite.log

README.md

@@ -1,4 +1,4 @@
-![](https://github.com/clearlinux/telemetrics-client/workflows/C%2FC++%20CI/badge.svg)
+[![Build Status](https://travis-ci.org/clearlinux/telemetrics-client.svg?branch=master)](https://travis-ci.org/clearlinux/telemetrics-client)
 
 Telemetrics-client
 ==================

build-aux/m4/ax_valgrind_check.m4

@@ -1,239 +0,0 @@
-# ===========================================================================
-#    https://www.gnu.org/software/autoconf-archive/ax_valgrind_check.html
-# ===========================================================================
-#
-# SYNOPSIS
-#
-#   AX_VALGRIND_DFLT(memcheck|helgrind|drd|sgcheck, on|off)
-#   AX_VALGRIND_CHECK()
-#
-# DESCRIPTION
-#
-#   AX_VALGRIND_CHECK checks whether Valgrind is present and, if so, allows
-#   running `make check` under a variety of Valgrind tools to check for
-#   memory and threading errors.
-#
-#   Defines VALGRIND_CHECK_RULES which should be substituted in your
-#   Makefile; and $enable_valgrind which can be used in subsequent configure
-#   output. VALGRIND_ENABLED is defined and substituted, and corresponds to
-#   the value of the --enable-valgrind option, which defaults to being
-#   enabled if Valgrind is installed and disabled otherwise. Individual
-#   Valgrind tools can be disabled via --disable-valgrind-<tool>, the
-#   default is configurable via the AX_VALGRIND_DFLT command or is to use
-#   all commands not disabled via AX_VALGRIND_DFLT. All AX_VALGRIND_DFLT
-#   calls must be made before the call to AX_VALGRIND_CHECK.
-#
-#   If unit tests are written using a shell script and automake's
-#   LOG_COMPILER system, the $(VALGRIND) variable can be used within the
-#   shell scripts to enable Valgrind, as described here:
-#
-#     https://www.gnu.org/software/gnulib/manual/html_node/Running-self_002dtests-under-valgrind.html
-#
-#   Usage example:
-#
-#   configure.ac:
-#
-#     AX_VALGRIND_DFLT([sgcheck], [off])
-#     AX_VALGRIND_CHECK
-#
-#   in each Makefile.am with tests:
-#
-#     @VALGRIND_CHECK_RULES@
-#     VALGRIND_SUPPRESSIONS_FILES = my-project.supp
-#     EXTRA_DIST = my-project.supp
-#
-#   This results in a "check-valgrind" rule being added. Running `make
-#   check-valgrind` in that directory will recursively run the module's test
-#   suite (`make check`) once for each of the available Valgrind tools (out
-#   of memcheck, helgrind and drd) while the sgcheck will be skipped unless
-#   enabled again on the commandline with --enable-valgrind-sgcheck. The
-#   results for each check will be output to test-suite-$toolname.log. The
-#   target will succeed if there are zero errors and fail otherwise.
-#
-#   Alternatively, a "check-valgrind-$TOOL" rule will be added, for $TOOL in
-#   memcheck, helgrind, drd and sgcheck. These are useful because often only
-#   some of those tools can be ran cleanly on a codebase.
-#
-#   The macro supports running with and without libtool.
-#
-# LICENSE
-#
-#   Copyright (c) 2014, 2015, 2016 Philip Withnall <philip.withnall@collabora.co.uk>
-#
-#   Copying and distribution of this file, with or without modification, are
-#   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.  This file is offered as-is, without any
-#   warranty.
-
-#serial 17
-
-dnl Configured tools
-m4_define([valgrind_tool_list], [[memcheck], [helgrind], [drd], [sgcheck]])
-m4_set_add_all([valgrind_exp_tool_set], [sgcheck])
-m4_foreach([vgtool], [valgrind_tool_list],
-           [m4_define([en_dflt_valgrind_]vgtool, [on])])
-
-AC_DEFUN([AX_VALGRIND_DFLT],[
-	m4_define([en_dflt_valgrind_$1], [$2])
-])dnl
-
-AM_EXTRA_RECURSIVE_TARGETS([check-valgrind])
-m4_foreach([vgtool], [valgrind_tool_list],
-	[AM_EXTRA_RECURSIVE_TARGETS([check-valgrind-]vgtool)])
-
-AC_DEFUN([AX_VALGRIND_CHECK],[
-	dnl Check for --enable-valgrind
-	AC_ARG_ENABLE([valgrind],
-	              [AS_HELP_STRING([--enable-valgrind], [Whether to enable Valgrind on the unit tests])],
-	              [enable_valgrind=$enableval],[enable_valgrind=])
-
-	AS_IF([test "$enable_valgrind" != "no"],[
-		# Check for Valgrind.
-		AC_CHECK_PROG([VALGRIND],[valgrind],[valgrind])
-		AS_IF([test "$VALGRIND" = ""],[
-			AS_IF([test "$enable_valgrind" = "yes"],[
-				AC_MSG_ERROR([Could not find valgrind; either install it or reconfigure with --disable-valgrind])
-			],[
-				enable_valgrind=no
-			])
-		],[
-			enable_valgrind=yes
-		])
-	])
-
-	AM_CONDITIONAL([VALGRIND_ENABLED],[test "$enable_valgrind" = "yes"])
-	AC_SUBST([VALGRIND_ENABLED],[$enable_valgrind])
-
-	# Check for Valgrind tools we care about.
-	[valgrind_enabled_tools=]
-	m4_foreach([vgtool],[valgrind_tool_list],[
-		AC_ARG_ENABLE([valgrind-]vgtool,
-		    m4_if(m4_defn([en_dflt_valgrind_]vgtool),[off],dnl
-[AS_HELP_STRING([--enable-valgrind-]vgtool, [Whether to use ]vgtool[ during the Valgrind tests])],dnl
-[AS_HELP_STRING([--disable-valgrind-]vgtool, [Whether to skip ]vgtool[ during the Valgrind tests])]),
-		              [enable_valgrind_]vgtool[=$enableval],
-		              [enable_valgrind_]vgtool[=])
-		AS_IF([test "$enable_valgrind" = "no"],[
-			enable_valgrind_]vgtool[=no],
-		      [test "$enable_valgrind_]vgtool[" ]dnl
-m4_if(m4_defn([en_dflt_valgrind_]vgtool), [off], [= "yes"], [!= "no"]),[
-			AC_CACHE_CHECK([for Valgrind tool ]vgtool,
-			               [ax_cv_valgrind_tool_]vgtool,[
-				ax_cv_valgrind_tool_]vgtool[=no
-				m4_set_contains([valgrind_exp_tool_set],vgtool,
-				    [m4_define([vgtoolx],[exp-]vgtool)],
-				    [m4_define([vgtoolx],vgtool)])
-				AS_IF([`$VALGRIND --tool=]vgtoolx[ --help >/dev/null 2>&1`],[
-					ax_cv_valgrind_tool_]vgtool[=yes
-				])
-			])
-			AS_IF([test "$ax_cv_valgrind_tool_]vgtool[" = "no"],[
-				AS_IF([test "$enable_valgrind_]vgtool[" = "yes"],[
-					AC_MSG_ERROR([Valgrind does not support ]vgtool[; reconfigure with --disable-valgrind-]vgtool)
-				],[
-					enable_valgrind_]vgtool[=no
-				])
-			],[
-				enable_valgrind_]vgtool[=yes
-			])
-		])
-		AS_IF([test "$enable_valgrind_]vgtool[" = "yes"],[
-			valgrind_enabled_tools="$valgrind_enabled_tools ]m4_bpatsubst(vgtool,[^exp-])["
-		])
-		AC_SUBST([ENABLE_VALGRIND_]vgtool,[$enable_valgrind_]vgtool)
-	])
-	AC_SUBST([valgrind_tools],["]m4_join([ ], valgrind_tool_list)["])
-	AC_SUBST([valgrind_enabled_tools],[$valgrind_enabled_tools])
-
-[VALGRIND_CHECK_RULES='
-# Valgrind check
-#
-# Optional:
-#  - VALGRIND_SUPPRESSIONS_FILES: Space-separated list of Valgrind suppressions
-#    files to load. (Default: empty)
-#  - VALGRIND_FLAGS: General flags to pass to all Valgrind tools.
-#    (Default: --num-callers=30)
-#  - VALGRIND_$toolname_FLAGS: Flags to pass to Valgrind $toolname (one of:
-#    memcheck, helgrind, drd, sgcheck). (Default: various)
-
-# Optional variables
-VALGRIND_SUPPRESSIONS ?= $(addprefix --suppressions=,$(VALGRIND_SUPPRESSIONS_FILES))
-VALGRIND_FLAGS ?= --num-callers=30
-VALGRIND_memcheck_FLAGS ?= --leak-check=full --show-reachable=no
-VALGRIND_helgrind_FLAGS ?= --history-level=approx
-VALGRIND_drd_FLAGS ?=
-VALGRIND_sgcheck_FLAGS ?=
-
-# Internal use
-valgrind_log_files = $(addprefix test-suite-,$(addsuffix .log,$(valgrind_tools)))
-
-valgrind_memcheck_flags = --tool=memcheck $(VALGRIND_memcheck_FLAGS)
-valgrind_helgrind_flags = --tool=helgrind $(VALGRIND_helgrind_FLAGS)
-valgrind_drd_flags = --tool=drd $(VALGRIND_drd_FLAGS)
-valgrind_sgcheck_flags = --tool=exp-sgcheck $(VALGRIND_sgcheck_FLAGS)
-
-valgrind_quiet = $(valgrind_quiet_$(V))
-valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY))
-valgrind_quiet_0 = --quiet
-valgrind_v_use   = $(valgrind_v_use_$(V))
-valgrind_v_use_  = $(valgrind_v_use_$(AM_DEFAULT_VERBOSITY))
-valgrind_v_use_0 = @echo "  USE   " $(patsubst check-valgrind-%-am,%,$''@):;
-
-# Support running with and without libtool.
-ifneq ($(LIBTOOL),)
-valgrind_lt = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=execute
-else
-valgrind_lt =
-endif
-
-# Use recursive makes in order to ignore errors during check
-check-valgrind-am:
-ifeq ($(VALGRIND_ENABLED),yes)
-	$(A''M_V_at)$(MAKE) $(AM_MAKEFLAGS) -k \
-		$(foreach tool, $(valgrind_enabled_tools), check-valgrind-$(tool))
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-
-# Valgrind running
-VALGRIND_TESTS_ENVIRONMENT = \
-	$(TESTS_ENVIRONMENT) \
-	env VALGRIND=$(VALGRIND) \
-	G_SLICE=always-malloc,debug-blocks \
-	G_DEBUG=fatal-warnings,fatal-criticals,gc-friendly
-
-VALGRIND_LOG_COMPILER = \
-	$(valgrind_lt) \
-	$(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS)
-
-define valgrind_tool_rule
-check-valgrind-$(1)-am:
-ifeq ($$(VALGRIND_ENABLED)-$$(ENABLE_VALGRIND_$(1)),yes-yes)
-ifneq ($$(TESTS),)
-	$$(valgrind_v_use)$$(MAKE) check-TESTS \
-		TESTS_ENVIRONMENT="$$(VALGRIND_TESTS_ENVIRONMENT)" \
-		LOG_COMPILER="$$(VALGRIND_LOG_COMPILER)" \
-		LOG_FLAGS="$$(valgrind_$(1)_flags)" \
-		TEST_SUITE_LOG=test-suite-$(1).log
-endif
-else ifeq ($$(VALGRIND_ENABLED),yes)
-	@echo "Need to reconfigure with --enable-valgrind-$(1)"
-else
-	@echo "Need to reconfigure with --enable-valgrind"
-endif
-endef
-
-$(foreach tool,$(valgrind_tools),$(eval $(call valgrind_tool_rule,$(tool))))
-
-A''M_DISTCHECK_CONFIGURE_FLAGS ?=
-A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind
-
-MOSTLYCLEANFILES ?=
-MOSTLYCLEANFILES += $(valgrind_log_files)
-
-.PHONY: check-valgrind $(add-prefix check-valgrind-,$(valgrind_tools))
-']
-
-	AC_SUBST([VALGRIND_CHECK_RULES])
-	m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([VALGRIND_CHECK_RULES])])
-])

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.69])
-AC_INIT([telemetrics-client], [2.4.0], [https://clearlinux.org/])
+AC_INIT([telemetrics-client], [2.2.3], [https://clearlinux.org/])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.14 -Wall -Werror -Wno-extra-portability foreign subdir-objects])
 AM_SILENT_RULES([yes])
@@ -20,20 +20,11 @@ AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
-# Valgrind check
-AX_VALGRIND_DFLT(memcheck, on)
-AX_VALGRIND_DFLT(helgrind, off)
-AX_VALGRIND_DFLT(drd, off)
-AX_VALGRIND_DFLT(sgcheck, off)
-
-AX_VALGRIND_CHECK
-
 # Checks for libraries.
 
 # check >= 0.9.12 is required for TAP output
 PKG_CHECK_MODULES([CHECK], [check >= 0.12])
 PKG_CHECK_MODULES([CURL], [libcurl])
-PKG_CHECK_MODULES([JSON_C], [json-c])
 AC_CHECK_LIB([elf], [elf_begin], [have_elflib=yes], [AC_MSG_ERROR([Unable to find libelf from elfutils])])
 AC_CHECK_LIB([dw], [dwfl_begin], [have_dwlib=yes], [AC_MSG_ERROR([Unable to find libdw from elfutils])])
 AS_IF([test "x$have_elflib" = "xyes" -a "x$have_dwlib" = "xyes"],
@@ -50,7 +41,6 @@ AC_CHECK_HEADERS([elfutils/libdwfl.h])
 AC_CHECK_HEADERS([fcntl.h])
 AC_CHECK_HEADERS([getopt.h])
 AC_CHECK_HEADERS([inttypes.h])
-AC_CHECK_HEADERS([json-c/json.h])
 AC_CHECK_HEADERS([libelf.h])
 AC_CHECK_HEADERS([limits.h])
 AC_CHECK_HEADERS([stdarg.h])
@@ -130,8 +120,8 @@ AC_ARG_WITH([loglevel], AS_HELP_STRING([--with-loglevel=NUM],
 AC_DEFINE_UNQUOTED([MAX_LOG_LEVEL], [${loglevel}], [Maximum log level for binaries])
 
 AC_ARG_WITH([backendserveraddr], AS_HELP_STRING([--with-backendserveraddr=URI],
-	    [uri to telemetrics backend server @<:@default=https://clr.telemetry.intel.com/v3/collector@:>@]), [backendaddr=${withval}])
-test -z "${backendaddr}" && backendaddr=https://clr.telemetry.intel.com/v3/collector
+	    [uri to telemetrics backend server @<:@default=https://clr.telemetry.intel.com/v2/collector@:>@]), [backendaddr=${withval}])
+test -z "${backendaddr}" && backendaddr=https://clr.telemetry.intel.com/v2/collector
 AC_SUBST(BACKEND_ADDR, [${backendaddr}])
 
 AC_ARG_ENABLE([logtype], AS_HELP_STRING([--enable-logtype],
@@ -181,6 +171,4 @@ systemconfdir:          $confpath
 socketdir:              $socketpath
 loglevel:               $loglevel
 logtype:                $logtype
-
-valgrind:               $enable_valgrind
 ])

src/configuration.c

@@ -152,18 +152,6 @@ bool set_default_config_values(struct configuration *config)
         return true;
 }
 
-/* Needed for unit testing */
-void free_config_struct(struct configuration *config)
-{
-        if (keyfile != NULL) {
-                nc_hashmap_free(keyfile);
-        }
-
-        for (int i = 0; i < CONF_STR_MAX; i++) {
-                free(config->strValues[i]);
-        }
-}
-
 bool read_config_from_file(char *config_file, struct configuration *config)
 {
         if (keyfile != NULL) {
@@ -287,14 +275,6 @@ void free_configuration(void)
         }
 }
 
-/* Needed for unit testing */
-void free_config_file(void)
-{
-        if (config_file) {
-                free(config_file);
-        }
-}
-
 const char *server_addr_config()
 {
         initialize_config();

src/data/bert-probe.service.in

@@ -0,0 +1,13 @@
+[Unit]
+Description=Telemetrics BERT Probe
+Requires=telemprobd.socket
+After=telemprobd.socket
+ConditionPathExists=/etc/telemetrics/opt-in
+ConditionPathExists=/sys/firmware/acpi/tables/data/BERT
+
+[Service]
+ExecStart=@bindir@/bertprobe
+User=telemetry
+
+[Install]
+WantedBy=multi-user.target

src/data/hprobe.timer

@@ -5,7 +5,6 @@ ConditionPathExists=/etc/telemetrics/opt-in
 [Timer]
 OnCalendar=daily
 AccuracySec=12h
-RandomizedDelaySec=21600
 Persistent=true
 
 [Install]

src/data/klogscanner.service.in

@@ -1,6 +1,5 @@
 [Unit]
 Description=Telemetrics Kernel Log Scanner
-ConditionVirtualization=!container
 Requires=telemprobd.socket
 After=telemprobd.socket
 

src/data/local.mk

@@ -16,6 +16,7 @@ EXTRA_DIST += \
 	%D%/example.2.conf \
 	%D%/hprobe.service.in \
 	%D%/hprobe.timer \
+	%D%/bert-probe.service.in \
 	%D%/journal-probe.service.in \
 	%D%/journal-probe-tail.service.in \
 	%D%/pstore-probe.service.in \
@@ -52,6 +53,7 @@ systemdunitdir = @SYSTEMD_UNITDIR@
 systemdunit_DATA = \
 	%D%/hprobe.service \
 	%D%/hprobe.timer \
+	%D%/bert-probe.service \
 	%D%/journal-probe.service \
 	%D%/journal-probe-tail.service \
 	%D%/pstore-probe.service \
@@ -66,6 +68,9 @@ systemdunit_DATA = \
 %D%/hprobe.service: %D%/hprobe.service.in
 	$(pathfix) < $< > $@
 
+%D%/bert-probe.service: %D%/bert-probe.service.in
+	$(pathfix) < $< > $@
+
 %D%/journal-probe.service: %D%/journal-probe.service.in
 	$(pathfix) < $< > $@
 
@@ -121,4 +126,5 @@ clean-local:
 		%D%/klogscanner.service \
 		%D%/pstore-clean.service \
 		%D%/hprobe.service \
+		%D%/bert-probe.service \
 		%D%/.dirstamp

src/local.mk

@@ -61,7 +61,7 @@ endif
 	%D%/iorecord.c \
 	%D%/iorecord.h
 
-%C%_telempostd_LDADD = $(CURL_LIBS) $(JSON_C_LIBS) \
+%C%_telempostd_LDADD = $(CURL_LIBS) \
 	%D%/libtelem-shared.la \
 	%D%/libtelemetry.la
 
@@ -101,6 +101,7 @@ noinst_LTLIBRARIES = %D%/libtelem-shared.la
 	%D%/configuration.c \
 	%D%/nica/inifile.c \
 	%D%/nica/hashmap.c \
+	%D%/nica/b64enc.c \
 	%D%/configuration.h \
 	%D%/common.c \
 	%D%/common.h

src/nica/b64enc.c

@@ -0,0 +1,154 @@
+/*
+ * This file is part of libnica.
+ *
+ * Copyright © 2017 Intel Corporation
+ *
+ * libnica is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ */
+
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <stdint.h>
+#include "b64enc.h"
+
+#define B64_LINE_LEN 76
+
+static int padding[] = {0, 2, 1, 0};
+static char table[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+
+/*
+ * base 64 encoding of 3 bytes to 4 printable characters
+ * (https://tools.ietf.org/html/rfc4648).
+ *
+ * i.e. (Reference: https://en.wikipedia.org/wiki/Base64)
+ *
+ *      [   M  ] [   a  ] [  n  ]
+ * bin  01001101 01100001 01101110
+ *
+ * b64  01001101 01100001 01101110  >> 18 & 0x3F -> 010011 -> ( 19 dec) T
+ *      ------
+ *
+ * b64  01001101 01100001 01101110  >> 12 & 0x3F -> 010110 -> ( 22 dec) W
+ *            -------
+ *
+ * b64  01001101 01100001 01101110  >>  6 & 0x3F -> 000101 -> (  5 dec) F
+ *                   -------
+ *
+ * b64  01001101 01100001 01101110  >>  0 & 0x3F -> 101110 -> (117 dec) u
+ *                          ------
+ *
+ */
+static void b64_3b(char bin[3], char *out) {
+
+    uint32_t x = (((uint32_t) bin[0] << 16) & 0xFF0000) |
+                 (((uint32_t) bin[1] <<  8) & 0xFF00)   |
+                 (((uint32_t) bin[2])       & 0xFF);
+
+    out[3] = table[x       & 0x3F];
+    out[2] = table[x >> 6  & 0x3F];
+    out[1] = table[x >> 12 & 0x3F];
+    out[0] = table[x >> 18 & 0x3F];
+
+}
+
+
+/*
+ * Provide padding to already initialized b64 output
+ */
+static void b64_padding(char *out, int pad_size) {
+
+    if (pad_size > 0) {
+        *out++ = '=';
+    }
+
+    if (pad_size > 1) {
+        *out++ = '=';
+    }
+
+    *out = '\0';
+}
+
+
+/*
+ * Encode file contents as b64 string
+ */
+int nc_b64enc_file(FILE *fh, char *buff, size_t buff_size) {
+
+    int ret_val = 1;
+    int out_count = 0;
+    int pad_size = 0;
+    char *buff_ptr = buff;
+    char bin[3] = {0, 0, 0};
+    size_t len = 0;
+
+    while ((len = fread(bin, 1, 3, fh)) > 0) {
+        b64_3b(bin, buff_ptr);
+        /*
+         Reset 2nd and 3rd bytes in case only one byte was read. If these
+         bytes are not clean b64 output will be corrupted with old bits.
+         */
+        bin[1] = bin[2] = 0;
+        /*
+         Advance pointer to the next free position of the b64 encoded
+         buffer. This happens to be len + 1 (as longs as len >= 1 and len <= 3)
+
+            len = 1 byte  -> b64 -> 2 bytes (or len + 1)
+            len = 2 bytes -> b64 -> 3 bytes (or len + 1)
+            len = 3 bytes -> b64 -> 4 bytes (or len + 1)
+        */
+        buff_ptr += (len + 1);
+        /*
+         Line break every 76 characters
+        */
+        out_count += (int) (len + 1);
+        if (out_count % B64_LINE_LEN == 0) {
+            *buff_ptr++ = '\n';
+        }
+        pad_size = padding[len];
+        /*
+         Check not to overflow buffer
+
+            buffer size <= b64 characters + padding length + null termination
+        */
+        if (buff_size <= (size_t) (buff_ptr - buff) + (size_t) pad_size + 1) {
+           ret_val = 0;
+           goto end_b64_enc;
+        }
+    }
+
+    b64_padding(buff_ptr, pad_size);
+
+end_b64_enc:
+
+    return ret_val;
+}
+
+
+int nc_b64enc_filename(const char *filename, char *buff, size_t buff_size) {
+
+    int ret = 0;
+    FILE *fh = NULL;
+
+    fh = fopen(filename, "rb");
+
+    if (fh == NULL) {
+        goto nc_b64_clean;
+    }
+
+    ret = nc_b64enc_file(fh, buff, buff_size);
+
+nc_b64_clean:
+
+    if (fh) {
+        fclose(fh);
+    }
+
+    return ret;
+}
+
+/* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

src/nica/b64enc.h

@@ -0,0 +1,42 @@
+/*
+ * This file is part of libnica.
+ *
+ * Copyright © 2017 Intel Corporation
+ *
+ * libnica is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1
+ * of the License, or (at your option) any later version.
+ *
+ * This is a chained base64 encode implementation.
+ */
+
+#pragma once
+
+#define _GNU_SOURCE
+
+#include "macros.h"
+
+/*
+ * Encodes contents of file handler in base64
+ *
+ * @param fh File handler to encode as base64
+ * @param buff Output buffer where the base64 output should be written
+ * @param buff_size Size of the output buffer
+ *
+ * @returns 1 in success and 0 in failure
+ */
+_nica_public_ int nc_b64enc_file(FILE *fh, char *buff, size_t buff_size);
+
+
+/*
+ * Encodes contents of file (filename) in base64
+ *
+ * @param filename File to encode as base64
+ * @param buff Output buffer where the base64 output should be written
+ * @param buff_size Size of the output buffer
+ *
+ * @returns 1 in success and 0 in failure
+ */
+_nica_public_ int nc_b64enc_filename(const char *filename, char *buff, size_t buff_size);
+

src/probes/README.md

@@ -2,6 +2,9 @@
 
 The default probes provided along the telemetry client code are:
 
+* bertprobe: this probe reports on the Boot Error Region Table if such
+  entry is found in ```/sys/firmware/acpi/tables/BERT```.
+
 * crashprobe: This probe processes core dump files. It can be registered as
   the kernel core file handler in /proc/sys/kernel/core_pattern.
 
@@ -12,7 +15,7 @@ The default probes provided along the telemetry client code are:
   from failed services.
 
 * klogscanner: a probe to collect 'oops messages' when the kernel detects a
-  problem. Also reports errors in the Boot Error Region Table if detected.
+  problem.
 
 * pstoreprobe: probe to collect messages left on pstore filesystem.
 

src/probes/bert_probe.c

@@ -0,0 +1,117 @@
+/*
+ * This program is part of the Clear Linux Project
+ *
+ * Copyright 2018 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms and conditions of the GNU Lesser General Public License, as
+ * published by the Free Software Foundation; either version 2.1 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+#define _GNU_SOURCE
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <getopt.h>
+#include "common.h"
+#include "telemetry.h"
+#include "nica/b64enc.h"
+
+#include "config.h"
+#include "log.h"
+
+static const char bert_record_file[] = "/sys/firmware/acpi/tables/data/BERT";
+static const char telem_record_class[] = "org.clearlinux/bert/debug";
+static uint32_t severity = 2;
+static uint32_t payload_version = 1;
+
+void print_usage(char *prog)
+{
+        printf("%s: Usage\n", prog);
+        printf("  -f,  --config_file    Specify a configuration file other than default\n");
+        printf("  -h,  --help           Display this help message\n");
+        printf("  -V,  --version        Print the program version\n");
+}
+
+int main(int argc, char **argv)
+{
+        struct telem_ref *tm_handle = NULL;
+        char *classification = (char *)telem_record_class;
+        char *payload;
+        int ret;
+
+        // Following vars are for arg parsing.
+        int c;
+        int opt_index = 0;
+        struct option opts[] = {
+                { "config_file", 1, NULL, 'f' },
+                { "help", 0, NULL, 'h' },
+                { "version", 0, NULL, 'V' },
+                { NULL, 0, NULL, 0 }
+        };
+
+        while ((c = getopt_long(argc, argv, "f:hV", opts, &opt_index)) != -1) {
+                switch (c) {
+                        case 'f':
+                                if (tm_set_config_file(optarg) != 0) {
+                                    telem_log(LOG_ERR, "Configuration file"
+                                                  " path not valid\n");
+                                    exit(EXIT_FAILURE);
+                                }
+                                break;
+                        case 'h':
+                                print_usage(argv[0]);
+                                exit(EXIT_SUCCESS);
+                        case 'V':
+                                printf(PACKAGE_VERSION "\n");
+                                exit(EXIT_SUCCESS);
+                        case '?':
+                                exit(EXIT_FAILURE);
+                }
+        }
+
+        payload = calloc(sizeof(char), MAX_PAYLOAD_LENGTH);
+        if (!payload) {
+                printf("Unable to allocate more memory.\n");
+                return -ENOMEM;
+        }
+
+        if (!(ret = nc_b64enc_filename(bert_record_file, payload, MAX_PAYLOAD_LENGTH))) {
+                printf("Failed to read payload from: %s\n", bert_record_file);
+                ret = EXIT_FAILURE;
+                goto done;
+        }
+
+        if ((ret = tm_create_record(&tm_handle, severity, classification,
+                                    payload_version)) < 0) {
+                printf("Failed to create record: %s\n", strerror(-ret));
+                goto done;
+        }
+
+        if ((ret = tm_set_payload(tm_handle, payload)) < 0) {
+                printf("Failed to set record payload: %s\n", strerror(-ret));
+                goto done;
+        }
+
+        if ((ret = tm_send_record(tm_handle)) < 0) {
+                printf("Failed to send record to daemon: %s\n", strerror(-ret));
+                goto done;
+        }
+
+        ret = EXIT_SUCCESS;
+done:
+        free(payload);
+        tm_free_record(tm_handle);
+        tm_handle = NULL;
+
+        return ret;
+}
+
+/* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

src/probes/crash_probe.c

@@ -396,7 +396,6 @@ static int process_corefile(nc_string **backtrace)
                 nc_string_free(*backtrace);
         }
         *backtrace = nc_string_dup("");
-        frame_counter = 0;
 
         if (dwfl_getthreads(d_core, thread_cb, backtrace) != DWARF_CB_OK) {
                 /* We aborted unwinding, due to too many frames.

src/probes/klog_scanner.c

@@ -23,7 +23,6 @@
 #include <unistd.h>
 #include <sys/stat.h>
 
-#include "common.h"
 #include "log.h"
 #include "oops_parser.h"
 #include "klog_scanner.h"
@@ -45,11 +44,6 @@ static bool send_data(char *backtrace, char *class, uint32_t severity)
                 return false;
         }
 
-        /* Truncate payload if necessary, otherwise nothing will be sent */
-        if (strlen(backtrace) > MAX_PAYLOAD_LENGTH) {
-                backtrace[MAX_PAYLOAD_LENGTH-1] = 0;
-        }
-
         if ((ret = tm_set_payload(handle, backtrace)) < 0) {
                 telem_log(LOG_ERR, "Failed to set payload: %s", strerror(-ret));
                 tm_free_record(handle);

src/probes/local.mk

@@ -4,7 +4,8 @@ bin_PROGRAMS += \
 	%D%/telem-record-gen \
 	%D%/klogscanner \
 	%D%/pstoreprobe \
-	%D%/pstoreclean
+	%D%/pstoreclean \
+	%D%/bertprobe
 
 %C%_hprobe_SOURCES = %D%/hello.c
 %C%_hprobe_LDADD = $(top_builddir)/src/libtelemetry.la
@@ -20,6 +21,21 @@ if HAVE_SYSTEMD_JOURNAL
 endif
 endif
 
+%C%_bertprobe_SOURCES = %D%/bert_probe.c \
+	src/nica/b64enc.c
+%C%_bertprobe_CFLAGS = $(AM_CFLAGS)
+%C%_bertprobe_LDADD = $(top_builddir)/src/libtelemetry.la
+%C%_bertprobe_LDFLAGS = \
+        $(AM_LDFLAGS) \
+        -pie
+
+if LOG_SYSTEMD
+if HAVE_SYSTEMD_JOURNAL
+%C%_bertprobe_CFLAGS += $(SYSTEMD_JOURNAL_CFLAGS)
+%C%_bertprobe_LDADD += $(SYSTEMD_JOURNAL_LIBS)
+endif
+endif
+
 %C%_telem_record_gen_SOURCES = %D%/telem_record_gen.c
 %C%_telem_record_gen_CFLAGS = \
 	$(AM_CFLAGS)

src/probes/oops_parser.c

@@ -162,12 +162,6 @@ struct oops_pattern oops_patterns_arr[] = {
                 TM_CRITICAL,
                 false,
         },
-        {
-                "BERT: Error records from previous boot:",
-                "org.clearlinux/bert/debug",
-                TM_MEDIUM,
-                false,
-        },
 };
 
 static int oops_patterns_cnt = sizeof(oops_patterns_arr) / sizeof(struct oops_pattern);
@@ -340,7 +334,6 @@ void oops_msg_cleanup(struct oops_log_msg *msg)
 static struct oops_log_msg oops_msg;
 
 static bool in_stack_dump = false;
-static bool in_bert_dump = false;
 
 static oops_handler_t oops_handler;
 
@@ -364,19 +357,6 @@ void oops_parser_cleanup()
         free_pattern_regex();
 }
 
-/*
- *
-[    1.609112] BERT: Error records from previous boot:
-[    1.609113] [Hardware Error]: event severity: fatal
-[    1.609115] [Hardware Error]:  Error 0, type: fatal
-[    1.609116] [Hardware Error]:   section type: unknown, 81212a96-09ed-4996-9471-8d729c8e69ed
-[    1.609117] [Hardware Error]:   section length: 0xc10
-[    1.609119] [Hardware Error]:   00000000: 00000001 00000000 00000000 01001002  ................
-[    1.609120] [Hardware Error]:   00000010: 01001002 00000001 c71f0d2f 00000003  ......../.......
-[    1.609122] [Hardware Error]:   00000020: 00000001 0000004f 0c070048 800001ff  ....O...H.......
-[    1.609123] [Hardware Error]:   00000030: 02002080 7e15fe03 00000001 00000000  . .....~......
- ...
- */
 void parse_single_line(char *line, size_t size)
 {
         char *start;
@@ -396,30 +376,28 @@ void parse_single_line(char *line, size_t size)
                                 continue;
                         }
                         telem_log(LOG_DEBUG, "Oops start has been  detected\n");
+
                         oops_msg.pattern = pattern;
                         oops_msg.lines[oops_msg.length] = strndup(start, (size_t)(line_end - start));
                         if (oops_msg.lines[oops_msg.length] == NULL) {
                                 //telem_perror("Failed to copy string");
                                 exit(EXIT_FAILURE);
                                 return;
+                        } else {
+                                oops_msg.length++;
                         }
-
-                        oops_msg.length++;
                         in_stack_dump = false;
-                        in_bert_dump = false;
-                        if (strstr(oops_msg.pattern->begin_line, "BERT:")) {
-                                in_bert_dump = true;
-                        }
-                        return;
+                        break;
                 }
         } else {
                 // If in the middle of oops
                 if (oops_msg.length >= MAX_LINES) {
-                        fprintf(stderr,"*** MAX_LINES!!\n");
                         end_found = true;
+                        // } else if (oops_msg.end_line && strstr(start, oops_msg.end_line)) {
+                        //        end_found = false;
                 } else if (strstr(start, "[ end trace")) {
                         end_found = true;
-                } else if (!in_stack_dump && !in_bert_dump) {
+                } else if (!in_stack_dump) {
                         // This line indicates the beginning of a stack trace;
                         // the next line is most likely the topmost frame.
                         if (starts_with(start, line_end, "Call Trace:")) {
@@ -436,10 +414,6 @@ void parse_single_line(char *line, size_t size)
                                 in_stack_dump = false;
                                 end_found = true;
                         }
-                } else if (in_bert_dump) {
-                        if (!strstr(start, "[Hardware Error]:")) {
-                                end_found = true;
-                        }
                 }
 
                 /* if a new oops starts, this one has ended */
@@ -577,10 +551,6 @@ static void stack_frame_free(struct stack_frame **head)
 
         while (*head != NULL) {
                 frame = (*head)->next;
-                // First free memory allocation for function name
-                if ((*head)->function) {
-                        free((*head)->function);
-                }
                 free(*head);
                 *head = frame;
         }
@@ -588,8 +558,8 @@ static void stack_frame_free(struct stack_frame **head)
 
 /*
  * Function parses lines of the format :
- * CPU: 2 PID: 6429 Comm: insmod Tainted: POE 3.19.0-18-generic #18-Ubuntu$
- * CPU: 2 PID: 0 Comm: swapper/2 Not tainted 3.10.4-100.fc18.x86_64 #1
+ * CPU: 2 PID: 6429 Comm: insmod Tainted: P           OE  3.19.0-18-generic #18-Ubuntu$
+ * CPU: 2 PID: 0 Comm: swapper/2 Not tainted  3.10.4-100.fc18.x86_64 #1
  * CPU: 3 PID: 0 Comm: swapper/3 Not tainted 4.0.5-300.fc22.x86_64 #1
  */
 static void parse_kernel_cpu_line(char *line, char **kernel_version, char **tainted)
@@ -838,15 +808,6 @@ static nc_string *parse_backtrace(struct oops_log_msg *msg)
 
                 if (str_starts_with_casei(line, "CPU: ") ||
                     str_starts_with_casei(line, "PID: ")) {
-                        /* Can't assume that these variables (tainted,
-                         * an kernel_version) are not already allocated
-                         * otherwise it will leak memory */
-                        if (tainted) {
-                             free(tainted);
-                        }
-                        if (kernel_version) {
-                             free(kernel_version);
-                        }
                         parse_kernel_cpu_line(line, &kernel_version, &tainted);
                         continue;
                 }
@@ -886,28 +847,15 @@ static nc_string *parse_backtrace(struct oops_log_msg *msg)
         return backtrace;
 }
 
-static void append_payload(nc_string *payload, struct oops_log_msg *msg)
-{
-        for (int i = 1; i < msg->length; i++) {
-                nc_string_cat(payload,msg->lines[i]);
-                nc_string_cat(payload,"\n");
-        }
-}
-
 nc_string *parse_payload(struct oops_log_msg *msg)
 {
         nc_string *payload, *backtrace;
 
         payload = nc_string_dup("Crash Report:\n");
         nc_string_append_printf(payload, "Reason: %s\n", msg->lines[0]);
-        if (strstr(msg->lines[0], "BERT:")) {
-                append_payload(payload, msg);
-        } else {
-                backtrace = parse_backtrace(msg);
-                nc_string_cat(payload, backtrace->str);
-                nc_string_free(backtrace);
-        }
-
+        backtrace = parse_backtrace(msg);
+        nc_string_cat(payload, backtrace->str);
+        nc_string_free(backtrace);
         return payload;
 
 }

src/telemctl.c

@@ -69,7 +69,6 @@ static int telemctl_opt_in(void);
 static int telemctl_journal(char *);
 
 struct telemcmd {
-        bool root;
         char *cmd;
         union {
         int  (*f1)(void);
@@ -79,13 +78,13 @@ struct telemcmd {
 };
 
 static struct telemcmd commands[] = {
-        {true,  "stop",      {.f1=telemctl_stop},     "Stops all running telemetry services" },
-        {true,  "start",     {.f1=telemctl_start},    "Starts all telemetry services" },
-        {true,  "restart",   {.f1=telemctl_restart},  "Restarts all telemetry services" },
-        {false, "is-active", {.f1=telemctl_is_active},"Checks if telemprobd and telempostd are active" },
-        {true,  "opt-in",    {.f1=telemctl_opt_in},   "Opts in to telemetry, and starts telemetry services" },
-        {true,  "opt-out",   {.f1=telemctl_opt_out},  "Opts out of telemetry, and stops telemetry services" },
-        {true,  "journal",   {.f2=telemctl_journal},  "Prints telemetry journal contents. Use -h argument with\n            command for more options"}
+        {"stop",      {.f1=telemctl_stop},     "Stops all running telemetry services" },
+        {"start",     {.f1=telemctl_start},    "Starts all telemetry services" },
+        {"restart",   {.f1=telemctl_restart},  "Restarts all telemetry services" },
+        {"is-active", {.f1=telemctl_is_active},"Checks if telemprobd and telempostd are active" },
+        {"opt-in",    {.f1=telemctl_opt_in},   "Opts in to telemetry, and starts telemetry services" },
+        {"opt-out",   {.f1=telemctl_opt_out},  "Opts out of telemetry, and stops telemetry services" },
+        {"journal",   {.f2=telemctl_journal},  "Prints telemetry journal contents. Use -h argument with\n            command for more options"}
 };
 
 static int syscmd(char *cmd, char *buff, int bufflen)
@@ -397,9 +396,9 @@ static int telemctl_opt_out(void)
                         fprintf(stderr, "Already opted out. Nothing to do.\n");
                         return 0;
                 }
-                fprintf(stderr, "Failed to remove %s.\n", TM_OPT_IN);
+		fprintf(stderr, "Failed to remove %s.\n", TM_OPT_IN);
                 return 1;
-        }
+	}
 
         ret = telemctl_stop();
         ret |= telemctl_remove_work_dirs();
@@ -426,7 +425,7 @@ static int telemctl_opt_in(void)
                 return 1;
         }
 
-        /* Create a brand new file TM_OPT_IN, we may fail because the file exists already.
+	/* Create a brand new file TM_OPT_IN, we maight fail because the file exists already.
          * In that case we are already opted in and we are done here. */
         int fd = open(TM_OPT_IN, O_CREAT|O_EXCL|O_WRONLY, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
         if (fd == -1) {
@@ -471,7 +470,7 @@ static int journal_cmd(char *cmd)
 
 static char* concatargs(int argc, char** argv)
 {
-        size_t len = 1 + strlen("telem_journal ");
+        size_t len = strlen("telem_journal") + 1;
         for (int i = 2; i < argc; i++) {
                 len += strlen(argv[i]) + 1;
         }
@@ -522,7 +521,7 @@ int main(int argc, char **argv)
 
         for (i = 0; i < sizeof(commands)/sizeof(commands[0]); i++) {
                 if (strcmp(commands[i].cmd, argv[1]) == 0) {
-                        if (commands[i].root == true && is_root == false) {
+                        if (!is_root) {
                                 fprintf(stderr, "Must be root to run this command. Exiting...\n");
                                 exit(1);
                         }

src/telemdaemon.c

@@ -354,21 +354,12 @@ static void process_record(TelemDaemon *daemon, client *cl)
 
         buf += cfg_info_size;
         header_size = *(uint32_t *)buf;
-        /* Header size can not be bigger than buffer size bail out early */
-        if ((uint32_t)header_size >= (uint32_t)cl->size) {
-                return;
-        }
         message_size = cl->size - (cfg_info_size + header_size);
-        telem_debug("DEBUG: cl->size: %ld\n", cl->size);
-        telem_debug("DEBUG: header_size: %ld\n", header_size);
-        telem_debug("DEBUG: message_size: %ld\n", message_size);
-        telem_debug("DEBUG: cfg_info_size: %ld\n", cfg_info_size);
-        telem_debug("Total: %zu\n", header_size + cfg_info_size + message_size);
-        /* Check message size bounds */
-        if (message_size <= 0 || message_size > MAX_PAYLOAD_LENGTH) {
-                telem_log(LOG_INFO, "Record message size out of bounds\n");
-                return;
-        }
+        telem_debug("DEBUG: cl->size: %zu\n", cl->size);
+        telem_debug("DEBUG: header_size: %zu\n", header_size);
+        telem_debug("DEBUG: message_size: %zu\n", message_size);
+        telem_debug("DEBUG: cfg_info_size: %zu\n", cfg_info_size);
+        assert(message_size > 0);      //TODO:Check for min and max limits
         msg = (char *)buf + sizeof(uint32_t);
 
         /* Copying the headers as strtok modifies the orginal buffer */

src/telemetry.c

@@ -977,18 +977,17 @@ int tm_set_payload(struct telem_ref *t_ref, char *payload)
         size_t payload_len;
         int ret = 0;
 
-        if (payload == NULL) {
-                telem_log(LOG_WARNING, "payload pointer is NULL\n");
+        payload_len = strlen((char *)payload);
+
+        if (payload_len > MAX_PAYLOAD_LENGTH) {
                 return -EINVAL;
         }
 
-        payload_len = strnlen(payload, MAX_PAYLOAD_LENGTH);
-
         if (payload_is_ascii(payload, payload_len) != 0) {
                 return -EINVAL;
         }
 
-        t_ref->record->payload = strndup(payload, payload_len);
+        t_ref->record->payload = strdup(payload);
 
         if (!t_ref->record->payload) {
                 telem_log(LOG_CRIT, "CRIT: Out of memory\n");
@@ -1274,7 +1273,7 @@ int tm_send_record(struct telem_ref *t_ref)
          */
         record_size = (2 * sizeof(uint32_t)) + total_size + 1;
 
-        data = (char *)calloc(sizeof(char), record_size);
+        data = calloc(sizeof(char), record_size);
         if (!data) {
                 telem_log(LOG_CRIT, "CRIT: Out of memory\n");
                 close(sfd);

src/telempostdaemon.c

@@ -1,7 +1,7 @@
 /*
  * This program is part of the Clear Linux Project
  *
- * Copyright 2018-2023 Intel Corporation
+ * Copyright 2018 Intel Corporation
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms and conditions of the GNU Lesser General Public License, as
@@ -25,7 +25,6 @@
 #include <stdbool.h>
 #include <sys/stat.h>
 #include <curl/curl.h>
-#include <json-c/json.h>
 #include <sys/signalfd.h>
 
 #include "log.h"
@@ -211,47 +210,13 @@ size_t write_callback(char *ptr, size_t size, size_t nmemb, void *userdata)
         return size * nmemb;
 }
 
-char *create_json_message(char *tm_headers[], char *tm_payload)
-{
-        /*
-         * Embed the telemetry record headers and the telemetry payload into a
-         * JSON object string.
-         */
-        char *json_string = NULL;
-        json_object *root = json_object_new_object();
-
-        /* Add the telemetry record headers */
-
-        for (int i = 0; i < NUM_HEADERS; i++) {
-                /* ex: arch: x86_64 */
-
-                /* Split the header field into name/value */
-                strtok(tm_headers[i], ":");
-                json_object *value = json_object_new_string(strtok(NULL, " "));
-                json_object_object_add(root, tm_headers[i], value);
-        }
-        json_object *payload = json_object_new_string(tm_payload);
-        json_object_object_add(root, "payload", payload);
-
-        /* Keep our own copy of the json string */
-        json_string = strdup(json_object_to_json_string_ext(root,
-                                                            JSON_C_TO_STRING_PLAIN |
-                                                            JSON_C_TO_STRING_NOSLASHESCAPE));
-
-        /* Free the memory associated with the JSON objects */
-        json_object_put(root);
-
-        return json_string;
-}
-
 bool post_record_http(char *headers[], char *body, char *cfg)
 {
         CURL *curl;
         int res = 0;
-        char *content = "Content-Type: application/json";
+        char *content = "Content-Type: application/text";
         struct curl_slist *custom_headers = NULL;
         char errorbuf[CURL_ERROR_SIZE];
-        char *json_body = NULL;
         long http_response = 0;
         const char *cert_file = get_cainfo_config();
         const char *tid_header = get_tidheader_config();
@@ -272,9 +237,6 @@ bool post_record_http(char *headers[], char *body, char *cfg)
                 telem_debug("DEBUG: override server_addr:%s\n", server_addr_config());
         }
 
-        // Generate the JSON message body
-        json_body = create_json_message(headers, body);
-
         // Initialize the libcurl global environment once per POST. This lets us
         // clean up the environment after each POST so that when the daemon is
         // sitting idle, it will be consuming as little memory as possible.
@@ -302,13 +264,16 @@ bool post_record_http(char *headers[], char *body, char *cfg)
 
         curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_callback);
 
+        for (int i = 0; i < NUM_HEADERS; i++) {
+                custom_headers = curl_slist_append(custom_headers, headers[i]);
+        }
         custom_headers = curl_slist_append(custom_headers, tid_header);
         // This should be set by probes/libtelemetry in the future
         custom_headers = curl_slist_append(custom_headers, content);
 
         curl_easy_setopt(curl, CURLOPT_HTTPHEADER, custom_headers);
-        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, json_body);
-        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, strlen(json_body));
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDS, body);
+        curl_easy_setopt(curl, CURLOPT_POSTFIELDSIZE, strlen(body));
         curl_easy_setopt(curl, CURLOPT_USE_SSL, CURLUSESSL_TRY);
 
         if (strlen(cert_file) > 0) {
@@ -350,11 +315,6 @@ bool post_record_http(char *headers[], char *body, char *cfg)
         curl_global_cleanup();
 
 Done:
-        if (json_body) {
-                free(json_body);
-                json_body = NULL;
-        }
-
         if (saved_config_file != NULL) {
                 if (set_config_file(saved_config_file) != 0) {
                         telem_log(LOG_ERR, "set-config_file(): Failed to set %s",
@@ -530,7 +490,7 @@ static bool deliver_record(TelemPostDaemon *daemon, char *headers[], char *body,
         return ret;
 }
 
-bool process_staged_record(char *filename, TelemPostDaemon *daemon)
+bool process_staged_record(char *filename, bool is_retry, TelemPostDaemon *daemon)
 {
         int k;
         bool ret = false;
@@ -570,12 +530,20 @@ bool process_staged_record(char *filename, TelemPostDaemon *daemon)
                 goto end_processing_file;
         }
 
+        /* Retries should not be recorded */
+        if (is_retry == false) {
+                /** Journal entry **/
+                save_entry_to_journal(daemon, current_time, headers);
+                /** Record retention **/
+                apply_retention_policies(daemon, body);
+        }
+
         /** Record delivery **/
         if (!daemon->record_server_delivery_enabled) {
                 telem_log(LOG_INFO, "record server delivery disabled\n");
                 // Not an error condition
                 ret = true;
-                goto end_record_delivery;
+                goto end_processing_file;
         }
 
         /** Spool policies **/
@@ -603,17 +571,6 @@ bool process_staged_record(char *filename, TelemPostDaemon *daemon)
         /** Deliver or spool **/
         ret = deliver_record(daemon, headers, body, cfg_file);
 
-end_record_delivery:
-        /** Save record once it is properly delivered, if record
-         *  is spooled the record is not saved to journal until
-         *  delievered on a re-try **/
-        if (ret) {
-                /** Save to journal **/
-                save_entry_to_journal(daemon, current_time, headers);
-                /** Record retention **/
-                apply_retention_policies(daemon, body);
-        }
-
 end_processing_file:
         /** Update spool size if record will be removed **/
         if (ret) {
@@ -668,7 +625,7 @@ int staging_records_loop(TelemPostDaemon *daemon)
                         telem_log(LOG_ERR, "Failed to allocate memory for staging record full path\n");
                         exit(EXIT_FAILURE);
                 }
-                if (process_staged_record(record_path, daemon)) {
+                if (process_staged_record(record_path, true, daemon)) {
                         unlink(record_path);
                         processed++;
                 }
@@ -764,7 +721,7 @@ void run_daemon(TelemPostDaemon *daemon)
                                                                 exit(EXIT_FAILURE);
                                                         }
                                                         /* Process inotify event */
-                                                        if (process_staged_record(record_name, daemon)) {
+                                                        if (process_staged_record(record_name, false, daemon)) {
                                                                 unlink(record_name);
                                                         }
                                                         free(record_name);

src/telempostdaemon.h

@@ -85,9 +85,11 @@ void close_daemon(TelemPostDaemon *daemon);
  * Processed record written on disk
  *
  * @param filename a pointor to record on disk
+ * @param is_retry a boolean value that indicates if
+ *        the record has been previously processed.
  * @param daemon post to telemetry post daemon
  */
-bool process_staged_record(char *filename, TelemPostDaemon *daemon);
+bool process_staged_record(char *filename, bool is_retry, TelemPostDaemon *daemon);
 
 /**
  * Scans staging directory to process files that were
@@ -105,7 +107,6 @@ int staging_records_loop(TelemPostDaemon *daemon);
  * @param body a pointer to the payload
  * @param cfg_file a pointer to a non-default configuration
  *        file to be used.
- * @return true if successful, false otherwise
  */
 bool post_record_http(char *headers[], char *body, char *cfg_file);
 

tests/check_config.c

@@ -14,10 +14,8 @@
  * details.
  */
 
-#include <stdlib.h>
 #include <check.h>
 #include "configuration.h"
-#include "configuration_check.h"
 
 START_TEST(check_read_config_for_invalid_file)
 {
@@ -54,7 +52,6 @@ START_TEST(check_read_valid_config)
                          "X-Telemetry-TID: 6907c830-eed9-4ce9-81ae-76daf8d88f0f");
         ck_assert(config.boolValues[CONF_DAEMON_RECYCLING_ENABLED] == true);
 
-        free_config_struct(&config);
 }
 END_TEST
 
@@ -83,8 +80,6 @@ START_TEST(check_default_config)
         ck_assert(config.boolValues[CONF_DAEMON_RECYCLING_ENABLED] == DEFAULT_DAEMON_RECYCLING_ENABLED);
         ck_assert(config.boolValues[CONF_RECORD_RETENTION_ENABLED] == DEFAULT_RECORD_RETENTION_ENABLED);
         ck_assert(config.boolValues[CONF_RECORD_SERVER_DELIVERY_ENABLED] == DEFAULT_RECORD_SERVER_DELIVERY_ENABLED);
-
-        free_config_struct(&config);
 }
 END_TEST
 
@@ -115,8 +110,6 @@ START_TEST(check_layered_config)
         ck_assert(config.boolValues[CONF_DAEMON_RECYCLING_ENABLED] == DEFAULT_DAEMON_RECYCLING_ENABLED);
         ck_assert(config.boolValues[CONF_RECORD_RETENTION_ENABLED] == DEFAULT_RECORD_RETENTION_ENABLED);
         ck_assert(config.boolValues[CONF_RECORD_SERVER_DELIVERY_ENABLED] == DEFAULT_RECORD_SERVER_DELIVERY_ENABLED);
-
-        free_config_struct(&config);
 }
 END_TEST
 
@@ -130,8 +123,6 @@ START_TEST(check_read_valid_config_record_retention_delivery)
 
         ck_assert(config.boolValues[CONF_RECORD_RETENTION_ENABLED] == true);
         ck_assert(config.boolValues[CONF_RECORD_SERVER_DELIVERY_ENABLED] == false);
-
-        free_config_struct(&config);
 }
 END_TEST
 
@@ -185,7 +176,6 @@ int main(void)
 {
         Suite *s;
         SRunner *sr;
-        int failed;
 
         s = config_suite();
         sr = srunner_create(s);
@@ -196,13 +186,13 @@ int main(void)
         srunner_set_tap(sr, "-");
 
         srunner_run_all(sr, CK_SILENT);
-        failed = srunner_ntests_failed(sr);
+        // failed = srunner_ntests_failed(sr);
         srunner_free(sr);
 
         // if you want the TAP driver to report a hard error based
         // on certain conditions (e.g. number of failed tests, etc.),
         // return non-zero here instead.
-        return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+        return 0;
 }
 
 /* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

tests/check_journal.c

@@ -17,7 +17,6 @@
 #include <check.h>
 #include <errno.h>
 #include <stdio.h>
-#include <stdlib.h>
 #include "common.h"
 #include "journal/journal.h"
 
@@ -240,7 +239,6 @@ int main(void)
 {
         Suite *s;
         SRunner *sr;
-        int failed;
 
         s = config_suite();
         sr = srunner_create(s);
@@ -251,13 +249,13 @@ int main(void)
         srunner_set_tap(sr, "-");
 
         srunner_run_all(sr, CK_SILENT);
-        failed = srunner_ntests_failed(sr);
+        // failed = srunner_ntests_failed(sr);
         srunner_free(sr);
 
         // if you want the TAP driver to report a hard error based
         // on certain conditions (e.g. number of failed tests, etc.),
         // return non-zero here instead.
-        return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+        return 0;
 }
 
 /* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

tests/check_libtelemetry.c

@@ -243,8 +243,9 @@ END_TEST
 
 void event_id_teardown(void)
 {
-        // Free record
-        create_teardown();
+        if (ref) {
+                free(ref);
+        }
         free(original_event_id);
 }
 
@@ -291,7 +292,6 @@ int main(void)
 {
         Suite *s;
         SRunner *sr;
-        int failed;
 
         s = lib_suite();
         sr = srunner_create(s);
@@ -299,13 +299,11 @@ int main(void)
         srunner_set_log(sr, NULL);
         srunner_set_tap(sr, "-");
 
-        // set CK_NOFORK to attach gdb
-        // srunner_set_fork_status(sr, CK_NOFORK);
         srunner_run_all(sr, CK_SILENT);
-        failed = srunner_ntests_failed(sr);
+
         srunner_free(sr);
 
-        return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+        return 0;
 }
 
 /* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

tests/check_ncb64.c

@@ -0,0 +1,192 @@
+/*
+ * This program is part of the Clear Linux Project
+ *
+ * Copyright 2017 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms and conditions of the GNU Lesser General Public License, as
+ * published by the Free Software Foundation; either version 2.1 of the License,
+ * or (at your option) any later version.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+ * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
+ * details.
+ */
+
+#define OUT_MAX_LEN 100
+
+#include <stdio.h>
+#include <check.h>
+#include "nica/b64enc.h"
+
+START_TEST(check_nc_b64_no_overflow)
+{
+        size_t n = 2;
+        char out[OUT_MAX_LEN];
+        const char *filename = TOPSRCDIR "/tests/nc_b64enc_test_files/foobar";
+
+        ck_assert_msg(!nc_b64enc_filename(filename, &out[0], n), "Should quit since buffer smaller than content");
+}
+END_TEST
+
+START_TEST(check_nc_b64_enc_n_file_empty)
+{
+        size_t n = OUT_MAX_LEN;
+        char out[OUT_MAX_LEN];
+        char *result = "\0";
+        const char *filename = TOPSRCDIR "/tests/nc_b64enc_test_files/empty";
+
+        ck_assert_msg(nc_b64enc_filename(filename, &out[0], n), "Error opening file");
+        ck_assert_str_eq(out, result);
+}
+END_TEST
+
+START_TEST(check_nc_b64_enc_n_file_fo)
+{
+        size_t n = OUT_MAX_LEN;
+        char out[OUT_MAX_LEN];
+        char *result = "Zm8=";
+        const char *filename = TOPSRCDIR "/tests/nc_b64enc_test_files/fo";
+
+        ck_assert_msg(nc_b64enc_filename(filename, &out[0], n), "Error opening file");
+        ck_assert_str_eq(out, result);
+}
+END_TEST
+
+START_TEST(check_nc_b64_enc_n_file_foob)
+{
+        size_t n = OUT_MAX_LEN;
+        char out[OUT_MAX_LEN];
+        char *result = "Zm9vYg==";
+        const char *filename = TOPSRCDIR "/tests/nc_b64enc_test_files/foob";
+
+        ck_assert_msg(nc_b64enc_filename(filename, &out[0], n), "Error opening file");
+        ck_assert_str_eq(out, result);
+}
+END_TEST
+
+START_TEST(check_nc_b64_enc_n_file_foobar)
+{
+        size_t n = OUT_MAX_LEN;
+        char out[OUT_MAX_LEN];
+        char *result = "Zm9vYmFyZm9vYmFy";
+        const char *filename = TOPSRCDIR "/tests/nc_b64enc_test_files/foobar";
+
+        ck_assert_msg(nc_b64enc_filename(filename, &out[0], n), "Error opening file");
+        ck_assert_str_eq(out, result);
+}
+END_TEST
+
+START_TEST(check_nc_b64_enc_n_file_long_text)
+{
+        size_t out_len = 8000;
+        char out[out_len];
+        const char *expected_out = \
+                "TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIG5vbnVtbXkgdml0YWUsIGluIHZpdmFtdXMgc3Vz\n"
+                "cGVuZGlzc2UgYWMuIFNlbXBlciBzZWQgcGhhcmV0cmEgc2NlbGVyaXNxdWUuIEVnZXQgZWxlaWZl\n"
+                "bmQgYW1ldCB2ZWwgbnVuYyB2b2x1dHBhdCBjdXJzdXMsIGF1Y3RvciBwbGF0ZWEgcHJldGl1bSwg\n"
+                "bWF0dGlzIHJpc3VzIGZhY2lsaXNpcyBmYXVjaWJ1cywgc3VzcGVuZGlzc2UgZGlhbSwgbGVjdHVz\n"
+                "IG1ldHVzIG51bGxhLiBOdW5jIGp1c3RvIGZhY2lsaXNpIG5hbSBmZWxpcyB2ZWwgbGFvcmVldCwg\n"
+                "bmliaCBsZW8gbWFzc2Egc3VzcGVuZGlzc2UgYWNjdW1zYW4gY29udmFsbGlzLCBzZWQgcXVpcyBw\n"
+                "ZWxsZW50ZXNxdWUgZWdlc3RhcywgbG9yZW0gYW50ZSBtb3JiaSBtYXR0aXMgdml0YWUuIFByYWVz\n"
+                "ZW50IGluIHJ1dHJ1bSBlZ2V0IGFjLCB2aXZhbXVzIHBlZGUgc3VzcGVuZGlzc2UgbGVjdHVzIG51\n"
+                "bGxhbSwgZXQgcGVkZSBldSBvZGlvIHBlZGUsIGV0aWFtIGxlbyBlZ2VzdGFzIGluLCBub251bW15\n"
+                "IHNlbXBlci4gQSBhY2N1bXNhbiBkdWksIHZlc3RpYnVsdW0gcmlkaWN1bHVzIGV0IGluLCBqdXN0\n"
+                "byBldCBwbGFjZXJhdCBkdWlzIHV0IHZpdmFtdXMgbGliZXJvLiBWZXN0aWJ1bHVtIGVnZXQgdXQg\n"
+                "bW9sbGlzLCBudW5jIGEgc29sbGljaXR1ZGluLCBmcmluZ2lsbGEgZXJvcyBwb3N1ZXJlIG1vbGxp\n"
+                "cyBhYyBuYXRvcXVlIHBlZGUsIHJpc3VzIG51bGxhIHJ1dHJ1bSB0dXJwaXMgYSB2aXRhZSBpZC4g\n"
+                "SW5jZXB0b3MgdGluY2lkdW50IHF1aWRlbSBhcmN1IHR1cnBpcyBudW5jIHNvbGxpY2l0dWRpbi4g\n"
+                "UGhhc2VsbHVzIG1ldHVzIGVyYXQgcGxhY2VyYXQsIGluIGVyYXQgbG9yZW0gbWF1cmlzIG51bGxh\n"
+                "LCBhdCBsaWJlcm8gZXJhdCBzdXNwZW5kaXNzZSBzYXBpZW4gbW9udGVzIHJob25jdXMsIG1hZ25h\n"
+                "IHF1YW0uIEp1c3RvIHByYWVzZW50IGxhY3VzIG1hc3NhLCByZXByZWhlbmRlcml0IG51bmMsIHJp\n"
+                "c3VzIGRpZ25pc3NpbSBmZWxpcyBub24sIGRpZ25pc3NpbSBvZGlvIHRlbGx1cyBhbGlxdWFtLCBl\n"
+                "bmltIHNvZGFsZXMgdGVtcG9yIHF1aXNxdWUgc29kYWxlcyBtYWduaXMgcG9ydHRpdG9yLiBMaWd1\n"
+                "bGEgc2VkIHJpc3VzLCBldSBlc3QgcXVpc3F1ZSwgY2xhc3Mgbm9uIGF1dGUgZXUsIHBsYXRlYSBz\n"
+                "Y2VsZXJpc3F1ZSBpZCBpbnRlZ2VyIGRpZ25pc3NpbW9zIGludGVnZXIgc3VzY2lwaXQuClZlaGlj\n"
+                "dWxhIGVpdXMgbmVjLCBjb252YWxsaXMgbWFlY2VuYXMgbGVjdHVzIHB1cnVzIHF1aXNxdWUgYWxp\n"
+                "cXVhbSwgZXQgZXQsIGxhY2luaWEgZGlzIGRpZ25pc3NpbSBsb3JlbS4gVm9sdXB0YXRlbSB1dCwg\n"
+                "dml2ZXJyYSBhZW5lYW4gcGhhc2VsbHVzIGZlbGlzLCBmZXJtZW50dW0gbGlndWxhIGVnZXQgdWxs\n"
+                "YW1jb3JwZXIgYW1ldCwgbWF1cmlzIGxlbyBsdWN0dXMuIEV0IGV0aWFtIHNlbXBlciBwaGFyZXRy\n"
+                "YSBuaWJoIG1pIG1hdXJpcy4gSGVuZHJlcml0IHNlZCBhbGlxdWFtLCBlZ2V0IGlkIHRlbGx1cyBt\n"
+                "YWduYSwgc2VkIGxhb3JlZXQgdWx0cmljZXMgZW5pbSwgbW9sbGlzIHN1c3BlbmRpc3NlIGluLiBF\n"
+                "dSBudWxsYW0gbG9yZW0gc2l0IGV0aWFtLCBvcmNpIGluIGxpYmVyby4gTnVuYyBpcHN1bSBtYXVy\n"
+                "aXMgZXQgc2VtIGhhYy4gRGljdHVtIGZhdWNpYnVzIGRpcyB2aXRhZSBpbiB2b2x1dHBhdCBtb3Ji\n"
+                "aSwgYSBkaWN0dW0sIHF1aXNxdWUgbWF1cmlzLCBhdWN0b3IgbmVjIHZlbCBwZWxsZW50ZXNxdWUg\n"
+                "dWxsYW1jb3JwZXIgZXRpYW0uIEN1bSBsaWJlcm8gd2lzaSBhY2N1bXNhbiBhbGlxdWFtIGNvbnNl\n"
+                "Y3RldHVlciB0ZWxsdXMsIHBoYXNlbGx1cyBjdXJhZSwgYXQgaWxsdW0gYW50ZSBwcmV0aXVtIG5p\n"
+                "YmggbW9yYmkuIFNlZCBibGFuZGl0IHB1bHZpbmFyIHB1bHZpbmFyLiBEaWN0dW0gZXN0IG51bmMg\n"
+                "ZWxlaWZlbmQsIHZlbGl0IHZlbGl0IHRlbXBvciBhY2N1bXNhbiBsb2JvcnRpcyBsYW9yZWV0IGNv\n"
+                "bmd1ZS4gU2l0IGFtZXQsIHNlZCBuaWJoIHBvcnJvIG5lcXVlIGF1Y3RvciBoeW1lbmFlb3MgcG9z\n"
+                "dWVyZSwgb2RpbyBudWxsYSBibGFuZGl0IGNvbmd1ZSBlbGl0LiBJZCBmYXVjaWJ1cyBldCB0ZW1w\n"
+                "dXMgbWFsZXN1YWRhIHBsYXRlYS4=";
+        const char *filename = TOPSRCDIR "/tests/nc_b64enc_test_files/long_text";
+
+        ck_assert_msg(nc_b64enc_filename(filename, &out[0], out_len), "Error opening file");
+        ck_assert_str_eq(out, expected_out);
+}
+END_TEST
+
+START_TEST(check_nc_b64_enc_n_filehandler_foobar)
+{
+        size_t n = OUT_MAX_LEN;
+        char out[OUT_MAX_LEN];
+        char *result = "Zm9vYmFyZm9vYmFy";
+        const char *filename = TOPSRCDIR "/tests/nc_b64enc_test_files/foobar";
+        FILE *fh = NULL;
+
+        fh = fopen(filename, "rb");
+
+        if (fh == NULL) {
+                ck_abort_msg("Unable to open foobar file");
+        }
+
+        ck_assert_msg(nc_b64enc_file(fh, &out[0], n), "Result does not match");
+        ck_assert_str_eq(out, result);
+}
+END_TEST
+
+Suite *config_suite(void)
+{
+        // A suite is comprised of test cases, defined below
+        Suite *s = suite_create("nc_b64enc");
+
+        // Individual unit tests are added to "test cases"
+        TCase *t = tcase_create("nc_b64enc");
+        tcase_add_test(t, check_nc_b64_no_overflow);
+        tcase_add_test(t, check_nc_b64_enc_n_file_empty);
+        tcase_add_test(t, check_nc_b64_enc_n_file_fo);
+        tcase_add_test(t, check_nc_b64_enc_n_file_foob);
+        tcase_add_test(t, check_nc_b64_enc_n_file_foobar);
+        tcase_add_test(t, check_nc_b64_enc_n_file_long_text);
+        tcase_add_test(t, check_nc_b64_enc_n_filehandler_foobar);
+
+        suite_add_tcase(s, t);
+
+        return s;
+}
+
+int main(void)
+{
+        Suite *s;
+        SRunner *sr;
+
+        s = config_suite();
+        sr = srunner_create(s);
+
+        // Use the TAP driver for now, so that each
+        // unit test will PASS/FAIL in the log output.
+        srunner_set_log(sr, NULL);
+        srunner_set_tap(sr, "-");
+
+        srunner_run_all(sr, CK_SILENT);
+        // failed = srunner_ntests_failed(sr);
+        srunner_free(sr);
+
+        // if you want the TAP driver to report a hard error based
+        // on certain conditions (e.g. number of failed tests, etc.),
+        // return non-zero here instead.
+        return 0;
+}
+
+/* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

tests/check_postd.c

@@ -62,7 +62,7 @@ START_TEST(check_handle_client_with_no_data)
         bool success;
         char *filename = ABSTOPSRCDIR "/tests/telempostd/empty_message";
 
-        success = process_staged_record(filename, &tdaemon);
+        success = process_staged_record(filename, false, &tdaemon);
         // Return true to remove corrupted record
         ck_assert(success == true);
 }
@@ -75,7 +75,7 @@ START_TEST(check_handle_client_with_incorrect_data)
         bool success;
         char *filename = ABSTOPSRCDIR "/tests/telempostd/incorrect_message";
 
-        success = process_staged_record(filename, &tdaemon);
+        success = process_staged_record(filename, false, &tdaemon);
         // Return true to remove corrupted record
         ck_assert(success == true);
 }
@@ -88,7 +88,7 @@ START_TEST(check_process_record_with_correct_size_and_data)
         bool success;
         char *filename = ABSTOPSRCDIR "/tests/telempostd/correct_message";
 
-        success = process_staged_record(filename, &tdaemon);
+        success = process_staged_record(filename, false, &tdaemon);
         ck_assert(success == true);
 }
 END_TEST
@@ -100,7 +100,7 @@ START_TEST(check_process_record_with_incorrect_headers)
         bool success;
         char *filename = ABSTOPSRCDIR "/tests/telempostd/incorrect_headers";
 
-        success = process_staged_record(filename, &tdaemon);
+        success = process_staged_record(filename, false, &tdaemon);
         // Return true to remove corrupted record
         ck_assert(success == true);
 }
@@ -421,7 +421,6 @@ int main(void)
 {
         Suite *s;
         SRunner *sr;
-        int failed;
 
         s = config_suite();
         sr = srunner_create(s);
@@ -432,13 +431,13 @@ int main(void)
         srunner_set_tap(sr, "-");
 
         srunner_run_all(sr, CK_SILENT);
-        failed = srunner_ntests_failed(sr);
+        // failed = srunner_ntests_failed(sr);
         srunner_free(sr);
 
         // if you want the TAP driver to report a hard error based
         // on certain conditions (e.g. number of failed tests, etc.),
         // return non-zero here instead.
-        return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+        return 0;
 }
 
 /* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

tests/check_probd.c

@@ -22,7 +22,6 @@
 #include <unistd.h>
 
 #include "configuration.h"
-#include "configuration_check.h"
 #include "telemdaemon.h"
 #include "common.h"
 
@@ -62,19 +61,12 @@ void setup(void)
         initialize_probe_daemon(&tdaemon);
 }
 
-void teardown(void)
-{
-        free_config_file();
-}
-
 START_TEST(check_daemon_is_initialized)
 {
         setup();
 
         ck_assert(tdaemon.nfds == 0);
         ck_assert(tdaemon.pollfds == NULL);
-
-        teardown();
 }
 END_TEST
 
@@ -92,9 +84,9 @@ START_TEST(check_add_del_poll_fd)
 
         int fd = 1;
         int short events = 1;
-        add_pollfd(&tdaemon, 1, events);
-        add_pollfd(&tdaemon, 2, events);
-        add_pollfd(&tdaemon, 3, events);
+        add_pollfd(&tdaemon, fd, events);
+        add_pollfd(&tdaemon, ++fd, events);
+        add_pollfd(&tdaemon, ++fd, events);
         ck_assert_msg(tdaemon.nfds == 3, "Failed to add pollfd");
 
         fd = get_poll_fd(&tdaemon, 0);
@@ -118,10 +110,6 @@ START_TEST(check_add_del_poll_fd)
         ck_assert_msg(tdaemon.nfds == 0, "Failed to delete pollfd");
         fd = get_poll_fd(&tdaemon, 0);
         ck_assert(fd == -1);
-
-        /* Cleaning alloctions */
-        free(tdaemon.pollfds);
-        teardown();
 }
 END_TEST
 
@@ -145,8 +133,6 @@ START_TEST(check_add_remove_client)
         remove_client(&(tdaemon.client_head), cl3);
         //ck_assert(tdaemon.client_head.lh_first == NULL);
         ck_assert_msg(is_client_list_empty(&(tdaemon.client_head)), "Failed to remove clients\n");
-
-        teardown();
 }
 END_TEST
 
@@ -185,8 +171,6 @@ START_TEST(check_handle_client_with_no_data)
         ck_assert_msg(is_client_list_empty(&(tdaemon.client_head)), "Failed to remove client with no data\n");
         ck_assert_msg(tdaemon.nfds == 0, "Failed to remove poll fd for client with n data\n");
         close(server_fd);
-
-        teardown();
 }
 END_TEST
 
@@ -213,8 +197,6 @@ START_TEST(check_handle_client_with_incorrect_data)
         ck_assert_msg(is_client_list_empty(&(tdaemon.client_head)), "Failed to remove client with no data\n");
         ck_assert_msg(tdaemon.nfds == 0, "Failed to remove poll fd for client with n data\n");
         close(server_fd);
-
-        teardown();
 }
 END_TEST
 
@@ -246,8 +228,6 @@ START_TEST(check_handle_client_with_incorrect_size)
         ck_assert_msg(is_client_list_empty(&(tdaemon.client_head)), "Failed to remove client with no data\n");
         ck_assert_msg(tdaemon.nfds == 0, "Failed to remove poll fd for client with n data\n");
         close(server_fd);
-
-        teardown();
 }
 END_TEST
 
@@ -352,8 +332,6 @@ START_TEST(check_process_record_with_incorrect_headers)
         ck_assert_msg(tdaemon.nfds == 0, "Failed to remove poll fd for client with incorrect headers\n");
         close(server_fd);
         free(record);
-
-        teardown();
 }
 END_TEST
 
@@ -383,7 +361,6 @@ int main(void)
 {
         Suite *s;
         SRunner *sr;
-        int failed;
 
         s = config_suite();
         sr = srunner_create(s);
@@ -393,16 +370,14 @@ int main(void)
         srunner_set_log(sr, NULL);
         srunner_set_tap(sr, "-");
 
-        // set CK_NOFORK to attach gdb
-        // srunner_set_fork_status(sr, CK_NOFORK);
         srunner_run_all(sr, CK_SILENT);
-        failed = srunner_ntests_failed(sr);
+        // failed = srunner_ntests_failed(sr);
         srunner_free(sr);
 
         // if you want the TAP driver to report a hard error based
         // on certain conditions (e.g. number of failed tests, etc.),
         // return non-zero here instead.
-        return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+        return 0;
 }
 
 /* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

tests/check_probes.c

@@ -57,10 +57,6 @@ void setup_payload(char *oopsfile)
                 oops_parser_init(callback_func);
                 split_buf_by_line(buf, buflen);
         }
-
-        if (buf) {
-                free(buf);
-        }
 }
 
 // Tests for checking backtrace
@@ -253,8 +249,6 @@ START_TEST(sysctl1_payload)
         ck_assert(strstr(pl->str, "#24 sys_ioctl"));
         ck_assert(strstr(pl->str, "#25 sysenter_past_esp"));
         ck_assert(strstr(pl->str, "#26 quirk_ali7101_acpi"));
-
-        nc_string_free(pl);
 }
 END_TEST
 
@@ -685,6 +679,27 @@ Suite *config_suite(void)
         tcase_add_test(t, bug_kernel_handle_payload);
         tcase_add_test(t, bug_kernel_handle_payload_new_format);
 
+        //TODO fix
+        //tcase_add_test(t, badness_payload);
+
+/*
+        tcase_add_test(t, watchdog_oops);
+        tcase_add_test(t, warning_oops);
+        tcase_add_test(t, warn_on_oops);
+        tcase_add_test(t, two_warnings_oops);
+        tcase_add_test(t, sysctl1_oops);
+        tcase_add_test(t, sysctl2_oops);
+        tcase_add_test(t, softlockup_oops);
+        tcase_add_test(t, rtnl_oops);
+        tcase_add_test(t, kernel_null_pointer_oops);
+        tcase_add_test(t, kernel_bug_oops);
+        tcase_add_test(t, irq_oops);
+        tcase_add_test(t, general_protection_fault_oops);
+        tcase_add_test(t, double_fault_oops);
+        tcase_add_test(t, bad_page_map_oops);
+        tcase_add_test(t, bug_kernel_handle_oops);
+        tcase_add_test(t, badness_oops);
+ */
         suite_add_tcase(s, t);
 
         return s;
@@ -694,7 +709,6 @@ int main(void)
 {
         Suite *s;
         SRunner *sr;
-        int failed;
 
         s = config_suite();
         sr = srunner_create(s);
@@ -706,16 +720,14 @@ int main(void)
         srunner_set_log(sr, NULL);
         srunner_set_tap(sr, "-");
 
-        // set CK_NOFORK to attach gdb
-        // srunner_set_fork_status(sr, CK_NOFORK);
         srunner_run_all(sr, CK_SILENT);
-        failed = srunner_ntests_failed(sr);
+        // failed = srunner_ntests_failed(sr);
         srunner_free(sr);
 
         // if you want the TAP driver to report a hard error based
         // on certain conditions (e.g. number of failed tests, etc.),
         // return non-zero here instead.
-        return (failed == 0) ? EXIT_SUCCESS : EXIT_FAILURE;
+        return 0;
 }
 
 /* vi: set ts=8 sw=8 sts=4 et tw=80 cino=(0: */

tests/configuration_check.h

@@ -1,24 +0,0 @@
-/*
- * This program is part of the Clear Linux Project
- *
- * Copyright 2020 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms and conditions of the GNU Lesser General Public License, as
- * published by the Free Software Foundation; either version 2.1 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
-#pragma once
-
-/* Function used only for unit testing */
-/* Frees configuration structure */
-void free_config_struct(struct configuration *config);
-
-/* Frees configuration file name string */
-void free_config_file(void);

tests/local.mk

@@ -1,6 +1,4 @@
-EXTRA_DIST += \
-	%D%/taplib.sh \
-	%D%/telemetrics-client.supp
+EXTRA_DIST += %D%/taplib.sh
 
 TEST_EXTENSIONS = .sh
 
@@ -17,6 +15,7 @@ check_PROGRAMS = \
 	%D%/check_probd \
 	%D%/check_postd \
 	%D%/check_probes \
+	%D%/check_ncb64  \
 	%D%/check_journal \
 	%D%/check_libtelemetry
 
@@ -24,7 +23,6 @@ dist_check_SCRIPTS = \
 	%D%/create-core.sh
 
 %C%_check_config_SOURCES = \
-	%D%/configuration_check.h \
 	%D%/check_config.c
 
 %C%_check_config_CFLAGS = \
@@ -43,7 +41,6 @@ endif
 endif
 
 %C%_check_probd_SOURCES = \
-	%D%/configuration_check.h \
 	%D%/check_probd.c \
 	src/telemdaemon.c \
 	src/telemdaemon.h \
@@ -93,7 +90,6 @@ EXTRA_DIST += \
 %C%_check_postd_LDADD = \
         @CHECK_LIBS@ \
         @CURL_LIBS@ \
-        @JSON_C_LIBS@ \
         $(top_builddir)/src/libtelem-shared.la
 
 if LOG_SYSTEMD
@@ -159,6 +155,25 @@ if HAVE_SYSTEMD_JOURNAL
 endif
 endif
 
+%C%_check_ncb64_SOURCES = \
+	%D%/check_ncb64.c \
+	src/nica/b64enc.h \
+	src/nica/b64enc.c
+
+%C%_check_ncb64_CFLAGS = \
+	$(AM_CFLAGS) \
+	@CHECK_CFLAGS@
+
+%C%_check_ncb64_LDADD = \
+	@CHECK_LIBS@
+
+EXTRA_DIST += \
+	%D%/nc_b64enc_test_files/empty \
+	%D%/nc_b64enc_test_files/fo \
+	%D%/nc_b64enc_test_files/foob \
+	%D%/nc_b64enc_test_files/foobar \
+	%D%/nc_b64enc_test_files/long_text
+
 %C%_check_journal_SOURCES = \
 	%D%/check_journal.c \
 	src/journal/journal.c \
@@ -201,14 +216,4 @@ if LOG_SYSTEMD
 endif
 endif
 
-@VALGRIND_CHECK_RULES@
-VALGRIND_SUPPRESSIONS_FILES = %D%/telemetrics-client.supp
-VALGRIND_FLAGS = \
-	--error-exitcode=1 \
-	--track-origins=yes \
-	--leak-resolution=low \
-	--verbose \
-	--leak-check=full \
-	--show-possibly-lost=no
-
 # vim: filetype=automake tabstop=8 shiftwidth=8 noexpandtab

tests/read_oopsfile.c

@@ -1,19 +1,3 @@
-/*
- * This program is part of the Clear Linux Project
- *
- * Copyright 2015 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms and conditions of the GNU Lesser General Public License, as
- * published by the Free Software Foundation; either version 2.1 of the License,
- * or (at your option) any later version.
- *
- * This program is distributed in the hope it will be useful, but WITHOUT ANY
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- */
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
@@ -52,18 +36,26 @@ char *readfile(char *filepath)
                         if (fread(bufp, sizeof(char), buflen, fp) != buflen) {
                                 telem_log(LOG_ERR, "Error reading file\n");
                         } else {
-                                bufp[buflen] = '\0';
+                                bufp[++buflen] = '\0';
                         }
                 }
                 if (fclose(fp) != 0) {
                         printf("Error closing file: %s\n", strerror(errno));
                 }
+                //free(bufp);
         } else {
                 telem_log(LOG_ERR, "Wrong file pathname: %s", filepath);
         }
 
         return bufp;
 }
+/*
+   char *getbuf()
+   {
+
+   return bufp;
+   }
+ */
 
 unsigned long getbuflen()
 {

tests/telemetrics-client.supp

@@ -1,38 +0,0 @@
-#  This program is part of the Clear Linux Project
-#
-#  Copyright 2020 Intel Corporation
-#
-#  This program is free software; you can redistribute it and/or modify it under
-#  the terms and conditions of the GNU Lesser General Public License, as
-#  published by the Free Software Foundation; either version 2.1 of the License,
-#  or (at your option) any later version.
-#
-#  This program is distributed in the hope it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-#  A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
-#  details.
-
-
-# False positive when check is run with CK_FORK=yes
-{
-        ck_fork_yes_false_positive
-        Memcheck:Leak
-        fun:malloc
-        fun:UnknownInlinedFun
-        fun:UnknownInlinedFun
-        fun:tag_string_to_list
-        fun:UnknownInlinedFun
-        fun:srunner_run_tagged
-        fun:main
-}
-
-# False positive returned by call to shell script from
-# with in test.
-{
-        ck_shell_call
-        Memcheck:Leak
-        fun:malloc
-        fun:xmalloc
-        fun:set_default_locale
-        fun:main
-}