Adding upstream version 8.2402.0.upstream/8.2402.0

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

3 files changed, 2180 insertions, 0 deletions

diff --git a/plugins/mmanon/Makefile.am b/plugins/mmanon/Makefile.am
new file mode 100644
index 0000000..98f0da2
--- /dev/null
+++ b/plugins/mmanon/Makefile.am
@@ -0,0 +1,8 @@
+pkglib_LTLIBRARIES = mmanon.la
+
+mmanon_la_SOURCES = mmanon.c
+mmanon_la_CPPFLAGS =  $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
+mmanon_la_LDFLAGS = -module -avoid-version
+mmanon_la_LIBADD = 
+
+EXTRA_DIST = 
diff --git a/plugins/mmanon/Makefile.in b/plugins/mmanon/Makefile.in
new file mode 100644
index 0000000..e3fc686
--- /dev/null
+++ b/plugins/mmanon/Makefile.in
@@ -0,0 +1,797 @@
+# 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 = plugins/mmanon
+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)
+mmanon_la_DEPENDENCIES =
+am_mmanon_la_OBJECTS = mmanon_la-mmanon.lo
+mmanon_la_OBJECTS = $(am_mmanon_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 = 
+mmanon_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+	$(mmanon_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)/mmanon_la-mmanon.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 = $(mmanon_la_SOURCES)
+DIST_SOURCES = $(mmanon_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 = mmanon.la
+mmanon_la_SOURCES = mmanon.c
+mmanon_la_CPPFLAGS = $(RSRT_CFLAGS) $(PTHREADS_CFLAGS)
+mmanon_la_LDFLAGS = -module -avoid-version
+mmanon_la_LIBADD = 
+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 plugins/mmanon/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu plugins/mmanon/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}; \
+	}
+
+mmanon.la: $(mmanon_la_OBJECTS) $(mmanon_la_DEPENDENCIES) $(EXTRA_mmanon_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(mmanon_la_LINK) -rpath $(pkglibdir) $(mmanon_la_OBJECTS) $(mmanon_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT)
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mmanon_la-mmanon.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 $@ $<
+
+mmanon_la-mmanon.lo: mmanon.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mmanon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mmanon_la-mmanon.lo -MD -MP -MF $(DEPDIR)/mmanon_la-mmanon.Tpo -c -o mmanon_la-mmanon.lo `test -f 'mmanon.c' || echo '$(srcdir)/'`mmanon.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mmanon_la-mmanon.Tpo $(DEPDIR)/mmanon_la-mmanon.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='mmanon.c' object='mmanon_la-mmanon.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) $(mmanon_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mmanon_la-mmanon.lo `test -f 'mmanon.c' || echo '$(srcdir)/'`mmanon.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)/mmanon_la-mmanon.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)/mmanon_la-mmanon.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/plugins/mmanon/mmanon.c b/plugins/mmanon/mmanon.c
new file mode 100644
index 0000000..811b763
--- /dev/null
+++ b/plugins/mmanon/mmanon.c
@@ -0,0 +1,1375 @@
+/* mmanon.c
+ * anonnymize IP addresses inside the syslog message part
+ *
+ * Copyright 2013 Adiscon GmbH.
+ *
+ * This file is part of rsyslog.
+ *
+ * Licensed 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
+ *       -or-
+ *       see COPYING.ASL20 in the source distribution
+ *
+ * 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.
+ */
+#include "config.h"
+#include "rsyslog.h"
+#include <stdio.h>
+#include <ctype.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <assert.h>
+#include <signal.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdint.h>
+#include "conf.h"
+#include "syslogd-types.h"
+#include "srUtils.h"
+#include "template.h"
+#include "module-template.h"
+#include "errmsg.h"
+#include "parserif.h"
+#include "hashtable.h"
+
+
+
+MODULE_TYPE_OUTPUT
+MODULE_TYPE_NOKEEP
+MODULE_CNFNAME("mmanon")
+
+
+DEF_OMOD_STATIC_DATA
+
+/* config variables */
+
+// enumerator for the mode
+enum mode {ZERO, RANDOMINT, SIMPLE};
+
+union node {
+	struct {
+		union node* more;
+		union node* less;
+	} pointer;
+	struct {
+		char ip_high[16];
+		char ip_low[16];
+	} ips;
+};
+
+struct ipv6_int {
+	unsigned long long high;
+	unsigned long long low;
+	};
+/* define operation modes we have */
+#define SIMPLE_MODE 0	 /* just overwrite */
+#define REWRITE_MODE 1	 /* rewrite IP address, canoninized */
+typedef struct _instanceData {
+	struct {
+		sbool enable;
+		int8_t bits;
+		union node* Root;
+		int randConsis;
+		enum mode mode;
+		uchar replaceChar;
+	} ipv4;
+
+	struct {
+		sbool enable;
+		uint8_t bits;
+		enum mode anonmode;
+		int randConsis;
+		struct hashtable* hash;
+	} ipv6;
+
+	struct {
+		sbool enable;
+		uint8_t bits;
+		enum mode anonmode;
+		int randConsis;
+		struct hashtable* hash;
+	} embeddedIPv4;
+} instanceData;
+
+typedef struct wrkrInstanceData {
+	instanceData *pData;
+	unsigned randstatus;
+} wrkrInstanceData_t;
+
+struct modConfData_s {
+	rsconf_t *pConf;	/* our overall config object */
+};
+static modConfData_t *loadModConf = NULL;/* modConf ptr to use for the current load process */
+static modConfData_t *runModConf = NULL;/* modConf ptr to use for the current exec process */
+
+
+/* tables for interfacing with the v6 config system */
+/* action (instance) parameters */
+static struct cnfparamdescr actpdescr[] = {
+	{ "ipv4.enable", eCmdHdlrBinary, 0 },
+	{ "ipv4.mode", eCmdHdlrGetWord, 0 },
+	{ "mode", eCmdHdlrGetWord, 0 },
+	{ "ipv4.bits", eCmdHdlrPositiveInt, 0 },
+	{ "ipv4.replacechar", eCmdHdlrGetChar, 0},
+	{ "replacementchar", eCmdHdlrGetChar, 0},
+	{ "ipv6.enable", eCmdHdlrBinary, 0 },
+	{ "ipv6.anonmode", eCmdHdlrGetWord, 0 },
+	{ "ipv6.bits", eCmdHdlrPositiveInt, 0 },
+	{ "embeddedipv4.enable", eCmdHdlrBinary, 0 },
+	{ "embeddedipv4.anonmode", eCmdHdlrGetWord, 0 },
+	{ "embeddedipv4.bits", eCmdHdlrPositiveInt, 0 }
+};
+static struct cnfparamblk actpblk =
+	{ CNFPARAMBLK_VERSION,
+	  sizeof(actpdescr)/sizeof(struct cnfparamdescr),
+	  actpdescr
+	};
+
+BEGINbeginCnfLoad
+CODESTARTbeginCnfLoad
+	loadModConf = pModConf;
+	pModConf->pConf = pConf;
+ENDbeginCnfLoad
+
+BEGINendCnfLoad
+CODESTARTendCnfLoad
+ENDendCnfLoad
+
+BEGINcheckCnf
+CODESTARTcheckCnf
+ENDcheckCnf
+
+BEGINactivateCnf
+CODESTARTactivateCnf
+	runModConf = pModConf;
+ENDactivateCnf
+
+BEGINfreeCnf
+CODESTARTfreeCnf
+ENDfreeCnf
+
+
+BEGINcreateInstance
+CODESTARTcreateInstance
+ENDcreateInstance
+
+BEGINcreateWrkrInstance
+CODESTARTcreateWrkrInstance
+	pWrkrData->randstatus = time(NULL);
+ENDcreateWrkrInstance
+
+
+BEGINisCompatibleWithFeature
+CODESTARTisCompatibleWithFeature
+ENDisCompatibleWithFeature
+
+
+static void
+delTree(union node* node, const int layer)
+{
+	if(node == NULL){
+		return;
+	}
+	if(layer == 31){
+		free(node);
+	} else {
+		delTree(node->pointer.more, layer + 1);
+		delTree(node->pointer.less, layer + 1);
+		free(node);
+	}
+}
+
+
+BEGINfreeInstance
+CODESTARTfreeInstance
+	delTree(pData->ipv4.Root, 0);
+	if(pData->ipv6.hash != NULL) {
+		hashtable_destroy(pData->ipv6.hash, 1);
+	}
+	if(pData->embeddedIPv4.hash != NULL) {
+		hashtable_destroy(pData->embeddedIPv4.hash, 1);
+	}
+ENDfreeInstance
+
+
+BEGINfreeWrkrInstance
+CODESTARTfreeWrkrInstance
+ENDfreeWrkrInstance
+
+
+static inline void
+setInstParamDefaults(instanceData *pData)
+{
+		pData->ipv4.enable = 1;
+		pData->ipv4.bits = 16;
+		pData->ipv4.Root = NULL;
+		pData->ipv4.randConsis = 0;
+		pData->ipv4.mode = ZERO;
+		pData->ipv4.replaceChar = 'x';
+
+		pData->ipv6.enable = 1;
+		pData->ipv6.bits = 96;
+		pData->ipv6.anonmode = ZERO;
+		pData->ipv6.randConsis = 0;
+		pData->ipv6.hash = NULL;
+
+		pData->embeddedIPv4.enable = 1;
+		pData->embeddedIPv4.bits = 96;
+		pData->embeddedIPv4.anonmode = ZERO;
+		pData->embeddedIPv4.randConsis = 0;
+		pData->embeddedIPv4.hash = NULL;
+}
+
+BEGINnewActInst
+	struct cnfparamvals *pvals;
+	int i;
+CODESTARTnewActInst
+	DBGPRINTF("newActInst (mmanon)\n");
+	if((pvals = nvlstGetParams(lst, &actpblk, NULL)) == NULL) {
+		ABORT_FINALIZE(RS_RET_MISSING_CNFPARAMS);
+	}
+
+	CODE_STD_STRING_REQUESTnewActInst(1)
+	CHKiRet(OMSRsetEntry(*ppOMSR, 0, NULL, OMSR_TPL_AS_MSG));
+	CHKiRet(createInstance(&pData));
+	setInstParamDefaults(pData);
+
+	for(i = 0 ; i < actpblk.nParams ; ++i) {
+		if(!pvals[i].bUsed)
+			continue;
+		if(!strcmp(actpblk.descr[i].name, "ipv4.mode") || !strcmp(actpblk.descr[i].name, "mode")) {
+			if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"zero",
+					 sizeof("zero")-1)) {
+				pData->ipv4.mode = ZERO;
+			} else if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"random",
+					 sizeof("random")-1)) {
+				pData->ipv4.mode = RANDOMINT;
+			} else if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"simple",
+					 sizeof("simple")-1) ||
+					!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"rewrite",
+					 sizeof("rewrite")-1)) {
+				pData->ipv4.mode = SIMPLE;
+			} else if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"random-consistent",
+					 sizeof("random-consistent")-1)) {
+				pData->ipv4.mode = RANDOMINT;
+				pData->ipv4.randConsis = 1;
+			} else {
+				parser_errmsg("mmanon: configuration error, unknown option for ipv4.mode, "
+					"will use \"zero\"\n");
+			}
+		} else if(!strcmp(actpblk.descr[i].name, "ipv4.bits")) {
+			if((int8_t) pvals[i].val.d.n <= 32) {
+				pData->ipv4.bits = (int8_t) pvals[i].val.d.n;
+			} else {
+				pData->ipv4.bits = 32;
+				parser_errmsg("warning: invalid number of ipv4.bits (%d), corrected "
+				"to 32", (int) pvals[i].val.d.n);
+			}
+		} else if(!strcmp(actpblk.descr[i].name, "ipv4.enable")) {
+			pData->ipv4.enable = (int) pvals[i].val.d.n;
+		} else if(!strcmp(actpblk.descr[i].name, "ipv4.replacechar") || !strcmp(actpblk.descr[i].name,
+			"replacementchar")) {
+			uchar* tmp = (uchar*) es_str2cstr(pvals[i].val.d.estr, NULL);
+			pData->ipv4.replaceChar = tmp[0];
+			free(tmp);
+		} else if(!strcmp(actpblk.descr[i].name, "ipv6.enable")) {
+			pData->ipv6.enable = (int) pvals[i].val.d.n;
+		} else if(!strcmp(actpblk.descr[i].name, "ipv6.bits")) {
+			if((uint8_t) pvals[i].val.d.n <= 128) {
+				pData->ipv6.bits = (uint8_t) pvals[i].val.d.n;
+			} else {
+				pData->ipv6.bits = 128;
+				parser_errmsg("warning: invalid number of ipv6.bits (%d), corrected "
+				"to 128", (int) pvals[i].val.d.n);
+			}
+		} else if(!strcmp(actpblk.descr[i].name, "ipv6.anonmode")) {
+			if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"zero",
+					 sizeof("zero")-1)) {
+				pData->ipv6.anonmode = ZERO;
+			} else if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"random",
+					 sizeof("random")-1)) {
+				pData->ipv6.anonmode = RANDOMINT;
+			} else if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"random-consistent",
+					 sizeof("random-consistent")-1)) {
+				pData->ipv6.anonmode = RANDOMINT;
+				pData->ipv6.randConsis = 1;
+			} else {
+				parser_errmsg("mmanon: configuration error, unknown option for "
+				"ipv6.anonmode, will use \"zero\"\n");
+			}
+		} else if(!strcmp(actpblk.descr[i].name, "embeddedipv4.enable")) {
+			pData->embeddedIPv4.enable = (int) pvals[i].val.d.n;
+		} else if(!strcmp(actpblk.descr[i].name, "embeddedipv4.bits")) {
+			if((uint8_t) pvals[i].val.d.n <= 128) {
+				pData->embeddedIPv4.bits = (uint8_t) pvals[i].val.d.n;
+			} else {
+				pData->embeddedIPv4.bits = 128;
+				parser_errmsg("warning: invalid number of embeddedipv4.bits (%d), "
+					"corrected to 128", (int) pvals[i].val.d.n);
+			}
+		} else if(!strcmp(actpblk.descr[i].name, "embeddedipv4.anonmode")) {
+			if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"zero",
+					 sizeof("zero")-1)) {
+				pData->embeddedIPv4.anonmode = ZERO;
+			} else if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"random",
+					 sizeof("random")-1)) {
+				pData->embeddedIPv4.anonmode = RANDOMINT;
+			} else if(!es_strbufcmp(pvals[i].val.d.estr, (uchar*)"random-consistent",
+					 sizeof("random-consistent")-1)) {
+				pData->embeddedIPv4.anonmode = RANDOMINT;
+				pData->embeddedIPv4.randConsis = 1;
+			} else {
+				parser_errmsg("mmanon: configuration error, unknown option for ipv6.anonmode, "
+				"will use \"zero\"\n");
+			}
+		} else {
+			parser_errmsg("mmanon: program error, non-handled "
+			  "param '%s'\n", actpblk.descr[i].name);
+		}
+	}
+
+	int bHadBitsErr = 0;
+	if(pData->ipv4.mode == SIMPLE) {
+		if(pData->ipv4.bits < 8 && pData->ipv4.bits > -1) {
+			pData->ipv4.bits = 8;
+			bHadBitsErr = 1;
+		} else if(pData->ipv4.bits < 16 && pData->ipv4.bits > 8) {
+			pData->ipv4.bits = 16;
+			bHadBitsErr = 1;
+		} else if(pData->ipv4.bits < 24 && pData->ipv4.bits > 16) {
+			pData->ipv4.bits = 24;
+			bHadBitsErr = 1;
+		} else if((pData->ipv4.bits != 32 && pData->ipv4.bits > 24) || pData->ipv4.bits < 0) {
+			pData->ipv4.bits = 32;
+			bHadBitsErr = 1;
+		}
+		if(bHadBitsErr) {
+			LogError(0, RS_RET_INVLD_ANON_BITS,
+				"mmanon: invalid number of ipv4 bits "
+				"in simple mode, corrected to %d",
+				pData->ipv4.bits);
+		}
+	}
+
+CODE_STD_FINALIZERnewActInst
+	cnfparamvalsDestruct(pvals, &actpblk);
+ENDnewActInst
+
+
+BEGINdbgPrintInstInfo
+CODESTARTdbgPrintInstInfo
+ENDdbgPrintInstInfo
+
+
+BEGINtryResume
+CODESTARTtryResume
+ENDtryResume
+
+
+static int
+getHexVal(char c)
+{
+	if('0' <= c && c <= '9') {
+		return c - '0';
+	} else if('a' <= c && c <= 'f') {
+		return (c - 'a') + 10;
+	} else if('A' <= c && c <= 'F') {
+		return (c - 'A') + 10;
+	} else {
+		return -1;
+	}
+}
+
+
+/* returns 1 if valid IPv4 digit, 0 if not */
+static int
+isPosByte(const uchar *const __restrict__ buf,
+	const size_t buflen,
+	size_t *const __restrict__ nprocessed)
+{
+	int val = 0; /* Default means no byte found */
+	size_t i;
+	for(i = 0 ; i < buflen; i++) {
+		if('0' <= buf[i] && buf[i] <= '9') {
+			/* Maximum 3 digits for single IPv4 Number, we only copy up to 4 numbers
+			 * but process forward to non digits */
+			if (i < 4) {
+				val = val*10 + buf[i]-'0';
+			}
+		} else
+			break;
+	}
+	*nprocessed = i;
+	/* Return 1 if more than 1 and less the 4 digits and between 0 and 255 */
+	if(	i > 0 &&
+		i < 4 &&
+		(val >= 0 && val <= 255)) {
+		return 1;
+	} else {
+		return 0;
+	}
+}
+
+/* 1 - is IPv4, 0 not */
+static int
+syntax_ipv4(const uchar *const __restrict__ buf,
+	const size_t buflen,
+	size_t *const __restrict__ nprocessed)
+{
+	size_t nproc = 0;
+	size_t i;
+	int r = 0;
+	if(isPosByte(buf, buflen, &i) == 0) {
+		goto done;
+	}
+	if(i >= buflen || buf[i] != '.') {
+		goto done;
+	}
+	i++;
+	if(isdigit(buf[i]) == 0 || isPosByte(buf+i, buflen-i, &nproc) == 0) {
+		goto done;
+	}
+	i += nproc;
+
+	if(i >= buflen || buf[i] != '.') {
+		goto done;
+	}
+	i++;
+	if(isdigit(buf[i]) == 0 || isPosByte(buf+i, buflen-i, &nproc) == 0) {
+		goto done;
+	}
+	i += nproc;
+
+	if(i >= buflen || buf[i] != '.') {
+		goto done;
+	}
+	i++;
+	if(isdigit(buf[i]) == 0 || isPosByte(buf+i, buflen-i, &nproc) == 0) {
+		goto done;
+	}
+	i += nproc;
+
+	*nprocessed = i;
+	r = 1;
+done:
+	return r;
+}
+
+
+static int
+isValidHexNum(const uchar *const __restrict__ buf,
+	const size_t buflen,
+	size_t *const __restrict__ nprocessed,
+	int handleDot)
+{
+	size_t idx = 0;
+	int cyc = 0;
+
+	while(idx < buflen) {
+		switch(buf[idx]) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+
+		case 'a':
+		case 'b':
+		case 'c':
+		case 'd':
+		case 'e':
+		case 'f':
+
+		case 'A':
+		case 'B':
+		case 'C':
+		case 'D':
+		case 'E':
+		case 'F':
+			cyc++;
+			(*nprocessed)++;
+			if(cyc == 5) {
+				goto done;
+			}
+			break;
+		case '.':
+			if(handleDot && cyc == 0) {
+				(*nprocessed)++;
+				cyc = -2;
+			}
+			goto done;
+		case ':':
+			if(cyc == 0) {
+				(*nprocessed)++;
+				cyc = -1;
+			}
+			goto done;
+		default:
+			goto done;
+		}
+		idx++;
+	}
+done:
+	return cyc;
+}
+
+
+static int
+syntax_ipv6(const uchar *const __restrict__ buf,
+	const size_t buflen,
+	size_t *const __restrict__ nprocessed)
+{
+	int lastSep = 0;
+	sbool hadAbbrev = 0;
+	sbool lastAbbrev = 0;
+	int ipParts = 0;
+	int numLen;
+	int isIP = 0;
+
+	while(*nprocessed < buflen) {
+		numLen = isValidHexNum(buf + *nprocessed, buflen - *nprocessed, nprocessed, 0);
+		if(numLen > 0 && numLen < 5) {  //found a valid num
+			if((ipParts == 7 && hadAbbrev) || ipParts > 7) {
+				isIP = 0;
+				goto done;
+			}
+			if (ipParts == 0 && lastSep && !hadAbbrev) {
+				isIP = 0;
+				goto done;
+			}
+			lastSep = 0;
+			lastAbbrev = 0;
+			ipParts++;
+		} else if (numLen < 0) {  //':'
+			if(lastSep) {
+				if(hadAbbrev) {
+					isIP = 0;
+					goto done;
+				} else {
+					hadAbbrev = 1;
+					lastAbbrev = 1;
+				}
+			}
+			lastSep = 1;
+		} else if (numLen == 5) {  // maybe truncated with port
+			if(hadAbbrev && ipParts >= 2) {
+				isIP = 1;
+				/* we need to go back 6 chars:
+				 * 5 digits plus leading ":" which designates port!
+				 */
+				*nprocessed -= 6;
+			} else {
+				isIP = 0;
+				/* nprocessed need not be corrected - it's only used if isIP == 1 */
+			}
+			goto done;
+		} else {  //no valid num
+			if(lastSep) {
+				if(lastAbbrev && ipParts < 8) {
+					isIP = 1;
+					goto done;
+				}
+				isIP = 0;
+				goto done;
+			}
+			if((ipParts == 8 && !hadAbbrev) || (ipParts < 8 && hadAbbrev)) {
+				isIP = 1;
+				goto done;
+			} else {
+				isIP = 0;
+				goto done;
+			}
+		}
+		if(ipParts == 8 && !hadAbbrev) {
+			isIP = 1;
+			goto done;
+		}
+	}
+
+	if((!lastSep && (ipParts == 8 && !hadAbbrev)) || (ipParts < 8 && hadAbbrev)) {
+		isIP = 1;
+	}
+
+done:
+	return isIP;
+}
+
+
+static unsigned
+ipv42num(const char *str)
+{
+	unsigned num[4] = {0, 0, 0, 0};
+	unsigned value = -1;
+	size_t len = strlen(str);
+	int cyc = 0;
+	for(unsigned i = 0 ; i < len ; i++) {
+		switch(str[i]) {
+		case '0':
+		case '1':
+		case '2':
+		case '3':
+		case '4':
+		case '5':
+		case '6':
+		case '7':
+		case '8':
+		case '9':
+			num[cyc] = num[cyc]*10+(str[i]-'0');
+			break;
+		case '.':
+			cyc++;
+			break;
+		}
+	}
+
+	value = num[0]*256*256*256+num[1]*256*256+num[2]*256+num[3];
+	return(value);
+}
+
+
+static unsigned
+code_int(unsigned ip, wrkrInstanceData_t *pWrkrData){
+	unsigned random;
+	unsigned long long shiftIP_subst = ip;
+	// variable needed because shift operation of 32nd bit in unsigned does not work
+	switch(pWrkrData->pData->ipv4.mode) {
+	case ZERO:
+		shiftIP_subst = ((shiftIP_subst>>(pWrkrData->pData->ipv4.bits))<<(pWrkrData->pData->ipv4.bits));
+		return (unsigned)shiftIP_subst;
+	case RANDOMINT:
+		shiftIP_subst = ((shiftIP_subst>>(pWrkrData->pData->ipv4.bits))<<(pWrkrData->pData->ipv4.bits));
+		// multiply the random number between 0 and 1 with a mask of (2^n)-1:
+		random = (unsigned)((rand_r(&(pWrkrData->randstatus))/(double)RAND_MAX)*
+			((1ull<<(pWrkrData->pData->ipv4.bits))-1));
+		return (unsigned)shiftIP_subst + random;
+	case SIMPLE:  //can't happen, since this case is caught at the start of anonipv4()
+	default:
+		LogError(0, RS_RET_INTERNAL_ERROR, "mmanon: unexpected code path reached in code_int function");
+		return 0;
+	}
+}
+
+
+static int
+num2ipv4(unsigned num, char *str) {
+	int numip[4];
+	size_t len;
+	for(int i = 0 ; i < 4 ; i++){
+		numip[i] = num % 256;
+		num = num / 256;
+	}
+	len = snprintf(str, 16, "%d.%d.%d.%d", numip[3], numip[2], numip[1], numip[0]);
+	return len;
+}
+
+
+static void
+getip(uchar *start, size_t end, char *address)
+{
+	size_t i;
+
+	for(i = 0; i < end; i++){
+		address[i] = *(start+i);
+	}
+	address[i] = '\0';
+}
+
+/* in case of error with malloc causing abort of function, the
+ * string at the target of address remains the same */
+static rsRetVal
+findip(char* address, wrkrInstanceData_t *pWrkrData)
+{
+	DEFiRet;
+	int i;
+	unsigned num;
+	union node* current;
+	union node* Last;
+	int MoreLess;
+	char* CurrentCharPtr;
+
+	current = pWrkrData->pData->ipv4.Root;
+	num = ipv42num(address);
+	for(i = 0; i < 31; i++){
+		if(pWrkrData->pData->ipv4.Root == NULL) {
+			CHKmalloc(current = (union node*)calloc(1, sizeof(union node)));
+			pWrkrData->pData->ipv4.Root = current;
+		}
+		Last = current;
+		if((num >> (31 - i)) & 1){
+			current = current->pointer.more;
+			MoreLess = 1;
+		} else {
+			current = current->pointer.less;
+			MoreLess = 0;
+		}
+		if(current == NULL){
+			CHKmalloc(current = (union node*)calloc(1, sizeof(union node)));
+			if(MoreLess == 1){
+				Last->pointer.more = current;
+			} else {
+				Last->pointer.less = current;
+			}
+		}
+	}
+	if(num & 1){
+		CurrentCharPtr = current->ips.ip_high;
+	} else {
+		CurrentCharPtr = current->ips.ip_low;
+	}
+	if(CurrentCharPtr[0] != '\0'){
+		strcpy(address, CurrentCharPtr);
+	} else {
+		num = code_int(num, pWrkrData);
+		num2ipv4(num, CurrentCharPtr);
+		strcpy(address, CurrentCharPtr);
+	}
+finalize_it:
+	RETiRet;
+}
+
+
+static void
+process_IPv4 (char* address, wrkrInstanceData_t *pWrkrData)
+{
+	unsigned num;
+
+	if(pWrkrData->pData->ipv4.randConsis){
+		findip(address, pWrkrData);
+	}else {
+		num = ipv42num(address);
+		num = code_int(num, pWrkrData);
+		num2ipv4(num, address);
+	}
+}
+
+
+static void
+simpleAnon(wrkrInstanceData_t *const pWrkrData, uchar *const msg, int *const hasChanged, int iplen)
+{
+	int maxidx = iplen - 1;
+
+	int j = -1;
+	for(int i = (pWrkrData->pData->ipv4.bits / 8); i > 0; i--) {
+		j++;
+		while('0' <= msg[maxidx - j] && msg[maxidx - j] <= '9') {
+			if(msg[maxidx - j] != pWrkrData->pData->ipv4.replaceChar) {
+				msg[maxidx - j] = pWrkrData->pData->ipv4.replaceChar;
+				*hasChanged = 1;
+			}
+			j++;
+		}
+	}
+}
+
+
+static void
+anonipv4(wrkrInstanceData_t *pWrkrData, uchar **msg, int *pLenMsg, int *idx, int *hasChanged)
+{
+	char address[16];
+	char caddress[16];
+	int offset = *idx;
+	uchar* msgcpy = *msg;
+	size_t iplen;
+	size_t caddresslen;
+	int oldLen = *pLenMsg;
+
+	if(syntax_ipv4((*msg) + offset, *pLenMsg - offset, &iplen)) {
+		if(pWrkrData->pData->ipv4.mode == SIMPLE) {
+			simpleAnon(pWrkrData, *msg + *idx, hasChanged, iplen);
+			*idx += iplen;
+			return;
+		}
+
+		assert(iplen < sizeof(address));
+		getip(*msg + offset, iplen, address);
+		offset += iplen;
+		strcpy(caddress, address);
+		process_IPv4(caddress, pWrkrData);
+		caddresslen = strlen(caddress);
+		*hasChanged = 1;
+
+		if(caddresslen != strlen(address)) {
+			*pLenMsg = *pLenMsg + ((int)caddresslen - (int)strlen(address));
+			*msg = (uchar*) malloc(*pLenMsg);
+			memcpy(*msg, msgcpy, *idx);
+		}
+		memcpy(*msg + *idx, caddress, caddresslen);
+		*idx = *idx + caddresslen;
+		if(*idx < *pLenMsg) {
+			memcpy(*msg + *idx, msgcpy + offset, oldLen - offset);
+		}
+		if(msgcpy != *msg) {
+			free(msgcpy);
+		}
+	}
+}
+
+
+static void
+code_ipv6_int(struct ipv6_int* ip, wrkrInstanceData_t *pWrkrData, int useEmbedded)
+{
+	unsigned long long randlow = 0;
+	unsigned long long randhigh = 0;
+	unsigned tmpRand;
+	int fullbits;
+
+	int bits = useEmbedded ? pWrkrData->pData->embeddedIPv4.bits : pWrkrData->pData->ipv6.bits;
+	enum mode anonmode = useEmbedded ? pWrkrData->pData->embeddedIPv4.anonmode : pWrkrData->pData->ipv6.anonmode;
+
+	if(bits == 128) { //has to be handled separately, since shift
+						 //128 bits doesn't work on unsigned long long
+		ip->high = 0;
+		ip->low = 0;
+	} else if(bits > 64) {
+		ip->low = 0;
+		ip->high = (ip->high >> (bits - 64)) <<  (bits - 64);
+	} else if(bits == 64) {
+		ip->low = 0;
+	} else {
+		ip->low = (ip->low >> bits) << bits;
+	}
+	switch(anonmode) {
+	case ZERO:
+		break;
+	case RANDOMINT:
+		if(bits == 128) {
+			for(int i = 0; i < 8; i++) {
+				tmpRand = (unsigned)((rand_r(&(pWrkrData->randstatus))/(double)RAND_MAX)*0xff);
+				ip->high <<= 8;
+				ip->high |= tmpRand;
+
+				tmpRand = (unsigned)((rand_r(&(pWrkrData->randstatus))/(double)RAND_MAX)*0xff);
+				ip->low <<= 8;
+				ip->low |= tmpRand;
+			}
+		} else if(bits > 64) {
+			for(int i = 0; i < 8; i++) {
+				tmpRand = (unsigned)((rand_r(&(pWrkrData->randstatus))/(double)RAND_MAX)*0xff);
+				ip->low <<= 8;
+				ip->low |= tmpRand;
+			}
+
+			bits -= 64;
+			fullbits = bits / 8;
+			bits = bits % 8;
+			while(fullbits > 0) {
+				tmpRand = (unsigned)((rand_r(&(pWrkrData->randstatus))/(double)RAND_MAX)*0xff);
+				randhigh <<= 8;
+				randhigh |= tmpRand;
+				fullbits--;
+			}
+			tmpRand = (unsigned)((rand_r(&(pWrkrData->randstatus))/(double)RAND_MAX)*((1 << bits) - 1));
+			randhigh <<= bits;
+			randhigh |= tmpRand;
+
+			ip->high |= randhigh;
+		} else if(bits == 64) {
+			for(int i = 0; i < 8; i++) {
+				tmpRand = (unsigned)((rand_r(&(pWrkrData->randstatus))/(double)RAND_MAX)*0xff);
+				ip->low <<= 8;
+				ip->low |= tmpRand;
+			}
+		} else {
+			fullbits = bits / 8;
+			bits = bits % 8;
+			while(fullbits > 0) {
+				tmpRand = (unsigned)((rand_r(&(pWrkrData->randstatus))/(double)RAND_MAX)*0xff);
+				randlow <<= 8;
+				randlow |= tmpRand;
+				fullbits--;
+			}
+			tmpRand = (unsigned)((rand_r(&(pWrkrData->randstatus))/(double)RAND_MAX)*((1 << bits) - 1));
+			randlow <<= bits;
+			randlow |= tmpRand;
+
+			ip->low |= randlow;
+		}
+		break;
+	case SIMPLE:  //can't happen, since this case is caught at the start of anonipv4()
+	default:
+		LogError(0, RS_RET_INTERNAL_ERROR, "mmanon: unexpected code path reached in code_int function");
+	}
+}
+
+
+//separate function from recognising ipv6, since the recognition might get more
+//complex. This function always stays
+//the same, since it always gets an valid ipv6 input
+static void
+ipv62num(char* const address, const size_t iplen, struct ipv6_int* const ip)
+{
+	int num[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+	int cyc = 0;
+	int dots = 0;
+	int val;
+	unsigned i;
+
+	for(i = 0; i < iplen && dots < 2; i++) {
+		val = getHexVal(address[i]);
+		if(val == -1) {
+			dots++;
+			if(dots < 2) {
+				cyc++;
+			}
+		} else {
+			num[cyc] = num[cyc] * 16 + val;
+			dots = 0;
+		}
+	}
+	if(dots == 2) {
+		if(i < iplen - 1) {
+			int shift = 0;
+			cyc = 7;
+			for(unsigned j = iplen - 1; j >= i; j--) {
+				val = getHexVal(address[j]);
+				if(val == -1) {
+					cyc--;
+					shift = 0;
+				} else {
+					val <<= shift;
+					shift += 4;
+					num[cyc] += val;
+				}
+			}
+		} else {
+			while(cyc < 8) {
+				num[cyc] = 0;
+				cyc++;
+			}
+		}
+	}
+
+	for(i = 0; i < 4; i++) {
+		ip->high <<= 16;
+		ip->high |= num[i];
+	}
+	while(i < 8) {
+		ip->low <<= 16;
+		ip->low |= num[i];
+		i++;
+	}
+}
+
+
+static void
+num2ipv6 (struct ipv6_int* ip, char* address)
+{
+	int num[8];
+	int i;
+
+	for(i = 7; i > 3; i--) {
+		num[i] = ip->low & 0xffff;
+		ip->low >>= 16;
+	}
+	while(i > -1) {
+		num[i] = ip->high & 0xffff;
+		ip->high >>= 16;
+		i--;
+	}
+
+	snprintf(address, 40, "%x:%x:%x:%x:%x:%x:%x:%x", num[0], num[1], num[2], num[3], num[4], num[5],
+		num[6], num[7]);
+}
+
+
+static int
+keys_equal_fn(void* key1, void* key2)
+{
+	struct ipv6_int *const k1 = (struct ipv6_int*) key1;
+	struct ipv6_int *const k2 = (struct ipv6_int*) key2;
+
+	return((k1->high == k2->high) && (k1->low == k2->low));
+}
+
+
+static unsigned
+hash_from_key_fn (void* k)
+{
+	struct ipv6_int *const key = (struct ipv6_int*) k;
+	unsigned hashVal;
+
+	hashVal = (key->high & 0xFFC00000) | (key->low & 0x3FFFFF);
+	return hashVal;
+}
+
+
+static void
+num2embedded (struct ipv6_int* ip, char* address)
+{
+	int num[8];
+	int i;
+
+	for(i = 7; i > 3; i--) {
+		num[i] = ip->low & 0xffff;
+		ip->low >>= 16;
+	}
+	while(i > -1) {
+		num[i] = ip->high & 0xffff;
+		ip->high >>= 16;
+		i--;
+	}
+
+	snprintf(address, 46, "%x:%x:%x:%x:%x:%x:%d.%d.%d.%d", num[0], num[1], num[2], num[3], num[4], num[5],
+		(num[6] & 0xff00) >> 8, num[6] & 0xff, (num[7] & 0xff00) >> 8, num[7] & 0xff);
+}
+
+
+static rsRetVal
+findIPv6(struct ipv6_int* num, char* address, wrkrInstanceData_t *const pWrkrData, int useEmbedded)
+{
+	struct ipv6_int* hashKey = NULL;
+	DEFiRet;
+	struct hashtable* hash = useEmbedded? pWrkrData->pData->embeddedIPv4.hash : pWrkrData->pData->ipv6.hash;
+
+
+	if(hash == NULL) {
+		CHKmalloc(hash = create_hashtable(512, hash_from_key_fn, keys_equal_fn, NULL));
+		if(useEmbedded) {
+			pWrkrData->pData->embeddedIPv4.hash = hash;
+		} else {
+			pWrkrData->pData->ipv6.hash = hash;
+		}
+	}
+
+	char* val = (char*)(hashtable_search(hash, num));
+
+	if(val != NULL) {
+		strcpy(address, val);
+	} else {
+		CHKmalloc(hashKey = (struct ipv6_int*) malloc(sizeof(struct ipv6_int)));
+		hashKey->low = num->low;
+		hashKey->high = num->high;
+
+		if(useEmbedded) {
+			code_ipv6_int(num, pWrkrData, 1);
+			num2embedded(num, address);
+		} else {
+			code_ipv6_int(num, pWrkrData, 0);
+			num2ipv6(num, address);
+		}
+		char* hashString;
+		CHKmalloc(hashString = strdup(address));
+
+		if(!hashtable_insert(hash, hashKey, hashString)) {
+			DBGPRINTF("hashtable error: insert to %s-table failed",
+				useEmbedded ? "embedded ipv4" : "ipv6");
+			free(hashString);
+			ABORT_FINALIZE(RS_RET_ERR);
+		}
+		hashKey = NULL;
+	}
+finalize_it:
+	free(hashKey);
+	RETiRet;
+}
+
+
+static void
+process_IPv6 (char* address, wrkrInstanceData_t *pWrkrData, const size_t iplen)
+{
+	struct ipv6_int num = {0, 0};
+
+	ipv62num(address, iplen, &num);
+
+	if(pWrkrData->pData->ipv6.randConsis) {
+		findIPv6(&num, address, pWrkrData, 0);
+	} else {
+		code_ipv6_int(&num, pWrkrData, 0);
+		num2ipv6(&num, address);
+	}
+}
+
+
+static void
+anonipv6(wrkrInstanceData_t *pWrkrData, uchar **msg, int *pLenMsg, int *idx, int *hasChanged)
+{
+	size_t iplen = 0;
+	int offset = *idx;
+	char address[40];
+	uchar* msgcpy = *msg;
+	size_t caddresslen;
+	size_t oldLen = *pLenMsg;
+
+	int syn = syntax_ipv6(*msg + offset, *pLenMsg - offset, &iplen);
+	if(syn) {
+		assert(iplen < sizeof(address));  //has to be < instead of <= since address includes space for a '\0'
+		getip(*msg + offset, iplen, address);
+		offset += iplen;
+		process_IPv6(address, pWrkrData, iplen);
+
+		caddresslen = strlen(address);
+		*hasChanged = 1;
+
+		if(caddresslen != iplen) {
+			*pLenMsg = *pLenMsg + ((int)caddresslen - (int)iplen);
+			*msg = (uchar*) malloc(*pLenMsg);
+			memcpy(*msg, msgcpy, *idx);
+		}
+		memcpy(*msg + *idx, address, caddresslen);
+		*idx = *idx + caddresslen;
+		if(*idx < *pLenMsg) {
+			memcpy(*msg + *idx, msgcpy + offset, oldLen - offset);
+		}
+		if(msgcpy != *msg) {
+			free(msgcpy);
+		}
+	}
+}
+
+
+static size_t
+findV4Start(const uchar *const __restrict__ buf, size_t dotPos)
+{
+	while(dotPos > 0) {
+		if(buf[dotPos] == ':') {
+			return dotPos + 1;
+		}
+		dotPos--;
+	}
+	return -1; //should not happen
+}
+
+
+static int
+syntax_embedded(const uchar *const __restrict__ buf,
+	const size_t buflen,
+	size_t *const __restrict__ nprocessed,
+	size_t * v4Start)
+{
+	int lastSep = 0;
+	sbool hadAbbrev = 0;
+	int ipParts = 0;
+	int numLen;
+	int isIP = 0;
+	size_t ipv4Len;
+
+	while(*nprocessed < buflen) {
+		numLen = isValidHexNum(buf + *nprocessed, buflen - *nprocessed, nprocessed, 1);
+		if(numLen > 0) {  //found a valid num
+			if((ipParts == 6 && hadAbbrev) || ipParts > 6) {  //is 6 since the first part of
+									  //IPv4 will also result in a valid hexvalue
+				isIP = 0;
+				goto done;
+			}
+			if (ipParts == 0 && lastSep && !hadAbbrev) {
+				isIP = 0;
+				goto done;
+			}
+			lastSep = 0;
+			ipParts++;
+		} else if (numLen == -1) {  //':'
+			if(lastSep) {
+				if(hadAbbrev) {
+					isIP = 0;
+					goto done;
+				} else {
+					hadAbbrev = 1;
+				}
+			}
+			lastSep = 1;
+		} else if (numLen == -2) {  //'.'
+			if (lastSep || (ipParts == 0 && hadAbbrev) || (ipParts <= 6 && !hadAbbrev)) {
+				isIP = 0;
+				goto done;
+			}
+			*v4Start = findV4Start(buf, (*nprocessed) - 1);
+			if(syntax_ipv4(buf + (*v4Start), buflen, &ipv4Len)) {
+				*nprocessed += (ipv4Len - ((*nprocessed) - (*v4Start)));
+				isIP = 1;
+				goto done;
+			} else {
+				isIP = 0;
+				goto done;
+			}
+		} else {  //no valid num
+			isIP = 0;
+			goto done;
+		}
+	}
+
+	isIP = 0;
+
+done:
+	return isIP;
+}
+
+
+static void
+embedded2num(char* address, size_t v4Start, struct ipv6_int* ip)
+{
+	int num[8] = {0, 0, 0, 0, 0, 0, 0, 0};
+	int cyc = 0;
+	int dots = 0;
+	int val;
+	unsigned i;
+
+	unsigned v4Val = ipv42num(address + v4Start);
+	num[7] = v4Val & 0xffff;
+	num[6] = (v4Val & 0xffff0000) >> 16;
+
+	for(i = 0; i < v4Start && dots < 2; i++) {
+		val = getHexVal(address[i]);
+		if(val == -1) {
+			dots++;
+			if(dots < 2) {
+				cyc++;
+			}
+		} else {
+			num[cyc] = num[cyc] * 16 + val;
+			dots = 0;
+		}
+	}
+	if(dots == 2) {
+		if(i < v4Start) {
+			int shift = 0;
+			cyc = 5;
+			for(unsigned j = v4Start - 1; j >= i; j--) {
+				val = getHexVal(address[j]);
+				if(val == -1) {
+					cyc--;
+					shift = 0;
+				} else {
+					val <<= shift;
+					shift += 4;
+					num[cyc] += val;
+				}
+			}
+		} else {
+			while(cyc < 6) {
+				num[cyc] = 0;
+				cyc++;
+			}
+		}
+	}
+
+	for(i = 0; i < 4; i++) {
+		ip->high <<= 16;
+		ip->high |= num[i];
+	}
+	while(i < 8) {
+		ip->low <<= 16;
+		ip->low |= num[i];
+		i++;
+	}
+}
+
+
+static void
+process_embedded (char* address, wrkrInstanceData_t *pWrkrData, size_t v4Start)
+{
+	struct ipv6_int num = {0, 0};
+
+	embedded2num(address, v4Start, &num);
+
+	if(pWrkrData->pData->embeddedIPv4.randConsis) {
+		findIPv6(&num, address, pWrkrData, 1);
+	} else {
+		code_ipv6_int(&num, pWrkrData, 1);
+		num2embedded(&num, address);
+	}
+}
+
+
+static void
+anonEmbedded(wrkrInstanceData_t *pWrkrData, uchar **msg, int *pLenMsg, int *idx, int *hasChanged)
+{
+	size_t iplen = 0;
+	int offset = *idx;
+	char address[46];
+	uchar* msgcpy = *msg;
+	unsigned caddresslen;
+	size_t oldLen = *pLenMsg;
+	size_t v4Start;
+
+	int syn = syntax_embedded(*msg + offset, *pLenMsg - offset, &iplen, &v4Start);
+	if(syn) {
+		assert(iplen < sizeof(address));
+		getip(*msg + offset, iplen, address);
+		offset += iplen;
+		process_embedded(address, pWrkrData, v4Start);
+
+		caddresslen = strlen(address);
+		*hasChanged = 1;
+
+		if(caddresslen != iplen) {
+			*pLenMsg = *pLenMsg + ((int)caddresslen - (int)iplen);
+			*msg = (uchar*) malloc(*pLenMsg);
+			memcpy(*msg, msgcpy, *idx);
+		}
+		memcpy(*msg + *idx, address, caddresslen);
+		*idx = *idx + caddresslen;
+		if(*idx < *pLenMsg) {
+			memcpy(*msg + *idx, msgcpy + offset, oldLen - offset);
+		}
+		if(msgcpy != *msg) {
+			free(msgcpy);
+		}
+	}
+}
+
+BEGINdoAction_NoStrings
+	smsg_t **ppMsg = (smsg_t **) pMsgData;
+	smsg_t *pMsg = ppMsg[0];
+	uchar *msg;
+	int lenMsg;
+	int i;
+	int hasChanged = 0;
+CODESTARTdoAction
+	lenMsg = getMSGLen(pMsg);
+	msg = (uchar*)strdup((char*)getMSG(pMsg));
+
+	for(i = 0 ; i <= lenMsg - 2 ; i++) {
+		if(pWrkrData->pData->embeddedIPv4.enable) {
+			anonEmbedded(pWrkrData, &msg, &lenMsg, &i, &hasChanged);
+		}
+		if(pWrkrData->pData->ipv4.enable) {
+			anonipv4(pWrkrData, &msg, &lenMsg, &i, &hasChanged);
+		}
+		if(pWrkrData->pData->ipv6.enable) {
+			anonipv6(pWrkrData, &msg, &lenMsg, &i, &hasChanged);
+		}
+	}
+	if(hasChanged) {
+		MsgReplaceMSG(pMsg, msg, lenMsg);
+	}
+	free(msg);
+ENDdoAction
+
+
+NO_LEGACY_CONF_parseSelectorAct
+
+
+BEGINmodExit
+CODESTARTmodExit
+ENDmodExit
+
+
+BEGINqueryEtryPt
+CODESTARTqueryEtryPt
+CODEqueryEtryPt_STD_OMOD_QUERIES
+CODEqueryEtryPt_STD_OMOD8_QUERIES
+CODEqueryEtryPt_STD_CONF2_OMOD_QUERIES
+CODEqueryEtryPt_STD_CONF2_QUERIES
+ENDqueryEtryPt
+
+
+
+BEGINmodInit()
+CODESTARTmodInit
+	*ipIFVersProvided = CURR_MOD_IF_VERSION; /* we only support the current interface specification */
+CODEmodInit_QueryRegCFSLineHdlr
+	DBGPRINTF("mmanon: module compiled with rsyslog version %s.\n", VERSION);
+ENDmodInit