Adding upstream version 8.2402.0.upstream/8.2402.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 1727 insertions, 0 deletions

diff --git a/contrib/omamqp1/Makefile.am b/contrib/omamqp1/Makefile.am
new file mode 100644
index 0000000..8cc3b0b
--- /dev/null
+++ b/contrib/omamqp1/Makefile.am
@@ -0,0 +1,8 @@
+pkglib_LTLIBRARIES = omamqp1.la
+
+omamqp1_la_SOURCES = omamqp1.c
+omamqp1_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(PROTON_CFLAGS)
+omamqp1_la_LDFLAGS = -module -avoid-version
+omamqp1_la_LIBADD = $(PROTON_LIBS) $(PTHREADS_LIBS)
+
+EXTRA_DIST = 
diff --git a/contrib/omamqp1/Makefile.in b/contrib/omamqp1/Makefile.in
new file mode 100644
index 0000000..5b86d3a
--- /dev/null
+++ b/contrib/omamqp1/Makefile.in
@@ -0,0 +1,798 @@
+# Makefile.in generated by automake 1.16.1 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994-2018 Free Software Foundation, Inc.
+
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__is_gnu_make = { \
+  if test -z '$(MAKELEVEL)'; then \
+    false; \
+  elif test -n '$(MAKE_HOST)'; then \
+    true; \
+  elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
+    true; \
+  else \
+    false; \
+  fi; \
+}
+am__make_running_with_option = \
+  case $${target_option-} in \
+      ?) ;; \
+      *) echo "am__make_running_with_option: internal error: invalid" \
+              "target option '$${target_option-}' specified" >&2; \
+         exit 1;; \
+  esac; \
+  has_opt=no; \
+  sane_makeflags=$$MAKEFLAGS; \
+  if $(am__is_gnu_make); then \
+    sane_makeflags=$$MFLAGS; \
+  else \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        bs=\\; \
+        sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \
+          | sed "s/$$bs$$bs[$$bs $$bs	]*//g"`;; \
+    esac; \
+  fi; \
+  skip_next=no; \
+  strip_trailopt () \
+  { \
+    flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \
+  }; \
+  for flg in $$sane_makeflags; do \
+    test $$skip_next = yes && { skip_next=no; continue; }; \
+    case $$flg in \
+      *=*|--*) continue;; \
+        -*I) strip_trailopt 'I'; skip_next=yes;; \
+      -*I?*) strip_trailopt 'I';; \
+        -*O) strip_trailopt 'O'; skip_next=yes;; \
+      -*O?*) strip_trailopt 'O';; \
+        -*l) strip_trailopt 'l'; skip_next=yes;; \
+      -*l?*) strip_trailopt 'l';; \
+      -[dEDm]) skip_next=yes;; \
+      -[JT]) skip_next=yes;; \
+    esac; \
+    case $$flg in \
+      *$$target_option*) has_opt=yes; break;; \
+    esac; \
+  done; \
+  test $$has_opt = yes
+am__make_dryrun = (target_option=n; $(am__make_running_with_option))
+am__make_keepgoing = (target_option=k; $(am__make_running_with_option))
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = contrib/omamqp1
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ac_check_define.m4 \
+	$(top_srcdir)/m4/atomic_operations.m4 \
+	$(top_srcdir)/m4/atomic_operations_64bit.m4 \
+	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
+	$(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
+	$(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(pkglibdir)"
+LTLIBRARIES = $(pkglib_LTLIBRARIES)
+am__DEPENDENCIES_1 =
+omamqp1_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
+am_omamqp1_la_OBJECTS = omamqp1_la-omamqp1.lo
+omamqp1_la_OBJECTS = $(am_omamqp1_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+omamqp1_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(omamqp1_la_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_P = $(am__v_P_@AM_V@)
+am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_@AM_V@)
+am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+am__v_GEN_0 = @echo "  GEN     " $@;
+am__v_GEN_1 = 
+AM_V_at = $(am__v_at_@AM_V@)
+am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+am__v_at_0 = @
+am__v_at_1 = 
+DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__maybe_remake_depfiles = depfiles
+am__depfiles_remade = ./$(DEPDIR)/omamqp1_la-omamqp1.Plo
+am__mv = mv -f
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CFLAGS) $(CFLAGS)
+AM_V_CC = $(am__v_CC_@AM_V@)
+am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
+am__v_CC_0 = @echo "  CC      " $@;
+am__v_CC_1 = 
+CCLD = $(CC)
+LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CCLD = $(am__v_CCLD_@AM_V@)
+am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
+am__v_CCLD_0 = @echo "  CCLD    " $@;
+am__v_CCLD_1 = 
+SOURCES = $(omamqp1_la_SOURCES)
+DIST_SOURCES = $(omamqp1_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+# Read a list of newline-separated strings from the standard input,
+# and print each of them once, without duplicates.  Input order is
+# *not* preserved.
+am__uniquify_input = $(AWK) '\
+  BEGIN { nonempty = 0; } \
+  { items[$$0] = 1; nonempty = 1; } \
+  END { if (nonempty) { for (i in items) print i; }; } \
+'
+# Make sure the list of sources is unique.  This is necessary because,
+# e.g., the same source file might be shared among _SOURCES variables
+# for different programs/libraries.
+am__define_uniq_tagged_files = \
+  list='$(am__tagged_files)'; \
+  unique=`for i in $$list; do \
+    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+  done | $(am__uniquify_input)`
+ETAGS = etags
+CTAGS = ctags
+am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
+APU_CFLAGS = @APU_CFLAGS@
+APU_LIBS = @APU_LIBS@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CIVETWEB_LIBS = @CIVETWEB_LIBS@
+CONF_FILE_PATH = @CONF_FILE_PATH@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CURL_CFLAGS = @CURL_CFLAGS@
+CURL_LIBS = @CURL_LIBS@
+CYGPATH_W = @CYGPATH_W@
+CZMQ_CFLAGS = @CZMQ_CFLAGS@
+CZMQ_LIBS = @CZMQ_LIBS@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DL_LIBS = @DL_LIBS@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FAUP_LIBS = @FAUP_LIBS@
+FGREP = @FGREP@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GNUTLS_CFLAGS = @GNUTLS_CFLAGS@
+GNUTLS_LIBS = @GNUTLS_LIBS@
+GREP = @GREP@
+GSS_LIBS = @GSS_LIBS@
+GT_KSI_LS12_CFLAGS = @GT_KSI_LS12_CFLAGS@
+GT_KSI_LS12_LIBS = @GT_KSI_LS12_LIBS@
+HASH_XXHASH_LIBS = @HASH_XXHASH_LIBS@
+HIREDIS_CFLAGS = @HIREDIS_CFLAGS@
+HIREDIS_LIBS = @HIREDIS_LIBS@
+IMUDP_LIBS = @IMUDP_LIBS@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+IP = @IP@
+JAVA = @JAVA@
+JAVAC = @JAVAC@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LEX = @LEX@
+LEXLIB = @LEXLIB@
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LIBCAPNG_CFLAGS = @LIBCAPNG_CFLAGS@
+LIBCAPNG_LIBS = @LIBCAPNG_LIBS@
+LIBCAPNG_PRESENT_CFLAGS = @LIBCAPNG_PRESENT_CFLAGS@
+LIBCAPNG_PRESENT_LIBS = @LIBCAPNG_PRESENT_LIBS@
+LIBDBI_CFLAGS = @LIBDBI_CFLAGS@
+LIBDBI_LIBS = @LIBDBI_LIBS@
+LIBESTR_CFLAGS = @LIBESTR_CFLAGS@
+LIBESTR_LIBS = @LIBESTR_LIBS@
+LIBEVENT_CFLAGS = @LIBEVENT_CFLAGS@
+LIBEVENT_LIBS = @LIBEVENT_LIBS@
+LIBFASTJSON_CFLAGS = @LIBFASTJSON_CFLAGS@
+LIBFASTJSON_LIBS = @LIBFASTJSON_LIBS@
+LIBGCRYPT_CFLAGS = @LIBGCRYPT_CFLAGS@
+LIBGCRYPT_CONFIG = @LIBGCRYPT_CONFIG@
+LIBGCRYPT_LIBS = @LIBGCRYPT_LIBS@
+LIBLOGGING_CFLAGS = @LIBLOGGING_CFLAGS@
+LIBLOGGING_LIBS = @LIBLOGGING_LIBS@
+LIBLOGGING_STDLOG_CFLAGS = @LIBLOGGING_STDLOG_CFLAGS@
+LIBLOGGING_STDLOG_LIBS = @LIBLOGGING_STDLOG_LIBS@
+LIBLOGNORM_CFLAGS = @LIBLOGNORM_CFLAGS@
+LIBLOGNORM_LIBS = @LIBLOGNORM_LIBS@
+LIBLZ4_CFLAGS = @LIBLZ4_CFLAGS@
+LIBLZ4_LIBS = @LIBLZ4_LIBS@
+LIBM = @LIBM@
+LIBMONGOC_CFLAGS = @LIBMONGOC_CFLAGS@
+LIBMONGOC_LIBS = @LIBMONGOC_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBRDKAFKA_CFLAGS = @LIBRDKAFKA_CFLAGS@
+LIBRDKAFKA_LIBS = @LIBRDKAFKA_LIBS@
+LIBS = @LIBS@
+LIBSYSTEMD_CFLAGS = @LIBSYSTEMD_CFLAGS@
+LIBSYSTEMD_JOURNAL_CFLAGS = @LIBSYSTEMD_JOURNAL_CFLAGS@
+LIBSYSTEMD_JOURNAL_LIBS = @LIBSYSTEMD_JOURNAL_LIBS@
+LIBSYSTEMD_LIBS = @LIBSYSTEMD_LIBS@
+LIBTOOL = @LIBTOOL@
+LIBUUID_CFLAGS = @LIBUUID_CFLAGS@
+LIBUUID_LIBS = @LIBUUID_LIBS@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+MYSQL_CFLAGS = @MYSQL_CFLAGS@
+MYSQL_CONFIG = @MYSQL_CONFIG@
+MYSQL_LIBS = @MYSQL_LIBS@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_CFLAGS = @OPENSSL_CFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PGSQL_CFLAGS = @PGSQL_CFLAGS@
+PGSQL_LIBS = @PGSQL_LIBS@
+PG_CONFIG = @PG_CONFIG@
+PID_FILE_PATH = @PID_FILE_PATH@
+PKG_CONFIG = @PKG_CONFIG@
+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
+PROTON_CFLAGS = @PROTON_CFLAGS@
+PROTON_LIBS = @PROTON_LIBS@
+PROTON_PROACTOR_CFLAGS = @PROTON_PROACTOR_CFLAGS@
+PROTON_PROACTOR_LIBS = @PROTON_PROACTOR_LIBS@
+PTHREADS_CFLAGS = @PTHREADS_CFLAGS@
+PTHREADS_LIBS = @PTHREADS_LIBS@
+PYTHON = @PYTHON@
+PYTHON_EXEC_PREFIX = @PYTHON_EXEC_PREFIX@
+PYTHON_PLATFORM = @PYTHON_PLATFORM@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_VERSION = @PYTHON_VERSION@
+RABBITMQ_CFLAGS = @RABBITMQ_CFLAGS@
+RABBITMQ_LIBS = @RABBITMQ_LIBS@
+RANLIB = @RANLIB@
+READLINK = @READLINK@
+REDIS = @REDIS@
+RELP_CFLAGS = @RELP_CFLAGS@
+RELP_LIBS = @RELP_LIBS@
+RSRT_CFLAGS = @RSRT_CFLAGS@
+RSRT_CFLAGS1 = @RSRT_CFLAGS1@
+RSRT_LIBS = @RSRT_LIBS@
+RSRT_LIBS1 = @RSRT_LIBS1@
+RST2MAN = @RST2MAN@
+RT_LIBS = @RT_LIBS@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+SNMP_CFLAGS = @SNMP_CFLAGS@
+SNMP_LIBS = @SNMP_LIBS@
+SOL_LIBS = @SOL_LIBS@
+STRIP = @STRIP@
+TCL_BIN_DIR = @TCL_BIN_DIR@
+TCL_INCLUDE_SPEC = @TCL_INCLUDE_SPEC@
+TCL_LIB_FILE = @TCL_LIB_FILE@
+TCL_LIB_FLAG = @TCL_LIB_FLAG@
+TCL_LIB_SPEC = @TCL_LIB_SPEC@
+TCL_PATCH_LEVEL = @TCL_PATCH_LEVEL@
+TCL_SRC_DIR = @TCL_SRC_DIR@
+TCL_STUB_LIB_FILE = @TCL_STUB_LIB_FILE@
+TCL_STUB_LIB_FLAG = @TCL_STUB_LIB_FLAG@
+TCL_STUB_LIB_SPEC = @TCL_STUB_LIB_SPEC@
+TCL_VERSION = @TCL_VERSION@
+UDPSPOOF_CFLAGS = @UDPSPOOF_CFLAGS@
+UDPSPOOF_LIBS = @UDPSPOOF_LIBS@
+VALGRIND = @VALGRIND@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+WARN_LDFLAGS = @WARN_LDFLAGS@
+WARN_SCANNERFLAGS = @WARN_SCANNERFLAGS@
+WGET = @WGET@
+YACC = @YACC@
+YACC_FOUND = @YACC_FOUND@
+YFLAGS = @YFLAGS@
+ZLIB_CFLAGS = @ZLIB_CFLAGS@
+ZLIB_LIBS = @ZLIB_LIBS@
+ZSTD_CFLAGS = @ZSTD_CFLAGS@
+ZSTD_LIBS = @ZSTD_LIBS@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+moddirs = @moddirs@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+pkgpyexecdir = @pkgpyexecdir@
+pkgpythondir = @pkgpythondir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+pyexecdir = @pyexecdir@
+pythondir = @pythondir@
+runstatedir = @runstatedir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+pkglib_LTLIBRARIES = omamqp1.la
+omamqp1_la_SOURCES = omamqp1.c
+omamqp1_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS) $(PROTON_CFLAGS)
+omamqp1_la_LDFLAGS = -module -avoid-version
+omamqp1_la_LIBADD = $(PROTON_LIBS) $(PTHREADS_LIBS)
+EXTRA_DIST = 
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .c .lo .o .obj
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/omamqp1/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu contrib/omamqp1/Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pkglibdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \
+	}
+
+uninstall-pkglibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \
+	done
+
+clean-pkglibLTLIBRARIES:
+	-test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES)
+	@list='$(pkglib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+
+omamqp1.la: $(omamqp1_la_OBJECTS) $(omamqp1_la_DEPENDENCIES) $(EXTRA_omamqp1_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(omamqp1_la_LINK) -rpath $(pkglibdir) $(omamqp1_la_OBJECTS) $(omamqp1_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/omamqp1_la-omamqp1.Plo@am__quote@ # am--include-marker
+
+$(am__depfiles_remade):
+	@$(MKDIR_P) $(@D)
+	@echo '# dummy' >$@-t && $(am__mv) $@-t $@
+
+am--depfiles: $(am__depfiles_remade)
+
+.c.o:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
+
+.c.obj:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.c.lo:
+@am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCC_TRUE@	$(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCC_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
+
+omamqp1_la-omamqp1.lo: omamqp1.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(omamqp1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT omamqp1_la-omamqp1.lo -MD -MP -MF $(DEPDIR)/omamqp1_la-omamqp1.Tpo -c -o omamqp1_la-omamqp1.lo `test -f 'omamqp1.c' || echo '$(srcdir)/'`omamqp1.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/omamqp1_la-omamqp1.Tpo $(DEPDIR)/omamqp1_la-omamqp1.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='omamqp1.c' object='omamqp1_la-omamqp1.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(omamqp1_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o omamqp1_la-omamqp1.lo `test -f 'omamqp1.c' || echo '$(srcdir)/'`omamqp1.c
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+ID: $(am__tagged_files)
+	$(am__define_uniq_tagged_files); mkid -fID $$unique
+tags: tags-am
+TAGS: tags
+
+tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	set x; \
+	here=`pwd`; \
+	$(am__define_uniq_tagged_files); \
+	shift; \
+	if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
+	  test -n "$$unique" || unique=$$empty_fix; \
+	  if test $$# -gt 0; then \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      "$$@" $$unique; \
+	  else \
+	    $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	      $$unique; \
+	  fi; \
+	fi
+ctags: ctags-am
+
+CTAGS: ctags
+ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files)
+	$(am__define_uniq_tagged_files); \
+	test -z "$(CTAGS_ARGS)$$unique" \
+	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+	     $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && $(am__cd) $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) "$$here"
+cscopelist: cscopelist-am
+
+cscopelist-am: $(am__tagged_files)
+	list='$(am__tagged_files)'; \
+	case "$(srcdir)" in \
+	  [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \
+	  *) sdir=$(subdir)/$(srcdir) ;; \
+	esac; \
+	for i in $$list; do \
+	  if test -f "$$i"; then \
+	    echo "$(subdir)/$$i"; \
+	  else \
+	    echo "$$sdir/$$i"; \
+	  fi; \
+	done >> $(top_builddir)/cscope.files
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+distdir: $(BUILT_SOURCES)
+	$(MAKE) $(AM_MAKEFLAGS) distdir-am
+
+distdir-am: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+installdirs:
+	for dir in "$(DESTDIR)$(pkglibdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+	mostlyclean-am
+
+distclean: distclean-am
+		-rm -f ./$(DEPDIR)/omamqp1_la-omamqp1.Plo
+	-rm -f Makefile
+distclean-am: clean-am distclean-compile distclean-generic \
+	distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am: install-pkglibLTLIBRARIES
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+		-rm -f ./$(DEPDIR)/omamqp1_la-omamqp1.Plo
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-pkglibLTLIBRARIES
+
+.MAKE: install-am install-strip
+
+.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \
+	clean-generic clean-libtool clean-pkglibLTLIBRARIES \
+	cscopelist-am ctags ctags-am distclean distclean-compile \
+	distclean-generic distclean-libtool distclean-tags distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pkglibLTLIBRARIES install-ps \
+	install-ps-am install-strip installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
+	uninstall-am uninstall-pkglibLTLIBRARIES
+
+.PRECIOUS: Makefile
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/contrib/omamqp1/omamqp1.c b/contrib/omamqp1/omamqp1.c
new file mode 100644
index 0000000..38d0022
--- /dev/null
+++ b/contrib/omamqp1/omamqp1.c
@@ -0,0 +1,921 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *
+ * omamqp1.c
+ *
+ * This output plugin enables rsyslog to send messages to an AMQP 1.0 protocol
+ * compliant message bus.
+ *
+ * AMQP glue code Copyright (C) 2015-2016 Kenneth A. Giusti
+ * <kgiusti@gmail.com>
+ */
+
+#include "config.h"
+#include "rsyslog.h"
+#include <stdio.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include "conf.h"
+#include "syslogd-types.h"
+#include "srUtils.h"
+#include "template.h"
+#include "module-template.h"
+#include "errmsg.h"
+#include "cfsysline.h"
+
+#include <pthread.h>
+#include <time.h>
+#include <proton/reactor.h>
+#include <proton/handlers.h>
+#include <proton/event.h>
+#include <proton/connection.h>
+#include <proton/session.h>
+#include <proton/link.h>
+#include <proton/delivery.h>
+#include <proton/message.h>
+#include <proton/transport.h>
+#include <proton/sasl.h>
+#include <proton/url.h>
+#include <proton/version.h>
+
+
+/* work-around issues in this contributed module */
+#pragma GCC diagnostic ignored "-Wswitch-enum"
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+
+MODULE_TYPE_OUTPUT
+MODULE_TYPE_NOKEEP
+MODULE_CNFNAME("omamqp1")
+
+
+/* internal structures
+ */
+DEF_OMOD_STATIC_DATA
+
+
+/* Settings for the action */
+typedef struct _configSettings {
+	pn_url_t *url;      /* address of message bus */
+	uchar *username;    /* authentication credentials */
+	uchar *password;
+	uchar *target;      /* endpoint for sent log messages */
+	uchar *templateName;
+	int bDisableSASL;   /* do not enable SASL? 0-enable 1-disable */
+	int idleTimeout;    /* disconnect idle connection (seconds) */
+	int reconnectDelay; /* pause before re-connecting (seconds) */
+	int maxRetries;   /* drop unrouteable messages after maxRetries attempts */
+} configSettings_t;
+
+
+/* Control for communicating with the protocol engine thread */
+
+typedef enum {          // commands sent to protocol thread
+	COMMAND_DONE,       // marks command complete
+	COMMAND_SEND,       // send a message to the message bus
+	COMMAND_IS_READY,   // is the connection to the message bus active?
+	COMMAND_SHUTDOWN    // cleanup and terminate protocol thread.
+} commands_t;
+
+
+typedef struct _threadIPC {
+	pthread_mutex_t lock;
+	pthread_cond_t condition;
+	commands_t command;
+	rsRetVal result;    // of command
+	pn_message_t *message;
+	uint64_t    tag;    // per message id
+} threadIPC_t;
+
+
+/* per-instance data */
+
+typedef struct _instanceData {
+	configSettings_t config;
+	threadIPC_t ipc;
+	int bThreadRunning;
+	pthread_t thread_id;
+	pn_reactor_t *reactor;
+	pn_handler_t *handler;
+	pn_message_t *message;
+	int log_count;
+} instanceData;
+
+typedef struct wrkrInstanceData {
+	instanceData *pData;
+} wrkrInstanceData_t;
+
+
+/* glue code */
+
+typedef void dispatch_t(pn_handler_t *, pn_event_t *, pn_event_type_t);
+
+static void _init_thread_ipc(threadIPC_t *pIPC);
+static void _clean_thread_ipc(threadIPC_t *ipc);
+static void _init_config_settings(configSettings_t *pConfig);
+static void _clean_config_settings(configSettings_t *pConfig);
+static rsRetVal _shutdown_thread(instanceData *pData);
+static rsRetVal _new_handler(pn_handler_t **handler,
+	                         pn_reactor_t *reactor,
+	                         dispatch_t *dispatcher,
+	                         configSettings_t *config,
+	                         threadIPC_t *ipc);
+static void _del_handler(pn_handler_t *handler);
+static rsRetVal _launch_protocol_thread(instanceData *pData);
+static rsRetVal _shutdown_thread(instanceData *pData);
+static rsRetVal _issue_command(threadIPC_t *ipc,
+	                           pn_reactor_t *reactor,
+	                           commands_t command,
+	                           pn_message_t *message);
+static void dispatcher(pn_handler_t *handler,
+	                   pn_event_t *event,
+	                   pn_event_type_t type);
+
+
+/* tables for interfacing with the v6 config system */
+/* action (instance) parameters */
+static struct cnfparamdescr actpdescr[] = {
+	{ "host", eCmdHdlrGetWord, CNFPARAM_REQUIRED },
+	{ "target", eCmdHdlrGetWord, CNFPARAM_REQUIRED },
+	{ "username", eCmdHdlrGetWord, 0 },
+	{ "password", eCmdHdlrGetWord, 0 },
+	{ "template", eCmdHdlrGetWord, 0 },
+	{ "idleTimeout", eCmdHdlrNonNegInt, 0 },
+	{ "reconnectDelay", eCmdHdlrPositiveInt, 0 },
+	{ "maxRetries", eCmdHdlrNonNegInt, 0 },
+	{ "disableSASL", eCmdHdlrInt, 0 }
+};
+static struct cnfparamblk actpblk = {
+	CNFPARAMBLK_VERSION,
+	sizeof(actpdescr)/sizeof(struct cnfparamdescr),
+	actpdescr
+};
+
+
+BEGINisCompatibleWithFeature
+CODESTARTisCompatibleWithFeature
+{
+	if (eFeat == sFEATURERepeatedMsgReduction)
+		iRet = RS_RET_OK;
+}
+ENDisCompatibleWithFeature
+
+
+BEGINcreateInstance
+CODESTARTcreateInstance
+{
+	memset(pData, 0, sizeof(instanceData));
+	_init_config_settings(&pData->config);
+	_init_thread_ipc(&pData->ipc);
+}
+ENDcreateInstance
+
+
+BEGINcreateWrkrInstance
+CODESTARTcreateWrkrInstance
+ENDcreateWrkrInstance
+
+
+BEGINfreeWrkrInstance
+CODESTARTfreeWrkrInstance
+ENDfreeWrkrInstance
+
+
+BEGINfreeInstance
+CODESTARTfreeInstance
+{
+	_shutdown_thread(pData);
+	_clean_config_settings(&pData->config);
+	_clean_thread_ipc(&pData->ipc);
+	if (pData->reactor) pn_reactor_free(pData->reactor);
+	if (pData->handler) pn_handler_free(pData->handler);
+	if (pData->message) pn_message_free(pData->message);
+}
+ENDfreeInstance
+
+
+BEGINdbgPrintInstInfo
+CODESTARTdbgPrintInstInfo
+{
+	configSettings_t *cfg = &pData->config;
+	dbgprintf("omamqp1:\n");
+	dbgprintf("  host=%s\n", pn_url_str(cfg->url));
+	dbgprintf("  username=%s\n", cfg->username);
+	//dbgprintf("  password=%s\n", pData->password);
+	dbgprintf("  target=%s\n", cfg->target);
+	dbgprintf("  template=%s\n", cfg->templateName);
+	dbgprintf("  disableSASL=%d\n", cfg->bDisableSASL);
+	dbgprintf("  idleTimeout=%d\n", cfg->idleTimeout);
+	dbgprintf("  reconnectDelay=%d\n", cfg->reconnectDelay);
+	dbgprintf("  maxRetries=%d\n", cfg->maxRetries);
+	dbgprintf("  running=%d\n", pData->bThreadRunning);
+}
+ENDdbgPrintInstInfo
+
+
+BEGINtryResume
+CODESTARTtryResume
+{
+	// is the link active?
+	instanceData *pData = pWrkrData->pData;
+	iRet = _issue_command(&pData->ipc, pData->reactor, COMMAND_IS_READY, NULL);
+}
+ENDtryResume
+
+
+BEGINbeginTransaction
+CODESTARTbeginTransaction
+{
+	DBGPRINTF("omamqp1: beginTransaction\n");
+	instanceData *pData = pWrkrData->pData;
+	pData->log_count = 0;
+	if (pData->message) pn_message_free(pData->message);
+	pData->message = pn_message();
+	CHKmalloc(pData->message);
+	pn_data_t *body = pn_message_body(pData->message);
+	pn_data_put_list(body);
+	pn_data_enter(body);
+}
+finalize_it:
+ENDbeginTransaction
+
+
+BEGINdoAction
+CODESTARTdoAction
+{
+	DBGPRINTF("omamqp1: doAction\n");
+	instanceData *pData = pWrkrData->pData;
+	if (!pData->message) ABORT_FINALIZE(RS_RET_OK);
+	pn_bytes_t msg = pn_bytes(strlen((const char *)ppString[0]),
+		(const char *)ppString[0]);
+	pn_data_t *body = pn_message_body(pData->message);
+	pn_data_put_string(body, msg);
+	pData->log_count++;
+	iRet = RS_RET_DEFER_COMMIT;
+}
+finalize_it:
+ENDdoAction
+
+
+BEGINendTransaction
+CODESTARTendTransaction
+{
+	DBGPRINTF("omamqp1: endTransaction\n");
+	instanceData *pData = pWrkrData->pData;
+	if (!pData->message) ABORT_FINALIZE(RS_RET_OK);
+	pn_data_t *body = pn_message_body(pData->message);
+	pn_data_exit(body);
+	pn_message_t *message = pData->message;
+	pData->message = NULL;
+	if (pData->log_count > 0) {
+		DBGPRINTF("omamqp1: sending [%d] records\n", pData->log_count);
+		CHKiRet(_issue_command(&pData->ipc, pData->reactor, COMMAND_SEND, message));
+	} else {
+		DBGPRINTF("omamqp1: no log messages to send\n");
+		pn_message_free(message);
+	}
+}
+finalize_it:
+ENDendTransaction
+
+
+BEGINnewActInst
+	struct cnfparamvals *pvals;
+	int i;
+	configSettings_t *cs;
+CODESTARTnewActInst
+{
+	if ((pvals = nvlstGetParams(lst, &actpblk, NULL)) == NULL) {
+		ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS);
+	}
+
+	CHKiRet(createInstance(&pData));
+	cs = &pData->config;
+
+	CODE_STD_STRING_REQUESTnewActInst(1);
+
+	for(i = 0 ; i < actpblk.nParams ; ++i) {
+		if (!pvals[i].bUsed)
+			continue;
+		if (!strcmp(actpblk.descr[i].name, "host")) {
+			char *u = es_str2cstr(pvals[i].val.d.estr, NULL);
+			cs->url = pn_url_parse(u);
+			if (!cs->url) {
+				LogError(0, RS_RET_CONF_PARSE_ERROR, "omamqp1: Invalid host URL configured: '%s'", u);
+				free(u);
+				ABORT_FINALIZE(RS_RET_CONF_PARSE_ERROR);
+			}
+			free(u);
+		} else if (!strcmp(actpblk.descr[i].name, "template")) {
+			cs->templateName = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
+		} else if (!strcmp(actpblk.descr[i].name, "target")) {
+			cs->target = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
+		} else if (!strcmp(actpblk.descr[i].name, "username")) {
+			cs->username = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
+		} else if (!strcmp(actpblk.descr[i].name, "password")) {
+			cs->password = (uchar*)es_str2cstr(pvals[i].val.d.estr, NULL);
+		} else if (!strcmp(actpblk.descr[i].name, "reconnectDelay")) {
+			cs->reconnectDelay = (int) pvals[i].val.d.n;
+		} else if (!strcmp(actpblk.descr[i].name, "idleTimeout")) {
+			cs->idleTimeout = (int) pvals[i].val.d.n;
+		} else if (!strcmp(actpblk.descr[i].name, "maxRetries")) {
+			cs->maxRetries = (int) pvals[i].val.d.n;
+		} else if (!strcmp(actpblk.descr[i].name, "disableSASL")) {
+			cs->bDisableSASL = (int) pvals[i].val.d.n;
+		} else {
+			dbgprintf("omamqp1: program error, unrecognized param '%s', ignored.\n",
+			actpblk.descr[i].name);
+		}
+	}
+
+	CHKiRet(OMSRsetEntry(*ppOMSR, 0, (uchar*)strdup((cs->templateName == NULL)
+		? "RSYSLOG_FileFormat" : (char*)cs->templateName), OMSR_NO_RQD_TPL_OPTS));
+
+	// once configuration is known, start the protocol engine thread
+	pData->reactor = pn_reactor();
+	CHKmalloc(pData->reactor);
+	CHKiRet(_new_handler(&pData->handler, pData->reactor, dispatcher, &pData->config, &pData->ipc));
+	CHKiRet(_launch_protocol_thread(pData));
+}
+CODE_STD_FINALIZERnewActInst
+	cnfparamvalsDestruct(pvals, &actpblk);
+ENDnewActInst
+
+
+NO_LEGACY_CONF_parseSelectorAct
+
+
+BEGINmodExit
+CODESTARTmodExit
+ENDmodExit
+
+
+BEGINqueryEtryPt
+	CODESTARTqueryEtryPt
+	CODEqueryEtryPt_STD_OMOD_QUERIES
+	CODEqueryEtryPt_STD_CONF2_CNFNAME_QUERIES
+	CODEqueryEtryPt_STD_CONF2_OMOD_QUERIES
+	CODEqueryEtryPt_TXIF_OMOD_QUERIES   /* use transaction interface */
+	CODEqueryEtryPt_STD_OMOD8_QUERIES
+ENDqueryEtryPt
+
+
+BEGINmodInit()
+CODESTARTmodInit
+{
+	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current
+						interface specification */
+CODEmodInit_QueryRegCFSLineHdlr
+	INITChkCoreFeature(bCoreSupportsBatching, CORE_FEATURE_BATCHING);
+	DBGPRINTF("omamqp1: module compiled with rsyslog version %s.\n", VERSION);
+	DBGPRINTF("omamqp1: %susing transactional output interface.\n", bCoreSupportsBatching ? "" : "not ");
+}
+ENDmodInit
+
+
+///////////////////////////////////////
+// All the Proton-specific glue code //
+///////////////////////////////////////
+
+
+/* state maintained by the protocol thread */
+
+typedef struct {
+	const configSettings_t *config;
+	threadIPC_t   *ipc;
+	pn_reactor_t *reactor;  // AMQP 1.0 protocol engine
+	pn_connection_t *conn;
+	pn_link_t *sender;
+	pn_delivery_t *delivery;
+	char *encode_buffer;
+	size_t buffer_size;
+	uint64_t tag;
+	int msgs_sent;
+	int msgs_settled;
+	int retries;
+	sbool stopped;
+} protocolState_t;
+
+// protocolState_t is embedded in the engine handler
+#define PROTOCOL_STATE(eh) ((protocolState_t *) pn_handler_mem(eh))
+
+
+static void _init_config_settings(configSettings_t *pConfig)
+{
+	memset(pConfig, 0, sizeof(configSettings_t));
+	pConfig->reconnectDelay = 5;
+	pConfig->maxRetries = 10;
+}
+
+
+static void _clean_config_settings(configSettings_t *pConfig)
+{
+	if (pConfig->url) pn_url_free(pConfig->url);
+	if (pConfig->username) free(pConfig->username);
+	if (pConfig->password) free(pConfig->password);
+	if (pConfig->target) free(pConfig->target);
+	if (pConfig->templateName) free(pConfig->templateName);
+	memset(pConfig, 0, sizeof(configSettings_t));
+}
+
+
+static void _init_thread_ipc(threadIPC_t *pIPC)
+{
+	memset(pIPC, 0, sizeof(threadIPC_t));
+	pthread_mutex_init(&pIPC->lock, NULL);
+	pthread_cond_init(&pIPC->condition, NULL);
+	pIPC->command = COMMAND_DONE;
+	pIPC->result = RS_RET_OK;
+}
+
+static void _clean_thread_ipc(threadIPC_t *ipc)
+{
+	pthread_cond_destroy(&ipc->condition);
+	pthread_mutex_destroy(&ipc->lock);
+}
+
+
+// create a new handler for the engine and set up the protocolState
+static rsRetVal _new_handler(pn_handler_t **handler,
+				pn_reactor_t *reactor,
+				dispatch_t *dispatch,
+				configSettings_t *config,
+				threadIPC_t *ipc)
+{
+	DEFiRet;
+	*handler = pn_handler_new(dispatch, sizeof(protocolState_t), _del_handler);
+	CHKmalloc(*handler);
+	pn_handler_add(*handler, pn_handshaker());
+	protocolState_t *pState = PROTOCOL_STATE(*handler);
+	memset(pState, 0, sizeof(protocolState_t));
+	pState->buffer_size = 64;  // will grow if not enough
+	pState->encode_buffer = (char *)malloc(pState->buffer_size);
+	CHKmalloc(pState->encode_buffer);
+	pState->reactor = reactor;
+	pState->stopped = false;
+	// these are _references_, don't free them:
+	pState->config = config;
+	pState->ipc = ipc;
+
+finalize_it:
+	RETiRet;
+}
+
+
+// in case existing buffer too small
+static rsRetVal _grow_buffer(protocolState_t *pState)
+{
+	DEFiRet;
+	pState->buffer_size *= 2;
+	free(pState->encode_buffer);
+	pState->encode_buffer = (char *)malloc(pState->buffer_size);
+	CHKmalloc(pState->encode_buffer);
+
+finalize_it:
+	RETiRet;
+}
+
+
+/* release the pn_handler_t instance. Do not call this directly,
+ * it will be called by the reactor when all references to the
+ * handler have been released.
+ */
+static void _del_handler(pn_handler_t *handler)
+{
+	protocolState_t *pState = PROTOCOL_STATE(handler);
+	if (pState->encode_buffer) free(pState->encode_buffer);
+}
+
+
+// Close the sender and its parent session and connection
+static void _close_connection(protocolState_t *ps)
+{
+	if (ps->sender) {
+		pn_link_close(ps->sender);
+		pn_session_close(pn_link_session(ps->sender));
+	}
+	if (ps->conn) pn_connection_close(ps->conn);
+}
+
+static void _abort_command(protocolState_t *ps)
+{
+	threadIPC_t *ipc = ps->ipc;
+
+	pthread_mutex_lock(&ipc->lock);
+	switch (ipc->command) {
+	case COMMAND_SEND:
+	  dbgprintf("omamqp1: aborted the message send in progress\n");
+	  CASE_FALLTHROUGH
+	case COMMAND_IS_READY:
+	  ipc->result = RS_RET_SUSPENDED;
+	  ipc->command = COMMAND_DONE;
+	  pthread_cond_signal(&ipc->condition);
+	  break;
+	case COMMAND_SHUTDOWN: // cannot be aborted
+	case COMMAND_DONE:
+	  break;
+	}
+	pthread_mutex_unlock(&ipc->lock);
+}
+
+
+// log a protocol error received from the message bus
+static void _log_error(const char *message, pn_condition_t *cond)
+{
+	const char *name = pn_condition_get_name(cond);
+	const char *desc = pn_condition_get_description(cond);
+	dbgprintf("omamqp1: %s %s:%s\n",
+	          message,
+	          (name) ? name : "<no name>",
+	          (desc) ? desc : "<no description>");
+}
+
+
+/* is the link ready to send messages? */
+static sbool _is_ready(pn_link_t *link)
+{
+	return (link
+	        && pn_link_state(link) == (PN_LOCAL_ACTIVE | PN_REMOTE_ACTIVE)
+	        && pn_link_credit(link) > 0);
+}
+
+
+/* Process each event emitted by the protocol engine */
+static void dispatcher(pn_handler_t *handler, pn_event_t *event, pn_event_type_t type)
+{
+	protocolState_t *ps = PROTOCOL_STATE(handler);
+	const configSettings_t *cfg = ps->config;
+
+	//DBGPRINTF("omamqp1: Event received: %s\n", pn_event_type_name(type));
+
+	switch (type) {
+
+	case PN_LINK_REMOTE_OPEN:
+	    DBGPRINTF("omamqp1: Message bus opened link.\n");
+	    break;
+
+	case PN_DELIVERY:
+	    // has the message been delivered to the message bus?
+	    if (ps->delivery) {
+	        assert(ps->delivery == pn_event_delivery(event));
+	        if (pn_delivery_updated(ps->delivery)) {
+	            rsRetVal result = RS_RET_IDLE;
+	            uint64_t rs = pn_delivery_remote_state(ps->delivery);
+	            switch (rs) {
+	            case PN_ACCEPTED:
+	                DBGPRINTF("omamqp1: Message ACCEPTED by message bus\n");
+	                result = RS_RET_OK;
+	                break;
+	            case PN_REJECTED:
+	              dbgprintf("omamqp1: message bus rejected log message: invalid message - dropping\n");
+	                // message bus considers this a 'bad message'. Cannot be redelivered.
+	                // Likely a configuration error. Drop the message by returning OK
+	                result = RS_RET_OK;
+	                break;
+	            case PN_RELEASED:
+	            case PN_MODIFIED:
+		// the message bus cannot accept the message.  This may be temporary - retry
+		// up to maxRetries before dropping
+	                if (++ps->retries >= cfg->maxRetries) {
+	                  dbgprintf("omamqp1: message bus failed to accept message - dropping\n");
+	                  result = RS_RET_OK;
+	                } else {
+	                  dbgprintf("omamqp1: message bus cannot accept message, retrying\n");
+	                  result = RS_RET_SUSPENDED;
+	                }
+	                break;
+	            case PN_RECEIVED:
+	                // not finished yet, wait for next delivery update
+	                break;
+	            default:
+	                // no other terminal states defined, so ignore anything else
+	                dbgprintf("omamqp1: unknown delivery state=0x%lX, assuming message accepted\n",
+	                          (unsigned long) pn_delivery_remote_state(ps->delivery));
+	                result = RS_RET_OK;
+	                break;
+	            }
+
+	            if (result != RS_RET_IDLE) {
+	                // the command is complete
+	                threadIPC_t *ipc = ps->ipc;
+	                pthread_mutex_lock(&ipc->lock);
+	                assert(ipc->command == COMMAND_SEND);
+	                ipc->result = result;
+	                ipc->command = COMMAND_DONE;
+	                pthread_cond_signal(&ipc->condition);
+	                pthread_mutex_unlock(&ipc->lock);
+	                pn_delivery_settle(ps->delivery);
+	                ps->delivery = NULL;
+	                if (result == RS_RET_OK) {
+	                  ps->retries = 0;
+	                }
+	            }
+	        }
+	    }
+	    break;
+
+
+	case PN_CONNECTION_BOUND:
+	    if (!cfg->bDisableSASL) {
+	        // force use of SASL, even allowing PLAIN authentication
+	        pn_sasl_t *sasl = pn_sasl(pn_event_transport(event));
+#if PN_VERSION_MAJOR == 0 && PN_VERSION_MINOR >= 10
+	        pn_sasl_set_allow_insecure_mechs(sasl, true);
+#else
+	        // proton version <= 0.9 only supports PLAIN authentication
+	        const char *user = cfg->username
+	            ? (char *)cfg->username
+	            : pn_url_get_username(cfg->url);
+	        if (user) {
+	            pn_sasl_plain(sasl, user, (cfg->password
+	                                       ? (char *) cfg->password
+	                                       : pn_url_get_password(cfg->url)));
+	        }
+#endif
+	    }
+	    if (cfg->idleTimeout) {
+	        // configured as seconds, set as milliseconds
+	        pn_transport_set_idle_timeout(pn_event_transport(event),
+	                                      cfg->idleTimeout * 1000);
+	    }
+	    break;
+
+	case PN_CONNECTION_UNBOUND:
+	    DBGPRINTF("omamqp1: cleaning up connection resources\n");
+	    pn_connection_release(pn_event_connection(event));
+	    ps->conn = NULL;
+	    ps->sender = NULL;
+	    ps->delivery = NULL;
+	    break;
+
+
+	case PN_TRANSPORT_ERROR:
+	    {
+	        // TODO: if auth failure, does it make sense to retry???
+	        pn_transport_t *tport = pn_event_transport(event);
+	        pn_condition_t *cond = pn_transport_condition(tport);
+	        if (pn_condition_is_set(cond)) {
+	            _log_error("transport failure", cond);
+	        }
+	        dbgprintf("omamqp1: network transport failed, reconnecting...\n");
+	        // the protocol thread will attempt to reconnect if it is not
+	        // being shut down
+	    }
+	    break;
+
+	default:
+	    break;
+	}
+}
+
+
+// Send a command to the protocol thread and
+// wait for the command to complete
+static rsRetVal _issue_command(threadIPC_t *ipc,
+	                           pn_reactor_t *reactor,
+	                           commands_t command,
+	                           pn_message_t *message)
+{
+	DEFiRet;
+
+	DBGPRINTF("omamqp1: Sending command %d to protocol thread\n", command);
+
+	pthread_mutex_lock(&ipc->lock);
+
+	if (message) {
+	    assert(ipc->message == NULL);
+	    ipc->message = message;
+	}
+	assert(ipc->command == COMMAND_DONE);
+	ipc->command = command;
+	pn_reactor_wakeup(reactor);
+	while (ipc->command != COMMAND_DONE) {
+	    pthread_cond_wait(&ipc->condition, &ipc->lock);
+	}
+	iRet = ipc->result;
+	if (ipc->message) {
+	    pn_message_free(ipc->message);
+	    ipc->message = NULL;
+	}
+
+	pthread_mutex_unlock(&ipc->lock);
+
+	DBGPRINTF("omamqp1: Command %d completed, status=%d\n", command, iRet);
+	RETiRet;
+}
+
+
+// check if a command needs processing
+static void _poll_command(protocolState_t *ps)
+{
+	if (ps->stopped) return;
+
+	threadIPC_t *ipc = ps->ipc;
+
+	pthread_mutex_lock(&ipc->lock);
+
+	switch (ipc->command) {
+
+	case COMMAND_SHUTDOWN:
+	    DBGPRINTF("omamqp1: Protocol thread processing shutdown command\n");
+	    ps->stopped = true;
+	    _close_connection(ps);
+	    // wait for the shutdown to complete before ack'ing this command
+	    break;
+
+	case COMMAND_IS_READY:
+	    DBGPRINTF("omamqp1: Protocol thread processing ready query command\n");
+	    ipc->result = _is_ready(ps->sender)
+	                  ? RS_RET_OK
+	                  : RS_RET_SUSPENDED;
+	    ipc->command = COMMAND_DONE;
+	    pthread_cond_signal(&ipc->condition);
+	    break;
+
+	case COMMAND_SEND:
+	    if (ps->delivery) break;  // currently processing this command
+	    DBGPRINTF("omamqp1: Protocol thread processing send message command\n");
+	    if (!_is_ready(ps->sender)) {
+	        ipc->result = RS_RET_SUSPENDED;
+	        ipc->command = COMMAND_DONE;
+	        pthread_cond_signal(&ipc->condition);
+	        break;
+	    }
+
+	    // send the message
+	    ++ps->tag;
+	    ps->delivery = pn_delivery(ps->sender,
+	                               pn_dtag((const char *)&ps->tag, sizeof(ps->tag)));
+	    pn_message_t *message = ipc->message;
+	    assert(message);
+
+	    int rc = 0;
+	    size_t len = ps->buffer_size;
+	    do {
+	        rc = pn_message_encode(message, ps->encode_buffer, &len);
+	        if (rc == PN_OVERFLOW) {
+	            _grow_buffer(ps);
+	            len = ps->buffer_size;
+	        }
+	    } while (rc == PN_OVERFLOW);
+
+	    pn_link_send(ps->sender, ps->encode_buffer, len);
+	    pn_link_advance(ps->sender);
+	    ++ps->msgs_sent;
+	    // command completes when remote updates the delivery (see PN_DELIVERY)
+	    break;
+
+	case COMMAND_DONE:
+	    break;
+	}
+
+	pthread_mutex_unlock(&ipc->lock);
+}
+
+/* runs the protocol engine, allowing it to handle TCP socket I/O and timer
+ * events in the background.
+*/
+static void *amqp1_thread(void *arg)
+{
+
+	pn_handler_t *handler = (pn_handler_t *)arg;
+	protocolState_t *ps = PROTOCOL_STATE(handler);
+	const configSettings_t *cfg = ps->config;
+
+	// have pn_reactor_process() exit after 5 sec to poll for commands
+	pn_reactor_set_timeout(ps->reactor, 5000);
+	pn_reactor_start(ps->reactor);
+
+	while (!ps->stopped) {
+	    // setup a connection:
+	    const char *host = pn_url_get_host(cfg->url);
+	    const char *port = pn_url_get_port(cfg->url);
+	    if (!port) port = "5672";
+
+#if PN_VERSION_MAJOR == 0 && PN_VERSION_MINOR >= 13
+	    ps->conn = pn_reactor_connection_to_host(ps->reactor,
+	                                             host,
+	                                             port,
+	                                             handler);
+	    pn_connection_set_hostname(ps->conn, host);
+#else
+	    {
+	        char host_addr[300];
+	        ps->conn = pn_reactor_connection(ps->reactor, handler);
+	        snprintf(host_addr, sizeof(host_addr), "%s:%s", host, port);
+	        pn_connection_set_hostname(ps->conn, host_addr);
+	    }
+#endif
+	    pn_connection_set_container(ps->conn, "rsyslogd-omamqp1");
+
+#if PN_VERSION_MAJOR == 0 && PN_VERSION_MINOR >= 10
+	    // proton version <= 0.9 did not support Cyrus SASL
+	    const char *user = cfg->username
+	        ? (char *)cfg->username
+	        : pn_url_get_username(cfg->url);
+	    if (user)
+	        pn_connection_set_user(ps->conn, user);
+
+	    const char *pword = cfg->password
+	        ? (char *) cfg->password
+	        : pn_url_get_password(cfg->url);
+	    if (pword)
+	        pn_connection_set_password(ps->conn, pword);
+#endif
+	    pn_connection_open(ps->conn);
+	    pn_session_t *ssn = pn_session(ps->conn);
+	    pn_session_open(ssn);
+	    ps->sender = pn_sender(ssn, (char *)cfg->target);
+	    pn_link_set_snd_settle_mode(ps->sender, PN_SND_UNSETTLED);
+	    char *addr = (char *)ps->config->target;
+	    pn_terminus_set_address(pn_link_target(ps->sender), addr);
+	    pn_terminus_set_address(pn_link_source(ps->sender), addr);
+	    pn_link_open(ps->sender);
+
+	    // run the protocol engine until the connection closes or thread is shut down
+	    sbool engine_running = true;
+	    while (engine_running) {
+	        engine_running = pn_reactor_process(ps->reactor);
+	        _poll_command(ps);
+	    }
+
+	    _abort_command(ps);   // unblock main thread if necessary
+
+	    // delay reconnectDelay seconds before re-connecting:
+	    int delay = ps->config->reconnectDelay;
+	    while (delay-- > 0 && !ps->stopped) {
+	        srSleep(1, 0);
+	        _poll_command(ps);
+	    }
+	}
+	pn_reactor_stop(ps->reactor);
+	// stop command is now done:
+	threadIPC_t *ipc = ps->ipc;
+	pthread_mutex_lock(&ipc->lock);
+	ipc->result = RS_RET_OK;
+	ipc->command = COMMAND_DONE;
+	pthread_cond_signal(&ipc->condition);
+	pthread_mutex_unlock(&ipc->lock);
+
+	DBGPRINTF("omamqp1: Protocol thread stopped\n");
+
+	return 0;
+}
+
+
+static rsRetVal _launch_protocol_thread(instanceData *pData)
+{
+	int rc;
+	DBGPRINTF("omamqp1: Starting protocol thread\n");
+	do {
+	    rc = pthread_create(&pData->thread_id, NULL, amqp1_thread, pData->handler);
+	    if (!rc) {
+	        pData->bThreadRunning = true;
+	        return RS_RET_OK;
+	    }
+	} while (rc == EAGAIN);
+	LogError(0, RS_RET_SYS_ERR, "omamqp1: thread create failed: %d", rc);
+	return RS_RET_SYS_ERR;
+}
+
+static rsRetVal _shutdown_thread(instanceData *pData)
+{
+	DEFiRet;
+
+	if (pData->bThreadRunning) {
+	    DBGPRINTF("omamqp1: shutting down thread...\n");
+	    CHKiRet(_issue_command(&pData->ipc, pData->reactor, COMMAND_SHUTDOWN, NULL));
+	    pthread_join(pData->thread_id, NULL);
+	    pData->bThreadRunning = false;
+	    DBGPRINTF("omamqp1: thread shutdown complete\n");
+	}
+
+finalize_it:
+	RETiRet;
+}
+
+
+
+/* vi:set ai:
+ */
+