diff --git a/ddns-scripts/Makefile b/ddns-scripts/Makefile
new file mode 100644
index 00000000..9ffc3d2f
--- /dev/null
+++ b/ddns-scripts/Makefile
@@ -0,0 +1,706 @@
+#
+# Copyright (C) 2008-2018 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ddns-scripts
+PKG_VERSION:=2.8.2
+PKG_RELEASE:=43
+
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ddns-scripts/Default
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=IP Addresses and Names
+  PKGARCH:=all
+endef
+
+
+define Package/ddns-scripts
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Dynamic DNS Client scripts (with IPv6 support)
+  DEPENDS:=+ddns-scripts-services
+endef
+
+define Package/ddns-scripts/description
+  Dynamic DNS Client scripts (with IPv6 support)
+  A highly configurable set of scripts for doing dynamic dns updates.
+  - IPv6 support
+  - DNS server support
+  - Glue Record support (require BIND host or KNOT host)
+  - DNS requests via TCP
+  - Proxy server support
+  - log file support
+  - support to run once
+  Version: $(PKG_VERSION)-$(PKG_RELEASE)
+  Info   : https://openwrt.org/docs/guide-user/services/ddns/client
+endef
+
+define Package/ddns-scripts/conffiles
+/etc/config/ddns
+endef
+
+
+define Package/ddns-scripts-services
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Common ddns providers
+  PROVIDES:=ddns-scripts_service
+endef
+
+define Package/ddns-scripts-services/description
+  Dynamic DNS Client definitions for supported services
+endef
+
+define Package/ddns-scripts-utils
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Utility scripts for ddns configs
+  DEPENDS:=ddns-scripts
+endef
+
+define Package/ddns-scripts-utils/description
+  Dynamic DNS Client utility scripts for config files
+endef
+
+
+define Package/ddns-scripts-luadns
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Extension for LuaDNS API v1
+  DEPENDS:=ddns-scripts +curl
+endef
+
+define Package/ddns-scripts-luadns/description
+  Dynamic DNS Client scripts extension for LuaDNS API v1 (require curl)
+endef
+
+define Package/ddns-scripts-cloudflare
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Extension for cloudflare.com API v4
+  DEPENDS:=ddns-scripts +curl
+  PROVIDES:=ddns-scripts_cloudflare.com-v4
+endef
+
+define Package/ddns-scripts-cloudflare/description
+  Dynamic DNS Client scripts extension for cloudflare.com API v4 (require curl)
+endef
+
+
+define Package/ddns-scripts-gcp
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Extension for Google Cloud DNS API v1
+  DEPENDS:=ddns-scripts +curl +openssl-util
+endef
+
+define Package/ddns-scripts-gcp/description
+  Dynamic DNS Client scripts extension for Google Cloud DNS API v1 (requires curl)
+endef
+
+
+define Package/ddns-scripts-freedns
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Extension for freedns.42.pl
+  DEPENDS:=ddns-scripts +curl
+  PROVIDES:=ddns-scripts_freedns_42_pl
+endef
+
+define Package/ddns-scripts-freedns/description
+  Dynamic DNS Client scripts extension for "freedns.42.pl".
+endef
+
+
+define Package/ddns-scripts-godaddy
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Extension for godaddy.com API v1
+  DEPENDS:=ddns-scripts +curl
+  PROVIDES:=ddns-scripts_godaddy.com-v1
+endef
+
+define Package/ddns-scripts-godaddy/description
+  Dynamic DNS Client scripts extension for "godaddy.com API v1".
+endef
+
+
+define Package/ddns-scripts-digitalocean
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Extention for digitalocean.com API v2
+  DEPENDS:=ddns-scripts +curl
+  PROVIDES:=ddns-scripts_digitalocean.com-v2
+endef
+
+define Package/ddns-scripts-digitalocean/description
+  Dynamic DNS Client scripts extension for "digitalocean.com API v2".
+  The script directly updates a DNS record using the DO API.
+  It requires:
+  "option dns_server" to be set to the server to be used by nsupdate.
+  "option domain" the dns domain to update the record for (eg. A-record: home.<example.com>)
+  "option username" the dns record name to update (eg. A-record: <home>.example.com)
+  "option param_opt" the id of the dns record to update (check using chrome inspector in the DO dns tab)
+  "option password" the api token generated in the DO panel
+endef
+
+
+define Package/ddns-scripts-dnspod
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Extension for dnspod.cn API
+  DEPENDS:=ddns-scripts +curl
+endef
+
+define Package/ddns-scripts-dnspod/description
+  Dynamic DNS Client scripts extension for dnspod.cn API (require curl)
+endef
+
+
+define Package/ddns-scripts-noip
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Extension for no-ip.com
+  DEPENDS:=ddns-scripts
+  PROVIDES:=ddns-scripts_no-ip_com
+endef
+
+define Package/ddns-scripts-noip/description
+  Dynamic DNS Client scripts extension for "no-ip.com".
+endef
+
+define Package/ddns-scripts-ns1
+  $(call Package/ddns-scripts/Default)
+  TITLE:=NS1 API
+  DEPENDS:=ddns-scripts +curl
+endef
+
+define Package/ddns-scripts-ns1/description
+  Dynamic DNS Client scripts extension for "ns1.com".
+  It requires:
+  "option username" to be a valid zone for ns1.com
+  "option password" to be a valid API key for ns1.com
+endef
+
+
+define Package/ddns-scripts-nsupdate
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Extension for using bind nsupdate.
+  DEPENDS:=ddns-scripts +bind-client
+  PROVIDES:=ddns-scripts_nsupdate
+endef
+
+define Package/ddns-scripts-nsupdate/description
+  Dynamic DNS Client scripts extension for direct updates using bind nsupdate
+  The script directly updates a PowerDNS (or maybe bind server) via nsupdate
+  from bind-client package.
+  It requires:
+  "option dns_server" to be set to the server to be used by nsupdate.
+  "option username" should be set to the key name and
+  "option password" to the base64 encoded shared secret.
+endef
+
+
+define Package/ddns-scripts-route53
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Extension for route53 API v1
+  DEPENDS:=ddns-scripts +curl +openssl-util
+  PROVIDES:=ddns-scripts_route53-v1
+endef
+
+define Package/ddns-scripts-route53/description
+  Dynamic DNS Client scripts extension for Amazon AWS "route53 API v1".
+  Note: You must also install ca-certificate or ca-bundle.
+  It requires:
+  "option username" to be a valid AWS access key id
+  "option password" to be the matching AWS secret key id
+  "option domain" to contain the hosted zone ID
+endef
+
+
+define Package/ddns-scripts-cnkuai
+  $(call Package/ddns-scripts/Default)
+  TITLE:=CnKuai API
+  DEPENDS:=ddns-scripts +curl +giflib-utils
+  PROVIDES:=ddns-scripts_cnkuai_cn
+endef
+
+define Package/ddns-scripts-cnkuai/description
+  Dynamic DNS Client scripts extension for "cnkuai.cn".
+  It requires:
+  "option username" to be a valid CnKuai control panel id
+  "option password" to be the matching CnKuai control panel password
+  "option domain" to contain the domain
+endef
+
+
+define Package/ddns-scripts-gandi
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Gandi API
+  DEPENDS:=ddns-scripts +curl
+endef
+
+define Package/ddns-scripts-gandi/description
+  Dynamic DNS Client scripts extension for "gandi.net".
+  It requires:
+  "option username" to be a valid subdomain for gandi.net
+  "option password" to be a valid API key for gandi.net
+endef
+
+
+define Package/ddns-scripts-pdns
+  $(call Package/ddns-scripts/Default)
+  TITLE:=PowerDNS API
+  DEPENDS:=ddns-scripts +curl
+endef
+
+define Package/ddns-scripts-pdns/description
+  Dynamic DNS Client scripts extension for "PowerDNS" via API.
+  It requires:
+  "option param_opt(Optional Parameter)" to be a valid root URL for the PowerDNS webserver
+  "option username" to be a valid subdomain for the PowerDNS domain
+  "option password" to be a valid API key for the PowerDNS webserver
+endef
+
+
+define Package/ddns-scripts-transip
+  $(call Package/ddns-scripts/Default)
+  TITLE:=Extension for TransIP API
+  DEPENDS:=ddns-scripts +curl +openssl-util +!BUSYBOX_CONFIG_MKTEMP:coreutils-mktemp
+endef
+
+define Package/ddns-scripts-transip/description
+  Dynamic DNS Client scripts extension for "transip.nl".
+  Note: You must also install ca-certificate or ca-bundle.
+  It requires:
+  "option username" to be a valid username for transip.nl
+  "option password" to be a valid matching private key
+  "option domain" to contain the base domain
+  "option param_enc" to contain the name of the DNS record to update
+  "option param_opt" to contain the TTL of the DNS record to update
+endef
+
+define Package/ddns-scripts-one
+	$(call Package/ddns-scripts/Default)
+	TITLE:=Extension for one.com Control Panel
+	DEPENDS:=ddns-scripts +curl
+endef
+
+define Package/ddns-scrtips-one/description
+	Dynamic DNS Client scripts extension for "one.com".
+	It requires:
+	"option username" to be a valid Email for one.com Control Panel
+	"option password" to be the matching one.com Control Panel password
+	"option domain" to contain the domain / subdomain
+endef
+
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+
+define Package/ddns-scripts/install
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DATA) ./files/etc/hotplug.d/iface/ddns \
+		$(1)/etc/hotplug.d/iface/95-ddns
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/etc/init.d/ddns \
+		$(1)/etc/init.d/ddns
+
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/etc/config/ddns \
+		$(1)/etc/config/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns
+	echo "$(PKG_VERSION)-$(PKG_RELEASE)" > $(1)/usr/share/ddns/version
+
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_DATA) ./files/usr/lib/ddns/dynamic_dns_functions.sh \
+		$(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/dynamic_dns_lucihelper.sh \
+		$(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/dynamic_dns_updater.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) ./files/usr/bin/ddns.sh \
+		$(1)/usr/bin/ddns
+endef
+
+define Package/ddns-scripts/postinst
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns enabled
+	/etc/init.d/ddns start
+fi
+exit 0
+endef
+
+define Package/ddns-scripts/prerm
+#!/bin/sh
+if [ -n "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+	/etc/init.d/ddns disable
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-services/install
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/* \
+		$(1)/usr/share/ddns/default
+
+	# Remove special services
+	rm $(1)/usr/share/ddns/default/luadns.com-v1.json
+	rm $(1)/usr/share/ddns/default/cloudflare.com-v4.json
+	rm $(1)/usr/share/ddns/default/cloud.google.com-v1.json
+	rm $(1)/usr/share/ddns/default/freedns.42.pl.json
+	rm $(1)/usr/share/ddns/default/godaddy.com-v1.json
+	rm $(1)/usr/share/ddns/default/digitalocean.com-v2.json
+	rm $(1)/usr/share/ddns/default/dnspod.cn.json
+	rm $(1)/usr/share/ddns/default/no-ip.com.json
+	rm $(1)/usr/share/ddns/default/bind-nsupdate.json
+	rm $(1)/usr/share/ddns/default/route53-v1.json
+	rm $(1)/usr/share/ddns/default/cnkuai.cn.json
+	rm $(1)/usr/share/ddns/default/gandi.net.json
+	rm $(1)/usr/share/ddns/default/pdns.json
+	rm $(1)/usr/share/ddns/default/transip.nl.json
+	rm $(1)/usr/share/ddns/default/ns1.com.json
+	rm $(1)/usr/share/ddns/default/one.com.json
+endef
+
+
+define Package/ddns-scripts-utils/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./samples/slaac_sample.sh \
+		$(1)/usr/lib/ddns/slaac.sh
+	$(INSTALL_BIN) ./samples/getlocalip_sample.sh \
+		$(1)/usr/lib/ddns/getlocalip.sh
+endef
+
+
+define Package/ddns-scripts-luadns/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_luadns_v1.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/luadns.com-v1.json \
+		$(1)/usr/share/ddns/default/
+endef
+
+define Package/ddns-scripts-luadns/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-cloudflare/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_cloudflare_com_v4.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/cloudflare.com-v4.json \
+		$(1)/usr/share/ddns/default/
+endef
+
+define Package/ddns-scripts-cloudflare/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-gcp/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_gcp_v1.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/cloud.google.com-v1.json \
+		$(1)/usr/share/ddns/default/
+endef
+
+define Package/ddns-scripts-gcp/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-freedns/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_freedns_42_pl.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/freedns.42.pl.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-freedns/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-godaddy/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_godaddy_com_v1.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/godaddy.com-v1.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-godaddy/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-digitalocean/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_digitalocean_com_v2.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/digitalocean.com-v2.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-digitalocean/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-dnspod/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_dnspod_cn.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/dnspod.cn.json \
+		$(1)/usr/share/ddns/default/
+endef
+
+define Package/ddns-scripts-dnspod/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-noip/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_no-ip_com.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/no-ip.com.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-noip/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-ns1/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_ns1_com.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/ns1.com.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-ns1/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-nsupdate/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_nsupdate.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/bind-nsupdate.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-nsupdate/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-route53/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_route53_v1.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/route53-v1.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-route53/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-cnkuai/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_cnkuai_cn.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/cnkuai.cn.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-cnkuai/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-gandi/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_gandi_net.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/gandi.net.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-gandi/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-pdns/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_pdns.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/pdns.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-pdns/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-transip/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_transip_nl.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/transip.nl.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-transip/prerm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+define Package/ddns-scripts-one/install
+	$(INSTALL_DIR) $(1)/usr/lib/ddns
+	$(INSTALL_BIN) ./files/usr/lib/ddns/update_one_com.sh \
+		$(1)/usr/lib/ddns
+
+	$(INSTALL_DIR) $(1)/usr/share/ddns/default
+	$(INSTALL_DATA) ./files/usr/share/ddns/default/one.com.json \
+		$(1)/usr/share/ddns/default
+endef
+
+define Package/ddns-scripts-one/prerm
+#!/bin/sh
+if [-z "${IPKG_INSTROOT}" ]; then
+	/etc/init.d/ddns stop
+fi
+exit 0
+endef
+
+
+$(eval $(call BuildPackage,ddns-scripts))
+$(eval $(call BuildPackage,ddns-scripts-services))
+$(eval $(call BuildPackage,ddns-scripts-utils))
+$(eval $(call BuildPackage,ddns-scripts-luadns))
+$(eval $(call BuildPackage,ddns-scripts-cloudflare))
+$(eval $(call BuildPackage,ddns-scripts-gcp))
+$(eval $(call BuildPackage,ddns-scripts-freedns))
+$(eval $(call BuildPackage,ddns-scripts-godaddy))
+$(eval $(call BuildPackage,ddns-scripts-digitalocean))
+$(eval $(call BuildPackage,ddns-scripts-dnspod))
+$(eval $(call BuildPackage,ddns-scripts-noip))
+$(eval $(call BuildPackage,ddns-scripts-nsupdate))
+$(eval $(call BuildPackage,ddns-scripts-route53))
+$(eval $(call BuildPackage,ddns-scripts-cnkuai))
+$(eval $(call BuildPackage,ddns-scripts-gandi))
+$(eval $(call BuildPackage,ddns-scripts-pdns))
+$(eval $(call BuildPackage,ddns-scripts-transip))
+$(eval $(call BuildPackage,ddns-scripts-ns1))
+$(eval $(call BuildPackage,ddns-scripts-one))
diff --git a/ddns-scripts/files/etc/config/ddns b/ddns-scripts/files/etc/config/ddns
new file mode 100644
index 00000000..b45855f0
--- /dev/null
+++ b/ddns-scripts/files/etc/config/ddns
@@ -0,0 +1,32 @@
+#
+# Please read https://openwrt.org/docs/guide-user/base-system/ddns
+#
+config ddns "global"
+	option ddns_dateformat "%F %R"
+#	option ddns_rundir "/var/run/ddns"
+#	option ddns_logdir "/var/log/ddns"
+	option ddns_loglines "250"
+	option upd_privateip "0"
+
+
+config service "myddns_ipv4"
+	option service_name	"dyndns.org"
+	option lookup_host	"yourhost.example.com"
+	option domain		"yourhost.example.com"
+	option username		"your_username"
+	option password		"your_password"
+	option interface	"wan"
+	option ip_source	"network"
+	option ip_network	"wan"
+
+config service "myddns_ipv6"
+	option update_url	"http://[USERNAME]:[PASSWORD]@your.provider.net/nic/update?hostname=[DOMAIN]&myip=[IP]"
+	option lookup_host	"yourhost.example.com"
+	option domain		"yourhost.example.com"
+	option username		"your_username"
+	option password		"your_password"
+	option use_ipv6		"1"
+	option interface	"wan6"
+	option ip_source	"network"
+	option ip_network	"wan6"
+
diff --git a/ddns-scripts/files/etc/hotplug.d/iface/ddns b/ddns-scripts/files/etc/hotplug.d/iface/ddns
new file mode 100644
index 00000000..48ff15a3
--- /dev/null
+++ b/ddns-scripts/files/etc/hotplug.d/iface/ddns
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+enable=`uci -q get ddns.glddns.enabled`
+if [ "$enable" = 1 -a "$INTERFACE" != "lan" ];then
+	case "$ACTION" in
+	ifdown |\
+	ifup)
+		/etc/init.d/ddns restart
+	;;
+	esac
+fi
+
+if [ "$enable" = 0 -a "$INTERFACE" != "lan" ];then
+        case "$ACTION" in
+        ifdown)
+        /etc/init.d/ddns stop
+        ;;
+        esac
+fi
diff --git a/ddns-scripts/files/etc/init.d/ddns b/ddns-scripts/files/etc/init.d/ddns
new file mode 100644
index 00000000..68151ba0
--- /dev/null
+++ b/ddns-scripts/files/etc/init.d/ddns
@@ -0,0 +1,45 @@
+#!/bin/sh /etc/rc.common
+START=95
+STOP=10
+
+PROG=/usr/lib/ddns/dynamic_dns_updater.sh
+bypassvpn=`uci -q get vpnpolicy.global.service_policy`
+
+if [ $bypassvpn = 1 ];then
+	PROG="sudo -g nonevpn /usr/lib/ddns/dynamic_dns_updater.sh"
+else
+	PROG=/usr/lib/ddns/dynamic_dns_updater.sh
+fi
+
+
+
+boot() {
+	return 0
+}
+
+reload() {
+	$PROG -- reload
+	return 0
+}
+
+restart() {
+	$PROG -- stop
+	sleep 1 # give time to shutdown
+	enable=`uci -q get ddns.glddns.enabled`
+	if [ "$enable" = 1 ];then
+		$PROG -- start
+	fi
+}
+
+start() {
+	enable=`uci -q get ddns.glddns.enabled`
+	if [ "$enable" = 1 ];then
+		$PROG -- start
+	fi
+}
+
+stop() {
+	$PROG -- stop
+	return 0
+}
+
diff --git a/ddns-scripts/files/usr/bin/ddns.sh b/ddns-scripts/files/usr/bin/ddns.sh
new file mode 100644
index 00000000..921465f7
--- /dev/null
+++ b/ddns-scripts/files/usr/bin/ddns.sh
@@ -0,0 +1,172 @@
+#!/bin/sh
+#
+# Copyright (C) 2020 TDT AG <development@tdt.de>
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See https://www.gnu.org/licenses/gpl-2.0.txt for more information.
+#
+
+. /lib/functions.sh
+
+DDNS_PACKAGE_DIR="/usr/share/ddns"
+URL="https://raw.githubusercontent.com/openwrt/packages/master/net/ddns-scripts/files"
+
+usage() {
+	local code="$1"
+	local msg="$2"
+
+	echo "$msg"
+	echo ""
+	echo "Usage: $(basename "$0") <command> <action> <service>"
+	echo ""
+	echo "Supported ddns <command>:"
+	echo "  service:  Command for custom ddns service providers"
+	echo ""
+	echo "Supported ddns 'service' command <action>:"
+	echo "  update:             Update local custom ddns service list"
+	echo "  list-available:     List all available custom service providers"
+	echo "  list-installed:     List all installed custom service providers"
+	echo "  install <service>:  Install custom service provider"
+	echo "  remove <service>:   Remove custom service provider"
+	echo "  purge:              Remove local custom ddns services"
+
+	exit "$code"
+}
+
+action_update() {
+	local cacert
+
+	config_load ddns
+	config_get url global 'url' "${URL}${DDNS_PACKAGE_DIR}"
+	config_get cacert global 'cacert' "IGNORE"
+	url="${url}/list"
+
+	mkdir -p "${DDNS_PACKAGE_DIR}"
+
+	if [ "$cacert" = "IGNORE" ]; then
+		uclient-fetch \
+			--no-check-certificate \
+			"$url" \
+			-O "${DDNS_PACKAGE_DIR}/list"
+	elif [ -f "$cacert" ]; then
+		uclient-fetch \
+			--ca-certificate="${cacert}" \
+			"$url" \
+			-O "${DDNS_PACKAGE_DIR}/list"
+	elif [ -n "$cacert" ]; then
+		echo "Certification file not found ($cacert)"
+		exit 5
+	fi
+}
+
+action_list_available() {
+	if [ -f "${DDNS_PACKAGE_DIR}/list" ]; then
+		cat "${DDNS_PACKAGE_DIR}/list"
+	else
+		echo "No custom service list file found. Please download first"
+		exit 3
+	fi
+}
+
+action_list_installed() {
+	if [ -d "${DDNS_PACKAGE_DIR}/custom" ]; then
+		ls "${DDNS_PACKAGE_DIR}/custom"
+	else
+		echo "No custom services installed"
+		exit 4
+	fi
+}
+
+action_install() {
+	local service="$1"
+
+	local url cacert
+
+	config_load ddns
+	config_get url global 'url' "${URL}${DDNS_PACKAGE_DIR}/default"
+	config_get cacert global 'cacert' "IGNORE"
+	url="${url}/${service}.json"
+
+	if [ -z "$service" ]; then
+		usage "4" "No custom service specified"
+	fi
+
+	mkdir -p "${DDNS_PACKAGE_DIR}/custom"
+
+	if [ "$cacert" = "IGNORE" ]; then
+		uclient-fetch \
+			--no-check-certificate \
+			"${url}" \
+			-O "${DDNS_PACKAGE_DIR}/custom/${service}.json"
+	elif [ -f "$cacert" ]; then
+		uclient-fetch \
+			--ca-certifcate="${cacert}" \
+			"${url}" \
+			-O "${DDNS_PACKAGE_DIR}/custom/${service}.json"
+	elif [ -n "$cacert" ]; then
+		echo "Certification file not found ($cacert)"
+		exit 5
+	fi
+}
+
+action_remove() {
+	local service="$1"
+	if [ -z "$service" ]; then
+		usage "4" "No custom service specified"
+	fi
+
+	rm "${DDNS_PACKAGE_DIR}/custom/${service}.json"
+}
+
+action_purge() {
+	rm -rf "${DDNS_PACKAGE_DIR}/custom"
+	rm -rf "${DDNS_PACKAGE_DIR}/list"
+}
+
+sub_service() {
+	local action="$1"
+	local service="$2"
+
+	case "$action" in
+		update)
+			action_update
+			;;
+		list-available)
+			action_list_available
+			;;
+		list-installed)
+			action_list_installed
+			;;
+		purge)
+			action_purge
+			;;
+		install)
+			action_install "$service"
+			;;
+		remove)
+			action_remove "$service"
+			;;
+		*)
+			usage "2" "Action not supported"
+			;;
+	esac
+}
+
+main() {
+	local cmd="$1"
+	local action="$2"
+	local service="$3"
+
+	[ "$#" -eq 0 ] && usage "1"
+
+	case "${cmd}" in
+		service)
+			sub_service "${action}" "${service}"
+			;;
+		*)
+			usage "1" "Command not supported"
+			;;
+	esac
+}
+
+main "$@"
diff --git a/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh b/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh
new file mode 100644
index 00000000..46ec6ddd
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/dynamic_dns_functions.sh
@@ -0,0 +1,1413 @@
+#!/bin/sh
+# /usr/lib/ddns/dynamic_dns_functions.sh
+#
+#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
+# Original written by Eric Paul Bishop, January 2008
+# (Loosely) based on the script on the one posted by exobyte in the forums here:
+# http://forum.openwrt.org/viewtopic.php?id=14040
+# extended and partial rewritten
+#.2014-2018 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+#
+# function timeout
+# copied from http://www.ict.griffith.edu.au/anthony/software/timeout.sh
+# @author Anthony Thyssen  6 April 2011
+#
+# variables in small chars are read from /etc/config/ddns
+# variables in big chars are defined inside these scripts as global vars
+# variables in big chars beginning with "__" are local defined inside functions only
+# set -vx  	#script debugger
+
+. /lib/functions.sh
+. /lib/functions/network.sh
+
+# GLOBAL VARIABLES #
+if [ -f "/usr/share/ddns/version" ]; then
+	VERSION="$(cat "/usr/share/ddns/version")"
+else
+	VERSION="unknown"
+fi
+SECTION_ID=""		# hold config's section name
+VERBOSE=0		# default mode is log to console, but easily changed with parameter
+DRY_RUN=0		# run without actually doing (sending) any changes
+MYPROG=$(basename $0)	# my program call name
+
+LOGFILE=""		# logfile - all files are set in dynamic_dns_updater.sh
+PIDFILE=""		# pid file
+UPDFILE=""		# store UPTIME of last update
+DATFILE=""		# save stdout data of WGet and other external programs called
+ERRFILE=""		# save stderr output of WGet and other external programs called
+IPFILE=""		# store registered IP for read by LuCI status
+TLDFILE=/usr/share/public_suffix_list.dat.gz	# TLD file used by split_FQDN
+
+CHECK_SECONDS=0		# calculated seconds out of given
+FORCE_SECONDS=0		# interval and unit
+RETRY_SECONDS=0		# in configuration
+
+LAST_TIME=0		# holds the uptime of last successful update
+CURR_TIME=0		# holds the current uptime
+NEXT_TIME=0		# calculated time for next FORCED update
+EPOCH_TIME=0		# seconds since 1.1.1970 00:00:00
+
+CURRENT_IP=""		# holds the current IP read from the box
+REGISTERED_IP=""	# holds the IP read from DNS
+
+URL_USER=""		# url encoded $username from config file
+URL_PASS=""		# url encoded $password from config file
+URL_PENC=""		# url encoded $param_enc from config file
+
+UPD_ANSWER=""		# Answer given by service on success
+
+ERR_LAST=0		# used to save $? return code of program and function calls
+RETRY_COUNT=0		# error counter on different current and registered IPs
+
+PID_SLEEP=0		# ProcessID of current background "sleep"
+
+# regular expression to detect IPv4 / IPv6
+# IPv4       0-9   1-3x "." 0-9  1-3x "." 0-9  1-3x "." 0-9  1-3x
+IPV4_REGEX="[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}\.[0-9]\{1,3\}"
+# IPv6       ( ( 0-9a-f  1-4char ":") min 1x) ( ( 0-9a-f  1-4char   )optional) ( (":" 0-9a-f 1-4char  ) min 1x)
+IPV6_REGEX="\(\([0-9A-Fa-f]\{1,4\}:\)\{1,\}\)\(\([0-9A-Fa-f]\{1,4\}\)\{0,1\}\)\(\(:[0-9A-Fa-f]\{1,4\}\)\{1,\}\)"
+
+# characters that are dangerous to pass to a shell command line
+SHELL_ESCAPE="[\"\'\`\$\!();><{}?|\[\]\*\\\\]"
+
+# dns character set. "-" must be the last character
+DNS_CHARSET="[@a-zA-Z0-9._-]"
+
+# domains can have * for wildcard. "-" must be the last character
+DNS_CHARSET_DOMAIN="[@a-zA-Z0-9._*-]"
+
+# detect if called by ddns-lucihelper.sh script, disable retrys (empty variable == false)
+LUCI_HELPER=$(printf %s "$MYPROG" | grep -i "luci")
+
+# Name Server Lookup Programs
+BIND_HOST=$(command -v host)
+KNOT_HOST=$(command -v khost)
+DRILL=$(command -v drill)
+HOSTIP=$(command -v hostip)
+NSLOOKUP=$(command -v nslookup)
+
+# Transfer Programs
+WGET=$(command -v wget)
+$WGET -V 2>/dev/null | grep -F -q +https && WGET_SSL=$WGET
+
+CURL=$(command -v curl)
+# CURL_SSL not empty then SSL support available
+CURL_SSL=$($CURL -V 2>/dev/null | grep -F "https")
+# CURL_PROXY not empty then Proxy support available
+CURL_PROXY=$(find /lib /usr/lib -name libcurl.so* -exec strings {} 2>/dev/null \; | grep -im1 "all_proxy")
+
+UCLIENT_FETCH=$(command -v uclient-fetch)
+
+# Global configuration settings
+# allow NON-public IP's
+upd_privateip=$(uci -q get ddns.global.upd_privateip) || upd_privateip=0
+
+# directory to store run information to.
+ddns_rundir=$(uci -q get ddns.global.ddns_rundir) || ddns_rundir="/var/run/ddns"
+[ -d $ddns_rundir ] || mkdir -p -m755 $ddns_rundir
+
+# directory to store log files
+ddns_logdir=$(uci -q get ddns.global.ddns_logdir) || ddns_logdir="/var/log/ddns"
+[ -d $ddns_logdir ] || mkdir -p -m755 $ddns_logdir
+
+# number of lines to before rotate logfile
+ddns_loglines=$(uci -q get ddns.global.ddns_loglines) || ddns_loglines=250
+ddns_loglines=$((ddns_loglines + 1))	# correct sed handling
+
+# format to show date information in log and luci-app-ddns default ISO 8601 format
+ddns_dateformat=$(uci -q get ddns.global.ddns_dateformat) || ddns_dateformat="%F %R"
+DATE_PROG="date +'$ddns_dateformat'"
+
+# USE_CURL if GNU Wget and cURL installed normally Wget is used by do_transfer()
+# to change this use global option use_curl '1'
+USE_CURL=$(uci -q get ddns.global.use_curl) || USE_CURL=0	# read config
+[ -n "$CURL" ] || USE_CURL=0					# check for cURL
+
+# loads all options for a given package and section
+# also, sets all_option_variables to a list of the variable names
+# $1 = ddns, $2 = SECTION_ID
+load_all_config_options()
+{
+	local __PKGNAME="$1"
+	local __SECTIONID="$2"
+	local __VAR
+	local __ALL_OPTION_VARIABLES=""
+
+	# this callback loads all the variables in the __SECTIONID section when we do
+	# config_load. We need to redefine the option_cb for different sections
+	# so that the active one isn't still active after we're done with it.  For reference
+	# the $1 variable is the name of the option and $2 is the name of the section
+	config_cb()
+	{
+		if [ ."$2" = ."$__SECTIONID" ]; then
+			option_cb()
+			{
+				__ALL_OPTION_VARIABLES="$__ALL_OPTION_VARIABLES $1"
+			}
+		else
+			option_cb() { return 0; }
+		fi
+	}
+
+	config_load "$__PKGNAME"
+
+	# Given SECTION_ID not found so no data, so return 1
+	[ -z "$__ALL_OPTION_VARIABLES" ] && return 1
+
+	for __VAR in $__ALL_OPTION_VARIABLES
+	do
+		config_get "$__VAR" "$__SECTIONID" "$__VAR"
+	done
+	return 0
+}
+
+# read's all service sections from ddns config
+# $1 = Name of variable to store
+load_all_service_sections() {
+	local __DATA=""
+	config_cb()
+	{
+		# only look for section type "service", ignore everything else
+		[ "$1" = "service" ] && __DATA="$__DATA $2"
+	}
+	config_load "ddns"
+
+	eval "$1=\"$__DATA\""
+	return
+}
+
+# starts updater script for all given sections or only for the one given
+# $1 = interface (Optional: when given only scripts are started
+# configured for that interface)
+# used by /etc/hotplug.d/iface/95-ddns on IFUP
+# and by /etc/init.d/ddns start
+start_daemon_for_all_ddns_sections()
+{
+	local __EVENTIF="$1"
+	local __SECTIONS=""
+	local __SECTIONID=""
+	local __IFACE=""
+	local __IPV6=""
+	local __MODE="$(uci -q get glconfig.general.mode)"
+
+	load_all_service_sections __SECTIONS
+	for __SECTIONID in $__SECTIONS; do
+		if [ ! ${__MODE} = "router" ];then
+		    __IFACE = "lan"
+		else
+		    config_get __IFACE "$__SECTIONID" interface "wan"
+		fi
+		config_get __IPV6 "$__SECTIONID" use_ipv6 "0"
+		[ "$__IPV6" = "1" ] && [ "$(uci -q get glipv6.globals.enabled)" = "0" ]  && continue
+		[ "$(uci -q get network.${__IFACE}.disabled)" = "1" ] && continue
+		#[ -z "$__EVENTIF" -o "$__IFACE" = "$__EVENTIF" ] || continue
+		if [ $VERBOSE -eq 0 ]; then	# start in background
+			/usr/lib/ddns/dynamic_dns_updater.sh -v 0 -S "$__SECTIONID" -- start &
+		else
+			/usr/lib/ddns/dynamic_dns_updater.sh -v "$VERBOSE" -S "$__SECTIONID" -- start
+		fi
+	done
+}
+
+# stop sections process incl. childs (sleeps)
+# $1 = section
+stop_section_processes() {
+	local __PID=0
+	local __PIDFILE="$ddns_rundir/$1.pid"
+	[ $# -ne 1 ] && write_log 12 "Error calling 'stop_section_processes()' - wrong number of parameters"
+
+	[ -e "$__PIDFILE" ] && {
+		__PID=$(cat $__PIDFILE)
+		ps | grep "^[\t ]*$__PID" >/dev/null 2>&1 && kill $__PID || __PID=0	# terminate it
+	}
+	[ $__PID -eq 0 ] # report if process was running
+}
+
+# stop updater script for all defines sections or only for one given
+# $1 = interface (optional)
+# used by /etc/hotplug.d/iface/95-ddns on 'ifdown'
+# and by /etc/init.d/ddns stop
+# needed because we also need to kill "sleep" child processes
+stop_daemon_for_all_ddns_sections() {
+	local __EVENTIF="$1"
+	local __SECTIONS=""
+	local __SECTIONID=""
+	local __IFACE=""
+
+	load_all_service_sections __SECTIONS
+	for __SECTIONID in $__SECTIONS;	do
+		config_get __IFACE "$__SECTIONID" interface "wan"
+		[ -z "$__EVENTIF" -o "$__IFACE" = "$__EVENTIF" ] || continue
+		stop_section_processes "$__SECTIONID"
+	done
+}
+
+# reports to console, logfile, syslog
+# $1	loglevel 7 == Debug to 0 == EMERG
+#	value +10 will exit the scripts
+# $2..n	text to report
+write_log() {
+	local __LEVEL __EXIT __CMD __MSG __MSE
+	local __TIME=$(date +%H%M%S)
+	[ $1 -ge 10 ] && {
+		__LEVEL=$(($1-10))
+		__EXIT=1
+	} || {
+		__LEVEL=$1
+		__EXIT=0
+	}
+	shift	# remove loglevel
+	[ $__EXIT -eq 0 ] && __MSG="$*" || __MSG="$* - TERMINATE"
+	case $__LEVEL in		# create log message and command depending on loglevel
+		0)	__CMD="logger -p user.emerg -t ddns-scripts[$$] $SECTION_ID: $__MSG"
+			__MSG=" $__TIME EMERG : $__MSG" ;;
+		1)	__CMD="logger -p user.alert -t ddns-scripts[$$] $SECTION_ID: $__MSG"
+			__MSG=" $__TIME ALERT : $__MSG" ;;
+		2)	__CMD="logger -p user.crit -t ddns-scripts[$$] $SECTION_ID: $__MSG"
+			__MSG=" $__TIME  CRIT : $__MSG" ;;
+		3)	__CMD="logger -p user.err -t ddns-scripts[$$] $SECTION_ID: $__MSG"
+			__MSG=" $__TIME ERROR : $__MSG" ;;
+		4)	__CMD="logger -p user.warn -t ddns-scripts[$$] $SECTION_ID: $__MSG"
+			__MSG=" $__TIME  WARN : $__MSG" ;;
+		5)	__CMD="logger -p user.notice -t ddns-scripts[$$] $SECTION_ID: $__MSG"
+			__MSG=" $__TIME  note : $__MSG" ;;
+		6)	__CMD="logger -p user.info -t ddns-scripts[$$] $SECTION_ID: $__MSG"
+			__MSG=" $__TIME  info : $__MSG" ;;
+		7)	__MSG=" $__TIME       : $__MSG";;
+		*) 	return;;
+	esac
+
+	# verbose echo
+	[ $VERBOSE -gt 0 -o $__EXIT -gt 0 ] && echo -e "$__MSG"
+	# write to logfile
+	if [ ${use_logfile:-1} -eq 1 -o $VERBOSE -gt 1 ]; then
+		if [ -n "$password" ]; then
+			# url encode __MSG, password already done
+			urlencode __MSE "$__MSG"
+			# replace encoded password inside encoded message
+			# and url decode (newline was encoded as %00)
+			__MSG=$( echo -e "$__MSE" \
+				| sed -e "s/$URL_PASS/***PW***/g" \
+				| sed -e "s/+/ /g; s/%00/\n/g; s/%/\\\\x/g" | xargs -0 printf "%b" )
+		fi
+		printf "%s\n" "$__MSG" >> $LOGFILE
+		# VERBOSE > 1 then NO loop so NO truncate log to $ddns_loglines lines
+		[ $VERBOSE -gt 1 ] || sed -i -e :a -e '$q;N;'$ddns_loglines',$D;ba' $LOGFILE
+	fi
+	[ -n "$LUCI_HELPER" ] && return	# nothing else todo when running LuCI helper script
+	[ $__LEVEL -eq 7 ] && return	# no syslog for debug messages
+	__CMD=$(echo -e "$__CMD" | tr -d '\n' | tr '\t' '     ')        # remove \n \t chars
+	[ $__EXIT  -eq 1 ] && {
+		eval '$__CMD'	# force syslog before exit
+		exit 1
+	}
+	[ $use_syslog -eq 0 ] && return
+	[ $((use_syslog + __LEVEL)) -le 7 ] && eval '$__CMD'
+
+	return
+}
+
+# replace all special chars to their %hex value
+# used for USERNAME and PASSWORD in update_url
+# unchanged: "-"(minus) "_"(underscore) "."(dot) "~"(tilde)
+# to verify: "'"(single quote) '"'(double quote)	# because shell delimiter
+#            "$"(Dollar)				# because used as variable output
+# tested with the following string stored via Luci Application as password / username
+# A B!"#AA$1BB%&'()*+,-./:;<=>?@[\]^_`{|}~	without problems at Dollar or quotes
+urlencode() {
+	# $1	Name of Variable to store encoded string to
+	# $2	string to encode
+	local __ENC
+
+	[ $# -ne 2 ] && write_log 12 "Error calling 'urlencode()' - wrong number of parameters"
+
+	__ENC="$(awk -v str="$2" 'BEGIN{ORS="";for(i=32;i<=127;i++)lookup[sprintf("%c",i)]=i
+		for(k=1;k<=length(str);++k){enc=substr(str,k,1);if(enc!~"[-_.~a-zA-Z0-9]")enc=sprintf("%%%02x", lookup[enc]);print enc}}')"
+
+	eval "$1=\"$__ENC\""	# transfer back to variable
+	return 0
+}
+
+# extract url or script for given DDNS Provider from
+# $1	Name of the provider
+# $2	Provider directory
+# $3	Name of Variable to store url to
+# $4	Name of Variable to store script to
+# $5	Name of Variable to store service answer to
+get_service_data() {
+	local provider="$1"
+	shift
+	local dir="$1"
+	shift
+
+	. /usr/share/libubox/jshn.sh
+	local name data url answer script
+
+	[ $# -ne 3 ] && write_log 12 "Error calling 'get_service_data()' - wrong number of parameters"
+
+	[ -f "${dir}/${provider}.json" ] || {
+		eval "$1=\"\""
+		eval "$2=\"\""
+		eval "$3=\"\""
+		return 1
+	}
+
+	json_load_file "${dir}/${provider}.json"
+	json_get_var name "name"
+	if [ "$use_ipv6" -eq "1" ]; then
+		json_select "ipv6"
+	else
+		json_select "ipv4"
+	fi
+	json_get_var data "url"
+	json_get_var answer "answer"
+	json_select ".."
+	json_cleanup
+
+	# check if URL or SCRIPT is given
+	url=$(echo "$data" | grep "^http")
+	[ -z "$url" ] && script="/usr/lib/ddns/${data}"
+
+	eval "$1=\"$url\""
+	eval "$2=\"$script\""
+	eval "$3=\"$answer\""
+	return 0
+}
+
+# Calculate seconds from interval and unit
+# $1	Name of Variable to store result in
+# $2	Number and
+# $3	Unit of time interval
+get_seconds() {
+	[ $# -ne 3 ] && write_log 12 "Error calling 'get_seconds()' - wrong number of parameters"
+	case "$3" in
+		"days" )	eval "$1=$(( $2 * 86400 ))";;
+		"hours" )	eval "$1=$(( $2 * 3600 ))";;
+		"minutes" )	eval "$1=$(( $2 * 60 ))";;
+		* )		eval "$1=$2";;
+	esac
+	return 0
+}
+
+timeout() {
+	#.copied from http://www.ict.griffith.edu.au/anthony/software/timeout.sh
+	# only did the following changes
+	#	- commented out "#!/bin/bash" and usage section
+	#	- replace exit by return for usage as function
+	#	- some reformatting
+	#
+	# timeout [-SIG] time [--] command args...
+	#
+	# Run the given command until completion, but kill it if it runs too long.
+	# Specifically designed to exit immediately (no sleep interval) and clean up
+	# nicely without messages or leaving any extra processes when finished.
+	#
+	# Example use
+	#    timeout 5 countdown
+	#
+	# Based on notes in my "Shell Script Hints", section "Command Timeout"
+	#   http://www.ict.griffith.edu.au/~anthony/info/shell/script.hints
+	#
+	# This script uses a lot of tricks to terminate both the background command,
+	# the timeout script, and even the sleep process.  It also includes trap
+	# commands to prevent sub-shells reporting expected "Termination Errors".
+	#
+	# It took years of occasional trials, errors and testing to get a pure bash
+	# timeout command working as well as this does.
+	#
+	#.Anthony Thyssen     6 April 2011
+	#
+#	PROGNAME=$(type $0 | awk '{print $3}')	# search for executable on path
+#	PROGDIR=$(dirname $PROGNAME)		# extract directory of program
+#	PROGNAME=$(basename $PROGNAME)		# base name of program
+
+	# output the script comments as docs
+#	Usage() {
+#		echo >&2 "$PROGNAME:" "$@"
+#		sed >&2 -n '/^###/q; /^#/!q; s/^#//; s/^ //; 3s/^/Usage: /; 2,$ p' "$PROGDIR/$PROGNAME"
+#		exit 10;
+#	}
+
+	SIG=-TERM
+
+	while [ $# -gt 0 ]; do
+		case "$1" in
+			--)
+				# forced end of user options
+				shift;
+				break ;;
+#			-\?|--help|--doc*)
+#				Usage ;;
+			[0-9]*)
+				TIMEOUT="$1" ;;
+			-*)
+				SIG="$1" ;;
+			*)
+				# unforced  end of user options
+				break ;;
+		esac
+		shift	# next option
+	done
+
+	# run main command in backgrounds and get its pid
+	"$@" &
+	command_pid=$!
+
+	# timeout sub-process abort countdown after ABORT seconds! also backgrounded
+	sleep_pid=0
+	(
+		# cleanup sleep process
+		trap 'kill -TERM $sleep_pid; return 1' 1 2 3 15
+		# sleep timeout period in background
+		sleep $TIMEOUT &
+		sleep_pid=$!
+		wait $sleep_pid
+		# Abort the command
+		kill $SIG $command_pid >/dev/null 2>&1
+		return 1
+	) &
+	timeout_pid=$!
+
+	# Wait for main command to finished or be timed out
+	wait $command_pid
+	status=$?
+
+	# Clean up timeout sub-shell - if it is still running!
+	kill $timeout_pid 2>/dev/null
+	wait $timeout_pid 2>/dev/null
+
+	# Uncomment to check if a LONG sleep still running (no sleep should be)
+	# sleep 1
+	# echo "-----------"
+	# /bin/ps j  # uncomment to show if abort "sleep" is still sleeping
+
+	return $status
+}
+
+# sanitize a variable
+# $1	variable name
+# $2	allowed shell pattern
+# $3	disallowed shell pattern
+sanitize_variable() {
+	local __VAR=$1
+	eval __VALUE=\$$__VAR
+	local __ALLOWED=$2
+	local __REJECT=$3
+
+	# removing all allowed should give empty string
+	if [ -n "$__ALLOWED" ]; then
+		[ -z "${__VALUE//$__ALLOWED}" ] || write_log 12 "sanitize on $__VAR found characters outside allowed subset"
+	fi
+
+	# removing rejected pattern should give the same string as the input
+	if [ -n "$__REJECT" ]; then
+		[ "$__VALUE" = "${__VALUE//$__REJECT}" ] || write_log 12 "sanitize on $__VAR found rejected characters"
+	fi
+}
+
+# verify given host and port is connectable
+# $1	Host/IP to verify
+# $2	Port to verify
+verify_host_port() {
+	local __HOST=$1
+	local __PORT=$2
+	local __NC=$(command -v nc)
+	local __NCEXT=$($(command -v nc) --help 2>&1 | grep "\-w" 2>/dev/null)	# busybox nc compiled with extensions
+	local __IP __IPV4 __IPV6 __RUNPROG __PROG __ERR
+	# return codes
+	# 1	system specific error
+	# 2	nslookup/host error
+	# 3	nc (netcat) error
+	# 4	unmatched IP version
+
+	[ $# -ne 2 ] && write_log 12 "Error calling 'verify_host_port()' - wrong number of parameters"
+
+	# check if ip or FQDN was given
+	__IPV4=$(echo $__HOST | grep -m 1 -o "$IPV4_REGEX$")	# do not detect ip in 0.0.0.0.example.com
+	__IPV6=$(echo $__HOST | grep -m 1 -o "$IPV6_REGEX")
+	# if FQDN given get IP address
+	[ -z "$__IPV4" -a -z "$__IPV6" ] && {
+		if [ -n "$BIND_HOST" ]; then	# use BIND host if installed
+			__PROG="BIND host"
+			__RUNPROG="$BIND_HOST $__HOST >$DATFILE 2>$ERRFILE"
+		elif [ -n "$KNOT_HOST" ]; then	# use Knot host if installed
+			__PROG="Knot host"
+			__RUNPROG="$KNOT_HOST $__HOST >$DATFILE 2>$ERRFILE"
+		elif [ -n "$DRILL" ]; then	# use drill if installed
+			__PROG="drill"
+			__RUNPROG="$DRILL -V0 $__HOST A >$DATFILE 2>$ERRFILE"			# IPv4
+			__RUNPROG="$__RUNPROG; $DRILL -V0 $__HOST AAAA >>$DATFILE 2>>$ERRFILE"	# IPv6
+		elif [ -n "$HOSTIP" ]; then	# use hostip if installed
+			__PROG="hostip"
+			__RUNPROG="$HOSTIP $__HOST >$DATFILE 2>$ERRFILE"			# IPv4
+			__RUNPROG="$__RUNPROG; $HOSTIP -6 $__HOST >>$DATFILE 2>>$ERRFILE"	# IPv6
+		else	# use BusyBox nslookup
+			__PROG="BusyBox nslookup"
+			__RUNPROG="$NSLOOKUP $__HOST >$DATFILE 2>$ERRFILE"
+		fi
+		write_log 7 "#> $__RUNPROG"
+		eval $__RUNPROG
+		__ERR=$?
+		# command error
+		[ $__ERR -gt 0 ] && {
+			write_log 3 "DNS Resolver Error - $__PROG Error '$__ERR'"
+			write_log 7 "$(cat $ERRFILE)"
+			return 2
+		}
+		# extract IP address
+		if [ -n "$BIND_HOST" -o -n "$KNOT_HOST" ]; then	# use BIND host or Knot host if installed
+			__IPV4="$(awk -F "address " '/has address/ {print $2; exit}' "$DATFILE")"
+			__IPV6="$(awk -F "address " '/has IPv6/ {print $2; exit}' "$DATFILE")"
+		elif [ -n "$DRILL" ]; then	# use drill if installed
+			__IPV4="$(awk '/^'"$__HOST"'/ {print $5}' "$DATFILE" | grep -m 1 -o "$IPV4_REGEX")"
+			__IPV6="$(awk '/^'"$__HOST"'/ {print $5}' "$DATFILE" | grep -m 1 -o "$IPV6_REGEX")"
+		elif [ -n "$HOSTIP" ]; then	# use hostip if installed
+			__IPV4="$(grep -m 1 -o "$IPV4_REGEX" "$DATFILE")"
+			__IPV6="$(grep -m 1 -o "$IPV6_REGEX" "$DATFILE")"
+		else	# use BusyBox nslookup
+			__IPV4="$(sed -ne "/^Name:/,\$ { s/^Address[0-9 ]\{0,\}: \($IPV4_REGEX\).*$/\\1/p }" "$DATFILE")"
+			__IPV6="$(sed -ne "/^Name:/,\$ { s/^Address[0-9 ]\{0,\}: \($IPV6_REGEX\).*$/\\1/p }" "$DATFILE")"
+		fi
+	}
+
+	# check IP version if forced
+	if [ $force_ipversion -ne 0 ]; then
+		__ERR=0
+		[ $use_ipv6 -eq 0 -a -z "$__IPV4" ] && __ERR=4
+		[ $use_ipv6 -eq 1 -a -z "$__IPV6" ] && __ERR=6
+		[ $__ERR -gt 0 ] && {
+			[ -n "$LUCI_HELPER" ] && return 4
+			write_log 14 "Verify host Error '4' - Forced IP Version IPv$__ERR don't match"
+		}
+	fi
+
+	# verify nc command
+	# busybox nc compiled without -l option "NO OPT l!" -> critical error
+	$__NC --help 2>&1 | grep -i "NO OPT l!" >/dev/null 2>&1 && \
+		write_log 12 "Busybox nc (netcat) compiled without '-l' option, error 'NO OPT l!'"
+	# busybox nc compiled with extensions
+	$__NC --help 2>&1 | grep "\-w" >/dev/null 2>&1 && __NCEXT="TRUE"
+
+	# connectivity test
+	# run busybox nc to HOST PORT
+	# busybox might be compiled with "FEATURE_PREFER_IPV4_ADDRESS=n"
+	# then nc will try to connect via IPv6 if there is any IPv6 available on any host interface
+	# not worrying, if there is an IPv6 wan address
+	# so if not "force_ipversion" to use_ipv6 then connect test via ipv4, if available
+	[ $force_ipversion -ne 0 -a $use_ipv6 -ne 0 -o -z "$__IPV4" ] && __IP=$__IPV6 || __IP=$__IPV4
+
+	if [ -n "$__NCEXT" ]; then	# BusyBox nc compiled with extensions (timeout support)
+		__RUNPROG="$__NC -w 1 $__IP $__PORT </dev/null >$DATFILE 2>$ERRFILE"
+		write_log 7 "#> $__RUNPROG"
+		eval $__RUNPROG
+		__ERR=$?
+		[ $__ERR -eq 0 ] && return 0
+		write_log 3 "Connect error - BusyBox nc (netcat) Error '$__ERR'"
+		write_log 7 "$(cat $ERRFILE)"
+		return 3
+	else		# nc compiled without extensions (no timeout support)
+		__RUNPROG="timeout 2 -- $__NC $__IP $__PORT </dev/null >$DATFILE 2>$ERRFILE"
+		write_log 7 "#> $__RUNPROG"
+		eval $__RUNPROG
+		__ERR=$?
+		[ $__ERR -eq 0 ] && return 0
+		write_log 3 "Connect error - BusyBox nc (netcat) timeout Error '$__ERR'"
+		return 3
+	fi
+}
+
+# verify given DNS server if connectable
+# $1	DNS server to verify
+verify_dns() {
+	local __ERR=255	# last error buffer
+	local __CNT=0	# error counter
+
+	[ $# -ne 1 ] && write_log 12 "Error calling 'verify_dns()' - wrong number of parameters"
+	write_log 7 "Verify DNS server '$1'"
+
+	while [ $__ERR -ne 0 ]; do
+		# DNS uses port 53
+		verify_host_port "$1" "53"
+		__ERR=$?
+		if [ -n "$LUCI_HELPER" ]; then	# no retry if called by LuCI helper script
+			return $__ERR
+		elif [ $__ERR -ne 0 -a $VERBOSE -gt 1 ]; then	# VERBOSE > 1 then NO retry
+			write_log 4 "Verify DNS server '$1' failed - Verbose Mode: $VERBOSE - NO retry on error"
+			return $__ERR
+		elif [ $__ERR -ne 0 ]; then
+			__CNT=$(( $__CNT + 1 ))	# increment error counter
+			# if error count > retry_max_count leave here
+			[ $retry_max_count -gt 0 -a $__CNT -gt $retry_max_count ] && \
+				write_log 14 "Verify DNS server '$1' failed after $retry_max_count retries"
+
+			write_log 4 "Verify DNS server '$1' failed - retry $__CNT/$retry_max_count in $RETRY_SECONDS seconds"
+			sleep $RETRY_SECONDS &
+			PID_SLEEP=$!
+			wait $PID_SLEEP	# enable trap-handler
+			PID_SLEEP=0
+		fi
+	done
+	return 0
+}
+
+# analyze and verify given proxy string
+# $1	Proxy-String to verify
+verify_proxy() {
+	#	complete entry		user:password@host:port
+	# 				inside user and password NO '@' of ":" allowed
+	#	host and port only	host:port
+	#	host only		host		ERROR unsupported
+	#	IPv4 address instead of host	123.234.234.123
+	#	IPv6 address instead of host	[xxxx:....:xxxx]	in square bracket
+	local __TMP __HOST __PORT
+	local __ERR=255	# last error buffer
+	local __CNT=0	# error counter
+
+	[ $# -ne 1 ] && write_log 12 "Error calling 'verify_proxy()' - wrong number of parameters"
+	write_log 7 "Verify Proxy server 'http://$1'"
+
+	# try to split user:password "@" host:port
+	__TMP=$(echo $1 | awk -F "@" '{print $2}')
+	# no "@" found - only host:port is given
+	[ -z "$__TMP" ] && __TMP="$1"
+	# now lets check for IPv6 address
+	__HOST=$(echo $__TMP | grep -m 1 -o "$IPV6_REGEX")
+	# IPv6 host address found read port
+	if [ -n "$__HOST" ]; then
+		# IPv6 split at "]:"
+		__PORT=$(echo $__TMP | awk -F "]:" '{print $2}')
+	else
+		__HOST=$(echo $__TMP | awk -F ":" '{print $1}')
+		__PORT=$(echo $__TMP | awk -F ":" '{print $2}')
+	fi
+	# No Port detected - EXITING
+	[ -z "$__PORT" ] && {
+		[ -n "$LUCI_HELPER" ] && return 5
+		write_log 14 "Invalid Proxy server Error '5' - proxy port missing"
+	}
+
+	while [ $__ERR -gt 0 ]; do
+		verify_host_port "$__HOST" "$__PORT"
+		__ERR=$?
+		if [ -n "$LUCI_HELPER" ]; then	# no retry if called by LuCI helper script
+			return $__ERR
+		elif [ $__ERR -gt 0 -a $VERBOSE -gt 1 ]; then	# VERBOSE > 1 then NO retry
+			write_log 4 "Verify Proxy server '$1' failed - Verbose Mode: $VERBOSE - NO retry on error"
+			return $__ERR
+		elif [ $__ERR -gt 0 ]; then
+			__CNT=$(( $__CNT + 1 ))	# increment error counter
+			# if error count > retry_max_count leave here
+			[ $retry_max_count -gt 0 -a $__CNT -gt $retry_max_count ] && \
+				write_log 14 "Verify Proxy server '$1' failed after $retry_max_count retries"
+
+			write_log 4 "Verify Proxy server '$1' failed - retry $__CNT/$retry_max_count in $RETRY_SECONDS seconds"
+			sleep $RETRY_SECONDS &
+			PID_SLEEP=$!
+			wait $PID_SLEEP	# enable trap-handler
+			PID_SLEEP=0
+		fi
+	done
+	return 0
+}
+
+do_transfer() {
+	# $1	# URL to use
+	local __URL="$1"
+	local __ERR=0
+	local __CNT=0	# error counter
+	local __PROG  __RUNPROG
+
+	[ $# -ne 1 ] && write_log 12 "Error in 'do_transfer()' - wrong number of parameters"
+
+	# Use ip_network as default for bind_network if not separately specified
+	[ -z "$bind_network" ] && [ "$ip_source" = "network" ] && [ "$ip_network" ] && bind_network="$ip_network"
+
+	# lets prefer GNU Wget because it does all for us - IPv4/IPv6/HTTPS/PROXY/force IP version
+	if [ -n "$WGET_SSL" ] && [ $USE_CURL -eq 0 ]; then 			# except global option use_curl is set to "1"
+		__PROG="$WGET --hsts-file=/tmp/.wget-hsts -nv -t 1 -O $DATFILE -o $ERRFILE"	# non_verbose no_retry outfile errfile
+		# force network/ip to use for communication
+		if [ -n "$bind_network" ]; then
+			local __BINDIP
+			# set correct program to detect IP
+			[ $use_ipv6 -eq 0 ] && __RUNPROG="network_get_ipaddr" || __RUNPROG="network_get_ipaddr6"
+			eval "$__RUNPROG __BINDIP $bind_network" || \
+				write_log 13 "Can not detect current IP using '$__RUNPROG $bind_network' - Error: '$?'"
+			write_log 7 "Force communication via IP '$__BINDIP'"
+			__PROG="$__PROG --bind-address=$__BINDIP"
+		fi
+		# force ip version to use
+		if [ $force_ipversion -eq 1 ]; then
+			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4" || __PROG="$__PROG -6"	# force IPv4/IPv6
+		fi
+		# set certificate parameters
+		if [ $use_https -eq 1 ]; then
+			if [ "$cacert" = "IGNORE" ]; then	# idea from Ticket #15327 to ignore server cert
+				__PROG="$__PROG --no-check-certificate"
+			elif [ -f "$cacert" ]; then
+				__PROG="$__PROG --ca-certificate=${cacert}"
+			elif [ -d "$cacert" ]; then
+				__PROG="$__PROG --ca-directory=${cacert}"
+			elif [ -n "$cacert" ]; then		# it's not a file and not a directory but given
+				write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
+			fi
+		fi
+		# disable proxy if no set (there might be .wgetrc or .curlrc or wrong environment set)
+		[ -z "$proxy" ] && __PROG="$__PROG --no-proxy"
+
+		# user agent string if provided
+		if [ -n "$user_agent" ]; then
+			# replace single and double quotes
+			user_agent=$(echo $user_agent | sed "s/'/ /g" | sed 's/"/ /g')
+			__PROG="$__PROG --user-agent='$user_agent'"
+		fi
+
+		__RUNPROG="$__PROG '$__URL'"	# build final command
+		__PROG="GNU Wget"		# reuse for error logging
+
+	# 2nd choice is cURL IPv4/IPv6/HTTPS
+	# libcurl might be compiled without Proxy or HTTPS Support
+	elif [ -n "$CURL" ]; then
+		__PROG="$CURL -RsS -o $DATFILE --stderr $ERRFILE"
+		# check HTTPS support
+		[ -z "$CURL_SSL" -a $use_https -eq 1 ] && \
+			write_log 13 "cURL: libcurl compiled without https support"
+		# force network/interface-device to use for communication
+		if [ -n "$bind_network" ]; then
+			local __DEVICE
+			network_get_device __DEVICE $bind_network || \
+				write_log 13 "Can not detect local device using 'network_get_device $bind_network' - Error: '$?'"
+			write_log 7 "Force communication via device '$__DEVICE'"
+			__PROG="$__PROG --interface $__DEVICE"
+		fi
+		# force ip version to use
+		if [ $force_ipversion -eq 1 ]; then
+			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4" || __PROG="$__PROG -6"	# force IPv4/IPv6
+		fi
+		# set certificate parameters
+		if [ $use_https -eq 1 ]; then
+			if [ "$cacert" = "IGNORE" ]; then	# idea from Ticket #15327 to ignore server cert
+				__PROG="$__PROG --insecure"	# but not empty better to use "IGNORE"
+			elif [ -f "$cacert" ]; then
+				__PROG="$__PROG --cacert $cacert"
+			elif [ -d "$cacert" ]; then
+				__PROG="$__PROG --capath $cacert"
+			elif [ -n "$cacert" ]; then		# it's not a file and not a directory but given
+				write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
+			fi
+		fi
+		# disable proxy if no set (there might be .wgetrc or .curlrc or wrong environment set)
+		# or check if libcurl compiled with proxy support
+		if [ -z "$proxy" ]; then
+			__PROG="$__PROG --noproxy '*'"
+		elif [ -z "$CURL_PROXY" ]; then
+			# if libcurl has no proxy support and proxy should be used then force ERROR
+			write_log 13 "cURL: libcurl compiled without Proxy support"
+		fi
+
+		__RUNPROG="$__PROG '$__URL'"	# build final command
+		__PROG="cURL"			# reuse for error logging
+
+	# uclient-fetch possibly with ssl support if /lib/libustream-ssl.so installed
+	elif [ -n "$UCLIENT_FETCH" ]; then
+		# UCLIENT_FETCH_SSL not empty then SSL support available
+		UCLIENT_FETCH_SSL=$(find /lib /usr/lib -name libustream-ssl.so* 2>/dev/null)
+		__PROG="$UCLIENT_FETCH -q -O $DATFILE"
+		# force network/ip not supported
+		[ -n "$__BINDIP" ] && \
+			write_log 14 "uclient-fetch: FORCE binding to specific address not supported"
+		# force ip version to use
+		if [ $force_ipversion -eq 1 ]; then
+			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4" || __PROG="$__PROG -6"       # force IPv4/IPv6
+		fi
+		# https possibly not supported
+		[ $use_https -eq 1 -a -z "$UCLIENT_FETCH_SSL" ] && \
+			write_log 14 "uclient-fetch: no HTTPS support! Additional install one of ustream-ssl packages"
+		# proxy support
+		[ -z "$proxy" ] && __PROG="$__PROG -Y off" || __PROG="$__PROG -Y on"
+		# https & certificates
+		if [ $use_https -eq 1 ]; then
+			if [ "$cacert" = "IGNORE" ]; then
+				__PROG="$__PROG --no-check-certificate"
+			elif [ -f "$cacert" ]; then
+				__PROG="$__PROG --ca-certificate=$cacert"
+			elif [ -n "$cacert" ]; then		# it's not a file; nothing else supported
+				write_log 14 "No valid certificate file '$cacert' for HTTPS communication"
+			fi
+		fi
+		__RUNPROG="$__PROG '$__URL' 2>$ERRFILE"		# build final command
+		__PROG="uclient-fetch"				# reuse for error logging
+
+	# Busybox Wget or any other wget in search $PATH (did not support neither IPv6 nor HTTPS)
+	elif [ -n "$WGET" ]; then
+		__PROG="$WGET -q -O $DATFILE"
+		# force network/ip not supported
+		[ -n "$__BINDIP" ] && \
+			write_log 14 "BusyBox Wget: FORCE binding to specific address not supported"
+		# force ip version not supported
+		[ $force_ipversion -eq 1 ] && \
+			write_log 14 "BusyBox Wget: Force connecting to IPv4 or IPv6 addresses not supported"
+		# https not supported
+		[ $use_https -eq 1 ] && \
+			write_log 14 "BusyBox Wget: no HTTPS support"
+		# disable proxy if no set (there might be .wgetrc or .curlrc or wrong environment set)
+		[ -z "$proxy" ] && __PROG="$__PROG -Y off"
+
+		__RUNPROG="$__PROG '$__URL' 2>$ERRFILE"		# build final command
+		__PROG="Busybox Wget"				# reuse for error logging
+
+	else
+		write_log 13 "Neither 'Wget' nor 'cURL' nor 'uclient-fetch' installed or executable"
+	fi
+
+	while : ; do
+		write_log 7 "#> $__RUNPROG"
+		eval $__RUNPROG			# DO transfer
+		__ERR=$?			# save error code
+		[ $__ERR -eq 0 ] && return 0	# no error leave
+		[ -n "$LUCI_HELPER" ] && return 1	# no retry if called by LuCI helper script
+
+		write_log 3 "$__PROG Error: '$__ERR'"
+		write_log 7 "$(cat $ERRFILE)"		# report error
+
+		[ $VERBOSE -gt 1 ] && {
+			# VERBOSE > 1 then NO retry
+			write_log 4 "Transfer failed - Verbose Mode: $VERBOSE - NO retry on error"
+			return 1
+		}
+
+		__CNT=$(( $__CNT + 1 ))	# increment error counter
+		# if error count > retry_max_count leave here
+		[ $retry_max_count -gt 0 -a $__CNT -gt $retry_max_count ] && \
+			write_log 14 "Transfer failed after $retry_max_count retries"
+
+		write_log 4 "Transfer failed - retry $__CNT/$retry_max_count in $RETRY_SECONDS seconds"
+		sleep $RETRY_SECONDS &
+		PID_SLEEP=$!
+		wait $PID_SLEEP	# enable trap-handler
+		PID_SLEEP=0
+	done
+	# we should never come here there must be a programming error
+	write_log 12 "Error in 'do_transfer()' - program coding error"
+}
+
+send_update() {
+	# $1	# IP to set at DDNS service provider
+	local __IP
+
+	[ $# -ne 1 ] && write_log 12 "Error calling 'send_update()' - wrong number of parameters"
+
+	if [ $upd_privateip -eq 0 ]; then
+		# verify given IP / no private IPv4's / no IPv6 addr starting with fxxx of with ":"
+		[ $use_ipv6 -eq 0 ] && __IP=$(echo $1 | grep -v -E "(^0|^10\.|^100\.6[4-9]\.|^100\.[7-9][0-9]\.|^100\.1[0-1][0-9]\.|^100\.12[0-7]\.|^127|^169\.254|^172\.1[6-9]\.|^172\.2[0-9]\.|^172\.3[0-1]\.|^192\.168)")
+		[ $use_ipv6 -eq 1 ] && __IP=$(echo $1 | grep "^[0-9a-eA-E]")
+	else
+		__IP=$(echo $1 | grep -m 1 -o "$IPV4_REGEX")		# valid IPv4 or
+		[ -z "$__IP" ] && __IP=$(echo $1 | grep -m 1 -o "$IPV6_REGEX")	# IPv6
+	fi
+	[ -z "$__IP" ] && {
+		write_log 3 "No or private or invalid IP '$1' given! Please check your configuration"
+		return 127
+	}
+
+	if [ -n "$update_script" ]; then
+		write_log 7 "parsing script '$update_script'"
+		. $update_script
+	else
+		local __URL __ERR
+
+		# do replaces in URL
+		__URL=$(echo $update_url | sed -e "s#\[USERNAME\]#$URL_USER#g"	-e "s#\[PASSWORD\]#$URL_PASS#g" \
+					       -e "s#\[PARAMENC\]#$URL_PENC#g"	-e "s#\[PARAMOPT\]#$param_opt#g" \
+					       -e "s#\[DOMAIN\]#$domain#g"	-e "s#\[IP\]#$__IP#g")
+		[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
+
+		do_transfer "$__URL" || return 1
+
+		write_log 7 "DDNS Provider answered:${N}$(cat $DATFILE)"
+
+		[ -z "$UPD_ANSWER" ] && return 0	# not set then ignore
+
+		grep -i -E "$UPD_ANSWER" $DATFILE >/dev/null 2>&1
+		return $?	# "0" if found
+	fi
+}
+
+get_current_ip () {
+	# $1	Name of Variable to store current IP
+	local __CNT=0	# error counter
+	local __RUNPROG __DATA __URL __ERR
+
+	[ $# -ne 1 ] && write_log 12 "Error calling 'get_current_ip()' - wrong number of parameters"
+	write_log 7 "Detect current IP on '$ip_source'"
+
+	while : ; do
+		if [ -n "$ip_network" -a "$ip_source" = "network" ]; then
+			# set correct program
+			network_flush_cache	# force re-read data from ubus
+			[ $use_ipv6 -eq 0 ] && __RUNPROG="network_get_ipaddr" \
+					    || __RUNPROG="network_get_ipaddr6"
+			eval "$__RUNPROG __DATA $ip_network" || \
+				write_log 13 "Can not detect current IP using $__RUNPROG '$ip_network' - Error: '$?'"
+			[ -n "$__DATA" ] && write_log 7 "Current IP '$__DATA' detected on network '$ip_network'"
+		elif [ -n "$ip_interface" -a "$ip_source" = "interface" ]; then
+			local __DATA4=""; local __DATA6=""
+			if [ -n "$(command -v ip)" ]; then		# ip program installed
+				write_log 7 "#> ip -o addr show dev $ip_interface scope global >$DATFILE 2>$ERRFILE"
+				ip -o addr show dev $ip_interface scope global >$DATFILE 2>$ERRFILE
+				__ERR=$?
+				if [ $__ERR -eq 0 ]; then
+					# DATFILE (sample)
+					# 10: l2tp-inet: <POINTOPOINT,MULTICAST,NOARP,UP,LOWER_UP> mtu 1456 qdisc fq_codel state UNKNOWN qlen 3\    link/ppp
+					# 10: l2tp-inet    inet 95.30.176.51 peer 95.30.176.1/32 scope global l2tp-inet\       valid_lft forever preferred_lft forever
+					# 5: eth1: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc fq_codel state UP qlen 1000\    link/ether 08:00:27:d0:10:32 brd ff:ff:ff:ff:ff:ff
+					# 5: eth1    inet 172.27.10.128/24 brd 172.27.10.255 scope global eth1\       valid_lft forever preferred_lft forever
+					# 5: eth1    inet 172.55.55.155/24 brd 172.27.10.255 scope global eth1\       valid_lft 12345sec preferred_lft 12345sec
+					# 5: eth1    inet6 2002:b0c7:f326::806b:c629:b8b9:433/128 scope global dynamic \       valid_lft 8026sec preferred_lft 8026sec
+					# 5: eth1    inet6 fd43:5368:6f6d:6500:806b:c629:b8b9:433/128 scope global dynamic \       valid_lft 8026sec preferred_lft 8026sec
+					# 5: eth1    inet6 fd43:5368:6f6d:6500:a00:27ff:fed0:1032/64 scope global dynamic \       valid_lft 14352sec preferred_lft 14352sec
+					# 5: eth1    inet6 2002:b0c7:f326::a00:27ff:fed0:1032/64 scope global dynamic \       valid_lft 14352sec preferred_lft 14352sec
+
+					#    remove      remove     remove      replace     replace
+					#     link     inet6 fxxx    sec      forever=>-1   / => ' ' to separate subnet from ip
+					sed "/link/d; /inet6 f/d; s/sec//g; s/forever/-1/g; s/\// /g" $DATFILE | \
+						awk '{ print $3" "$4" "$NF }' > $ERRFILE	# temp reuse ERRFILE
+					# we only need    inet?   IP  prefered time
+
+					local __TIME4=0;  local __TIME6=0
+					local __TYP __ADR __TIME
+					while read __TYP __ADR __TIME; do
+						__TIME=${__TIME:-0}	# supress shell errors on last (empty) line of DATFILE
+						#    IPversion       no "-1" record stored - now "-1" record or new time > oldtime
+						[ "$__TYP" = "inet6" -a $__TIME6 -ge 0 -a \( $__TIME -lt 0 -o $__TIME -gt $__TIME6 \) ] && {
+							__DATA6="$__ADR"
+							__TIME6="$__TIME"
+						}
+						[ "$__TYP" = "inet" -a $__TIME4 -ge 0 -a \( $__TIME -lt 0 -o $__TIME -gt $__TIME4 \) ] && {
+							__DATA4="$__ADR"
+							__TIME4="$__TIME"
+						}
+					done < $ERRFILE
+				else
+					write_log 3 "ip Error: '$__ERR'"
+					write_log 7 "$(cat $ERRFILE)"		# report error
+				fi
+			else					# use deprecated ifconfig
+				write_log 7 "#> ifconfig $ip_interface >$DATFILE 2>$ERRFILE"
+				ifconfig $ip_interface >$DATFILE 2>$ERRFILE
+				__ERR=$?
+				if [ $__ERR -eq 0 ]; then
+					__DATA4=$(awk '
+						/inet addr:/ {	# Filter IPv4
+						#   inet addr:192.168.1.1  Bcast:192.168.1.255  Mask:255.255.255.0
+						$1="";		# remove inet
+						$3="";		# remove Bcast: ...
+						$4="";		# remove Mask: ...
+						FS=":";		# separator ":"
+						$0=$0;		# reread to activate separator
+						$1="";		# remove addr
+						FS=" ";		# set back separator to default " "
+						$0=$0;		# reread to activate separator (remove whitespaces)
+						print $1;	# print IPv4 addr
+						}' $DATFILE
+					)
+					__DATA6=$(awk '
+						/inet6/ && /: [0-9a-eA-E]/ {	# Filter IPv6 exclude fxxx
+						#   inet6 addr: 2001:db8::xxxx:xxxx/32 Scope:Global
+						FS="/";		# separator "/"
+						$0=$0;		# reread to activate separator
+						$2="";		# remove everything behind "/"
+						FS=" ";		# set back separator to default " "
+						$0=$0;		# reread to activate separator
+						print $3;	# print IPv6 addr
+						}' $DATFILE
+					)
+				else
+					write_log 3 "ifconfig Error: '$__ERR'"
+					write_log 7 "$(cat $ERRFILE)"		# report error
+				fi
+			fi
+			[ $use_ipv6 -eq 0 ] && __DATA="$__DATA4" || __DATA="$__DATA6"
+			[ -n "$__DATA" ] && write_log 7 "Current IP '$__DATA' detected on interface '$ip_interface'"
+		elif [ -n "$ip_script" -a "$ip_source" = "script" ]; then
+			write_log 7 "#> $ip_script >$DATFILE 2>$ERRFILE"
+			eval $ip_script >$DATFILE 2>$ERRFILE
+			__ERR=$?
+			if [ $__ERR -eq 0 ]; then
+				__DATA=$(cat $DATFILE)
+				[ -n "$__DATA" ] && write_log 7 "Current IP '$__DATA' detected via script '$ip_script'"
+			else
+				write_log 3 "$ip_script Error: '$__ERR'"
+				write_log 7 "$(cat $ERRFILE)"		# report error
+			fi
+		elif [ -n "$ip_url" -a "$ip_source" = "web" ]; then
+			do_transfer "$ip_url"
+			# use correct regular expression
+			[ $use_ipv6 -eq 0 ] \
+				&& __DATA=$(grep -m 1 -o "$IPV4_REGEX" $DATFILE) \
+				|| __DATA=$(grep -m 1 -o "$IPV6_REGEX" $DATFILE)
+			[ -n "$__DATA" ] && write_log 7 "Current IP '$__DATA' detected on web at '$ip_url'"
+		else
+			write_log 12 "Error in 'get_current_ip()' - unhandled ip_source '$ip_source'"
+		fi
+		# valid data found return here
+		[ -n "$__DATA" ] && {
+			eval "$1=\"$__DATA\""
+			return 0
+		}
+
+		[ -n "$LUCI_HELPER" ] && return 1	# no retry if called by LuCI helper script
+
+		write_log 7 "Data detected:"
+		write_log 7 "$(cat $DATFILE)"
+
+		[ $VERBOSE -gt 1 ] && {
+			# VERBOSE > 1 then NO retry
+			write_log 4 "Get current IP via '$ip_source' failed - Verbose Mode: $VERBOSE - NO retry on error"
+			return 1
+		}
+
+		__CNT=$(( $__CNT + 1 ))	# increment error counter
+		# if error count > retry_max_count leave here
+		[ $retry_max_count -gt 0 -a $__CNT -gt $retry_max_count ] && \
+			write_log 14 "Get current IP via '$ip_source' failed after $retry_max_count retries"
+		write_log 4 "Get current IP via '$ip_source' failed - retry $__CNT/$retry_max_count in $RETRY_SECONDS seconds"
+		sleep $RETRY_SECONDS &
+		PID_SLEEP=$!
+		wait $PID_SLEEP	# enable trap-handler
+		PID_SLEEP=0
+	done
+	# we should never come here there must be a programming error
+	write_log 12 "Error in 'get_current_ip()' - program coding error"
+}
+
+get_registered_ip() {
+	# $1	Name of Variable to store public IP (REGISTERED_IP)
+	# $2	(optional) if set, do not retry on error
+	local __CNT=0	# error counter
+	local __ERR=255
+	local __REGEX  __PROG  __RUNPROG  __DATA  __IP
+	# return codes
+	# 1	no IP detected
+
+	[ $# -lt 1 -o $# -gt 2 ] && write_log 12 "Error calling 'get_registered_ip()' - wrong number of parameters"
+	[ $is_glue -eq 1 -a -z "$BIND_HOST" ] && write_log 14 "Lookup of glue records is only supported using BIND host"
+	write_log 7 "Detect registered/public IP"
+
+	# set correct regular expression
+	[ $use_ipv6 -eq 0 ] && __REGEX="$IPV4_REGEX" || __REGEX="$IPV6_REGEX"
+
+	if [ -n "$BIND_HOST" ]; then
+		__PROG="$BIND_HOST"
+		[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -t A"  || __PROG="$__PROG -t AAAA"
+		if [ $force_ipversion -eq 1 ]; then			# force IP version
+			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4"  || __PROG="$__PROG -6"
+		fi
+		[ $force_dnstcp -eq 1 ] && __PROG="$__PROG -T"	# force TCP
+		[ $is_glue -eq 1 ] && __PROG="$__PROG -v" # use verbose output to get additional section
+
+		__RUNPROG="$__PROG $lookup_host $dns_server >$DATFILE 2>$ERRFILE"
+		__PROG="BIND host"
+	elif [ -n "$KNOT_HOST" ]; then
+		__PROG="$KNOT_HOST"
+		[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -t A"  || __PROG="$__PROG -t AAAA"
+		if [ $force_ipversion -eq 1 ]; then			# force IP version
+			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4"  || __PROG="$__PROG -6"
+		fi
+		[ $force_dnstcp -eq 1 ] && __PROG="$__PROG -T"	# force TCP
+
+		__RUNPROG="$__PROG $lookup_host $dns_server >$DATFILE 2>$ERRFILE"
+		__PROG="Knot host"
+	elif [ -n "$DRILL" ]; then
+		__PROG="$DRILL -V0"			# drill options name @server type
+		if [ $force_ipversion -eq 1 ]; then			# force IP version
+			[ $use_ipv6 -eq 0 ] && __PROG="$__PROG -4"  || __PROG="$__PROG -6"
+		fi
+		[ $force_dnstcp -eq 1 ] && __PROG="$__PROG -t" || __PROG="$__PROG -u"	# force TCP
+		__PROG="$__PROG $lookup_host"
+		[ -n "$dns_server" ] && __PROG="$__PROG @$dns_server"
+		[ $use_ipv6 -eq 0 ] && __PROG="$__PROG A"  || __PROG="$__PROG AAAA"
+
+		__RUNPROG="$__PROG >$DATFILE 2>$ERRFILE"
+		__PROG="drill"
+	elif [ -n "$HOSTIP" ]; then	# hostip package installed
+		__PROG="$HOSTIP"
+		[ $force_dnstcp -ne 0 ] && \
+			write_log 14 "hostip - no support for 'DNS over TCP'"
+
+		# is IP given as dns_server ?
+		__IP=$(echo $dns_server | grep -m 1 -o "$IPV4_REGEX")
+		[ -z "$__IP" ] && __IP=$(echo $dns_server | grep -m 1 -o "$IPV6_REGEX")
+
+		# we got NO ip for dns_server, so build command
+		[ -z "$__IP" -a -n "$dns_server" ] && {
+			__IP="\`$HOSTIP"
+			[ $use_ipv6 -eq 1 -a $force_ipversion -eq 1 ] && __IP="$__IP -6"
+			__IP="$__IP $dns_server | grep -m 1 -o"
+			[ $use_ipv6 -eq 1 -a $force_ipversion -eq 1 ] \
+				&& __IP="$__IP '$IPV6_REGEX'" \
+				|| __IP="$__IP '$IPV4_REGEX'"
+			__IP="$__IP \`"
+		}
+
+		[ $use_ipv6 -eq 1 ] && __PROG="$__PROG -6"
+		[ -n "$dns_server" ] && __PROG="$__PROG -r $__IP"
+		__RUNPROG="$__PROG $lookup_host >$DATFILE 2>$ERRFILE"
+		__PROG="hostip"
+	elif [ -n "$NSLOOKUP" ]; then	# last use BusyBox nslookup
+		NSLOOKUP_MUSL=$($(command -v nslookup) localhost 2>&1 | grep -F "(null)")	# not empty busybox compiled with musl
+		[ $force_dnstcp -ne 0 ] && \
+			write_log 14 "Busybox nslookup - no support for 'DNS over TCP'"
+		[ -n "$NSLOOKUP_MUSL" -a -n "$dns_server" ] && \
+			write_log 14 "Busybox compiled with musl - nslookup don't support the use of DNS Server"
+		[ $force_ipversion -ne 0 ] && \
+			write_log 5 "Busybox nslookup - no support to 'force IP Version' (ignored)"
+
+		__RUNPROG="$NSLOOKUP $lookup_host $dns_server >$DATFILE 2>$ERRFILE"
+		__PROG="BusyBox nslookup"
+	else	# there must be an error
+		write_log 12 "Error in 'get_registered_ip()' - no supported Name Server lookup software accessible"
+	fi
+
+	while : ; do
+		write_log 7 "#> $__RUNPROG"
+		eval $__RUNPROG
+		__ERR=$?
+		if [ $__ERR -ne 0 ]; then
+			write_log 3 "$__PROG error: '$__ERR'"
+			write_log 7 "$(cat $ERRFILE)"
+		else
+			if [ -n "$BIND_HOST" -o -n "$KNOT_HOST" ]; then
+				if [ $is_glue -eq 1 ]; then
+					__DATA=$(cat $DATFILE | grep "^$lookup_host" | grep -om1 "$__REGEX" )
+				else
+					__DATA=$(cat $DATFILE | awk -F "address " '/has/ {print $2; exit}' )
+				fi
+			elif [ -n "$DRILL" ]; then
+				__DATA=$(cat $DATFILE | awk '/^'"$lookup_host"'/ {print $5; exit}' )
+			elif [ -n "$HOSTIP" ]; then
+				__DATA=$(cat $DATFILE | grep -om1 "$__REGEX")
+			elif [ -n "$NSLOOKUP" ]; then
+				__DATA=$(cat $DATFILE | sed -ne "/^Name:/,\$ { s/^Address[0-9 ]\{0,\}: \($__REGEX\).*$/\\1/p }" )
+			fi
+			[ -n "$__DATA" ] && {
+				write_log 7 "Registered IP '$__DATA' detected"
+				[ -z "$IPFILE" ] || echo "$__DATA" > $IPFILE
+				eval "$1=\"$__DATA\""	# valid data found
+				return 0		# leave here
+			}
+			write_log 4 "NO valid IP found"
+			__ERR=127
+		fi
+		[ -z "$IPFILE" ] || echo "" > $IPFILE
+
+		[ -n "$LUCI_HELPER" ] && return $__ERR	# no retry if called by LuCI helper script
+		[ -n "$2" ] && return $__ERR		# $2 is given -> no retry
+		[ $VERBOSE -gt 1 ] && {
+			# VERBOSE > 1 then NO retry
+			write_log 4 "Get registered/public IP for '$lookup_host' failed - Verbose Mode: $VERBOSE - NO retry on error"
+			return $__ERR
+		}
+
+		__CNT=$(( $__CNT + 1 ))	# increment error counter
+		# if error count > retry_max_count leave here
+		[ $retry_max_count -gt 0 -a $__CNT -gt $retry_max_count ] && \
+			write_log 14 "Get registered/public IP for '$lookup_host' failed after $retry_max_count retries"
+
+		write_log 4 "Get registered/public IP for '$lookup_host' failed - retry $__CNT/$retry_max_count in $RETRY_SECONDS seconds"
+		sleep $RETRY_SECONDS &
+		PID_SLEEP=$!
+		wait $PID_SLEEP	# enable trap-handler
+		PID_SLEEP=0
+	done
+	# we should never come here there must be a programming error
+	write_log 12 "Error in 'get_registered_ip()' - program coding error"
+}
+
+get_uptime() {
+	# $1	Variable to store result in
+	[ $# -ne 1 ] && write_log 12 "Error calling 'verify_host_port()' - wrong number of parameters"
+	local __UPTIME=$(cat /proc/uptime)
+	eval "$1=\"${__UPTIME%%.*}\""
+}
+
+trap_handler() {
+	# $1	trap signal
+	# $2	optional (exit status)
+	local __PIDS __PID
+	local __ERR=${2:-0}
+	local __OLD_IFS=$IFS
+	local __NEWLINE_IFS='
+' # __NEWLINE_IFS
+
+	[ $PID_SLEEP -ne 0 ] && kill -$1 $PID_SLEEP 2>/dev/null	# kill pending sleep if exist
+
+	case $1 in
+		 0)	if [ $__ERR -eq 0 ]; then
+				write_log 5 "PID '$$' exit normal at $(eval $DATE_PROG)${N}"
+			else
+				write_log 4 "PID '$$' exit WITH ERROR '$__ERR' at $(eval $DATE_PROG)${N}"
+			fi ;;
+		 1)	write_log 6 "PID '$$' received 'SIGHUP' at $(eval $DATE_PROG)"
+			# reload config via starting the script again
+			/usr/lib/ddns/dynamic_dns_updater.sh -v "0" -S "$__SECTIONID" -- start || true
+			exit 0 ;;	# and leave this one
+		 2)	write_log 5 "PID '$$' terminated by 'SIGINT' at $(eval $DATE_PROG)${N}";;
+		 3)	write_log 5 "PID '$$' terminated by 'SIGQUIT' at $(eval $DATE_PROG)${N}";;
+		15)	write_log 5 "PID '$$' terminated by 'SIGTERM' at $(eval $DATE_PROG)${N}";;
+		 *)	write_log 13 "Unhandled signal '$1' in 'trap_handler()'";;
+	esac
+
+	__PIDS=$(pgrep -P $$)	# get my childs (pgrep prints with "newline")
+	IFS=$__NEWLINE_IFS
+	for __PID in $__PIDS; do
+		kill -$1 $__PID	# terminate it
+	done
+	IFS=$__OLD_IFS
+
+	# remove out and err file
+	[ -f $DATFILE ] && rm -f $DATFILE
+	[ -f $ERRFILE ] && rm -f $ERRFILE
+
+	# exit with correct handling:
+	# remove trap handling settings and send kill to myself
+	trap - 0 1 2 3 15
+	[ $1 -gt 0 ] && kill -$1 $$
+}
+
+split_FQDN() {
+	# $1	FQDN to split
+	# $2	name of variable to store TLD
+	# $3	name of variable to store (reg)Domain
+	# $4	name of variable to store Host/Subdomain
+
+	[ $# -ne 4 ] && write_log 12 "Error calling 'split_FQDN()' - wrong number of parameters"
+	[ -z "$1"  ] && write_log 12 "Error calling 'split_FQDN()' - missing FQDN to split"
+	[ -f $TLDFILE ] || write_log 12 "Error calling 'split_FQDN()' - missing file '$TLDFILE'"
+
+	local _HOST _FDOM _CTLD _FTLD
+	local _SET="$@"					# save given function parameters
+
+	local _PAR=$(echo "$1" | tr [A-Z] [a-z] | tr "." " ")	# to lower and replace DOT with SPACE
+	set -- $_PAR					# set new as function parameters
+	_PAR=""						# clear variable for later reuse
+	while [ -n "$1" ] ; do				# as long we have parameters
+		_PAR="$1 $_PAR"				# invert order of parameters
+		shift
+	done
+	set -- $_PAR					# use new as function parameters
+	_PAR=""						# clear variable
+
+	while [ -n "$1" ] ; do				# as long we have parameters
+		if [ -z "$_CTLD" ]; then 		# first loop
+			_CTLD="$1"			# CURRENT TLD to look at
+			shift
+		else
+			_CTLD="$1.$_CTLD"		# Next TLD to look at
+			shift
+		fi
+		# check if TLD exact match in tld_names.dat, save TLD
+		zcat $TLDFILE | grep -E "^$_CTLD$" >/dev/null 2>&1 && {
+			_FTLD="$_CTLD"		# save found
+			_FDOM="$1"		# save domain next step might be invalid
+			continue
+		}
+		# check if match any "*" in tld_names.dat,
+		zcat $TLDFILE | grep -E "^\*.$_CTLD$" >/dev/null 2>&1 && {
+			[ -z "$1" ] && break	# no more data break
+			# check if next level TLD match excludes "!" in tld_names.dat
+			if zcat $TLDFILE | grep -E "^!$1.$_CTLD$" >/dev/null 2>&1 ; then
+				_FTLD="$_CTLD"	# Yes
+			else
+				_FTLD="$1.$_CTLD"
+				shift
+			fi
+			_FDOM="$1"; shift
+		}
+		[ -n "$_FTLD" ] && break	# we have something valid, break
+	done
+
+	# the leftover parameters are the HOST/SUBDOMAIN
+	while [ -n "$1" ]; do
+		_HOST="$1 $_HOST"		# remember we need to invert
+		shift
+	done
+	_HOST=$(echo $_HOST | tr " " ".")	# insert DOT
+
+	set -- $_SET				# set back parameters from function call
+	[ -n "$_FTLD" ] && {
+		eval "$2=$_FTLD"		# set TLD
+		eval "$3=$_FDOM"		# set registrable domain
+		eval "$4=$_HOST"		# set HOST/SUBDOMAIN
+		return 0
+	}
+	eval "$2=''"		# clear TLD
+	eval "$3=''"		# clear registrable domain
+	eval "$4=''"		# clear HOST/SUBDOMAIN
+	return 1
+}
+
+expand_ipv6() {
+	# Original written for bash by
+	#.Author:  Florian Streibelt <florian@f-streibelt.de>
+	# Date:    08.04.2012
+	# License: Public Domain, but please be fair and
+	#          attribute the original author(s) and provide
+	#          a link to the original source for corrections:
+	#.         https://github.com/mutax/IPv6-Address-checks
+
+	# $1	IPv6 to expand
+	# $2	name of variable to store expanded IPv6
+	[ $# -ne 2 ] && write_log 12 "Error calling 'expand_ipv6()' - wrong number of parameters"
+
+	INPUT="$(echo "$1" | tr 'A-F' 'a-f')"
+	[ "$INPUT" = "::" ] && INPUT="::0"	# special case ::
+
+	O=""
+
+	while [ "$O" != "$INPUT" ]; do
+		O="$INPUT"
+
+		# fill all words with zeroes
+		INPUT=$( echo "$INPUT" | sed	-e 's|:\([0-9a-f]\{3\}\):|:0\1:|g' \
+						-e 's|:\([0-9a-f]\{3\}\)$|:0\1|g' \
+						-e 's|^\([0-9a-f]\{3\}\):|0\1:|g' \
+						-e 's|:\([0-9a-f]\{2\}\):|:00\1:|g' \
+						-e 's|:\([0-9a-f]\{2\}\)$|:00\1|g' \
+						-e 's|^\([0-9a-f]\{2\}\):|00\1:|g' \
+						-e 's|:\([0-9a-f]\):|:000\1:|g' \
+						-e 's|:\([0-9a-f]\)$|:000\1|g' \
+						-e 's|^\([0-9a-f]\):|000\1:|g' )
+
+	done
+
+	# now expand the ::
+	ZEROES=""
+
+	echo "$INPUT" | grep -qs "::"
+	if [ "$?" -eq 0 ]; then
+		GRPS="$( echo "$INPUT" | sed  's|[0-9a-f]||g' | wc -m )"
+		GRPS=$(( GRPS-1 ))		# remove carriage return
+		MISSING=$(( 8-GRPS ))
+		while [ $MISSING -gt 0 ]; do
+			ZEROES="$ZEROES:0000"
+			MISSING=$(( MISSING-1 ))
+		done
+
+		# be careful where to place the :
+		INPUT=$( echo "$INPUT" | sed	-e 's|\(.\)::\(.\)|\1'$ZEROES':\2|g' \
+						-e 's|\(.\)::$|\1'$ZEROES':0000|g' \
+						-e 's|^::\(.\)|'$ZEROES':0000:\1|g;s|^:||g' )
+	fi
+
+	# an expanded address has 39 chars + CR
+	if [ $(echo $INPUT | wc -m) != 40 ]; then
+		write_log 4 "Error in 'expand_ipv6()' - invalid IPv6 found: '$1' expanded: '$INPUT'"
+		eval "$2='invalid'"
+		return 1
+	fi
+
+	# echo the fully expanded version of the address
+	eval "$2=$INPUT"
+	return 0
+}
diff --git a/ddns-scripts/files/usr/lib/ddns/dynamic_dns_lucihelper.sh b/ddns-scripts/files/usr/lib/ddns/dynamic_dns_lucihelper.sh
new file mode 100644
index 00000000..f7633484
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/dynamic_dns_lucihelper.sh
@@ -0,0 +1,172 @@
+#!/bin/sh
+# /usr/lib/ddns/dynamic_dns_lucihelper.sh
+#
+#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
+#.2014-2018 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+# This script is used by luci-app-ddns
+#
+# variables in small chars are read from /etc/config/ddns as parameter given here
+# variables in big chars are defined inside these scripts as gloval vars
+# variables in big chars beginning with "__" are local defined inside functions only
+# set -vx  	#script debugger
+
+. /usr/lib/ddns/dynamic_dns_functions.sh	# global vars are also defined here
+
+usage() {
+	cat << EOF
+
+Usage:
+ $MYPROG [options] -- command
+
+Commands:
+ get_local_ip        using given INTERFACE or NETWORK or SCRIPT or URL
+ get_registered_ip   for given FQDN
+ verify_dns          given DNS-SERVER
+ verify_proxy        given PROXY
+ start               start given SECTION
+ reload              force running ddns processes to reload changed configuration
+ restart             restart all ddns processes
+
+Parameters:
+ -6                  => use_ipv6=1          (default 0)
+ -d DNS-SERVER       => dns_server=SERVER[:PORT]
+ -f                  => force_ipversion=1   (default 0)
+ -g                  => is_glue=1           (default 0)
+ -i INTERFACE        => ip_interface=INTERFACE; ip_source="interface"
+ -l FQDN             => lookup_host=FQDN
+ -n NETWORK          => ip_network=NETWORK; ip_source="network"
+ -p PROXY            => proxy=[USER:PASS@]PROXY:PORT
+ -s SCRIPT           => ip_script=SCRIPT; ip_source="script"
+ -t                  => force_dnstcp=1      (default 0)
+ -u URL              => ip_url=URL; ip_source="web"
+ -S SECTION          SECTION to start
+
+ -h                  => show this help and exit
+ -L                  => use_logfile=1    (default 0)
+ -v LEVEL            => VERBOSE=LEVEL    (default 0)
+ -V                  => show version and exit
+
+EOF
+}
+
+usage_err() {
+	printf %s\\n "$MYPROG: $@" >&2
+	usage >&2
+	exit 255
+}
+
+# preset some variables, wrong or not set in ddns-functions.sh
+SECTION_ID="lucihelper"
+LOGFILE="$ddns_logdir/$SECTION_ID.log"
+DATFILE="$ddns_rundir/$SECTION_ID.$$.dat"	# save stdout data of WGet and other extern programs called
+ERRFILE="$ddns_rundir/$SECTION_ID.$$.err"	# save stderr output of WGet and other extern programs called
+DDNSPRG="/usr/lib/ddns/dynamic_dns_updater.sh"
+VERBOSE=0		# no console logging
+# global variables normally set by reading DDNS UCI configuration
+use_syslog=0		# no syslog
+use_logfile=0		# no logfile
+
+use_ipv6=0		# Use IPv6 - default IPv4
+force_ipversion=0	# Force IP Version - default 0 - No
+force_dnstcp=0		# Force TCP on DNS - default 0 - No
+is_glue=0		# Is glue record - default 0 - No
+use_https=0		# not needed but must be set
+
+while getopts ":6d:fghi:l:n:p:s:S:tu:Lv:V" OPT; do
+	case "$OPT" in
+		6)	use_ipv6=1;;
+		d)	dns_server="$OPTARG";;
+		f)	force_ipversion=1;;
+		g)	is_glue=1;;
+		i)	ip_interface="$OPTARG"; ip_source="interface";;
+		l)	lookup_host="$OPTARG";;
+		n)	ip_network="$OPTARG"; ip_source="network";;
+		p)	proxy="$OPTARG";;
+		s)	ip_script="$OPTARG"; ip_source="script";;
+		t)	force_dnstcp=1;;
+		u)	ip_url="$OPTARG"; ip_source="web";;
+		h)	usage; exit 255;;
+		L)	use_logfile=1;;
+		v)	VERBOSE=$OPTARG;;
+		S)	SECTION=$OPTARG;;
+		V)	printf %s\\n "ddns-scripts $VERSION"; exit 255;;
+		:)	usage_err "option -$OPTARG missing argument";;
+		\?)	usage_err "invalid option -$OPTARG";;
+		*)	usage_err "unhandled option -$OPT $OPTARG";;
+	esac
+done
+shift $((OPTIND - 1 ))	# OPTIND is 1 based
+
+[ $# -eq 0 ] && usage_err "missing command"
+
+__RET=0
+case "$1" in
+	get_registered_ip)
+		[ -z "$lookup_host" ] && usage_err "command 'get_registered_ip': 'lookup_host' not set" 
+		write_log 7 "-----> get_registered_ip IP"
+		[ -z "$SECTION" ] || IPFILE="$ddns_rundir/$SECTION.ip"
+		IP=""
+		get_registered_ip IP
+		__RET=$?
+		[ $__RET -ne 0 ] && IP=""
+		printf "%s" "$IP"
+		;;
+	verify_dns)
+		[ -z "$dns_server" ] && usage_err "command 'verify_dns': 'dns_server' not set" 
+		write_log 7 "-----> verify_dns '$dns_server'"
+		verify_dns "$dns_server"
+		__RET=$?
+		;;
+	verify_proxy)
+		[ -z "$proxy" ] && usage_err "command 'verify_proxy': 'proxy' not set" 
+		write_log 7 "-----> verify_proxy '$proxy'"
+		verify_proxy "$proxy"
+		__RET=$?
+		;;
+	get_local_ip)
+		[ -z "$ip_source" ] && usage_err "command 'get_local_ip': 'ip_source' not set" 
+		[ -n "$proxy" -a "$ip_source" = "web" ] && {
+			# proxy defined, used for ip_source=web
+			export HTTP_PROXY="http://$proxy"
+			export HTTPS_PROXY="http://$proxy"
+			export http_proxy="http://$proxy"
+			export https_proxy="http://$proxy"
+		}
+		# don't need IP only the return code
+		IP=""
+		if [ "$ip_source" = "web" -o  "$ip_source" = "script" ]; then
+			# we wait only 3 seconds for an
+			# answer from "web" or "script"
+			write_log 7 "-----> timeout 3 -- get_current_ip IP"
+			timeout 3 -- get_current_ip IP
+		else
+			write_log 7 "-----> get_current_ip IP"
+			get_current_ip IP
+		fi
+		__RET=$?
+		;;
+	start)
+		[ -z "$SECTION" ] &&  usage_err "command 'start': 'SECTION' not set"
+		if [ $VERBOSE -eq 0 ]; then	# start in background
+			$DDNSPRG -v 0 -S $SECTION -- start &
+		else
+			$DDNSPRG -v $VERBOSE -S $SECTION -- start
+		fi
+		;;
+	reload)
+		$DDNSPRG -- reload
+		;;
+	restart)
+		$DDNSPRG -- stop
+		sleep 1
+		$DDNSPRG -- start
+		;;
+	*)
+		__RET=255
+		;;
+esac
+
+# remove out and err file
+[ -f $DATFILE ] && rm -f $DATFILE
+[ -f $ERRFILE ] && rm -f $ERRFILE
+return $__RET
diff --git a/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh b/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
new file mode 100644
index 00000000..eb17a949
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh
@@ -0,0 +1,437 @@
+#!/bin/sh
+# /usr/lib/ddns/dynamic_dns_updater.sh
+#
+#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
+# Original written by Eric Paul Bishop, January 2008
+# (Loosely) based on the script on the one posted by exobyte in the forums here:
+# http://forum.openwrt.org/viewtopic.php?id=14040
+# extended and partial rewritten
+#.2014-2018 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+#
+# variables in small chars are read from /etc/config/ddns
+# variables in big chars are defined inside these scripts as global vars
+# variables in big chars beginning with "__" are local defined inside functions only
+# set -vx  	#script debugger
+
+. $(dirname $0)/dynamic_dns_functions.sh	# global vars are also defined here
+
+usage() {
+	cat << EOF
+
+Usage:
+ $MYPROG [options] -- command
+
+Commands:
+start                Start SECTION or NETWORK or all
+stop                 Stop NETWORK or all
+
+Parameters:
+ -n NETWORK          Start/Stop sections in background monitoring NETWORK, force VERBOSE=0
+ -S SECTION          SECTION to start
+                     use either -N NETWORK or -S SECTION
+
+ -h                  show this help and exit
+ -V                  show version and exit
+ -v LEVEL            VERBOSE=LEVEL (default 1)
+                        '0' NO output to console
+                        '1' output to console
+                        '2' output to console AND logfile
+                            + run once WITHOUT retry on error
+ -d                  dry run (don't send any changes)
+
+EOF
+}
+
+usage_err() {
+	printf %s\\n "$MYPROG: $@" >&2
+	usage >&2
+	exit 1
+}
+
+while getopts ":hv:dn:S:V" OPT; do
+	case "$OPT" in
+		h)	usage; exit 0;;
+		v)	VERBOSE=$OPTARG;;
+		d)	DRY_RUN=1;;
+		n)	NETWORK=$OPTARG;;
+		S)	SECTION_ID=$OPTARG;;
+		V)	printf %s\\n "ddns-scripts $VERSION"; exit 0;;
+		:)	usage_err "option -$OPTARG missing argument";;
+		\?)	usage_err "invalid option -$OPTARG";;
+		*)	usage_err "unhandled option -$OPT $OPTARG";;
+	esac
+done
+shift $((OPTIND - 1 ))	# OPTIND is 1 based
+
+[ -n "$NETWORK" -a -n "$SECTION_ID" ] && usage_err "use either option '-N' or '-S' not both"
+[ $# -eq 0 ] && usage_err "missing command"
+[ $# -gt 1 ] && usage_err "to much commands"
+
+case "$1" in
+	start)
+		if [ -n "$NETWORK" ]; then
+			start_daemon_for_all_ddns_sections "$NETWORK"
+			exit 0
+		fi
+		if [ -z "$SECTION_ID" ]; then
+			start_daemon_for_all_ddns_sections
+			exit 0
+		fi
+		;;
+	stop)
+		if [ -n "$INTERFACE" ]; then
+			stop_daemon_for_all_ddns_sections "$NETWORK"
+			exit 0
+		else
+			stop_daemon_for_all_ddns_sections
+			exit 0
+		fi
+		exit 1
+		;;
+	reload)
+		killall -1 dynamic_dns_updater.sh 2>/dev/null
+		exit $?
+		;;
+	*)	usage_err "unknown command - $1";;
+esac
+
+# set file names
+PIDFILE="$ddns_rundir/$SECTION_ID.pid"	# Process ID file
+UPDFILE="$ddns_rundir/$SECTION_ID.update"	# last update successful send (system uptime)
+DATFILE="$ddns_rundir/$SECTION_ID.dat"	# save stdout data of WGet and other extern programs called
+ERRFILE="$ddns_rundir/$SECTION_ID.err"	# save stderr output of WGet and other extern programs called
+IPFILE="$ddns_rundir/$SECTION_ID.ip"	#
+LOGFILE="$ddns_logdir/$SECTION_ID.log"	# log file
+
+# VERBOSE > 1 delete logfile if exist to create an empty one
+# only with this data of this run for easier diagnostic
+# new one created by write_log function
+[ $VERBOSE -gt 1 -a -f $LOGFILE ] && rm -f $LOGFILE
+# Previously -v 3 could we used for dry run
+[ $VERBOSE -ge 3 ] && DRY_RUN=1
+
+# TRAP handler
+trap "trap_handler 0 \$?" 0	# handle script exit with exit status
+trap "trap_handler 1"  1	# SIGHUP	Hangup / reload config
+trap "trap_handler 2"  2	# SIGINT	Terminal interrupt
+trap "trap_handler 3"  3	# SIGQUIT	Terminal quit
+# trap "trap_handler 9"  9	# SIGKILL	no chance to trap
+trap "trap_handler 15" 15	# SIGTERM	Termination
+
+################################################################################
+# Leave this comment here, to clearly document variable names that are expected/possible
+# Use load_all_config_options to load config options, which is a much more flexible solution.
+#
+# config_load "ddns"
+# config_get <variable> $SECTION_ID <option>
+#
+# defined options (also used as variable):
+#
+# enabled	self-explanatory
+# interface 	network interface used by hotplug.d i.e. 'wan' or 'wan6'
+#
+# service_name	Which DDNS service do you use or "custom"
+# update_url	URL to use to update your "custom" DDNS service
+# update_script SCRIPT to use to update your "custom" DDNS service
+#
+# lookup_host	FQDN of ONE of your at DDNS service defined host / required to validate if IP update happen/necessary
+# domain 	Nomally your DDNS hostname / replace [DOMAIN] in update_url
+# username 	Username of your DDNS service account / urlenceded and replace [USERNAME] in update_url
+# password 	Password of your DDNS service account / urlencoded and replace [PASSWORD] in update_url
+# param_enc	Optional parameter for (later) usage  / urlencoded and replace [PARAMENC] in update_url
+# param_opt	Optional parameter for (later) usage  / replace [PARAMOPT] in update_url
+#
+# use_https	use HTTPS to update DDNS service
+# cacert	file or directory where HTTPS can find certificates to verify server; 'IGNORE' ignore check of server certificate
+#
+# use_syslog	log activity to syslog
+#
+# ip_source	source to detect current IP ('network' or 'web' or 'script' or 'interface')
+# ip_network	local defined network to read IP from i.e. 'wan' or 'wan6'
+# ip_url	URL to read current IP from i.e. http://checkip.dyndns.com/ or http://checkipv6.dyndns.com/
+# ip_script	full path and name of your script to detect current IP
+# ip_interface	physical interface to use for detecting
+#
+# check_interval	check for changes every  !!! checks below 10 minutes make no sense because the Internet
+# check_unit		'days' 'hours' 'minutes' !!! needs about 5-10 minutes to sync an IP-change for an DNS entry
+#
+# force_interval	force to send an update to your service if no change was detected
+# force_unit		'days' 'hours' 'minutes' !!! force_interval="0" runs this script once for use i.e. with cron
+#
+# retry_interval	if error was detected retry in
+# retry_unit		'days' 'hours' 'minutes' 'seconds'
+# retry_max_count	number of retries before scripts stops
+#
+# use_ipv6		detecting/sending IPv6 address
+# force_ipversion	force usage of IPv4 or IPv6 for the whole detection and update communication
+# dns_server		using a non default dns server to get Registered IP from Internet
+# force_dnstcp		force communication with DNS server via TCP instead of default UDP
+# proxy			using a proxy for communication !!! ALSO used to detect current IP via web => return proxy's IP !!!
+# use_logfile		self-explanatory "/var/log/ddns/$SECTION_ID.log"
+# is_glue			the record that should be updated is a glue record
+#
+# some functionality needs
+# - GNU Wget or cURL installed for sending updates to DDNS service
+# - BIND host installed to detect Registered IP
+#
+################################################################################
+
+load_all_config_options "ddns" "$SECTION_ID"
+ERR_LAST=$?	# save return code - equal 0 if SECTION_ID found
+
+# set defaults if not defined
+[ -z "$enabled" ]	  && enabled=0
+[ -z "$retry_max_count" ] && retry_max_count=0	# endless retry
+[ -z "$use_syslog" ]      && use_syslog=2	# syslog "Notice"
+[ -z "$use_https" ]       && use_https=0	# not use https
+[ -z "$use_logfile" ]     && use_logfile=1	# use logfile by default
+[ -z "$use_ipv6" ]	  && use_ipv6=0		# use IPv4 by default
+[ -z "$force_ipversion" ] && force_ipversion=0	# default let system decide
+[ -z "$force_dnstcp" ]	  && force_dnstcp=0	# default UDP
+[ -z "$ip_source" ]	  && ip_source="network"
+[ -z "$is_glue" ]	  && is_glue=0		# default the ddns record is not a glue record
+[ "$ip_source" = "network" -a -z "$ip_network" -a $use_ipv6 -eq 0 ] && ip_network="wan"  # IPv4: default wan
+[ "$ip_source" = "network" -a -z "$ip_network" -a $use_ipv6 -eq 1 ] && ip_network="wan6" # IPv6: default wan6
+[ "$ip_source" = "web" -a -z "$ip_url" -a $use_ipv6 -eq 0 ] && ip_url="http://checkip.dyndns.com"
+[ "$ip_source" = "web" -a -z "$ip_url" -a $use_ipv6 -eq 1 ] && ip_url="http://checkipv6.dyndns.com"
+[ "$ip_source" = "interface" -a -z "$ip_interface" ] && ip_interface="eth1"
+
+# url encode username (might be email or something like this)
+# and password (might have special chars for security reason)
+# and optional parameter "param_enc"
+[ -n "$username" ] && urlencode URL_USER "$username"
+[ -n "$password" ] && urlencode URL_PASS "$password"
+[ -n "$param_enc" ] && urlencode URL_PENC "$param_enc"
+
+# SECTION_ID does not exists
+[ $ERR_LAST -ne 0 ] && {
+	[ $VERBOSE -le 1 ] && VERBOSE=2		# force console out and logfile output
+	[ -f $LOGFILE ] && rm -f $LOGFILE	# clear logfile before first entry
+	write_log  7 "************ ************** ************** **************"
+	write_log  5 "PID '$$' started at $(eval $DATE_PROG)"
+	write_log  7 "ddns version  : $VERSION"
+	write_log  7 "uci configuration:${N}$(uci -q show ddns | grep '=service' | sort)"
+	write_log 14 "Service section '$SECTION_ID' not defined"
+}
+
+write_log 7 "************ ************** ************** **************"
+write_log 5 "PID '$$' started at $(eval $DATE_PROG)"
+write_log 7 "ddns version  : $VERSION"
+write_log 7 "uci configuration:${N}$(uci -q show ddns.$SECTION_ID | sort)"
+# write_log 7 "ddns version  : $(opkg list-installed ddns-scripts | cut -d ' ' -f 3)"
+case $VERBOSE in
+	0) write_log  7 "verbose mode  : 0 - run normal, NO console output";;
+	1) write_log  7 "verbose mode  : 1 - run normal, console mode";;
+	2) write_log  7 "verbose mode  : 2 - run once, NO retry on error";;
+	*) write_log 14 "error detecting VERBOSE '$VERBOSE'";;
+esac
+[ $DRY_RUN -ge 1 ] && write_log  7 "Dry Run: NOT sending update"
+
+# check enabled state otherwise we don't need to continue
+[ $enabled -eq 0 ] && write_log 14 "Service section disabled!"
+
+# determine what update url we're using if a service_name is supplied
+# otherwise update_url is set inside configuration (custom update url)
+# or update_script is set inside configuration (custom update script)
+[ -n "$service_name" ] && {
+	# Check first if we have a custom service provider with this name
+	get_service_data "$service_name" "/usr/share/ddns/custom" update_url update_script UPD_ANSWER
+	if [ "$?" != "0" ]; then
+		get_service_data "$service_name" "/usr/share/ddns/default" update_url update_script UPD_ANSWER
+	fi
+}
+
+[ -z "$update_url" -a -z "$update_script" ] && write_log 14 "No update_url found/defined or no update_script found/defined!"
+[ -n "$update_script" -a ! -f "$update_script" ] && write_log 14 "Custom update_script not found!"
+
+# temporary needed to convert existing uci settings
+[ -z "$lookup_host" ] && {
+	uci -q set ddns.$SECTION_ID.lookup_host="$domain"
+	uci -q commit ddns
+	lookup_host="$domain"
+}
+# later versions only check if configured correctly
+
+# without lookup host and possibly other required options we can do nothing for you
+[ -z "$lookup_host" ] && write_log 14 "Service section not configured correctly! Missing 'lookup_host'"
+
+# verify validity of variables
+[ -n "$lookup_host" ] && sanitize_variable lookup_host "$DNS_CHARSET" ""
+[ -n "$dns_server" ] && sanitize_variable dns_server "$DNS_CHARSET" ""
+[ -n "$domain" ] && sanitize_variable domain "$DNS_CHARSET_DOMAIN" ""
+
+# Filter shell escape characters, if these are required in the URL, they
+# can still be passed url encoded
+[ -n "$param_opt" ] && sanitize_variable param_opt "" "$SHELL_ESCAPE"
+
+[ -n "$update_url" ] && {
+	# only check if update_url is given, update_scripts have to check themselves
+	[ -z "$domain" ] && $(echo "$update_url" | grep "\[DOMAIN\]" >/dev/null 2>&1) && \
+		write_log 14 "Service section not configured correctly! Missing 'domain'"
+	[ -z "$username" ] && $(echo "$update_url" | grep "\[USERNAME\]" >/dev/null 2>&1) && \
+		write_log 14 "Service section not configured correctly! Missing 'username'"
+	[ -z "$password" ] && $(echo "$update_url" | grep "\[PASSWORD\]" >/dev/null 2>&1) && \
+		write_log 14 "Service section not configured correctly! Missing 'password'"
+	[ -z "$param_enc" ] && $(echo "$update_url" | grep "\[PARAMENC\]" >/dev/null 2>&1) && \
+		write_log 14 "Service section not configured correctly! Missing 'param_enc'"
+	[ -z "$param_opt" ] && $(echo "$update_url" | grep "\[PARAMOPT\]" >/dev/null 2>&1) && \
+		write_log 14 "Service section not configured correctly! Missing 'param_opt'"
+}
+
+# verify ip_source 'script' if script is configured and executable
+if [ "$ip_source" = "script" ]; then
+	set -- $ip_script	#handling script with parameters, we need a trick
+	[ -z "$1" ] && write_log 14 "No script defined to detect current IP!"
+	[ -x "$1" ] || write_log 14 "Script to detect current IP not executable!"
+fi
+
+# compute update interval in seconds
+get_seconds CHECK_SECONDS ${check_interval:-10} ${check_unit:-"minutes"} # default 10 min
+get_seconds FORCE_SECONDS ${force_interval:-72} ${force_unit:-"hours"}	 # default 3 days
+get_seconds RETRY_SECONDS ${retry_interval:-60} ${retry_unit:-"seconds"} # default 60 sec
+[ $CHECK_SECONDS -lt 300 ] && CHECK_SECONDS=300		# minimum 5 minutes
+[ $FORCE_SECONDS -gt 0 -a $FORCE_SECONDS -lt $CHECK_SECONDS ] && FORCE_SECONDS=$CHECK_SECONDS	# FORCE_SECONDS >= CHECK_SECONDS or 0
+write_log 7 "check interval: $CHECK_SECONDS seconds"
+write_log 7 "force interval: $FORCE_SECONDS seconds"
+write_log 7 "retry interval: $RETRY_SECONDS seconds"
+write_log 7 "retry max count : $retry_max_count times"
+
+# kill old process if it exists & set new pid file
+stop_section_processes "$SECTION_ID"
+[ $? -gt 0 ] && write_log 7 "'SIGTERM' was send to old process" || write_log 7 "No old process"
+echo $$ > $PIDFILE
+
+# determine when the last update was
+# the following lines should prevent multiple updates if hotplug fires multiple startups
+# as described in Ticket #7820, but did not function if never an update take place
+# i.e. after a reboot (/var is linked to /tmp)
+# using uptime as reference because date might not be updated via NTP client
+get_uptime CURR_TIME
+[ -e "$UPDFILE" ] && {
+	LAST_TIME=$(cat $UPDFILE)
+	# check also LAST > CURR because link of /var/run to /tmp might be removed
+	# i.e. boxes with larger filesystems
+	[ -z "$LAST_TIME" ] && LAST_TIME=0
+	[ $LAST_TIME -gt $CURR_TIME ] && LAST_TIME=0
+}
+if [ $LAST_TIME -eq 0 ]; then
+	write_log 7 "last update: never"
+else
+	EPOCH_TIME=$(( $(date +%s) - $CURR_TIME + $LAST_TIME ))
+	EPOCH_TIME="date -d @$EPOCH_TIME +'$ddns_dateformat'"
+	write_log 7 "last update: $(eval $EPOCH_TIME)"
+fi
+
+# verify DNS server
+[ -n "$dns_server" ] && verify_dns "$dns_server"
+
+# verify Proxy server and set environment
+[ -n "$proxy" ] && {
+	verify_proxy "$proxy" && {
+		# everything ok set proxy
+		export HTTP_PROXY="http://$proxy"
+		export HTTPS_PROXY="http://$proxy"
+		export http_proxy="http://$proxy"
+		export https_proxy="http://$proxy"
+	}
+}
+
+# let's check if there is already an IP registered on the web
+get_registered_ip REGISTERED_IP "NO_RETRY"
+ERR_LAST=$?
+#     No error    or     No IP set	 otherwise retry
+[ $ERR_LAST -eq 0 -o $ERR_LAST -eq 127 ] || get_registered_ip REGISTERED_IP "NO_RETRY"
+# on IPv6 we use expanded version to be shure when comparing
+[ $use_ipv6 -eq 1 ] && expand_ipv6 "$REGISTERED_IP" REGISTERED_IP
+
+# loop endlessly, checking ip every check_interval and forcing an updating once every force_interval
+write_log 6 "Starting main loop at $(eval $DATE_PROG)"
+FIRST_UPDATE=1
+while : ; do
+
+	get_current_ip CURRENT_IP		# read current IP
+	[ $use_ipv6 -eq 1 ] && expand_ipv6 "$CURRENT_IP" CURRENT_IP	# on IPv6 we use expanded version
+
+	# prepare update
+	# never updated or forced immediate then NEXT_TIME = 0
+	[ $FORCE_SECONDS -eq 0 -o $LAST_TIME -eq 0 ] \
+		&& NEXT_TIME=0 \
+		|| NEXT_TIME=$(( $LAST_TIME + $FORCE_SECONDS ))
+
+	get_uptime CURR_TIME		# get current uptime
+
+	# send update when current time > next time or current ip different from registered ip or first start
+	if [ $CURR_TIME -ge $NEXT_TIME -o "$CURRENT_IP" != "$REGISTERED_IP" -o $FIRST_UPDATE -eq 1 ]; then
+		FIRST_UPDATE=0
+		if [ $VERBOSE -gt 2 ]; then
+			write_log 7 "Dry Run: NO UPDATE send"
+		elif [ "$CURRENT_IP" != "$REGISTERED_IP" ]; then
+			write_log 7 "Update needed - L: '$CURRENT_IP' <> R: '$REGISTERED_IP'"
+		else
+			write_log 7 "Forced Update - L: '$CURRENT_IP' == R: '$REGISTERED_IP'"
+		fi
+
+		ERR_LAST=0
+		[ $VERBOSE -lt 3 ] && {
+			send_update "$CURRENT_IP"
+			ERR_LAST=$?	# save return value
+		}
+
+		# error sending current IP to provider
+		# we have no communication error (handled inside send_update/do_transfer)
+		# but update was not recognized
+		# do NOT retry after RETRY_SECONDS, do retry after CHECK_SECONDS
+		# to early retrys will block most DDNS provider
+		# providers answer is checked inside send_update() function
+		if [ $ERR_LAST -eq 0 ]; then
+			get_uptime LAST_TIME		# we send update, so
+			echo $LAST_TIME > $UPDFILE	# save LASTTIME to file
+			[ "$CURRENT_IP" != "$REGISTERED_IP" ] \
+				&& write_log 6 "Update successful - IP '$CURRENT_IP' send" \
+				|| write_log 6 "Forced update successful - IP: '$CURRENT_IP' send"
+		elif [ $ERR_LAST -eq 127 ]; then
+			write_log 3 "No update send to DDNS Provider"
+		else
+			write_log 3 "IP update not accepted by DDNS Provider"
+		fi
+	fi
+
+	# now we wait for check interval before testing if update was recognized
+	[ $VERBOSE -le 2 ] && {
+		write_log 7 "Waiting $CHECK_SECONDS seconds (Check Interval)"
+		sleep $CHECK_SECONDS &
+		PID_SLEEP=$!
+		wait $PID_SLEEP	# enable trap-handler
+		PID_SLEEP=0
+	} || write_log 7 "Dry Run: NO Check Interval waiting"
+
+	REGISTERED_IP=""		# clear variable
+	get_registered_ip REGISTERED_IP	# get registered/public IP
+	[ $use_ipv6 -eq 1 ] && expand_ipv6 "$REGISTERED_IP" REGISTERED_IP	# on IPv6 we use expanded version
+
+	# IP's are still different
+	if [ "$CURRENT_IP" != "$REGISTERED_IP" ]; then
+		if [ $VERBOSE -le 1 ]; then	# VERBOSE <=1 then retry
+			RETRY_COUNT=$(( $RETRY_COUNT + 1 ))
+			[ $retry_max_count -gt 0 -a $RETRY_COUNT -gt $retry_max_count ] && \
+				write_log 14 "Updating IP at DDNS provider failed after $retry_max_count retries"
+			write_log 4 "Updating IP at DDNS provider failed - starting retry $RETRY_COUNT/$retry_max_count"
+			continue # loop to beginning
+		else
+			write_log 4 "Updating IP at DDNS provider failed"
+			write_log 7 "Verbose Mode: $VERBOSE - NO retry"; exit 1
+		fi
+	else
+		# we checked successful the last update
+		RETRY_COUNT=0			# reset error counter
+	fi
+
+	# force_update=0 or VERBOSE > 1 - leave here
+	[ $VERBOSE -gt 1 ]  && write_log 7 "Verbose Mode: $VERBOSE - NO reloop"
+	[ $FORCE_SECONDS -eq 0 ] && write_log 6 "Configured to run once"
+	[ $VERBOSE -gt 1 -o $FORCE_SECONDS -eq 0 ] && exit 0
+
+	write_log 6 "Rerun IP check at $(eval $DATE_PROG)"
+done
+# we should never come here there must be a programming error
+write_log 12 "Error in 'dynamic_dns_updater.sh - program coding error"
diff --git a/ddns-scripts/files/usr/lib/ddns/update_cloudflare_com_v4.sh b/ddns-scripts/files/usr/lib/ddns/update_cloudflare_com_v4.sh
new file mode 100644
index 00000000..4fb3a0dd
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_cloudflare_com_v4.sh
@@ -0,0 +1,202 @@
+#!/bin/sh
+#
+#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
+#
+# script for sending updates to cloudflare.com
+#.based on Ben Kulbertis cloudflare-update-record.sh found at http://gist.github.com/benkulbertis
+#.and on George Johnson's cf-ddns.sh found at https://github.com/gstuartj/cf-ddns.sh
+#.2016-2018 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+# CloudFlare API documentation at https://api.cloudflare.com/
+#
+# This script is parsed by dynamic_dns_functions.sh inside send_update() function
+#
+# using following options from /etc/config/ddns
+# option username  - your cloudflare e-mail
+# option password  - cloudflare api key, you can get it from cloudflare.com/my-account/
+# option domain    - "hostname@yourdomain.TLD"	# syntax changed to remove split_FQDN() function and tld_names.dat.gz
+#
+# The proxy status would not be changed by this script. Please change it in Cloudflare dashboard manually.
+#
+# variable __IP already defined with the ip-address to use for update
+#
+
+# check parameters
+[ -z "$CURL" ] && [ -z "$CURL_SSL" ] && write_log 14 "Cloudflare communication require cURL with SSL support. Please install"
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing key as 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing secret as 'password'"
+[ $use_https -eq 0 ] && use_https=1	# force HTTPS
+
+# used variables
+local __HOST __DOMAIN __TYPE __URLBASE __PRGBASE __RUNPROG __DATA __IPV6 __ZONEID __RECID __PROXIED
+local __URLBASE="https://api.cloudflare.com/client/v4"
+local __TTL=120
+
+# split __HOST __DOMAIN from $domain
+# given data:
+# @example.com for "domain record"
+# host.sub@example.com for a "host record"
+__HOST=$(printf %s "$domain" | cut -d@ -f1)
+__DOMAIN=$(printf %s "$domain" | cut -d@ -f2)
+
+# Cloudflare v4 needs:
+# __DOMAIN = the base domain i.e. example.com
+# __HOST   = the FQDN of record to modify
+# i.e. example.com for the "domain record" or host.sub.example.com for "host record"
+
+# handling domain record then set __HOST = __DOMAIN
+[ -z "$__HOST" ] && __HOST=$__DOMAIN
+# handling host record then rebuild fqdn host@domain.tld => host.domain.tld
+[ "$__HOST" != "$__DOMAIN" ] && __HOST="${__HOST}.${__DOMAIN}"
+
+# set record type
+[ $use_ipv6 -eq 0 ] && __TYPE="A" || __TYPE="AAAA"
+
+# transfer function to use for godaddy
+# all needed variables are set global here
+# so we can use them directly
+cloudflare_transfer() {
+	local __CNT=0
+	local __ERR
+	while : ; do
+		write_log 7 "#> $__RUNPROG"
+		eval "$__RUNPROG"
+		__ERR=$?			# save communication error
+		[ $__ERR -eq 0 ] && break	# no error break while
+
+		write_log 3 "cURL Error: '$__ERR'"
+		write_log 7 "$(cat $ERRFILE)"		# report error
+
+		[ $VERBOSE_MODE -gt 1 ] && {
+			# VERBOSE_MODE > 1 then NO retry
+			write_log 4 "Transfer failed - Verbose Mode: $VERBOSE_MODE - NO retry on error"
+			break
+		}
+
+		__CNT=$(( $__CNT + 1 ))	# increment error counter
+		# if error count > retry_count leave here
+		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
+			write_log 14 "Transfer failed after $retry_count retries"
+
+		write_log 4 "Transfer failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
+		sleep $RETRY_SECONDS &
+		PID_SLEEP=$!
+		wait $PID_SLEEP	# enable trap-handler
+		PID_SLEEP=0
+	done
+
+	# check for error
+	grep -q '"success":\s*true' $DATFILE || {
+		write_log 4 "CloudFlare reported an error:"
+		write_log 7 "$(cat $DATFILE)"		# report error
+		return 1	# HTTP-Fehler
+	}
+}
+
+# Build base command to use
+__PRGBASE="$CURL -RsS -o $DATFILE --stderr $ERRFILE"
+# force network/interface-device to use for communication
+if [ -n "$bind_network" ]; then
+	local __DEVICE
+	network_get_physdev __DEVICE $bind_network || \
+		write_log 13 "Can not detect local device using 'network_get_physdev $bind_network' - Error: '$?'"
+	write_log 7 "Force communication via device '$__DEVICE'"
+	__PRGBASE="$__PRGBASE --interface $__DEVICE"
+fi
+# force ip version to use
+if [ $force_ipversion -eq 1 ]; then
+	[ $use_ipv6 -eq 0 ] && __PRGBASE="$__PRGBASE -4" || __PRGBASE="$__PRGBASE -6"	# force IPv4/IPv6
+fi
+# set certificate parameters
+if [ "$cacert" = "IGNORE" ]; then	# idea from Ticket #15327 to ignore server cert
+	__PRGBASE="$__PRGBASE --insecure"	# but not empty better to use "IGNORE"
+elif [ -f "$cacert" ]; then
+	__PRGBASE="$__PRGBASE --cacert $cacert"
+elif [ -d "$cacert" ]; then
+	__PRGBASE="$__PRGBASE --capath $cacert"
+elif [ -n "$cacert" ]; then		# it's not a file and not a directory but given
+	write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
+fi
+# disable proxy if not set (there might be .wgetrc or .curlrc or wrong environment set)
+# or check if libcurl compiled with proxy support
+if [ -z "$proxy" ]; then
+	__PRGBASE="$__PRGBASE --noproxy '*'"
+elif [ -z "$CURL_PROXY" ]; then
+	# if libcurl has no proxy support and proxy should be used then force ERROR
+	write_log 13 "cURL: libcurl compiled without Proxy support"
+fi
+# set headers
+if [ "$username" = "Bearer" ]; then
+  write_log 7 "Found Username 'Bearer' using Password as Bearer Authorization Token"
+  __PRGBASE="$__PRGBASE --header 'Authorization: Bearer $password' "
+else
+  __PRGBASE="$__PRGBASE --header 'X-Auth-Email: $username' "
+  __PRGBASE="$__PRGBASE --header 'X-Auth-Key: $password' "
+fi
+__PRGBASE="$__PRGBASE --header 'Content-Type: application/json' "
+
+if [ -n "$zone_id" ]; then
+	__ZONEID="$zone_id"
+else
+	# read zone id for registered domain.TLD
+	__RUNPROG="$__PRGBASE --request GET '$__URLBASE/zones?name=$__DOMAIN'"
+	cloudflare_transfer || return 1
+	# extract zone id
+	__ZONEID=$(grep -o '"id":\s*"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1)
+	[ -z "$__ZONEID" ] && {
+		write_log 4 "Could not detect 'zone id' for domain.tld: '$__DOMAIN'"
+		return 127
+	}
+fi
+
+# read record id for A or AAAA record of host.domain.TLD
+__RUNPROG="$__PRGBASE --request GET '$__URLBASE/zones/$__ZONEID/dns_records?name=$__HOST&type=$__TYPE'"
+cloudflare_transfer || return 1
+# extract record id
+__RECID=$(grep -o '"id":\s*"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1)
+[ -z "$__RECID" ] && {
+	write_log 4 "Could not detect 'record id' for host.domain.tld: '$__HOST'"
+	return 127
+}
+
+# extract current stored IP
+__DATA=$(grep -o '"content":\s*"[^"]*' $DATFILE | grep -o '[^"]*$' | head -1)
+
+# check data
+[ $use_ipv6 -eq 0 ] \
+	&& __DATA=$(printf "%s" "$__DATA" | grep -m 1 -o "$IPV4_REGEX") \
+	|| __DATA=$(printf "%s" "$__DATA" | grep -m 1 -o "$IPV6_REGEX")
+
+# we got data so verify
+[ -n "$__DATA" ] && {
+	# expand IPv6 for compare
+	if [ $use_ipv6 -eq 1 ]; then
+		expand_ipv6 $__IP __IPV6
+		expand_ipv6 $__DATA __DATA
+		[ "$__DATA" = "$__IPV6" ] && {		# IPv6 no update needed
+			write_log 7 "IPv6 at CloudFlare.com already up to date"
+			return 0
+		}
+	else
+		[ "$__DATA" = "$__IP" ] && {		# IPv4 no update needed
+			write_log 7 "IPv4 at CloudFlare.com already up to date"
+			return 0
+		}
+	fi
+}
+
+# update is needed
+# let's build data to send
+# set proxied parameter
+__PROXIED=$(grep -o '"proxied":\s*[^",]*' $DATFILE | grep -o '[^:]*$')
+
+# use file to work around " needed for json
+cat > $DATFILE << EOF
+{"id":"$__ZONEID","type":"$__TYPE","name":"$__HOST","content":"$__IP","ttl":$__TTL,"proxied":$__PROXIED}
+EOF
+
+# let's complete transfer command
+__RUNPROG="$__PRGBASE --request PUT --data @$DATFILE '$__URLBASE/zones/$__ZONEID/dns_records/$__RECID'"
+cloudflare_transfer || return 1
+
+return 0
+
diff --git a/ddns-scripts/files/usr/lib/ddns/update_cnkuai_cn.sh b/ddns-scripts/files/usr/lib/ddns/update_cnkuai_cn.sh
new file mode 100644
index 00000000..a2b78630
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_cnkuai_cn.sh
@@ -0,0 +1,86 @@
+# inside url we need domain, username and password
+[ -z "$domain" ]   && write_log 14 "Service section not configured correctly! Missing 'domain'"
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
+
+local urlCp='http://cp.cnkuai.cn/'
+local urlLogin='http://cp.cnkuai.cn/userlogin.asp'
+local urlCaptcha='http://cp.cnkuai.cn/inc/image.asp'
+local urlDnsA='http://cp.cnkuai.cn/dns_a.asp'
+local urlDnsAAAA='http://cp.cnkuai.cn/dns_ipv6.asp'
+local urlDnsSave='http://cp.cnkuai.cn/dns_save.asp'
+
+getPixel(){
+  local filename=$1
+  local x=$(($2*3))
+  local y=$(($3*3))
+  local width=48
+
+  hexdump -s "$((x+width*y))" -n 3 -e '3/1 "%02X"' "$filename"
+}
+
+captchaChar(){
+  local filename=$1
+  local xoffset=$2
+
+  if [ "$(getPixel "$filename" $((xoffset+2)) 5)" = '000000' ]; then
+    echo '1'
+  elif [ "$(getPixel "$filename" $((xoffset+5)) 7)" = '000000' ]; then
+    echo '2'
+  elif [ "$(getPixel "$filename" $((xoffset+4)) 3)" = '000000' ]; then
+    echo '4'
+  elif [ "$(getPixel "$filename" $((xoffset+6)) 4)" = '000000' ]; then
+    echo '7'
+  elif [ "$(getPixel "$filename" $((xoffset+5)) 8)" = '000000' ]; then
+    echo '8'
+  elif [ "$(getPixel "$filename" $((xoffset+6)) 8)" = '000000' ]; then
+    echo '9'
+  elif [ "$(getPixel "$filename" $((xoffset+5)) 6)" = '000000' ]; then
+    echo '3'
+  elif [ "$(getPixel "$filename" $((xoffset+0)) 4)" = '000000' ]; then
+    echo '5'
+  elif [ "$(getPixel "$filename" $((xoffset+1)) 5)" = '000000' ]; then
+    echo '6'
+  else
+    echo '0'
+  fi
+}
+
+captcha(){
+  local str
+  str=$(captchaChar "$1" 9)
+  str=$str$(captchaChar "$1" 18)
+  str=$str$(captchaChar "$1" 26)
+  str=$str$(captchaChar "$1" 35)
+  echo "$str"
+}
+
+#clean
+rm /tmp/cnkuai.*
+#login to cnkuai dns cp
+curl -c '/tmp/cnkuai.cookiejar' "$urlCaptcha" | gif2rgb > /tmp/cnkuai.rgb || return 1
+yzm=$(captcha "/tmp/cnkuai.rgb")
+curl -b '/tmp/cnkuai.cookiejar' -c '/tmp/cnkuai.cookiejar' -H "Content-Type: application/x-www-form-urlencoded" -H "Referer: $urlCp" -d "userid=$URL_USER&password=$URL_PASS&yzm=$yzm&B1=%C8%B7%C8%CF%B5%C7%C2%BD&lx=0&userlx=3" -X POST "$urlLogin" > /dev/null || return 1
+
+if [ "$use_ipv6" -eq 0 ]; then
+  curl -b '/tmp/cnkuai.cookiejar' -c '/tmp/cnkuai.cookiejar' "$urlDnsA" > /tmp/cnkuai.html || return 1
+else
+  curl -b '/tmp/cnkuai.cookiejar' -c '/tmp/cnkuai.cookiejar' "$urlDnsAAAA" > /tmp/cnkuai.html || return 1
+fi
+local domainline
+domainline=$(awk "/<td>$domain<\/td>/{ print NR; exit }" /tmp/cnkuai.html)
+local domainid
+domainid=$(awk "NR==$((domainline+3))" /tmp/cnkuai.html | sed 's/^.*name=\x27domainid\x27 value="//g' | sed 's/".*$//g')
+local dnslistid
+dnslistid=$(awk "NR==$((domainline+3))" /tmp/cnkuai.html | sed 's/^.*name=\x27dnslistid\x27 value="//g' | sed 's/".*$//g')
+
+local data
+
+if [ "$use_ipv6" -eq 0 ]; then
+  data="T2=$__IP&T3=120&act=dns_a_edit&domainid=$domainid&dnslistid=$dnslistid&B1=%D0%DE%B8%C4"
+else
+  data="T2=$__IP&T3=120&act=dns_ipv6_edit&domainid=$domainid&dnslistid=$dnslistid&B1=%D0%DE%B8%C4"
+fi
+curl -b '/tmp/cnkuai.cookiejar' -c '/tmp/cnkuai.cookiejar' -H "Content-Type: application/x-www-form-urlencoded" -H "Referer: $urlDnsA" -d "$data" -X POST "$urlDnsSave" > /dev/null || return 1
+
+return 0
diff --git a/ddns-scripts/files/usr/lib/ddns/update_digitalocean_com_v2.sh b/ddns-scripts/files/usr/lib/ddns/update_digitalocean_com_v2.sh
new file mode 100644
index 00000000..5ee1b13f
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_digitalocean_com_v2.sh
@@ -0,0 +1,40 @@
+# Script for sending user defined updates using the DigitalOcean API
+# 2015 Artem Yakimenko <code at temik dot me>
+# 2021 George Giannou <giannoug at gmail dot com>
+
+# Options passed from /etc/config/ddns:
+# Domain - the domain name managed by DigitalOcean (e.g. example.com)
+# Username - the hostname of the domain (e.g. myrouter)
+# Password - DigitalOcean personal access token (API key)
+# Optional Parameter - the API domain record ID of the hostname (e.g. 21694203)
+
+# Use the following command to find your API domain record ID (replace TOKEN and DOMAIN with your own):
+# curl -X GET -H 'Content-Type: application/json' \
+# 	-H "Authorization: Bearer TOKEN" \
+# 	"https://api.digitalocean.com/v2/domains/DOMAIN/records"
+
+. /usr/share/libubox/jshn.sh
+
+[ -z "$domain" ] && write_log 14 "Service section not configured correctly! Missing domain name as 'Domain'"
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing hostname as 'Username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing personal access token as 'Password'"
+[ -z "$param_opt" ] && write_log 14 "Service section not configured correctly! Missing API domain record ID as 'Optional Parameter'"
+
+# Construct JSON payload
+json_init
+json_add_string name "$username"
+json_add_string data "$__IP"
+
+__STATUS=$(curl -Ss -X PUT "https://api.digitalocean.com/v2/domains/${domain}/records/${param_opt}" \
+	-H "Authorization: Bearer ${password}" \
+	-H "Content-Type: application/json" \
+	-d "$(json_dump)" \
+	-w "%{http_code}\n" -o $DATFILE 2>$ERRFILE)
+
+if [ $? -ne 0 ]; then
+	write_log 14 "Curl failed: $(cat $ERRFILE)"
+	return 1
+elif [ -z $__STATUS ] || [ $__STATUS != 200 ]; then
+	write_log 14 "Curl failed: $__STATUS \ndigitalocean.com answered: $(cat $DATFILE)"
+	return 1
+fi
diff --git a/ddns-scripts/files/usr/lib/ddns/update_dnspod_cn.sh b/ddns-scripts/files/usr/lib/ddns/update_dnspod_cn.sh
new file mode 100755
index 00000000..2091be13
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_dnspod_cn.sh
@@ -0,0 +1,137 @@
+#!/bin/sh
+
+# Check inputs
+[ -z "$username" ] && write_log 14 "Configuration error! [User name] cannot be empty"
+[ -z "$password" ] && write_log 14 "Configuration error! [Password] cannot be empty"
+
+# Check external tools
+[ -n "$CURL_SSL" ] || write_log 13 "Dnspod communication require cURL with SSL support. Please install"
+[ -n "$CURL_PROXY" ] || write_log 13 "cURL: libcurl compiled without Proxy support"
+
+# Declare variables
+#local __URLBASE __HOST __DOMAIN __TYPE __CMDBASE __POST __POST1 __RECIP __RECID __TTL
+__URLBASE="https://dnsapi.cn"
+
+# Get host and domain from $domain
+[ "${domain:0:2}" = "@." ] && domain="${domain/./}"      # host
+[ "$domain" = "${domain/@/}" ] && domain="${domain/./@}" # host with no sperator
+__HOST="${domain%%@*}"
+__DOMAIN="${domain#*@}"
+[ -z "$__HOST" -o "$__HOST" = "$__DOMAIN" ] && __HOST=@
+
+# Set record type
+[ $use_ipv6 = 0 ] && __TYPE=A || __TYPE=AAAA
+
+# Build base command
+build_command() {
+	__CMDBASE="$CURL -Ss"
+	# bind host/IP
+	if [ -n "$bind_network" ]; then
+		local __DEVICE
+		network_get_physdev __DEVICE $bind_network || write_log 13 "Can not detect local device using 'network_get_physdev $bind_network' - Error: '$?'"
+		write_log 7 "Force communication via device '$__DEVICE'"
+		__CMDBASE="$__CMDBASE --interface $__DEVICE"
+	fi
+	# Force IP version
+	if [ $force_ipversion = 1 ]; then
+		[ $use_ipv6 = 0 ] && __CMDBASE="$__CMDBASE -4" || __CMDBASE="$__CMDBASE -6"
+	fi
+	# Set CA
+	if [ $use_https = 1 ]; then
+		if [ "$cacert" = IGNORE ]; then
+			__CMDBASE="$__CMDBASE --insecure"
+		elif [ -f "$cacert" ]; then
+			__CMDBASE="$__CMDBASE --cacert $cacert"
+		elif [ -d "$cacert" ]; then
+			__CMDBASE="$__CMDBASE --capath $cacert"
+		elif [ -n "$cacert" ]; then
+			write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
+		fi
+	fi
+	# Set if no proxy (might be an error with .wgetrc or env)
+	[ -z "$proxy" ] && __CMDBASE="$__CMDBASE --noproxy '*'"
+	__CMDBASE="$__CMDBASE -d"
+}
+
+# Dnspod API
+dnspod_transfer() {
+	__CNT=0
+	case "$1" in
+	0) __A="$__CMDBASE '$__POST' $__URLBASE/Record.List" ;;
+	1) __A="$__CMDBASE '$__POST1' $__URLBASE/Record.Create" ;;
+	2) __A="$__CMDBASE '$__POST1&record_id=$__RECID&ttl=$__TTL' $__URLBASE/Record.Modify" ;;
+	esac
+
+	write_log 7 "#> $__A"
+	while ! __TMP=$(eval $__A 2>&1); do
+		write_log 3 "[$__TMP]"
+		if [ $VERBOSE -gt 1 ]; then
+			write_log 4 "Transfer failed - detailed mode: $VERBOSE - Do not try again after an error"
+			return 1
+		fi
+		__CNT=$(($__CNT + 1))
+		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && write_log 14 "Transfer failed after $retry_count retries"
+		write_log 4 "Transfer failed - $__CNT Try again in $RETRY_SECONDS seconds"
+		sleep $RETRY_SECONDS &
+		PID_SLEEP=$!
+		wait $PID_SLEEP
+		PID_SLEEP=0
+	done
+	__ERR=$(jsonfilter -s "$__TMP" -e "@.status.code")
+	[ $__ERR = 1 ] && return 0
+	[ $__ERR = 10 ] && [ $1 = 0 ] && return 0
+	__TMP=$(jsonfilter -s "$__TMP" -e "@.status.message")
+	local A="$(date +%H%M%S) ERROR : [$__TMP] - Terminate process"
+	logger -p user.err -t ddns-scripts[$$] $SECTION_ID: ${A:15}
+	printf "%s\n" " $A" >>$LOGFILE
+	exit 1
+}
+
+# Add record
+add_domain() {
+	dnspod_transfer 1
+	printf "%s\n" " $(date +%H%M%S)       : Record add successfully: [$([ "$__HOST" = @ ] || echo $__HOST.)$__DOMAIN],[IP:$__IP]" >>$LOGFILE
+	return 0
+}
+
+# Modify record
+update_domain() {
+	dnspod_transfer 2
+	printf "%s\n" " $(date +%H%M%S)       : Record modified successfully: [$([ "$__HOST" = @ ] || echo $__HOST.)$__DOMAIN],[IP:$__IP],[TTL:$__TTL]" >>$LOGFILE
+	return 0
+}
+
+# Get DNS record
+describe_domain() {
+	ret=0
+	__POST="login_token=$username,$password&format=json&domain=$__DOMAIN&sub_domain=$__HOST"
+	__POST1="$__POST&value=$__IP&record_type=$__TYPE&record_line_id=0"
+	dnspod_transfer 0
+	__TMP=$(jsonfilter -s "$__TMP" -e "@.records[@.type='$__TYPE' && @.line_id='0']")
+	if [ -z "$__TMP" ]; then
+		printf "%s\n" " $(date +%H%M%S)       : Record not exist: [$([ "$__HOST" = @ ] || echo $__HOST.)$__DOMAIN]" >>$LOGFILE
+		ret=1
+	else
+		__RECIP=$(jsonfilter -s "$__TMP" -e "@.value")
+		if [ "$__RECIP" != "$__IP" ]; then
+			__RECID=$(jsonfilter -s "$__TMP" -e "@.id")
+			__TTL=$(jsonfilter -s "$__TMP" -e "@.ttl")
+			printf "%s\n" " $(date +%H%M%S)       : Record needs to be updated: [Record IP:$__RECIP] [Local IP:$__IP]" >>$LOGFILE
+			ret=2
+		fi
+	fi
+}
+
+build_command
+describe_domain
+if [ $ret = 1 ]; then
+	sleep 3
+	add_domain
+elif [ $ret = 2 ]; then
+	sleep 3
+	update_domain
+else
+	printf "%s\n" " $(date +%H%M%S)       : Record needs not update: [Record IP:$__RECIP] [Local IP:$__IP]" >>$LOGFILE
+fi
+
+return 0
diff --git a/ddns-scripts/files/usr/lib/ddns/update_freedns_42_pl.sh b/ddns-scripts/files/usr/lib/ddns/update_freedns_42_pl.sh
new file mode 100644
index 00000000..f0e91972
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_freedns_42_pl.sh
@@ -0,0 +1,17 @@
+#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
+#.2018 Michal Lipka <michal at sysadmin dot care>
+local __DUMMY
+local __URL="https://freedns.42.pl/xmlrpc.php"
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
+[ $ip_dynamic -eq 1 ] && __IP='\&lt;dynamic\&gt;'
+PROG="$(command -v curl) -sk"
+write_log 7 "sending update to freedns.42.pl with ip $__IP"
+XMLDATA="<?xml version='1.0'?><methodCall><methodName>xname.updateArecord</methodName><params><param><value><struct><member><name>name</name><value><string>[RECORDNAME]</string></value></member><member><name>zone</name><value><string>[ZONENAME]</string></value></member><member><name>oldaddress</name><value><string>*</string></value></member><member><name>updatereverse</name><value><string>0</string></value></member><member><name>user</name><value><string>[USERNAME]</string></value></member><member><name>ttl</name><value><string>600</string></value></member><member><name>newaddress</name><value><string>[IP]</string></value></member><member><name>password</name><value><string>[PASSWORD]</string></value></member></struct></value></param></params></methodCall>"
+XMLDATA=$(echo $XMLDATA | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
+-e "s#\[ZONENAME\]#$zone#g" -e "s#\[RECORDNAME\]#$record#g" -e "s#\[IP\]#$__IP#g")
+$PROG -d "$XMLDATA" -o $DATFILE $__URL || return 1
+write_log 7 "'freedns.42.pl' answered:${N}$(cat $DATFILE)"
+grep "<fault>" $DATFILE > /dev/null 2>&1 && return 1
+grep '<name>serial</name>' $DATFILE >/dev/null 2>&1
+return $?
diff --git a/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh b/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh
new file mode 100644
index 00000000..321687d7
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_gandi_net.sh
@@ -0,0 +1,48 @@
+#!/bin/sh
+# Thanks goes to Alex Griffin who provided this script.
+
+. /usr/share/libubox/jshn.sh
+
+local __TTL=600
+local __RRTYPE
+local __ENDPOINT="https://api.gandi.net/v5/livedns"
+local __STATUS
+
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing subdomain as 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing API Key as 'password'"
+
+[ $use_ipv6 -ne 0 ] && __RRTYPE="AAAA" || __RRTYPE="A"
+
+# Construct JSON payload
+json_init
+json_add_int rrset_ttl "$__TTL"
+json_add_array rrset_values
+json_add_string "" "$__IP"
+json_close_array
+
+# Log the curl command
+write_log 7 "curl -s -X PUT \"$__ENDPOINT/domains/$domain/records/$username/$__RRTYPE\" \
+	-H \"Authorization: Apikey $password\" \
+	-H \"Content-Type: application/json\" \
+	-d \"$(json_dump)\" \
+	--connect-timeout 30"
+
+__STATUS=$(curl -s -X PUT "$__ENDPOINT/domains/$domain/records/$username/$__RRTYPE" \
+	-H "Authorization: Apikey $password" \
+	-H "Content-Type: application/json" \
+	-d "$(json_dump)" \
+	--connect-timeout 30 \
+	-w "%{http_code}\n" -o $DATFILE 2>$ERRFILE)
+
+local __ERRNO=$?
+if [ $__ERRNO -ne 0 ]; then
+	write_log 14 "Curl failed with $__ERRNO: $(cat $ERRFILE)"
+	return 1
+elif [ -z $__STATUS ] || [ $__STATUS != 201 ]; then
+	write_log 14 "LiveDNS failed: $__STATUS \ngandi.net answered: $(cat $DATFILE)"
+	return 1
+fi
+
+write_log 7 "gandi.net answered: $(cat $DATFILE)"
+
+return 0
diff --git a/ddns-scripts/files/usr/lib/ddns/update_gcp_v1.sh b/ddns-scripts/files/usr/lib/ddns/update_gcp_v1.sh
new file mode 100755
index 00000000..5bd096f4
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_gcp_v1.sh
@@ -0,0 +1,272 @@
+#!/bin/sh
+#
+#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
+#.2022 Chris Barrick <chrisbarrick@google.com>
+#
+# This script sends DDNS updates using the Google Cloud DNS REST API.
+# See: https://cloud.google.com/dns/docs/reference/v1
+#
+# This script uses a GCP service account. The user is responsible for creating
+# the service account, ensuring it has permission to update DNS records, and
+# for generating a service account key to be used by this script. The records
+# to be updated must already exist.
+#
+# Arguments:
+#
+# - $username: The service account name.
+#   Example: ddns-service-account@my-dns-project.iam.gserviceaccount.com
+#
+# - $password: The service account key. You can paste the key directly into the
+#   "password" field or upload the key file to the router and set the field
+#   equal to the file path. This script supports JSON keys or the raw private
+#   key as a PEM file. P12 keys are not supported. File names must end with
+#   `*.json` or `*.pem`.
+#
+# - $domain: The domain to update.
+#
+# - $param_enc: The additional required arguments, as form-urlencoded data,
+#   i.e. `key1=value1&key2=value2&...`. The required arguments are:
+#   - project: The name of the GCP project that owns the DNS records.
+#   - zone: The DNS zone in the GCP API.
+#   - Example: `project=my-dns-project&zone=my-dns-zone`
+#
+# - $param_opt: Optional TTL for the records, in seconds. Defaults to 3600 (1h).
+#
+# Dependencies:
+# - ddns-scripts  (for the base functionality)
+# - openssl-util  (for the authentication flow)
+# - curl          (for the GCP REST API)
+
+. /usr/share/libubox/jshn.sh
+
+
+# Authentication
+# ---------------------------------------------------------------------------
+# The authentication flow works like this:
+#
+#   1. Construct a JWT claim for access to the DNS readwrite scope.
+#   2. Sign the JWT with the service accout key, proving we have access.
+#   3. Exchange the JWT for an access token, valid for 5m.
+#   4. Use the access token for API calls.
+#
+# See https://developers.google.com/identity/protocols/oauth2/service-account
+
+# A URL-safe variant of base64 encoding, used by JWTs.
+base64_urlencode() {
+	openssl base64 | tr '/+' '_-' | tr -d '=\n'
+}
+
+# Prints the service account private key in PEM format.
+get_service_account_key() {
+	# The "password" field provides us with the service account key.
+	# We allow the user to provide it to us in a few different formats.
+	#
+	# 1. If $password is a string ending in `*.json`, it is a file path,
+	#    pointing to a JSON service account key as downloaded from GCP.
+	#
+	# 2. If $password is a string ending with `*.pem`, it is a PEM private
+	#    key, extracted from the JSON service account key.
+	#
+	# 3. If $password starts with `{`, then the JSON service account key
+	#    was pasted directly into the password field.
+	#
+	# 4. If $password starts with `---`, then the PEM private key was pasted
+	#    directly into the password field.
+	#
+	# We do not support P12 service account keys.
+	case "${password}" in
+	(*".json")
+		jsonfilter -i "${password}" -e @.private_key
+	;;
+	(*".pem")
+		cat "${password}"
+	;;
+	("{"*)
+		jsonfilter -s "${password}" -e @.private_key
+	;;
+	("---"*)
+		printf "%s" "${password}"
+	;;
+	(*)
+		write_log 14 "Could not parse the service account key."
+	;;
+	esac
+}
+
+# Sign stdin using the service account key. Prints the signature.
+# The input is the JWT header-payload. Used to construct a signed JWT.
+sign() {
+	# Dump the private key to a tmp file so openssl can get to it.
+	local tmp_keyfile="$(mktemp -t gcp_dns_sak.pem.XXXXXX)"
+	chmod 600 ${tmp_keyfile}
+	get_service_account_key > ${tmp_keyfile}
+	openssl dgst -binary -sha256 -sign ${tmp_keyfile}
+	rm ${tmp_keyfile}
+}
+
+# Print the JWT header in JSON format.
+# Currently, Google only supports RS256.
+jwt_header() {
+	json_init
+	json_add_string "alg" "RS256"
+	json_add_string "typ" "JWT"
+	json_dump
+}
+
+# Prints the JWT claim-set in JSON format.
+# The claim is for 5m of readwrite access to the Cloud DNS API.
+jwt_claim_set() {
+	local iat=$(date -u +%s)  # Current UNIX time, UTC.
+	local exp=$(( iat + 300 ))  # Expiration is 5m in the future.
+
+	json_init
+	json_add_string "iss" "${username}"
+	json_add_string "scope" "https://www.googleapis.com/auth/ndev.clouddns.readwrite"
+	json_add_string "aud" "https://oauth2.googleapis.com/token"
+	json_add_string "iat" "${iat}"
+	json_add_string "exp" "${exp}"
+	json_dump
+}
+
+# Generate a JWT signed by the service account key, which can be exchanged for
+# a Google Cloud access token, authorized for Cloud DNS.
+get_jwt() {
+	local header=$(jwt_header | base64_urlencode)
+	local payload=$(jwt_claim_set | base64_urlencode)
+	local header_payload="${header}.${payload}"
+	local signature=$(printf "%s" ${header_payload} | sign | base64_urlencode)
+	echo "${header_payload}.${signature}"
+}
+
+# Request an access token for the Google Cloud service account.
+get_access_token_raw() {
+	local grant_type="urn:ietf:params:oauth:grant-type:jwt-bearer"
+	local assertion=$(get_jwt)
+
+	${CURL} -v https://oauth2.googleapis.com/token \
+		--data-urlencode 'grant_type=urn:ietf:params:oauth:grant-type:jwt-bearer' \
+		--data-urlencode "assertion=${assertion}" \
+		| jsonfilter -e @.access_token
+}
+
+# Get the access token, stripping the trailing dots.
+get_access_token() {
+	# Since tokens may contain internal dots, we only trim the suffix if it
+	# starts with at least 8 dots. (The access token has *many* trailing dots.)
+	local access_token="$(get_access_token_raw)"
+	echo "${access_token%%........*}"
+}
+
+
+# Google Cloud DNS API
+# ---------------------------------------------------------------------------
+# Cloud DNS offers a straight forward RESTful API.
+#
+# - The main class is a ResourceRecordSet. It's a collection of DNS records
+#   that share the same domain, type, TTL, etc. Within a record set, the only
+#   difference between the records are their values.
+#
+# - The record sets live under a ManagedZone, which in turn lives under a
+#   Project. All we need to know about these are their names.
+#
+# - This implementation only makes PATCH requests to update existing record
+#   sets. The user must have already created at least one A or AAAA record for
+#   the domain they are updating. It's fine to start with a dummy, like 0.0.0.0.
+#
+# - The API requires SSL, and this implementation uses curl.
+
+# Prints a ResourceRecordSet in JSON format.
+format_record_set() {
+	local domain="$1"
+	local record_type="$2"
+	local ttl="$3"
+	shift 3 # The remaining arguments are the IP addresses for this record set.
+
+	json_init
+	json_add_string "kind" "dns#resourceRecordSet"
+	json_add_string "name" "${domain}."  # trailing dot on the domain
+	json_add_string "type" "${record_type}"
+	json_add_string "ttl" "${ttl}"
+	json_add_array "rrdatas"
+	for value in $@; do
+		json_add_string "" "${value}"
+	done
+	json_close_array
+	json_dump
+}
+
+# Makes an HTTP PATCH request to the Cloud DNS API.
+patch_record_set() {
+	local access_token="$1"
+	local project="$2"
+	local zone="$3"
+	local domain="$4"
+	local record_type="$5"
+	local ttl="$6"
+	shift 6 # The remaining arguments are the IP addresses for this record set.
+
+	# Note the trailing dot after the domain name. It's fully qualified.
+	local url="https://dns.googleapis.com/dns/v1/projects/${project}/managedZones/${zone}/rrsets/${domain}./${record_type}"
+	local record_set=$(format_record_set ${domain} ${record_type} ${ttl} $@)
+
+	${CURL} -v ${url} \
+		-X PATCH \
+		-H "Content-Type: application/json" \
+		-H "Authorization: Bearer ${access_token}" \
+		-d "${record_set}"
+}
+
+
+# Main entrypoint
+# ---------------------------------------------------------------------------
+
+# Parse the $param_enc into project and zone variables.
+# The arguments are the names for those variables.
+parse_project_zone() {
+	local project_var=$1
+	local zone_var=$2
+
+	IFS='&'
+	for entry in $param_enc
+	do
+		case "${entry}" in
+		('project='*)
+			local project_val=$(echo "${entry}" | cut -d'=' -f2)
+			eval "${project_var}=${project_val}"
+		;;
+		('zone='*)
+			local zone_val=$(echo "${entry}" | cut -d'=' -f2)
+			eval "${zone_var}=${zone_val}"
+		;;
+		esac
+	done
+	unset IFS
+}
+
+main() {
+	local access_token project zone ttl record_type
+
+	# Dependency checking
+	[ -z "${CURL_SSL}" ] && write_log 14 "Google Cloud DNS requires cURL with SSL support"
+	[ -z "$(openssl version)" ] && write_log 14 "Google Cloud DNS update requires openssl-utils"
+
+	# Argument parsing
+	[ -z ${param_opt} ] && ttl=3600 || ttl="${param_opt}"
+	[ $use_ipv6 -ne 0 ] && record_type="AAAA" || record_type="A"
+	parse_project_zone project zone
+
+	# Sanity checks
+	[ -z "${username}" ] && write_log 14 "Config is missing 'username' (service account name)"
+	[ -z "${password}" ] && write_log 14 "Config is missing 'password' (service account key)"
+	[ -z "${domain}" ] && write_log 14 "Config is missing 'domain'"
+	[ -z "${project}" ] && write_log 14 "Could not parse project name from 'param_enc'"
+	[ -z "${zone}" ] && write_log 14 "Could not parse zone name from 'param_enc'"
+	[ -z "${ttl}" ] && write_log 14 "Could not parse TTL from 'param_opt'"
+	[ -z "${record_type}" ] && write_log 14 "Could not determine the record type"
+
+	# Push the record!
+	access_token="$(get_access_token)"
+	patch_record_set "${access_token}" "${project}" "${zone}" "${domain}" "${record_type}" "${ttl}" "${__IP}"
+}
+
+main $@
diff --git a/ddns-scripts/files/usr/lib/ddns/update_godaddy_com_v1.sh b/ddns-scripts/files/usr/lib/ddns/update_godaddy_com_v1.sh
new file mode 100644
index 00000000..b8d527ca
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_godaddy_com_v1.sh
@@ -0,0 +1,172 @@
+#!/bin/sh
+#
+#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
+#
+# script for sending updates to godaddy.com
+#.based on GoDaddy.sh v1.0 by Nazar78 @ TeaNazaR.com
+#.2017-2018 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+# GoDaddy Documentation at https://developer.godaddy.com/doc
+#
+# This script is parsed by dynamic_dns_functions.sh inside send_update() function
+#
+# using following options from /etc/config/ddns
+# option username - "key" as generated at https://developer.godaddy.com/keys/
+# option password - "secret" as generated at https://developer.godaddy.com/keys/
+# option domain   - "yourdomain.TLD" to update or "hostname@yourdomain.TLD"
+#
+# variable __IP already defined with the ip-address to use for update
+#
+
+# check parameters
+[ -z "$CURL" ] && [ -z "$CURL_SSL" ] && write_log 14 "GoDaddy communication require cURL with SSL support. Please install"
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing key as 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing secret as 'password'"
+[ $use_https -eq 0 ] && use_https=1	# force HTTPS
+
+# used variables
+local __HOST __DOMAIN __TYPE __URL __PRGBASE __RUNPROG __DATA __IPV6
+
+# split __HOST __DOMAIN from $domain
+# given data:
+# @example.com for "domain record"
+# host.sub@example.com for a "host record"
+__HOST=$(printf %s "$domain" | cut -d@ -f1)
+__DOMAIN=$(printf %s "$domain" | cut -d@ -f2)
+
+# GoDaddy needs:
+# __DOMAIN = the base domain i.e. example.com
+# __HOST   = host.sub if updating a host record or
+# __HOST   = "@" urlencoded "%40" for a domain record
+[ -z "$__HOST" -o "$__HOST" = "$__DOMAIN" ] && __HOST="%40"
+
+# set record type
+[ $use_ipv6 -eq 0 ] && __TYPE="A" || __TYPE="AAAA"
+
+# now we know the url to use
+# __URL="https://api.ote-godaddy.com/v1/domains/$__DOMAIN/records/$__TYPE/$__HOST"	# api test server
+__URL="https://api.godaddy.com/v1/domains/$__DOMAIN/records/$__TYPE/$__HOST"		# production server
+
+# transfer function to use for godaddy
+# all needed variables are set global here
+# so we can use them directly
+godaddy_transfer() {
+	local __CNT=0
+	local __STATUS __ERR __DEVICE
+	while : ; do
+		write_log 7 "#> $__RUNPROG"
+		__STATUS=$(eval "$__RUNPROG")
+		__ERR=$?			# save communication error
+		[ $__ERR -eq 0 ] && break	# no error break while
+
+		write_log 4 "cURL error: '$__ERR'"
+		write_log 7 "$(cat $ERRFILE)"		# report error
+
+		[ $VERBOSE_MODE -gt 1 ] && {
+			# VERBOSE_MODE > 1 then NO retry
+			write_log 4 "Transfer failed - Verbose Mode: $VERBOSE_MODE - NO retry on error"
+			break
+		}
+
+		__CNT=$(( $__CNT + 1 ))	# increment error counter
+		# if error count > retry_count leave here
+		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
+			write_log 14 "Transfer failed after $retry_count retries"
+
+		write_log 4 "Transfer failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
+		sleep $RETRY_SECONDS &
+		PID_SLEEP=$!
+		wait $PID_SLEEP	# enable trap-handler
+		PID_SLEEP=0
+	done
+
+	# handle HTTP error
+	[ $__STATUS -ne 200 ] && {
+		write_log 4 "GoDaddy reported an error:"
+		write_log 7 "$(cat $DATFILE)"
+		return 1
+	}
+	return 0
+}
+
+# Build base command to use
+__PRGBASE="$CURL -RsS -w '%{http_code}' -o $DATFILE --stderr $ERRFILE"
+# force network/interface-device to use for communication
+if [ -n "$bind_network" ]; then
+	local __DEVICE
+	network_get_physdev __DEVICE $bind_network || \
+		write_log 13 "Can not detect local device using 'network_get_physdev $bind_network' - Error: '$?'"
+	write_log 7 "Force communication via device '$__DEVICE'"
+	__PRGBASE="$__PRGBASE --interface $__DEVICE"
+fi
+# force ip version to use
+if [ $force_ipversion -eq 1 ]; then
+	[ $use_ipv6 -eq 0 ] && __PRGBASE="$__PRGBASE -4" || __PRGBASE="$__PRGBASE -6"	# force IPv4/IPv6
+fi
+# set certificate parameters
+if [ "$cacert" = "IGNORE" ]; then	# idea from Ticket #15327 to ignore server cert
+	__PRGBASE="$__PRGBASE --insecure"	# but not empty better to use "IGNORE"
+elif [ -f "$cacert" ]; then
+	__PRGBASE="$__PRGBASE --cacert $cacert"
+elif [ -d "$cacert" ]; then
+	__PRGBASE="$__PRGBASE --capath $cacert"
+elif [ -n "$cacert" ]; then		# it's not a file and not a directory but given
+	write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
+fi
+# disable proxy if no set (there might be .wgetrc or .curlrc or wrong environment set)
+# or check if libcurl compiled with proxy support
+if [ -z "$proxy" ]; then
+	__PRGBASE="$__PRGBASE --noproxy '*'"
+elif [ -z "$CURL_PROXY" ]; then
+	# if libcurl has no proxy support and proxy should be used then force ERROR
+	write_log 13 "cURL: libcurl compiled without Proxy support"
+fi
+# set headers
+__PRGBASE="$__PRGBASE --header 'Authorization: sso-key $username:$password' "
+__PRGBASE="$__PRGBASE --header 'Accept: application/json' "
+__PRGBASE="$__PRGBASE --header 'Content-Type: application/json; charset=utf-8' "
+
+# read data from godaddy.com
+__RUNPROG="$__PRGBASE --request GET $__URL"
+godaddy_transfer || return 1
+
+# HTTP 200 OK, now analyse data and check if update needed
+__DATA=$(sed -r 's/.+data":"(.+)","t.+/\1/g' $DATFILE)
+
+# check data
+[ $use_ipv6 -eq 0 ] \
+	&& __DATA=$(printf "%s" "$__DATA" | grep -m 1 -o "$IPV4_REGEX") \
+	|| __DATA=$(printf "%s" "$__DATA" | grep -m 1 -o "$IPV6_REGEX")
+
+# we got data so verify
+[ -n "$__DATA" ] && {
+	# expand IPv6 for compare
+	if [ $use_ipv6 -eq 1 ]; then
+		expand_ipv6 $__IP __IPV6
+		expand_ipv6 $__DATA __DATA
+		[ "$__DATA" = "$__IPV6" ] && {		# IPv6 no update needed
+			write_log 7 "IPv6 at GoDaddy.com already up to date"
+			return 0
+		}
+	else
+		[ "$__DATA" = "$__IP" ] && {		# IPv4 no update needed
+			write_log 7 "IPv4 at GoDaddy.com already up to date"
+			return 0
+		}
+	fi
+}
+
+# update is needed
+# let's build data to send,
+# use file to work around double quotes '"' needed for json
+cat > $DATFILE << EOF
+[{"data":"$__IP"}]
+EOF
+
+# let's complete transfer command
+__RUNPROG="$__PRGBASE --request PUT --data @$DATFILE $__URL"
+
+godaddy_transfer || return 1
+
+# HTTP 200 OK
+return 0
+
diff --git a/ddns-scripts/files/usr/lib/ddns/update_luadns_v1.sh b/ddns-scripts/files/usr/lib/ddns/update_luadns_v1.sh
new file mode 100644
index 00000000..5d7954e1
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_luadns_v1.sh
@@ -0,0 +1,191 @@
+#!/bin/sh
+#
+#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
+#.2023 Jihoon Han <rapid_renard@renard.ga>
+#
+#.based on Christian Schoenebeck's update_cloudflare_com_v4.sh
+#.and on Neilpang's acme.sh found at https://github.com/acmesh-official/acme.sh
+#
+# Script for sending DDNS updates using the LuaDNS API
+# See: https://luadns.com/api
+#
+# using following options from /etc/config/ddns
+# option username - "Emaii" as registered on LuaDNS
+# option password - "API Key" as generated at https://api.luadns.com/api_keys
+# option domain   - The domain to update (e.g. my.example.com)
+#
+
+# check parameters
+[ -z "$CURL" ] && [ -z "$CURL_SSL" ] && write_log 14 "LuaDNS API require cURL with SSL support. Please install"
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing e-mail as 'Username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing personal API key as 'Password'"
+[ $use_https -eq 0 ] && use_https=1	# force HTTPS
+
+# used variables
+local __HOST __DOMAIN __TYPE __URLBASE __PRGBASE __RUNPROG __DATA __IPV6 __ZONEID __RECID
+local __URLBASE="https://api.luadns.com/v1"
+local __TTL=300
+
+# set record type
+[ $use_ipv6 -eq 0 ] && __TYPE="A" || __TYPE="AAAA"
+
+# transfer function to use for LuaDNS
+# all needed variables are set global here
+# so we can use them directly
+luadns_transfer() {
+	local __CNT=0
+	local __STATUS __ERR
+	while : ; do
+		write_log 7 "#> $__RUNPROG"
+		__STATUS=$(eval "$__RUNPROG")
+		__ERR=$?			# save communication error
+		[ $__ERR -eq 0 ] && break	# no error break while
+
+		write_log 3 "cURL Error: '$__ERR'"
+		write_log 7 "$(cat $ERRFILE)"		# report error
+
+		[ $VERBOSE_MODE -gt 1 ] && {
+			# VERBOSE_MODE > 1 then NO retry
+			write_log 4 "Transfer failed - Verbose Mode: $VERBOSE_MODE - NO retry on error"
+			break
+		}
+
+		__CNT=$(( $__CNT + 1 ))	# increment error counter
+		# if error count > retry_count leave here
+		[ $retry_count -gt 0 -a $__CNT -gt $retry_count ] && \
+			write_log 14 "Transfer failed after $retry_count retries"
+
+		write_log 4 "Transfer failed - retry $__CNT/$retry_count in $RETRY_SECONDS seconds"
+		sleep $RETRY_SECONDS &
+		PID_SLEEP=$!
+		wait $PID_SLEEP	# enable trap-handler
+		PID_SLEEP=0
+	done
+
+	# handle HTTP error
+	[ $__STATUS -ne 200 ] && {
+		write_log 4 "LuaDNS reported an error:"
+		write_log 7 "$(cat $DATFILE)"
+		return 1
+	}
+	return 0
+}
+
+# Build base command to use
+__PRGBASE="$CURL -RsS -w '%{http_code}' -o $DATFILE --stderr $ERRFILE"
+# force network/interface-device to use for communication
+if [ -n "$bind_network" ]; then
+	local __DEVICE
+	network_get_physdev __DEVICE $bind_network || \
+		write_log 13 "Can not detect local device using 'network_get_physdev $bind_network' - Error: '$?'"
+	write_log 7 "Force communication via device '$__DEVICE'"
+	__PRGBASE="$__PRGBASE --interface $__DEVICE"
+fi
+# force ip version to use
+if [ $force_ipversion -eq 1 ]; then
+	[ $use_ipv6 -eq 0 ] && __PRGBASE="$__PRGBASE -4" || __PRGBASE="$__PRGBASE -6"	# force IPv4/IPv6
+fi
+# set certificate parameters
+if [ "$cacert" = "IGNORE" ]; then	# idea from Ticket #15327 to ignore server cert
+	__PRGBASE="$__PRGBASE --insecure"	# but not empty better to use "IGNORE"
+elif [ -f "$cacert" ]; then
+	__PRGBASE="$__PRGBASE --cacert $cacert"
+elif [ -d "$cacert" ]; then
+	__PRGBASE="$__PRGBASE --capath $cacert"
+elif [ -n "$cacert" ]; then		# it's not a file and not a directory but given
+	write_log 14 "No valid certificate(s) found at '$cacert' for HTTPS communication"
+fi
+# disable proxy if not set (there might be .wgetrc or .curlrc or wrong environment set)
+# or check if libcurl compiled with proxy support
+if [ -z "$proxy" ]; then
+	__PRGBASE="$__PRGBASE --noproxy '*'"
+elif [ -z "$CURL_PROXY" ]; then
+	# if libcurl has no proxy support and proxy should be used then force ERROR
+	write_log 13 "cURL: libcurl compiled without Proxy support"
+fi
+# set headers
+__PRGBASE="$__PRGBASE --user '$username:$password' "
+__PRGBASE="$__PRGBASE --header 'Accept: application/json' "
+
+if [ -n "$zone_id" ]; then
+	__ZONEID="$zone_id"
+else
+	# read zone id for registered domain.TLD
+	__RUNPROG="$__PRGBASE --request GET '$__URLBASE/zones'"
+	luadns_transfer || return 1	
+	# extract zone id
+	i=1
+	while : ; do
+		h=$(printf "%s" "$domain" | cut -d . -f $i-100 -s)
+		[ -z "$h" ] && {
+			write_log 4 "Could not detect 'Zone ID' for the domain provided: '$domain'"
+			return 127
+		}
+
+		__ZONEID=$(grep -o -e "\"id\":[^,]*,\"name\":\"$h\"" $DATFILE | cut -d : -f 2 | cut -d , -f 1)
+		[ -n "$__ZONEID" ] && {
+			# LuaDNS API needs:
+			# __DOMAIN = the base domain i.e. example.com
+			# __HOST   = the FQDN of record to modify
+			# i.e. example.com for the "domain record" or host.sub.example.com for "host record"
+			__HOST="$domain"
+			__DOMAIN="$h"
+			write_log 7 "Domain : '$__DOMAIN'"
+			write_log 7 "Zone ID : '$__ZONEID'"
+			write_log 7 "Host : '$__HOST'"
+			break
+		}
+		i=$(expr "$i" + 1)
+	done
+fi
+
+# read record id for A or AAAA record of host.domain.TLD
+__RUNPROG="$__PRGBASE --request GET '$__URLBASE/zones/$__ZONEID/records'"
+luadns_transfer || return 1
+# extract record id
+__RECID=$(grep -o -e "\"id\":[^,]*,\"name\":\"$__HOST.\",\"type\":\"$__TYPE\"" $DATFILE | head -n 1 | cut -d : -f 2 | cut -d , -f 1)
+[ -z "$__RECID" ] && {
+	write_log 4 "Could not detect 'Record ID' for the domain provided: '$__HOST'"
+	return 127
+}
+write_log 7 "Record ID : '$__RECID'"
+
+# extract current stored IP
+__DATA=$(grep -o -e "\"id\":$__RECID,\"name\":\"$__HOST.\",\"type\":\"$__TYPE\",\"content\":[^,]*" $DATFILE | grep -o '[^"]*' | tail -n 1)
+
+# check data
+[ $use_ipv6 -eq 0 ] \
+	&& __DATA=$(printf "%s" "$__DATA" | grep -m 1 -o "$IPV4_REGEX") \
+	|| __DATA=$(printf "%s" "$__DATA" | grep -m 1 -o "$IPV6_REGEX")
+
+# we got data so verify
+[ -n "$__DATA" ] && {
+	# expand IPv6 for compare
+	if [ $use_ipv6 -eq 1 ]; then
+		expand_ipv6 $__IP __IPV6
+		expand_ipv6 $__DATA __DATA
+		[ "$__DATA" = "$__IPV6" ] && {		# IPv6 no update needed
+			write_log 7 "IPv6 at LuaDNS already up to date"
+			return 0
+		}
+	else
+		[ "$__DATA" = "$__IP" ] && {		# IPv4 no update needed
+			write_log 7 "IPv4 at LuaDNS already up to date"
+			return 0
+		}
+	fi
+}
+
+# update is needed
+# let's build data to send
+
+# use file to work around " needed for json
+cat > $DATFILE << EOF
+{"name":"$__HOST.","type":"$__TYPE","content":"$__IP","ttl":$__TTL}
+EOF
+
+# let's complete transfer command
+__RUNPROG="$__PRGBASE --request PUT --data @$DATFILE '$__URLBASE/zones/$__ZONEID/records/$__RECID'"
+luadns_transfer || return 1
+
+return 0
diff --git a/ddns-scripts/files/usr/lib/ddns/update_no-ip_com.sh b/ddns-scripts/files/usr/lib/ddns/update_no-ip_com.sh
new file mode 100644
index 00000000..e13058b1
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_no-ip_com.sh
@@ -0,0 +1,54 @@
+#
+#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
+#
+# script for sending updates to no-ip.com / noip.com
+#.2014-2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+#
+# This script is parsed by dynamic_dns_functions.sh inside send_update() function
+#
+# provider did not reactivate records, if no IP change was recognized
+# so we send a dummy (localhost) and a seconds later we send the correct IP addr
+#
+local __DUMMY
+local __UPDURL6="http://[USERNAME]:[PASSWORD]@dynupdate6.noip.com/nic/update?hostname=[DOMAIN]&myip=[IP]"
+local __UPDURL="http://[USERNAME]:[PASSWORD]@dynupdate.noip.com/nic/update?hostname=[DOMAIN]&myip=[IP]"
+# inside url we need username and password
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
+
+# set IP version dependend dummy (localhost)
+[ $use_ipv6 -eq 0 ] && __DUMMY="127.0.0.1" || __DUMMY="::1"
+[ $use_ipv6 -eq 0 ] && __UPDURL=$__UPDURL || __UPDURL=$__UPDURL6
+
+# lets do DUMMY transfer
+write_log 7 "sending dummy IP to 'no-ip.com'"
+__URL=$(echo $__UPDURL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
+			       -e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__DUMMY#g")
+[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
+
+do_transfer "$__URL" || return 1
+
+write_log 7 "'no-ip.com' answered:${N}$(cat $DATFILE)"
+# analyse provider answers
+# "good [IP_ADR]"	= successful
+# "nochg [IP_ADR]"	= no change but OK
+grep -E "good|nochg" $DATFILE >/dev/null 2>&1 || return 1
+
+# lets wait a seconds
+sleep 1
+
+# now send the correct data
+write_log 7 "sending real IP to 'no-ip.com'"
+__URL=$(echo $__UPDURL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
+			       -e "s#\[DOMAIN\]#$domain#g" -e "s#\[IP\]#$__IP#g")
+[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
+
+do_transfer "$__URL" || return 1
+
+write_log 7 "'no-ip.com' answered:${N}$(cat $DATFILE)"
+# analyse provider answers
+# "good [IP_ADR]"	= successful
+# "nochg [IP_ADR]"	= no change but OK
+grep -E "good|nochg" $DATFILE >/dev/null 2>&1
+return $?	# "0" if "good" or "nochg" found
+
diff --git a/ddns-scripts/files/usr/lib/ddns/update_ns1_com.sh b/ddns-scripts/files/usr/lib/ddns/update_ns1_com.sh
new file mode 100644
index 00000000..4b965339
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_ns1_com.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+# Derived from update_gandi_net.sh
+
+. /usr/share/libubox/jshn.sh
+
+local __ENDPOINT="https://api.nsone.net/v1"
+local __TTL=600
+local __RRTYPE
+local __URL
+local __STATUS
+
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing zone as 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing API Key as 'password'"
+
+[ $use_ipv6 -ne 0 ] && __RRTYPE="AAAA" || __RRTYPE="A"
+
+# Construct JSON payload
+json_init
+# {"answers":[{"answer":["1.1.1.1"]}]}
+json_add_array answers
+json_add_object
+json_add_array answer
+json_add_string "" "$__IP"
+json_close_array
+json_close_object
+json_close_array
+
+__URL="$__ENDPOINT/zones/$username/$domain/$__RRTYPE"
+
+__STATUS=$(curl -s -X POST "$__URL" \
+	-H "X-NSONE-Key: $password" \
+	-H "Content-Type: application/json" \
+	-d "$(json_dump)" \
+	-w "%{http_code}\n" -o $DATFILE 2>$ERRFILE)
+
+if [ $? -ne 0 ]; then
+	write_log 14 "Curl failed: $(cat $ERRFILE)"
+	return 1
+elif [ -z $__STATUS ] || [ $__STATUS != 200 ]; then
+	write_log 4 "Request failed: $__STATUS, NS1 answered: $(cat $DATFILE)"
+	if [ $__STATUS = 404 ]; then
+		write_log 4 "Status is 404, trying to create a DNS record"
+
+		json_init
+		json_add_string "zone" "$username"
+		json_add_string "domain" "$domain"
+		json_add_string "type" "$__RRTYPE"
+		json_add_string "ttl" "$__TTL"
+		json_add_array answers
+		json_add_object
+		json_add_array answer
+		json_add_string "" "$__IP"
+		json_close_array
+		json_close_object
+		json_close_array
+
+		__STATUS=$(curl -s -X PUT "$__URL" \
+			-H "X-NSONE-Key: $password" \
+			-H "Content-Type: application/json" \
+			-d "$(json_dump)" \
+			-w "%{http_code}\n" -o $DATFILE 2>$ERRFILE)
+
+		if [ $? -ne 0 ]; then
+			write_log 14 "Curl failed: $(cat $ERRFILE)"
+			return 1
+		elif [ -z $__STATUS ] || [ $__STATUS != 200 ]; then
+			write_log 14 "Request failed: $__STATUS, NS1 answered: $(cat $DATFILE)"
+			return 1
+		fi
+	else
+		return 1
+	fi
+fi
+
+write_log 7 "NS1 answered: $(cat $DATFILE)"
+
+return 0
diff --git a/ddns-scripts/files/usr/lib/ddns/update_nsupdate.sh b/ddns-scripts/files/usr/lib/ddns/update_nsupdate.sh
new file mode 100644
index 00000000..039196ff
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_nsupdate.sh
@@ -0,0 +1,48 @@
+#
+#.Distributed under the terms of the GNU General Public License (GPL) version 2.0
+#
+# The script directly updates a PowerDNS (or maybe bind server) via nsupdate from bind-client package.
+#.based on github request #957 by Jan Riechers <de at r-jan dot de>
+#.2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+#
+# This script is parsed by dynamic_dns_functions.sh inside send_update() function
+#
+# using following options from /etc/config/ddns
+# option username   - keyname 
+# option password   - shared secret (base64 encoded)
+# option domain     - full qualified domain to update
+# option dns_server - DNS server to update
+#
+# variable __IP already defined with the ip-address to use for update
+#
+local __TTL=600		#.preset DNS TTL (in seconds)
+local __RRTYPE __PW __TCP
+local __PROG=$(command -v nsupdate)			# BIND nsupdate ?
+[ -z "$__PROG" ] && __PROG=$(command -v knsupdate)	# Knot nsupdate ?
+
+[ -z "$__PROG" ]     && write_log 14 "'nsupdate' or 'knsupdate' not installed !"
+[ -z "$username" ]   && write_log 14 "Service section not configured correctly! Missing 'username'"
+[ -z "$password" ]   && write_log 14 "Service section not configured correctly! Missing 'password'"
+[ -z "$dns_server" ] && write_log 14 "Service section not configured correctly! Missing 'dns_server'"
+
+[ $use_ipv6 -ne 0 ] && __RRTYPE="AAAA" || __RRTYPE="A"
+[ $force_dnstcp -ne 0 ] && __TCP="-v" || __TCP=""
+
+# create command file
+cat >$DATFILE <<-EOF
+server $dns_server
+key $username $password
+update del $domain $__RRTYPE
+update add $domain $__TTL $__RRTYPE $__IP
+show
+send
+answer
+quit
+EOF
+
+$__PROG -d $__TCP $DATFILE >$ERRFILE 2>&1
+
+# nsupdate always return success
+write_log 7 "(k)nsupdate reports:${N}$(cat $ERRFILE)"
+
+return 0
diff --git a/ddns-scripts/files/usr/lib/ddns/update_one_com.sh b/ddns-scripts/files/usr/lib/ddns/update_one_com.sh
new file mode 100644
index 00000000..94ec2ef4
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_one_com.sh
@@ -0,0 +1,142 @@
+#!/bin/sh
+
+# ONE.COM DDNS SCRIPT
+# REQUIRES CURL
+# $ opkg install curl
+
+# SCRIPT BY LUGICO
+# CONTACT: main@lugico.de
+
+[ -z "$CURL" ] && [ -z "$CURL_SSL" ] && write_log 14 "one.com communication require cURL with SSL support. Please install"
+[ -z "$domain" ]   && write_log 14 "Service section not configured correctly! Missing 'domain'"
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
+
+. /usr/share/libubox/jshn.sh
+
+write_log 0 "one.com ddns script started"
+
+local __SUBDOMAIN __MAINDOMAIN __LOGINURL __RECORDID
+local __TTL=3600
+
+COOKIEJAR=$(mktemp /tmp/one_com_cookiejar.XXXXXX) || exit 1
+
+__SUBDOMAIN=$(echo $domain | sed -e 's/[^\.]*\.[^\.]*$//' -e 's/\.$//' )
+__MAINDOMAIN=$(echo $domain | sed -e "s/${__SUBDOMAIN}\.//" )
+
+
+# LOGGING IN
+# GET LOGIN POST URL FROM FORM
+__LOGINURL=$( $CURL \
+	-RsSL \
+	--stderr $ERRFILE \
+	-c $COOKIEJAR \
+	"https://www.one.com/admin/" \
+	| grep 'Login-form login autofill' \
+	| sed -e 's/.*action="//' -e 's/".*//' -e 's/\&amp;/\&/g' \
+)
+
+# POST LOGIN DATA
+$CURL \
+	-RsSL \
+	--stderr $ERRFILE \
+	-c $COOKIEJAR \
+	-b $COOKIEJAR \
+	"${__LOGINURL}" \
+	-H "Content-Type: application/x-www-form-urlencoded" \
+	-X POST \
+	-d "username=${username}&password=${password}&credentialId=" \
+	| grep "Invalid username or password." > $DATFILE
+
+if [ "$?" == "0" ] ; then
+	write_log 14 "Invalid credentials"
+	return 1
+fi
+
+
+# SETTING DOMAIN
+$CURL -RsSL \
+	--stderr $ERRFILE \
+	-c $COOKIEJAR \
+	-b $COOKIEJAR \
+	"https://www.one.com/admin/select-admin-domain.do?domain=${__MAINDOMAIN}" \
+	| grep "<meta name=\"one.com:active-domain\" content=\"${__MAINDOMAIN}\"/>" > $DATFILE
+
+if [ "$?" != "0" ] ; then
+	write_log 14 "Failed to select domain '${__MAINDOMAIN}'"
+	return 1
+fi
+
+
+# GETTING RECORD ID
+records=$( $CURL \
+	-RsSL \
+	--stderr $ERRFILE \
+	-c $COOKIEJAR \
+	-b $COOKIEJAR \
+	"https://www.one.com/admin/api/domains/${__MAINDOMAIN}/dns/custom_records"
+)
+
+json_load "$records"
+
+if json_is_a "result" "object" && \
+	json_select "result" && \
+	json_is_a "data" "array"
+then
+	json_select "data"
+	i=1
+	while json_is_a ${i} "object" ; do
+		json_select "${i}"
+		json_select "attributes"
+		json_get_var "prefix" "prefix"
+		json_close_object
+		if [ "$prefix" == "$__SUBDOMAIN" ] ; then
+			json_get_var "__RECORDID" "id"
+			write_log 0 "Found record id : ${__RECORDID}"
+			break
+		fi
+		json_close_object
+		i=$(($i + 1))
+	done
+fi
+
+
+if [ "${__RECORDID}" == "" ] ; then
+	write_log 14 "domain record not found"
+	return 1
+fi
+
+
+# CREATING PATCH DATA
+json_init
+json_add_string "type" "dns_service_records"
+json_add_string "id" "${__RECORDID}"
+json_add_object "attributes"
+json_add_string "type" "A"
+json_add_string "prefix" "${__SUBDOMAIN}"
+json_add_string "content" "${__IP}"
+json_add_int "ttl" ${__TTL}
+patchdata=$(json_dump)
+
+
+# SENDING PATCH
+$CURL \
+	-RsSL \
+	--stderr $ERRFILE \
+	-c $COOKIEJAR \
+	-b $COOKIEJAR \
+	-X PATCH \
+	-d "$patchdata" \
+	-H "Content-Type: application/json" \
+	"https://www.one.com/admin/api/domains/${__MAINDOMAIN}/dns/custom_records/${__RECORDID}" \
+	| grep "priority" > $DATFILE
+
+if [ "$?" != "0" ] ; then
+	write_log 14 "one.com gave an unexpected response"
+	return 1
+fi
+
+rm $COOKIEJAR
+write_log 0 "one.com ddns script finished without errors"
+
+return 0
diff --git a/ddns-scripts/files/usr/lib/ddns/update_pdns.sh b/ddns-scripts/files/usr/lib/ddns/update_pdns.sh
new file mode 100755
index 00000000..a19ed13f
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_pdns.sh
@@ -0,0 +1,63 @@
+#!/bin/sh
+# Derived from update_gandi_net.sh
+. /usr/share/libubox/jshn.sh
+
+local __TTL=600
+local __RRTYPE
+local __STATUS
+local __RNAME
+
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing subdomain as 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing API Key as 'password'"
+[ -z "$param_opt" ] && write_log 14 "Service section not configured correctly! Missing PowerDNS URL as 'Optional Parameter'(param_opt)"
+
+# Create endpoint from $param_opt
+# e.g. param_opt=http://127.0.0.1:8081
+local __ENDPOINT="$param_opt/api/v1/servers/localhost/zones"
+
+[ $use_ipv6 -ne 0 ] && __RRTYPE="AAAA" || __RRTYPE="A"
+
+# Make sure domain is period terminated
+if [ ${domain: -1} != '.' ]; then
+	domain="${domain}."
+fi
+if [ $username == '@' ]; then
+	__RNAME="$domain"
+else
+	__RNAME="$username.$domain"
+fi
+
+# Build JSON payload
+json_init
+json_add_array rrsets
+json_add_object
+	json_add_string name "$__RNAME"
+	json_add_string type "$__RRTYPE"
+	json_add_int ttl $__TTL
+	json_add_string changetype "REPLACE"
+	json_add_array records
+	json_add_object
+		json_add_string content "$__IP"
+		json_add_boolean disabled 0
+	json_close_object
+	json_close_array
+json_close_object
+json_close_array
+
+__STATUS=$(curl -Ss -X PATCH "$__ENDPOINT/$domain" \
+	-H "X-Api-Key: $password" \
+	-H "Content-Type: application/json" \
+	-d "$(json_dump)" \
+	-w "%{http_code}\n" \
+	-o $DATFILE 2>$ERRFILE)
+
+
+if [ $? -ne 0 ]; then
+	write_log 14 "Curl failed: $(cat $ERRFILE)"
+	return 1
+elif [ -z $__STATUS ] || [ $__STATUS != 204 ]; then
+	write_log 14 "PowerDNS request failed: $__STATUS \n$(cat $DATFILE)"
+	return 1
+fi
+
+return 0
diff --git a/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh b/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh
new file mode 100644
index 00000000..0d474051
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_route53_v1.sh
@@ -0,0 +1,96 @@
+#!/bin/sh
+# Distributed under the terms of the GNU General Public License (GPL) version 2.0
+# based on Yuval Adam's route53.sh found at https://github.com/yuvadm/route53-ddns/blob/master/route53.sh
+# 2017 Max Berger <max at berger dot name>
+
+[ -z "${CURL_SSL}" ] && write_log 14 "Amazon AWS Route53 communication require cURL with SSL support. Please install"
+[ -z "${username}" ] && write_log 14 "Service section not configured correctly! Missing key as 'username'"
+[ -z "${password}" ] && write_log 14 "Service section not configured correctly! Missing secret as 'password'"
+[ -z "${domain}" ] && write_log 14 "Service section not configured correctly! Missing zone id as 'domain'"
+
+ENDPOINT="route53.amazonaws.com"
+RECORD_TTL=300
+RECORD_NAME="${lookup_host}."
+RECORD_VALUE="${__IP}"
+[ ${use_ipv6} -eq 0 ] && RECORD_TYPE="A"
+[ ${use_ipv6} -eq 1 ] && RECORD_TYPE="AAAA"
+
+HOSTED_ZONE_ID="${domain}"
+API_PATH="/2013-04-01/hostedzone/${HOSTED_ZONE_ID}/rrset/"
+
+AWS_ACCESS_KEY_ID="${username}"
+AWS_SECRET_ACCESS_KEY="${password}"
+AWS_REGION='us-east-1'
+AWS_SERVICE='route53'
+
+hash() {
+    msg="$1"
+    echo -en "${msg}" | openssl dgst -sha256 | sed 's/^.* //'
+}
+
+sign_plain() {
+    # Sign message using a plaintext key
+    key="$1"
+    msg="$2"
+    echo -en "${msg}" | openssl dgst -hex -sha256 -hmac "${key}" | sed 's/^.* //'
+}
+
+sign() {
+    # Sign message using a hex formatted key
+    key="$1"
+    msg="$2"
+    echo -en "${msg}" | openssl dgst -hex -sha256 -mac HMAC -macopt "hexkey:${key}" | sed 's/^.* //'
+}
+
+request_body="<?xml version=\"1.0\" encoding=\"UTF-8\"?> \
+<ChangeResourceRecordSetsRequest xmlns=\"https://route53.amazonaws.com/doc/2013-04-01/\"> \
+<ChangeBatch> \
+   <Changes> \
+      <Change> \
+         <Action>UPSERT</Action> \
+         <ResourceRecordSet> \
+            <Name>${RECORD_NAME}</Name> \
+            <Type>${RECORD_TYPE}</Type> \
+            <TTL>${RECORD_TTL}</TTL> \
+            <ResourceRecords> \
+               <ResourceRecord> \
+                  <Value>${RECORD_VALUE}</Value> \
+               </ResourceRecord> \
+            </ResourceRecords> \
+         </ResourceRecordSet> \
+      </Change> \
+   </Changes> \
+</ChangeBatch> \
+</ChangeResourceRecordSetsRequest>"
+
+fulldate="$(date --utc +%Y%m%dT%H%M%SZ)"
+shortdate="$(date --utc +%Y%m%d)"
+signed_headers="host;x-amz-date"
+request_hash="$(hash "${request_body}")"
+canonical_request="POST\n${API_PATH}\n\nhost:route53.amazonaws.com\nx-amz-date:${fulldate}\n\n${signed_headers}\n${request_hash}"
+
+date_key="$(sign_plain "AWS4${AWS_SECRET_ACCESS_KEY}" "${shortdate}")"
+region_key="$(sign "${date_key}" ${AWS_REGION})"
+service_key="$(sign "${region_key}" ${AWS_SERVICE})"
+signing_key="$(sign "${service_key}" aws4_request)"
+
+credential="${shortdate}/${AWS_REGION}/${AWS_SERVICE}/aws4_request"
+sigmsg="AWS4-HMAC-SHA256\n${fulldate}\n${credential}\n$(hash "${canonical_request}")"
+
+signature="$(sign "${signing_key}" "${sigmsg}")"
+
+authorization="AWS4-HMAC-SHA256 Credential=${AWS_ACCESS_KEY_ID}/${credential}, SignedHeaders=${signed_headers}, Signature=${signature}"
+
+ANSWER="$(flock /tmp/$(basename -s .sh "$0").lock curl \
+    -X "POST" \
+    -H "Host: route53.amazonaws.com" \
+    -H "X-Amz-Date: ${fulldate}" \
+    -H "Authorization: ${authorization}" \
+    -H "Content-Type: text/xml" \
+    -d "$request_body" \
+    "https://${ENDPOINT}${API_PATH}")"
+write_log 7 "${ANSWER}"
+
+echo "${ANSWER}" | grep -F "Error" >/dev/null && return 1
+echo "${ANSWER}" | grep -F "ChangeInfo" >/dev/null && return 0
+return 2
diff --git a/ddns-scripts/files/usr/lib/ddns/update_transip_nl.sh b/ddns-scripts/files/usr/lib/ddns/update_transip_nl.sh
new file mode 100644
index 00000000..fe46987f
--- /dev/null
+++ b/ddns-scripts/files/usr/lib/ddns/update_transip_nl.sh
@@ -0,0 +1,134 @@
+#!/bin/sh
+#
+# 2021 Martijn Atema <martijn@atema.one>
+#
+# This script sends ddns updates using the TransIP API (see https://api.transip.nl/)
+# and is parsed by dynamic_dns_functions.sh inside send_update().
+#
+# The following options provided by ddns are used:
+# username  - Username of account used for logging in to TransIP
+# password  - Private key generated at https://www.transip.nl/cp/account/api/
+#            (make sure to accept non-whitelisted IP addresses)
+# domain    - Base domain name registered at TransIP
+#             ('domain.tld' when updating 'hostname.domain.tld')
+# param_enc - Name of DNS record to update
+#             ('hostname' when updating 'hostname.domain.tld')
+# param_opt - TTL of the DNS record to update (in seconds)
+#
+# Note: Make sure that there is exactly one record of type A (for IPv4) or
+#       AAAA (for IPv6) with the specified name and TTL. That record will be
+#       updated by this script.
+#
+# The script requires cURL with SSL and the openssl binary
+
+
+[ -z "${username}" ] && write_log 14 "Service config is missing 'username'"
+[ -z "${password}" ] && write_log 14 "Service config is missing 'password' (private key)"
+[ -z "${domain}" ] && write_log 14 "Service config is missing 'domain' (base domain name)"
+[ -z "${param_enc}" ] && write_log 14 "Service config is missing 'param_enc' (DNS record name)"
+[ -z "${param_opt}" ] && write_log 14 "Service config is missing 'param_opt' (DNS record TTL)"
+
+[ -z "${CURL_SSL}" ] && write_log 14 "TransIP update requires cURL with SSL"
+[ -z "$(openssl version)" ] && write_log 14 "TransIP update requires openssl binary"
+
+. /usr/share/libubox/jshn.sh
+
+
+# Re-format the private key and write to a temporary file
+
+__tmp_keyfile="$(mktemp -t ddns-transip.XXXXXX)"
+
+echo "${password}" | \
+        sed -e "s/-----BEGIN PRIVATE KEY-----\s*/&\n/" \
+        -e "s/-----END PRIVATE KEY-----/\n&/" \
+        -e "s/\S\{64\}\s*/&\n/g" \
+        > "${__tmp_keyfile}"
+
+
+# Create authentication request
+
+json_init
+json_add_string "login" "${username}"
+json_add_string "label" "DDNS-script ($(openssl rand -hex 4))"
+json_add_string "nonce" $(openssl rand -hex 16)
+json_add_boolean "read_only" 0
+json_add_boolean "global_key" 1
+__auth_body="$(json_dump)"
+
+
+# Sign body using the private key and encode with base64
+
+__auth_signature=$(echo -n "${__auth_body}" | \
+        openssl dgst -sha512 -sign "${__tmp_keyfile}" | \
+        openssl base64 | \
+        tr -d " \t\n\r")
+
+rm "${__tmp_keyfile}"
+
+
+# Send and parse request for a temporary authentication token
+
+__auth_status=$(curl -s -X POST "https://api.transip.nl/v6/auth" \
+        -H "Content-Type: application/json" \
+        -H "Signature: ${__auth_signature}" \
+        -d "${__auth_body}" \
+        -w "%{http_code}\n" \
+        -o "${DATFILE}" 2>"${ERRFILE}")
+
+
+# Logging for error and debug
+
+if [ $? -ne 0 ]; then
+        write_log 14 "Curl failed: $(cat "${ERRFILE}")"
+        return 1
+fi
+
+if [ -z ${__auth_status} ] || [ ${__auth_status} -ne 201 ]; then
+        write_log 14 "TransIP authentication (status ${__auth_status}) failed: $(cat ${DATFILE})"
+        return 1
+fi
+
+write_log 7 "TransIP authentication successful"
+
+
+## Extract token from the response
+
+__auth_token=$(cat ${DATFILE} | sed 's/^.*"token" *: *"\([^"]*\)".*$/\1/')
+
+
+# Create request body for update
+
+json_init
+json_add_object "dnsEntry"
+json_add_string "name" "${param_enc}"
+json_add_string "type" "$([ $use_ipv6 -ne 0 ] && echo -n AAAA || echo -n A)"
+json_add_int "expire" "${param_opt}"
+json_add_string "content" "${__IP}"
+json_close_object
+__update_body="$(json_dump)"
+
+
+# Send update request
+
+__update_status=$(curl -s -X PATCH "https://api.transip.nl/v6/domains/${domain}/dns" \
+        -H "Content-Type: application/json" \
+        -H "Authorization: Bearer ${__auth_token}" \
+        -d "${__update_body}" \
+        -w "%{http_code}\n" \
+        -o "${DATFILE}" 2>"${ERRFILE}")
+
+
+# Logging for error and debug
+
+if [ $? -ne 0 ]; then
+        write_log 14 "Curl failed: $(cat "${ERRFILE}")"
+        return 1
+fi
+
+if [ -z ${__update_status} ] || [ ${__update_status} -ne 204 ]; then
+        write_log 14 "TransIP DNS update (status ${__update_status}) failed: $(cat ${DATFILE})"
+        return 1
+fi
+
+write_log 7 "TransIP DNS update successful"
+return 0
diff --git a/ddns-scripts/files/usr/share/ddns/default/3322.org.json b/ddns-scripts/files/usr/share/ddns/default/3322.org.json
new file mode 100644
index 00000000..d166dc44
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/3322.org.json
@@ -0,0 +1,6 @@
+{
+	"name": "3322.org",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@members.3322.org/dyndns/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/afraid.org-basicauth.json b/ddns-scripts/files/usr/share/ddns/default/afraid.org-basicauth.json
new file mode 100644
index 00000000..b4f73fa5
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/afraid.org-basicauth.json
@@ -0,0 +1,9 @@
+{
+	"name": "afraid.org-basicauth",
+	"ipv4": {
+		"url": "https://[USERNAME]:[PASSWORD]@freedns.afraid.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
+	},
+	"ipv6": {
+		"url": "https://[USERNAME]:[PASSWORD]@freedns.afraid.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/afraid.org-keyauth.json b/ddns-scripts/files/usr/share/ddns/default/afraid.org-keyauth.json
new file mode 100644
index 00000000..166b004b
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/afraid.org-keyauth.json
@@ -0,0 +1,9 @@
+{
+	"name": "afraid.org-keyauth",
+	"ipv4": {
+		"url": "https://freedns.afraid.org/dynamic/update.php?[PASSWORD]&address=[IP]"
+	},
+	"ipv6": {
+		"url": "https://freedns.afraid.org/dynamic/update.php?[PASSWORD]&address=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-basic.json b/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-basic.json
new file mode 100644
index 00000000..436caf48
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-basic.json
@@ -0,0 +1,9 @@
+{
+	"name": "afraid.org-v2-basic",
+	"ipv4": {
+		"url": "https://[USERNAME]:[PASSWORD]@sync.afraid.org/u/?h=[DOMAIN]&ip=[IP]"
+	},
+	"ipv6": {
+		"url": "https://[USERNAME]:[PASSWORD]@v6.sync.afraid.org/u/?h=[DOMAIN]&ip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-token.json b/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-token.json
new file mode 100644
index 00000000..0786dd82
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/afraid.org-v2-token.json
@@ -0,0 +1,9 @@
+{
+	"name": "afraid.org-v2-token",
+	"ipv4": {
+		"url": "https://sync.afraid.org/u/[PASSWORD]/?address=[IP]"
+	},
+	"ipv6": {
+		"url": "https://v6.sync.afraid.org/u/[PASSWORD]/?address=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/all-inkl.com.json b/ddns-scripts/files/usr/share/ddns/default/all-inkl.com.json
new file mode 100644
index 00000000..d0f5b736
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/all-inkl.com.json
@@ -0,0 +1,9 @@
+{
+	"name": "all-inkl.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyndns.kasserver.com/?myip=[IP]"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyndns.kasserver.com/?myip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/bind-nsupdate.json b/ddns-scripts/files/usr/share/ddns/default/bind-nsupdate.json
new file mode 100644
index 00000000..f91806a1
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/bind-nsupdate.json
@@ -0,0 +1,9 @@
+{
+	"name": "bind-nsupdate",
+	"ipv4": {
+		"url": "update_nsupdate.sh"
+	},
+	"ipv6": {
+		"url": "update_nsupdate.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/changeip.com.json b/ddns-scripts/files/usr/share/ddns/default/changeip.com.json
new file mode 100644
index 00000000..3472f0b3
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/changeip.com.json
@@ -0,0 +1,7 @@
+{
+	"name": "changeip.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@nic.changeip.com/nic/update?u=[USERNAME]&p=[PASSWORD]&cmd=update&hostname=[DOMAIN]&ip=[IP]",
+		"answer": "Successful"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/cloud.google.com-v1.json b/ddns-scripts/files/usr/share/ddns/default/cloud.google.com-v1.json
new file mode 100644
index 00000000..eee707b3
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/cloud.google.com-v1.json
@@ -0,0 +1,10 @@
+{
+	"name": "cloud.google.com-v1",
+	"ipv4": {
+		"url": "update_gcp_v1.sh"
+	},
+	"ipv6": {
+		"url": "update_gcp_v1.sh"
+	}
+}
+
diff --git a/ddns-scripts/files/usr/share/ddns/default/cloudflare.com-v4.json b/ddns-scripts/files/usr/share/ddns/default/cloudflare.com-v4.json
new file mode 100644
index 00000000..66a1d118
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/cloudflare.com-v4.json
@@ -0,0 +1,9 @@
+{
+	"name": "cloudflare.com-v4",
+	"ipv4": {
+		"url": "update_cloudflare_com_v4.sh"
+	},
+	"ipv6": {
+		"url": "update_cloudflare_com_v4.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/cnkuai.cn.json b/ddns-scripts/files/usr/share/ddns/default/cnkuai.cn.json
new file mode 100644
index 00000000..1e9bebf5
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/cnkuai.cn.json
@@ -0,0 +1,9 @@
+{
+	"name": "cnkuai.cn",
+	"ipv4": {
+		"url": "update_cnkuai_cn.sh"
+	},
+	"ipv6": {
+		"url": "update_cnkuai_cn.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/core-networks.de.json b/ddns-scripts/files/usr/share/ddns/default/core-networks.de.json
new file mode 100644
index 00000000..c334d773
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/core-networks.de.json
@@ -0,0 +1,11 @@
+{
+	"name": "core-networks.de",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyndns.core-networks.de/?hostname=[DOMAIN]&myip=[IP]&keepipv6=1",
+		"answer": "good"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyndns.core-networks.de/?hostname=[DOMAIN]&myip=[IP]&keepipv4=1",
+		"answer": "good"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/ddnss.de.json b/ddns-scripts/files/usr/share/ddns/default/ddnss.de.json
new file mode 100644
index 00000000..17cdf0e3
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/ddnss.de.json
@@ -0,0 +1,7 @@
+{
+	"name": "ddnss.de",
+	"ipv4": {
+		"url": "http://ip4.ddnss.de/upd.php?user=[USERNAME]&pwd=[PASSWORD]&host=[DOMAIN]&ip=[IP]",
+		"answer": "Updated|No change"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/ddo.jp.json b/ddns-scripts/files/usr/share/ddns/default/ddo.jp.json
new file mode 100644
index 00000000..1cf53b57
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/ddo.jp.json
@@ -0,0 +1,6 @@
+{
+	"name": "ddo.jp",
+	"ipv4": {
+		"url": "http://free.ddo.jp/dnsupdate.php?dn=[DOMAIN]&pw=[PASSWORD]&ip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/desec.io.json b/ddns-scripts/files/usr/share/ddns/default/desec.io.json
new file mode 100644
index 00000000..c28458fe
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/desec.io.json
@@ -0,0 +1,11 @@
+{
+	"name": "desec.io",
+	"ipv4": {
+		"url": "https://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv4=[IP]&myipv6=preserve",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "https://update.dedyn.io/update?username=[USERNAME]&password=[PASSWORD]&hostname=[DOMAIN]&myipv6=[IP]&myipv4=preserve",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dhis.org.json b/ddns-scripts/files/usr/share/ddns/default/dhis.org.json
new file mode 100644
index 00000000..cc2ce3e5
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dhis.org.json
@@ -0,0 +1,9 @@
+{
+	"name": "dhis.org",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@is.dhis.org/"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@is.dhis.org/"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/digitalocean.com-v2.json b/ddns-scripts/files/usr/share/ddns/default/digitalocean.com-v2.json
new file mode 100644
index 00000000..abeac560
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/digitalocean.com-v2.json
@@ -0,0 +1,9 @@
+{
+	"name": "digitalocean.com-v2",
+	"ipv4": {
+		"url": "update_digitalocean_com_v2.sh"
+	},
+	"ipv6": {
+		"url": "update_digitalocean_com_v2.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsdynamic.org.json b/ddns-scripts/files/usr/share/ddns/default/dnsdynamic.org.json
new file mode 100644
index 00000000..f1fd1810
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dnsdynamic.org.json
@@ -0,0 +1,7 @@
+{
+	"name": "dnsdynamic.org",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@www.dnsdynamic.org/api/?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsever.com.json b/ddns-scripts/files/usr/share/ddns/default/dnsever.com.json
new file mode 100644
index 00000000..23f9ac94
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dnsever.com.json
@@ -0,0 +1,6 @@
+{
+	"name": "dnsever.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyna.dnsever.com/update.php?host[[DOMAIN]]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsexit.com.json b/ddns-scripts/files/usr/share/ddns/default/dnsexit.com.json
new file mode 100644
index 00000000..89d7a814
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dnsexit.com.json
@@ -0,0 +1,6 @@
+{
+	"name": "dnsexit.com",
+	"ipv4": {
+		"url": "http://update.dnsexit.com/RemoteUpdate.sv?login=[USERNAME]&password=[PASSWORD]&host=[DOMAIN]&myip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnshome.de.json b/ddns-scripts/files/usr/share/ddns/default/dnshome.de.json
new file mode 100644
index 00000000..f767de2b
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dnshome.de.json
@@ -0,0 +1,9 @@
+{
+	"name": "dnshome.de",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@www.dnshome.de/dyndns.php?hostname=[DOMAIN]&ip=[IP]"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@www.dnshome.de/dyndns.php?hostname=[DOMAIN]&ip6=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsmadeeasy.com.json b/ddns-scripts/files/usr/share/ddns/default/dnsmadeeasy.com.json
new file mode 100644
index 00000000..744301af
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dnsmadeeasy.com.json
@@ -0,0 +1,7 @@
+{
+	"name": "dnsmadeeasy.com",
+	"ipv4": {
+		"url": "http://cp.dnsmadeeasy.com/servlet/updateip?username=[USERNAME]&password=[PASSWORD]&id=[DOMAIN]&ip=[IP]",
+		"answer": "success|ip-same"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsmax.com.json b/ddns-scripts/files/usr/share/ddns/default/dnsmax.com.json
new file mode 100644
index 00000000..e84667a7
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dnsmax.com.json
@@ -0,0 +1,6 @@
+{
+	"name": "dnsmax.com",
+	"ipv4": {
+		"url": "http://update.dnsmax.com/update/?username=[USERNAME]&password=[PASSWORD]&resellerid=1&clientname=openwrt&clientversion=8.09&protocolversion=2.0&updatehostname=[DOMAIN]&ip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnsomatic.com.json b/ddns-scripts/files/usr/share/ddns/default/dnsomatic.com.json
new file mode 100644
index 00000000..09df1eb0
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dnsomatic.com.json
@@ -0,0 +1,7 @@
+{
+	"name": "dnsomatic.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@updates.dnsomatic.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnspark.com.json b/ddns-scripts/files/usr/share/ddns/default/dnspark.com.json
new file mode 100644
index 00000000..f10e1f24
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dnspark.com.json
@@ -0,0 +1,7 @@
+{
+	"name": "dnspark.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@control.dnspark.com/api/dynamic/update.php?hostname=[DOMAIN]&ip=[IP]",
+		"answer": "ok|nochange"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dnspod.cn.json b/ddns-scripts/files/usr/share/ddns/default/dnspod.cn.json
new file mode 100644
index 00000000..dcfa4a25
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dnspod.cn.json
@@ -0,0 +1,9 @@
+{
+	"name": "dnspod.cn",
+	"ipv4": {
+		"url": "update_dnspod_cn.sh"
+	},
+	"ipv6": {
+		"url": "update_dnspod_cn.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/do.de.json b/ddns-scripts/files/usr/share/ddns/default/do.de.json
new file mode 100644
index 00000000..3884a01a
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/do.de.json
@@ -0,0 +1,11 @@
+{
+	"name": "do.de",
+	"ipv4": {
+		"url": "http://ddns.do.de/?myip=[IP]&hostname=[DOMAIN]&username=[USERNAME]&password=[PASSWORD]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "http://ddns.do.de/?myip=[IP]&hostname=[DOMAIN]&username=[USERNAME]&password=[PASSWORD]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/domopoli.de.json b/ddns-scripts/files/usr/share/ddns/default/domopoli.de.json
new file mode 100644
index 00000000..517751cc
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/domopoli.de.json
@@ -0,0 +1,7 @@
+{
+	"name": "domopoli.de",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@http://dyndns.domopoli.de/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/duckdns.org.json b/ddns-scripts/files/usr/share/ddns/default/duckdns.org.json
new file mode 100644
index 00000000..625c9f99
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/duckdns.org.json
@@ -0,0 +1,11 @@
+{
+	"name": "duckdns.org",
+	"ipv4": {
+		"url": "http://www.duckdns.org/update?domains=[DOMAIN]&token=[PASSWORD]&ip=[IP]",
+		"answer": "OK"
+	},
+	"ipv6": {
+		"url": "http://www.duckdns.org/update?domains=[DOMAIN]&token=[PASSWORD]&ipv6=[IP]",
+		"answer": "OK"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/duiadns.net.json b/ddns-scripts/files/usr/share/ddns/default/duiadns.net.json
new file mode 100644
index 00000000..bbf9998b
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/duiadns.net.json
@@ -0,0 +1,9 @@
+{
+	"name": "duiadns.net",
+	"ipv4": {
+		"url": "http://ip.duiadns.net/dynamic.duia?host=[DOMAIN]&password=[PASSWORD]&ip4=[IP]"
+	},
+	"ipv6": {
+		"url": "http://ip.duiadns.net/dynamic.duia?host=[DOMAIN]&password=[PASSWORD]&ip6=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dy.fi.json b/ddns-scripts/files/usr/share/ddns/default/dy.fi.json
new file mode 100644
index 00000000..ce9e4fd8
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dy.fi.json
@@ -0,0 +1,7 @@
+{
+	"name": "dy.fi",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@www.dy.fi/nic/update?hostname=[DOMAIN]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dyn.com.json b/ddns-scripts/files/usr/share/ddns/default/dyn.com.json
new file mode 100644
index 00000000..0ac779b0
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dyn.com.json
@@ -0,0 +1,11 @@
+{
+	"name": "dyn.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@members.dyndns.org/v3/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@members.dyndns.org/v3/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dyndns.it.json b/ddns-scripts/files/usr/share/ddns/default/dyndns.it.json
new file mode 100644
index 00000000..2cffb347
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dyndns.it.json
@@ -0,0 +1,7 @@
+{
+	"name": "dyndns.it",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@update.dyndns.it/nic/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dyndns.org.json b/ddns-scripts/files/usr/share/ddns/default/dyndns.org.json
new file mode 100644
index 00000000..a0c064f4
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dyndns.org.json
@@ -0,0 +1,11 @@
+{
+	"name": "dyndns.org",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@members.dyndns.org/v3/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@members.dyndns.org/v3/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dynu.com.json b/ddns-scripts/files/usr/share/ddns/default/dynu.com.json
new file mode 100644
index 00000000..2c25ea90
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dynu.com.json
@@ -0,0 +1,9 @@
+{
+	"name": "dynu.com",
+	"ipv4": {
+		"url": "http://api.dynu.com/nic/update?hostname=[DOMAIN]&myip=[IP]&username=[USERNAME]&password=[PASSWORD]"
+	},
+	"ipv6": {
+		"url": "http://api.dynu.com/nic/update?hostname=[DOMAIN]&myipv6=[IP]&username=[USERNAME]&password=[PASSWORD]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/dynv6.com.json b/ddns-scripts/files/usr/share/ddns/default/dynv6.com.json
new file mode 100644
index 00000000..66c62aa7
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/dynv6.com.json
@@ -0,0 +1,11 @@
+{
+	"name": "dynv6.com",
+	"ipv4": {
+		"url": "http://dynv6.com/api/update?hostname=[DOMAIN]&token=[PASSWORD]&ipv4=[IP]",
+		"answer": "updated|unchanged"
+	},
+	"ipv6": {
+		"url": "http://dynv6.com/api/update?hostname=[DOMAIN]&token=[PASSWORD]&ipv6=[IP]",
+		"answer": "updated|unchanged"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/easydns.com.json b/ddns-scripts/files/usr/share/ddns/default/easydns.com.json
new file mode 100644
index 00000000..0642c38d
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/easydns.com.json
@@ -0,0 +1,11 @@
+{
+	"name": "easydns.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@api.cp.easydns.com/dyn/generic.php?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "OK|NOERROR"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@api.cp.easydns.com/dyn/generic.php?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "OK|NOERROR"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/freedns.42.pl.json b/ddns-scripts/files/usr/share/ddns/default/freedns.42.pl.json
new file mode 100644
index 00000000..c04dc1dd
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/freedns.42.pl.json
@@ -0,0 +1,6 @@
+{
+	"name": "freedns.42.pl",
+	"ipv4": {
+		"url": "update_freedns_42_pl.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/gandi.net.json b/ddns-scripts/files/usr/share/ddns/default/gandi.net.json
new file mode 100644
index 00000000..de54a16a
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/gandi.net.json
@@ -0,0 +1,9 @@
+{
+	"name": "gandi.net",
+	"ipv4": {
+		"url": "update_gandi_net.sh"
+	},
+	"ipv6": {
+		"url": "update_gandi_net.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/glddns.com.json b/ddns-scripts/files/usr/share/ddns/default/glddns.com.json
new file mode 100644
index 00000000..ec14cbfa
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/glddns.com.json
@@ -0,0 +1,11 @@
+{
+        "name": "glddns.com",
+        "ipv4": {
+                "url": "http://[USERNAME]:[PASSWORD]@ddns.glddns.com/nic/update?hostname=[PARAMENC]&myip=[IP]",
+                "answer": "OK"
+        },
+        "ipv6": {
+                "url": "http://[USERNAME]:[PASSWORD]@ddns.glddns.com/nic/update?hostname=[PARAMENC]&myip=[IP]",
+                "answer": "OK"
+        }
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/godaddy.com-v1.json b/ddns-scripts/files/usr/share/ddns/default/godaddy.com-v1.json
new file mode 100644
index 00000000..211e0e5f
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/godaddy.com-v1.json
@@ -0,0 +1,9 @@
+{
+	"name": "godaddy.com-v1",
+	"ipv4": {
+		"url": "update_godaddy_com_v1.sh"
+	},
+	"ipv6": {
+		"url": "update_godaddy_com_v1.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/goip.de.json b/ddns-scripts/files/usr/share/ddns/default/goip.de.json
new file mode 100644
index 00000000..5aaf3bae
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/goip.de.json
@@ -0,0 +1,9 @@
+{
+	"name": "goip.de",
+	"ipv4": {
+		"url": "http://www.goip.de/setip?username=[USERNAME]&password=[PASSWORD]&subdomain=[DOMAIN]&ip=[IP]"
+	},
+	"ipv6": {
+		"url": "http://www.goip.de/setip?username=[USERNAME]&password=[PASSWORD]&subdomain=[DOMAIN]&ip6=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/google.com.json b/ddns-scripts/files/usr/share/ddns/default/google.com.json
new file mode 100644
index 00000000..edfe461c
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/google.com.json
@@ -0,0 +1,11 @@
+{
+	"name": "google.com",
+	"ipv4": {
+		"url": "https://[USERNAME]:[PASSWORD]@domains.google.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "https://[USERNAME]:[PASSWORD]@domains.google.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/he.net.json b/ddns-scripts/files/usr/share/ddns/default/he.net.json
new file mode 100644
index 00000000..7043efe6
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/he.net.json
@@ -0,0 +1,11 @@
+{
+	"name": "he.net",
+	"ipv4": {
+		"url": "http://[DOMAIN]:[PASSWORD]@dyn.dns.he.net/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "http://[DOMAIN]:[PASSWORD]@dyn.dns.he.net/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/hosting.de.json b/ddns-scripts/files/usr/share/ddns/default/hosting.de.json
new file mode 100644
index 00000000..c41ee35e
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/hosting.de.json
@@ -0,0 +1,11 @@
+{
+	"name": "hosting.de",
+	"ipv4": {
+		"url": "https://[USERNAME]:[PASSWORD]@ddns.hosting.de/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "https://[USERNAME]:[PASSWORD]@ddns.hosting.de/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/infomaniak.com.json b/ddns-scripts/files/usr/share/ddns/default/infomaniak.com.json
new file mode 100644
index 00000000..80541aca
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/infomaniak.com.json
@@ -0,0 +1,11 @@
+{
+	"name": "infomaniak.com",
+	"ipv4": {
+		"url": "https://[USERNAME]:[PASSWORD]@infomaniak.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "https://[USERNAME]:[PASSWORD]@infomaniak.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/inwx.de.json b/ddns-scripts/files/usr/share/ddns/default/inwx.de.json
new file mode 100644
index 00000000..10b16a98
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/inwx.de.json
@@ -0,0 +1,11 @@
+{
+	"name": "inwx.de",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyndns.inwx.com/nic/update?myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyndns.inwx.com/nic/update?myipv6=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/ipnodns.ru.json b/ddns-scripts/files/usr/share/ddns/default/ipnodns.ru.json
new file mode 100644
index 00000000..026caa19
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/ipnodns.ru.json
@@ -0,0 +1,7 @@
+{
+	"name": "ipnodns.ru",
+	"ipv4": {
+		"url": "https://ipnodns.ru/cgi-bin/dyndns.cgi?login=[USERNAME]&secret=[PASSWORD]",
+		"answer": "ok"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/joker.com.json b/ddns-scripts/files/usr/share/ddns/default/joker.com.json
new file mode 100644
index 00000000..af897f18
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/joker.com.json
@@ -0,0 +1,7 @@
+{
+	"name": "joker.com",
+	"ipv4": {
+		"url": "http://svc.joker.com/nic/update?username=[USERNAME]&password=[PASSWORD]&myip=[IP]&hostname=[DOMAIN]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/loopia.se.json b/ddns-scripts/files/usr/share/ddns/default/loopia.se.json
new file mode 100644
index 00000000..f1c3fc22
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/loopia.se.json
@@ -0,0 +1,11 @@
+{
+	"name": "loopia.se",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@dns.loopia.se/XDynDNSServer/XDynDNS.php?system=custom&hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@dns.loopia.se/XDynDNSServer/XDynDNS.php?system=custom&hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/luadns.com-v1.json b/ddns-scripts/files/usr/share/ddns/default/luadns.com-v1.json
new file mode 100644
index 00000000..c77d55be
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/luadns.com-v1.json
@@ -0,0 +1,9 @@
+{
+	"name": "luadns.com-v1",
+	"ipv4": {
+		"url": "update_luadns_v1.sh"
+	},
+	"ipv6": {
+		"url": "update_luadns_v1.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/moniker.com.json b/ddns-scripts/files/usr/share/ddns/default/moniker.com.json
new file mode 100644
index 00000000..c5b7aa98
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/moniker.com.json
@@ -0,0 +1,7 @@
+{
+	"name": "moniker.com",
+	"ipv4": {
+		"url": "https://dynamicdns.key-systems.net/update.php?hostname=[DOMAIN]&password=[PASSWORD]&ip=[IP]",
+		"answer": "success"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/mydns.jp.json b/ddns-scripts/files/usr/share/ddns/default/mydns.jp.json
new file mode 100644
index 00000000..11e98873
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/mydns.jp.json
@@ -0,0 +1,9 @@
+{
+	"name": "mydns.jp",
+	"ipv4": {
+		"url": "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV4ADDR=[IP]"
+	},
+	"ipv6": {
+		"url": "http://www.mydns.jp/directip.html?MID=[USERNAME]&PWD=[PASSWORD]&IPV6ADDR=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/myonlineportal.net.json b/ddns-scripts/files/usr/share/ddns/default/myonlineportal.net.json
new file mode 100644
index 00000000..b3196d6d
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/myonlineportal.net.json
@@ -0,0 +1,11 @@
+{
+	"name": "myonlineportal.net",
+	"ipv4": {
+		"url": "http://myonlineportal.net/updateddns?hostname=[DOMAIN]&ip=[IP]&username=[USERNAME]&password=[PASSWORD]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "http://myonlineportal.net/updateddns?hostname=[DOMAIN]&ip6=[IP]&username=[USERNAME]&password=[PASSWORD]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com-v2.json b/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com-v2.json
new file mode 100644
index 00000000..e2462238
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com-v2.json
@@ -0,0 +1,9 @@
+{
+        "name": "mythic-beasts.com (API v2)",
+        "ipv4": {
+                "url": "https://[USERNAME]:[PASSWORD]@ipv4.api.mythic-beasts.com/dns/v2/dynamic/[DOMAIN]"
+        },
+        "ipv6": {
+                "url": "https://[USERNAME]:[PASSWORD]@ipv6.api.mythic-beasts.com/dns/v2/dynamic/[DOMAIN]"
+        }
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com.json b/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com.json
new file mode 100644
index 00000000..9b2556be
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/mythic-beasts.com.json
@@ -0,0 +1,9 @@
+{
+	"name": "mythic-beasts.com",
+	"ipv4": {
+		"url": "http://dnsapi4.mythic-beasts.com/?domain=[USERNAME]&password=[PASSWORD]&command=REPLACE%20[DOMAIN]%2060%20A%20DYNAMIC_IP&origin=."
+	},
+	"ipv6": {
+		"url": "http://dnsapi6.mythic-beasts.com/?domain=[USERNAME]&password=[PASSWORD]&command=REPLACE%20[DOMAIN]%2060%20AAAA%20DYNAMIC_IP&origin=."
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/namecheap.com.json b/ddns-scripts/files/usr/share/ddns/default/namecheap.com.json
new file mode 100644
index 00000000..bbb0c1fc
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/namecheap.com.json
@@ -0,0 +1,6 @@
+{
+	"name": "namecheap.com",
+	"ipv4": {
+		"url": "http://dynamicdns.park-your-domain.com/update?host=[USERNAME]&domain=[DOMAIN]&password=[PASSWORD]&ip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/njal.la.json b/ddns-scripts/files/usr/share/ddns/default/njal.la.json
new file mode 100644
index 00000000..5da8850d
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/njal.la.json
@@ -0,0 +1,9 @@
+{
+	"name": "njal.la",
+	"ipv4": {
+		"url": "https://njal.la/update/?h=[DOMAIN]&k=[PASSWORD]&a=[IP]"
+	},
+	"ipv6": {
+		"url": "https://njal.la/update/?h=[DOMAIN]&k=[PASSWORD]&aaaa=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/no-ip.com.json b/ddns-scripts/files/usr/share/ddns/default/no-ip.com.json
new file mode 100644
index 00000000..e0f8ccb5
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/no-ip.com.json
@@ -0,0 +1,10 @@
+{
+	"name": "no-ip.com",
+	"ipv4": {
+		"url": "update_no-ip_com.sh"
+	},
+	"ipv6": {
+		"url": "update_no-ip_com.sh"
+	}
+}
+
diff --git a/ddns-scripts/files/usr/share/ddns/default/no-ip.pl.json b/ddns-scripts/files/usr/share/ddns/default/no-ip.pl.json
new file mode 100644
index 00000000..323a415a
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/no-ip.pl.json
@@ -0,0 +1,9 @@
+{
+	"name": "no-ip.pl",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@update.no-ip.pl/?hostname=[DOMAIN]"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@update.no-ip.pl/?hostname=[DOMAIN]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/now-dns.com.json b/ddns-scripts/files/usr/share/ddns/default/now-dns.com.json
new file mode 100644
index 00000000..8c4a2209
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/now-dns.com.json
@@ -0,0 +1,11 @@
+{
+	"name": "now-dns.com",
+	"ipv4": {
+		"url": "https://[USERNAME]:[PASSWORD]@now-dns.com/update?hostname=[DOMAIN]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "https://[USERNAME]:[PASSWORD]@now-dns.com/update?hostname=[DOMAIN]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/ns1.com.json b/ddns-scripts/files/usr/share/ddns/default/ns1.com.json
new file mode 100644
index 00000000..93484b6c
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/ns1.com.json
@@ -0,0 +1,9 @@
+{
+	"name": "ns1.com",
+	"ipv4": {
+		"url": "update_ns1_com.sh"
+	},
+	"ipv6": {
+		"url": "update_ns1_com.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/nsupdate.info.json b/ddns-scripts/files/usr/share/ddns/default/nsupdate.info.json
new file mode 100644
index 00000000..435e41df
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/nsupdate.info.json
@@ -0,0 +1,11 @@
+{
+	"name": "nsupdate.info",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@ipv4.nsupdate.info/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@ipv6.nsupdate.info/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/one.com.json b/ddns-scripts/files/usr/share/ddns/default/one.com.json
new file mode 100644
index 00000000..9245a730
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/one.com.json
@@ -0,0 +1,6 @@
+{
+	"name": "one.com",
+	"ipv4": {
+		"url": "update_one_com.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/opendns.com.json b/ddns-scripts/files/usr/share/ddns/default/opendns.com.json
new file mode 100644
index 00000000..35d4953c
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/opendns.com.json
@@ -0,0 +1,7 @@
+{
+	"name":"opendns.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@updates.opendns.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/oray.com.json b/ddns-scripts/files/usr/share/ddns/default/oray.com.json
new file mode 100644
index 00000000..31728057
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/oray.com.json
@@ -0,0 +1,6 @@
+{
+	"name": "oray.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@ddns.oray.com/ph/update?hostname=[DOMAIN]&myip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/ovh.com.json b/ddns-scripts/files/usr/share/ddns/default/ovh.com.json
new file mode 100644
index 00000000..92f2066a
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/ovh.com.json
@@ -0,0 +1,7 @@
+{
+	"name": "ovh.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@www.ovh.com/nic/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/pdns.json b/ddns-scripts/files/usr/share/ddns/default/pdns.json
new file mode 100644
index 00000000..aa6faa65
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/pdns.json
@@ -0,0 +1,9 @@
+{
+	"name": "PowerDNS",
+	"ipv4": {
+		"url": "update_pdns.sh"
+	},
+	"ipv6": {
+		"url": "update_pdns.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/regfish.de.json b/ddns-scripts/files/usr/share/ddns/default/regfish.de.json
new file mode 100644
index 00000000..9b179959
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/regfish.de.json
@@ -0,0 +1,11 @@
+{
+	"name": "regfish.de",
+	"ipv4": {
+		"url": "http://dyndns.regfish.de/?fqdn=[DOMAIN]&forcehost=1&authtype=secure&token=[PASSWORD]&ipv4=[IP]",
+		"answer": "success|100|101"
+	},
+	"ipv6": {
+		"url": "http://dyndns.regfish.de/?fqdn=[DOMAIN]&forcehost=1&authtype=secure&token=[PASSWORD]&ipv6=[IP]",
+		"answer": "success|100|101"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/route53-v1.json b/ddns-scripts/files/usr/share/ddns/default/route53-v1.json
new file mode 100644
index 00000000..bf5d8d37
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/route53-v1.json
@@ -0,0 +1,9 @@
+{
+	"name": "route53-v1",
+	"ipv4": {
+		"url": "update_route53_v1.sh"
+	},
+	"ipv6": {
+		"url": "update_route53_v1.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/schokokeks.org.json b/ddns-scripts/files/usr/share/ddns/default/schokokeks.org.json
new file mode 100644
index 00000000..480c0693
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/schokokeks.org.json
@@ -0,0 +1,7 @@
+{
+	"name": "schokokeks.org",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyndns.schokokeks.org/nic/update?myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/selfhost.de.json b/ddns-scripts/files/usr/share/ddns/default/selfhost.de.json
new file mode 100644
index 00000000..0db3895c
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/selfhost.de.json
@@ -0,0 +1,7 @@
+{
+	"name": "selfhost.de",
+	"ipv4": {
+		"url": "http://carol.selfhost.de/update?username=[USERNAME]&password=[PASSWORD]&myip=[IP]&hostname=1",
+		"answer": "good|nochg|200|204"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/simply.com.json b/ddns-scripts/files/usr/share/ddns/default/simply.com.json
new file mode 100644
index 00000000..5ab9c8d5
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/simply.com.json
@@ -0,0 +1,11 @@
+{
+	"name": "simply.com",
+	"ipv4": {
+		"url": "https://[USERNAME]:[PASSWORD]@api.simply.com/2/ddns/?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "https://[USERNAME]:[PASSWORD]@api.simply.com/2/ddns/?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/sitelutions.com.json b/ddns-scripts/files/usr/share/ddns/default/sitelutions.com.json
new file mode 100644
index 00000000..a9fec1fb
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/sitelutions.com.json
@@ -0,0 +1,7 @@
+{
+	"name": "sitelutions.com",
+	"ipv4": {
+		"url": "https://dnsup.sitelutions.com/dnsup?user=[USERNAME]&pass=[PASSWORD]&id=[DOMAIN]&ip=[IP]",
+		"answer": "success"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/spdyn.de.json b/ddns-scripts/files/usr/share/ddns/default/spdyn.de.json
new file mode 100644
index 00000000..a9352efc
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/spdyn.de.json
@@ -0,0 +1,11 @@
+{
+	"name": "spdyn.de",
+	"ipv4": {
+		"url": "https://update.spdyn.de/nic/update?hostname=[DOMAIN]&myip=[IP]&user=[USERNAME]&pass=[PASSWORD]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "https://update.spdyn.de/nic/update?hostname=[DOMAIN]&myip=[IP]&user=[USERNAME]&pass=[PASSWORD]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/strato.com.json b/ddns-scripts/files/usr/share/ddns/default/strato.com.json
new file mode 100644
index 00000000..9ab43d24
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/strato.com.json
@@ -0,0 +1,11 @@
+{
+	"name": "strato.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyndns.strato.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyndns.strato.com/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/system-ns.com.json b/ddns-scripts/files/usr/share/ddns/default/system-ns.com.json
new file mode 100644
index 00000000..4c4ca7fc
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/system-ns.com.json
@@ -0,0 +1,8 @@
+{
+	"name": "system-ns.com",
+
+	"ipv4": {
+		"url": "http://system-ns.com/api?type=dynamic&command=set&domain=[DOMAIN]&token=[PASSWORD]&ip=[IP]",
+		"answer": "0"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/thatip.com.json b/ddns-scripts/files/usr/share/ddns/default/thatip.com.json
new file mode 100644
index 00000000..18e72b75
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/thatip.com.json
@@ -0,0 +1,6 @@
+{
+	"name": "thatip.com",
+	"ipv4": {
+		"url": "http://update.dnsmax.com/update/?username=[USERNAME]&password=[PASSWORD]&resellerid=2&clientname=openwrt&clientversion=8.09&protocolversion=2.0&updatehostname=[DOMAIN]&ip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/transip.nl.json b/ddns-scripts/files/usr/share/ddns/default/transip.nl.json
new file mode 100644
index 00000000..1dabb4f6
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/transip.nl.json
@@ -0,0 +1,9 @@
+{
+	"name": "transip.nl",
+	"ipv4": {
+		"url": "update_transip_nl.sh"
+	},
+	"ipv6": {
+		"url": "update_transip_nl.sh"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/twodns.de.json b/ddns-scripts/files/usr/share/ddns/default/twodns.de.json
new file mode 100644
index 00000000..2d20e76c
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/twodns.de.json
@@ -0,0 +1,6 @@
+{
+	"name": "twodns.de",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@update.twodns.de/update?hostname=[DOMAIN]&ip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/udmedia.de.json b/ddns-scripts/files/usr/share/ddns/default/udmedia.de.json
new file mode 100644
index 00000000..fa9ff4c5
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/udmedia.de.json
@@ -0,0 +1,9 @@
+{
+	"name": "udmedia.de",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@www.udmedia.de/nic/update?myip=[IP]"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@www.udmedia.de/nic/update?myip=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/variomedia.de.json b/ddns-scripts/files/usr/share/ddns/default/variomedia.de.json
new file mode 100644
index 00000000..fa86f4e6
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/variomedia.de.json
@@ -0,0 +1,11 @@
+{
+	"name": "variomedia.de",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyndns.variomedia.de/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	},
+	"ipv6": {
+		"url": "http://[USERNAME]:[PASSWORD]@dyndns.variomedia.de/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/xlhost.de.json b/ddns-scripts/files/usr/share/ddns/default/xlhost.de.json
new file mode 100644
index 00000000..302cdc63
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/xlhost.de.json
@@ -0,0 +1,7 @@
+{
+	"name": "xlhost.de",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@nsupdate.xlhost.de/nic/update?hostname=[DOMAIN]&myip=[IP]",
+		"answer": "good|nochg"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/default/zoneedit.com.json b/ddns-scripts/files/usr/share/ddns/default/zoneedit.com.json
new file mode 100644
index 00000000..dd3c2263
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/default/zoneedit.com.json
@@ -0,0 +1,6 @@
+{
+	"name": "zoneedit.com",
+	"ipv4": {
+		"url": "http://[USERNAME]:[PASSWORD]@dynamic.zoneedit.com/auth/dynamic.html?host=[DOMAIN]&dnsto=[IP]"
+	}
+}
diff --git a/ddns-scripts/files/usr/share/ddns/list b/ddns-scripts/files/usr/share/ddns/list
new file mode 100644
index 00000000..88d369c9
--- /dev/null
+++ b/ddns-scripts/files/usr/share/ddns/list
@@ -0,0 +1,68 @@
+3322.org
+afraid.org-basicauth
+afraid.org-keyauth
+afraid.org-v2-basic
+afraid.org-v2-token
+all-inkl.com
+changeip.com
+core-networks.de
+ddnss.de
+ddo.jp
+desec.io
+dhis.org
+dnsdynamic.org
+dnsever.com
+dnsexit.com
+dnshome.de
+dnsmadeeasy.com
+dnsmax.com
+dnsomatic.com
+dnspark.com
+do.de
+domopoli.de
+duckdns.org
+duiadns.net
+dy.fi
+dyn.com
+dyndns.it
+dyndns.org
+dynu.com
+dynv6.com
+easydns.com
+goip.de
+google.com
+he.net
+hosting.de
+infomaniak.com
+ipnodns.ru
+inwx.de
+joker.com
+loopia.se
+moniker.com
+mydns.jp
+myonlineportal.net
+mythic-beasts.com
+mythic-beasts.com-v2
+namecheap.com
+njal.la
+no-ip.pl
+now-dns.com
+nsupdate.info
+opendns.com
+oray.com
+ovh.com
+regfish.de
+schokokeks.org
+selfhost.de
+simply.com
+sitelutions.com
+spdyn.de
+strato.com
+system-ns.com
+thatip.com
+transip.nl
+twodns.de
+udmedia.de
+variomedia.de
+xlhost.de
+zoneedit.com
diff --git a/ddns-scripts/samples/ddns.config_sample b/ddns-scripts/samples/ddns.config_sample
new file mode 100644
index 00000000..46bd8abe
--- /dev/null
+++ b/ddns-scripts/samples/ddns.config_sample
@@ -0,0 +1,319 @@
+#
+#
+# Here you find a description on every parameter supported
+# and used by ddns-scripts and corresponding LuCI application
+#
+# Inside your ddns configuration file (/etc/config/ddns)
+# you might not find some of below described options.
+# This is because you don't need to define options
+# if using there defaults. The LuCI application will delete
+# options that configured to there default values.
+#
+# If you have a working ddns configuration from old ddns-scripts (Version 1.x)
+# everything will function the same with new scripts
+# without any changes to the configuration.
+#
+# If you like to use this file for your configuration then
+# use a copy, because the used software to modify the
+# configuration files will throw away all empty lines
+# and those starting with # (comments).
+#
+
+#####################################################################
+# Global application settings
+#
+config ddns "global"
+
+	###########
+	# set date format to use for display date in logfiles
+	# and LuCI web application.
+	# For codes see man pages of date command.
+	# default: "%F %R" (ISO 8601 format)
+#	option ddns_dateformat "%F %R"
+
+	###########
+	# set run directory to use for .pid and .update files
+	# there will be a separate file for every running service section
+	# default: "/var/run/ddns"
+#	option ddns_rundir "/var/run/ddns"
+
+	###########
+	# set log directory to use for .log files
+	# there will be a separate file for every running service section
+	# default: "/var/log/ddns"
+#	option ddns_logdir "/var/log/ddns"
+
+	###########
+	# set number of lines stored in .log file before auto truncated
+	# default: "250" lines
+#	option ddns_loglines "250"
+
+	###########
+	# Whether to allow to send Private/Special IP's to the DDNS provider
+	# IPv4: 0.x, 10.x, 127.x, 172.16.x-172.31.x, 192.168.x
+	# IPv6: ::, Fxxx:
+	# default: "0"	disabled
+#	option upd_privateip "0"
+
+#####################################################################
+# DDNS service settings
+#
+# for each service you want to serve you need a separate configuration
+# if you need IPv4 and IPv6 you need to setup 2 separate configurations
+# with different names. (i.e. "myddns_ipv4" and "myddns_ipv6")
+# do not use white-spaces or dashes "-" or "@" ":" "!" or
+# other special characters inside name.
+config service "myddns"
+
+	########### Basic settings ########################
+
+	###########
+	# enable/disable this service section
+	# default: "0"	disabled
+	option enabled "0"
+
+	###########
+	# detecting/sending IPv4 or IPv6 address to the DDNS provider
+	# set to "1" if you want to use IPv6
+	# default: "0"	use IPv4
+	option use_ipv6 "0"
+
+	###########
+	# defines the network as defined in /etc/config/network
+	# to be monitored for up/down events to start via hotplug
+	default: "wan"	for IPv4
+	default: "wan6"	for IPv6
+	option interface "wan"
+
+	###########
+	# Next you need to specify the name of the service you are
+	# connecting to "eg. dyndns.org".  The format of the update
+	# urls for several different dynamic dns services is specified
+	# in the "/usr/lib/ddns/services" file for IPv4 and in
+	# "/usr/lib/ddns/service_ipv6" file. This list is hardly complete
+	# as there are many, many different dynamic dns services.
+	# If your service is on the list you can merely specify it with the
+	# "service_name" option.  Otherwise you will need to determine
+	# the format of the url to update with.  You can either add an
+	# entry to the "/usr/lib/ddns/services" or "services_ipv6" file
+	# or specify this with the "update_url" option.
+	# If your ddns provider doesn't work with ddns-scripts because
+	# there are additional parameters or other special thinks to be done,
+	# then you could write your own script to send updates to your ddns provider.
+	# Have a look into /usr/lib/ddns/update_sample.sh
+	# The script is specified in "update_script"
+	# Either set "service_name" or one of "update_url" and "update_script"
+	# default: none
+	option service_name "dyndns.org"
+
+	# sample:
+	# "http://[USERNAME]:[PASSWORD]@members.dyndns.org/nic/update?hostname=[DOMAIN]&myip=[IP]"
+#	option update_url   ""
+
+	# sample:
+	# "/usr/lib/ddns/update_sample.sh"
+#	option update_script   ""
+
+	###########
+	# Keep an eye on providers help pages.
+	#
+	# FQDN of ONE of your defined host at DDNS provider
+	# REQUIRED to verify what the current IP at DNS using nslookup/host command
+	# default: none
+	option lookup_host ""
+
+	# Your DNS name / replace [DOMAIN] in update_url
+	# default: none
+	option domain ""
+
+	# Username of your DDNS service account / replace [USERNAME] in update_url
+	# default: none
+	option username ""
+
+	# Password of your DDNS service account / replace [PASSWORD] in update url
+	# default: none
+	option password ""
+
+	###########
+	# Optional parameters for use inside update_url
+	#
+	# parameter that will be urlencoded before replacement of [PARAMENC] inside update url
+	# default: none
+	option param_enc ""
+
+	# parameter that repace [PARAMOPT] inside update url
+	# default: none
+	option param_opt ""
+
+	###########
+	# use HTTPS for secure communication with you DDNS provider
+	# personally found some providers having problems when not sending
+	# updates via HTTPS. You must not specify "https://" in update_url.
+	# It's modified by the scripts themselves
+	# Needs GNU Wget (with SSL support) or cURL to be installed.
+	# default: "0"	do not use HTTPS
+	option use_https "0"
+
+	# if using HTTPS (see above) the transfer program tries to verify
+	# the providers server certificate. For verification there needs to be
+	# the counterpart on this machine. Specify the path or path/file where
+	# the transfer program can find them. (might need package CA-certificates)
+	# if you don't want to verify servers certificate (insecure) you should
+	# this parameter to "IGNORE" (in capital letters)
+	# default: (none)	path where CA-certificate package is installed
+	option cacert "/etc/ssl/certs"
+
+	###########
+	# for logging and control if everything work fine you can get information inside
+	# system log . Critical Errors are always send to system log.
+	# You can define which information you like to log
+	# 1 == info, notice, warning, errors
+	# 2 == notice, warning, errors
+	# 3 == warning, errors
+	# 4 == errors
+	# default: "0" off
+	option use_syslog  "0"
+
+	###########
+	# for logging and control if everything work fine you can get information inside
+	# log file. You find the file per default in /var/log/ddns/[sectionname].log
+	# The path can be modified for all log files in ddns.global section (see above)
+	# default: "1" on
+	option use_logfile "1"
+
+	########### Advanced settings #####################
+
+	###########
+	# you need to specify how ddns-scripts should detect you current local ip.
+	# the ip_source could be set to "network", "web", "interface" or "script"
+	# the parameters below specifying the additional information needed for
+	# the corresponding ip_spource configuration
+	# default: "network"
+
+	# ip_source "network" additional uses option ip_network and detects the
+	# current local ip on network as defined in /etc/config/network
+	# default: "wan"  using IPv4
+	# default: "wan6" using IPv6
+	option ip_source  "network"
+	option ip_network "wan"
+
+	# ip_source "web" additional uses option ip_url and detects the current
+	# local ip from special web sides that response with the ip address of
+	# calling host. If you are behind a firewall/NAT this is the best option
+	# since none of the local networks or interfaces will have the external ip.
+	# default: "http://checkip.dyndns.com"   using IPv4
+	# default: "http://checkipv6.dyndns.com" using IPv6
+#	option ip_source "web"
+#	option ip_url    "http://checkip.dyndns.com"
+
+	# ip_source "interface" additional uses option ip_interface
+	# ip_source "interface" uses one of the locally installed physical interfaces
+	# to detect independent from network they configured to.
+	# default: none
+#	option ip_source    "interface"
+#	option ip_interface "eth1"
+
+	# ip_source "script" additional uses option ip_script
+	# it's useful if you want to write your own script to detect the
+	# current local ip. put full path into ip_script option.
+	# The script must be executable.
+	# default: none
+#	option ip_source "script"
+#	option ip_script ""
+
+	# This option can be used in combination with ip_source "web" and ip_url.
+	# It adds a given user agent string to the request.
+	# Will only be used when wget or wget-ssl is installed.
+#	option user_agent "Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/95.0"
+
+	###########
+	# force_ipversion option will set the "-4" respectively "-6" parameter
+	# on command line of transfer and DNS lookup program.
+	# So the whole communication uses the selected IP version between both ends.
+	# needs GNU Wget or cURL installed for transfer and
+	# BIND's host for DNS lookup.
+	# default: "0" disabled
+	option force_ipversion "0"
+
+	###########
+	# Normally the current (in the internet) registered ip is detected using the
+	# local defined name lookup policies (i.e. /etc/resolve.conf etc.)
+	# Specify here a DNS server to use instead of the defaults.
+	# you can use hostname or ip address
+	# i.e. "google-public-dns-a.google.com"
+	# default: none
+#	option dns_server "google-public-dns-a.google.com"
+
+	# By default every DNS call is made via UDP protocol
+	# Some internet provider offer modems that cache UDP DNS requests.
+	# They also redirect calls to external servers to local.
+	# To force the usage of TCP for DNS requests enable this option
+	# Needs BIND's host program be installed
+	# default: "0" disabled
+#	option force_dnstcp "0"
+
+	###########
+	# If a Proxy is need to access HTTP/HTTPS pages on the WEB
+	# it can be configured here also for sending updates to the
+	# DDNS provider. If you configured use_https='1' above, you
+	# need to setup your HTTPS proxy here, otherwise your
+	# HTTP proxy. !!! You should not detect your current IP
+	# ip_source='web' (see above) because this request is also
+	# send via the configured proxy !!!
+	# Syntax: [user:password@]proxy:port !port is required !
+	# IPv6 address must be in squared brackets "[...]"
+	# default: none
+#	option proxy ''
+
+	###########
+	# In some very special configurations i.e. Multi WAN environment
+	# in a NAT cascade it might be necessary to define
+	# a network to use for communication.
+	# should use option ip_source "web" (see above)
+	# Needs GNU Wget (with SSL support) or cURL to be installed.
+	# GNU Wget will use IP address and cURL the physical device 
+	# of the given network
+	# default: none
+#	option bind_network "wan7"
+
+	########### Timer settings ########################
+
+	###########
+	# defines the time interval to check if local IP has changed
+	# After the first start and first update send, the system will
+	# wait this time before verify if update was successful send.
+	# !!! checks below 5 minutes make no sense because the Internet
+	# needs about 5-10 minutes to sync an IP-change to all DNS servers !!!
+	# accepted unit entry’s: 'seconds' 'minutes' 'hours'
+	# minimum 5 minutes == 300 seconds
+	# default 10 minutes
+	option check_interval	'10'
+	option check_unit	'minutes'
+
+	###########
+	# force to send an update to service provider, if no change was detected.
+	# consult DDNS providers documentation if your DDNS entry might timeout.
+	# accepted unit entry’s: 'minutes' 'hours' 'days'
+	# minimum needs to be greater or equal check interval (see above)
+	# A special setting of '0' is allowed, which forces the script to run once.
+	# It sends an update, verify if update was accepted by DNS
+	# (retry if not) and finish. Useful if you want to start by your own (i.e. cron)
+	# default 3 days == 72 hours
+	option force_interval	'72'
+	option force_unit	'hours'
+
+	###########
+	# if error happen on detecting, sending or updating the
+	# script will retry the relevant action for retry_count times
+	# before stopping script execution.
+	# default: 5
+	option retry_count '5'
+
+	###########
+	# if error happen on detecting, sending or updating the
+	# script will retry the relevant action.
+	# here you define the time to wait before retry is started
+	# accepted unit entry’s: 'seconds' 'minutes'
+	# default: 60 seconds
+	option retry_interval	'60'
+	option retry_unit	'seconds'
diff --git a/ddns-scripts/samples/getlocalip_sample.sh b/ddns-scripts/samples/getlocalip_sample.sh
new file mode 100755
index 00000000..b98806b6
--- /dev/null
+++ b/ddns-scripts/samples/getlocalip_sample.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+#
+# sample script for detecting local IP
+# 2014-2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+#
+# activated inside /etc/config/ddns by setting
+#
+# option ip_source	'script'
+# option ip_script 	'/usr/lib/ddns/getlocalip_sample.sh -6' !!! parameters ALLOWED
+#
+# the script is executed (not parsed) inside get_local_ip() function
+# of /usr/lib/ddns/dynamic_dns_functions.sh
+#
+# useful when this box is the only DDNS client in the network
+# IP adresses of "internal" boxes could be detected with this script
+# so no need to install ddns client on every "internal" box
+# On IPv6 every internal box normally has it's own external IP
+#
+# This script should
+# 	- return the IP address via stdout	echo -n "...."	!!! without line feed
+#	- report errors via stderr		echo "...." >&2
+#	- return an error code ('0' for success)	exit 123
+
+case $1 in
+	-4)	echo -n "8.8.8.8"		# never append linefeed or simular
+		exit 0
+		;;				# IP's of Googles public DNS
+	-6)	echo -n "2001:4860:4860::8888"
+		exit 0
+		;;
+	*)	echo "$0 - Invalid or missing parameter" >&2
+		exit 1
+esac
+echo "Should never come here" >&2
+exit 2
diff --git a/ddns-scripts/samples/slaac_sample.sh b/ddns-scripts/samples/slaac_sample.sh
new file mode 100755
index 00000000..ea8f24d8
--- /dev/null
+++ b/ddns-scripts/samples/slaac_sample.sh
@@ -0,0 +1,59 @@
+#!/bin/sh
+#
+# script to determine and return SLAAC ipv6 address using prefix from a locally configured interface and the MAC address of the device
+# (c) 2018 Keve Mueller <keve at keve dot hu>
+#
+# activated inside /etc/config/ddns by setting
+#
+# option ip_source      'script'
+# option ip_script      '/usr/lib/ddns/slaac_sample.sh br-lan AA:BB:CC:DD:EE:FF'
+#
+# the script is executed (not parsed) inside get_local_ip() function
+# of /usr/lib/ddns/dynamic_dns_functions.sh
+#
+# useful when this box is the only DDNS client in the network and other clients use SLAAC
+# so no need to install ddns client on every "internal" box
+#
+# NB: this will not catch the actual IPV6 used by the host when it is configured to use temporary addresses
+
+#NB: we need a valid MAC address that is fully expanded with leading zeroes on all positions
+format_eui_64() {
+    local macaddr="$1"
+    echo ${macaddr:0:1}$(echo ${macaddr:1:1}|tr 0123456789abcdefABCDEF 23016745ab89efcd89efcd)${macaddr:3:2}:${macaddr:6:2}ff:fe${macaddr:9:2}:${macaddr:12:2}${macaddr:15:2}
+}
+
+# expand :: in an ipv6 address specification to the appropriate series of 0:
+# result will have 8 ipv6 fragments separated by single colon
+# NB: input must be a valid IPv6 address, e.g. ::1
+# NB: numbers are not prepended with leading zeroes
+expand_ipv6_colons() {
+    local ipv6=$1
+# we need :: to be in the middle, so prepend a 0 if the input starts with : and append 0 if it ends with it
+    if [ "${ipv6:0:1}" = ":" ]; then ipv6=0${ipv6}; fi
+    if [ "${ipv6: -1:1}" = ":" ]; then ipv6=${ipv6}0; fi
+# retain only the real colons
+    local colons=${ipv6//::|[0123456789abcdefABCDEF]/}
+# count them
+    local num_colons=${#colons}
+    local filler=":0:0:0:0:0:0:"
+# replace the :: with the appropriate substring from filler
+    local ipv6_x=${ipv6/::/${filler:0:(7-$num_colons)*2-1}}
+    echo $ipv6_x
+}
+
+# obtain the first ipv6 address of the device passed in $1
+addr_net=$(ip -6 -o addr show dev $1 scope global up | cut -d" " -f 7 | head -1)
+#addr_net=$1
+addr=${addr_net%/*}
+# TODO: we assume /64 subnet
+# get the first 64 bits of the address
+prefix=$(expand_ipv6_colons $addr | cut -d: -f -4)
+# compute the SLAAC 64 bits from the MAC
+suffix=$(format_eui_64 "$2")
+
+echo -n $prefix:$suffix
+exit 0
+
+#echo "Should never come here" >&2
+#exit 2
+
diff --git a/ddns-scripts/samples/update_sample.sh b/ddns-scripts/samples/update_sample.sh
new file mode 100644
index 00000000..316dfa52
--- /dev/null
+++ b/ddns-scripts/samples/update_sample.sh
@@ -0,0 +1,41 @@
+# sample script for sending user defined updates
+# 2014-2015 Christian Schoenebeck <christian dot schoenebeck at gmail dot com>
+#
+# activated inside /etc/config/ddns by setting
+#
+# option update_script '/usr/lib/ddns/update_sample.sh'
+#
+# the script is parsed (not executed) inside send_update() function
+# of /usr/lib/ddns/dynamic_dns_functions.sh
+# so you can use all available functions and global variables inside this script
+# already defined in dynamic_dns_updater.sh and dynamic_dns_functions.sh
+#
+# It make sence to define the update url ONLY inside this script
+# because it's anyway unique to the update script
+# otherwise it should work with the default scripts
+#
+# the code here is the copy of the default used inside send_update()
+#
+# tested with spdns.de
+local __URL="http://[USERNAME]:[PASSWORD]@update.spdns.de/nic/update?hostname=[DOMAIN]&myip=[IP]"
+# inside url we need domain, username and password
+[ -z "$domain" ]   && write_log 14 "Service section not configured correctly! Missing 'domain'"
+[ -z "$username" ] && write_log 14 "Service section not configured correctly! Missing 'username'"
+[ -z "$password" ] && write_log 14 "Service section not configured correctly! Missing 'password'"
+
+# do replaces in URL
+__URL=$(echo $__URL | sed -e "s#\[USERNAME\]#$URL_USER#g" -e "s#\[PASSWORD\]#$URL_PASS#g" \
+			     -e "s#\[PARAMENC\]#$URL_PENC#g" -e "s#\[PARAMOPT\]#$param_opt#g" \
+			     -e "s#\[DOMAIN\]#$domain#g"     -e "s#\[IP\]#$__IP#g")
+[ $use_https -ne 0 ] && __URL=$(echo $__URL | sed -e 's#^http:#https:#')
+
+do_transfer "$__URL" || return 1
+
+write_log 7 "DDNS Provider answered:\n$(cat $DATFILE)"
+
+# analyse provider answers
+# "good [IP_ADR]"	= successful
+# "nochg [IP_ADR]"	= no change but OK
+grep -i -E "good|nochg" $DATFILE >/dev/null 2>&1
+return $?	# "0" if "good" or "nochg" found
+
diff --git a/dhcpdiscover/Makefile b/dhcpdiscover/Makefile
new file mode 100644
index 00000000..81d9dfe6
--- /dev/null
+++ b/dhcpdiscover/Makefile
@@ -0,0 +1,39 @@
+#
+# Copyright (C) 2006-2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# Author: p4u <pau@dabax.net>
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dhcpdiscover
+PKG_RELEASE:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/dhcpdiscover
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+define Package/dhcpdiscover
+ SECTION:=net
+ CATEGORY:=Network
+ TITLE:=dhcpdiscover
+endef
+
+define Package/dhcpdiscover/description
+ Brings some information about the existing DHCP servers of the network
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Package/dhcpdiscover/install
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcpdiscover $(1)/bin/
+endef
+
+$(eval $(call BuildPackage,dhcpdiscover))
diff --git a/dhcpdiscover/README.md b/dhcpdiscover/README.md
new file mode 100644
index 00000000..1d14b673
--- /dev/null
+++ b/dhcpdiscover/README.md
@@ -0,0 +1,48 @@
+* Program: dhcpdiscover
+  
+  This program checks the existence and more details of a DHCP server
+
+* About the code structure
+
+  The Makefile found in the directory of this README is for OpenWRT. It can be imported as a package. Inside the src/ directory the C code of dhcpdiscover can be found. If you want to compile it for your computer execute: cd src && make
+
+* Licence information
+
+  Code under GPLv3
+  
+  Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org), 2013 OpenWRT.org 
+
+* Contributors
+
+  Mike Gore 25 Aug 2005: Modified for standalone operation   
+  Pau Escrich Jun 2013: Added -b option and ported to OpenWRT 
+
+
+___________________________________________________________
+
+ 
+```
+Usage: dhcpdiscover [-s serverip] [-r requestedip] [-m clientmac ] [-b bannedip] [-t timeout] [-i interface]
+                  [-v] -s, --serverip=IPADDRESS
+   IP address of DHCP server that we must hear from
+ -r, --requestedip=IPADDRESS
+   IP address that should be offered by at least one DHCP server
+ -m, --mac=MACADDRESS
+   Client MAC address to use for sending packets
+ -b, --bannedip=IPADDRESS
+   Server IP address to ignore
+ -t, --timeout=INTEGER
+   Seconds to wait for DHCPOFFER before timeout occurs
+ -i, --interface=STRING
+   Interface to to use for listening (i.e. eth0)
+ -v, --verbose
+   Print extra information (command-line use only)
+ -p, --prometheus
+   Print extra information in prometheus format
+ -h, --help
+   Print detailed help screen
+ -V, --version
+   Print version information
+
+Example: sudo ./dhcpdiscover -i eth0 -b 192.168.1.1
+```
diff --git a/dhcpdiscover/run_loop.sh b/dhcpdiscover/run_loop.sh
new file mode 100755
index 00000000..6a2935c5
--- /dev/null
+++ b/dhcpdiscover/run_loop.sh
@@ -0,0 +1,38 @@
+#!/bin/sh
+
+. /lib/functions/gl_util.sh
+
+DHCP_FILE="/tmp/dnsmasq.d/drop-in-dhcp"
+DHCP_INFO="/tmp/drop-in-dhcp-info"
+
+POOL_START
+POOL_END
+POOL_NETMASK
+POOL_LEASETIME
+UPSTREAM_GATEWAY
+LOCAL_IPADDR
+
+setup_dhcp_for_wan()
+{
+    echo "dhcp-range=set:wan,${POOL_START},${POOL_END},${POOL_NETMASK},${POOL_LEASETIME}" >/tmp/dnsmasq.d/drop-in-dhcp
+    /etc/init.d/dnsmasq restart
+}
+
+remove_dhcp_for_wan()
+{
+    rm /tmp/dnsmasq.d/drop-in-dhcp
+    /etc/init.d/dnsmasq restart
+}
+
+check_dhcp_server()
+{
+    local WAN="$(get_wan)"
+    local INFO="$(dhcpdiscover -i ${WAN} -p -t 5 ${LOCAL_IPADDR:+-b $LOCAL_IPADDR})"
+    if [ -n "$INFO" ];then
+        echo $INFO > $DHCP_INFO
+    else
+        rm $DHCP_INFO
+    fi
+}
+
+
diff --git a/dhcpdiscover/src/Makefile b/dhcpdiscover/src/Makefile
new file mode 100644
index 00000000..2dfbc734
--- /dev/null
+++ b/dhcpdiscover/src/Makefile
@@ -0,0 +1,13 @@
+CC       = gcc
+CPPFLAGS = 
+CFLAGS   = -Os -Wall
+LDFLAGS	 =
+CONFIGURE_ARGS =
+
+all: dhcpdiscover
+
+dhcpdiscover: 
+	$(CC) -o dhcpdiscover dhcpdiscover.c
+
+clean:
+	rm -f dhcpdiscover
diff --git a/dhcpdiscover/src/dhcpdiscover.c b/dhcpdiscover/src/dhcpdiscover.c
new file mode 100644
index 00000000..54c6a5b8
--- /dev/null
+++ b/dhcpdiscover/src/dhcpdiscover.c
@@ -0,0 +1,1362 @@
+/******************************************************************************
+ *
+ * Original name: CHECK_DHCP.C
+ * Current name: DHCPDISCOVER.C
+ *
+ * License: GPL
+ * Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)
+ * Copyright (c) 2006-2013 OpenWRT.org
+ *
+ * License Information:
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ *****************************************************************************/
+
+const char* COPYRIGHT = " \
+*\n \
+* License: GPL\n \
+* Copyright (c) 2001-2004 Ethan Galstad (nagios@nagios.org)\n \
+* Copyright (c) 2006-2013 OpenWRT.org \n \
+* ====================================================== \n \
+* Mike Gore 25 Aug 2005 \n \
+*    Modified for standalone operation \n \
+* ====================================================== \n \
+* Pau Escrich Jun 2013 \n \
+*    Added -b option and ported to OpenWRT \n \
+* ====================================================== \n \
+*\n \
+** License Information:\n \
+*\n \
+* This program is free software; you can redistribute it and/or modify\n \
+* it under the terms of the GNU General Public License as published by\n \
+* the Free Software Foundation; either version 2 of the License, or\n \
+* (at your option) any later version.\n \
+*\n \
+* This program is distributed in the hope that it will be useful,\n \
+* but WITHOUT ANY WARRANTY; without even the implied warranty of\n \
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n \
+* GNU General Public License for more details.\n \
+*\n \
+* You should have received a copy of the GNU General Public License\n \
+* along with this program; if not, write to the Free Software\n \
+* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.\n \
+*\n \
+* $Id: dhcpdiscover.c,v 2$\n \
+*";
+
+const char* progname = "dhcpdiscover";
+const char* revision = "$Revision: 2$";
+const char* copyright = "2006-2013";
+const char* email = "p4u@dabax.net";
+
+#include <arpa/inet.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <getopt.h>
+#include <locale.h>
+#include <net/if.h>
+#include <netdb.h>
+#include <netinet/in.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <time.h>
+
+#if defined(__linux__)
+
+#include <features.h>
+#include <linux/if_ether.h>
+
+#elif defined(__bsd__)
+
+#include <net/if_dl.h>
+#include <netinet/if_ether.h>
+#include <sys/sysctl.h>
+
+#elif defined(__sun__) || defined(__solaris__) || defined(__hpux__)
+
+#define INSAP 22
+#define OUTSAP 24
+
+#include <ctype.h>
+#include <signal.h>
+#include <sys/dlpi.h>
+#include <sys/poll.h>
+#include <sys/stropts.h>
+
+#define bcopy(source, destination, length) memcpy(destination, source, length)
+
+#define AREA_SZ 5000 /* buffer length in bytes */
+static u_long ctl_area[AREA_SZ];
+static u_long dat_area[AREA_SZ];
+static struct strbuf ctl = { AREA_SZ, 0, (char*)ctl_area };
+static struct strbuf dat = { AREA_SZ, 0, (char*)dat_area };
+
+#define GOT_CTRL 1
+#define GOT_DATA 2
+#define GOT_BOTH 3
+#define GOT_INTR 4
+#define GOT_ERR 128
+
+#define u_int8_t uint8_t
+#define u_int16_t uint16_t
+#define u_int32_t uint32_t
+
+static int get_msg(int);
+static int check_ctrl(int);
+static int put_ctrl(int, int, int);
+static int put_both(int, int, int, int);
+static int dl_open(const char*, int, int*);
+static int dl_bind(int, int, u_char*);
+long mac_addr_dlpi(const char*, int, u_char*);
+
+#endif
+
+#define HAVE_GETOPT_H
+
+#define usage printf
+
+/**** Common definitions ****/
+
+#define STATE_OK 0
+#define STATE_WARNING 1
+#define STATE_CRITICAL 2
+#define STATE_UNKNOWN -1
+
+#define OK 0
+#define ERROR -1
+
+#define FALSE 0
+#define TRUE 1
+
+/**** DHCP definitions ****/
+
+#define MAX_DHCP_CHADDR_LENGTH 16
+#define MAX_DHCP_SNAME_LENGTH 64
+#define MAX_DHCP_FILE_LENGTH 128
+#define MAX_DHCP_OPTIONS_LENGTH 312
+
+typedef struct dhcp_packet_struct {
+    u_int8_t op;                                  /* packet type */
+    u_int8_t htype;                               /* type of hardware address for this machine (Ethernet, etc) */
+    u_int8_t hlen;                                /* length of hardware address (of this machine) */
+    u_int8_t hops;                                /* hops */
+    u_int32_t xid;                                /* random transaction id number - chosen by this machine */
+    u_int16_t secs;                               /* seconds used in timing */
+    u_int16_t flags;                              /* flags */
+    struct in_addr ciaddr;                        /* IP address of this machine (if we already have one) */
+    struct in_addr yiaddr;                        /* IP address of this machine (offered by the DHCP server) */
+    struct in_addr siaddr;                        /* IP address of DHCP server */
+    struct in_addr giaddr;                        /* IP address of DHCP relay */
+    unsigned char chaddr[MAX_DHCP_CHADDR_LENGTH]; /* hardware address of this machine */
+    char sname[MAX_DHCP_SNAME_LENGTH];            /* name of DHCP server */
+    char file[MAX_DHCP_FILE_LENGTH];              /* boot file name (used for diskless
+                                                     booting?) */
+    char options[MAX_DHCP_OPTIONS_LENGTH];        /* options */
+} dhcp_packet;
+
+typedef struct dhcp_offer_struct {
+    struct in_addr server_address;  /* address of DHCP server that sent this offer */
+    struct in_addr offered_address; /* the IP address that was offered to us */
+    struct in_addr netmask;
+    u_int32_t lease_time;           /* lease time in seconds */
+    u_int32_t renewal_time;         /* renewal time in seconds */
+    u_int32_t rebinding_time;       /* rebinding time in seconds */
+    struct dhcp_offer_struct* next;
+} dhcp_offer;
+
+typedef struct requested_server_struct {
+    struct in_addr server_address;
+    struct requested_server_struct* next;
+} requested_server;
+
+#define BOOTREQUEST 1
+#define BOOTREPLY 2
+
+#define DHCPDISCOVER 1
+#define DHCPOFFER 2
+#define DHCPREQUEST 3
+#define DHCPDECLINE 4
+#define DHCPACK 5
+#define DHCPNACK 6
+#define DHCPRELEASE 7
+
+#define DHCP_OPTION_MESSAGE_TYPE 53
+#define DHCP_OPTION_HOST_NAME 12
+#define DHCP_OPTION_BROADCAST_ADDRESS 28
+#define DHCP_OPTION_REQUESTED_ADDRESS 50
+#define DHCP_OPTION_LEASE_TIME 51
+#define DHCP_OPTION_NETMASK 1
+#define DHCP_OPTION_ROUTER 3
+#define DHCP_OPTION_DNS 6
+#define DHCP_OPTION_RENEWAL_TIME 58
+#define DHCP_OPTION_REBINDING_TIME 59
+
+#define DHCP_INFINITE_TIME 0xFFFFFFFF
+
+#define DHCP_BROADCAST_FLAG 32768
+
+#define DHCP_SERVER_PORT 67
+#define DHCP_CLIENT_PORT 68
+
+#define ETHERNET_HARDWARE_ADDRESS 1        /* used in htype field of dhcp packet */
+#define ETHERNET_HARDWARE_ADDRESS_LENGTH 6 /* length of Ethernet hardware addresses */
+
+unsigned char client_hardware_address[MAX_DHCP_CHADDR_LENGTH] = "";
+unsigned int my_client_mac[MAX_DHCP_CHADDR_LENGTH];
+int mymac = 0;
+
+struct in_addr banned_ip;
+int banned = 0;
+char baddr[16];
+
+char network_interface_name[16] = "eth0";
+
+u_int32_t packet_xid = 0;
+
+u_int32_t dhcp_lease_time = 0;
+u_int32_t dhcp_renewal_time = 0;
+u_int32_t dhcp_rebinding_time = 0;
+
+int dhcpoffer_timeout = 2;
+
+dhcp_offer* dhcp_offer_list = NULL;
+requested_server* requested_server_list = NULL;
+
+int valid_responses = 0; /* number of valid DHCPOFFERs we received */
+int requested_servers = 0;
+int requested_responses = 0;
+
+int request_specific_address = FALSE;
+int received_requested_address = FALSE;
+int verbose = 0;
+int prometheus = 0;
+struct in_addr requested_address;
+
+void print_revision(const char* progname, const char* revision) {
+    fprintf(stdout, "Program: %s %s\n", progname, revision);
+}
+
+int process_arguments(int, char**);
+int call_getopt(int, char**);
+int validate_arguments(void);
+void print_usage(void);
+void print_help(void);
+
+int get_hardware_address(int, char*);
+
+int send_dhcp_discover(int);
+int get_dhcp_offer(int);
+
+int get_results(void);
+
+int add_dhcp_offer(struct in_addr, dhcp_packet*);
+int free_dhcp_offer_list(void);
+int free_requested_server_list(void);
+
+int create_dhcp_socket(void);
+int close_dhcp_socket(int);
+int send_dhcp_packet(void*, int, int, struct sockaddr_in*);
+int receive_dhcp_packet(void*, int, int, int, struct sockaddr_in*);
+
+int main(int argc, char** argv)
+{
+    int dhcp_socket;
+    int result;
+
+    setlocale(LC_ALL, "");
+    // bindtextdomain (PACKAGE, LOCALEDIR);
+    // textdomain (PACKAGE);
+
+    if (process_arguments(argc, argv) != OK) {
+        printf("Could not parse arguments");
+    }
+
+    // Set banned addr in string format in global var baddr
+    if (banned) {
+        inet_ntop(AF_INET, &(banned_ip), baddr, INET_ADDRSTRLEN);
+        if (verbose)
+            fprintf(stdout, "Banned addr:%s\n", baddr);
+    }
+
+    /* create socket for DHCP communications */
+    dhcp_socket = create_dhcp_socket();
+
+    /* get hardware address of client machine */
+    get_hardware_address(dhcp_socket, network_interface_name);
+
+    /* send DHCPDISCOVER packet */
+    send_dhcp_discover(dhcp_socket);
+
+    /* wait for a DHCPOFFER packet */
+    get_dhcp_offer(dhcp_socket);
+
+    /* close socket we created */
+    close_dhcp_socket(dhcp_socket);
+
+    /* determine state/plugin output to return */
+    if (!prometheus) {
+        result = get_results();
+    }
+
+    /* free allocated memory */
+    free_dhcp_offer_list();
+    free_requested_server_list();
+
+    return result;
+}
+
+/* determines hardware address on client machine */
+int get_hardware_address(int sock, char* interface_name)
+{
+    int i;
+
+#if defined(__linux__)
+    struct ifreq ifr;
+
+    strncpy((char*)&ifr.ifr_name, interface_name, sizeof(ifr.ifr_name));
+
+    // Added code to try to set local MAC address just to be through
+    // If this fails the test will still work since
+    // we do encode the MAC as part of the DHCP frame - tests show it works
+    if (mymac) {
+        int i;
+        for (i = 0; i < MAX_DHCP_CHADDR_LENGTH; ++i)
+            client_hardware_address[i] = my_client_mac[i];
+        memcpy(&ifr.ifr_hwaddr.sa_data, &client_hardware_address[0], 6);
+        if (ioctl(sock, SIOCSIFHWADDR, &ifr) < 0) {
+            fprintf(stderr, "Could not set hardware address of interface '%s'\n",  interface_name);
+            // perror("Error");
+            // exit(STATE_UNKNOWN);
+        }
+    } else {
+        /* try and grab hardware address of requested interface */
+        if (ioctl(sock, SIOCGIFHWADDR, &ifr) < 0) {
+            fprintf(stderr, "Could not get hardware address of interface '%s'\n", interface_name);
+            exit(STATE_UNKNOWN);
+        }
+        memcpy(&client_hardware_address[0], &ifr.ifr_hwaddr.sa_data, 6);
+    }
+
+#elif defined(__bsd__)
+    /* King 2004	see ACKNOWLEDGEMENTS */
+
+    int mib[6], len;
+    char* buf;
+    unsigned char* ptr;
+    struct if_msghdr* ifm;
+    struct sockaddr_dl* sdl;
+
+    mib[0] = CTL_NET;
+    mib[1] = AF_ROUTE;
+    mib[2] = 0;
+    mib[3] = AF_LINK;
+    mib[4] = NET_RT_IFLIST;
+
+    if ((mib[5] = if_nametoindex(interface_name)) == 0) {
+        fprintf(stderr, "if_nametoindex error - %s.\n", strerror(errno);
+        exit(STATE_UNKNOWN);
+    }
+
+    if (sysctl(mib, 6, NULL, &len, NULL, 0) < 0) {
+        fprintf(stderr, "Couldn't get hardware address from %s. sysctl 1 error - %s.\n", interface_name, strerror(errno);
+        exit(STATE_UNKNOWN);
+    }
+
+    if ((buf = malloc(len)) == NULL) {
+        fprintf(stderr, "Couldn't get hardware address from interface %s. malloc error - %s.\n", interface_name, strerror(errno);
+        exit(4);
+    }
+
+    if (sysctl(mib, 6, buf, &len, NULL, 0) < 0) {
+        fprintf(stderr, "Couldn't get hardware address from %s. sysctl 2 error - %s.\n", interface_name, strerror(errno);
+        exit(STATE_UNKNOWN);
+    }
+
+    ifm = (struct if_msghdr*)buf;
+    sdl = (struct sockaddr_dl*)(ifm + 1);
+    ptr = (unsigned char*)LLADDR(sdl);
+    memcpy(&client_hardware_address[0], ptr, 6);
+    /* King 2004 */
+
+#elif defined(__sun__) || defined(__solaris__)
+
+    /* Kompf 2000-2003	see ACKNOWLEDGEMENTS */
+    long stat;
+    char dev[20] = "/dev/";
+    char* p;
+    int unit;
+
+    for (p = interface_name; *p && isalpha(*p); p++)
+        /* no-op */;
+    if (p != '\0') {
+        unit = atoi(p);
+        *p = '\0';
+        strncat(dev, interface_name, 6);
+    } else {
+        fprintf(stderr, "can't find unit number in interface_name (%s) - expecting "
+                "TypeNumber eg lnc0.\n", interface_name);
+        exit(STATE_UNKNOWN);
+    }
+    stat = mac_addr_dlpi(dev, unit, client_hardware_address);
+    if (stat != 0) {
+        fprintf(stderr, "can't read MAC address from DLPI streams interface for "
+                "device %s unit %d.\n", dev, unit);
+        exit(STATE_UNKNOWN);
+    }
+
+#elif defined(__hpux__)
+
+    long stat;
+    char dev[20] = "/dev/dlpi";
+    int unit = 0;
+
+    stat = mac_addr_dlpi(dev, unit, client_hardware_address);
+    if (stat != 0) {
+        fprintf(stderr, "can't read MAC address from DLPI streams interface for "
+               "device %s unit %d.\n", dev, unit);
+        exit(STATE_UNKNOWN);
+    }
+    /* Kompf 2000-2003 */
+
+#else
+    fprintf(stderr, "can't get MAC address for this architecture.\n");
+    exit(STATE_UNKNOWN);
+#endif
+
+    if (verbose) {
+        fprintf(stdout, "Hardware address: ");
+        for (i = 0; i < 6; ++i)
+          fprintf(stdout, "%2.2x", client_hardware_address[i]);
+        fprintf(stdout, "\n");
+    }
+
+    return OK;
+}
+
+/* sends a DHCPDISCOVER broadcast message in an attempt to find DHCP servers */
+int send_dhcp_discover(int sock)
+{
+    dhcp_packet discover_packet;
+    struct sockaddr_in sockaddr_broadcast;
+
+    /* clear the packet data structure */
+    bzero(&discover_packet, sizeof(discover_packet));
+
+    /* boot request flag (backward compatible with BOOTP servers) */
+    discover_packet.op = BOOTREQUEST;
+
+    /* hardware address type */
+    discover_packet.htype = ETHERNET_HARDWARE_ADDRESS;
+
+    /* length of our hardware address */
+    discover_packet.hlen = ETHERNET_HARDWARE_ADDRESS_LENGTH;
+
+    discover_packet.hops = 0;
+
+    /* transaction id is supposed to be random */
+    srand(time(NULL));
+    packet_xid = random();
+    discover_packet.xid = htonl(packet_xid);
+
+    /**** WHAT THE HECK IS UP WITH THIS?!?  IF I DON'T MAKE THIS CALL, ONLY ONE
+     * SERVER RESPONSE IS PROCESSED!!!! ****/
+    /* downright bizzarre... */
+    ntohl(discover_packet.xid);
+
+    /*discover_packet.secs=htons(65535);*/
+    discover_packet.secs = 0xFF;
+
+    /* tell server it should broadcast its response */
+    discover_packet.flags = htons(DHCP_BROADCAST_FLAG);
+
+    /* our hardware address */
+    memcpy(discover_packet.chaddr, client_hardware_address, ETHERNET_HARDWARE_ADDRESS_LENGTH);
+
+    /* first four bytes of options field is magic cookie (as per RFC 2132) */
+    discover_packet.options[0] = '\x63';
+    discover_packet.options[1] = '\x82';
+    discover_packet.options[2] = '\x53';
+    discover_packet.options[3] = '\x63';
+
+    /* DHCP message type is embedded in options field */
+    discover_packet.options[4] = DHCP_OPTION_MESSAGE_TYPE; /* DHCP message type option identifier */
+    discover_packet.options[5] = '\x01';                   /* DHCP message option length in bytes */
+    discover_packet.options[6] = DHCPDISCOVER;
+
+    /* the IP address we're requesting */
+    if (request_specific_address == TRUE) {
+        discover_packet.options[7] = DHCP_OPTION_REQUESTED_ADDRESS;
+        discover_packet.options[8] = '\x04';
+        memcpy(&discover_packet.options[9], &requested_address, sizeof(requested_address));
+    }
+
+    /* send the DHCPDISCOVER packet to broadcast address */
+    sockaddr_broadcast.sin_family = AF_INET;
+    sockaddr_broadcast.sin_port = htons(DHCP_SERVER_PORT);
+    sockaddr_broadcast.sin_addr.s_addr = INADDR_BROADCAST;
+    bzero(&sockaddr_broadcast.sin_zero, sizeof(sockaddr_broadcast.sin_zero));
+
+    if (verbose) {
+        fprintf(stdout, "DHCPDISCOVER to %s port %d\n",
+               inet_ntoa(sockaddr_broadcast.sin_addr),
+               ntohs(sockaddr_broadcast.sin_port));
+        fprintf(stdout, "DHCPDISCOVER XID: %lu (0x%X)\n",
+               (unsigned long)ntohl(discover_packet.xid),
+               ntohl(discover_packet.xid));
+        fprintf(stdout, "DHCDISCOVER ciaddr:  %s\n", inet_ntoa(discover_packet.ciaddr));
+        fprintf(stdout, "DHCDISCOVER yiaddr:  %s\n", inet_ntoa(discover_packet.yiaddr));
+        fprintf(stdout, "DHCDISCOVER siaddr:  %s\n", inet_ntoa(discover_packet.siaddr));
+        fprintf(stdout, "DHCDISCOVER giaddr:  %s\n", inet_ntoa(discover_packet.giaddr));
+    }
+
+    /* send the DHCPDISCOVER packet out */
+    send_dhcp_packet(&discover_packet, sizeof(discover_packet), sock, &sockaddr_broadcast);
+
+    if (verbose)
+    fprintf(stdout, "\n\n");
+
+  return OK;
+}
+
+/* waits for a DHCPOFFER message from one or more DHCP servers */
+int get_dhcp_offer(int sock)
+{
+    dhcp_packet offer_packet;
+    struct sockaddr_in source;
+    int result = OK;
+    int responses = 0;
+    int x;
+    time_t start_time;
+    time_t current_time;
+
+    time(&start_time);
+
+    /* receive as many responses as we can */
+    for (responses = 0, valid_responses = 0;!valid_responses;) {
+        time(&current_time);
+        if ((current_time - start_time) >= dhcpoffer_timeout)
+            break;
+
+        if (verbose)
+            fprintf(stdout, "\n\n");
+
+        bzero(&source, sizeof(source));
+        bzero(&offer_packet, sizeof(offer_packet));
+
+        result = OK;
+        result = receive_dhcp_packet(&offer_packet, sizeof(offer_packet), sock,
+                                     dhcpoffer_timeout, &source);
+
+        // checks if the source address is the banned one
+        char saddr[16];
+        inet_ntop(AF_INET, &(source.sin_addr), saddr, INET_ADDRSTRLEN);
+
+        if (banned && strcmp(saddr, baddr) == 0) {
+            if (verbose)
+                fprintf(stdout, "DHCP offer comming from the banned addr %s, ignoring it\n",
+                 baddr);
+          result = 1;
+        }
+
+        if (result != OK) {
+            if (verbose)
+                fprintf(stdout, "Result=ERROR\n");
+            continue;
+        } else {
+            if (verbose)
+                fprintf(stdout, "Result=OK\n");
+            responses++;
+        }
+
+        if (verbose) {
+            fprintf(stdout, "DHCPOFFER from IP address %s\n", inet_ntoa(source.sin_addr));
+            fprintf(stdout, "DHCPOFFER XID: %lu (0x%X)\n",
+                    (unsigned long)ntohl(offer_packet.xid), ntohl(offer_packet.xid));
+        }
+
+        /* check packet xid to see if its the same as the one we used in the
+         * discover packet */
+        if (ntohl(offer_packet.xid) != packet_xid) {
+            if (verbose)
+                fprintf(stdout, "DHCPOFFER XID (%lu) did not match DHCPDISCOVER XID (%lu) - "
+                        "ignoring packet\n",
+                        (unsigned long)ntohl(offer_packet.xid),
+                        (unsigned long)packet_xid);
+          continue;
+        }
+
+        /* check hardware address */
+        result = OK;
+        if (verbose)
+            fprintf(stdout, "DHCPOFFER chaddr: ");
+
+        for (x = 0; x < ETHERNET_HARDWARE_ADDRESS_LENGTH; x++) {
+            if (verbose)
+                fprintf(stdout, "%02X", (unsigned char)offer_packet.chaddr[x]);
+
+            if (offer_packet.chaddr[x] != client_hardware_address[x])
+                result = ERROR;
+        }
+
+        if (verbose)
+            fprintf(stdout, "\n");
+
+        if (result == ERROR) {
+            if (verbose)
+                fprintf(stdout, "DHCPOFFER hardware address did not match our own - ignoring "
+                        "packet\n");
+            continue;
+        }
+
+        if (verbose) {
+            fprintf(stdout, "DHCPOFFER ciaddr: %s\n", inet_ntoa(offer_packet.ciaddr));
+            fprintf(stdout, "DHCPOFFER yiaddr: %s\n", inet_ntoa(offer_packet.yiaddr));
+            fprintf(stdout, "DHCPOFFER siaddr: %s\n", inet_ntoa(offer_packet.siaddr));
+            fprintf(stdout, "DHCPOFFER giaddr: %s\n", inet_ntoa(offer_packet.giaddr));
+        }
+
+        add_dhcp_offer(source.sin_addr, &offer_packet);
+
+        valid_responses++;
+    }
+
+    if (verbose) {
+        fprintf(stdout, "Total responses seen on the wire: %d\n", responses);
+        fprintf(stdout, "Valid responses for this machine: %d\n", valid_responses);
+    }
+
+    return OK;
+}
+
+/* sends a DHCP packet */
+int send_dhcp_packet(void* buffer, int buffer_size, int sock, struct sockaddr_in* dest)
+{
+    int result;
+
+    result = sendto(sock, (char*)buffer, buffer_size, 0, (struct sockaddr*)dest, sizeof(*dest));
+
+    if (verbose)
+        fprintf(stdout, "send_dhcp_packet result: %d\n", result);
+
+    if (result < 0)
+        return ERROR;
+
+    return OK;
+}
+
+/* receives a DHCP packet */
+int receive_dhcp_packet(void* buffer, int buffer_size, int sock, int timeout, struct sockaddr_in* address)
+{
+    struct timeval tv;
+    fd_set readfds;
+    int recv_result;
+    socklen_t address_size;
+    struct sockaddr_in source_address;
+
+    /* wait for data to arrive (up time timeout) */
+    tv.tv_sec = timeout;
+    tv.tv_usec = 0;
+    FD_ZERO(&readfds);
+    FD_SET(sock, &readfds);
+    select(sock + 1, &readfds, NULL, NULL, &tv);
+
+    /* make sure some data has arrived */
+    if (!FD_ISSET(sock, &readfds)) {
+        if (verbose)
+            fprintf(stdout, "No (more) data received\n");
+        return ERROR;
+    }
+    else {
+        /* why do we need to peek first?  i don't know, its a hack.  without it, the
+           source address of the first packet received was not being interpreted
+           correctly.  sigh... */
+        bzero(&source_address, sizeof(source_address));
+        address_size = sizeof(source_address);
+        recv_result = recvfrom(sock, (char*)buffer, buffer_size, MSG_PEEK, (struct sockaddr*)&source_address, &address_size);
+
+        if (verbose)
+            fprintf(stdout, "recv_result_1: %d\n", recv_result);
+
+        recv_result = recvfrom(sock, (char *)buffer, buffer_size, 0,
+                              (struct sockaddr *)&source_address, &address_size);
+        if (verbose)
+            fprintf(stdout, "recv_result_2: %d\n", recv_result);
+
+        if (recv_result == -1) {
+            if (verbose) {
+                fprintf(stdout, "recvfrom() failed, ");
+                fprintf(stdout, "errno: (%d) -> %s\n", errno, strerror(errno));
+            }
+            return ERROR;
+        } else {
+            if (verbose) {
+                fprintf(stdout, "receive_dhcp_packet() result: %d\n", recv_result);
+                fprintf(stdout, "receive_dhcp_packet() source: %s\n",
+                inet_ntoa(source_address.sin_addr));
+            }
+
+            memcpy(address, &source_address, sizeof(source_address));
+            return OK;
+        }
+    }
+
+    return OK;
+}
+
+/* creates a socket for DHCP communication */
+int create_dhcp_socket(void)
+{
+    struct sockaddr_in myname;
+    struct ifreq interface;
+    int sock;
+    int flag = 1;
+
+    /* Set up the address we're going to bind to. */
+    bzero(&myname, sizeof(myname));
+    myname.sin_family = AF_INET;
+    myname.sin_port = htons(DHCP_CLIENT_PORT);
+    myname.sin_addr.s_addr = INADDR_ANY; /* listen on any address */
+    bzero(&myname.sin_zero, sizeof(myname.sin_zero));
+
+    /* create a socket for DHCP communications */
+    sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
+    if (sock < 0) {
+        fprintf(stderr, "Could not create socket!\n");
+        exit(STATE_UNKNOWN);
+    }
+
+    if (verbose)
+        fprintf(stdout, "DHCP socket: %d\n", sock);
+
+    /* set the reuse address flag so we don't get errors when restarting */
+    flag = 1;
+    if (setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char *)&flag, sizeof(flag)) < 0) {
+        fprintf(stderr, "Could not set reuse address option on DHCP socket!\n");
+        exit(STATE_UNKNOWN);
+    }
+
+    /* set the broadcast option - we need this to listen to DHCP broadcast
+    * messages */
+    if (setsockopt(sock, SOL_SOCKET, SO_BROADCAST, (char *)&flag, sizeof flag) < 0) {
+        fprintf(stderr, "Could not set broadcast option on DHCP socket!\n");
+        exit(STATE_UNKNOWN);
+    }
+
+    /* bind socket to interface */
+#if defined(__linux__)
+    strncpy(interface.ifr_ifrn.ifrn_name, network_interface_name, IFNAMSIZ);
+    if (setsockopt(sock, SOL_SOCKET, SO_BINDTODEVICE, (char *)&interface,
+                   sizeof(interface)) < 0) {
+        fprintf(stderr, "Could not bind socket to interface %s.  Check your "
+               "privileges...\n",
+               network_interface_name);
+        exit(STATE_UNKNOWN);
+    }
+#else
+    strncpy(interface.ifr_name, network_interface_name, IFNAMSIZ);
+#endif
+
+    /* bind the socket */
+    if (bind(sock, (struct sockaddr *)&myname, sizeof(myname)) < 0) {
+        fprintf(stderr, "Could not bind to DHCP socket (port %d)!  Check your "
+                "privileges...\n", DHCP_CLIENT_PORT);
+        exit(STATE_UNKNOWN);
+    }
+
+    return sock;
+}
+
+/* closes DHCP socket */
+int close_dhcp_socket(int sock)
+{
+    close(sock);
+    return OK;
+}
+
+/* adds a requested server address to list in memory */
+int add_requested_server(struct in_addr server_address)
+{
+    requested_server* new_server;
+
+    new_server = (requested_server*)malloc(sizeof(requested_server));
+    if (new_server == NULL)
+        return ERROR;
+
+    new_server->server_address = server_address;
+
+    new_server->next = requested_server_list;
+    requested_server_list = new_server;
+
+    requested_servers++;
+
+    if (verbose)
+        fprintf(stdout, "Requested server address: %s\n",
+                inet_ntoa(new_server->server_address));
+
+    return OK;
+}
+
+/* adds a DHCP OFFER to list in memory */
+int add_dhcp_offer(struct in_addr source, dhcp_packet* offer_packet)
+{
+    dhcp_offer* new_offer;
+    int x;
+    int y;
+    unsigned option_type;
+    unsigned option_length;
+    struct in_addr netmask; 
+    struct in_addr router; 
+    struct in_addr dns[2]={0};
+    int dnsindex=0;
+
+    if (offer_packet == NULL)
+        return ERROR;
+
+    /* process all DHCP options present in the packet */
+    for (x = 4; x < MAX_DHCP_OPTIONS_LENGTH;) {
+
+        /* end of options (0 is really just a pad, but bail out anyway) */
+        if ((int)offer_packet->options[x] == -1 || (int)offer_packet->options[x] == 0)
+            break;
+
+        /* get option type */
+        option_type = offer_packet->options[x++];
+
+        /* get option length */
+        option_length = offer_packet->options[x++];
+
+        if (verbose)
+            fprintf(stdout, "Option: %d (0x%02X)\n", option_type, option_length);
+
+        /* get option data */
+        if (option_type == DHCP_OPTION_LEASE_TIME) {
+            memcpy(&dhcp_lease_time, &offer_packet->options[x], sizeof(dhcp_lease_time));
+            dhcp_lease_time = ntohl(dhcp_lease_time);
+        }
+        else if (option_type == DHCP_OPTION_NETMASK) {
+            memcpy(&netmask, &offer_packet->options[x], 4);
+        }
+        else if (option_type == DHCP_OPTION_ROUTER) {
+            memcpy(&router, &offer_packet->options[x], 4);
+        }
+        else if (option_type == DHCP_OPTION_DNS) {
+            memcpy(&dns[0], &offer_packet->options[x], 4);
+            if(option_length == 8)
+                memcpy(&dns[1], &offer_packet->options[x+4], 4);
+        }
+
+        x = x+option_length;
+    }
+
+    if (verbose) {
+        if (dhcp_lease_time == DHCP_INFINITE_TIME)
+            fprintf(stdout, "Lease Time: Infinite\n");
+        else
+            fprintf(stdout, "Lease Time: %lu seconds\n", (unsigned long)dhcp_lease_time);
+        if (dhcp_renewal_time == DHCP_INFINITE_TIME)
+            fprintf(stdout, "Renewal Time: Infinite\n");
+        else
+            fprintf(stdout, "Renewal Time: %lu seconds\n", (unsigned long)dhcp_renewal_time);
+        if (dhcp_rebinding_time == DHCP_INFINITE_TIME)
+            fprintf(stdout, "Rebinding Time: Infinite\n");
+        fprintf(stdout, "Rebinding Time: %lu seconds\n", (unsigned long)dhcp_rebinding_time);
+    }
+
+    new_offer = (dhcp_offer*)malloc(sizeof(dhcp_offer));
+
+    if (new_offer == NULL)
+        return ERROR;
+
+    new_offer->server_address = source;
+    new_offer->offered_address = offer_packet->yiaddr;
+    new_offer->lease_time = dhcp_lease_time;
+    new_offer->renewal_time = dhcp_renewal_time;
+    new_offer->rebinding_time = dhcp_rebinding_time;
+    memcpy(&new_offer->netmask,&netmask, 4);
+
+    if (verbose) {
+        fprintf(stdout, "Added offer from server @ %s",
+                inet_ntoa(new_offer->server_address));
+        fprintf(stdout, " of IP address %s\n", inet_ntoa(new_offer->offered_address));
+    }
+
+
+    if (prometheus) {
+        fprintf(stdout, "yiaddr: %s\n", inet_ntoa(new_offer->offered_address));
+        fprintf(stdout, "giaddr: %s\n", inet_ntoa(new_offer->server_address)); 
+        fprintf(stdout, "netmask: %s\n", inet_ntoa(new_offer->netmask)); 
+        fprintf(stdout, "router: %s\n", inet_ntoa(router)); 
+        fprintf(stdout, "dns1: %s\n", inet_ntoa(dns[0])); 
+        fprintf(stdout, "dns2: %s\n", inet_ntoa(dns[1]));
+        fprintf(stdout, "LeaseTime: %lu\n", (unsigned long)new_offer->lease_time); 
+        fprintf(stdout, "dev: %s\n", network_interface_name);
+    }
+
+    /* add new offer to head of list */
+    new_offer->next = dhcp_offer_list;
+    dhcp_offer_list = new_offer;
+
+    return OK;
+}
+
+/* frees memory allocated to DHCP OFFER list */
+int free_dhcp_offer_list(void)
+{
+    dhcp_offer* this_offer;
+    dhcp_offer* next_offer;
+
+    for (this_offer = dhcp_offer_list; this_offer != NULL; this_offer = next_offer) {
+        next_offer = this_offer->next;
+        free(this_offer);
+    }
+
+    return OK;
+}
+
+/* frees memory allocated to requested server list */
+int free_requested_server_list(void)
+{
+    requested_server* this_server;
+    requested_server* next_server;
+
+    for (this_server = requested_server_list; this_server != NULL; this_server = next_server) {
+        next_server = this_server->next;
+        free(this_server);
+    }
+
+    return OK;
+}
+
+/* gets state and plugin output to return */
+int get_results(void)
+{
+    dhcp_offer* temp_offer;
+    requested_server* temp_server;
+    int result;
+    u_int32_t max_lease_time = 0;
+
+    received_requested_address = FALSE;
+
+    /* checks responses from requested servers */
+    requested_responses = 0;
+    if (requested_servers > 0) {
+
+        for (temp_server = requested_server_list; temp_server != NULL; temp_server = temp_server->next) {
+
+            for (temp_offer = dhcp_offer_list; temp_offer != NULL; temp_offer = temp_offer->next) {
+
+                /* get max lease time we were offered */
+                if (temp_offer->lease_time > max_lease_time || temp_offer->lease_time == DHCP_INFINITE_TIME)
+                    max_lease_time = temp_offer->lease_time;
+
+                /* see if we got the address we requested */
+                if (!memcmp(&requested_address, &temp_offer->offered_address, sizeof(requested_address)))
+                    received_requested_address = TRUE;
+
+                /* see if the servers we wanted a response from talked to us or not */
+                if (!memcmp(&temp_offer->server_address, &temp_server->server_address, sizeof(temp_server->server_address))) {
+                    if (verbose) {
+                        fprintf(stdout, "DHCP Server Match: Offerer=%s",
+                                inet_ntoa(temp_offer->server_address));
+                        fprintf(stdout, " Requested=%s\n", inet_ntoa(temp_server->server_address));
+                    }
+                    requested_responses++;
+                }
+            }
+        }
+    }
+
+    /* else check and see if we got our requested address from any server */
+    else {
+        for (temp_offer = dhcp_offer_list; temp_offer != NULL; temp_offer = temp_offer->next) {
+
+            /* get max lease time we were offered */
+            if (temp_offer->lease_time > max_lease_time || temp_offer->lease_time == DHCP_INFINITE_TIME)
+                max_lease_time = temp_offer->lease_time;
+
+            /* see if we got the address we requested */
+            if (!memcmp(&requested_address, &temp_offer->offered_address, sizeof(requested_address)))
+                received_requested_address = TRUE;
+        }
+    }
+
+    result = STATE_OK;
+    if (valid_responses == 0)
+        result = STATE_CRITICAL;
+    else if (requested_servers > 0 && requested_responses == 0)
+        result = STATE_CRITICAL;
+    else if (requested_responses < requested_servers)
+        result = STATE_WARNING;
+    else if (request_specific_address == TRUE && received_requested_address == FALSE)
+        result = STATE_WARNING;
+
+    fprintf(stdout, "DHCP %s: ", (result == STATE_OK) ? "ok" : "problem");
+
+    /* we didn't receive any DHCPOFFERs */
+    if (dhcp_offer_list == NULL) {
+        fprintf(stdout, "No DHCPOFFERs were received.\n");
+        return result;
+    }
+
+    fprintf(stdout, "Received %d DHCPOFFER(s)", valid_responses);
+
+    if (requested_servers > 0)
+        fprintf(stdout, ", %s%d of %d requested servers responded",
+                ((requested_responses < requested_servers) && requested_responses > 0)
+                ? "only " : "",
+                requested_responses, requested_servers);
+
+    if (request_specific_address == TRUE)
+        fprintf(stdout, ", requested address (%s) was %soffered",
+                inet_ntoa(requested_address),
+                (received_requested_address == TRUE) ? "" : "not ");
+
+    fprintf(stdout, ", max lease time = ");
+    if (max_lease_time == DHCP_INFINITE_TIME)
+        fprintf(stdout, "Infinity");
+    else
+        fprintf(stdout, "%lu sec", (unsigned long)max_lease_time);
+
+    fprintf(stdout, ".\n");
+
+    return result;
+}
+
+/* process command-line arguments */
+int process_arguments(int argc, char** argv)
+{
+    int c;
+
+    if (argc < 1)
+        return ERROR;
+
+    c = 0;
+    while ((c += (call_getopt(argc - c, &argv[c]))) < argc) {
+        /*
+        if(is_option(argv[c]))
+                continue;
+        */
+    }
+
+    return validate_arguments();
+}
+
+int call_getopt(int argc, char** argv)
+{
+    int c = 0;
+    int i = 0;
+    struct in_addr ipaddress;
+
+#ifdef HAVE_GETOPT_H
+    int option_index = 0;
+    int ret;
+    static struct option long_options[] = { { "serverip", required_argument, 0, 's' }, { "requestedip", required_argument, 0, 'r' }, { "timeout", required_argument, 0, 't' }, { "interface", required_argument, 0, 'i' }, { "mac", required_argument, 0, 'm' }, { "bannedip", required_argument, 0, 'b' }, { "verbose", no_argument, 0, 'v' }, { "prometheus", no_argument, 0, 'p' }, { "version", no_argument, 0, 'V' }, { "help", no_argument, 0, 'h' }, { 0, 0, 0, 0 } };
+#endif
+
+    while (1) {
+#ifdef HAVE_GETOPT_H
+        c = getopt_long(argc, argv, "+hVvpt:s:r:t:i:m:b:", long_options, &option_index);
+#else
+        c = getopt(argc, argv, "+?hVvpt:s:r:t:i:m:b:");
+#endif
+
+        i++;
+
+        if (c == -1 || c == EOF || c == 1)
+            break;
+
+        switch (c) {
+        case 'w':
+        case 'r':
+        case 't':
+        case 'i':
+            i++;
+            break;
+        default:
+            break;
+        }
+
+        switch (c) {
+
+        case 'm': /* Our MAC address */
+        {
+            ret = sscanf(optarg, "%x:%x:%x:%x:%x:%x", my_client_mac + 0, my_client_mac + 1, my_client_mac + 2, my_client_mac + 3, my_client_mac + 4, my_client_mac + 5);
+            if (ret != 6) {
+                usage("Invalid MAC address\n");
+                break;
+            }
+            for (i = 0; i < 6; ++i)
+                client_hardware_address[i] = my_client_mac[i];
+        }
+            mymac = 1;
+            break;
+        case 'b': /* Banned IP */
+            if (inet_aton(optarg, &ipaddress)) {
+                banned_ip = ipaddress;
+                banned = 1;
+            } else
+                fprintf(stdout, "Banned IP not specified, ignoring -b");
+            break;
+
+        case 's': /* DHCP server address */
+            if (inet_aton(optarg, &ipaddress))
+                add_requested_server(ipaddress);
+            /*
+            else
+                  usage("Invalid server IP address\n");
+            */
+            break;
+
+        case 'r': /* address we are requested from DHCP servers */
+            if (inet_aton(optarg, &ipaddress)) {
+                requested_address = ipaddress;
+                request_specific_address = TRUE;
+            }
+            /*
+            else
+                  usage("Invalid requested IP address\n");
+            */
+            break;
+
+        case 't': /* timeout */
+            /*
+            if(is_intnonneg(optarg))
+            */
+            if (atoi(optarg) > 0)
+                dhcpoffer_timeout = atoi(optarg);
+            /*
+            else
+                  usage("Time interval must be a nonnegative integer\n");
+            */
+            break;
+
+        case 'i': /* interface name */
+          strncpy(network_interface_name, optarg,
+                  sizeof(network_interface_name) - 1);
+                  network_interface_name[sizeof(network_interface_name) - 1] = '\x0';
+          break;
+
+        case 'V': /* version */
+            print_revision(progname, revision);
+            exit(STATE_OK);
+
+        case 'h': /* help */
+            print_help();
+            exit(STATE_OK);
+
+        case 'v': /* verbose */
+            verbose = 1;
+            break;
+
+        case 'p': /* prometheus */
+            prometheus = 1;
+            break;
+
+        default: /* help */
+            fprintf(stdout, "Unknown argument: %s", optarg);
+            break;
+        }
+    }
+
+    return i;
+}
+
+int validate_arguments(void) { return OK; }
+
+#if defined(__sun__) || defined(__solaris__) || defined(__hpux__)
+
+/* Kompf 2000-2003	see ACKNOWLEDGEMENTS */
+
+/* get a message from a stream; return type of message */
+static int get_msg(int fd)
+{
+    int flags = 0;
+    int res, ret;
+    ctl_area[0] = 0;
+    dat_area[0] = 0;
+    ret = 0;
+    res = getmsg(fd, &ctl, &dat, &flags);
+
+    if (res < 0) {
+        if (errno == EINTR) {
+            return (GOT_INTR);
+        } else {
+            fprintf(stdout, "%s\n", "get_msg FAILED.");
+            return (GOT_ERR);
+        }
+    }
+    if (ctl.len > 0) {
+        ret |= GOT_CTRL;
+    }
+    if (dat.len > 0) {
+        ret |= GOT_DATA;
+    }
+    return (ret);
+}
+
+/* verify that dl_primitive in ctl_area = prim */
+static int check_ctrl(int prim)
+{
+    dl_error_ack_t* err_ack = (dl_error_ack_t*)ctl_area;
+    if (err_ack->dl_primitive != prim) {
+        fprintf(stderr, "DLPI stream API failed to get MAC in check_ctrl: %s.\n", strerror(errno);
+        exit(STATE_UNKNOWN);
+    }
+    return 0;
+}
+
+/* put a control message on a stream */
+static int put_ctrl(int fd, int len, int pri)
+{
+    ctl.len = len;
+    if (putmsg(fd, &ctl, 0, pri) < 0) {
+        fprintf(stderr, "DLPI stream API failed to get MAC in put_ctrl/putmsg(): %s.\n", strerror(errno);
+        exit(STATE_UNKNOWN);
+    }
+    return 0;
+}
+
+/* put a control + data message on a stream */
+static int put_both(int fd, int clen, int dlen, int pri)
+{
+    ctl.len = clen;
+    dat.len = dlen;
+    if (putmsg(fd, &ctl, &dat, pri) < 0) {
+        fprintf(stderr, "DLPI stream API failed to get MAC in put_both/putmsg().\n", strerror(errno);
+        exit(STATE_UNKNOWN);
+    }
+    return 0;
+}
+
+/* open file descriptor and attach */
+static int dl_open(const char* dev, int unit, int* fd)
+{
+    dl_attach_req_t* attach_req = (dl_attach_req_t*)ctl_area;
+    if ((*fd = open(dev, O_RDWR)) == -1) {
+        fprintf(stderr, "DLPI stream API failed to get MAC in dl_attach_req/open(%s..): %s.\n", dev, strerror(errno);
+        exit(STATE_UNKNOWN);
+    }
+    attach_req->dl_primitive = DL_ATTACH_REQ;
+    attach_req->dl_ppa = unit;
+    put_ctrl(*fd, sizeof(dl_attach_req_t), 0);
+    get_msg(*fd);
+    return check_ctrl(DL_OK_ACK);
+}
+
+/* send DL_BIND_REQ */
+static int dl_bind(int fd, int sap, u_char* addr)
+{
+    dl_bind_req_t* bind_req = (dl_bind_req_t*)ctl_area;
+    dl_bind_ack_t* bind_ack = (dl_bind_ack_t*)ctl_area;
+    bind_req->dl_primitive = DL_BIND_REQ;
+    bind_req->dl_sap = sap;
+    bind_req->dl_max_conind = 1;
+    bind_req->dl_service_mode = DL_CLDLS;
+    bind_req->dl_conn_mgmt = 0;
+    bind_req->dl_xidtest_flg = 0;
+    put_ctrl(fd, sizeof(dl_bind_req_t), 0);
+    get_msg(fd);
+    if (GOT_ERR == check_ctrl(DL_BIND_ACK)) {
+        fprintf(stderr, "DLPI stream API failed to get MAC in dl_bind/check_ctrl(): %s.\n", strerror(errno);
+        exit(STATE_UNKNOWN);
+    }
+    bcopy((u_char*)bind_ack + bind_ack->dl_addr_offset, addr, bind_ack->dl_addr_length);
+    return 0;
+}
+
+/***********************************************************************
+ * interface:
+ * function mac_addr_dlpi - get the mac address of the interface with
+ *                          type dev (eg lnc, hme) and unit (0, 1 ..)
+ *
+ * parameter: addr: an array of six bytes, has to be allocated by the caller
+ *
+ * return: 0 if OK, -1 if the address could not be determined
+ *
+ *
+ ***********************************************************************/
+
+long mac_addr_dlpi(const char* dev, int unit, u_char* addr)
+{
+    int fd;
+    u_char mac_addr[25];
+
+    if (GOT_ERR != dl_open(dev, unit, &fd)) {
+        if (GOT_ERR != dl_bind(fd, INSAP, mac_addr)) {
+            bcopy(mac_addr, addr, 6);
+            return 0;
+        }
+    }
+    close(fd);
+    return -1;
+}
+
+/* Kompf 2000-2003 */
+
+#endif
+
+/* print usage help */
+void print_help(void)
+{
+
+    print_revision(progname, revision);
+
+    fprintf(stdout, COPYRIGHT, copyright, email);
+
+    fprintf(stdout, "\n\nThis program checks the existence and more details of a DHCP "
+            "server\n\n");
+
+    print_usage();
+
+  fprintf(stdout, "\
+ -s, --serverip=IPADDRESS\n\
+   IP address of DHCP server that we must hear from\n\
+ -r, --requestedip=IPADDRESS\n\
+   IP address that should be offered by at least one DHCP server\n\
+ -m, --mac=MACADDRESS\n\
+   Client MAC address to use for sending packets\n\
+ -b, --bannedip=IPADDRESS\n\
+   Server IP address to ignore\n\
+ -t, --timeout=INTEGER\n\
+   Seconds to wait for DHCPOFFER before timeout occurs\n\
+ -i, --interface=STRING\n\
+   Interface to to use for listening (i.e. eth0)\n\
+ -v, --verbose\n\
+   Print extra information (command-line use only)\n\
+ -o, --output\n\
+   Print dhcp result\n\
+ -p, --prometheus\n\
+   Print extra information in prometheus format\n\
+ -h, --help\n\
+   Print detailed help screen\n\
+ -V, --version\n\
+   Print version information\n\n\
+Example: sudo ./dhcpdiscover -i eth0 -b 192.168.1.1\n\
+");
+}
+
+void print_usage(void)
+{
+    fprintf(stdout, "\
+Usage: %s [-s serverip] [-r requestedip] [-m clientmac ] [-b bannedip] [-t timeout] [-i interface]\n\
+                  [-v] [-p]", progname);
+}
diff --git a/dnscrypt-proxy/Config.in b/dnscrypt-proxy/Config.in
new file mode 100755
index 00000000..50d09af4
--- /dev/null
+++ b/dnscrypt-proxy/Config.in
@@ -0,0 +1,8 @@
+menu "Configuration"
+	depends on PACKAGE_dnscrypt-proxy
+
+config DNSCRYPT_ENABLE_PLUGINS
+	bool "Enable plugin support (includes libldns and plugins, increases size by 125kB)"
+	default n
+
+endmenu
diff --git a/dnscrypt-proxy/Makefile b/dnscrypt-proxy/Makefile
new file mode 100644
index 00000000..32a7c00e
--- /dev/null
+++ b/dnscrypt-proxy/Makefile
@@ -0,0 +1,129 @@
+#
+# Copyright (C) 2018 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dnscrypt-proxy
+PKG_SOURCE_DATE:=2018-11-22
+PKG_SOURCE_VERSION:=f61ca76a852cf56e399a458f9e002886b1b049f0
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/dyne/dnscrypt-proxy
+PKG_MIRROR_HASH:=1de8d9913aea4528920dbc6fcd4769a7ab70f7c1c73abba39e68e07376cbb395
+
+PKG_MAINTAINER:=Damiano Renfer <damiano.renfer@gmail.com>
+PKG_LICENSE:=ISC
+PKG_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_DNSCRYPT_ENABLE_PLUGINS
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/dnscrypt-proxy/Default
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=IP Addresses and Names
+  URL:=https://github.com/dyne/dnscrypt-proxy
+endef
+
+define Package/dnscrypt-proxy
+  $(call Package/dnscrypt-proxy/Default)
+  DEPENDS:=+libsodium +dnscrypt-proxy-resolvers +DNSCRYPT_ENABLE_PLUGINS:libltdl \
+	+DNSCRYPT_ENABLE_PLUGINS:libldns
+  TITLE:=A tool for securing communications between a client and a DNS resolver
+endef
+
+define Package/dnscrypt-proxy/description
+  dnscrypt-proxy provides local service which can be used directly as your
+  local resolver or as a DNS forwarder, encrypting and authenticating requests
+  using the DNSCrypt protocol and passing them to an upstream server.
+  The DNSCrypt protocol uses high-speed high-security elliptic-curve cryptography
+  and is very similar to DNSCurve, but focuses on securing communications between
+  a client and its first-level resolver.
+endef
+
+define Package/dnscrypt-proxy-resolvers
+  $(call Package/dnscrypt-proxy/Default)
+  TITLE:=Package with current list of dnscrypt-proxy resolvers
+endef
+
+define Package/dnscrypt-proxy-resolvers/description
+  Package with current list of dnscrypt-proxy resolvers.
+endef
+
+define Package/hostip
+  $(call Package/dnscrypt-proxy/Default)
+  DEPENDS:=+libsodium
+  TITLE:=Resolver to IPv4 or IPv6 addresses
+endef
+
+define Package/hostip/description
+  The DNSCrypt proxy ships with a simple tool named hostip that resolves a name
+  to IPv4 or IPv6 addresses.
+endef
+
+define Package/dnscrypt-proxy/config
+	source "$(SOURCE)/Config.in"
+endef
+
+define Build/Configure
+	$(call Build/Configure/Default, \
+	--prefix=/usr \
+	--disable-ssp \
+	$(if $(CONFIG_DNSCRYPT_ENABLE_PLUGINS),,--disable-plugins) \
+	)
+endef
+
+TARGET_CFLAGS += \
+	-fomit-frame-pointer \
+	-fdata-sections \
+	-ffunction-sections
+
+TARGET_LDFLAGS += \
+	-Wl,-gc-sections
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)"
+
+define Package/dnscrypt-proxy/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/dnscrypt-proxy $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/dnscrypt-proxy.init $(1)/etc/init.d/dnscrypt-proxy
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/dnscrypt-proxy.config $(1)/etc/config/dnscrypt-proxy
+	$(if $(CONFIG_DNSCRYPT_ENABLE_PLUGINS), \
+		$(INSTALL_DIR) $(1)/usr/lib/dnscrypt-proxy; \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/dnscrypt-proxy/libdcplugin_example_cache.so $(1)/usr/lib/dnscrypt-proxy/; \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/dnscrypt-proxy/libdcplugin_example_ldns_aaaa_blocking.so $(1)/usr/lib/dnscrypt-proxy/; \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/dnscrypt-proxy/libdcplugin_example_ldns_blocking.so $(1)/usr/lib/dnscrypt-proxy/; \
+		$(CP) $(PKG_INSTALL_DIR)/usr/lib/dnscrypt-proxy/libdcplugin_example_logging.so $(1)/usr/lib/dnscrypt-proxy/)
+endef
+
+define Package/dnscrypt-proxy-resolvers/install
+	$(INSTALL_DIR) $(1)/usr/share/dnscrypt-proxy
+	$(CP) ./files/dnscrypt-resolvers.csv $(1)/usr/share/dnscrypt-proxy/
+endef
+
+define Package/dnscrypt-proxy/conffiles
+/etc/config/dnscrypt-proxy
+endef
+
+define Package/hostip/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_INSTALL_DIR)/usr/bin/hostip $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,dnscrypt-proxy))
+$(eval $(call BuildPackage,dnscrypt-proxy-resolvers))
+$(eval $(call BuildPackage,hostip))
diff --git a/dnscrypt-proxy/files/dnscrypt-proxy.config b/dnscrypt-proxy/files/dnscrypt-proxy.config
new file mode 100644
index 00000000..94b9bbee
--- /dev/null
+++ b/dnscrypt-proxy/files/dnscrypt-proxy.config
@@ -0,0 +1,36 @@
+config global
+	# start dnscrypt-proxy from procd interface trigger rather than immediately in init
+	# if needed you can restrict trigger to certain interface(s)
+	# list procd_trigger 'wan'
+	# list procd_trigger 'wan6'
+	option enable '0'
+
+config dnscrypt-proxy ns1
+	option address '127.0.0.1'
+	option port '5353'
+	option resolver 'fvz-anyone'
+	# more details about the following options can be found in:
+	#    https://github.com/dyne/dnscrypt-proxy/blob/master/dnscrypt-proxy.conf
+	# option resolvers_list '/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv'
+	# ephemeral keys option requires extra CPU cycles and can cause huge system load
+	# option ephemeral_keys '0'
+	# option client_key '/path/to/client_key'
+	# option log_level '6'
+	# option syslog '1'
+	# option syslog_prefix 'dnscrypt-proxy'
+	# option query_log_file '/path/to/logfile'
+	# enable cache may speed up dnscrypt-proxy
+	# option local_cache '0'
+	# disable IPv6 may also speed up dnscrypt-proxy
+	# option block_ipv6 '0'
+	# Blacklists allow you to block domains, ip, ...
+	# list blacklist 'domains:/path/to/domains-blacklist-file.txt'
+	# list blacklist 'domains:/path/to/domains-blacklist2-file.txt'
+
+#	config dnscrypt-proxy ns2
+#		option address '127.0.0.1'
+#		option port '5454'
+#		# option resolver 'd0wn-random-ns1'
+#		# option resolvers_list '/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv'
+#		# option ephemeral_keys '0'
+#		# option client_key ''
diff --git a/dnscrypt-proxy/files/dnscrypt-proxy.init b/dnscrypt-proxy/files/dnscrypt-proxy.init
new file mode 100644
index 00000000..53391511
--- /dev/null
+++ b/dnscrypt-proxy/files/dnscrypt-proxy.init
@@ -0,0 +1,168 @@
+#!/bin/sh /etc/rc.common
+
+START=30
+USE_PROCD=1
+PROG=/usr/sbin/dnscrypt-proxy
+CONFIG_DIR=/var/etc
+USER=nobody
+
+boot() {
+    dnscrypt_boot=1
+    rc_procd start_service
+}
+
+dnscrypt_instance() {
+    local config_path="$CONFIG_DIR/dnscrypt-proxy-$1.conf"
+    create_config_file $1 "$config_path"
+
+    procd_open_instance
+    procd_set_param command $PROG "$config_path"
+    procd_close_instance
+}
+
+create_config_file() {
+    local address port resolver resolvers_list ephemeral_keys client_key log_level syslog syslog_prefix local_cache query_log_file block_ipv6 provider_name provider_key resolver_address
+    local config_path="$2"
+    local plugins_support_enabled=$(dnscrypt-proxy --version | grep 'Support for plugins: present' | wc -l)
+
+    [ ! -d "$CONFIG_DIR" ] && mkdir -p "$CONFIG_DIR"
+    [ -f "$config_path" ] && rm "$config_path"
+
+    config_get      address         $1 'address'        '127.0.0.1'
+    config_get      port            $1 'port'           '5353'
+    config_get      resolver        $1 'resolver'       ''
+    config_get      provider_name   $1 'providername'   ''
+    config_get      provider_key    $1 'providerkey'    ''
+    config_get      resolver_address $1 'resolveraddress'    ''
+    config_get      resolvers_list  $1 'resolvers_list' '/usr/share/dnscrypt-proxy/dnscrypt-resolvers.csv'
+    config_get      client_key      $1 'client_key'     ''
+    config_get      syslog_prefix   $1 'syslog_prefix'  'dnscrypt-proxy'
+    config_get      query_log_file  $1 'query_log_file' ''
+    config_get      log_level       $1 'log_level'      '6'
+    config_get      blacklist       $1 'blacklist'      ''
+    config_get_bool syslog          $1 'syslog'         '1'
+    config_get_bool ephemeral_keys  $1 'ephemeral_keys' '0'
+    config_get_bool local_cache     $1 'local_cache'    '0'
+    config_get_bool block_ipv6      $1 'block_ipv6'     '0'
+
+    append_param_not_empty  "ResolverName"  "$resolver"         $config_path
+    append_param            "ResolversList" "$resolvers_list"   $config_path
+    append_param_not_empty  "ProviderName"  "$provider_name"    $config_path
+    append_param_not_empty  "ProviderKey"   "$provider_key"     $config_path
+    append_param_not_empty  "ResolverAddress" "$resolver_address" $config_path
+    append_param            "User"          "$USER"             $config_path
+    append_param            "LocalAddress"  "$address:$port"    $config_path
+    append_param_not_empty  "ClientKey"     "$client_key"       $config_path
+    append_on_off           "EphemeralKeys" $ephemeral_keys     $config_path
+    append_param            "LogLevel"      "$log_level"        $config_path
+    append_on_off           "Syslog"        $syslog             $config_path
+    append_param            "SyslogPrefix"  "$syslog_prefix"    $config_path
+    append_on_off           "LocalCache"    $local_cache        $config_path
+    append_param_not_empty  "QueryLogFile"  "$query_log_file"   $config_path
+
+    if [ $plugins_support_enabled -ne 0 ] && [ $block_ipv6 -ne 0 ]
+    then
+        append_yes_no "BlockIPv6" $block_ipv6 $config_path
+    elif [ $block_ipv6 -ne 0 ]
+    then
+        log_ignored_param "block_ipv6"
+    fi
+
+    if [ $plugins_support_enabled -ne 0 ] && [ -n "$blacklist" ]
+    then
+        config_list_foreach $1 'blacklist' append_blacklists $config_path
+    elif [ -n "$blacklist" ]
+    then
+        log_ignored_param "blacklist"
+    fi
+}
+
+log_ignored_param() {
+    local param_name=$1
+    logger -t dnscrypt-proxy -p user.warn "dnscrypt-proxy plugins support not present, ignoring '$param_name' parameter."
+}
+
+append_on_off() {
+    local param_name=$1
+    local param_value=$2
+    local config_path=$3
+    local value
+
+    if [ $param_value -eq 1 ]
+    then
+        value="on"
+    else
+        value="off"
+    fi
+
+    echo "$param_name $value" >> $config_path
+}
+
+append_yes_no() {
+    local param_name=$1
+    local param_value=$2
+    local config_path=$3
+    local value
+
+    if [ $param_value -eq 1 ]
+    then
+        value="yes"
+    else
+        value="no"
+    fi
+
+    echo "$param_name $value" >> $config_path
+}
+
+append_param() {
+    local param_name=$1
+    local param_value=$2
+    local config_path=$3
+	
+    echo "$param_name $param_value" >> $config_path
+}
+
+append_param_not_empty() {
+    local param_name=$1
+    local param_value=$2
+    local config_path=$3
+
+    if [ ! -z "$param_value" -a "$param_value" != " " ]
+    then
+        append_param "$param_name" "$param_value" "$config_path"
+    fi
+}
+
+append_blacklists() {
+    local value="$1"
+    local config_path="$2"
+    append_param_not_empty "BlackList" "$value" $config_path
+}
+
+start_service() {
+    if [ -n "${dnscrypt_boot}" ]
+    then
+        return 0
+    fi
+    local enable="$(uci_get dnscrypt-proxy.@global[0].enable)"
+    [ "$enable" = 1 ] || return 0
+    config_load dnscrypt-proxy
+    config_foreach dnscrypt_instance dnscrypt-proxy
+}
+
+service_triggers() {
+    local trigger
+    local triggerlist="$(uci_get dnscrypt-proxy.@global[0].procd_trigger)"
+
+    PROCD_RELOAD_DELAY=2000
+    if [ -n "${triggerlist}" ]
+    then
+        for trigger in ${triggerlist}
+        do
+            procd_add_interface_trigger "interface.*.up" "${trigger}" /etc/init.d/dnscrypt-proxy reload
+        done
+    else
+        procd_add_raw_trigger "interface.*.up" 2000 /etc/init.d/dnscrypt-proxy reload
+    fi
+    procd_add_reload_trigger 'dnscrypt-proxy'
+}
diff --git a/dnscrypt-proxy/files/dnscrypt-resolvers.csv b/dnscrypt-proxy/files/dnscrypt-resolvers.csv
new file mode 100644
index 00000000..e2cf7b13
--- /dev/null
+++ b/dnscrypt-proxy/files/dnscrypt-resolvers.csv
@@ -0,0 +1,107 @@
+Name,"Full name","Description","Location","Coordinates",URL,Version,DNSSEC validation,No logs,Namecoin,Resolver address,Provider name,Provider public key,Provider public key TXT record
+adguard-dns-family-ns1,"Adguard DNS Family Protection 1","Adguard DNS with safesearch and adult content blocking","Anycast","",https://adguard.com/en/adguard-dns/overview.html,1,no,yes,no,176.103.130.132:5443,2.dnscrypt.family.ns1.adguard.com,B831:5DD7:B14B:6EE3:20A4:70DC:2ED6:B1AA:398C:C9E5:86F8:5D45:45D6:B8C9:B500:5ABA,pk.family.ns1.adguard.com
+adguard-dns-family-ns2,"Adguard DNS Family Protection 2","Adguard DNS with safesearch and adult content blocking","Anycast","",https://adguard.com/en/adguard-dns/overview.html,1,no,yes,no,176.103.130.134:5443,2.dnscrypt.family.ns2.adguard.com,8C21:17A9:EBC1:57D6:FB64:056F:0ADB:C11C:5D83:6734:73C4:6E25:8D9B:2F57:D4EE:351F,pk.family.ns2.adguard.com
+adguard-dns-ns1,"Adguard DNS 1","Remove ads and protect your computer from malware","Anycast","",https://adguard.com/en/adguard-dns/overview.html,1,no,yes,no,176.103.130.130:5443,2.dnscrypt.default.ns1.adguard.com,D12B:47F2:52DC:F2C2:BBF8:9910:86EA:F79C:E449:5D8B:16C8:A0C4:322E:52CA:3F39:0873,pk.default.ns1.adguard.com
+adguard-dns-ns2,"Adguard DNS 2","Remove ads and protect your computer from malware","Anycast","",https://adguard.com/en/adguard-dns/overview.html,1,no,yes,no,176.103.130.131:5443,2.dnscrypt.default.ns2.adguard.com,81D0:02D3:6A4C:A50C:473B:7479:650F:E12E:02B3:21CB:6138:562A:208E:403D:FDC5:5E94,pk.default.ns2.adguard.com
+bikinhappy-sg,"BikinHappy Singapore","provided by bikinhappy.com","Singapore","",http://dns.bikinhappy.com,1,yes,yes,no,172.104.46.253:443,2.dnscrypt-cert.dns.bikinhappy.com,7167:91A0:745E:17ED:1E73:D426:C697:E8DF:EE4B:476B:149F:8449:62DD:4615:BD71:5C70,
+bn-fr0,"Babylon Network France 0","Non-logging, uncensored DNS resolver provided by Babylon Network","Roubaix, France","",https://babylon.network,1,no,yes,no,5.135.66.222:5353,2.dnscrypt-cert.babylon.network,8794:070A:143D:35CA:1CA6:32E7:B189:3028:4EAE:5DAF:EBB4:01E3:DF52:E9F0:37AB:D182,pk.fr0.dnscrypt.babylon.network
+bn-fr0-ipv6,"Babylon Network France 0 (IPv6)","Non-logging, uncensored IPv6 DNS resolver provided by Babylon Network","Roubaix, France","",https://babylon.network,1,no,yes,no,[2001:41d0:8:4480::222]:5353,2.dnscrypt-cert.babylon.network,8794:070A:143D:35CA:1CA6:32E7:B189:3028:4EAE:5DAF:EBB4:01E3:DF52:E9F0:37AB:D182,pk.fr0.dnscrypt.babylon.network
+bn-fr1,"Babylon Network France 1","Non-logging, uncensored DNS resolver provided by Babylon Network","Roubaix, France","",https://babylon.network,1,no,yes,no,164.132.130.171:5353,2.dnscrypt-cert.babylon.network,8794:070A:143D:35CA:1CA6:32E7:B189:3028:4EAE:5DAF:EBB4:01E3:DF52:E9F0:37AB:D182,pk.fr1.dnscrypt.babylon.network
+bn-fr1-ipv6,"Babylon Network France 1 (IPv6)","Non-logging, uncensored IPv6 DNS resolver provided by Babylon Network","Roubaix, France","",https://babylon.network,1,no,yes,no,[2001:41d0:1:82b5::171]:5353,2.dnscrypt-cert.babylon.network,8794:070A:143D:35CA:1CA6:32E7:B189:3028:4EAE:5DAF:EBB4:01E3:DF52:E9F0:37AB:D182,pk.fr1.dnscrypt.babylon.network
+bn-nl0,"Babylon Network Netherlands 0","Non-logging, uncensored DNS resolver provided by Babylon Network","Amsterdam, The Netherlands","",https://babylon.network,1,no,yes,no,87.253.152.190:5353,2.dnscrypt-cert.babylon.network,8794:070A:143D:35CA:1CA6:32E7:B189:3028:4EAE:5DAF:EBB4:01E3:DF52:E9F0:37AB:D182,pk.nl0.dnscrypt.babylon.network
+bn-nl0-ipv6,"Babylon Network Netherlands 0 (IPv6)","Non-logging, uncensored IPv6 DNS resolver provided by Babylon Network","Amsterdam, The Netherlands","",https://babylon.network,1,no,yes,no,[2a01:7c8:c020:3::190]:5353,2.dnscrypt-cert.babylon.network,8794:070A:143D:35CA:1CA6:32E7:B189:3028:4EAE:5DAF:EBB4:01E3:DF52:E9F0:37AB:D182,pk.nl0.dnscrypt.babylon.network
+cisco,"Cisco OpenDNS","Remove your DNS blind spot","Anycast","",https://www.opendns.com,1,no,no,no,208.67.220.220,2.dnscrypt-cert.opendns.com,B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79,
+cisco-familyshield,"Cisco OpenDNS with FamilyShield","Block websites not suitable for children","Anycast","",https://www.opendns.com/home-internet-security/parental-controls/,1,no,no,no,208.67.220.123,2.dnscrypt-cert.opendns.com,B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79,
+cisco-ipv6,"Cisco OpenDNS over IPv6","Cisco OpenDNS IPv6 sandbox","Anycast","",https://www.opendns.com/about/innovations/ipv6/,1,no,no,no,[2620:0:ccc::2]:443,2.dnscrypt-cert.opendns.com,B735:1140:206F:225D:3E2B:D822:D7FD:691E:A1C3:3CC8:D666:8D0C:BE04:BFAB:CA43:FB79,
+cpunks-ru,"Cypherpunks.ru","Cypherpunks.ru public DNS server",Russia,,http://www.cypherpunks.ru/DNSCrypt.html,1,no,yes,no,77.51.181.209:5353,2.dnscrypt-cert.cypherpunks.ru,1838:CCA3:D953:0A66:3433:5D50:05BD:3758:44E3:977E:E868:2B6C:5528:12BD:A78D:2E99,
+cs-caeast,"CS Canada east DNSCrypt server","provided by cryptostorm.is","Montreal, CA",,"https://cryptostorm.is",1,"no","yes","yes",167.114.84.132:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-cawest,"CS Canada west DNSCrypt server","provided by cryptostorm.is","Vancouver, CA",,"https://cryptostorm.is",1,"no","yes","yes",162.221.207.228:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-cfi,"CS cryptofree France DNSCrypt server","provided by cryptostorm.is","Paris, France",,"https://cryptostorm.is",1,"no","yes","yes",212.83.175.31:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-cfii,"CS secondary cryptofree France DNSCrypt server","provided by cryptostorm.is","Paris, France",,"https://cryptostorm.is",1,"no","yes","yes",23.105.70.204:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-ch,"CS Switzerland DNSCrypt server","provided by cryptostorm.is","Baar, Switzerland",,"https://cryptostorm.is",1,"no","yes","yes",185.60.147.77:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-de,"CS Frankfurt, DE DNSCrypt server","provided by cryptostorm.is","Frankfurt, Germany",,"https://cryptostorm.is",1,"no","yes","yes",84.16.240.43:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-de3,"CS Dusseldorf, DE DNSCrypt server","provided by cryptostorm.is","Dusseldorf, Germany",,"https://cryptostorm.is",1,"no","yes","yes",89.163.214.174:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-dk,"CS Denmark DNSCrypt server","provided by cryptostorm.is","Copenhagen, Denmark",,"https://cryptostorm.is",1,"no","yes","yes",82.103.131.172:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-dk2,"CS secondary Denmark DNSCrypt server","provided by cryptostorm.is","Copenhagen, Denmark",,"https://cryptostorm.is",1,"no","yes","yes",185.212.169.139:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-es,"CS Spain DNSCrypt server","provided by cryptostorm.is","Valencia, Spain",,"https://cryptostorm.is",1,"no","yes","yes",185.140.114.51:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-fi,"CS Finland DNSCrypt server","provided by cryptostorm.is","Helsinki, Finland",,"https://cryptostorm.is",1,"no","yes","yes",185.117.118.20:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-fr,"CS France DNSCrypt server","provided by cryptostorm.is","Paris, France",,"https://cryptostorm.is",1,"no","yes","yes",212.129.46.86:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-fr2,"CS secondary France DNSCrypt server","provided by cryptostorm.is","Paris, France",,"https://cryptostorm.is",1,"no","yes","yes",212.129.46.32:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-lt,"CS Lithuania DNSCrypt server","provided by cryptostorm.is","Vilnius, Lithuania",,"https://cryptostorm.is",1,"no","yes","yes",46.166.170.10:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-lv,"CS Latvia DNSCrypt server","provided by cryptostorm.is","Riga, Latvia",,"https://cryptostorm.is",1,"no","yes","yes",80.233.134.52:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-md,"CS Moldova DNSCrypt server","provided by cryptostorm.is","Chisinau, Moldova",,"https://cryptostorm.is",1,"no","yes","yes",176.123.3.249:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-nl,"CS Netherlands DNSCrypt server","provided by cryptostorm.is","Rotterdam, Netherlands",,"https://cryptostorm.is",1,"no","yes","yes",213.163.64.208:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-pl,"CS Poland DNSCrypt server","provided by cryptostorm.is","Warsaw, Poland",,"https://cryptostorm.is",1,"no","yes","yes",5.133.8.187:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-pt,"CS Portugal DNSCrypt server","provided by cryptostorm.is","Lisbon, Portugal",,"https://cryptostorm.is",1,"no","yes","yes",109.71.42.228:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-ro,"CS Romania DNSCrypt server","provided by cryptostorm.is","Romania",,"https://cryptostorm.is",1,"no","yes","yes",5.254.96.195:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-rome,"CS Italy DNSCrypt server","provided by cryptostorm.is","Rome, Italy",,"https://cryptostorm.is",1,"no","yes","yes",185.94.193.234:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-uk,"CS England DNSCrypt server","provided by cryptostorm.is","Rugby, England",,"https://cryptostorm.is",1,"no","yes","yes",5.101.137.251:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-useast,"CS New York City NY US DNSCrypt server","provided by cryptostorm.is","Buffalo, NY",,"https://cryptostorm.is",1,"no","yes","yes",173.234.159.235:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-useast2,"CS Washington DC US DNSCrypt server","provided by cryptostorm.is","Washington, DC",,"https://cryptostorm.is",1,"no","yes","yes",198.7.58.227:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-usnorth,"CS Chicago IL US DNSCrypt server","provided by cryptostorm.is","Chicago, IL",,"https://cryptostorm.is",1,"no","yes","yes",173.234.56.115:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-ussouth,"CS Dallas TX US DNSCrypt server","provided by cryptostorm.is","Dallas, TX",,"https://cryptostorm.is",1,"no","yes","yes",70.32.38.67:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-ussouth2,"CS Atlanta GA US DNSCrypt server","provided by cryptostorm.is","Atlanta, GA",,"https://cryptostorm.is",1,"no","yes","yes",108.62.19.131:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-uswest,"CS Seattle WA US DNSCrypt server","provided by cryptostorm.is","Seattle, WA",,"https://cryptostorm.is",1,"no","yes","yes",64.120.5.251:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-uswest3,"CS secondary Las Vegas NV US DNSCrypt server","provided by cryptostorm.is","Las Vegas, NV",,"https://cryptostorm.is",1,"no","yes","yes",104.238.195.139:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+cs-uswest5,"CS Los Angeles CA US DNSCrypt server","provided by cryptostorm.is","Los Angeles, CA",,"https://cryptostorm.is",1,"no","yes","yes",173.208.95.75:443,2.dnscrypt-cert.cryptostorm.is,3133:72AD:5956:32C2:416B:872F:098F:851B:DDB9:6528:4C6C:BE9A:4F19:0964:30DB:A95A,
+d0wn-at-ns1,"D0wn Resolver Austria 01","Server provided by Martin 'd0wn' Albus","Austria","",https://dns.d0wn.biz,1,yes,yes,no,79.133.33.52,2.dnscrypt-cert.at.d0wn.biz,717E:5DF4:1841:CD4B:D92E:CE16:ECCC:443D:B305:B03D:86E6:69B7:4AC1:FBB6:18D0:2BB4,pubkey.at.dnscrypt.d0wn.biz
+d0wn-cz-ns1,"D0wn Resolver Czech Republic 01","Server provided by Martin 'd0wn' Albus","Czech Republic","",https://dns.d0wn.biz,1,yes,yes,no,81.2.237.32,2.dnscrypt-cert.cz.d0wn.biz,EE21:5055:4DA0:1367:BAC3:768A:7C1E:24BF:D777:ACD5:77A4:44F8:BDF3:84E0:5966:D855,pubkey.cz.dnscrypt.d0wn.biz
+d0wn-de-ns1,"D0wn Resolver Germany 01","Server provided by Martin 'd0wn' Albus","Germany","",https://dns.d0wn.biz,1,yes,yes,no,82.211.31.248,2.dnscrypt-cert.de.d0wn.biz,B040:19F8:8D49:4682:41E3:EB58:5F61:173F:EF8E:55DA:0597:2DB7:27BB:C153:1DD8:D109,pubkey.de.dnscrypt.d0wn.biz
+d0wn-de-ns1-ipv6,"D0wn Resolver Germany 01 over IPv6","Server provided by Martin 'd0wn' Albus","Germany","",https://dns.d0wn.biz,1,yes,yes,no,[2001:1608:10:195:3:dead:beef:cafe]:443,2.dnscrypt-cert.de.d0wn.biz,B040:19F8:8D49:4682:41E3:EB58:5F61:173F:EF8E:55DA:0597:2DB7:27BB:C153:1DD8:D109,pubkey.de.dnscrypt.d0wn.biz
+d0wn-es-ns1,"D0wn Resolver Spain 01","Server provided by Martin 'd0wn' Albus","Spain","",https://dns.d0wn.biz,1,yes,yes,no,91.142.220.29,2.dnscrypt-cert.es.d0wn.biz,EB09:E854:AEDA:9705:CB47:ED69:EADD:4156:3653:82C5:C88D:A2E3:6917:3B54:4774:7505,pubkey.es.dnscrypt.d0wn.biz
+d0wn-fr-ns1,"D0wn Resolver France 01","Server provided by Martin 'd0wn' Albus","France","",https://dns.d0wn.biz,1,yes,yes,no,151.80.7.115:1053,2.dnscrypt-cert.fr.d0wn.biz,58A8:22D3:29EB:C14F:BCEB:45AF:42EB:2F58:C797:0AD3:ED31:397D:1D34:8636:2375:7251,pubkey.fr.dnscrypt.d0wn.biz
+d0wn-fr-ns2,"D0wn Resolver France 02","Server provided by Martin 'd0wn' Albus","France","",https://dns.d0wn.biz,1,yes,yes,no,37.187.0.40,2.dnscrypt-cert.fr2.d0wn.biz,25A7:DB7B:7835:55D5:7DA4:7C0C:57F8:9C5F:0220:3D09:67E3:585A:723E:E0D1:CB38:F767,pubkey.fr2.dnscrypt.d0wn.biz
+d0wn-fr-ns2-ipv6,"D0wn Resolver France 02 over IPv6","Server provided by Martin 'd0wn' Albus","France","",https://dns.d0wn.biz,1,yes,yes,no,[2001:41D0:A:0028::1]:443,2.dnscrypt-cert.fr2.d0wn.biz,25A7:DB7B:7835:55D5:7DA4:7C0C:57F8:9C5F:0220:3D09:67E3:585A:723E:E0D1:CB38:F767,pubkey.fr2.dnscrypt.d0wn.biz
+d0wn-gr-ns1,"D0wn Resolver Greece 01","Server provided by Martin 'd0wn' Albus","Greece","",https://dns.d0wn.biz,1,yes,yes,no,85.25.105.193,2.dnscrypt-cert.gr.d0wn.biz,B19C:0B5C:48F2:58FA:0BE4:67F4:5F50:BC7F:985F:C544:8A4F:BC9D:5574:5A35:5701:8009,pubkey.gr.dnscrypt.d0wn.biz
+d0wn-id-ns1,"D0wn Resolver Indonesia 01","Server provided by Martin 'd0wn' Albus","Indonesia","",https://dns.d0wn.biz,1,yes,yes,no,45.114.118.195,2.dnscrypt-cert.id.d0wn.biz,BE93:B3F1:2A3B:2448:8F33:F91F:9461:5F73:D5CA:56D6:C789:96DE:7A18:D4DE:5182:094D,pubkey.id.dnscrypt.d0wn.biz
+d0wn-is-ns1,"D0wn Resolver Iceland 01","Server provided by Martin 'd0wn' Albus","Iceland","",https://dns.d0wn.biz,1,yes,yes,no,37.235.49.61,2.dnscrypt-cert.is.d0wn.biz,2B28:974E:073A:6B38:722A:5BE1:F7A0:250C:508F:A809:238F:8F3D:76D8:6098:20D7:B2D9,pubkey.is.dnscrypt.d0wn.biz
+d0wn-is-ns2,"D0wn Resolver Iceland 02","Server provided by Martin 'd0wn' Albus","Iceland","",https://dns.d0wn.biz,1,yes,yes,no,93.95.226.165,2.dnscrypt-cert.is2.d0wn.biz,8460:34A9:C630:CA3C:04AC:4A90:1625:F17A:87B2:ACB9:4180:AC48:1E2C:10E8:CEDE:1A6F,pubkey.is2.dnscrypt.d0wn.biz
+d0wn-it-ns1,"D0wn Resolver Italy 01","Server provided by Martin 'd0wn' Albus","Italy","",https://dns.d0wn.biz,1,yes,yes,no,31.14.133.188,2.dnscrypt-cert.it.d0wn.biz,2DEC:CEF8:A4D0:57DE:0D1A:CE8E:0A3C:BEB8:2135:61A8:BF0E:7373:0BA0:EC38:C876:3B50,pubkey.it.dnscrypt.d0wn.biz
+d0wn-lv-ns1,"D0wn Resolver Latvia 01","Server provided by Martin 'd0wn' Albus","Latvia","",https://dns.d0wn.biz,1,yes,yes,no,89.111.13.60,2.dnscrypt-cert.lv.d0wn.biz,9AC3:6B4C:7ADB:E7D6:D697:B6BF:151C:151A:B291:8C5D:B912:15F8:B986:5926:33A4:A5E1,pubkey.lv.dnscrypt.d0wn.biz
+d0wn-lv-ns2,"D0wn Resolver Latvia 02","Server provided by Martin 'd0wn' Albus","Latvia","",https://dns.d0wn.biz,1,yes,yes,no,185.86.151.28,2.dnscrypt-cert.lv2.d0wn.biz,B111:F80C:E3E0:1C36:CC73:0995:009E:6351:EF08:0503:309D:9417:7AA3:8C67:916D:0CDF,pubkey.lv.dnscrypt.d0wn.biz
+d0wn-lv-ns2-ipv6,"D0wn Resolver Latvia 01 over IPv6","Server provided by Martin 'd0wn' Albus","Latvia","",https://dns.d0wn.biz,1,yes,yes,no,[2a02:7aa0:1201::f60e:2719]:443,2.dnscrypt-cert.lv2.d0wn.biz,B111:F80C:E3E0:1C36:CC73:0995:009E:6351:EF08:0503:309D:9417:7AA3:8C67:916D:0CDF,pubkey.lv.dnscrypt.d0wn.biz
+d0wn-md-ns1,"D0wn Resolver Moldova 01","Server provided by Martin 'd0wn' Albus","Moldova","",https://dns.d0wn.biz,1,yes,yes,no,178.17.170.67:1053,2.dnscrypt-cert.md.d0wn.biz,3DB2:C4CB:39E2:6B82:FDDF:6D91:1A65:D164:F4F0:D237:8CDD:0C37:469F:24BA:B9A0:F9FF,pubkey.md.dnscrypt.d0wn.biz
+d0wn-md-ns1-ipv6,"D0wn Resolver Moldova 01 over IPv6","Server provided by Martin 'd0wn' Albus","Moldova","",https://dns.d0wn.biz,1,yes,yes,no,[2a00:1dc0:cafe::ad86:fa7e]:1053,2.dnscrypt-cert.md.d0wn.biz,3DB2:C4CB:39E2:6B82:FDDF:6D91:1A65:D164:F4F0:D237:8CDD:0C37:469F:24BA:B9A0:F9FF,pubkey.md.dnscrypt.d0wn.biz
+d0wn-mx-ns1,"D0wn Resolver Mexico 01","Server provided by Martin 'd0wn' Albus","Mexico","",https://dns.d0wn.biz,1,yes,yes,no,201.131.126.212,2.dnscrypt-cert.mx.d0wn.biz,999E:63F0:0DE7:C171:3A72:5625:2A3F:097B:EC3A:D28F:BE28:7569:5C37:E80D:3D55:4FD0,pubkey.mx.dnscrypt.d0wn.biz
+d0wn-nl-ns1,"D0wn Resolver Netherlands 01","Server provided by Martin 'd0wn' Albus","Netherlands","",https://dns.d0wn.biz,1,yes,yes,no,95.85.9.86:1053,2.dnscrypt-cert.nl.d0wn.biz,7BE6:68FE:A505:FFA7:4C27:C2CA:F881:59DA:038C:5741:13AA:2556:A4D2:2D0B:B6F0:009E,pubkey.nl.dnscrypt.d0wn.biz
+d0wn-nl-ns1-ipv6,"D0wn Resolver Netherlands 01 over IPv6","Server provided by Martin 'd0wn' Albus","Netherlands","",https://dns.d0wn.biz,1,yes,yes,no,[2a03:b0c0:0:1010::62:f001]:1053,2.dnscrypt-cert.nl.d0wn.biz,7BE6:68FE:A505:FFA7:4C27:C2CA:F881:59DA:038C:5741:13AA:2556:A4D2:2D0B:B6F0:009E,pubkey.nl.dnscrypt.d0wn.biz
+d0wn-nl-ns2,"D0wn Resolver Netherlands 02","Server provided by Martin 'd0wn' Albus","Netherlands","",https://dns.d0wn.biz,1,yes,yes,no,185.83.217.248:1053,2.dnscrypt-cert.nl2.d0wn.biz,DFAA:B7D8:29E6:1F34:4FED:2610:4221:70C9:ADC7:7E9F:A65F:4A46:0BAE:A735:3186:3B99,pubkey.nl2.dnscrypt.d0wn.biz
+d0wn-nl-ns2-ipv6,"D0wn Resolver Netherlands 02 over IPv6","Server provided by Martin 'd0wn' Albus","Netherlands","",https://dns.d0wn.biz,1,yes,yes,no,[2a02:2ca0:64:22::2]:1053,2.dnscrypt-cert.nl2.d0wn.biz,DFAA:B7D8:29E6:1F34:4FED:2610:4221:70C9:ADC7:7E9F:A65F:4A46:0BAE:A735:3186:3B99,pubkey.nl2.dnscrypt.d0wn.biz
+d0wn-nl-ns4,"D0wn Resolver Netherlands 04","Server provided by Martin 'd0wn' Albus","Netherlands","",https://dns.d0wn.biz,1,yes,yes,no,31.220.43.105,2.dnscrypt-cert.nl4.d0wn.biz,2A4F:4389:5CE6:3230:B4C5:76A5:AC38:6418:4D12:6949:B160:FDB0:9166:ABB4:CEC6:0672,pubkey.nl4.dnscrypt.d0wn.biz
+d0wn-random-ns1,"D0wn Resolver Moldova Random 01","Server provided by Martin 'd0wn' Albus","Moldova","",https://dns.d0wn.biz,1,yes,yes,no,178.17.170.133:443,2.dnscrypt-cert.random.d0wn.biz,A420:867F:ED5C:024C:C86A:EECE:AA05:194B:017F:D2FF:9E72:385A:874F:8CE5:6832:ED2E,pubkey.random.dnscrypt.d0wn.biz
+d0wn-random-ns1-ipv6,"D0wn Resolver Moldova Random 01 over IPv6","Server provided by Martin 'd0wn' Albus","Moldova","",https://dns.d0wn.biz,1,yes,yes,no,[2a00:1dc0:cafe::c6af:c19d]:443,2.dnscrypt-cert.random.d0wn.biz,A420:867F:ED5C:024C:C86A:EECE:AA05:194B:017F:D2FF:9E72:385A:874F:8CE5:6832:ED2E,pubkey.random.dnscrypt.d0wn.biz
+d0wn-random-ns2,"D0wn Resolver Netherlands Random 02","Server provided by Martin 'd0wn' Albus","Netherlands","",https://dns.d0wn.biz,1,yes,yes,no,185.14.29.140,2.dnscrypt-cert.random2.d0wn.biz,7D73:F486:3C01:4CC9:B278:D107:F254:7A4F:1EA2:1081:07B0:CB82:645A:D8A4:B98A:B327,pubkey.random2.dnscrypt.d0wn.biz
+d0wn-random-ns2-ipv6,"D0wn Resolver Netherlands Random 02 over IPv6","Server provided by Martin 'd0wn' Albus","Netherlands","",https://dns.d0wn.biz,1,yes,yes,no,[2a00:1ca8:a7::1e9]:443,2.dnscrypt-cert.random2.d0wn.biz,7D73:F486:3C01:4CC9:B278:D107:F254:7A4F:1EA2:1081:07B0:CB82:645A:D8A4:B98A:B327,pubkey.random2.dnscrypt.d0wn.biz
+d0wn-ru-ns1,"D0wn Resolver Russia 01","Server provided by Martin 'd0wn' Albus","Russia","",https://dns.d0wn.biz,1,yes,yes,no,91.214.71.181,2.dnscrypt-cert.ru.d0wn.biz,0ECA:BC40:E0A1:335F:0221:4240:AB86:2919:D16A:2393:CCEB:4B40:9EB9:4F24:3077:ED99,pubkey.ru.dnscrypt.d0wn.biz
+d0wn-se-ns1,"D0wn Resolver Sweden 01","Server provided by Martin 'd0wn' Albus","Sweden","",https://dns.d0wn.biz,1,yes,yes,no,95.215.44.124,2.dnscrypt-cert.se.d0wn.biz,9D4F:762B:DD24:F77A:64B4:7E0F:F5C6:93FD:A02A:39E9:8FEC:0CEE:F252:3A5F:A403:C032,pubkey.se.dnscrypt.d0wn.biz
+d0wn-se-ns1-ipv6,"D0wn Resolver Sweden 01 over IPv6","Server provided by Martin 'd0wn' Albus","Sweden","",https://dns.d0wn.biz,1,yes,yes,no,[2a02:7aa0:1619::4f50:a69]:443,2.dnscrypt-cert.se.d0wn.biz,9D4F:762B:DD24:F77A:64B4:7E0F:F5C6:93FD:A02A:39E9:8FEC:0CEE:F252:3A5F:A403:C032,pubkey.se.dnscrypt.d0wn.biz
+d0wn-se-ns2,"D0wn Resolver Sweden 02","Server provided by Martin 'd0wn' Albus","Sweden","",https://dns.d0wn.biz,1,yes,yes,no,31.220.5.186,2.dnscrypt-cert.se2.d0wn.biz,C57D:D6A4:178E:ADE2:D0C0:B138:A4D4:074A:DF59:1488:8711:5CAC:EB60:A37B:3492:DA15,pubkey.se2.dnscrypt.d0wn.biz
+d0wn-sg-ns1,"D0wn Resolver Singapore 01","Server provided by Martin 'd0wn' Albus","Singapore","",https://dns.d0wn.biz,1,yes,yes,no,128.199.248.105,2.dnscrypt-cert.sg.d0wn.biz,D82B:2B76:1DA0:8470:B55B:820C:FAAB:9F32:D632:E9E0:5616:2CE7:7D21:E970:98FF:4A34,pubkey.sg.dnscrypt.d0wn.biz
+d0wn-sg-ns1-ipv6,"D0wn Resolver Singapore 01 over IPv6","Server provided by Martin 'd0wn' Albus","Singapore","",https://dns.d0wn.biz,1,yes,yes,no,[2400:6180:0:d0::38:d001]:443,2.dnscrypt-cert.sg.d0wn.biz,D82B:2B76:1DA0:8470:B55B:820C:FAAB:9F32:D632:E9E0:5616:2CE7:7D21:E970:98FF:4A34,pubkey.sg.dnscrypt.d0wn.biz
+d0wn-tz-ns1,"D0wn Resolver Tanzania 01","Server provided by Martin 'd0wn' Albus","Tanzania","",https://dns.d0wn.biz,1,yes,yes,no,41.79.69.13,2.dnscrypt-cert.tz.d0wn.biz,D606:15FB:D145:3BA1:4E76:8A3E:5C5C:B3AC:1746:1331:463D:A0AF:8CF7:DF04:DA4D:756D,pubkey.tz.dnscrypt.d0wn.biz
+d0wn-tz-ns1-ipv6,"D0wn Resolver Tanzania 01 over IPv6","Server provided by Martin 'd0wn' Albus","Tanzania","",https://dns.d0wn.biz,1,yes,yes,no,[2c0f:fda8:5::2ed1:d2ec]:443,2.dnscrypt-cert.tz.d0wn.biz,D606:15FB:D145:3BA1:4E76:8A3E:5C5C:B3AC:1746:1331:463D:A0AF:8CF7:DF04:DA4D:756D,pubkey.tz.dnscrypt.d0wn.biz
+d0wn-us-ns1,"D0wn Resolver United States of America 01","Server provided by Martin 'd0wn' Albus","United States of America","",https://dns.d0wn.biz,1,yes,yes,no,107.181.187.219,2.dnscrypt-cert.us.d0wn.biz,04BB:6100:7CFF:C72B:AF91:8942:F9DC:12A9:61A1:C6F2:177F:7CF9:F3C9:1B43:9FBE:6B80,pubkey.us.dnscrypt.d0wn.biz
+d0wn-us-ns2,"D0wn Resolver United States of America 02","Server provided by Martin 'd0wn' Albus","United States of America","",https://dns.d0wn.biz,1,yes,yes,no,192.252.222.24,2.dnscrypt-cert.us2.d0wn.biz,729B:FABE:2295:D469:E911:F97E:3EE4:F6DB:0190:EA6F:7CF3:F7EE:BB6B:99B1:698A:237D,pubkey.us2.dnscrypt.d0wn.biz
+d0wn-us-ns4,"D0wn Resolver United States of America 04","Server provided by Martin 'd0wn' Albus","United States of America","",https://dns.d0wn.biz,1,yes,yes,no,107.181.168.52,2.dnscrypt-cert.us4.d0wn.biz,F392:5D53:A315:66C2:ACF2:B2D2:8A69:6739:B066:1B8C:EF1B:3AFD:E828:0D83:D4EA:6D7D,pubkey.us4.dnscrypt.d0wn.biz
+d0wn-za-ns1,"D0wn Resolver South Africa 01","Server provided by Martin 'd0wn' Albus","South Africa","",https://dns.d0wn.biz,1,yes,yes,no,169.239.181.3,2.dnscrypt-cert.za.d0wn.biz,FBBD:0F3A:AF2B:B1BB:CD8F:9324:D5F6:A68C:E722:3890:8B90:92CF:F6D2:BF7C:9EC1:1368,pubkey.za.dnscrypt.d0wn.biz
+dnscrypt.ca-1,"dnscrypt.ca Server 1","Uncensored DNSSEC validating and log-free","Montreal, Canada","","https://dnscrypt.ca/",1,yes,yes,no,"199.167.130.118:5353","2.dnscrypt-cert.dnscrypt.ca-1",74F7:4555:17BC:26F7:1177:E56D:7293:2788:6C72:915B:3F46:2830:3F91:0C47:C38E:8279,
+dnscrypt.ca-2,"dnscrypt.ca Server 2","Uncensored DNSSEC validating and log-free","Montreal, Canada","","https://dnscrypt.ca/",1,yes,yes,no,"199.167.128.112:5353","2.dnscrypt-cert.dnscrypt.ca-2",43D5:2C82:5922:96C2:DB6F:8D48:CE22:4FDC:C726:26E1:06F6:E388:6193:FA00:9029:631B,
+dnscrypt.eu-dk,"DNSCrypt.eu Denmark","Free, non-logged, uncensored. Hosted by Netgroup.","Denmark","",https://dnscrypt.eu,1,yes,yes,no,77.66.84.233,2.dnscrypt-cert.resolver2.dnscrypt.eu,3748:5585:E3B9:D088:FD25:AD36:B037:01F5:520C:D648:9E9A:DD52:1457:4955:9F0A:9955,pubkey.resolver2.dnscrypt.eu
+dnscrypt.eu-dk-ipv6,"DNSCrypt.eu Denmark over IPv6","Free, non-logged, uncensored. Hosted by Netgroup.","Denmark","",https://dnscrypt.eu,1,yes,yes,no,[2001:1448:243::dc2]:443,2.dnscrypt-cert.resolver2.dnscrypt.eu,3748:5585:E3B9:D088:FD25:AD36:B037:01F5:520C:D648:9E9A:DD52:1457:4955:9F0A:9955,pubkey.resolver2.dnscrypt.eu
+dnscrypt.eu-nl,"DNSCrypt.eu Holland","Free, non-logged, uncensored. Hosted by RamNode.","Netherlands","",https://dnscrypt.eu,1,yes,yes,no,176.56.237.171,2.dnscrypt-cert.resolver1.dnscrypt.eu,67C0:0F2C:21C5:5481:45DD:7CB4:6A27:1AF2:EB96:9931:40A3:09B6:2B8D:1653:1185:9C66,pubkey.resolver1.dnscrypt.eu
+dnscrypt.nl-ns0,"DNSCrypt.nl The Netherlands (NL)","Public DNSCrypt server in Amsterdam, the Netherlands","Netherlands","",https://dnscrypt.nl,1,yes,yes,no,45.76.35.212,2.dnscrypt-cert.ns0.dnscrypt.nl,4C84:FB8C:0511:5DFA:5F97:C5ED:0329:1370:C78A:BCD6:4E15:DD53:AB08:DE72:FB84:4ACA,pkey.ns0.dnscrypt.nl
+dnscrypt.nl-ns0-ipv6,"DNSCrypt.nl The Netherlands (NL) over IPv6","Public DNSCrypt server in Amsterdam, the Netherlands","Netherlands","",https://dnscrypt.nl,1,yes,yes,no,[2001:19f0:5001:30a:5400:ff:fe58:7140]:443,2.dnscrypt-cert.ns0.dnscrypt.nl,4C84:FB8C:0511:5DFA:5F97:C5ED:0329:1370:C78A:BCD6:4E15:DD53:AB08:DE72:FB84:4ACA,pkey.ns0.dnscrypt.nl
+dnscrypt.org-fr,"DNSCrypt.org France","DNSSEC/Non-logged/Uncensored - ARM server donated by Scaleway.com","Paris, France","",https://fr.dnscrypt.org,2,yes,yes,no,212.47.228.136,2.dnscrypt-cert.fr.dnscrypt.org,E801:B84E:A606:BFB0:BAC0:CE43:445B:B15E:BA64:B02F:A3C4:AA31:AE10:636A:0790:324D,pubkey.fr.dnscrypt.org
+fvz-anyone,"Primary OpenNIC Anycast DNS Resolver","Fusl's public primary OpenNIC Tier2 Anycast DNS Resolver","Anycast","",http://dnsrec.meo.ws/,1,no,yes,no,185.121.177.177,2.dnscrypt-cert.dnsrec.meo.ws,1A6A:D0A3:2B4C:5A61:A695:D153:670D:69AB:1690:3F9E:C3F7:F64F:13E5:35A3:18B2:28A5,
+fvz-anytwo,"Secondary OpenNIC Anycast DNS Resolver","Fusl's public secondary OpenNIC Tier2 Anycast DNS Resolver","Anycast","",http://dnsrec.meo.ws/,1,no,yes,no,169.239.202.202,2.dnscrypt-cert.dnsrec.meo.ws,1A6A:D0A3:2B4C:5A61:A695:D153:670D:69AB:1690:3F9E:C3F7:F64F:13E5:35A3:18B2:28A5,
+ipredator,"Ipredator.se Server","Public DNSCrypt server in Sweden provided by Ipredator.se","Sweden","",https://www.ipredator.se,1,yes,yes,no,194.132.32.32,2.dnscrypt-cert.ipredator.se,C44C:566A:A8D6:46C4:32B1:04F5:3D00:961B:32DC:71CF:1C04:BD9E:B013:E480:E7A4:7828,pubkey.resolver2.ipredator.se
+ns0.dnscrypt.is,"ns0.dnscrypt.is in Reykjavík, Iceland","DNSSEC enabled, non-logging, uncensored. Sponsored by 1984 Hosting.","Reykjavík, Iceland","",https://dnscrypt.is,1,yes,yes,no,93.95.228.87,2.dnscrypt-cert.ns0.dnscrypt.is,EE41:6A83:451C:218F:37B2:B736:78C4:999F:7DE6:89D1:31D2:7866:7C8E:A8BB:1C95:B402,pubkey.ns0.dnscrypt.is
+okturtles,"okTurtles","For a surveillance-free world. HTTPS is broken. DNSChain fixes it.","Georgia, US","33.032501, -83.895699",http://okturtles.com/,1,no,yes,no,23.226.227.93,2.dnscrypt-cert.okturtles.com,1D85:3953:E34F:AFD0:05F9:4C6F:D1CC:E635:D411:9904:0D48:D19A:5D35:0B6A:7C81:73CB,
+opennic-tumabox,"TumaBox","Public DNS server operated by TumaBox.org","Germany","",http://wiki.tumabox.org/doku.php?id=dns,1,no,yes,no,130.255.73.90:5353,2.tumabox.org,D591:7B11:6A35:3114:C238:AA99:A6EB:0C28:7CF7:6805:41AC:5DBF:A8A0:239E:228C:5B06,
+opennic-tumabox-ipv6,"TumaBox over IPv6","Public DNS server operated by TumaBox.org","Germany","",http://wiki.tumabox.org/doku.php?id=dns,1,no,yes,no,[2a02:e00:fffd:139::9]:5353,2.tumabox.org,D591:7B11:6A35:3114:C238:AA99:A6EB:0C28:7CF7:6805:41AC:5DBF:A8A0:239E:228C:5B06,
+securedns,SecureDNS,Uncensored and no logging,"Amsterdam, Netherlands",,https://securedns.eu,1,yes,yes,no,146.185.167.43:5353,2.dnscrypt-cert.securedns.eu,B3A5:9769:1457:5B04:89E1:9FAE:9C43:E679:FAF2:8C57:1897:0031:7F7B:B496:291F:B095,2.dnscrypt-cert.securedns.eu
+securedns-ipv6,SecureDNS over IPv6,Uncensored and no logging,"Amsterdam, Netherlands",,https://securedns.eu,1,yes,yes,no,[2a03:b0c0:0:1010::e9a:3001]:5353,2.dnscrypt-cert.securedns.eu,B3A5:9769:1457:5B04:89E1:9FAE:9C43:E679:FAF2:8C57:1897:0031:7F7B:B496:291F:B095,2.dnscrypt-cert.securedns.eu
+soltysiak,"Soltysiak","Public DNSCrypt server in Poland","Poland","52.4014619, 16.9278078",http://dc1.soltysiak.com/,1,yes,yes,yes,178.216.201.222:2053,2.dnscrypt-cert.soltysiak.com,25C4:E188:2915:4697:8F9C:2BBD:B6A7:AFA4:01ED:A051:0508:5D53:03E7:1928:C066:8F21,pubkey.dc1.soltysiak.com
+soltysiak-ipv6,"Soltysiak over IPv6","Public DNSCrypt server in Poland","Poland","52.4014619, 16.9278078",http://dc1.soltysiak.com/,1,yes,yes,yes,[2001:470:70:4ff::2]:2053,2.dnscrypt-cert.soltysiak.com,25C4:E188:2915:4697:8F9C:2BBD:B6A7:AFA4:01ED:A051:0508:5D53:03E7:1928:C066:8F21,pubkey.dc1.soltysiak.com
+ventricle.us,"Anatomical DNS","Public DNSCrypt resolver provided by Jacob Henner","New York, NY","",https://jacobhenner.com,1,yes,yes,no,107.170.57.34,2.dnscrypt-cert.dnscrypt.ventricle.us,E985:F118:AD4E:3CC6:5FF2:2520:1890:C6F5:58B7:5B5A:52F5:6B17:CFEA:C100:5C8B:9BAA,pubkey.dnscrypt.ventricle.us
+yandex,"Yandex","Yandex public DNS server","Anycast","",https://www.yandex.com,1,no,no,no,77.88.8.78:15353,2.dnscrypt-cert.browser.yandex.net,D384:C071:C9F7:4662:AF2A:CCD5:7B5D:CC97:14D4:07B6:AD36:01E1:AEDC:06D5:6D49:6327,
diff --git a/dnscrypt-proxy/patches/010-internal.patch b/dnscrypt-proxy/patches/010-internal.patch
new file mode 100644
index 00000000..f10a85f1
--- /dev/null
+++ b/dnscrypt-proxy/patches/010-internal.patch
@@ -0,0 +1,11 @@
+--- a/src/proxy/app.c
++++ b/src/proxy/app.c
+@@ -391,7 +391,7 @@ dnscrypt_proxy_main(int argc, char *argv[])
+     }
+     logger_noformat(&proxy_context, LOG_NOTICE, "Starting " PACKAGE_STRING);
+     sodium_mlock(&proxy_context, sizeof proxy_context);
+-    randombytes_set_implementation(&randombytes_salsa20_implementation);
++    randombytes_set_implementation(&randombytes_internal_implementation);
+ 
+ #ifdef PLUGINS
+     if (plugin_support_context_load(app_context.dcps_context) != 0) {
diff --git a/dnscrypt-proxy2/Makefile b/dnscrypt-proxy2/Makefile
new file mode 100644
index 00000000..25d6ba12
--- /dev/null
+++ b/dnscrypt-proxy2/Makefile
@@ -0,0 +1,95 @@
+#
+# Copyright (C) 2019-2021 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dnscrypt-proxy2
+PKG_VERSION:=2.1.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=dnscrypt-proxy-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/DNSCrypt/dnscrypt-proxy/tar.gz/$(PKG_VERSION)?
+PKG_HASH:=cc4a2f274ce48c3731ff981e940e6475d912fb356a80481e91725e81d67bde14
+PKG_BUILD_DIR:=$(BUILD_DIR)/dnscrypt-proxy-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Josef Schlehofer <josef.schlehofer@nic.cz>
+PKG_LICENSE:=ISC
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_USE_MIPS16:=0
+
+GO_PKG:=github.com/DNSCrypt/dnscrypt-proxy
+
+include $(INCLUDE_DIR)/package.mk
+include ../../packages/lang/golang/golang-package.mk
+
+GO_MOD_ARGS:=
+GO_PKG_BUILD_VARS+= GO111MODULE=off
+
+define Package/dnscrypt-proxy2
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Flexible DNS proxy with encrypted DNS protocols
+  URL:=https://github.com/DNSCrypt/dnscrypt-proxy
+  DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle
+  CONFLICTS:=dnscrypt-proxy
+endef
+
+define Package/dnscrypt-proxy2/install
+	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
+
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/sbin/
+
+	$(INSTALL_DIR) $(1)/etc/dnscrypt-proxy2
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/dnscrypt-proxy/example-dnscrypt-proxy.toml $(1)/etc/dnscrypt-proxy2/dnscrypt-proxy.toml
+	$(INSTALL_CONF) ./files/blocked-names.txt $(1)/etc/dnscrypt-proxy2/blocked-names.txt
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/dnscrypt-proxy.init $(1)/etc/init.d/dnscrypt-proxy
+
+	$(INSTALL_CONF) ./files/{*.md,*.minisig} $(1)/etc/dnscrypt-proxy2/
+
+	sed -i "s/^listen_addresses = .*/listen_addresses = ['127.0.0.53:53']/" $(1)/etc/dnscrypt-proxy2/dnscrypt-proxy.toml
+	sed -i "s/^  # blocked_names_file = 'blocked-names.txt'/blocked_names_file = 'blocked-names.txt'/" $(1)/etc/dnscrypt-proxy2/dnscrypt-proxy.toml
+	sed -i 's/^ipv6_servers = false/ipv6_servers = true/' $(1)/etc/dnscrypt-proxy2/dnscrypt-proxy.toml
+	sed -i 's/^odoh_servers = false/odoh_servers = true/' $(1)/etc/dnscrypt-proxy2/dnscrypt-proxy.toml
+
+	echo "[sources.'odoh-servers']" >> $(1)/etc/dnscrypt-proxy2/dnscrypt-proxy.toml
+	echo "urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md']" >> $(1)/etc/dnscrypt-proxy2/dnscrypt-proxy.toml
+	echo "minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'" >> $(1)/etc/dnscrypt-proxy2/dnscrypt-proxy.toml
+	echo "cache_file = 'odoh-servers.md'" >> $(1)/etc/dnscrypt-proxy2/dnscrypt-proxy.toml
+endef
+
+define Package/dnscrypt-proxy2/description
+  A flexible DNS proxy, with support for modern encrypted DNS protocols
+  such as DNSCrypt v2 and DNS-over-HTTPS.
+endef
+
+define Package/dnscrypt-proxy2/conffiles
+/etc/dnscrypt-proxy2/dnscrypt-proxy.toml
+endef
+
+define Package/golang-github-jedisct1-dnscrypt-proxy2-dev
+$(call Package/dnscrypt-proxy2)
+$(call GoPackage/GoSubMenu)
+  TITLE+= (source files)
+  PKGARCH:=all
+endef
+
+define Package/golang-github-jedisct1-dnscrypt-proxy2-dev/description
+$(call Package/dnscrypt-proxy2/description)
+
+  This package provides the source files for the client/bridge program.
+endef
+
+$(eval $(call GoBinPackage,dnscrypt-proxy2))
+$(eval $(call BuildPackage,dnscrypt-proxy2))
+$(eval $(call GoSrcPackage,golang-github-jedisct1-dnscrypt-proxy2-dev))
+$(eval $(call BuildPackage,golang-github-jedisct1-dnscrypt-proxy2-dev))
diff --git a/dnscrypt-proxy2/files/blocked-names.txt b/dnscrypt-proxy2/files/blocked-names.txt
new file mode 100644
index 00000000..5b16077d
--- /dev/null
+++ b/dnscrypt-proxy2/files/blocked-names.txt
@@ -0,0 +1,38 @@
+
+###########################
+#        Blocklist        #
+###########################
+
+## Rules for name-based query blocking, one per line
+##
+## Example of valid patterns:
+##
+## ads.*         | matches anything with an "ads." prefix
+## *.example.com | matches example.com and all names within that zone such as www.example.com
+## example.com   | identical to the above
+## =example.com  | block example.com but not *.example.com
+## *sex*         | matches any name containing that substring
+## ads[0-9]*     | matches "ads" followed by one or more digits
+## ads*.example* | *, ? and [] can be used anywhere, but prefixes/suffixes are faster
+
+ad.*
+ads.*
+banner.*
+banners.*
+creatives.*
+oas.*
+oascentral.*        # inline comments are allowed after a pound sign
+stats.*
+tag.*
+telemetry.*
+tracker.*
+*.local
+eth0.me
+*.workgroup
+
+
+
+## Time-based rules
+
+# *.youtube.*  @time-to-sleep
+# facebook.com @work
diff --git a/dnscrypt-proxy2/files/dnscrypt-proxy.init b/dnscrypt-proxy2/files/dnscrypt-proxy.init
new file mode 100644
index 00000000..f79412f0
--- /dev/null
+++ b/dnscrypt-proxy2/files/dnscrypt-proxy.init
@@ -0,0 +1,27 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+
+# starts before dnsmasq starts
+START=18
+# stops before networking stops
+STOP=89
+
+PROG=/usr/sbin/dnscrypt-proxy
+CONFIGFILE=/etc/dnscrypt-proxy2/dnscrypt-proxy.toml
+
+start_service() {
+    local mode=$(uci -q get gl-dns.@dns[0].mode)
+    local proto=$(uci -q get gl-dns.@dns[0].proto)
+
+    [ "$mode" = "secure" ] || exit 0
+    [ "$proto" = "DoT" ] && exit 0
+
+    procd_open_instance
+    procd_set_param command "$PROG" -config "$CONFIGFILE"
+    procd_set_param file "$CONFIGFILE"
+    procd_set_param stdout 1
+    procd_set_param stderr 1
+    procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
+    procd_close_instance
+}
diff --git a/dnscrypt-proxy2/files/dnscrypt-proxy2.default b/dnscrypt-proxy2/files/dnscrypt-proxy2.default
new file mode 100644
index 00000000..1829a95f
--- /dev/null
+++ b/dnscrypt-proxy2/files/dnscrypt-proxy2.default
@@ -0,0 +1 @@
+sed 's/odoh_servers = false/odoh_servers = true/' /etc/dnscrypt-proxy2/dnscrypt-proxy.toml
diff --git a/dnscrypt-proxy2/files/odoh-servers.md b/dnscrypt-proxy2/files/odoh-servers.md
new file mode 100644
index 00000000..d568d692
--- /dev/null
+++ b/dnscrypt-proxy2/files/odoh-servers.md
@@ -0,0 +1,107 @@
+# Oblivious DoH servers list
+
+Oblivious DNS-over-HTTPS servers.
+
+Connecting to these can only be done via a relay from the odoh-relays list.
+
+To use that list, add this to the `[sources]` section of your `dnscrypt-proxy.toml` configuration file:
+
+    [sources.'odoh-servers']
+    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/odoh-servers.md', 'https://download.dnscrypt.info/resolvers-list/v3/odoh-servers.md']
+    minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+    cache_file = 'odoh-servers.md'
+
+--
+
+
+## odoh-cloudflare
+
+Cloudflare ODoH server.
+https://cloudflare.com
+
+sdns://BQcAAAAAAAAAF29kb2guY2xvdWRmbGFyZS1kbnMuY29tCi9kbnMtcXVlcnk
+
+
+## odoh-crypto-sx
+
+ODoH target server. Anycast, no logs.
+Backend hosted by Scaleway. Maintained by Frank Denis.
+
+sdns://BQcAAAAAAAAADm9kb2guY3J5cHRvLnN4Ci9kbnMtcXVlcnk
+
+
+## odoh-id-gmail
+
+ODoH target server. Based in Singapore, no logs.
+Filter ads, trackers and malware.
+
+sdns://BQMAAAAAAAAADGRvaC50aWFyLmFwcAUvb2RvaA
+
+
+## odoh-jp.tiar.app
+
+ODoH target server. no logs.
+
+sdns://BQcAAAAAAAAAC2pwLnRpYXIuYXBwBS9vZG9o
+
+
+## odoh-jp.tiarap.org
+
+ODoH target server via Cloudflare, no logs.
+
+sdns://BQcAAAAAAAAADWpwLnRpYXJhcC5vcmcFL29kb2g
+
+
+## odoh-koki-ams
+
+Oblivious DoH target server in The Netherlands. No logs, No filter, DNSSEC.
+
+sdns://BQcAAAAAAAAAGG9kb2gtdGFyZ2V0LmFsZWtiZXJnLm5ldAovZG5zLXF1ZXJ5
+
+
+## odoh-koki-es
+
+Oblivious DoH target server in Spain. No logs, No filter, DNSSEC.
+
+sdns://BQcAAAAAAAAAG29kb2gtdGFyZ2V0LWVzLmFsZWtiZXJnLm5ldAovZG5zLXF1ZXJ5
+
+
+## odoh-koki-noads-ams
+
+Oblivious DoH target server in The Netherlands. No logs, filter ads and malware, DNSSEC.
+
+sdns://BQMAAAAAAAAAHm9kb2gtdGFyZ2V0LW5vYWRzLmFsZWtiZXJnLm5ldAovZG5zLXF1ZXJ5
+
+
+## odoh-koki-noads-se
+
+Oblivious DoH target server in Sweden. No logs, filter ads and malware, DNSSEC.
+
+sdns://BQMAAAAAAAAAIW9kb2gtdGFyZ2V0LW5vYWRzLXNlLmFsZWtiZXJnLm5ldAovZG5zLXF1ZXJ5
+
+
+## odoh-koki-se
+
+Oblivious DoH target server in Sweden. No logs, No filter, DNSSEC.
+
+sdns://BQcAAAAAAAAAG29kb2gtdGFyZ2V0LXNlLmFsZWtiZXJnLm5ldAovZG5zLXF1ZXJ5
+
+
+## odoh-resolver4.dns.openinternet.io
+
+ODoH target server. no logs, no filter, DNSSEC.
+Running on dedicated hardware colocated at Sonic.net in Santa Rosa, CA in the United States.
+
+Uses Sonic's recusrive DNS servers as upstream resolvers (but is not affiliated with Sonic
+in any way). Provided by https://openinternet.io
+
+sdns://BQcAAAAAAAAAHXJlc29sdmVyNC5kbnMub3BlbmludGVybmV0LmlvCi9kbnMtcXVlcnk
+
+
+## odoh-tiarap.org
+
+ODoH target server via Cloudflare, no logs.
+Filter ads, trackers and malware.
+
+sdns://BQMAAAAAAAAADmRvaC50aWFyYXAub3JnBS9vZG9o
+
diff --git a/dnscrypt-proxy2/files/odoh-servers.md.minisig b/dnscrypt-proxy2/files/odoh-servers.md.minisig
new file mode 100644
index 00000000..2e55ab16
--- /dev/null
+++ b/dnscrypt-proxy2/files/odoh-servers.md.minisig
@@ -0,0 +1,4 @@
+untrusted comment: signature from minisign secret key
+RWQf6LRCGA9i5+wcy0YDEua+VeVdt5sxciWHB5PG086bAXiJR+t3LkTJib84DY3R1/7m6QZNQKYLBRD989ogLhMzrPGjCC/VEgQ=
+trusted comment: timestamp:1645350486	file:odoh-servers.md
+T/e949WkqgmbkQt76OSZVX5AP3dPw3WPj7cfsri1RzUTTQiFKngn0GPhgdcJd2SXLxt8onT1y2TTBNTLI95dCQ==
diff --git a/dnscrypt-proxy2/files/public-resolvers.md b/dnscrypt-proxy2/files/public-resolvers.md
new file mode 100644
index 00000000..5eb792b4
--- /dev/null
+++ b/dnscrypt-proxy2/files/public-resolvers.md
@@ -0,0 +1,2827 @@
+# public-resolvers
+
+This is an extensive list of public DNS resolvers supporting the
+DNSCrypt and DNS-over-HTTP2 protocols.
+
+This list is maintained by Frank Denis <j @ dnscrypt [.] info>
+
+Warning: it includes servers that may censor content, servers that don't
+verify DNSSEC records, and servers that will collect and monetize your
+queries.
+
+Adjust the `require_*` options in dnscrypt-proxy to filter that list
+according to your needs.
+
+To use that list, add this to the `[sources]` section of your
+`dnscrypt-proxy.toml` configuration file:
+
+    [sources.'public-resolvers']
+    urls = ['https://raw.githubusercontent.com/DNSCrypt/dnscrypt-resolvers/master/v3/public-resolvers.md', 'https://download.dnscrypt.info/resolvers-list/v3/public-resolvers.md']
+    minisign_key = 'RWQf6LRCGA9i53mlYecO4IzT51TGPpvWucNSCh1CBM0QTaLn73Y7GFO3'
+    cache_file = 'public-resolvers.md'
+
+--
+
+
+## acsacsar-ams-ipv4
+
+Public non-censoring, non-logging, DNSSEC-capable, DNSCrypt-enabled DNS resolver hosted on Scaleway by @acsacsar (twitter)
+
+sdns://AQcAAAAAAAAADTUxLjE1OC4xNjYuOTcgAyfzz5J-mV9G-yOB4Hwcdk7yX12EQs5Iva7kV3oGtlEgMi5kbnNjcnlwdC1jZXJ0LmFjc2Fjc2FyLWFtcy5jb20
+
+
+## acsacsar-ams-ipv6
+
+Public non-censoring, non-logging, DNSSEC-capable, DNSCrypt-enabled DNS resolver hosted on Scaleway by @acsacsar (twitter)
+
+sdns://AQcAAAAAAAAAFlsyMDAxOmJjODoxODI0OjczODo6MV0gAyfzz5J-mV9G-yOB4Hwcdk7yX12EQs5Iva7kV3oGtlEgMi5kbnNjcnlwdC1jZXJ0LmFjc2Fjc2FyLWFtcy5jb20
+
+
+## adfree.usableprivacy.net
+
+Public updns DoH service with advertising, tracker and malware filters.
+Hosted in Europe by @usableprivacy, details see: https://docs.usableprivacy.com
+
+sdns://AgMAAAAAAAAADTc4LjQ3LjE2My4xNDGgzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984YYWRmcmVlLnVzYWJsZXByaXZhY3kubmV0Ci9kbnMtcXVlcnk
+
+
+## adfree.usableprivacy.net-ipv6
+
+Public updns DoH service with advertising, tracker and malware filters.
+Hosted in Europe by @usableprivacy, details see: https://docs.usableprivacy.com
+
+sdns://AgMAAAAAAAAAFlsyYTAxOjRmODoxYzBjOjgzMmQ6Ol2gzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984YYWRmcmVlLnVzYWJsZXByaXZhY3kubmV0Ci9kbnMtcXVlcnk
+
+
+## adguard-dns
+
+Remove ads and protect your computer from malware
+
+Warning: This server is incompatible with anonymization.
+
+sdns://AQMAAAAAAAAAETk0LjE0MC4xNC4xNDo1NDQzINErR_JS3PLCu_iZEIbq95zkSV2LFsigxDIuUso_OQhzIjIuZG5zY3J5cHQuZGVmYXVsdC5uczEuYWRndWFyZC5jb20
+
+
+## adguard-dns-doh
+
+Remove ads and protect your computer from malware (over DoH)
+
+sdns://AgMAAAAAAAAADzE3Ni4xMDMuMTMwLjEzMCCaOjT3J965vKUQA9nOnDn48n3ZxSQpAcK6saROY1oCGQ9kbnMuYWRndWFyZC5jb20KL2Rucy1xdWVyeQ
+
+
+## adguard-dns-family
+
+Adguard DNS with safesearch and adult content blocking
+
+Warning: This server is incompatible with anonymization.
+
+sdns://AQMAAAAAAAAAETk0LjE0MC4xNC4xNTo1NDQzILgxXdexS27jIKRw3C7Wsao5jMnlhvhdRUXWuMm1AFq6ITIuZG5zY3J5cHQuZmFtaWx5Lm5zMS5hZGd1YXJkLmNvbQ
+
+
+## adguard-dns-family-doh
+
+Adguard DNS with safesearch and adult content blocking (over DoH)
+
+sdns://AgMAAAAAAAAADzE3Ni4xMDMuMTMwLjEzMiCaOjT3J965vKUQA9nOnDn48n3ZxSQpAcK6saROY1oCGRZkbnMtZmFtaWx5LmFkZ3VhcmQuY29tCi9kbnMtcXVlcnk
+
+
+## adguard-dns-family-ipv6
+
+Adguard DNS with safesearch and adult content blocking
+
+Warning: This server is incompatible with anonymization.
+
+sdns://AQMAAAAAAAAAGVsyYTEwOjUwYzA6OmJhZDE6ZmZdOjU0NDMguDFd17FLbuMgpHDcLtaxqjmMyeWG-F1FRda4ybUAWrohMi5kbnNjcnlwdC5mYW1pbHkubnMxLmFkZ3VhcmQuY29t
+
+
+## adguard-dns-ipv6
+
+Remove ads and protect your computer from malware
+
+Warning: This server is incompatible with anonymization.
+
+sdns://AQMAAAAAAAAAGFsyYTEwOjUwYzA6OmFkMTpmZl06NTQ0MyDRK0fyUtzywrv4mRCG6vec5EldixbIoMQyLlLKPzkIcyIyLmRuc2NyeXB0LmRlZmF1bHQubnMxLmFkZ3VhcmQuY29t
+
+
+## adguard-dns-unfiltered
+
+AdGuard public DNS servers without filters
+
+Warning: This server is incompatible with anonymization.
+
+sdns://AQMAAAAAAAAAEjk0LjE0MC4xNC4xNDA6NTQ0MyC16ETWuDo-PhJo62gfvqcN48X6aNvWiBQdvy7AZrLa-iUyLmRuc2NyeXB0LnVuZmlsdGVyZWQubnMxLmFkZ3VhcmQuY29t
+
+
+## adguard-dns-unfiltered-ipv6
+
+AdGuard public DNS servers without filters
+
+Warning: This server is incompatible with anonymization.
+
+sdns://AQMAAAAAAAAAFlsyYTEwOjUwYzA6OjE6ZmZdOjU0NDMgtehE1rg6Pj4SaOtoH76nDePF-mjb1ogUHb8uwGay2volMi5kbnNjcnlwdC51bmZpbHRlcmVkLm5zMS5hZGd1YXJkLmNvbQ
+
+
+## ahadns-doh-chi
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in Chicago, USA. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=chi
+
+sdns://AgMAAAAAAAAADTE5My4yOS42Mi4xOTagzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984SZG9oLmNoaS5haGFkbnMubmV0Ci9kbnMtcXVlcnk
+
+
+## ahadns-doh-chi-ipv6
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in Chicago, USA. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=chi
+
+sdns://AgMAAAAAAAAAFFsyNjA1OjQ4NDA6MzpjNDo6YzRdoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOEmRvaC5jaGkuYWhhZG5zLm5ldAovZG5zLXF1ZXJ5
+
+
+## ahadns-doh-in
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in Mumbai, India. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=in
+
+sdns://AgMAAAAAAAAADTQ1Ljc5LjEyMC4yMzOgzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984RZG9oLmluLmFoYWRucy5uZXQKL2Rucy1xdWVyeQ
+
+
+## ahadns-doh-in-ipv6
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in Mumbai, India. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=in
+
+sdns://AgMAAAAAAAAAF1syNDAwOjg5MDQ6ZTAwMTo0Mzo6NDNdoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOEWRvaC5pbi5haGFkbnMubmV0Ci9kbnMtcXVlcnk
+
+
+## ahadns-doh-la
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in Los Angeles, USA. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=la
+
+sdns://AgMAAAAAAAAADTQ1LjY3LjIxOS4yMDigzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984RZG9oLmxhLmFoYWRucy5uZXQKL2Rucy1xdWVyeQ
+
+
+## ahadns-doh-la-ipv6
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in Los Angeles, USA. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=la
+
+sdns://AgMAAAAAAAAAFlsyYTA0OmJkYzc6MTAwOjcwOjo3MF2gzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984RZG9oLmxhLmFoYWRucy5uZXQKL2Rucy1xdWVyeQ
+
+
+## ahadns-doh-nl
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in Amsterdam, Netherlands. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=nl
+
+sdns://AgMAAAAAAAAACTUuMi43NS43NaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhFkb2gubmwuYWhhZG5zLm5ldAovZG5zLXF1ZXJ5
+
+
+## ahadns-doh-nl-ipv6
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in Amsterdam, Netherlands. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=nl
+
+sdns://AgMAAAAAAAAAFlsyYTA0OjUyYzA6MTAxOjc1Ojo3NV2gzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984RZG9oLm5sLmFoYWRucy5uZXQKL2Rucy1xdWVyeQ
+
+
+## ahadns-doh-ny
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in New York. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=ny
+
+sdns://AgMAAAAAAAAADjE4NS4yMTMuMjYuMTg3oMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOEWRvaC5ueS5haGFkbnMubmV0Ci9kbnMtcXVlcnk
+
+
+## ahadns-doh-ny-ipv6
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in New York. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=ny
+
+sdns://AgMAAAAAAAAAE1syYTBkOjU2MDA6MzM6Mzo6M12gzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984RZG9oLm55LmFoYWRucy5uZXQKL2Rucy1xdWVyeQ
+
+
+## ahadns-doh-pl
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in Poland. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=pl
+
+sdns://AgMAAAAAAAAADDQ1LjEzMi43NS4xNqDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhFkb2gucGwuYWhhZG5zLm5ldAovZG5zLXF1ZXJ5
+
+
+## ahadns-doh-pl-ipv6
+
+A zero logging DNS with support for DNS-over-HTTPS (DoH) & DNS-over-TLS (DoT). Blocks ads, malware, trackers, viruses, ransomware, telemetry and more. No persistent logs. DNSSEC. Hosted in Poland. By https://ahadns.com/
+Server statistics can be seen at: https://statistics.ahadns.com/?server=pl
+
+sdns://AgMAAAAAAAAAEVsyYTBlOmRjMDo3OmQ6OmRdoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOEWRvaC5wbC5haGFkbnMubmV0Ci9kbnMtcXVlcnk
+
+
+## alidns-doh
+
+A public DNS resolver that supports DoH/DoT in mainland China, provided by Alibaba-Cloud.
+
+Warning: GFW filtering rules are applied by that resolver.
+
+Homepage: https://alidns.com/
+
+sdns://AgAAAAAAAAAACTIyMy41LjUuNSAUZf-XFWhwvjDwNPWQzx8E3VDwpSDoT4pSfpwaLofrgA5kbnMuYWxpZG5zLmNvbQovZG5zLXF1ZXJ5
+
+
+## altername
+
+Protocol: DNSCrypt | Features: Non-logging, Non-filtering, DNSSEC, EmerDNS | Location: Moscow, Russia
+
+sdns://AQcAAAAAAAAAEDE4NS4yMDQuMi44Ojg0NDMgmfGTecriYs8VCfSDIUo6U6yQ5g98itBT7FWH3yYVB1MZMi5kbnNjcnlwdC1jZXJ0LmFsdGVybmFtZQ
+
+
+## altername-ipv6
+
+Protocol: DNSCrypt IPv6 | Features: Non-logging, Non-filtering, DNSSEC, EmerDNS | Location: Moscow, Russia
+
+sdns://AQcAAAAAAAAAG1syYTA0OjUyMDA6ZmZmNDo6MTNmZl06ODQ0MyCZ8ZN5yuJizxUJ9IMhSjpTrJDmD3yK0FPsVYffJhUHUxkyLmRuc2NyeXB0LWNlcnQuYWx0ZXJuYW1l
+
+
+## ams-ads-doh-nl
+
+Resolver in Amsterdam. DoH protocol. Non-logging. Blocks ads, malware and trackers. DNSSEC enabled.
+
+sdns://AgMAAAAAAAAADTUxLjE1LjEyNC4yMDgAGGRuc25sLW5vYWRzLmFsZWtiZXJnLm5ldAovZG5zLXF1ZXJ5
+
+
+## ams-dnscrypt-nl
+
+Resolver in Amsterdam. Dnscrypt protocol. Non-logging, non-filtering, DNSSEC.
+
+sdns://AQcAAAAAAAAADTUxLjE1LjEyNC4yMDggvBOI9XY-Pex18ckPyRW_torq3-scRfaYUYBjnGDn8WIfMi5kbnNjcnlwdC1jZXJ0LmFtcy1kbnNjcnlwdC1ubA
+
+
+## ams-dnscrypt-nl-ipv6
+
+Resolver in Amsterdam. Dnscrypt protocol. Non-logging, non-filtering, DNSSEC.
+
+sdns://AQcAAAAAAAAAF1syMDAxOmJjODoxODMwOjIwMTg6OjFdILwTiPV2Pj3sdfHJD8kVv7aK6t_rHEX2mFGAY5xg5_FiHzIuZG5zY3J5cHQtY2VydC5hbXMtZG5zY3J5cHQtbmw
+
+
+## ams-doh-nl
+
+Resolver in Amsterdam. DoH protocol. Non-logging, non-filtering, DNSSEC.
+
+sdns://AgcAAAAAAAAADTUxLjE1LjEyNC4yMDigzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984SZG5zbmwuYWxla2JlcmcubmV0Ci9kbnMtcXVlcnk
+
+
+## ams-doh-nl-ipv6
+
+Resolver in Amsterdam. DoH protocol. Non-logging, non-filtering, DNSSEC.
+
+sdns://AgcAAAAAAAAAF1syMDAxOmJjODoxODMwOjIwMTg6OjFdoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOEmRuc25sLmFsZWtiZXJnLm5ldAovZG5zLXF1ZXJ5
+
+
+## att
+
+AT&T test DoH server.
+
+sdns://AgQAAAAAAAAAAKBLTrSwdCmLgotcADCVoQtFI_uVHAyINIsJxT5bq6QIoyD2Hldod9qWUClMzLX5bHX8txvaG7xGRjZ8Tr7aidcxjxBkb2h0cmlhbC5hdHQubmV0Ci9kbnMtcXVlcnk
+
+
+## bcn-ads-doh
+
+Resolver in Spain. DoH protocol. Non-logging, remove ads and malware, DNSSEC.
+
+sdns://AgMAAAAAAAAADjE4NS4yNTMuMTU0LjY2ABhkbnNlcy1ub2Fkcy5hbGVrYmVyZy5uZXQKL2Rucy1xdWVyeQ
+
+
+## bcn-dnscrypt
+
+Resolver in Spain. DNSCrypt protocol. Non-logging, non-filtering, DNSSEC.
+
+sdns://AQcAAAAAAAAADjE4NS4yNTMuMTU0LjY2IOAW_iKdfcd9ay9ewR8txQSwT-LP2bcoxGHv4wxTyGtNHDIuZG5zY3J5cHQtY2VydC5iY24tZG5zY3J5cHQ
+
+
+## bcn-doh
+
+Resolver in Spain. DoH protocol. Non-logging, non-filtering, DNSSEC.
+
+sdns://AgcAAAAAAAAADjE4NS4yNTMuMTU0LjY2oMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOEmRuc2VzLmFsZWtiZXJnLm5ldAovZG5zLXF1ZXJ5
+
+
+## bortzmeyer
+
+Non-logging DoH server in France operated by Stéphane Bortzmeyer.
+
+https://www.bortzmeyer.org/doh-bortzmeyer-fr-policy.html
+
+sdns://AgcAAAAAAAAADDE5My43MC44NS4xMaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhFkb2guYm9ydHptZXllci5mcgEv
+
+
+## bortzmeyer-ipv6
+
+Non-logging DoH server in France operated by Stéphane Bortzmeyer (IPv6 only).
+
+https://www.bortzmeyer.org/doh-bortzmeyer-fr-policy.html
+
+sdns://AgcAAAAAAAAAGVsyMDAxOjQxZDA6MzAyOjIyMDA6OjE4MF2gzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984RZG9oLmJvcnR6bWV5ZXIuZnIBLw
+
+
+## brahma-world
+
+DNS-over-HTTPS server. Non Logging, filters ads, trackers and malware. DNSSEC ready, QNAME Minimization, No EDNS Client-Subnet.
+
+Hosted in Stockholm, Sweden. (https://dns.brahma.world)
+
+sdns://AgMAAAAAAAAADjE2LjE3MC4xNTAuMjIxoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOEGRucy5icmFobWEud29ybGQKL2Rucy1xdWVyeQ
+
+
+## brahma-world-ipv6
+
+DNS-over-HTTPS server. Non Logging, filters ads, trackers and malware. DNSSEC ready, QNAME Minimization, No EDNS Client-Subnet.
+
+Hosted in Stockholm, Sweden. (https://dns.brahma.world)
+
+sdns://AgMAAAAAAAAAJ1syYTA1OmQwMTY6YWY4OjQwMDA6NzcxMDo2ZmM6YmRlMzpmZTBlXaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhBkbnMuYnJhaG1hLndvcmxkCi9kbnMtcXVlcnk
+
+
+## circl-doh
+
+DoH server operated by CIRCL, Computer Incident Response Center Luxembourg.
+
+Hosted in Bettembourg, Luxembourg.
+
+sdns://AgYAAAAAAAAADTE4NS4xOTQuOTQuNzEADGRucy5jaXJjbC5sdQovZG5zLXF1ZXJ5
+
+
+## circl-doh-ipv6
+
+DoH server operated by CIRCL, Computer Incident Response Center Luxembourg.
+
+Hosted in Bettembourg, Luxembourg.
+
+sdns://AgYAAAAAAAAAElsyYTAwOjU5ODA6OTQ6OjcxXQAMZG5zLmNpcmNsLmx1Ci9kbnMtcXVlcnk
+
+
+## cisco
+
+Remove your DNS blind spot (DNSCrypt protocol)
+
+Warning: This server is incompatible with anonymization.
+
+Warning: modifies your queries to include a copy of your network
+address when forwarding them to a selection of companies and organizations.
+
+sdns://AQEAAAAAAAAADjIwOC42Ny4yMjAuMjIwILc1EUAgbyJdPivYItf9aR6hwzzI1maNDL4Ev6vKQ_t5GzIuZG5zY3J5cHQtY2VydC5vcGVuZG5zLmNvbQ
+
+
+## cisco-doh
+
+Remove your DNS blind spot (DoH protocol)
+
+Warning: modifies your queries to include a copy of your network
+address when forwarding them to a selection of companies and organizations.
+
+sdns://AgAAAAAAAAAADDE0Ni4xMTIuNDEuMiBoU4_HgY6B0kIqkGBjb6UoKkP2Dc4bumDC1_Orq2YAlw9kb2gub3BlbmRucy5jb20KL2Rucy1xdWVyeQ
+
+
+## cisco-familyshield
+
+Block websites not suitable for children (DNSCrypt protocol)
+
+Warning: modifies your queries to include a copy of your network
+address when forwarding them to a selection of companies and organizations.
+
+Currently incompatible with DNS anonymization.
+
+sdns://AQEAAAAAAAAADjIwOC42Ny4yMjAuMTIzILc1EUAgbyJdPivYItf9aR6hwzzI1maNDL4Ev6vKQ_t5GzIuZG5zY3J5cHQtY2VydC5vcGVuZG5zLmNvbQ
+
+
+## cisco-familyshield-ipv6
+
+Block websites not suitable for children (IPv6)
+
+Warning: This server is incompatible with anonymization.
+
+Warning: modifies your queries to include a copy of your network
+address when forwarding them to a selection of companies and organizations.
+
+sdns://AQEAAAAAAAAAEVsyNjIwOjExOTozNTo6MzVdILc1EUAgbyJdPivYItf9aR6hwzzI1maNDL4Ev6vKQ_t5GzIuZG5zY3J5cHQtY2VydC5vcGVuZG5zLmNvbQ
+
+
+## cisco-ipv6
+
+Cisco OpenDNS over IPv6 (DNSCrypt protocol)
+
+Warning: This server is incompatible with anonymization.
+
+Warning: modifies your queries to include a copy of your network
+address when forwarding them to a selection of companies and organizations.
+
+sdns://AQEAAAAAAAAAD1syNjIwOjA6Y2NjOjoyXSC3NRFAIG8iXT4r2CLX_WkeocM8yNZmjQy-BL-rykP7eRsyLmRuc2NyeXB0LWNlcnQub3BlbmRucy5jb20
+
+
+## cisco-ipv6-doh
+
+Cisco OpenDNS over IPv6 (DoH protocol)
+
+Warning: modifies your queries to include a copy of your network
+address when forwarding them to a selection of companies and organizations.
+
+sdns://AgAAAAAAAAAAEFsyNjIwOjExOTpmYzo6Ml0gaFOPx4GOgdJCKpBgY2-lKCpD9g3OG7pgwtfzq6tmAJcPZG9oLm9wZW5kbnMuY29tCi9kbnMtcXVlcnk
+
+
+## cisco-sandbox
+
+Cisco OpenDNS Sandbox (anycast) - RFC-compliant DNS service without filtering
+
+dnssec/log/no-filter/ecs 146.112.41.4
+
+Warning: This server is incompatible with anonymization.
+
+sdns://AQUAAAAAAAAADDE0Ni4xMTIuNDEuNCC3NRFAIG8iXT4r2CLX_WkeocM8yNZmjQy-BL-rykP7eRsyLmRuc2NyeXB0LWNlcnQub3BlbmRucy5jb20
+
+
+## cleanbrowsing-adult
+
+Blocks access to all adult, pornographic and explicit sites. It does
+not block proxy or VPNs, nor mixed-content sites. Sites like Reddit
+are allowed. Google and Bing are set to the Safe Mode.
+
+Warning: This server is incompatible with anonymization.
+
+By https://cleanbrowsing.org/
+
+sdns://AQMAAAAAAAAAEzE4NS4yMjguMTY4LjEwOjg0NDMgvKwy-tVDaRcfCDLWB1AnwyCM7vDo6Z-UGNx3YGXUjykRY2xlYW5icm93c2luZy5vcmc
+
+
+## cleanbrowsing-adult-ipv6
+
+Blocks access to all adult, pornographic and explicit sites. It does
+not block proxy or VPNs, nor mixed-content sites. Sites like Reddit
+are allowed. Google and Bing are set to the Safe Mode.
+
+Warning: This server is incompatible with anonymization.
+
+By https://cleanbrowsing.org/
+
+sdns://AQMAAAAAAAAAFVsyYTBkOjJhMDA6MTo6MV06ODQ0MyC8rDL61UNpFx8IMtYHUCfDIIzu8Ojpn5QY3HdgZdSPKRFjbGVhbmJyb3dzaW5nLm9yZw
+
+
+## cleanbrowsing-family
+
+Blocks access to all adult, pornographic and explicit sites. It also
+blocks proxy and VPN domains that are used to bypass the filters.
+Mixed content sites (like Reddit) are also blocked. Google, Bing and
+Youtube are set to the Safe Mode.
+
+Warning: This server is incompatible with anonymization.
+
+By https://cleanbrowsing.org/
+
+sdns://AQMAAAAAAAAAFDE4NS4yMjguMTY4LjE2ODo4NDQzILysMvrVQ2kXHwgy1gdQJ8MgjO7w6OmflBjcd2Bl1I8pEWNsZWFuYnJvd3Npbmcub3Jn
+
+
+## cleanbrowsing-family-ipv6
+
+Blocks access to all adult, pornographic and explicit sites. It also
+blocks proxy and VPN domains that are used to bypass the filters.
+Mixed content sites (like Reddit) are also blocked. Google, Bing and
+Youtube are set to the Safe Mode.
+
+Warning: This server is incompatible with anonymization.
+
+By https://cleanbrowsing.org/
+
+sdns://AQMAAAAAAAAAFFsyYTBkOjJhMDA6MTo6XTo4NDQzILysMvrVQ2kXHwgy1gdQJ8MgjO7w6OmflBjcd2Bl1I8pEWNsZWFuYnJvd3Npbmcub3Jn
+
+
+## cleanbrowsing-security
+
+Block access to phishing, malware and malicious domains. It does not block adult content.
+By https://cleanbrowsing.org/
+
+Warning: This server is incompatible with anonymization.
+
+sdns://AQMAAAAAAAAAEjE4NS4yMjguMTY4Ljk6ODQ0MyC8rDL61UNpFx8IMtYHUCfDIIzu8Ojpn5QY3HdgZdSPKRFjbGVhbmJyb3dzaW5nLm9yZw
+
+
+## cloudflare
+
+Cloudflare DNS (anycast) - aka 1.1.1.1 / 1.0.0.1
+
+sdns://AgcAAAAAAAAABzEuMC4wLjEAEmRucy5jbG91ZGZsYXJlLmNvbQovZG5zLXF1ZXJ5
+
+
+## cloudflare-family
+
+Cloudflare DNS (anycast) with malware protection and parental control - aka 1.1.1.3 / 1.0.0.3
+
+sdns://AgMAAAAAAAAABzEuMC4wLjMAGWZhbWlseS5jbG91ZGZsYXJlLWRucy5jb20KL2Rucy1xdWVyeQ
+
+
+## cloudflare-family-ipv6
+
+Cloudflare DNS over IPv6 (anycast) with malware protection and parental control
+
+sdns://AgMAAAAAAAAAFlsyNjA2OjQ3MDA6NDcwMDo6MTExM10AGWZhbWlseS5jbG91ZGZsYXJlLWRucy5jb20KL2Rucy1xdWVyeQ
+sdns://AgMAAAAAAAAAFlsyNjA2OjQ3MDA6NDcwMDo6MTAwM10AGWZhbWlseS5jbG91ZGZsYXJlLWRucy5jb20KL2Rucy1xdWVyeQ
+
+
+## cloudflare-ipv6
+
+Cloudflare DNS over IPv6 (anycast)
+
+sdns://AgcAAAAAAAAAFlsyNjA2OjQ3MDA6NDcwMDo6MTExMV0AIDFkb3QxZG90MWRvdDEuY2xvdWRmbGFyZS1kbnMuY29tCi9kbnMtcXVlcnk
+sdns://AgcAAAAAAAAAFlsyNjA2OjQ3MDA6NDcwMDo6MTAwMV0AIDFkb3QxZG90MWRvdDEuY2xvdWRmbGFyZS1kbnMuY29tCi9kbnMtcXVlcnk
+
+
+## cloudflare-security
+
+Cloudflare DNS (anycast) with malware blocking - aka 1.1.1.2 / 1.0.0.2
+
+sdns://AgMAAAAAAAAABzEuMC4wLjIAG3NlY3VyaXR5LmNsb3VkZmxhcmUtZG5zLmNvbQovZG5zLXF1ZXJ5
+
+
+## cloudflare-security-ipv6
+
+Cloudflare DNS over IPv6 (anycast) with malware blocking
+
+sdns://AgMAAAAAAAAAFlsyNjA2OjQ3MDA6NDcwMDo6MTExMl0AG3NlY3VyaXR5LmNsb3VkZmxhcmUtZG5zLmNvbQovZG5zLXF1ZXJ5
+sdns://AgMAAAAAAAAAFlsyNjA2OjQ3MDA6NDcwMDo6MTAwMl0AG3NlY3VyaXR5LmNsb3VkZmxhcmUtZG5zLmNvbQovZG5zLXF1ZXJ5
+
+
+## comodo-02
+
+Comodo Dome Shield (anycast) - https://cdome.comodo.com/shield/
+
+sdns://AQUAAAAAAAAACjguMjAuMjQ3LjIg0sJUqpYcHsoXmZb1X7yAHwg2xyN5q1J-zaiGG-Dgs7AoMi5kbnNjcnlwdC1jZXJ0LnNoaWVsZC0yLmRuc2J5Y29tb2RvLmNvbQ
+
+
+## controld-block-malware
+
+ControlD Free DNS. Take CONTROL of your Internet. Block unwanted content, bypass geo-restrictions and be more productive. DoH protocol and No logging. - https://controld.com/free-dns
+
+This DNS blocks Malware domains.
+
+sdns://AgMAAAAAAAAACjc2Ljc2LjIuMTEAFGZyZWVkbnMuY29udHJvbGQuY29tAy9wMQ
+
+
+## controld-block-malware-ad
+
+ControlD Free DNS. Take CONTROL of your Internet. Block unwanted content, bypass geo-restrictions and be more productive. DoH protocol and No logging. - https://controld.com/free-dns
+
+This DNS blocks Malware, Ads & Tracking domains.
+
+sdns://AgMAAAAAAAAACjc2Ljc2LjIuMTEAFGZyZWVkbnMuY29udHJvbGQuY29tAy9wMg
+
+
+## controld-block-malware-ad-social
+
+ControlD Free DNS. Take CONTROL of your Internet. Block unwanted content, bypass geo-restrictions and be more productive. DoH protocol and No logging. - https://controld.com/free-dns
+
+This DNS blocks Malware, Ads & Tracking and Social Networks domains.
+
+sdns://AgMAAAAAAAAACjc2Ljc2LjIuMTEAFGZyZWVkbnMuY29udHJvbGQuY29tAy9wMw
+
+
+## controld-family-friendly
+
+ControlD Free DNS. Take CONTROL of your Internet. Block unwanted content, bypass geo-restrictions and be more productive. DoH protocol and No logging. - https://controld.com/free-dns
+
+This DNS blocks Malware, Ads & Tracking, Adult Content and Drugs domains.
+
+sdns://AgMAAAAAAAAACjc2Ljc2LjIuMTEAFGZyZWVkbnMuY29udHJvbGQuY29tBy9mYW1pbHk
+
+
+## controld-uncensored
+
+ControlD Free DNS. Take CONTROL of your Internet. Block unwanted content, bypass geo-restrictions and be more productive. DoH protocol and No logging. - https://controld.com/free-dns
+
+This DNS unblocks censored domains from various countries.
+
+sdns://AgcAAAAAAAAACjc2Ljc2LjIuMTEAFGZyZWVkbnMuY29udHJvbGQuY29tCy91bmNlbnNvcmVk
+
+
+## controld-unfiltered
+
+ControlD Free DNS. Take CONTROL of your Internet. Block unwanted content, bypass geo-restrictions and be more productive. DoH protocol and No logging. - https://controld.com/free-dns
+
+This is a Unfiltered DNS, no DNS record blocking or manipulation here, if you want to block Malware, Ads & Tracking or Social Network domains, use the other ControlD DNS configs.
+
+sdns://AgcAAAAAAAAACjc2Ljc2LjIuMTEAFGZyZWVkbnMuY29udHJvbGQuY29tAy9wMA
+
+
+## cs-austria
+
+Wien, Austria DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTk0LjE5OC40MS4yMzUgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-barcelona
+
+Barcelona, Spain DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjM3LjEyMC4xNDIuMTE1IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-belgium
+
+Brussels, Belgium DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTM3LjEyMC4yMzYuMTEgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-berlin
+
+Berlin, Germany DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTM3LjEyMC4yMTcuNzUgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-brazil
+
+Sao Paulo, Brazil DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjE3Ny41NC4xNDUuMTMxIDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-bulgaria
+
+Sofia, Bulgaria DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjM3LjEyMC4xNTIuMjM1IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-ch
+
+Switzerland DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAACzgxLjE3LjMxLjM0IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-czech
+
+Prague, Czech Republic DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADzIxNy4xMzguMjIwLjI0MyAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-dc
+
+US - Washington, DC DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADDE5OC43LjU4LjIyNyAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-de
+
+Frankfurt, Germany DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAACzE0Ni43MC44Mi4zIDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-dk
+
+Denmark DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTM3LjEyMC4yMzIuNDMgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-dus1
+
+Dusseldorf, Germany 1 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjIxMy4yMDIuMjE2LjEyIDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-dus2
+
+Dusseldorf, Germany 2 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADzIxMy4yMDIuMjE2LjIzNiAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-dus3
+
+Dusseldorf, Germany 3 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjg5LjE2My4yMjEuMTgxIDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-dus4
+
+Dusseldorf, Germany 4 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjg1LjExNC4xMzguMTE5IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-finland
+
+Finland DNSCrypt server provided by https://cryptostorm.is
+
+sdns://AQIAAAAAAAAADjE4NS4xMTcuMTE4LjIwIDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-fl
+
+US - Miami, FL DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADDIzLjE5LjExNy41NSAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-fl2
+
+US - Miami, FL 2 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADDIzLjE5LjExNy41MSAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-fr
+
+France DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTE2My4xNzIuMzQuNTYgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-ga
+
+US - Atlanta, GA DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTY0LjQyLjE4MS4yMjcgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-hungary
+
+Budapest, Hungary DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTg2LjEwNi43NC4yMTkgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-il
+
+US - Chicago, IL DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjE3My4yMzQuNTYuMTE1IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-il2
+
+US - Chicago, IL 2 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjE3Mi4xMDcuMTk5LjE5IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-india
+
+India DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADzE2NS4yMzEuMjUzLjE2MyAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-ireland
+
+Dublin, Ireland DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjM3LjEyMC4yMzUuMTg3IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-is
+
+Iceland DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTgyLjIyMS4xMjguNDQgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-la
+
+US - Los Angeles, CA DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADDIzLjE5LjY3LjExNiAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-london
+
+London, England DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTc4LjEyOS4xNDAuNjUgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-lv
+
+Latvia DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADzEwOS4yNDguMTQ5LjEzMyAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-madrid
+
+Madrid, Spain DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjE4NS4xODMuMTA2LjgzIDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-manchester
+
+Manchester, England DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTE5NS4xMi40OC4xNzEgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-md
+
+Moldova DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjE3OC4xNzUuMTI5LjE2IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-mexico
+
+Mexico City, Mexico DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTEwMy4xNC4yNi4xOTAgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-milan
+
+Milan, Italy DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADzIxNy4xMzguMjE5LjIxOSAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-montreal
+
+Montreal, Canada DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjE2Ny4xMTQuODQuMTMyIDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-montreal2
+
+Montreal, Canada 2 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADzE0NC4xNjguMTY1LjE2MyAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-nc
+
+US - North Carolina DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjE1NS4yNTQuMjEuMjUwIDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-nl
+
+Netherlands DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTE4NS4xMDcuODAuODQgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-nl2
+
+Netherlands 2 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADzE3Mi4xMDcuMjI2LjEwNyAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-norway
+
+Oslo, Norway DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjkxLjIxOS4yMTUuMjI3IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-nv
+
+US - Las Vegas, NV DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADDM3LjEyMC4xNDcuMiAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-nyc1
+
+US - New York City, NY 1 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADDIzLjE5LjI0NS44OCAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-nyc2
+
+US - New York City, NY 2 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADDIzLjE5LjI0NS44NCAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-ore
+
+US - Oregon DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTEwNC4yNTUuMTc1LjIgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-poland
+
+Warsaw, Poland DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTM3LjEyMC4yMTEuOTEgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-pt
+
+Portugal DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjkxLjIwNS4yMzAuMjI0IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-ro
+
+Romania DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTE0Ni43MC42Ni4yMjcgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-rome
+
+Rome, Italy DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjM3LjEyMC4yMDcuMTMxIDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-sea
+
+US - Seattle, WA DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADDY0LjEyMC41LjI1MSAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-serbia
+
+Belgrade, Serbia DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjM3LjEyMC4xOTMuMjE5IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-sk
+
+South Korea DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADzE3Mi4xMDcuMTU0LjIxMSAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-slovakia
+
+Bratislava, Slovakia DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjE5My4zNy4yNTUuMjI3IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-swe
+
+Sweden DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADzEyOC4xMjcuMTA0LjEwOCAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-sydney
+
+Sydney, Australia DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADjM3LjEyMC4yMzQuMjUxIDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-tokyo
+
+Tokyo, Japan DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADDE0Ni43MC4zMS40MyAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cs-tx
+
+US - Dallas, TX DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADTIwOS41OC4xNDcuMzYgMTNyrVlWMsJBa4cvCY-FG925ZShMbL6aTxkJZDDbqVoeMi5kbnNjcnlwdC1jZXJ0LmNyeXB0b3N0b3JtLmlz
+
+
+## cs-tx2
+
+US - Dallas, TX 2 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAACzQ1LjM1LjM1Ljk5IDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-tx3
+
+US - Dallas, TX 3 DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAACzQ1LjM1LjcyLjQzIDEzcq1ZVjLCQWuHLwmPhRvduWUoTGy-mk8ZCWQw26laHjIuZG5zY3J5cHQtY2VydC5jcnlwdG9zdG9ybS5pcw
+
+
+## cs-vancouver
+
+Vancouver, Canada DNSCrypt server provided by https://cryptostorm.is/
+
+sdns://AQIAAAAAAAAADDcxLjE5LjI1MS4zNCAxM3KtWVYywkFrhy8Jj4Ub3bllKExsvppPGQlkMNupWh4yLmRuc2NyeXB0LWNlcnQuY3J5cHRvc3Rvcm0uaXM
+
+
+## cz.nic
+
+CZ.NIC's open DNSSEC validating resolvers in Prague, Czech Republic.
+CZ.NIC resolvers neither collect any personal data nor gather
+information on pages where your computer sends personal data.
+https://www.nic.cz/odvr/
+
+sdns://AgcAAAAAAAAADDE4NS40My4xMzUuMaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zgtvZHZyLm5pYy5jegQvZG9o
+
+
+## cz.nic-ipv6
+
+CZ.NIC's open DNSSEC validating resolvers in Prague, Czech Republic (IPv6 only).
+CZ.NIC resolvers neither collect any personal data nor gather
+information on pages where your computer sends personal data.
+https://www.nic.cz/odvr/
+
+sdns://AgcAAAAAAAAAE1syMDAxOjE0OGY6ZmZmZTo6MV2gzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984Lb2R2ci5uaWMuY3oEL2RvaA
+
+
+## d0wn-tz-ns1
+
+Server provided by Martin 'd0wn' Albus
+
+sdns://AQcAAAAAAAAACzQxLjc5LjY5LjEzINYGFfvRRTuhTnaKPlxcs6wXRhMxRj2gr4z33wTaTXVtGzIuZG5zY3J5cHQtY2VydC50ei5kMHduLmJpeg
+
+
+## d0wn-tz-ns1-ipv6
+
+Server provided by Martin 'd0wn' Albus
+
+sdns://AQcAAAAAAAAAGFsyYzBmOmZkYTg6NTo6MmVkMTpkMmVjXSDWBhX70UU7oU52ij5cXLOsF0YTMUY9oK-M998E2k11bRsyLmRuc2NyeXB0LWNlcnQudHouZDB3bi5iaXo
+
+
+## dct-at1
+
+DNSCrypt | IPv4 only | Non-logging | Non-filtering | DNSSEC | Vienna, Austria.
+
+sdns://AQcAAAAAAAAADDgzLjEzOC41NS4zNiBODx7VDHmrdwypnwyTGYbrznR8UddwTB13_uABxZynrBcyLmRuc2NyeXB0LWNlcnQuZGN0LWRlMQ
+
+
+## dct-de1
+
+DNSCrypt | IPv4 only | Non-logging | Non-filtering | DNSSEC | Düsseldorf, Germany.
+
+sdns://AQcAAAAAAAAAFDEwMy4xNTguMjIzLjE2Mjo4NDQzIB9z-95JSBqhYTv8UIQqUs65Ym2DYNXzBf5cN-kH8Pt9FzIuZG5zY3J5cHQtY2VydC5kY3QtZGUx
+
+
+## dct-ru1
+
+DNSCrypt | IPv4 only | Non-logging | Non-filtering | DNSSEC | Moscow, Russia.
+
+sdns://AQcAAAAAAAAADTE4NS4yMi4xNTQuMTkgH3P73klIGqFhO_xQhCpSzrlibYNg1fMF_lw36Qfw-30XMi5kbnNjcnlwdC1jZXJ0LmRjdC1ydTE
+
+
+## decloudus-nogoogle-tst
+
+Servers helps you deGoogle and unGoogle by completely blocking Google tracking in addition to annoying ads, online trackers, and malware. Supports DNSSEC. No Logs.
+
+Contributed by: https://decloudus.com
+
+sdns://AQMAAAAAAAAAEjE3Ni45LjE5OS4xNTg6ODQ0MyD73Ye9XeCsS7TdFu9fRP7s5k-0aL91yygulGVmeOAKLh4yLmRuc2NyeXB0LWNlcnQuRGVDbG91ZFVzLXRlc3Q
+
+
+## decloudus-nogoogle-tstipv6
+
+Servers helps you deGoogle and unGoogle by completely blocking Google tracking in addition to annoying ads, online trackers, and malware. Supports DNSSEC. No Logs. For IPv6.
+
+Contributed by: https://decloudus.com
+
+sdns://AQMAAAAAAAAAG1syYTAxOjRmODoxNTE6MTFiMDo6M106ODQ0MyD73Ye9XeCsS7TdFu9fRP7s5k-0aL91yygulGVmeOAKLh4yLmRuc2NyeXB0LWNlcnQuRGVDbG91ZFVzLXRlc3Q
+
+
+## deffer-dns.au
+
+DNSSEC/Non-logged/Uncensored in Sydney (AWS).
+Encrypted DNS Server image by jedisct1, maintaned by DeffeR.
+
+sdns://AQcAAAAAAAAADTUyLjY1LjIzNS4xMjkg5Q00RDDBkwx3fUaa0_etjz4iH3lLBOqsg95bYDmV07MdMi5kbnNjcnlwdC1jZXJ0LmRlZmZlci1kbnMuYXU
+
+
+## dns.b33.network-dnscrypt
+
+DNSCrypt | IPv4 only | Non-logging | DNSSEC | Blocks ads, malware, trackers, viruses, ransomware, telemetry and more | hosted on OVH | Location: Paris, France | Maintained by 0xb33 - (https://github.com/0xb33)
+
+sdns://AQMAAAAAAAAAEjE2Mi4xOS4xMjkuMjA6NTQ0MyBLAxD2I-nLlzrjDQhX_eNLqCb-_DIIEiH7MBG2gbliLRsyLmRuc2NyeXB0LWNlcnQuYjMzLm5ldHdvcms
+
+
+## dns.digitale-gesellschaft.ch
+
+Public DoH resolver operated by the Digital Society (https://www.digitale-gesellschaft.ch).
+Hosted in Zurich, Switzerland.
+
+Non-logging, non-filtering, supports DNSSEC.
+
+sdns://AgcAAAAAAAAADTE4NS45NS4yMTguNDKgzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984cZG5zLmRpZ2l0YWxlLWdlc2VsbHNjaGFmdC5jaAovZG5zLXF1ZXJ5
+
+
+## dns.digitale-gesellschaft.ch-2
+
+Public DoH resolver operated by the Digital Society (https://www.digitale-gesellschaft.ch).
+Hosted in Zurich, Switzerland.
+
+Non-logging, non-filtering, supports DNSSEC.
+
+sdns://AgcAAAAAAAAADTE4NS45NS4yMTguNDOgzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984cZG5zLmRpZ2l0YWxlLWdlc2VsbHNjaGFmdC5jaAovZG5zLXF1ZXJ5
+
+
+## dns.digitale-gesellschaft.ch-ipv6
+
+Public IPv6 DoH resolver operated by the Digital Society (https://www.digitale-gesellschaft.ch).
+Hosted in Zurich, Switzerland.
+
+Non-logging, non-filtering, supports DNSSEC.
+
+sdns://AgcAAAAAAAAAD1syYTA1OmZjODQ6OjQyXaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhxkbnMuZGlnaXRhbGUtZ2VzZWxsc2NoYWZ0LmNoCi9kbnMtcXVlcnk
+
+
+## dns.digitale-gesellschaft.ch-ipv6-2
+
+Public IPv6 DoH resolver operated by the Digital Society (https://www.digitale-gesellschaft.ch).
+Hosted in Zurich, Switzerland.
+
+Non-logging, non-filtering, supports DNSSEC.
+
+sdns://AgcAAAAAAAAAD1syYTA1OmZjODQ6OjQzXaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhxkbnMuZGlnaXRhbGUtZ2VzZWxsc2NoYWZ0LmNoCi9kbnMtcXVlcnk
+
+
+## dns.digitalsize.net
+
+A public, non-tracking, non-filtering DNS resolver with DNSSEC enabled and hosted in Germany (https://dns.digitalsize.net)
+
+sdns://AgcAAAAAAAAADjE2Mi41NS4xNTkuMjAyoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOE2Rucy5kaWdpdGFsc2l6ZS5uZXQKL2Rucy1xdWVyeQ
+
+
+## dns.digitalsize.net-ipv6
+
+A public, non-tracking, non-filtering DNS resolver with DNSSEC enabled and hosted in Germany (https://dns.digitalsize.net)
+
+sdns://AgcAAAAAAAAAFlsyYTAxOjRmODoxYzFkOmYxNDo6MV2gzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984TZG5zLmRpZ2l0YWxzaXplLm5ldAovZG5zLXF1ZXJ5
+
+
+## dns.ryan-palmer
+
+Non-logging, non-filtering, DNSSEC DoH Server. Hosted in the UK.
+
+sdns://AgcAAAAAAAAADjY4LjE4My4yNTMuMjAwoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOFGRuczEucnlhbi1wYWxtZXIuY29tCi9kbnMtcXVlcnk
+
+
+## dns.sb
+
+DNSSEC-enabled DoH server by https://xtom.com/
+https://dns.sb/doh/
+
+sdns://AgcAAAAAAAAADzE4NS4yMjIuMjIyLjIyMiACKC69_nqGQOLLyjCQJNWgwRXTVfrgMllhwr12J14JbAZkb2guc2IKL2Rucy1xdWVyeQ
+
+
+## dns.sb-ipv6
+
+DNSSEC-enabled DoH server by https://xtom.com/ - IPv6
+https://dns.sb/doh/
+
+sdns://AgcAAAAAAAAACFsyYTA5OjpdIAIoLr3-eoZA4svKMJAk1aDBFdNV-uAyWWHCvXYnXglsBmRvaC5zYgovZG5zLXF1ZXJ5
+
+
+## dns.therifleman.name
+
+DNS-over-HTTPS DNS forwarder from Mumbai, India. Blocks web and Android trackers and ads.
+IP addresses are not logged, but queries are logged for 24 hours for debugging.
+Report issues, send suggestions @ joker349 at protonmail.com.
+Also supports DoT (for android) @ dns.therifleman.name and plain DNS @ 172.104.206.174
+
+sdns://AgMAAAAAAAAADzE3Mi4xMDQuMjA2LjE3NKDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhRkbnMudGhlcmlmbGVtYW4ubmFtZQovZG5zLXF1ZXJ5
+
+
+## dns.watch
+
+Free, uncensored, non-logging server in Germany.
+https://dns.watch
+
+sdns://AQcAAAAAAAAADDg0LjIwMC43MC40MCBATVoA32LgIUTsC0hxmLlKGa_o5PRngHyldrEei5T5sCMyLmRuc2NyeXB0LWNlcnQucmVzb2x2ZXIyLmRucy53YXRjaA
+
+
+## dns.watch-ipv6
+
+Free, uncensored, non-logging server in Germany. IPv6 only.
+https://dns.watch
+
+sdns://AQcAAAAAAAAAHFsyMDAxOjE2MDg6MTA6MjU6OjkyNDk6ZDY5Yl0gQE1aAN9i4CFE7AtIcZi5Shmv6OT0Z4B8pXaxHouU-bAjMi5kbnNjcnlwdC1jZXJ0LnJlc29sdmVyMi5kbnMud2F0Y2g
+
+
+## dnscrypt-ch-blahdns-ipv4
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Switzerland. By https://blahdns.com/
+
+sdns://AQMAAAAAAAAAETQ1LjkxLjkyLjEyMTo4NDQzIIUTqWvE4INLlQ1jtQLo0-LVTQSWayYCkzTpBx26I_wrGzIuZG5zY3J5cHQtY2VydC5ibGFoZG5zLmNvbQ
+
+
+## dnscrypt-ch-blahdns-ipv6
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Switzerland. By https://blahdns.com/
+
+sdns://AQMAAAAAAAAAF1syYTBlOmRjMDo2OjIzOjoyXTo4NDQzIIUTqWvE4INLlQ1jtQLo0-LVTQSWayYCkzTpBx26I_wrGzIuZG5zY3J5cHQtY2VydC5ibGFoZG5zLmNvbQ
+
+
+## dnscrypt-de-blahdns-ipv4
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Germany. By https://blahdns.com/
+
+sdns://AQMAAAAAAAAAEjc4LjQ2LjI0NC4xNDM6ODQ0MyCFE6lrxOCDS5UNY7UC6NPi1U0ElmsmApM06QcduiP8KxsyLmRuc2NyeXB0LWNlcnQuYmxhaGRucy5jb20
+
+
+## dnscrypt-de-blahdns-ipv6
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Germany. By https://blahdns.com/
+
+sdns://AQMAAAAAAAAAG1syYTAxOjRmODpjMTc6ZWM2Nzo6MV06ODQ0MyCFE6lrxOCDS5UNY7UC6NPi1U0ElmsmApM06QcduiP8KxsyLmRuc2NyeXB0LWNlcnQuYmxhaGRucy5jb20
+
+
+## dnscrypt-sg-blahdns-ipv4
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Singapore. By https://blahdns.com/
+
+sdns://AQMAAAAAAAAAEzE5Mi41My4xNzUuMTQ5Ojg0NDMghROpa8Tgg0uVDWO1AujT4tVNBJZrJgKTNOkHHboj_CsbMi5kbnNjcnlwdC1jZXJ0LmJsYWhkbnMuY29t
+
+
+## dnscrypt-sg-blahdns-ipv6
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Singapore. By https://blahdns.com/
+
+sdns://AQMAAAAAAAAAJVsyNDAwOjg5MDE6OmYwM2M6OTJmZjpmZTI3Ojg3MGFdOjg0NDMghROpa8Tgg0uVDWO1AujT4tVNBJZrJgKTNOkHHboj_CsbMi5kbnNjcnlwdC1jZXJ0LmJsYWhkbnMuY29t
+
+
+## dnscrypt.be
+
+Resolver in Leuven, Belgium (UCLL Campus Proximus). Non-logging/DNSSEC/Uncensored. https://dnscrypt.be
+Maintained by Sigfried (https://sigfried.be) hosted by ISW Leuven (https://iswleuven.be).
+
+sdns://AQcAAAAAAAAADzE5My4xOTEuMTg3LjEwNyAzWmXOT_I8k2BKJzxIJ_iYoXRQRWcR0Q1FFyrJWtvogxsyLmRuc2NyeXB0LWNlcnQuZG5zY3J5cHQuYmU
+
+
+## dnscrypt.ca-1
+
+Free, Canadian, uncensored, no-logs, encrypted, and DNSSEC validated DNS service for your pleasure. https://dnscrypt.ca/
+
+sdns://AQcAAAAAAAAADzE2Ny4xMTQuMjIwLjEyNSAaU6PJUHicvdELGTOkaJtshGpA8bc9F1KuysmCnst84h0yLmRuc2NyeXB0LWNlcnQuZG5zY3J5cHQuY2EtMQ
+
+
+## dnscrypt.ca-1-doh
+
+Free, Canadian, uncensored, no-logs, encrypted, and DNSSEC validated DNS service for your pleasure. https://dnscrypt.ca/
+
+sdns://AgcAAAAAAAAAEzE2Ny4xMTQuMjIwLjEyNTo0NTOgzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984UZG5zMS5kbnNjcnlwdC5jYTo0NTMKL2Rucy1xdWVyeQ
+
+
+## dnscrypt.ca-1-doh-ipv6
+
+Free, Canadian, uncensored, no-logs, encrypted, and DNSSEC validated DNS service for your pleasure. https://dnscrypt.ca/
+
+sdns://AgcAAAAAAAAAKVsyNjA3OjUzMDA6NjE6OTVmOjcyODM6MTFkOTpmODY6ZTY4OV06NDUzoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOGWRuczEuaXB2Ni5kbnNjcnlwdC5jYTo0NTMKL2Rucy1xdWVyeQ
+
+
+## dnscrypt.ca-1-ipv6
+
+Free, Canadian, uncensored, no-logs, encrypted, and DNSSEC validated DNS service for your pleasure. https://dnscrypt.ca/
+
+sdns://AQcAAAAAAAAAJVsyNjA3OjUzMDA6NjE6OTVmOjcyODM6MTFkOTpmODY6ZTY4OV0gINkZ1Ow8UAjNxwpR6itPy_6KmTxkMdDsaB1epzhFq4AiMi5kbnNjcnlwdC1jZXJ0LmRuc2NyeXB0LmNhLTEtaXB2Ng
+
+
+## dnscrypt.ca-2
+
+Free, Canadian, uncensored, no-logs, encrypted, and DNSSEC validated DNS service for your pleasure. https://dnscrypt.ca/
+
+sdns://AQcAAAAAAAAADTE0OS41Ni4yMjguNDUgAQhUqztWp-7505FY_vaCC_-TojV8iRYI254V07vgEYUdMi5kbnNjcnlwdC1jZXJ0LmRuc2NyeXB0LmNhLTI
+
+
+## dnscrypt.ca-2-doh
+
+Free, Canadian, uncensored, no-logs, encrypted, and DNSSEC validated DNS service for your pleasure. https://dnscrypt.ca/
+
+sdns://AgcAAAAAAAAAETE0OS41Ni4yMjguNDU6NDUzoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOFGRuczIuZG5zY3J5cHQuY2E6NDUzCi9kbnMtcXVlcnk
+
+
+## dnscrypt.ca-2-doh-ipv6
+
+Free, Canadian, uncensored, no-logs, encrypted, and DNSSEC validated DNS service for your pleasure. https://dnscrypt.ca/
+
+sdns://AgcAAAAAAAAAKVsyNjA3OjUzMDA6NjE6OTVmOjcyODM6MTFkOTpmODY6ZTY5MF06NDUzoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOGWRuczIuaXB2Ni5kbnNjcnlwdC5jYTo0NTMKL2Rucy1xdWVyeQ
+
+
+## dnscrypt.ca-2-ipv6
+
+Free, Canadian, uncensored, no-logs, encrypted, and DNSSEC validated DNS service for your pleasure. https://dnscrypt.ca/
+
+sdns://AQcAAAAAAAAAJVsyNjA3OjUzMDA6NjE6OTVmOjcyODM6MTFkOTpmODY6ZTY5MF0gmHxwqJfb2hUaNK1LVeqADvVhzASq1cV90sPYYfwX9CkiMi5kbnNjcnlwdC1jZXJ0LmRuc2NyeXB0LmNhLTItaXB2Ng
+
+
+## dnscrypt.eu-nl
+
+Free, non-logged, uncensored. Hosted by RamNode.
+
+sdns://AQcAAAAAAAAADjE3Ni41Ni4yMzcuMTcxIGfADywhxVSBRd18tGonGvLrlpkxQKMJtiuNFlMRhZxmJTIuZG5zY3J5cHQtY2VydC5yZXNvbHZlcjEuZG5zY3J5cHQuZXU
+
+
+## dnscrypt.eu-nl-ipv6
+
+Free, non-logged, uncensored. Hosted by RamNode.
+
+sdns://AQcAAAAAAAAAGlsyYTAwOmQ4ODA6MzoxOjphNmMxOjJlODldIGfADywhxVSBRd18tGonGvLrlpkxQKMJtiuNFlMRhZxmJTIuZG5zY3J5cHQtY2VydC5yZXNvbHZlcjEuZG5zY3J5cHQuZXU
+
+
+## dnscrypt.pl
+
+Free | No filtering | Zero logs | DNSSEC | Poland | https://dnscrypt.pl/ | @dnscryptpl
+
+sdns://AQcAAAAAAAAAFDE3OC4yMTYuMjAxLjEyODoyMDUzIH9hfLgepVPSNMSbwnnHT3tUmAUNHb8RGv7mmWPGR6FpGzIuZG5zY3J5cHQtY2VydC5kbnNjcnlwdC5wbA
+
+
+## dnscrypt.pl-guardian
+
+Free | Malware and phishing filtering | Zero logs | DNSSEC | Poland | https://dnscrypt.pl/ | @dnscryptpl
+
+sdns://AQMAAAAAAAAAFDE3OC4yMTYuMjAxLjEyODoyMDU0IH9hfLgepVPSNMSbwnnHT3tUmAUNHb8RGv7mmWPGR6FpGzIuZG5zY3J5cHQtY2VydC5kbnNjcnlwdC5wbA
+
+
+## dnscrypt.uk-doh-ipv4
+
+DoH, no logs, uncensored, DNSSEC. Hosted in London UK on Digital Ocean
+https://www.dnscrypt.uk
+
+sdns://AgcAAAAAAAAADzE2NS4yMjcuMjMzLjIwMAATZG9oLmRuc2NyeXB0LnVrOjQ0MwovZG5zLXF1ZXJ5
+
+
+## dnscrypt.uk-doh-ipv6
+
+DoH, no logs, uncensored, DNSSEC. Hosted in London UK on Digital Ocean
+https://www.dnscrypt.uk
+
+sdns://AgcAAAAAAAAAGlsyYTAzOmIwYzA6MTpkMDo6ZWJlOmQwMDFdABNkb2guZG5zY3J5cHQudWs6NDQzCi9kbnMtcXVlcnk
+
+
+## dnscrypt.uk-ipv4
+
+DNSCrypt, no logs, uncensored, DNSSEC. Hosted in London UK on Digital Ocean
+https://www.dnscrypt.uk
+
+sdns://AQcAAAAAAAAADTE2NS4yMzIuMzIuOTUgAdMO6A4gTdoYcdOhDyhRVGdlvxS02kQEpP8EbX2paDwbMi5kbnNjcnlwdC1jZXJ0LmRuc2NyeXB0LnVr
+
+
+## dnscrypt.uk-ipv6
+
+DNSCrypt, no logs, uncensored, DNSSEC. Hosted in London UK on Digital Ocean
+https://www.dnscrypt.uk
+
+sdns://AQcAAAAAAAAAGlsyYTAzOmIwYzA6MTplMDo6NDg3OjEwMDFdIAHTDugOIE3aGHHToQ8oUVRnZb8UtNpEBKT_BG19qWg8GzIuZG5zY3J5cHQtY2VydC5kbnNjcnlwdC51aw
+
+
+## dnsforfamily
+
+(DNSCrypt Protocol) Block adult websites, gambling websites, malwares and advertisements.
+It also enforces safe search in: Google, YouTube, Bing, DuckDuckGo and Yandex.
+
+Social websites like Facebook and Instagram are not blocked. No DNS queries are logged.
+
+As of December 2020 2.7 million websites are blocked and new websites are added to blacklist daily.
+Completely free, no ads or any commercial motive. Operating for 3 years now.
+
+Warning: This server is incompatible with anonymization.
+
+Provided by: https://dnsforfamily.com
+
+sdns://AQIAAAAAAAAADDc4LjQ3LjY0LjE2MSATJeLOABXNSYcSJIoqR5_iUYz87Y4OecMLB84aEAKPrRBkbnNmb3JmYW1pbHkuY29t
+
+
+## dnsforfamily-doh
+
+(DoH Protocol) Block adult websites, gambling websites, malwares and advertisements.
+It also enforces safe search in: Google, YouTube, Bing, DuckDuckGo and Yandex.
+Social websites like Facebook and Instagram are not blocked. No DNS queries are logged.
+As of December 2020 2.7 million websites are blocked and new websites are added to blacklist daily.
+Completely free, no ads or any commercial motive. Operating for 3 years now.
+
+Provided by: https://dnsforfamily.com
+
+sdns://AgIAAAAAAAAADTk1LjIxNy4yMTMuOTSgzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984YZG5zLWRvaC5kbnNmb3JmYW1pbHkuY29tCi9kbnMtcXVlcnk
+
+
+## dnsforfamily-doh-no-safe-search
+
+(DoH Protocol) Block adult websites, gambling websites, malwares and advertisements.
+Unlike other dnsforfamily DNSCrypt servers, this one does not enforces safe search. So Google, YouTube, Bing, DuckDuckGo and Yandex are completely accessible without any restriction.
+
+Social websites like Facebook and Instagram are not blocked. No DNS queries are logged.
+
+As of December 2020 2.7 million websites are blocked and new websites are added to blacklist daily.
+Completely free, no ads or any commercial motive. Operating for 3 years now.
+
+Warning: This server is incompatible with anonymization.
+
+Provided by: https://dnsforfamily.com
+
+sdns://AgIAAAAAAAAADTk1LjIxNy4yMTMuOTSgzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984nZG5zLWRvaC1uby1zYWZlLXNlYXJjaC5kbnNmb3JmYW1pbHkuY29tCi9kbnMtcXVlcnk
+
+
+## dnsforfamily-no-safe-search
+
+(DNSCrypt Protocol) Block adult websites, gambling websites, malwares and advertisements.
+Unlike other dnsforfamily DNSCrypt servers, this one does not enforces safe search. So Google, YouTube, Bing, DuckDuckGo and Yandex are completely accessible without any restriction.
+
+Social websites like Facebook and Instagram are not blocked. No DNS queries are logged.
+
+As of December 2020 2.7 million websites are blocked and new websites are added to blacklist daily.
+Completely free, no ads or any commercial motive. Operating for 3 years now.
+
+Warning: This server is incompatible with anonymization.
+
+Provided by: https://dnsforfamily.com
+
+sdns://AQIAAAAAAAAADzEzNS4xODEuMTkzLjIyMiDrxcZ_hFtGE6tfATvQZYjxgl5pTY_e2cRH_ms8bEWofBBkbnNmb3JmYW1pbHkuY29t
+
+
+## dnsforfamily-v6
+
+(DNSCrypt Protocol) Block adult websites, gambling websites, malwares and advertisements.
+It also enforces safe search in: Google, YouTube, Bing, DuckDuckGo and Yandex.
+
+Social websites like Facebook and Instagram are not blocked. No DNS queries are logged.
+As of December 2020 2.7 million websites are blocked and new websites are added to blacklist daily.
+Completely free, no ads or any commercial motive. Operating for 3 years now.
+
+Provided by: https://dnsforfamily.com
+
+sdns://AQIAAAAAAAAAF1syYTAxOjRmODoxYzE3OjRkZjg6OjFdIGN4CrSY4fb2hK8voFJL3GKiM7xQNwkKGH4b0k7LmMPxEGRuc2ZvcmZhbWlseS5jb20
+
+
+## dnsforge.de
+
+Public DoH resolver running with Pihole for Adblocking (https://dnsforge.de).
+
+Non-logging, AD-filtering, supports DNSSEC. Hosted in Germany.
+
+sdns://AgMAAAAAAAAADDE3Ni45LjkzLjE5OKDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zgtkbnNmb3JnZS5kZQovZG5zLXF1ZXJ5
+
+
+## dnshome-doh
+
+https://www.dnshome.de/ public resolver in Germany
+
+sdns://AgYAAAAAAAAAAKDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zg5kbnMuZG5zaG9tZS5kZQovZG5zLXF1ZXJ5
+
+
+## dnspod-doh
+
+A public DNS resolver in mainland China provided by DNSPod (Tencent Cloud).
+
+https://www.dnspod.cn/Products/Public.DNS?lang=en
+
+sdns://AgAAAAAAAAAAACDBlAfoWsQD52fP2oOBh_Ag-lY6yBaIr1EMIqd559RaVgdkb2gucHViCi9kbnMtcXVlcnk
+
+
+## dnswarden-asia-adblock-dcv4
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAAFDIwNy4xNDguMTIwLjI0NDoyMDUzIKaotzxLPX3tRvpH4lDhbTo1cHCL4X-ZhW_Ji6jU8LwyITIuZG5zY3J5cHQtY2VydC5kbnN3YXJkZW4tYWRibG9jaw
+
+
+## dnswarden-asia-adblock-dcv6
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAALVsyMDAxOjE5ZjA6NDQwMDo0ZGUyOjU0MDA6M2ZmOmZlYTk6ZDQxOF06MjA1MyCmqLc8Sz197Ub6R-JQ4W06NXBwi-F_mYVvyYuo1PC8MiEyLmRuc2NyeXB0LWNlcnQuZG5zd2FyZGVuLWFkYmxvY2s
+
+
+## dnswarden-asia-adblock-dohv4
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAADzIwNy4xNDguMTIwLjI0NCCUatENG1QLfgjhzgopuDy_zcpf4bCem4u7DleuxzCFaRZkb2guYXNpYS5kbnN3YXJkZW4uY29tCC9hZGJsb2Nr
+
+
+## dnswarden-asia-adblock-dohv6
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAAKFsyMDAxOjE5ZjA6NDQwMDo0ZGUyOjU0MDA6M2ZmOmZlYTk6ZDQxOF0glGrRDRtUC34I4c4KKbg8v83KX-GwnpuLuw5XrscwhWkWZG9oLmFzaWEuZG5zd2FyZGVuLmNvbQgvYWRibG9jaw
+
+
+## dnswarden-asia-adultfilter-dcv4
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAAFDIwNy4xNDguMTIwLjI0NDo1MzUzIKaotzxLPX3tRvpH4lDhbTo1cHCL4X-ZhW_Ji6jU8LwyJTIuZG5zY3J5cHQtY2VydC5kbnN3YXJkZW4tYWR1bHRmaWx0ZXI
+
+
+## dnswarden-asia-adultfilter-dcv6
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAALVsyMDAxOjE5ZjA6NDQwMDo0ZGUyOjU0MDA6M2ZmOmZlYTk6ZDQxOF06NTM1MyCmqLc8Sz197Ub6R-JQ4W06NXBwi-F_mYVvyYuo1PC8MiUyLmRuc2NyeXB0LWNlcnQuZG5zd2FyZGVuLWFkdWx0ZmlsdGVy
+
+
+## dnswarden-asia-adultfilter-dohv4
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAADzIwNy4xNDguMTIwLjI0NCCUatENG1QLfgjhzgopuDy_zcpf4bCem4u7DleuxzCFaRZkb2guYXNpYS5kbnN3YXJkZW4uY29tDC9hZHVsdGZpbHRlcg
+
+
+## dnswarden-asia-adultfilter-dohv6
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAAKFsyMDAxOjE5ZjA6NDQwMDo0ZGUyOjU0MDA6M2ZmOmZlYTk6ZDQxOF0glGrRDRtUC34I4c4KKbg8v83KX-GwnpuLuw5XrscwhWkWZG9oLmFzaWEuZG5zd2FyZGVuLmNvbQwvYWR1bHRmaWx0ZXI
+
+
+## dnswarden-asia-uncensor-dcv4
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQcAAAAAAAAAFTIwNy4xNDguMTIwLjI0NDoxNTM1MyCmqLc8Sz197Ub6R-JQ4W06NXBwi-F_mYVvyYuo1PC8MiIyLmRuc2NyeXB0LWNlcnQuZG5zd2FyZGVuLXVuY2Vuc29y
+
+
+## dnswarden-asia-uncensor-dcv6
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQcAAAAAAAAALlsyMDAxOjE5ZjA6NDQwMDo0ZGUyOjU0MDA6M2ZmOmZlYTk6ZDQxOF06MTUzNTMgpqi3PEs9fe1G-kfiUOFtOjVwcIvhf5mFb8mLqNTwvDIiMi5kbnNjcnlwdC1jZXJ0LmRuc3dhcmRlbi11bmNlbnNvcg
+
+
+## dnswarden-asia-uncensor-dohv4
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgcAAAAAAAAADzIwNy4xNDguMTIwLjI0NCCUatENG1QLfgjhzgopuDy_zcpf4bCem4u7DleuxzCFaRZkb2guYXNpYS5kbnN3YXJkZW4uY29tCy91bmNlbnNvcmVk
+
+
+## dnswarden-asia-uncensor-dohv6
+
+Hosted in Singapore. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgcAAAAAAAAAKFsyMDAxOjE5ZjA6NDQwMDo0ZGUyOjU0MDA6M2ZmOmZlYTk6ZDQxOF0glGrRDRtUC34I4c4KKbg8v83KX-GwnpuLuw5XrscwhWkWZG9oLmFzaWEuZG5zd2FyZGVuLmNvbQsvdW5jZW5zb3JlZA
+
+
+## dnswarden-eu-adblock-dcv4
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAAEDQ1Ljc2Ljg4LjIwOjIwNTMg1s4Ar-3awN0OmfAQzlZywvR2ZGVMg0aeNdwrLHspdpMhMi5kbnNjcnlwdC1jZXJ0LmRuc3dhcmRlbi1hZGJsb2Nr
+
+
+## dnswarden-eu-adblock-dcv6
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAALVsyMDAxOjE5ZjA6NmMwMToyYjE3OjU0MDA6M2ZmOmZlYTk6ZDQyZl06MjA1MyDWzgCv7drA3Q6Z8BDOVnLC9HZkZUyDRp413Csseyl2kyEyLmRuc2NyeXB0LWNlcnQuZG5zd2FyZGVuLWFkYmxvY2s
+
+
+## dnswarden-eu-adblock-dohv4
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAACzQ1Ljc2Ljg4LjIwoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOFGRvaC5ldS5kbnN3YXJkZW4uY29tCC9hZGJsb2Nr
+
+
+## dnswarden-eu-adblock-dohv6
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAAKFsyMDAxOjE5ZjA6NmMwMToyYjE3OjU0MDA6M2ZmOmZlYTk6ZDQyZl2gzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984UZG9oLmV1LmRuc3dhcmRlbi5jb20IL2FkYmxvY2s
+
+
+## dnswarden-eu-adultfilter-dcv4
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAAEDQ1Ljc2Ljg4LjIwOjUzNTMg1s4Ar-3awN0OmfAQzlZywvR2ZGVMg0aeNdwrLHspdpMlMi5kbnNjcnlwdC1jZXJ0LmRuc3dhcmRlbi1hZHVsdGZpbHRlcg
+
+
+## dnswarden-eu-adultfilter-dcv6
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAALVsyMDAxOjE5ZjA6NmMwMToyYjE3OjU0MDA6M2ZmOmZlYTk6ZDQyZl06NTM1MyDWzgCv7drA3Q6Z8BDOVnLC9HZkZUyDRp413Csseyl2kyUyLmRuc2NyeXB0LWNlcnQuZG5zd2FyZGVuLWFkdWx0ZmlsdGVy
+
+
+## dnswarden-eu-adultfilter-dohv4
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAACzQ1Ljc2Ljg4LjIwoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOFGRvaC5ldS5kbnN3YXJkZW4uY29tDC9hZHVsdGZpbHRlcg
+
+
+## dnswarden-eu-adultfilter-dohv6
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAAKFsyMDAxOjE5ZjA6NmMwMToyYjE3OjU0MDA6M2ZmOmZlYTk6ZDQyZl2gzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984UZG9oLmV1LmRuc3dhcmRlbi5jb20ML2FkdWx0ZmlsdGVy
+
+
+## dnswarden-eu-uncensor-dcv4
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQcAAAAAAAAAETQ1Ljc2Ljg4LjIwOjE1MzUzINbOAK_t2sDdDpnwEM5WcsL0dmRlTINGnjXcKyx7KXaTIjIuZG5zY3J5cHQtY2VydC5kbnN3YXJkZW4tdW5jZW5zb3I
+
+
+## dnswarden-eu-uncensor-dcv6
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQcAAAAAAAAALlsyMDAxOjE5ZjA6NmMwMToyYjE3OjU0MDA6M2ZmOmZlYTk6ZDQyZl06MTUzNTMg1s4Ar-3awN0OmfAQzlZywvR2ZGVMg0aeNdwrLHspdpMiMi5kbnNjcnlwdC1jZXJ0LmRuc3dhcmRlbi11bmNlbnNvcg
+
+
+## dnswarden-eu-uncensor-dohv4
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgcAAAAAAAAACzQ1Ljc2Ljg4LjIwoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOFGRvaC5ldS5kbnN3YXJkZW4uY29tCy91bmNlbnNvcmVk
+
+
+## dnswarden-eu-uncensor-dohv6
+
+Hosted in Germany. For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgcAAAAAAAAAKFsyMDAxOjE5ZjA6NmMwMToyYjE3OjU0MDA6M2ZmOmZlYTk6ZDQyZl2gzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984UZG9oLmV1LmRuc3dhcmRlbi5jb20LL3VuY2Vuc29yZWQ
+
+
+## dnswarden-us-adblock-dcv4
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAAEzE0NC4yMDIuNjkuMTQ5OjIwNTMgc_eiadnb3wpUqznTHbI2NziLpELYc4uuDM-s3v3CsSQhMi5kbnNjcnlwdC1jZXJ0LmRuc3dhcmRlbi1hZGJsb2Nr
+
+
+## dnswarden-us-adblock-dcv6
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAALFsyMDAxOjE5ZjA6NjQwMTpkNmU6NTQwMDozZmY6ZmVhOTpkNDVlXToyMDUzIHP3omnZ298KVKs50x2yNjc4i6RC2HOLrgzPrN79wrEkITIuZG5zY3J5cHQtY2VydC5kbnN3YXJkZW4tYWRibG9jaw
+
+
+## dnswarden-us-adblock-dohv4
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAADjE0NC4yMDIuNjkuMTQ5oMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOFGRvaC51cy5kbnN3YXJkZW4uY29tCC9hZGJsb2Nr
+
+
+## dnswarden-us-adblock-dohv6
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAAJ1syMDAxOjE5ZjA6NjQwMTpkNmU6NTQwMDozZmY6ZmVhOTpkNDVlXaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhRkb2gudXMuZG5zd2FyZGVuLmNvbQgvYWRibG9jaw
+
+
+## dnswarden-us-adultfilter-dcv4
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAAEzE0NC4yMDIuNjkuMTQ5OjUzNTMgc_eiadnb3wpUqznTHbI2NziLpELYc4uuDM-s3v3CsSQlMi5kbnNjcnlwdC1jZXJ0LmRuc3dhcmRlbi1hZHVsdGZpbHRlcg
+
+
+## dnswarden-us-adultfilter-dcv6
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQMAAAAAAAAALFsyMDAxOjE5ZjA6NjQwMTpkNmU6NTQwMDozZmY6ZmVhOTpkNDVlXTo1MzUzIHP3omnZ298KVKs50x2yNjc4i6RC2HOLrgzPrN79wrEkJTIuZG5zY3J5cHQtY2VydC5kbnN3YXJkZW4tYWR1bHRmaWx0ZXI
+
+
+## dnswarden-us-adultfilter-dohv4
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAADjE0NC4yMDIuNjkuMTQ5oMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOFGRvaC51cy5kbnN3YXJkZW4uY29tDC9hZHVsdGZpbHRlcg
+
+
+## dnswarden-us-adultfilter-dohv6
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgMAAAAAAAAAJ1syMDAxOjE5ZjA6NjQwMTpkNmU6NTQwMDozZmY6ZmVhOTpkNDVlXaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhRkb2gudXMuZG5zd2FyZGVuLmNvbQwvYWR1bHRmaWx0ZXI
+
+
+## dnswarden-us-uncensor-dcv4
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQcAAAAAAAAAFDE0NC4yMDIuNjkuMTQ5OjE1MzUzIHP3omnZ298KVKs50x2yNjc4i6RC2HOLrgzPrN79wrEkIjIuZG5zY3J5cHQtY2VydC5kbnN3YXJkZW4tdW5jZW5zb3I
+
+
+## dnswarden-us-uncensor-dcv6
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AQcAAAAAAAAALVsyMDAxOjE5ZjA6NjQwMTpkNmU6NTQwMDozZmY6ZmVhOTpkNDVlXToxNTM1MyBz96Jp2dvfClSrOdMdsjY3OIukQthzi64Mz6ze_cKxJCIyLmRuc2NyeXB0LWNlcnQuZG5zd2FyZGVuLXVuY2Vuc29y
+
+
+## dnswarden-us-uncensor-dohv4
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgcAAAAAAAAADjE0NC4yMDIuNjkuMTQ5oMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOFGRvaC51cy5kbnN3YXJkZW4uY29tCy91bmNlbnNvcmVk
+
+
+## dnswarden-us-uncensor-dohv6
+
+Hosted in USA (Dallas) . For more information look [here](https://github.com/bhanupratapys/dnswarden) or [here](https://dnswarden.com).
+
+sdns://AgcAAAAAAAAAJ1syMDAxOjE5ZjA6NjQwMTpkNmU6NTQwMDozZmY6ZmVhOTpkNDVlXaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhRkb2gudXMuZG5zd2FyZGVuLmNvbQsvdW5jZW5zb3JlZA
+
+
+## doh-ch-blahdns
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Switzerland. By https://blahdns.com/
+
+sdns://AgMAAAAAAAAADDQ1LjkxLjkyLjEyMQASZG9oLWNoLmJsYWhkbnMuY29tCi9kbnMtcXVlcnk
+
+
+## doh-ch-blahdns-v6
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Switzerland. By https://blahdns.com/
+
+sdns://AgMAAAAAAAAAElsyYTBlOmRjMDo2OjIzOjoyXQASZG9oLWNoLmJsYWhkbnMuY29tCi9kbnMtcXVlcnk
+
+
+## doh-cleanbrowsing-adult
+
+Blocks access to all adult, pornographic and explicit sites. It does
+not block proxy or VPNs, nor mixed-content sites. Sites like Reddit
+are allowed. Google and Bing are set to the Safe Mode.
+
+By https://cleanbrowsing.org/
+
+sdns://AgMAAAAAAAAAAAAVZG9oLmNsZWFuYnJvd3Npbmcub3JnEi9kb2gvYWR1bHQtZmlsdGVyLw
+
+
+## doh-cleanbrowsing-family
+
+Blocks access to all adult, pornographic and explicit sites. It also
+blocks proxy and VPN domains that are used to bypass the filters.
+Mixed content sites (like Reddit) are also blocked. Google, Bing and
+Youtube are set to the Safe Mode.
+
+By https://cleanbrowsing.org/
+
+sdns://AgMAAAAAAAAAAAAVZG9oLmNsZWFuYnJvd3Npbmcub3JnEy9kb2gvZmFtaWx5LWZpbHRlci8
+
+
+## doh-cleanbrowsing-security
+
+Block access to phishing, malware and malicious domains. It does not block adult content.
+By https://cleanbrowsing.org/
+
+sdns://AgMAAAAAAAAAAAAVZG9oLmNsZWFuYnJvd3Npbmcub3JnFS9kb2gvc2VjdXJpdHktZmlsdGVyLw
+
+
+## doh-crypto-sx
+
+DNS-over-HTTPS server. Anycast, no logs, no censorship, DNSSEC.
+Backend hosted by Scaleway, globally cached via Cloudflare.
+Maintained by Frank Denis.
+
+sdns://AgcAAAAAAAAACzEwNC4yMS42Ljc4AA1kb2guY3J5cHRvLnN4Ci9kbnMtcXVlcnk
+sdns://AgcAAAAAAAAADjE3Mi42Ny4xMzQuMTU3AA1kb2guY3J5cHRvLnN4Ci9kbnMtcXVlcnk
+
+
+## doh-crypto-sx-ipv6
+
+DNS-over-HTTPS server accessible over IPv6. Anycast, no logs, no censorship, DNSSEC.
+Backend hosted by Scaleway, globally cached via Cloudflare.
+Maintained by Frank Denis.
+
+sdns://AgcAAAAAAAAAGlsyNjA2OjQ3MDA6MzAzNzo6NjgxNTo2NGVdABJkb2gtaXB2Ni5jcnlwdG8uc3gKL2Rucy1xdWVyeQ
+sdns://AgcAAAAAAAAAG1syNjA2OjQ3MDA6MzAzNjo6YWM0Mzo4NjlkXQASZG9oLWlwdjYuY3J5cHRvLnN4Ci9kbnMtcXVlcnk
+
+
+## doh-de-blahdns
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Germany. By https://blahdns.com/
+
+sdns://AgMAAAAAAAAADTc4LjQ2LjI0NC4xNDMAEmRvaC1kZS5ibGFoZG5zLmNvbQovZG5zLXF1ZXJ5
+
+
+## doh-de-blahdns-v6
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Germany. By https://blahdns.com/
+
+sdns://AgMAAAAAAAAAFlsyYTAxOjRmODpjMTc6ZWM2Nzo6MV0AEmRvaC1kZS5ibGFoZG5zLmNvbQovZG5zLXF1ZXJ5
+
+
+## doh-fi-blahdns
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Finland. By https://blahdns.com/
+
+sdns://AgMAAAAAAAAADjk1LjIxNi4yMTIuMTc3ABJkb2gtZmkuYmxhaGRucy5jb20KL2Rucy1xdWVyeQ
+
+
+## doh-fi-blahdns-v6
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Finland. By https://blahdns.com/
+
+sdns://AgMAAAAAAAAAF1syYTAxOjRmOTpjMDEwOjQzY2U6OjFdABJkb2gtZmkuYmxhaGRucy5jb20KL2Rucy1xdWVyeQ
+
+
+## doh-jp-blahdns
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Japan. By https://blahdns.com/
+
+sdns://AgMAAAAAAAAADjEzOS4xNjIuMTEyLjQ3ABJkb2gtanAuYmxhaGRucy5jb20KL2Rucy1xdWVyeQ
+
+
+## doh-jp-blahdns-v6
+
+Blocks ad and Tracking, no Logging, DNSSEC, Hosted in Japan. By https://blahdns.com/
+
+sdns://AgMAAAAAAAAAIFsyNDAwOjg5MDI6OmYwM2M6OTJmZjpmZTI3OjM0NGJdABJkb2gtanAuYmxhaGRucy5jb20KL2Rucy1xdWVyeQ
+
+
+## doh.appliedprivacy.net
+
+Public DoH resolver operated by the Foundation for Applied Privacy (https://appliedprivacy.net).
+Hosted in Vienna, Austria.
+
+Non-logging, non-filtering, supports DNSSEC.
+
+sdns://AgcAAAAAAAAAAKDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhZkb2guYXBwbGllZHByaXZhY3kubmV0Bi9xdWVyeQ
+
+
+## doh.ffmuc.net
+
+An open (non-logging, non-filtering, non-censoring) DoH resolver operated by Freifunk Munich with nodes in DE.
+https://ffmuc.net/
+
+sdns://AgcAAAAAAAAACjUuMS42Ni4yNTWgzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984NZG9oLmZmbXVjLm5ldAovZG5zLXF1ZXJ5
+
+
+## doh.ffmuc.net-2
+
+An open (non-logging, non-filtering, non-censoring) DoH resolver operated by Freifunk Munich with nodes in DE.
+https://ffmuc.net/
+
+sdns://AgcAAAAAAAAADjE4NS4xNTAuOTkuMjU1oMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffODWRvaC5mZm11Yy5uZXQKL2Rucy1xdWVyeQ
+
+
+## doh.ffmuc.net-v6
+
+An open (non-logging, non-filtering, non-censoring) DoH resolver operated by Freifunk Munich with nodes in DE.
+https://ffmuc.net/
+
+sdns://AgcAAAAAAAAAFVsyMDAxOjY3ODplNjg6ZjAwMDo6XaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zg1kb2guZmZtdWMubmV0Ci9kbnMtcXVlcnk
+
+
+## doh.ffmuc.net-v6-2
+
+An open (non-logging, non-filtering, non-censoring) DoH resolver operated by Freifunk Munich with nodes in DE.
+https://ffmuc.net/
+
+sdns://AgcAAAAAAAAAFVsyMDAxOjY3ODplZDA6ZjAwMDo6XaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zg1kb2guZmZtdWMubmV0Ci9kbnMtcXVlcnk
+
+
+## doh.tiarap.org
+
+Non-Logging DNS-over-HTTPS server, cached via Cloudflare.
+Filters out ads, trackers and malware, NO ECS, supports DNSSEC.
+
+sdns://AgMAAAAAAAAADDEwNC4yMS42NS42MAAOZG9oLnRpYXJhcC5vcmcKL2Rucy1xdWVyeQ
+
+
+## doh.tiarap.org-ipv6
+
+Non-Logging DNS-over-HTTPS server (IPv6), cached via Cloudflare.
+Filters out ads, trackers and malware, NO ECS, supports DNSSEC.
+
+sdns://AgMAAAAAAAAAG1syNjA2OjQ3MDA6MzAzNDo6NjgxNTo0MTNjXQAOZG9oLnRpYXJhcC5vcmcKL2Rucy1xdWVyeQ
+
+
+## e-utp.net-ipv6-doh
+
+e-utp.net DNS Cache service, only accessible over IPv6
+https://fido.e-utp.net/display/EUTPNET/Recursive+DNS
+
+sdns://AgcAAAAAAAAAE1syMDAxOjY3YzoyMWVjOjo1M10gXMJdnIoy7PLLu5Hr9wvZVsUgOfnyDoQJ2mFUcVI21x0SZG5zY2FjaGUuZS11dHAubmV0Ci9kbnMtcXVlcnk
+
+
+## east.comss.one
+
+DNS with adblock filters and antiphishing, gaining popularity among russian-speaking users.
+
+sdns://AQMAAAAAAAAAEjkxLjIzMC4yMTEuNjc6NTQ0MyAVacgDhm0kq-ciz2DrJlPhYjI9v6tAQHbulojEz86TEyIyLmRuc2NyeXB0LWNlcnQuZG5zLmVhc3QuY29tc3Mub25l
+
+
+## faelix-ch-ipv4
+
+An open (non-logging, non-filtering, no ECS) DNSCrypt resolver operated by https://faelix.net/ with IPv4 nodes anycast within AS41495 in Switzerland.
+
+sdns://AQYAAAAAAAAAEzE4NS4xMzQuMTk2LjU0Ojg0NDMgfsvvPi8BgDKNYODh0ewj5Oh32OoJoZNwGgTWs8C-i-EfMi5kbnNjcnlwdC1jZXJ0LnJkbnMuZmFlbGl4Lm5ldA
+sdns://AQYAAAAAAAAAEzE4NS4xMzQuMTk2LjU1Ojg0NDMgfsvvPi8BgDKNYODh0ewj5Oh32OoJoZNwGgTWs8C-i-EfMi5kbnNjcnlwdC1jZXJ0LnJkbnMuZmFlbGl4Lm5ldA
+
+
+## faelix-uk-ipv4
+
+An open (non-logging, non-filtering, no ECS) DNSCrypt resolver operated by https://faelix.net/ with IPv4 nodes anycast within AS41495 in the UK.
+
+sdns://AQYAAAAAAAAAEjQ2LjIyNy4yMDAuNTQ6ODQ0MyB-y-8-LwGAMo1g4OHR7CPk6HfY6gmhk3AaBNazwL6L4R8yLmRuc2NyeXB0LWNlcnQucmRucy5mYWVsaXgubmV0
+sdns://AQYAAAAAAAAAEjQ2LjIyNy4yMDAuNTU6ODQ0MyB-y-8-LwGAMo1g4OHR7CPk6HfY6gmhk3AaBNazwL6L4R8yLmRuc2NyeXB0LWNlcnQucmRucy5mYWVsaXgubmV0
+
+
+## faelix-uk-ipv6
+
+An open (non-logging, non-filtering, no ECS) DNSCrypt resolver operated by https://faelix.net/ with IPv6 nodes anycast within AS41495 in the UK.
+
+sdns://AQYAAAAAAAAAFFsyYTAxOjllMDA6OjU0XTo4NDQzIH7L7z4vAYAyjWDg4dHsI-Tod9jqCaGTcBoE1rPAvovhHzIuZG5zY3J5cHQtY2VydC5yZG5zLmZhZWxpeC5uZXQ
+sdns://AQYAAAAAAAAAFFsyYTAxOjllMDA6OjU1XTo4NDQzIH7L7z4vAYAyjWDg4dHsI-Tod9jqCaGTcBoE1rPAvovhHzIuZG5zY3J5cHQtY2VydC5yZG5zLmZhZWxpeC5uZXQ
+
+
+## ffmuc.net
+
+An open (non-logging, non-filtering, non-censoring) DNSCrypt resolver operated by Freifunk Munich with nodes in DE.
+https://ffmuc.net/
+
+sdns://AQcAAAAAAAAADzUuMS42Ni4yNTU6ODQ0MyAH0Hrxz9xdmXadPwJmkKcESWXCdCdseRyu9a7zuQxG-hkyLmRuc2NyeXB0LWNlcnQuZmZtdWMubmV0
+
+
+## ffmuc.net-v6
+
+An open (non-logging, non-filtering, non-censoring) DNSCrypt resolver operated by Freifunk Munich with nodes in DE.
+https://ffmuc.net/
+
+sdns://AQcAAAAAAAAAGlsyMDAxOjY3ODplNjg6ZjAwMDo6XTo4NDQzIAfQevHP3F2Zdp0_AmaQpwRJZcJ0J2x5HK71rvO5DEb6GTIuZG5zY3J5cHQtY2VydC5mZm11Yy5uZXQ
+
+
+## freetsa.org-ipv6
+
+Non-logged/Uncensored provided by www.freetsa.org. Support for DNS and DNS-over-TLS (DoT)
+
+sdns://AQcAAAAAAAAAH1syNjA3OmYxMzA6MDpmODo6MzA4NTplOTYxXTo1NTMg2P-7QuAxvnp5cwtFVo1Jak6Ky1mqg2b9arkeJyp9FuQbMi5kbnNjcnlwdC1jZXJ0LmZyZWV0c2Eub3Jn
+
+
+## gombadi-syd
+
+Protocol: DNSCrypt IPv4 | Features: Non-logging, Non-filtering, DNSSEC, Unbound | Location: Sydney, AU
+
+sdns://AQUAAAAAAAAADzE3Mi4xMDUuMTY2LjE4OSCqZ1fiHV9W_d5oL0UH7Cc1fIohJG9lej3-8EW2ND_xbBwyLmRuc2NyeXB0LWNlcnQuZ29tYmFkaS5zeWQy
+
+
+## gombadi-syd-ipv6
+
+Protocol: DNSCrypt IPv6 | Features: Non-logging, Non-filtering, DNSSEC, Unbound | Location: Sydney, AU
+
+sdns://AQUAAAAAAAAAIFsyNDAwOjg5MDc6OmYwM2M6OTJmZjpmZTYzOmU3NDhdIKpnV-IdX1b93mgvRQfsJzV8iiEkb2V6Pf7wRbY0P_FsHDIuZG5zY3J5cHQtY2VydC5nb21iYWRpLnN5ZDI
+
+
+## google
+
+Google DNS (anycast)
+
+sdns://AgUAAAAAAAAABzguOC44LjigHvYkz_9ea9O63fP92_3qVlRn43cpncfuZnUWbzAMwbmgdoAkR6AZkxo_AEMExT_cbBssN43Evo9zs5_ZyWnftEUgalBisNF41VbxY7E7Gw8ZQ10CWIKRzHVYnf7m6xHI1cMKZG5zLmdvb2dsZQovZG5zLXF1ZXJ5
+
+
+## google-ipv6
+
+Google DNS (anycast)
+
+sdns://AgUAAAAAAAAAFlsyMDAxOjQ4NjA6NDg2MDo6ODg4OF2gHvYkz_9ea9O63fP92_3qVlRn43cpncfuZnUWbzAMwbmgdoAkR6AZkxo_AEMExT_cbBssN43Evo9zs5_ZyWnftEUgalBisNF41VbxY7E7Gw8ZQ10CWIKRzHVYnf7m6xHI1cMKZG5zLmdvb2dsZQovZG5zLXF1ZXJ5
+
+
+## hdns
+
+HDNS is a public DNS resolver that supports Handshake domains.
+https://www.hdns.io
+
+sdns://AgYAAAAAAAAADjEwMy4xOTYuMzguMjAwIBGxAuax9j5SiYTWAl8ysTgkH8iLvXUZV01wyYMtU-HoDXF1ZXJ5LmhkbnMuaW8KL2Rucy1xdWVyeQ
+
+
+## he
+
+Hurricane Electric DoH server (anycast)
+
+Unknown logging policy.
+
+sdns://AgUAAAAAAAAACzc0LjgyLjQyLjQyoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffODG9yZG5zLmhlLm5ldAovZG5zLXF1ZXJ5
+
+
+## ibksturm
+
+DNSCRYPT V2 Server, No Logging, No Filters, DNSSEC
+
+Running privately by ibksturm in Thurgau, Switzerland
+
+sdns://AQcAAAAAAAAAEzIxMy4xOTYuMTkxLjk2Ojg0NDMgHK0AUhqiLSuBFR07jpBhKvko_oyqyWnot8z4cce7cKkYMi5kbnNjcnlwdC1jZXJ0Lmlia3N0dXJt
+
+
+## id-gmail
+
+Non-Logging DNSCrypt server located in Singapore.
+Filters out ads, trackers and malware, supports DNSSEC, provided by id-gmail.
+
+sdns://AQMAAAAAAAAADjE3NC4xMzguMjEuMTI4IO-WgGbo2ZTwZdg-3dMa7u31bYZXRj5KykfN1_6Xw9T2HDIuZG5zY3J5cHQtY2VydC5kbnMudGlhci5hcHA
+
+
+## id-gmail-doh
+
+Non-Logging DNS-over-HTTPS server located in Singapore.
+Filters out ads, trackers and malware, supports DNSSEC, provided by id-gmail.
+
+sdns://AgMAAAAAAAAADjE3NC4xMzguMjkuMTc1oMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffODGRvaC50aWFyLmFwcAovZG5zLXF1ZXJ5
+
+
+## id-gmail-doh-ipv6
+
+Non-Logging DNS-over-HTTPS (IPv6) server located in Singapore.
+Filters out ads, trackers and malware, supports DNSSEC, provided by id-gmail.
+
+sdns://AgMAAAAAAAAAG1syNDAwOjYxODA6MDpkMDo6NWY3Mzo0MDAxXaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zgxkb2gudGlhci5hcHAKL2Rucy1xdWVyeQ
+
+
+## id-gmail-ipv6
+
+Non-Logging DNSCrypt (IPv6) server located in Singapore.
+Filters out ads, trackers and malware, supports DNSSEC, provided by id-gmail.
+
+sdns://AQMAAAAAAAAAG1syNDAwOjYxODA6MDpkMDo6NWY2ZTo0MDAxXSDvloBm6NmU8GXYPt3TGu7t9W2GV0Y-SspHzdf-l8PU9hwyLmRuc2NyeXB0LWNlcnQuZG5zLnRpYXIuYXBw
+
+
+## iij
+
+DoH server operated by Internet Initiative Japan in Tokyo.
+https://www.iij.ad.jp/
+
+sdns://AgUAAAAAAAAACjEwMy4yLjU3LjUgmOPV5TavKVjNL38U9wTvSidtJeM81l8uZfXk8nJ8EzARcHVibGljLmRucy5paWouanAKL2Rucy1xdWVyeQ
+
+
+## jp.tiar.app
+
+Non-Logging, Non-Filtering DNSCrypt server in Japan.
+No ECS, Support DNSSEC
+
+sdns://AQcAAAAAAAAAEjE3Mi4xMDQuOTMuODA6MTQ0MyAyuHY-8b9lNqHeahPAzW9IoXnjiLaZpTeNbVs8TN9UUxsyLmRuc2NyeXB0LWNlcnQuanAudGlhci5hcHA
+
+
+## jp.tiar.app-doh
+
+Non-Logging, Non-Filtering DNS-over-HTTPS server in Japan.
+No ECS, Support DNSSEC
+
+sdns://AgcAAAAAAAAADTE3Mi4xMDQuOTMuODCgzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984LanAudGlhci5hcHAKL2Rucy1xdWVyeQ
+
+
+## jp.tiar.app-doh-ipv6
+
+Non-Logging, Non-Filtering DNS-over-HTTPS (IPv6) server in Japan.
+No ECS, Support DNSSEC
+
+sdns://AgcAAAAAAAAAIFsyNDAwOjg5MDI6OmYwM2M6OTFmZjpmZWRhOmM1MTRdoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOC2pwLnRpYXIuYXBwCi9kbnMtcXVlcnk
+
+
+## jp.tiar.app-ipv6
+
+Non-Logging, Non-Filtering DNSCrypt (IPv6) server in Japan.
+No ECS, Support DNSSEC
+
+sdns://AQcAAAAAAAAAJVsyNDAwOjg5MDI6OmYwM2M6OTFmZjpmZWRhOmM1MTRdOjE0NDMgMrh2PvG_ZTah3moTwM1vSKF544i2maU3jW1bPEzfVFMbMi5kbnNjcnlwdC1jZXJ0LmpwLnRpYXIuYXBw
+
+
+## jp.tiarap.org
+
+DNS-over-HTTPS Server. Non-Logging, Non-Filtering, No ECS, Support DNSSEC.
+Cached via Cloudflare.
+
+sdns://AgcAAAAAAAAAAAANanAudGlhcmFwLm9yZwovZG5zLXF1ZXJ5
+
+
+## jp.tiarap.org-ipv6
+
+DNS-over-HTTPS Server (IPv6). Non-Logging, Non-Filtering, No ECS, Support DNSSEC.
+Cached via Cloudflare.
+
+sdns://AgcAAAAAAAAAG1syNjA2OjQ3MDA6MzAzNjo6NjgxYjo5NmFhXQANanAudGlhcmFwLm9yZwovZG5zLXF1ZXJ5
+
+
+## libredns
+
+DoH server in Germany. No logging, but no DNS padding and no DNSSEC support.
+https://libredns.gr/
+
+sdns://AgYAAAAAAAAADjExNi4yMDIuMTc2LjI2oMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOD2RvaC5saWJyZWRucy5ncgovZG5zLXF1ZXJ5
+
+
+## libredns-noads
+
+DoH server in Germany. No logging, but no DNS padding and no DNSSEC support.
+no ads version, uses StevenBlack's host list: https://github.com/StevenBlack/hosts
+
+sdns://AgIAAAAAAAAADjExNi4yMDIuMTc2LjI2oMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOD2RvaC5saWJyZWRucy5ncgQvYWRz
+
+
+## meganerd
+
+DNSCrypt server by MegaNerd.nl (IPv4) - https://meganerd.nl/encrypted-dns-server
+Hosted in Amsterdam (AMS1), The Netherlands.
+
+Non-logging, non-filtering, supports DNSSEC.
+
+sdns://AQcAAAAAAAAADjEzNi4yNDQuOTcuMTE0IPyq3HBOXuNgu6FO4pU71Si6CTV6kPD85NA6AThr_6tiGDIuZG5zY3J5cHQtY2VydC5tZWdhbmVyZA
+
+
+## meganerd-doh-ipv6
+
+DoH server by MegaNerd.nl (IPv6) - https://meganerd.nl/encrypted-dns-server
+Hosted in Amsterdam (AMS1), The Netherlands.
+
+Non-logging, non-filtering, supports DNSSEC.
+
+sdns://AgcAAAAAAAAAKFsyMDAxOjE5ZjA6NTAwMTpjYmI6NTQwMDowM2ZmOmZlMDc6ZjcwZF2gzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984VY2hld2JhY2NhLm1lZ2FuZXJkLm5sBC9kb2g
+
+
+## meganerd-ipv6
+
+DNSCrypt server by MegaNerd.nl (IPv6) - https://meganerd.nl/encrypted-dns-server
+Hosted in Amsterdam (AMS1), The Netherlands.
+
+Non-logging, non-filtering, supports DNSSEC.
+
+sdns://AQcAAAAAAAAAJ1syMDAxOjE5ZjA6NTAwMTpjYmI6NTQwMDozZmY6ZmUwNzpmNzBkXSD8qtxwTl7jYLuhTuKVO9Uougk1epDw_OTQOgE4a_-rYhgyLmRuc2NyeXB0LWNlcnQubWVnYW5lcmQ
+
+
+## moulticast-ca-ipv4
+
+Public | Non-filtering | Non-logging | DNSSEC aware | Hosted in Canada | Operated by @herver (Github) | https://moulticast.net/dnscrypt/
+
+sdns://AQcAAAAAAAAADTE0OS41Ni4xNC4xNTkggqVNQrswzoCc-93hdnomI0UwlYC3q80lR9-79MEC3xUdMi5kbnNjcnlwdC1jZXJ0Lm1vdWx0aWNhc3QtY2E
+
+
+## moulticast-ca-ipv6
+
+Public | Non-filtering | Non-logging | DNSSEC aware | Hosted in Canada | Operated by @herver (Github) | https://moulticast.net/dnscrypt/
+
+sdns://AQcAAAAAAAAAGlsyNjA3OjUzMDA6MjAxOjMxMDA6OjNkZmJdIIKlTUK7MM6AnPvd4XZ6JiNFMJWAt6vNJUffu_TBAt8VHTIuZG5zY3J5cHQtY2VydC5tb3VsdGljYXN0LWNh
+
+
+## moulticast-de-ipv4
+
+Public | Non-filtering | Non-logging | DNSSEC aware | Hosted in Germany | Operated by @herver (Github) | https://moulticast.net/dnscrypt/
+
+sdns://AQcAAAAAAAAADTUxLjE5NS4xMTcuMjYgI0N2y9-Xq_-5VbF43rxF6u10RV5LphBpRaTRNZuAOnAdMi5kbnNjcnlwdC1jZXJ0Lm1vdWx0aWNhc3QtZGU
+
+
+## moulticast-fr-ipv4
+
+Public | Non-filtering | Non-logging | DNSSEC aware | Hosted in France | Operated by @herver (Github) | https://moulticast.net/dnscrypt/
+
+sdns://AQcAAAAAAAAADTE5My4yMDAuNDMuMjUgdahEBxLVMuwDPeuVlJbOFrrDypHdrAlyIm7FrDgPyMgdMi5kbnNjcnlwdC1jZXJ0Lm1vdWx0aWNhc3QtZnI
+
+
+## moulticast-sg-ipv4
+
+Public | Non-filtering | Non-logging | DNSSEC aware | Hosted in Singapore | Operated by @herver (Github) | https://moulticast.net/dnscrypt/
+
+sdns://AQcAAAAAAAAADTUxLjc5LjE1OC4xODMgL4fe2yQRI0ljCMe05zhSmeKGYz-izKVjyE040Ovq-gUdMi5kbnNjcnlwdC1jZXJ0Lm1vdWx0aWNhc3Qtc2c
+
+
+## moulticast-sg-ipv6
+
+Public | Non-filtering | Non-logging | DNSSEC aware | Hosted in Singapore | Operated by @herver (Github) | https://moulticast.net/dnscrypt/
+
+sdns://AQcAAAAAAAAAGlsyNDAyOjFmMDA6ODAwMDo4MDA6OjEyYmFdIC-H3tskESNJYwjHtOc4UpnihmM_osylY8hNONDr6voFHTIuZG5zY3J5cHQtY2VydC5tb3VsdGljYXN0LXNn
+
+
+## moulticast-uk-ipv4
+
+Public | Non-filtering | Non-logging | DNSSEC aware | Hosted in UK | Operated by @herver (Github) | https://moulticast.net/dnscrypt/
+
+sdns://AQcAAAAAAAAADjUxLjE5NS4yMDAuMTgyIOdFe4OLrR_kCKC-8omGs5my5qxIyBgkldWZoSUmYvCNHTIuZG5zY3J5cHQtY2VydC5tb3VsdGljYXN0LXVr
+
+
+## mullvad-adblock-doh
+
+Public ad-blocking, non-logging (audited), DNSSEC-capable, DNS-over-HTTPS resolver hosted by VPN provider Mullvad
+Anycast IPv4/IPv6 with servers in SE, DE, UK, US, AU and SG
+https://mullvad.net/en/help/dns-over-https-and-dns-over-tls/
+
+sdns://AgMAAAAAAAAAACD5_zfwLmMstzhwJcB-V5CKPTcbfJXYzdA5DeIx7ZQ6EhdhZGJsb2NrLmRvaC5tdWxsdmFkLm5ldAovZG5zLXF1ZXJ5
+
+
+## mullvad-doh
+
+Public non-filtering, non-logging (audited), DNSSEC-capable, DNS-over-HTTPS resolver hosted by VPN provider Mullvad
+Anycast IPv4/IPv6 with servers in SE, DE, UK, US, AU and SG
+https://mullvad.net/en/help/dns-over-https-and-dns-over-tls/
+
+sdns://AgcAAAAAAAAAACD5_zfwLmMstzhwJcB-V5CKPTcbfJXYzdA5DeIx7ZQ6Eg9kb2gubXVsbHZhZC5uZXQKL2Rucy1xdWVyeQ
+
+
+## nextdns
+
+NextDNS is a cloud-based private DNS service that gives you full control
+over what is allowed and what is blocked on the Internet.
+
+DNSSEC, Anycast, Non-logging, NoFilters
+
+https://www.nextdns.io/
+
+sdns://AgcAAAAAAAAACjQ1LjkwLjI4LjAgmjo09yfeubylEAPZzpw5-PJ92cUkKQHCurGkTmNaAhkOZG5zLm5leHRkbnMuaW8PL2Ruc2NyeXB0LXByb3h5
+
+
+## nextdns-ipv6
+
+Connects to NextDNS over IPv6.
+
+NextDNS is a cloud-based private DNS service that gives you full control
+over what is allowed and what is blocked on the Internet.
+
+DNSSEC, Anycast, Non-logging, NoFilters
+
+https://www.nextdns.io/
+
+sdns://AgcAAAAAAAAADVsyYTA3OmE4YzA6Ol0gmjo09yfeubylEAPZzpw5-PJ92cUkKQHCurGkTmNaAhkOZG5zLm5leHRkbnMuaW8PL2Ruc2NyeXB0LXByb3h5
+
+
+## nextdns-ultralow
+
+NextDNS is a cloud-based private DNS service that gives you full control
+over what is allowed and what is blocked on the Internet.
+
+https://www.nextdns.io/
+
+To select the server location, the "-ultralow" variant relies on bootstrap servers
+instead of anycast.
+
+sdns://AgcAAAAAAAAAACCaOjT3J965vKUQA9nOnDn48n3ZxSQpAcK6saROY1oCGQ5kbnMubmV4dGRucy5pbw8vZG5zY3J5cHQtcHJveHk
+
+
+## njalla-doh
+
+Non-logging DoH server in Sweden operated by Njalla.
+
+https://dns.njal.la/
+
+sdns://AgcAAAAAAAAADDk1LjIxNS4xOS41M6DMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zgtkbnMubmphbC5sYQovZG5zLXF1ZXJ5
+
+
+## opennic-R4SAS
+
+DNSSEC • OpenNIC • Non-logging • Uncensored - hosted on OVH - https://opennic.i2pd.xyz/
+Location: Paris, France
+Maintained by R4SAS - https://github.com/r4sas
+
+sdns://AQcAAAAAAAAADTE1MS44MC4yMjIuNzkgqdYyOk8lgAkmGXUVAs4jHh922d53bIfGu7KKDv_bDk4gMi5kbnNjcnlwdC1jZXJ0Lm9wZW5uaWMuaTJwZC54eXo
+
+
+## opennic-R4SAS-doh-ipv6
+
+DOH • DNSSEC • OpenNIC • Non-logging • Uncensored - hosted on OVH - https://opennic.i2pd.xyz/
+Location: Paris, France
+Maintained by R4SAS - https://github.com/r4sas
+
+sdns://AgYAAAAAAAAAF1syMDAxOjQ3MDoxZjE1OmI4MDo6NTNdoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOEG9wZW5uaWMuaTJwZC54eXoKL2Rucy1xdWVyeQ
+
+
+## opennic-R4SAS-ipv6
+
+DNSSEC • OpenNIC • Non-logging • Uncensored - hosted on OVH - https://opennic.i2pd.xyz/
+Location: Paris, France
+Maintained by R4SAS - https://github.com/r4sas
+
+sdns://AQcAAAAAAAAAF1syMDAxOjQ3MDoxZjE1OmI4MDo6NTNdIKnWMjpPJYAJJhl1FQLOIx4fdtned2yHxruyig7_2w5OIDIuZG5zY3J5cHQtY2VydC5vcGVubmljLmkycGQueHl6
+
+
+## oszx
+
+Secure DNS Project by PumpleX - Hosted in the UK by OVH
+No Logging / Ad-Blocking
+Information at https://dns.oszx.co
+
+sdns://AQIAAAAAAAAAETUxLjM4LjgzLjE0MTo1MzUzIMwm9_oYw26P4JIVoDhJ_5kFDdNxX1ke4fEzL1V5bwEjFzIuZG5zY3J5cHQtY2VydC5vc3p4LmNv
+
+
+## plan9-ns1
+
+DNSCrypt server in New Jersey, USA. Non-logging, non-filtering, DNSSEC, anonymized.
+Running the official Docker image, info - https://jlongua.github.io/plan9-dns/
+
+sdns://AQcAAAAAAAAADjE3My4xOTkuMTI2LjM1IJLwH3z8-G6TDyEk6yXMmGxuss7nGfFnkHrtm4VOSc9SGTIuZG5zY3J5cHQtY2VydC5wbGFuOS1kbnM
+
+
+## plan9-ns2
+
+DNSCrypt server in Florida, USA. Non-logging, non-filtering, DNSSEC, anonymized.
+info - https://jlongua.github.io/plan9-dns/
+
+sdns://AQcAAAAAAAAAEjQ1LjYzLjExMC4xODc6ODQ0MyCcjeRhPcJTsKhZ8iViALPd39CussG6SnprFT9z_1f03x0yLmRuc2NyeXB0LWNlcnQucGxhbjktbnMyLmNvbQ
+
+
+## plan9-ns2-doh
+
+doh server in Florida, USA. Non-logging, non-filtering, DNSSEC.
+info - https://jlongua.github.io/plan9-dns/
+
+sdns://AgcAAAAAAAAADTQ1LjYzLjExMC4xODegzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984TZHJhY28ucGxhbjktbnMyLmNvbQovZG5zLXF1ZXJ5
+
+
+## plan9-ns2-doh-ipv6
+
+doh server in Florida, USA. Non-logging, non-filtering, DNSSEC.
+info - https://jlongua.github.io/plan9-dns/
+
+sdns://AgcAAAAAAAAAHVsyMDAxOjE5ZjA6OTAwMjoxZDc0OjU0MDA6OjFdoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOE2RyYWNvLnBsYW45LW5zMi5jb20KL2Rucy1xdWVyeQ
+
+
+## pryv8boi
+
+By pryv8, non Logging, uncensored, DNSSEC - hosted on contabo servers
+
+sdns://AQcAAAAAAAAAEzE2NC42OC4xMjEuMTYyOjQ0NDMgHtKNfXpUMzPyLnXK8DauHpWm1Rqhz7LqwBBmSzdY9BIcMi5kbnNjcnlwdC1jZXJ0LnByeXY4Ym9pLm9yZw
+
+
+## publicarray-au-doh
+
+DNSSEC • OpenNIC • Non-logging • Uncensored - hosted on vultr.com
+Maintained by publicarray - https://dns.seby.io
+
+sdns://AgcAAAAAAAAADDQ1Ljc2LjExMy4zMaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhBkb2guc2VieS5pbzo4NDQzCi9kbnMtcXVlcnk
+
+
+## publicarray-au2-doh
+
+DNSSEC • OpenNIC • Non-logging • Uncensored - hosted on ovh.com.au
+Maintained by publicarray - https://dns.seby.io
+
+sdns://AgcAAAAAAAAADTEzOS45OS4yMjIuNzIgmjo09yfeubylEAPZzpw5-PJ92cUkKQHCurGkTmNaAhkNZG9oLTIuc2VieS5pbwovZG5zLXF1ZXJ5
+
+
+## puredns-doh
+
+Public uncensored DNS resolver in Singapore - https://puredns.org
+
+sdns://AgcAAAAAAAAADDE0Ni4xOTAuNi4xM6BmL48K1DOtQqCKxtEfEuUWP3vn2CnK_93cRXllU_Xe1yBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zgtwdXJlZG5zLm9yZwovZG5zLXF1ZXJ5
+
+
+## puredns-doh-ipv6
+
+Public uncensored DNS resolver in Singapore - https://puredns.org
+
+sdns://AgcAAAAAAAAAG1syNDAwOjYxODA6MDpkMDo6MTExMTpjMDAxXaBmL48K1DOtQqCKxtEfEuUWP3vn2CnK_93cRXllU_Xe1yBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zgtwdXJlZG5zLm9yZwovZG5zLXF1ZXJ5
+
+
+## pwoss.org-dnscrypt
+
+No filter | No logs | DNSSEC | Nuremberg, Germany (netcup) | Maintained by https://pwoss.org/ (Dan)
+
+sdns://AQcAAAAAAAAAEzQ1LjE0Mi4xNzYuMTcwOjQ0MzQgZF8FTkuFVFw6YP5x8ydebnTb8ONP7Ti6P0K1REyhUHgZMi5kbnNjcnlwdC1jZXJ0LnB3b3NzLm9yZw
+
+
+## quad101
+
+DNSSEC-aware public resolver by the Taiwan Network Information Center (TWNIC)
+https://101.101.101.101/index_en.html
+
+sdns://AgcAAAAAAAAAACC2vD25TAYM7EnyCH8Xw1-0g5OccnTsGH9vQUUH0njRtAxkbnMudHduaWMudHcKL2Rucy1xdWVyeQ
+
+
+## quad9-dnscrypt-ip4-filter-ecs-pri
+
+Quad9 (anycast) dnssec/no-log/filter/ecs 9.9.9.11 - 149.112.112.11
+
+sdns://AQMAAAAAAAAADTkuOS45LjExOjg0NDMgZ8hHuMh1jNEgJFVDvnVnRt803x2EwAuMRwNo34Idhj4ZMi5kbnNjcnlwdC1jZXJ0LnF1YWQ5Lm5ldA
+sdns://AQMAAAAAAAAAEzE0OS4xMTIuMTEyLjExOjg0NDMgZ8hHuMh1jNEgJFVDvnVnRt803x2EwAuMRwNo34Idhj4ZMi5kbnNjcnlwdC1jZXJ0LnF1YWQ5Lm5ldA
+
+
+## quad9-dnscrypt-ip4-filter-pri
+
+Quad9 (anycast) dnssec/no-log/filter 9.9.9.9 - 149.112.112.9 - 149.112.112.112
+
+sdns://AQMAAAAAAAAADDkuOS45Ljk6ODQ0MyBnyEe4yHWM0SAkVUO-dWdG3zTfHYTAC4xHA2jfgh2GPhkyLmRuc2NyeXB0LWNlcnQucXVhZDkubmV0
+sdns://AQMAAAAAAAAAEjE0OS4xMTIuMTEyLjk6ODQ0MyBnyEe4yHWM0SAkVUO-dWdG3zTfHYTAC4xHA2jfgh2GPhkyLmRuc2NyeXB0LWNlcnQucXVhZDkubmV0
+sdns://AQMAAAAAAAAAFDE0OS4xMTIuMTEyLjExMjo4NDQzIGfIR7jIdYzRICRVQ751Z0bfNN8dhMALjEcDaN-CHYY-GTIuZG5zY3J5cHQtY2VydC5xdWFkOS5uZXQ
+
+
+## quad9-dnscrypt-ip4-nofilter-ecs-pri
+
+Quad9 (anycast) no-dnssec/no-log/no-filter/ecs 9.9.9.12 - 149.112.112.12
+
+sdns://AQYAAAAAAAAADTkuOS45LjEyOjg0NDMgZ8hHuMh1jNEgJFVDvnVnRt803x2EwAuMRwNo34Idhj4ZMi5kbnNjcnlwdC1jZXJ0LnF1YWQ5Lm5ldA
+sdns://AQYAAAAAAAAAEzE0OS4xMTIuMTEyLjEyOjg0NDMgZ8hHuMh1jNEgJFVDvnVnRt803x2EwAuMRwNo34Idhj4ZMi5kbnNjcnlwdC1jZXJ0LnF1YWQ5Lm5ldA
+
+
+## quad9-dnscrypt-ip4-nofilter-pri
+
+Quad9 (anycast) no-dnssec/no-log/no-filter 149.112.112.10
+
+sdns://AQYAAAAAAAAAEzE0OS4xMTIuMTEyLjEwOjg0NDMgZ8hHuMh1jNEgJFVDvnVnRt803x2EwAuMRwNo34Idhj4ZMi5kbnNjcnlwdC1jZXJ0LnF1YWQ5Lm5ldA
+
+
+## quad9-doh-ip4-port443-filter-ecs-pri
+
+Quad9 (anycast) dnssec/no-log/filter/ecs 9.9.9.11 - 149.112.112.11
+
+sdns://AgMAAAAAAAAACDkuOS45LjExICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKE2RuczExLnF1YWQ5Lm5ldDo0NDMKL2Rucy1xdWVyeQ
+sdns://AgMAAAAAAAAADjE0OS4xMTIuMTEyLjExICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKE2RuczExLnF1YWQ5Lm5ldDo0NDMKL2Rucy1xdWVyeQ
+
+
+## quad9-doh-ip4-port443-filter-pri
+
+Quad9 (anycast) dnssec/no-log/filter 9.9.9.9 - 149.112.112.9 - 149.112.112.112
+
+sdns://AgMAAAAAAAAABzkuOS45LjkgKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoSZG5zOS5xdWFkOS5uZXQ6NDQzCi9kbnMtcXVlcnk
+sdns://AgMAAAAAAAAADTE0OS4xMTIuMTEyLjkgKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoSZG5zOS5xdWFkOS5uZXQ6NDQzCi9kbnMtcXVlcnk
+sdns://AgMAAAAAAAAADzE0OS4xMTIuMTEyLjExMiAqFfXWrLbnwJAa3k67x0OyzNSJAytG4WQvBpNoMAElihFkbnMucXVhZDkubmV0OjQ0MwovZG5zLXF1ZXJ5
+
+
+## quad9-doh-ip4-port443-nofilter-ecs-pri
+
+Quad9 (anycast) no-dnssec/no-log/no-filter/ecs 9.9.9.12 - 149.112.112.12
+
+sdns://AgYAAAAAAAAACDkuOS45LjEyICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKE2RuczEyLnF1YWQ5Lm5ldDo0NDMKL2Rucy1xdWVyeQ
+sdns://AgYAAAAAAAAADjE0OS4xMTIuMTEyLjEyICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKE2RuczEyLnF1YWQ5Lm5ldDo0NDMKL2Rucy1xdWVyeQ
+
+
+## quad9-doh-ip4-port443-nofilter-pri
+
+Quad9 (anycast) no-dnssec/no-log/no-filter 9.9.9.10 - 149.112.112.10
+
+sdns://AgYAAAAAAAAACDkuOS45LjEwICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKE2RuczEwLnF1YWQ5Lm5ldDo0NDMKL2Rucy1xdWVyeQ
+sdns://AgYAAAAAAAAADjE0OS4xMTIuMTEyLjEwICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKE2RuczEwLnF1YWQ5Lm5ldDo0NDMKL2Rucy1xdWVyeQ
+
+
+## quad9-doh-ip4-port5053-filter-ecs-pri
+
+Quad9 (anycast) dnssec/no-log/filter/ecs 9.9.9.11 - 149.112.112.11
+
+sdns://AgMAAAAAAAAACDkuOS45LjExICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKFGRuczExLnF1YWQ5Lm5ldDo1MDUzCi9kbnMtcXVlcnk
+sdns://AgMAAAAAAAAADjE0OS4xMTIuMTEyLjExICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKFGRuczExLnF1YWQ5Lm5ldDo1MDUzCi9kbnMtcXVlcnk
+
+
+## quad9-doh-ip4-port5053-filter-pri
+
+Quad9 (anycast) dnssec/no-log/filter 9.9.9.9 - 149.112.112.9 - 149.112.112.112
+
+sdns://AgMAAAAAAAAABzkuOS45LjkgKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoTZG5zOS5xdWFkOS5uZXQ6NTA1MwovZG5zLXF1ZXJ5
+sdns://AgMAAAAAAAAADTE0OS4xMTIuMTEyLjkgKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoTZG5zOS5xdWFkOS5uZXQ6NTA1MwovZG5zLXF1ZXJ5
+sdns://AgMAAAAAAAAADzE0OS4xMTIuMTEyLjExMiAqFfXWrLbnwJAa3k67x0OyzNSJAytG4WQvBpNoMAElihJkbnMucXVhZDkubmV0OjUwNTMKL2Rucy1xdWVyeQ
+
+
+## quad9-doh-ip4-port5053-nofilter-ecs-pri
+
+Quad9 (anycast) no-dnssec/no-log/no-filter/ecs 9.9.9.12 - 149.112.112.12
+
+sdns://AgYAAAAAAAAACDkuOS45LjEyICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKFGRuczEyLnF1YWQ5Lm5ldDo1MDUzCi9kbnMtcXVlcnk
+sdns://AgYAAAAAAAAADjE0OS4xMTIuMTEyLjEyICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKFGRuczEyLnF1YWQ5Lm5ldDo1MDUzCi9kbnMtcXVlcnk
+
+
+## quad9-doh-ip4-port5053-nofilter-pri
+
+Quad9 (anycast) no-dnssec/no-log/no-filter 9.9.9.10 - 149.112.112.10
+
+sdns://AgYAAAAAAAAACDkuOS45LjEwICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKFGRuczEwLnF1YWQ5Lm5ldDo1MDUzCi9kbnMtcXVlcnk
+sdns://AgYAAAAAAAAADjE0OS4xMTIuMTEyLjEwICoV9dastufAkBreTrvHQ7LM1IkDK0bhZC8Gk2gwASWKFGRuczEwLnF1YWQ5Lm5ldDo1MDUzCi9kbnMtcXVlcnk
+
+
+## quad9-doh-ip6-port443-filter-ecs-pri
+
+Quad9 (anycast) dnssec/no-log/filter/ecs 2620:fe::11 - 2620:fe::fe:11
+
+sdns://AgMAAAAAAAAADVsyNjIwOmZlOjoxMV0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoTZG5zMTEucXVhZDkubmV0OjQ0MwovZG5zLXF1ZXJ5
+sdns://AgMAAAAAAAAAEFsyNjIwOmZlOjpmZToxMV0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoTZG5zMTEucXVhZDkubmV0OjQ0MwovZG5zLXF1ZXJ5
+
+
+## quad9-doh-ip6-port443-filter-pri
+
+Quad9 (anycast) dnssec/no-log/filter 2620:fe::fe - 2620:fe::9 - 2620:fe::fe:9
+
+sdns://AgMAAAAAAAAADVsyNjIwOmZlOjpmZV0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoRZG5zLnF1YWQ5Lm5ldDo0NDMKL2Rucy1xdWVyeQ
+sdns://AgMAAAAAAAAADFsyNjIwOmZlOjo5XSAqFfXWrLbnwJAa3k67x0OyzNSJAytG4WQvBpNoMAElihFkbnMucXVhZDkubmV0OjQ0MwovZG5zLXF1ZXJ5
+sdns://AgMAAAAAAAAAD1syNjIwOmZlOjpmZTo5XSAqFfXWrLbnwJAa3k67x0OyzNSJAytG4WQvBpNoMAElihJkbnM5LnF1YWQ5Lm5ldDo0NDMKL2Rucy1xdWVyeQ
+
+
+## quad9-doh-ip6-port443-nofilter-ecs-pri
+
+Quad9 (anycast) no-dnssec/no-log/no-filter/ecs 2620:fe::12 - 2620:fe::fe:12
+
+sdns://AgYAAAAAAAAADVsyNjIwOmZlOjoxMl0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoTZG5zMTIucXVhZDkubmV0OjQ0MwovZG5zLXF1ZXJ5
+sdns://AgYAAAAAAAAAEFsyNjIwOmZlOjpmZToxMl0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoTZG5zMTIucXVhZDkubmV0OjQ0MwovZG5zLXF1ZXJ5
+
+
+## quad9-doh-ip6-port443-nofilter-pri
+
+Quad9 (anycast) no-dnssec/no-log/no-filter 2620:fe::10 - 2620:fe::fe:10
+
+sdns://AgYAAAAAAAAADVsyNjIwOmZlOjoxMF0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoTZG5zMTAucXVhZDkubmV0OjQ0MwovZG5zLXF1ZXJ5
+sdns://AgYAAAAAAAAAEFsyNjIwOmZlOjpmZToxMF0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoTZG5zMTAucXVhZDkubmV0OjQ0MwovZG5zLXF1ZXJ5
+
+
+## quad9-doh-ip6-port5053-filter-ecs-pri
+
+Quad9 (anycast) dnssec/no-log/filter/ecs 2620:fe::11 - 2620:fe::fe:11
+
+sdns://AgMAAAAAAAAADVsyNjIwOmZlOjoxMV0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoUZG5zMTEucXVhZDkubmV0OjUwNTMKL2Rucy1xdWVyeQ
+sdns://AgMAAAAAAAAAEFsyNjIwOmZlOjpmZToxMV0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoUZG5zMTEucXVhZDkubmV0OjUwNTMKL2Rucy1xdWVyeQ
+
+
+## quad9-doh-ip6-port5053-filter-pri
+
+Quad9 (anycast) dnssec/no-log/filter 2620:fe::fe - 2620:fe::9 - 2620:fe::fe:9
+
+sdns://AgMAAAAAAAAADVsyNjIwOmZlOjpmZV0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoSZG5zLnF1YWQ5Lm5ldDo1MDUzCi9kbnMtcXVlcnk
+sdns://AgMAAAAAAAAADFsyNjIwOmZlOjo5XSAqFfXWrLbnwJAa3k67x0OyzNSJAytG4WQvBpNoMAElihJkbnMucXVhZDkubmV0OjUwNTMKL2Rucy1xdWVyeQ
+sdns://AgMAAAAAAAAAD1syNjIwOmZlOjpmZTo5XSAqFfXWrLbnwJAa3k67x0OyzNSJAytG4WQvBpNoMAElihNkbnM5LnF1YWQ5Lm5ldDo1MDUzCi9kbnMtcXVlcnk
+
+
+## quad9-doh-ip6-port5053-nofilter-ecs-pri
+
+Quad9 (anycast) no-dnssec/no-log/no-filter/ecs 2620:fe::12 - 2620:fe::fe:12
+
+sdns://AgYAAAAAAAAADVsyNjIwOmZlOjoxMl0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoUZG5zMTIucXVhZDkubmV0OjUwNTMKL2Rucy1xdWVyeQ
+sdns://AgYAAAAAAAAAEFsyNjIwOmZlOjpmZToxMl0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoUZG5zMTIucXVhZDkubmV0OjUwNTMKL2Rucy1xdWVyeQ
+
+
+## quad9-doh-ip6-port5053-nofilter-pri
+
+Quad9 (anycast) no-dnssec/no-log/no-filter 2620:fe::10 - 2620:fe::fe:10
+
+sdns://AgYAAAAAAAAADVsyNjIwOmZlOjoxMF0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoUZG5zMTAucXVhZDkubmV0OjUwNTMKL2Rucy1xdWVyeQ
+sdns://AgYAAAAAAAAAEFsyNjIwOmZlOjpmZToxMF0gKhX11qy258CQGt5Ou8dDsszUiQMrRuFkLwaTaDABJYoUZG5zMTAucXVhZDkubmV0OjUwNTMKL2Rucy1xdWVyeQ
+
+
+## resolver4.dns.openinternet.io
+
+DNSCrypt & DoH resolver on dedicated hardware colocated at Sonic.net in Santa Rosa, CA in the United States.
+
+No log, no filter, DNSSEC. Uses Sonic's recusrive DNS servers as upstream resolvers (but is not affiliated with Sonic
+in any way). Provided by https://openinternet.io
+
+sdns://AQcAAAAAAAAADTcwLjM2LjE3MC4xMjYgIMqRyWkPSPlDAmN_2ne3A6A6EQtQRyEJcXoCWPHbX5EtMi5kbnNjcnlwdC1jZXJ0LnJlc29sdmVyNC5kbnMub3BlbmludGVybmV0Lmlv
+
+
+## safesurfer
+
+Family safety focused blocklist for over 2 million adult sites, as well as phishing and malware and more.
+Free to use, paid for customizing blocking for more categories+sites and viewing usage at my.safesurfer.io. Logs taken for viewing
+usage, data never sold - https://safesurfer.io
+
+Warning: this server is incompatible with DNS anonymization.
+
+sdns://AQIAAAAAAAAADzEwNC4xNTUuMjM3LjIyNSAnIH_VEgToNntINABd-f_R0wu-KpwzY55u2_iu2R1A2CAyLmRuc2NyeXB0LWNlcnQuc2FmZXN1cmZlci5jby5ueg
+
+
+## safesurfer-doh
+
+Family safety focused blocklist for over 2 million adult sites, as well as phishing and malware and more.
+Free to use, paid for customizing blocking for more categories+sites and viewing usage at my.safesurfer.io. Logs taken for viewing
+usage, data never sold - https://safesurfer.io
+
+sdns://AgAAAAAAAAAAACBqUGKw0XjVVvFjsTsbDxlDXQJYgpHMdVid_ubrEcjVwxFkb2guc2FmZXN1cmZlci5pbwovZG5zLXF1ZXJ5
+
+
+## saldns01-conoha-ipv4
+
+Hosted on ConoHa VPS Tokyo region. No log. No filter.
+
+sdns://AQcAAAAAAAAAFDExOC4yNy4xMDguMTQwOjUwNDQzIJ6mPj1aeYrSINYeUzVU2n9JMTUgalCmDR6OhSlzrFtfIjIuZG5zY3J5cHQtY2VydC5zYWxkbnMwMS50eXBlcS5vcmc
+
+
+## saldns02-conoha-ipv4
+
+Hosted on ConoHa VPS Tokyo region. No log. No filter.
+
+sdns://AQcAAAAAAAAAFTEzMy4xMzAuMTE4LjEwMzo1MDQ0MyCo72atOPI72UkQcaypJBmUUd1btQTwm1VRxHLioOo19SIyLmRuc2NyeXB0LWNlcnQuc2FsZG5zMDIudHlwZXEub3Jn
+
+
+## saldnssg01-conoha-ipv4
+
+Hosted on ConoHa VPS Singapore region. No log. No filter.
+
+sdns://AQcAAAAAAAAAFDE2My40NC4xNTQuMTQ0OjUwNDQzIGri6V6DYmNp01gdIzQyrACcU7_tbcUKEN8-P4B5NATAJTIuZG5zY3J5cHQtY2VydC5zYWxkbnMtc2cwMS50eXBlcS5vcmc
+
+
+## scaleway-ams
+
+DNSSEC/Non-logged/Uncensored in Amsterdam - DEV1-S instance donated by Scaleway.com
+Maintained by Frank Denis - https://fr.dnscrypt.info
+
+sdns://AQcAAAAAAAAADTUxLjE1LjEyMi4yNTAg6Q3ZfapcbHgiHKLF7QFoli0Ty1Vsz3RXs1RUbxUrwZAcMi5kbnNjcnlwdC1jZXJ0LnNjYWxld2F5LWFtcw
+
+
+## scaleway-ams-ipv6
+
+DNSSEC/Non-logged/Uncensored in Amsterdam - IPv6 only - DEV1-S instance donated by Scaleway.com
+Maintained by Frank Denis - https://fr.dnscrypt.info
+
+sdns://AQcAAAAAAAAAFlsyMDAxOmJjODoxODIwOjUwZDo6MV0g6Q3ZfapcbHgiHKLF7QFoli0Ty1Vsz3RXs1RUbxUrwZAcMi5kbnNjcnlwdC1jZXJ0LnNjYWxld2F5LWFtcw
+
+
+## scaleway-fr
+
+DNSSEC/Non-logged/Uncensored in Paris - DEV1-S instance donated by Scaleway.com
+Maintained by Frank Denis - https://fr.dnscrypt.info
+
+sdns://AQcAAAAAAAAADjIxMi40Ny4yMjguMTM2IOgBuE6mBr-wusDOQ0RbsV66ZLAvo8SqMa4QY2oHkDJNHzIuZG5zY3J5cHQtY2VydC5mci5kbnNjcnlwdC5vcmc
+
+
+## scaleway-fr-ipv6
+
+DNSSEC/Non-logged/Uncensored in Paris - IPv6 only - DEV1-S instance donated by Scaleway.com
+Maintained by Frank Denis - https://fr.dnscrypt.info
+
+sdns://AQcAAAAAAAAAF1syMDAxOmJjODo0N2IwOjFhMDE6OjFdIOgBuE6mBr-wusDOQ0RbsV66ZLAvo8SqMa4QY2oHkDJNHzIuZG5zY3J5cHQtY2VydC5mci5kbnNjcnlwdC5vcmc
+
+
+## serbica
+
+Public DNSCrypt server in the Netherlands by https://litepay.ch
+
+sdns://AQcAAAAAAAAAEzE4NS42Ni4xNDMuMTc4OjUzNTMg-Y2MQmGOXiggAEKulN-ITGEn_Kj3TIP1UK1X2wh3o7wXMi5kbnNjcnlwdC1jZXJ0LnNlcmJpY2E
+
+
+## sfw.scaleway-fr
+
+Uses deep learning to block adult websites. Free, DNSSEC, no logs.
+Hosted in Paris, running on a 1-XS server donated by Scaleway.com
+Maintained by Frank Denis - https://fr.dnscrypt.info/sfw.html
+
+sdns://AQMAAAAAAAAADzE2My4xNzIuMTgwLjEyNSDfYnO_x1IZKotaObwMhaw_-WRF1zZE9mJygl01WPGh_x8yLmRuc2NyeXB0LWNlcnQuc2Z3LnNjYWxld2F5LWZy
+
+
+## sgp-dn53
+
+non-censoring, non-logging, DNSSEC-capable based on official docker image hosted in Singapore
+
+sdns://AQcAAAAAAAAADDIwLjIxMi41Mi43NiDjxysoCLj_kqq1dtoYCpB9_eZ3vMihC0hAJx7wyc5aRBgyLmRuc2NyeXB0LWNlcnQuc2dwLWRuNTM
+
+
+## sgp-dn53-ipv6
+
+non-censoring, non-logging, DNSSEC-capable based on official docker image hosted in Singapore
+
+sdns://AQcAAAAAAAAAH1syYTAxOjExMTpmMTAwOjcwMDA6OjZmZGQ6NTNjNl0g48crKAi4_5KqtXbaGAqQff3md7zIoQtIQCce8MnOWkQYMi5kbnNjcnlwdC1jZXJ0LnNncC1kbjUz
+
+
+## sth-ads-doh-se
+
+Resolver in Stockholm, Sweden. DoH server. Non-logging, remove ads and malware, DNSSEC.
+
+sdns://AgMAAAAAAAAADTQ1LjE1My4xODcuOTYAGGRuc3NlLW5vYWRzLmFsZWtiZXJnLm5ldAovZG5zLXF1ZXJ5
+
+
+## sth-dnscrypt-se
+
+Resolver in Stockholm, Sweden. DNSCrypt server. Non-logging, non-filtering, DNSSEC.
+
+sdns://AQcAAAAAAAAADTQ1LjE1My4xODcuOTYgeXlaphvMhHruyoIiBZWFCQqgabN91D0bQEBb3nJ9yUYfMi5kbnNjcnlwdC1jZXJ0LnN0aC1kbnNjcnlwdC1zZQ
+
+
+## sth-doh-se
+
+Resolver in Stockholm, Sweden. DoH server. Non-logging, non-filtering, DNSSEC.
+
+sdns://AgcAAAAAAAAADTQ1LjE1My4xODcuOTagzBBg05yDKbYrb7x9DW35MJhpuYHn5jktXNj6QI9NgOYgRE69Z7uD-IB7OSHpOKyReLiCvVCq2xEjHwRM9fCN984SZG5zc2UuYWxla2JlcmcubmV0Ci9kbnMtcXVlcnk
+
+
+## sth-doh-se-ipv6
+
+Resolver in Stockholm, Sweden. DoH server. Non-logging, non-filtering, DNSSEC.
+
+sdns://AgcAAAAAAAAAFVsyYTA5OmNkNDI6Zjo0MjViOjoxXaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhJkbnNzZS5hbGVrYmVyZy5uZXQKL2Rucy1xdWVyeQ
+
+
+## switch
+
+Public DoH service provided by SWITCH in Switzerland
+
+https://www.switch.ch
+
+Provides protection against malware, but does not block ads.
+
+sdns://AgMAAAAAAAAAACAqFfXWrLbnwJAa3k67x0OyzNSJAytG4WQvBpNoMAElig1kbnMuc3dpdGNoLmNoCi9kbnMtcXVlcnk
+
+
+## techsaviours.org-dnscrypt
+
+No filter | No logs | DNSSEC | Nuremberg, Germany (netcup) | Maintained by https://techsaviours.org/
+
+sdns://AQcAAAAAAAAAEjQ1LjEzMi4yNDUuOTU6NDQzNCAaKOG7s_XPRo0TVYMDCtgWPemMyDThFEe1os3q_As_UCAyLmRuc2NyeXB0LWNlcnQudGVjaHNhdmlvdXJzLm9yZw
+
+
+## tuna-doh-ipv4
+
+DoH server provided by Tsinghua University TUNA Association, located in mainland China, no GFW poisoning yet it has a manual blacklist.
+
+sdns://AgEAAAAAAAAACTEwMS42LjYuNiBZPi1Jp0AjVVUmrvm3QisZ5bixZzkbbe5e0pKxyiOnTA4xMDEuNi42LjY6ODQ0MwovZG5zLXF1ZXJ5
+
+
+## uncensoreddns-dk-ipv4
+
+Also known as censurfridns.
+DoH, no logs, no filter, DNSSEC, unicast hosted in Denmark - https://blog.uncensoreddns.org
+
+sdns://AgcAAAAAAAAADDg5LjIzMy40My43MaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhl1bmljYXN0LnVuY2Vuc29yZWRkbnMub3JnCi9kbnMtcXVlcnk
+
+
+## uncensoreddns-dk-ipv6
+
+Also known as censurfridns.
+DoH, no logs, no filter, DNSSEC, unicast hosted in Denmark - https://blog.uncensoreddns.org
+
+sdns://AgcAAAAAAAAAElsyYTAxOjNhMDo1Mzo1Mzo6XaDMEGDTnIMptitvvH0NbfkwmGm5gefmOS1c2PpAj02A5iBETr1nu4P4gHs5Iek4rJF4uIK9UKrbESMfBEz18I33zhl1bmljYXN0LnVuY2Vuc29yZWRkbnMub3JnCi9kbnMtcXVlcnk
+
+
+## uncensoreddns-ipv4
+
+Also known as censurfridns.
+DoH, no logs, no filter, DNSSEC, anycast - https://blog.uncensoreddns.org
+
+sdns://AgcAAAAAAAAADjkxLjIzOS4xMDAuMTAwoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOGWFueWNhc3QudW5jZW5zb3JlZGRucy5vcmcKL2Rucy1xdWVyeQ
+
+
+## uncensoreddns-ipv6
+
+Also known as censurfridns.
+DoH, no logs, no filter, DNSSEC, anycast - https://blog.uncensoreddns.org
+
+sdns://AgcAAAAAAAAAEVsyMDAxOjY3YzoyOGE0OjpdoMwQYNOcgym2K2-8fQ1t-TCYabmB5-Y5LVzY-kCPTYDmIEROvWe7g_iAezkh6TiskXi4gr1QqtsRIx8ETPXwjffOGWFueWNhc3QudW5jZW5zb3JlZGRucy5vcmcKL2Rucy1xdWVyeQ
+
+
+## userspace-australia
+
+DNSCrypt in Australia (Brisbane & Melbourne) by UserSpace.
+No logs | IPv4 | Filtered
+
+sdns://AQMAAAAAAAAAEDEwMy4xNi4xMzEuNzc6NTQgnRNtOLv4IzxEfkbLFOaHa-ncLImdQiP-pS1jaFY5jlUdMi5kbnNjcnlwdC1jZXJ0LnVzZXJzcGFjZS1ibmU
+sdns://AQMAAAAAAAAAEjEwMy4yMzYuMTYyLjExOTo1NCBPr5jCD_2geOTMmS5LgQg_v79pgppTm3vLZhe_oahbgR0yLmRuc2NyeXB0LWNlcnQudXNlcnNwYWNlLW1lbA
+
+
+## userspace-australia-ipv6
+
+DNSCrypt in Australia (Brisbane & Melbourne) by UserSpace.
+No logs | IPv6 | Filtered
+
+sdns://AQMAAAAAAAAAJVsyNDA0Ojk0MDA6MTowOjIxNjozZWZmOmZlZjA6MTgwYV06NTQgnRNtOLv4IzxEfkbLFOaHa-ncLImdQiP-pS1jaFY5jlUdMi5kbnNjcnlwdC1jZXJ0LnVzZXJzcGFjZS1ibmU
+sdns://AQMAAAAAAAAAJVsyNDA0Ojk0MDA6MzowOjIxNjozZWZmOmZlZTA6N2Y2OV06NTQgT6-Ywg_9oHjkzJkuS4EIP7-_aYKaU5t7y2YXv6GoW4EdMi5kbnNjcnlwdC1jZXJ0LnVzZXJzcGFjZS1tZWw
+
+
+## v.dnscrypt.uk-doh-ipv4
+
+DoH, no logs, uncensored, DNSSEC. Hosted in London UK on Digital Ocean
+https://www.dnscrypt.uk
+
+sdns://AgcAAAAAAAAADTEzNi4yNDQuNjUuMjAAEXYuZG5zY3J5cHQudWs6NDQzCi9kbnMtcXVlcnk
+
+
+## v.dnscrypt.uk-doh-ipv6
+
+DoH, no logs, uncensored, DNSSEC. Hosted in London UK on Digital Ocean
+https://www.dnscrypt.uk
+
+sdns://AgcAAAAAAAAAJ1syYTA1OmY0ODA6MTAwMDo5Njc6NTQwMDozZmY6ZmU3ZTo1NWQzXQARdi5kbnNjcnlwdC51azo0NDMKL2Rucy1xdWVyeQ
+
+
+## v.dnscrypt.uk-ipv4
+
+DNSCrypt, no logs, uncensored, DNSSEC. Hosted in London UK on Digital Ocean
+https://www.dnscrypt.uk
+
+sdns://AQcAAAAAAAAADzEwNC4yMzguMTg2LjE5MiDtST2M6teQZk8GPEe3lZojaS18kDY8nkPMtZF75bQe5R0yLmRuc2NyeXB0LWNlcnQudi5kbnNjcnlwdC51aw
+
+
+## v.dnscrypt.uk-ipv6
+
+DNSCrypt, no logs, uncensored, DNSSEC. Hosted in London UK on Digital Ocean
+https://www.dnscrypt.uk
+
+sdns://AQcAAAAAAAAAKFsyMDAxOjE5ZjA6NzQwMjoxNTc0OjU0MDA6MmZmOmZlNjY6MmNmZl0g7Uk9jOrXkGZPBjxHt5WaI2ktfJA2PJ5DzLWRe-W0HuUdMi5kbnNjcnlwdC1jZXJ0LnYuZG5zY3J5cHQudWs
+
+
+## wevpn-singapore
+
+Private DNSCrypt service by WeVPN in Singapore - https://wevpn.com/dns
+With ad blocking.
+
+sdns://AQcAAAAAAAAAEzE0My4yNDQuMzMuNzQ6MTUzNTMgFTXwu5MfYkBOrRpDeoB-yOWEjCnf-l3yixhtuzuPBskfMi5kbnNjcnlwdC1jZXJ0LnNlY3VyZS5kbnMudGVzdA
+
+
+## wevpn-useast
+
+Private DNSCrypt service by WeVPN in New Jersey, USA - https://wevpn.com/dns
+With ad blocking.
+
+sdns://AQcAAAAAAAAAFDIzLjIyNi4xMzQuMjQyOjE1MzUzII_Le5DiGa3AfdRxR7DRt52ZaexL_22aLfjDJwp5saIsHzIuZG5zY3J5cHQtY2VydC5zZWN1cmUuZG5zLnRlc3Q
+
+
+## wevpn-uswest
+
+Private DNSCrypt service by WeVPN in Los Angeles, USA - https://wevpn.com/dns
+With ad blocking.
+
+sdns://AQcAAAAAAAAAEjcyLjExLjEzNC45MDoxNTM1MyAKLsInrJLgKMxBqSL1VvH74T3wwp1bn5wkvPwUlea3Kh8yLmRuc2NyeXB0LWNlcnQuc2VjdXJlLmRucy50ZXN0
+
+
+## yandex
+
+Yandex public DNS server (anycast)
+
+sdns://AQQAAAAAAAAAEDc3Ljg4LjguNzg6MTUzNTMg04TAccn3RmKvKszVe13MlxTUB7atNgHhrtwG1W1JYyciMi5kbnNjcnlwdC1jZXJ0LmJyb3dzZXIueWFuZGV4Lm5ldA
+
diff --git a/dnscrypt-proxy2/files/public-resolvers.md.minisig b/dnscrypt-proxy2/files/public-resolvers.md.minisig
new file mode 100644
index 00000000..4f57dd1a
--- /dev/null
+++ b/dnscrypt-proxy2/files/public-resolvers.md.minisig
@@ -0,0 +1,4 @@
+untrusted comment: signature from minisign secret key
+RWQf6LRCGA9i5x5qFHQjA/xsZJkJ0JySsC5KSQigpNKMoEv8LJFgbIeweCfbtNX1z/I6b1ISadUKj2wiO3qKXWNWNpNcEfRl9A8=
+trusted comment: timestamp:1650538394	file:public-resolvers.md
+PAdyacwfZtV9oqzcxI+BvfigaFEIgyIQYvLmuWCAPgxvjj2LkcW2NfU9I8/KfMDOPGqZuJp7G+NJQqfuCKWnBw==
diff --git a/dnscrypt-proxy2/files/relays.md b/dnscrypt-proxy2/files/relays.md
new file mode 100644
index 00000000..d577a31c
--- /dev/null
+++ b/dnscrypt-proxy2/files/relays.md
@@ -0,0 +1,577 @@
+# Anonymized DNS relays
+
+Anonymized DNS is a lightweight alternative to Tor and SOCKS proxies,
+dedicated to DNS traffic. They hide the client IP address to DNS resolvers,
+providing anonymity in addition to confidentiality and integrity.
+
+DNS Anonymization is only compatible with servers supporting the
+DNSCrypt protocol.
+
+See the link below for more information:
+
+https://github.com/DNSCrypt/dnscrypt-proxy/wiki/Anonymized-DNS
+
+
+## anon-acsacsar-ams-ipv4
+
+Anonymized DNS relay hosted in AMS on Scaleway
+
+sdns://gQ01MS4xNTguMTY2Ljk3
+
+
+## anon-acsacsar-ams-ipv6
+
+Anonymized DNS relay hosted in AMS on Scaleway
+
+sdns://gRZbMjAwMTpiYzg6MTgyNDo3Mzg6OjFd
+
+
+## anon-ams-nl
+
+Anonymized DNS relay hosted in Netherlands - NL
+
+sdns://gRE1MS4xNS4xMjQuMjA4OjQ0Mw
+
+
+## anon-ams-nl-ipv6
+
+Anonymized DNS relay hosted in Netherlands - NL
+
+sdns://gRtbMjAwMTpiYzg6MTgzMDoyMDE4OjoxXTo0NDM
+
+
+## anon-bcn
+
+Anonymized DNS relay hosted in Barcelona, Spain.
+
+sdns://gRIxODUuMjUzLjE1NC42Njo0NDM
+
+
+## anon-cs-austria
+
+Wien, Austria Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ05NC4xOTguNDEuMjM1
+
+
+## anon-cs-barcelona
+
+Barcelona, Spain Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4zNy4xMjAuMTQyLjExNQ
+
+
+## anon-cs-belgium
+
+Brussels, Belgium Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ0zNy4xMjAuMjM2LjEx
+
+
+## anon-cs-berlin
+
+Berlin, Germany Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ0zNy4xMjAuMjE3Ljc1
+
+
+## anon-cs-brazil
+
+Brazil Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4xNzcuNTQuMTQ1LjEzMQ
+
+
+## anon-cs-bulgaria
+
+Sofia, Bulgaria Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4zNy4xMjAuMTUyLjIzNQ
+
+
+## anon-cs-czech
+
+Prague, Czech Republic Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ8yMTcuMTM4LjIyMC4yNDM
+
+
+## anon-cs-dc
+
+US - Washington, DC Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQwxOTguNy41OC4yMjc
+
+
+## anon-cs-de
+
+Frankfurt, Germany Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQsxNDYuNzAuODIuMw
+
+
+## anon-cs-dk
+
+Denmark Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ0zNy4xMjAuMjMyLjQz
+
+
+## anon-cs-dus1
+
+Dusseldorf, Germany 1 Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4yMTMuMjAyLjIxNi4xMg
+
+
+## anon-cs-dus2
+
+Dusseldorf, Germany 2 Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ8yMTMuMjAyLjIxNi4yMzY
+
+
+## anon-cs-dus4
+
+Dusseldorf, Germany 4 Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ44NS4xMTQuMTM4LjExOQ
+
+
+## anon-cs-finland
+
+Finland Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4xODUuMTE3LjExOC4yMA
+
+
+## anon-cs-fl
+
+US - Miami, FL Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQwyMy4xOS4xMTcuNTU
+
+
+## anon-cs-fl2
+
+US - Miami, FL Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQwyMy4xOS4xMTcuNTE
+
+
+## anon-cs-fr
+
+France Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ0xNjMuMTcyLjM0LjU2
+
+
+## anon-cs-hungary
+
+Budapest, Hungary Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ04Ni4xMDYuNzQuMjE5
+
+
+## anon-cs-il
+
+US - Chicago, IL Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4xNzMuMjM0LjU2LjExNQ
+
+
+## anon-cs-il2
+
+US - Chicago, IL 2 Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4xNzIuMTA3LjE5OS4xOQ
+
+
+## anon-cs-ireland
+
+Dublin, Ireland Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4zNy4xMjAuMjM1LjE4Nw
+
+
+## anon-cs-is
+
+Iceland Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ04Mi4yMjEuMTI4LjQ0
+
+
+## anon-cs-la
+
+US - Los Angeles, CA Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQwyMy4xOS42Ny4xMTY
+
+
+## anon-cs-london
+
+London, England Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ03OC4xMjkuMTQwLjY1
+
+
+## anon-cs-madrid
+
+Madrid, Spain Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4xODUuMTgzLjEwNi44Mw
+
+
+## anon-cs-manchester
+
+Manchester, England Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ0xOTUuMTIuNDguMTcx
+
+
+## anon-cs-milan
+
+Milan, Italy Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ8yMTcuMTM4LjIxOS4yMTk
+
+
+## anon-cs-montreal
+
+Montreal, Canada Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4xNjcuMTE0Ljg0LjEzMg
+
+
+## anon-cs-montreal2
+
+Montreal, Canada 2 Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ8xNDQuMTY4LjE2NS4xNjM
+
+
+## anon-cs-nc
+
+US - North Carolina Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4xNTUuMjU0LjIxLjI1MA
+
+
+## anon-cs-nl
+
+Netherlands Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ0xODUuMTA3LjgwLjg0
+
+
+## anon-cs-nl2
+
+Netherlands 2 Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ8xNzIuMTA3LjIyNi4xMDc
+
+
+## anon-cs-norway
+
+Oslo, Norway Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ45MS4yMTkuMjE1LjIyNw
+
+
+## anon-cs-nv
+
+US - Las Vegas, NV Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQwzNy4xMjAuMTQ3LjI
+
+
+## anon-cs-nyc1
+
+US - New York City, NY 1 Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQwyMy4xOS4yNDUuODg
+
+
+## anon-cs-nyc2
+
+US - New York City, NY 2 Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQwyMy4xOS4yNDUuODQ
+
+
+## anon-cs-ore
+
+US - Oregon Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ0xMDQuMjU1LjE3NS4y
+
+
+## anon-cs-poland
+
+Warsaw, Poland Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ0zNy4xMjAuMjExLjkx
+
+
+## anon-cs-pt
+
+Portugal Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ45MS4yMDUuMjMwLjIyNA
+
+
+## anon-cs-ro
+
+Romania Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ0xNDYuNzAuNjYuMjI3
+
+
+## anon-cs-rome
+
+Rome, Italy Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4zNy4xMjAuMjA3LjEzMQ
+
+
+## anon-cs-sea
+
+US - Seattle, WA Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQw2NC4xMjAuNS4yNTE
+
+
+## anon-cs-serbia
+
+Belgrade, Serbia Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4zNy4xMjAuMTkzLjIxOQ
+
+
+## anon-cs-sk
+
+South Korea Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ8xNzIuMTA3LjE1NC4yMTE
+
+
+## anon-cs-slovakia
+
+Bratislava, Slovakia Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4xOTMuMzcuMjU1LjIyNw
+
+
+## anon-cs-swe
+
+Sweden Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ8xMjguMTI3LjEwNC4xMDg
+
+
+## anon-cs-sydney
+
+Sydney, Australia Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ4zNy4xMjAuMjM0LjI1MQ
+
+
+## anon-cs-tokyo
+
+Tokyo, Japan Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQwxNDYuNzAuMzEuNDM
+
+
+## anon-cs-tx
+
+US - Dallas, TX Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQ0yMDkuNTguMTQ3LjM2
+
+
+## anon-cs-tx2
+
+US - Dallas, TX 2 Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQs0NS4zNS4zNS45OQ
+
+
+## anon-cs-tx3
+
+US - Dallas, TX 3 Anonymized DNS relay server provided by https://cryptostorm.is/
+
+sdns://gQs0NS4zNS43Mi40Mw
+
+
+## anon-curzon-prg
+
+Anonymized DNS relay hosted in Prague, Czech Republic on SkylonHost - maintained by @ztheory. No log.
+
+sdns://gQ4xMDkuMjQ4LjQzLjE1NA
+
+
+## anon-dnscrypt.uk-ipv4
+
+Anonymized DNS relay hosted in UK on DigitalOcean
+
+sdns://gQ0xNjUuMjMyLjMyLjk1
+
+
+## anon-dnscrypt.uk-ipv6
+
+Anonymized DNS relay hosted in UK on DigitalOcean
+
+sdns://gRpbMmEwMzpiMGMwOjE6ZTA6OjQ4NzoxMDAxXQ
+
+
+## anon-inconnu
+
+Anonymized DNS relay hosted in Seattle, WA (USA), maintained by Eric
+Lagergren (@ericlagergren). Running the official Docker image on Vultr.
+
+sdns://gQ4xMDQuMjM4LjE1My40Ng
+
+
+## anon-kama
+
+Anonymized DNS relay hosted in France and maintained by Frank Denis (@jedisct1).
+
+sdns://gQ4xMzcuNzQuMjIzLjIzNA
+
+
+## anon-meganerd
+
+Anonymized DNS relay hosted by MegaNerd.nl (IPv4) (https://www.meganerd.nl/encrypted-dns-server) in Amsterdam, The Netherlands (AMS1)
+
+sdns://gQ4xMzYuMjQ0Ljk3LjExNA
+
+
+## anon-meganerd-ipv6
+
+Anonymized DNS relay hosted by MegaNerd.nl (IPv6) (https://www.meganerd.nl/encrypted-dns-server) in Amsterdam, The Netherlands (AMS1)
+
+sdns://gSdbMjAwMToxOWYwOjUwMDE6Y2JiOjU0MDA6M2ZmOmZlMDc6ZjcwZF0
+
+
+## anon-plan9-dns
+
+Anonymized DNS relay hosted in New Jersey, USA. Running the official Docker image on Vultr by @jlongua1
+
+sdns://gQ4xNzMuMTk5LjEyNi4zNQ
+
+
+## anon-plan9-ns2
+
+Anonymized DNS relay hosted in Florida, USA. info - https://jlongua.github.io/plan9-dns/
+
+sdns://gRI0NS42My4xMTAuMTg3Ojg0NDM
+
+
+## anon-resolver4.dns.openinternet.io
+
+Anonymized DNS relay colocated at Sonic.net in Santa Rosa, CA in the United States. Provided by https://openinternet.io
+
+sdns://gQ03MC4zNi4xNzAuMTI2
+
+
+## anon-saldns01-conoha-ipv4
+
+Hosted on ConoHa VPS Tokyo region. No log.
+
+sdns://gRQxMTguMjcuMTA4LjE0MDo1MDQ0Mw
+
+
+## anon-saldns02-conoha-ipv4
+
+Hosted on ConoHa VPS Tokyo region. No log.
+
+sdns://gRUxMzMuMTMwLjExOC4xMDM6NTA0NDM
+
+
+## anon-saldns99-conoha-ipv4
+
+Hosted on ConoHa VPS Tokyo region (not a resolver, but just a relay). No log
+
+sdns://gRUxMzMuMTMwLjExMy4xNjM6NTA0NDM
+
+
+## anon-saldnssg01-conoha-ipv4
+
+Hosted on ConoHa VPS Singapore region. No log.
+
+sdns://gRQxNjMuNDQuMTU0LjE0NDo1MDQ0Mw
+
+
+## anon-scaleway
+
+Anonymized DNS relay hosted in France and maintained by Frank Denis (@jedisct1).
+Running on an instance donated by https://scaleway.com
+
+sdns://gQ8xNjMuMTcyLjE4MC4xMjU
+
+
+## anon-scaleway-ams
+
+Anonymized DNS relay hosted in Amsterdam and maintained by Frank Denis (@jedisct1).
+Running on an instance donated by https://scaleway.com
+
+sdns://gQ01MS4xNS4xMjIuMjUw
+
+
+## anon-scaleway-ams-ipv6
+
+Anonymized DNS relay hosted in Amsterdam and maintained by Frank Denis (@jedisct1).
+IPv6 only. Running on an instance donated by https://scaleway.com
+
+sdns://gRZbMjAwMTpiYzg6MTgyMDo1MGQ6OjFd
+
+
+## anon-serbica
+
+Anonymized DNS relay hosted in Netherlands by https://litepay.ch
+
+sdns://gRMxODUuNjYuMTQzLjE3ODo1MzUz
+
+
+## anon-sth-se
+
+Anonymized DNS relay hosted in Sweden - SE
+
+sdns://gRE0NS4xNTMuMTg3Ljk2OjQ0Mw
+
+
+## anon-techsaviours.org
+
+Anonymized DNS relay hosted in Nuremberg, Germany (netcup) and maintained by https://techsaviours.org
+
+sdns://gRI0NS4xMzIuMjQ1Ljk1OjQ0MzQ
+
+
+## anon-tiarap
+
+Anonymized DNS relay hosted in Singapore
+
+sdns://gRMxNzQuMTM4LjI5LjE3NToxNDQz
+
+
+## anon-tiarap-ipv6
+
+Anonymized IPv6 DNS relay hosted in Singapore
+
+sdns://gSBbMjQwMDo2MTgwOjA6ZDA6OjVmNzM6NDAwMV06MTQ0Mw
+
+
+## anon-v.dnscrypt.uk-ipv4
+
+Anonymized DNS relay hosted in UK on Vultr
+
+sdns://gQ8xMDQuMjM4LjE4Ni4xOTI
+
+
+## anon-v.dnscrypt.uk-ipv6
+
+Anonymized DNS relay hosted in UK on Vultr
+
+sdns://gShbMjAwMToxOWYwOjc0MDI6MTU3NDo1NDAwOjJmZjpmZTY2OjJjZmZd
+
diff --git a/dnscrypt-proxy2/files/relays.md.minisig b/dnscrypt-proxy2/files/relays.md.minisig
new file mode 100644
index 00000000..e077e799
--- /dev/null
+++ b/dnscrypt-proxy2/files/relays.md.minisig
@@ -0,0 +1,4 @@
+untrusted comment: signature from minisign secret key
+RWQf6LRCGA9i584EuhI0oTk76xKCChYBEd4IzpmSacC5FtvCRM29jF+Z8xNkHEDNCzCj8W7+jl5RsVaXanZQ9XKPVX9QZrhQIAE=
+trusted comment: timestamp:1650451429	file:relays.md
+iakKshXKbc5eTc8rrPVHORvuJkVUencKat6nab29t6MbfiY3jVfSBNQy/IrrLyIQD4FiCXByh81/bfb3Dhh3DA==
diff --git a/fcgi/Makefile b/fcgi/Makefile
new file mode 100644
index 00000000..32acaefc
--- /dev/null
+++ b/fcgi/Makefile
@@ -0,0 +1,77 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fcgi
+PKG_VERSION:=2.4.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)2-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/FastCGI-Archives/fcgi2/tar.gz/$(PKG_VERSION)?
+PKG_HASH:=1fe83501edfc3a7ec96bb1e69db3fd5ea1730135bd73ab152186fd0b437013bc
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)2-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Jacob Siverskog <jacob@teenageengineering.com>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE.TERMS
+
+PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/uclibc++.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/fcgi/Default
+  SECTION:=libs
+  CATEGORY:=Libraries
+  URL:=https://fastcgi-archives.github.io/
+endef
+
+define Package/fcgi
+  $(call Package/fcgi/Default)
+  MENU:=1
+  DEPENDS:=+libpthread
+  TITLE:=Shared library of FastCGI
+endef
+
+define Package/fcgixx
+  $(call Package/fcgi/Default)
+  DEPENDS:=fcgi $(CXX_DEPENDS)
+  TITLE:=Shared library of FastCGI++
+endef
+
+define Package/fcgi/description
+ FastCGI is a language independent, scalable, open extension to
+ CGI that provides high performance without the limitations of
+ server specific APIs.
+endef
+
+TARGET_CXXFLAGS += -fno-rtti -flto
+TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/fastcgi.h $(1)/usr/include/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/fcgi{app,_config,misc,o,os,_stdio}.h $(1)/usr/include/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi{,++}.{a,so*} $(1)/usr/lib/
+endef
+
+define Package/fcgi/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/cgi-fcgi $(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi.so.* $(1)/usr/lib/
+endef
+
+define Package/fcgixx/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi++.so.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,fcgi))
+$(eval $(call BuildPackage,fcgixx))
diff --git a/fcgi/patches/100-fcgio-int-type-fix.patch b/fcgi/patches/100-fcgio-int-type-fix.patch
new file mode 100644
index 00000000..1aec5f04
--- /dev/null
+++ b/fcgi/patches/100-fcgio-int-type-fix.patch
@@ -0,0 +1,35 @@
+--- a/include/fcgio.h
++++ b/include/fcgio.h
+@@ -77,10 +77,10 @@ protected:
+     virtual int sync();
+ 
+     // Remove and return the current character.
+-    virtual int uflow();
++    virtual int_type uflow();
+ 
+     // Fill the get area (if buffered) and return the current character.
+-    virtual int underflow();
++    virtual int_type underflow();
+ 
+     // Use a buffer.  The only reasons that a buffer would be useful is
+     // to support the use of the unget()/putback() or seek() methods.  Using
+--- a/libfcgi/fcgio.cpp
++++ b/libfcgi/fcgio.cpp
+@@ -86,7 +86,7 @@ int fcgi_streambuf::sync()
+ }
+ 
+ // uflow() removes the char, underflow() doesn't
+-int fcgi_streambuf::uflow() 
++std::basic_streambuf<char>::int_type fcgi_streambuf::uflow()
+ {
+     if (this->bufsize)
+     {
+@@ -100,7 +100,7 @@ int fcgi_streambuf::uflow()
+     }
+ }
+ 				
+-int fcgi_streambuf::underflow()
++std::basic_streambuf<char>::int_type fcgi_streambuf::underflow()
+ {
+     if (this->bufsize)
+     {
diff --git a/fullconenat/Makefile b/fullconenat/Makefile
new file mode 100644
index 00000000..32843f82
--- /dev/null
+++ b/fullconenat/Makefile
@@ -0,0 +1,61 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fullconenat
+PKG_RELEASE:=1
+
+PKG_SOURCE_DATE:=2023-01-01
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/llccd/netfilter-full-cone-nat.git
+PKG_SOURCE_VERSION:=74c5e6f3c7faaf33ece451697537c81781781c20
+PKG_MIRROR_HASH:=3c254f1edba28eafdccac9cf95eb550fd2b05eeaaec8a02c73e1dcd2f98f9d93
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/kernel.mk
+include $(INCLUDE_DIR)/package.mk
+
+define Package/iptables-mod-fullconenat
+  SUBMENU:=Firewall
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=FULLCONENAT iptables extension
+  DEPENDS:=+iptables +kmod-ipt-fullconenat
+endef
+
+define Package/iptables-mod-fullconenat/install
+	$(INSTALL_DIR) $(1)/usr/lib/iptables
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libipt_FULLCONENAT.so $(1)/usr/lib/iptables
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libip6t_FULLCONENAT.so $(1)/usr/lib/iptables
+endef
+
+define KernelPackage/ipt-fullconenat
+  SUBMENU:=Netfilter Extensions
+  TITLE:=FULLCONENAT netfilter module
+  DEPENDS:=+kmod-nf-ipt +kmod-nf-nat +kmod-nf-ipt6 +kmod-nf-nat6
+  KCONFIG:=  \
+	CONFIG_NF_CONNTRACK_EVENTS=y \
+	CONFIG_NF_CONNTRACK_CHAIN_EVENTS=y
+  FILES:=$(PKG_BUILD_DIR)/xt_FULLCONENAT.ko
+endef
+
+include $(INCLUDE_DIR)/kernel-defaults.mk
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(CP) ./src/Makefile $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	+$(KERNEL_MAKE) $(PKG_JOBS) -C "$(LINUX_DIR)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		ARCH="$(LINUX_KARCH)" \
+		M="$(PKG_BUILD_DIR)" \
+		EXTRA_CFLAGS="$(BUILDFLAGS)" \
+		modules
+	$(call Build/Compile/Default)
+endef
+
+$(eval $(call KernelPackage,ipt-fullconenat))
+$(eval $(call BuildPackage,iptables-mod-fullconenat))
+
diff --git a/fullconenat/src/Makefile b/fullconenat/src/Makefile
new file mode 100755
index 00000000..47a24441
--- /dev/null
+++ b/fullconenat/src/Makefile
@@ -0,0 +1,10 @@
+all: libipt_FULLCONENAT.so libip6t_FULLCONENAT.so
+.PHONY: all
+
+%.so: %.o
+	$(CC) -shared -lxtables -o $@ $^
+
+%.o: %.c
+	$(CC) ${CFLAGS} -fPIC -c -o $@ $<
+
+obj-m += xt_FULLCONENAT.o
diff --git a/gl-sdk4-edgerouter-status/.gitlab-ci.yml b/gl-sdk4-edgerouter-status/.gitlab-ci.yml
new file mode 100644
index 00000000..335cefd1
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/.gitlab-ci.yml
@@ -0,0 +1,23 @@
+# use the official gcc image, based on debian
+# can use verions as well, like gcc:5.2
+# see https://hub.docker.com/_/gcc/
+image: gcc
+
+stages:
+  - build
+
+
+compile:
+  stage: build
+  tags:
+    - gl_router_runner
+  only:
+    refs:
+      - master
+  script:
+    - echo $CI_PROJECT_NAME
+    - echo $CI_PROJECT_DIR
+    - echo $CI_COMMIT_SHORT_SHA
+    - echo $CI_COMMIT_MESSAGE
+    - cd /home/luo/runner-script/sdk4_script;./sdk4_compile_ci "$CI_PROJECT_NAME" "$CI_PROJECT_DIR" "$CI_COMMIT_SHORT_SHA" "$CI_COMMIT_MESSAGE"
+
diff --git a/gl-sdk4-edgerouter-status/Makefile b/gl-sdk4-edgerouter-status/Makefile
new file mode 100755
index 00000000..06705287
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/Makefile
@@ -0,0 +1,46 @@
+#
+#
+# Copyright (C) 2017 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=gl-sdk4-edgerouter-status
+PKG_VERSION:=4.0.0
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+
+define KernelPackage/gl-sdk4-edgerouter-status
+  CATEGORY:=gl-inet
+  SUBMENU:=Kernel modules
+  TITLE:=Status Monitor for edgerouter
+  FILES:=$(PKG_BUILD_DIR)/edgerouter-status.ko
+  AUTOLOAD:=$(call AutoLoad,30,edgerouter-status,1)
+endef
+
+
+KERNEL_MAKE_FLAGS?= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)"
+
+MAKE_OPTS:= \
+	$(KERNEL_MAKE_FLAGS) \
+	M="$(PKG_BUILD_DIR)"
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		modules
+endef
+
+define Package/gl-sdk4-edgerouter-status/install
+	echo "install done"
+endef
+
+$(eval $(call KernelPackage,gl-sdk4-edgerouter-status))
diff --git a/gl-sdk4-edgerouter-status/src/Makefile b/gl-sdk4-edgerouter-status/src/Makefile
new file mode 100644
index 00000000..b23dc6ae
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/src/Makefile
@@ -0,0 +1,2 @@
+edgerouter-status-objs := main.o devices.o procs.o arp.o
+obj-m := edgerouter-status.o
diff --git a/gl-sdk4-edgerouter-status/src/arp.c b/gl-sdk4-edgerouter-status/src/arp.c
new file mode 100644
index 00000000..1964a1ee
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/src/arp.c
@@ -0,0 +1,179 @@
+#include <net/arp.h>
+#include <linux/ip.h>
+#include "erdevices.h"
+#include <linux/workqueue.h>
+
+static struct work_struct do_arp_work;
+static struct delayed_work arp_loop_work;
+
+struct arp_sender {
+    struct work_struct work;
+    __be32 sip;
+    __be32 tip;
+    u8 smac[ETH_ALEN];
+    u8 tmac[ETH_ALEN];
+    struct net_device *dev;
+};
+struct arp_sender *gl_arp_sender;
+
+static void arp_send_special_sender(int type, int ptype, __be32 dest_ip,
+                                    struct net_device *dev, __be32 src_ip,
+                                    const unsigned char *dest_hw,
+                                    const unsigned char *src_hw,
+                                    const unsigned char *target_hw,
+                                    const unsigned char *sender_hw)
+{
+    struct sk_buff *skb;
+    unsigned char *ptr;
+    struct arphdr *ahdr;
+
+    /* arp on this interface. */
+    if (dev->flags & IFF_NOARP)
+        return;
+
+    skb = arp_create(type, ptype, dest_ip, dev, src_ip,
+                     dest_hw, src_hw, target_hw);
+    if (!skb)
+        return;
+    ahdr = arp_hdr(skb);
+    ptr = (unsigned char *)(ahdr + 1);
+    memcpy(ptr, sender_hw, ETH_ALEN);
+    arp_xmit(skb);
+}
+
+static void spoof(__be32 dest_ip, struct net_device *dev, const unsigned char *target_hw)
+{
+    char probe_mac[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
+    struct neighbour *n = __ipv4_neigh_lookup_noref(dev, erdevice_target_ip);
+
+    if (n) {
+        arp_send_special_sender(ARPOP_REQUEST, ETH_P_ARP, dest_ip, dev, 0, target_hw, dev->dev_addr, probe_mac, n->ha);
+    }
+    arp_send(ARPOP_REPLY, ETH_P_ARP, dest_ip, dev, erdevice_target_ip, target_hw, dev->dev_addr, target_hw);
+    arp_send(ARPOP_REQUEST, ETH_P_ARP, dest_ip, dev, erdevice_target_ip, target_hw, dev->dev_addr, target_hw);
+}
+
+static void do_arp_spoof(struct work_struct *mywork)
+{
+    struct arp_sender *sender;
+
+    sender = container_of(mywork, struct arp_sender, work);
+    if (!sender)
+        return;
+    //spoof(sender->tip,sender->dev,sender->tmac);
+    //arp_send(ARPOP_REQUEST, ETH_P_ARP, sender->tip, sender->dev, 0, probe_dmac, sender->smac, probe_mac);
+    //arp_send(ARPOP_REPLY, ETH_P_ARP, sender->tip, sender->dev, sender->sip, sender->tmac, sender->smac, sender->tmac);
+
+}
+
+void arp_spoof(struct sk_buff *skb)
+{
+    unsigned char *ptr;
+    __be32 sip, tip;
+    struct ethhdr *ehdr = eth_hdr(skb);
+    struct arphdr *ahdr = arp_hdr(skb);
+    if (ehdr == NULL || ahdr == NULL)
+        return;
+
+    if (ahdr->ar_op != __cpu_to_be16(ARPOP_REPLY))
+        return;
+
+    ptr = (unsigned char *)(ahdr + 1);
+    ptr += skb->dev->addr_len;
+    memcpy(&sip, ptr, 4);
+    ptr += 4;
+    ptr += skb->dev->addr_len;
+    memcpy(&tip, ptr, 4);
+
+    //printk("erdevice recv arp reply %pM\t%pI4\n",ehdr->h_source,&sip);
+    if ((!((sip ^ erdevice_target_ip) & erdevice_target_mask))
+            && (sip != erdevice_target_ip)
+            && (ahdr->ar_op == __cpu_to_be16(ARPOP_REPLY))) {
+        update_arp_alive(ehdr->h_source, sip);
+    }/* else if ((!((sip ^ erdevice_target_ip) & erdevice_target_mask))
+               && (tip == erdevice_target_ip)
+               && gl_arp_sender
+               && (ahdr->ar_op == __cpu_to_be16(ARPOP_REQUEST))) {
+        //spoof(sip,skb->dev,ehdr->h_source);
+        gl_arp_sender->tip = sip;
+        gl_arp_sender->sip = tip;
+        memcpy(gl_arp_sender->tmac, ehdr->h_source, ETH_ALEN);
+        memcpy(gl_arp_sender->smac, skb->dev->dev_addr, ETH_ALEN);
+        gl_arp_sender->dev = skb->dev;
+        schedule_work(&gl_arp_sender->work);
+    }*/
+    return;
+}
+
+
+static void do_arp_loop(struct work_struct *work)
+{
+    __be32 start, end, ifaddr;
+    struct net_device *dev;
+    char probe_mac[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
+    char probe_dmac[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+    int i;
+    struct erdevice *device;
+
+    if (!ermodule_is_enabled())
+        goto out;
+
+    if (strlen(erdevice_iface))
+        dev = dev_get_by_name(&init_net, erdevice_iface);
+    if (!dev)
+        goto out;
+
+    rcu_read_lock();
+    if (dev->ip_ptr && (dev->ip_ptr)->ifa_list)
+        ifaddr = ((dev->ip_ptr)->ifa_list)->ifa_address;
+    rcu_read_unlock();
+
+    start = (erdevice_target_ip & erdevice_target_mask);
+    end = start + (cpu_to_be32(0xffffffff) - erdevice_target_mask);
+
+    for (start = start + cpu_to_be32(1); start < end;  start = start + cpu_to_be32(1)) {
+        if (start == erdevice_target_ip)
+            continue;
+
+        arp_send(ARPOP_REQUEST, ETH_P_ARP, start, dev, ifaddr, probe_dmac, dev->dev_addr, probe_mac);
+        //printk("%pM\t%pI4 send arp to %pM\t%pI4\n",dev->dev_addr, &(((dev->ip_ptr)->ifa_list)->ifa_address),probe_dmac,&start);
+    }
+
+    for (i = 0; i < DEVICES_HASH_SIZE ; i++) {
+        hlist_for_each_entry(device, &devices[i], hlist) {
+            //spin_lock(&hash_lock);
+            if (device->arpalive == 0 && device->debounce == 0) { //设备里先设置防抖标志，等待设备文档获取IP后才重新spoof，消抖时间为3个周期
+                device->debounce = 3;
+            } else if (device->arpalive && device->debounce == 0) {
+                device->arpalive = device->arpalive -  1;
+                spoof(device->ip, dev, device->mac);
+            }
+            //spin_unlock(&hash_lock);
+        }
+
+    }
+    dev_put(dev);
+out:
+    mod_delayed_work(system_long_wq, &arp_loop_work, HZ * 3);
+}
+
+void erdevice_arp_init(void)
+{
+    gl_arp_sender = (struct arp_sender *)kzalloc(sizeof(struct arp_sender), GFP_KERNEL);
+    if (gl_arp_sender == NULL) {
+        return;
+    }
+    gl_arp_sender->work = do_arp_work;
+    INIT_WORK(&gl_arp_sender->work, do_arp_spoof);
+    INIT_DELAYED_WORK(&arp_loop_work, do_arp_loop);
+    mod_delayed_work(system_long_wq, &arp_loop_work, HZ * 3);
+}
+
+void erdevice_arp_free(void)
+{
+    if (gl_arp_sender) {
+        kfree(gl_arp_sender);
+    }
+    cancel_delayed_work_sync(&arp_loop_work);
+    return;
+}
diff --git a/gl-sdk4-edgerouter-status/src/devices.c b/gl-sdk4-edgerouter-status/src/devices.c
new file mode 100644
index 00000000..7891c66d
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/src/devices.c
@@ -0,0 +1,215 @@
+#include <linux/version.h>
+#include <linux/slab.h>
+#include <asm/unaligned.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <linux/etherdevice.h>
+#include <linux/netfilter.h>
+#include <linux/inetdevice.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/ktime.h>
+#include <linux/inet.h>
+#include <asm/div64.h>
+#include <net/arp.h>
+#include <linux/kobject.h>
+#include <linux/jiffies.h>
+#include <linux/version.h>
+
+#include "erdevices.h"
+
+static struct kmem_cache *devices_cache __read_mostly;
+static u32 hash_rnd __read_mostly;
+struct hlist_head devices[DEVICES_HASH_SIZE];
+
+
+static inline int mac_hash(const u8 *mac)
+{
+    /* use 1 byte of OUI and 3 bytes of NIC */
+    u32 key = get_unaligned((u32 *)(mac + 2));
+    return jhash_1word(key, hash_rnd) & (DEVICES_HASH_SIZE - 1);
+}
+
+/*static __kernel_time_t jiffiestosec(const unsigned long jiffies)
+{
+    struct timeval value;
+    jiffies_to_timeval(jiffies,&value);
+    return value.tv_sec;
+}*/
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+static __kernel_time_t get_cur_time(void)
+#else
+static time64_t get_cur_time(void)
+#endif
+{
+    struct timespec64 value;
+    ktime_get_real_ts64(&value);
+    return value.tv_sec;
+}
+
+void delete_erdevice(struct erdevice *device)
+{
+    hlist_del(&device->hlist);
+}
+
+void show_erdevice(struct seq_file *s)
+{
+    int i;
+    struct erdevice *device;
+    for (i = 0; i < DEVICES_HASH_SIZE ; i++) {
+        hlist_for_each_entry(device, &devices[i], hlist) {
+            seq_printf(s, "%pM\t%pI4\t%-16lu\t%-16lu\t%d\n", device->mac, (void *)&device->ip, device->lastalive, device->arpalive, device->debounce);
+        }
+
+    }
+}
+
+void flush_devices(void)
+{
+    int i;
+    struct erdevice *device;
+    struct hlist_node *n;
+
+    for (i = 0; i < DEVICES_HASH_SIZE ; i++) {
+        //spin_lock(&hash_lock);
+        hlist_for_each_entry_safe(device, n, &devices[i], hlist) {
+            delete_erdevice(device);
+        }
+        //spin_unlock(&hash_lock);
+    }
+}
+
+static struct erdevice *find_erdevice(struct hlist_head *head, const u8 *mac)
+{
+    struct erdevice *erdevice;
+    //spin_lock(&hash_lock);
+    hlist_for_each_entry(erdevice, head, hlist) {
+        if (ether_addr_equal(erdevice->mac, mac)) {
+            //spin_unlock(&hash_lock);
+            return erdevice;
+        }
+    }
+    //spin_unlock(&hash_lock);
+
+    return NULL;
+}
+
+
+int update_erdevices(const u8 *mac, const __be32 ip)
+{
+    struct hlist_head *head = &devices[mac_hash(mac)];
+    struct erdevice *device;
+    int ret = 0;
+
+    spin_lock(&hash_lock);
+    device = find_erdevice(head, mac);
+    /* 如果设备存在，更新活跃时间和IP */
+    if (likely(device)) {
+        device->lastalive = get_cur_time();
+        device->ip = ip;
+        goto out;
+    }
+
+    if (erdevice_work_mode != 0) { //手动模式不自动增加设备
+        goto out;
+    }
+
+    /* 如果设备不存在，创建设备 */
+    device = kmem_cache_zalloc(devices_cache, GFP_ATOMIC);
+    if (!device) {
+        ret = -ENOMEM;
+        goto out;
+    }
+    memcpy(device->mac, mac, ETH_ALEN);
+    device->ip = ip;
+    device->lastalive = get_cur_time();
+    hlist_add_head(&device->hlist, head);
+out:
+    spin_unlock(&hash_lock);
+    return ret;
+}
+
+int update_arp_alive(const u8 *mac, const __be32 ip)
+{
+    struct hlist_head *head = &devices[mac_hash(mac)];
+    struct erdevice *device;
+    int ret = 0;
+
+    spin_lock(&hash_lock);
+    device = find_erdevice(head, mac);
+    /* 如果设备存在，更新活跃时间和IP */
+    if (likely(device)) {
+        if (device->debounce) { //离线设备重新上线消抖
+            device->debounce--;
+        }
+        device->arpalive = 3;
+        device->ip = ip;
+        goto out;
+    }
+
+    if (erdevice_work_mode != 0) { //手动模式不自动增加设备
+        goto out;
+    }
+
+    /* 如果设备不存在，创建设备 */
+    device = kmem_cache_zalloc(devices_cache, GFP_ATOMIC);
+    if (!device) {
+        ret = -ENOMEM;
+        goto out;
+    }
+    memcpy(device->mac, mac, ETH_ALEN);
+    device->ip = ip;
+    device->lastalive = 0;
+    device->arpalive = 3;
+    hlist_add_head(&device->hlist, head);
+out:
+    spin_unlock(&hash_lock);
+    return ret;
+}
+
+int new_erdevices(const u8 *mac)
+{
+    struct hlist_head *head = &devices[mac_hash(mac)];
+    struct erdevice *device;
+    int ret=0;
+    spin_lock(&hash_lock);
+
+    device = find_erdevice(head, mac);
+    if (likely(device)) {
+        goto out;
+    }
+
+    /* 如果设备不存在，创建设备 */
+    device = kmem_cache_zalloc(devices_cache, GFP_ATOMIC);
+    if (!device) {
+        ret = -ENOMEM;
+        goto out;
+    }
+    memcpy(device->mac, mac, ETH_ALEN);
+    device->lastalive = 0;
+    device->arpalive = 0;
+    hlist_add_head(&device->hlist, head);
+out:
+    spin_unlock(&hash_lock);
+    return ret;
+
+}
+
+int devices_init(void)
+{
+    devices_cache = kmem_cache_create("devices_cache", sizeof(struct erdevice), 0, 0, NULL);
+    if (!devices_cache)
+        return -ENOMEM;
+
+    get_random_bytes(&hash_rnd, sizeof(hash_rnd));
+
+
+    return 0;
+}
+
+
+void devices_remove(void)
+{
+    kmem_cache_destroy(devices_cache);
+}
diff --git a/gl-sdk4-edgerouter-status/src/erdevices.h b/gl-sdk4-edgerouter-status/src/erdevices.h
new file mode 100644
index 00000000..0491da2a
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/src/erdevices.h
@@ -0,0 +1,49 @@
+#ifndef __ERDEVICES_H
+#define __ERDEVICES_H
+
+#include <linux/if_ether.h>
+#include <linux/etherdevice.h>
+#include <linux/inetdevice.h>
+#include <linux/jhash.h>
+
+
+struct erdevice {
+    struct hlist_node hlist;
+    struct net_device *dev;
+    u8 mac[ETH_ALEN];
+    __be32 ip;
+    int debounce;
+    unsigned long lastalive ____cacheline_aligned_in_smp;
+    unsigned long arpalive ____cacheline_aligned_in_smp;
+};
+
+#define DEVICES_HASH_SIZE              (1 << 8)
+
+extern spinlock_t hash_lock;
+
+extern struct hlist_head devices[DEVICES_HASH_SIZE];
+extern char erdevice_iface[IFNAMSIZ];
+extern u8 erdevice_target_mac[ETH_ALEN];
+extern __be32 erdevice_target_ip;
+extern __be32 erdevice_target_mask;
+extern int erdevice_work_mode;
+
+
+extern int ermodule_is_enabled(void);
+extern int devices_init(void);
+extern void devices_remove(void);
+extern void delete_erdevice(struct erdevice *device);
+extern int new_erdevices(const u8 *mac);
+extern int update_erdevices(const u8 *mac, const __be32 ip);
+extern int update_arp_alive(const u8 *mac, const __be32 ip);
+extern void flush_devices(void);
+extern void show_erdevice(struct seq_file *s);
+
+extern int erdevice_proc_init(void);
+extern void erdevice_proc_remove(void);
+
+extern void arp_spoof(struct sk_buff *skb);
+extern void erdevice_arp_init(void);
+extern void erdevice_arp_free(void);
+
+#endif
diff --git a/gl-sdk4-edgerouter-status/src/main.c b/gl-sdk4-edgerouter-status/src/main.c
new file mode 100644
index 00000000..e33d62dc
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/src/main.c
@@ -0,0 +1,143 @@
+/*
+ *  Copyright (C) 2022 Chongjun Luo <luochongjung@gl-inet.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/proc_fs.h>
+#include <net/arp.h>
+#include <linux/ip.h>
+#include <linux/netfilter.h>
+#include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_arp.h>
+
+#include "erdevices.h"
+
+char erdevice_iface[IFNAMSIZ] = {0};
+u8 erdevice_target_mac[ETH_ALEN] = {0};
+__be32 erdevice_target_ip = 0;
+__be32 erdevice_target_mask = 0;
+int erdevice_work_mode = 0;
+
+DEFINE_SPINLOCK(hash_lock);
+
+#define IS_IP(skb) (!skb_vlan_tag_present(skb) && skb->protocol == htons(ETH_P_IP))
+
+static int mac_is_zero(u8 mac[ETH_ALEN])
+{
+    int i = 0;
+    for (i = 0; i < ETH_ALEN; i++) {
+        if (mac[i] != 0)
+            return 0;
+    }
+    return 1;
+}
+
+int ermodule_is_enabled(void)
+{
+    if (erdevice_target_ip == 0 || mac_is_zero(erdevice_target_mac) == 1)
+        return 0;
+    return 1;
+}
+
+static u32 edge_ipv4_forward_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *state)
+{
+    struct ethhdr *ehdr = eth_hdr(skb);
+    struct iphdr *iph = ip_hdr(skb);
+    __be32 saddr, daddr;
+
+    saddr = iph->saddr;
+    daddr = iph->daddr;
+
+    if (!ermodule_is_enabled())
+        return NF_ACCEPT;
+
+    if ((!((saddr ^ erdevice_target_ip) & erdevice_target_mask))
+            && ether_addr_equal(erdevice_target_mac, ehdr->h_dest)
+            && (saddr != erdevice_target_ip)) {
+        update_erdevices(ehdr->h_source, saddr);
+    }
+
+    return NF_ACCEPT;
+}
+
+static u32 edge_arp_in_hook(void *priv, struct sk_buff *skb, const struct nf_hook_state *state)
+{
+    arp_spoof(skb);
+    return NF_ACCEPT;
+}
+
+static struct nf_hook_ops edge_bwm_ops[] __read_mostly = {
+    {
+        .hook       = edge_ipv4_forward_hook,
+        .pf         = NFPROTO_IPV4,
+        .hooknum    = NF_INET_FORWARD,
+        .priority   = NF_IP_PRI_FIRST,
+    },
+    {
+        .hook       = edge_arp_in_hook,
+        .pf         = NFPROTO_ARP,
+        .hooknum    = NF_ARP_IN,
+        .priority   = NF_IP_PRI_FIRST,
+    },
+};
+
+
+static int __init edge_tertf_init(void)
+{
+    int ret = 0;
+
+    erdevice_arp_init();
+
+    ret = devices_init();
+    if (ret < 0) {
+        pr_err("can't devices list\n");
+        return ret;
+    }
+
+    ret = erdevice_proc_init();
+    if (ret < 0) {
+        pr_err("can't create proc fs\n");
+        goto free_devices;
+    }
+
+#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 12, 14)
+    ret = nf_register_net_hooks(&init_net, edge_bwm_ops, ARRAY_SIZE(edge_bwm_ops));
+#else
+    ret = nf_register_hooks(edge_bwm_ops, ARRAY_SIZE(edge_bwm_ops));
+#endif
+    if (ret < 0) {
+        pr_err("can't register hook\n");
+        goto free_proc;
+    }
+
+    return 0;
+free_proc:
+    erdevice_proc_remove();
+free_devices:
+    devices_remove();
+    erdevice_arp_free();
+    return ret;
+}
+
+static void __exit edge_tertf_exit(void)
+{
+#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 12, 14)
+    nf_unregister_net_hooks(&init_net, edge_bwm_ops, ARRAY_SIZE(edge_bwm_ops));
+#else
+    nf_unregister_hooks(edge_bwm_ops, ARRAY_SIZE(edge_bwm_ops));
+#endif
+    erdevice_proc_remove();
+    devices_remove();
+    erdevice_arp_free();
+}
+
+module_init(edge_tertf_init);
+module_exit(edge_tertf_exit);
+
+MODULE_AUTHOR("Chongjun Luo <luochongjun@gl-inet.com>");
+MODULE_LICENSE("GPL");
diff --git a/gl-sdk4-edgerouter-status/src/procs.c b/gl-sdk4-edgerouter-status/src/procs.c
new file mode 100644
index 00000000..678e27b5
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/src/procs.c
@@ -0,0 +1,316 @@
+#include <linux/proc_fs.h>
+#include <linux/inet.h>
+#include <linux/version.h>
+
+//#include <time.h>
+#include "erdevices.h"
+
+static int strtomac(const char *str, u8 mac[ETH_ALEN])
+{
+    if (sscanf(str, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx",
+               &mac[0],
+               &mac[1],
+               &mac[2],
+               &mac[3],
+               &mac[4],
+               &mac[5]) == 6) {
+        return 0;
+    } else {
+        return -1;
+    }
+}
+
+static void format_str(char *str)
+{
+    if (str[strlen(str) - 1] == '\n')
+        str[strlen(str) - 1] = '\0';
+}
+
+static int erdevices_show(struct seq_file *s, void *v)
+{
+
+    seq_printf(s, "MAC\tIP\tLastalive\tARPalive\n");
+    show_erdevice(s);
+    return 0;
+}
+
+static ssize_t erdevices_write(struct file *file, const char __user *buf, size_t size, loff_t *ppos)
+{
+    char conf[128] = "";
+    u8 mac[ETH_ALEN];
+
+    if (size > sizeof(conf) - 1)
+        return -EINVAL;
+
+    memset(conf, 0, sizeof(conf));
+    if (copy_from_user(conf, buf, size))
+        return -EFAULT;
+    format_str(conf);
+    if (strcmp("flush", conf) == 0) {
+        flush_devices();
+        return size;
+    }
+
+    if (0 != strtomac(conf, mac))
+        return -EINVAL;
+
+    new_erdevices(mac);
+
+    return size;
+}
+
+static int erdevices_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, erdevices_show, NULL);
+}
+
+static int target_ip_show(struct seq_file *s, void *v)
+{
+
+    seq_printf(s, "%pI4/%d\n", (void *)&erdevice_target_ip, inet_mask_len(erdevice_target_mask));
+    return 0;
+}
+
+static ssize_t target_ip_write(struct file *file, const char __user *buf, size_t size, loff_t *ppos)
+{
+    char conf[128] = "";
+    char *mask, *endp;
+    __be32 ip, m = 0;
+
+    if (size > sizeof(conf) - 1)
+        return -EINVAL;
+    memset(conf, 0, sizeof(conf));
+    if (copy_from_user(conf, buf, size))
+        return -EFAULT;
+    format_str(conf);
+
+    mask = strchr(conf, '/');
+    if (mask)
+        *mask++ = 0;
+
+
+    if (!in4_pton(conf, strlen(conf), (u8 *)&ip, '\0', NULL)) {
+        return -EINVAL;
+    }
+
+    if (mask) {
+        m = simple_strtoul(mask, &endp, 10);
+        if (endp == mask || m > 32)
+            return -EINVAL;
+    }
+
+    erdevice_target_ip = ip;
+    erdevice_target_mask = inet_make_mask(m);
+    return size;
+}
+
+static int target_ip_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, target_ip_show, NULL);
+}
+
+
+static int target_mac_show(struct seq_file *s, void *v)
+{
+
+    seq_printf(s, "%pM\n", erdevice_target_mac);
+    return 0;
+}
+
+static ssize_t target_mac_write(struct file *file, const char __user *buf, size_t size, loff_t *ppos)
+{
+    char conf[128] = "";
+    u8 mac[ETH_ALEN];
+
+    if (size > sizeof(conf) - 1)
+        return -EINVAL;
+
+    memset(conf, 0, sizeof(conf));
+    if (copy_from_user(conf, buf, size))
+        return -EFAULT;
+    format_str(conf);
+
+    if (0 != strtomac(conf, mac))
+        return -EINVAL;
+
+    memcpy(erdevice_target_mac, mac, ETH_ALEN);
+    return size;
+}
+
+static int target_mac_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, target_mac_show, NULL);
+}
+
+static int mode_show(struct seq_file *s, void *v)
+{
+
+    seq_printf(s, "%d\n", erdevice_work_mode);
+    return 0;
+}
+
+static ssize_t mode_write(struct file *file, const char __user *buf, size_t size, loff_t *ppos)
+{
+    int ret;
+    int res;
+    ret = kstrtoint_from_user(buf, size, 10, &res);
+    if (ret) {
+        return ret;
+    }
+    erdevice_work_mode = res;
+    return size;
+}
+
+static int mode_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, mode_show, NULL);
+}
+
+static int iface_show(struct seq_file *s, void *v)
+{
+
+    seq_printf(s, "%s\n", erdevice_iface);
+    return 0;
+}
+
+static ssize_t iface_write(struct file *file, const char __user *buf, size_t size, loff_t *ppos)
+{
+    char conf[128] = "";
+
+    if (size > sizeof(conf) - 1)
+        return -EINVAL;
+    memset(conf, 0, sizeof(conf));
+    if (copy_from_user(conf, buf, size))
+        return -EFAULT;
+    format_str(conf);
+
+    if (size > 0 && size < IFNAMSIZ) {
+        memcpy(erdevice_iface, conf, size);
+    } else {
+        return -EFAULT;
+    }
+
+    return size;
+}
+
+static int iface_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, iface_show, NULL);
+}
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+const static struct file_operations erdevices_ops = {
+    .owner      = THIS_MODULE,
+    .open       = erdevices_open,
+    .read       = seq_read,
+    .write      = erdevices_write,
+    .llseek     = seq_lseek,
+    .release    = single_release
+};
+#else
+const static struct proc_ops erdevices_ops = {
+    .proc_open       = erdevices_open,
+    .proc_read       = seq_read,
+    .proc_write      = erdevices_write,
+    .proc_lseek     = seq_lseek,
+    .proc_release    = single_release
+};
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+const static struct file_operations target_ip_ops = {
+    .owner      = THIS_MODULE,
+    .open       = target_ip_open,
+    .read       = seq_read,
+    .write      = target_ip_write,
+    .llseek     = seq_lseek,
+    .release    = single_release
+};
+#else
+const static struct proc_ops target_ip_ops = {
+    .proc_open       = target_ip_open,
+    .proc_read       = seq_read,
+    .proc_write      = target_ip_write,
+    .proc_lseek     = seq_lseek,
+    .proc_release    = single_release
+};
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+const static struct file_operations target_mac_ops = {
+    .owner      = THIS_MODULE,
+    .open       = target_mac_open,
+    .read       = seq_read,
+    .write      = target_mac_write,
+    .llseek     = seq_lseek,
+    .release    = single_release
+};
+#else
+const static struct proc_ops target_mac_ops = {
+    .proc_open       = target_mac_open,
+    .proc_read       = seq_read,
+    .proc_write      = target_mac_write,
+    .proc_lseek     = seq_lseek,
+    .proc_release    = single_release
+};
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+const static struct file_operations mode_ops = {
+    .owner      = THIS_MODULE,
+    .open       = mode_open,
+    .read       = seq_read,
+    .write      = mode_write,
+    .llseek     = seq_lseek,
+    .release    = single_release
+};
+#else
+const static struct proc_ops mode_ops = {
+    .proc_open       = mode_open,
+    .proc_read       = seq_read,
+    .proc_write      = mode_write,
+    .proc_lseek     = seq_lseek,
+    .proc_release    = single_release
+};
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+const static struct file_operations iface_ops = {
+    .owner      = THIS_MODULE,
+    .open       = iface_open,
+    .read       = seq_read,
+    .write      = iface_write,
+    .llseek     = seq_lseek,
+    .release    = single_release
+};
+#else
+const static struct proc_ops iface_ops = {
+    .proc_open       = iface_open,
+    .proc_read       = seq_read,
+    .proc_write      = iface_write,
+    .proc_lseek     = seq_lseek,
+    .proc_release    = single_release
+};
+#endif
+
+int erdevice_proc_init(void)
+{
+    struct proc_dir_entry *proc;
+    proc = proc_mkdir("edgerouter-status", NULL);
+    if (!proc) {
+        pr_err("can't create dir /proc/edgerouter-status/\n");
+        return -ENODEV;;
+    }
+    proc_create("erdevices", 0644, proc, &erdevices_ops);
+    proc_create("target_ip", 0644, proc, &target_ip_ops);
+    proc_create("target_mac", 0644, proc, &target_mac_ops);
+    proc_create("iface", 0644, proc, &iface_ops);
+    proc_create("mode", 0644, proc, &mode_ops);
+    return 0;
+}
+
+
+void erdevice_proc_remove(void)
+{
+    remove_proc_subtree("edgerouter-status", NULL);
+}
diff --git a/gl-sdk4-edgerouter-status/src/subnet.c b/gl-sdk4-edgerouter-status/src/subnet.c
new file mode 100644
index 00000000..b6a690f0
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/src/subnet.c
@@ -0,0 +1,246 @@
+/*
+ *  Copyright (C) 2019 jianhui zhao <zhaojh329@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <linux/rtnetlink.h>
+#include <linux/proc_fs.h>
+#include <linux/inet.h>
+
+#include "subnet.h"
+
+static LIST_HEAD(subnets);
+static DEFINE_SPINLOCK(lock);
+
+static struct hlist_head subnets_index[NETDEV_HASHENTRIES];
+
+bool subnet_exist(struct net_device *dev)
+{
+    struct hlist_head *head = &subnets_index[dev->ifindex & (NETDEV_HASHENTRIES - 1)];
+    struct subnet *n;
+
+    hlist_for_each_entry_rcu(n, head, hlist) {
+        if (n->ifindex == dev->ifindex)
+            return true;
+    }
+
+    return false;
+}
+
+void del_subnet_dev(struct net_device *dev)
+{
+    struct hlist_head *head = &subnets_index[dev->ifindex & (NETDEV_HASHENTRIES - 1)];
+    struct subnet *n;
+
+    spin_lock_bh(&lock);
+    hlist_for_each_entry(n, head, hlist) {
+        if (n->ifindex == dev->ifindex) {
+            n->ifindex = -1;
+            hlist_del_rcu(&n->hlist);
+            pr_info("tertf: %s changed, delete it\n", dev->name);
+            break;
+        }
+    }
+    spin_unlock_bh(&lock);
+}
+
+static void add_subnet_dev_nolock(struct net_device *dev)
+{
+    struct hlist_head *head = &subnets_index[dev->ifindex & (NETDEV_HASHENTRIES - 1)];
+    struct subnet *net, *tmp;
+
+    list_for_each_entry(net, &subnets, list) {
+        if (!strcmp(net->ifname, dev->name)) {
+            hlist_for_each_entry(tmp, head, hlist) {
+                if (tmp == net)
+                    return;
+            }
+            pr_info("tertf: %s registered, add it\n", dev->name);
+            net->ifindex = dev->ifindex;
+            hlist_add_head_rcu(&net->hlist, head);
+            break;
+        }
+    }
+}
+
+void add_subnet_dev(struct net_device *dev)
+{
+    spin_lock_bh(&lock);
+    add_subnet_dev_nolock(dev);
+    spin_unlock_bh(&lock);
+}
+
+static int proc_show(struct seq_file *s, void *v)
+{
+    struct subnet *net;
+
+    seq_printf(s, "ifindex ifname\n");
+
+    spin_lock_bh(&lock);
+    list_for_each_entry(net, &subnets, list) {
+        seq_printf(s, "%-7d %s\n", net->ifindex, net->ifname);
+    }
+    spin_unlock_bh(&lock);
+
+    return 0;
+}
+
+/*
+** remove the spaces(carriage returns) at the brginning and end of the string
+*/
+static void clean_string(char *str)
+{
+    char *start = str - 1;
+    char *end = str;
+    char *p = str;
+
+    while (*p) {
+        switch (*p) {
+            case ' ':
+            case '\r':
+            case '\n': {
+                if (start + 1 == p)
+                    start = p;
+            }
+            break;
+            default:
+                break;
+        }
+        ++p;
+    }
+    --p;
+    ++start;
+    if (*start == 0) {
+        *str = 0;
+        return;
+    }
+    end = p + 1;
+    while (p > start) {
+        switch (*p) {
+            case ' ':
+            case '\r':
+            case '\n': {
+                if (end - 1 == p)
+                    end = p;
+            }
+            break;
+            default:
+                break;
+        }
+        --p;
+    }
+    memmove(str, start, end - start);
+    *(str + (int)end - (int)start) = 0;
+}
+
+static void add_subnet(char *ifname)
+{
+    struct net_device *dev;
+    struct subnet *net;
+
+    spin_lock_bh(&lock);
+
+    list_for_each_entry(net, &subnets, list) {
+        if (!strcmp(net->ifname, ifname)) {
+            pr_err("tertf: %s already exits\n", ifname);
+            goto err;
+        }
+    }
+
+    net = kzalloc(sizeof(struct subnet), GFP_ATOMIC);
+    if (!net) {
+        pr_err("tertf: no mem\n");
+        goto err;
+    }
+
+    net->ifindex = -1;
+
+    strcpy(net->ifname, ifname);
+    list_add_tail(&net->list, &subnets);
+
+    dev = dev_get_by_name(&init_net, ifname);
+    if (dev) {
+        add_subnet_dev_nolock(dev);
+        dev_put(dev);
+    }
+
+err:
+    spin_unlock_bh(&lock);
+}
+
+static ssize_t proc_write(struct file *file, const char __user *buf, size_t size, loff_t *ppos)
+{
+    char ifname[IFNAMSIZ] = {0};
+
+    if (size > IFNAMSIZ - 1)
+        return -EINVAL;
+
+    if (copy_from_user(ifname, buf, size))
+        return -EFAULT;
+
+    clean_string(ifname);
+
+    add_subnet(ifname);
+
+    return size;
+}
+
+static int proc_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_show, NULL);
+}
+
+const static struct file_operations proc_ops = {
+    .owner      = THIS_MODULE,
+    .open       = proc_open,
+    .read       = seq_read,
+    .write      = proc_write,
+    .llseek     = seq_lseek,
+    .release    = single_release
+};
+
+int subnet_init(struct proc_dir_entry *proc)
+{
+    proc_create("subnet", 0644, proc, &proc_ops);
+
+    return 0;
+}
+
+
+static void subnet_index_clear(void)
+{
+    struct subnet *n;
+    struct hlist_node *tmp;
+    int i;
+
+    for (i = 0; i < NETDEV_HASHENTRIES; i++) {
+        spin_lock_bh(&lock);
+        hlist_for_each_entry_safe(n, tmp, &subnets_index[i], hlist) {
+            hlist_del_rcu(&n->hlist);
+        }
+        spin_unlock_bh(&lock);
+    }
+}
+
+static void subnet_rcu_free(struct rcu_head *head)
+{
+    struct subnet *n = container_of(head, struct subnet, rcu);
+    kfree(n);
+}
+
+void subnet_free(void)
+{
+    struct subnet *n, *tmp;
+
+    subnet_index_clear();
+
+    spin_lock_bh(&lock);
+    list_for_each_entry_safe(n, tmp, &subnets, list) {
+        list_del(&n->list);
+        call_rcu(&n->rcu, subnet_rcu_free);
+    }
+    spin_unlock_bh(&lock);
+}
diff --git a/gl-sdk4-edgerouter-status/src/subnet.h b/gl-sdk4-edgerouter-status/src/subnet.h
new file mode 100644
index 00000000..054e345f
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/src/subnet.h
@@ -0,0 +1,29 @@
+/*
+ *  Copyright (C) 2019 jianhui zhao <zhaojh329@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#ifndef __SUBNET_
+#define __SUBNET_
+
+#include <linux/netdevice.h>
+
+struct subnet {
+    int ifindex;
+    struct rcu_head rcu;
+    struct hlist_node hlist;
+    struct list_head list;
+    char ifname[IFNAMSIZ];
+};
+
+bool subnet_exist(struct net_device *dev);
+void del_subnet_dev(struct net_device *dev);
+void add_subnet_dev(struct net_device *dev);
+
+int subnet_init(struct proc_dir_entry *proc);
+void subnet_free(void);
+
+#endif
diff --git a/gl-sdk4-edgerouter-status/src/term.c b/gl-sdk4-edgerouter-status/src/term.c
new file mode 100644
index 00000000..160c768a
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/src/term.c
@@ -0,0 +1,520 @@
+/*
+ *  Copyright (C) 2019 jianhui zhao <zhaojh329@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#include <linux/version.h>
+#include <linux/slab.h>
+#include <linux/jhash.h>
+#include <asm/unaligned.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <linux/etherdevice.h>
+#include <linux/netfilter.h>
+#include <linux/inetdevice.h>
+#include <linux/sched.h>
+#include <linux/timer.h>
+#include <linux/inet.h>
+#include <asm/div64.h>
+#include <net/arp.h>
+#include <linux/kobject.h>
+
+#include "term.h"
+
+#define TERM_HASH_SIZE              (1 << 8)
+#define TERM_EVENT_BUF_SIZE         512
+
+static struct kmem_cache *term_cache __read_mostly;
+static struct hlist_head terms[TERM_HASH_SIZE];
+static u32 hash_rnd __read_mostly;
+
+/*
+* keepalive_work:
+* Before timeout, ICMP message is sent first. After the timeout time is reached, if the device is not offline,
+* the time will be updated, otherwise the device will be offline.
+*/
+struct delayed_work keepalive_work;
+struct delayed_work gc_work;
+
+static unsigned long ttl;
+static unsigned long icmp_ttl;
+
+static DEFINE_SPINLOCK(hash_lock);
+
+extern u64 uevent_next_seqnum(void);
+
+static int term_event_add_var(struct term_event *event, int argv,
+                              const char *format, ...)
+{
+    static char buf[128];
+    char *s;
+    va_list args;
+    int len;
+
+    if (argv)
+        return 0;
+
+    va_start(args, format);
+    len = vsnprintf(buf, sizeof(buf), format, args);
+    va_end(args);
+
+    if (len >= sizeof(buf)) {
+        WARN_ON(1);
+        return -ENOMEM;
+    }
+
+    s = skb_put(event->skb, len + 1);
+    strcpy(s, buf);
+
+    return 0;
+}
+
+static const char *event_action_str(int act)
+{
+    switch (act) {
+        case TERM_EVENT_ADD:
+            return "add";
+        case TERM_EVENT_DEL:
+            return "del";
+        case TERM_EVENT_CHANGE:
+            return "chg";
+        default:
+            return NULL;
+    }
+}
+
+static int hotplug_fill_event(struct term_event *event, const char *action)
+{
+    int ret;
+
+    ret = term_event_add_var(event, 0, "HOME=%s", "/");
+    if (ret)
+        return ret;
+
+    ret = term_event_add_var(event, 0, "PATH=%s",
+                             "/sbin:/bin:/usr/sbin:/usr/bin");
+    if (ret)
+        return ret;
+
+    ret = term_event_add_var(event, 0, "SUBSYSTEM=%s", "gl-tertf");
+    if (ret)
+        return ret;
+
+    ret = term_event_add_var(event, 0, "ACTION=%s", action);
+    if (ret)
+        return ret;
+
+    ret = term_event_add_var(event, 0, "MAC=%pM", event->mac);
+    if (ret)
+        return ret;
+
+    ret = term_event_add_var(event, 0, "IP=%pI4", &event->ip);
+    if (ret)
+        return ret;
+
+    if (event->action == TERM_EVENT_ADD) {
+        ret = term_event_add_var(event, 0, "DEV=%s", event->dev);
+        if (ret)
+            return ret;
+    }
+
+    ret = term_event_add_var(event, 0, "SEQNUM=%llu", uevent_next_seqnum());
+
+    return ret;
+}
+
+static void hotplug_work(struct work_struct *work)
+{
+    struct term_event *event = container_of(work, struct term_event, work);
+    const char *action = event_action_str(event->action);
+    int ret = 0;
+
+    if (!action)
+        goto out_free_event;
+
+    event->skb = alloc_skb(TERM_EVENT_BUF_SIZE, GFP_KERNEL);
+    if (!event->skb)
+        goto out_free_event;
+
+    ret = term_event_add_var(event, 0, "%s@", action);
+    if (ret)
+        goto out_free_skb;
+
+    ret = hotplug_fill_event(event, action);
+    if (ret)
+        goto out_free_skb;
+
+    NETLINK_CB(event->skb).dst_group = 1;
+    broadcast_uevent(event->skb, 0, 1, GFP_KERNEL);
+
+out_free_skb:
+    if (ret) {
+        kfree_skb(event->skb);
+    }
+out_free_event:
+    kfree(event);
+}
+
+static void hotplug_create_event(struct terminal *term, int action)
+{
+    struct term_event *event;
+
+    event = kzalloc(sizeof(struct term_event), GFP_KERNEL);
+    if (!event)
+        return;
+
+    event->ip = term->ip;
+
+    memcpy(event->mac, term->mac, ETH_ALEN);
+
+    if (action == TERM_EVENT_ADD)
+        strcpy(event->dev, netdev_name(term->dev));
+
+    event->action = action;
+
+    INIT_WORK(&event->work, hotplug_work);
+    schedule_work(&event->work);
+}
+
+static inline int term_mac_hash(const u8 *mac)
+{
+    /* use 1 byte of OUI and 3 bytes of NIC */
+    u32 key = get_unaligned((u32 *)(mac + 2));
+    return jhash_1word(key, hash_rnd) & (TERM_HASH_SIZE - 1);
+}
+
+static void term_rcu_free(struct rcu_head *head)
+{
+    struct terminal *term = container_of(head, struct terminal, rcu);
+
+#if 0
+    pr_info("term: %pM %pI4 freed\n", term->mac, &term->ip);
+#endif
+
+    hotplug_create_event(term, TERM_EVENT_DEL);
+
+    dev_put(term->dev);
+    free_percpu(term->stats);
+    kmem_cache_free(term_cache, term);
+}
+
+static void term_delete(struct terminal *term)
+{
+    hlist_del_rcu(&term->hlist);
+    call_rcu(&term->rcu, term_rcu_free);
+}
+
+static struct terminal *find_term_rcu(struct hlist_head *head, const u8 *mac)
+{
+    struct terminal *term;
+
+    hlist_for_each_entry_rcu(term, head, hlist) {
+        if (ether_addr_equal(term->mac, mac))
+            return term;
+    }
+
+    return NULL;
+}
+
+static struct terminal *find_term(struct hlist_head *head, const u8 *mac)
+{
+    struct terminal *term;
+
+    hlist_for_each_entry(term, head, hlist) {
+        if (ether_addr_equal(term->mac, mac))
+            return term;
+    }
+
+    return NULL;
+}
+
+void term_create(const u8 *mac, __be32 addr, struct net_device *dev)
+{
+    struct hlist_head *head = &terms[term_mac_hash(mac)];
+    struct terminal *term, *old;
+    int i;
+
+    term = find_term_rcu(head, mac);
+    if (likely(term && term->dev == dev))
+        return;
+
+    term = kmem_cache_zalloc(term_cache, GFP_ATOMIC);
+    if (!term)
+        return;
+
+    term->stats = alloc_percpu_gfp(struct term_stats, GFP_ATOMIC);
+    if (!term->stats) {
+        kmem_cache_free(term_cache, term);
+        return;
+    }
+
+    for_each_possible_cpu(i) {
+        struct term_stats *st = per_cpu_ptr(term->stats, i);
+        u64_stats_init(&st->syncp);
+    }
+
+    dev_hold(dev);
+
+    term->ip = addr;
+    term->dev = dev;
+    memcpy(term->mac, mac, ETH_ALEN);
+
+#if 0
+    pr_info("term: %pM %pI4 added\n", term->mac, &term->ip);
+#endif
+
+    hotplug_create_event(term, TERM_EVENT_ADD);
+
+    spin_lock(&hash_lock);
+    old = find_term(head, mac);
+    if (unlikely(old)) {
+        hlist_replace_rcu(&old->hlist, &term->hlist);
+        call_rcu(&old->rcu, term_rcu_free);
+    } else {
+        hlist_add_head_rcu(&term->hlist, head);
+    }
+    spin_unlock(&hash_lock);
+}
+
+void term_update(const u8 *mac, __be32 addr, unsigned int rx, unsigned int tx, bool alive)
+{
+    struct hlist_head *head = &terms[term_mac_hash(mac)];
+    struct terminal *term;
+    struct term_stats *st;
+
+    term = find_term_rcu(head, mac);
+    if (!term)
+        return;
+
+    if (alive)
+        term->updated = jiffies;
+
+    if (unlikely(addr != term->ip)) {
+        term->ip = addr;
+        hotplug_create_event(term, TERM_EVENT_CHANGE);
+    } else {
+        term->ip = addr;
+    }
+
+    st = this_cpu_ptr(term->stats);
+
+    u64_stats_update_begin(&st->syncp);
+    st->rx_bytes += rx;
+    st->tx_bytes += tx;
+    u64_stats_update_end(&st->syncp);
+}
+
+static void term_flush(void)
+{
+    struct terminal *term;
+    struct hlist_node *n;
+    int i;
+
+    for (i = 0; i < TERM_HASH_SIZE; i++) {
+        spin_lock_bh(&hash_lock);
+        hlist_for_each_entry_safe(term, n, &terms[i], hlist) {
+            term_delete(term);
+        }
+        spin_unlock_bh(&hash_lock);
+    }
+}
+
+void flush_term_by_dev(struct net_device *dev)
+{
+    struct terminal *term;
+    struct hlist_node *n;
+    int i;
+
+    for (i = 0; i < TERM_HASH_SIZE; i++) {
+        spin_lock_bh(&hash_lock);
+        hlist_for_each_entry_safe(term, n, &terms[i], hlist) {
+            if (dev == term->dev)
+                term_delete(term);
+        }
+        spin_unlock_bh(&hash_lock);
+    }
+}
+
+static int proc_show(struct seq_file *s, void *v)
+{
+    struct terminal *term;
+    int i;
+
+    seq_printf(s, "%-17s  %-16s  %-16s  %-16s  %-16s\n", "MAC", "IP", "Tx(Byte)", "Rx(Byte)", "Device");
+
+    for (i = 0; i < TERM_HASH_SIZE; i++) {
+        rcu_read_lock();
+        hlist_for_each_entry_rcu(term, &terms[i], hlist) {
+            u64 tx_bytes_sum = 0, rx_bytes_sum = 0;
+            int j;
+
+            for_each_possible_cpu(j) {
+                struct term_stats *st = per_cpu_ptr(term->stats, j);
+                u64 tx_bytes, rx_bytes;
+                unsigned int start;
+
+                do {
+                    start = u64_stats_fetch_begin_irq(&st->syncp);
+                    tx_bytes = st->tx_bytes;
+                    rx_bytes = st->rx_bytes;
+                } while (u64_stats_fetch_retry_irq(&st->syncp, start));
+
+                tx_bytes_sum += tx_bytes;
+                rx_bytes_sum += rx_bytes;
+            }
+
+            seq_printf(s, "%pM  %-16pI4  %-16llu  %-16llu  %-16s\n",
+                       term->mac, &term->ip, tx_bytes_sum, rx_bytes_sum, netdev_name(term->dev));
+        }
+        rcu_read_unlock();
+    }
+
+    return 0;
+}
+
+static ssize_t proc_write(struct file *file, const char __user *buf, size_t size, loff_t *ppos)
+{
+    char data[128] = "";
+    char *e;
+
+    if (size > sizeof(data) - 1)
+        return -EINVAL;
+
+    if (copy_from_user(data, buf, sizeof(data) - 1))
+        return -EFAULT;
+
+    e = strchr(data, '\n');
+    if (e)
+        *e = 0;
+
+    if (data[0] == 'c') {
+        term_flush();
+        return size;
+    }
+
+    return size;
+}
+
+static int proc_open(struct inode *inode, struct file *file)
+{
+    return single_open(file, proc_show, NULL);
+}
+
+const static struct file_operations proc_ops = {
+    .owner      = THIS_MODULE,
+    .open       = proc_open,
+    .read       = seq_read,
+    .write      = proc_write,
+    .llseek     = seq_lseek,
+    .release    = single_release
+};
+
+static void term_keepalive(struct work_struct *work)
+{
+    static char target_mac[6] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
+    struct terminal *term;
+    int i;
+
+    for (i = 0; i < TERM_HASH_SIZE; i++) {
+        rcu_read_lock();
+        hlist_for_each_entry_rcu(term, &terms[i], hlist) {
+            struct net_device *dev = term->dev;
+            struct net_device *br_dev;
+            struct in_device *indev;
+
+            br_dev = netdev_master_upper_dev_get_rcu(term->dev);
+            if (br_dev)
+                dev = br_dev;
+
+            indev = __in_dev_get_rcu(dev);
+            if (indev) {
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
+                for_primary_ifa(indev) {
+#else
+                const struct in_ifaddr *ifa;
+                in_dev_for_each_ifa_rcu(ifa, indev) {
+#endif
+                    arp_send(ARPOP_REQUEST, ETH_P_ARP, term->ip, dev, ifa->ifa_address, target_mac, dev->dev_addr, target_mac);
+                }
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 3, 0)
+                endfor_ifa(indev);
+#endif
+            }
+        }
+        rcu_read_unlock();
+    }
+
+    mod_delayed_work(system_long_wq, &keepalive_work,  icmp_ttl);
+}
+
+static void term_cleanup(struct work_struct *work)
+{
+    unsigned long work_delay = ttl;
+    struct terminal *term;
+    struct hlist_node *n;
+    int i;
+
+    for (i = 0; i < TERM_HASH_SIZE; i++) {
+        spin_lock_bh(&hash_lock);
+        hlist_for_each_entry_safe(term, n, &terms[i], hlist) {
+            if (time_after(jiffies, term->updated + ttl))
+                term_delete(term);
+            else
+                work_delay = min(work_delay, term->updated + ttl - jiffies);
+        }
+        spin_unlock_bh(&hash_lock);
+    }
+
+    /* Cleanup minimum 10 milliseconds apart */
+    work_delay = max_t(unsigned long, work_delay, msecs_to_jiffies(10));
+    mod_delayed_work(system_long_wq, &gc_work, work_delay);
+}
+
+void set_term_ttl(unsigned long t)
+{
+    if (t > 0) {
+        icmp_ttl = t * HZ / 3;//每个TTL周期内发送3个心跳包，如果丢包率高可以调整
+        ttl = t * HZ;
+    }
+
+    mod_delayed_work(system_long_wq, &keepalive_work, 0);
+    mod_delayed_work(system_long_wq, &gc_work, 0);
+}
+
+unsigned long get_term_ttl(void)
+{
+    return ttl / HZ;
+}
+
+int term_init(struct proc_dir_entry *proc)
+{
+    term_cache = kmem_cache_create("term_cache", sizeof(struct terminal), 0, 0, NULL);
+    if (!term_cache)
+        return -ENOMEM;
+
+    proc_create("term", 0644, proc, &proc_ops);
+
+    get_random_bytes(&hash_rnd, sizeof(hash_rnd));
+
+    INIT_DELAYED_WORK(&keepalive_work, term_keepalive);
+    INIT_DELAYED_WORK(&gc_work, term_cleanup);
+
+    set_term_ttl(60);
+
+    return 0;
+}
+
+void term_free(void)
+{
+    cancel_delayed_work_sync(&keepalive_work);
+    cancel_delayed_work_sync(&gc_work);
+
+    term_flush();
+
+    rcu_barrier();  /* Wait for completion of call_rcu()'s */
+
+    kmem_cache_destroy(term_cache);
+}
diff --git a/gl-sdk4-edgerouter-status/src/term.h b/gl-sdk4-edgerouter-status/src/term.h
new file mode 100644
index 00000000..aec7063f
--- /dev/null
+++ b/gl-sdk4-edgerouter-status/src/term.h
@@ -0,0 +1,58 @@
+/*
+ *  Copyright (C) 2019 jianhui zhao <zhaojh329@gmail.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ */
+
+#ifndef __TERM_
+#define __TERM_
+
+#include <linux/if_ether.h>
+
+#include "subnet.h"
+
+struct term_stats {
+    u64 rx_bytes;
+    u64 tx_bytes;
+    struct u64_stats_sync syncp;
+};
+
+struct terminal {
+    struct hlist_node hlist;
+    struct net_device *dev;
+    unsigned long updated;
+    struct rcu_head rcu;
+    u8 mac[ETH_ALEN];
+    __be32 ip;
+    struct term_stats __percpu *stats;
+};
+
+enum {
+    TERM_EVENT_ADD,
+    TERM_EVENT_DEL,
+    TERM_EVENT_CHANGE
+};
+
+struct term_event {
+    int action;
+    __be32 ip;
+    u8 mac[ETH_ALEN];
+    char dev[IFNAMSIZ];
+    struct sk_buff *skb;
+    struct work_struct work;
+};
+
+void term_update(const u8 *mac, __be32 addr, unsigned int rx, unsigned int tx, bool alive);
+void term_create(const u8 *mac, __be32 addr, struct net_device *dev);
+
+void set_term_ttl(unsigned long t);
+unsigned long get_term_ttl(void);
+
+int term_init(struct proc_dir_entry *proc);
+void term_free(void);
+
+void flush_term_by_dev(struct net_device *dev);
+
+#endif
diff --git a/gl-sdk4-fan/Makefile b/gl-sdk4-fan/Makefile
new file mode 100644
index 00000000..7eb0eaf2
--- /dev/null
+++ b/gl-sdk4-fan/Makefile
@@ -0,0 +1,61 @@
+#
+#
+# Copyright (C) 2019 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+include ./version.mk
+
+PKG_NAME:=gl-sdk4-fan
+PKG_VERSION:=$(strip $(call findrev))
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define KernelPackage/$(PKG_NAME)
+	CATEGORY:=gl-sdk4
+	SUBMENU:=Kernel modules
+	DEPENDS:= +kmod-hwmon-pwmfan +libc
+	TITLE:= glinet SDK4 fan module
+	FILES:=$(PKG_BUILD_DIR)/driver/gl_fan_driver.ko
+	AUTOLOAD:=$(call AutoLoad,81,gl_fan_driver,1)
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)
+endef
+
+KERNEL_MAKE_FLAGS?= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)"
+
+MAKE_OPTS:= \
+	$(KERNEL_MAKE_FLAGS) \
+	M="$(PKG_BUILD_DIR)/driver"
+
+define Build/Compile
+	$(call Build/Compile/Default)
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		modules
+endef
+
+define KernelPackage/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/gl_fan $(1)/usr/bin/
+
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/etc/config/glfan $(1)/etc/config/glfan
+	$(INSTALL_BIN) ./files/etc/init.d/gl_fan $(1)/etc/init.d/gl_fan
+
+	$(INSTALL_DIR) $(1)/usr/lib/oui-httpd/rpc
+	$(CP) ./files/fan.lua $(1)/usr/lib/oui-httpd/rpc/fan
+endef
+
+$(eval $(call KernelPackage,$(PKG_NAME)))
diff --git a/gl-sdk4-fan/files/etc/config/glfan b/gl-sdk4-fan/files/etc/config/glfan
new file mode 100755
index 00000000..4226ba3a
--- /dev/null
+++ b/gl-sdk4-fan/files/etc/config/glfan
@@ -0,0 +1,5 @@
+
+config globals 'globals'
+	option enabled '1'
+	option sysfs '/sys/devices/virtual/thermal/thermal_zone0/temp'
+	option div 1
diff --git a/gl-sdk4-fan/files/etc/init.d/gl_fan b/gl-sdk4-fan/files/etc/init.d/gl_fan
new file mode 100755
index 00000000..9741b740
--- /dev/null
+++ b/gl-sdk4-fan/files/etc/init.d/gl_fan
@@ -0,0 +1,43 @@
+#!/bin/sh  /etc/rc.common
+
+START=99
+
+USE_PROCD=1
+
+PROG=/usr/bin/gl_fan
+
+get_fan_config() {
+    config_get enabled $1 enabled
+    config_get sysfs $1 sysfs
+    config_get div $1 div
+    config_get temperature $1 temperature
+    config_get proportion $1 proportion
+    config_get integration $1 integration
+    config_get differential $1 differential
+    config_get debug $1 debug
+}
+
+start_service() {
+    config_load glfan
+    config_foreach get_fan_config globals
+
+    [ "$enabled" != "1" ] && exit
+    [ -n "$sysfs" ] && PROG="$PROG -T $sysfs"
+    [ -n "$div" ] && PROG="$PROG -D $div"
+    [ -n "$temperature" ] && PROG="$PROG -t $temperature"
+    [ -n "$proportion" ] && PROG="$PROG -p $proportion"
+    [ -n "$integration" ] && PROG="$PROG -i $integration"
+    [ -n "$differential" ] && PROG="$PROG -d $differential"
+    [ "$debug" = "1" ] && PROG="$PROG -v"
+
+    procd_open_instance
+    procd_set_param respawn
+    procd_set_param stderr 1
+    procd_set_param command $PROG
+    procd_close_instance
+}
+
+stop_service() {
+    kill -9 $(pgrep -f '/usr/bin/gl_fan') 2>/dev/null
+    echo 0 > /sys/class/thermal/cooling_device0/cur_state
+}
\ No newline at end of file
diff --git a/gl-sdk4-fan/files/fan.lua b/gl-sdk4-fan/files/fan.lua
new file mode 100644
index 00000000..7f20c8ca
--- /dev/null
+++ b/gl-sdk4-fan/files/fan.lua
@@ -0,0 +1,109 @@
+--[[
+    @object-name: fan
+    @object-desc: This is the API related to fan Internet access.
+--]]
+
+local uci = require "uci"
+local utils = require "oui.utils"
+local fs = require "oui.fs"
+
+local M = {}
+
+local function stop_test_fan()
+    utils.writefile("/sys/class/thermal/cooling_device0/cur_state", "0")
+    ngx.pipe.spawn({"/etc/init.d/gl_fan", "restart"}):wait()
+end
+
+--[[
+    @method-name: set_test
+    @method-desc: Set fan test.
+
+    @in bool     test             测试风扇起转.
+    @in number   time             测试风扇起转时间s, 缺省为10s.
+    @in-example:  {\"jsonrpc\":\"2.0\",\"method\":\"call\",\"params\":[\"\",\"fan\",\"set_test\",{\"test\":true,\"time\":5}],\"id\":1}
+    @out-example: {\"jsonrpc\": \"2.0\", \"id\": 1, \"result\": {}}
+--]]
+
+M.set_test = function(params)
+
+    local test = params.test
+    if test == true then
+        local time = params.time or 10
+        ngx.pipe.spawn({"/etc/init.d/gl_fan", "stop"}):wait()
+        utils.writefile("/sys/class/thermal/cooling_device0/cur_state", "255")
+        ngx.timer.at(time, stop_test_fan)
+    end
+end
+
+--[[
+    @method-name: get_status
+    @method-desc: Get status of fan.
+
+    @out number   speed             风扇转速.
+    @out bool     status            风扇状态，true:开启 false:关闭.
+
+    @in-example:  {\"jsonrpc\":\"2.0\",\"method\":\"call\",\"params\":[\"\",\"fan\",\"get_status\",{}],\"id\":1}
+    @out-example: {"id":1,"jsonrpc":"2.0","result":{"speed":2000,"status":true}}
+--]]
+M.get_status = function(params)
+    local res = { speed = 0, status = false }
+
+    if not fs.access("/proc/gl-hw-info/fan") then
+        return res
+    end
+
+    local hwmon, cooling_device = utils.readfile("/proc/gl-hw-info/fan", "l"):match("(.+) (.+)")
+
+    if fs.access("/sys/class/hwmon/" .. hwmon .. "/fan1_input") then
+        res.speed = utils.readfile("/sys/class/hwmon/" .. hwmon .. "/fan1_input", "n")
+    else
+        utils.writefile("/sys/class/fan/fan_speed", "refresh")
+        ngx.sleep(1.5)
+        res.speed = tonumber(utils.readfile("/sys/class/fan/fan_speed"):match("(%d+)"))
+    end
+
+    res.status = utils.readfile("/sys/class/thermal/" .. cooling_device .. "/cur_state", 'n') > 0
+    return res
+end
+
+--[[
+    @method-name: set_config
+    @method-desc: Set fan config.
+
+    @in number   temperature             风扇起转温度.
+    @in-example:  {\"jsonrpc\":\"2.0\",\"method\":\"call\",\"params\":[\"\",\"fan\",\"set_config\",{\"temperature\":75}],\"id\":1}
+    @out-example: {\"jsonrpc\": \"2.0\", \"id\": 1, \"result\": {}}
+--]]
+
+M.set_config = function(params)
+
+    local c = uci.cursor()
+    local temperature = params.temperature
+    if temperature then
+        c:set("glfan", "globals", "temperature", temperature)
+        c:commit("glfan")
+        ngx.pipe.spawn({"/etc/init.d/gl_fan", "restart"}):wait()
+    end
+
+end
+
+--[[
+    @method-name: get_config
+    @method-desc: Get config of fan.
+
+    @out number   temperature             当前风扇起转温度.
+    @out number   warn_temperature        警告预值温度（出厂起转温度）.
+
+    @in-example:  {\"jsonrpc\":\"2.0\",\"method\":\"call\",\"params\":[\"\",\"fan\",\"get_config\",{}],\"id\":1}
+    @out-example: {"id":1,"jsonrpc":"2.0","result":{"warn_temperature":75,"temperature":75}}
+--]]
+M.get_config = function(params)
+
+    local c = uci.cursor()
+    local res = {}
+    res.temperature = tonumber(c:get("glfan", "globals", "temperature") or "75")
+    res.warn_temperature = tonumber(c:get("glfan", "globals", "warn_temperature") or "75")
+    return res
+end
+
+return M
diff --git a/gl-sdk4-fan/src/CMakeLists.txt b/gl-sdk4-fan/src/CMakeLists.txt
new file mode 100755
index 00000000..025e509a
--- /dev/null
+++ b/gl-sdk4-fan/src/CMakeLists.txt
@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.0)
+
+project(gl_fan C)
+
+aux_source_directory(. SRCS)
+add_executable(gl_fan ${SRCS})
+
+install(
+    TARGETS gl_fan
+    DESTINATION gl_fan
+)
diff --git a/gl-sdk4-fan/src/driver/Makefile b/gl-sdk4-fan/src/driver/Makefile
new file mode 100644
index 00000000..3b82a4f7
--- /dev/null
+++ b/gl-sdk4-fan/src/driver/Makefile
@@ -0,0 +1 @@
+obj-m := gl_fan_driver.o
diff --git a/gl-sdk4-fan/src/driver/gl_fan_driver.c b/gl-sdk4-fan/src/driver/gl_fan_driver.c
new file mode 100644
index 00000000..862d6591
--- /dev/null
+++ b/gl-sdk4-fan/src/driver/gl_fan_driver.c
@@ -0,0 +1,177 @@
+/*
+ * 	gl_fan {
+ *		compatible = "gl-fan";
+ *		interrupt-parent = <&pio>;
+ *		interrupts = <29 IRQ_TYPE_EDGE_RISING>;
+ *	};
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/version.h>
+#include <linux/interrupt.h>
+#include <linux/of_irq.h>
+#include <linux/timer.h>
+#include <linux/of_platform.h>
+
+#define GL_FAN_DRV_NAME "gl-fan_v2.0"
+
+typedef struct {
+    struct class *class;
+    struct device *dev;
+    unsigned int count;
+    unsigned int irq;
+    bool refresh;
+    struct timer_list timer;
+} gl_fan_t;
+
+static gl_fan_t gl_fan;
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+static void gl_fan_timer_callback(unsigned long arg)
+#else
+static void gl_fan_timer_callback(struct timer_list *t)
+#endif
+{
+    disable_irq(gl_fan.irq);
+    gl_fan.refresh = false;
+}
+
+static irqreturn_t handle_gpio_irq(int irq, void *data)
+{
+    gl_fan.count++;
+    return IRQ_HANDLED;
+}
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
+static ssize_t fan_speed_show(struct class *class, struct class_attribute *attr,
+			char *buf)
+#else
+static ssize_t fan_speed_show(const struct class *class, const struct class_attribute *attr,
+			  char *buf)
+#endif
+{
+    if (gl_fan.refresh) {
+        return sprintf(buf, "refreshing...\n");
+    } else {
+        if (gl_fan.count < 5) {
+            return sprintf(buf, "0\n");
+        } else {
+            return sprintf(buf, "%d\n", (int)(30 * gl_fan.count));
+        }
+    }
+}
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
+static ssize_t fan_speed_store(struct class *class, struct class_attribute *attr,
+			const char *buf, size_t count)
+#else
+static ssize_t fan_speed_store(const struct class *class, const struct class_attribute *attr,
+			   const char *buf, size_t count)
+#endif
+{
+    if (!strstr(buf, "refresh")) {
+        pr_err("please input 'refresh' %s\n", buf);
+        return -EBADRQC;
+    }
+
+    if (gl_fan.refresh == true) {
+        pr_err("gpio is busy\n");
+        return -EBADRQC;
+    }
+
+    gl_fan.refresh = true;
+    gl_fan.count = 0 ;
+
+    enable_irq(gl_fan.irq);
+    mod_timer(&gl_fan.timer, jiffies + msecs_to_jiffies(1000));
+
+    return count;
+}
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+static CLASS_ATTR(fan_speed, 0664, fan_speed_show, fan_speed_store);
+#else
+static CLASS_ATTR_RW(fan_speed);
+#endif
+
+static int gl_fan_probe(struct platform_device *pdev)
+{
+    struct device_node *np = pdev->dev.of_node;
+    struct device *dev = &pdev->dev;
+    int ret;
+
+    gl_fan.irq = of_irq_get(np, 0);
+    if (gl_fan.irq < 0) {
+        dev_err(dev, "Failed to get IRQ\n");
+        return -ENXIO;
+    }
+
+    ret = devm_request_irq(dev, gl_fan.irq, handle_gpio_irq, 0, "fan speed", NULL);
+    if (ret) {
+        pr_err("request irq %d failed!\n", gl_fan.irq);
+        return ret;
+    }
+
+    disable_irq(gl_fan.irq);
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 0)
+    setup_timer(&gl_fan.timer, gl_fan_timer_callback, 0);
+#else
+    timer_setup(&gl_fan.timer, gl_fan_timer_callback, 0);
+#endif
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
+    gl_fan.class = class_create(THIS_MODULE, "fan");
+#else
+    gl_fan.class = class_create("fan");
+#endif
+    ret = class_create_file(gl_fan.class, &class_attr_fan_speed);
+    if (ret) {
+        dev_err(dev, "fail to creat class file\n");
+        return ret;
+    }
+
+    gl_fan.dev = dev;
+
+    dev_info(dev, "install gl_fan\n");
+
+    return 0;
+}
+
+static int gl_fan_remove(struct platform_device *pdev)
+{
+    class_destroy(gl_fan.class);
+    dev_info(&pdev->dev, "remove gl_fan\n");
+    return 0;
+}
+
+static const struct of_device_id gl_fan_match[] = {
+    { .compatible = "gl-fan" },
+    {}
+};
+
+static struct platform_driver gl_fan_driver = {
+    .probe		= gl_fan_probe,
+    .remove		= gl_fan_remove,
+    .driver = {
+        .name	= GL_FAN_DRV_NAME,
+        .of_match_table = gl_fan_match,
+    }
+};
+
+static int __init gl_fan_init(void)
+{
+    return platform_driver_register(&gl_fan_driver);
+}
+
+static void __exit gl_fan_exit(void)
+{
+    platform_driver_unregister(&gl_fan_driver);
+}
+
+module_init(gl_fan_init);
+module_exit(gl_fan_exit);
+
+MODULE_AUTHOR("xinfa deng <xinfa.deng@gl-inet.com>");
+MODULE_LICENSE("GPL");
diff --git a/gl-sdk4-fan/src/gl_fan.c b/gl-sdk4-fan/src/gl_fan.c
new file mode 100644
index 00000000..a93177fb
--- /dev/null
+++ b/gl-sdk4-fan/src/gl_fan.c
@@ -0,0 +1,235 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <getopt.h>
+#include <sys/stat.h>
+#include <stdbool.h>
+//#include <gl_log.h>
+//#include <gl-utils/files.h>
+
+static const char *CPU_TEMP_FILE = "/sys/devices/virtual/thermal/thermal_zone0/temp";
+#define FAN_PWM_FILE "/sys/class/thermal/cooling_device0/cur_state"
+#define FAN_SPEED_FILE "/sys/class/fan/fan_speed"
+#define TEMPERATURE 75
+#define PROPORTION 10
+#define INTEFRATION 2
+#define DIIFFERENTIAL 10
+static int temp_div = 1;
+
+static void usage(const char *prog)
+{
+    fprintf(stderr, "Usage: %s [option]\n"
+            "          -T sysfs         # temperature sysfs path, default is %s\n"
+            "          -D div         # temperature divide, default is %d\n"
+            "          -t temperature   # expected CPU temperature, default is %d\n"
+            "          -p proportion    # Proportion parameter in PID algorithm, default is %d\n"
+            "          -i integration   # integration parameter in PID algorithm, default is %d\n"
+            "          -d differential  # differential parameter in PID algorithm, default is %d\n"
+            "          -s               # print fan speed\n"
+            "          -v               # verbose\n", prog, CPU_TEMP_FILE, temp_div, TEMPERATURE, PROPORTION, INTEFRATION, DIIFFERENTIAL);
+    exit(1);
+}
+
+static bool check_file_is_exist(const char *name)
+{
+    struct stat buffer;
+    return (stat(name, &buffer) == 0);
+}
+
+
+static int read_file_oneline(const char *path, char *result, size_t size)
+{
+    FILE *fp;
+    char *line = NULL;
+    size_t len = 0;
+    ssize_t read;
+
+    fp = fopen(path, "r");
+    if (fp == NULL)
+        return -1;
+
+    if ((read = getline(&line, &len, fp)) != -1) {
+        if (size != 0)
+            memcpy(result, line, size);
+        else
+            memcpy(result, line, read - 1);
+    }
+
+    fclose(fp);
+    if (line)
+        free(line);
+    return 0;
+}
+
+
+static size_t write_file(const char *path, char *buf, size_t len)
+{
+    FILE *fp = NULL;
+    size_t size = 0;
+    fp = fopen(path, "w+");
+    if (fp == NULL) {
+        return 0;
+    }
+    size = fwrite(buf, len, 1, fp);
+    fclose(fp);
+    return size;
+}
+
+
+int get_cpu_temp(int *temp)
+{
+    char tmp[8] = {0};
+    if (check_file_is_exist(CPU_TEMP_FILE)) {
+        read_file_oneline(CPU_TEMP_FILE, tmp, 0);
+        *temp = atoi(tmp) / temp_div;
+        if (*temp <= 0 || *temp >= 150) {
+            //gl_log_err("%d :It's not a normal temperature\n", *temp);
+            return -2;
+        }
+    } else {
+        //gl_log_err("%s :No such file or directory\n", CPU_TEMP_FILE);
+        return -1;
+    }
+    return 0;
+}
+
+int set_fan_pwm(char pwm)
+{
+    char tmp[8] = {0};
+    int ret = 0;
+
+    sprintf(tmp, "%d\n", pwm);
+    if (check_file_is_exist(FAN_PWM_FILE)) {
+        if ((ret = write_file(FAN_PWM_FILE, tmp, strlen(tmp))) == 1) {
+            return 0;
+        } else {
+            //gl_log_err("%s :write error: Input/output error\n", FAN_PWM_FILE);
+        }
+    } else {
+        //gl_log_err("%s :No such file or directory\n", FAN_PWM_FILE);
+    }
+    return -2;
+}
+
+int get_fan_speed(void)
+{
+    char tmp[64] = {0};
+    int ret = 0;
+    if (check_file_is_exist(FAN_SPEED_FILE)) {
+        if ((ret = write_file(FAN_SPEED_FILE, "refresh", strlen("refresh"))) == 1) {
+            sleep(2);
+            read_file_oneline(FAN_SPEED_FILE, tmp, 0);
+            tmp[63] = '\0';
+            printf("%s\n", tmp);
+            return 0;
+        } else {
+            //gl_log_err("%s :write error: Input/output error\n", FAN_SPEED_FILE);
+        }
+    } else {
+        //gl_log_err("%s :No such file or directory\n", FAN_SPEED_FILE);
+    }
+    return -2;
+}
+
+int main(int argc, char **argv)
+{
+    int verbose = 0;
+    float prop = PROPORTION, integ = INTEFRATION, diffr = DIIFFERENTIAL;
+    int goal_temp = TEMPERATURE;
+    int opt;
+
+    //gl_log_level(LOG_ERR);
+
+    while ((opt = getopt(argc, argv, "T:D:t:p:i:d:vs")) != -1) {
+        switch (opt) {
+            case 'T':
+                CPU_TEMP_FILE = optarg;
+                break;
+            case 'D':
+                temp_div = atoi(optarg);
+                if (temp_div < 1)
+                    temp_div = 1;
+                break;
+            case 't':
+                goal_temp = atoi(optarg);
+                break;
+            case 'p':
+                prop = atof(optarg);
+                break;
+            case 'i':
+                integ = atof(optarg);
+                break;
+            case 'd':
+                diffr = atof(optarg);
+                break;
+            case 's':
+                get_fan_speed();
+                return 0;
+                break;
+            case 'v':
+                //gl_log_level(LOG_DEBUG);
+                break;
+            default: /* '?' */
+                usage(argv[0]);
+        }
+    }
+
+    int current_temp = 0;
+    int current_error = 0;
+    static int total_error = 0;
+    int last_error = 0;
+    int prev_error = 0;
+    float set_pwm = 0;
+    static float last_pwm = 0;
+
+    set_fan_pwm(0);
+    while (1) {
+
+        if (get_cpu_temp(&current_temp))
+            goto loop_end;
+
+        current_error = current_temp - goal_temp;
+        total_error += current_error;
+        if (total_error > 120) {
+            total_error = 120;
+        } else if (total_error < 0 || current_error < -4) {
+            total_error = 0;
+        }
+
+        set_pwm = prop * current_error - diffr * (current_error - 2 * last_error + prev_error) + integ * total_error;
+
+        prev_error = last_error;
+        last_error = current_error;
+/*
+        gl_log_debug("set_pwm:%f proportion:%f integration:%f differential:%f\n",
+                     set_pwm, prop * current_error, integ * total_error, diffr * (current_error - 2 * last_error + prev_error));
+
+        gl_log_debug("current_temp:%d current_error:%d total_error:%d last_error:%d prev_error:%d\n",
+                     current_temp, current_error, total_error, last_error, prev_error);
+*/
+
+        if (set_pwm > 120) {
+            set_pwm = 120;
+        } else if (set_pwm < 0) {
+            set_pwm = 0;
+        }
+
+
+        if (set_pwm == 0 && last_pwm == 0) {
+            goto loop_end;
+        } else {
+            if (set_pwm == 0 && last_pwm != 0)
+                sleep(300);
+
+            last_pwm = set_pwm;
+        }
+
+        set_fan_pwm((char)set_pwm);
+
+loop_end:
+        sleep(20);
+    }
+
+    return 0;
+}
diff --git a/gl-sdk4-fan/version.mk b/gl-sdk4-fan/version.mk
new file mode 100644
index 00000000..09bdcfa6
--- /dev/null
+++ b/gl-sdk4-fan/version.mk
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2020 Jianhui Zhao <zhaojh329@gmail.com>
+#
+# This is free software, licensed under the MIT.
+#
+
+define findrev
+  $(shell \
+    if git log -1 >/dev/null 2>/dev/null; then \
+      set -- $$(git log -1 --format="%ct %h" --abbrev=7 -- .); \
+      if [ -n "$$1" ]; then
+        secs="$$(($$1 % 86400))"; \
+        yday="$$(date --utc --date="@$$1" "+%Y.%j")"; \
+        printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2"; \
+      else \
+        echo "unknown"; \
+      fi; \
+    else \
+      ts=$$(find . -type f -printf '%T@\n' 2>/dev/null | sort -rn | head -n1 | cut -d. -f1); \
+      if [ -n "$$ts" ]; then \
+        secs="$$(($$ts % 86400))"; \
+        date="$$(date --utc --date="@$$ts" "+%Y%m%d")"; \
+        printf '%s.%05d' "$$date" "$$secs"; \
+      else \
+        echo "unknown"; \
+      fi; \
+    fi \
+  )
+endef
diff --git a/gl-sdk4-hw-info/Makefile b/gl-sdk4-hw-info/Makefile
new file mode 100644
index 00000000..894f4b50
--- /dev/null
+++ b/gl-sdk4-hw-info/Makefile
@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2019 Jianhui Zhao <zhaojh329@gmail.com>
+#
+# This is free software, licensed under the MIT.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+include ./version.mk
+
+PKG_NAME:=gl-sdk4-hw-info
+PKG_VERSION:=$(strip $(call findrev))
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/gl-sdk4-hw-info
+  CATEGORY:=gl-sdk4
+  SUBMENU:=Kernel modules
+  TITLE:=GL.iNet hardware information
+  FILES:=$(PKG_BUILD_DIR)/gl-sdk4-hw-info.ko
+  DEPENDS:=+uboot-envtools
+  AUTOLOAD:=$(call AutoLoad,01,gl-sdk4-hw-info,1)
+  KCONFIG:=
+endef
+
+define Build/Prepare
+	$(INSTALL_DIR) $(PKG_BUILD_DIR)
+	$(CP) ./src/. $(PKG_BUILD_DIR)
+endef
+
+KERNEL_MAKE_FLAGS?= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)"
+
+MAKE_OPTS:= \
+	$(KERNEL_MAKE_FLAGS) \
+	M="$(PKG_BUILD_DIR)"
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		modules
+endef
+
+define KernelPackage/gl-sdk4-hw-info/install
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DATA) ./files/gl-hw-env.default $(1)/etc/uci-defaults/00-gl-hw-env
+endef
+
+$(eval $(call KernelPackage,gl-sdk4-hw-info))
diff --git a/gl-sdk4-hw-info/Readme.md b/gl-sdk4-hw-info/Readme.md
new file mode 100644
index 00000000..3faff324
--- /dev/null
+++ b/gl-sdk4-hw-info/Readme.md
@@ -0,0 +1,63 @@
+### 使用说明
+该驱动用于glinet路由器的硬件属性描述
+
+### dts写法
+
+1. 识别驱动的compatible属性为gl-hw-info
+
+2. 支持任意形式，任意数量的字符串属性，可根据实际情况直接添加
+
+3. 支持任意形式，任意数量的布尔值属性，可根据实际情况直接添加
+
+4. 支持固定形式的factory_data属性，factory_data属性已cells的格式描述，目前支持 device_mac,device_ddns,device_sn,device_sn_bak,country_code等
+
+   **例：**
+
+   ```xml-dtd
+           gl_hw {
+                   compatible = "gl-hw-info";
+   
+                   #address-cells = <1>;
+                   #size-cells = <1>;
+                   wan = "eth0";
+                   lan = "eth1.1";
+                   build-in-modem = "1-1.2";
+                   usb;
+   				function-switch;
+                   factory_data {
+                           device_mac = <&art 0>;
+                           device_ddns = <&art 0x10>;
+                           device_sn_bak = <&art 0x20>;
+                           device_sn = <&art 0x30>;
+                           country_code = <&art 0x88>;
+                           device_cert = <&art 0x1000>;
+                   };
+           };
+   ```
+
+   ### proc节点说明
+
+   1. 系统启动后，会在proc目录下生成gl-hw-info文件节点
+   2. gl-hw-info会依据设备树将对应的属性以文件形式展开
+   3. 对应的属性文件支持read操作，可以直接使用cat命令查看内容
+
+   **例：**
+
+   ```shell
+   root@OpenWrt:/# ll /proc/gl-hw-info/
+   dr-xr-xr-x    2 root     root             0 Feb 16 06:39 ./
+   dr-xr-xr-x   47 root     root             0 Jan  1  1970 ../
+   -r--r--r--    1 root     root             0 Feb 16 06:39 country_code
+   -r--r--r--    1 root     root             0 Feb 16 06:39 device_ddns
+   -r--r--r--    1 root     root             0 Feb 16 06:39 device_mac
+   -r--r--r--    1 root     root             0 Feb 16 06:39 device_sn
+   -r--r--r--    1 root     root             0 Feb 16 06:39 device_sn_bak
+   -r--r--r--    1 root     root             0 Feb 16 06:39 lan
+   -r--r--r--    1 root     root             0 Feb 16 06:39 usb
+   -r--r--r--    1 root     root             0 Feb 16 06:39 wan
+   root@OpenWrt:/# cat /proc/gl-hw-info/device_mac 
+   94:83:c4:06:00:c2
+   
+   ```
+
+   
\ No newline at end of file
diff --git a/gl-sdk4-hw-info/files/gl-hw-env.default b/gl-sdk4-hw-info/files/gl-hw-env.default
new file mode 100644
index 00000000..cae601bb
--- /dev/null
+++ b/gl-sdk4-hw-info/files/gl-hw-env.default
@@ -0,0 +1,20 @@
+CFG=/etc/fw_env_gl.config
+
+[ -f /proc/gl-hw-info/cfg-partition ] && dev=$(cat /proc/gl-hw-info/cfg-partition)
+
+[ -n "$dev" -a -e $dev ] || exit 0
+
+name=$(echo ${dev##*/})
+
+case "${name:0:3}" in
+    mtd)
+        size=$(cat /sys/class/mtd/$name/size | awk '{printf("0x%x",$1)}')
+        ;;
+    mmc)
+        size=$(cat /sys/class/block/$name/size | awk '{printf("0x%x",$1 * 512)}')
+        ;;
+    *)
+        exit 0
+esac
+
+echo "$dev 0 $size" > $CFG
diff --git a/gl-sdk4-hw-info/src/Makefile b/gl-sdk4-hw-info/src/Makefile
new file mode 100644
index 00000000..738874a2
--- /dev/null
+++ b/gl-sdk4-hw-info/src/Makefile
@@ -0,0 +1,2 @@
+gl-sdk4-hw-info-objs := proc.o factory_data.o iso3166.o main.o
+obj-m := gl-sdk4-hw-info.o
diff --git a/gl-sdk4-hw-info/src/factory_data.c b/gl-sdk4-hw-info/src/factory_data.c
new file mode 100644
index 00000000..ac7a0c84
--- /dev/null
+++ b/gl-sdk4-hw-info/src/factory_data.c
@@ -0,0 +1,238 @@
+#include <linux/module.h>
+#include <linux/module.h>
+#include <linux/sizes.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/etherdevice.h>
+#include <linux/mtd/mtd.h>
+#include <linux/blkdev.h>
+#include <linux/version.h>
+#include <linux/pagemap.h>
+
+#include "gl-hw-info.h"
+
+static int block_part_read(const char *part, unsigned int from,
+                  void *val, size_t bytes)
+{
+    pgoff_t index = from >> PAGE_SHIFT;
+    int offset = from & (PAGE_SIZE - 1);
+    const fmode_t mode = FMODE_READ;
+    struct block_device *bdev;
+    struct page *page;
+    char *buf = val;
+    int cpylen;
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0)
+    bdev = blkdev_get_by_path(part, mode, NULL);
+#else
+    bdev = blkdev_get_by_path(part, mode, NULL, NULL);
+#endif
+    if (IS_ERR(bdev))
+        return -1;
+
+    while (bytes) {
+        if ((offset + bytes) > PAGE_SIZE)
+            cpylen = PAGE_SIZE - offset;
+        else
+            cpylen = bytes;
+        bytes = bytes - cpylen;
+
+        page = read_mapping_page(bdev->bd_inode->i_mapping, index, NULL);
+        if (IS_ERR(page))
+            return PTR_ERR(page);
+
+        memcpy(buf, page_address(page) + offset, cpylen);
+        put_page(page);
+
+        buf += cpylen;
+        offset = 0;
+        index++;
+    }
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 5, 0)
+    blkdev_put(bdev, mode);
+#else
+    blkdev_put(bdev, NULL);
+#endif
+
+    return 0;
+}
+
+static int parse_mtd_value(const char *part, u32 offset, void *dest, int len)
+{
+#ifdef CONFIG_MTD
+    struct mtd_info *mtd;
+    size_t retlen;
+    int rc;
+
+    mtd = get_mtd_device_nm(part);
+    if (IS_ERR(mtd))
+        return -1;
+
+    rc = mtd_read(mtd, offset, len, &retlen, dest);
+    if (!rc && retlen != len)
+        rc = -EIO;
+
+    put_mtd_device(mtd);
+    return rc;
+#else
+    return -ENODEV;
+#endif
+}
+
+static int parse_value(struct device_node *np, const char *prop,
+                           void *dest, int len)
+{
+    const char *part, *offset_str;
+    u32 offset = 0;
+
+    if (of_property_read_string_index(np, prop, 0, &part))
+        return -1;
+
+    if (!of_property_read_string_index(np, prop, 1, &offset_str))
+        offset = simple_strtoul(offset_str, NULL, 0);
+
+    if(!strncmp(part,"/dev/mmc", 8))
+        return block_part_read(part, offset, dest, len);
+
+    return parse_mtd_value(part, offset, dest, len);
+}
+
+static void make_device_country_code(struct device_node *np)
+{
+    __be16 country_code = 0;
+
+    if (parse_value(np, "country_code", &country_code, COUNTRY_LEN))
+        return;
+
+    create_proc_node("country_code", lookup_country(be16_to_cpu(country_code)));
+}
+
+static void make_device_sn_bak(struct device_node *np)
+{
+    if (parse_value(np, "device_sn_bak", gl_hw_info.device_sn_bak, SN_LEN))
+        return;
+
+    if (strlen(gl_hw_info.device_sn_bak))
+        create_proc_node("device_sn_bak", gl_hw_info.device_sn_bak);
+}
+
+static void make_device_sn(struct device_node *np)
+{
+    if (parse_value(np, "device_sn", gl_hw_info.device_sn, SN_LEN))
+        return;
+
+    if (strlen(gl_hw_info.device_sn))
+        create_proc_node("device_sn", gl_hw_info.device_sn);
+}
+
+static void make_device_ddns(struct device_node *np)
+{
+    if (parse_value(np, "device_ddns", gl_hw_info.device_ddns, DDNS_LEN))
+        return;
+
+    if (strlen(gl_hw_info.device_ddns))
+        create_proc_node("device_ddns", gl_hw_info.device_ddns);
+}
+
+static void make_device_mac(struct device_node *np)
+{
+    u8 mac[ETH_ALEN];
+
+    if (parse_value(np, "device_mac", mac, MAC_LEN))
+        return;
+
+    if (is_valid_ether_addr(mac)) {
+        snprintf(gl_hw_info.device_mac, sizeof(gl_hw_info.device_mac), "%pM", mac);
+        create_proc_node("device_mac", gl_hw_info.device_mac);
+    }
+}
+
+static void make_device_cert(struct device_node *np)
+{
+    size_t key_len;
+    char *p;
+
+    if (parse_value(np, "device_cert", gl_hw_info.device_cert, CERT_LEN))
+        return;
+
+    p = strstr(gl_hw_info.device_cert, "-----BEGIN PRIVATE KEY-----");
+    if (!p)
+        return;
+
+    key_len = strlen(p);
+
+    if (p[key_len - 1] == '\n')
+        p[key_len - 1] = '\0';
+
+    memmove(p + 1, p, key_len);
+
+    if (p[-1] == '\n')
+        p[-1] = '\0';
+
+    *p++ = '\0';
+
+    gl_hw_info.device_key = p;
+
+    create_proc_node("device_cert", gl_hw_info.device_cert);
+    create_proc_node("device_key", gl_hw_info.device_key);
+}
+
+static void make_device_submodel(struct device_node *np)
+{
+    size_t submodel_len;
+    size_t i;
+    bool all_ff = true;
+    char *p;
+
+    if (parse_value(np, "device_submodel", gl_hw_info.device_submodel, SUBMODEL_LEN))
+        return;
+
+    p = gl_hw_info.device_submodel;
+
+    // 检查字符串中是否全都是0xff或0x00字节
+    for (i = 0; i < SUBMODEL_LEN; i++) {
+        if (p[i] != 0xffffffff || p[i] != 0x00) {
+          all_ff = false;
+          break;
+        }
+    }
+
+    if (!all_ff) {
+    // 如果不全都是0xff字节，确定第一个0xff或0x00字节的位置
+        for (i = 0; i < SUBMODEL_LEN; i++) {
+            if (p[i] == 0xffffffff || p[i] == 0x00) {
+                submodel_len = i ;
+                break;
+            }
+        }
+        // 截取子设备型号字符串（字符串长度为submodel_len，从第一个字符开始截取）
+        strncpy(gl_hw_info.device_submodel, p, submodel_len);
+        gl_hw_info.device_submodel[submodel_len] = '\0'; // 添加结束符'\0'
+    }
+
+    create_proc_node("device_submodel", gl_hw_info.device_submodel);
+}
+
+static void make_firmware_type_flag(struct device_node *np)
+{
+    if (parse_value(np, "firmware_type", gl_hw_info.firmware_type, FIRMWARE_LEN))
+        return;
+
+    if (strlen(gl_hw_info.firmware_type) && gl_hw_info.firmware_type[0] == '2')
+        create_proc_node("firmware_type", gl_hw_info.firmware_type);
+    else
+        create_proc_node("firmware_type", "2c");
+}
+
+void make_factory_data(struct device_node *np)
+{
+    make_device_mac(np);
+    make_device_ddns(np);
+    make_device_sn(np);
+    make_device_sn_bak(np);
+    make_device_cert(np);
+    make_device_country_code(np);
+    make_device_submodel(np);
+    make_firmware_type_flag(np);
+}
diff --git a/gl-sdk4-hw-info/src/gl-hw-info.h b/gl-sdk4-hw-info/src/gl-hw-info.h
new file mode 100644
index 00000000..0ac3dc76
--- /dev/null
+++ b/gl-sdk4-hw-info/src/gl-hw-info.h
@@ -0,0 +1,43 @@
+#ifndef __GL_HW_INFO_H
+#define __GL_HW_INFO_H
+
+#include <linux/proc_fs.h>
+#include <linux/sizes.h>
+#include <linux/if.h>
+#include <linux/types.h>
+#include <linux/slab.h>
+
+#define GL_HW_INFO_DRV_NAME "gl-hw-info_v1.0"
+#define PROC_DIR "gl-hw-info"
+
+#define MAC_LEN 6
+#define SN_LEN 16
+#define DDNS_LEN 7
+#define COUNTRY_LEN 2
+#define FIRMWARE_LEN 2
+#define CERT_LEN 4096
+#define SUBMODEL_LEN 16
+
+struct glinet_hw_info {
+    struct proc_dir_entry *parent;
+    u8 device_mac[18];
+    u8 device_ddns[DDNS_LEN + 1];
+    u8 firmware_type[FIRMWARE_LEN + 1];
+    u8 device_sn[SN_LEN + 1];
+    u8 device_sn_bak[SN_LEN + 1];
+    u8 device_submodel[SUBMODEL_LEN + 1];
+    u8 device_cert[CERT_LEN + 1];
+    u8 *device_key;
+};
+
+extern struct glinet_hw_info gl_hw_info;
+
+struct proc_dir_entry *create_proc_node(const char *name, const char *value);
+int proc_init_gl_hw_info(void);
+int proc_remove_gl_hw_info(void);
+
+void make_factory_data(struct device_node *np);
+
+const char *lookup_country(int iso3166);
+
+#endif
diff --git a/gl-sdk4-hw-info/src/iso3166.c b/gl-sdk4-hw-info/src/iso3166.c
new file mode 100644
index 00000000..410869f7
--- /dev/null
+++ b/gl-sdk4-hw-info/src/iso3166.c
@@ -0,0 +1,272 @@
+#include <linux/types.h>
+
+struct iso3166_label {
+    u16 iso3166;
+    char name[28];
+};
+
+/*
+ * ISO3166 country labels
+ */
+static const struct iso3166_label iso3166_names[] = {
+    { 0x3030, "00" },// "World" },
+    { 0x4144, "AD" },// "Andorra" },
+    { 0x4145, "AE" },// "United Arab Emirates" },
+    { 0x4146, "AF" },// "Afghanistan" },
+    { 0x4147, "AG" },// "Antigua and Barbuda" },
+    { 0x4149, "AI" },// "Anguilla" },
+    { 0x414C, "AL" },// "Albania" },
+    { 0x414D, "AM" },// "Armenia" },
+    { 0x414E, "AN" },// "Netherlands Antilles" },
+    { 0x414F, "AO" },// "Angola" },
+    { 0x4151, "AQ" },// "Antarctica" },
+    { 0x4152, "AR" },// "Argentina" },
+    { 0x4153, "AS" },// "American Samoa" },
+    { 0x4154, "AT" },// "Austria" },
+    { 0x4155, "AU" },// "Australia" },
+    { 0x4157, "AW" },// "Aruba" },
+    { 0x4158, "AX" },// "Aland Islands" },
+    { 0x415A, "AZ" },// "Azerbaijan" },
+    { 0x4241, "BA" },// "Bosnia and Herzegovina" },
+    { 0x4242, "BB" },// "Barbados" },
+    { 0x4244, "BD" },// "Bangladesh" },
+    { 0x4245, "BE" },// "Belgium" },
+    { 0x4246, "BF" },// "Burkina Faso" },
+    { 0x4247, "BG" },// "Bulgaria" },
+    { 0x4248, "BH" },// "Bahrain" },
+    { 0x4249, "BI" },// "Burundi" },
+    { 0x424A, "BJ" },// "Benin" },
+    { 0x424C, "BL" },// "Saint Barthelemy" },
+    { 0x424D, "BM" },// "Bermuda" },
+    { 0x424E, "BN" },// "Brunei Darussalam" },
+    { 0x424F, "BO" },// "Bolivia" },
+    { 0x4252, "BR" },// "Brazil" },
+    { 0x4253, "BS" },// "Bahamas" },
+    { 0x4254, "BT" },// "Bhutan" },
+    { 0x4256, "BV" },// "Bouvet Island" },
+    { 0x4257, "BW" },// "Botswana" },
+    { 0x4259, "BY" },// "Belarus" },
+    { 0x425A, "BZ" },// "Belize" },
+    { 0x4341, "CA" },// "Canada" },
+    { 0x4343, "CC" },// "Cocos (Keeling) Islands" },
+    { 0x4344, "CD" },// "Congo" },
+    { 0x4346, "CF" },// "Central African Republic" },
+    { 0x4347, "CG" },// "Congo" },
+    { 0x4348, "CH" },// "Switzerland" },
+    { 0x4349, "CI" },// "Cote d'Ivoire" },
+    { 0x434B, "CK" },// "Cook Islands" },
+    { 0x434C, "CL" },// "Chile" },
+    { 0x434D, "CM" },// "Cameroon" },
+    { 0x434E, "CN" },// "China" },
+    { 0x434F, "CO" },// "Colombia" },
+    { 0x4352, "CR" },// "Costa Rica" },
+    { 0x4355, "CU" },// "Cuba" },
+    { 0x4356, "CV" },// "Cape Verde" },
+    { 0x4358, "CX" },// "Christmas Island" },
+    { 0x4359, "CY" },// "Cyprus" },
+    { 0x435A, "CZ" },// "Czech Republic" },
+    { 0x4445, "DE" },// "Germany" },
+    { 0x444A, "DJ" },// "Djibouti" },
+    { 0x444B, "DK" },// "Denmark" },
+    { 0x444D, "DM" },// "Dominica" },
+    { 0x444F, "DO" },// "Dominican Republic" },
+    { 0x445A, "DZ" },// "Algeria" },
+    { 0x4543, "EC" },// "Ecuador" },
+    { 0x4545, "EE" },// "Estonia" },
+    { 0x4547, "EG" },// "Egypt" },
+    { 0x4548, "EH" },// "Western Sahara" },
+    { 0x4552, "ER" },// "Eritrea" },
+    { 0x4553, "ES" },// "Spain" },
+    { 0x4554, "ET" },// "Ethiopia" },
+    { 0x4649, "FI" },// "Finland" },
+    { 0x464A, "FJ" },// "Fiji" },
+    { 0x464B, "FK" },// "Falkland Islands" },
+    { 0x464D, "FM" },// "Micronesia" },
+    { 0x464F, "FO" },// "Faroe Islands" },
+    { 0x4652, "FR" },// "France" },
+    { 0x4741, "GA" },// "Gabon" },
+    { 0x4742, "GB" },// "United Kingdom" },
+    { 0x4744, "GD" },// "Grenada" },
+    { 0x4745, "GE" },// "Georgia" },
+    { 0x4746, "GF" },// "French Guiana" },
+    { 0x4747, "GG" },// "Guernsey" },
+    { 0x4748, "GH" },// "Ghana" },
+    { 0x4749, "GI" },// "Gibraltar" },
+    { 0x474C, "GL" },// "Greenland" },
+    { 0x474D, "GM" },// "Gambia" },
+    { 0x474E, "GN" },// "Guinea" },
+    { 0x4750, "GP" },// "Guadeloupe" },
+    { 0x4751, "GQ" },// "Equatorial Guinea" },
+    { 0x4752, "GR" },// "Greece" },
+    { 0x4753, "GS" },// "South Georgia" },
+    { 0x4754, "GT" },// "Guatemala" },
+    { 0x4755, "GU" },// "Guam" },
+    { 0x4757, "GW" },// "Guinea-Bissau" },
+    { 0x4759, "GY" },// "Guyana" },
+    { 0x484B, "HK" },// "Hong Kong" },
+    { 0x484D, "HM" },// "Heard and McDonald Islands" },
+    { 0x484E, "HN" },// "Honduras" },
+    { 0x4852, "HR" },// "Croatia" },
+    { 0x4854, "HT" },// "Haiti" },
+    { 0x4855, "HU" },// "Hungary" },
+    { 0x4944, "ID" },// "Indonesia" },
+    { 0x4945, "IE" },// "Ireland" },
+    { 0x494C, "IL" },// "Israel" },
+    { 0x494D, "IM" },// "Isle of Man" },
+    { 0x494E, "IN" },// "India" },
+    { 0x494F, "IO" },// "Chagos Islands" },
+    { 0x4951, "IQ" },// "Iraq" },
+    { 0x4952, "IR" },// "Iran" },
+    { 0x4953, "IS" },// "Iceland" },
+    { 0x4954, "IT" },// "Italy" },
+    { 0x4A45, "JE" },// "Jersey" },
+    { 0x4A4D, "JM" },// "Jamaica" },
+    { 0x4A4F, "JO" },// "Jordan" },
+    { 0x4A50, "JP" },// "Japan" },
+    { 0x4B45, "KE" },// "Kenya" },
+    { 0x4B47, "KG" },// "Kyrgyzstan" },
+    { 0x4B48, "KH" },// "Cambodia" },
+    { 0x4B49, "KI" },// "Kiribati" },
+    { 0x4B4D, "KM" },// "Comoros" },
+    { 0x4B4E, "KN" },// "Saint Kitts and Nevis" },
+    { 0x4B50, "KP" },// "North Korea" },
+    { 0x4B52, "KR" },// "South Korea" },
+    { 0x4B57, "KW" },// "Kuwait" },
+    { 0x4B59, "KY" },// "Cayman Islands" },
+    { 0x4B5A, "KZ" },// "Kazakhstan" },
+    { 0x4C41, "LA" },// "Laos" },
+    { 0x4C42, "LB" },// "Lebanon" },
+    { 0x4C43, "LC" },// "Saint Lucia" },
+    { 0x4C49, "LI" },// "Liechtenstein" },
+    { 0x4C4B, "LK" },// "Sri Lanka" },
+    { 0x4C52, "LR" },// "Liberia" },
+    { 0x4C53, "LS" },// "Lesotho" },
+    { 0x4C54, "LT" },// "Lithuania" },
+    { 0x4C55, "LU" },// "Luxembourg" },
+    { 0x4C56, "LV" },// "Latvia" },
+    { 0x4C59, "LY" },// "Libyan Arab Jamahiriya" },
+    { 0x4D41, "MA" },// "Morocco" },
+    { 0x4D43, "MC" },// "Monaco" },
+    { 0x4D44, "MD" },// "Moldova" },
+    { 0x4D45, "ME" },// "Montenegro" },
+    { 0x4D46, "MF" },// "Saint Martin (French part)" },
+    { 0x4D47, "MG" },// "Madagascar" },
+    { 0x4D48, "MH" },// "Marshall Islands" },
+    { 0x4D4B, "MK" },// "Macedonia" },
+    { 0x4D4C, "ML" },// "Mali" },
+    { 0x4D4D, "MM" },// "Myanmar" },
+    { 0x4D4E, "MN" },// "Mongolia" },
+    { 0x4D4F, "MO" },// "Macao" },
+    { 0x4D50, "MP" },// "Northern Mariana Islands" },
+    { 0x4D51, "MQ" },// "Martinique" },
+    { 0x4D52, "MR" },// "Mauritania" },
+    { 0x4D53, "MS" },// "Montserrat" },
+    { 0x4D54, "MT" },// "Malta" },
+    { 0x4D55, "MU" },// "Mauritius" },
+    { 0x4D56, "MV" },// "Maldives" },
+    { 0x4D57, "MW" },// "Malawi" },
+    { 0x4D58, "MX" },// "Mexico" },
+    { 0x4D59, "MY" },// "Malaysia" },
+    { 0x4D5A, "MZ" },// "Mozambique" },
+    { 0x4E41, "NA" },// "Namibia" },
+    { 0x4E43, "NC" },// "New Caledonia" },
+    { 0x4E45, "NE" },// "Niger" },
+    { 0x4E46, "NF" },// "Norfolk Island" },
+    { 0x4E47, "NG" },// "Nigeria" },
+    { 0x4E49, "NI" },// "Nicaragua" },
+    { 0x4E4C, "NL" },// "Netherlands" },
+    { 0x4E4F, "NO" },// "Norway" },
+    { 0x4E50, "NP" },// "Nepal" },
+    { 0x4E52, "NR" },// "Nauru" },
+    { 0x4E55, "NU" },// "Niue" },
+    { 0x4E5A, "NZ" },// "New Zealand" },
+    { 0x4F4D, "OM" },// "Oman" },
+    { 0x5041, "PA" },// "Panama" },
+    { 0x5045, "PE" },// "Peru" },
+    { 0x5046, "PF" },// "French Polynesia" },
+    { 0x5047, "PG" },// "Papua New Guinea" },
+    { 0x5048, "PH" },// "Philippines" },
+    { 0x504B, "PK" },// "Pakistan" },
+    { 0x504C, "PL" },// "Poland" },
+    { 0x504D, "PM" },// "Saint Pierre and Miquelon" },
+    { 0x504E, "PN" },// "Pitcairn" },
+    { 0x5052, "PR" },// "Puerto Rico" },
+    { 0x5053, "PS" },// "Palestinian Territory" },
+    { 0x5054, "PT" },// "Portugal" },
+    { 0x5057, "PW" },// "Palau" },
+    { 0x5059, "PY" },// "Paraguay" },
+    { 0x5141, "QA" },// "Qatar" },
+    { 0x5245, "RE" },// "Reunion" },
+    { 0x524F, "RO" },// "Romania" },
+    { 0x5253, "RS" },// "Serbia" },
+    { 0x5255, "RU" },// "Russian Federation" },
+    { 0x5257, "RW" },// "Rwanda" },
+    { 0x5341, "SA" },// "Saudi Arabia" },
+    { 0x5342, "SB" },// "Solomon Islands" },
+    { 0x5343, "SC" },// "Seychelles" },
+    { 0x5344, "SD" },// "Sudan" },
+    { 0x5345, "SE" },// "Sweden" },
+    { 0x5347, "SG" },// "Singapore" },
+    { 0x5348, "SH" },// "St. Helena and Dependencies" },
+    { 0x5349, "SI" },// "Slovenia" },
+    { 0x534A, "SJ" },// "Svalbard and Jan Mayen" },
+    { 0x534B, "SK" },// "Slovakia" },
+    { 0x534C, "SL" },// "Sierra Leone" },
+    { 0x534D, "SM" },// "San Marino" },
+    { 0x534E, "SN" },// "Senegal" },
+    { 0x534F, "SO" },// "Somalia" },
+    { 0x5352, "SR" },// "Suriname" },
+    { 0x5354, "ST" },// "Sao Tome and Principe" },
+    { 0x5356, "SV" },// "El Salvador" },
+    { 0x5359, "SY" },// "Syrian Arab Republic" },
+    { 0x535A, "SZ" },// "Swaziland" },
+    { 0x5443, "TC" },// "Turks and Caicos Islands" },
+    { 0x5444, "TD" },// "Chad" },
+    { 0x5446, "TF" },// "French Southern Territories" },
+    { 0x5447, "TG" },// "Togo" },
+    { 0x5448, "TH" },// "Thailand" },
+    { 0x544A, "TJ" },// "Tajikistan" },
+    { 0x544B, "TK" },// "Tokelau" },
+    { 0x544C, "TL" },// "Timor-Leste" },
+    { 0x544D, "TM" },// "Turkmenistan" },
+    { 0x544E, "TN" },// "Tunisia" },
+    { 0x544F, "TO" },// "Tonga" },
+    { 0x5452, "TR" },// "Turkey" },
+    { 0x5454, "TT" },// "Trinidad and Tobago" },
+    { 0x5456, "TV" },// "Tuvalu" },
+    { 0x5457, "TW" },// "Taiwan" },
+    { 0x545A, "TZ" },// "Tanzania" },
+    { 0x5541, "UA" },// "Ukraine" },
+    { 0x5547, "UG" },// "Uganda" },
+    { 0x554D, "UM" },// "U.S. Minor Outlying Islands" },
+    { 0x5553, "US" },// "United States" },
+    { 0x5559, "UY" },// "Uruguay" },
+    { 0x555A, "UZ" },// "Uzbekistan" },
+    { 0x5641, "VA" },// "Vatican City State" },
+    { 0x5643, "VC" },// "St. Vincent and Grenadines" },
+    { 0x5645, "VE" },// "Venezuela" },
+    { 0x5647, "VG" },// "Virgin Islands, British" },
+    { 0x5649, "VI" },// "Virgin Islands, U.S." },
+    { 0x564E, "VN" },// "Viet Nam" },
+    { 0x5655, "VU" },// "Vanuatu" },
+    { 0x5746, "WF" },// "Wallis and Futuna" },
+    { 0x5753, "WS" },// "Samoa" },
+    { 0x5945, "YE" },// "Yemen" },
+    { 0x5954, "YT" },// "Mayotte" },
+    { 0x5A41, "ZA" },// "South Africa" },
+    { 0x5A4D, "ZM" },// "Zambia" },
+    { 0x5A57, "ZW" },// "Zimbabwe" },
+    { 0, "" }
+};
+
+const char *lookup_country(int iso3166)
+{
+    const struct iso3166_label *l;
+
+    for (l = iso3166_names; l->iso3166; l++) {
+        if (iso3166 == l->iso3166)
+            return l->name;
+    }
+
+    return "";
+}
diff --git a/gl-sdk4-hw-info/src/main.c b/gl-sdk4-hw-info/src/main.c
new file mode 100644
index 00000000..60b9e474
--- /dev/null
+++ b/gl-sdk4-hw-info/src/main.c
@@ -0,0 +1,112 @@
+/*
+ *  GL hardware information driver
+ *
+ *  Copyright (C) 2021 Chonejun Luo <luochongjun@gl-inet.com>
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/module.h>
+#include <linux/module.h>
+#include <linux/sizes.h>
+#include <linux/of.h>
+#include <linux/of_address.h>
+#include <linux/of_platform.h>
+#include <linux/etherdevice.h>
+#include <linux/mtd/mtd.h>
+#include "gl-hw-info.h"
+
+struct glinet_hw_info gl_hw_info = {};
+
+static int gl_hw_info_probe(struct platform_device *pdev)
+{
+#ifdef CONFIG_OF
+    struct property *pp = NULL;
+    struct device_node *np = pdev->dev.of_node;
+    struct device_node *data_np = of_find_node_by_name(NULL, "factory_data");
+    static char flash_size_str[64] = "";
+    int flash_size = 0;
+
+    if (data_np) {
+        make_factory_data(data_np);
+        of_node_put(data_np);
+    }
+
+    of_property_read_u32(np, "flash_size", &flash_size);
+    sprintf(flash_size_str, "%d MiB", flash_size);
+    create_proc_node("flash_size", flash_size_str);
+
+    for_each_property_of_node(np, pp) {
+        const char *value = NULL;
+
+        if (!strcmp(pp->name, "name") || !strcmp(pp->name, "compatible") ||
+                !strcmp(pp->name, "#address-cells") || !strcmp(pp->name, "#size-cells") ||
+                !strcmp(pp->name, "flash_size"))
+            continue;
+
+        if (!pp->value)
+            continue;
+
+        if (strnlen(pp->value, pp->length) < pp->length)
+            value = (char *)pp->value;
+
+        create_proc_node(pp->name, value ? value : "True");
+    }
+#endif
+    printk("install gl_hw_info\n");
+
+    return 0;
+}
+
+static int gl_hw_info_remove(struct platform_device *pdev)
+{
+    printk("remove gl_hw_info\n");
+    return 0;
+}
+
+static const struct of_device_id gl_hw_info_match[] = {
+    { .compatible = "gl-hw-info" },
+    {}
+};
+
+static struct platform_driver gl_hw_info_driver = {
+    .probe		= gl_hw_info_probe,
+    .remove		= gl_hw_info_remove,
+    .driver = {
+        .name	= GL_HW_INFO_DRV_NAME,
+        .of_match_table = gl_hw_info_match,
+    }
+};
+
+static int __init gl_hw_info_init(void)
+{
+    int ret;
+    ret = proc_init_gl_hw_info();
+    if (ret)
+        goto err_out;
+    ret = platform_driver_register(&gl_hw_info_driver);
+    if (ret)
+        goto err_proc_exit;
+
+
+    return ret;
+err_proc_exit:
+    proc_remove_gl_hw_info();
+err_out:
+    return ret;
+}
+
+static void __exit gl_hw_info_exit(void)
+{
+    platform_driver_unregister(&gl_hw_info_driver);
+    proc_remove_gl_hw_info();
+}
+
+module_init(gl_hw_info_init);
+module_exit(gl_hw_info_exit);
+
+MODULE_AUTHOR("Chongjun Luo <luochongjun@gl-inet.com>");
+MODULE_LICENSE("GPL");
+
diff --git a/gl-sdk4-hw-info/src/proc.c b/gl-sdk4-hw-info/src/proc.c
new file mode 100644
index 00000000..e4d03ad0
--- /dev/null
+++ b/gl-sdk4-hw-info/src/proc.c
@@ -0,0 +1,64 @@
+#include <linux/module.h>
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/proc_fs.h>
+#include <linux/uaccess.h>
+#include <linux/seq_file.h>
+#include <linux/version.h>
+#include "gl-hw-info.h"
+
+static int proc_show(struct seq_file *s, void *v)
+{
+    const char *value = s->private;
+
+    seq_printf(s, "%s\n", value);
+
+    return 0;
+}
+
+
+static int proc_open(struct inode *inode, struct file *file)
+{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 17, 0)
+    return single_open(file, proc_show, PDE_DATA(inode));
+#else
+    return single_open(file, proc_show, pde_data(inode));
+#endif
+}
+
+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 10, 0)
+struct file_operations proc_fops = {
+    .owner = THIS_MODULE,
+    .read = seq_read,
+    .open = proc_open,
+    .llseek = seq_lseek,
+    .release = single_release,
+};
+#else
+struct proc_ops proc_fops = {
+    .proc_read = seq_read,
+    .proc_open = proc_open,
+    .proc_lseek = seq_lseek,
+    .proc_release = single_release,
+};
+#endif
+
+struct proc_dir_entry *create_proc_node(const char *name, const char *value)
+{
+    return proc_create_data(name, 0, gl_hw_info.parent, &proc_fops, (void *)value);
+}
+
+int proc_init_gl_hw_info(void)
+{
+    gl_hw_info.parent = proc_mkdir(PROC_DIR, NULL);
+    if (!gl_hw_info.parent)
+        return -ENOENT;
+
+    return 0;
+}
+
+int proc_remove_gl_hw_info(void)
+{
+    proc_remove(gl_hw_info.parent);
+    return 0;
+}
diff --git a/gl-sdk4-hw-info/version.mk b/gl-sdk4-hw-info/version.mk
new file mode 100644
index 00000000..09bdcfa6
--- /dev/null
+++ b/gl-sdk4-hw-info/version.mk
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2020 Jianhui Zhao <zhaojh329@gmail.com>
+#
+# This is free software, licensed under the MIT.
+#
+
+define findrev
+  $(shell \
+    if git log -1 >/dev/null 2>/dev/null; then \
+      set -- $$(git log -1 --format="%ct %h" --abbrev=7 -- .); \
+      if [ -n "$$1" ]; then
+        secs="$$(($$1 % 86400))"; \
+        yday="$$(date --utc --date="@$$1" "+%Y.%j")"; \
+        printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2"; \
+      else \
+        echo "unknown"; \
+      fi; \
+    else \
+      ts=$$(find . -type f -printf '%T@\n' 2>/dev/null | sort -rn | head -n1 | cut -d. -f1); \
+      if [ -n "$$ts" ]; then \
+        secs="$$(($$ts % 86400))"; \
+        date="$$(date --utc --date="@$$ts" "+%Y%m%d")"; \
+        printf '%s.%05d' "$$date" "$$secs"; \
+      else \
+        echo "unknown"; \
+      fi; \
+    fi \
+  )
+endef
diff --git a/gn/Makefile b/gn/Makefile
new file mode 100644
index 00000000..ada48637
--- /dev/null
+++ b/gn/Makefile
@@ -0,0 +1,79 @@
+# Copyright (c) 2023 Project CHIP Authors
+#
+# 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
+#
+# 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 $(TOPDIR)/rules.mk
+
+PKG_NAME:=gn
+PKG_SOURCE_URL:=https://gn.googlesource.com/gn
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_MIRROR:=0 # don't try OpenWrt mirror
+
+# GN versioning is based on the number of commits since the tag `initial-commit`,
+# and is exposed to build scripts via the `gn_version` variable. When updating
+# PKG_SOURCE_VERSION to a new commit hash, GN_VERSION needs to be obtained via
+#   git describe HEAD --match initial-commit | cut -f 3 -d -
+# and updated below.
+PKG_SOURCE_DATE:=2023-07-24
+PKG_SOURCE_VERSION:=62ac86a938c365ccdbbbd9a9b49fb72fa3d6eb81
+PKG_MIRROR_HASH:=231e7e663ec3a374bb86a50904b2af6562c29aad03de43f6b4a03d1be1f083c5
+GN_VERSION:=2116
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_HOST_ONLY:=1
+HOST_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/host-build.mk
+
+define Package/gn
+  SECTION:=devel
+  CATEGORY:=Development
+  TITLE:=gn
+  URL:=https://gn.googlesource.com/gn
+endef
+
+define Package/gn/description
+  GN is a meta-build system that generates build files for Ninja.
+endef
+
+define Host/Configure
+	cd $(HOST_BUILD_DIR) && $(HOST_CONFIGURE_VARS) \
+		$(STAGING_DIR_HOST)/bin/python build/gen.py --no-last-commit-position
+	echo "$$$$GN_LAST_COMMIT_HEADER" | \
+		VER_NUM=$(GN_VERSION) VER_STR="$(GN_VERSION) (`echo "$(PKG_SOURCE_VERSION)" | cut -c 1-12`)" \
+		perl -lpe 's/\$$$$(\w+)/$$$$ENV{$$$$1}/ge' >$(HOST_BUILD_DIR)/out/last_commit_position.h
+endef
+
+define Host/Compile
+	$(NINJA) -C $(HOST_BUILD_DIR)/out gn
+endef
+
+define Host/Install
+	$(INSTALL_DIR) $(1)/bin
+	$(INSTALL_BIN) $(HOST_BUILD_DIR)/out/gn $(1)/bin
+endef
+
+define GN_LAST_COMMIT_HEADER
+#ifndef OUT_LAST_COMMIT_POSITION_H_
+#define OUT_LAST_COMMIT_POSITION_H_
+#define LAST_COMMIT_POSITION_NUM $$VER_NUM
+#define LAST_COMMIT_POSITION "$$VER_STR"
+#endif // OUT_LAST_COMMIT_POSITION_H_
+endef
+export GN_LAST_COMMIT_HEADER
+
+$(eval $(call BuildPackage,gn))
+$(eval $(call HostBuild))
diff --git a/golang/golang-build.sh b/golang/golang-build.sh
new file mode 100644
index 00000000..fe8718ee
--- /dev/null
+++ b/golang/golang-build.sh
@@ -0,0 +1,210 @@
+#!/bin/sh
+#
+# Copyright (C) 2020, 2022 Jeffery To
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+nl="
+"
+
+log() {
+	# shellcheck disable=SC2039
+	local IFS=" "
+	printf '%s\n' "$*"
+}
+
+log_error() {
+	# shellcheck disable=SC2039
+	local IFS=" "
+	printf 'Error: %s\n' "$*" >&2
+}
+
+link_contents() {
+	# shellcheck disable=SC2039
+	local src="$1" dest="$2" IFS="$nl" dirs dir base
+
+	if [ -n "$(find "$src" -mindepth 1 -maxdepth 1 -name "*.go" -not -type d)" ]; then
+		log_error "$src is already a Go library"
+		return 1
+	fi
+
+	dirs="$(find "$src" -mindepth 1 -maxdepth 1 -type d)"
+	for dir in $dirs; do
+		base="${dir##*/}"
+		if [ -d "$dest/$base" ]; then
+			case "$dir" in
+			*$GO_BUILD_DEPENDS_SRC/$GO_PKG)
+				log "$GO_PKG is already installed. Please check for circular dependencies."
+				;;
+			*)
+				link_contents "$src/$base" "$dest/$base"
+				;;
+			esac
+		else
+			log "...${src#$GO_BUILD_DEPENDS_SRC}/$base"
+			ln -sf "$src/$base" "$dest/$base"
+		fi
+	done
+
+	return 0
+}
+
+configure() {
+	# shellcheck disable=SC2039
+	local files code testdata gomod pattern extra IFS file dest
+
+	cd "$BUILD_DIR" || return 1
+
+	files="$(find ./ -path "*/.*" -prune -o -not -type d -print)"
+
+	if [ "$GO_INSTALL_ALL" != 1 ]; then
+		code="$(printf '%s\n' "$files" | grep '\.\(c\|cc\|cpp\|go\|h\|hh\|hpp\|proto\|s\)$')"
+		testdata="$(printf '%s\n' "$files" | grep '/testdata/')"
+		gomod="$(printf '%s\n' "$files" | grep '/go\.\(mod\|sum\|work\)$')"
+
+		for pattern in $GO_INSTALL_EXTRA; do
+			extra="$(printf '%s\n' "$extra"; printf '%s\n' "$files" | grep -e "$pattern")"
+		done
+
+		files="$(printf '%s\n%s\n%s\n%s\n' "$code" "$testdata" "$gomod" "$extra" | grep -v '^[[:space:]]*$' | sort -u)"
+	fi
+
+	IFS="$nl"
+
+	log "Copying files from $BUILD_DIR into $GO_BUILD_DIR/src/$GO_PKG"
+	mkdir -p "$GO_BUILD_DIR/src"
+	for file in $files; do
+		log "${file#./}"
+		dest="$GO_BUILD_DIR/src/$GO_PKG/${file#./}"
+		mkdir -p "${dest%/*}"
+		cp -fpR "$file" "$dest"
+	done
+	log
+
+	if [ "$GO_SOURCE_ONLY" != 1 ]; then
+		if [ -d "$GO_BUILD_DEPENDS_SRC" ]; then
+			log "Symlinking directories from $GO_BUILD_DEPENDS_SRC into $GO_BUILD_DIR/src"
+			link_contents "$GO_BUILD_DEPENDS_SRC" "$GO_BUILD_DIR/src"
+		else
+			log "$GO_BUILD_DEPENDS_SRC does not exist, skipping symlinks"
+		fi
+	else
+		log "Not building binaries, skipping symlinks"
+	fi
+	log
+
+	return 0
+}
+
+build() {
+	# shellcheck disable=SC2039
+	local modargs pattern targets retval
+
+	cd "$GO_BUILD_DIR" || return 1
+
+	if [ -f "$BUILD_DIR/go.mod" ] ; then
+		mkdir -p "$GO_MOD_CACHE_DIR"
+		modargs="$GO_MOD_ARGS"
+	fi
+
+	log "Finding targets"
+	# shellcheck disable=SC2086
+	targets="$(go list $modargs $GO_BUILD_PKG)"
+	for pattern in $GO_EXCLUDES; do
+		targets="$(printf '%s\n' "$targets" | grep -v "$pattern")"
+	done
+	log
+
+	if [ "$GO_GO_GENERATE" = 1 ]; then
+		log "Calling go generate"
+		# shellcheck disable=SC2086
+		GOOS='' GOARCH='' GO386='' GOARM='' GOMIPS='' GOMIPS64='' \
+		go generate -v $targets
+		log
+	fi
+
+	if [ "$GO_SOURCE_ONLY" = 1 ]; then
+		return 0
+	fi
+
+	log "Building targets"
+	mkdir -p "$GO_BUILD_DIR/bin" "$GO_BUILD_CACHE_DIR"
+	# shellcheck disable=SC2086
+	go install $modargs "$@" $targets
+	retval="$?"
+	log
+
+	if [ "$retval" -eq 0 ] && [ -z "$(find "$GO_BUILD_BIN_DIR" -maxdepth 0 -type d -not -empty 2>/dev/null)" ]; then
+		log_error "No binaries were built"
+		retval=1
+	fi
+
+	if [ "$retval" -ne 0 ]; then
+		cache_cleanup
+	fi
+
+	return "$retval"
+}
+
+install_bin() {
+	# shellcheck disable=SC2039
+	local dest="$1"
+	install -d -m0755 "$dest/$GO_INSTALL_BIN_PATH"
+	install -m0755 "$GO_BUILD_BIN_DIR"/* "$dest/$GO_INSTALL_BIN_PATH/"
+}
+
+install_src() {
+	# shellcheck disable=SC2039
+	local dest="$1" dir="${GO_PKG%/*}"
+	install -d -m0755 "$dest/$GO_BUILD_DEPENDS_PATH/src/$dir"
+	cp -fpR "$GO_BUILD_DIR/src/$GO_PKG" "$dest/$GO_BUILD_DEPENDS_PATH/src/$dir/"
+}
+
+cache_cleanup() {
+	if ! [ -d "$GO_MOD_CACHE_DIR" ]; then
+		return 0
+	fi
+
+	# in case go is called without -modcacherw
+	find "$GO_MOD_CACHE_DIR" -type d -not -perm -u+w -exec chmod u+w '{}' +
+
+	if [ -n "$CONFIG_GOLANG_MOD_CACHE_WORLD_READABLE" ]; then
+		find "$GO_MOD_CACHE_DIR"      -type d -not -perm -go+rx -exec chmod go+rx '{}' +
+		find "$GO_MOD_CACHE_DIR" -not -type d -not -perm -go+r  -exec chmod go+r  '{}' +
+	fi
+
+	return 0
+}
+
+
+if [ "$#" -lt 1 ]; then
+	log_error "Missing command"
+	exit 1
+fi
+
+command="$1"
+shift 1
+
+case "$command" in
+	configure)
+		configure
+		;;
+	build)
+		build "$@"
+		;;
+	install_bin)
+		install_bin "$@"
+		;;
+	install_src)
+		install_src "$@"
+		;;
+	cache_cleanup)
+		cache_cleanup
+		;;
+	*)
+		log_error "Invalid command \"$command\""
+		exit 1
+		;;
+esac
diff --git a/golang/golang-compiler.mk b/golang/golang-compiler.mk
new file mode 100644
index 00000000..50cc4490
--- /dev/null
+++ b/golang/golang-compiler.mk
@@ -0,0 +1,192 @@
+#
+# Copyright (C) 2018, 2020-2021, 2023 Jeffery To
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifeq ($(origin GO_INCLUDE_DIR),undefined)
+  GO_INCLUDE_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
+endif
+
+include $(GO_INCLUDE_DIR)/golang-values.mk
+
+
+# $(1) valid GOOS_GOARCH combinations
+# $(2) go version id
+define GoCompiler/Default/CheckHost
+	$(if $(filter $(GO_HOST_OS_ARCH),$(1)),,$(error go-$(2) cannot be installed on $(GO_HOST_OS)/$(GO_HOST_ARCH)))
+endef
+
+# $(1) source go root
+# $(2) destination prefix
+# $(3) go version id
+# $(4) additional environment variables (optional)
+define GoCompiler/Default/Make
+	( \
+		cd "$(1)/src" ; \
+		$(if $(2),GOROOT_FINAL="$(2)/lib/go-$(3)") \
+		$(4) \
+		$(BASH) make.bash \
+		$(if $(findstring s,$(OPENWRT_VERBOSE)),-v) \
+		--no-banner \
+		; \
+	)
+endef
+
+# $(1) destination prefix
+# $(2) go version id
+define GoCompiler/Default/Install/make-dirs
+	$(INSTALL_DIR) "$(1)/lib/go-$(2)"
+	$(INSTALL_DIR) "$(1)/share/go-$(2)"
+endef
+
+# $(1) source go root
+# $(2) destination prefix
+# $(3) go version id
+# $(4) file/directory name
+define GoCompiler/Default/Install/install-share-data
+	$(CP) "$(1)/$(4)" "$(2)/share/go-$(3)/"
+	$(LN) "../../share/go-$(3)/$(4)" "$(2)/lib/go-$(3)/"
+endef
+
+# $(1) source go root
+# $(2) destination prefix
+# $(3) go version id
+# $(4) GOOS_GOARCH
+# $(5) install suffix (optional)
+define GoCompiler/Default/Install/Bin
+	$(call GoCompiler/Default/Install/make-dirs,$(2),$(3))
+
+	$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),api)
+
+	$(INSTALL_DATA) -p "$(1)/go.env" "$(2)/lib/go-$(3)/"
+	$(INSTALL_DATA) -p "$(1)/VERSION" "$(2)/lib/go-$(3)/"
+
+	for file in CONTRIBUTING.md LICENSE PATENTS README.md SECURITY.md; do \
+		if [ -f "$(1)/$$$$file" ]; then \
+			$(INSTALL_DATA) -p "$(1)/$$$$file" "$(2)/share/go-$(3)/" ; \
+		fi ; \
+	done
+
+	$(INSTALL_DIR) "$(2)/lib/go-$(3)/bin"
+
+  ifeq ($(4),$(GO_HOST_OS_ARCH))
+	$(INSTALL_BIN) -p "$(1)/bin"/* "$(2)/lib/go-$(3)/bin/"
+  else
+	$(INSTALL_BIN) -p "$(1)/bin/$(4)"/* "$(2)/lib/go-$(3)/bin/"
+  endif
+
+	if [ -d "$(1)/pkg/$(4)$(if $(5),_$(5))" ]; then \
+		$(INSTALL_DIR) "$(2)/lib/go-$(3)/pkg" ; \
+		$(CP) "$(1)/pkg/$(4)$(if $(5),_$(5))" "$(2)/lib/go-$(3)/pkg/" ; \
+	fi
+
+	$(INSTALL_DIR) "$(2)/lib/go-$(3)/pkg/tool/$(4)"
+	$(INSTALL_BIN) -p "$(1)/pkg/tool/$(4)"/* "$(2)/lib/go-$(3)/pkg/tool/$(4)/"
+endef
+
+# $(1) destination prefix
+# $(2) go version id
+define GoCompiler/Default/Install/BinLinks
+	$(INSTALL_DIR) "$(1)/bin"
+	$(LN) "../lib/go-$(2)/bin/go" "$(1)/bin/go"
+	$(LN) "../lib/go-$(2)/bin/gofmt" "$(1)/bin/gofmt"
+endef
+
+# $(1) source go root
+# $(2) destination prefix
+# $(3) go version id
+define GoCompiler/Default/Install/Doc
+	$(call GoCompiler/Default/Install/make-dirs,$(2),$(3))
+
+	$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),doc)
+endef
+
+# $(1) source go root
+# $(2) destination prefix
+# $(3) go version id
+define GoCompiler/Default/Install/Src
+	$(call GoCompiler/Default/Install/make-dirs,$(2),$(3))
+
+	$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),lib)
+	$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),misc)
+	$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),src)
+	$(call GoCompiler/Default/Install/install-share-data,$(1),$(2),$(3),test)
+
+	$(FIND) \
+		"$(2)/share/go-$(3)/src/" \
+		\! -type d -a \( -name "*.bat" -o -name "*.rc" \) \
+		-delete
+
+	if [ -d "$(1)/pkg/include" ]; then \
+		$(INSTALL_DIR) "$(2)/lib/go-$(3)/pkg" ; \
+		$(INSTALL_DIR) "$(2)/share/go-$(3)/pkg" ; \
+		$(CP) "$(1)/pkg/include" "$(2)/share/go-$(3)/pkg/" ; \
+		$(LN) "../../../share/go-$(3)/pkg/include" "$(2)/lib/go-$(3)/pkg/" ; \
+	fi
+endef
+
+# $(1) destination prefix
+# $(2) go version id
+define GoCompiler/Default/Uninstall
+	rm -rf "$(1)/lib/go-$(2)"
+	rm -rf "$(1)/share/go-$(2)"
+endef
+
+# $(1) destination prefix
+define GoCompiler/Default/Uninstall/BinLinks
+	rm -f "$(1)/bin/go"
+	rm -f "$(1)/bin/gofmt"
+endef
+
+
+# $(1) profile name
+# $(2) source go root
+# $(3) destination prefix
+# $(4) go version id
+# $(5) GOOS_GOARCH
+# $(6) install suffix (optional)
+define GoCompiler/AddProfile
+
+  # $$(1) valid GOOS_GOARCH combinations
+  define GoCompiler/$(1)/CheckHost
+	$$(call GoCompiler/Default/CheckHost,$$(1),$(4))
+  endef
+
+  # $$(1) additional environment variables (optional)
+  define GoCompiler/$(1)/Make
+	$$(call GoCompiler/Default/Make,$(2),$(3),$(4),$$(1))
+  endef
+
+  # $$(1) override install prefix (optional)
+  define GoCompiler/$(1)/Install/Bin
+	$$(call GoCompiler/Default/Install/Bin,$(2),$$(or $$(1),$(3)),$(4),$(5),$(6))
+  endef
+
+  # $$(1) override install prefix (optional)
+  define GoCompiler/$(1)/Install/BinLinks
+	$$(call GoCompiler/Default/Install/BinLinks,$$(or $$(1),$(3)),$(4))
+  endef
+
+  # $$(1) override install prefix (optional)
+  define GoCompiler/$(1)/Install/Doc
+	$$(call GoCompiler/Default/Install/Doc,$(2),$$(or $$(1),$(3)),$(4))
+  endef
+
+  # $$(1) override install prefix (optional)
+  define GoCompiler/$(1)/Install/Src
+	$$(call GoCompiler/Default/Install/Src,$(2),$$(or $$(1),$(3)),$(4))
+  endef
+
+  # $$(1) override install prefix (optional)
+  define GoCompiler/$(1)/Uninstall
+	$$(call GoCompiler/Default/Uninstall,$$(or $$(1),$(3)),$(4))
+  endef
+
+  # $$(1) override install prefix (optional)
+  define GoCompiler/$(1)/Uninstall/BinLinks
+	$$(call GoCompiler/Default/Uninstall/BinLinks,$$(or $$(1),$(3)))
+  endef
+
+endef
diff --git a/golang/golang-host-build.mk b/golang/golang-host-build.mk
new file mode 100644
index 00000000..7c7551fd
--- /dev/null
+++ b/golang/golang-host-build.mk
@@ -0,0 +1,220 @@
+#
+# Copyright (C) 2020, 2022 Jeffery To
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifeq ($(origin GO_INCLUDE_DIR),undefined)
+  GO_INCLUDE_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
+endif
+
+include $(GO_INCLUDE_DIR)/golang-values.mk
+
+
+# these variables have the same meanings as in golang-package.mk
+GO_HOST_INSTALL_EXTRA?=$(GO_PKG_INSTALL_EXTRA)
+GO_HOST_INSTALL_ALL?=$(GO_PKG_INSTALL_ALL)
+GO_HOST_SOURCE_ONLY?=$(GO_PKG_SOURCE_ONLY)
+GO_HOST_BUILD_PKG?=$(GO_PKG_BUILD_PKG)
+GO_HOST_EXCLUDES?=$(GO_PKG_EXCLUDES)
+GO_HOST_GO_GENERATE?=$(GO_PKG_GO_GENERATE)
+GO_HOST_GCFLAGS?=$(GO_PKG_GCFLAGS)
+GO_HOST_LDFLAGS?=$(GO_PKG_LDFLAGS)
+GO_HOST_LDFLAGS_X?=$(GO_PKG_LDFLAGS_X)
+GO_HOST_TAGS?=$(GO_PKG_TAGS)
+GO_HOST_INSTALL_BIN_PATH?=/bin
+
+
+# need to repeat this here in case golang-package.mk is not included
+GO_PKG_BUILD_PKG?=$(strip $(GO_PKG))/...
+
+GO_HOST_WORK_DIR_NAME:=.go_work
+GO_HOST_BUILD_DIR=$(HOST_BUILD_DIR)/$(GO_HOST_WORK_DIR_NAME)/build
+GO_HOST_BUILD_BIN_DIR=$(GO_HOST_BUILD_DIR)/bin
+
+GO_HOST_BUILD_DEPENDS_PATH:=/share/gocode
+GO_HOST_BUILD_DEPENDS_SRC=$(STAGING_DIR_HOSTPKG)$(GO_HOST_BUILD_DEPENDS_PATH)/src
+
+GO_HOST_DIR_NAME:=$(lastword $(subst /,$(space),$(CURDIR)))
+GO_HOST_STAGING_DIR:=$(TMP_DIR)/host-stage-$(GO_HOST_DIR_NAME)
+GO_HOST_STAGING_FILES_LIST_DIR:=$(HOST_BUILD_PREFIX)/stamp
+GO_HOST_BIN_STAGING_FILES_LIST:=$(GO_HOST_STAGING_FILES_LIST_DIR)/$(GO_HOST_DIR_NAME)-bin.list
+GO_HOST_SRC_STAGING_FILES_LIST:=$(GO_HOST_STAGING_FILES_LIST_DIR)/$(GO_HOST_DIR_NAME)-src.list
+
+ifeq ($(GO_HOST_PIE_SUPPORTED),1)
+  GO_HOST_ENABLE_PIE:=1
+endif
+
+GO_HOST_BUILD_CONFIG_VARS= \
+	GO_PKG="$(strip $(GO_PKG))" \
+	GO_INSTALL_EXTRA="$(strip $(GO_HOST_INSTALL_EXTRA))" \
+	GO_INSTALL_ALL="$(strip $(GO_HOST_INSTALL_ALL))" \
+	GO_SOURCE_ONLY="$(strip $(GO_HOST_SOURCE_ONLY))" \
+	GO_BUILD_PKG="$(strip $(GO_HOST_BUILD_PKG))" \
+	GO_EXCLUDES="$(strip $(GO_HOST_EXCLUDES))" \
+	GO_GO_GENERATE="$(strip $(GO_HOST_GO_GENERATE))" \
+	GO_INSTALL_BIN_PATH="$(strip $(GO_HOST_INSTALL_BIN_PATH))" \
+	BUILD_DIR="$(HOST_BUILD_DIR)" \
+	GO_BUILD_DIR="$(GO_HOST_BUILD_DIR)" \
+	GO_BUILD_BIN_DIR="$(GO_HOST_BUILD_BIN_DIR)" \
+	GO_BUILD_DEPENDS_PATH="$(GO_HOST_BUILD_DEPENDS_PATH)" \
+	GO_BUILD_DEPENDS_SRC="$(GO_HOST_BUILD_DEPENDS_SRC)"
+
+GO_HOST_MORE_CFLAGS?= \
+	-Wformat -Werror=format-security \
+	-fstack-protector-strong \
+	-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 \
+	-Wl,-z,now -Wl,-z,relro \
+	$(if $(GO_HOST_ENABLE_PIE),$(FPIC))
+
+GO_HOST_MORE_LDFLAGS?= \
+	-znow -zrelro \
+	$(if $(GO_HOST_ENABLE_PIE),$(FPIC) -specs=$(INCLUDE_DIR)/hardened-ld-pie.specs)
+
+GO_HOST_TARGET_VARS= \
+	CGO_ENABLED=1 \
+	CC=gcc \
+	CXX=g++ \
+	PKG_CONFIG=pkg-config \
+	CGO_CFLAGS="$(HOST_CFLAGS) $(GO_HOST_MORE_CFLAGS)" \
+	CGO_CPPFLAGS="$(HOST_CPPFLAGS) $(GO_HOST_MORE_CPPFLAGS)" \
+	CGO_CXXFLAGS="$(HOST_CFLAGS) $(GO_HOST_MORE_CFLAGS)" \
+	CGO_LDFLAGS="$(HOST_LDFLAGS) $(GO_HOST_MORE_LDFLAGS)" \
+	GO_GCC_HELPER_CC="$(HOSTCC)" \
+	GO_GCC_HELPER_CXX="$(HOSTCXX)" \
+	GO_GCC_HELPER_PATH="$$$$PATH" \
+	PATH="$(STAGING_DIR_HOSTPKG)/lib/go-cross/openwrt:$$$$PATH"
+
+GO_HOST_BUILD_VARS= \
+	GOPATH="$(GO_HOST_BUILD_DIR)" \
+	GOCACHE="$(GO_BUILD_CACHE_DIR)" \
+	GOMODCACHE="$(GO_MOD_CACHE_DIR)" \
+	GOENV=off
+
+GO_HOST_VARS= \
+	$(GO_HOST_TARGET_VARS) \
+	$(GO_HOST_BUILD_VARS)
+
+GO_HOST_DEFAULT_LDFLAGS= \
+	-linkmode external \
+	-extldflags '$(patsubst -z%,-Wl$(comma)-z$(comma)%,$(HOST_LDFLAGS) $(GO_HOST_MORE_LDFLAGS))'
+
+GO_HOST_CUSTOM_LDFLAGS= \
+	$(GO_HOST_LDFLAGS) \
+	$(patsubst %,-X %,$(GO_HOST_LDFLAGS_X))
+
+GO_HOST_INSTALL_ARGS= \
+	-v \
+	-ldflags "all=$(GO_HOST_DEFAULT_LDFLAGS)" \
+	$(if $(GO_HOST_ENABLE_PIE),-buildmode pie) \
+	$(if $(strip $(GO_HOST_GCFLAGS)),-gcflags "$(GO_HOST_GCFLAGS)") \
+	$(if $(strip $(GO_HOST_CUSTOM_LDFLAGS)),-ldflags "$(GO_HOST_CUSTOM_LDFLAGS) $(GO_HOST_DEFAULT_LDFLAGS)") \
+	$(if $(strip $(GO_HOST_TAGS)),-tags "$(GO_HOST_TAGS)")
+
+define GoHost/Host/Configure
+	$(GO_GENERAL_BUILD_CONFIG_VARS) \
+	$(GO_HOST_BUILD_CONFIG_VARS) \
+	$(SHELL) $(GO_INCLUDE_DIR)/golang-build.sh configure
+endef
+
+# $(1) additional arguments for go command line (optional)
+define GoHost/Host/Compile
+	$(GO_GENERAL_BUILD_CONFIG_VARS) \
+	$(GO_HOST_BUILD_CONFIG_VARS) \
+	$(GO_HOST_VARS) \
+	$(SHELL) $(GO_INCLUDE_DIR)/golang-build.sh build $(GO_HOST_INSTALL_ARGS) $(1)
+endef
+
+define GoHost/Host/Install/Bin
+	rm -rf "$(GO_HOST_STAGING_DIR)"
+	mkdir -p "$(GO_HOST_STAGING_DIR)" "$(GO_HOST_STAGING_FILES_LIST_DIR)"
+
+	$(GO_GENERAL_BUILD_CONFIG_VARS) \
+	$(GO_HOST_BUILD_CONFIG_VARS) \
+	$(SHELL) $(GO_INCLUDE_DIR)/golang-build.sh install_bin "$(GO_HOST_STAGING_DIR)"
+
+	if [ -f "$(GO_HOST_BIN_STAGING_FILES_LIST)" ]; then \
+		"$(SCRIPT_DIR)/clean-package.sh" \
+			"$(GO_HOST_BIN_STAGING_FILES_LIST)" \
+			"$(1)" ; \
+	fi
+
+	cd "$(GO_HOST_STAGING_DIR)" && find ./ > "$(GO_HOST_STAGING_DIR).files"
+
+	$(call locked, \
+		mv "$(GO_HOST_STAGING_DIR).files" "$(GO_HOST_BIN_STAGING_FILES_LIST)" && \
+		$(CP) "$(GO_HOST_STAGING_DIR)"/* "$(1)/", \
+		host-staging-dir \
+	)
+
+	rm -rf "$(GO_HOST_STAGING_DIR)"
+endef
+
+define GoHost/Host/Install/Src
+	rm -rf "$(GO_HOST_STAGING_DIR)"
+	mkdir -p "$(GO_HOST_STAGING_DIR)" "$(GO_HOST_STAGING_FILES_LIST_DIR)"
+
+	$(GO_GENERAL_BUILD_CONFIG_VARS) \
+	$(GO_HOST_BUILD_CONFIG_VARS) \
+	$(SHELL) $(GO_INCLUDE_DIR)/golang-build.sh install_src "$(GO_HOST_STAGING_DIR)"
+
+	if [ -f "$(GO_HOST_SRC_STAGING_FILES_LIST)" ]; then \
+		"$(SCRIPT_DIR)/clean-package.sh" \
+			"$(GO_HOST_SRC_STAGING_FILES_LIST)" \
+			"$(1)" ; \
+	fi
+
+	cd "$(GO_HOST_STAGING_DIR)" && find ./ > "$(GO_HOST_STAGING_DIR).files"
+
+	$(call locked, \
+		mv "$(GO_HOST_STAGING_DIR).files" "$(GO_HOST_SRC_STAGING_FILES_LIST)" && \
+		$(CP) "$(GO_HOST_STAGING_DIR)"/* "$(1)/", \
+		host-staging-dir \
+	)
+
+	rm -rf "$(GO_HOST_STAGING_DIR)"
+endef
+
+define GoHost/Host/Install
+	$(if $(filter $(GO_HOST_SOURCE_ONLY),1),, \
+		$(call GoHost/Host/Install/Bin,$(1)) \
+	)
+	$(call GoHost/Host/Install/Src,$(1))
+endef
+
+define GoHost/Host/Uninstall
+	if [ -f "$(GO_HOST_BIN_STAGING_FILES_LIST)" ]; then \
+		"$(SCRIPT_DIR)/clean-package.sh" \
+			"$(GO_HOST_BIN_STAGING_FILES_LIST)" \
+			"$(HOST_BUILD_PREFIX)" ; \
+		rm -f "$(GO_HOST_BIN_STAGING_FILES_LIST)" ; \
+	fi
+
+	if [ -f "$(GO_HOST_SRC_STAGING_FILES_LIST)" ]; then \
+		"$(SCRIPT_DIR)/clean-package.sh" \
+			"$(GO_HOST_SRC_STAGING_FILES_LIST)" \
+			"$(HOST_BUILD_PREFIX)" ; \
+		rm -f "$(GO_HOST_SRC_STAGING_FILES_LIST)" ; \
+	fi
+endef
+
+
+ifneq ($(strip $(GO_PKG)),)
+  Host/Configure=$(call GoHost/Host/Configure)
+  Host/Compile=$(call GoHost/Host/Compile)
+  Hooks/HostCompile/Post+=Go/CacheCleanup
+  Host/Uninstall=$(call GoHost/Host/Uninstall,$(1))
+endif
+
+define GoHostBuild
+  Host/Install=$$(call GoHost/Host/Install,$$(1))
+endef
+
+define GoBinHostBuild
+  Host/Install=$$(call GoHost/Host/Install/Bin,$$(1))
+endef
+
+define GoSrcHostBuild
+  Host/Install=$$(call GoHost/Host/Install/Src,$$(1))
+endef
diff --git a/golang/golang-package.mk b/golang/golang-package.mk
new file mode 100644
index 00000000..cc005053
--- /dev/null
+++ b/golang/golang-package.mk
@@ -0,0 +1,320 @@
+#
+# Copyright (C) 2018-2022 Jeffery To
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifeq ($(origin GO_INCLUDE_DIR),undefined)
+  GO_INCLUDE_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
+endif
+
+include $(GO_INCLUDE_DIR)/golang-values.mk
+
+
+# Variables (all optional, except GO_PKG) to be set in package
+# Makefiles:
+#
+# GO_PKG (required) - name of Go package
+#
+#   Go name of the package.
+#
+#   e.g. GO_PKG:=golang.org/x/text
+#
+#
+# GO_PKG_INSTALL_EXTRA - list of regular expressions, default empty
+#
+#   Additional files/directories to install. By default, only these
+#   files are installed:
+#
+#   * Files with one of these extensions:
+#     .go, .c, .cc, .cpp, .h, .hh, .hpp, .proto, .s
+#
+#   * Files in any 'testdata' directory
+#
+#   * go.mod, go.sum and go.work, in any directory
+#
+#   e.g. GO_PKG_INSTALL_EXTRA:=example.toml marshal_test.toml
+#
+#
+# GO_PKG_INSTALL_ALL - boolean (0 or 1), default false
+#
+#   If true, install all files regardless of extension or directory.
+#
+#   e.g. GO_PKG_INSTALL_ALL:=1
+#
+#
+# GO_PKG_SOURCE_ONLY - boolean (0 or 1), default false
+#
+#   If true, 'go install' will not be called. If the package does not
+#   (or should not) build any binaries, then specifying this option will
+#   save build time.
+#
+#   e.g. GO_PKG_SOURCE_ONLY:=1
+#
+#
+# GO_PKG_BUILD_PKG - list of build targets, default GO_PKG/...
+#
+#   Build targets for compiling this Go package, i.e. arguments passed
+#   to 'go install'.
+#
+#   e.g. GO_PKG_BUILD_PKG:=github.com/debian/ratt/cmd/...
+#
+#
+# GO_PKG_EXCLUDES - list of regular expressions, default empty
+#
+#   Patterns to exclude from the build targets expanded from
+#   GO_PKG_BUILD_PKG.
+#
+#   e.g. GO_PKG_EXCLUDES:=examples/
+#
+#
+# GO_PKG_GO_GENERATE - boolean (0 or 1), default false
+#
+#   If true, 'go generate' will be called on all build targets (as
+#   determined by GO_PKG_BUILD_PKG and GO_PKG_EXCLUDES). This is usually
+#   not necessary.
+#
+#   e.g. GO_PKG_GO_GENERATE:=1
+#
+#
+# GO_PKG_GCFLAGS - list of options, default empty
+#
+#   Additional go tool compile options to use when building targets.
+#
+#   e.g. GO_PKG_GCFLAGS:=-N -l
+#
+#
+# GO_PKG_LDFLAGS - list of options, default empty
+#
+#   Additional go tool link options to use when building targets.
+#
+#   Note that the OpenWrt build system has an option to strip binaries
+#   (enabled by default), so -s (Omit the symbol table and debug
+#   information) and -w (Omit the DWARF symbol table) flags are not
+#   necessary.
+#
+#   e.g. GO_PKG_LDFLAGS:=-r dir1:dir2 -u
+#
+#
+# GO_PKG_LDFLAGS_X - list of string variable definitions, default empty
+#
+#   Each definition will be passed as the parameter to the -X go tool
+#   link option, i.e. -ldflags "-X importpath.name=value".
+#
+#   e.g. GO_PKG_LDFLAGS_X:=main.Version=$(PKG_VERSION) main.BuildStamp=$(SOURCE_DATE_EPOCH)
+#
+#
+# GO_PKG_TAGS - list of build tags, default empty
+#
+#   Build tags to consider satisfied during the build, passed as the
+#   parameter to the -tags option for 'go install'.
+#
+#   e.g. GO_PKG_TAGS:=release,noupgrade
+#
+#
+# GO_PKG_INSTALL_BIN_PATH - target directory path, default /usr/bin
+#
+#   Directory path under "dest_dir" where binaries will be installed by
+#   '$(call GoPackage/Package/Install/Bin,dest_dir)'.
+#
+#   e.g. GO_PKG_INSTALL_BIN_PATH:=/sbin
+
+# Credit for this package build process (GoPackage/Build/Configure and
+# GoPackage/Build/Compile) belong to Debian's dh-golang completely.
+# https://salsa.debian.org/go-team/packages/dh-golang
+
+
+GO_PKG_BUILD_PKG?=$(strip $(GO_PKG))/...
+GO_PKG_INSTALL_BIN_PATH?=/usr/bin
+
+GO_PKG_WORK_DIR_NAME:=.go_work
+GO_PKG_BUILD_DIR=$(PKG_BUILD_DIR)/$(GO_PKG_WORK_DIR_NAME)/build
+GO_PKG_BUILD_BIN_DIR=$(GO_PKG_BUILD_DIR)/bin$(if $(GO_HOST_TARGET_DIFFERENT),/$(GO_OS_ARCH))
+
+GO_PKG_BUILD_DEPENDS_PATH:=/usr/share/gocode
+GO_PKG_BUILD_DEPENDS_SRC=$(STAGING_DIR)$(GO_PKG_BUILD_DEPENDS_PATH)/src
+
+ifdef CONFIG_PKG_ASLR_PIE_ALL
+  ifeq ($(strip $(PKG_ASLR_PIE)),1)
+    ifeq ($(GO_TARGET_PIE_SUPPORTED),1)
+      GO_PKG_ENABLE_PIE:=1
+    else
+      $(warning PIE buildmode is not supported for $(GO_OS)/$(GO_ARCH))
+    endif
+  endif
+endif
+
+ifdef CONFIG_PKG_ASLR_PIE_REGULAR
+  ifeq ($(strip $(PKG_ASLR_PIE_REGULAR)),1)
+    ifeq ($(GO_TARGET_PIE_SUPPORTED),1)
+      GO_PKG_ENABLE_PIE:=1
+    else
+      $(warning PIE buildmode is not supported for $(GO_OS)/$(GO_ARCH))
+    endif
+  endif
+endif
+
+ifdef CONFIG_GOLANG_SPECTRE
+  ifeq ($(GO_TARGET_SPECTRE_SUPPORTED),1)
+    GO_PKG_ENABLE_SPECTRE:=1
+  else
+    $(warning Spectre mitigations are not supported for $(GO_ARCH))
+  endif
+endif
+
+# sstrip causes corrupted section header size
+ifneq ($(CONFIG_USE_SSTRIP),)
+  ifneq ($(CONFIG_DEBUG),)
+    GO_PKG_STRIP_ARGS:=--strip-unneeded --remove-section=.comment --remove-section=.note
+  else
+    GO_PKG_STRIP_ARGS:=--strip-all
+  endif
+  STRIP:=$(TARGET_CROSS)strip $(GO_PKG_STRIP_ARGS)
+endif
+
+define GoPackage/GoSubMenu
+  SUBMENU:=Go
+  SECTION:=lang
+  CATEGORY:=Languages
+endef
+
+GO_PKG_BUILD_CONFIG_VARS= \
+	GO_PKG="$(strip $(GO_PKG))" \
+	GO_INSTALL_EXTRA="$(strip $(GO_PKG_INSTALL_EXTRA))" \
+	GO_INSTALL_ALL="$(strip $(GO_PKG_INSTALL_ALL))" \
+	GO_SOURCE_ONLY="$(strip $(GO_PKG_SOURCE_ONLY))" \
+	GO_BUILD_PKG="$(strip $(GO_PKG_BUILD_PKG))" \
+	GO_EXCLUDES="$(strip $(GO_PKG_EXCLUDES))" \
+	GO_GO_GENERATE="$(strip $(GO_PKG_GO_GENERATE))" \
+	GO_INSTALL_BIN_PATH="$(strip $(GO_PKG_INSTALL_BIN_PATH))" \
+	BUILD_DIR="$(PKG_BUILD_DIR)" \
+	GO_BUILD_DIR="$(GO_PKG_BUILD_DIR)" \
+	GO_BUILD_BIN_DIR="$(GO_PKG_BUILD_BIN_DIR)" \
+	GO_BUILD_DEPENDS_PATH="$(GO_PKG_BUILD_DEPENDS_PATH)" \
+	GO_BUILD_DEPENDS_SRC="$(GO_PKG_BUILD_DEPENDS_SRC)"
+
+GO_PKG_TARGET_VARS= \
+	GOOS="$(GO_OS)" \
+	GOARCH="$(GO_ARCH)" \
+	GO386="$(GO_386)" \
+	GOAMD64="$(GO_AMD64)" \
+	GOARM="$(GO_ARM)" \
+	GOMIPS="$(GO_MIPS)" \
+	GOMIPS64="$(GO_MIPS64)" \
+	GOPPC64="$(GO_PPC64)" \
+	CGO_ENABLED=1 \
+	CC="$(TARGET_CC)" \
+	CXX="$(TARGET_CXX)" \
+	CGO_CFLAGS="$(filter-out $(GO_CFLAGS_TO_REMOVE),$(TARGET_CFLAGS))" \
+	CGO_CPPFLAGS="$(TARGET_CPPFLAGS)" \
+	CGO_CXXFLAGS="$(filter-out $(GO_CFLAGS_TO_REMOVE),$(TARGET_CXXFLAGS))" \
+	CGO_LDFLAGS="$(TARGET_LDFLAGS)"
+
+GO_PKG_BUILD_VARS= \
+	GOPATH="$(GO_PKG_BUILD_DIR)" \
+	GOCACHE="$(GO_BUILD_CACHE_DIR)" \
+	GOMODCACHE="$(GO_MOD_CACHE_DIR)" \
+	GOENV=off \
+	GOTOOLCHAIN=local
+
+GO_PKG_VARS= \
+	$(GO_PKG_TARGET_VARS) \
+	$(GO_PKG_BUILD_VARS)
+
+GO_PKG_DEFAULT_GCFLAGS= \
+	$(if $(GO_PKG_ENABLE_SPECTRE),-spectre all)
+
+GO_PKG_DEFAULT_ASMFLAGS= \
+	$(if $(GO_PKG_ENABLE_SPECTRE),-spectre all)
+
+GO_PKG_DEFAULT_LDFLAGS= \
+	-buildid '$(SOURCE_DATE_EPOCH)' \
+	-linkmode external \
+	-extldflags '$(patsubst -z%,-Wl$(comma)-z$(comma)%,$(TARGET_LDFLAGS))'
+
+GO_PKG_CUSTOM_LDFLAGS= \
+	$(GO_PKG_LDFLAGS) \
+	$(patsubst %,-X %,$(GO_PKG_LDFLAGS_X))
+
+GO_PKG_INSTALL_ARGS= \
+	-v \
+	-buildvcs=false \
+	-trimpath \
+	-ldflags "all=$(GO_PKG_DEFAULT_LDFLAGS)" \
+	$(if $(strip $(GO_PKG_DEFAULT_GCFLAGS)),-gcflags "all=$(GO_PKG_DEFAULT_GCFLAGS)") \
+	$(if $(strip $(GO_PKG_DEFAULT_ASMFLAGS)),-asmflags "all=$(GO_PKG_DEFAULT_ASMFLAGS)") \
+	$(if $(GO_PKG_ENABLE_PIE),-buildmode pie) \
+	$(if $(filter $(GO_ARCH),arm),-installsuffix "v$(GO_ARM)") \
+	$(if $(filter $(GO_ARCH),mips mipsle),-installsuffix "$(GO_MIPS)") \
+	$(if $(filter $(GO_ARCH),mips64 mips64le),-installsuffix "$(GO_MIPS64)") \
+	$(if $(strip $(GO_PKG_GCFLAGS)),-gcflags "$(GO_PKG_GCFLAGS) $(GO_PKG_DEFAULT_GCFLAGS)") \
+	$(if $(strip $(GO_PKG_CUSTOM_LDFLAGS)),-ldflags "$(GO_PKG_CUSTOM_LDFLAGS) $(GO_PKG_DEFAULT_LDFLAGS)") \
+	$(if $(strip $(GO_PKG_TAGS)),-tags "$(GO_PKG_TAGS)")
+
+define GoPackage/Build/Configure
+	$(GO_GENERAL_BUILD_CONFIG_VARS) \
+	$(GO_PKG_BUILD_CONFIG_VARS) \
+	$(SHELL) $(GO_INCLUDE_DIR)/golang-build.sh configure
+endef
+
+# $(1) additional arguments for go command line (optional)
+define GoPackage/Build/Compile
+	$(GO_GENERAL_BUILD_CONFIG_VARS) \
+	$(GO_PKG_BUILD_CONFIG_VARS) \
+	$(GO_PKG_VARS) \
+	$(SHELL) $(GO_INCLUDE_DIR)/golang-build.sh build $(GO_PKG_INSTALL_ARGS) $(1)
+endef
+
+define GoPackage/Build/InstallDev
+	$(call GoPackage/Package/Install/Src,$(1))
+endef
+
+define GoPackage/Package/Install/Bin
+	$(GO_GENERAL_BUILD_CONFIG_VARS) \
+	$(GO_PKG_BUILD_CONFIG_VARS) \
+	$(SHELL) $(GO_INCLUDE_DIR)/golang-build.sh install_bin "$(1)"
+endef
+
+define GoPackage/Package/Install/Src
+	$(GO_GENERAL_BUILD_CONFIG_VARS) \
+	$(GO_PKG_BUILD_CONFIG_VARS) \
+	$(SHELL) $(GO_INCLUDE_DIR)/golang-build.sh install_src "$(1)"
+endef
+
+define GoPackage/Package/Install
+	$(if $(filter $(GO_PKG_SOURCE_ONLY),1),, \
+		$(call GoPackage/Package/Install/Bin,$(1)) \
+	)
+	$(call GoPackage/Package/Install/Src,$(1))
+endef
+
+
+ifneq ($(strip $(GO_PKG)),)
+  ifeq ($(GO_TARGET_SPECTRE_SUPPORTED),1)
+    PKG_CONFIG_DEPENDS+=CONFIG_GOLANG_SPECTRE
+  endif
+
+  Build/Configure=$(call GoPackage/Build/Configure)
+  Build/Compile=$(call GoPackage/Build/Compile)
+  Hooks/Compile/Post+=Go/CacheCleanup
+  Build/InstallDev=$(call GoPackage/Build/InstallDev,$(1))
+endif
+
+define GoPackage
+  ifndef Package/$(1)/install
+    Package/$(1)/install=$$(call GoPackage/Package/Install,$$(1))
+  endif
+endef
+
+define GoBinPackage
+  ifndef Package/$(1)/install
+    Package/$(1)/install=$$(call GoPackage/Package/Install/Bin,$$(1))
+  endif
+endef
+
+define GoSrcPackage
+  ifndef Package/$(1)/install
+    Package/$(1)/install=$$(call GoPackage/Package/Install/Src,$$(1))
+  endif
+endef
diff --git a/golang/golang-values.mk b/golang/golang-values.mk
new file mode 100644
index 00000000..1584d22f
--- /dev/null
+++ b/golang/golang-values.mk
@@ -0,0 +1,269 @@
+#
+# Copyright (C) 2018-2023 Jeffery To
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+ifeq ($(origin GO_INCLUDE_DIR),undefined)
+  GO_INCLUDE_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
+endif
+
+
+# Unset environment variables
+# There are more magic variables to track down, but ain't nobody got time for that
+
+# From https://pkg.go.dev/cmd/go#hdr-Environment_variables
+
+# General-purpose environment variables:
+unexport \
+  GO111MODULE \
+  GCCGO \
+  GOARCH \
+  GOBIN \
+  GOCACHE \
+  GOMODCACHE \
+  GODEBUG \
+  GOENV \
+  GOFLAGS \
+  GOOS \
+  GOPATH \
+  GOROOT \
+  GOTOOLCHAIN \
+  GOTMPDIR \
+  GOWORK
+# Unmodified:
+#   GOINSECURE
+#   GOPRIVATE
+#   GOPROXY
+#   GONOPROXY
+#   GOSUMDB
+#   GONOSUMDB
+#   GOVCS
+
+# Environment variables for use with cgo:
+unexport \
+  AR \
+  CC \
+  CGO_ENABLED \
+  CGO_CFLAGS   CGO_CFLAGS_ALLOW   CGO_CFLAGS_DISALLOW \
+  CGO_CPPFLAGS CGO_CPPFLAGS_ALLOW CGO_CPPFLAGS_DISALLOW \
+  CGO_CXXFLAGS CGO_CXXFLAGS_ALLOW CGO_CXXFLAGS_DISALLOW \
+  CGO_FFLAGS   CGO_FFLAGS_ALLOW   CGO_FFLAGS_DISALLOW \
+  CGO_LDFLAGS  CGO_LDFLAGS_ALLOW  CGO_LDFLAGS_DISALLOW \
+  CXX \
+  FC
+# Unmodified:
+#   PKG_CONFIG
+
+# Architecture-specific environment variables:
+unexport \
+  GOARM \
+  GO386 \
+  GOAMD64 \
+  GOMIPS \
+  GOMIPS64 \
+  GOPPC64 \
+  GOWASM
+
+# Environment variables for use with code coverage:
+unexport \
+  GOCOVERDIR
+
+# Special-purpose environment variables:
+unexport \
+  GCCGOTOOLDIR \
+  GOEXPERIMENT \
+  GOROOT_FINAL \
+  GO_EXTLINK_ENABLED
+# Unmodified:
+#   GIT_ALLOW_PROTOCOL
+
+# From https://pkg.go.dev/runtime#hdr-Environment_Variables
+unexport \
+  GOGC \
+  GOMEMLIMIT \
+  GOMAXPROCS \
+  GORACE \
+  GOTRACEBACK
+
+# From https://pkg.go.dev/cmd/cgo#hdr-Using_cgo_with_the_go_command
+unexport \
+  CC_FOR_TARGET \
+  CXX_FOR_TARGET
+# Todo:
+#   CC_FOR_${GOOS}_${GOARCH}
+#   CXX_FOR_${GOOS}_${GOARCH}
+
+# From https://go.dev/doc/install/source#environment
+unexport \
+  GOHOSTOS \
+  GOHOSTARCH
+
+# From https://go.dev/src/make.bash
+unexport \
+  GO_GCFLAGS \
+  GO_LDFLAGS \
+  GO_LDSO \
+  GO_DISTFLAGS \
+  GOBUILDTIMELOGFILE \
+  GOROOT_BOOTSTRAP
+
+# From https://go.dev/doc/go1.9#parallel-compile
+unexport \
+  GO19CONCURRENTCOMPILATION
+
+# From https://go.dev/src/cmd/dist/build.go
+unexport \
+  BOOT_GO_GCFLAGS \
+  BOOT_GO_LDFLAGS
+
+# From https://go.dev/src/cmd/dist/buildtool.go
+unexport \
+  GOBOOTSTRAP_TOOLEXEC
+
+
+# GOOS / GOARCH
+
+go_arch=$(subst \
+  aarch64,arm64,$(subst \
+  i386,386,$(subst \
+  mipsel,mipsle,$(subst \
+  mips64el,mips64le,$(subst \
+  powerpc64,ppc64,$(subst \
+  x86_64,amd64,$(1)))))))
+
+GO_OS:=linux
+GO_ARCH:=$(call go_arch,$(ARCH))
+GO_OS_ARCH:=$(GO_OS)_$(GO_ARCH)
+
+GO_HOST_OS:=$(call tolower,$(HOST_OS))
+GO_HOST_ARCH:=$(call go_arch,$(subst \
+  armv6l,arm,$(subst \
+  armv7l,arm,$(subst \
+  i686,i386,$(HOST_ARCH)))))
+GO_HOST_OS_ARCH:=$(GO_HOST_OS)_$(GO_HOST_ARCH)
+
+ifeq ($(GO_OS_ARCH),$(GO_HOST_OS_ARCH))
+  GO_HOST_TARGET_SAME:=1
+else
+  GO_HOST_TARGET_DIFFERENT:=1
+endif
+
+ifeq ($(GO_ARCH),386)
+  ifeq ($(CONFIG_TARGET_x86_geode)$(CONFIG_TARGET_x86_legacy),y)
+    GO_386:=softfloat
+  else
+    GO_386:=sse2
+  endif
+
+  # -fno-plt: causes "unexpected GOT reloc for non-dynamic symbol" errors
+  GO_CFLAGS_TO_REMOVE:=-fno-plt
+
+else ifeq ($(GO_ARCH),amd64)
+  GO_AMD64:=v1
+
+else ifeq ($(GO_ARCH),arm)
+  GO_TARGET_FPU:=$(word 2,$(subst +,$(space),$(call qstrip,$(CONFIG_CPU_TYPE))))
+
+  # FPU names from https://gcc.gnu.org/onlinedocs/gcc-8.4.0/gcc/ARM-Options.html#index-mfpu-1
+  # see also https://github.com/gcc-mirror/gcc/blob/releases/gcc-8.4.0/gcc/config/arm/arm-cpus.in
+
+  ifeq ($(GO_TARGET_FPU),)
+    GO_ARM:=5
+  else ifneq ($(filter $(GO_TARGET_FPU),vfp vfpv2),)
+    GO_ARM:=6
+  else
+    GO_ARM:=7
+  endif
+
+else ifneq ($(filter $(GO_ARCH),mips mipsle),)
+  ifeq ($(CONFIG_HAS_FPU),y)
+    GO_MIPS:=hardfloat
+  else
+    GO_MIPS:=softfloat
+  endif
+
+  # -mips32r2: conflicts with -march=mips32 set by go
+  GO_CFLAGS_TO_REMOVE:=-mips32r2
+
+else ifneq ($(filter $(GO_ARCH),mips64 mips64le),)
+  ifeq ($(CONFIG_HAS_FPU),y)
+    GO_MIPS64:=hardfloat
+  else
+    GO_MIPS64:=softfloat
+  endif
+
+else ifeq ($(GO_ARCH),ppc64)
+  GO_PPC64:=power8
+
+endif
+
+
+# Target Go
+
+GO_ARCH_DEPENDS:=@(aarch64||arm||i386||i686||mips||mips64||mips64el||mipsel||powerpc64||riscv64||x86_64)
+
+
+# ASLR/PIE
+
+# From https://go.dev/src/internal/platform/supported.go
+GO_PIE_SUPPORTED_OS_ARCH:= \
+  android_386  android_amd64  android_arm  android_arm64 \
+  linux_386    linux_amd64    linux_arm    linux_arm64 \
+  windows_386  windows_amd64  windows_arm  windows_arm64 \
+  \
+  darwin_amd64 darwin_arm64 \
+  ios_amd64    ios_arm64 \
+  \
+  freebsd_amd64 \
+  \
+  aix_ppc64 \
+  \
+  linux_loong64 linux_ppc64le linux_riscv64 linux_s390x
+
+# From https://go.dev/src/cmd/go/internal/work/init.go
+go_pie_install_suffix=$(if $(filter $(1),aix_ppc64 windows_386 windows_amd64 windows_arm windows_arm64),,shared)
+
+ifneq ($(filter $(GO_HOST_OS_ARCH),$(GO_PIE_SUPPORTED_OS_ARCH)),)
+  GO_HOST_PIE_SUPPORTED:=1
+  GO_HOST_PIE_INSTALL_SUFFIX:=$(call go_pie_install_suffix,$(GO_HOST_OS_ARCH))
+endif
+
+ifneq ($(filter $(GO_OS_ARCH),$(GO_PIE_SUPPORTED_OS_ARCH)),)
+  GO_TARGET_PIE_SUPPORTED:=1
+  GO_TARGET_PIE_INSTALL_SUFFIX:=$(call go_pie_install_suffix,$(GO_OS_ARCH))
+endif
+
+
+# Spectre mitigations
+
+GO_SPECTRE_SUPPORTED_ARCH:=amd64
+
+ifneq ($(filter $(GO_HOST_ARCH),$(GO_SPECTRE_SUPPORTED_ARCH)),)
+  GO_HOST_SPECTRE_SUPPORTED:=1
+endif
+
+ifneq ($(filter $(GO_ARCH),$(GO_SPECTRE_SUPPORTED_ARCH)),)
+  GO_TARGET_SPECTRE_SUPPORTED:=1
+endif
+
+
+# General build info
+
+GO_BUILD_CACHE_DIR:=$(or $(call qstrip,$(CONFIG_GOLANG_BUILD_CACHE_DIR)),$(TMP_DIR)/go-build)
+GO_MOD_CACHE_DIR:=$(DL_DIR)/go-mod-cache
+
+GO_MOD_ARGS= \
+	-modcacherw
+
+GO_GENERAL_BUILD_CONFIG_VARS= \
+	CONFIG_GOLANG_MOD_CACHE_WORLD_READABLE="$(CONFIG_GOLANG_MOD_CACHE_WORLD_READABLE)" \
+	GO_BUILD_CACHE_DIR="$(GO_BUILD_CACHE_DIR)" \
+	GO_MOD_CACHE_DIR="$(GO_MOD_CACHE_DIR)" \
+	GO_MOD_ARGS="$(GO_MOD_ARGS)"
+
+define Go/CacheCleanup
+	$(GO_GENERAL_BUILD_CONFIG_VARS) \
+	$(SHELL) $(GO_INCLUDE_DIR)/golang-build.sh cache_cleanup
+endef
diff --git a/golang/golang/Config.in b/golang/golang/Config.in
new file mode 100644
index 00000000..76fd85c8
--- /dev/null
+++ b/golang/golang/Config.in
@@ -0,0 +1,33 @@
+menu "Configuration"
+
+config GOLANG_EXTERNAL_BOOTSTRAP_ROOT
+	string "External bootstrap Go root directory"
+	default ""
+	help
+	  Path to a working Go tree (>= Go 1.4), with bin, pkg, and src
+	  subdirectories and the Go compiler at bin/go.
+
+	  If specified, the existing Go installation will be used to
+	  compile host (buildroot) Go.
+
+	  Leave blank to compile the default bootstrap Go.
+
+config GOLANG_BUILD_CACHE_DIR
+	string "Go build cache directory"
+	default ""
+	help
+	  Store the Go build cache in this directory.
+	  If not set, uses '$(TMP_DIR)/go-build'.
+
+config GOLANG_MOD_CACHE_WORLD_READABLE
+	bool "Ensure Go module cache is world-readable"
+	default n
+
+config GOLANG_SPECTRE
+	bool "Enable Spectre mitigations"
+	default n
+	depends on x86_64
+	help
+	  Currently only available for x86-64 (amd64).
+
+endmenu
diff --git a/golang/golang/Makefile b/golang/golang/Makefile
new file mode 100644
index 00000000..ee99de47
--- /dev/null
+++ b/golang/golang/Makefile
@@ -0,0 +1,405 @@
+#
+# Copyright (C) 2018-2023 Jeffery To
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+GO_VERSION_MAJOR_MINOR:=1.21
+GO_VERSION_PATCH:=5
+
+PKG_NAME:=golang
+PKG_VERSION:=$(GO_VERSION_MAJOR_MINOR)$(if $(GO_VERSION_PATCH),.$(GO_VERSION_PATCH))
+PKG_RELEASE:=1
+
+GO_SOURCE_URLS:=https://dl.google.com/go/ \
+                https://mirrors.ustc.edu.cn/golang/ \
+                https://mirrors.nju.edu.cn/golang/
+
+PKG_SOURCE:=go$(PKG_VERSION).src.tar.gz
+PKG_SOURCE_URL:=$(GO_SOURCE_URLS)
+PKG_HASH:=285cbbdf4b6e6e62ed58f370f3f6d8c30825d6e56c5853c66d3c23bcdb09db19
+
+PKG_MAINTAINER:=Jeffery To <jeffery.to@gmail.com>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:golang:go
+
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_DIR:=$(BUILD_DIR)/go-$(PKG_VERSION)
+PKG_BUILD_PARALLEL:=1
+PKG_BUILD_FLAGS:=no-mips16
+
+PKG_GO_PREFIX:=/usr
+PKG_GO_VERSION_ID:=$(GO_VERSION_MAJOR_MINOR)
+PKG_GO_ROOT:=$(PKG_GO_PREFIX)/lib/go-$(PKG_GO_VERSION_ID)
+
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/go-$(PKG_VERSION)
+HOST_BUILD_PARALLEL:=1
+
+HOST_GO_PREFIX:=$(STAGING_DIR_HOSTPKG)
+HOST_GO_VERSION_ID:=cross
+HOST_GO_ROOT:=$(HOST_GO_PREFIX)/lib/go-$(HOST_GO_VERSION_ID)
+
+HOST_GO_VALID_OS_ARCH:= \
+  android_386  android_amd64  android_arm  android_arm64 \
+  freebsd_386  freebsd_amd64  freebsd_arm  freebsd_arm64 \
+  linux_386    linux_amd64    linux_arm    linux_arm64 \
+  openbsd_386  openbsd_amd64  openbsd_arm  openbsd_arm64 \
+  netbsd_386   netbsd_amd64   netbsd_arm   netbsd_arm64 \
+  windows_386  windows_amd64  windows_arm  windows_arm64 \
+  \
+  plan9_386    plan9_amd64    plan9_arm \
+  \
+  darwin_amd64 darwin_arm64 \
+  ios_amd64    ios_arm64 \
+  \
+  dragonfly_amd64 \
+  illumos_amd64 \
+  solaris_amd64 \
+  \
+  aix_ppc64 \
+  js_wasm \
+  wasip1_wasm \
+  \
+  freebsd_riscv64 \
+  \
+  linux_ppc64 linux_ppc64le \
+  linux_mips linux_mipsle linux_mips64 linux_mips64le \
+  linux_loong64 linux_riscv64 linux_s390x \
+  \
+  openbsd_mips64
+
+BOOTSTRAP_SOURCE:=go1.4-bootstrap-20171003.tar.gz
+BOOTSTRAP_SOURCE_URL:=$(GO_SOURCE_URLS)
+BOOTSTRAP_HASH:=f4ff5b5eb3a3cae1c993723f3eab519c5bae18866b5e5f96fe1102f0cb5c3e52
+
+BOOTSTRAP_BUILD_DIR:=$(HOST_BUILD_DIR)/.go_bootstrap
+
+BOOTSTRAP_GO_VALID_OS_ARCH:= \
+  darwin_386     darwin_amd64 \
+  dragonfly_386  dragonfly_amd64 \
+  freebsd_386    freebsd_amd64    freebsd_arm \
+  linux_386      linux_amd64      linux_arm \
+  netbsd_386     netbsd_amd64     netbsd_arm \
+  openbsd_386    openbsd_amd64 \
+  plan9_386      plan9_amd64 \
+                 solaris_amd64 \
+  windows_386    windows_amd64
+
+BOOTSTRAP_1_17_SOURCE:=go1.17.13.src.tar.gz
+BOOTSTRAP_1_17_SOURCE_URL:=$(GO_SOURCE_URLS)
+BOOTSTRAP_1_17_HASH:=a1a48b23afb206f95e7bbaa9b898d965f90826f6f1d1fc0c1d784ada0cd300fd
+
+BOOTSTRAP_1_17_BUILD_DIR:=$(HOST_BUILD_DIR)/.go_bootstrap_1.17
+
+include $(INCLUDE_DIR)/host-build.mk
+include $(INCLUDE_DIR)/package.mk
+include ../golang-compiler.mk
+include ../golang-package.mk
+
+PKG_UNPACK:=$(HOST_TAR) -C "$(PKG_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(PKG_SOURCE)"
+HOST_UNPACK:=$(HOST_TAR) -C "$(HOST_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(PKG_SOURCE)"
+BOOTSTRAP_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_SOURCE)"
+BOOTSTRAP_1_17_UNPACK:=$(HOST_TAR) -C "$(BOOTSTRAP_1_17_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(BOOTSTRAP_1_17_SOURCE)"
+
+# don't strip ELF executables in test data
+RSTRIP:=:
+STRIP:=:
+
+ifeq ($(GO_TARGET_SPECTRE_SUPPORTED),1)
+  PKG_CONFIG_DEPENDS+=CONFIG_GOLANG_SPECTRE
+endif
+
+define Package/golang/Default
+$(call GoPackage/GoSubMenu)
+  TITLE:=Go programming language
+  URL:=https://go.dev/
+  DEPENDS:=$(GO_ARCH_DEPENDS)
+endef
+
+define Package/golang/Default/description
+The Go programming language is an open source project to make
+programmers more productive.
+
+Go is expressive, concise, clean, and efficient. Its concurrency
+mechanisms make it easy to write programs that get the most out of
+multicore and networked machines, while its novel type system enables
+flexible and modular program construction. Go compiles quickly to
+machine code yet has the convenience of garbage collection and the power
+of run-time reflection. It's a fast, statically typed, compiled language
+that feels like a dynamically typed, interpreted language.
+endef
+
+# go tool requires source present:
+# https://github.com/golang/go/issues/4635
+define Package/golang
+$(call Package/golang/Default)
+  TITLE+= (compiler)
+  DEPENDS+= +golang-src
+endef
+
+define Package/golang/description
+$(call Package/golang/Default/description)
+
+This package provides an assembler, compiler, linker, and compiled
+libraries for the Go programming language.
+endef
+
+define Package/golang/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/golang-doc
+$(call Package/golang/Default)
+  TITLE+= (documentation)
+endef
+
+define Package/golang-doc/description
+$(call Package/golang/Default/description)
+
+This package provides the documentation for the Go programming language.
+endef
+
+define Package/golang-src
+$(call Package/golang/Default)
+  TITLE+= (source files)
+endef
+
+define Package/golang-src/description
+$(call Package/golang/Default/description)
+
+This package provides the Go programming language source files needed
+for cross-compilation.
+endef
+
+
+# Bootstrap
+
+BOOTSTRAP_ROOT_DIR:=$(call qstrip,$(CONFIG_GOLANG_EXTERNAL_BOOTSTRAP_ROOT))
+
+ifeq ($(BOOTSTRAP_ROOT_DIR),)
+  BOOTSTRAP_ROOT_DIR:=$(BOOTSTRAP_BUILD_DIR)
+
+  define Download/golang-bootstrap
+    FILE:=$(BOOTSTRAP_SOURCE)
+    URL:=$(BOOTSTRAP_SOURCE_URL)
+    HASH:=$(BOOTSTRAP_HASH)
+  endef
+  $(eval $(call Download,golang-bootstrap))
+
+  define Bootstrap/Prepare
+	mkdir -p "$(BOOTSTRAP_BUILD_DIR)" && $(BOOTSTRAP_UNPACK) ;
+  endef
+  Hooks/HostPrepare/Post+=Bootstrap/Prepare
+
+  $(eval $(call GoCompiler/AddProfile,Bootstrap,$(BOOTSTRAP_BUILD_DIR),,bootstrap,$(GO_HOST_OS_ARCH)))
+endif
+
+
+# Bootstrap 1.17
+
+define Download/golang-bootstrap-1.17
+  FILE:=$(BOOTSTRAP_1_17_SOURCE)
+  URL:=$(BOOTSTRAP_1_17_SOURCE_URL)
+  HASH:=$(BOOTSTRAP_1_17_HASH)
+endef
+$(eval $(call Download,golang-bootstrap-1.17))
+
+define Bootstrap-1.17/Prepare
+	mkdir -p "$(BOOTSTRAP_1_17_BUILD_DIR)" && $(BOOTSTRAP_1_17_UNPACK) ;
+endef
+Hooks/HostPrepare/Post+=Bootstrap-1.17/Prepare
+
+$(eval $(call GoCompiler/AddProfile,Bootstrap-1.17,$(BOOTSTRAP_1_17_BUILD_DIR),,bootstrap-1.17,$(GO_HOST_OS_ARCH)))
+
+
+# Host
+
+ifeq ($(GO_HOST_PIE_SUPPORTED),1)
+  HOST_GO_ENABLE_PIE:=1
+endif
+
+# when using GO_LDFLAGS to set buildmode=pie, the PIE install suffix
+# does not apply (we also delete the std lib during Host/Install)
+
+$(eval $(call GoCompiler/AddProfile,Host,$(HOST_BUILD_DIR),$(HOST_GO_PREFIX),$(HOST_GO_VERSION_ID),$(GO_HOST_OS_ARCH),$(HOST_GO_INSTALL_SUFFIX)))
+
+HOST_GO_VARS= \
+	GOHOSTARCH="$(GO_HOST_ARCH)" \
+	GOCACHE="$(GO_BUILD_CACHE_DIR)" \
+	GOENV=off \
+	CC="$(HOSTCC_NOCACHE)" \
+	CXX="$(HOSTCXX_NOCACHE)"
+
+define Host/Configure
+	$(call GoCompiler/Bootstrap/CheckHost,$(BOOTSTRAP_GO_VALID_OS_ARCH))
+	$(call GoCompiler/Host/CheckHost,$(HOST_GO_VALID_OS_ARCH))
+
+	mkdir -p "$(GO_BUILD_CACHE_DIR)"
+endef
+
+define Host/Compile
+	$(call GoCompiler/Bootstrap/Make, \
+		$(HOST_GO_VARS) \
+	)
+
+	$(call GoCompiler/Bootstrap-1.17/Make, \
+		GOROOT_BOOTSTRAP="$(BOOTSTRAP_ROOT_DIR)" \
+		$(HOST_GO_VARS) \
+	)
+
+	$(call GoCompiler/Host/Make, \
+		GOROOT_BOOTSTRAP="$(BOOTSTRAP_1_17_BUILD_DIR)" \
+		$(if $(HOST_GO_ENABLE_PIE),GO_LDFLAGS="-buildmode pie") \
+		$(HOST_GO_VARS) \
+	)
+endef
+
+# if host and target os/arch are the same,
+# when go compiles a program, it will use the host std lib
+# so remove it now and force go to rebuild std for target later
+define Host/Install
+	$(call Host/Uninstall)
+
+	$(call GoCompiler/Host/Install/Bin,)
+	$(call GoCompiler/Host/Install/Src,)
+
+	$(call GoCompiler/Host/Install/BinLinks,)
+
+	rm -rf "$(HOST_GO_ROOT)/pkg/$(GO_HOST_OS_ARCH)$(if $(HOST_GO_INSTALL_SUFFIX),_$(HOST_GO_INSTALL_SUFFIX))"
+
+	$(INSTALL_DIR) "$(HOST_GO_ROOT)/openwrt"
+	$(INSTALL_BIN) ./files/go-gcc-helper "$(HOST_GO_ROOT)/openwrt/"
+	$(LN) go-gcc-helper "$(HOST_GO_ROOT)/openwrt/gcc"
+	$(LN) go-gcc-helper "$(HOST_GO_ROOT)/openwrt/g++"
+endef
+
+define Host/Uninstall
+	rm -rf "$(HOST_GO_ROOT)/openwrt"
+
+	$(call GoCompiler/Host/Uninstall/BinLinks,)
+
+	$(call GoCompiler/Host/Uninstall,)
+endef
+
+
+# Target
+
+ifeq ($(GO_PKG_ENABLE_PIE),1)
+  PKG_GO_INSTALL_SUFFIX:=$(GO_TARGET_PIE_INSTALL_SUFFIX)
+endif
+
+$(eval $(call GoCompiler/AddProfile,Package,$(PKG_BUILD_DIR),$(PKG_GO_PREFIX),$(PKG_GO_VERSION_ID),$(GO_OS_ARCH),$(PKG_GO_INSTALL_SUFFIX)))
+
+PKG_GO_ZBOOTSTRAP_MODS:= \
+	s/defaultGO386 = `[^`]*`/defaultGO386 = `$(or $(GO_386),sse2)`/; \
+	s/defaultGOAMD64 = `[^`]*`/defaultGOAMD64 = `$(or $(GO_AMD64),v1)`/; \
+	s/defaultGOARM = `[^`]*`/defaultGOARM = `$(or $(GO_ARM),7)`/; \
+	s/defaultGOMIPS = `[^`]*`/defaultGOMIPS = `$(or $(GO_MIPS),hardfloat)`/; \
+	s/defaultGOMIPS64 = `[^`]*`/defaultGOMIPS64 = `$(or $(GO_MIPS64),hardfloat)`/; \
+	s/defaultGOPPC64 = `[^`]*`/defaultGOPPC64 = `$(or $(GO_PPC64),power8)`/;
+
+PKG_GO_ZBOOTSTRAP_PATH:=$(PKG_BUILD_DIR)/src/internal/buildcfg/zbootstrap.go
+
+PKG_GO_VARS= \
+	GOHOSTARCH="$(GO_HOST_ARCH)" \
+	GOCACHE="$(GO_BUILD_CACHE_DIR)" \
+	GOENV=off \
+	GO_GCC_HELPER_PATH="$$$$PATH" \
+	CC=gcc \
+	CXX=g++ \
+	PKG_CONFIG=pkg-config \
+	PATH="$(HOST_GO_ROOT)/openwrt:$$$$PATH"
+
+PKG_GO_GCFLAGS= \
+	$(if $(GO_PKG_ENABLE_SPECTRE),-spectre all)
+
+PKG_GO_ASMFLAGS= \
+	$(if $(GO_PKG_ENABLE_SPECTRE),-spectre all)
+
+PKG_GO_LDFLAGS= \
+	-buildid '$(SOURCE_DATE_EPOCH)' \
+	-linkmode external \
+	-extldflags '$(patsubst -z%,-Wl$(comma)-z$(comma)%,$(TARGET_LDFLAGS))' \
+	$(if $(CONFIG_NO_STRIP)$(CONFIG_DEBUG),,-s -w)
+
+PKG_GO_INSTALL_ARGS= \
+	-buildvcs=false \
+	-trimpath \
+	-ldflags "all=$(PKG_GO_LDFLAGS)" \
+	$(if $(PKG_GO_GCFLAGS),-gcflags "all=$(PKG_GO_GCFLAGS)") \
+	$(if $(PKG_GO_ASMFLAGS),-asmflags "all=$(PKG_GO_ASMFLAGS)") \
+	$(if $(filter $(GO_PKG_ENABLE_PIE),1),-buildmode pie)
+
+define Build/Configure
+	mkdir -p "$(GO_BUILD_CACHE_DIR)"
+endef
+
+define Build/Compile
+	@echo "Building target Go first stage"
+
+	$(call GoCompiler/Package/Make, \
+		GOROOT_BOOTSTRAP="$(HOST_GO_ROOT)" \
+		GO_GCC_HELPER_CC="$(HOSTCC)" \
+		GO_GCC_HELPER_CXX="$(HOSTCXX)" \
+		$(PKG_GO_VARS) \
+	)
+
+	$(SED) '$(PKG_GO_ZBOOTSTRAP_MODS)' "$(PKG_GO_ZBOOTSTRAP_PATH)"
+
+	( \
+		if echo 'int main() { return 0; }' | $(TARGET_CC) -o $(PKG_BUILD_DIR)/test-ldso -x c - > /dev/null 2>&1; then \
+			LDSO=$$$$( \
+				readelf -l $(PKG_BUILD_DIR)/test-ldso | \
+				sed -n -e 's/^.*interpreter: \(.*\)[]]/\1/p' \
+			) ; \
+		fi ; \
+		$(SED) "s,defaultGO_LDSO = \`[^\`]*\`,defaultGO_LDSO = \`$$$$LDSO\`," "$(PKG_GO_ZBOOTSTRAP_PATH)" ; \
+	)
+
+	@echo "Building target Go second stage"
+
+	( \
+		cd "$(PKG_BUILD_DIR)/bin" ; \
+		export $(GO_PKG_TARGET_VARS) ; \
+		$(CP) go go-host ; \
+		GOROOT_FINAL="$(PKG_GO_ROOT)" \
+		GO_GCC_HELPER_CC="$(TARGET_CC)" \
+		GO_GCC_HELPER_CXX="$(TARGET_CXX)" \
+		$(PKG_GO_VARS) \
+		./go-host install -a $(PKG_GO_INSTALL_ARGS) std cmd ; \
+		retval="$$$$?" ; \
+		rm -f go-host ; \
+		exit "$$$$retval" ; \
+	)
+endef
+
+define Package/golang/install
+	$(call GoCompiler/Package/Install/Bin,$(1)$(PKG_GO_PREFIX))
+	$(call GoCompiler/Package/Install/BinLinks,$(1)$(PKG_GO_PREFIX))
+endef
+
+define Package/golang-doc/install
+	$(call GoCompiler/Package/Install/Doc,$(1)$(PKG_GO_PREFIX))
+endef
+
+define Package/golang-src/install
+	$(call GoCompiler/Package/Install/Src,$(1)$(PKG_GO_PREFIX))
+endef
+
+# src/debug contains ELF executables as test data
+# and they reference these libraries
+# we need to call this in Package/$(1)/extra_provides
+# to pass CheckDependencies in include/package-ipkg.mk
+define Package/golang-src/extra_provides
+	echo 'libc.so.6'
+endef
+
+
+$(eval $(call HostBuild))
+$(eval $(call BuildPackage,golang))
+$(eval $(call BuildPackage,golang-doc))
+$(eval $(call BuildPackage,golang-src))
diff --git a/golang/golang/files/go-gcc-helper b/golang/golang/files/go-gcc-helper
new file mode 100644
index 00000000..b21457b5
--- /dev/null
+++ b/golang/golang/files/go-gcc-helper
@@ -0,0 +1,47 @@
+#!/bin/sh
+#
+# Copyright (C) 2018, 2020 Jeffery To
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+me=go-gcc-helper
+name="${0##*/}"
+
+log() {
+	# shellcheck disable=SC2039
+	local IFS=" "
+	printf '%s\n' "$me: $*"
+}
+
+case "$name" in
+gcc)
+	if [ -z "$GO_GCC_HELPER_CC" ]; then
+		log "missing GO_GCC_HELPER_CC"
+		exit 1
+	fi
+	cmd="$GO_GCC_HELPER_CC"
+	;;
+g++)
+	if [ -z "$GO_GCC_HELPER_CXX" ]; then
+		log "missing GO_GCC_HELPER_CXX"
+		exit 1
+	fi
+	cmd="$GO_GCC_HELPER_CXX"
+	;;
+*)
+	log "unknown command \"$name\""
+	exit 1
+	;;
+esac
+
+if [ -n "$GO_GCC_HELPER_PATH" ]; then
+	export PATH="$GO_GCC_HELPER_PATH"
+else
+	log "missing GO_GCC_HELPER_PATH"
+fi
+
+log "running $cmd $*"
+
+$cmd "$@"
diff --git a/httping/Makefile b/httping/Makefile
new file mode 100644
index 00000000..b4ed1daf
--- /dev/null
+++ b/httping/Makefile
@@ -0,0 +1,89 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=httping
+PKG_VERSION:=2.5
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz
+PKG_SOURCE_URL:=http://www.vanheusden.com/httping
+PKG_HASH:=3e895a0a6d7bd79de25a255a1376d4da88eb09c34efdd0476ab5a907e75bfaf8
+
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/httping/Default
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Httping is like 'ping' but for http-requests
+  URL:=http://www.vanheusden.com/httping/
+  DEPENDS:=$(INTL_DEPENDS)
+  MAINTAINER:=Marcin Jurkowski <marcin1j@gmail.com>
+endef
+
+define Package/httping/Default/description
+	Give it an url, and it'll show you how long it takes to connect, send a
+	request and retrieve the reply (only the headers). Be aware that the
+	transmission across the network also takes time!
+endef
+
+define Package/httping
+  $(call Package/httping/Default)
+  DEPENDS+= +libopenssl
+  TITLE+= (with SSL support)
+  VARIANT:=ssl
+endef
+
+define Package/httping/description
+	$(call Package/httping/Default/description)
+	This package is built with SSL support.
+endef
+
+define Package/httping-nossl
+  $(call Package/httping/Default)
+  TITLE+= (without SSL support)
+  VARIANT:=nossl
+endef
+
+define Package/httping-nossl/description
+	$(call Package/httping/Default/description)
+	This package is built without SSL support.
+endef
+
+define Build/Configure
+endef
+
+TARGET_LDFLAGS += $(INTL_LDFLAGS) $(if $(INTL_FULL),-lintl)
+
+MAKE_FLAGS += \
+	DEBUG="no" \
+	FW="no" \
+	NC="no" \
+	TFO="no" \
+	JSON="no" \
+	NAGIOS="no" \
+	HELP="yes" \
+	FULLHELP="no"
+
+
+ifeq ($(BUILD_VARIANT),nossl)
+	MAKE_FLAGS += SSL="no"
+endif
+
+define Package/httping/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/httping $(1)/usr/bin/
+endef
+
+Package/httping-nossl/install = $(Package/httping/install)
+
+$(eval $(call BuildPackage,httping))
+$(eval $(call BuildPackage,httping-nossl))
diff --git a/httping/patches/001-no_strip.patch b/httping/patches/001-no_strip.patch
new file mode 100644
index 00000000..3dd5e353
--- /dev/null
+++ b/httping/patches/001-no_strip.patch
@@ -0,0 +1,12 @@
+--- a/Makefile
++++ b/Makefile
+@@ -115,9 +115,6 @@ install: $(TARGET) $(TRANSLATIONS)
+ 	$(INSTALLMAN) $(MAN_RU) $(DESTDIR)/$(MANDIR)/ru/man1
+ 	$(INSTALLDIR) $(DESTDIR)/$(DOCDIR)
+ 	$(INSTALLDOC) $(DOCS) $(DESTDIR)/$(DOCDIR)
+-ifneq ($(DEBUG),yes)
+-	$(STRIP) $(DESTDIR)/$(BINDIR)/$(TARGET)
+-endif
+ 	mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES
+ 	cp nl.mo $(DESTDIR)/$(PREFIX)/share/locale/nl/LC_MESSAGES/httping.mo
+ 	mkdir -p $(DESTDIR)/$(PREFIX)/share/locale/ru/LC_MESSAGES
diff --git a/httping/patches/002-fix_compile_warnings.patch b/httping/patches/002-fix_compile_warnings.patch
new file mode 100644
index 00000000..09bf321c
--- /dev/null
+++ b/httping/patches/002-fix_compile_warnings.patch
@@ -0,0 +1,10 @@
+--- a/http.c
++++ b/http.c
+@@ -4,6 +4,7 @@
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <stdlib.h>
+ #ifndef NO_SSL
+ #include <openssl/ssl.h>
+ #include "mssl.h"
diff --git a/httping/patches/003-fix_response_time.patch b/httping/patches/003-fix_response_time.patch
new file mode 100644
index 00000000..e07970e8
--- /dev/null
+++ b/httping/patches/003-fix_response_time.patch
@@ -0,0 +1,17 @@
+--- a/utils.c
++++ b/utils.c
+@@ -18,12 +18,11 @@
+ double get_ts(void)
+ {
+ 	struct timeval ts;
+-       	struct timezone tz;
+ 
+-	if (gettimeofday(&ts, &tz) == -1)
++	if (gettimeofday(&ts, NULL) == -1)
+ 		error_exit(gettext("gettimeofday failed"));
+ 
+-	return (double)ts.tv_sec + ((double)ts.tv_usec)/1000000.0 + (double)(tz.tz_minuteswest * 60);
++	return (double)ts.tv_sec + ((double)ts.tv_usec)/1000000.0;
+ }
+ 
+ void split_string(const char *in, const char *split, char ***list, int *list_n)
diff --git a/httping/patches/004-minimize.patch b/httping/patches/004-minimize.patch
new file mode 100644
index 00000000..14cfe5b7
--- /dev/null
+++ b/httping/patches/004-minimize.patch
@@ -0,0 +1,375 @@
+--- a/main.c
++++ b/main.c
+@@ -51,25 +51,40 @@ volatile int stop = 0;
+ 
+ int quiet = 0;
+ char machine_readable = 0;
++#ifdef ENABLE_JSON
+ char json_output = 0;
++#else
++#define json_output 0
++#endif
+ char show_ts = 0;
+ 
++#ifdef ENABLE_HELP_FORMAT
+ int max_x = 80, max_y = 24;
++#endif
+ 
++#ifdef ENABLE_NAGIOS
+ char nagios_mode = 0;
++#else
++#define nagios_mode 0
++#endif
++#ifdef NC
+ char ncurses_mode = 0;
++#else
++#define ncurses_mode 0
++#endif
+ 
+ int fd = -1;
+ 
+ volatile char got_sigquit = 0;
+ 
+-void handler_quit(int s)
++void handler_quit()
+ {
+ 	signal(SIGQUIT, handler_quit);
+ 
+ 	got_sigquit = 1;
+ }
+ 
++#ifdef ENABLE_HELP_FORMAT
+ void determine_terminal_size(int *max_y, int *max_x)
+ {
+         struct winsize size;
+@@ -104,6 +119,7 @@ void determine_terminal_size(int *max_y,
+                         *max_y = 24;
+         }
+ }
++#endif
+ 
+ void emit_statuslines(double run_time)
+ {
+@@ -159,6 +175,7 @@ void emit_headers(char *in)
+ #endif
+ }
+ 
++#ifdef ENABLE_JSON
+ void emit_json(char ok, int seq, double start_ts, stats_t *t_resolve, stats_t *t_connect, stats_t *t_request, int http_code, const char *msg, int header_size, int data_size, double Bps, const char *host, const char *ssl_fp, double toff_diff_ts, char tfo_success, stats_t *t_ssl, stats_t *t_write, stats_t *t_close, int n_cookies, stats_t *stats_to, stats_t *tcp_rtt_stats, int re_tx, int pmtu, int recv_tos, stats_t *t_total)
+ {
+ 	if (seq > 1)
+@@ -203,6 +220,7 @@ void emit_json(char ok, int seq, double
+ 	printf("\"tos\" : \"%02x\" ", recv_tos);
+ 	printf("}");
+ }
++#endif
+ 
+ char *get_ts_str(int verbose)
+ {
+@@ -240,8 +258,13 @@ void emit_error(int verbose, int seq, do
+ 		if (!quiet && !machine_readable && !nagios_mode && !json_output)
+ 			printf("%s%s%s%s\n", ts ? ts : "", c_error, get_error(), c_normal);
+ 
++#ifdef ENABLE_JSON
+ 	if (json_output)
+ 		emit_json(0, seq, start_ts, NULL, NULL, NULL, -1, get_error(), -1, -1, -1, "", "", -1, 0, NULL, NULL, NULL, 0, NULL, NULL, 0, 0, 0, NULL);
++#else
++	(void) seq;
++	(void) start_ts;
++#endif
+ 
+ 	clear_error();
+ 
+@@ -590,6 +613,7 @@ void fetch_proxy_settings(char **proxy_u
+ 	}
+ }
+ 
++#ifdef ENABLE_NAGIOS
+ void parse_nagios_settings(const char *in, double *nagios_warn, double *nagios_crit)
+ {
+ 	char *dummy = strchr(in, ',');
+@@ -600,6 +624,7 @@ void parse_nagios_settings(const char *i
+ 
+ 	*nagios_crit = atof(dummy + 1);
+ }
++#endif
+ 
+ void parse_bind_to(const char *in, struct sockaddr_in *bind_to_4, struct sockaddr_in6 *bind_to_6, struct sockaddr_in **bind_to)
+ {
+@@ -722,6 +747,7 @@ char check_compressed(const char *reply)
+ 	return 0;
+ }
+ 
++#ifdef ENABLE_NAGIOS
+ int nagios_result(int ok, int nagios_mode, int nagios_exit_code, double avg_httping_time, double nagios_warn, double nagios_crit)
+ {
+ 	if (nagios_mode == 1)
+@@ -762,6 +788,7 @@ int nagios_result(int ok, int nagios_mod
+ 
+ 	return -1;
+ }
++#endif
+ 
+ void proxy_to_host_and_port(char *in, char **proxy_host, int *proxy_port)
+ {
+@@ -896,8 +923,10 @@ int main(int argc, char *argv[])
+ 	int n_static_cookies = 0, n_dynamic_cookies = 0;
+ 	char resolve_once = 0;
+ 	char have_resolved = 0;
++#ifdef ENABLE_NAGIOS
+ 	double nagios_warn=0.0, nagios_crit=0.0;
+ 	int nagios_exit_code = 2;
++#endif
+ 	double avg_httping_time = -1.0;
+ 	int get_instead_of_head = 0;
+ 	char show_Bps = 0, ask_compression = 0;
+@@ -928,9 +957,17 @@ int main(int argc, char *argv[])
+ 	stats_t t_connect, t_request, t_total, t_resolve, t_write, t_ssl, t_close, stats_to, tcp_rtt_stats, stats_header_size;
+ 	char first_resolve = 1;
+ 	double graph_limit = MY_DOUBLE_INF;
++#ifdef NC
++#ifdef FW
+ 	char nc_graph = 1;
++#else
++	#define nc_graph 1
++#endif
++#endif
+ 	char adaptive_interval = 0;
++#ifdef NC
+ 	double show_slow_log = MY_DOUBLE_INF;
++#endif
+ 	char use_tcp_nodelay = 1;
+ 	int max_mtu = -1;
+ 	int write_sleep = 500; /* in us (microseconds), determines resolution of transmit time determination */
+@@ -980,8 +1017,10 @@ int main(int argc, char *argv[])
+ 		{"user-agent",	1, NULL, 'I' },
+ 		{"referer",	1, NULL, 'S' },
+ 		{"resolve-once",0, NULL, 'r' },
++#ifdef ENABLE_NAGIOS
+ 		{"nagios-mode-1",	1, NULL, 'n' },
+ 		{"nagios-mode-2",	1, NULL, 'n' },
++#endif
+ 		{"bind-to",	1, NULL, 'y' },
+ 		{"quiet",	0, NULL, 'q' },
+ 		{"username",	1, NULL, 'U' },
+@@ -1052,7 +1091,9 @@ int main(int argc, char *argv[])
+ #endif
+ 	init_statst(&stats_header_size);
+ 
++#ifdef ENABLE_HELP_FORMAT
+ 	determine_terminal_size(&max_y, &max_x);
++#endif
+ 
+ 	signal(SIGPIPE, SIG_IGN);
+ 
+@@ -1108,11 +1149,11 @@ int main(int argc, char *argv[])
+ 			case 14:
+ 				draw_phase = 1;
+ 				break;
+-#endif
+ 
+ 			case 13:
+ 				show_slow_log = atof(optarg);
+ 				break;
++#endif
+ 
+ 			case 12:
+ 				adaptive_interval = 1;
+@@ -1144,9 +1185,11 @@ int main(int argc, char *argv[])
+ 				fprintf(stderr, gettext("\n *** -A is no longer required ***\n\n"));
+ 				break;
+ 
++#ifdef ENABLE_JSON
+ 			case 'M':
+ 				json_output = 1;
+ 				break;
++#endif
+ 
+ 			case 'v':
+ 				verbose++;
+@@ -1338,6 +1381,7 @@ int main(int argc, char *argv[])
+ 				version();
+ 				return 0;
+ 
++#ifdef ENABLE_NAGIOS
+ 			case 'n':
+ 				if (nagios_mode)
+ 					error_exit(gettext("-n and -N are mutual exclusive\n"));
+@@ -1352,6 +1396,7 @@ int main(int argc, char *argv[])
+ 				nagios_mode = 2;
+ 				nagios_exit_code = atoi(optarg);
+ 				break;
++#endif
+ 
+ 			case 'P':
+ 				auth_password = optarg;
+@@ -1497,8 +1542,10 @@ int main(int argc, char *argv[])
+ 			printf("PING %s%s:%s%d%s (%s):\n", c_green, hostname, c_bright, portnr, c_normal, get);
+ 	}
+ 
++#ifdef ENABLE_JSON
+ 	if (json_output)
+ 		printf("[\n");
++#endif
+ 
+ 	if (adaptive_interval && wait <= 0.0)
+ 		error_exit(gettext("Interval must be > 0 when using adaptive interval"));
+@@ -1593,7 +1640,10 @@ int main(int argc, char *argv[])
+ 		int age = -1;
+ 		char *sc = NULL, *scdummy = NULL;
+ 		char *fp = NULL;
+-		int re_tx = 0, pmtu = 0, recv_tos = 0;
++		int recv_tos = 0;
++#if defined(NC) || defined(ENABLE_JSON)
++		int re_tx = 0, pmtu = 0;
++#endif
+ 		socklen_t recv_tos_len = sizeof recv_tos;
+ 
+ 		dstart = get_ts();
+@@ -1607,7 +1657,9 @@ int main(int argc, char *argv[])
+ 			char req_sent = 0;
+ 			double dummy_ms = 0.0;
+ 			double their_est_ts = -1.0, toff_diff_ts = -1.0;
++#if defined(ENABLE_JSON) || defined(TCP_TFO)
+ 			char tfo_success = 0;
++#endif
+ 			double ssl_handshake = 0.0;
+ 			char cur_have_resolved = 0;
+ #if defined(linux) || defined(__FreeBSD__)
+@@ -2114,7 +2166,7 @@ persistent_loop:
+ 
+ 				update_statst(&tcp_rtt_stats, (double)info.tcpi_rtt / 1000.0);
+ 
+-#ifdef linux
++#if defined(linux) && (defined(NC) || defined(ENABLE_JSON))
+ 				re_tx = info.tcpi_retransmits;
+ 				pmtu = info.tcpi_pmtu;
+ #endif
+@@ -2134,6 +2186,7 @@ persistent_loop:
+ 			toff_diff_ts = ((double)their_ts - their_est_ts) * 1000.0;
+ 			update_statst(&stats_to, toff_diff_ts);
+ 
++#ifdef ENABLE_JSON
+ 			if (json_output)
+ 			{
+ 				char current_host[4096] = { 0 };
+@@ -2145,7 +2198,9 @@ persistent_loop:
+ 
+ 				emit_json(1, curncount, dstart, &t_resolve, &t_connect, &t_request, atoi(sc ? sc : "-1"), sc ? sc : "?", headers_len, len, Bps, current_host, fp, toff_diff_ts, tfo_success, &t_ssl, &t_write, &t_close, n_dynamic_cookies, &stats_to, &tcp_rtt_stats, re_tx, pmtu, recv_tos, &t_total);
+ 			}
+-			else if (machine_readable)
++			else
++#endif
++			if (machine_readable)
+ 			{
+ 				if (sc)
+ 				{
+@@ -2404,14 +2459,18 @@ persistent_loop:
+ 		stats_line(1, complete_url, count, curncount, err, ok, started_at, verbose, &t_total, avg_httping_time, show_Bps ? &bps : NULL);
+ 
+ error_exit:
++#ifdef ENABLE_NAGIOS
+ 	if (nagios_mode)
+ 		return nagios_result(ok, nagios_mode, nagios_exit_code, avg_httping_time, nagios_warn, nagios_crit);
++#endif
+ 
+ 	if (!json_output && !machine_readable)
+ 		printf("%s", c_very_normal);
+ 
++#ifdef ENABLE_JSON
+ 	if (json_output)
+ 		printf("\n]\n");
++#endif
+ 
+ 	free_cookies(static_cookies, n_static_cookies);
+ 	free_cookies(dynamic_cookies, n_dynamic_cookies);
+--- a/help.c
++++ b/help.c
+@@ -93,6 +93,8 @@ void version(void)
+ 	fprintf(stderr, gettext("\n"));
+ }
+ 
++#ifdef ENABLE_HELP
++#ifdef ENABLE_HELP_FORMAT
+ void format_help(const char *short_str, const char *long_str, const char *descr)
+ {
+ 	int par_width = SWITCHES_COLUMN_WIDTH, max_wrap_width = par_width / 2, cur_par_width = 0;
+@@ -167,9 +169,30 @@ void format_help(const char *short_str,
+ 		p = n;
+ 	}
+ }
++#else
++void format_help(const char *short_str, const char *long_str, const char *descr)
++{
++	if (short_str)
++	{
++		fputs(short_str, stderr);
++		fputc(' ', stderr);
++	}
++
++	if (long_str)
++	{
++		fputs(long_str, stderr);
++		fputc(' ', stderr);
++	}
++
++	fputs(descr, stderr);
++	fputc('\n', stderr);
++}
++#endif
++#endif
+ 
+ void usage(const char *me)
+ {
++#ifdef ENABLE_HELP
+ 	char *dummy = NULL, has_color = 0;
+ 	char host[256] = { 0 };
+ 
+@@ -270,11 +293,15 @@ void usage(const char *me)
+ 	fprintf(stderr, gettext(" *** output mode settings ***\n"));
+ 	format_help("-q", "--quiet", gettext("quiet, only returncode"));
+ 	format_help("-m", "--parseable-output", gettext("give machine parseable output (see also -o and -e)"));
++#ifdef ENABLE_JSON
+ 	format_help("-M", NULL, gettext("json output, cannot be combined with -m"));
++#endif
+ 	format_help("-o rc,rc,...", "--ok-result-codes", gettext("what http results codes indicate 'ok' comma separated WITHOUT spaces inbetween default is 200, use with -e"));
+ 	format_help("-e x", "--result-string", gettext("string to display when http result code doesn't match"));
++#ifdef ENABLE_NAGIOS
+ 	format_help("-n warn,crit", "--nagios-mode-1 / --nagios-mode-2", gettext("Nagios-mode: return 1 when avg. response time >= warn, 2 if >= crit, otherwhise return 0"));
+ 	format_help("-N x", NULL, gettext("Nagios mode 2: return 0 when all fine, 'x' when anything failes"));
++#endif
+ 	format_help("-C cookie=value", "--cookie", gettext("add a cookie to the request"));
+ 	format_help("-Y", "--colors", gettext("add colors"));
+ 	format_help("-a", "--audible-ping", gettext("audible ping"));
+@@ -309,5 +336,6 @@ void usage(const char *me)
+ 	fprintf(stderr, gettext("Example:\n"));
+ 	fprintf(stderr, "\t%s %s%s -s -Z\n\n", me, host, has_color ? " -Y" : "");
+ 
++#endif
+ 	new_version_alert();
+ }
+--- a/Makefile
++++ b/Makefile
+@@ -88,6 +88,22 @@ OBJS+=fft.o
+ LDFLAGS+=-lfftw3
+ endif
+ 
++ifeq ($(JSON),yes)
++CFLAGS+=-DENABLE_JSON
++endif
++
++ifeq ($(NAGIOS),yes)
++CFLAGS+=-DENABLE_NAGIOS
++endif
++
++ifeq ($(HELP),yes)
++CFLAGS+=-DENABLE_HELP
++endif
++
++ifeq ($(HELPFORMAT),yes)
++CFLAGS+=-DENABLE_HELP_FORMAT
++endif
++
+ ifeq ($(DEBUG),yes)
+ CFLAGS+=-D_DEBUG -ggdb
+ LDFLAGS+=-g
diff --git a/httping/patches/005-httping-add-support-specified-interface.patch b/httping/patches/005-httping-add-support-specified-interface.patch
new file mode 100644
index 00000000..bb0e2f7e
--- /dev/null
+++ b/httping/patches/005-httping-add-support-specified-interface.patch
@@ -0,0 +1,100 @@
+Index: b/main.c
+===================================================================
+--- a/main.c	2022-11-08 14:44:49.944296773 +0800
++++ b/main.c	2022-11-08 14:55:50.338093076 +0800
+@@ -899,6 +899,7 @@ int main(int argc, char *argv[])
+ 	double started_at = -1;
+ 	char do_fetch_proxy_settings = 0;
+ 	char *hostname = NULL;
++	char *ifname = NULL;
+ 	char *proxy_host = NULL, *proxy_user = NULL, *proxy_password = NULL;
+ 	int proxy_port = 8080;
+ 	int portnr = 80;
+@@ -1022,6 +1023,7 @@ int main(int argc, char *argv[])
+ 		{"nagios-mode-2",	1, NULL, 'n' },
+ #endif
+ 		{"bind-to",	1, NULL, 'y' },
++		{"bind-to-interface",     1, NULL, 'O' },
+ 		{"quiet",	0, NULL, 'q' },
+ 		{"username",	1, NULL, 'U' },
+ 		{"password",	1, NULL, 'P' },
+@@ -1097,7 +1099,7 @@ int main(int argc, char *argv[])
+ 
+ 	signal(SIGPIPE, SIG_IGN);
+ 
+-	while((c = getopt_long(argc, argv, "DKEA5MvYWT:ZQ6Sy:XL:bBg:h:p:c:i:Gx:t:o:e:falqsmV?I:R:rn:N:zP:U:C:F", long_options, NULL)) != -1)
++	while((c = getopt_long(argc, argv, "DKEA5MvYWT:ZQ6SyO:XL:bBg:h:p:c:i:Gx:t:o:e:falqsmV?I:R:rn:N:zP:U:C:F", long_options, NULL)) != -1)
+ 	{
+ 		switch(c)
+ 		{
+@@ -1271,6 +1273,10 @@ int main(int argc, char *argv[])
+ 				parse_bind_to(optarg, &bind_to_4, &bind_to_6, &bind_to);
+ 				break;
+ 
++			case 'O':
++				ifname = optarg;
++				break;
++
+ 			case 'z':
+ 				show_fp = 1;
+ 				break;
+@@ -1761,7 +1767,7 @@ persistent_loop:
+ 				int rc = -1;
+ 				struct addrinfo *ai_dummy = proxy_host ? ai_use_proxy : ai_use;
+ 
+-				fd = create_socket((struct sockaddr *)bind_to, ai_dummy, recv_buffer_size, tx_buffer_size, max_mtu, use_tcp_nodelay, priority, send_tos);
++				fd = create_socket((struct sockaddr *)bind_to, ai_dummy, recv_buffer_size, tx_buffer_size, max_mtu, use_tcp_nodelay, priority, send_tos, ifname);
+ 				if (fd < 0)
+ 					rc = fd; /* FIXME need to fix this, this is ugly */
+ 				else if (proxy_host)
+Index: b/tcp.c
+===================================================================
+--- a/tcp.c	2016-09-12 15:45:50.000000000 +0800
++++ b/tcp.c	2022-11-08 14:50:48.598186803 +0800
+@@ -5,6 +5,7 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netinet/tcp.h>
++#include <net/if.h>
+ #include <arpa/inet.h>
+ #include <libintl.h>
+ #include <netdb.h>
+@@ -45,7 +46,7 @@ int set_no_delay(int fd)
+ 	return 0;
+ }
+ 
+-int create_socket(struct sockaddr *bind_to, struct addrinfo *ai, int recv_buffer_size, int tx_buffer_size, int max_mtu, char use_no_delay, int priority, int tos)
++int create_socket(struct sockaddr *bind_to, struct addrinfo *ai, int recv_buffer_size, int tx_buffer_size, int max_mtu, char use_no_delay, int priority, int tos, char *ifname)
+ {
+ 	int fd = -1;
+ 
+@@ -76,6 +77,18 @@ int create_socket(struct sockaddr *bind_
+ 			close(fd);
+ 			return RC_INVAL;
+ 		}
++	}
++
++	if (ifname != NULL && strlen(ifname) > 0)
++	{
++		struct ifreq ifr;
++		strncpy(ifr.ifr_name, ifname, IFNAMSIZ);
++		if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE, (char *)&ifr, sizeof ifr) == -1)
++		{
++			set_error(gettext("error can't bind to interface %s"), strerror(errno));
++			close(fd);
++			return RC_INVAL;
++		}
+ 	}
+ 
+ 	if (max_mtu >= 0)
+Index: b/tcp.h
+===================================================================
+--- a/tcp.h	2016-09-12 15:45:50.000000000 +0800
++++ b/tcp.h	2022-11-08 14:49:04.117700822 +0800
+@@ -1,5 +1,5 @@
+ /* Released under AGPL v3 with exception for the OpenSSL library. See license.txt */
+ 
+-int create_socket(struct sockaddr *bind_to, struct addrinfo *ai, int recv_buffer_size, int tx_buffer_size, int max_mtu, char use_no_delay, int priority, int tos);
++int create_socket(struct sockaddr *bind_to, struct addrinfo *ai, int recv_buffer_size, int tx_buffer_size, int max_mtu, char use_no_delay, int priority, int tos, char *ifname);
+ int connect_to(int fd, struct addrinfo *ai, double timeout, char *tfo, char *msg, int msg_len, char *msg_accepted);
+ void failure_close(int fd);
diff --git a/i2c-gpio-custom/Makefile b/i2c-gpio-custom/Makefile
new file mode 100644
index 00000000..cee3246e
--- /dev/null
+++ b/i2c-gpio-custom/Makefile
@@ -0,0 +1,53 @@
+#
+# Copyright (C) 2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=i2c-gpio-custom
+PKG_RELEASE:=2
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/i2c-gpio-custom
+  SUBMENU:=I2C support
+  TITLE:=Custom GPIO-based I2C device
+  DEPENDS:=@GPIO_SUPPORT @LINUX_4_4 +kmod-i2c-core +kmod-i2c-gpio
+  FILES:=$(PKG_BUILD_DIR)/i2c-gpio-custom.ko
+  KCONFIG:=
+endef
+
+define KernelPackage/i2c-gpio-custom/description
+ Kernel module for register a custom i2c-gpio platform device.
+endef
+
+EXTRA_KCONFIG:= \
+	CONFIG_I2C_GPIO_CUSTOM=m
+
+EXTRA_CFLAGS:= \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(EXTRA_KCONFIG)))) \
+
+MAKE_OPTS:= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)" \
+	SUBDIRS="$(PKG_BUILD_DIR)" \
+	EXTRA_CFLAGS="$(EXTRA_CFLAGS)" \
+	$(EXTRA_KCONFIG)
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS) \
+		modules
+endef
+
+$(eval $(call KernelPackage,i2c-gpio-custom))
diff --git a/i2c-gpio-custom/src/Kconfig b/i2c-gpio-custom/src/Kconfig
new file mode 100644
index 00000000..e2e3a68d
--- /dev/null
+++ b/i2c-gpio-custom/src/Kconfig
@@ -0,0 +1,10 @@
+config I2C_GPIO_CUSTOM
+	tristate "Custom GPIO-based I2C driver"
+	depends on GENERIC_GPIO
+	select I2C_GPIO
+	help
+	  This is an I2C driver to register 1 to 4 custom I2C buses using
+	  GPIO lines.
+
+	  This support is also available as a module.  If so, the module
+	  will be called i2c-gpio-custom.
diff --git a/i2c-gpio-custom/src/Makefile b/i2c-gpio-custom/src/Makefile
new file mode 100644
index 00000000..dcb2e2ab
--- /dev/null
+++ b/i2c-gpio-custom/src/Makefile
@@ -0,0 +1 @@
+obj-${CONFIG_I2C_GPIO_CUSTOM}	+= i2c-gpio-custom.o
\ No newline at end of file
diff --git a/i2c-gpio-custom/src/i2c-gpio-custom.c b/i2c-gpio-custom/src/i2c-gpio-custom.c
new file mode 100644
index 00000000..921d290d
--- /dev/null
+++ b/i2c-gpio-custom/src/i2c-gpio-custom.c
@@ -0,0 +1,202 @@
+/*
+ *  Custom GPIO-based I2C driver
+ *
+ *  Copyright (C) 2007-2008 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ * ---------------------------------------------------------------------------
+ *
+ *  The behaviour of this driver can be altered by setting some parameters
+ *  from the insmod command line.
+ *
+ *  The following parameters are adjustable:
+ *
+ *	bus0	These four arguments can be arrays of
+ *	bus1	1-8 unsigned integers as follows:
+ *	bus2
+ *	bus3	<id>,<sda>,<scl>,<udelay>,<timeout>,<sda_od>,<scl_od>,<scl_oo>
+ *
+ *  where:
+ *
+ *  <id>	ID to used as device_id for the corresponding bus (required)
+ *  <sda>	GPIO pin ID to used for SDA (required)
+ *  <scl>	GPIO pin ID to used for SCL (required)
+ *  <udelay>	signal toggle delay.
+ *  <timeout>	clock stretching timeout.
+ *  <sda_od>	SDA is configured as open drain.
+ *  <scl_od>	SCL is configured as open drain.
+ *  <scl_oo>	SCL output drivers cannot be turned off.
+ *
+ *  See include/i2c-gpio.h for more information about the parameters.
+ *
+ *  If this driver is built into the kernel, you can use the following kernel
+ *  command line parameters, with the same values as the corresponding module
+ *  parameters listed above:
+ *
+ *	i2c-gpio-custom.bus0
+ *	i2c-gpio-custom.bus1
+ *	i2c-gpio-custom.bus2
+ *	i2c-gpio-custom.bus3
+ */
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+
+#include <linux/i2c-gpio.h>
+
+#define DRV_NAME	"i2c-gpio-custom"
+#define DRV_DESC	"Custom GPIO-based I2C driver"
+#define DRV_VERSION	"0.1.1"
+
+#define PFX		DRV_NAME ": "
+
+#define BUS_PARAM_ID		0
+#define BUS_PARAM_SDA		1
+#define BUS_PARAM_SCL		2
+#define BUS_PARAM_UDELAY	3
+#define BUS_PARAM_TIMEOUT	4
+#define BUS_PARAM_SDA_OD	5
+#define BUS_PARAM_SCL_OD	6
+#define BUS_PARAM_SCL_OO	7
+
+#define BUS_PARAM_REQUIRED	3
+#define BUS_PARAM_COUNT		8
+#define BUS_COUNT_MAX		4
+
+static unsigned int bus0[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus1[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus2[BUS_PARAM_COUNT] __initdata;
+static unsigned int bus3[BUS_PARAM_COUNT] __initdata;
+
+static unsigned int bus_nump[BUS_COUNT_MAX] __initdata;
+
+#define BUS_PARM_DESC \
+	" config -> id,sda,scl[,udelay,timeout,sda_od,scl_od,scl_oo]"
+
+module_param_array(bus0, uint, &bus_nump[0], 0);
+MODULE_PARM_DESC(bus0, "bus0" BUS_PARM_DESC);
+module_param_array(bus1, uint, &bus_nump[1], 0);
+MODULE_PARM_DESC(bus1, "bus1" BUS_PARM_DESC);
+module_param_array(bus2, uint, &bus_nump[2], 0);
+MODULE_PARM_DESC(bus2, "bus2" BUS_PARM_DESC);
+module_param_array(bus3, uint, &bus_nump[3], 0);
+MODULE_PARM_DESC(bus3, "bus3" BUS_PARM_DESC);
+
+static struct platform_device *devices[BUS_COUNT_MAX];
+static unsigned int nr_devices;
+
+static void i2c_gpio_custom_cleanup(void)
+{
+	int i;
+
+	for (i = 0; i < nr_devices; i++)
+		if (devices[i])
+			platform_device_put(devices[i]);
+}
+
+static int __init i2c_gpio_custom_add_one(unsigned int id, unsigned int *params)
+{
+	struct platform_device *pdev;
+	struct i2c_gpio_platform_data pdata;
+	int err;
+
+	if (!bus_nump[id])
+		return 0;
+
+	if (bus_nump[id] < BUS_PARAM_REQUIRED) {
+		printk(KERN_ERR PFX "not enough parameters for bus%d\n", id);
+		err = -EINVAL;
+		goto err;
+	}
+
+	pdev = platform_device_alloc("i2c-gpio", params[BUS_PARAM_ID]);
+	if (!pdev) {
+		err = -ENOMEM;
+		goto err;
+	}
+
+	pdata.sda_pin = params[BUS_PARAM_SDA];
+	pdata.scl_pin = params[BUS_PARAM_SCL];
+	pdata.udelay = params[BUS_PARAM_UDELAY];
+	pdata.timeout = params[BUS_PARAM_TIMEOUT];
+	pdata.sda_is_open_drain = params[BUS_PARAM_SDA_OD] != 0;
+	pdata.scl_is_open_drain = params[BUS_PARAM_SCL_OD] != 0;
+	pdata.scl_is_output_only = params[BUS_PARAM_SCL_OO] != 0;
+
+	err = platform_device_add_data(pdev, &pdata, sizeof(pdata));
+	if (err)
+		goto err_put;
+
+	err = platform_device_add(pdev);
+	if (err)
+		goto err_put;
+
+	devices[nr_devices++] = pdev;
+	return 0;
+
+err_put:
+	platform_device_put(pdev);
+err:
+	return err;
+}
+
+static int __init i2c_gpio_custom_probe(void)
+{
+	int err;
+
+	printk(KERN_INFO DRV_DESC " version " DRV_VERSION "\n");
+
+	err = i2c_gpio_custom_add_one(0, bus0);
+	if (err)
+		goto err;
+
+	err = i2c_gpio_custom_add_one(1, bus1);
+	if (err)
+		goto err;
+
+	err = i2c_gpio_custom_add_one(2, bus2);
+	if (err)
+		goto err;
+
+	err = i2c_gpio_custom_add_one(3, bus3);
+	if (err)
+		goto err;
+
+	if (!nr_devices) {
+		printk(KERN_ERR PFX "no bus parameter(s) specified\n");
+		err = -ENODEV;
+		goto err;
+	}
+
+	return 0;
+
+err:
+	i2c_gpio_custom_cleanup();
+	return err;
+}
+
+#ifdef MODULE
+static int __init i2c_gpio_custom_init(void)
+{
+	return i2c_gpio_custom_probe();
+}
+module_init(i2c_gpio_custom_init);
+
+static void __exit i2c_gpio_custom_exit(void)
+{
+	i2c_gpio_custom_cleanup();
+}
+module_exit(i2c_gpio_custom_exit);
+#else
+subsys_initcall(i2c_gpio_custom_probe);
+#endif /* MODULE*/
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Gabor Juhos <juhosg@openwrt.org >");
+MODULE_DESCRIPTION(DRV_DESC);
+MODULE_VERSION(DRV_VERSION);
diff --git a/libiwinfo-lua53/Makefile b/libiwinfo-lua53/Makefile
new file mode 100644
index 00000000..53ffd343
--- /dev/null
+++ b/libiwinfo-lua53/Makefile
@@ -0,0 +1,30 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libiwinfo-lua53
+PKG_RELEASE:=2
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libiwinfo-lua53
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=libiwinfo Lua5.3 binding
+  DEPENDS:=+libiwinfo +liblua5.3
+endef
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/lua5.3
+TARGET_LDFLAGS += -liwinfo -fPIC
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -shared \
+		$(PKG_BUILD_DIR)/iwinfo.c \
+		-o $(PKG_BUILD_DIR)/iwinfo.so
+endef
+
+define Package/libiwinfo-lua53/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/iwinfo.so $(1)/usr/local/lib/lua/5.3/iwinfo.so
+endef
+
+$(eval $(call BuildPackage,libiwinfo-lua53))
diff --git a/libiwinfo-lua53/src/iwinfo.c b/libiwinfo-lua53/src/iwinfo.c
new file mode 100644
index 00000000..7e9235bc
--- /dev/null
+++ b/libiwinfo-lua53/src/iwinfo.c
@@ -0,0 +1,115 @@
+#include <lauxlib.h>
+#include <lua.h>
+#include <iwinfo.h>
+
+static int lua_iwinfo_info(lua_State *L)
+{
+    const char *ifname = luaL_checkstring(L, 1);
+    const struct iwinfo_ops *iw = iwinfo_backend(ifname);
+    char buf[IWINFO_BUFSIZE];
+    int num;
+
+    if (!iw) {
+        lua_pushnil(L);
+        lua_pushfstring(L, "No such wireless device: %s", ifname);
+        return 2;
+    }
+
+    lua_newtable(L);
+
+    memset(buf, 0, sizeof(buf));
+
+    if (!iw->ssid(ifname, buf) && buf[0]) {
+        lua_pushstring(L, buf);
+        lua_setfield(L, -2, "ssid");
+    }
+
+    memset(buf, 0, sizeof(buf));
+
+    if (!iw->bssid(ifname, buf) && buf[0]) {
+        lua_pushstring(L, buf);
+        lua_setfield(L, -2, "bssid");
+    }
+
+    if (!iw->channel(ifname, &num)) {
+        lua_pushinteger(L, num);
+        lua_setfield(L, -2, "channel");
+    }
+
+    if (!iw->signal(ifname, &num)) {
+        lua_pushinteger(L, num);
+        lua_setfield(L, -2, "signal");
+    }
+
+    if (iw->htmode && !iw->htmode(ifname, &num)) {
+        const char *htmode = iwinfo_htmode_name(num);
+        lua_pushstring(L, htmode ? htmode : "unknown");
+        lua_setfield(L, -2, "htmode");
+    }
+
+    iwinfo_finish();
+
+    return 1;
+}
+
+static int lua_iwinfo_freqlist(lua_State *L)
+{
+    const char *ifname = luaL_checkstring(L, 1);
+    const struct iwinfo_ops *iw = iwinfo_backend(ifname);
+	struct iwinfo_freqlist_entry *e;
+    char buf[IWINFO_BUFSIZE];
+    int i, j, len, freq;
+    int ret = 1;
+
+    if (!iw) {
+        lua_pushnil(L);
+        lua_pushfstring(L, "No such wireless device: %s", ifname);
+        return 2;
+    }
+
+    if (iw->freqlist(ifname, buf, &len) || len <= 0) {
+        ret = 2;
+        lua_pushnil(L);
+        lua_pushfstring(L, "No frequency information available");
+        goto done;
+    }
+
+    lua_newtable(L);
+
+    for (i = 0, j = 1; i < len; i += sizeof(struct iwinfo_freqlist_entry)) {
+        e = (struct iwinfo_freqlist_entry *)&buf[i];
+
+        lua_newtable(L);
+
+        /* MHz */
+        lua_pushinteger(L, e->mhz);
+        lua_setfield(L, -2, "mhz");
+
+        /* Channel */
+        lua_pushinteger(L, e->channel);
+        lua_setfield(L, -2, "channel");
+
+        /* Restricted (DFS/TPC/Radar) */
+        lua_pushboolean(L, e->restricted);
+        lua_setfield(L, -2, "restricted");
+
+        lua_rawseti(L, -2, j++);
+    }
+
+done:
+    iwinfo_finish();
+    return ret;
+}
+
+static const luaL_Reg funcs[] = {
+    {"info", lua_iwinfo_info},
+    {"freqlist", lua_iwinfo_freqlist},
+    {NULL, NULL}
+};
+
+int luaopen_iwinfo(lua_State *L)
+{
+    luaL_newlib(L, funcs);
+
+    return 1;
+}
diff --git a/libuci-lua-53/Makefile b/libuci-lua-53/Makefile
new file mode 100644
index 00000000..3675ea94
--- /dev/null
+++ b/libuci-lua-53/Makefile
@@ -0,0 +1,29 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libuci-lua53
+PKG_RELEASE:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libuci-lua53
+  SECTION=libs
+  CATEGORY=Libraries
+  DEPENDS:=+libuci +liblua5.3
+  TITLE:=Lua5.3 plugin for UCI
+endef
+
+TARGET_CFLAGS += $(FPIC) -I$(STAGING_DIR)/usr/include/lua5.3
+TARGET_LDFLAGS += -luci
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -shared \
+		$(PKG_BUILD_DIR)/uci.c \
+		-o $(PKG_BUILD_DIR)/uci.so
+endef
+
+define Package/libuci-lua53/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3
+	$(CP) $(PKG_BUILD_DIR)/uci.so $(1)/usr/local/lib/lua/5.3
+endef
+
+$(eval $(call BuildPackage,libuci-lua53))
diff --git a/libuci-lua-53/src/uci.c b/libuci-lua-53/src/uci.c
new file mode 100755
index 00000000..82cf369b
--- /dev/null
+++ b/libuci-lua-53/src/uci.c
@@ -0,0 +1,1120 @@
+/*
+ * libuci plugin for Lua
+ * Copyright (C) 2008 Felix Fietkau <nbd@openwrt.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <stdbool.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <lauxlib.h>
+#include <uci.h>
+
+#define MODNAME        "uci"
+#define METANAME       MODNAME ".meta"
+//#define DEBUG 1
+
+#ifdef DEBUG
+#define DPRINTF(...) fprintf(stderr, __VA_ARGS__)
+#else
+#define DPRINTF(...) do {} while (0)
+#endif
+
+static struct uci_context *global_ctx = NULL;
+
+static struct uci_context *
+find_context(lua_State *L, int *offset)
+{
+	struct uci_context **ctx;
+	if (!lua_isuserdata(L, 1)) {
+		if (!global_ctx) {
+			global_ctx = uci_alloc_context();
+			if (!global_ctx) {
+				luaL_error(L, "failed to allocate UCI context");
+				return NULL;
+			}
+		}
+		if (offset)
+			*offset = 0;
+		return global_ctx;
+	}
+	if (offset)
+		*offset = 1;
+	ctx = luaL_checkudata(L, 1, METANAME);
+	if (!ctx || !*ctx) {
+		luaL_error(L, "failed to get UCI context");
+		return NULL;
+	}
+
+	return *ctx;
+}
+
+static struct uci_package *
+find_package(lua_State *L, struct uci_context *ctx, const char *str, bool al)
+{
+	struct uci_package *p = NULL;
+	struct uci_element *e;
+	char *sep;
+	char *name;
+
+	sep = strchr(str, '.');
+	if (sep) {
+		name = malloc(1 + sep - str);
+		if (!name) {
+			luaL_error(L, "out of memory");
+			return NULL;
+		}
+		strncpy(name, str, sep - str);
+		name[sep - str] = 0;
+	} else
+		name = (char *) str;
+
+	uci_foreach_element(&ctx->root, e) {
+		if (strcmp(e->name, name) != 0)
+			continue;
+
+		p = uci_to_package(e);
+		goto done;
+	}
+
+	if (al)
+		uci_load(ctx, name, &p);
+
+done:
+	if (name != str)
+		free(name);
+	return p;
+}
+
+static int
+lookup_extended(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool extended)
+{
+	int rv;
+	struct uci_ptr lookup;
+
+	/* use a copy of the passed ptr since failing lookups will
+	 * clobber the state */
+	lookup = *ptr;
+	lookup.flags |= UCI_LOOKUP_EXTENDED;
+
+	rv = uci_lookup_ptr(ctx, &lookup, str, extended);
+
+	/* copy to passed ptr on success */
+	if (!rv)
+		*ptr = lookup;
+
+	return rv;
+}
+
+static int
+lookup_ptr(struct uci_context *ctx, struct uci_ptr *ptr, char *str, bool extended)
+{
+	if (ptr && !ptr->s && ptr->section && *ptr->section == '@')
+		return lookup_extended(ctx, ptr, str, extended);
+
+	return uci_lookup_ptr(ctx, ptr, str, extended);
+}
+
+static int
+lookup_args(lua_State *L, struct uci_context *ctx, int offset, struct uci_ptr *ptr, char **buf)
+{
+	char *s = NULL;
+	int n;
+
+	n = lua_gettop(L);
+	luaL_checkstring(L, 1 + offset);
+	s = strdup(lua_tostring(L, 1 + offset));
+	if (!s)
+		goto error;
+
+	memset(ptr, 0, sizeof(struct uci_ptr));
+	if (!find_package(L, ctx, s, true))
+		goto error;
+
+	switch (n - offset) {
+	case 4:
+	case 3:
+		ptr->option = luaL_checkstring(L, 3 + offset);
+		/* fall through */
+	case 2:
+		ptr->section = luaL_checkstring(L, 2 + offset);
+		ptr->package = luaL_checkstring(L, 1 + offset);
+		if (lookup_ptr(ctx, ptr, NULL, true) != UCI_OK)
+			goto error;
+		break;
+	case 1:
+		if (lookup_ptr(ctx, ptr, s, true) != UCI_OK)
+			goto error;
+		break;
+	default:
+		luaL_error(L, "invalid argument count");
+		goto error;
+	}
+
+	*buf = s;
+	return 0;
+
+error:
+	if (s)
+		free(s);
+	return 1;
+}
+
+static int
+uci_push_status(lua_State *L, struct uci_context *ctx, bool hasarg)
+{
+	char *str = NULL;
+
+	if (!hasarg)
+		lua_pushboolean(L, (ctx->err == UCI_OK));
+	if (ctx->err) {
+		uci_get_errorstr(ctx, &str, MODNAME);
+		if (str) {
+			lua_pushstring(L, str);
+			free(str);
+			return 2;
+		}
+	}
+	return 1;
+}
+
+static void
+uci_push_option(lua_State *L, struct uci_option *o)
+{
+	struct uci_element *e;
+	int i = 0;
+
+	switch(o->type) {
+	case UCI_TYPE_STRING:
+		lua_pushstring(L, o->v.string);
+		break;
+	case UCI_TYPE_LIST:
+		lua_newtable(L);
+		uci_foreach_element(&o->v.list, e) {
+			i++;
+			lua_pushstring(L, e->name);
+			lua_rawseti(L, -2, i);
+		}
+		break;
+	default:
+		lua_pushnil(L);
+		break;
+	}
+}
+
+static void
+uci_push_section(lua_State *L, struct uci_section *s, int index)
+{
+	struct uci_element *e;
+
+	lua_newtable(L);
+	lua_pushboolean(L, s->anonymous);
+	lua_setfield(L, -2, ".anonymous");
+	lua_pushstring(L, s->type);
+	lua_setfield(L, -2, ".type");
+	lua_pushstring(L, s->e.name);
+	lua_setfield(L, -2, ".name");
+	if (index >= 0) {
+		lua_pushinteger(L, index);
+		lua_setfield(L, -2, ".index");
+	}
+
+	uci_foreach_element(&s->options, e) {
+		struct uci_option *o = uci_to_option(e);
+		uci_push_option(L, o);
+		lua_setfield(L, -2, o->e.name);
+	}
+}
+
+static void
+uci_push_package(lua_State *L, struct uci_package *p)
+{
+	struct uci_element *e;
+	int i = 0;
+
+	lua_newtable(L);
+	uci_foreach_element(&p->sections, e) {
+		uci_push_section(L, uci_to_section(e), i);
+		lua_setfield(L, -2, e->name);
+		i++;
+	}
+}
+
+static int
+uci_lua_unload(lua_State *L)
+{
+	struct uci_context *ctx;
+	struct uci_package *p;
+	const char *s;
+	int offset = 0;
+
+	ctx = find_context(L, &offset);
+	luaL_checkstring(L, 1 + offset);
+	s = lua_tostring(L, 1 + offset);
+	p = find_package(L, ctx, s, false);
+	if (p) {
+		uci_unload(ctx, p);
+		return uci_push_status(L, ctx, false);
+	} else {
+		lua_pushboolean(L, 0);
+	}
+	return 1;
+}
+
+static int
+uci_lua_load(lua_State *L)
+{
+	struct uci_context *ctx;
+	struct uci_package *p = NULL;
+	const char *s;
+	int offset = 0;
+
+	ctx = find_context(L, &offset);
+	uci_lua_unload(L);
+	lua_pop(L, 1); /* bool ret value of unload */
+	s = lua_tostring(L, -1);
+
+	uci_load(ctx, s, &p);
+	return uci_push_status(L, ctx, false);
+}
+
+
+static int
+uci_lua_foreach(lua_State *L)
+{
+	struct uci_context *ctx;
+	struct uci_package *p;
+	struct uci_element *e, *tmp;
+	const char *package, *type;
+	bool ret = false;
+	int offset = 0;
+	int i = 0;
+
+	ctx = find_context(L, &offset);
+	package = luaL_checkstring(L, 1 + offset);
+
+	if (lua_isnil(L, 2 + offset))
+		type = NULL;
+	else
+		type = luaL_checkstring(L, 2 + offset);
+
+	if (!lua_isfunction(L, 3 + offset) || !package)
+		return luaL_error(L, "Invalid argument");
+
+	p = find_package(L, ctx, package, true);
+	if (!p)
+		goto done;
+
+	uci_foreach_element_safe(&p->sections, tmp, e) {
+		struct uci_section *s = uci_to_section(e);
+
+		i++;
+
+		if (type && (strcmp(s->type, type) != 0))
+			continue;
+
+		lua_pushvalue(L, 3 + offset); /* iterator function */
+		uci_push_section(L, s, i - 1);
+		if (lua_pcall(L, 1, 1, 0) == 0) {
+			ret = true;
+			if (lua_isboolean(L, -1) && !lua_toboolean(L, -1))
+				break;
+		}
+		else
+		{
+			lua_error(L);
+			break;
+		}
+	}
+
+done:
+	lua_pushboolean(L, ret);
+	return 1;
+}
+
+
+
+static int
+uci_lua_each_iter(lua_State *L)
+{
+	const char *type = lua_tostring(L, lua_upvalueindex(1));
+	const struct uci_list *list = lua_topointer(L, lua_upvalueindex(2));
+	struct uci_element *e = (struct uci_element *)lua_topointer(L, lua_upvalueindex(3));
+	struct uci_element *tmp = (struct uci_element *)lua_topointer(L, lua_upvalueindex(4));
+	int i = lua_tointeger(L, lua_upvalueindex(5));
+	struct uci_section *s;
+
+again:
+	if (i) {
+		e = tmp;
+		tmp = list_to_element(e->list.next);
+	}
+
+	if (&e->list == list)
+		return 0;
+
+	s = uci_to_section(e);
+
+	i++;
+
+	if (type && (strcmp(s->type, type) != 0))
+		goto again;
+
+	lua_pushlightuserdata(L, tmp);
+	lua_replace(L, lua_upvalueindex(4));
+
+	lua_pushlightuserdata(L, e);
+	lua_replace(L, lua_upvalueindex(3));
+
+	lua_pushinteger(L, i);
+	lua_replace(L, lua_upvalueindex(5));
+
+	uci_push_section(L, s, i - 1);
+
+	return 1;
+}
+
+static int
+uci_lua_each(lua_State *L)
+{
+	struct uci_context *ctx;
+	struct uci_package *p;
+	struct uci_element *e, *tmp;
+	const char *package, *type;
+	int offset = 0;
+	int i = 0;
+
+	ctx = find_context(L, &offset);
+	package = luaL_checkstring(L, 1 + offset);
+
+	if (lua_isnil(L, 2 + offset))
+		type = NULL;
+	else
+		type = luaL_checkstring(L, 2 + offset);
+
+	p = find_package(L, ctx, package, true);
+	if (!p) {
+		lua_pushnil(L);
+		return 1;
+	}
+
+	e = list_to_element(p->sections.next);
+	tmp = list_to_element(e->list.next);
+
+	if (type)
+		lua_pushstring(L, type);
+	else
+		lua_pushnil(L);
+
+	lua_pushlightuserdata(L, &p->sections);
+	lua_pushlightuserdata(L, tmp);
+	lua_pushlightuserdata(L, e);
+	lua_pushinteger(L, i);
+
+	lua_pushcclosure(L, uci_lua_each_iter, 5);
+	return 1;
+}
+
+static int
+uci_lua_get_any(lua_State *L, bool all)
+{
+	struct uci_context *ctx;
+	struct uci_ptr ptr;
+	int offset = 0;
+	int nret = 1;
+	char *s = NULL;
+
+	ctx = find_context(L, &offset);
+
+	if (lookup_args(L, ctx, offset, &ptr, &s))
+		goto error;
+
+	if (!all && !ptr.s) {
+		ctx->err = UCI_ERR_INVAL;
+		goto error;
+	}
+	if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
+		ctx->err = UCI_ERR_NOTFOUND;
+		goto error;
+	}
+
+	if (ptr.o) {
+		uci_push_option(L, ptr.o);
+	} else if (ptr.s) {
+		if (all) {
+			uci_push_section(L, ptr.s, -1);
+		}
+		else {
+			lua_pushstring(L, ptr.s->type);
+			lua_pushstring(L, ptr.s->e.name);
+			nret++;
+		}
+	} else {
+		uci_push_package(L, ptr.p);
+	}
+
+	if (s)
+		free(s);
+	return nret;
+
+error:
+	if (s)
+		free(s);
+
+	lua_pushnil(L);
+	return uci_push_status(L, ctx, true);
+}
+
+static int
+uci_lua_get(lua_State *L)
+{
+	return uci_lua_get_any(L, false);
+}
+
+static int
+uci_lua_get_all(lua_State *L)
+{
+	return uci_lua_get_any(L, true);
+}
+
+static int
+uci_lua_add(lua_State *L)
+{
+	struct uci_context *ctx;
+	struct uci_section *s = NULL;
+	struct uci_package *p;
+	const char *package;
+	const char *type;
+	const char *name = NULL;
+	int offset = 0;
+
+	ctx = find_context(L, &offset);
+	package = luaL_checkstring(L, 1 + offset);
+	type = luaL_checkstring(L, 2 + offset);
+	p = find_package(L, ctx, package, true);
+	if (!p)
+		goto fail;
+
+	if (uci_add_section(ctx, p, type, &s) || !s)
+		goto fail;
+
+	name = s->e.name;
+	lua_pushstring(L, name);
+	return 1;
+
+fail:
+	lua_pushnil(L);
+	return uci_push_status(L, ctx, true);
+}
+
+static int
+uci_lua_delete(lua_State *L)
+{
+	struct uci_context *ctx;
+	struct uci_ptr ptr;
+	int offset = 0;
+	char *s = NULL;
+
+	ctx = find_context(L, &offset);
+
+	if (lookup_args(L, ctx, offset, &ptr, &s))
+		goto error;
+
+	uci_delete(ctx, &ptr);
+
+error:
+	if (s)
+		free(s);
+	return uci_push_status(L, ctx, false);
+}
+
+static int
+uci_lua_rename(lua_State *L)
+{
+	struct uci_context *ctx;
+	struct uci_ptr ptr;
+	int err = UCI_ERR_MEM;
+	char *s = NULL;
+	int nargs, offset = 0;
+
+	ctx = find_context(L, &offset);
+	nargs = lua_gettop(L);
+	if (lookup_args(L, ctx, offset, &ptr, &s))
+		goto error;
+
+	switch(nargs - offset) {
+	case 1:
+		/* Format: uci.set("p.s.o=v") or uci.set("p.s=v") */
+		break;
+	case 4:
+		/* Format: uci.set("p", "s", "o", "v") */
+		ptr.value = luaL_checkstring(L, nargs);
+		break;
+	case 3:
+		/* Format: uci.set("p", "s", "v") */
+		ptr.value = ptr.option;
+		ptr.option = NULL;
+		break;
+	default:
+		ctx->err = UCI_ERR_INVAL;
+		goto error;
+	}
+
+	err = lookup_ptr(ctx, &ptr, NULL, true);
+	if (err)
+		goto error;
+
+	if (((ptr.s == NULL) && (ptr.option != NULL)) || (ptr.value == NULL)) {
+		ctx->err = UCI_ERR_INVAL;
+		goto error;
+	}
+
+	err = uci_rename(ctx, &ptr);
+	if (err)
+		goto error;
+
+error:
+	if (s)
+		free(s);
+	return uci_push_status(L, ctx, false);
+}
+
+static int
+uci_lua_reorder(lua_State *L)
+{
+	struct uci_context *ctx;
+	struct uci_ptr ptr;
+	int err = UCI_ERR_MEM;
+	char *s = NULL;
+	int nargs, offset = 0;
+
+	ctx = find_context(L, &offset);
+	nargs = lua_gettop(L);
+	if (lookup_args(L, ctx, offset, &ptr, &s))
+		goto error;
+
+	switch(nargs - offset) {
+	case 1:
+		/* Format: uci.set("p.s=v") or uci.set("p.s=v") */
+		if (ptr.option) {
+			ctx->err = UCI_ERR_INVAL;
+			goto error;
+		}
+		break;
+	case 3:
+		/* Format: uci.set("p", "s", "v") */
+		ptr.value = ptr.option;
+		ptr.option = NULL;
+		break;
+	default:
+		ctx->err = UCI_ERR_INVAL;
+		goto error;
+	}
+
+	err = lookup_ptr(ctx, &ptr, NULL, true);
+	if (err)
+		goto error;
+
+	if ((ptr.s == NULL) || (ptr.value == NULL)) {
+		ctx->err = UCI_ERR_INVAL;
+		goto error;
+	}
+
+	err = uci_reorder_section(ctx, ptr.s, strtoul(ptr.value, NULL, 10));
+	if (err)
+		goto error;
+
+error:
+	if (s)
+		free(s);
+	return uci_push_status(L, ctx, false);
+}
+
+
+static int
+uci_lua_set(lua_State *L)
+{
+	struct uci_context *ctx;
+	struct uci_ptr ptr;
+	bool istable = false;
+	int err = UCI_ERR_MEM;
+	char *s = NULL;
+	const char *v;
+	unsigned int i;
+	int nargs, offset = 0;
+
+	ctx = find_context(L, &offset);
+	nargs = lua_gettop(L);
+	if (lookup_args(L, ctx, offset, &ptr, &s))
+		goto error;
+
+	switch(nargs - offset) {
+	case 1:
+		/* Format: uci.set("p.s.o=v") or uci.set("p.s=v") */
+		break;
+	case 4:
+		/* Format: uci.set("p", "s", "o", "v") */
+		if (lua_istable(L, nargs)) {
+			if (lua_rawlen(L, nargs) < 1) {
+				free(s);
+				return luaL_error(L, "Cannot set an uci option to an empty table value");
+			}
+			lua_rawgeti(L, nargs, 1);
+			ptr.value = luaL_checkstring(L, -1);
+			lua_pop(L, 1);
+			istable = true;
+		} else {
+			ptr.value = luaL_checkstring(L, nargs);
+		}
+		break;
+	case 3:
+		/* Format: uci.set("p", "s", "v") */
+		ptr.value = ptr.option;
+		ptr.option = NULL;
+		break;
+	default:
+		ctx->err = UCI_ERR_INVAL;
+		goto error;
+	}
+
+	err = lookup_ptr(ctx, &ptr, NULL, true);
+	if (err)
+		goto error;
+
+	if (((ptr.s == NULL) && (ptr.option != NULL)) || (ptr.value == NULL)) {
+		ctx->err = UCI_ERR_INVAL;
+		goto error;
+	}
+
+	if (istable) {
+		if (lua_rawlen(L, nargs) == 1) {
+			i = 1;
+			if (ptr.o) {
+				v = ptr.value;
+				ptr.value = NULL;
+				err = uci_delete(ctx, &ptr);
+				if (err)
+					goto error;
+				ptr.value = v;
+			}
+		} else {
+			i = 2;
+			err = uci_set(ctx, &ptr);
+			if (err)
+				goto error;
+		}
+
+		for (; i <= lua_rawlen(L, nargs); i++) {
+			lua_rawgeti(L, nargs, i);
+			ptr.value = luaL_checkstring(L, -1);
+			err = uci_add_list(ctx, &ptr);
+			lua_pop(L, 1);
+			if (err)
+				goto error;
+		}
+	} else {
+		err = uci_set(ctx, &ptr);
+		if (err)
+			goto error;
+	}
+
+
+error:
+	if (s)
+		free(s);
+	return uci_push_status(L, ctx, false);
+}
+
+enum pkg_cmd {
+	CMD_SAVE,
+	CMD_COMMIT,
+	CMD_REVERT
+};
+
+static int
+uci_lua_package_cmd(lua_State *L, enum pkg_cmd cmd)
+{
+	struct uci_context *ctx;
+	struct uci_element *e, *tmp;
+	struct uci_ptr ptr;
+	char *s = NULL;
+	int nargs, offset = 0;
+
+	ctx = find_context(L, &offset);
+	nargs = lua_gettop(L);
+	if ((cmd != CMD_REVERT) && (nargs - offset > 1))
+		goto err;
+
+	if (lookup_args(L, ctx, offset, &ptr, &s))
+		goto err;
+
+	lookup_ptr(ctx, &ptr, NULL, true);
+
+	uci_foreach_element_safe(&ctx->root, tmp, e) {
+		struct uci_package *p = uci_to_package(e);
+
+		if (ptr.p && (ptr.p != p))
+			continue;
+
+		ptr.p = p;
+		switch(cmd) {
+		case CMD_COMMIT:
+			uci_commit(ctx, &p, false);
+			break;
+		case CMD_SAVE:
+			uci_save(ctx, p);
+			break;
+		case CMD_REVERT:
+			uci_revert(ctx, &ptr);
+			break;
+		}
+	}
+
+err:
+	if (s)
+		free(s);
+	return uci_push_status(L, ctx, false);
+}
+
+static int
+uci_lua_save(lua_State *L)
+{
+	return uci_lua_package_cmd(L, CMD_SAVE);
+}
+
+static int
+uci_lua_commit(lua_State *L)
+{
+	return uci_lua_package_cmd(L, CMD_COMMIT);
+}
+
+static int
+uci_lua_revert(lua_State *L)
+{
+	return uci_lua_package_cmd(L, CMD_REVERT);
+}
+
+static void
+uci_lua_add_change(lua_State *L, struct uci_element *e)
+{
+	struct uci_delta *h;
+	const char *name;
+	const char *value;
+
+	h = uci_to_delta(e);
+	if (!h->section)
+		return;
+
+	lua_getfield(L, -1, h->section);
+	if (lua_isnil(L, -1)) {
+		lua_pop(L, 1);
+		lua_newtable(L);
+		lua_pushvalue(L, -1); /* copy for setfield */
+		lua_setfield(L, -3, h->section);
+	}
+
+	name = h->e.name;
+	value = h->value ? h->value : "";
+
+	if (name) {
+		lua_getfield(L, -1, name);
+
+		/* this delta is a list add operation */
+		if (h->cmd == UCI_CMD_LIST_ADD) {
+			/* there seems to be no table yet */
+			if (!lua_istable(L, -1)) {
+				lua_newtable(L);
+
+				/* if there is a value on the stack already, add */
+				if (!lua_isnil(L, -2)) {
+					lua_pushvalue(L, -2);
+					lua_rawseti(L, -2, 1);
+					lua_pushstring(L, value);
+					lua_rawseti(L, -2, 2);
+
+				/* this is the first table item */
+				} else {
+					lua_pushstring(L, value);
+					lua_rawseti(L, -2, 1);
+				}
+
+				lua_setfield(L, -3, name);
+
+			/* a table is on the top of the stack and this is a subsequent,
+			 * list_add, append this value to table */
+			} else {
+				lua_pushstring(L, value);
+				lua_rawseti(L, -2, lua_rawlen(L, -2) + 1);
+			}
+
+		/* non-list change, simply set/replace field */
+		} else {
+			lua_pushstring(L, value);
+			lua_setfield(L, -3, name);
+		}
+
+		lua_pop(L, 1);
+	} else {
+		lua_pushstring(L, value);
+		lua_setfield(L, -2, ".type");
+	}
+
+	lua_pop(L, 1);
+}
+
+static void
+uci_lua_changes_pkg(lua_State *L, struct uci_context *ctx, const char *package)
+{
+	struct uci_package *p = NULL;
+	struct uci_element *e;
+	bool autoload = false;
+
+	p = find_package(L, ctx, package, false);
+	if (!p) {
+		autoload = true;
+		p = find_package(L, ctx, package, true);
+		if (!p)
+			return;
+	}
+
+	if (uci_list_empty(&p->delta) && uci_list_empty(&p->saved_delta))
+		goto done;
+
+	lua_newtable(L);
+	uci_foreach_element(&p->saved_delta, e) {
+		uci_lua_add_change(L, e);
+	}
+	uci_foreach_element(&p->delta, e) {
+		uci_lua_add_change(L, e);
+	}
+	lua_setfield(L, -2, p->e.name);
+
+done:
+	if (autoload)
+		uci_unload(ctx, p);
+}
+
+static int
+uci_lua_changes(lua_State *L)
+{
+	struct uci_context *ctx;
+	const char *package = NULL;
+	char **config = NULL;
+	int nargs;
+	int i, offset = 0;
+
+	ctx = find_context(L, &offset);
+	nargs = lua_gettop(L);
+	switch(nargs - offset) {
+	case 1:
+		package = luaL_checkstring(L, 1 + offset);
+	case 0:
+		break;
+	default:
+		return luaL_error(L, "invalid argument count");
+	}
+
+	lua_newtable(L);
+	if (package) {
+		uci_lua_changes_pkg(L, ctx, package);
+		return 1;
+	}
+
+	if ((uci_list_configs(ctx, &config) != UCI_OK) || !config)
+		return 1;
+
+	for (i = 0; config[i] != NULL; i++) {
+		uci_lua_changes_pkg(L, ctx, config[i]);
+	}
+
+	free(config);
+	return 1;
+}
+
+static int
+uci_lua_get_confdir(lua_State *L)
+{
+	struct uci_context *ctx = find_context(L, NULL);
+	lua_pushstring(L, ctx->confdir);
+	return 1;
+}
+
+static int
+uci_lua_set_confdir(lua_State *L)
+{
+	struct uci_context *ctx;
+	int offset = 0;
+
+	ctx = find_context(L, &offset);
+	luaL_checkstring(L, 1 + offset);
+	uci_set_confdir(ctx, lua_tostring(L, -1));
+	return uci_push_status(L, ctx, false);
+}
+
+static int
+uci_lua_get_savedir(lua_State *L)
+{
+	struct uci_context *ctx = find_context(L, NULL);
+	lua_pushstring(L, ctx->savedir);
+	return 1;
+}
+
+static int
+uci_lua_add_delta(lua_State *L)
+{
+	struct uci_context *ctx;
+	int offset = 0;
+
+	ctx = find_context(L, &offset);
+	luaL_checkstring(L, 1 + offset);
+	uci_add_delta_path(ctx, lua_tostring(L, -1));
+	return uci_push_status(L, ctx, false);
+}
+
+static int
+uci_lua_set_savedir(lua_State *L)
+{
+	struct uci_context *ctx;
+	int offset = 0;
+
+	ctx = find_context(L, &offset);
+	luaL_checkstring(L, 1 + offset);
+	uci_set_savedir(ctx, lua_tostring(L, -1));
+	return uci_push_status(L, ctx, false);
+}
+
+static int
+uci_lua_list_configs(lua_State *L)
+{
+	struct uci_context *ctx;
+	char **configs = NULL;
+	char **ptr;
+	int i = 1;
+
+	ctx = find_context(L, NULL);
+	if ((uci_list_configs(ctx, &configs) != UCI_OK) || !configs)
+		return uci_push_status(L, ctx, false);
+	lua_newtable(L);
+	for (ptr = configs; *ptr; ptr++) {
+		lua_pushstring(L, *ptr);
+		lua_rawseti(L, -2, i++);
+	}
+	free(configs);
+	return 1;
+}
+
+static int
+uci_lua_gc(lua_State *L)
+{
+	struct uci_context **ctx;
+
+	if (!lua_isuserdata(L, 1)) {
+		if (!global_ctx)
+			return 0;
+		ctx = &global_ctx;
+	} else {
+		ctx = luaL_checkudata(L, 1, METANAME);
+		if (!*ctx)
+			return 0;
+	}
+	uci_free_context(*ctx);
+	*ctx = NULL;
+	return 0;
+}
+
+static int
+uci_lua_cursor(lua_State *L)
+{
+	struct uci_context **u;
+	int argc = lua_gettop(L);
+
+	u = lua_newuserdata(L, sizeof(struct uci_context *));
+	luaL_getmetatable(L, METANAME);
+	lua_setmetatable(L, -2);
+
+	*u = uci_alloc_context();
+	if (!*u)
+		return luaL_error(L, "Cannot allocate UCI context");
+	switch (argc) {
+		case 2:
+			if (lua_isstring(L, 2) &&
+				(uci_set_savedir(*u, luaL_checkstring(L, 2)) != UCI_OK))
+				return luaL_error(L, "Unable to set savedir");
+			/* fall through */
+		case 1:
+			if (lua_isstring(L, 1) &&
+				(uci_set_confdir(*u, luaL_checkstring(L, 1)) != UCI_OK))
+				return luaL_error(L, "Unable to set confdir");
+			break;
+		default:
+			break;
+	}
+	return 1;
+}
+
+static const luaL_Reg uci[] = {
+	{ "__gc", uci_lua_gc },
+	{ "close", uci_lua_gc },
+	{ "cursor", uci_lua_cursor },
+	{ "load", uci_lua_load },
+	{ "unload", uci_lua_unload },
+	{ "get", uci_lua_get },
+	{ "get_all", uci_lua_get_all },
+	{ "add", uci_lua_add },
+	{ "set", uci_lua_set },
+	{ "rename", uci_lua_rename },
+	{ "save", uci_lua_save },
+	{ "delete", uci_lua_delete },
+	{ "commit", uci_lua_commit },
+	{ "revert", uci_lua_revert },
+	{ "reorder", uci_lua_reorder },
+	{ "changes", uci_lua_changes },
+	{ "foreach", uci_lua_foreach },
+	{ "each", uci_lua_each },
+	{ "add_history", uci_lua_add_delta },
+	{ "add_delta", uci_lua_add_delta },
+	{ "get_confdir", uci_lua_get_confdir },
+	{ "set_confdir", uci_lua_set_confdir },
+	{ "get_savedir", uci_lua_get_savedir },
+	{ "set_savedir", uci_lua_set_savedir },
+	{ "list_configs", uci_lua_list_configs },
+	{ NULL, NULL },
+};
+
+
+int
+luaopen_uci(lua_State *L)
+{
+	/* create metatable */
+	luaL_newmetatable(L, METANAME);
+
+	/* metatable.__index = metatable */
+	lua_pushvalue(L, -1);
+	lua_setfield(L, -2, "__index");
+
+	/* fill metatable */
+	luaL_setfuncs(L, uci, 0);
+	lua_pop(L, 1);
+
+	/* create module */
+	lua_newtable(L);
+	lua_pushvalue(L, -1);
+	luaL_setfuncs(L, uci, 0);
+	lua_setglobal(L, MODNAME);
+
+	return 1;
+}
diff --git a/libuhttpd/Makefile b/libuhttpd/Makefile
new file mode 100644
index 00000000..51442f07
--- /dev/null
+++ b/libuhttpd/Makefile
@@ -0,0 +1,63 @@
+#
+# Copyright (C) 2018 Jianhui Zhao
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libuhttpd
+PKG_VERSION:=3.14.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL=https://github.com/zhaojh329/libuhttpd/releases/download/v$(PKG_VERSION)
+PKG_HASH:=512d4abfced0ec916d985d3d1eac7528e6676eecae6aca27fdaf313374e29f16
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_PARALLEL:=1
+CMAKE_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/libuhttpd/Default
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=Networking
+  TITLE:=A lightweight HTTP server library based on libev
+  URL:=https://github.com/zhaojh329/libuhttpd
+  DEPENDS:=+libev $(2)
+  VARIANT:=$(1)
+  PROVIDES:=libuhttpd
+endef
+
+Package/libuhttpd-openssl=$(call Package/libuhttpd/Default,openssl,+PACKAGE_libuhttpd-openssl:libopenssl)
+Package/libuhttpd-wolfssl=$(call Package/libuhttpd/Default,wolfssl,+PACKAGE_libuhttpd-wolfssl:libwolfssl)
+Package/libuhttpd-mbedtls=$(call Package/libuhttpd/Default,mbedtls,+PACKAGE_libuhttpd-mbedtls:libmbedtls +PACKAGE_libuhttpd-mbedtls:zlib)
+Package/libuhttpd-nossl=$(call Package/libuhttpd/Default,nossl)
+
+ifeq ($(BUILD_VARIANT),openssl)
+  CMAKE_OPTIONS += -DUSE_OPENSSL=ON
+else ifeq ($(BUILD_VARIANT),wolfssl)
+  CMAKE_OPTIONS += -DUSE_WOLFSSL=ON
+else ifeq ($(BUILD_VARIANT),mbedtls)
+  CMAKE_OPTIONS += -DUSE_MBEDTLS=ON
+else
+  CMAKE_OPTIONS += -DSSL_SUPPORT=OFF
+endif
+
+define Package/libuhttpd-$(BUILD_VARIANT)/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libuhttpd.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libuhttpd-openssl))
+$(eval $(call BuildPackage,libuhttpd-mbedtls))
+$(eval $(call BuildPackage,libuhttpd-wolfssl))
+$(eval $(call BuildPackage,libuhttpd-nossl))
diff --git a/libuhttpd/patches/0001-feat-gzip-support-application-json.patch b/libuhttpd/patches/0001-feat-gzip-support-application-json.patch
new file mode 100644
index 00000000..d3d14fd5
--- /dev/null
+++ b/libuhttpd/patches/0001-feat-gzip-support-application-json.patch
@@ -0,0 +1,27 @@
+From 5abf120d8ac4b34fe1170e283a398495fb28b91f Mon Sep 17 00:00:00 2001
+From: Jianhui Zhao <zhaojh329@gmail.com>
+Date: Wed, 10 Nov 2021 08:05:57 +0000
+Subject: [PATCH] feat: gzip: support "application/json"
+
+Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
+---
+ src/file.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/file.c b/src/file.c
+index bca99a8..f3549e3 100644
+--- a/src/file.c
++++ b/src/file.c
+@@ -206,7 +206,8 @@ static void file_if_gzip(struct uh_connection *conn, const char *path, const cha
+     if (!hdr.p || !memmem(hdr.p, hdr.len, "gzip", 4))
+         return;
+ 
+-    if (strcmp(mime, "text/css") && strcmp(mime, "text/javascript") && strcmp(mime, "text/html"))
++    if (strcmp(mime, "text/css") && strcmp(mime, "text/javascript") && strcmp(mime, "text/html") &&
++        strcmp(mime, "application/json"))
+         return;
+ 
+     fd = open(path, O_RDONLY);
+-- 
+2.25.1
+
diff --git a/libuhttpd/patches/0002-feat-add-api-send_file.patch b/libuhttpd/patches/0002-feat-add-api-send_file.patch
new file mode 100644
index 00000000..007c68bd
--- /dev/null
+++ b/libuhttpd/patches/0002-feat-add-api-send_file.patch
@@ -0,0 +1,77 @@
+From 5816775684388693238743116bd41551e8f6013c Mon Sep 17 00:00:00 2001
+From: gl-zhaojianhui <jianhui.zhao@gl-inet.com>
+Date: Tue, 23 Nov 2021 14:32:23 +0800
+Subject: [PATCH] feat: add api: send_file
+
+Signed-off-by: gl-zhaojianhui <jianhui.zhao@gl-inet.com>
+---
+ src/connection.c | 27 +++++++++++++++++++++++++++
+ src/uhttpd.h     |  2 ++
+ 2 files changed, 29 insertions(+)
+
+Index: libuhttpd-3.14.1/src/connection.c
+===================================================================
+--- libuhttpd-3.14.1.orig/src/connection.c
++++ libuhttpd-3.14.1/src/connection.c
+@@ -332,6 +332,39 @@ static bool conn_https_redirect(struct u
+     return true;
+ }
+ 
++static void conn_send_file(struct uh_connection *conn, const char *path, off_t offset, int64_t len)
++{
++    struct uh_connection_internal *conni = (struct uh_connection_internal *)conn;
++    int fd = -1;
++
++	fd = open(path, O_RDONLY);
++    if (fd < 0) {
++        log_err("open: %s\n", strerror(errno));
++        return;
++    }
++
++    if (lseek(fd, offset, SEEK_SET) == -1) {
++        log_err("lseek: %s\n", strerror(errno));
++        close(fd);
++        return;
++    }
++
++    /* If the file is greater than 2K, use sendfile */
++    if (len > 2048) {
++        conni->file.size = len;
++        conni->file.fd = fd;
++#ifdef SSL_SUPPORT
++        if (conni->ssl)
++            fcntl(fd, F_SETFL, fcntl(fd, F_GETFL, 0) | O_NONBLOCK);
++#endif
++    } else {
++        while (len)
++            len -= buffer_put_fd(&conni->wb, fd, len, NULL);
++
++        close(fd);
++    }
++}
++
+ static void conn_check_expect_100_continue(struct uh_connection *conn)
+ {
+     struct uh_str expect = conn->get_header(conn, "Expect");
+@@ -1065,6 +1098,8 @@ static void conn_init_cb(struct uh_conne
+     conn->send_redirect = conn_send_redirect;
+     conn->https_redirect = conn_https_redirect;
+ 
++    conn->send_file = conn_send_file;
++
+     conn->check_expect_100_continue = conn_check_expect_100_continue;
+ 
+     conn->end_response = conn_end_response;
+Index: libuhttpd-3.14.1/src/uhttpd.h
+===================================================================
+--- libuhttpd-3.14.1.orig/src/uhttpd.h
++++ libuhttpd-3.14.1/src/uhttpd.h
+@@ -122,6 +122,8 @@ struct uh_connection {
+     /* restriction: cannot send over 6553 bytes */
+     void (*vprintf)(struct uh_connection *conn, const char *format, va_list arg);
+ 
++    void (*send_file)(struct uh_connection *conn, const char *path, off_t offset, int64_t len);
++
+     /* Tells libuhttpd that we has replied all data to the client, no any more data to send */
+     void (*end_response)(struct uh_connection *conn);
+ 
diff --git a/lsqlite3-lua5.3/Makefile b/lsqlite3-lua5.3/Makefile
new file mode 100644
index 00000000..ea01356e
--- /dev/null
+++ b/lsqlite3-lua5.3/Makefile
@@ -0,0 +1,55 @@
+#
+# Copyright (C) 2006-2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lsqlite3-lua5.3-gl
+PKG_VERSION:=0.9.5
+PKG_RELEASE:=1
+
+PKG_SOURCE:=lsqlite3_fsl09y.zip
+PKG_SOURCE_URL:=http://lua.sqlite.org/index.cgi/zip/
+PKG_HASH:=d38402aa7640055d260c1246c36e6d6d31b425a25a805431f13695694466b722
+
+PKG_LICENSE:=MIT
+PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(basename $(PKG_SOURCE))
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lsqlite3-lua5.3-gl
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Lua wrapper for the SQLite3 library
+  URL:=http://lua.sqlite.org
+  DEPENDS:=+libsqlite3 +liblua5.3
+endef
+
+TARGET_CFLAGS += $(FPIC) -std=gnu99
+TARGET_CPPFLAGS += -DLUA_USE_LINUX
+TARGET_LDFLAGS += -lsqlite3 -lpthread
+
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/lua5.3
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_CPPFLAGS) \
+		-c $(PKG_BUILD_DIR)/lsqlite3.c \
+		-o $(PKG_BUILD_DIR)/lsqlite3.o \
+		-DLSQLITE_VERSION=\"$(PKG_VERSION)\"
+	$(TARGET_CC) $(TARGET_LDFLAGS) -shared \
+		$(PKG_BUILD_DIR)/lsqlite3.o \
+		-o $(PKG_BUILD_DIR)/lsqlite3.so
+endef
+
+define Package/lsqlite3-lua5.3-gl/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3
+	$(CP) $(PKG_BUILD_DIR)/*.so $(1)/usr/local/lib/lua/5.3
+endef
+
+$(eval $(call BuildPackage,lsqlite3-lua5.3-gl))
diff --git a/lua-cjson/Makefile b/lua-cjson/Makefile
new file mode 100644
index 00000000..38c35be5
--- /dev/null
+++ b/lua-cjson/Makefile
@@ -0,0 +1,79 @@
+#
+# Copyright (C) 2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lua-cjson
+PKG_VERSION:=2.1.0
+PKG_RELEASE:=1
+PKG_MAINTAINER:=Dirk Chang <dirk@kooiot.com>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/openresty/lua-cjson.git
+PKG_MIRROR_HASH:=892c3e70a9675d6ba4d1ae47a8dbc4d791664593d506f4d211ca08440b6b62a1
+PKG_SOURCE_DATE:=2021-10-25
+PKG_SOURCE_VERSION:=0f3dda34a35d93b92aba39a6c7b30d1d23918812
+
+# This is needed for openwrt-18.06
+PKG_BUILD_DIR = $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/lua-cjson/default
+  SUBMENU:=Lua
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=Lua CJSON parser
+  URL:=https://github.com/mpx/lua-cjson
+endef
+
+define Package/lua-cjson
+  $(Package/lua-cjson/default)
+  DEPENDS+=+liblua
+  VARIANT:=lua-51
+endef
+
+define Package/lua-cjson-lua5.3
+  $(Package/lua-cjson/default)
+  DEPENDS+=+liblua5.3
+  VARIANT:=lua-53
+endef
+
+TARGET_CFLAGS += $(FPIC) -std=gnu99
+
+ifeq ($(BUILD_VARIANT),lua-53)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/lua5.3
+endif
+
+TARGET_LDFLAGS += -lm
+
+define Build/Compile
+	$(TARGET_CC) $(TARGET_CFLAGS) $(TARGET_LDFLAGS) -shared \
+		$(PKG_BUILD_DIR)/fpconv.c \
+    $(PKG_BUILD_DIR)/lua_cjson.c \
+    $(PKG_BUILD_DIR)/strbuf.c \
+		-o $(PKG_BUILD_DIR)/cjson.so
+endef
+
+define Package/lua-cjson/install
+	$(INSTALL_DIR) $(1)/usr/lib/lua
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cjson.so $(1)/usr/lib/lua/
+
+	$(INSTALL_DIR) $(1)/usr/lib/lua/cjson
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/lua/cjson/util.lua $(1)/usr/lib/lua/cjson
+endef
+
+define Package/lua-cjson-lua5.3/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/cjson
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cjson.so $(1)/usr/local/lib/lua/5.3
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/lua/cjson/util.lua $(1)/usr/local/lib/lua/5.3/cjson
+endef
+
+$(eval $(call BuildPackage,lua-cjson))
+$(eval $(call BuildPackage,lua-cjson-lua5.3))
diff --git a/lua-cjson/patches/001-support-integer-in-lua5.3.patch b/lua-cjson/patches/001-support-integer-in-lua5.3.patch
new file mode 100644
index 00000000..303c33d0
--- /dev/null
+++ b/lua-cjson/patches/001-support-integer-in-lua5.3.patch
@@ -0,0 +1,14 @@
+--- a/lua_cjson.c
++++ b/lua_cjson.c
+@@ -1348,6 +1348,11 @@ static void json_process_value(lua_State
+         lua_pushlstring(l, token->value.string, token->string_len);
+         break;;
+     case T_NUMBER:
++#if LUA_VERSION_NUM > 502
++        if ((lua_Integer)token->value.number == token->value.number)
++            lua_pushinteger(l, (lua_Integer)token->value.number);
++        else
++#endif
+         lua_pushnumber(l, token->value.number);
+         break;;
+     case T_BOOLEAN:
diff --git a/lua-eco/Makefile b/lua-eco/Makefile
new file mode 100644
index 00000000..849226ae
--- /dev/null
+++ b/lua-eco/Makefile
@@ -0,0 +1,210 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=lua-eco
+PKG_VERSION:=3.5.1
+PKG_RELEASE:=2
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL=https://github.com/zhaojh329/lua-eco/releases/download/v$(PKG_VERSION)
+PKG_HASH:=eef79d98e06b682f9fca1f84f164b949c493582e01adb775bfb1c2dbcf2e8b42
+
+PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_CONFIG_DEPENDS:= \
+	LUA_ECO_OPENSSL \
+	LUA_ECO_WOLFSSL \
+	LUA_ECO_MBEDTLS
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/lua-eco
+  TITLE:=A Lua interpreter with a built-in libev event loop
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Lua
+  URL:=https://github.com/zhaojh329/lua-eco
+  DEPENDS:=+libev +liblua5.3
+endef
+
+define Package/lua-eco/description
+  Lua-eco is a Lua interpreter with a built-in event loop for scheduling
+  lightweight coroutines automatically, enabling efficient concurrency in
+  Lua. Build high-performance, scalable applications.
+endef
+
+define Package/lua-eco/Module
+  TITLE:=$1 support for lua-eco
+  SECTION:=lang
+  CATEGORY:=Languages
+  SUBMENU:=Lua
+  URL:=https://github.com/zhaojh329/lua-eco
+  DEPENDS:=+lua-eco $2
+endef
+
+Package/lua-eco-log=$(call Package/lua-eco/Module,log utils)
+Package/lua-eco-base64=$(call Package/lua-eco/Module,base64)
+Package/lua-eco-sha1=$(call Package/lua-eco/Module,sha1)
+Package/lua-eco-md5=$(call Package/lua-eco/Module,md5)
+Package/lua-eco-socket=$(call Package/lua-eco/Module,socket)
+Package/lua-eco-dns=$(call Package/lua-eco/Module,dns,+lua-eco-socket)
+Package/lua-eco-ssl=$(call Package/lua-eco/Module,ssl,\
+  +LUA_ECO_OPENSSL:libopenssl +LUA_ECO_WOLFSSL:libwolfssl \
+  +LUA_ECO_MBEDTLS:libmbedtls +LUA_ECO_MBEDTLS:zlib +lua-eco-socket)
+Package/lua-eco-ubus=$(call Package/lua-eco/Module,ubus,+libubus)
+Package/lua-eco-http=$(call Package/lua-eco/Module,http/https,+lua-eco-dns +lua-eco-ssl +lua-eco-base64 +lua-eco-log)
+Package/lua-eco-mqtt=$(call Package/lua-eco/Module,mqtt,+lua-eco-socket +lua-eco-ssl)
+Package/lua-eco-websocket=$(call Package/lua-eco/Module,websocket,+lua-eco-http +lua-eco-base64 +lua-eco-sha1)
+Package/lua-eco-termios=$(call Package/lua-eco/Module,termios)
+Package/lua-eco-netlink=$(call Package/lua-eco/Module,netlink,+lua-eco-socket)
+Package/lua-eco-ip=$(call Package/lua-eco/Module,ip utils,+lua-eco-netlink)
+Package/lua-eco-nl80211=$(call Package/lua-eco/Module,nl80211,+lua-eco-netlink)
+Package/lua-eco-ssh=$(call Package/lua-eco/Module,ssh,+lua-eco-socket +libssh2)
+
+define Package/lua-eco-ssl/config
+	choice
+		prompt "SSL Library"
+		default LUA_ECO_MBEDTLS
+
+		config LUA_ECO_OPENSSL
+			bool "OpenSSL"
+
+		config LUA_ECO_WOLFSSL
+			bool "wolfSSL"
+
+		config LUA_ECO_MBEDTLS
+			bool "mbedTLS"
+	endchoice
+endef
+
+CMAKE_OPTIONS += \
+  -DECO_UBUS_SUPPORT=O$(if $(CONFIG_PACKAGE_lua-eco-ubus),N,FF) \
+  -DECO_SSL_SUPPORT=O$(if $(CONFIG_PACKAGE_lua-eco-ssl),N,FF)
+
+ifneq ($(CONFIG_PACKAGE_lua-eco-ssl),)
+  ifneq ($(CONFIG_LUA_ECO_OPENSSL),)
+    CMAKE_OPTIONS += -DUSE_OPENSSL=ON
+  else ifneq ($(CONFIG_LUA_ECO_WOLFSSL),)
+    CMAKE_OPTIONS += -DUSE_WOLFSSL=ON
+  else ifneq ($(CONFIG_LUA_ECO_MBEDTLS),)
+    CMAKE_OPTIONS += -DUSE_MBEDTLS=ON
+  endif
+endif
+
+define Package/lua-eco/install
+	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/local/lib/lua/5.3/eco/core \
+		$(1)/usr/lib $(1)/usr/local/lib/lua/5.3/eco/encoding
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/eco $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libeco.so $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bufio.so $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/hex.lua $(1)/usr/local/lib/lua/5.3/eco/encoding
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/{time,bufio,sys,file}.so $(1)/usr/local/lib/lua/5.3/eco/core
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/{time,sys,file,sync}.lua $(1)/usr/local/lib/lua/5.3/eco
+endef
+
+define Package/lua-eco-log/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/log.so $(1)/usr/local/lib/lua/5.3/eco
+endef
+
+define Package/lua-eco-base64/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco/encoding
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/base64.so $(1)/usr/local/lib/lua/5.3/eco/encoding
+endef
+
+define Package/lua-eco-sha1/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco/hash
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/sha1.so $(1)/usr/local/lib/lua/5.3/eco/hash
+endef
+
+define Package/lua-eco-md5/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco/hash
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/md5.so $(1)/usr/local/lib/lua/5.3/eco/hash
+endef
+
+define Package/lua-eco-socket/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco/core
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/socket.lua $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/socket.so $(1)/usr/local/lib/lua/5.3/eco/core
+endef
+
+define Package/lua-eco-dns/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/dns.lua $(1)/usr/local/lib/lua/5.3/eco
+endef
+
+define Package/lua-eco-ssl/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco/core
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/ssl.lua $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ssl.so $(1)/usr/local/lib/lua/5.3/eco/core
+endef
+
+define Package/lua-eco-ubus/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco/core
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/ubus.lua $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ubus.so $(1)/usr/local/lib/lua/5.3/eco/core
+endef
+
+define Package/lua-eco-http/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco/http
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/http/*.lua $(1)/usr/local/lib/lua/5.3/eco/http
+endef
+
+define Package/lua-eco-mqtt/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/mqtt.lua $(1)/usr/local/lib/lua/5.3/eco
+endef
+
+define Package/lua-eco-websocket/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/websocket.lua $(1)/usr/local/lib/lua/5.3/eco
+endef
+
+define Package/lua-eco-termios/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/termios.so $(1)/usr/local/lib/lua/5.3/eco
+endef
+
+define Package/lua-eco-netlink/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco/core
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/{nl,genl}.lua $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/{nl,genl}.so $(1)/usr/local/lib/lua/5.3/eco/core
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/rtnl.so $(1)/usr/local/lib/lua/5.3/eco
+endef
+
+define Package/lua-eco-ip/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/ip.lua $(1)/usr/local/lib/lua/5.3/eco
+endef
+
+define Package/lua-eco-nl80211/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco/core
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/nl80211.lua $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nl80211.so $(1)/usr/local/lib/lua/5.3/eco/core
+endef
+
+define Package/lua-eco-ssh/install
+	$(INSTALL_DIR) $(1)/usr/local/lib/lua/5.3/eco/core
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/ssh.lua $(1)/usr/local/lib/lua/5.3/eco
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ssh.so $(1)/usr/local/lib/lua/5.3/eco/core
+endef
+
+$(eval $(call BuildPackage,lua-eco))
+$(eval $(call BuildPackage,lua-eco-log))
+$(eval $(call BuildPackage,lua-eco-base64))
+$(eval $(call BuildPackage,lua-eco-sha1))
+$(eval $(call BuildPackage,lua-eco-md5))
+$(eval $(call BuildPackage,lua-eco-socket))
+$(eval $(call BuildPackage,lua-eco-dns))
+$(eval $(call BuildPackage,lua-eco-ssl))
+$(eval $(call BuildPackage,lua-eco-ubus))
+$(eval $(call BuildPackage,lua-eco-http))
+$(eval $(call BuildPackage,lua-eco-mqtt))
+$(eval $(call BuildPackage,lua-eco-websocket))
+$(eval $(call BuildPackage,lua-eco-termios))
+$(eval $(call BuildPackage,lua-eco-netlink))
+$(eval $(call BuildPackage,lua-eco-ip))
+$(eval $(call BuildPackage,lua-eco-nl80211))
+$(eval $(call BuildPackage,lua-eco-ssh))
diff --git a/lua-eco/patches/0001-compatible-openwrt-18.06.patch b/lua-eco/patches/0001-compatible-openwrt-18.06.patch
new file mode 100644
index 00000000..0683e2b5
--- /dev/null
+++ b/lua-eco/patches/0001-compatible-openwrt-18.06.patch
@@ -0,0 +1,10 @@
+--- a/rtnl.c
++++ b/rtnl.c
+@@ -280,7 +280,6 @@ int luaopen_eco_rtnl(lua_State *L)
+     lua_add_constant(L, "IFA_CACHEINFO", IFA_CACHEINFO);
+     lua_add_constant(L, "IFA_MULTICAST", IFA_MULTICAST);
+     lua_add_constant(L, "IFA_FLAGS", IFA_FLAGS);
+-    lua_add_constant(L, "IFA_RT_PRIORITY", IFA_RT_PRIORITY);
+ 
+     lua_add_constant(L, "RTNLGRP_LINK", RTNLGRP_LINK);
+     lua_add_constant(L, "RTNLGRP_NOTIFY", RTNLGRP_NOTIFY);
diff --git a/lua-eco/patches/0002-fix-close-socket-when-returned-from-function.patch b/lua-eco/patches/0002-fix-close-socket-when-returned-from-function.patch
new file mode 100644
index 00000000..cf495cb0
--- /dev/null
+++ b/lua-eco/patches/0002-fix-close-socket-when-returned-from-function.patch
@@ -0,0 +1,746 @@
+From 687b62a6bcdbf299ae5ac07632a67302eff42529 Mon Sep 17 00:00:00 2001
+From: Jianhui Zhao <zhaojh329@gmail.com>
+Date: Fri, 24 May 2024 16:04:17 +0800
+Subject: [PATCH] fix: close socket when returned from function.
+
+Signed-off-by: Jianhui Zhao <zhaojh329@gmail.com>
+---
+ genl.lua    |  24 +++-
+ ip.lua      | 106 +++++++++++-----
+ nl80211.lua | 360 +++++++++++++++++++++++++++++++++++-----------------
+ 3 files changed, 334 insertions(+), 156 deletions(-)
+
+diff --git a/genl.lua b/genl.lua
+index f10f1c6..f985e87 100644
+--- a/genl.lua
++++ b/genl.lua
+@@ -16,12 +16,7 @@ local function parse_grps(nest, groups)
+     end
+ end
+ 
+-local function get_family_by(params)
+-    local sock, err = nl.open(nl.NETLINK_GENERIC)
+-    if not sock then
+-        return nil, err
+-    end
+-
++local function __get_family_by(sock, params)
+     local msg = nl.nlmsg(genl.GENL_ID_CTRL, nl.NLM_F_REQUEST)
+ 
+     msg:put(genl.genlmsghdr({ cmd = genl.CTRL_CMD_GETFAMILY }))
+@@ -71,6 +66,23 @@ local function get_family_by(params)
+     return info
+ end
+ 
++local function get_family_by(params)
++    local sock, err = nl.open(nl.NETLINK_GENERIC)
++    if not sock then
++        return nil, err
++    end
++
++    local res, err = __get_family_by(sock, params)
++
++    sock:close()
++
++    if res then
++        return res
++    end
++
++    return nil, err
++end
++
+ function M.get_family_byid(id)
+     if type(id) ~= 'number' then
+         error('invalid id')
+diff --git a/ip.lua b/ip.lua
+index 8dbde8c..a57bd3f 100644
+--- a/ip.lua
++++ b/ip.lua
+@@ -9,12 +9,7 @@ local nl = require 'eco.nl'
+ 
+ local M = {}
+ 
+-local function rtnl_send(msg)
+-    local sock, err = nl.open(nl.NETLINK_ROUTE)
+-    if not sock then
+-        return nil, err
+-    end
+-
++local function __rtnl_send(sock, msg)
+     local ok, err = sock:send(msg)
+     if not ok then
+         return nil, err
+@@ -42,6 +37,23 @@ local function rtnl_send(msg)
+     return nil, 'no ack'
+ end
+ 
++local function rtnl_send(msg)
++    local sock, err = nl.open(nl.NETLINK_ROUTE)
++    if not sock then
++        return nil, err
++    end
++
++    local ok, err = __rtnl_send(sock, msg)
++
++    sock:close()
++
++    if ok then
++        return true
++    end
++
++    return nil, err
++end
++
+ local link = {}
+ 
+ --[[
+@@ -176,20 +188,10 @@ function link.set(dev, attrs)
+     return rtnl_send(msg)
+ end
+ 
+-function link.get(dev)
+-    local dev_index = socket.if_nametoindex(dev)
+-    if not dev_index then
+-        return nil, 'no such device'
+-    end
+-
+-    local sock, err = nl.open(nl.NETLINK_ROUTE)
+-    if not sock then
+-        return nil, err
+-    end
+-
++local function link_get(sock, ifindex)
+     local msg = nl.nlmsg(rtnl.RTM_GETLINK, nl.NLM_F_REQUEST)
+ 
+-    msg:put(rtnl.ifinfomsg({ family = socket.AF_UNSPEC, index = dev_index }))
++    msg:put(rtnl.ifinfomsg({ family = socket.AF_UNSPEC, index = ifindex }))
+ 
+     local ok, err = sock:send(msg)
+     if not ok then
+@@ -295,6 +297,28 @@ function link.get(dev)
+     return res
+ end
+ 
++function link.get(dev)
++    local ifindex = socket.if_nametoindex(dev)
++    if not ifindex then
++        return nil, 'no such device'
++    end
++
++    local sock, err = nl.open(nl.NETLINK_ROUTE)
++    if not sock then
++        return nil, err
++    end
++
++    local res, err = link_get(sock, ifindex)
++
++    sock:close()
++
++    if res then
++        return res
++    end
++
++    return nil, err
++end
++
+ M.link = link
+ 
+ local address = {}
+@@ -405,21 +429,7 @@ function address.del(dev, addr)
+     return do_address('del', dev, addr)
+ end
+ 
+-function address.get(dev)
+-    local dev_index
+-
+-    if dev then
+-        dev_index = socket.if_nametoindex(dev)
+-        if not dev_index then
+-            return nil, 'no such device'
+-        end
+-    end
+-
+-    local sock, err = nl.open(nl.NETLINK_ROUTE)
+-    if not sock then
+-        return nil, err
+-    end
+-
++local function address_get(sock, ifindex)
+     local msg = nl.nlmsg(rtnl.RTM_GETADDR, nl.NLM_F_REQUEST | nl.NLM_F_DUMP)
+ 
+     msg:put(rtnl.ifaddrmsg({ family = socket.AF_UNSPEC }))
+@@ -449,7 +459,7 @@ function address.get(dev)
+                 local info = rtnl.parse_ifaddrmsg(msg)
+                 local family = info.family
+ 
+-                if not dev_index or dev_index == info.index then
++                if not ifindex or ifindex == info.index then
+                     res.ifname = socket.if_indextoname(info.index)
+                     res.scope = rtscope_to_name[info.scope]
+                     res.family = family
+@@ -483,7 +493,7 @@ function address.get(dev)
+                     return nil, 'RTNETLINK answers: ' .. sys.strerror(-err)
+                 end
+             elseif nlh.type == nl.NLMSG_DONE then
+-                if dev_index and #reses < 1 then
++                if ifindex and #reses < 1 then
+                     return nil, 'not found'
+                 end
+                 return reses
+@@ -492,6 +502,32 @@ function address.get(dev)
+     end
+ end
+ 
++function address.get(dev)
++    local ifindex
++
++    if dev then
++        ifindex = socket.if_nametoindex(dev)
++        if not ifindex then
++            return nil, 'no such device'
++        end
++    end
++
++    local sock, err = nl.open(nl.NETLINK_ROUTE)
++    if not sock then
++        return nil, err
++    end
++
++    local res, err = address_get(sock, ifindex)
++
++    sock:close()
++
++    if res then
++        return res
++    end
++
++    return nil, err
++end
++
+ M.address = address
+ 
+ return M
+diff --git a/nl80211.lua b/nl80211.lua
+index 9566dd2..d756dfe 100644
+--- a/nl80211.lua
++++ b/nl80211.lua
+@@ -250,7 +250,15 @@ function M.add_interface(phy, ifname, attrs)
+ 
+     put_interface_attrs(msg, attrs)
+ 
+-    return send_nl80211_msg(sock, msg)
++    local ok, err = send_nl80211_msg(sock, msg)
++
++    sock:close()
++
++    if ok then
++        return true
++    end
++
++    return nil, err
+ end
+ 
+ function M.set_interface(ifname, attrs)
+@@ -272,7 +280,15 @@ function M.set_interface(ifname, attrs)
+ 
+     put_interface_attrs(msg, attrs)
+ 
+-    return send_nl80211_msg(sock, msg)
++    local ok, err = send_nl80211_msg(sock, msg)
++
++    sock:close()
++
++    if ok then
++        return true
++    end
++
++    return nil, err
+ end
+ 
+ function M.del_interface(ifname)
+@@ -292,24 +308,18 @@ function M.del_interface(ifname)
+ 
+     msg:put_attr_u32(nl80211.ATTR_IFINDEX, if_index)
+ 
+-    return send_nl80211_msg(sock, msg)
+-end
++    local ok, err = send_nl80211_msg(sock, msg)
+ 
+-function M.get_interface(ifname)
+-    if type(ifname) ~= 'string' then
+-        error('invalid ifname')
+-    end
++    sock:close()
+ 
+-    local ifidx = socket.if_nametoindex(ifname)
+-    if not ifidx then
+-        return nil, 'no dev'
++    if ok then
++        return true
+     end
+ 
+-    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_INTERFACE)
+-    if not sock then
+-        return nil, msg
+-    end
++    return nil, err
++end
+ 
++local function get_interface(sock, msg, ifidx)
+     msg:put_attr_u32(nl80211.ATTR_IFINDEX, ifidx)
+ 
+     local ok, err = sock:send(msg)
+@@ -335,12 +345,33 @@ function M.get_interface(ifname)
+     return parse_interface(msg)
+ end
+ 
+-function M.get_interfaces(phy)
+-    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_INTERFACE, nl.NLM_F_DUMP)
++function M.get_interface(ifname)
++    if type(ifname) ~= 'string' then
++        error('invalid ifname')
++    end
++
++    local ifidx = socket.if_nametoindex(ifname)
++    if not ifidx then
++        return nil, 'no dev'
++    end
++
++    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_INTERFACE)
+     if not sock then
+         return nil, msg
+     end
+ 
++    local res, err = get_interface(sock, msg, ifidx)
++
++    sock:close()
++
++    if res then
++        return res
++    end
++
++    return nil, err
++end
++
++local function get_interfaces(sock, msg, phy)
+     if phy and type(phy) ~= 'number' then
+         error('invalid phy index')
+     end
+@@ -382,6 +413,23 @@ function M.get_interfaces(phy)
+     end
+ end
+ 
++function M.get_interfaces(phy)
++    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_INTERFACE, nl.NLM_F_DUMP)
++    if not sock then
++        return nil, msg
++    end
++
++    local res, err = get_interfaces(sock, msg, phy)
++
++    sock:close()
++
++    if res then
++        return res
++    end
++
++    return nil, err
++end
++
+ local cipher_names = {
+     [0] = 'NONE',
+     [1] = 'WEP-40',
+@@ -574,25 +622,7 @@ local function parse_bss(nest)
+     return info
+ end
+ 
+-function M.scan(action, params)
+-    local flags = 0
+-    local cmd
+-
+-    if action == 'trigger' then
+-        flags = nl.NLM_F_ACK
+-        cmd = nl80211.CMD_TRIGGER_SCAN
+-    elseif action == 'dump' then
+-        flags = nl.NLM_F_DUMP
+-        cmd = nl80211.CMD_GET_SCAN
+-    elseif action == 'abort' then
+-        flags = nl.NLM_F_ACK
+-        cmd = nl80211.CMD_ABORT_SCAN
+-    else
+-        error('invalid scan action')
+-    end
+-
+-    params = params or {}
+-
++local function nl80211_scan(sock, msg, action, cmd, params)
+     if type(params.ifname) ~= 'string' then
+         error('invalid ifname')
+     end
+@@ -602,11 +632,6 @@ function M.scan(action, params)
+         return nil, 'no such device'
+     end
+ 
+-    local sock, msg = prepare_send_cmd(cmd, flags)
+-    if not sock then
+-        return nil, msg
+-    end
+-
+     msg:put_attr_u32(nl80211.ATTR_IFINDEX, ifidx)
+ 
+     if action == 'trigger' then
+@@ -694,20 +719,45 @@ function M.scan(action, params)
+     end
+ end
+ 
+---[[
+-    The callback function "cb" must return a boolean value to stop waiting event.
+-    Return true or return false following a error message.
+-    The callback will get three params: cmd, attrs, data.
+---]]
+-function M.wait_event(grp_name, timeout, cb, data)
+-    local grp = genl.get_group_id('nl80211', grp_name)
+-    if not grp then
+-        return nil, 'not support'
++function M.scan(action, params)
++    local flags = 0
++    local cmd
++
++    if action == 'trigger' then
++        flags = nl.NLM_F_ACK
++        cmd = nl80211.CMD_TRIGGER_SCAN
++    elseif action == 'dump' then
++        flags = nl.NLM_F_DUMP
++        cmd = nl80211.CMD_GET_SCAN
++    elseif action == 'abort' then
++        flags = nl.NLM_F_ACK
++        cmd = nl80211.CMD_ABORT_SCAN
++    else
++        error('invalid scan action')
+     end
+ 
+-    local sock, err = nl.open(nl.NETLINK_GENERIC)
++    params = params or {}
++
++    local sock, msg = prepare_send_cmd(cmd, flags)
+     if not sock then
+-        return nil, err
++        return nil, msg
++    end
++
++    local res, err = nl80211_scan(sock, msg, action, cmd, params)
++
++    sock:close()
++
++    if res then
++        return res
++    end
++
++    return nil, err
++end
++
++local function wait_event(sock, grp_name, timeout, cb, data)
++    local grp = genl.get_group_id('nl80211', grp_name)
++    if not grp then
++        return nil, 'not support'
+     end
+ 
+     local ok, err = sock:bind(0)
+@@ -715,7 +765,7 @@ function M.wait_event(grp_name, timeout, cb, data)
+         return nil, err
+     end
+ 
+-    local ok, err = sock:add_membership(grp)
++    ok, err = sock:add_membership(grp)
+     if not ok then
+         return nil, err
+     end
+@@ -748,21 +798,29 @@ function M.wait_event(grp_name, timeout, cb, data)
+     end
+ end
+ 
+-function M.get_noise(ifname)
+-    if type(ifname) ~= 'string' then
+-        error('invalid ifname')
++--[[
++    The callback function "cb" must return a boolean value to stop waiting event.
++    Return true or return false following a error message.
++    The callback will get three params: cmd, attrs, data.
++--]]
++function M.wait_event(grp_name, timeout, cb, data)
++    local sock, err = nl.open(nl.NETLINK_GENERIC)
++    if not sock then
++        return nil, err
+     end
+ 
+-    local ifidx = socket.if_nametoindex(ifname)
+-    if not ifidx then
+-        return nil, 'no dev'
+-    end
++    local ok, err = wait_event(sock, grp_name, timeout, cb, data)
+ 
+-    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_SURVEY, nl.NLM_F_DUMP)
+-    if not sock then
+-        return nil, msg
++    sock:close()
++
++    if ok then
++        return true
+     end
+ 
++    return nil, err
++end
++
++local function get_noise(sock, msg, ifidx)
+     msg:put_attr_u32(nl80211.ATTR_IFINDEX, ifidx)
+ 
+     local ok, err = sock:send(msg)
+@@ -806,6 +864,32 @@ function M.get_noise(ifname)
+     end
+ end
+ 
++function M.get_noise(ifname)
++    if type(ifname) ~= 'string' then
++        error('invalid ifname')
++    end
++
++    local ifidx = socket.if_nametoindex(ifname)
++    if not ifidx then
++        return nil, 'no dev'
++    end
++
++    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_SURVEY, nl.NLM_F_DUMP)
++    if not sock then
++        return nil, msg
++    end
++
++    local res, err = get_noise(sock, msg, ifidx)
++
++    sock:close()
++
++    if res then
++        return res
++    end
++
++    return nil, err
++end
++
+ local function parse_bitrate(attrs)
+     local r = {}
+     local rate = 0
+@@ -974,25 +1058,12 @@ local function parse_station(attrs, sinfo)
+     return info
+ end
+ 
+-function M.get_station(ifname, mac)
+-    if type(ifname) ~= 'string' then
+-        error('invalid ifname')
+-    end
+-
+-    if type(mac) ~= 'string' then
+-        error('invalid mac')
+-    end
+-
++local function get_station(sock, msg, ifname, mac)
+     local ifidx = socket.if_nametoindex(ifname)
+     if not ifidx then
+         return nil, 'no dev'
+     end
+ 
+-    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_STATION)
+-    if not sock then
+-        return nil, msg
+-    end
+-
+     msg:put_attr_u32(nl80211.ATTR_IFINDEX, ifidx)
+     msg:put_attr(nl80211.ATTR_MAC, hex.decode(mac:gsub(':', '')))
+ 
+@@ -1028,21 +1099,37 @@ function M.get_station(ifname, mac)
+     return res
+ end
+ 
+-function M.get_stations(ifname)
++function M.get_station(ifname, mac)
+     if type(ifname) ~= 'string' then
+         error('invalid ifname')
+     end
+ 
+-    local ifidx = socket.if_nametoindex(ifname)
+-    if not ifidx then
+-        return nil, 'no dev'
++    if type(mac) ~= 'string' then
++        error('invalid mac')
+     end
+ 
+-    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_STATION, nl.NLM_F_DUMP)
++    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_STATION)
+     if not sock then
+         return nil, msg
+     end
+ 
++    local res, err = get_station(sock, msg, ifname, mac)
++
++    sock:close()
++
++    if res then
++        return res
++    end
++
++    return nil, err
++end
++
++local function get_stations(sock, msg, ifname)
++    local ifidx = socket.if_nametoindex(ifname)
++    if not ifidx then
++        return nil, 'no dev'
++    end
++
+     msg:put_attr_u32(nl80211.ATTR_IFINDEX, ifidx)
+ 
+     local ok, err = sock:send(msg)
+@@ -1088,25 +1175,28 @@ function M.get_stations(ifname)
+     end
+ end
+ 
+-function M.get_protocol_features(phy)
+-    local phyid
+-
+-    if type(phy) == 'string' then
+-        phyid = M.phy_lookup(phy)
+-        if not phyid then
+-            return nil, string.format('"%s" not exists', phy)
+-        end
+-    elseif type(phy) == 'number' then
+-        phyid = phy
+-    else
+-        error('invalid phy')
++function M.get_stations(ifname)
++    if type(ifname) ~= 'string' then
++        error('invalid ifname')
+     end
+ 
+-    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_PROTOCOL_FEATURES)
++    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_STATION, nl.NLM_F_DUMP)
+     if not sock then
+         return nil, msg
+     end
+ 
++    local res, err = get_stations(sock, msg, ifname)
++
++    sock:close()
++
++    if res then
++        return res
++    end
++
++    return nil, err
++end
++
++local function get_protocol_features(sock, msg, phyid)
+     msg:put_attr_u32(nl80211.ATTR_WIPHY, phyid)
+ 
+     local ok, err = sock:send(msg)
+@@ -1136,9 +1226,37 @@ function M.get_protocol_features(phy)
+         features = nl.attr_get_u32(attrs[nl80211.ATTR_PROTOCOL_FEATURES])
+     end
+ 
++    return features
++end
++
++function M.get_protocol_features(phy)
++    local phyid
++
++    if type(phy) == 'string' then
++        phyid = M.phy_lookup(phy)
++        if not phyid then
++            return nil, string.format('"%s" not exists', phy)
++        end
++    elseif type(phy) == 'number' then
++        phyid = phy
++    else
++        error('invalid phy')
++    end
++
++    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_PROTOCOL_FEATURES)
++    if not sock then
++        return nil, msg
++    end
++
++    local res, err = get_protocol_features(sock, msg, phyid)
++
+     sock:close()
+ 
+-    return features
++    if res then
++        return res
++    end
++
++    return nil, err
+ end
+ 
+ local function parse_freqlist(attrs, freqlist)
+@@ -1220,25 +1338,7 @@ local function parse_freqlist(attrs, freqlist)
+     end
+ end
+ 
+-function M.get_freqlist(phy)
+-    local phyid
+-
+-    if type(phy) == 'string' then
+-        phyid = M.phy_lookup(phy)
+-        if not phyid then
+-            return nil, string.format('"%s" not exists', phy)
+-        end
+-    elseif type(phy) == 'number' then
+-        phyid = phy
+-    else
+-        error('invalid phy')
+-    end
+-
+-    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_WIPHY, nl.NLM_F_DUMP)
+-    if not sock then
+-        return nil, msg
+-    end
+-
++local function get_freqlist(sock, msg, phyid)
+     msg:put_attr_u32(nl80211.ATTR_WIPHY, phyid)
+     msg:put_attr_flag(nl80211.ATTR_SPLIT_WIPHY_DUMP)
+ 
+@@ -1279,4 +1379,34 @@ function M.get_freqlist(phy)
+     end
+ end
+ 
++function M.get_freqlist(phy)
++    local phyid
++
++    if type(phy) == 'string' then
++        phyid = M.phy_lookup(phy)
++        if not phyid then
++            return nil, string.format('"%s" not exists', phy)
++        end
++    elseif type(phy) == 'number' then
++        phyid = phy
++    else
++        error('invalid phy')
++    end
++
++    local sock, msg = prepare_send_cmd(nl80211.CMD_GET_WIPHY, nl.NLM_F_DUMP)
++    if not sock then
++        return nil, msg
++    end
++
++    local res, err = get_freqlist(sock, msg, phyid)
++
++    sock:close()
++
++    if res then
++        return res
++    end
++
++    return nil, err
++end
++
+ return setmetatable(M, { __index = nl80211 })
+-- 
+2.34.1
+
diff --git a/minidlna/Makefile b/minidlna/Makefile
new file mode 100644
index 00000000..25db032b
--- /dev/null
+++ b/minidlna/Makefile
@@ -0,0 +1,68 @@
+#
+# Copyright (C) 2010-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=minidlna
+PKG_VERSION:=1.3.0
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=@SF/minidlna
+PKG_HASH:=47d9b06b4c48801a4c1112ec23d24782728b5495e95ec2195bbe5c81bc2d3c63
+
+PKG_MAINTAINER:=
+PKG_LICENSE:=GPL-2.0-or-later BSD-3-Clause
+PKG_LICENSE_FILES:=COPYING LICENCE.miniupnpd
+
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/minidlna
+  SECTION:=multimedia
+  CATEGORY:=Multimedia
+  TITLE:=UPnP A/V & DLNA Media Server
+  URL:=http://minidlna.sourceforge.net/
+  DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg \
+  	+libid3tag +libflac +libvorbis $(ICONV_DEPENDS) $(INTL_DEPENDS)
+  USERID:=minidlna:minidlna
+endef
+
+define Package/minidlna/description
+  MiniDLNA (aka ReadyDLNA) is server software with the aim of
+  being fully compliant with DLNA/UPnP-AV clients.
+endef
+
+define Package/minidlna/conffiles
+/etc/config/minidlna
+endef
+
+CONFIGURE_ARGS += \
+	--with-libiconv-prefix="$(ICONV_PREFIX)" \
+	--with-libintl-prefix="$(INTL_PREFIX)" \
+	--with-os-name="OpenWrt Linux" \
+	--with-os-version="$(LINUX_VERSION)" \
+	--with-os-url="https://openwrt.org/" \
+	--with-db-path="/var/run/minidlna" \
+	--with-log-path="/var/log"
+
+define Package/minidlna/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/minidlnad $(1)/usr/sbin/minidlnad
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/minidlna.init $(1)/etc/init.d/minidlna
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/minidlna.config $(1)/etc/config/minidlna
+	$(INSTALL_DIR) $(1)/etc/sysctl.d
+	$(INSTALL_CONF) ./files/minidlna.sysctl $(1)/etc/sysctl.d/30-minidlna.conf
+endef
+
+$(eval $(call BuildPackage,minidlna))
diff --git a/minidlna/files/minidlna.config b/minidlna/files/minidlna.config
new file mode 100644
index 00000000..4ffeadb0
--- /dev/null
+++ b/minidlna/files/minidlna.config
@@ -0,0 +1,19 @@
+config minidlna config
+	option enabled '0'
+	option user 'minidlna'
+	option port '8200'
+	option interface 'br-lan'
+	option friendly_name 'OpenWrt DLNA Server'
+	option db_dir '/var/run/minidlna'
+	option inotify '1'
+	option enable_tivo '0'
+	option wide_links '0'
+	option strict_dlna '0'
+	option presentation_url ''
+	option notify_interval '900'
+	option serial '12345678'
+	option model_number '1'
+	option root_container '.'
+	option uuid ''
+	list media_dir '/mnt'
+	option album_art_names 'Cover.jpg/cover.jpg/AlbumArtSmall.jpg/albumartsmall.jpg/AlbumArt.jpg/albumart.jpg/Album.jpg/album.jpg/Folder.jpg/folder.jpg/Thumb.jpg/thumb.jpg'
diff --git a/minidlna/files/minidlna.init b/minidlna/files/minidlna.init
new file mode 100644
index 00000000..9f6b5bc9
--- /dev/null
+++ b/minidlna/files/minidlna.init
@@ -0,0 +1,111 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2010 OpenWrt.org
+
+START=81
+
+PROG=/usr/sbin/minidlnad
+USE_PROCD=1
+
+
+. /lib/functions.sh
+MINIDLNA_CONFIG_FILE="/var/etc/minidlna.conf"
+
+minidlna_cfg_addbool() {
+	local cfg="$1"
+	local key="$2"
+	local def="$3"
+	local val
+
+	config_get_bool val "$cfg" "$key" "$def"
+	[ "$val" -gt 0 ] && val="yes" || val="no"
+	echo "$key=$val"
+}
+
+minidlna_cfg_addstr() {
+	local cfg="$1"
+	local key="$2"
+	local def="$3"
+	local val
+
+	config_get val "$cfg" "$key" "$def"
+	[ -n "$val" ] && echo "$key=$val"
+}
+
+minidlna_cfg_add_media_dir() {
+	local val=$1
+	echo "media_dir=$val"
+}
+
+minidlna_create_config() {
+	local cfg=$1
+	local port
+	local interface
+
+	config_get port "$cfg" port
+	config_get interface "$cfg" interface
+
+	{ [ -z "$interface" ] || [ -t "$port" ]; } && return 1
+
+	mkdir -p /var/etc
+	echo "# this file is generated automatically, don't edit"
+
+	echo "port=$port"
+	echo "network_interface=$interface"
+
+	minidlna_cfg_addstr "$cfg" friendly_name
+	minidlna_cfg_addstr "$cfg" user
+	minidlna_cfg_addstr "$cfg" db_dir
+	minidlna_cfg_addstr "$cfg" log_level 'error'
+	minidlna_cfg_addbool "$cfg" inotify '1'
+	minidlna_cfg_addbool "$cfg" enable_tivo '0'
+	minidlna_cfg_addbool "$cfg" wide_links '0'
+	minidlna_cfg_addbool "$cfg" strict_dlna '0'
+	minidlna_cfg_addstr "$cfg" album_art_names
+	minidlna_cfg_addstr "$cfg" presentation_url
+	minidlna_cfg_addstr "$cfg" notify_interval '900'
+	minidlna_cfg_addstr "$cfg" serial '12345678'
+	minidlna_cfg_addstr "$cfg" model_number '1'
+	minidlna_cfg_addstr "$cfg" minissdpsocket
+	minidlna_cfg_addstr "$cfg" root_container '.'
+	minidlna_cfg_addstr "$cfg" uuid '019f9a56-ff60-44c0-9edc-eae88d09fa05'
+	config_list_foreach "$cfg" "media_dir" minidlna_cfg_add_media_dir
+
+	return 0
+} > "$MINIDLNA_CONFIG_FILE"
+
+start_service() {
+	local enabled
+	local db_dir
+	local user
+	local val
+
+	config_load 'minidlna'
+	config_get_bool enabled config 'enabled' '0'
+
+	[ "$enabled" -gt 0 ] || return 1
+
+	config_get val "config" uuid
+	[ "$val" = '' ] && uci set minidlna.config.uuid="$(cat /proc/sys/kernel/random/uuid)" && uci commit minidlna
+
+	minidlna_create_config config || return 1
+
+	config_get db_dir config 'db_dir' '/var/run/minidlna'
+	config_get user config 'user' 'minidlna'
+
+	[ -d "$db_dir" ] || {
+		mkdir -m 755 -p "$db_dir"
+		chown -R "$user":"$user" "$db_dir"
+	}
+
+	procd_open_instance
+	procd_set_param command "$PROG"
+	procd_append_param command -S -f "$MINIDLNA_CONFIG_FILE"
+	procd_set_param stdout 1
+	procd_set_param stderr 1
+	procd_set_param respawn
+	procd_close_instance
+}
+
+service_triggers() {
+	procd_add_reload_trigger "minidlna"
+}
diff --git a/minidlna/files/minidlna.sysctl b/minidlna/files/minidlna.sysctl
new file mode 100644
index 00000000..aaf460e1
--- /dev/null
+++ b/minidlna/files/minidlna.sysctl
@@ -0,0 +1,2 @@
+# this is the desired value for minidlna
+fs.inotify.max_user_watches=65536
diff --git a/minidlna/patches/001-dont-build-po-files.patch b/minidlna/patches/001-dont-build-po-files.patch
new file mode 100644
index 00000000..f16514cb
--- /dev/null
+++ b/minidlna/patches/001-dont-build-po-files.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -17,7 +17,7 @@
+ 
+ AM_CFLAGS = -Wall -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
+ 
+-SUBDIRS=po
++SUBDIRS=
+ 
+ sbin_PROGRAMS = minidlnad
+ check_PROGRAMS = testupnpdescgen
+--- a/configure.ac
++++ b/configure.ac
+@@ -658,6 +658,5 @@ case "$target_os" in
+ esac
+ 
+ 
+-AC_OUTPUT([ po/Makefile.in
+-Makefile
+-])
++AC_CONFIG_FILES([Makefile])
++AC_OUTPUT
diff --git a/minidlna/patches/005-added-support-RMVB.patch b/minidlna/patches/005-added-support-RMVB.patch
new file mode 100644
index 00000000..ddf354f2
--- /dev/null
+++ b/minidlna/patches/005-added-support-RMVB.patch
@@ -0,0 +1,55 @@
+From e4a045e92b864dc148ca46be94668c5b67132405 Mon Sep 17 00:00:00 2001
+From: VergLsm <vision.lsm.2012@gmail.com>
+Date: Fri, 31 Jan 2020 10:01:12 +0000
+Subject: [PATCH] Added support RMVB.
+
+---
+ metadata.c       | 4 ++++
+ upnpglobalvars.h | 3 ++-
+ utils.c          | 3 +++
+ 3 files changed, 9 insertions(+), 1 deletion(-)
+
+--- a/metadata.c
++++ b/metadata.c
+@@ -862,6 +862,10 @@ GetVideoMetadata(const char *path, const
+ 			xasprintf(&m.mime, "video/x-matroska");
+ 		else if( strcmp(ctx->iformat->name, "flv") == 0 )
+ 			xasprintf(&m.mime, "video/x-flv");
++		else if( strcmp(ctx->iformat->name, "rm") == 0 )
++			xasprintf(&m.mime, "video/x-pn-realvideo");
++		else if( strcmp(ctx->iformat->name, "rmvb") == 0 )
++			xasprintf(&m.mime, "video/x-pn-realvideo");
+ 		if( m.mime )
+ 			goto video_no_dlna;
+ 
+--- a/upnpglobalvars.h
++++ b/upnpglobalvars.h
+@@ -172,7 +172,8 @@
+ 	"http-get:*:audio/x-wav:*," \
+ 	"http-get:*:audio/x-flac:*," \
+ 	"http-get:*:audio/x-dsd:*," \
+-	"http-get:*:application/ogg:*"
++	"http-get:*:application/ogg:*,"\
++	"http-get:*:video/x-pn-realvideo:*"
+ 
+ #define DLNA_FLAG_DLNA_V1_5      0x00100000
+ #define DLNA_FLAG_HTTP_STALLING  0x00200000
+--- a/utils.c
++++ b/utils.c
+@@ -377,6 +377,8 @@ mime_to_ext(const char * mime)
+ 				return "3gp";
+ 			else if( strncmp(mime+6, "x-tivo-mpeg", 11) == 0 )
+ 				return "TiVo";
++			else if( strcmp(mime+6, "x-pn-realvideo") == 0 )
++				return "rm";
+ 			break;
+ 		case 'i':
+ 			if( strcmp(mime+6, "jpeg") == 0 )
+@@ -401,6 +403,7 @@ is_video(const char * file)
+ 		ends_with(file, ".m2t") || ends_with(file, ".mkv")   ||
+ 		ends_with(file, ".vob") || ends_with(file, ".ts")    ||
+ 		ends_with(file, ".flv") || ends_with(file, ".xvid")  ||
++		ends_with(file, ".rm") || ends_with(file, ".rmvb")  ||
+ #ifdef TIVO_SUPPORT
+ 		ends_with(file, ".TiVo") ||
+ #endif
diff --git a/minidlna/patches/020-wrap_container_definitions_into_a_structure.patch b/minidlna/patches/020-wrap_container_definitions_into_a_structure.patch
new file mode 100644
index 00000000..859e9f43
--- /dev/null
+++ b/minidlna/patches/020-wrap_container_definitions_into_a_structure.patch
@@ -0,0 +1,118 @@
+From e0065b8343bc963a89556449e00f1d20086cc1f1 Mon Sep 17 00:00:00 2001
+From: Daniel Kamil Kozar <dkk089@gmail.com>
+Date: Sat, 15 Dec 2018 16:26:37 +0100
+Subject: [PATCH] Wrap container definitions into a structure
+
+---
+ containers.c | 25 +++++++++++++++++++++++++
+ containers.h |  8 ++++++++
+ scanner.c    | 33 ++++++---------------------------
+ 3 files changed, 39 insertions(+), 27 deletions(-)
+
+--- a/containers.c
++++ b/containers.c
+@@ -23,6 +23,31 @@
+ #include "containers.h"
+ #include "log.h"
+ 
++const struct container_s containers[] = {
++		{ "0","-1",   "root" },
++		{ MUSIC_ID, "0", "Music" },
++		{ MUSIC_ALL_ID, MUSIC_ID, "All Music" },
++		{ MUSIC_GENRE_ID, MUSIC_ID, "Genre" },
++		{ MUSIC_ARTIST_ID, MUSIC_ID, "Artist" },
++		{ MUSIC_ALBUM_ID, MUSIC_ID, "Album" },
++		{ MUSIC_DIR_ID, MUSIC_ID, "Folders" },
++		{ MUSIC_PLIST_ID, MUSIC_ID, "Playlists" },
++
++		{ VIDEO_ID, "0", "Video" },
++		{ VIDEO_ALL_ID, VIDEO_ID, "All Video" },
++		{ VIDEO_DIR_ID, VIDEO_ID, "Folders" },
++
++		{ IMAGE_ID, "0", "Pictures" },
++		{ IMAGE_ALL_ID, IMAGE_ID, "All Pictures" },
++		{ IMAGE_DATE_ID, IMAGE_ID, "Date Taken" },
++		{ IMAGE_CAMERA_ID, IMAGE_ID, "Camera" },
++		{ IMAGE_DIR_ID, IMAGE_ID, "Folders" },
++
++		{ BROWSEDIR_ID, "0", "Browse Folders" },
++
++		{ 0, 0, 0 }
++};
++
+ #define NINETY_DAYS "7776000"
+ 
+ const char *music_id = MUSIC_ID;
+--- a/containers.h
++++ b/containers.h
+@@ -16,6 +16,14 @@
+  * along with MiniDLNA. If not, see <http://www.gnu.org/licenses/>.
+  */
+ 
++struct container_s {
++	const char *object_id;
++	const char *parent_id;
++	const char *name;
++};
++
++extern const struct container_s containers[];
++
+ struct magic_container_s {
+ 	const char *name;
+ 	const char *objectid_match;
+--- a/scanner.c
++++ b/scanner.c
+@@ -529,30 +529,7 @@ insert_file(const char *name, const char
+ int
+ CreateDatabase(void)
+ {
+-	int ret, i;
+-	const char *containers[] = { "0","-1",   "root",
+-	                        MUSIC_ID, "0", _("Music"),
+-	                    MUSIC_ALL_ID, MUSIC_ID, _("All Music"),
+-	                  MUSIC_GENRE_ID, MUSIC_ID, _("Genre"),
+-	                 MUSIC_ARTIST_ID, MUSIC_ID, _("Artist"),
+-	                  MUSIC_ALBUM_ID, MUSIC_ID, _("Album"),
+-	                    MUSIC_DIR_ID, MUSIC_ID, _("Folders"),
+-	                  MUSIC_PLIST_ID, MUSIC_ID, _("Playlists"),
+-
+-	                        VIDEO_ID, "0", _("Video"),
+-	                    VIDEO_ALL_ID, VIDEO_ID, _("All Video"),
+-	                    VIDEO_DIR_ID, VIDEO_ID, _("Folders"),
+-
+-	                        IMAGE_ID, "0", _("Pictures"),
+-	                    IMAGE_ALL_ID, IMAGE_ID, _("All Pictures"),
+-	                   IMAGE_DATE_ID, IMAGE_ID, _("Date Taken"),
+-	                 IMAGE_CAMERA_ID, IMAGE_ID, _("Camera"),
+-	                    IMAGE_DIR_ID, IMAGE_ID, _("Folders"),
+-
+-	                    BROWSEDIR_ID, "0", _("Browse Folders"),
+-			0 };
+-
+-	ret = sql_exec(db, create_objectTable_sqlite);
++	int ret = sql_exec(db, create_objectTable_sqlite);
+ 	if( ret != SQLITE_OK )
+ 		goto sql_failed;
+ 	ret = sql_exec(db, create_detailTable_sqlite);
+@@ -576,16 +553,18 @@ CreateDatabase(void)
+ 	ret = sql_exec(db, "INSERT into SETTINGS values ('UPDATE_ID', '0')");
+ 	if( ret != SQLITE_OK )
+ 		goto sql_failed;
+-	for( i=0; containers[i]; i=i+3 )
++	for( int i=0; containers[i].name; ++i )
+ 	{
++		const struct container_s *c = &containers[i];
++		const char *name = _(c->name);
+ 		ret = sql_exec(db, "INSERT into OBJECTS (OBJECT_ID, PARENT_ID, DETAIL_ID, CLASS, NAME)"
+ 		                   " values "
+ 		                   "('%s', '%s', %lld, 'container.storageFolder', '%q')",
+-		                   containers[i], containers[i+1], GetFolderMetadata(containers[i+2], NULL, NULL, NULL, 0), containers[i+2]);
++		                   c->object_id, c->parent_id, GetFolderMetadata(name, NULL, NULL, NULL, 0), name);
+ 		if( ret != SQLITE_OK )
+ 			goto sql_failed;
+ 	}
+-	for( i=0; magic_containers[i].objectid_match; i++ )
++	for( int i=0; magic_containers[i].objectid_match; i++ )
+ 	{
+ 		struct magic_container_s *magic = &magic_containers[i];
+ 		if (!magic->name)
diff --git a/minidlna/patches/030-mark_all_instances_of_magic_container_s_as_const.patch b/minidlna/patches/030-mark_all_instances_of_magic_container_s_as_const.patch
new file mode 100644
index 00000000..84a81883
--- /dev/null
+++ b/minidlna/patches/030-mark_all_instances_of_magic_container_s_as_const.patch
@@ -0,0 +1,125 @@
+From d297624e533d6d4274c750e3769749c3d7f121c8 Mon Sep 17 00:00:00 2001
+From: Daniel Kamil Kozar <dkk089@gmail.com>
+Date: Sat, 15 Dec 2018 16:34:30 +0100
+Subject: [PATCH] Mark all instances of magic_container_s as const
+
+---
+ containers.c | 38 +++++++++++++++++++-------------------
+ containers.h |  6 +++---
+ scanner.c    |  2 +-
+ upnpsoap.c   |  6 +++---
+ 4 files changed, 26 insertions(+), 26 deletions(-)
+
+--- a/containers.c
++++ b/containers.c
+@@ -50,23 +50,23 @@ const struct container_s containers[] =
+ 
+ #define NINETY_DAYS "7776000"
+ 
+-const char *music_id = MUSIC_ID;
+-const char *music_all_id = MUSIC_ALL_ID;
+-const char *music_genre_id = MUSIC_GENRE_ID;
+-const char *music_artist_id = MUSIC_ARTIST_ID;
+-const char *music_album_id = MUSIC_ALBUM_ID;
+-const char *music_plist_id = MUSIC_PLIST_ID;
+-const char *music_dir_id = MUSIC_DIR_ID;
+-const char *video_id = VIDEO_ID;
+-const char *video_all_id = VIDEO_ALL_ID;
+-const char *video_dir_id = VIDEO_DIR_ID;
+-const char *image_id = IMAGE_ID;
+-const char *image_all_id = IMAGE_ALL_ID;
+-const char *image_date_id = IMAGE_DATE_ID;
+-const char *image_camera_id = IMAGE_CAMERA_ID;
+-const char *image_dir_id = IMAGE_DIR_ID;
++static const char *music_id = MUSIC_ID;
++static const char *music_all_id = MUSIC_ALL_ID;
++static const char *music_genre_id = MUSIC_GENRE_ID;
++static const char *music_artist_id = MUSIC_ARTIST_ID;
++static const char *music_album_id = MUSIC_ALBUM_ID;
++static const char *music_plist_id = MUSIC_PLIST_ID;
++static const char *music_dir_id = MUSIC_DIR_ID;
++static const char *video_id = VIDEO_ID;
++static const char *video_all_id = VIDEO_ALL_ID;
++static const char *video_dir_id = VIDEO_DIR_ID;
++static const char *image_id = IMAGE_ID;
++static const char *image_all_id = IMAGE_ALL_ID;
++static const char *image_date_id = IMAGE_DATE_ID;
++static const char *image_camera_id = IMAGE_CAMERA_ID;
++static const char *image_dir_id = IMAGE_DIR_ID;
+ 
+-struct magic_container_s magic_containers[] =
++const struct magic_container_s magic_containers[] =
+ {
+ 	/* Alternate root container */
+ 	{ NULL,
+@@ -149,7 +149,7 @@ struct magic_container_s magic_container
+ 	{ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0 }
+ };
+ 
+-struct magic_container_s *
++const struct magic_container_s *
+ in_magic_container(const char *id, int flags, const char **real_id)
+ {
+ 	size_t len;
+@@ -179,7 +179,7 @@ in_magic_container(const char *id, int f
+ 	return NULL;
+ }
+ 
+-struct magic_container_s *
++const struct magic_container_s *
+ check_magic_container(const char *id, int flags)
+ {
+ 	int i;
+--- a/containers.h
++++ b/containers.h
+@@ -38,7 +38,7 @@ struct magic_container_s {
+ 	int required_flags;
+ };
+ 
+-extern struct magic_container_s magic_containers[];
++extern const struct magic_container_s magic_containers[];
+ 
+-struct magic_container_s *in_magic_container(const char *id, int flags, const char **real_id);
+-struct magic_container_s *check_magic_container(const char *id, int flags);
++const struct magic_container_s *in_magic_container(const char *id, int flags, const char **real_id);
++const struct magic_container_s *check_magic_container(const char *id, int flags);
+--- a/scanner.c
++++ b/scanner.c
+@@ -566,7 +566,7 @@ CreateDatabase(void)
+ 	}
+ 	for( int i=0; magic_containers[i].objectid_match; i++ )
+ 	{
+-		struct magic_container_s *magic = &magic_containers[i];
++		const struct magic_container_s *magic = &magic_containers[i];
+ 		if (!magic->name)
+ 			continue;
+ 		if( sql_get_int_field(db, "SELECT 1 from OBJECTS where OBJECT_ID = '%s'", magic->objectid_match) == 0 )
+--- a/upnpsoap.c
++++ b/upnpsoap.c
+@@ -804,7 +804,7 @@ add_res(char *size, char *duration, char
+ }
+ 
+ static int
+-get_child_count(const char *object, struct magic_container_s *magic)
++get_child_count(const char *object, const struct magic_container_s *magic)
+ {
+ 	int ret;
+ 
+@@ -1301,7 +1301,7 @@ BrowseContentDirectory(struct upnphttp *
+ 			"<Result>"
+ 			"&lt;DIDL-Lite"
+ 			CONTENT_DIRECTORY_SCHEMAS;
+-	struct magic_container_s *magic;
++	const struct magic_container_s *magic;
+ 	char *zErrMsg = NULL;
+ 	char *sql, *ptr;
+ 	struct Response args;
+@@ -1823,7 +1823,7 @@ SearchContentDirectory(struct upnphttp *
+ 			"<Result>"
+ 			"&lt;DIDL-Lite"
+ 			CONTENT_DIRECTORY_SCHEMAS;
+-	struct magic_container_s *magic;
++	const struct magic_container_s *magic;
+ 	char *zErrMsg = NULL;
+ 	char *sql, *ptr;
+ 	struct Response args;
diff --git a/minidlna/patches/040-heroes.patch b/minidlna/patches/040-heroes.patch
new file mode 100644
index 00000000..74a3e249
--- /dev/null
+++ b/minidlna/patches/040-heroes.patch
@@ -0,0 +1,25 @@
+From 972fb2bbfdb7118551da45c5828c9e74be581fc4 Mon Sep 17 00:00:00 2001
+From: Daniel Kamil Kozar <dkk089@gmail.com>
+Date: Sat, 15 Dec 2018 21:55:52 +0100
+Subject: [PATCH] What about David Bowie's "Heroes"?
+
+---
+ utils.c | 7 -------
+ 1 file changed, 7 deletions(-)
+
+--- a/utils.c
++++ b/utils.c
+@@ -87,13 +87,6 @@ trim(char *str)
+ 		len--;
+ 	}
+ 
+-	if (str[0] == '"' && str[len-1] == '"')
+-	{
+-		str[0] = '\0';
+-		str[len-1] = '\0';
+-		str++;
+-	}
+-
+ 	return str;
+ }
+ 
diff --git a/minidlna/patches/060-reduce_duplication_in_sql_c.patch b/minidlna/patches/060-reduce_duplication_in_sql_c.patch
new file mode 100644
index 00000000..c2372173
--- /dev/null
+++ b/minidlna/patches/060-reduce_duplication_in_sql_c.patch
@@ -0,0 +1,192 @@
+From be9de8b2e0864b46498496af9ffdc31c0e7b764a Mon Sep 17 00:00:00 2001
+From: Daniel Kamil Kozar <dkk089@gmail.com>
+Date: Sun, 16 Dec 2018 14:21:58 +0100
+Subject: [PATCH] Reduce duplication in sql.c
+
+---
+ sql.c | 166 ++++++++++++++++++++--------------------------------------
+ 1 file changed, 58 insertions(+), 108 deletions(-)
+
+--- a/sql.c
++++ b/sql.c
+@@ -65,122 +65,72 @@ sql_get_table(sqlite3 *db, const char *s
+ 	return ret;
+ }
+ 
++#define sql_get_field(type, column_get_fn) \
++		va_list		ap;\
++		int		counter, result;\
++		char		*sql;\
++		type		ret;\
++		sqlite3_stmt	*stmt;\
++		\
++		va_start(ap, fmt);\
++		sql = sqlite3_vmprintf(fmt, ap);\
++		va_end(ap);\
++\
++		/*DPRINTF(E_DEBUG, L_DB_SQL, "sql: %s\n", sql); */ \
++\
++		switch (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL))\
++		{\
++			case SQLITE_OK:\
++				break;\
++			default:\
++				DPRINTF(E_ERROR, L_DB_SQL, "prepare failed: %s\n%s\n", sqlite3_errmsg(db), sql);\
++				sqlite3_free(sql);\
++				return -1;\
++		}\
++\
++		for (counter = 0;\
++		     ((result = sqlite3_step(stmt)) == SQLITE_BUSY || result == SQLITE_LOCKED) && counter < 2;\
++		     counter++) {\
++			/* While SQLITE_BUSY has a built in timeout,\
++			 * SQLITE_LOCKED does not, so sleep */\
++			if (result == SQLITE_LOCKED)\
++				sleep(1);\
++		}\
++\
++		switch (result)\
++		{\
++			case SQLITE_DONE:\
++				/* no rows returned */\
++				ret = 0;\
++				break;\
++			case SQLITE_ROW:\
++				if (sqlite3_column_type(stmt, 0) == SQLITE_NULL)\
++				{\
++					ret = 0;\
++					break;\
++				}\
++				ret = column_get_fn(stmt, 0);\
++				break;\
++			default:\
++				DPRINTF(E_WARN, L_DB_SQL, "%s: step failed: %s\n%s\n", __func__, sqlite3_errmsg(db), sql);\
++				ret = -1;\
++				break;\
++		}\
++		sqlite3_free(sql);\
++		sqlite3_finalize(stmt);\
++\
++		return ret;
++
+ int
+ sql_get_int_field(sqlite3 *db, const char *fmt, ...)
+ {
+-	va_list		ap;
+-	int		counter, result;
+-	char		*sql;
+-	int		ret;
+-	sqlite3_stmt	*stmt;
+-	
+-	va_start(ap, fmt);
+-	sql = sqlite3_vmprintf(fmt, ap);
+-	va_end(ap);
+-
+-	//DPRINTF(E_DEBUG, L_DB_SQL, "sql: %s\n", sql);
+-
+-	switch (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL))
+-	{
+-		case SQLITE_OK:
+-			break;
+-		default:
+-			DPRINTF(E_ERROR, L_DB_SQL, "prepare failed: %s\n%s\n", sqlite3_errmsg(db), sql);
+-			sqlite3_free(sql);
+-			return -1;
+-	}
+-
+-	for (counter = 0;
+-	     ((result = sqlite3_step(stmt)) == SQLITE_BUSY || result == SQLITE_LOCKED) && counter < 2;
+-	     counter++) {
+-		/* While SQLITE_BUSY has a built in timeout,
+-		 * SQLITE_LOCKED does not, so sleep */
+-		if (result == SQLITE_LOCKED)
+-			sleep(1);
+-	}
+-
+-	switch (result)
+-	{
+-		case SQLITE_DONE:
+-			/* no rows returned */
+-			ret = 0;
+-			break;
+-		case SQLITE_ROW:
+-			if (sqlite3_column_type(stmt, 0) == SQLITE_NULL)
+-			{
+-				ret = 0;
+-				break;
+-			}
+-			ret = sqlite3_column_int(stmt, 0);
+-			break;
+-		default:
+-			DPRINTF(E_WARN, L_DB_SQL, "%s: step failed: %s\n%s\n", __func__, sqlite3_errmsg(db), sql);
+-			ret = -1;
+-			break;
+-	}
+-	sqlite3_free(sql);
+-	sqlite3_finalize(stmt);
+-
+-	return ret;
++	sql_get_field(int, sqlite3_column_int)
+ }
+ 
+ int64_t
+ sql_get_int64_field(sqlite3 *db, const char *fmt, ...)
+ {
+-	va_list		ap;
+-	int		counter, result;
+-	char		*sql;
+-	int64_t		ret;
+-	sqlite3_stmt	*stmt;
+-	
+-	va_start(ap, fmt);
+-	sql = sqlite3_vmprintf(fmt, ap);
+-	va_end(ap);
+-
+-	//DPRINTF(E_DEBUG, L_DB_SQL, "sql: %s\n", sql);
+-
+-	switch (sqlite3_prepare_v2(db, sql, -1, &stmt, NULL))
+-	{
+-		case SQLITE_OK:
+-			break;
+-		default:
+-			DPRINTF(E_ERROR, L_DB_SQL, "prepare failed: %s\n%s\n", sqlite3_errmsg(db), sql);
+-			sqlite3_free(sql);
+-			return -1;
+-	}
+-
+-	for (counter = 0;
+-	     ((result = sqlite3_step(stmt)) == SQLITE_BUSY || result == SQLITE_LOCKED) && counter < 2;
+-	     counter++) {
+-		/* While SQLITE_BUSY has a built in timeout,
+-		 * SQLITE_LOCKED does not, so sleep */
+-		if (result == SQLITE_LOCKED)
+-			sleep(1);
+-	}
+-
+-	switch (result)
+-	{
+-		case SQLITE_DONE:
+-			/* no rows returned */
+-			ret = 0;
+-			break;
+-		case SQLITE_ROW:
+-			if (sqlite3_column_type(stmt, 0) == SQLITE_NULL)
+-			{
+-				ret = 0;
+-				break;
+-			}
+-			ret = sqlite3_column_int64(stmt, 0);
+-			break;
+-		default:
+-			DPRINTF(E_WARN, L_DB_SQL, "%s: step failed: %s\n%s\n", __func__, sqlite3_errmsg(db), sql);
+-			ret = -1;
+-			break;
+-	}
+-	sqlite3_free(sql);
+-	sqlite3_finalize(stmt);
+-
+-	return ret;
++	sql_get_field(int64_t, sqlite3_column_int64)
+ }
+ 
+ char *
diff --git a/minidlna/patches/070-return-void.patch b/minidlna/patches/070-return-void.patch
new file mode 100644
index 00000000..ec0e6d37
--- /dev/null
+++ b/minidlna/patches/070-return-void.patch
@@ -0,0 +1,19 @@
+From ce34745bb19a649c8570ef0a3da9ffd5e941548e Mon Sep 17 00:00:00 2001
+From: Daniel Kamil Kozar <dkk089@gmail.com>
+Date: Sun, 30 Dec 2018 22:49:50 +0100
+Subject: [PATCH] No return in a function returning non-void
+
+---
+ upnpdescgen.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/upnpdescgen.c
++++ b/upnpdescgen.c
+@@ -525,6 +525,7 @@ genXML(char * str, int * len, int * tmpl
+ 			pile[top].eltname = eltname;
+ 		}
+ 	}
++	return str;
+ }
+ 
+ /* genRootDesc() :
diff --git a/mmc-utils/Makefile b/mmc-utils/Makefile
new file mode 100644
index 00000000..43513f5f
--- /dev/null
+++ b/mmc-utils/Makefile
@@ -0,0 +1,52 @@
+#
+# Copyright (C) 2015-2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mmc-utils
+PKG_RELEASE:=2
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git
+PKG_SOURCE_DATE:=2019-10-10
+PKG_SOURCE_VERSION:=73d6c59af8d1bcedf5de4aa1f5d5b7f765f545f5
+PKG_MIRROR_HASH:=6ff0b32136c7bc64a099f1185a3ca063b5d644056476456a23029e9f6dfa789a
+
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=
+
+PKG_MAINTAINER:=Michael Heimpold <mhei@heimpold.de>
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mmc-utils
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Userspace tools for MMC/SD devices
+  URL:=http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git
+endef
+
+define Package/mmc-utils/description
+  This package contains the userspace mmc utils, the userspace
+  counterpart to the Linux MMC/SD subsystem.
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+	        $(TARGET_CONFIGURE_OPTS) CFLAGS="$(TARGET_CFLAGS) -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" \
+	        mmc
+endef
+
+define Package/mmc-utils/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mmc $(1)/sbin
+endef
+
+$(eval $(call BuildPackage,mmc-utils))
diff --git a/mmc-utils/patches/0000-properly-set-fortify-source-in-makefile.patch b/mmc-utils/patches/0000-properly-set-fortify-source-in-makefile.patch
new file mode 100644
index 00000000..1a208133
--- /dev/null
+++ b/mmc-utils/patches/0000-properly-set-fortify-source-in-makefile.patch
@@ -0,0 +1,9 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ CC ?= gcc
+-AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2
++AM_CFLAGS = -D_FILE_OFFSET_BITS=64
+ CFLAGS ?= -g -O2
+ objects = \
+ 	mmc.o \
diff --git a/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch b/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch
new file mode 100644
index 00000000..36ea88cc
--- /dev/null
+++ b/mmc-utils/patches/0006-Fix-parsing-of-Product-Revision-and-Serial-Number.patch
@@ -0,0 +1,24 @@
+From 1307f0efca4acdff036b5b3a60847f7528cd7b6f Mon Sep 17 00:00:00 2001
+From: Stephane Fillod <f8cfe@free.fr>
+Date: Mon, 14 Jan 2019 17:50:50 +0100
+Subject: [PATCH] Fix parsing of Product Revision and Serial Number
+
+According to MMC Standard (similar to SDCard Standard).
+
+Signed-off-by: Stephane Fillod <f8cfe@free.fr>
+Acked-by: Avri Altman <avri.altman@wdc.com>
+---
+ lsmmc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/lsmmc.c
++++ b/lsmmc.c
+@@ -562,7 +562,7 @@ void print_mmc_cid(struct config *config
+ 	unsigned int crc;
+ 
+ 	parse_bin(cid, "8u6r2u8u48a4u4u32u4u4u7u1r",
+-		&mid, &cbx, &oid, &pnm[0], &psn, &prv_major, &prv_minor,
++		&mid, &cbx, &oid, &pnm[0], &prv_major, &prv_minor, &psn,
+ 		&mdt_year, &mdt_month, &crc);
+ 
+ 	pnm[6] = '\0';
diff --git a/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch b/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch
new file mode 100644
index 00000000..6ccf2e5b
--- /dev/null
+++ b/mmc-utils/patches/0007-Add-various-SD-eMMC-vendors-to-table.patch
@@ -0,0 +1,92 @@
+From a2985ca233641f596926314762b5f1085aeaa723 Mon Sep 17 00:00:00 2001
+From: Stephane Fillod <f8cfe@free.fr>
+Date: Tue, 15 Jan 2019 14:56:15 +0100
+Subject: [PATCH] Add various SD/eMMC vendors to table
+
+Part if this list update comes from a compilation of this web site[1].
+
+[1] https://www.cameramemoryspeed.com/sd-memory-card-faq/reading-sd-card-cid-serial-psn-internal-numbers/
+
+Signed-off-by: Stephane Fillod <f8cfe@free.fr>
+---
+ lsmmc.c | 34 ++++++++++++++++++++++++++++++++--
+ 1 file changed, 32 insertions(+), 2 deletions(-)
+
+--- a/lsmmc.c
++++ b/lsmmc.c
+@@ -112,7 +112,7 @@ struct ids_database database[] = {
+ 	{
+ 		.type = "sd",
+ 		.id = 0x1b,
+-		.manufacturer = "Transcend",
++		.manufacturer = "Transcend/Samsung",
+ 	},
+ 	{
+ 		.type = "sd",
+@@ -122,7 +122,7 @@ struct ids_database database[] = {
+ 	{
+ 		.type = "sd",
+ 		.id = 0x1d,
+-		.manufacturer = "Corsair",
++		.manufacturer = "Corsair/AData",
+ 	},
+ 	{
+ 		.type = "sd",
+@@ -136,6 +136,11 @@ struct ids_database database[] = {
+ 	},
+ 	{
+ 		.type = "sd",
++		.id = 0x27,
++		.manufacturer = "Delkin/Phison",
++	},
++	{
++		.type = "sd",
+ 		.id = 0x28,
+ 		.manufacturer = "Lexar",
+ 	},
+@@ -146,6 +151,11 @@ struct ids_database database[] = {
+ 	},
+ 	{
+ 		.type = "sd",
++		.id = 0x31,
++		.manufacturer = "Silicon Power",
++	},
++	{
++		.type = "sd",
+ 		.id = 0x33,
+ 		.manufacturer = "STMicroelectronics",
+ 	},
+@@ -161,6 +171,21 @@ struct ids_database database[] = {
+ 	},
+ 	{
+ 		.type = "sd",
++		.id = 0x74,
++		.manufacturer = "Transcend",
++	},
++	{
++		.type = "sd",
++		.id = 0x76,
++		.manufacturer = "Patriot",
++	},
++	{
++		.type = "sd",
++		.id = 0x82,
++		.manufacturer = "Gobe/Sony",
++	},
++	{
++		.type = "sd",
+ 		.id = 0x89,
+ 		.manufacturer = "Unknown",
+ 	},
+@@ -224,6 +249,11 @@ struct ids_database database[] = {
+ 		.id = 0x70,
+ 		.manufacturer = "Kingston",
+ 	},
++	{
++		.type = "mmc",
++		.id = 0xfe,
++		.manufacturer = "Micron",
++	},
+ };
+ 
+ /* Command line parsing functions */
diff --git a/mmc-utils/patches/0008-Various-fixes.patch b/mmc-utils/patches/0008-Various-fixes.patch
new file mode 100644
index 00000000..f3ea6a73
--- /dev/null
+++ b/mmc-utils/patches/0008-Various-fixes.patch
@@ -0,0 +1,269 @@
+From dacd9d2950f5f6559cde1ceec3035ab77e9698ad Mon Sep 17 00:00:00 2001
+From: Stephane Fillod <f8cfe@free.fr>
+Date: Tue, 15 Jan 2019 15:06:03 +0100
+Subject: [PATCH] Various fixes
+
+These warnings were mainly found using cppcheck.
+
+Signed-off-by: Stephane Fillod <f8cfe@free.fr>
+Reviewed-by: Michael Heimpold <mhei@heimpold.de>
+---
+ lsmmc.c    | 42 +++++++++++++++++++++---------------------
+ mmc_cmds.c | 14 ++++++++++++--
+ 2 files changed, 33 insertions(+), 23 deletions(-)
+
+--- a/lsmmc.c
++++ b/lsmmc.c
+@@ -554,9 +554,9 @@ void print_sd_cid(struct config *config,
+ 		printf("\tOID: %s\n", oid);
+ 		printf("\tPNM: %s\n", pnm);
+ 		printf("\tPRV: 0x%01x%01x ", prv_major, prv_minor);
+-		printf("(%d.%d)\n", prv_major, prv_minor);
++		printf("(%u.%u)\n", prv_major, prv_minor);
+ 		printf("\tPSN: 0x%08x\n", psn);
+-		printf("\tMDT: 0x%02x%01x %d %s\n", mdt_year, mdt_month,
++		printf("\tMDT: 0x%02x%01x %u %s\n", mdt_year, mdt_month,
+ 		       2000 + mdt_year, months[mdt_month]);
+ 		printf("\tCRC: 0x%02x\n", crc);
+ 	} else {
+@@ -566,9 +566,9 @@ void print_sd_cid(struct config *config,
+ 		else
+ 			printf("manufacturer: 'Unlisted' '%s'\n", oid);
+ 
+-		printf("product: '%s' %d.%d\n", pnm, prv_major, prv_minor);
++		printf("product: '%s' %u.%u\n", pnm, prv_major, prv_minor);
+ 		printf("serial: 0x%08x\n", psn);
+-		printf("manfacturing date: %d %s\n", 2000 + mdt_year,
++		printf("manufacturing date: %u %s\n", 2000 + mdt_year,
+ 		       months[mdt_month]);
+ 	}
+ }
+@@ -625,9 +625,9 @@ void print_mmc_cid(struct config *config
+ 		printf("\tOID: 0x%01x\n", oid);
+ 		printf("\tPNM: %s\n", pnm);
+ 		printf("\tPRV: 0x%01x%01x ", prv_major, prv_minor);
+-		printf("(%d.%d)\n", prv_major, prv_minor);
++		printf("(%u.%u)\n", prv_major, prv_minor);
+ 		printf("\tPSN: 0x%08x\n", psn);
+-		printf("\tMDT: 0x%01x%01x %d %s\n", mdt_month, mdt_year,
++		printf("\tMDT: 0x%01x%01x %u %s\n", mdt_month, mdt_year,
+ 		       1997 + mdt_year, months[mdt_month]);
+ 		printf("\tCRC: 0x%02x\n", crc);
+ 	} else {
+@@ -637,9 +637,9 @@ void print_mmc_cid(struct config *config
+ 		else
+ 			printf("manufacturer: 'Unlisted' '%c'\n", oid);
+ 
+-		printf("product: '%s' %d.%d\n", pnm, prv_major, prv_minor);
++		printf("product: '%s' %u.%u\n", pnm, prv_major, prv_minor);
+ 		printf("serial: 0x%08x\n", psn);
+-		printf("manfacturing date: %d %s\n", 1997 + mdt_year,
++		printf("manufacturing date: %u %s\n", 1997 + mdt_year,
+ 		       months[mdt_month]);
+ 	}
+ }
+@@ -729,7 +729,7 @@ void print_sd_csd(struct config *config,
+ 
+ 		printf("======SD/CSD======\n");
+ 
+-		printf("\tCSD_STRUCTURE: %d\n", csd_structure);
++		printf("\tCSD_STRUCTURE: %u\n", csd_structure);
+ 		printf("\tTAAC: 0x%02x (", taac);
+ 
+ 		switch (taac_timevalue) {
+@@ -816,7 +816,7 @@ void print_sd_csd(struct config *config,
+ 		if (csd_structure == 1 && taac != 0x0e)
+ 			printf("Warn: Invalid TAAC (should be 0x0e)\n");
+ 
+-		printf("\tNSAC: %d clocks\n", nsac);
++		printf("\tNSAC: %u clocks\n", nsac);
+ 		if (csd_structure == 1 && nsac != 0x00)
+ 			printf("Warn: Invalid NSAC (should be 0x00)\n");
+ 
+@@ -1103,12 +1103,12 @@ void print_sd_csd(struct config *config,
+ 			if (erase_blk_en != 0x01)
+ 				printf("Warn: Invalid ERASE_BLK_EN (should be 0x01)\n");
+ 
+-			printf("\tSECTOR_SIZE: 0x%02x (Erasable sector: %d blocks)\n",
++			printf("\tSECTOR_SIZE: 0x%02x (Erasable sector: %u blocks)\n",
+ 			       sector_size, sector_size + 1);
+ 			if (sector_size != 0x7f)
+ 				printf("Warn: Invalid SECTOR_SIZE (should be 0x7f)\n");
+ 
+-			printf("\tWP_GRP_SIZE: 0x%02x (Write protect group: %d blocks)\n",
++			printf("\tWP_GRP_SIZE: 0x%02x (Write protect group: %u blocks)\n",
+ 			       wp_grp_size, wp_grp_size + 1);
+ 			if (wp_grp_size != 0x00)
+ 				printf("Warn: Invalid WP_GRP_SIZE (should be 0x00)\n");
+@@ -1117,7 +1117,7 @@ void print_sd_csd(struct config *config,
+ 			if (wp_grp_enable != 0x00)
+ 				printf("Warn: Invalid WP_GRP_ENABLE (should be 0x00)\n");
+ 
+-			printf("\tR2W_FACTOR: 0x%01x (Write %d times read)\n",
++			printf("\tR2W_FACTOR: 0x%01x (Write %u times read)\n",
+ 			       r2w_factor, r2w_factor);
+ 			if (r2w_factor != 0x02)
+ 				printf("Warn: Invalid R2W_FACTOR (should be 0x02)\n");
+@@ -1199,7 +1199,7 @@ void print_sd_csd(struct config *config,
+ 		else
+ 			printf("%.2fbyte", memory_capacity * 1.0);
+ 
+-		printf(" (%lld bytes, %lld sectors, %d bytes each)\n",
++		printf(" (%llu bytes, %llu sectors, %d bytes each)\n",
+ 		       memory_capacity, blocks, block_size);
+ 	} else {
+ 		unsigned long long blocks = 0;
+@@ -1262,7 +1262,7 @@ void print_sd_csd(struct config *config,
+ 		else
+ 			printf("%.2fbyte", memory_capacity * 1.0);
+ 
+-		printf(" (%lld bytes, %lld sectors, %d bytes each)\n",
++		printf(" (%llu bytes, %llu sectors, %d bytes each)\n",
+ 		       memory_capacity, blocks, block_size);
+ 	}
+ }
+@@ -1456,7 +1456,7 @@ void print_mmc_csd(struct config *config
+ 			break;
+ 		}
+ 
+-		printf("\tNSAC: %d clocks\n", nsac);
++		printf("\tNSAC: %u clocks\n", nsac);
+ 		printf("\tTRAN_SPEED: 0x%02x (", tran_speed);
+ 		switch (tran_speed_timevalue) {
+ 		case 0x0:
+@@ -1764,10 +1764,10 @@ void print_mmc_csd(struct config *config
+ 
+ 		printf("\tC_SIZE_MULT: 0x%01x\n", c_size_mult);
+ 		printf("\tERASE_GRP_SIZE: 0x%02x\n", erase_grp_size);
+-		printf("\tERASE_GRP_MULT: 0x%02x (%d write blocks/erase group)\n",
++		printf("\tERASE_GRP_MULT: 0x%02x (%u write blocks/erase group)\n",
+ 		       erase_grp_mult, (erase_grp_size + 1) *
+ 		       (erase_grp_mult + 1));
+-		printf("\tWP_GRP_SIZE: 0x%02x (%d blocks/write protect group)\n",
++		printf("\tWP_GRP_SIZE: 0x%02x (%u blocks/write protect group)\n",
+ 		       wp_grp_size, wp_grp_size + 1);
+ 		printf("\tWP_GRP_ENABLE: 0x%01x\n", wp_grp_enable);
+ 
+@@ -1784,7 +1784,7 @@ void print_mmc_csd(struct config *config
+ 			break;
+ 		}
+ 
+-		printf("\tR2W_FACTOR: 0x%01x (Write %d times read)\n",
++		printf("\tR2W_FACTOR: 0x%01x (Write %u times read)\n",
+ 		       r2w_factor, r2w_factor);
+ 
+ 		printf("\tWRITE_BL_LEN: 0x%01x (", write_bl_len);
+@@ -1914,7 +1914,7 @@ void print_mmc_csd(struct config *config
+ 		else
+ 			printf("%.2fbyte", memory_capacity * 1.0);
+ 
+-		printf(" (%lld bytes, %lld sectors, %d bytes each)\n",
++		printf(" (%llu bytes, %llu sectors, %d bytes each)\n",
+ 		       memory_capacity, blocks, block_size);
+ 	} else {
+ 		int mult;
+@@ -1991,7 +1991,7 @@ void print_mmc_csd(struct config *config
+ 			printf("%.2fKbyte", memory_capacity / (1024.0));
+ 		else
+ 			printf("%.2fbyte", memory_capacity * 1.0);
+-		printf(" (%lld bytes, %lld sectors, %d bytes each)\n",
++		printf(" (%llu bytes, %llu sectors, %d bytes each)\n",
+ 		       memory_capacity, blocks, block_size);
+ 	}
+ }
+--- a/mmc_cmds.c
++++ b/mmc_cmds.c
+@@ -252,6 +252,7 @@ int do_writeprotect_boot_get(int nargs,
+ 
+ 	print_writeprotect_boot_status(ext_csd);
+ 
++	close(fd);
+ 	return ret;
+ }
+ 
+@@ -290,6 +291,7 @@ int do_writeprotect_boot_set(int nargs,
+ 		exit(1);
+ 	}
+ 
++	close(fd);
+ 	return ret;
+ }
+ 
+@@ -378,6 +380,7 @@ int do_writeprotect_user_get(int nargs,
+ 	if (last_wpblk != (x + y - 1))
+ 		print_wp_status(wp_sizeblks, last_wpblk, cnt - 1, last_prot);
+ 
++	close(fd);
+ 	return ret;
+ }
+ 
+@@ -524,6 +527,7 @@ int do_disable_512B_emulation(int nargs,
+ 		printf("MMC does not support disabling 512B emulation mode.\n");
+ 	}
+ 
++	close(fd);
+ 	return ret;
+ }
+ 
+@@ -595,6 +599,7 @@ int do_write_boot_en(int nargs, char **a
+ 			value, EXT_CSD_PART_CONFIG, device);
+ 		exit(1);
+ 	}
++	close(fd);
+ 	return ret;
+ }
+ 
+@@ -716,6 +721,7 @@ int do_hwreset(int value, int nargs, cha
+ 		exit(1);
+ 	}
+ 
++	close(fd);
+ 	return ret;
+ }
+ 
+@@ -766,6 +772,7 @@ int do_write_bkops_en(int nargs, char **
+ 		exit(1);
+ 	}
+ 
++	close(fd);
+ 	return ret;
+ }
+ 
+@@ -796,6 +803,7 @@ int do_status_get(int nargs, char **argv
+ 
+ 	printf("SEND_STATUS response: 0x%08x\n", response);
+ 
++	close(fd);
+ 	return ret;
+ }
+ 
+@@ -1615,11 +1623,11 @@ int do_read_extcsd(int nargs, char **arg
+ 		printf("Write reliability setting register"
+ 			" [WR_REL_SET]: 0x%02x\n", reg);
+ 
+-		printf(" user area: %s\n", reg & (1<<0) ? reliable : fast);
++		printf(" user area: %s\n", (reg & (1<<0)) ? reliable : fast);
+ 		int i;
+ 		for (i = 1; i <= 4; i++) {
+ 			printf(" partition %d: %s\n", i,
+-				reg & (1<<i) ? reliable : fast);
++				(reg & (1<<i)) ? reliable : fast);
+ 		}
+ 
+ 		reg = ext_csd[EXT_CSD_WR_REL_PARAM];
+@@ -1837,6 +1845,7 @@ int do_sanitize(int nargs, char **argv)
+ 		exit(1);
+ 	}
+ 
++	close(fd);
+ 	return ret;
+ 
+ }
+@@ -2422,6 +2431,7 @@ int do_cache_ctrl(int value, int nargs,
+ 		exit(1);
+ 	}
+ 
++	close(fd);
+ 	return ret;
+ }
+ 
diff --git a/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch b/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch
new file mode 100644
index 00000000..186e6131
--- /dev/null
+++ b/mmc-utils/patches/0009-mmc-utils-let-FFU-mode-use-CMD23-and-CMD25.patch
@@ -0,0 +1,181 @@
+From f54f401085e011e6f9c7b120aa1794b19c32b493 Mon Sep 17 00:00:00 2001
+From: "Shivamurthy Shastri (sshivamurthy)" <sshivamurthy@micron.com>
+Date: Wed, 10 Apr 2019 13:38:08 +0000
+Subject: [PATCH] mmc-utils: let FFU mode use CMD23 and CMD25
+
+As per specification, the host can use either CMD24 or CMD25 in
+closed-ended or open-ended way.
+CMD25 is better option as it can flash the firmware image in one go.
+
+Signed-off-by: Shivamurthy Shastri <sshivamurthy@micron.com>
+Reviewed-by: Avri Altman <avri.altman@wdc.com>
+---
+ mmc.h      |  2 ++
+ mmc_cmds.c | 70 ++++++++++++++++++++++++++++++------------------------
+ 2 files changed, 41 insertions(+), 31 deletions(-)
+
+--- a/mmc.h
++++ b/mmc.h
+@@ -25,10 +25,12 @@
+ /* From kernel linux/mmc/mmc.h */
+ #define MMC_SWITCH		6	/* ac	[31:0] See below	R1b */
+ #define MMC_SEND_EXT_CSD	8	/* adtc				R1  */
++#define MMC_STOP_TRANSMISSION    12   /* ac                      R1b */
+ #define MMC_SEND_STATUS		13	/* ac   [31:16] RCA        R1  */
+ #define R1_SWITCH_ERROR   (1 << 7)  /* sx, c */
+ #define MMC_SWITCH_MODE_WRITE_BYTE	0x03	/* Set target to value */
+ #define MMC_READ_MULTIPLE_BLOCK  18   /* adtc [31:0] data addr   R1  */
++#define MMC_SET_BLOCK_COUNT      23   /* adtc [31:0] data addr   R1  */
+ #define MMC_WRITE_BLOCK		24	/* adtc [31:0] data addr	R1  */
+ #define MMC_WRITE_MULTIPLE_BLOCK 25   /* adtc                    R1  */
+ #define MMC_SET_WRITE_PROT	28    /* ac   [31:0] data addr   R1b */
+--- a/mmc_cmds.c
++++ b/mmc_cmds.c
+@@ -2456,12 +2456,13 @@ int do_ffu(int nargs, char **argv)
+ 	int sect_done = 0, retry = 3, ret = -EINVAL;
+ 	unsigned int sect_size;
+ 	__u8 ext_csd[512];
+-	__u8 *buf;
++	__u8 *buf = NULL;
+ 	__u32 arg;
+ 	off_t fw_size;
+ 	ssize_t chunk_size;
+ 	char *device;
+-	struct mmc_ioc_multi_cmd *multi_cmd;
++	struct mmc_ioc_multi_cmd *multi_cmd = NULL;
++	__u32 blocks = 1;
+ 
+ 	if (nargs != 3) {
+ 		fprintf(stderr, "Usage: ffu <image name> </path/to/mmcblkX> \n");
+@@ -2481,14 +2482,6 @@ int do_ffu(int nargs, char **argv)
+ 		exit(1);
+ 	}
+ 
+-	buf = malloc(512);
+-	multi_cmd = calloc(1, sizeof(struct mmc_ioc_multi_cmd) +
+-				3 * sizeof(struct mmc_ioc_cmd));
+-	if (!buf || !multi_cmd) {
+-		perror("failed to allocate memory");
+-		goto out;
+-	}
+-
+ 	ret = read_extcsd(dev_fd, ext_csd);
+ 	if (ret) {
+ 		fprintf(stderr, "Could not read EXT_CSD from %s\n", device);
+@@ -2513,9 +2506,17 @@ int do_ffu(int nargs, char **argv)
+ 	}
+ 
+ 	fw_size = lseek(img_fd, 0, SEEK_END);
++	if (fw_size > MMC_IOC_MAX_BYTES || fw_size == 0) {
++		fprintf(stderr, "Wrong firmware size");
++		goto out;
++	}
+ 
+-	if (fw_size == 0) {
+-		fprintf(stderr, "Firmware image is empty");
++	/* allocate maximum required */
++	buf = malloc(fw_size);
++	multi_cmd = calloc(1, sizeof(struct mmc_ioc_multi_cmd) +
++				4 * sizeof(struct mmc_ioc_cmd));
++	if (!buf || !multi_cmd) {
++		perror("failed to allocate memory");
+ 		goto out;
+ 	}
+ 
+@@ -2525,14 +2526,19 @@ int do_ffu(int nargs, char **argv)
+ 		goto out;
+ 	}
+ 
++	/* calculate required fw blocks for CMD25 */
++	blocks = fw_size / sect_size;
++
+ 	/* set CMD ARG */
+ 	arg = ext_csd[EXT_CSD_FFU_ARG_0] |
+ 		ext_csd[EXT_CSD_FFU_ARG_1] << 8 |
+ 		ext_csd[EXT_CSD_FFU_ARG_2] << 16 |
+ 		ext_csd[EXT_CSD_FFU_ARG_3] << 24;
+ 
++	/* prepare multi_cmd for FFU based on cmd to be used */
++
+ 	/* prepare multi_cmd to be sent */
+-	multi_cmd->num_of_cmds = 3;
++	multi_cmd->num_of_cmds = 4;
+ 
+ 	/* put device into ffu mode */
+ 	multi_cmd->cmds[0].opcode = MMC_SWITCH;
+@@ -2543,37 +2549,42 @@ int do_ffu(int nargs, char **argv)
+ 	multi_cmd->cmds[0].flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
+ 	multi_cmd->cmds[0].write_flag = 1;
+ 
++	/* send block count */
++	multi_cmd->cmds[1].opcode = MMC_SET_BLOCK_COUNT;
++	multi_cmd->cmds[1].arg = blocks;
++	multi_cmd->cmds[1].flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
++
+ 	/* send image chunk */
+-	multi_cmd->cmds[1].opcode = MMC_WRITE_BLOCK;
+-	multi_cmd->cmds[1].blksz = sect_size;
+-	multi_cmd->cmds[1].blocks = 1;
+-	multi_cmd->cmds[1].arg = arg;
+-	multi_cmd->cmds[1].flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
+-	multi_cmd->cmds[1].write_flag = 1;
+-	mmc_ioc_cmd_set_data(multi_cmd->cmds[1], buf);
++	multi_cmd->cmds[2].opcode = MMC_WRITE_MULTIPLE_BLOCK;
++	multi_cmd->cmds[2].blksz = sect_size;
++	multi_cmd->cmds[2].blocks = blocks;
++	multi_cmd->cmds[2].arg = arg;
++	multi_cmd->cmds[2].flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_ADTC;
++	multi_cmd->cmds[2].write_flag = 1;
++	mmc_ioc_cmd_set_data(multi_cmd->cmds[2], buf);
+ 
+ 	/* return device into normal mode */
+-	multi_cmd->cmds[2].opcode = MMC_SWITCH;
+-	multi_cmd->cmds[2].arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
++	multi_cmd->cmds[3].opcode = MMC_SWITCH;
++	multi_cmd->cmds[3].arg = (MMC_SWITCH_MODE_WRITE_BYTE << 24) |
+ 			(EXT_CSD_MODE_CONFIG << 16) |
+ 			(EXT_CSD_NORMAL_MODE << 8) |
+ 			EXT_CSD_CMD_SET_NORMAL;
+-	multi_cmd->cmds[2].flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
+-	multi_cmd->cmds[2].write_flag = 1;
++	multi_cmd->cmds[3].flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
++	multi_cmd->cmds[3].write_flag = 1;
+ 
+ do_retry:
+ 	/* read firmware chunk */
+ 	lseek(img_fd, 0, SEEK_SET);
+-	chunk_size = read(img_fd, buf, 512);
++	chunk_size = read(img_fd, buf, fw_size);
+ 
+-	while (chunk_size > 0) {
++	if (chunk_size > 0) {
+ 		/* send ioctl with multi-cmd */
+ 		ret = ioctl(dev_fd, MMC_IOC_MULTI_CMD, multi_cmd);
+ 
+ 		if (ret) {
+ 			perror("Multi-cmd ioctl");
+ 			/* In case multi-cmd ioctl failed before exiting from ffu mode */
+-			ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[2]);
++			ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[3]);
+ 			goto out;
+ 		}
+ 
+@@ -2600,9 +2611,6 @@ do_retry:
+ 		} else {
+ 			fprintf(stderr, "Programmed %d/%jd bytes\r", sect_done * sect_size, (intmax_t)fw_size);
+ 		}
+-
+-		/* read the next firmware chunk (if any) */
+-		chunk_size = read(img_fd, buf, 512);
+ 	}
+ 
+ 	if ((sect_done * sect_size) == fw_size) {
+@@ -2639,7 +2647,7 @@ do_retry:
+ 		if (ret) {
+ 			perror("Multi-cmd ioctl failed setting install mode");
+ 			/* In case multi-cmd ioctl failed before exiting from ffu mode */
+-			ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[2]);
++			ioctl(dev_fd, MMC_IOC_CMD, &multi_cmd->cmds[3]);
+ 			goto out;
+ 		}
+ 
diff --git a/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch b/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch
new file mode 100644
index 00000000..185d64e4
--- /dev/null
+++ b/mmc-utils/patches/0010-One-further-optimization-of-trimming-routine.patch
@@ -0,0 +1,30 @@
+From 3539243dcab7b84bb8a45e2c2da80e162284bffc Mon Sep 17 00:00:00 2001
+From: Michael Heimpold <mhei@heimpold.de>
+Date: Sat, 8 Dec 2018 10:43:01 +0100
+Subject: [PATCH] One further optimization of trimming routine
+
+The last change to the trimming routine made it more efficient,
+however, we can even get rid of the memmove() as we leave the
+function with strdup() anyway.
+
+Signed-off-by: Michael Heimpold <mhei@heimpold.de>
+Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
+---
+ lsmmc.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+--- a/lsmmc.c
++++ b/lsmmc.c
+@@ -393,10 +393,9 @@ char *read_file(char *name)
+ 		start++;
+ 		len--;
+ 	}
+-	memmove(line, start, len);
+-	line[len] = '\0';
+ 
+-	return strdup(line);
++	start[len] = '\0';
++	return strdup(start);
+ }
+ 
+ /* Hexadecimal string parsing functions */
diff --git a/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch b/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch
new file mode 100644
index 00000000..ec0c4d90
--- /dev/null
+++ b/mmc-utils/patches/0011-mmc-utils-Fix-scaling-of-cache-size.patch
@@ -0,0 +1,29 @@
+From 8121cece25da8dad1dc91393f5285195997c71b1 Mon Sep 17 00:00:00 2001
+From: Patrick Oppenlander <patrick.oppenlander@gmail.com>
+Date: Fri, 14 Feb 2020 09:13:32 +1100
+Subject: [PATCH] mmc-utils: Fix scaling of cache size
+
+JESD84-B51 7.4.30 CACHE_SIZE [252:249] states that "the size is
+indicated as multiple of kilobits". This is also supported by Table 39,
+"e.MMC internal sizes and related Units / Granularities" which lists
+"32Kb (=4KB)" as the cache size granularity for 4KiB native devices.
+
+Signed-off-by: Patrick Oppenlander <patrick.oppenlander@gmail.com>
+Reviewed-by: Avri Altman <avri.altman@wdc.com>
+---
+ mmc_cmds.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/mmc_cmds.c
++++ b/mmc_cmds.c
+@@ -1427,8 +1427,8 @@ int do_read_extcsd(int nargs, char **arg
+ 		printf("Power off notification [POWER_OFF_LONG_TIME: 0x%02x]\n",
+ 			ext_csd[247]);
+ 		printf("Cache Size [CACHE_SIZE] is %d KiB\n",
+-			ext_csd[249] << 0 | (ext_csd[250] << 8) |
+-			(ext_csd[251] << 16) | (ext_csd[252] << 24));
++			(ext_csd[249] << 0 | (ext_csd[250] << 8) |
++			(ext_csd[251] << 16) | (ext_csd[252] << 24)) / 8);
+ 	}
+ 
+ 	/* A441: Reserved [501:247]
diff --git a/mmc-utils/patches/0012-add-extcsd_operation.patch b/mmc-utils/patches/0012-add-extcsd_operation.patch
new file mode 100644
index 00000000..1bd7a372
--- /dev/null
+++ b/mmc-utils/patches/0012-add-extcsd_operation.patch
@@ -0,0 +1,109 @@
+Index: mmc-utils-2019-10-10-73d6c59a/mmc.c
+===================================================================
+--- mmc-utils-2019-10-10-73d6c59a.orig/mmc.c
++++ mmc-utils-2019-10-10-73d6c59a/mmc.c
+@@ -215,6 +215,16 @@ static struct Command commands[] = {
+ 		"Run Field Firmware Update with <image name> on <device>.\n",
+ 	  NULL
+ 	},
++	{ do_write_extcsd, -3,
++	  "extcsd write", "<device> <reg_index> <value>\n"
++		"Write the value to ext_csd register index.\n",
++	  NULL
++	},
++	{ do_read_extcsd_index, -2,
++	  "extcsd read-index", "<device> <reg_index>\n"
++		"Read ext_csd register index.\n",
++	  NULL
++	},
+ 	{ 0, 0, 0, 0 }
+ };
+ 
+Index: mmc-utils-2019-10-10-73d6c59a/mmc_cmds.c
+===================================================================
+--- mmc-utils-2019-10-10-73d6c59a.orig/mmc_cmds.c
++++ mmc-utils-2019-10-10-73d6c59a/mmc_cmds.c
+@@ -2675,3 +2675,70 @@ out:
+ 	return ret;
+ #endif
+ }
++
++
++int do_write_extcsd(int nargs, char **argv)
++{
++	int fd, ret;
++	char *device;
++	int reg_index, value;
++
++	if (nargs != 4) {
++	       fprintf(stderr, "mmc extcsd read <device> </path/to/mmcblkX> <reg_index> <value>\n");
++	       exit(1);
++	}
++
++	device = argv[1];
++	reg_index = strtol(argv[2], NULL, 10);
++	value = strtol(argv[3], NULL, 16);
++
++	fd = open(device, O_RDWR);
++	if (fd < 0) {
++		perror("open");
++		exit(1);
++	}
++
++	ret = write_extcsd_value(fd, reg_index, value);
++	if (ret) {
++		fprintf(stderr,
++			"Could not write 0x%02x to EXT_CSD[%d] in %s\n",
++			value, reg_index, device);
++		close(fd);
++		exit(1);
++	}
++
++	close(fd);
++	return ret;
++}
++
++int do_read_extcsd_index(int nargs, char **argv)
++{
++	__u8 ext_csd[512];
++	int fd, ret;
++	char *device;
++	int reg_index;
++
++	if (nargs != 3) {
++		fprintf(stderr, "Usage: mmc extcsd read </path/to/mmcblkX> <reg_index>\n");
++		exit(1);
++	}
++
++	device = argv[1];
++	reg_index = strtol(argv[2], NULL, 10);
++
++	fd = open(device, O_RDWR);
++	if (fd < 0) {
++		perror("open");
++		exit(1);
++	}
++
++	ret = read_extcsd(fd, ext_csd);
++	if (ret) {
++		fprintf(stderr, "Could not read EXT_CSD from %s\n", device);
++		close(fd);
++		exit(1);
++	}
++	printf("EXT_CSD[%d]=0x%02x\n",reg_index,ext_csd[reg_index]);
++	close(fd);
++	return ret;
++}
+\ No newline at end of file
+Index: mmc-utils-2019-10-10-73d6c59a/mmc_cmds.h
+===================================================================
+--- mmc-utils-2019-10-10-73d6c59a.orig/mmc_cmds.h
++++ mmc-utils-2019-10-10-73d6c59a/mmc_cmds.h
+@@ -19,6 +19,7 @@
+ 
+ /* mmc_cmds.c */
+ int do_read_extcsd(int nargs, char **argv);
++int do_read_extcsd_index(int nargs, char **argv);
+ int do_write_extcsd(int nargs, char **argv);
+ int do_writeprotect_boot_get(int nargs, char **argv);
+ int do_writeprotect_boot_set(int nargs, char **argv);
diff --git a/mqtt/Makefile b/mqtt/Makefile
new file mode 100644
index 00000000..962ff762
--- /dev/null
+++ b/mqtt/Makefile
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2013 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mqtt
+PKG_REFV:=2
+PKG_VERSION:=1.3.1
+PKG_RELEASE:=1
+PKG_USE_NINJA:=0
+CMAKE_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/mqtt
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=MQTT common libary
+  DEPENDS:=+libpthread +libopenssl
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./src/* $(PKG_BUILD_DIR)
+endef
+
+CMAKE_OPTIONS := -DPAHO_WITH_SSL=ON
+
+define Package/mqtt/install
+	$(INSTALL_DIR) $(1)/usr/lib/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,mqtt))
+
diff --git a/mqtt/src/.cproject b/mqtt/src/.cproject
new file mode 100644
index 00000000..f2483dad
--- /dev/null
+++ b/mqtt/src/.cproject
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+	<storageModule moduleId="org.eclipse.cdt.core.settings">
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.2116872643">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.2116872643" moduleId="org.eclipse.cdt.core.settings" name="debug-native">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.2116872643" name="debug-native" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.2116872643.2105697674" name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.base.1661896025" name="cdt.managedbuild.toolchain.gnu.base" superClass="cdt.managedbuild.toolchain.gnu.base">
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.189112861" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
+							<builder id="cdt.managedbuild.target.gnu.builder.base.1205354372" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1645786956" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.2093522624" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.58852055" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.919295913" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.873628110" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.134024992" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.637863378" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.126058850" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.base.1158334210" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1398987161" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+					<fileInfo id="cdt.managedbuild.toolchain.gnu.base.2116872643.660980254" name="mqttclient_module.c" rcbsApplicability="disable" resourcePath="test/python/mqttclient_module.c" toolsToInvoke="cdt.managedbuild.tool.gnu.c.compiler.base.919295913.892752676">
+						<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.919295913.892752676" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base.919295913">
+							<option id="gnu.c.compiler.option.include.paths.1043418401" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+								<listOptionValue builtIn="false" value="/usr/include/python2.6"/>
+							</option>
+							<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.1471037566" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+						</tool>
+					</fileInfo>
+					<sourceEntries>
+						<entry flags="VALUE_WORKSPACE_PATH" kind="sourcePath" name="src"/>
+					</sourceEntries>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.2116872643.128299804">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.2116872643.128299804" moduleId="org.eclipse.cdt.core.settings" name="debug-x86-linux">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.2116872643.128299804" name="debug-x86-linux" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.2116872643.128299804." name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.base.1794382793" name="cdt.managedbuild.toolchain.gnu.base" superClass="cdt.managedbuild.toolchain.gnu.base">
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.1485941262" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
+							<builder id="cdt.managedbuild.target.gnu.builder.base.220668335" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.284844463" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1478312340" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1918693642" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1542253543" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.273102950" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.1110240347" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.1992155787" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1355647881" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.base.1049977093" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1999881075" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+					<fileInfo id="cdt.managedbuild.toolchain.gnu.base.2116872643.128299804.44392871" name="mqttclient_module.c" rcbsApplicability="disable" resourcePath="test/python/mqttclient_module.c" toolsToInvoke="cdt.managedbuild.tool.gnu.c.compiler.base.1542253543.1236301446">
+						<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1542253543.1236301446" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base.1542253543">
+							<option id="gnu.c.compiler.option.include.paths.387085861" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+								<listOptionValue builtIn="false" value="/usr/include/python2.6/"/>
+							</option>
+							<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.912266645" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+						</tool>
+					</fileInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+		<cconfiguration id="cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084">
+			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084" moduleId="org.eclipse.cdt.core.settings" name="debug-arm-linux-gnueabihf">
+				<externalSettings/>
+				<extensions>
+					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
+					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
+				</extensions>
+			</storageModule>
+			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+				<configuration artifactName="${ProjName}" buildProperties="" description="" id="cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084" name="debug-arm-linux-gnueabihf" parent="org.eclipse.cdt.build.core.emptycfg">
+					<folderInfo id="cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084." name="/" resourcePath="">
+						<toolChain id="cdt.managedbuild.toolchain.gnu.base.831723006" name="cdt.managedbuild.toolchain.gnu.base" superClass="cdt.managedbuild.toolchain.gnu.base">
+							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.1838207249" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/>
+							<builder id="cdt.managedbuild.target.gnu.builder.base.373473642" keepEnvironmentInBuildfile="false" managedBuildOn="false" name="Gnu Make Builder" parallelBuildOn="true" parallelizationNumber="optimal" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.archiver.base.1386858473" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.base.1005171182" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1367844459" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1805700752" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.892553453" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.c.linker.base.1775502227" name="GCC C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.base"/>
+							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.base.2000163116" name="GCC C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.base">
+								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1797952705" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
+									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
+									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
+								</inputType>
+							</tool>
+							<tool id="cdt.managedbuild.tool.gnu.assembler.base.1735139022" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.base">
+								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1355266401" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
+							</tool>
+						</toolChain>
+					</folderInfo>
+					<fileInfo id="cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084.1410045178" name="mqttclient_module.c" rcbsApplicability="disable" resourcePath="test/python/mqttclient_module.c" toolsToInvoke="cdt.managedbuild.tool.gnu.c.compiler.base.1805700752.404015131">
+						<tool id="cdt.managedbuild.tool.gnu.c.compiler.base.1805700752.404015131" name="GCC C Compiler" superClass="cdt.managedbuild.tool.gnu.c.compiler.base.1805700752">
+							<option id="gnu.c.compiler.option.include.paths.253579949" superClass="gnu.c.compiler.option.include.paths" valueType="includePath">
+								<listOptionValue builtIn="false" value="/usr/include/python2.6/"/>
+							</option>
+							<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.987997893" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
+						</tool>
+					</fileInfo>
+				</configuration>
+			</storageModule>
+			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
+		</cconfiguration>
+	</storageModule>
+	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
+		<project id="org.eclipse.paho.mqtt.c.null.1335713239" name="org.eclipse.paho.mqtt.c"/>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
+	<storageModule moduleId="refreshScope" versionNumber="2">
+		<configuration configurationName="Default">
+			<resource resourceType="PROJECT" workspacePath="/org.eclipse.paho.mqtt.c"/>
+		</configuration>
+		<configuration configurationName="x86-linux">
+			<resource resourceType="PROJECT" workspacePath="/org.eclipse.paho.mqtt.c"/>
+		</configuration>
+		<configuration configurationName="arm-linux-gnueabihf">
+			<resource resourceType="PROJECT" workspacePath="/org.eclipse.paho.mqtt.c"/>
+		</configuration>
+	</storageModule>
+	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
+	<storageModule moduleId="scannerConfiguration">
+		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.2116872643.128299804;cdt.managedbuild.toolchain.gnu.base.2116872643.128299804.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1478312340;cdt.managedbuild.tool.gnu.cpp.compiler.input.1918693642">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.2116872643.128299804;cdt.managedbuild.toolchain.gnu.base.2116872643.128299804.;cdt.managedbuild.tool.gnu.c.compiler.base.1542253543;cdt.managedbuild.tool.gnu.c.compiler.input.273102950">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084;cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084.;cdt.managedbuild.tool.gnu.c.compiler.base.1805700752;cdt.managedbuild.tool.gnu.c.compiler.input.892553453">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.2116872643;cdt.managedbuild.toolchain.gnu.base.2116872643.2105697674;cdt.managedbuild.tool.gnu.cpp.compiler.base.2093522624;cdt.managedbuild.tool.gnu.cpp.compiler.input.58852055">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084;cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084.;cdt.managedbuild.tool.gnu.cpp.compiler.base.1005171182;cdt.managedbuild.tool.gnu.cpp.compiler.input.1367844459">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+		<scannerConfigBuildInfo instanceId="cdt.managedbuild.toolchain.gnu.base.2116872643;cdt.managedbuild.toolchain.gnu.base.2116872643.2105697674;cdt.managedbuild.tool.gnu.c.compiler.base.919295913;cdt.managedbuild.tool.gnu.c.compiler.input.873628110">
+			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
+		</scannerConfigBuildInfo>
+	</storageModule>
+</cproject>
diff --git a/mqtt/src/.gitignore b/mqtt/src/.gitignore
new file mode 100644
index 00000000..5b2b31f8
--- /dev/null
+++ b/mqtt/src/.gitignore
@@ -0,0 +1,6 @@
+/dep/
+/build/
+/build.paho/
+*.swp
+*.pyc
+/build.paho
diff --git a/mqtt/src/.gitreview b/mqtt/src/.gitreview
new file mode 100644
index 00000000..2d16be7e
--- /dev/null
+++ b/mqtt/src/.gitreview
@@ -0,0 +1,5 @@
+[gerrit]
+host=git.eclipse.org
+port=29418
+project=paho/org.eclipse.paho.mqtt.c
+defaultbranch=develop
diff --git a/mqtt/src/.project b/mqtt/src/.project
new file mode 100644
index 00000000..afb95ae2
--- /dev/null
+++ b/mqtt/src/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.paho.mqtt.c</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.python.pydev.PyDevBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
+			<triggers>clean,full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
+			<triggers>full,incremental,</triggers>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.cdt.core.cnature</nature>
+		<nature>org.eclipse.cdt.core.ccnature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
+		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
+		<nature>org.python.pydev.pythonNature</nature>
+	</natures>
+</projectDescription>
diff --git a/mqtt/src/.pydevproject b/mqtt/src/.pydevproject
new file mode 100644
index 00000000..40e9f40a
--- /dev/null
+++ b/mqtt/src/.pydevproject
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse-pydev version="1.0"?><pydev_project>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
+</pydev_project>
diff --git a/mqtt/src/.settings/org.eclipse.cdt.core.prefs b/mqtt/src/.settings/org.eclipse.cdt.core.prefs
new file mode 100644
index 00000000..ed690d89
--- /dev/null
+++ b/mqtt/src/.settings/org.eclipse.cdt.core.prefs
@@ -0,0 +1,43 @@
+eclipse.preferences.version=1
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/BUILD_TYPE/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/BUILD_TYPE/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/BUILD_TYPE/value=debug
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/CFLAGS/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/CFLAGS/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/CFLAGS/value=-m32
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/LDFLAGS/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/LDFLAGS/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/LDFLAGS/value=-m32
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/MACHINETYPE/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/MACHINETYPE/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/MACHINETYPE/value=x86
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/OSTYPE/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/OSTYPE/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/OSTYPE/value=Linux
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/append=true
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.128299804/appendContributed=true
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/BUILD_TYPE/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/BUILD_TYPE/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/BUILD_TYPE/value=debug
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/CC/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/CC/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/CC/value=arm-linux-gnueabihf-gcc
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/CFLAGS/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/CFLAGS/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/CFLAGS/value=-Idep/arm-linux-gnueabihf/include -Idep/arm-linux-gnueabihf/include/arm-linux-gnueabihf
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/LDFLAGS/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/LDFLAGS/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/LDFLAGS/value=-Ldep/arm-linux-gnueabihf/lib
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/MACHINETYPE/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/MACHINETYPE/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/MACHINETYPE/value=arm-linux-gnueabihf
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/OSTYPE/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/OSTYPE/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/OSTYPE/value=Linux
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/append=true
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643.1588218084/appendContributed=true
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643/BUILD_TYPE/delimiter=\:
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643/BUILD_TYPE/operation=append
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643/BUILD_TYPE/value=debug
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643/append=true
+environment/project/cdt.managedbuild.toolchain.gnu.base.2116872643/appendContributed=true
diff --git a/mqtt/src/.travis.yml b/mqtt/src/.travis.yml
new file mode 100644
index 00000000..42da139e
--- /dev/null
+++ b/mqtt/src/.travis.yml
@@ -0,0 +1,53 @@
+sudo: required
+language: c
+compiler:
+- gcc
+- clang
+os:
+- linux
+- osx
+matrix:
+  exclude:
+  - compiler: gcc
+    os: osx
+  - compiler: clang
+    os: linux
+before_install:
+#- if [ "$DEPLOY" = "true" ]; then ./travis-setup-deploy.sh; fi
+- "./travis-install.sh"
+env:
+  global:
+  - secure: Ro53zVdGCjCQx9U4wvD9GBwB346tIQ7y1MWOAe1QrFWlmoQLC8KUeddQkc+27pdrOG9Fm9QQcI82EDlh0bfRBy1ITfWSVVZVfbNLv9sBWesND1F9YlnFpn/fag2OE+ULPSEJVJMxZoqiR9yiYWO3pTWue4YjCSuFAjpQNO6VnV3HiQJRG1jeaylx0QVLQWKAL/qkRbuqG9o4xpS1Kebaj86+q9UTHcL1a+Aj53u+Ajqnc9ZbUB/yBrfHyufTKpAD8Ef/FEIWXg2svtiWVEwEsPtdTn5P7AefJ2FNEyT4uMKIEBzWIPeWvUZLFF6U7QA07+uYDE0Ir4voPptBUlIYqQz1CUz9XCOPmM/N+GgqpyNyUjpMb4CM1b+iwBwcsHc0Z1JFcPz65ZMSt1D/WeUfQlaB/KxQBpz4lD2mxEmAuBIoGNrAG+FRULoY+xQSAf7V0W8am6QbHNnXif30mdkF3lgAhaAOwWO03JD7ctEJXqzRbMK8HrBkrgWfHsRRLFT50m8CrNLFz+3lCYuPHge2gHUMDfIHMxd4N9f2dlfV9GJkHQOQYwFfP5L2Y5Xq9KTnZX+bsglDC2WcOJu2F8h1LxTMV5Kku8zl1RZlEAt8Qa9EtCMczA3sL4NfGxazO22WpyOvHdwb26mhdJTgquI5oZsl71zcIf+WLGfgUAEq4/k=
+script:
+- if [[ "$COVERITY_SCAN_BRANCH" != 1 ]]; then ./travis-build.sh; fi
+addons:
+  coverity_scan:
+    project:
+      name: eclipse/paho.mqtt.c
+    notification_email: icraggs@uk.ibm.com
+    build_command_prepend: make clean
+    build_command: make -j 4
+    branch_pattern: coverity-.*
+  apt:
+    sources:
+    - george-edison55-precise-backports
+    - sourceline: ppa:mosquitto-dev/mosquitto-ppa
+    packages:
+    - cmake
+    - cmake-data
+    - mosquitto
+    - doxygen
+  ssh_known_hosts: build.eclipse.org
+after_success:
+- ls -l build.paho/*.tar.gz
+#- if [ "$DEPLOY" = "true" ]; then ./travis-deploy.sh; fi
+deploy:
+  provider: releases
+  api_key:
+    secure: L5fp5Q+ZQvLt7jsQ6RUWbK6sm29ZNmfLmEXKZCg4g6+kaqxXmt3ijJT6VgNoZh209bP8TyfxDbbmdvfN542O4rM69WcyrBEIfsvkjs2thnyYpMz7PtDXUfiLdv/Wws4f8QCFOwy4xKmk4VFcrxPRoQRBGcQ23P3l1bcW56m4qB3JzupqHsj7/caMQmyk3gGKx/uSj9Vtvjl7z0pM1NuH2sxkdeUZ1FLDdb6HmY/Wo3v0ldO8gBUfrcjoi9zgjdV5AztxTafVhNu0LIbbAie1y6tMVGUqnXm2W4PqgfhtYAhM8VOfEykzh5sH0+DqA4G82X512aHHegdkK3/wt+DXZX6n/XK4tWBQR87vN8n8Lexj+uKC1Mmh7VTrO6f5QS/eXR1RvG5w+XBKIfHuOC6t6PS3NrRrGxUzY3DzgyBpUSaw+bNbL+auvN0bPz6lBjykiawdCZhjlqytNBOTsgNOyJaWJGE4fMTXQjVDcdZ8Cr/BOXHImXsm5cQ2clBwMg8RGwxBeX4nOcGaCfeYogI84z4uIRwTc5REnW4MCHeZgnZNvf3dG/hUCQpUPB2CIooqj84o36chjTp3at6mZxzKc1aATexmhu9UWRzqT3Ezs8KuaU4LxdlPI0UYO5bWf+BexRCmUwSkHlcqUwoZeRE/Fd4KXkm2r6anisyEJmywfD8=
+  file_glob: true
+  file: build.paho/*.tar.gz
+  on:
+    repo: eclipse/paho.mqtt.c
+  skip_cleanup: true
+  draft: false
diff --git a/mqtt/src/CMakeLists.txt b/mqtt/src/CMakeLists.txt
new file mode 100644
index 00000000..9817ff1f
--- /dev/null
+++ b/mqtt/src/CMakeLists.txt
@@ -0,0 +1,103 @@
+#*******************************************************************************
+#  Copyright (c) 2015, 2019 logi.cals GmbH and others
+#
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  and Eclipse Distribution License v1.0 which accompany this distribution.
+#
+#  The Eclipse Public License is available at
+#     http://www.eclipse.org/legal/epl-v10.html
+#  and the Eclipse Distribution License is available at
+#    http://www.eclipse.org/org/documents/edl-v10.php.
+#
+#  Contributors:
+#     Rainer Poisel - initial version
+#     Genis Riera Perez - Add support for building debian package
+#*******************************************************************************/
+
+# Note: on OS X you should install XCode and the associated command-line tools
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.4)
+PROJECT("Eclipse Paho C" C)
+MESSAGE(STATUS "CMake version: " ${CMAKE_VERSION})
+MESSAGE(STATUS "CMake system name: " ${CMAKE_SYSTEM_NAME})
+
+SET(CMAKE_SCRIPTS "${CMAKE_SOURCE_DIR}/cmake")
+SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+
+## build settings
+SET(PAHO_VERSION_MAJOR 1)
+SET(PAHO_VERSION_MINOR 3)
+SET(PAHO_VERSION_PATCH 1)
+SET(CLIENT_VERSION ${PAHO_VERSION_MAJOR}.${PAHO_VERSION_MINOR}.${PAHO_VERSION_PATCH})
+
+INCLUDE(GNUInstallDirs)
+
+STRING(TIMESTAMP BUILD_TIMESTAMP UTC)
+MESSAGE(STATUS "Timestamp is ${BUILD_TIMESTAMP}")
+
+IF(WIN32)
+  ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN -MD)
+ELSEIF(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+  ADD_DEFINITIONS(-DOSX)
+ENDIF()
+
+## build options
+SET(PAHO_WITH_SSL FALSE CACHE BOOL "Flag that defines whether to build ssl-enabled binaries too. ")
+SET(PAHO_BUILD_STATIC FALSE CACHE BOOL "Build static library")
+SET(PAHO_BUILD_DOCUMENTATION FALSE CACHE BOOL "Create and install the HTML based API documentation (requires Doxygen)")
+SET(PAHO_BUILD_SAMPLES FALSE CACHE BOOL "Build sample programs")
+SET(PAHO_BUILD_DEB_PACKAGE FALSE CACHE BOOL "Build debian package")
+SET(PAHO_ENABLE_TESTING TRUE CACHE BOOL "Build tests and run")
+SET(PAHO_ENABLE_CPACK TRUE CACHE BOOL "Enable CPack")
+
+
+ADD_SUBDIRECTORY(src)
+IF(PAHO_BUILD_SAMPLES)
+    ADD_SUBDIRECTORY(src/samples)
+ENDIF()
+
+IF(PAHO_BUILD_DOCUMENTATION)
+    ADD_SUBDIRECTORY(doc)
+ENDIF()
+
+IF (PAHO_ENABLE_CPACK)
+       ### packaging settings
+       FILE(GLOB samples "src/samples/*.c")
+       INSTALL(FILES ${samples} DESTINATION samples)
+
+       SET(CPACK_PACKAGE_VENDOR "Eclipse Paho")
+       SET(CPACK_PACKAGE_NAME "Eclipse-Paho-MQTT-C")
+       INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION .)
+
+       IF (WIN32)
+               SET(CPACK_GENERATOR "ZIP")
+       ELSEIF(PAHO_BUILD_DEB_PACKAGE)
+               INSTALL(FILES CONTRIBUTING.md epl-v10 edl-v10 README.md notice.html DESTINATION .)
+
+               SET(CPACK_GENERATOR "DEB")
+               CONFIGURE_FILE(${CMAKE_SCRIPTS}/CPackDebConfig.cmake.in
+                       ${CMAKE_BINARY_DIR}/CPackDebConfig.cmake @ONLY)
+               SET(CPACK_PROJECT_CONFIG_FILE ${CMAKE_BINARY_DIR}/CPackDebConfig.cmake)
+               ADD_SUBDIRECTORY(debian)
+       ELSE()
+               SET(CPACK_GENERATOR "TGZ")
+       ENDIF()
+ELSE()
+       FILE(GLOB samples "src/samples/*.c")
+       INSTALL(FILES ${samples} DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+ENDIF()
+
+SET(CPACK_PACKAGE_VERSION_MAJOR ${PAHO_VERSION_MAJOR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${PAHO_VERSION_MINOR})
+SET(CPACK_PACKAGE_VERSION_PATCH ${PAHO_VERSION_PATCH})
+INCLUDE(CPack)
+
+IF(PAHO_ENABLE_TESTING)
+    ENABLE_TESTING()
+    INCLUDE_DIRECTORIES(test src)
+    ADD_SUBDIRECTORY(test)
+ELSE()
+    INCLUDE_DIRECTORIES(src)
+ENDIF()
diff --git a/mqtt/src/CODE_OF_CONDUCT.md b/mqtt/src/CODE_OF_CONDUCT.md
new file mode 100644
index 00000000..46451852
--- /dev/null
+++ b/mqtt/src/CODE_OF_CONDUCT.md
@@ -0,0 +1 @@
+Please see the [Eclipse Community Code of Conduct](https://eclipse.org/org/documents/Community_Code_of_Conduct.php)
diff --git a/mqtt/src/CONTRIBUTING.md b/mqtt/src/CONTRIBUTING.md
new file mode 100644
index 00000000..d62bd218
--- /dev/null
+++ b/mqtt/src/CONTRIBUTING.md
@@ -0,0 +1,66 @@
+# Contributing to Paho
+
+Thanks for your interest in this project!
+
+You can contribute bugfixes and new features by sending pull requests through GitHub.
+
+## Legal
+
+In order for your contribution to be accepted, it must comply with the Eclipse Foundation IP policy.
+
+Please read the [Eclipse Foundation policy on accepting contributions via Git](http://wiki.eclipse.org/Development_Resources/Contributing_via_Git).
+
+1. Sign the [Eclipse ECA](http://www.eclipse.org/legal/ECA.php)
+  1. Register for an Eclipse Foundation User ID. You can register [here](https://dev.eclipse.org/site_login/createaccount.php).
+  2. Log into the [Eclipse projects forge](https://www.eclipse.org/contribute/cla), and click on 'Eclipse Contributor Agreement'.
+2. Go to your [account settings](https://dev.eclipse.org/site_login/myaccount.php#open_tab_accountsettings) and add your GitHub username to your account.
+3. Make sure that you _sign-off_ your Git commits in the following format:
+  ``` Signed-off-by: Alex Smith <alexsmith@nowhere.com> ``` This is usually at the bottom of the commit message. You can automate this by adding the '-s' flag when you make the commits. e.g.   ```git commit -s -m "Adding a cool feature"```
+4. Ensure that the email address that you make your commits with is the same one you used to sign up to the Eclipse Foundation website with.
+
+## Contributing a change
+
+1. [Fork the repository on GitHub](https://github.com/eclipse/paho.mqtt.c/fork)
+2. Clone the forked repository onto your computer: ``` git clone https://github.com/<your username>/paho.mqtt.c.git ```
+3. Create a new branch from the latest ```develop``` branch with ```git checkout -b YOUR_BRANCH_NAME origin/develop```
+4. Make your changes
+5. If developing a new feature, make sure to include JUnit tests.
+6. Ensure that all new and existing tests pass.
+7. Commit the changes into the branch: ``` git commit -s ``` Make sure that your commit message is meaningful and describes your changes correctly.
+8. If you have a lot of commits for the change, squash them into a single / few commits.
+9. Push the changes in your branch to your forked repository.
+10. Finally, go to [https://github.com/eclipse/paho.mqtt.c](https://github.com/eclipse/paho.mqtt.c) and create a pull request from your "YOUR_BRANCH_NAME" branch to the ```develop``` one to request review and merge of the commits in your pushed branch.
+
+
+What happens next depends on the content of the patch. If it is 100% authored
+by the contributor and is less than 1000 lines (and meets the needs of the
+project), then it can be pulled into the main repository. If not, more steps
+are required. These are detailed in the
+[legal process poster](http://www.eclipse.org/legal/EclipseLegalProcessPoster.pdf).
+
+
+
+## Developer resources:
+
+
+Information regarding source code management, builds, coding standards, and more.
+
+- [https://projects.eclipse.org/projects/iot.paho/developer](https://projects.eclipse.org/projects/iot.paho/developer)
+
+Contact:
+--------
+
+Contact the project developers via the project's development
+[mailing list](https://dev.eclipse.org/mailman/listinfo/paho-dev).
+
+Search for bugs:
+----------------
+
+This project uses GitHub Issues here: [github.com/eclipse/paho.mqtt.c/issues](https://github.com/eclipse/paho.mqtt.c/issues) to track ongoing development and issues.
+
+Create a new bug:
+-----------------
+
+Be sure to search for existing bugs before you create another one. Remember that contributions are always welcome!
+
+- [Create new Paho bug](https://github.com/eclipse/paho.mqtt.c/issues/new)
diff --git a/mqtt/src/LICENSE b/mqtt/src/LICENSE
new file mode 100644
index 00000000..3e0901fe
--- /dev/null
+++ b/mqtt/src/LICENSE
@@ -0,0 +1,13 @@
+Eclipse Public License - v 1.0
+
+This program and the accompanying materials
+are made available under the terms of the Eclipse Public License v1.0
+and Eclipse Distribution License v1.0 which accompany this distribution.
+
+The Eclipse Public License is available at
+  http://www.eclipse.org/legal/epl-v10.html
+and the Eclipse Distribution License is available at
+  http://www.eclipse.org/org/documents/edl-v10.php.
+
+For an explanation of what dual-licensing means to you, see:
+https://www.eclipse.org/legal/eplfaq.php#DUALLIC
diff --git a/mqtt/src/Makefile b/mqtt/src/Makefile
new file mode 100755
index 00000000..0679006e
--- /dev/null
+++ b/mqtt/src/Makefile
@@ -0,0 +1,354 @@
+#*******************************************************************************
+#  Copyright (c) 2009, 2019 IBM Corp.
+#
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  and Eclipse Distribution License v1.0 which accompany this distribution.
+#
+#  The Eclipse Public License is available at
+#     http://www.eclipse.org/legal/epl-v10.html
+#  and the Eclipse Distribution License is available at
+#    http://www.eclipse.org/org/documents/edl-v10.php.
+#
+#  Contributors:
+#     Ian Craggs - initial API and implementation and/or initial documentation
+#     Allan Stockdill-Mander - SSL updates
+#     Andy Piper - various fixes
+#     Ian Craggs - OSX build
+#     Rainer Poisel - support for multi-core builds and cross-compilation
+#*******************************************************************************/
+
+# Note: on OS X you should install XCode and the associated command-line tools
+
+SHELL = /bin/sh
+.PHONY: clean, mkdir, install, uninstall, html
+
+ifndef release.version
+  release.version = 1.3.1
+endif
+
+# determine current platform
+BUILD_TYPE ?= debug
+ifeq ($(OS),Windows_NT)
+	OSTYPE ?= $(OS)
+	MACHINETYPE ?= $(PROCESSOR_ARCHITECTURE)
+else
+	OSTYPE ?= $(shell uname -s)
+	MACHINETYPE ?= $(shell uname -m)
+	build.level = $(shell date)
+endif # OS
+ifeq ($(OSTYPE),linux)
+	OSTYPE = Linux
+endif
+
+# assume this is normally run in the main Paho directory
+ifndef srcdir
+  srcdir = src
+endif
+
+ifndef blddir
+  blddir = build/output
+endif
+
+ifndef blddir_work
+  blddir_work = build
+endif
+
+ifndef docdir
+  docdir = $(blddir)/doc
+endif
+
+ifndef docdir_work
+  docdir_work = $(blddir)/../doc
+endif
+
+ifndef prefix
+	prefix = /usr/local
+endif
+
+ifndef exec_prefix
+	exec_prefix = ${prefix}
+endif
+
+bindir = $(exec_prefix)/bin
+includedir = $(prefix)/include
+libdir = $(exec_prefix)/lib
+datarootdir = $(prefix)/share
+mandir = $(datarootdir)/man
+man1dir = $(mandir)/man1
+man2dir = $(mandir)/man2
+man3dir = $(mandir)/man3
+
+SOURCE_FILES = $(wildcard $(srcdir)/*.c)
+SOURCE_FILES_C = $(filter-out $(srcdir)/MQTTAsync.c $(srcdir)/MQTTVersion.c $(srcdir)/SSLSocket.c, $(SOURCE_FILES))
+SOURCE_FILES_CS = $(filter-out $(srcdir)/MQTTAsync.c $(srcdir)/MQTTVersion.c, $(SOURCE_FILES))
+SOURCE_FILES_A = $(filter-out $(srcdir)/MQTTClient.c $(srcdir)/MQTTVersion.c $(srcdir)/SSLSocket.c, $(SOURCE_FILES))
+SOURCE_FILES_AS = $(filter-out $(srcdir)/MQTTClient.c $(srcdir)/MQTTVersion.c, $(SOURCE_FILES))
+
+HEADERS = $(srcdir)/*.h
+HEADERS_C = $(filter-out $(srcdir)/MQTTAsync.h, $(HEADERS))
+HEADERS_A = $(HEADERS)
+
+SAMPLE_FILES_C = MQTTClient_publish MQTTClient_publish_async MQTTClient_subscribe
+SYNC_SAMPLES = ${addprefix ${blddir}/samples/,${SAMPLE_FILES_C}}
+
+UTIL_FILES_CS = paho_cs_pub paho_cs_sub 
+SYNC_UTILS = ${addprefix ${blddir}/samples/,${UTIL_FILES_CS}}
+
+SAMPLE_FILES_A = MQTTAsync_subscribe MQTTAsync_publish
+ASYNC_SAMPLES = ${addprefix ${blddir}/samples/,${SAMPLE_FILES_A}}
+
+UTIL_FILES_AS = paho_c_pub paho_c_sub
+ASYNC_UTILS = ${addprefix ${blddir}/samples/,${UTIL_FILES_AS}}
+
+TEST_FILES_C = test1 test15 test2 sync_client_test test_mqtt4sync test10
+SYNC_TESTS = ${addprefix ${blddir}/test/,${TEST_FILES_C}}
+
+TEST_FILES_CS = test3
+SYNC_SSL_TESTS = ${addprefix ${blddir}/test/,${TEST_FILES_CS}}
+
+TEST_FILES_A = test4 test45 test6 test9 test95 test_mqtt4async test11
+ASYNC_TESTS = ${addprefix ${blddir}/test/,${TEST_FILES_A}}
+
+TEST_FILES_AS = test5
+ASYNC_SSL_TESTS = ${addprefix ${blddir}/test/,${TEST_FILES_AS}}
+
+# The names of the four different libraries to be built
+MQTTLIB_C = paho-mqtt3c
+MQTTLIB_CS = paho-mqtt3cs
+MQTTLIB_A = paho-mqtt3a
+MQTTLIB_AS = paho-mqtt3as
+
+CC ?= gcc
+
+ifndef INSTALL
+INSTALL = install
+endif
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA =  $(INSTALL) -m 644
+DOXYGEN_COMMAND = doxygen
+
+MAJOR_VERSION = 1
+MINOR_VERSION = 0
+VERSION = ${MAJOR_VERSION}.${MINOR_VERSION}
+
+MQTTLIB_C_NAME = lib${MQTTLIB_C}.so.${VERSION}
+MQTTLIB_CS_NAME = lib${MQTTLIB_CS}.so.${VERSION}
+MQTTLIB_A_NAME = lib${MQTTLIB_A}.so.${VERSION}
+MQTTLIB_AS_NAME = lib${MQTTLIB_AS}.so.${VERSION}
+MQTTVERSION_NAME = paho_c_version
+PAHO_C_PUB_NAME = paho_c_pub
+PAHO_C_SUB_NAME = paho_c_sub
+PAHO_CS_PUB_NAME = paho_cs_pub
+PAHO_CS_SUB_NAME = paho_cs_sub
+
+MQTTLIB_C_TARGET = ${blddir}/${MQTTLIB_C_NAME}
+MQTTLIB_CS_TARGET = ${blddir}/${MQTTLIB_CS_NAME}
+MQTTLIB_A_TARGET = ${blddir}/${MQTTLIB_A_NAME}
+MQTTLIB_AS_TARGET = ${blddir}/${MQTTLIB_AS_NAME}
+MQTTVERSION_TARGET = ${blddir}/${MQTTVERSION_NAME}
+PAHO_C_PUB_TARGET = ${blddir}/samples/${PAHO_C_PUB_NAME}
+PAHO_C_SUB_TARGET = ${blddir}/samples/${PAHO_C_SUB_NAME}
+PAHO_CS_PUB_TARGET = ${blddir}/samples/${PAHO_CS_PUB_NAME}
+PAHO_CS_SUB_TARGET = ${blddir}/samples/${PAHO_CS_SUB_NAME}
+
+CCFLAGS_SO = -g -fPIC $(CFLAGS) -Os -Wall -fvisibility=hidden -I$(blddir_work) 
+FLAGS_EXE = $(LDFLAGS) -I ${srcdir} -lpthread -L ${blddir}
+FLAGS_EXES = $(LDFLAGS) -I ${srcdir} ${START_GROUP} -lpthread -lssl -lcrypto ${END_GROUP} -L ${blddir}
+
+LDCONFIG ?= /sbin/ldconfig
+LDFLAGS_C = $(LDFLAGS) -shared -Wl,-init,$(MQTTCLIENT_INIT) -lpthread
+LDFLAGS_CS = $(LDFLAGS) -shared $(START_GROUP) -lpthread $(EXTRA_LIB) -lssl -lcrypto $(END_GROUP) -Wl,-init,$(MQTTCLIENT_INIT)
+LDFLAGS_A = $(LDFLAGS) -shared -Wl,-init,$(MQTTASYNC_INIT) -lpthread
+LDFLAGS_AS = $(LDFLAGS) -shared $(START_GROUP) -lpthread $(EXTRA_LIB) -lssl -lcrypto $(END_GROUP) -Wl,-init,$(MQTTASYNC_INIT)
+
+SED_COMMAND = sed \
+    -e "s/@CLIENT_VERSION@/${release.version}/g" \
+    -e "s/@BUILD_TIMESTAMP@/${build.level}/g"
+
+ifeq ($(OSTYPE),Linux)
+
+MQTTCLIENT_INIT = MQTTClient_init
+MQTTASYNC_INIT = MQTTAsync_init
+START_GROUP = -Wl,--start-group
+END_GROUP = -Wl,--end-group
+
+EXTRA_LIB = -ldl
+
+LDFLAGS_C += -Wl,-soname,lib$(MQTTLIB_C).so.${MAJOR_VERSION}
+LDFLAGS_CS += -Wl,-soname,lib$(MQTTLIB_CS).so.${MAJOR_VERSION} -Wl,-no-whole-archive
+LDFLAGS_A += -Wl,-soname,lib${MQTTLIB_A}.so.${MAJOR_VERSION}
+LDFLAGS_AS += -Wl,-soname,lib${MQTTLIB_AS}.so.${MAJOR_VERSION} -Wl,-no-whole-archive
+
+else ifeq ($(OSTYPE),Darwin)
+
+MQTTCLIENT_INIT = _MQTTClient_init
+MQTTASYNC_INIT = _MQTTAsync_init
+START_GROUP =
+END_GROUP =
+
+EXTRA_LIB = -ldl
+
+CCFLAGS_SO += -Wno-deprecated-declarations -DOSX -I /usr/local/opt/openssl/include
+LDFLAGS_C += -Wl,-install_name,lib$(MQTTLIB_C).so.${MAJOR_VERSION}
+LDFLAGS_CS += -Wl,-install_name,lib$(MQTTLIB_CS).so.${MAJOR_VERSION} -L /usr/local/opt/openssl/lib
+LDFLAGS_A += -Wl,-install_name,lib${MQTTLIB_A}.so.${MAJOR_VERSION}
+LDFLAGS_AS += -Wl,-install_name,lib${MQTTLIB_AS}.so.${MAJOR_VERSION} -L /usr/local/opt/openssl/lib
+FLAGS_EXE += -DOSX
+FLAGS_EXES += -L /usr/local/opt/openssl/lib
+
+LDCONFIG = echo
+
+endif
+
+all: build
+
+build: | mkdir ${MQTTLIB_C_TARGET} ${MQTTLIB_CS_TARGET} ${MQTTLIB_A_TARGET} ${MQTTLIB_AS_TARGET} ${MQTTVERSION_TARGET} ${SYNC_SAMPLES} ${SYNC_UTILS} ${ASYNC_SAMPLES} ${ASYNC_UTILS} ${SYNC_TESTS} ${SYNC_SSL_TESTS} ${ASYNC_TESTS} ${ASYNC_SSL_TESTS}
+
+clean:
+	rm -rf ${blddir}/*
+	rm -rf ${blddir_work}/*
+
+mkdir:
+	-mkdir -p ${blddir}/samples
+	-mkdir -p ${blddir}/test
+	echo OSTYPE is $(OSTYPE)
+
+${SYNC_TESTS}: ${blddir}/test/%: ${srcdir}/../test/%.c $(MQTTLIB_C_TARGET)
+	${CC} -DNOSTACKTRACE -DNOLOG_MESSAGES $(srcdir)/Thread.c -g -o $@ $< -l${MQTTLIB_C} ${FLAGS_EXE}
+
+${SYNC_SSL_TESTS}: ${blddir}/test/%: ${srcdir}/../test/%.c $(MQTTLIB_CS_TARGET)
+	${CC} -g -o $@ $< -l${MQTTLIB_CS} ${FLAGS_EXES}
+
+${ASYNC_TESTS}: ${blddir}/test/%: ${srcdir}/../test/%.c $(MQTTLIB_CS_TARGET)
+	${CC} -g -o $@ $< -l${MQTTLIB_A} ${FLAGS_EXE}
+
+${ASYNC_SSL_TESTS}: ${blddir}/test/%: ${srcdir}/../test/%.c $(MQTTLIB_CS_TARGET) $(MQTTLIB_AS_TARGET)
+	${CC} -g -o $@ $< -l${MQTTLIB_AS} ${FLAGS_EXES}
+
+${SYNC_SAMPLES}: ${blddir}/samples/%: ${srcdir}/samples/%.c $(MQTTLIB_C_TARGET)
+	${CC} -o $@ $< -l${MQTTLIB_CS} ${FLAGS_EXES} 
+	
+${SYNC_UTILS}: ${blddir}/samples/%: ${srcdir}/samples/%.c ${srcdir}/samples/pubsub_opts.c $(MQTTLIB_CS_TARGET)
+	${CC} -o $@ $< -l${MQTTLIB_CS} ${FLAGS_EXES} ${srcdir}/samples/pubsub_opts.c
+
+${ASYNC_SAMPLES}: ${blddir}/samples/%: ${srcdir}/samples/%.c $(MQTTLIB_A_TARGET)
+	${CC} -o $@ $< -l${MQTTLIB_AS} ${FLAGS_EXES}
+	
+${ASYNC_UTILS}: ${blddir}/samples/%: ${srcdir}/samples/%.c ${srcdir}/samples/pubsub_opts.c $(MQTTLIB_AS_TARGET)
+	${CC} -o $@ $< -l${MQTTLIB_AS} ${FLAGS_EXES} ${srcdir}/samples/pubsub_opts.c
+
+$(blddir_work)/VersionInfo.h: $(srcdir)/VersionInfo.h.in
+	$(SED_COMMAND) $< > $@
+
+${MQTTLIB_C_TARGET}: ${SOURCE_FILES_C} ${HEADERS_C} $(blddir_work)/VersionInfo.h
+	${CC} ${CCFLAGS_SO} -o $@ ${SOURCE_FILES_C} ${LDFLAGS_C}
+	-ln -s lib$(MQTTLIB_C).so.${VERSION}  ${blddir}/lib$(MQTTLIB_C).so.${MAJOR_VERSION}
+	-ln -s lib$(MQTTLIB_C).so.${MAJOR_VERSION} ${blddir}/lib$(MQTTLIB_C).so
+
+${MQTTLIB_CS_TARGET}: ${SOURCE_FILES_CS} ${HEADERS_C} $(blddir_work)/VersionInfo.h
+	${CC} ${CCFLAGS_SO} -o $@ ${SOURCE_FILES_CS} -DOPENSSL ${LDFLAGS_CS}
+	-ln -s lib$(MQTTLIB_CS).so.${VERSION}  ${blddir}/lib$(MQTTLIB_CS).so.${MAJOR_VERSION}
+	-ln -s lib$(MQTTLIB_CS).so.${MAJOR_VERSION} ${blddir}/lib$(MQTTLIB_CS).so
+
+${MQTTLIB_A_TARGET}: ${SOURCE_FILES_A} ${HEADERS_A} $(blddir_work)/VersionInfo.h
+	${CC} ${CCFLAGS_SO} -o $@ ${SOURCE_FILES_A} ${LDFLAGS_A}
+	-ln -s lib$(MQTTLIB_A).so.${VERSION}  ${blddir}/lib$(MQTTLIB_A).so.${MAJOR_VERSION}
+	-ln -s lib$(MQTTLIB_A).so.${MAJOR_VERSION} ${blddir}/lib$(MQTTLIB_A).so
+
+${MQTTLIB_AS_TARGET}: ${SOURCE_FILES_AS} ${HEADERS_A} $(blddir_work)/VersionInfo.h
+	${CC} ${CCFLAGS_SO} -o $@ ${SOURCE_FILES_AS} -DOPENSSL ${LDFLAGS_AS}
+	-ln -s lib$(MQTTLIB_AS).so.${VERSION}  ${blddir}/lib$(MQTTLIB_AS).so.${MAJOR_VERSION}
+	-ln -s lib$(MQTTLIB_AS).so.${MAJOR_VERSION} ${blddir}/lib$(MQTTLIB_AS).so
+
+${MQTTVERSION_TARGET}: $(srcdir)/MQTTVersion.c $(srcdir)/MQTTAsync.h ${MQTTLIB_A_TARGET} $(MQTTLIB_CS_TARGET)
+	${CC} ${FLAGS_EXE} -o $@ -l${MQTTLIB_A} $(srcdir)/MQTTVersion.c -ldl
+
+strip_options:
+	$(eval INSTALL_OPTS := -s)
+
+install-strip: build strip_options install
+
+install: build
+	mkdir -p $(DESTDIR)$(PREFIX)${includedir}
+	$(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_C_TARGET} $(DESTDIR)${libdir}
+	$(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_CS_TARGET} $(DESTDIR)${libdir}
+	$(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_A_TARGET} $(DESTDIR)${libdir}
+	$(INSTALL_DATA) ${INSTALL_OPTS} ${MQTTLIB_AS_TARGET} $(DESTDIR)${libdir}
+	$(INSTALL_PROGRAM) ${INSTALL_OPTS} ${MQTTVERSION_TARGET} $(DESTDIR)${bindir}
+	$(INSTALL_PROGRAM) ${INSTALL_OPTS} ${PAHO_C_PUB_TARGET} $(DESTDIR)${bindir}
+	$(INSTALL_PROGRAM) ${INSTALL_OPTS} ${PAHO_C_SUB_TARGET} $(DESTDIR)${bindir}
+	$(INSTALL_PROGRAM) ${INSTALL_OPTS} ${PAHO_CS_PUB_TARGET} $(DESTDIR)${bindir}
+	$(INSTALL_PROGRAM) ${INSTALL_OPTS} ${PAHO_CS_SUB_TARGET} $(DESTDIR)${bindir}
+	$(LDCONFIG) $(DESTDIR)${libdir}
+	ln -s lib$(MQTTLIB_C).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so
+	ln -s lib$(MQTTLIB_CS).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so
+	ln -s lib$(MQTTLIB_A).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so
+	ln -s lib$(MQTTLIB_AS).so.${MAJOR_VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so
+	@if test ! -f $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so.${MAJOR_VERSION}; then ln -s lib$(MQTTLIB_C).so.${VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so.${MAJOR_VERSION}; fi
+	@if test ! -f $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so.${MAJOR_VERSION}; then ln -s lib$(MQTTLIB_CS).so.${VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so.${MAJOR_VERSION}; fi
+	@if test ! -f $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so.${MAJOR_VERSION}; then ln -s lib$(MQTTLIB_A).so.${VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so.${MAJOR_VERSION}; fi
+	@if test ! -f $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so.${MAJOR_VERSION}; then ln -s lib$(MQTTLIB_AS).so.${VERSION} $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so.${MAJOR_VERSION}; fi
+	$(INSTALL_DATA) ${srcdir}/MQTTAsync.h $(DESTDIR)${includedir}
+	$(INSTALL_DATA) ${srcdir}/MQTTClient.h $(DESTDIR)${includedir}
+	$(INSTALL_DATA) ${srcdir}/MQTTClientPersistence.h $(DESTDIR)${includedir}
+	$(INSTALL_DATA) ${srcdir}/MQTTProperties.h $(DESTDIR)${includedir}
+	$(INSTALL_DATA) ${srcdir}/MQTTReasonCodes.h $(DESTDIR)${includedir}
+	$(INSTALL_DATA) ${srcdir}/MQTTSubscribeOpts.h $(DESTDIR)${includedir}	
+	- $(INSTALL_DATA) doc/man/man1/paho_c_pub.1 $(DESTDIR)${man1dir}
+	- $(INSTALL_DATA) doc/man/man1/paho_c_sub.1 $(DESTDIR)${man1dir}
+	- $(INSTALL_DATA) doc/man/man1/paho_cs_pub.1 $(DESTDIR)${man1dir}
+	- $(INSTALL_DATA) doc/man/man1/paho_cs_sub.1 $(DESTDIR)${man1dir}
+	
+	- $(INSTALL_DATA) ${blddir}/doc/MQTTClient/man/man3/MQTTClient.h.3 $(DESTDIR)${man3dir}
+	- $(INSTALL_DATA) ${blddir}/doc/MQTTAsync/man/man3/MQTTAsync.h.3 $(DESTDIR)${man3dir}
+	
+uninstall:
+	- rm $(DESTDIR)${libdir}/${MQTTLIB_C_NAME} 
+	- rm $(DESTDIR)${libdir}/${MQTTLIB_CS_NAME} 
+	- rm $(DESTDIR)${libdir}/${MQTTLIB_A_NAME} 
+	- rm $(DESTDIR)${libdir}/${MQTTLIB_AS_NAME} 
+	- rm $(DESTDIR)${bindir}/${MQTTVERSION_NAME} 
+	- rm $(DESTDIR)${bindir}/${PAHO_C_PUB_NAME} 
+	- rm $(DESTDIR)${bindir}/${PAHO_C_SUB_NAME} 
+	- rm $(DESTDIR)${bindir}/${PAHO_CS_PUB_NAME} 
+	- rm $(DESTDIR)${bindir}/${PAHO_CS_SUB_NAME} 
+	$(LDCONFIG) $(DESTDIR)${libdir}
+	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so
+	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so
+	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so
+	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so
+	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_C).so.${MAJOR_VERSION}
+	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_CS).so.${MAJOR_VERSION}
+	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_A).so.${MAJOR_VERSION}
+	- rm $(DESTDIR)${libdir}/lib$(MQTTLIB_AS).so.${MAJOR_VERSION}
+	- rm $(DESTDIR)${includedir}/MQTTAsync.h
+	- rm $(DESTDIR)${includedir}/MQTTClient.h
+	- rm $(DESTDIR)${includedir}/MQTTClientPersistence.h
+	- rm $(DESTDIR)${includedir}/MQTTProperties.h
+	- rm $(DESTDIR)${includedir}/MQTTReasonCodes.h
+	- rm $(DESTDIR)${includedir}/MQTTSubscribeOpts.h
+	
+	- rm $(DESTDIR)${man1dir}/paho_c_pub.1
+	- rm $(DESTDIR)${man1dir}/paho_c_sub.1
+	- rm $(DESTDIR)${man1dir}/paho_cs_pub.1
+	- rm $(DESTDIR)${man1dir}/paho_cs_sub.1
+	
+	- rm $(DESTDIR)${man3dir}/MQTTClient.h.3
+	- rm $(DESTDIR)${man3dir}/MQTTAsync.h.3
+
+REGEX_DOXYGEN := \
+    's;@PROJECT_SOURCE_DIR@/src/\?;;' \
+    's;@PROJECT_SOURCE_DIR@;..;' \
+    's;@CMAKE_CURRENT_BINARY_DIR@;../build/output;'
+SED_DOXYGEN := $(foreach sed_exp,$(REGEX_DOXYGEN),-e $(sed_exp))
+define process_doxygen
+	cd ${srcdir}; sed $(SED_DOXYGEN) ../doc/${1}.in > ../$(docdir_work)/${1}
+	cd ${srcdir}; $(DOXYGEN_COMMAND) ../$(docdir_work)/${1}
+endef
+html:
+	-mkdir -p $(docdir_work)
+	-mkdir -p ${docdir}
+	$(call process_doxygen,DoxyfileV3ClientAPI)
+	$(call process_doxygen,DoxyfileV3AsyncAPI)
+	$(call process_doxygen,DoxyfileV3ClientInternal)
diff --git a/mqtt/src/PULL_REQUEST_TEMPLATE.md b/mqtt/src/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 00000000..b0862532
--- /dev/null
+++ b/mqtt/src/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+
+Thank you for your interest in this project managed by the Eclipse Foundation.
+
+The guidelines for contributions can be found in the CONTRIBUTING.md file.
+
+At a minimum, you must sign the Eclipse ECA, and sign off each commit.  
+
+To complete and submit a ECA, log into the Eclipse projects forge 
+You will need to create an account with the Eclipse Foundation if you have not already done so.
+Be sure to use the same email address when you register for the account that you intend to use when you commit to Git.
+Go to https://accounts.eclipse.org/user/eca to sign the Eclipse ECA.
+
+
diff --git a/mqtt/src/README.md b/mqtt/src/README.md
new file mode 100644
index 00000000..bae232f9
--- /dev/null
+++ b/mqtt/src/README.md
@@ -0,0 +1,215 @@
+[![Build Status](https://travis-ci.org/eclipse/paho.mqtt.c.svg?branch=master)](https://travis-ci.org/eclipse/paho.mqtt.c)
+[![Total Alerts](https://img.shields.io/lgtm/alerts/g/eclipse/paho.mqtt.c.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/eclipse/paho.mqtt.c/alerts/)
+
+
+# Eclipse Paho MQTT C client
+
+This repository contains the source code for the [Eclipse Paho](http://eclipse.org/paho) MQTT C client library.
+
+This code builds libraries which enable applications to connect to an [MQTT](http://mqtt.org) broker to publish messages, and to subscribe to topics and receive published messages.
+
+Both synchronous and asynchronous modes of operation are supported.
+
+## Libraries
+
+The Paho C client comprises four shared libraries:
+
+ * libmqttv3a.so - asynchronous
+ * libmqttv3as.so - asynchronous with SSL
+ * libmqttv3c.so - "classic" / synchronous
+ * libmqttv3cs.so - "classic" / synchronous with SSL
+
+Optionally, using the CMake build, you can build static versions of those libraries.
+
+## Build instructions for GNU Make
+
+Ensure the OpenSSL development package is installed.  Then from the client library base directory run:
+
+```
+make
+sudo make install
+```
+
+This will build and install the libraries.  To uninstall:
+
+```
+sudo make uninstall
+```
+
+To build the documentation requires doxygen and optionally graphviz.
+
+```
+make html
+```
+
+The provided GNU Makefile is intended to perform all build steps in the ```build``` directory within the source-tree of Eclipse Paho. Generated binares, libraries, and the documentation can be found in the ```build/output``` directory after completion. 
+
+Options that are passed to the compiler/linker can be specified by typical Unix build variables:
+
+Variable | Description
+------------ | -------------
+CC | Path to the C compiler
+CFLAGS | Flags passed to compiler calls
+LDFLAGS | Flags passed to linker calls
+
+
+## Build requirements / compilation using CMake
+
+There build process currently supports a number of Linux "flavors" including ARM and s390, OS X, AIX and Solaris as well as the Windows operating system. The build process requires the following tools:
+  * CMake (http://cmake.org)
+  * Ninja (https://martine.github.io/ninja/) or
+    GNU Make (https://www.gnu.org/software/make/), and
+  * gcc (https://gcc.gnu.org/).
+
+On Debian based systems this would mean that the following packages have to be installed:
+
+```
+apt-get install build-essential gcc make cmake cmake-gui cmake-curses-gui
+```
+
+Also, in order to build a debian package from the source code, the following packages have to be installed
+
+```
+apt-get install fakeroot fakeroot devscripts dh-make lsb-release
+```
+
+Ninja can be downloaded from its github project page in the "releases" section. Optionally it is possible to build binaries with SSL support. This requires the OpenSSL libraries and includes to be available. E. g. on Debian:
+
+```
+apt-get install libssl-dev
+```
+
+The documentation requires doxygen and optionally graphviz:
+
+```
+apt-get install doxygen graphviz
+```
+
+Before compiling, determine the value of some variables in order to configure features, library locations, and other options:
+
+Variable | Default Value | Description
+------------ | ------------- | -------------
+PAHO_BUILD_STATIC | FALSE | Build a static version of the libraries
+PAHO_WITH_SSL | FALSE | Flag that defines whether to build ssl-enabled binaries too. 
+OPENSSL_SEARCH_PATH | "" (system default) | Directory containing your OpenSSL installation (i.e. `/usr/local` when headers are in `/usr/local/include` and libraries are in `/usr/local/lib`)
+PAHO_BUILD_DOCUMENTATION | FALSE | Create and install the HTML based API documentation (requires Doxygen)
+PAHO_BUILD_SAMPLES | FALSE | Build sample programs
+MQTT_TEST_BROKER | tcp://localhost:1883 | MQTT connection URL for a broker to use during test execution
+MQTT_TEST_PROXY | tcp://localhost:1883 | Hostname of the test proxy to use
+MQTT_SSL_HOSTNAME | localhost | Hostname of a test SSL MQTT broker to use
+PAHO_BUILD_DEB_PACKAGE | FALSE | Build debian package
+
+Using these variables CMake can be used to generate your Ninja or Make files. Using CMake, building out-of-source is the default. Therefore it is recommended to invoke all build commands inside your chosen build directory but outside of the source tree.
+
+An example build session targeting the build platform could look like this:
+
+```
+mkdir /tmp/build.paho
+cd /tmp/build.paho
+cmake -GNinja -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=TRUE -DPAHO_BUILD_SAMPLES=TRUE ~/git/org.eclipse.paho.mqtt.c
+```
+
+Invoking cmake and specifying build options can also be performed using cmake-gui or ccmake (see https://cmake.org/runningcmake/). For example:
+
+```
+ccmake -GNinja ~/git/org.eclipse.paho.mqtt.c
+```
+
+To compile/link the binaries and to generate packages, simply invoke `ninja package` or `make -j <number-of-cores-to-use> package` after CMake. To simply compile/link invoke `ninja` or `make -j <number-of-cores-to-use>`.
+
+### Debug builds
+
+Debug builds can be performed by defining the value of the ```CMAKE_BUILD_TYPE``` option to ```Debug```. For example:
+
+```
+cmake -GNinja -DCMAKE_BUILD_TYPE=Debug git/org.eclipse.paho.mqtt.c
+```
+
+
+### Running the tests
+
+Test code is available in the ``test`` directory. The tests can be built and executed with the CMake build system. The test execution requires a MQTT broker running. By default, the build system uses ```localhost```, however it is possible to configure the build to use an external broker. These parameters are documented in the Build Requirements section above.
+
+After ensuring a MQTT broker is available, it is possible to execute the tests by starting the proxy and running `ctest` as described below:
+
+```
+python ../test/mqttsas2.py &
+ctest -VV
+```
+
+### Cross compilation
+
+Cross compilation using CMake is performed by using so called "toolchain files" (see: http://www.vtk.org/Wiki/CMake_Cross_Compiling).
+
+The path to the toolchain file can be specified by using CMake's `-DCMAKE_TOOLCHAIN_FILE` option. In case no toolchain file is specified, the build is performed for the native build platform.
+
+For your convenience toolchain files for the following platforms can be found in the `cmake` directory of Eclipse Paho:
+  * Linux x86
+  * Linux ARM11 (a.k.a. the Raspberry Pi)
+  * Windows x86_64
+  * Windows x86
+
+The provided toolchain files assume that required compilers/linkers are to be found in the environment, i. e. the PATH-Variable of your user or system. If you prefer, you can also specify the absolute location of your compilers in the toolchain files.
+
+Example invocation for the Raspberry Pi:
+
+```
+cmake -GNinja -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_SAMPLES=TRUE -DPAHO_BUILD_DOCUMENTATION=TRUE -DOPENSSL_LIB_SEARCH_PATH=/tmp/libssl-dev/usr/lib/arm-linux-gnueabihf -DOPENSSL_INC_SEARCH_PATH="/tmp/libssl-dev/usr/include/openssl;/tmp/libssl-dev/usr/include/arm-linux-gnueabihf" -DCMAKE_TOOLCHAIN_FILE=~/git/org.eclipse.paho.mqtt.c/cmake/toolchain.linux-arm11.cmake ~/git/org.eclipse.paho.mqtt.c
+```
+
+Compilers for the Raspberry Pi can be obtained from e. g. Linaro (see: http://releases.linaro.org/15.06/components/toolchain/binaries/4.8/arm-linux-gnueabihf/). This example assumes that OpenSSL-libraries and includes have been installed in the ```/tmp/libssl-dev``` directory.
+
+Example invocation for Windows 64 bit:
+
+```
+cmake -GNinja -DPAHO_BUILD_SAMPLES=TRUE -DCMAKE_TOOLCHAIN_FILE=~/git/org.eclipse.paho.mqtt.c/cmake/toolchain.win64.cmake ~/git/org.eclipse.paho.mqtt.c
+
+```
+
+In this case the libraries and executable are not linked against OpenSSL Libraries. Cross compilers for the Windows platform can be installed on Debian like systems like this:
+
+```
+apt-get install gcc-mingw-w64-x86-64 gcc-mingw-w64-i686
+```
+
+## Usage and API
+
+Detailed API documentation is available by building the Doxygen docs in the  ``doc`` directory. A [snapshot is also available online](https://www.eclipse.org/paho/files/mqttdoc/MQTTClient/html/index.html).
+
+Samples are available in the Doxygen docs and also in ``src/samples`` for reference.
+
+Note that using the C headers from a C++ program requires the following declaration as part of the C++ code:
+
+```
+    extern "C" {
+    #include "MQTTClient.h"
+    #include "MQTTClientPersistence.h"
+    }
+```
+
+## Runtime tracing
+
+A number of environment variables control runtime tracing of the C library.
+
+Tracing is switched on using ``MQTT_C_CLIENT_TRACE`` (a value of ON traces to stdout, any other value should specify a file to trace to).
+
+The verbosity of the output is controlled using the  ``MQTT_C_CLIENT_TRACE_LEVEL`` environment variable - valid values are ERROR, PROTOCOL, MINIMUM, MEDIUM and MAXIMUM (from least to most verbose).
+
+The variable ``MQTT_C_CLIENT_TRACE_MAX_LINES`` limits the number of lines of trace that are output.
+
+```
+export MQTT_C_CLIENT_TRACE=ON
+export MQTT_C_CLIENT_TRACE_LEVEL=PROTOCOL
+```
+
+## Reporting bugs
+
+Please open issues in the Github project: https://github.com/eclipse/paho.mqtt.c/issues.
+
+## More information
+
+Discussion of the Paho clients takes place on the [Eclipse paho-dev mailing list](https://dev.eclipse.org/mailman/listinfo/paho-dev).
+
+General questions about the MQTT protocol are discussed in the [MQTT Google Group](https://groups.google.com/forum/?hl=en-US&fromgroups#!forum/mqtt).
+
+There is much more information available via the [MQTT community site](http://mqtt.org).
diff --git a/mqtt/src/about.html b/mqtt/src/about.html
new file mode 100644
index 00000000..6555a44e
--- /dev/null
+++ b/mqtt/src/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+ 
+<p><em>December 9, 2013</em></p>	
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content").  Unless otherwise 
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL") and Eclipse Distribution License Version 1.0 ("EDL").
+A copy of the EPL is available at 
+<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> 
+and a copy of the EDL is available at 
+<a href="http://www.eclipse.org/org/documents/edl-v10.php">http://www.eclipse.org/org/documents/edl-v10.php</a>. 
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is 
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content.  Check the Redistributor's license that was 
+provided with the Content.  If no such license exists, contact the Redistributor.  Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body></html>
diff --git a/mqtt/src/android/Android.mk b/mqtt/src/android/Android.mk
new file mode 100644
index 00000000..6338da50
--- /dev/null
+++ b/mqtt/src/android/Android.mk
@@ -0,0 +1,140 @@
+# Example: Android Native Library makefile for paho.mqtt.c
+# contributed by Bin Li <bin.li@windriver.com>
+
+LOCAL_PATH := $(call my-dir)
+libpaho-mqtt3_lib_path := ../src
+libpaho-mqtt3_c_includes := $(LOCAL_PATH)/$(libpaho-mqtt3_lib_path) \
+	external/hdc/android-ifaddrs \
+	external/openssl/include \
+	external/zlib
+
+# build sample util
+define build_sample_util
+__sample_module:= $1
+__sample_lib:= $2
+include $(CLEAR_VARS)
+LOCAL_C_INCLUDES := $(libpaho-mqtt3_c_includes)
+LOCAL_SHARED_LIBRARIES := $$(__sample_lib)
+LOCAL_MODULE := $$(__sample_module)
+LOCAL_SRC_FILES := $(libpaho-mqtt3_lib_path)/samples/$$(__sample_module).c
+include $(BUILD_EXECUTABLE)
+endef
+
+libpaho-mqtt3_local_src_c_files_common := \
+	$(libpaho-mqtt3_lib_path)/MQTTProtocolClient.c \
+	$(libpaho-mqtt3_lib_path)/Tree.c \
+	$(libpaho-mqtt3_lib_path)/Heap.c \
+	$(libpaho-mqtt3_lib_path)/MQTTPacket.c \
+	$(libpaho-mqtt3_lib_path)/Clients.c \
+	$(libpaho-mqtt3_lib_path)/Thread.c \
+	$(libpaho-mqtt3_lib_path)/utf-8.c \
+	$(libpaho-mqtt3_lib_path)/StackTrace.c \
+	$(libpaho-mqtt3_lib_path)/MQTTProtocolOut.c \
+	$(libpaho-mqtt3_lib_path)/Socket.c \
+	$(libpaho-mqtt3_lib_path)/Log.c \
+	$(libpaho-mqtt3_lib_path)/Messages.c \
+	$(libpaho-mqtt3_lib_path)/LinkedList.c \
+	$(libpaho-mqtt3_lib_path)/MQTTPersistence.c \
+	$(libpaho-mqtt3_lib_path)/MQTTPacketOut.c \
+	$(libpaho-mqtt3_lib_path)/SocketBuffer.c \
+	$(libpaho-mqtt3_lib_path)/MQTTPersistenceDefault.c \
+
+libpaho-mqtt3_local_src_c_files_c := \
+	$(libpaho-mqtt3_lib_path)/MQTTClient.c \
+
+libpaho-mqtt3_local_src_c_files_cs := \
+	$(libpaho-mqtt3_lib_path)/MQTTClient.c \
+	$(libpaho-mqtt3_lib_path)/SSLSocket.c \
+
+libpaho-mqtt3_local_src_c_files_a := \
+	$(libpaho-mqtt3_lib_path)/MQTTAsync.c \
+
+libpaho-mqtt3_local_src_c_files_as := \
+	$(libpaho-mqtt3_lib_path)/MQTTAsync.c \
+	$(libpaho-mqtt3_lib_path)/SSLSocket.c \
+
+# update the header file which normally generated by cmake
+$(shell (cp -f $(LOCAL_PATH)/$(libpaho-mqtt3_lib_path)/VersionInfo.h.in $(LOCAL_PATH)/$(libpaho-mqtt3_lib_path)/VersionInfo.h))
+$(shell (sed -i "s/@CLIENT_VERSION@/1.2.0/g" $(LOCAL_PATH)/$(libpaho-mqtt3_lib_path)/VersionInfo.h))
+$(shell ( sed -i "s/@BUILD_TIMESTAMP@/$(shell date)/g" $(LOCAL_PATH)/$(libpaho-mqtt3_lib_path)/VersionInfo.h))
+
+# building static libraries
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libpaho-mqtt3c
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/$(libpaho-mqtt3_lib_path)
+LOCAL_C_INCLUDES:= $(libpaho-mqtt3_c_includes)
+LOCAL_SRC_FILES := $(libpaho-mqtt3_local_src_c_files_common) $(libpaho-mqtt3_local_src_c_files_c)
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libpaho-mqtt3cs
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/$(libpaho-mqtt3_lib_path)
+LOCAL_C_INCLUDES:= $(libpaho-mqtt3_c_includes)
+LOCAL_CFLAGS += -DOPENSSL
+LOCAL_SRC_FILES := $(libpaho-mqtt3_local_src_c_files_common) $(libpaho-mqtt3_local_src_c_files_cs)
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libpaho-mqtt3a
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/${libpaho-mqtt3_lib_path}
+LOCAL_C_INCLUDES:= $(libpaho-mqtt3_c_includes)
+LOCAL_SRC_FILES := $(libpaho-mqtt3_local_src_c_files_common) $(libpaho-mqtt3_local_src_c_files_a)
+include $(BUILD_STATIC_LIBRARY)
+  
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libpaho-mqtt3as
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/${libpaho-mqtt3_lib_path}
+LOCAL_CFLAGS += -DOPENSSL
+LOCAL_C_INCLUDES:= $(libpaho-mqtt3_c_includes)
+LOCAL_SRC_FILES := $(libpaho-mqtt3_local_src_c_files_common) $(libpaho-mqtt3_local_src_c_files_as)
+include $(BUILD_STATIC_LIBRARY)
+
+# building shared libraries
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libpaho-mqtt3c
+LOCAL_SHARED_LIBRARIES := libdl
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/$(libpaho-mqtt3_lib_path)
+LOCAL_C_INCLUDES:= $(libpaho-mqtt3_c_includes)
+LOCAL_SRC_FILES := $(libpaho-mqtt3_local_src_c_files_common) $(libpaho-mqtt3_local_src_c_files_c)
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libpaho-mqtt3cs
+LOCAL_SHARED_LIBRARIES := libcrypto libssl libdl
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/$(libpaho-mqtt3_lib_path)
+LOCAL_C_INCLUDES:= $(libpaho-mqtt3_c_includes)
+LOCAL_CFLAGS += -DOPENSSL
+LOCAL_SRC_FILES := $(libpaho-mqtt3_local_src_c_files_common) $(libpaho-mqtt3_local_src_c_files_cs)
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libpaho-mqtt3a
+LOCAL_SHARED_LIBRARIES := libdl
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/${libpaho-mqtt3_lib_path}
+LOCAL_C_INCLUDES:= $(libpaho-mqtt3_c_includes)
+LOCAL_SRC_FILES := $(libpaho-mqtt3_local_src_c_files_common) $(libpaho-mqtt3_local_src_c_files_a)
+include $(BUILD_SHARED_LIBRARY)
+ 
+include $(CLEAR_VARS)
+LOCAL_MODULE    := libpaho-mqtt3as
+LOCAL_SHARED_LIBRARIES := libcrypto libssl libdl
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/${libpaho-mqtt3_lib_path}
+LOCAL_CFLAGS += -DOPENSSL
+LOCAL_C_INCLUDES:= $(libpaho-mqtt3_c_includes)
+LOCAL_SRC_FILES := $(libpaho-mqtt3_local_src_c_files_common) $(libpaho-mqtt3_local_src_c_files_as)
+include $(BUILD_SHARED_LIBRARY)
+
+# building samples
+
+$(eval $(call build_sample_util, MQTTAsync_subscribe, libpaho-mqtt3a ) )
+$(eval $(call build_sample_util, MQTTAsync_publish, libpaho-mqtt3a ) )
+$(eval $(call build_sample_util, MQTTClient_publish, libpaho-mqtt3c ) )
+$(eval $(call build_sample_util, MQTTClient_publish_async, libpaho-mqtt3c ) )
+$(eval $(call build_sample_util, MQTTClient_subscribe, libpaho-mqtt3c ) )
+$(eval $(call build_sample_util, paho_c_pub, libpaho-mqtt3a ) )
+$(eval $(call build_sample_util, paho_c_sub, libpaho-mqtt3a ) )
+$(eval $(call build_sample_util, paho_cs_pub, libpaho-mqtt3c ) )
+$(eval $(call build_sample_util, paho_cs_sub, libpaho-mqtt3c ) )
+
diff --git a/mqtt/src/appveyor.yml b/mqtt/src/appveyor.yml
new file mode 100644
index 00000000..f8f3634f
--- /dev/null
+++ b/mqtt/src/appveyor.yml
@@ -0,0 +1,80 @@
+version: 1.3.{build}
+ 
+environment:
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
+      PAHO_WINDOWS_BUILD_BIT: x86
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      PAHO_WINDOWS_BUILD_BIT: x64
+    
+configuration: Debug
+install:
+  - cmd: openssl version
+  - cmd: C:\Python36\python --version
+  - cmd: netsh advfirewall firewall add rule name="Python 3.6" dir=in action=allow program="C:\Python36\python.exe" enable=yes
+  - cmd: netsh advfirewall firewall add rule name="Open Port 1883" dir=in action=allow protocol=TCP localport=1883
+  - cmd: netsh advfirewall set allprofiles state off
+  - ps: Start-Process C:\Python36\python -ArgumentList 'test\mqttsas.py'
+  - cmd: git clone https://github.com/eclipse/paho.mqtt.testing.git
+  - cmd: cd paho.mqtt.testing\interoperability
+  - ps: Start-Process C:\Python36\python -ArgumentList 'startbroker.py -c localhost_testing.conf'
+  - cmd: cd ..\..
+
+build_script:
+- cmd: >-
+    mkdir build.paho
+
+    cd build.paho
+
+    echo %APPVEYOR_BUILD_WORKER_IMAGE%
+
+    if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2015" call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" %PAHO_WINDOWS_BUILD_BIT%
+
+    if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2013" call "C:\Program Files (x86)\Microsoft Visual Studio 12.0\VC\vcvarsall.bat" %PAHO_WINDOWS_BUILD_BIT%
+
+    cmake -G "NMake Makefiles" -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE ..
+
+    nmake
+
+    ctest -T test -VV
+
+    cd ..
+
+after_build:
+- cmd: >-
+    set ZIPNAME=eclipse-paho-mqtt-c-windows.zip 
+
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\*.html
+
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\*.md
+
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\*-v10
+
+    7z a %ZIPNAME% build.paho\src\*.dll
+
+    7z a %ZIPNAME% build.paho\src\*.lib
+
+    7z rn %ZIPNAME% build.paho\src lib
+
+    7z a %ZIPNAME% build.paho\src\samples\*.exe
+
+    7z rn %ZIPNAME% build.paho\src\samples bin
+
+    7z a %ZIPNAME% %APPVEYOR_BUILD_FOLDER%\build.paho\src\MQTTVersion.exe
+
+    7z rn %ZIPNAME% MQTTVersion.exe bin\MQTTVersion.exe
+
+    7z a %ZIPNAME% src\MQTTClient.h src\MQTTAsync.h src\MQTTClientPersistence.h src\MQTTProperties.h src\MQTTReasonCodes.h src\MQTTSubscribeOpts.h
+
+    7z rn %ZIPNAME% src include
+
+    7z a %ZIPNAME% src\samples\*.c
+
+    7z rn %ZIPNAME% src\samples samples
+
+artifacts:
+- path: eclipse-paho-mqtt-c-windows.zip
+  name: paho-mqtt-c
+
+test:
+  assemblies: build/Testing/*/Test.xml
diff --git a/mqtt/src/build.xml b/mqtt/src/build.xml
new file mode 100644
index 00000000..71631e99
--- /dev/null
+++ b/mqtt/src/build.xml
@@ -0,0 +1,316 @@
+<!--****************************************************************************
+  Copyright (c) 2012, 2019 IBM Corp.
+
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  and Eclipse Distribution License v1.0 which accompany this distribution.
+
+  The Eclipse Public License is available at
+     http://www.eclipse.org/legal/epl-v10.html
+  and the Eclipse Distribution License is available at
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+  Contributors:
+     Ian Craggs - initial API and implementation and/or initial documentation
+*******************************************************************************-->
+
+<project name="MQTT C Client" default="full">
+
+  <taskdef resource="net/sf/antcontrib/antlib.xml">
+    <classpath>
+      <pathelement location="/opt/public/cbi/build/3rdPartyJars/ant-contrib.jar" />
+      <pathelement location="/usr/share/java/ant-contrib.jar" />
+    </classpath>
+  </taskdef>
+
+  <property name="output.folder" value="build/output" />
+  <property name="release.version" value="1.3.1" />
+
+  <property name="libname" value="mqttv3c" />
+  <property name="libname.ssl" value="mqttv3cs" />
+  <property name="libname.async" value="mqttv3a" />
+  <property name="libname.async.ssl" value="mqttv3as" />
+  <property name="ssl" value="yes" />
+  <property name="windows.openssl.folder" value="c:\openssl\bin" />
+  <property name="test.hostname" value="iot.eclipse.org"/>
+  <property name="test.port" value="1883"/>
+  <property name="proxy.port" value="18883"/>
+  <if>
+    <os family="windows"/>
+    <then>
+      <property name="os.family" value="windows" />
+    </then>
+    <else>
+      <if>
+      <os family="mac"/>
+      <then>
+        <property name="os.family" value="mac" />
+      </then>
+      <else>
+        <property name="os.family" value="unix" />
+      </else>
+      </if>
+    </else>
+  </if>
+  <echo message="os.family is '${os.family}'" />
+
+  <target name="init">
+    <tstamp>
+      <format property="buildTimestamp" pattern="yyyyMMddHHmm" />
+    </tstamp>
+
+    <fileset id="sync.source.fileset" dir="src">
+      <include name="*.c"/>
+      <exclude name="MQTTAsync.c"/>
+      <exclude name="MQTTVersion.c"/>
+    </fileset>
+    <pathconvert refid="sync.source.fileset" property="sync.source.files" pathsep=" "/>
+
+    <fileset id="async.source.fileset" dir="src">
+      <include name="*.c"/>
+      <exclude name="MQTTClient.c"/>
+      <exclude name="MQTTVersion.c"/>
+    </fileset>
+    <pathconvert refid="async.source.fileset" property="async.source.files" pathsep=" "/>
+
+  </target>
+
+  <target name="version" depends="init" description="replace tags with the right levels">
+    <property name="build.level" value="${DSTAMP}${TSTAMP}" />
+    <copy file="src/VersionInfo.h.in" tofile="src/VersionInfo.h" overwrite="true"/>
+    <replace file="src/VersionInfo.h" token="@BUILD_TIMESTAMP@" value="${build.level}" />
+    <replace file="src/VersionInfo.h" token="@CLIENT_VERSION@" value="${release.version}" />
+  </target>
+
+  <target name="test" >
+    <!-- display Python version -->
+    <exec executable="python" failonerror="true">
+      <arg line="-V"/>
+    </exec>
+    <exec executable="python" dir="test" spawn="true">
+        <arg value="mqttsas2.py" />
+        <arg value="${test.hostname}" />
+        <arg value="${test.port}" />
+        <arg value="${proxy.port}" />
+    </exec>
+    <if>
+      <os family="windows"/>
+    <then>
+      <foreach target="runAtest" param="aTest" list="test1,test2,test4,test9"/>
+    </then>
+    <else>
+      <foreach target="runAtest" param="aTest" list="test1,test2,test4,test9"/>
+    </else>
+    </if>
+    <foreach target="runSSLtest" param="aTest" list="test3,test5"/>
+  </target>
+
+  <target name="runAtest">
+    <if>
+      <os family="windows"/>
+    <then>
+      <exec executable="cmd.exe" failonerror="true" dir="${output.folder}/test" >
+        <arg value="/c" />
+        <arg value="${aTest}.exe" />
+        <arg value="--connection" />
+        <arg value="tcp://${test.hostname}:${test.port}" />
+        <arg value="--proxy_connection" />
+        <arg value="tcp://localhost:${proxy.port}" />
+        <env key="PATH" path="${output.folder}" />
+      </exec>
+    </then>
+    <else>
+      <exec executable="./${aTest}" failonerror="true" dir="${output.folder}/test" >
+        <arg value="--connection" />
+        <arg value="tcp://${test.hostname}:${test.port}" />
+        <arg value="--proxy_connection" />
+        <arg value="tcp://localhost:${proxy.port}" />
+        <env key="LD_LIBRARY_PATH" path="${output.folder}" />
+        <env key="DYLD_LIBRARY_PATH" path="${output.folder}" />
+      </exec>
+    </else>
+    </if>
+  </target>
+
+  <target name="runSSLtest">
+    <if>
+      <os family="windows"/>
+    <then>
+      <exec executable="cmd.exe" failonerror="true" dir="${output.folder}/test" >
+        <arg value="/c" />
+        <arg value="${aTest}.exe" />
+        <arg value="--hostname" />
+        <arg value="${test.hostname}" />
+        <env key="PATH" path="${output.folder};${windows.openssl.folder}" />
+      </exec>
+    </then>
+    <else>
+      <exec executable="./${aTest}" failonerror="true" dir="${output.folder}/test" >
+        <arg value="--hostname" />
+        <arg value="${test.hostname}" />
+        <env key="LD_LIBRARY_PATH" path="${output.folder}" />
+        <env key="DYLD_LIBRARY_PATH" path="${output.folder}" />
+      </exec>
+    </else>
+    </if>
+  </target>
+
+  <target name="doc" >
+    <if>
+      <available file="/usr/bin/doxygen"/>
+      <then>
+        <mkdir dir="${output.folder}/doc"/>
+        <exec executable="doxygen" dir="src">
+          <arg value="../doc/DoxyfileV3ClientAPI"/>
+        </exec>
+        <exec executable="doxygen" dir="src">
+          <arg value="../doc/DoxyfileV3AsyncAPI"/>
+        </exec>
+        <zip destfile="${output.folder}/MQTTClient_doc.zip">
+          <zipfileset dir="${output.folder}/doc/MQTTClient" />
+        </zip>
+        <zip destfile="${output.folder}/MQTTAsync_doc.zip">
+	        <zipfileset dir="${output.folder}/doc/MQTTAsync" prefix="MQTTAsync/"/>
+        </zip>
+        <delete dir="${output.folder}/doc" />
+      </then>
+      <else>
+        <echo message="doxygen is not available" />
+      </else>
+    </if>
+  </target>
+
+  <target name="build" >
+    <if>
+    <os family="unix"/>
+    <then>
+    <delete dir="${output.folder}" />
+    <!-- display gcc version -->
+    <exec executable="gcc" failonerror="true">
+      <arg line="-v"/>
+    </exec>
+    <if>
+      <available file="/usr/bin/make"/>
+      <then>
+        <exec executable="make" dir="."/>
+      </then>
+    </if>
+    </then>
+    </if>
+    <if>
+    <os family="windows"/>
+    <then>
+    <delete dir="${output.folder}" />
+    <!-- display gcc version -->
+    <exec executable="cl" failonerror="true">
+    </exec>
+    <exec executable="msbuild" dir=".">
+           <arg line='"Windows Build\Paho C MQTT APIs.sln"'/>
+           <arg line="/p:Configuration=Release"/>
+    </exec>
+     </then>
+    </if>
+  </target>
+
+  <target name="package">
+    <mkdir dir="${output.folder}/include"/>
+    <copy overwrite="true" todir="${output.folder}/include">
+      <fileset dir="src" includes="MQTTClient.h,MQTTAsync.h,MQTTClientPersistence.h"/>
+    </copy>
+    <copy overwrite="true" todir="${output.folder}">
+      <fileset dir="." includes="README.md,CONTRIBUTING.md,about.html,notice.html,edl-v10,epl-v10"/>
+    </copy>
+    <mkdir dir="${output.folder}/lib"/>
+    <move overwrite="true" todir="${output.folder}/lib">
+      <fileset dir="${output.folder}" includes="*paho*"/>
+    </move>
+    <mkdir dir="${output.folder}/bin"/>
+    <move overwrite="true" todir="${output.folder}/bin">
+      <fileset dir="${output.folder}/samples" includes="*"/>
+      <fileset dir="${output.folder}" includes="MQTTVersion"/>
+    </move>
+    <copy overwrite="true" todir="${output.folder}/samples">
+      <fileset dir="src/samples" includes="*"/>
+    </copy>
+    <delete>
+       <fileset dir="." includes="eclipse-paho-mqtt-c-windows-${release.version}.zip"/>
+       <fileset dir="." includes="eclipse-paho-mqtt-c-${os.family}-${release.version}.tar.gz"/>
+    </delete>
+
+   <if>
+    <os family="windows"/>
+    <then>
+    <exec executable="c:\cygwin\bin\zip.exe" failonerror="true" dir="${output.folder}">
+      <arg value="-r"/>
+      <arg value="eclipse-paho-mqtt-c-windows-${release.version}.zip"/>
+      <arg value="about.html"/>
+      <arg value="notice.html"/>
+      <arg value="README.md"/>
+      <arg value="CONTRIBUTING.md"/>
+      <arg value="epl-v10"/>
+      <arg value="edl-v10"/>
+      <arg value="include"/>
+	  <arg value="samples"/>
+      <arg value="lib"/>
+      <arg value="bin"/>
+    </exec>
+    </then>
+    <else>
+    <exec executable="tar" failonerror="true" dir="${output.folder}">
+      <arg value="czf"/>
+      <arg value="eclipse-paho-mqtt-c-${os.family}-${release.version}.tar.gz"/>
+      <arg value="about.html"/>
+      <arg value="notice.html"/>
+      <arg value="README.md"/>
+      <arg value="CONTRIBUTING.md"/>
+      <arg value="epl-v10"/>
+      <arg value="edl-v10"/>
+      <arg value="include"/>
+	  <arg value="samples"/>
+      <arg value="lib"/>
+      <arg value="bin"/>
+    </exec>
+    </else>
+    </if>
+
+   <if>
+    <os family="unix"/>
+    <then>
+    <exec executable="tar" failonerror="true" dir=".">
+      <arg value="czf"/>
+      <arg value="${output.folder}/eclipse-paho-mqtt-c-src-${release.version}.tar.gz"/>
+      <arg value="about.html"/>
+      <arg value="notice.html"/>
+      <arg value="README.md"/>
+      <arg value="CONTRIBUTING.md"/>
+      <arg value="epl-v10"/>
+      <arg value="edl-v10"/>
+      <arg value="Makefile"/>
+      <arg value="build.xml"/>
+      <arg value="src"/>
+      <arg value="test"/>
+      <arg value="Windows Build"/>
+    </exec>
+    </then>
+   </if>
+  </target>
+
+  <target name="copy">
+    <if>
+      <available file="/shared/technology"/>
+      <then>
+        <mkdir dir="/shared/technology/paho/C/${release.version}/${build.level}"/>
+       	<echo message="Copying the build output to /shared" />
+      	<copy overwrite="true" todir="/shared/technology/paho/C/${release.version}/${build.level}">
+          <fileset dir="${output.folder}">
+	          <include name="*.gz"/>
+	          <include name="*.zip"/>
+          </fileset>
+        </copy>
+      </then>
+    </if>
+  </target>
+
+  <target name="full" depends="init, version, build, test, doc, package, copy" />
+
+</project>
diff --git a/mqtt/src/cbuild.bat b/mqtt/src/cbuild.bat
new file mode 100644
index 00000000..22cbd379
--- /dev/null
+++ b/mqtt/src/cbuild.bat
@@ -0,0 +1,19 @@
+
+setlocal
+
+rmdir /s /q build.paho
+mkdir build.paho
+
+cd build.paho
+
+call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x64
+
+cmake -G "NMake Makefiles" -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=TRUE ..
+
+nmake
+
+ctest -T test -VV
+
+cd ..
+
+endlocal
diff --git a/mqtt/src/cmake/CPackDebConfig.cmake.in b/mqtt/src/cmake/CPackDebConfig.cmake.in
new file mode 100644
index 00000000..c815426c
--- /dev/null
+++ b/mqtt/src/cmake/CPackDebConfig.cmake.in
@@ -0,0 +1,91 @@
+IF (CPACK_GENERATOR MATCHES "DEB")
+    FIND_PROGRAM(DPKG_PROGRAM dpkg DOC "dpkg program of Debian-based systems")
+    IF (DPKG_PROGRAM)
+      EXECUTE_PROCESS(
+        COMMAND ${DPKG_PROGRAM} --print-architecture
+        OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+      )
+    ELSE (DPKG_PROGRAM)
+      MESSAGE(FATAL_ERROR "Could not find an architecture for the package")
+    ENDIF (DPKG_PROGRAM)
+
+    EXECUTE_PROCESS(
+      COMMAND lsb_release -si
+      OUTPUT_VARIABLE CPACK_DEBIAN_DIST_NAME
+      RESULT_VARIABLE DIST_NAME_STATUS
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    IF (DIST_NAME_STATUS)
+       MESSAGE(FATAL_ERROR "Could not find a GNU/Linux distribution name")
+    ENDIF (DIST_NAME_STATUS)
+
+    IF (CPACK_DEBIAN_DIST_NAME STREQUAL "")
+      MESSAGE(FATAL_ERROR "Could not find a GNU/Linux distribution name")
+    ENDIF ()
+
+    EXECUTE_PROCESS(
+      COMMAND lsb_release -sc
+      OUTPUT_VARIABLE CPACK_DEBIAN_DIST_CODE
+      RESULT_VARIABLE DIST_CODE_STATUS
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+
+    IF (DIST_NAME_STATUS)
+       MESSAGE(FATAL_ERROR "Could not find a GNU/Linux distribution codename")
+    ENDIF (DIST_NAME_STATUS)
+
+    IF (CPACK_DEBIAN_DIST_CODE STREQUAL "")
+      MESSAGE(FATAL_ERROR "Could not find a GNU/Linux distribution codename")
+    ENDIF ()
+
+    SET(CPACK_PACKAGE_VERSION_MAJOR @PAHO_VERSION_MAJOR@)
+    SET(CPACK_PACKAGE_VERSION_MINOR @PAHO_VERSION_MINOR@)
+    SET(CPACK_PACKAGE_VERSION_PATCH @PAHO_VERSION_PATCH@)
+    SET(PACKAGE_VERSION
+        "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
+    IF (PACKAGE_VERSION STREQUAL "")
+      MESSAGE(FATAL_ERROR "Could not find a version number for the package")
+    ENDIF ()
+
+    SET(PAHO_WITH_SSL @PAHO_WITH_SSL@)
+
+    MESSAGE("Package version:   ${PACKAGE_VERSION}")
+    MESSAGE("Package built for: ${CPACK_DEBIAN_DIST_NAME} ${CPACK_DEBIAN_DIST_CODE}")
+    IF(PAHO_WITH_SSL)
+        MESSAGE("Package built with ssl-enabled binaries too")
+    ENDIF()
+
+    # Additional lines to a paragraph should start with " "; paragraphs should
+    # be separated with a " ." line
+    SET(CPACK_PACKAGE_NAME "libpaho-mqtt")
+    SET(CPACK_PACKAGE_CONTACT "Eclipse")
+    SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Eclipse Paho MQTT C client")
+    SET(CPACK_DEBIAN_PACKAGE_NAME ${CPACK_PACKAGE_NAME})
+    SET(CPACK_DEBIAN_PACKAGE_MAINTAINER
+        "Genis Riera Perez <genis.riera.perez@gmail.com>")
+    SET(CPACK_DEBIAN_PACKAGE_DESCRIPTION "Eclipse Paho MQTT C client library")
+    SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
+    SET(CPACK_DEBIAN_PACKAGE_VERSION ${PACKAGE_VERSION})
+    SET(CPACK_DEBIAN_PACKAGE_SECTION "net")
+    SET(CPACK_DEBIAN_PACKAGE_CONFLICTS ${CPACK_PACKAGE_NAME})
+    SET(CPACK_PACKAGE_FILE_NAME
+        "${CPACK_DEBIAN_PACKAGE_NAME}_${CPACK_DEBIAN_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
+    IF(PAHO_WITH_SSL)
+      SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libssl-dev")
+    ENDIF()
+
+    UNSET(PACKAGE_VERSION CACHE)
+    UNSET(CPACK_DEBIAN_PACKAGE_VERSION CACHE)
+
+    #
+    # From CMakeDebHelper
+    # See http://www.cmake.org/Wiki/CMake:CPackPackageGenerators#Overall_usage_.28common_to_all_generators.29
+    #
+
+    # When the DEB-generator runs, we want him to run our install-script
+    #set( CPACK_INSTALL_SCRIPT ${CPACK_DEBIAN_INSTALL_SCRIPT} )
+
+ENDIF()
diff --git a/mqtt/src/cmake/toolchain.linux-arm11.cmake b/mqtt/src/cmake/toolchain.linux-arm11.cmake
new file mode 100644
index 00000000..4965ff7c
--- /dev/null
+++ b/mqtt/src/cmake/toolchain.linux-arm11.cmake
@@ -0,0 +1,10 @@
+# path to compiler and utilities
+# specify the cross compiler
+SET(CMAKE_C_COMPILER arm-linux-gnueabihf-gcc)
+
+# Name of the target platform
+SET(CMAKE_SYSTEM_NAME Linux)
+SET(CMAKE_SYSTEM_PROCESSOR arm)
+
+# Version of the system
+SET(CMAKE_SYSTEM_VERSION 1)
diff --git a/mqtt/src/cmake/toolchain.win32.cmake b/mqtt/src/cmake/toolchain.win32.cmake
new file mode 100644
index 00000000..05e72540
--- /dev/null
+++ b/mqtt/src/cmake/toolchain.win32.cmake
@@ -0,0 +1,15 @@
+# Name of the target platform
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# Version of the system
+SET(CMAKE_SYSTEM_VERSION 1)
+
+# specify the cross compiler
+SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
+SET(CMAKE_RC_COMPILER_ENV_VAR "RC")
+SET(CMAKE_RC_COMPILER "")
+SET(CMAKE_SHARED_LINKER_FLAGS
+    "-fdata-sections -ffunction-sections -Wl,--enable-stdcall-fixup -static-libgcc -static -lpthread" CACHE STRING "" FORCE)
+SET(CMAKE_EXE_LINKER_FLAGS
+    "-fdata-sections -ffunction-sections -Wl,--enable-stdcall-fixup -static-libgcc -static -lpthread" CACHE STRING "" FORCE)
diff --git a/mqtt/src/cmake/toolchain.win64.cmake b/mqtt/src/cmake/toolchain.win64.cmake
new file mode 100644
index 00000000..98afef18
--- /dev/null
+++ b/mqtt/src/cmake/toolchain.win64.cmake
@@ -0,0 +1,15 @@
+# Name of the target platform
+SET(CMAKE_SYSTEM_NAME Windows)
+
+# Version of the system
+SET(CMAKE_SYSTEM_VERSION 1)
+
+# specify the cross compiler
+SET(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
+SET(CMAKE_RC_COMPILER_ENV_VAR "RC")
+SET(CMAKE_RC_COMPILER "")
+SET(CMAKE_SHARED_LINKER_FLAGS
+    "-fdata-sections -ffunction-sections -Wl,--enable-stdcall-fixup -static-libgcc -static -lpthread" CACHE STRING "" FORCE)
+SET(CMAKE_EXE_LINKER_FLAGS
+    "-fdata-sections -ffunction-sections -Wl,--enable-stdcall-fixup -static-libgcc -static -lpthread" CACHE STRING "" FORCE)
diff --git a/mqtt/src/conanfile.py b/mqtt/src/conanfile.py
new file mode 100644
index 00000000..d3ab6fa2
--- /dev/null
+++ b/mqtt/src/conanfile.py
@@ -0,0 +1,92 @@
+from conans import ConanFile, CMake, tools
+
+
+class PahocConan(ConanFile):
+    name = "paho.mqtt.c"
+    version = "1.3.1"
+    license = "Eclipse Public License - v 1.0"
+    url = "https://github.com/eclipse/paho.mqtt.c"
+    description = """The Eclipse Paho project provides open-source client implementations of MQTT
+and MQTT-SN messaging protocols aimed at new, existing, and emerging applications for the Internet
+of Things (IoT)"""
+    settings = "os", "compiler", "build_type", "arch"
+    options = {"shared": [True, False], "SSL": [True, False], "asynchronous": [True, False]}
+    default_options = "shared=False", "SSL=False", "asynchronous=False"
+    generators = "cmake"
+    exports_sources = "*"
+
+    def requirements(self):
+        if self.options.SSL:
+            self.requires("OpenSSL/1.0.2n@conan/stable")
+
+    def build(self):
+        tools.replace_in_file("CMakeLists.txt", "PROJECT(\"paho\" C)", '''PROJECT("paho" C)
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()''')
+        tools.replace_in_file("CMakeLists.txt", "ADD_SUBDIRECTORY(test)", "") #  Disable tests
+        tools.replace_in_file("CMakeLists.txt",
+                              "ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN -MD)",
+                              "ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -DWIN32_LEAN_AND_MEAN)") #  Allow other runtimes
+        cmake = CMake(self)
+        cmake.definitions["PAHO_BUILD_DOCUMENTATION"] = False
+        cmake.definitions["PAHO_BUILD_SAMPLES"] = False
+        cmake.definitions["PAHO_BUILD_DEB_PACKAGE"] = False
+        cmake.definitions["PAHO_BUILD_STATIC"] = not self.options.shared
+        cmake.definitions["PAHO_WITH_SSL"] = self.options.SSL
+        cmake.configure()
+        cmake.build()
+
+    def package(self):
+        self.copy("*e*l-v10", dst="licenses")
+        self.copy("*.h", dst="include", src="src")
+        self.copy("*paho*.dll", dst="bin", keep_path=False)
+        self.copy("*paho*.dylib", dst="lib", keep_path=False)
+        self.copy("*paho*.so*", dst="lib", keep_path=False)
+        self.copy("*paho*.a", dst="lib", keep_path=False)
+        self.copy("*paho*.lib", dst="lib", keep_path=False)
+
+    def package_info(self):
+        self.cpp_info.libs = []
+
+        if self.options.shared and self:
+            if self.options.asynchronous:
+                if self.options.SSL:
+                    self.cpp_info.libs.append("paho-mqtt3as")
+                else:
+                    self.cpp_info.libs.append("paho-mqtt3a")
+            else:
+                if self.options.SSL:
+                    self.cpp_info.libs.append("paho-mqtt3cs")
+                else:
+                    self.cpp_info.libs.append("paho-mqtt3c")
+        else:
+            if self.options.asynchronous:
+                if self.options.SSL:
+                    self.cpp_info.libs.append("paho-mqtt3as-static")
+                else:
+                    self.cpp_info.libs.append("paho-mqtt3a-static")
+            else:
+                if self.options.SSL:
+                    self.cpp_info.libs.append("paho-mqtt3cs-static")
+                else:
+                    self.cpp_info.libs.append("paho-mqtt3c-static")
+
+        if self.settings.os == "Windows":
+            if not self.options.shared:
+                self.cpp_info.libs.append("ws2_32")
+                if self.settings.compiler == "gcc":
+                    self.cpp_info.libs.append("wsock32") # (MinGW) needed?
+        else:
+            if self.settings.os == "Linux":
+                self.cpp_info.libs.append("c")
+                self.cpp_info.libs.append("dl")
+                self.cpp_info.libs.append("pthread")
+            elif self.settings.os == "FreeBSD":
+                self.cpp_info.libs.append("compat")
+                self.cpp_info.libs.append("pthread")
+            else:
+                self.cpp_info.libs.append("c")
+                self.cpp_info.libs.append("pthread")
+
+    def configure(self):
+        del self.settings.compiler.libcxx
diff --git a/mqtt/src/debian/CMakeLists.txt b/mqtt/src/debian/CMakeLists.txt
new file mode 100644
index 00000000..7b315b81
--- /dev/null
+++ b/mqtt/src/debian/CMakeLists.txt
@@ -0,0 +1,16 @@
+# These files (generated by dhelpers) will be copied into the control-part of the deb.
+# Files that end up in the filesystem normally (e.g. cron/init-scripts) must not be mentioned here.
+# It's a good idea to add "conffiles", as the debhelpers may generate it.
+set( DH_GENERATED_CONTROL_EXTRA
+    preinst
+        postinst
+        postrm
+        prerm
+        conffiles
+)
+
+# At this point, CMakeDebHelper must be included (add .cmake if you have it in this directory)
+
+include( CMakeDebHelper )
+
+# CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA and CPACK_INSTALL_SCRIPT are set now, don't modify them!
diff --git a/mqtt/src/deploy_rsa.enc b/mqtt/src/deploy_rsa.enc
new file mode 100644
index 00000000..05d51d15
Binary files /dev/null and b/mqtt/src/deploy_rsa.enc differ
diff --git a/mqtt/src/dist/Makefile b/mqtt/src/dist/Makefile
new file mode 100644
index 00000000..8c421eda
--- /dev/null
+++ b/mqtt/src/dist/Makefile
@@ -0,0 +1,11 @@
+VERSION=1.3.0
+
+check:
+	rpmlint -i dist/paho-c.spec
+
+rpm-prep:
+	mkdir -p ${HOME}/rpmbuild/SOURCES/
+	tar --transform="s/\./paho-c-${VERSION}/" -cf ${HOME}/rpmbuild/SOURCES/v${VERSION}.tar.gz --exclude=./build.paho --exclude=.git --exclude=*.bz ./ --gzip
+
+rpm: rpm-prep
+	rpmbuild -ba dist/paho-c.spec
diff --git a/mqtt/src/dist/paho-c.spec b/mqtt/src/dist/paho-c.spec
new file mode 100644
index 00000000..b1d7141f
--- /dev/null
+++ b/mqtt/src/dist/paho-c.spec
@@ -0,0 +1,78 @@
+Summary:            MQTT C Client
+Name:               paho-c
+Version:            1.3.0
+Release:            3%{?dist}
+License:            Eclipse Distribution License 1.0 and Eclipse Public License 1.0
+Group:              Development/Tools
+Source:             https://github.com/eclipse/paho.mqtt.c/archive/v%{version}.tar.gz
+URL:                https://eclipse.org/paho/clients/c/
+BuildRequires:      cmake
+BuildRequires:      gcc
+BuildRequires:      graphviz
+BuildRequires:      doxygen
+BuildRequires:      openssl-devel
+Requires:           openssl
+
+
+%description
+The Paho MQTT C Client is a fully fledged MQTT client written in ANSI standard C.
+
+
+%package devel
+Summary:            MQTT C Client development kit
+Group:              Development/Libraries
+Requires:           paho-c
+
+%description devel
+Development files and samples for the the Paho MQTT C Client.
+
+
+%package devel-docs
+Summary:            MQTT C Client development kit documentation
+Group:              Development/Libraries
+
+%description devel-docs
+Development documentation files for the the Paho MQTT C Client.
+
+%prep
+%autosetup -n paho-c-%{version}
+
+%build
+mkdir build.paho && cd build.paho
+%cmake -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=TRUE -DPAHO_BUILD_SAMPLES=TRUE ..
+make %{?_smp_mflags}
+
+%install
+cd build.paho
+make install DESTDIR=%{buildroot}
+
+%files
+%doc edl-v10 epl-v10
+%{_libdir}/*
+
+%files devel
+%{_bindir}/*
+%{_includedir}/*
+
+%files devel-docs
+%{_datadir}/*
+
+%changelog
+* Thu Jul 27 2017 Otavio R. Piske <opiske@redhat.com> - 1.2.0-4
+- Enabled generation of debuginfo package
+
+* Thu Jul 27 2017 Otavio R. Piske <opiske@redhat.com> - 1.2.0-3
+- Fixed changelog issues pointed by rpmlint
+
+* Thu Jul 27 2017 Otavio R. Piske <opiske@redhat.com> - 1.2.0-2
+- Updated changelog to comply with Fedora packaging guidelines
+
+* Wed Jul 26 2017 Otavio R. Piske <opiske@redhat.com> - 1.2.0-1
+- Fixed rpmlint warnings: replaced cmake call with builtin macro
+- Fixed rpmlint warnings: removed buildroot reference from build section
+
+* Fri Jun 30 2017 Otavio R. Piske <opiske@redhat.com> - 1.2.0
+- Updated package to version 1.2.0
+
+* Sat Dec 31 2016 Otavio R. Piske <opiske@redhat.com> - 1.1.0
+- Initial packaging
diff --git a/mqtt/src/doc/CMakeLists.txt b/mqtt/src/doc/CMakeLists.txt
new file mode 100644
index 00000000..f15f3143
--- /dev/null
+++ b/mqtt/src/doc/CMakeLists.txt
@@ -0,0 +1,45 @@
+#*******************************************************************************
+#  Copyright (c) 2015 logi.cals GmbH
+# 
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  and Eclipse Distribution License v1.0 which accompany this distribution. 
+# 
+#  The Eclipse Public License is available at 
+#     http://www.eclipse.org/legal/epl-v10.html
+#  and the Eclipse Distribution License is available at 
+#    http://www.eclipse.org/org/documents/edl-v10.php.
+# 
+#  Contributors:
+#     Rainer Poisel - initial version
+#*******************************************************************************/
+
+# Note: on OS X you should install XCode and the associated command-line tools
+
+### documentation settings
+FIND_PACKAGE(Doxygen)
+IF(NOT DOXYGEN_FOUND)
+    message(FATAL_ERROR "Doxygen is needed to build the documentation.")
+ENDIF()
+SET(DOXYTARGETS)
+FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc)
+FOREACH(DOXYFILE_SRC DoxyfileV3ClientAPI;DoxyfileV3AsyncAPI;DoxyfileV3ClientInternal)
+    SET(DOXYFILE_IN ${DOXYFILE_SRC}.in)
+    SET(DOXYFILE ${CMAKE_CURRENT_BINARY_DIR}/${DOXYFILE_SRC})
+
+    CONFIGURE_FILE(${DOXYFILE_IN} ${DOXYFILE} @ONLY)
+    ADD_CUSTOM_TARGET(${DOXYFILE_SRC}.target
+        COMMAND ${DOXYGEN_EXECUTABLE} ${DOXYFILE}
+            WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+            COMMENT "Generating API documentation with Doxygen"
+            VERBATIM
+    )
+    SET(DOXYTARGETS ${DOXYTARGETS} ${DOXYFILE_SRC}.target)
+ENDFOREACH(DOXYFILE_SRC)
+
+ADD_CUSTOM_TARGET(doc ALL DEPENDS ${DOXYTARGETS})
+IF (PAHO_ENABLE_CPACK)
+    INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION share)
+ELSE()
+    INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc DESTINATION ${CMAKE_INSTALL_DOCDIR})
+ENDIF()
\ No newline at end of file
diff --git a/mqtt/src/doc/DoxyfileV3AsyncAPI.in b/mqtt/src/doc/DoxyfileV3AsyncAPI.in
new file mode 100644
index 00000000..bca35447
--- /dev/null
+++ b/mqtt/src/doc/DoxyfileV3AsyncAPI.in
@@ -0,0 +1,2443 @@
+# Doxyfile 1.8.14
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "Paho Asynchronous MQTT C Client Library"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = "@PROJECT_SOURCE_DIR@/doc/pahologo.png"
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = "@CMAKE_CURRENT_BINARY_DIR@/doc/MQTTAsync/"
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = NO
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = @PROJECT_SOURCE_DIR@/src
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = YES
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       = MQTTAsync_main
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = @PROJECT_SOURCE_DIR@/src/MQTTAsync.h \
+                         @PROJECT_SOURCE_DIR@/src/MQTTClientPersistence.h \
+                         @PROJECT_SOURCE_DIR@/src/MQTTProperties.h \
+                         @PROJECT_SOURCE_DIR@/src/MQTTSubscribeOpts.h \
+                         @PROJECT_SOURCE_DIR@/src/MQTTReasonCodes.h
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = NO
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via Javascript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have Javascript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: https://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          =
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NONE
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# https://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = YES
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = __attribute__(x)=
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = YES
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = YES
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/mqtt/src/doc/DoxyfileV3ClientAPI.in b/mqtt/src/doc/DoxyfileV3ClientAPI.in
new file mode 100644
index 00000000..8db2d141
--- /dev/null
+++ b/mqtt/src/doc/DoxyfileV3ClientAPI.in
@@ -0,0 +1,2443 @@
+# Doxyfile 1.8.14
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "Paho MQTT C Client Library"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = "@PROJECT_SOURCE_DIR@/doc/pahologo.png"
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = "@CMAKE_CURRENT_BINARY_DIR@/doc/MQTTClient/"
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = NO
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = @PROJECT_SOURCE_DIR@/src
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = NO
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = YES
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = NO
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = YES
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = NO
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       = MQTTClient_main
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = @PROJECT_SOURCE_DIR@/src/MQTTClient.h \
+                         @PROJECT_SOURCE_DIR@/src/MQTTClientPersistence.h \
+                         @PROJECT_SOURCE_DIR@/src/MQTTProperties.h \
+                         @PROJECT_SOURCE_DIR@/src/MQTTSubscribeOpts.h \
+                         @PROJECT_SOURCE_DIR@/src/MQTTReasonCodes.h
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = NO
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via Javascript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have Javascript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: https://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          =
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NONE
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# https://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = YES
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = __attribute__(x)=
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = YES
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = YES
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/mqtt/src/doc/DoxyfileV3ClientInternal.in b/mqtt/src/doc/DoxyfileV3ClientInternal.in
new file mode 100644
index 00000000..5dc1beff
--- /dev/null
+++ b/mqtt/src/doc/DoxyfileV3ClientInternal.in
@@ -0,0 +1,2487 @@
+# Doxyfile 1.8.14
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See
+# https://www.gnu.org/software/libiconv/ for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = "MQTT C Client Libraries Internals"
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         =
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify a logo or an icon that is included
+# in the documentation. The maximum height of the logo should not exceed 55
+# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy
+# the logo to the output directory.
+
+PROJECT_LOGO           = "@PROJECT_SOURCE_DIR@/doc/pahologo.png"
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = "@CMAKE_CURRENT_BINARY_DIR@/doc/MQTTClient_internal/"
+
+# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
+# characters to appear in the names of generated files. If set to NO, non-ASCII
+# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode
+# U+3044.
+# The default value is: NO.
+
+ALLOW_UNICODE_NAMES    = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       = "The $name class" \
+                         "The $name widget" \
+                         "The $name file" \
+                         is \
+                         provides \
+                         specifies \
+                         contains \
+                         represents \
+                         a \
+                         an \
+                         the
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        = @PROJECT_SOURCE_DIR@/src
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new
+# page for each member. If set to NO, the documentation of a member will be part
+# of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 8
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines (in the resulting output). You can put ^^ in the value part of an
+# alias to insert a newline as if a physical newline was in the original file.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = YES
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
+# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran:
+# Fortran. In the later case the parser tries to guess whether the code is fixed
+# or free formatted code, this is the default for Fortran type files), VHDL. For
+# instance to make doxygen treat .inc files as Fortran files (default is PHP),
+# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+#
+# Note: For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When the TOC_INCLUDE_HEADINGS tag is set to a non-zero value, all headings up
+# to that level are automatically included in the table of contents, even if
+# they do not have an id attribute.
+# Note: This feature currently applies only to Markdown headings.
+# Minimum value: 0, maximum value: 99, default value: 0.
+# This tag requires that the tag MARKDOWN_SUPPORT is set to YES.
+
+TOC_INCLUDE_HEADINGS   = 0
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by putting a % sign in front of the word or
+# globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# https://www.riverbankcomputing.com/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# If one adds a struct or class to a group and this option is enabled, then also
+# any nested class or struct is added to the same group. By default this option
+# is disabled and one has to add nested compounds explicitly via \ingroup.
+# The default value is: NO.
+
+GROUP_NESTED_COMPOUNDS = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = YES
+
+# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = YES
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO,
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. If set to YES, local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO, only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO, these classes will be included in the various overviews. This option
+# has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO, these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO, these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES, upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES, the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will
+# append additional text to a page's title, such as Class Reference. If set to
+# YES the compound reference will be hidden.
+# The default value is: NO.
+
+HIDE_COMPOUND_REFERENCE= NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO, the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo
+# list. This list is created by putting \todo commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test
+# list. This list is created by putting \test commands in the documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       = MQTTClient_internal
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES, the
+# list will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also https://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. See also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO, doxygen will only warn about wrong or incomplete
+# parameter documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# If the WARN_AS_ERROR tag is set to YES then doxygen will immediately stop when
+# a warning is encountered.
+# The default value is: NO.
+
+WARN_AS_ERROR          = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = @PROJECT_SOURCE_DIR@/src
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: https://www.gnu.org/software/libiconv/) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# read by doxygen.
+#
+# If left blank the following patterns are tested:*.c, *.cc, *.cxx, *.cpp,
+# *.c++, *.java, *.ii, *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h,
+# *.hh, *.hxx, *.hpp, *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc,
+# *.m, *.markdown, *.md, *.mm, *.dox, *.py, *.pyw, *.f90, *.f95, *.f03, *.f08,
+# *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf and *.qsf.
+
+FILE_PATTERNS          = *.cc \
+                         *.cxx \
+                         *.cpp \
+                         *.c++ \
+                         *.d \
+                         *.java \
+                         *.ii \
+                         *.ixx \
+                         *.ipp \
+                         *.i++ \
+                         *.inl \
+                         *.h \
+                         *.hh \
+                         *.hxx \
+                         *.hpp \
+                         *.h++ \
+                         *.idl \
+                         *.odl \
+                         *.cs \
+                         *.php \
+                         *.php3 \
+                         *.inc \
+                         *.m \
+                         *.mm \
+                         *.dox \
+                         *.py \
+                         *.f90 \
+                         *.f \
+                         *.vhd \
+                         *.vhdl \
+                         *.C \
+                         *.CC \
+                         *.C++ \
+                         *.II \
+                         *.I++ \
+                         *.H \
+                         *.HH \
+                         *.H++ \
+                         *.CS \
+                         *.PHP \
+                         *.PHP3 \
+                         *.M \
+                         *.MM \
+                         *.PY \
+                         *.F90 \
+                         *.F \
+                         *.VHD \
+                         *.VHDL \
+                         *.c
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       = *
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+#
+# Note that for custom extensions or not directly supported extensions you also
+# need to set EXTENSION_MAPPING for the extension otherwise the files are not
+# properly processed by doxygen.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see https://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = NO
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# cascading style sheets that are included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefore more robust against future updates.
+# Doxygen will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list). For an example see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the style sheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# https://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to YES can help to show when doxygen was last run and thus if the
+# documentation is up to date.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_MENUS tag is set to YES then the generated HTML
+# documentation will contain a main index with vertical navigation menus that
+# are dynamically created via Javascript. If disabled, the navigation index will
+# consists of multiple levels of tabs that are statically embedded in every HTML
+# page. Disable this option to support browsers that do not have Javascript,
+# like the Qt help browser.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_MENUS     = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: https://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See https://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler (hhc.exe). If non-empty,
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated
+# (YES) or that it should be included in the master .chm file (NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated
+# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it
+# enables the Previous and Next buttons.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://doc.qt.io/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://doc.qt.io/qt-4.8/qthelpproject.html#virtual-folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://doc.qt.io/qt-4.8/qthelpproject.html#custom-filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://doc.qt.io/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NONE
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANSPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# https://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from https://www.mathjax.org before deployment.
+# The default value is: https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2/.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavors of web server based searching depending on the EXTERNAL_SEARCH
+# setting. When disabled, doxygen will generate a PHP script for searching and
+# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing
+# and searching needs to be provided by external tools. See the section
+# "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer (doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: https://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = NO
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4wide
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. The package can be specified just
+# by its name or with the correct syntax as to be used with the LaTeX
+# \usepackage command. To get the times font for instance you can specify :
+# EXTRA_PACKAGES=times or EXTRA_PACKAGES={times}
+# To use the option intlimits with the amsmath package you can specify:
+# EXTRA_PACKAGES=[intlimits]{amsmath}
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber,
+# $projectbrief, $projectlogo. Doxygen will replace $title with the empty
+# string, for the replacement values of the other commands the user is referred
+# to HTML_HEADER.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer. See
+# LATEX_HEADER for more information on how to generate a default footer and what
+# special commands can be used inside the footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined
+# LaTeX style sheets that are included after the standard style sheets created
+# by doxygen. Using this option one can overrule certain style aspects. Doxygen
+# will copy the style sheet files to the output directory.
+# Note: The order of the extra style sheet files is of importance (e.g. the last
+# style sheet in the list overrules the setting of the previous ones in the
+# list).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_STYLESHEET =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES, to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# https://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+# If the LATEX_TIMESTAMP tag is set to YES then the footer of each generated
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_TIMESTAMP        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code
+# with syntax highlighting in the RTF output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_SOURCE_CODE        = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# The MAN_SUBDIR tag determines the name of the directory created within
+# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by
+# MAN_EXTENSION with the initial . removed.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_SUBDIR             =
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the
+# program listings (including syntax highlighting and cross-referencing
+# information) to the DOCBOOK output. Note that enabling this will significantly
+# increase the size of the DOCBOOK output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_PROGRAMLISTING = NO
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an
+# AutoGen Definitions (see http://autogen.sourceforge.net/) file that captures
+# the structure of the code including all documentation. Note that this feature
+# is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO, the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
+# in the source code. If set to NO, only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = NO
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = NO
+
+# If the SEARCH_INCLUDES tag is set to YES, the include files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             =
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all references to function-like macros that are alone on a line, have
+# an all uppercase name, and do not end with a semicolon. Such function macros
+# are typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have a unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES, all external class will be listed in
+# the class index. If set to NO, only the inherited external classes will be
+# listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed
+# in the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = NO
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = YES
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font in the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = FreeSans
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = NO
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command. Disabling a call graph can be
+# accomplished by means of the command \hidecallgraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = YES
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command. Disabling a caller graph can be
+# accomplished by means of the command \hidecallergraph.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot. For an explanation of the image formats see the section
+# output formats in the documentation of the dot tool (Graphviz (see:
+# http://www.graphviz.org/)).
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif, svg, png:gd, png:gd:gd, png:cairo,
+# png:cairo:gd, png:cairo:cairo, png:cairo:gdiplus, png:gdiplus and
+# png:gdiplus:gdiplus.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the
+# path where java can find the plantuml.jar file. If left blank, it is assumed
+# PlantUML is not used or called during a preprocessing step. Doxygen will
+# generate a warning when it encounters a \startuml command in this case and
+# will not generate output for the diagram.
+
+PLANTUML_JAR_PATH      =
+
+# When using plantuml, the PLANTUML_CFG_FILE tag can be used to specify a
+# configuration file for plantuml.
+
+PLANTUML_CFG_FILE      =
+
+# When using plantuml, the specified paths are searched for files specified by
+# the !include statement in a plantuml block.
+
+PLANTUML_INCLUDE_PATH  =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 1000
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = YES
+
+# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = NO
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES
diff --git a/mqtt/src/doc/man/man1/paho_c_pub.1 b/mqtt/src/doc/man/man1/paho_c_pub.1
new file mode 100644
index 00000000..60ec2df0
--- /dev/null
+++ b/mqtt/src/doc/man/man1/paho_c_pub.1
@@ -0,0 +1,199 @@
+.TH PAHO_C_PUB 1L "31 July 2018 (v1.3.0)" http://eclipse.org/paho
+
+.SH NAME
+paho_c_pub \- send (publish) data to an MQTT server
+
+.SH SYNOPSIS
+.B paho_c_pub
+[\fItopic\fR]
+[\fB\-t\fR|\fB\-\-topic\fR \fItopic\fR]
+[\fB\-c\fR|\fB\-\-connection\fR \fIconnection\fR]
+[\fB\-h\fR|\fB\-\-host\fR \fIhostname\fR]
+[\fB\-p\fR|\fB\-\-port\fR \fIportnumber\fR]
+[\fB\-i\fR|\fB\-\-clientid\fR \fIclientid\fR]
+[\fB\-u\fR|\fB\-\-username\fR \fIusername\fR]
+[\fB\-P\fR|\fB\-\-password\fR \fIpassword\fR]
+[\fB\-k\fR|\fB\-\-keepalive\fR \fIkeepalive-timeout\fR]
+[\fB\-V\fR|\fB\-\-MQTT-version\fR \fB31\fR|\fB311\fR|\fB5\fR]
+.br
+[\fB\-q\fR|\fB\-\-qos\fR \fB0\fR|\fB1\fR|\fB2\fR]
+[\fB\-r\fR|\fB\-\-retained\fR]
+[\fB\-n\fR|\fB\-\-null-message\fR]
+[\fB\-m\fR|\fB\-\-message\fR \fImessage\fR]
+[\fB\-f\fR|\fB\-\-filename\fR \fIfilename\fR]
+[\fB\-\-delimiter\fR \fIdelimiter\fR]
+[\fB\-\-maxdatalen\fR \fImaxdatalen\fR]
+.br
+[\fB\-\-message-expiry\fR \fIexpiry-interval\fR]
+[\fB\-\-user-property\fR \fIname\fR \fIvalue\fR]
+.br
+[\fB\-\-quiet\fR]
+[\fB\-\-verbose\fR]
+[\fB\-\-trace\fR \fBmin\fR|\fBmax\fR|\fBerror\fR|\fBprotocol\fR]
+.br
+[\fB\-\-will-topic\fR \fIwill-topic\fR]
+[\fB\-\-will-payload\fR \fIwill-payload\fR]
+[\fB\-\-will-retain\fR]
+[\fB\-\-will-qos\fR \fB0\fR|\fB1\fR|\fB2\fR]
+.br
+[\fB\-\-cafile\fR \fIcafile\fR]
+[\fB\-\-capath\fR \fIcapath\fR]
+[\fB\-\-cert\fR \fIcertfile\fR]
+[\fB\-\-key\fR \fIkeyfile\fR]
+[\fB\-\-keypass\fR \fIpassword\fR]
+[\fB\-\-ciphers\fR \fIcipher-string\fR]
+[\fB\-\-insecure\fR]
+
+
+.SH DESCRIPTION
+.B paho_c_pub
+sends data to an MQTT server using the Eclipse Paho C client asynchronous library (MQTTAsync).
+MQTT is a protocol, operating over TCP/IP, which allows programs to easily communicate
+with each other through a server.  Messages are published to topics and delivered to any subscribers to those topics.
+The corresponding subscriber program \fBpaho_c_sub\fR allows the receipt of MQTT messages.
+.PP
+The default mode of operation is to read input from stdin, sending a separate message for each line read.  Options exist
+to change this mode to send a one-off message, of 0 length (\fB-n\fR), a given string (\fB-m\fR), or the contents of a file (\fB-f\fR).
+
+.SH "OPTIONS"
+.TP
+.PD 0
+.BI \-t
+.TP
+.PD
+.B \-\-topic
+The MQTT topic to publish the data to.
+.TP
+.PD 0
+.BI \-c
+.TP
+.PD
+.B \-\-connection
+The MQTT URI to connect to, a combination of transport prefix, host, port and for websockets, topic.  
+To connect using TCP use the tcp prefix, for example: \fBtcp://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR.  
+An example using SSL/TLS: \fBssl://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR.  
+An example for websockets, insecure: \fBws://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR\fB/\fR\fItopic\fR, and
+secure: \fBwss://\fR\fIlocalhost\fR\fB:\fR\fI80\fR\fB/\fR\fItopic\fR.
+.TP
+.PD 0
+.BI \-h
+.TP
+.PD
+.B \-\-host
+The TCP/IP host name of the MQTT server to connect to. Along with the \fB--port\fR option, an older alternative to using \fB--connection\fR.
+.TP
+.PD 0
+.BI \-p
+.TP
+.PD
+.B \-\-port
+The TCP/IP port number of the MQTT server to connect to. Along with the \fB--host\fR option, an older alternative to using \fB--connection\fR.
+.TP
+.PD 0
+.BI \-q
+.TP
+.PD
+.B \-\-qos
+The MQTT QoS on which to publish the message. The alternatives are \fB0\fR, \fB1\fR or \fB2\fR.
+.TP
+.PD 0
+.BI \-V
+.TP
+.PD
+.B \-\-MQTTversion
+The version of the MQTT protocol to use.  Valid options are \fB31\fR (or \fBmqttv31\fR), \fB311\fR (\fBmqttv311\fR) and \fB5\fR (or \fBmqttv5\fR).
+If MQTT version 5 is used, then some additional options are valid, such as \fB--message-expiry\fR and \fB--user-property\fR.
+.TP
+.PD
+.B \-\-quiet
+Do not print error messages.
+.TP
+.PD
+.B \-\-trace
+Print library internal trace.  Valid levels are \fBmin\fR, \fBmax\fR, \fBerror\fR and \fprotocol\fR.
+.TP
+.PD 0
+.BI \-r
+.TP
+.PD
+.B \-\-retained
+Publish messages with the MQTT retained flag set.
+.TP
+.PD 0
+.BI \-n
+.TP
+.PD
+.B \-\-null-message
+Publish a 0-length message.  
+.TP
+.PD 0
+.BI \-m
+.TP
+.PD
+.B \-\-message
+Publish a one off message with the payload supplied. 
+.TP
+.PD 0
+.BI \-f
+.TP
+.PD
+.B \-\-filename
+Publish a one off message with the contents of the file whose name is given.
+.TP
+.PD
+.B \-\-message-expiry
+[MQTT version 5 only] Sets the expiry interval property of messages in seconds.  
+.TP
+.PD
+.B \-\-user-property
+[MQTT version 5 only] Sets a user property of sent messages.  A pair of strings, name and value.
+.TP
+.PD
+.B \-\-will-topic
+Sets the MQTT will message topic to publish to. If the application ends without sending an MQTT disconnect, the
+will message will be published to this topic.
+.TP
+.PD
+.B \-\-will-payload
+Only used if \fBwill-topic\fR is set. Sets the MQTT will message to be published. 
+.TP
+.PD
+.B \-\-will-qos
+Only used if \fBwill-topic\fR is set. Sets the MQTT QoS at which the will message is published. The alternatives are \fB0\fR, \fB1\fR or \fB2\fR.
+.TP
+.PD
+.B \-\-will-retain
+Only used if \fBwill-topic\fR is set. Sets the MQTT retained flag on the will message. 
+.TP
+.PD
+.B \-\-cafile
+Only used with a TLS connection. The name of a file for the OpenSSL trust store.
+.TP
+.PD
+.B \-\-capath
+Only used with a TLS connection. The name of a directory holding OpenSSL trusted certificates.
+.TP
+.PD
+.B \-\-cert
+Only used with a TLS connection. The name of a file for the TLS keystore containing a client certificate to be presented.
+.TP
+.PD
+.B \-\-key
+Only used with a TLS connection. The name of a file containing the client private key.
+.TP
+.PD
+.B \-\-keypass
+Only used with a TLS connection. The password for the client private key file, if needed.
+.TP
+.PD
+.B \-\-ciphers
+Only used with a TLS connection. A list of cipher suites that the client will present to the server during the TLS handshake.
+.TP
+.PD
+.B \-\-insecure
+Only used with a TLS connection. Don't check that the server certificate common name matches the hostname.
+
+
+
+
+
diff --git a/mqtt/src/doc/man/man1/paho_c_sub.1 b/mqtt/src/doc/man/man1/paho_c_sub.1
new file mode 100644
index 00000000..0f69cefd
--- /dev/null
+++ b/mqtt/src/doc/man/man1/paho_c_sub.1
@@ -0,0 +1,170 @@
+.TH PAHO_C_SUB 1L "31 July 2018 (v1.3.0)" http://eclipse.org/paho
+
+.SH NAME
+paho_c_sub \- receive (subscribe to) data from an MQTT server
+
+.SH SYNOPSIS
+.B paho_c_sub
+[\fItopic\fR]
+[\fB\-t\fR|\fB\-\-topic\fR \fItopic\fR]
+[\fB\-c\fR|\fB\-\-connection\fR \fIconnection\fR]
+[\fB\-h\fR|\fB\-\-host\fR \fIhostname\fR]
+[\fB\-p\fR|\fB\-\-port\fR \fIportnumber\fR]
+[\fB\-i\fR|\fB\-\-clientid\fR \fIclientid\fR]
+[\fB\-u\fR|\fB\-\-username\fR \fIusername\fR]
+[\fB\-P\fR|\fB\-\-password\fR \fIpassword\fR]
+[\fB\-k\fR|\fB\-\-keepalive\fR \fIkeepalive-timeout\fR]
+[\fB\-V\fR|\fB\-\-MQTT-version\fR \fB31\fR|\fB311\fR|\fB5\fR]
+.br
+[\fB\-q\fR|\fB\-\-qos\fR \fB0\fR|\fB1\fR|\fB2\fR]
+[\fB\-R\fR|\fB\-\-no-retained\fR]
+[\fB\-\-delimiter\fR \fIdelimiter\fR]
+[\fB\-\-no-delimiter\fR]
+.br
+[\fB\-\-quiet\fR]
+[\fB\-\-verbose\fR]
+[\fB\-\-trace\fR \fBmin\fR|\fBmax\fR|\fBerror\fR|\fBprotocol\fR]
+.br
+[\fB\-\-will-topic\fR \fIwill-topic\fR]
+[\fB\-\-will-payload\fR \fIwill-payload\fR]
+[\fB\-\-will-retain\fR]
+[\fB\-\-will-qos\fR \fB0\fR|\fB1\fR|\fB2\fR]
+.br
+[\fB\-\-cafile\fR \fIcafile\fR]
+[\fB\-\-capath\fR \fIcapath\fR]
+[\fB\-\-cert\fR \fIcertfile\fR]
+[\fB\-\-key\fR \fIkeyfile\fR]
+[\fB\-\-keypass\fR \fIpassword\fR]
+[\fB\-\-ciphers\fR \fIcipher-string\fR]
+[\fB\-\-insecure\fR]
+
+
+.SH DESCRIPTION
+.B paho_c_sub
+receives data from an MQTT server using the Eclipse Paho C client asynchronous library (MQTTAsync).
+MQTT is a protocol, operating over TCP/IP, which allows programs to easily communicate
+with each other through a server.  Messages are published to topics and delivered to any subscribers to those topics.
+The corresponding publisher program \fBpaho_c_pub\fR allows MQTT messages to be sent.
+.PP
+The default mode of operation is to output each message to stdout terminated by the delimiter.
+
+.SH "OPTIONS"
+.TP
+.PD 0
+.BI \-t
+.TP
+.PD
+.B \-\-topic
+The MQTT topic to publish the data to.
+.TP
+.PD 0
+.BI \-c
+.TP
+.PD
+.B \-\-connection
+The MQTT URI to connect to, a combination of transport prefix, host, port and for websockets, topic.  
+To connect using TCP use the tcp prefix, for example: \fBtcp://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR.  
+An example using SSL/TLS: \fBssl://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR.  
+An example for websockets, insecure: \fBws://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR\fB/\fR\fItopic\fR, and
+secure: \fBwss://\fR\fIlocalhost\fR\fB:\fR\fI80\fR\fB/\fR\fItopic\fR.
+.TP
+.PD 0
+.BI \-h
+.TP
+.PD
+.B \-\-host
+The TCP/IP host name of the MQTT server to connect to. Along with the \fB--port\fR option, an older alternative to using \fB--connection\fR.
+.TP
+.PD 0
+.BI \-p
+.TP
+.PD
+.B \-\-port
+The TCP/IP port number of the MQTT server to connect to. Along with the \fB--host\fR option, an older alternative to using \fB--connection\fR.
+.TP
+.PD 0
+.BI \-q
+.TP
+.PD
+.B \-\-qos
+The MQTT QoS on which to publish the message. The alternatives are \fB0\fR, \fB1\fR or \fB2\fR.
+.TP
+.PD 0
+.BI \-V
+.TP
+.PD
+.B \-\-MQTTversion
+The version of the MQTT protocol to use.  Valid options are \fB31\fR (or \fBmqttv31\fR), \fB311\fR (\fBmqttv311\fR) and \fB5\fR (or \fBmqttv5\fR).
+.TP
+.PD
+.B \-\-quiet
+Do not print error messages.
+.TP
+.PD
+.B \-\-trace
+Print library internal trace.  Valid levels are \fBmin\fR, \fBmax\fR, \fBerror\fR and \fprotocol\fR.
+.TP
+.PD 0
+.BI \-R
+.TP
+.PD
+.B \-\-no-retained
+Do not print messages which have the MQTT retained flag set. 
+.TP
+.PD
+.B \-\-delimiter
+The delimiter string to append to each message when printing.  Defaults to newline.
+.TP
+.PD
+.B \-\-no-delimiter
+Do not add a delimiter to each message when printing.
+.TP
+.PD
+.B \-\-will-topic
+Sets the MQTT will message topic to publish to. If the application ends without sending an MQTT disconnect, the
+will message will be published to this topic.
+.TP
+.PD
+.B \-\-will-payload
+Only used if \fBwill-topic\fR is set. Sets the MQTT will message to be published. 
+.TP
+.PD
+.B \-\-will-qos
+Only used if \fBwill-topic\fR is set. Sets the MQTT QoS at which the will message is published. The alternatives are \fB0\fR, \fB1\fR or \fB2\fR.
+.TP
+.PD
+.B \-\-will-retain
+Only used if \fBwill-topic\fR is set. Sets the MQTT retained flag on the will message. 
+.TP
+.PD
+.B \-\-cafile
+Only used with a TLS connection. The name of a file for the OpenSSL trust store.
+.TP
+.PD
+.B \-\-capath
+Only used with a TLS connection. The name of a directory holding OpenSSL trusted certificates.
+.TP
+.PD
+.B \-\-cert
+Only used with a TLS connection. The name of a file for the TLS keystore containing a client certificate to be presented.
+.TP
+.PD
+.B \-\-key
+Only used with a TLS connection. The name of a file containing the client private key.
+.TP
+.PD
+.B \-\-keypass
+Only used with a TLS connection. The password for the client private key file, if needed.
+.TP
+.PD
+.B \-\-ciphers
+Only used with a TLS connection. A list of cipher suites that the client will present to the server during the TLS handshake.
+.TP
+.PD
+.B \-\-insecure
+Only used with a TLS connection. Don't check that the server certificate common name matches the hostname.
+
+
+
+
+
diff --git a/mqtt/src/doc/man/man1/paho_cs_pub.1 b/mqtt/src/doc/man/man1/paho_cs_pub.1
new file mode 100644
index 00000000..4e8f4ad7
--- /dev/null
+++ b/mqtt/src/doc/man/man1/paho_cs_pub.1
@@ -0,0 +1,199 @@
+.TH PAHO_CS_PUB 1L "31 July 2018 (v1.3.0)" http://eclipse.org/paho
+
+.SH NAME
+paho_cs_pub \- send (publish) data to an MQTT server
+
+.SH SYNOPSIS
+.B paho_cs_pub
+[\fItopic\fR]
+[\fB\-t\fR|\fB\-\-topic\fR \fItopic\fR]
+[\fB\-c\fR|\fB\-\-connection\fR \fIconnection\fR]
+[\fB\-h\fR|\fB\-\-host\fR \fIhostname\fR]
+[\fB\-p\fR|\fB\-\-port\fR \fIportnumber\fR]
+[\fB\-i\fR|\fB\-\-clientid\fR \fIclientid\fR]
+[\fB\-u\fR|\fB\-\-username\fR \fIusername\fR]
+[\fB\-P\fR|\fB\-\-password\fR \fIpassword\fR]
+[\fB\-k\fR|\fB\-\-keepalive\fR \fIkeepalive-timeout\fR]
+[\fB\-V\fR|\fB\-\-MQTT-version\fR \fB31\fR|\fB311\fR|\fB5\fR]
+.br
+[\fB\-q\fR|\fB\-\-qos\fR \fB0\fR|\fB1\fR|\fB2\fR]
+[\fB\-r\fR|\fB\-\-retained\fR]
+[\fB\-n\fR|\fB\-\-null-message\fR]
+[\fB\-m\fR|\fB\-\-message\fR \fImessage\fR]
+[\fB\-f\fR|\fB\-\-filename\fR \fIfilename\fR]
+[\fB\-\-delimiter\fR \fIdelimiter\fR]
+[\fB\-\-maxdatalen\fR \fImaxdatalen\fR]
+.br
+[\fB\-\-message-expiry\fR \fIexpiry-interval\fR]
+[\fB\-\-user-property\fR \fIname\fR \fIvalue\fR]
+.br
+[\fB\-\-quiet\fR]
+[\fB\-\-verbose\fR]
+[\fB\-\-trace\fR \fBmin\fR|\fBmax\fR|\fBerror\fR|\fBprotocol\fR]
+.br
+[\fB\-\-will-topic\fR \fIwill-topic\fR]
+[\fB\-\-will-payload\fR \fIwill-payload\fR]
+[\fB\-\-will-retain\fR]
+[\fB\-\-will-qos\fR \fB0\fR|\fB1\fR|\fB2\fR]
+.br
+[\fB\-\-cafile\fR \fIcafile\fR]
+[\fB\-\-capath\fR \fIcapath\fR]
+[\fB\-\-cert\fR \fIcertfile\fR]
+[\fB\-\-key\fR \fIkeyfile\fR]
+[\fB\-\-keypass\fR \fIpassword\fR]
+[\fB\-\-ciphers\fR \fIcipher-string\fR]
+[\fB\-\-insecure\fR]
+
+
+.SH DESCRIPTION
+.B paho_cs_pub
+sends data to an MQTT server using the Eclipse Paho C client synchronous library (MQTTClient).
+MQTT is a protocol, operating over TCP/IP, which allows programs to easily communicate
+with each other through a server.  Messages are published to topics and delivered to any subscribers to those topics.
+The corresponding subscriber program \fBpaho_cs_sub\fR allows the receipt of MQTT messages.
+.PP
+The default mode of operation is to read input from stdin, sending a separate message for each line read.  Options exist
+to change this mode to send a one-off message, of 0 length (\fB-n\fR), a given string (\fB-m\fR), or the contents of a file (\fB-f\fR).
+
+.SH "OPTIONS"
+.TP
+.PD 0
+.BI \-t
+.TP
+.PD
+.B \-\-topic
+The MQTT topic to publish the data to.
+.TP
+.PD 0
+.BI \-c
+.TP
+.PD
+.B \-\-connection
+The MQTT URI to connect to, a combination of transport prefix, host, port and for websockets, topic.  
+To connect using TCP use the tcp prefix, for example: \fBtcp://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR.  
+An example using SSL/TLS: \fBssl://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR.  
+An example for websockets, insecure: \fBws://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR\fB/\fR\fItopic\fR, and
+secure: \fBwss://\fR\fIlocalhost\fR\fB:\fR\fI80\fR\fB/\fR\fItopic\fR.
+.TP
+.PD 0
+.BI \-h
+.TP
+.PD
+.B \-\-host
+The TCP/IP host name of the MQTT server to connect to. Along with the \fB--port\fR option, an older alternative to using \fB--connection\fR.
+.TP
+.PD 0
+.BI \-p
+.TP
+.PD
+.B \-\-port
+The TCP/IP port number of the MQTT server to connect to. Along with the \fB--host\fR option, an older alternative to using \fB--connection\fR.
+.TP
+.PD 0
+.BI \-q
+.TP
+.PD
+.B \-\-qos
+The MQTT QoS on which to publish the message. The alternatives are \fB0\fR, \fB1\fR or \fB2\fR.
+.TP
+.PD 0
+.BI \-V
+.TP
+.PD
+.B \-\-MQTTversion
+The version of the MQTT protocol to use.  Valid options are \fB31\fR (or \fBmqttv31\fR), \fB311\fR (\fBmqttv311\fR) and \fB5\fR (or \fBmqttv5\fR).
+If MQTT version 5 is used, then some additional options are valid, such as \fB--message-expiry\fR and \fB--user-property\fR.
+.TP
+.PD
+.B \-\-quiet
+Do not print error messages.
+.TP
+.PD
+.B \-\-trace
+Print library internal trace.  Valid levels are \fBmin\fR, \fBmax\fR, \fBerror\fR and \fprotocol\fR.
+.TP
+.PD 0
+.BI \-r
+.TP
+.PD
+.B \-\-retained
+Publish messages with the MQTT retained flag set.
+.TP
+.PD 0
+.BI \-n
+.TP
+.PD
+.B \-\-null-message
+Publish a 0-length message.  
+.TP
+.PD 0
+.BI \-m
+.TP
+.PD
+.B \-\-message
+Publish a one off message with the payload supplied. 
+.TP
+.PD 0
+.BI \-f
+.TP
+.PD
+.B \-\-filename
+Publish a one off message with the contents of the file whose name is given.
+.TP
+.PD
+.B \-\-message-expiry
+[MQTT version 5 only] Sets the expiry interval property of messages in seconds.  
+.TP
+.PD
+.B \-\-user-property
+[MQTT version 5 only] Sets a user property of sent messages.  A pair of strings, name and value.
+.TP
+.PD
+.B \-\-will-topic
+Sets the MQTT will message topic to publish to. If the application ends without sending an MQTT disconnect, the
+will message will be published to this topic.
+.TP
+.PD
+.B \-\-will-payload
+Only used if \fBwill-topic\fR is set. Sets the MQTT will message to be published. 
+.TP
+.PD
+.B \-\-will-qos
+Only used if \fBwill-topic\fR is set. Sets the MQTT QoS at which the will message is published. The alternatives are \fB0\fR, \fB1\fR or \fB2\fR.
+.TP
+.PD
+.B \-\-will-retain
+Only used if \fBwill-topic\fR is set. Sets the MQTT retained flag on the will message. 
+.TP
+.PD
+.B \-\-cafile
+Only used with a TLS connection. The name of a file for the OpenSSL trust store.
+.TP
+.PD
+.B \-\-capath
+Only used with a TLS connection. The name of a directory holding OpenSSL trusted certificates.
+.TP
+.PD
+.B \-\-cert
+Only used with a TLS connection. The name of a file for the TLS keystore containing a client certificate to be presented.
+.TP
+.PD
+.B \-\-key
+Only used with a TLS connection. The name of a file containing the client private key.
+.TP
+.PD
+.B \-\-keypass
+Only used with a TLS connection. The password for the client private key file, if needed.
+.TP
+.PD
+.B \-\-ciphers
+Only used with a TLS connection. A list of cipher suites that the client will present to the server during the TLS handshake.
+.TP
+.PD
+.B \-\-insecure
+Only used with a TLS connection. Don't check that the server certificate common name matches the hostname.
+
+
+
+
+
diff --git a/mqtt/src/doc/man/man1/paho_cs_sub.1 b/mqtt/src/doc/man/man1/paho_cs_sub.1
new file mode 100644
index 00000000..7cd2004a
--- /dev/null
+++ b/mqtt/src/doc/man/man1/paho_cs_sub.1
@@ -0,0 +1,170 @@
+.TH PAHO_CS_SUB 1L "31 July 2018 (v1.3.0)" http://eclipse.org/paho
+
+.SH NAME
+paho_cs_sub \- receive (subscribe to) data from an MQTT server
+
+.SH SYNOPSIS
+.B paho_cs_sub
+[\fItopic\fR]
+[\fB\-t\fR|\fB\-\-topic\fR \fItopic\fR]
+[\fB\-c\fR|\fB\-\-connection\fR \fIconnection\fR]
+[\fB\-h\fR|\fB\-\-host\fR \fIhostname\fR]
+[\fB\-p\fR|\fB\-\-port\fR \fIportnumber\fR]
+[\fB\-i\fR|\fB\-\-clientid\fR \fIclientid\fR]
+[\fB\-u\fR|\fB\-\-username\fR \fIusername\fR]
+[\fB\-P\fR|\fB\-\-password\fR \fIpassword\fR]
+[\fB\-k\fR|\fB\-\-keepalive\fR \fIkeepalive-timeout\fR]
+[\fB\-V\fR|\fB\-\-MQTT-version\fR \fB31\fR|\fB311\fR|\fB5\fR]
+.br
+[\fB\-q\fR|\fB\-\-qos\fR \fB0\fR|\fB1\fR|\fB2\fR]
+[\fB\-R\fR|\fB\-\-no-retained\fR]
+[\fB\-\-delimiter\fR \fIdelimiter\fR]
+[\fB\-\-no-delimiter\fR]
+.br
+[\fB\-\-quiet\fR]
+[\fB\-\-verbose\fR]
+[\fB\-\-trace\fR \fBmin\fR|\fBmax\fR|\fBerror\fR|\fBprotocol\fR]
+.br
+[\fB\-\-will-topic\fR \fIwill-topic\fR]
+[\fB\-\-will-payload\fR \fIwill-payload\fR]
+[\fB\-\-will-retain\fR]
+[\fB\-\-will-qos\fR \fB0\fR|\fB1\fR|\fB2\fR]
+.br
+[\fB\-\-cafile\fR \fIcafile\fR]
+[\fB\-\-capath\fR \fIcapath\fR]
+[\fB\-\-cert\fR \fIcertfile\fR]
+[\fB\-\-key\fR \fIkeyfile\fR]
+[\fB\-\-keypass\fR \fIpassword\fR]
+[\fB\-\-ciphers\fR \fIcipher-string\fR]
+[\fB\-\-insecure\fR]
+
+
+.SH DESCRIPTION
+.B paho_cs_sub
+receives data from an MQTT server using the Eclipse Paho C client synchronous library (MQTTClient).
+MQTT is a protocol, operating over TCP/IP, which allows programs to easily communicate
+with each other through a server.  Messages are published to topics and delivered to any subscribers to those topics.
+The corresponding publisher program \fBpaho_cs_pub\fR allows MQTT messages to be sent.
+.PP
+The default mode of operation is to output each message to stdout terminated by the delimiter.
+
+.SH "OPTIONS"
+.TP
+.PD 0
+.BI \-t
+.TP
+.PD
+.B \-\-topic
+The MQTT topic to publish the data to.
+.TP
+.PD 0
+.BI \-c
+.TP
+.PD
+.B \-\-connection
+The MQTT URI to connect to, a combination of transport prefix, host, port and for websockets, topic.  
+To connect using TCP use the tcp prefix, for example: \fBtcp://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR.  
+An example using SSL/TLS: \fBssl://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR.  
+An example for websockets, insecure: \fBws://\fR\fIlocalhost\fR\fB:\fR\fI1883\fR\fB/\fR\fItopic\fR, and
+secure: \fBwss://\fR\fIlocalhost\fR\fB:\fR\fI80\fR\fB/\fR\fItopic\fR.
+.TP
+.PD 0
+.BI \-h
+.TP
+.PD
+.B \-\-host
+The TCP/IP host name of the MQTT server to connect to. Along with the \fB--port\fR option, an older alternative to using \fB--connection\fR.
+.TP
+.PD 0
+.BI \-p
+.TP
+.PD
+.B \-\-port
+The TCP/IP port number of the MQTT server to connect to. Along with the \fB--host\fR option, an older alternative to using \fB--connection\fR.
+.TP
+.PD 0
+.BI \-q
+.TP
+.PD
+.B \-\-qos
+The MQTT QoS on which to publish the message. The alternatives are \fB0\fR, \fB1\fR or \fB2\fR.
+.TP
+.PD 0
+.BI \-V
+.TP
+.PD
+.B \-\-MQTTversion
+The version of the MQTT protocol to use.  Valid options are \fB31\fR (or \fBmqttv31\fR), \fB311\fR (\fBmqttv311\fR) and \fB5\fR (or \fBmqttv5\fR).
+.TP
+.PD
+.B \-\-quiet
+Do not print error messages.
+.TP
+.PD
+.B \-\-trace
+Print library internal trace.  Valid levels are \fBmin\fR, \fBmax\fR, \fBerror\fR and \fprotocol\fR.
+.TP
+.PD 0
+.BI \-R
+.TP
+.PD
+.B \-\-no-retained
+Do not print messages which have the MQTT retained flag set. 
+.TP
+.PD
+.B \-\-delimiter
+The delimiter string to append to each message when printing.  Defaults to newline.
+.TP
+.PD
+.B \-\-no-delimiter
+Do not add a delimiter to each message when printing.
+.TP
+.PD
+.B \-\-will-topic
+Sets the MQTT will message topic to publish to. If the application ends without sending an MQTT disconnect, the
+will message will be published to this topic.
+.TP
+.PD
+.B \-\-will-payload
+Only used if \fBwill-topic\fR is set. Sets the MQTT will message to be published. 
+.TP
+.PD
+.B \-\-will-qos
+Only used if \fBwill-topic\fR is set. Sets the MQTT QoS at which the will message is published. The alternatives are \fB0\fR, \fB1\fR or \fB2\fR.
+.TP
+.PD
+.B \-\-will-retain
+Only used if \fBwill-topic\fR is set. Sets the MQTT retained flag on the will message. 
+.TP
+.PD
+.B \-\-cafile
+Only used with a TLS connection. The name of a file for the OpenSSL trust store.
+.TP
+.PD
+.B \-\-capath
+Only used with a TLS connection. The name of a directory holding OpenSSL trusted certificates.
+.TP
+.PD
+.B \-\-cert
+Only used with a TLS connection. The name of a file for the TLS keystore containing a client certificate to be presented.
+.TP
+.PD
+.B \-\-key
+Only used with a TLS connection. The name of a file containing the client private key.
+.TP
+.PD
+.B \-\-keypass
+Only used with a TLS connection. The password for the client private key file, if needed.
+.TP
+.PD
+.B \-\-ciphers
+Only used with a TLS connection. A list of cipher suites that the client will present to the server during the TLS handshake.
+.TP
+.PD
+.B \-\-insecure
+Only used with a TLS connection. Don't check that the server certificate common name matches the hostname.
+
+
+
+
+
diff --git a/mqtt/src/doc/pahologo.png b/mqtt/src/doc/pahologo.png
new file mode 100644
index 00000000..27f197d8
Binary files /dev/null and b/mqtt/src/doc/pahologo.png differ
diff --git a/mqtt/src/edl-v10 b/mqtt/src/edl-v10
new file mode 100644
index 00000000..cf989f14
--- /dev/null
+++ b/mqtt/src/edl-v10
@@ -0,0 +1,15 @@
+
+Eclipse Distribution License - v 1.0
+
+Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors.
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+    Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+    Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+    Neither the name of the Eclipse Foundation, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. 
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
diff --git a/mqtt/src/epl-v10 b/mqtt/src/epl-v10
new file mode 100644
index 00000000..79e486c3
--- /dev/null
+++ b/mqtt/src/epl-v10
@@ -0,0 +1,70 @@
+Eclipse Public License - v 1.0
+
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
+
+1. DEFINITIONS
+
+"Contribution" means:
+
+a) in the case of the initial Contributor, the initial code and documentation distributed under this Agreement, and
+b) in the case of each subsequent Contributor:
+i) changes to the Program, and
+ii) additions to the Program;
+where such changes and/or additions to the Program originate from and are distributed by that particular Contributor. A Contribution 'originates' from a Contributor if it was added to the Program by such Contributor itself or anyone acting on such Contributor's behalf. Contributions do not include additions to the Program which: (i) are separate modules of software distributed in conjunction with the Program under their own license agreement, and (ii) are not derivative works of the Program.
+"Contributor" means any person or entity that distributes the Program.
+
+"Licensed Patents" mean patent claims licensable by a Contributor which are necessarily infringed by the use or sale of its Contribution alone or when combined with the Program.
+
+"Program" means the Contributions distributed in accordance with this Agreement.
+
+"Recipient" means anyone who receives the Program under this Agreement, including all Contributors.
+
+2. GRANT OF RIGHTS
+
+a) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, distribute and sublicense the Contribution of such Contributor, if any, and such derivative works, in source code and object code form.
+b) Subject to the terms of this Agreement, each Contributor hereby grants Recipient a non-exclusive, worldwide, royalty-free patent license under Licensed Patents to make, use, sell, offer to sell, import and otherwise transfer the Contribution of such Contributor, if any, in source code and object code form. This patent license shall apply to the combination of the Contribution and the Program if, at the time the Contribution is added by the Contributor, such addition of the Contribution causes such combination to be covered by the Licensed Patents. The patent license shall not apply to any other combinations which include the Contribution. No hardware per se is licensed hereunder.
+c) Recipient understands that although each Contributor grants the licenses to its Contributions set forth herein, no assurances are provided by any Contributor that the Program does not infringe the patent or other intellectual property rights of any other entity. Each Contributor disclaims any liability to Recipient for claims brought by any other entity based on infringement of intellectual property rights or otherwise. As a condition to exercising the rights and licenses granted hereunder, each Recipient hereby assumes sole responsibility to secure any other intellectual property rights needed, if any. For example, if a third party patent license is required to allow Recipient to distribute the Program, it is Recipient's responsibility to acquire that license before distributing the Program.
+d) Each Contributor represents that to its knowledge it has sufficient copyright rights in its Contribution, if any, to grant the copyright license set forth in this Agreement.
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under its own license agreement, provided that:
+
+a) it complies with the terms and conditions of this Agreement; and
+b) its license agreement:
+i) effectively disclaims on behalf of all Contributors all warranties and conditions, express and implied, including warranties or conditions of title and non-infringement, and implied warranties or conditions of merchantability and fitness for a particular purpose;
+ii) effectively excludes on behalf of all Contributors all liability for damages, including direct, indirect, special, incidental and consequential damages, such as lost profits;
+iii) states that any provisions which differ from this Agreement are offered by that Contributor alone and not by any other party; and
+iv) states that source code for the Program is available from such Contributor, and informs licensees how to obtain it in a reasonable manner on or through a medium customarily used for software exchange.
+When the Program is made available in source code form:
+
+a) it must be made available under this Agreement; and
+b) a copy of this Agreement must be included with each copy of the Program.
+Contributors may not remove or alter any copyright notices contained within the Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if any, in a manner that reasonably allows subsequent Recipients to identify the originator of the Contribution.
+
+4. COMMERCIAL DISTRIBUTION
+
+Commercial distributors of software may accept certain responsibilities with respect to end users, business partners and the like. While this license is intended to facilitate the commercial use of the Program, the Contributor who includes the Program in a commercial product offering should do so in a manner which does not create potential liability for other Contributors. Therefore, if a Contributor includes the Program in a commercial product offering, such Contributor ("Commercial Contributor") hereby agrees to defend and indemnify every other Contributor ("Indemnified Contributor") against any losses, damages and costs (collectively "Losses") arising from claims, lawsuits and other legal actions brought by a third party against the Indemnified Contributor to the extent caused by the acts or omissions of such Commercial Contributor in connection with its distribution of the Program in a commercial product offering. The obligations in this section do not apply to any claims or Losses relating to any actual or alleged intellectual property infringement. In order to qualify, an Indemnified Contributor must: a) promptly notify the Commercial Contributor in writing of such claim, and b) allow the Commercial Contributor to control, and cooperate with the Commercial Contributor in, the defense and any related settlement negotiations. The Indemnified Contributor may participate in any such claim at its own expense.
+
+For example, a Contributor might include the Program in a commercial product offering, Product X. That Contributor is then a Commercial Contributor. If that Commercial Contributor then makes performance claims, or offers warranties related to Product X, those performance claims and warranties are such Commercial Contributor's responsibility alone. Under this section, the Commercial Contributor would have to defend claims against the other Contributors related to those performance claims and warranties, and if a court requires any other Contributor to pay any damages as a result, the Commercial Contributor must pay those damages.
+
+5. NO WARRANTY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely responsible for determining the appropriateness of using and distributing the Program and assumes all risks associated with its exercise of rights under this Agreement , including but not limited to the risks and costs of program errors, compliance with applicable laws, damage to or loss of data, programs or equipment, and unavailability or interruption of operations.
+
+6. DISCLAIMER OF LIABILITY
+
+EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+
+7. GENERAL
+
+If any provision of this Agreement is invalid or unenforceable under applicable law, it shall not affect the validity or enforceability of the remainder of the terms of this Agreement, and without further action by the parties hereto, such provision shall be reformed to the minimum extent necessary to make such provision valid and enforceable.
+
+If Recipient institutes patent litigation against any entity (including a cross-claim or counterclaim in a lawsuit) alleging that the Program itself (excluding combinations of the Program with other software or hardware) infringes such Recipient's patent(s), then such Recipient's rights granted under Section 2(b) shall terminate as of the date such litigation is filed.
+
+All Recipient's rights under this Agreement shall terminate if it fails to comply with any of the material terms or conditions of this Agreement and does not cure such failure in a reasonable period of time after becoming aware of such noncompliance. If all Recipient's rights under this Agreement terminate, Recipient agrees to cease use and distribution of the Program as soon as reasonably practicable. However, Recipient's obligations under this Agreement and any licenses granted by Recipient relating to the Program shall continue and survive.
+
+Everyone is permitted to copy and distribute copies of this Agreement, but in order to avoid inconsistency the Agreement is copyrighted and may only be modified in the following manner. The Agreement Steward reserves the right to publish new versions (including revisions) of this Agreement from time to time. No one other than the Agreement Steward has the right to modify this Agreement. The Eclipse Foundation is the initial Agreement Steward. The Eclipse Foundation may assign the responsibility to serve as the Agreement Steward to a suitable separate entity. Each new version of the Agreement will be given a distinguishing version number. The Program (including Contributions) may always be distributed subject to the version of the Agreement under which it was received. In addition, after a new version of the Agreement is published, Contributor may elect to distribute the Program (including its Contributions) under the new version. Except as expressly stated in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to the intellectual property of any Contributor under this Agreement, whether expressly, by implication, estoppel or otherwise. All rights in the Program not expressly granted under this Agreement are reserved.
+
+This Agreement is governed by the laws of the State of New York and the intellectual property laws of the United States of America. No party to this Agreement will bring a legal action under this Agreement more than one year after the cause of action arose. Each party waives its rights to a jury trial in any resulting litigation.
diff --git a/mqtt/src/notice.html b/mqtt/src/notice.html
new file mode 100644
index 00000000..f19c483b
--- /dev/null
+++ b/mqtt/src/notice.html
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
+<title>Eclipse Foundation Software User Agreement</title>
+</head>
+
+<body lang="EN-US">
+<h2>Eclipse Foundation Software User Agreement</h2>
+<p>February 1, 2011</p>
+
+<h3>Usage Of Content</h3>
+
+<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
+   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
+   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
+   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
+   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
+   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
+
+<h3>Applicable Licenses</h3>
+
+<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
+   (&quot;EPL&quot;).  A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+   For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+
+<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
+   repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
+
+<ul>
+       <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
+       <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
+       <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
+      and/or Fragments associated with that Feature.</li>
+       <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
+</ul>
+
+<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
+Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
+including, but not limited to the following locations:</p>
+
+<ul>
+       <li>The top-level (root) directory</li>
+       <li>Plug-in and Fragment directories</li>
+       <li>Inside Plug-ins and Fragments packaged as JARs</li>
+       <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
+       <li>Feature directories</li>
+</ul>
+
+<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
+installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
+inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
+Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
+that directory.</p>
+
+<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
+OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
+
+<ul>
+       <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
+       <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
+       <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
+       <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
+       <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
+       <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
+</ul>
+
+<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
+contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
+
+
+<h3>Use of Provisioning Technology</h3>
+
+<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
+   Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
+   other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
+   install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
+       href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
+   (&quot;Specification&quot;).</p>
+
+<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
+   applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
+   in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
+   Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
+
+<ol>
+       <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
+       on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
+       product.</li>
+       <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
+       accessed and copied to the Target Machine.</li>
+       <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
+       Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
+       Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
+       the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
+       indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
+</ol>
+
+<h3>Cryptography</h3>
+
+<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
+   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
+   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
+
+<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
+</body>
+</html>
diff --git a/mqtt/src/src/Base64.c b/mqtt/src/src/Base64.c
new file mode 100644
index 00000000..689fedf4
--- /dev/null
+++ b/mqtt/src/src/Base64.c
@@ -0,0 +1,352 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Wind River Systems, Inc. All Rights Reserved.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Keith Holman - initial implementation and documentation
+ *******************************************************************************/
+
+#include "Base64.h"
+
+#if defined(WIN32) || defined(WIN64)
+#pragma comment(lib, "crypt32.lib")
+#include <Windows.h>
+#include <WinCrypt.h>
+b64_size_t Base64_decode( b64_data_t *out, b64_size_t out_len, const char *in, b64_size_t in_len )
+{
+	b64_size_t ret = 0u;
+	DWORD dw_out_len = (DWORD)out_len;
+	if ( CryptStringToBinaryA( in, in_len, CRYPT_STRING_BASE64, out, &dw_out_len, NULL, NULL ) )
+		ret = (b64_size_t)dw_out_len;
+	return ret;
+}
+
+b64_size_t Base64_encode( char *out, b64_size_t out_len, const b64_data_t *in, b64_size_t in_len )
+{
+	b64_size_t ret = 0u;
+	DWORD dw_out_len = (DWORD)out_len;
+	if ( CryptBinaryToStringA( in, in_len, CRYPT_STRING_BASE64 | CRYPT_STRING_NOCRLF, out, &dw_out_len ) )
+		ret = (b64_size_t)dw_out_len;
+	return ret;
+}
+#else /* if defined(WIN32) || defined(WIN64) */
+
+#if defined(OPENSSL)
+#include <openssl/bio.h>
+#include <openssl/evp.h>
+static b64_size_t Base64_encodeDecode(
+	char *out, b64_size_t out_len, const char *in, b64_size_t in_len, int encode )
+{
+	b64_size_t ret = 0u;
+	if ( in_len > 0u )
+	{
+		int rv;
+		BIO *bio, *b64, *b_in, *b_out;
+
+		b64 = BIO_new(BIO_f_base64());
+		bio = BIO_new(BIO_s_mem());
+		b64 = BIO_push(b64, bio);
+		BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL); /* ignore new-lines */
+
+		if ( encode )
+		{
+			b_in = bio;
+			b_out = b64;
+		}
+		else
+		{
+			b_in = b64;
+			b_out = bio;
+		}
+
+		rv = BIO_write(b_out, in, (int)in_len);
+		BIO_flush(b_out); /* indicate end of encoding */
+
+		if ( rv > 0 )
+		{
+			rv = BIO_read(b_in, out, (int)out_len);
+			if ( rv > 0 )
+			{
+				ret = (b64_size_t)rv;
+				if ( out_len > ret )
+					out[ret] = '\0';
+			}
+		}
+
+		BIO_free_all(b64);  /* free all used memory */
+	}
+	return ret;
+}
+
+b64_size_t Base64_decode( b64_data_t *out, b64_size_t out_len, const char *in, b64_size_t in_len )
+{
+	return Base64_encodeDecode( (char*)out, out_len, in, in_len, 0 );
+}
+
+b64_size_t Base64_encode( char *out, b64_size_t out_len, const b64_data_t *in, b64_size_t in_len )
+{
+	return Base64_encodeDecode( out, out_len, (const char*)in, in_len, 1 );
+}
+
+#else /* if defined(OPENSSL) */
+b64_size_t Base64_decode( b64_data_t *out, b64_size_t out_len, const char *in, b64_size_t in_len )
+{
+#define NV 64
+	static const unsigned char BASE64_DECODE_TABLE[] =
+	{
+		NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, /*  0-15 */
+		NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, /* 16-31 */
+		NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, 62, NV, NV, NV, 63, /* 32-47 */
+		52, 53, 54, 55, 56, 57, 58, 59, 60, 61, NV, NV, NV, NV, NV, NV, /* 48-63 */
+		NV,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, /* 64-79 */
+		15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, NV, NV, NV, NV, NV, /* 80-95 */
+		NV, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, /* 96-111 */
+		41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, NV, NV, NV, NV, NV, /* 112-127 */
+		NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, /* 128-143 */
+		NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, /* 144-159 */
+		NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, /* 160-175 */
+		NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, /* 176-191 */
+		NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, /* 192-207 */
+		NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, /* 208-223 */
+		NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, /* 224-239 */
+		NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV, NV  /* 240-255 */
+	};
+
+	b64_size_t ret = 0u;
+	b64_size_t out_count = 0u;
+
+	/* in valid base64, length must be multiple of 4's: 0, 4, 8, 12, etc */
+	while ( in_len > 3u && out_count < out_len )
+	{
+		int i;
+		unsigned char c[4];
+		for ( i = 0; i < 4; ++i, ++in )
+			c[i] = BASE64_DECODE_TABLE[(int)(*in)];
+		in_len -= 4u;
+
+		/* first byte */
+		*out = c[0] << 2;
+		*out |= (c[1] & ~0xF) >> 4;
+		++out;
+		++out_count;
+
+		if ( out_count < out_len )
+		{
+			/* second byte */
+			*out = (c[1] & 0xF) << 4;
+			if ( c[2] < NV )
+			{
+				*out |= (c[2] & ~0x3) >> 2;
+				++out;
+				++out_count;
+
+				if ( out_count < out_len )
+				{
+					/* third byte */
+					*out = (c[2] & 0x3) << 6;
+					if ( c[3] < NV )
+					{
+						*out |= c[3];
+						++out;
+						++out_count;
+					}
+					else
+						in_len = 0u;
+				}
+			}
+			else
+				in_len = 0u;
+		}
+	}
+
+	if ( out_count <= out_len )
+	{
+		ret = out_count;
+		if ( out_count < out_len )
+			*out = '\0';
+	}
+	return ret;
+}
+
+b64_size_t Base64_encode( char *out, b64_size_t out_len, const b64_data_t *in, b64_size_t in_len )
+{
+	static const char BASE64_ENCODE_TABLE[] =
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+		"abcdefghijklmnopqrstuvwxyz"
+		"0123456789+/=";
+	b64_size_t ret = 0u;
+	b64_size_t out_count = 0u;
+
+	while ( in_len > 0u && out_count < out_len )
+	{
+		int i;
+		unsigned char c[] = { 0, 0, 64, 64 }; /* index of '=' char */
+
+		/* first character */
+		i = *in;
+		c[0] = (i & ~0x3) >> 2;
+
+		/* second character */
+		c[1] = (i & 0x3) << 4;
+		--in_len;
+		if ( in_len > 0u )
+		{
+			++in;
+			i = *in;
+			c[1] |= (i & ~0xF) >> 4;
+
+			/* third character */
+			c[2] = (i & 0xF) << 2;
+			--in_len;
+			if ( in_len > 0u )
+			{
+				++in;
+				i = *in;
+				c[2] |= (i & ~0x3F) >> 6;
+
+				/* fourth character */
+				c[3] = (i & 0x3F);
+				--in_len;
+				++in;
+			}
+		}
+
+		/* encode the characters */
+		out_count += 4u;
+		for ( i = 0; i < 4 && out_count <= out_len; ++i, ++out )
+			*out = BASE64_ENCODE_TABLE[c[i]];
+	}
+
+	if ( out_count <= out_len )
+	{
+		if ( out_count < out_len )
+			*out = '\0';
+		ret = out_count;
+	}
+	return ret;
+}
+#endif /* else if defined(OPENSSL) */
+#endif /* if else defined(WIN32) || defined(WIN64) */
+
+b64_size_t Base64_decodeLength( const char *in, b64_size_t in_len )
+{
+	b64_size_t pad = 0u;
+
+	if ( in && in_len > 1u )
+		pad += ( in[in_len - 2u] == '=' ? 1u : 0u );
+	if ( in && in_len > 0u )
+		pad += ( in[in_len - 1u] == '=' ? 1u : 0u );
+	return (in_len / 4u * 3u) - pad;
+}
+
+b64_size_t Base64_encodeLength( const b64_data_t *in, b64_size_t in_len )
+{
+	return ((4u * in_len / 3u) + 3u) & ~0x3;
+}
+
+#if defined(BASE64_TEST)
+#include <stdio.h>
+#include <string.h>
+
+#define TEST_EXPECT(i,x) if (!(x)) {fprintf( stderr, "failed test: %s (for i == %d)\n", #x, i ); ++fails;}
+
+int main(int argc, char *argv[])
+{
+	struct _td
+	{
+		const char *in;
+		const char *out;
+	};
+
+	int i;
+	unsigned int fails = 0u;
+	struct _td test_data[] = {
+		{ "", "" },
+		{ "p", "cA==" },
+		{ "pa", "cGE=" },
+		{ "pah", "cGFo" },
+		{ "paho", "cGFobw==" },
+		{ "paho ", "cGFobyA=" },
+		{ "paho w", "cGFobyB3" },
+		{ "paho wi", "cGFobyB3aQ==" },
+		{ "paho wit", "cGFobyB3aXQ=" },
+		{ "paho with", "cGFobyB3aXRo" },
+		{ "paho with ", "cGFobyB3aXRoIA==" },
+		{ "paho with w", "cGFobyB3aXRoIHc=" },
+		{ "paho with we", "cGFobyB3aXRoIHdl" },
+		{ "paho with web", "cGFobyB3aXRoIHdlYg==" },
+		{ "paho with webs", "cGFobyB3aXRoIHdlYnM=" },
+		{ "paho with webso", "cGFobyB3aXRoIHdlYnNv" },
+		{ "paho with websoc", "cGFobyB3aXRoIHdlYnNvYw==" },
+		{ "paho with websock", "cGFobyB3aXRoIHdlYnNvY2s=" },
+		{ "paho with websocke", "cGFobyB3aXRoIHdlYnNvY2tl" },
+		{ "paho with websocket", "cGFobyB3aXRoIHdlYnNvY2tldA==" },
+		{ "paho with websockets", "cGFobyB3aXRoIHdlYnNvY2tldHM=" },
+		{ "paho with websockets.", "cGFobyB3aXRoIHdlYnNvY2tldHMu" },
+		{ "The quick brown fox jumps over the lazy dog",
+		  "VGhlIHF1aWNrIGJyb3duIGZveCBqdW1wcyBvdmVyIHRoZSBsYXp5IGRvZw==" },
+		{ "Man is distinguished, not only by his reason, but by this singular passion from\n"
+		  "other animals, which is a lust of the mind, that by a perseverance of delight\n"
+		  "in the continued and indefatigable generation of knowledge, exceeds the short\n"
+		  "vehemence of any carnal pleasure.",
+		  "TWFuIGlzIGRpc3Rpbmd1aXNoZWQsIG5vdCBvbmx5IGJ5IGhpcyByZWFzb24sIGJ1dCBieSB0aGlz"
+		  "IHNpbmd1bGFyIHBhc3Npb24gZnJvbQpvdGhlciBhbmltYWxzLCB3aGljaCBpcyBhIGx1c3Qgb2Yg"
+		  "dGhlIG1pbmQsIHRoYXQgYnkgYSBwZXJzZXZlcmFuY2Ugb2YgZGVsaWdodAppbiB0aGUgY29udGlu"
+		  "dWVkIGFuZCBpbmRlZmF0aWdhYmxlIGdlbmVyYXRpb24gb2Yga25vd2xlZGdlLCBleGNlZWRzIHRo"
+		  "ZSBzaG9ydAp2ZWhlbWVuY2Ugb2YgYW55IGNhcm5hbCBwbGVhc3VyZS4=" },
+		{ NULL, NULL }
+	};
+
+	/* decode tests */
+	i = 0;
+	while ( test_data[i].in != NULL )
+	{
+		int r;
+		char out[512u];
+		r = Base64_decode( out, sizeof(out), test_data[i].out, strlen(test_data[i].out) );
+		TEST_EXPECT( i, r == strlen(test_data[i].in) && strncmp(out, test_data[i].in, strlen(test_data[i].in)) == 0 );
+		++i;
+	}
+
+	/* decode length tests */
+	i = 0;
+	while ( test_data[i].in != NULL )
+	{
+		TEST_EXPECT( i, Base64_decodeLength(test_data[i].out, strlen(test_data[i].out)) == strlen(test_data[i].in));
+		++i;
+	}
+
+	/* encode tests */
+	i = 0;
+	while ( test_data[i].in != NULL )
+	{
+		int r;
+		char out[512u];
+		r = Base64_encode( out, sizeof(out), test_data[i].in, strlen(test_data[i].in) );
+		TEST_EXPECT( i, r == strlen(test_data[i].out) && strncmp(out, test_data[i].out, strlen(test_data[i].out)) == 0 );
+		++i;
+	}
+
+	/* encode length tests */
+	i = 0;
+	while ( test_data[i].in != NULL )
+	{
+		TEST_EXPECT( i, Base64_encodeLength(test_data[i].in, strlen(test_data[i].in)) == strlen(test_data[i].out) );
+		++i;
+	}
+
+	if ( fails )
+		printf( "%u test failed!\n", fails );
+	else
+		printf( "all tests passed\n" );
+	return fails;
+}
+#endif /* if defined(BASE64_TEST) */
diff --git a/mqtt/src/src/Base64.h b/mqtt/src/src/Base64.h
new file mode 100644
index 00000000..df9dd757
--- /dev/null
+++ b/mqtt/src/src/Base64.h
@@ -0,0 +1,83 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Wind River Systems, Inc. All Rights Reserved.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Keith Holman - initial implementation and documentation
+ *******************************************************************************/
+
+#if !defined(BASE64_H)
+#define BASE64_H
+
+/** type for size of a buffer, it saves passing around @p size_t (unsigned long long or unsigned long int) */
+typedef unsigned int b64_size_t;
+/** type for raw base64 data */
+typedef unsigned char b64_data_t;
+
+/**
+ * Decodes base64 data
+ *
+ * @param[out]     out                 decoded data
+ * @param[in]      out_len             length of output buffer
+ * @param[in]      in                  base64 string to decode
+ * @param[in]      in_len              length of input buffer
+ *
+ * @return the amount of data decoded
+ *
+ * @see Base64_decodeLength
+ * @see Base64_encode
+ */
+b64_size_t Base64_decode( b64_data_t *out, b64_size_t out_len,
+	const char *in, b64_size_t in_len );
+
+/**
+ * Size of buffer required to decode base64 data
+ *
+ * @param[in]      in                  base64 string to decode
+ * @param[in]      in_len              length of input buffer
+ *
+ * @return the size of buffer the decoded string would require
+ *
+ * @see Base64_decode
+ * @see Base64_encodeLength
+ */
+b64_size_t Base64_decodeLength( const char *in, b64_size_t in_len );
+
+/**
+ * Encodes base64 data
+ *
+ * @param[out]     out                 encode base64 string
+ * @param[in]      out_len             length of output buffer
+ * @param[in]      in                  raw data to encode
+ * @param[in]      in_len              length of input buffer
+ *
+ * @return the amount of data encoded
+ *
+ * @see Base64_decode
+ * @see Base64_encodeLength
+ */
+b64_size_t Base64_encode( char *out, b64_size_t out_len,
+	const b64_data_t *in, b64_size_t in_len );
+
+/**
+ * Size of buffer required to encode base64 data
+ *
+ * @param[in]      in                  raw data to encode
+ * @param[in]      in_len              length of input buffer
+ *
+ * @return the size of buffer the encoded string would require
+ *
+ * @see Base64_decodeLength
+ * @see Base64_encode
+ */
+b64_size_t Base64_encodeLength( const b64_data_t *in, b64_size_t in_len );
+
+#endif /* BASE64_H */
diff --git a/mqtt/src/src/CMakeLists.txt b/mqtt/src/src/CMakeLists.txt
new file mode 100644
index 00000000..b46eaca0
--- /dev/null
+++ b/mqtt/src/src/CMakeLists.txt
@@ -0,0 +1,197 @@
+#*******************************************************************************
+#  Copyright (c) 2015, 2018 logi.cals GmbH and others
+#
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  and Eclipse Distribution License v1.0 which accompany this distribution.
+#
+#  The Eclipse Public License is available at
+#     http://www.eclipse.org/legal/epl-v10.html
+#  and the Eclipse Distribution License is available at
+#    http://www.eclipse.org/org/documents/edl-v10.php.
+#
+#  Contributors:
+#     Rainer Poisel - initial version
+#     Ian Craggs (IBM Corp.) - merge master
+#     Ian Craggs - update for MQTTV5 support
+#*******************************************************************************/
+
+# Note: on OS X you should install XCode and the associated command-line tools
+
+## compilation/linkage settings
+INCLUDE_DIRECTORIES(
+    .
+    ${CMAKE_BINARY_DIR}
+    )
+
+CONFIGURE_FILE(VersionInfo.h.in
+    ${CMAKE_BINARY_DIR}/VersionInfo.h
+    @ONLY
+    )
+
+SET(common_src
+    MQTTProtocolClient.c
+    Clients.c
+    utf-8.c
+    StackTrace.c
+    MQTTPacket.c
+    MQTTPacketOut.c
+    Messages.c
+    Tree.c
+    Socket.c
+    Log.c
+    MQTTPersistence.c
+    Thread.c
+    MQTTProtocolOut.c
+    MQTTPersistenceDefault.c
+    SocketBuffer.c
+    Heap.c
+    LinkedList.c
+    MQTTProperties.c
+    MQTTReasonCodes.c
+    Base64.c
+    SHA1.c
+    WebSocket.c
+    )
+
+IF (WIN32)
+    SET(LIBS_SYSTEM ws2_32)
+ELSEIF (UNIX)
+    IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        SET(LIBS_SYSTEM c dl pthread)
+    ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+        SET(LIBS_SYSTEM compat pthread)
+    ELSE()
+        SET(LIBS_SYSTEM c pthread)
+    ENDIF()
+ENDIF()
+
+## common compilation for libpaho-mqtt3c and libpaho-mqtt3a
+ADD_LIBRARY(common_obj OBJECT ${common_src})
+SET_PROPERTY(TARGET common_obj PROPERTY POSITION_INDEPENDENT_CODE ON)
+
+ADD_EXECUTABLE(MQTTVersion MQTTVersion.c)
+
+ADD_LIBRARY(paho-mqtt3c SHARED $<TARGET_OBJECTS:common_obj> MQTTClient.c)
+ADD_LIBRARY(paho-mqtt3a SHARED $<TARGET_OBJECTS:common_obj> MQTTAsync.c)
+
+TARGET_LINK_LIBRARIES(paho-mqtt3c ${LIBS_SYSTEM})
+TARGET_LINK_LIBRARIES(paho-mqtt3a ${LIBS_SYSTEM})
+
+TARGET_LINK_LIBRARIES(MQTTVersion paho-mqtt3a paho-mqtt3c ${LIBS_SYSTEM})
+SET_TARGET_PROPERTIES(
+    paho-mqtt3c paho-mqtt3a PROPERTIES
+    VERSION ${CLIENT_VERSION}
+    SOVERSION ${PAHO_VERSION_MAJOR})
+
+INSTALL(TARGETS paho-mqtt3c paho-mqtt3a
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+INSTALL(TARGETS MQTTVersion
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+IF (PAHO_BUILD_STATIC)
+    ADD_LIBRARY(paho-mqtt3c-static STATIC $<TARGET_OBJECTS:common_obj> MQTTClient.c)
+    ADD_LIBRARY(paho-mqtt3a-static STATIC $<TARGET_OBJECTS:common_obj> MQTTAsync.c)
+
+    TARGET_LINK_LIBRARIES(paho-mqtt3c-static ${LIBS_SYSTEM})
+    TARGET_LINK_LIBRARIES(paho-mqtt3a-static ${LIBS_SYSTEM})
+
+    INSTALL(TARGETS paho-mqtt3c-static paho-mqtt3a-static
+        ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ENDIF()
+
+INSTALL(FILES MQTTAsync.h MQTTClient.h MQTTClientPersistence.h MQTTProperties.h MQTTReasonCodes.h MQTTSubscribeOpts.h
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+
+IF (PAHO_WITH_SSL)
+    SET(OPENSSL_SEARCH_PATH "" CACHE PATH "Directory containing OpenSSL libraries and includes")
+
+    IF (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+      SET(OPENSSL_SEARCH_PATH "/usr/local/opt/openssl")
+    ENDIF (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+
+    IF (WIN32)
+      SET(OPENSSL_SEARCH_PATH "C:/OpenSSL-Win64")
+      SET(OPENSSL_SEARCH_LIB_PATH "${OPENSSL_SEARCH_PATH}/lib64")
+      IF (DEFINED ENV{PAHO_WINDOWS_BUILD_BIT})
+        IF ($ENV{PAHO_WINDOWS_BUILD_BIT} STREQUAL "x86")
+          SET(OPENSSL_SEARCH_PATH "C:/OpenSSL-Win32")
+          SET(OPENSSL_SEARCH_LIB_PATH "${OPENSSL_SEARCH_PATH}/lib32")
+        ENDIF ()
+      ENDIF ()
+    ELSE()
+      SET(OPENSSL_SEARCH_LIB_PATH "${OPENSSL_SEARCH_PATH}/lib64")
+    ENDIF ()
+
+    FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
+        HINTS ${OPENSSL_SEARCH_PATH}/include)
+    FIND_LIBRARY(OPENSSL_LIB NAMES ssl libssl ssleay32
+        HINTS ${OPENSSL_SEARCH_PATH}/lib ${OPENSSL_SEARCH_LIB_PATH})
+    FIND_LIBRARY(OPENSSLCRYPTO_LIB NAMES crypto libcrypto libeay32
+      	HINTS ${OPENSSL_SEARCH_PATH}/lib ${OPENSSL_SEARCH_LIB_PATH})
+
+    MESSAGE(STATUS "OpenSSL hints: ${OPENSSL_SEARCH_PATH}")
+    MESSAGE(STATUS "OpenSSL headers found at ${OPENSSL_INCLUDE_DIR}")
+    MESSAGE(STATUS "OpenSSL library found at ${OPENSSL_LIB}")
+    MESSAGE(STATUS "OpenSSL Crypto library found at ${OPENSSLCRYPTO_LIB}")
+
+    INCLUDE_DIRECTORIES(
+        ${OPENSSL_INCLUDE_DIR}
+    )
+
+    ## common compilation for libpaho-mqtt3cs and libpaho-mqtt3as
+    ## Note: SSL libraries must be recompiled due ifdefs
+    ADD_LIBRARY(common_ssl_obj OBJECT ${common_src})
+    SET_PROPERTY(TARGET common_ssl_obj PROPERTY POSITION_INDEPENDENT_CODE ON)
+    SET_PROPERTY(TARGET common_ssl_obj PROPERTY COMPILE_DEFINITIONS "OPENSSL=1")
+    ADD_LIBRARY(paho-mqtt3cs SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c)
+    ADD_LIBRARY(paho-mqtt3as SHARED $<TARGET_OBJECTS:common_ssl_obj> MQTTAsync.c SSLSocket.c)
+
+    TARGET_LINK_LIBRARIES(paho-mqtt3cs ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM})
+    TARGET_LINK_LIBRARIES(paho-mqtt3as ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} ${LIBS_SYSTEM})
+    SET_TARGET_PROPERTIES(
+        paho-mqtt3cs paho-mqtt3as PROPERTIES
+        VERSION ${CLIENT_VERSION}
+        SOVERSION ${PAHO_VERSION_MAJOR}
+        COMPILE_DEFINITIONS "OPENSSL=1")
+    INSTALL(TARGETS paho-mqtt3cs paho-mqtt3as
+        ARCHIVE DESTINATION  ${CMAKE_INSTALL_LIBDIR}
+        LIBRARY DESTINATION  ${CMAKE_INSTALL_LIBDIR}
+        RUNTIME DESTINATION  ${CMAKE_INSTALL_BINDIR})
+
+    IF (PAHO_BUILD_STATIC)
+        ADD_LIBRARY(paho-mqtt3cs-static STATIC $<TARGET_OBJECTS:common_ssl_obj> MQTTClient.c SSLSocket.c)
+        ADD_LIBRARY(paho-mqtt3as-static STATIC $<TARGET_OBJECTS:common_ssl_obj> MQTTAsync.c SSLSocket.c)
+
+        TARGET_LINK_LIBRARIES(paho-mqtt3cs-static ${OPENSSL_LIBRARIES} ${LIBS_SYSTEM})
+        TARGET_LINK_LIBRARIES(paho-mqtt3as-static ${OPENSSL_LIBRARIES} ${LIBS_SYSTEM})
+        SET_TARGET_PROPERTIES(
+        paho-mqtt3cs-static paho-mqtt3as-static PROPERTIES
+        VERSION ${CLIENT_VERSION}
+        SOVERSION ${PAHO_VERSION_MAJOR}
+        COMPILE_DEFINITIONS "OPENSSL=1")
+
+        INSTALL(TARGETS paho-mqtt3cs-static paho-mqtt3as-static
+            ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    ENDIF()
+ENDIF()
+
+# Base64 test
+ADD_EXECUTABLE( Base64Test EXCLUDE_FROM_ALL Base64.c Base64.h )
+TARGET_COMPILE_DEFINITIONS( Base64Test PUBLIC "-DBASE64_TEST" )
+IF (PAHO_WITH_SSL)
+	ADD_EXECUTABLE( Base64TestOpenSSL EXCLUDE_FROM_ALL Base64.c Base64.h )
+	TARGET_LINK_LIBRARIES( Base64TestOpenSSL ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} )
+	TARGET_COMPILE_DEFINITIONS( Base64TestOpenSSL PUBLIC "-DBASE64_TEST -DOPENSSL=1" )
+ENDIF (PAHO_WITH_SSL)
+
+# SHA1 test
+ADD_EXECUTABLE( Sha1Test EXCLUDE_FROM_ALL SHA1.c SHA1.h )
+TARGET_COMPILE_DEFINITIONS( Sha1Test PUBLIC "-DSHA1_TEST" )
+IF (PAHO_WITH_SSL)
+	ADD_EXECUTABLE( Sha1TestOpenSSL EXCLUDE_FROM_ALL SHA1.c SHA1.h )
+	TARGET_LINK_LIBRARIES( Sha1TestOpenSSL ${OPENSSL_LIB} ${OPENSSLCRYPTO_LIB} )
+	TARGET_COMPILE_DEFINITIONS( Sha1TestOpenSSL PUBLIC "-DSHA1_TEST -DOPENSSL=1" )
+ENDIF (PAHO_WITH_SSL)
diff --git a/mqtt/src/src/Clients.c b/mqtt/src/src/Clients.c
new file mode 100644
index 00000000..477d248d
--- /dev/null
+++ b/mqtt/src/src/Clients.c
@@ -0,0 +1,55 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2013 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - add SSL support
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief functions which apply to client structures
+ * */
+
+
+#include "Clients.h"
+
+#include <string.h>
+#include <stdio.h>
+
+
+/**
+ * List callback function for comparing clients by clientid
+ * @param a first integer value
+ * @param b second integer value
+ * @return boolean indicating whether a and b are equal
+ */
+int clientIDCompare(void* a, void* b)
+{
+	Clients* client = (Clients*)a;
+	/*printf("comparing clientdIDs %s with %s\n", client->clientID, (char*)b);*/
+	return strcmp(client->clientID, (char*)b) == 0;
+}
+
+
+/**
+ * List callback function for comparing clients by socket
+ * @param a first integer value
+ * @param b second integer value
+ * @return boolean indicating whether a and b are equal
+ */
+int clientSocketCompare(void* a, void* b)
+{
+	Clients* client = (Clients*)a;
+	/*printf("comparing %d with %d\n", (char*)a, (char*)b); */
+	return client->net.socket == *(int*)b;
+}
diff --git a/mqtt/src/src/Clients.h b/mqtt/src/src/Clients.h
new file mode 100644
index 00000000..d5b2a4b9
--- /dev/null
+++ b/mqtt/src/src/Clients.h
@@ -0,0 +1,154 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - add SSL support
+ *    Ian Craggs - fix for bug 413429 - connectionLost not called
+ *    Ian Craggs - change will payload to binary
+ *    Ian Craggs - password to binary
+ *    Ian Craggs - MQTT 5 support
+ *******************************************************************************/
+
+#if !defined(CLIENTS_H)
+#define CLIENTS_H
+
+#include <time.h>
+#if defined(OPENSSL)
+#if defined(WIN32) || defined(WIN64)
+#include <winsock2.h>
+#endif
+#include <openssl/ssl.h>
+#endif
+#include "MQTTClient.h"
+#include "LinkedList.h"
+#include "MQTTClientPersistence.h"
+
+
+/**
+ * Stored publication data to minimize copying
+ */
+typedef struct
+{
+	char *topic;
+	int topiclen;
+	char* payload;
+	int payloadlen;
+	int refcount;
+} Publications;
+
+/**
+ * Client publication message data
+ */
+typedef struct
+{
+	int qos;
+	int retain;
+	int msgid;
+	int MQTTVersion;
+	MQTTProperties properties;
+	Publications *publish;
+	time_t lastTouch;		/**> used for retry and expiry */
+	char nextMessageType;	/**> PUBREC, PUBREL, PUBCOMP */
+	int len;				/**> length of the whole structure+data */
+} Messages;
+
+/**
+ * Client will message data
+ */
+typedef struct
+{
+	char *topic;
+	int payloadlen;
+	void *payload;
+	int retained;
+	int qos;
+} willMessages;
+
+typedef struct
+{
+	int socket;
+	time_t lastSent;
+	time_t lastReceived;
+	time_t lastPing;
+#if defined(OPENSSL)
+	SSL* ssl;
+	SSL_CTX* ctx;
+#endif
+	int websocket; /**< socket has been upgraded to use web sockets */
+	char *websocket_key;
+} networkHandles;
+
+
+/* connection states */
+/** no connection in progress, see connected value */
+#define NOT_IN_PROGRESS  0x0
+/** TCP connection in progress */
+#define TCP_IN_PROGRESS  0x1
+/** SSL connection in progress */
+#define SSL_IN_PROGRESS  0x2
+/** Websocket connection in progress */
+#define WEBSOCKET_IN_PROGRESS   0x3
+/** TCP completed, waiting for MQTT ACK */
+#define WAIT_FOR_CONNACK 0x4
+/** Disconnecting */
+#define DISCONNECTING    -2
+
+/**
+ * Data related to one client
+ */
+typedef struct
+{
+	char* clientID;					      /**< the string id of the client */
+	const char* username;					/**< MQTT v3.1 user name */
+	int passwordlen;              /**< MQTT password length */
+	const void* password;					/**< MQTT v3.1 binary password */
+	unsigned int cleansession : 1;	/**< MQTT V3 clean session flag */
+	unsigned int cleanstart : 1;		/**< MQTT V5 clean start flag */
+	unsigned int connected : 1;		/**< whether it is currently connected */
+	unsigned int good : 1; 			  /**< if we have an error on the socket we turn this off */
+	unsigned int ping_outstanding : 1;
+	signed int connect_state : 4;
+	networkHandles net;
+	int msgID;
+	int keepAliveInterval;
+	int retryInterval;
+	int maxInflightMessages;
+	willMessages* will;
+	List* inboundMsgs;
+	List* outboundMsgs;				/**< in flight */
+	List* messageQueue;
+	unsigned int qentry_seqno;
+	void* phandle;  /* the persistence handle */
+	MQTTClient_persistence* persistence; /* a persistence implementation */
+	void* context; /* calling context - used when calling disconnect_internal */
+	int MQTTVersion;
+	int sessionExpiry; /**< MQTT 5 session expiry */
+#if defined(OPENSSL)
+	MQTTClient_SSLOptions *sslopts;
+	SSL_SESSION* session;    /***< SSL session pointer for fast handhake */
+#endif
+} Clients;
+
+int clientIDCompare(void* a, void* b);
+int clientSocketCompare(void* a, void* b);
+
+/**
+ * Configuration data related to all clients
+ */
+typedef struct
+{
+	const char* version;
+	List* clients;
+} ClientStates;
+
+#endif
diff --git a/mqtt/src/src/Heap.c b/mqtt/src/src/Heap.c
new file mode 100644
index 00000000..856aa7ef
--- /dev/null
+++ b/mqtt/src/src/Heap.c
@@ -0,0 +1,512 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - use tree data structure instead of list
+ *    Ian Craggs - change roundup to Heap_roundup to avoid macro name clash on MacOSX
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief functions to manage the heap with the goal of eliminating memory leaks
+ *
+ * For any module to use these functions transparently, simply include the Heap.h
+ * header file.  Malloc and free will be redefined, but will behave in exactly the same
+ * way as normal, so no recoding is necessary.
+ *
+ * */
+
+#include "Tree.h"
+#include "Log.h"
+#include "StackTrace.h"
+#include "Thread.h"
+
+#if defined(HEAP_UNIT_TESTS)
+char* Broker_recordFFDC(char* symptoms);
+#endif /* HEAP_UNIT_TESTS */
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stddef.h>
+
+#include "Heap.h"
+
+#undef malloc
+#undef realloc
+#undef free
+
+#if defined(WIN32) || defined(WIN64)
+mutex_type heap_mutex;
+#else
+static pthread_mutex_t heap_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+static mutex_type heap_mutex = &heap_mutex_store;
+#endif
+
+static heap_info state = {0, 0}; /**< global heap state information */
+static int eyecatcher = 0x88888888;
+
+/*#define HEAP_STACK 1 */
+
+/**
+ * Each item on the heap is recorded with this structure.
+ */
+typedef struct
+{
+	char* file;		/**< the name of the source file where the storage was allocated */
+	int line;		/**< the line no in the source file where it was allocated */
+	void* ptr;		/**< pointer to the allocated storage */
+	size_t size;    /**< size of the allocated storage */
+#if defined(HEAP_STACK)
+	char* stack;
+#endif
+} storageElement;
+
+static Tree heap;	/**< Tree that holds the allocation records */
+static const char *errmsg = "Memory allocation error";
+
+
+static size_t Heap_roundup(size_t size);
+static int ptrCompare(void* a, void* b, int value);
+/*static void Heap_check(char* string, void* ptr);*/
+static void checkEyecatchers(char* file, int line, void* p, size_t size);
+static int Internal_heap_unlink(char* file, int line, void* p);
+static void HeapScan(enum LOG_LEVELS log_level);
+
+
+/**
+ * Round allocation size up to a multiple of the size of an int.  Apart from possibly reducing fragmentation,
+ * on the old v3 gcc compilers I was hitting some weird behaviour, which might have been errors in
+ * sizeof() used on structures and related to packing.  In any case, this fixes that too.
+ * @param size the size actually needed
+ * @return the rounded up size
+ */
+static size_t Heap_roundup(size_t size)
+{
+	static int multsize = 4*sizeof(int);
+
+	if (size % multsize != 0)
+		size += multsize - (size % multsize);
+	return size;
+}
+
+
+/**
+ * List callback function for comparing storage elements
+ * @param a pointer to the current content in the tree (storageElement*)
+ * @param b pointer to the memory to free
+ * @return boolean indicating whether a and b are equal
+ */
+static int ptrCompare(void* a, void* b, int value)
+{
+	a = ((storageElement*)a)->ptr;
+	if (value)
+		b = ((storageElement*)b)->ptr;
+
+	return (a > b) ? -1 : (a == b) ? 0 : 1;
+}
+
+/*
+static void Heap_check(char* string, void* ptr)
+{
+	Node* curnode = NULL;
+	storageElement* prev, *s = NULL;
+
+	printf("Heap_check start %p\n", ptr);
+	while ((curnode = TreeNextElement(&heap, curnode)) != NULL)
+	{
+		prev = s;
+		s = (storageElement*)(curnode->content);
+
+		if (prev)
+		{
+		if (ptrCompare(s, prev, 1) != -1)
+		{
+			printf("%s: heap order error %d %p %p\n", string, ptrCompare(s, prev, 1), prev->ptr, s->ptr);
+			exit(99);
+		}
+		else
+			printf("%s: heap order good %d %p %p\n", string, ptrCompare(s, prev, 1), prev->ptr, s->ptr);
+		}
+	}
+}*/
+
+
+/**
+ * Allocates a block of memory.  A direct replacement for malloc, but keeps track of items
+ * allocated in a list, so that free can check that a item is being freed correctly and that
+ * we can check that all memory is freed at shutdown.
+ * @param file use the __FILE__ macro to indicate which file this item was allocated in
+ * @param line use the __LINE__ macro to indicate which line this item was allocated at
+ * @param size the size of the item to be allocated
+ * @return pointer to the allocated item, or NULL if there was an error
+ */
+void* mymalloc(char* file, int line, size_t size)
+{
+	storageElement* s = NULL;
+	size_t space = sizeof(storageElement);
+	size_t filenamelen = strlen(file)+1;
+
+	Thread_lock_mutex(heap_mutex);
+	size = Heap_roundup(size);
+	if ((s = malloc(sizeof(storageElement))) == NULL)
+	{
+		Log(LOG_ERROR, 13, errmsg);
+		return NULL;
+	}
+	s->size = size; /* size without eyecatchers */
+	if ((s->file = malloc(filenamelen)) == NULL)
+	{
+		Log(LOG_ERROR, 13, errmsg);
+		free(s);
+		return NULL;
+	}
+	space += filenamelen;
+	strcpy(s->file, file);
+#if defined(HEAP_STACK)
+#define STACK_LEN 300
+	if ((s->stack = malloc(STACK_LEN)) == NULL)
+	{
+		Log(LOG_ERROR, 13, errmsg);
+		free(s->file);
+		free(s);
+		return NULL;
+	}
+	StackTrace_get(Thread_getid(), s->stack, STACK_LEN);
+#endif
+	s->line = line;
+	/* Add space for eyecatcher at each end */
+	if ((s->ptr = malloc(size + 2*sizeof(int))) == NULL)
+	{
+		Log(LOG_ERROR, 13, errmsg);
+		free(s->file);
+		free(s);
+		return NULL;
+	}
+	space += size + 2*sizeof(int);
+	*(int*)(s->ptr) = eyecatcher; /* start eyecatcher */
+	*(int*)(((char*)(s->ptr)) + (sizeof(int) + size)) = eyecatcher; /* end eyecatcher */
+	Log(TRACE_MAX, -1, "Allocating %d bytes in heap at file %s line %d ptr %p\n", (int)size, file, line, s->ptr);
+	TreeAdd(&heap, s, space);
+	state.current_size += size;
+	if (state.current_size > state.max_size)
+		state.max_size = state.current_size;
+	Thread_unlock_mutex(heap_mutex);
+	return ((int*)(s->ptr)) + 1;	/* skip start eyecatcher */
+}
+
+
+static void checkEyecatchers(char* file, int line, void* p, size_t size)
+{
+	int *sp = (int*)p;
+	char *cp = (char*)p;
+	int us;
+	static const char *msg = "Invalid %s eyecatcher %d in heap item at file %s line %d";
+
+	if ((us = *--sp) != eyecatcher)
+		Log(LOG_ERROR, 13, msg, "start", us, file, line);
+
+	cp += size;
+	if ((us = *(int*)cp) != eyecatcher)
+		Log(LOG_ERROR, 13, msg, "end", us, file, line);
+}
+
+
+/**
+ * Remove an item from the recorded heap without actually freeing it.
+ * Use sparingly!
+ * @param file use the __FILE__ macro to indicate which file this item was allocated in
+ * @param line use the __LINE__ macro to indicate which line this item was allocated at
+ * @param p pointer to the item to be removed
+ */
+static int Internal_heap_unlink(char* file, int line, void* p)
+{
+	Node* e = NULL;
+	int rc = 0;
+
+	e = TreeFind(&heap, ((int*)p)-1);
+	if (e == NULL)
+		Log(LOG_ERROR, 13, "Failed to remove heap item at file %s line %d", file, line);
+	else
+	{
+		storageElement* s = (storageElement*)(e->content);
+		Log(TRACE_MAX, -1, "Freeing %d bytes in heap at file %s line %d, heap use now %d bytes\n",
+											 (int)s->size, file, line, (int)state.current_size);
+		checkEyecatchers(file, line, p, s->size);
+		/* free(s->ptr); */
+		free(s->file);
+		state.current_size -= s->size;
+		TreeRemoveNodeIndex(&heap, e, 0);
+		free(s);
+		rc = 1;
+	}
+	return rc;
+}
+
+
+/**
+ * Frees a block of memory.  A direct replacement for free, but checks that a item is in
+ * the allocates list first.
+ * @param file use the __FILE__ macro to indicate which file this item was allocated in
+ * @param line use the __LINE__ macro to indicate which line this item was allocated at
+ * @param p pointer to the item to be freed
+ */
+void myfree(char* file, int line, void* p)
+{
+	if (p) /* it is legal und usual to call free(NULL) */
+	{
+		Thread_lock_mutex(heap_mutex);
+		if (Internal_heap_unlink(file, line, p))
+			free(((int*)p)-1);
+		Thread_unlock_mutex(heap_mutex);
+	}
+	else
+	{
+		Log(LOG_ERROR, -1, "Call of free(NULL) in %s,%d",file,line);
+	}
+}
+
+
+/**
+ * Remove an item from the recorded heap without actually freeing it.
+ * Use sparingly!
+ * @param file use the __FILE__ macro to indicate which file this item was allocated in
+ * @param line use the __LINE__ macro to indicate which line this item was allocated at
+ * @param p pointer to the item to be removed
+ */
+void Heap_unlink(char* file, int line, void* p)
+{
+	Thread_lock_mutex(heap_mutex);
+	Internal_heap_unlink(file, line, p);
+	Thread_unlock_mutex(heap_mutex);
+}
+
+
+/**
+ * Reallocates a block of memory.  A direct replacement for realloc, but keeps track of items
+ * allocated in a list, so that free can check that a item is being freed correctly and that
+ * we can check that all memory is freed at shutdown.
+ * We have to remove the item from the tree, as the memory is in order and so it needs to
+ * be reinserted in the correct place.
+ * @param file use the __FILE__ macro to indicate which file this item was reallocated in
+ * @param line use the __LINE__ macro to indicate which line this item was reallocated at
+ * @param p pointer to the item to be reallocated
+ * @param size the new size of the item
+ * @return pointer to the allocated item, or NULL if there was an error
+ */
+void *myrealloc(char* file, int line, void* p, size_t size)
+{
+	void* rc = NULL;
+	storageElement* s = NULL;
+
+	Thread_lock_mutex(heap_mutex);
+	s = TreeRemoveKey(&heap, ((int*)p)-1);
+	if (s == NULL)
+		Log(LOG_ERROR, 13, "Failed to reallocate heap item at file %s line %d", file, line);
+	else
+	{
+		size_t space = sizeof(storageElement);
+		size_t filenamelen = strlen(file)+1;
+
+		checkEyecatchers(file, line, p, s->size);
+		size = Heap_roundup(size);
+		state.current_size += size - s->size;
+		if (state.current_size > state.max_size)
+			state.max_size = state.current_size;
+		if ((s->ptr = realloc(s->ptr, size + 2*sizeof(int))) == NULL)
+		{
+			Log(LOG_ERROR, 13, errmsg);
+			return NULL;
+		}
+		space += size + 2*sizeof(int) - s->size;
+		*(int*)(s->ptr) = eyecatcher; /* start eyecatcher */
+		*(int*)(((char*)(s->ptr)) + (sizeof(int) + size)) = eyecatcher; /* end eyecatcher */
+		s->size = size;
+		space -= strlen(s->file);
+		s->file = realloc(s->file, filenamelen);
+		space += filenamelen;
+		strcpy(s->file, file);
+		s->line = line;
+		rc = s->ptr;
+		TreeAdd(&heap, s, space);
+	}
+	Thread_unlock_mutex(heap_mutex);
+	return (rc == NULL) ? NULL : ((int*)(rc)) + 1;	/* skip start eyecatcher */
+}
+
+
+/**
+ * Utility to find an item in the heap.  Lets you know if the heap already contains
+ * the memory location in question.
+ * @param p pointer to a memory location
+ * @return pointer to the storage element if found, or NULL
+ */
+void* Heap_findItem(void* p)
+{
+	Node* e = NULL;
+
+	Thread_lock_mutex(heap_mutex);
+	e = TreeFind(&heap, ((int*)p)-1);
+	Thread_unlock_mutex(heap_mutex);
+	return (e == NULL) ? NULL : e->content;
+}
+
+
+/**
+ * Scans the heap and reports any items currently allocated.
+ * To be used at shutdown if any heap items have not been freed.
+ */
+static void HeapScan(enum LOG_LEVELS log_level)
+{
+	Node* current = NULL;
+
+	Thread_lock_mutex(heap_mutex);
+	Log(log_level, -1, "Heap scan start, total %d bytes", (int)state.current_size);
+	while ((current = TreeNextElement(&heap, current)) != NULL)
+	{
+		storageElement* s = (storageElement*)(current->content);
+		Log(log_level, -1, "Heap element size %d, line %d, file %s, ptr %p", (int)s->size, s->line, s->file, s->ptr);
+		Log(log_level, -1, "  Content %.*s", (10 > current->size) ? (int)s->size : 10, (char*)(((int*)s->ptr) + 1));
+#if defined(HEAP_STACK)
+		Log(log_level, -1, "  Stack:\n%s", s->stack);
+#endif
+	}
+	Log(log_level, -1, "Heap scan end");
+	Thread_unlock_mutex(heap_mutex);
+}
+
+
+/**
+ * Heap initialization.
+ */
+int Heap_initialize(void)
+{
+	TreeInitializeNoMalloc(&heap, ptrCompare);
+	heap.heap_tracking = 0; /* no recursive heap tracking! */
+	return 0;
+}
+
+
+/**
+ * Heap termination.
+ */
+void Heap_terminate(void)
+{
+	Log(TRACE_MIN, -1, "Maximum heap use was %d bytes", (int)state.max_size);
+	if (state.current_size > 20) /* One log list is freed after this function is called */
+	{
+		Log(LOG_ERROR, -1, "Some memory not freed at shutdown, possible memory leak");
+		HeapScan(LOG_ERROR);
+	}
+}
+
+
+/**
+ * Access to heap state
+ * @return pointer to the heap state structure
+ */
+heap_info* Heap_get_info(void)
+{
+	return &state;
+}
+
+
+/**
+ * Dump a string from the heap so that it can be displayed conveniently
+ * @param file file handle to dump the heap contents to
+ * @param str the string to dump, could be NULL
+ */
+int HeapDumpString(FILE* file, char* str)
+{
+	int rc = 0;
+	size_t len = str ? strlen(str) + 1 : 0; /* include the trailing null */
+
+	if (fwrite(&(str), sizeof(char*), 1, file) != 1)
+		rc = -1;
+	else if (fwrite(&(len), sizeof(int), 1 ,file) != 1)
+		rc = -1;
+	else if (len > 0 && fwrite(str, len, 1, file) != 1)
+		rc = -1;
+	return rc;
+}
+
+
+/**
+ * Dump the state of the heap
+ * @param file file handle to dump the heap contents to
+ */
+int HeapDump(FILE* file)
+{
+	int rc = 0;
+	Node* current = NULL;
+
+	while (rc == 0 && (current = TreeNextElement(&heap, current)))
+	{
+		storageElement* s = (storageElement*)(current->content);
+
+		if (fwrite(&(s->ptr), sizeof(s->ptr), 1, file) != 1)
+			rc = -1;
+		else if (fwrite(&(current->size), sizeof(current->size), 1, file) != 1)
+			rc = -1;
+		else if (fwrite(s->ptr, current->size, 1, file) != 1)
+			rc = -1;
+	}
+	return rc;
+}
+
+
+#if defined(HEAP_UNIT_TESTS)
+
+void Log(enum LOG_LEVELS log_level, int msgno, char* format, ...)
+{
+	printf("Log %s", format);
+}
+
+char* Broker_recordFFDC(char* symptoms)
+{
+	printf("recordFFDC");
+	return "";
+}
+
+#define malloc(x) mymalloc(__FILE__, __LINE__, x)
+#define realloc(a, b) myrealloc(__FILE__, __LINE__, a, b)
+#define free(x) myfree(__FILE__, __LINE__, x)
+
+int main(int argc, char *argv[])
+{
+	char* h = NULL;
+	Heap_initialize();
+
+	h = malloc(12);
+	free(h);
+	printf("freed h\n");
+
+	h = malloc(12);
+	h = realloc(h, 14);
+	h = realloc(h, 25);
+	h = realloc(h, 255);
+	h = realloc(h, 2225);
+	h = realloc(h, 22225);
+    printf("freeing h\n");
+	free(h);
+	Heap_terminate();
+	printf("Finishing\n");
+	return 0;
+}
+
+#endif /* HEAP_UNIT_TESTS */
+
+/* Local Variables: */
+/* indent-tabs-mode: t */
+/* c-basic-offset: 8 */
+/* End: */
diff --git a/mqtt/src/src/Heap.h b/mqtt/src/src/Heap.h
new file mode 100644
index 00000000..6d24c04f
--- /dev/null
+++ b/mqtt/src/src/Heap.h
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2013 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - use tree data structure instead of list
+ *******************************************************************************/
+
+
+#if !defined(HEAP_H)
+#define HEAP_H
+
+#if defined(HIGH_PERFORMANCE)
+#define NO_HEAP_TRACKING 1
+#endif
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#if !defined(NO_HEAP_TRACKING)
+/**
+ * redefines malloc to use "mymalloc" so that heap allocation can be tracked
+ * @param x the size of the item to be allocated
+ * @return the pointer to the item allocated, or NULL
+ */
+#define malloc(x) mymalloc(__FILE__, __LINE__, x)
+
+/**
+ * redefines realloc to use "myrealloc" so that heap allocation can be tracked
+ * @param a the heap item to be reallocated
+ * @param b the new size of the item
+ * @return the new pointer to the heap item
+ */
+#define realloc(a, b) myrealloc(__FILE__, __LINE__, a, b)
+
+/**
+ * redefines free to use "myfree" so that heap allocation can be tracked
+ * @param x the size of the item to be freed
+ */
+#define free(x) myfree(__FILE__, __LINE__, x)
+
+#endif
+
+/**
+ * Information about the state of the heap.
+ */
+typedef struct
+{
+	size_t current_size;	/**< current size of the heap in bytes */
+	size_t max_size;		/**< max size the heap has reached in bytes */
+} heap_info;
+
+#if defined(__cplusplus)
+ extern "C" {
+#endif
+
+void* mymalloc(char*, int, size_t size);
+void* myrealloc(char*, int, void* p, size_t size);
+void myfree(char*, int, void* p);
+
+void Heap_scan(FILE* file);
+int Heap_initialize(void);
+void Heap_terminate(void);
+heap_info* Heap_get_info(void);
+int HeapDump(FILE* file);
+int HeapDumpString(FILE* file, char* str);
+void* Heap_findItem(void* p);
+void Heap_unlink(char* file, int line, void* p);
+#ifdef __cplusplus
+     }
+#endif
+
+#endif
diff --git a/mqtt/src/src/LinkedList.c b/mqtt/src/src/LinkedList.c
new file mode 100644
index 00000000..20f95149
--- /dev/null
+++ b/mqtt/src/src/LinkedList.c
@@ -0,0 +1,506 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2013 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - updates for the async client
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief functions which apply to linked list structures.
+ *
+ * These linked lists can hold data of any sort, pointed to by the content pointer of the
+ * ListElement structure.  ListElements hold the points to the next and previous items in the
+ * list.
+ * */
+
+#include "LinkedList.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "Heap.h"
+
+
+static int ListUnlink(List* aList, void* content, int(*callback)(void*, void*), int freeContent);
+
+
+/**
+ * Sets a list structure to empty - all null values.  Does not remove any items from the list.
+ * @param newl a pointer to the list structure to be initialized
+ */
+void ListZero(List* newl)
+{
+	memset(newl, '\0', sizeof(List));
+	/*newl->first = NULL;
+	newl->last = NULL;
+	newl->current = NULL;
+	newl->count = newl->size = 0;*/
+}
+
+
+/**
+ * Allocates and initializes a new list structure.
+ * @return a pointer to the new list structure
+ */
+List* ListInitialize(void)
+{
+	List* newl = malloc(sizeof(List));
+	ListZero(newl);
+	return newl;
+}
+
+
+/**
+ * Append an already allocated ListElement and content to a list.  Can be used to move
+ * an item from one list to another.
+ * @param aList the list to which the item is to be added
+ * @param content the list item content itself
+ * @param newel the ListElement to be used in adding the new item
+ * @param size the size of the element
+ */
+void ListAppendNoMalloc(List* aList, void* content, ListElement* newel, size_t size)
+{ /* for heap use */
+	newel->content = content;
+	newel->next = NULL;
+	newel->prev = aList->last;
+	if (aList->first == NULL)
+		aList->first = newel;
+	else
+		aList->last->next = newel;
+	aList->last = newel;
+	++(aList->count);
+	aList->size += size;
+}
+
+
+/**
+ * Append an item to a list.
+ * @param aList the list to which the item is to be added
+ * @param content the list item content itself
+ * @param size the size of the element
+ */
+void ListAppend(List* aList, void* content, size_t size)
+{
+	ListElement* newel = malloc(sizeof(ListElement));
+	ListAppendNoMalloc(aList, content, newel, size);
+}
+
+
+/**
+ * Insert an item to a list at a specific position.
+ * @param aList the list to which the item is to be added
+ * @param content the list item content itself
+ * @param size the size of the element
+ * @param index the position in the list. If NULL, this function is equivalent
+ * to ListAppend.
+ */
+void ListInsert(List* aList, void* content, size_t size, ListElement* index)
+{
+	ListElement* newel = malloc(sizeof(ListElement));
+
+	if ( index == NULL )
+		ListAppendNoMalloc(aList, content, newel, size);
+	else
+	{
+		newel->content = content;
+		newel->next = index;
+		newel->prev = index->prev;
+
+		index->prev = newel;
+		if ( newel->prev != NULL )
+			newel->prev->next = newel;
+		else
+			aList->first = newel;
+
+		++(aList->count);
+		aList->size += size;
+	}
+}
+
+
+/**
+ * Finds an element in a list by comparing the content pointers, rather than the contents
+ * @param aList the list in which the search is to be conducted
+ * @param content pointer to the list item content itself
+ * @return the list item found, or NULL
+ */
+ListElement* ListFind(List* aList, void* content)
+{
+	return ListFindItem(aList, content, NULL);
+}
+
+
+/**
+ * Finds an element in a list by comparing the content or pointer to the content.  A callback
+ * function is used to define the method of comparison for each element.
+ * @param aList the list in which the search is to be conducted
+ * @param content pointer to the content to look for
+ * @param callback pointer to a function which compares each element (NULL means compare by content pointer)
+ * @return the list element found, or NULL
+ */
+ListElement* ListFindItem(List* aList, void* content, int(*callback)(void*, void*))
+{
+	ListElement* rc = NULL;
+
+	if (aList->current != NULL && ((callback == NULL && aList->current->content == content) ||
+		   (callback != NULL && callback(aList->current->content, content))))
+		rc = aList->current;
+	else
+	{
+		ListElement* current = NULL;
+
+		/* find the content */
+		while (ListNextElement(aList, &current) != NULL)
+		{
+			if (callback == NULL)
+			{
+				if (current->content == content)
+				{
+					rc = current;
+					break;
+				}
+			}
+			else
+			{
+				if (callback(current->content, content))
+				{
+					rc = current;
+					break;
+				}
+			}
+		}
+		if (rc != NULL)
+			aList->current = rc;
+	}
+	return rc;
+}
+
+
+/**
+ * Removes and optionally frees an element in a list by comparing the content.
+ * A callback function is used to define the method of comparison for each element.
+ * @param aList the list in which the search is to be conducted
+ * @param content pointer to the content to look for
+ * @param callback pointer to a function which compares each element
+ * @param freeContent boolean value to indicate whether the item found is to be freed
+ * @return 1=item removed, 0=item not removed
+ */
+static int ListUnlink(List* aList, void* content, int(*callback)(void*, void*), int freeContent)
+{
+	ListElement* next = NULL;
+	ListElement* saved = aList->current;
+	int saveddeleted = 0;
+
+	if (!ListFindItem(aList, content, callback))
+		return 0; /* false, did not remove item */
+
+	if (aList->current->prev == NULL)
+		/* so this is the first element, and we have to update the "first" pointer */
+		aList->first = aList->current->next;
+	else
+		aList->current->prev->next = aList->current->next;
+
+	if (aList->current->next == NULL)
+		aList->last = aList->current->prev;
+	else
+		aList->current->next->prev = aList->current->prev;
+
+	next = aList->current->next;
+	if (freeContent)
+        {
+		free(aList->current->content);
+                aList->current->content = NULL;
+        }
+	if (saved == aList->current)
+		saveddeleted = 1;
+	free(aList->current);
+	if (saveddeleted)
+		aList->current = next;
+	else
+		aList->current = saved;
+	--(aList->count);
+	return 1; /* successfully removed item */
+}
+
+
+/**
+ * Removes but does not free an item in a list by comparing the pointer to the content.
+ * @param aList the list in which the search is to be conducted
+ * @param content pointer to the content to look for
+ * @return 1=item removed, 0=item not removed
+ */
+int ListDetach(List* aList, void* content)
+{
+	return ListUnlink(aList, content, NULL, 0);
+}
+
+
+/**
+ * Removes and frees an item in a list by comparing the pointer to the content.
+ * @param aList the list from which the item is to be removed
+ * @param content pointer to the content to look for
+ * @return 1=item removed, 0=item not removed
+ */
+int ListRemove(List* aList, void* content)
+{
+	return ListUnlink(aList, content, NULL, 1);
+}
+
+
+/**
+ * Removes and frees an the first item in a list.
+ * @param aList the list from which the item is to be removed
+ * @return 1=item removed, 0=item not removed
+ */
+void* ListDetachHead(List* aList)
+{
+	void *content = NULL;
+	if (aList->count > 0)
+	{
+		ListElement* first = aList->first;
+		if (aList->current == first)
+			aList->current = first->next;
+		if (aList->last == first) /* i.e. no of items in list == 1 */
+			aList->last = NULL;
+		content = first->content;
+		aList->first = aList->first->next;
+		if (aList->first)
+			aList->first->prev = NULL;
+		free(first);
+		--(aList->count);
+	}
+	return content;
+}
+
+
+/**
+ * Removes and frees an the first item in a list.
+ * @param aList the list from which the item is to be removed
+ * @return 1=item removed, 0=item not removed
+ */
+int ListRemoveHead(List* aList)
+{
+	free(ListDetachHead(aList));
+	return 0;
+}
+
+
+/**
+ * Removes but does not free the last item in a list.
+ * @param aList the list from which the item is to be removed
+ * @return the last item removed (or NULL if none was)
+ */
+void* ListPopTail(List* aList)
+{
+	void* content = NULL;
+	if (aList->count > 0)
+	{
+		ListElement* last = aList->last;
+		if (aList->current == last)
+			aList->current = last->prev;
+		if (aList->first == last) /* i.e. no of items in list == 1 */
+			aList->first = NULL;
+		content = last->content;
+		aList->last = aList->last->prev;
+		if (aList->last)
+			aList->last->next = NULL;
+		free(last);
+		--(aList->count);
+	}
+	return content;
+}
+
+
+/**
+ * Removes but does not free an element in a list by comparing the content.
+ * A callback function is used to define the method of comparison for each element.
+ * @param aList the list in which the search is to be conducted
+ * @param content pointer to the content to look for
+ * @param callback pointer to a function which compares each element
+ * @return 1=item removed, 0=item not removed
+ */
+int ListDetachItem(List* aList, void* content, int(*callback)(void*, void*))
+{ /* do not free the content */
+	return ListUnlink(aList, content, callback, 0);
+}
+
+
+/**
+ * Removes and frees an element in a list by comparing the content.
+ * A callback function is used to define the method of comparison for each element
+ * @param aList the list in which the search is to be conducted
+ * @param content pointer to the content to look for
+ * @param callback pointer to a function which compares each element
+ * @return 1=item removed, 0=item not removed
+ */
+int ListRemoveItem(List* aList, void* content, int(*callback)(void*, void*))
+{ /* remove from list and free the content */
+	return ListUnlink(aList, content, callback, 1);
+}
+
+
+/**
+ * Removes and frees all items in a list, leaving the list ready for new items.
+ * @param aList the list to which the operation is to be applied
+ */
+void ListEmpty(List* aList)
+{
+	while (aList->first != NULL)
+	{
+		ListElement* first = aList->first;
+		if (first->content != NULL)
+                {
+			free(first->content);
+                        first->content = NULL;
+                }
+		aList->first = first->next;
+		free(first);
+	}
+	aList->count = 0;
+	aList->size = 0;
+	aList->current = aList->first = aList->last = NULL;
+}
+
+/**
+ * Removes and frees all items in a list, and frees the list itself
+ * @param aList the list to which the operation is to be applied
+ */
+void ListFree(List* aList)
+{
+	ListEmpty(aList);
+	free(aList);
+}
+
+
+/**
+ * Removes and but does not free all items in a list, and frees the list itself
+ * @param aList the list to which the operation is to be applied
+ */
+void ListFreeNoContent(List* aList)
+{
+	while (aList->first != NULL)
+	{
+		ListElement* first = aList->first;
+		aList->first = first->next;
+		free(first);
+	}
+	free(aList);
+}
+
+
+/**
+ * Forward iteration through a list
+ * @param aList the list to which the operation is to be applied
+ * @param pos pointer to the current position in the list.  NULL means start from the beginning of the list
+ * This is updated on return to the same value as that returned from this function
+ * @return pointer to the current list element
+ */
+ListElement* ListNextElement(List* aList, ListElement** pos)
+{
+	return *pos = (*pos == NULL) ? aList->first : (*pos)->next;
+}
+
+
+/**
+ * Backward iteration through a list
+ * @param aList the list to which the operation is to be applied
+ * @param pos pointer to the current position in the list.  NULL means start from the end of the list
+ * This is updated on return to the same value as that returned from this function
+ * @return pointer to the current list element
+ */
+ListElement* ListPrevElement(List* aList, ListElement** pos)
+{
+	return *pos = (*pos == NULL) ? aList->last : (*pos)->prev;
+}
+
+
+/**
+ * List callback function for comparing integers
+ * @param a first integer value
+ * @param b second integer value
+ * @return boolean indicating whether a and b are equal
+ */
+int intcompare(void* a, void* b)
+{
+	return *((int*)a) == *((int*)b);
+}
+
+
+/**
+ * List callback function for comparing C strings
+ * @param a first integer value
+ * @param b second integer value
+ * @return boolean indicating whether a and b are equal
+ */
+int stringcompare(void* a, void* b)
+{
+	return strcmp((char*)a, (char*)b) == 0;
+}
+
+
+#if defined(UNIT_TESTS)
+
+
+int main(int argc, char *argv[])
+{
+	int i, *ip, *todelete;
+	ListElement* current = NULL;
+	List* l = ListInitialize();
+	printf("List initialized\n");
+
+	for (i = 0; i < 10; i++)
+	{
+		ip = malloc(sizeof(int));
+		*ip = i;
+		ListAppend(l, (void*)ip, sizeof(int));
+		if (i==5)
+			todelete = ip;
+		printf("List element appended %d\n",  *((int*)(l->last->content)));
+	}
+
+	printf("List contents:\n");
+	current = NULL;
+	while (ListNextElement(l, &current) != NULL)
+		printf("List element: %d\n", *((int*)(current->content)));
+
+	printf("List contents in reverse order:\n");
+	current = NULL;
+	while (ListPrevElement(l, &current) != NULL)
+		printf("List element: %d\n", *((int*)(current->content)));
+
+	/* if ListFindItem(l, *ip, intcompare)->content */
+
+	printf("List contents having deleted element %d:\n", *todelete);
+	ListRemove(l, todelete);
+	current = NULL;
+	while (ListNextElement(l, &current) != NULL)
+		printf("List element: %d\n", *((int*)(current->content)));
+
+	i = 9;
+	ListRemoveItem(l, &i, intcompare);
+	printf("List contents having deleted another element, %d, size now %d:\n", i, l->size);
+	current = NULL;
+	while (ListNextElement(l, &current) != NULL)
+		printf("List element: %d\n", *((int*)(current->content)));
+
+	ListFree(l);
+	printf("List freed\n");
+}
+
+#endif
+
+
+
+
+
diff --git a/mqtt/src/src/LinkedList.h b/mqtt/src/src/LinkedList.h
new file mode 100644
index 00000000..102a4fd8
--- /dev/null
+++ b/mqtt/src/src/LinkedList.h
@@ -0,0 +1,105 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2013 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - updates for the async client
+ *    Ian Craggs - change size types from int to size_t
+ *******************************************************************************/
+
+#if !defined(LINKEDLIST_H)
+#define LINKEDLIST_H
+
+#include <stdlib.h> /* for size_t definition */
+
+/*BE
+defm defList(T)
+
+def T concat Item
+{
+	at 4
+	n32 ptr T concat Item suppress "next"
+	at 0
+	n32 ptr T concat Item suppress "prev"
+	at 8
+	n32 ptr T id2str(T)
+}
+
+def T concat List
+{
+	n32 ptr T concat Item suppress "first"
+	n32 ptr T concat Item suppress "last"
+	n32 ptr T concat Item suppress "current"
+	n32 dec "count"
+	n32 suppress "size"
+}
+endm
+
+defList(INT)
+defList(STRING)
+defList(TMP)
+
+BE*/
+
+/**
+ * Structure to hold all data for one list element
+ */
+typedef struct ListElementStruct
+{
+	struct ListElementStruct *prev, /**< pointer to previous list element */
+							*next;	/**< pointer to next list element */
+	void* content;					/**< pointer to element content */
+} ListElement;
+
+
+/**
+ * Structure to hold all data for one list
+ */
+typedef struct
+{
+	ListElement *first,	/**< first element in the list */
+				*last,	/**< last element in the list */
+				*current;	/**< current element in the list, for iteration */
+	int count;  /**< no of items */
+	size_t size;  /**< heap storage used */
+} List;
+
+void ListZero(List*);
+List* ListInitialize(void);
+
+void ListAppend(List* aList, void* content, size_t size);
+void ListAppendNoMalloc(List* aList, void* content, ListElement* newel, size_t size);
+void ListInsert(List* aList, void* content, size_t size, ListElement* index);
+
+int ListRemove(List* aList, void* content);
+int ListRemoveItem(List* aList, void* content, int(*callback)(void*, void*));
+void* ListDetachHead(List* aList);
+int ListRemoveHead(List* aList);
+void* ListPopTail(List* aList);
+
+int ListDetach(List* aList, void* content);
+int ListDetachItem(List* aList, void* content, int(*callback)(void*, void*));
+
+void ListFree(List* aList);
+void ListEmpty(List* aList);
+void ListFreeNoContent(List* aList);
+
+ListElement* ListNextElement(List* aList, ListElement** pos);
+ListElement* ListPrevElement(List* aList, ListElement** pos);
+
+ListElement* ListFind(List* aList, void* content);
+ListElement* ListFindItem(List* aList, void* content, int(*callback)(void*, void*));
+
+int intcompare(void* a, void* b);
+int stringcompare(void* a, void* b);
+
+#endif
diff --git a/mqtt/src/src/Log.c b/mqtt/src/src/Log.c
new file mode 100644
index 00000000..405870fb
--- /dev/null
+++ b/mqtt/src/src/Log.c
@@ -0,0 +1,564 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - updates for the async client
+ *    Ian Craggs - fix for bug #427028
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief Logging and tracing module
+ *
+ * 
+ */
+
+#include "Log.h"
+#include "MQTTPacket.h"
+#include "MQTTProtocol.h"
+#include "MQTTProtocolClient.h"
+#include "Messages.h"
+#include "LinkedList.h"
+#include "StackTrace.h"
+#include "Thread.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdarg.h>
+#include <time.h>
+#include <string.h>
+
+#if !defined(WIN32) && !defined(WIN64)
+#include <syslog.h>
+#include <sys/stat.h>
+#define GETTIMEOFDAY 1
+#else
+#define snprintf _snprintf
+#endif
+
+#if defined(GETTIMEOFDAY)
+	#include <sys/time.h>
+#else
+	#include <sys/timeb.h>
+#endif
+
+#if !defined(WIN32) && !defined(WIN64)
+/**
+ * _unlink mapping for linux
+ */
+#define _unlink unlink
+#endif
+
+
+#if !defined(min)
+#define min(A,B) ( (A) < (B) ? (A):(B))
+#endif
+
+trace_settings_type trace_settings =
+{
+	TRACE_MINIMUM,
+	400,
+	INVALID_LEVEL
+};
+
+#define MAX_FUNCTION_NAME_LENGTH 256
+
+typedef struct
+{
+#if defined(GETTIMEOFDAY)
+	struct timeval ts;
+#else
+	struct timeb ts;
+#endif
+	int sametime_count;
+	int number;
+	int thread_id;
+	int depth;
+	char name[MAX_FUNCTION_NAME_LENGTH + 1];
+	int line;
+	int has_rc;
+	int rc;
+	enum LOG_LEVELS level;
+} traceEntry;
+
+static int start_index = -1,
+			next_index = 0;
+static traceEntry* trace_queue = NULL;
+static int trace_queue_size = 0;
+
+static FILE* trace_destination = NULL;	/**< flag to indicate if trace is to be sent to a stream */
+static char* trace_destination_name = NULL; /**< the name of the trace file */
+static char* trace_destination_backup_name = NULL; /**< the name of the backup trace file */
+static int lines_written = 0; /**< number of lines written to the current output file */
+static int max_lines_per_file = 1000; /**< maximum number of lines to write to one trace file */
+static enum LOG_LEVELS trace_output_level = INVALID_LEVEL;
+static Log_traceCallback* trace_callback = NULL;
+static traceEntry* Log_pretrace(void);
+static char* Log_formatTraceEntry(traceEntry* cur_entry);
+static void Log_output(enum LOG_LEVELS log_level, const char *msg);
+static void Log_posttrace(enum LOG_LEVELS log_level, traceEntry* cur_entry);
+static void Log_trace(enum LOG_LEVELS log_level, const char *buf);
+#if 0
+static FILE* Log_destToFile(const char *dest);
+static int Log_compareEntries(const char *entry1, const char *entry2);
+#endif
+
+static int sametime_count = 0;
+#if defined(GETTIMEOFDAY)
+struct timeval ts, last_ts;
+#else
+struct timeb ts, last_ts;
+#endif
+static char msg_buf[512];
+
+#if defined(WIN32) || defined(WIN64)
+mutex_type log_mutex;
+#else
+static pthread_mutex_t log_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+static mutex_type log_mutex = &log_mutex_store;
+#endif
+
+
+int Log_initialize(Log_nameValue* info)
+{
+	int rc = -1;
+	char* envval = NULL;
+
+	if ((trace_queue = malloc(sizeof(traceEntry) * trace_settings.max_trace_entries)) == NULL)
+		return rc;
+	trace_queue_size = trace_settings.max_trace_entries;
+
+	if ((envval = getenv("MQTT_C_CLIENT_TRACE")) != NULL && strlen(envval) > 0)
+	{
+		if (strcmp(envval, "ON") == 0 || (trace_destination = fopen(envval, "w")) == NULL)
+			trace_destination = stdout;
+		else
+		{
+			trace_destination_name = malloc(strlen(envval) + 1);
+			strcpy(trace_destination_name, envval);
+			trace_destination_backup_name = malloc(strlen(envval) + 3);
+			sprintf(trace_destination_backup_name, "%s.0", trace_destination_name);
+		}
+	}
+	if ((envval = getenv("MQTT_C_CLIENT_TRACE_MAX_LINES")) != NULL && strlen(envval) > 0)
+	{
+		max_lines_per_file = atoi(envval);
+		if (max_lines_per_file <= 0)
+			max_lines_per_file = 1000;
+	}
+	if ((envval = getenv("MQTT_C_CLIENT_TRACE_LEVEL")) != NULL && strlen(envval) > 0)
+	{
+		if (strcmp(envval, "MAXIMUM") == 0 || strcmp(envval, "TRACE_MAXIMUM") == 0)
+			trace_settings.trace_level = TRACE_MAXIMUM;
+		else if (strcmp(envval, "MEDIUM") == 0 || strcmp(envval, "TRACE_MEDIUM") == 0)
+			trace_settings.trace_level = TRACE_MEDIUM;
+		else if (strcmp(envval, "MINIMUM") == 0 || strcmp(envval, "TRACE_MINIMUM") == 0)
+			trace_settings.trace_level = TRACE_MINIMUM;
+		else if (strcmp(envval, "PROTOCOL") == 0  || strcmp(envval, "TRACE_PROTOCOL") == 0)
+			trace_output_level = TRACE_PROTOCOL;
+		else if (strcmp(envval, "ERROR") == 0  || strcmp(envval, "TRACE_ERROR") == 0)
+			trace_output_level = LOG_ERROR;
+	}
+	Log_output(TRACE_MINIMUM, "=========================================================");
+	Log_output(TRACE_MINIMUM, "                   Trace Output");
+	if (info)
+	{
+		while (info->name)
+		{
+			snprintf(msg_buf, sizeof(msg_buf), "%s: %s", info->name, info->value);
+			Log_output(TRACE_MINIMUM, msg_buf);
+			info++;
+		}
+	}
+#if !defined(WIN32) && !defined(WIN64)
+	struct stat buf;
+	if (stat("/proc/version", &buf) != -1)
+	{
+		FILE* vfile;
+		
+		if ((vfile = fopen("/proc/version", "r")) != NULL)
+		{
+			int len;
+			
+			strcpy(msg_buf, "/proc/version: ");
+			len = strlen(msg_buf);
+			if (fgets(&msg_buf[len], sizeof(msg_buf) - len, vfile))
+				Log_output(TRACE_MINIMUM, msg_buf);
+			fclose(vfile);
+		}
+	}
+#endif
+	Log_output(TRACE_MINIMUM, "=========================================================");
+		
+	return rc;
+}
+
+
+void Log_setTraceCallback(Log_traceCallback* callback)
+{
+	trace_callback = callback;
+}
+
+
+void Log_setTraceLevel(enum LOG_LEVELS level)
+{
+	if (level < TRACE_MINIMUM) /* the lowest we can go is TRACE_MINIMUM*/
+		trace_settings.trace_level = level;
+	trace_output_level = level;
+}
+
+
+void Log_terminate(void)
+{
+	free(trace_queue);
+	trace_queue = NULL;
+	trace_queue_size = 0;
+	if (trace_destination)
+	{
+		if (trace_destination != stdout)
+			fclose(trace_destination);
+		trace_destination = NULL;
+	}
+	if (trace_destination_name) {
+		free(trace_destination_name);
+		trace_destination_name = NULL;
+	}
+	if (trace_destination_backup_name) {
+		free(trace_destination_backup_name);
+		trace_destination_backup_name = NULL;
+	}
+	start_index = -1;
+	next_index = 0;
+	trace_output_level = INVALID_LEVEL;
+	sametime_count = 0;
+}
+
+
+static traceEntry* Log_pretrace(void)
+{
+	traceEntry *cur_entry = NULL;
+
+	/* calling ftime/gettimeofday seems to be comparatively expensive, so we need to limit its use */
+	if (++sametime_count % 20 == 0)
+	{
+#if defined(GETTIMEOFDAY)
+		gettimeofday(&ts, NULL);
+		if (ts.tv_sec != last_ts.tv_sec || ts.tv_usec != last_ts.tv_usec)
+#else
+		ftime(&ts);
+		if (ts.time != last_ts.time || ts.millitm != last_ts.millitm)
+#endif
+		{
+			sametime_count = 0;
+			last_ts = ts;
+		}
+	}
+
+	if (trace_queue_size != trace_settings.max_trace_entries)
+	{
+		traceEntry* new_trace_queue = malloc(sizeof(traceEntry) * trace_settings.max_trace_entries);
+
+		memcpy(new_trace_queue, trace_queue, min(trace_queue_size, trace_settings.max_trace_entries) * sizeof(traceEntry));
+		free(trace_queue);
+		trace_queue = new_trace_queue;
+		trace_queue_size = trace_settings.max_trace_entries;
+
+		if (start_index > trace_settings.max_trace_entries + 1 ||
+				next_index > trace_settings.max_trace_entries + 1)
+		{
+			start_index = -1;
+			next_index = 0;
+		}
+	}
+
+	/* add to trace buffer */
+	cur_entry = &trace_queue[next_index];
+	if (next_index == start_index) /* means the buffer is full */
+	{
+		if (++start_index == trace_settings.max_trace_entries)
+			start_index = 0;
+	} else if (start_index == -1)
+		start_index = 0;
+	if (++next_index == trace_settings.max_trace_entries)
+		next_index = 0;
+
+	return cur_entry;
+}
+
+static char* Log_formatTraceEntry(traceEntry* cur_entry)
+{
+	struct tm *timeinfo;
+	int buf_pos = 31;
+
+#if defined(GETTIMEOFDAY)
+	timeinfo = localtime((time_t *)&cur_entry->ts.tv_sec);
+#else
+	timeinfo = localtime(&cur_entry->ts.time);
+#endif
+	strftime(&msg_buf[7], 80, "%Y%m%d %H%M%S ", timeinfo);
+#if defined(GETTIMEOFDAY)
+	sprintf(&msg_buf[22], ".%.3lu ", cur_entry->ts.tv_usec / 1000L);
+#else
+	sprintf(&msg_buf[22], ".%.3hu ", cur_entry->ts.millitm);
+#endif
+	buf_pos = 27;
+
+	sprintf(msg_buf, "(%.4d)", cur_entry->sametime_count);
+	msg_buf[6] = ' ';
+
+	if (cur_entry->has_rc == 2)
+		strncpy(&msg_buf[buf_pos], cur_entry->name, sizeof(msg_buf)-buf_pos);
+	else
+	{
+		const char *format = Messages_get(cur_entry->number, cur_entry->level);
+		if (cur_entry->has_rc == 1)
+			snprintf(&msg_buf[buf_pos], sizeof(msg_buf)-buf_pos, format, cur_entry->thread_id,
+					cur_entry->depth, "", cur_entry->depth, cur_entry->name, cur_entry->line, cur_entry->rc);
+		else
+			snprintf(&msg_buf[buf_pos], sizeof(msg_buf)-buf_pos, format, cur_entry->thread_id,
+					cur_entry->depth, "", cur_entry->depth, cur_entry->name, cur_entry->line);
+	}
+	return msg_buf;
+}
+
+
+static void Log_output(enum LOG_LEVELS log_level, const char *msg)
+{
+	if (trace_destination)
+	{
+		fprintf(trace_destination, "%s\n", msg);
+
+		if (trace_destination != stdout && ++lines_written >= max_lines_per_file)
+		{	
+
+			fclose(trace_destination);		
+			_unlink(trace_destination_backup_name); /* remove any old backup trace file */
+			rename(trace_destination_name, trace_destination_backup_name); /* rename recently closed to backup */
+			trace_destination = fopen(trace_destination_name, "w"); /* open new trace file */
+			if (trace_destination == NULL)
+				trace_destination = stdout;
+			lines_written = 0;
+		}
+		else
+			fflush(trace_destination);
+	}
+		
+	if (trace_callback)
+		(*trace_callback)(log_level, msg);
+}
+
+
+static void Log_posttrace(enum LOG_LEVELS log_level, traceEntry* cur_entry)
+{
+	if (((trace_output_level == -1) ? log_level >= trace_settings.trace_level : log_level >= trace_output_level))
+	{
+		char* msg = NULL;
+		
+		if (trace_destination || trace_callback)
+			msg = &Log_formatTraceEntry(cur_entry)[7];
+		
+		Log_output(log_level, msg);
+	}
+}
+
+
+static void Log_trace(enum LOG_LEVELS log_level, const char *buf)
+{
+	traceEntry *cur_entry = NULL;
+
+	if (trace_queue == NULL)
+		return;
+
+	cur_entry = Log_pretrace();
+
+	memcpy(&(cur_entry->ts), &ts, sizeof(ts));
+	cur_entry->sametime_count = sametime_count;
+
+	cur_entry->has_rc = 2;
+	strncpy(cur_entry->name, buf, sizeof(cur_entry->name));
+	cur_entry->name[MAX_FUNCTION_NAME_LENGTH] = '\0';
+
+	Log_posttrace(log_level, cur_entry);
+}
+
+
+/**
+ * Log a message.  If possible, all messages should be indexed by message number, and
+ * the use of the format string should be minimized or negated altogether.  If format is
+ * provided, the message number is only used as a message label.
+ * @param log_level the log level of the message
+ * @param msgno the id of the message to use if the format string is NULL
+ * @param aFormat the printf format string to be used if the message id does not exist
+ * @param ... the printf inserts
+ */
+void Log(enum LOG_LEVELS log_level, int msgno, const char *format, ...)
+{
+	if (log_level >= trace_settings.trace_level)
+	{
+		const char *temp = NULL;
+		va_list args;
+
+		/* we're using a static character buffer, so we need to make sure only one thread uses it at a time */
+		Thread_lock_mutex(log_mutex); 
+		if (format == NULL && (temp = Messages_get(msgno, log_level)) != NULL)
+			format = temp;
+
+		va_start(args, format);
+		vsnprintf(msg_buf, sizeof(msg_buf), format, args);
+
+		Log_trace(log_level, msg_buf);
+		va_end(args);
+		Thread_unlock_mutex(log_mutex); 
+	}
+}
+
+
+/**
+ * The reason for this function is to make trace logging as fast as possible so that the
+ * function exit/entry history can be captured by default without unduly impacting
+ * performance.  Therefore it must do as little as possible.
+ * @param log_level the log level of the message
+ * @param msgno the id of the message to use if the format string is NULL
+ * @param aFormat the printf format string to be used if the message id does not exist
+ * @param ... the printf inserts
+ */
+void Log_stackTrace(enum LOG_LEVELS log_level, int msgno, int thread_id, int current_depth, const char* name, int line, int* rc)
+{
+	traceEntry *cur_entry = NULL;
+
+	if (trace_queue == NULL)
+		return;
+
+	if (log_level < trace_settings.trace_level)
+		return;
+
+	Thread_lock_mutex(log_mutex);
+	cur_entry = Log_pretrace();
+
+	memcpy(&(cur_entry->ts), &ts, sizeof(ts));
+	cur_entry->sametime_count = sametime_count;
+	cur_entry->number = msgno;
+	cur_entry->thread_id = thread_id;
+	cur_entry->depth = current_depth;
+	strcpy(cur_entry->name, name);
+	cur_entry->level = log_level;
+	cur_entry->line = line;
+	if (rc == NULL)
+		cur_entry->has_rc = 0;
+	else
+	{
+		cur_entry->has_rc = 1;
+		cur_entry->rc = *rc;
+	}
+
+	Log_posttrace(log_level, cur_entry);
+	Thread_unlock_mutex(log_mutex);
+}
+
+
+#if 0
+static FILE* Log_destToFile(const char *dest)
+{
+	FILE* file = NULL;
+
+	if (strcmp(dest, "stdout") == 0)
+		file = stdout;
+	else if (strcmp(dest, "stderr") == 0)
+		file = stderr;
+	else
+	{
+		if (strstr(dest, "FFDC"))
+			file = fopen(dest, "ab");
+		else
+			file = fopen(dest, "wb");
+	}
+	return file;
+}
+
+
+static int Log_compareEntries(const char *entry1, const char *entry2)
+{
+	int comp = strncmp(&entry1[7], &entry2[7], 19);
+
+	/* if timestamps are equal, use the sequence numbers */
+	if (comp == 0)
+		comp = strncmp(&entry1[1], &entry2[1], 4);
+
+	return comp;
+}
+
+
+/**
+ * Write the contents of the stored trace to a stream
+ * @param dest string which contains a file name or the special strings stdout or stderr
+ */
+int Log_dumpTrace(char* dest)
+{
+	FILE* file = NULL;
+	ListElement* cur_trace_entry = NULL;
+	const int msgstart = 7;
+	int rc = -1;
+	int trace_queue_index = 0;
+
+	if ((file = Log_destToFile(dest)) == NULL)
+	{
+		Log(LOG_ERROR, 9, NULL, "trace", dest, "trace entries");
+		goto exit;
+	}
+
+	fprintf(file, "=========== Start of trace dump ==========\n");
+	/* Interleave the log and trace entries together appropriately */
+	ListNextElement(trace_buffer, &cur_trace_entry);
+	trace_queue_index = start_index;
+	if (trace_queue_index == -1)
+		trace_queue_index = next_index;
+	else
+	{
+		Log_formatTraceEntry(&trace_queue[trace_queue_index++]);
+		if (trace_queue_index == trace_settings.max_trace_entries)
+			trace_queue_index = 0;
+	}
+	while (cur_trace_entry || trace_queue_index != next_index)
+	{
+		if (cur_trace_entry && trace_queue_index != -1)
+		{	/* compare these timestamps */
+			if (Log_compareEntries((char*)cur_trace_entry->content, msg_buf) > 0)
+				cur_trace_entry = NULL;
+		}
+
+		if (cur_trace_entry)
+		{
+			fprintf(file, "%s\n", &((char*)(cur_trace_entry->content))[msgstart]);
+			ListNextElement(trace_buffer, &cur_trace_entry);
+		}
+		else
+		{
+			fprintf(file, "%s\n", &msg_buf[7]);
+			if (trace_queue_index != next_index)
+			{
+				Log_formatTraceEntry(&trace_queue[trace_queue_index++]);
+				if (trace_queue_index == trace_settings.max_trace_entries)
+					trace_queue_index = 0;
+			}
+		}
+	}
+	fprintf(file, "========== End of trace dump ==========\n\n");
+	if (file != stdout && file != stderr && file != NULL)
+		fclose(file);
+	rc = 0;
+exit:
+	return rc;
+}
+#endif
+
+
diff --git a/mqtt/src/src/Log.h b/mqtt/src/src/Log.h
new file mode 100644
index 00000000..455beb65
--- /dev/null
+++ b/mqtt/src/src/Log.h
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2013 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - updates for the async client
+ *******************************************************************************/
+
+#if !defined(LOG_H)
+#define LOG_H
+
+/*BE
+map LOG_LEVELS
+{
+	"TRACE_MAXIMUM" 1
+	"TRACE_MEDIUM" 2
+	"TRACE_MINIMUM" 3
+	"TRACE_PROTOCOL" 4
+
+	"ERROR" 5
+	"SEVERE" 6
+	"FATAL" 7
+}
+BE*/
+
+enum LOG_LEVELS {
+	INVALID_LEVEL = -1,
+	TRACE_MAXIMUM = 1,
+	TRACE_MEDIUM,
+	TRACE_MINIMUM,
+	TRACE_PROTOCOL,
+	LOG_ERROR,
+	LOG_SEVERE,
+	LOG_FATAL,
+};
+
+
+/*BE
+def trace_settings_type
+{
+   n32 map LOG_LEVELS "trace_level"
+   n32 dec "max_trace_entries"
+   n32 dec "trace_output_level"
+}
+BE*/
+typedef struct
+{
+	enum LOG_LEVELS trace_level;	/**< trace level */
+	int max_trace_entries;		/**< max no of entries in the trace buffer */
+	enum LOG_LEVELS trace_output_level;		/**< trace level to output to destination */
+} trace_settings_type;
+
+extern trace_settings_type trace_settings;
+
+#define LOG_PROTOCOL TRACE_PROTOCOL
+#define TRACE_MAX TRACE_MAXIMUM
+#define TRACE_MIN TRACE_MINIMUM
+#define TRACE_MED TRACE_MEDIUM
+
+typedef struct
+{
+	const char* name;
+	const char* value;
+} Log_nameValue;
+
+int Log_initialize(Log_nameValue*);
+void Log_terminate(void);
+
+void Log(enum LOG_LEVELS, int, const char *, ...);
+void Log_stackTrace(enum LOG_LEVELS, int, int, int, const char*, int, int*);
+
+typedef void Log_traceCallback(enum LOG_LEVELS level, const char *message);
+void Log_setTraceCallback(Log_traceCallback* callback);
+void Log_setTraceLevel(enum LOG_LEVELS level);
+
+#endif
diff --git a/mqtt/src/src/MQTTAsync.c b/mqtt/src/src/MQTTAsync.c
new file mode 100644
index 00000000..b750f9f7
--- /dev/null
+++ b/mqtt/src/src/MQTTAsync.c
@@ -0,0 +1,4150 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial implementation and documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL support
+ *    Ian Craggs - multiple server connection support
+ *    Ian Craggs - fix for bug 413429 - connectionLost not called
+ *    Ian Craggs - fix for bug 415042 - using already freed structure
+ *    Ian Craggs - fix for bug 419233 - mutexes not reporting errors
+ *    Ian Craggs - fix for bug 420851
+ *    Ian Craggs - fix for bug 432903 - queue persistence
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Rong Xiang, Ian Craggs - C++ compatibility
+ *    Ian Craggs - fix for bug 442400: reconnecting after network cable unplugged
+ *    Ian Craggs - fix for bug 444934 - incorrect free in freeCommand1
+ *    Ian Craggs - fix for bug 445891 - assigning msgid is not thread safe
+ *    Ian Craggs - fix for bug 465369 - longer latency than expected
+ *    Ian Craggs - fix for bug 444103 - success/failure callbacks not invoked
+ *    Ian Craggs - fix for bug 484363 - segfault in getReadySocket
+ *    Ian Craggs - automatic reconnect and offline buffering (send while disconnected)
+ *    Ian Craggs - fix for bug 472250
+ *    Ian Craggs - fix for bug 486548
+ *    Ian Craggs - SNI support
+ *    Ian Craggs - auto reconnect timing fix #218
+ *    Ian Craggs - fix for issue #190
+ *    Ian Craggs - check for NULL SSL options #334
+ *    Ian Craggs - allocate username/password buffers #431
+ *    Ian Craggs - MQTT 5.0 support
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief Asynchronous API implementation
+ *
+ */
+
+#define _GNU_SOURCE /* for pthread_mutexattr_settype */
+#include <stdlib.h>
+#include <string.h>
+#if !defined(WIN32) && !defined(WIN64)
+	#include <sys/time.h>
+#endif
+
+#if !defined(NO_PERSISTENCE)
+#include "MQTTPersistence.h"
+#endif
+#include "MQTTAsync.h"
+#include "utf-8.h"
+#include "MQTTProtocol.h"
+#include "MQTTProtocolOut.h"
+#include "Thread.h"
+#include "SocketBuffer.h"
+#include "StackTrace.h"
+#include "Heap.h"
+#include "OsWrapper.h"
+#include "WebSocket.h"
+
+#define URI_TCP "tcp://"
+#define URI_WS  "ws://"
+#define URI_WSS "wss://"
+
+#include "VersionInfo.h"
+
+const char *client_timestamp_eye = "MQTTAsyncV3_Timestamp " BUILD_TIMESTAMP;
+const char *client_version_eye = "MQTTAsyncV3_Version " CLIENT_VERSION;
+
+void MQTTAsync_global_init(MQTTAsync_init_options* inits)
+{
+#if defined(OPENSSL)
+	SSLSocket_handleOpensslInit(inits->do_openssl_init);
+#endif
+}
+
+#if !defined(min)
+#define min(a, b) (((a) < (b)) ? (a) : (b))
+#endif
+
+static ClientStates ClientState =
+{
+	CLIENT_VERSION, /* version */
+	NULL /* client list */
+};
+
+ClientStates* bstate = &ClientState;
+
+MQTTProtocol state;
+
+enum MQTTAsync_threadStates
+{
+	STOPPED, STARTING, RUNNING, STOPPING
+};
+
+enum MQTTAsync_threadStates sendThread_state = STOPPED;
+enum MQTTAsync_threadStates receiveThread_state = STOPPED;
+static thread_id_type sendThread_id = 0,
+					receiveThread_id = 0;
+
+#if defined(WIN32) || defined(WIN64)
+static mutex_type mqttasync_mutex = NULL;
+static mutex_type socket_mutex = NULL;
+static mutex_type mqttcommand_mutex = NULL;
+static sem_type send_sem = NULL;
+extern mutex_type stack_mutex;
+extern mutex_type heap_mutex;
+extern mutex_type log_mutex;
+BOOL APIENTRY DllMain(HANDLE hModule,
+					  DWORD  ul_reason_for_call,
+					  LPVOID lpReserved)
+{
+	switch (ul_reason_for_call)
+	{
+		case DLL_PROCESS_ATTACH:
+			Log(TRACE_MAX, -1, "DLL process attach");
+			if (mqttasync_mutex == NULL)
+			{
+				mqttasync_mutex = CreateMutex(NULL, 0, NULL);
+				mqttcommand_mutex = CreateMutex(NULL, 0, NULL);
+				send_sem = CreateEvent(
+		        NULL,               /* default security attributes */
+		        FALSE,              /* manual-reset event? */
+		        FALSE,              /* initial state is nonsignaled */
+		        NULL                /* object name */
+		        );
+				stack_mutex = CreateMutex(NULL, 0, NULL);
+				heap_mutex = CreateMutex(NULL, 0, NULL);
+				log_mutex = CreateMutex(NULL, 0, NULL);
+				socket_mutex = CreateMutex(NULL, 0, NULL);
+			}
+		case DLL_THREAD_ATTACH:
+			Log(TRACE_MAX, -1, "DLL thread attach");
+		case DLL_THREAD_DETACH:
+			Log(TRACE_MAX, -1, "DLL thread detach");
+		case DLL_PROCESS_DETACH:
+			Log(TRACE_MAX, -1, "DLL process detach");
+	}
+	return TRUE;
+}
+#else
+static pthread_mutex_t mqttasync_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+static mutex_type mqttasync_mutex = &mqttasync_mutex_store;
+
+static pthread_mutex_t socket_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+static mutex_type socket_mutex = &socket_mutex_store;
+
+static pthread_mutex_t mqttcommand_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+static mutex_type mqttcommand_mutex = &mqttcommand_mutex_store;
+
+static cond_type_struct send_cond_store = { PTHREAD_COND_INITIALIZER, PTHREAD_MUTEX_INITIALIZER };
+static cond_type send_cond = &send_cond_store;
+
+void MQTTAsync_init(void)
+{
+	pthread_mutexattr_t attr;
+	int rc;
+
+	pthread_mutexattr_init(&attr);
+#if !defined(_WRS_KERNEL)
+	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+#else
+	/* #warning "no pthread_mutexattr_settype" */
+#endif
+	if ((rc = pthread_mutex_init(mqttasync_mutex, &attr)) != 0)
+		printf("MQTTAsync: error %d initializing async_mutex\n", rc);
+	if ((rc = pthread_mutex_init(mqttcommand_mutex, &attr)) != 0)
+		printf("MQTTAsync: error %d initializing command_mutex\n", rc);
+	if ((rc = pthread_mutex_init(socket_mutex, &attr)) != 0)
+		printf("MQTTClient: error %d initializing socket_mutex\n", rc);
+
+	if ((rc = pthread_cond_init(&send_cond->cond, NULL)) != 0)
+		printf("MQTTAsync: error %d initializing send_cond cond\n", rc);
+	if ((rc = pthread_mutex_init(&send_cond->mutex, &attr)) != 0)
+		printf("MQTTAsync: error %d initializing send_cond mutex\n", rc);
+}
+
+#define WINAPI
+#endif
+
+static volatile int global_initialized = 0;
+static List* handles = NULL;
+static int tostop = 0;
+static List* commands = NULL;
+
+
+#if defined(WIN32) || defined(WIN64)
+#define START_TIME_TYPE DWORD
+START_TIME_TYPE MQTTAsync_start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE MQTTAsync_start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_MONOTONIC, &start);
+	return start;
+}
+#else
+#define START_TIME_TYPE struct timeval
+START_TIME_TYPE MQTTAsync_start_clock(void)
+{
+	static struct timeval start;
+	static struct timespec start_ts;
+
+	clock_gettime(CLOCK_MONOTONIC, &start_ts);
+	start.tv_sec = start_ts.tv_sec;
+	start.tv_usec = start_ts.tv_nsec / 1000;
+	return start;
+}
+#endif
+
+#if defined(WIN32) || defined(WIN64)
+void MQTTAsync_init_rand(void)
+{
+	START_TIME_TYPE now = MQTTAsync_start_clock();
+	srand(now);
+}
+#elif defined(AIX)
+void MQTTAsync_init_rand(void)
+{
+	START_TIME_TYPE now = MQTTAsync_start_clock();
+	srand(now.tv_nsec);
+}
+#else
+void MQTTAsync_init_rand(void)
+{
+	START_TIME_TYPE now = MQTTAsync_start_clock();
+	srand(now.tv_usec);
+}
+#endif
+
+
+#if defined(WIN32) || defined(WIN64)
+long MQTTAsync_elapsed(DWORD milliseconds)
+{
+	return GetTickCount() - milliseconds;
+}
+#elif defined(AIX)
+#define assert(a)
+long MQTTAsync_elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_MONOTONIC, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long MQTTAsync_elapsed(struct timeval start)
+{
+	struct timeval now, res;
+	static struct timespec now_ts;
+
+	clock_gettime(CLOCK_MONOTONIC, &now_ts);
+	now.tv_sec = now_ts.tv_sec;
+	now.tv_usec = now_ts.tv_nsec / 1000;
+	timersub(&now, &start, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+typedef struct
+{
+	MQTTAsync_message* msg;
+	char* topicName;
+	int topicLen;
+	unsigned int seqno; /* only used on restore */
+} qEntry;
+
+typedef struct
+{
+	int type;
+	MQTTAsync_onSuccess* onSuccess;
+	MQTTAsync_onFailure* onFailure;
+	MQTTAsync_onSuccess5* onSuccess5;
+	MQTTAsync_onFailure5* onFailure5;
+	MQTTAsync_token token;
+	void* context;
+	START_TIME_TYPE start_time;
+	MQTTProperties properties;
+	union
+	{
+		struct
+		{
+			int count;
+			char** topics;
+			int* qoss;
+			MQTTSubscribe_options opts;
+			MQTTSubscribe_options* optlist;
+		} sub;
+		struct
+		{
+			int count;
+			char** topics;
+		} unsub;
+		struct
+		{
+			char* destinationName;
+			int payloadlen;
+			void* payload;
+			int qos;
+			int retained;
+		} pub;
+		struct
+		{
+			int internal;
+			int timeout;
+			enum MQTTReasonCodes reasonCode;
+		} dis;
+		struct
+		{
+			int currentURI;
+			int MQTTVersion; /**< current MQTT version being used to connect */
+		} conn;
+	} details;
+} MQTTAsync_command;
+
+
+typedef struct MQTTAsync_struct
+{
+	char* serverURI;
+	int ssl;
+	int websocket;
+	Clients* c;
+
+	/* "Global", to the client, callback definitions */
+	MQTTAsync_connectionLost* cl;
+	MQTTAsync_messageArrived* ma;
+	MQTTAsync_deliveryComplete* dc;
+	void* clContext; /* the context to be associated with the conn lost callback*/
+	void* maContext; /* the context to be associated with the msg arrived callback*/
+	void* dcContext; /* the context to be associated with the deliv complete callback*/
+
+	MQTTAsync_connected* connected;
+	void* connected_context; /* the context to be associated with the connected callback*/
+
+	MQTTAsync_disconnected* disconnected;
+	void* disconnected_context; /* the context to be associated with the disconnected callback*/
+
+	/* Each time connect is called, we store the options that were used.  These are reused in
+	   any call to reconnect, or an automatic reconnect attempt */
+	MQTTAsync_command connect;		/* Connect operation properties */
+	MQTTAsync_command disconnect;		/* Disconnect operation properties */
+	MQTTAsync_command* pending_write;       /* Is there a socket write pending? */
+
+	List* responses;
+	unsigned int command_seqno;
+
+	MQTTPacket* pack;
+
+	/* added for offline buffering */
+	MQTTAsync_createOptions* createOptions;
+	int shouldBeConnected;
+
+	/* added for automatic reconnect */
+	int automaticReconnect;
+	int minRetryInterval;
+	int maxRetryInterval;
+	int serverURIcount;
+	char** serverURIs;
+	int connectTimeout;
+
+	int currentInterval;
+	int currentIntervalBase;
+	START_TIME_TYPE lastConnectionFailedTime;
+	int retrying;
+	int reconnectNow;
+
+	/* MQTT V5 properties */
+	MQTTProperties* connectProps;
+	MQTTProperties* willProps;
+
+} MQTTAsyncs;
+
+
+typedef struct
+{
+	MQTTAsync_command command;
+	MQTTAsyncs* client;
+	unsigned int seqno; /* only used on restore */
+} MQTTAsync_queuedCommand;
+
+
+static int clientSockCompare(void* a, void* b);
+static void MQTTAsync_lock_mutex(mutex_type amutex);
+static void MQTTAsync_unlock_mutex(mutex_type amutex);
+static int MQTTAsync_checkConn(MQTTAsync_command* command, MQTTAsyncs* client);
+static void MQTTAsync_terminate(void);
+#if !defined(NO_PERSISTENCE)
+static int MQTTAsync_unpersistCommand(MQTTAsync_queuedCommand* qcmd);
+static int MQTTAsync_persistCommand(MQTTAsync_queuedCommand* qcmd);
+static MQTTAsync_queuedCommand* MQTTAsync_restoreCommand(char* buffer, int buflen, int MQTTVersion);
+/*static void MQTTAsync_insertInOrder(List* list, void* content, int size);*/
+static int MQTTAsync_restoreCommands(MQTTAsyncs* client);
+#endif
+static int MQTTAsync_addCommand(MQTTAsync_queuedCommand* command, int command_size);
+static void MQTTAsync_startConnectRetry(MQTTAsyncs* m);
+static void MQTTAsync_checkDisconnect(MQTTAsync handle, MQTTAsync_command* command);
+static void MQTTProtocol_checkPendingWrites(void);
+static void MQTTAsync_freeServerURIs(MQTTAsyncs* m);
+static void MQTTAsync_freeCommand1(MQTTAsync_queuedCommand *command);
+static void MQTTAsync_freeCommand(MQTTAsync_queuedCommand *command);
+static void MQTTAsync_writeComplete(int socket, int rc);
+static int MQTTAsync_processCommand(void);
+static void MQTTAsync_checkTimeouts(void);
+static thread_return_type WINAPI MQTTAsync_sendThread(void* n);
+static void MQTTAsync_emptyMessageQueue(Clients* client);
+static void MQTTAsync_removeResponsesAndCommands(MQTTAsyncs* m);
+static int MQTTAsync_completeConnection(MQTTAsyncs* m, Connack* connack);
+static thread_return_type WINAPI MQTTAsync_receiveThread(void* n);
+static void MQTTAsync_stop(void);
+static void MQTTAsync_closeOnly(Clients* client, enum MQTTReasonCodes reasonCode, MQTTProperties* props);
+static void MQTTAsync_closeSession(Clients* client, enum MQTTReasonCodes reasonCode, MQTTProperties* props);
+static int clientStructCompare(void* a, void* b);
+static int MQTTAsync_cleanSession(Clients* client);
+static int MQTTAsync_deliverMessage(MQTTAsyncs* m, char* topicName, size_t topicLen, MQTTAsync_message* mm);
+static int MQTTAsync_disconnect1(MQTTAsync handle, const MQTTAsync_disconnectOptions* options, int internal);
+static int MQTTAsync_disconnect_internal(MQTTAsync handle, int timeout);
+static int cmdMessageIDCompare(void* a, void* b);
+static int MQTTAsync_assignMsgId(MQTTAsyncs* m);
+static int MQTTAsync_countBufferedMessages(MQTTAsyncs* m);
+static void MQTTAsync_retry(void);
+static int MQTTAsync_connecting(MQTTAsyncs* m);
+static MQTTPacket* MQTTAsync_cycle(int* sock, unsigned long timeout, int* rc);
+/*static int pubCompare(void* a, void* b);*/
+
+
+void MQTTAsync_sleep(long milliseconds)
+{
+	FUNC_ENTRY;
+#if defined(WIN32) || defined(WIN64)
+	Sleep(milliseconds);
+#else
+	usleep(milliseconds*1000);
+#endif
+	FUNC_EXIT;
+}
+
+
+// Add random amount of jitter for exponential backoff on retry
+// Jitter value will be +/- 20% of "base" interval, including max interval
+// https://www.awsarchitectureblog.com/2015/03/backoff.html
+// http://ee.lbl.gov/papers/sync_94.pdf
+int MQTTAsync_randomJitter(int currentIntervalBase, int minInterval, int maxInterval)
+{
+	int max_sleep = min(maxInterval, currentIntervalBase) * 1.2; // (e.g. 72 if base > 60)
+	int min_sleep = max(minInterval, currentIntervalBase) / 1.2; // (e.g. 48 if base > 60)
+
+	if (min_sleep >= max_sleep) // shouldn't happen, but just incase
+	{
+		return min_sleep;
+	}
+
+	// random_between(min_sleep, max_sleep)
+	// http://stackoverflow.com/questions/2509679/how-to-generate-a-random-number-from-within-a-range
+	int r;
+	int range = max_sleep - min_sleep + 1;
+	if (range > RAND_MAX)
+	{
+		range = RAND_MAX;
+	}
+
+	int buckets = RAND_MAX / range;
+	int limit = buckets * range;
+
+	/* Create equal size buckets all in a row, then fire randomly towards
+	 * the buckets until you land in one of them. All buckets are equally
+	 * likely. If you land off the end of the line of buckets, try again. */
+	do
+	{
+		r = rand();
+	} while (r >= limit);
+
+	int randResult = r / buckets;
+	return min_sleep + randResult;
+}
+
+
+/**
+ * List callback function for comparing clients by socket
+ * @param a first integer value
+ * @param b second integer value
+ * @return boolean indicating whether a and b are equal
+ */
+static int clientSockCompare(void* a, void* b)
+{
+	MQTTAsyncs* m = (MQTTAsyncs*)a;
+	return m->c->net.socket == *(int*)b;
+}
+
+
+static void MQTTAsync_lock_mutex(mutex_type amutex)
+{
+	int rc = Thread_lock_mutex(amutex);
+	if (rc != 0)
+		Log(LOG_ERROR, 0, "Error %s locking mutex", strerror(rc));
+}
+
+
+static void MQTTAsync_unlock_mutex(mutex_type amutex)
+{
+	int rc = Thread_unlock_mutex(amutex);
+	if (rc != 0)
+		Log(LOG_ERROR, 0, "Error %s unlocking mutex", strerror(rc));
+}
+
+
+/*
+  Check whether there are any more connect options.  If not then we are finished
+  with connect attempts.
+*/
+static int MQTTAsync_checkConn(MQTTAsync_command* command, MQTTAsyncs* client)
+{
+	int rc;
+
+	FUNC_ENTRY;
+	rc = command->details.conn.currentURI + 1 < client->serverURIcount ||
+		(command->details.conn.MQTTVersion == 4 && client->c->MQTTVersion == MQTTVERSION_DEFAULT);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTAsync_createWithOptions(MQTTAsync* handle, const char* serverURI, const char* clientId,
+		int persistence_type, void* persistence_context,  MQTTAsync_createOptions* options)
+{
+	int rc = 0;
+	MQTTAsyncs *m = NULL;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+
+	if (serverURI == NULL || clientId == NULL)
+	{
+		rc = MQTTASYNC_NULL_PARAMETER;
+		goto exit;
+	}
+
+	if (!UTF8_validateString(clientId))
+	{
+		rc = MQTTASYNC_BAD_UTF8_STRING;
+		goto exit;
+	}
+
+	if (strstr(serverURI, "://") != NULL)
+	{
+		if (strncmp(URI_TCP, serverURI, strlen(URI_TCP)) != 0
+		 && strncmp(URI_WS, serverURI, strlen(URI_WS)) != 0
+#if defined(OPENSSL)
+            && strncmp(URI_SSL, serverURI, strlen(URI_SSL)) != 0
+		 && strncmp(URI_WSS, serverURI, strlen(URI_WSS)) != 0
+#endif
+			)
+		{
+			rc = MQTTASYNC_BAD_PROTOCOL;
+			goto exit;
+		}
+	}
+
+	if (options && (strncmp(options->struct_id, "MQCO", 4) != 0 ||
+					options->struct_version < 0 || options->struct_version > 1))
+	{
+		rc = MQTTASYNC_BAD_STRUCTURE;
+		goto exit;
+	}
+
+	if (!global_initialized)
+	{
+		#if defined(HEAP_H)
+			Heap_initialize();
+		#endif
+		Log_initialize((Log_nameValue*)MQTTAsync_getVersionInfo());
+		bstate->clients = ListInitialize();
+		Socket_outInitialize();
+		Socket_setWriteCompleteCallback(MQTTAsync_writeComplete);
+		handles = ListInitialize();
+		commands = ListInitialize();
+#if defined(OPENSSL)
+		SSLSocket_initialize();
+#endif
+		global_initialized = 1;
+	}
+	m = malloc(sizeof(MQTTAsyncs));
+	*handle = m;
+	memset(m, '\0', sizeof(MQTTAsyncs));
+	if (strncmp(URI_TCP, serverURI, strlen(URI_TCP)) == 0)
+		serverURI += strlen(URI_TCP);
+	else if (strncmp(URI_WS, serverURI, strlen(URI_WS)) == 0)
+	{
+		serverURI += strlen(URI_WS);
+		m->websocket = 1;
+	}
+#if defined(OPENSSL)
+	else if (strncmp(URI_SSL, serverURI, strlen(URI_SSL)) == 0)
+	{
+		serverURI += strlen(URI_SSL);
+		m->ssl = 1;
+	}
+	else if (strncmp(URI_WSS, serverURI, strlen(URI_WSS)) == 0)
+	{
+		serverURI += strlen(URI_WSS);
+		m->ssl = 1;
+		m->websocket = 1;
+	}
+#endif
+	m->serverURI = MQTTStrdup(serverURI);
+	m->responses = ListInitialize();
+	ListAppend(handles, m, sizeof(MQTTAsyncs));
+
+	m->c = malloc(sizeof(Clients));
+	memset(m->c, '\0', sizeof(Clients));
+	m->c->context = m;
+	m->c->outboundMsgs = ListInitialize();
+	m->c->inboundMsgs = ListInitialize();
+	m->c->messageQueue = ListInitialize();
+	m->c->clientID = MQTTStrdup(clientId);
+	m->c->MQTTVersion = MQTTVERSION_DEFAULT;
+
+	m->shouldBeConnected = 0;
+	if (options)
+	{
+		m->createOptions = malloc(sizeof(MQTTAsync_createOptions));
+		memcpy(m->createOptions, options, sizeof(MQTTAsync_createOptions));
+		if (options->struct_version > 0)
+			m->c->MQTTVersion = options->MQTTVersion;
+	}
+
+#if !defined(NO_PERSISTENCE)
+	rc = MQTTPersistence_create(&(m->c->persistence), persistence_type, persistence_context);
+	if (rc == 0)
+	{
+		rc = MQTTPersistence_initialize(m->c, m->serverURI);
+		if (rc == 0)
+		{
+			MQTTAsync_restoreCommands(m);
+			MQTTPersistence_restoreMessageQueue(m->c);
+		}
+	}
+#endif
+	ListAppend(bstate->clients, m->c, sizeof(Clients) + 3*sizeof(List));
+
+exit:
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTAsync_create(MQTTAsync* handle, const char* serverURI, const char* clientId,
+		int persistence_type, void* persistence_context)
+{
+	MQTTAsync_init_rand();
+
+	return MQTTAsync_createWithOptions(handle, serverURI, clientId, persistence_type,
+		persistence_context, NULL);
+}
+
+
+static void MQTTAsync_terminate(void)
+{
+	FUNC_ENTRY;
+	MQTTAsync_stop();
+	if (global_initialized)
+	{
+		ListElement* elem = NULL;
+		ListFree(bstate->clients);
+		ListFree(handles);
+		while (ListNextElement(commands, &elem))
+			MQTTAsync_freeCommand1((MQTTAsync_queuedCommand*)(elem->content));
+		ListFree(commands);
+		handles = NULL;
+		WebSocket_terminate();
+		#if defined(HEAP_H)
+			Heap_terminate();
+		#endif
+		Log_terminate();
+		global_initialized = 0;
+	}
+	FUNC_EXIT;
+}
+
+
+#if !defined(NO_PERSISTENCE)
+static int MQTTAsync_unpersistCommand(MQTTAsync_queuedCommand* qcmd)
+{
+	int rc = 0;
+	char key[PERSISTENCE_MAX_KEY_LENGTH + 1];
+
+	FUNC_ENTRY;
+	if (qcmd->client->c->MQTTVersion >= MQTTVERSION_5)
+		sprintf(key, "%s%u", PERSISTENCE_V5_COMMAND_KEY, qcmd->seqno);
+	else
+		sprintf(key, "%s%u", PERSISTENCE_COMMAND_KEY, qcmd->seqno);
+	if ((rc = qcmd->client->c->persistence->premove(qcmd->client->c->phandle, key)) != 0)
+		Log(LOG_ERROR, 0, "Error %d removing command from persistence", rc);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static int MQTTAsync_persistCommand(MQTTAsync_queuedCommand* qcmd)
+{
+	int rc = 0;
+	MQTTAsyncs* aclient = qcmd->client;
+	MQTTAsync_command* command = &qcmd->command;
+	int* lens = NULL;
+	void** bufs = NULL;
+	int bufindex = 0, i, nbufs = 0;
+	char key[PERSISTENCE_MAX_KEY_LENGTH + 1];
+	int props_allocated = 0;
+	int process = 1;
+
+	FUNC_ENTRY;
+	switch (command->type)
+	{
+		case SUBSCRIBE:
+			nbufs = ((aclient->c->MQTTVersion >= MQTTVERSION_5) ? 4 : 3) +
+				(command->details.sub.count * 2);
+
+			lens = (int*)malloc(nbufs * sizeof(int));
+			bufs = malloc(nbufs * sizeof(char *));
+
+			bufs[bufindex] = &command->type;
+			lens[bufindex++] = sizeof(command->type);
+
+			bufs[bufindex] = &command->token;
+			lens[bufindex++] = sizeof(command->token);
+
+			bufs[bufindex] = &command->details.sub.count;
+			lens[bufindex++] = sizeof(command->details.sub.count);
+
+			for (i = 0; i < command->details.sub.count; ++i)
+			{
+				bufs[bufindex] = command->details.sub.topics[i];
+				lens[bufindex++] = (int)strlen(command->details.sub.topics[i]) + 1;
+
+				if (aclient->c->MQTTVersion < MQTTVERSION_5)
+				{
+					bufs[bufindex] = &command->details.sub.qoss[i];
+					lens[bufindex++] = sizeof(command->details.sub.qoss[i]);
+				}
+				else
+				{
+					if (command->details.sub.count == 1)
+					{
+						bufs[bufindex] = &command->details.sub.opts;
+						lens[bufindex++] = sizeof(command->details.sub.opts);
+					}
+					else
+					{
+						bufs[bufindex] = &command->details.sub.optlist[i];
+						lens[bufindex++] = sizeof(command->details.sub.optlist[i]);
+					}
+				}
+			}
+			break;
+
+		case UNSUBSCRIBE:
+			nbufs = ((aclient->c->MQTTVersion >= MQTTVERSION_5) ? 4 : 3) +
+					command->details.unsub.count;
+
+			lens = (int*)malloc(nbufs * sizeof(int));
+			bufs = malloc(nbufs * sizeof(char *));
+
+			bufs[bufindex] = &command->type;
+			lens[bufindex++] = sizeof(command->type);
+
+			bufs[bufindex] = &command->token;
+			lens[bufindex++] = sizeof(command->token);
+
+			bufs[bufindex] = &command->details.unsub.count;
+			lens[bufindex++] = sizeof(command->details.unsub.count);
+
+			for (i = 0; i < command->details.unsub.count; ++i)
+			{
+				bufs[bufindex] = command->details.unsub.topics[i];
+				lens[bufindex++] = (int)strlen(command->details.unsub.topics[i]) + 1;
+			}
+			break;
+
+		case PUBLISH:
+			nbufs = (aclient->c->MQTTVersion >= MQTTVERSION_5) ? 8 : 7;
+
+			lens = (int*)malloc(nbufs * sizeof(int));
+			bufs = malloc(nbufs * sizeof(char *));
+
+			bufs[bufindex] = &command->type;
+			lens[bufindex++] = sizeof(command->type);
+
+			bufs[bufindex] = &command->token;
+			lens[bufindex++] = sizeof(command->token);
+
+			bufs[bufindex] = command->details.pub.destinationName;
+			lens[bufindex++] = (int)strlen(command->details.pub.destinationName) + 1;
+
+			bufs[bufindex] = &command->details.pub.payloadlen;
+			lens[bufindex++] = sizeof(command->details.pub.payloadlen);
+
+			bufs[bufindex] = command->details.pub.payload;
+			lens[bufindex++] = command->details.pub.payloadlen;
+
+			bufs[bufindex] = &command->details.pub.qos;
+			lens[bufindex++] = sizeof(command->details.pub.qos);
+
+			bufs[bufindex] = &command->details.pub.retained;
+			lens[bufindex++] = sizeof(command->details.pub.retained);
+			break;
+
+		default:
+			process = 0;
+			break;
+	}
+	if (aclient->c->MQTTVersion >= MQTTVERSION_5 && process) 	/* persist properties */
+	{
+		int temp_len = 0;
+		char* ptr = NULL;
+
+		temp_len = MQTTProperties_len(&command->properties);
+		ptr = bufs[bufindex] = malloc(temp_len);
+		props_allocated = bufindex;
+		rc = MQTTProperties_write(&ptr, &command->properties);
+		lens[bufindex++] = temp_len;
+		sprintf(key, "%s%u", PERSISTENCE_V5_COMMAND_KEY, ++aclient->command_seqno);
+	}
+	else
+		sprintf(key, "%s%u", PERSISTENCE_COMMAND_KEY, ++aclient->command_seqno);
+
+	if (nbufs > 0)
+	{
+		if ((rc = aclient->c->persistence->pput(aclient->c->phandle, key, nbufs, (char**)bufs, lens)) != 0)
+			Log(LOG_ERROR, 0, "Error persisting command, rc %d", rc);
+		qcmd->seqno = aclient->command_seqno;
+	}
+	if (props_allocated > 0)
+		free(bufs[props_allocated]);
+	if (lens)
+		free(lens);
+	if (bufs)
+		free(bufs);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static MQTTAsync_queuedCommand* MQTTAsync_restoreCommand(char* buffer, int buflen, int MQTTVersion)
+{
+	MQTTAsync_command* command = NULL;
+	MQTTAsync_queuedCommand* qcommand = NULL;
+	char* ptr = buffer;
+	int i;
+	size_t data_size;
+
+	FUNC_ENTRY;
+	qcommand = malloc(sizeof(MQTTAsync_queuedCommand));
+	memset(qcommand, '\0', sizeof(MQTTAsync_queuedCommand));
+	command = &qcommand->command;
+
+	command->type = *(int*)ptr;
+	ptr += sizeof(int);
+
+	command->token = *(MQTTAsync_token*)ptr;
+	ptr += sizeof(MQTTAsync_token);
+
+	switch (command->type)
+	{
+		case SUBSCRIBE:
+			command->details.sub.count = *(int*)ptr;
+			ptr += sizeof(int);
+
+			if (command->details.sub.count > 0)
+			{
+				command->details.sub.topics = (char **)malloc(sizeof(char *) * command->details.sub.count);
+				if (MQTTVersion < MQTTVERSION_5)
+					command->details.sub.qoss = (int *)malloc(sizeof(int) * command->details.sub.count);
+				else if (command->details.sub.count > 1)
+					command->details.sub.optlist = (MQTTSubscribe_options*)malloc(sizeof(MQTTSubscribe_options) * command->details.sub.count);
+			}
+
+			for (i = 0; i < command->details.sub.count; ++i)
+			{
+				data_size = strlen(ptr) + 1;
+
+				command->details.sub.topics[i] = malloc(data_size);
+				strcpy(command->details.sub.topics[i], ptr);
+				ptr += data_size;
+
+				if (MQTTVersion < MQTTVERSION_5)
+				{
+					command->details.sub.qoss[i] = *(int*)ptr;
+					ptr += sizeof(int);
+				}
+				else
+				{
+					if (command->details.sub.count == 1)
+					{
+						command->details.sub.opts = *(MQTTSubscribe_options*)ptr;
+						ptr += sizeof(MQTTSubscribe_options);
+					}
+					else
+					{
+						command->details.sub.optlist[i] = *(MQTTSubscribe_options*)ptr;
+						ptr += sizeof(MQTTSubscribe_options);
+					}
+				}
+			}
+			break;
+
+		case UNSUBSCRIBE:
+			command->details.unsub.count = *(int*)ptr;
+			ptr += sizeof(int);
+
+			if (command->details.unsub.count > 0)
+			{
+				command->details.unsub.topics = (char **)malloc(sizeof(char *) * command->details.unsub.count);
+			}
+
+			for (i = 0; i < command->details.unsub.count; ++i)
+			{
+				data_size = strlen(ptr) + 1;
+
+				command->details.unsub.topics[i] = malloc(data_size);
+				strcpy(command->details.unsub.topics[i], ptr);
+				ptr += data_size;
+			}
+			break;
+
+		case PUBLISH:
+			data_size = strlen(ptr) + 1;
+			command->details.pub.destinationName = malloc(data_size);
+			strcpy(command->details.pub.destinationName, ptr);
+			ptr += data_size;
+
+			command->details.pub.payloadlen = *(int*)ptr;
+			ptr += sizeof(int);
+
+			data_size = command->details.pub.payloadlen;
+			command->details.pub.payload = malloc(data_size);
+			memcpy(command->details.pub.payload, ptr, data_size);
+			ptr += data_size;
+
+			command->details.pub.qos = *(int*)ptr;
+			ptr += sizeof(int);
+
+			command->details.pub.retained = *(int*)ptr;
+			ptr += sizeof(int);
+			break;
+
+		default:
+			free(qcommand);
+			qcommand = NULL;
+
+	}
+	if (qcommand != NULL && MQTTVersion >= MQTTVERSION_5 &&
+			MQTTProperties_read(&command->properties, &ptr, buffer + buflen) != 1)
+	{
+			Log(LOG_ERROR, -1, "Error restoring properties from persistence");
+			free(qcommand);
+			qcommand = NULL;
+	}
+
+	FUNC_EXIT;
+	return qcommand;
+}
+
+/*
+static void MQTTAsync_insertInOrder(List* list, void* content, int size)
+{
+	ListElement* index = NULL;
+	ListElement* current = NULL;
+
+	FUNC_ENTRY;
+	while (ListNextElement(list, &current) != NULL && index == NULL)
+	{
+		if (((MQTTAsync_queuedCommand*)content)->seqno < ((MQTTAsync_queuedCommand*)current->content)->seqno)
+			index = current;
+	}
+
+	ListInsert(list, content, size, index);
+	FUNC_EXIT;
+}*/
+
+
+static int MQTTAsync_restoreCommands(MQTTAsyncs* client)
+{
+	int rc = 0;
+	char **msgkeys;
+	int nkeys;
+	int i = 0;
+	Clients* c = client->c;
+	int commands_restored = 0;
+
+	FUNC_ENTRY;
+	if (c->persistence && (rc = c->persistence->pkeys(c->phandle, &msgkeys, &nkeys)) == 0)
+	{
+		while (rc == 0 && i < nkeys)
+		{
+			char *buffer = NULL;
+			int buflen;
+
+			if (strncmp(msgkeys[i], PERSISTENCE_COMMAND_KEY, strlen(PERSISTENCE_COMMAND_KEY)) != 0 &&
+				strncmp(msgkeys[i], PERSISTENCE_V5_COMMAND_KEY, strlen(PERSISTENCE_V5_COMMAND_KEY)) != 0)
+			{
+				;
+			}
+			else if ((rc = c->persistence->pget(c->phandle, msgkeys[i], &buffer, &buflen)) == 0)
+			{
+				int MQTTVersion =
+					(strncmp(msgkeys[i], PERSISTENCE_V5_COMMAND_KEY, strlen(PERSISTENCE_V5_COMMAND_KEY)) == 0)
+					? MQTTVERSION_5 : MQTTVERSION_3_1_1;
+				MQTTAsync_queuedCommand* cmd = MQTTAsync_restoreCommand(buffer, buflen, MQTTVersion);
+
+				if (cmd)
+				{
+					cmd->client = client;
+					cmd->seqno = atoi(strchr(msgkeys[i], '-')+1); /* key format is tag'-'seqno */
+					MQTTPersistence_insertInOrder(commands, cmd, sizeof(MQTTAsync_queuedCommand));
+					free(buffer);
+					client->command_seqno = max(client->command_seqno, cmd->seqno);
+					commands_restored++;
+				}
+			}
+			if (msgkeys[i])
+				free(msgkeys[i]);
+			i++;
+		}
+		if (msgkeys != NULL)
+			free(msgkeys);
+	}
+	Log(TRACE_MINIMUM, -1, "%d commands restored for client %s", commands_restored, c->clientID);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+#endif
+
+
+static int MQTTAsync_addCommand(MQTTAsync_queuedCommand* command, int command_size)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttcommand_mutex);
+	/* Don't set start time if the connect command is already in process #218 */
+	if ((command->command.type != CONNECT) || (command->client->c->connect_state == NOT_IN_PROGRESS))
+		command->command.start_time = MQTTAsync_start_clock();
+	if (command->command.type == CONNECT ||
+		(command->command.type == DISCONNECT && command->command.details.dis.internal))
+	{
+		MQTTAsync_queuedCommand* head = NULL;
+
+		if (commands->first)
+			head = (MQTTAsync_queuedCommand*)(commands->first->content);
+
+		if (head != NULL && head->client == command->client && head->command.type == command->command.type)
+			MQTTAsync_freeCommand(command); /* ignore duplicate connect or disconnect command */
+		else
+			ListInsert(commands, command, command_size, commands->first); /* add to the head of the list */
+	}
+	else
+	{
+		ListAppend(commands, command, command_size);
+#if !defined(NO_PERSISTENCE)
+		if (command->client->c->persistence)
+			MQTTAsync_persistCommand(command);
+#endif
+	}
+	MQTTAsync_unlock_mutex(mqttcommand_mutex);
+#if !defined(WIN32) && !defined(WIN64)
+	rc = Thread_signal_cond(send_cond);
+	if (rc != 0)
+		Log(LOG_ERROR, 0, "Error %d from signal cond", rc);
+#else
+	rc = Thread_post_sem(send_sem);
+#endif
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static void MQTTAsync_startConnectRetry(MQTTAsyncs* m)
+{
+	if (m->automaticReconnect && m->shouldBeConnected)
+	{
+		m->lastConnectionFailedTime = MQTTAsync_start_clock();
+		if (m->retrying)
+		{
+			m->currentIntervalBase = min(m->currentIntervalBase * 2, m->maxRetryInterval);
+		}
+		else
+		{
+			m->currentIntervalBase = m->minRetryInterval;
+			m->retrying = 1;
+		}
+		m->currentInterval = MQTTAsync_randomJitter(m->currentIntervalBase, m->minRetryInterval, m->maxRetryInterval);
+	}
+}
+
+
+int MQTTAsync_reconnect(MQTTAsync handle)
+{
+	int rc = MQTTASYNC_FAILURE;
+	MQTTAsyncs* m = handle;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+
+	if (m->automaticReconnect)
+	{
+		if (m->shouldBeConnected)
+		{
+			m->reconnectNow = 1;
+			if (m->retrying == 0)
+			{
+				m->currentIntervalBase = m->minRetryInterval;
+				m->currentInterval = m->minRetryInterval;
+				m->retrying = 1;
+			}
+			rc = MQTTASYNC_SUCCESS;
+		}
+	}
+	else
+	{
+		/* to reconnect, put the connect command to the head of the command queue */
+		MQTTAsync_queuedCommand* conn = malloc(sizeof(MQTTAsync_queuedCommand));
+		memset(conn, '\0', sizeof(MQTTAsync_queuedCommand));
+		conn->client = m;
+		conn->command = m->connect;
+		/* make sure that the version attempts are restarted */
+		if (m->c->MQTTVersion == MQTTVERSION_DEFAULT)
+			conn->command.details.conn.MQTTVersion = 0;
+		MQTTAsync_addCommand(conn, sizeof(m->connect));
+		rc = MQTTASYNC_SUCCESS;
+	}
+
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static void MQTTAsync_checkDisconnect(MQTTAsync handle, MQTTAsync_command* command)
+{
+	MQTTAsyncs* m = handle;
+
+	FUNC_ENTRY;
+	/* wait for all inflight message flows to finish, up to timeout */;
+	if (m->c->outboundMsgs->count == 0 || MQTTAsync_elapsed(command->start_time) >= command->details.dis.timeout)
+	{
+		int was_connected = m->c->connected;
+		MQTTAsync_closeSession(m->c, command->details.dis.reasonCode, &command->properties);
+		if (command->details.dis.internal)
+		{
+			if (m->cl && was_connected)
+			{
+				Log(TRACE_MIN, -1, "Calling connectionLost for client %s", m->c->clientID);
+				(*(m->cl))(m->clContext, NULL);
+			}
+			MQTTAsync_startConnectRetry(m);
+		}
+		else if (command->onSuccess)
+		{
+			MQTTAsync_successData data;
+
+			memset(&data, '\0', sizeof(data));
+			Log(TRACE_MIN, -1, "Calling disconnect complete for client %s", m->c->clientID);
+			(*(command->onSuccess))(command->context, &data);
+		}
+		else if (command->onSuccess5)
+		{
+			MQTTAsync_successData5 data = MQTTAsync_successData5_initializer;
+
+			data.reasonCode = MQTTASYNC_SUCCESS;
+			Log(TRACE_MIN, -1, "Calling disconnect complete for client %s", m->c->clientID);
+			(*(command->onSuccess5))(command->context, &data);
+		}
+	}
+	FUNC_EXIT;
+}
+
+/**
+ * Call Socket_noPendingWrites(int socket) with protection by socket_mutex, see https://github.com/eclipse/paho.mqtt.c/issues/385
+ */
+static int MQTTAsync_Socket_noPendingWrites(int socket)
+{
+    int rc;
+    Thread_lock_mutex(socket_mutex);
+    rc = Socket_noPendingWrites(socket);
+    Thread_unlock_mutex(socket_mutex);
+    return rc;
+}
+
+/**
+ * See if any pending writes have been completed, and cleanup if so.
+ * Cleaning up means removing any publication data that was stored because the write did
+ * not originally complete.
+ */
+static void MQTTProtocol_checkPendingWrites(void)
+{
+	FUNC_ENTRY;
+	if (state.pending_writes.count > 0)
+	{
+		ListElement* le = state.pending_writes.first;
+		while (le)
+		{
+			if (Socket_noPendingWrites(((pending_write*)(le->content))->socket))
+			{
+				MQTTProtocol_removePublication(((pending_write*)(le->content))->p);
+				state.pending_writes.current = le;
+				ListRemove(&(state.pending_writes), le->content); /* does NextElement itself */
+				le = state.pending_writes.current;
+			}
+			else
+				ListNextElement(&(state.pending_writes), &le);
+		}
+	}
+	FUNC_EXIT;
+}
+
+
+static void MQTTAsync_freeServerURIs(MQTTAsyncs* m)
+{
+	int i;
+
+	for (i = 0; i < m->serverURIcount; ++i)
+		free(m->serverURIs[i]);
+	m->serverURIcount = 0;
+	if (m->serverURIs)
+		free(m->serverURIs);
+	m->serverURIs = NULL;
+}
+
+
+static void MQTTAsync_freeCommand1(MQTTAsync_queuedCommand *command)
+{
+	if (command->command.type == SUBSCRIBE)
+	{
+		int i;
+
+		for (i = 0; i < command->command.details.sub.count; i++)
+			free(command->command.details.sub.topics[i]);
+
+		free(command->command.details.sub.topics);
+		command->command.details.sub.topics = NULL;
+		free(command->command.details.sub.qoss);
+		command->command.details.sub.qoss = NULL;
+	}
+	else if (command->command.type == UNSUBSCRIBE)
+	{
+		int i;
+
+		for (i = 0; i < command->command.details.unsub.count; i++)
+			free(command->command.details.unsub.topics[i]);
+
+		free(command->command.details.unsub.topics);
+		command->command.details.unsub.topics = NULL;
+	}
+	else if (command->command.type == PUBLISH)
+	{
+		/* qos 1 and 2 topics are freed in the protocol code when the flows are completed */
+		if (command->command.details.pub.destinationName)
+			free(command->command.details.pub.destinationName);
+		command->command.details.pub.destinationName = NULL;
+		free(command->command.details.pub.payload);
+		command->command.details.pub.payload = NULL;
+	}
+	MQTTProperties_free(&command->command.properties);
+}
+
+static void MQTTAsync_freeCommand(MQTTAsync_queuedCommand *command)
+{
+	MQTTAsync_freeCommand1(command);
+	free(command);
+}
+
+
+static void MQTTAsync_writeComplete(int socket, int rc)
+{
+	ListElement* found = NULL;
+
+	FUNC_ENTRY;
+	/* a partial write is now complete for a socket - this will be on a publish*/
+
+	MQTTProtocol_checkPendingWrites();
+
+	/* find the client using this socket */
+	if ((found = ListFindItem(handles, &socket, clientSockCompare)) != NULL)
+	{
+		MQTTAsyncs* m = (MQTTAsyncs*)(found->content);
+
+		time(&(m->c->net.lastSent));
+
+		/* see if there is a pending write flagged */
+		if (m->pending_write)
+		{
+			ListElement* cur_response = NULL;
+			MQTTAsync_command* command = m->pending_write;
+			MQTTAsync_queuedCommand* com = NULL;
+
+			cur_response = NULL;
+			while (ListNextElement(m->responses, &cur_response))
+			{
+				com = (MQTTAsync_queuedCommand*)(cur_response->content);
+				if (&com->command == m->pending_write)
+					break;
+			}
+
+			if (cur_response) /* we found a response */
+			{
+				if (command->type == PUBLISH)
+				{
+					if (rc == 1 && command->details.pub.qos == 0)
+					{
+						if (command->onSuccess)
+						{
+							MQTTAsync_successData data;
+
+							data.token = command->token;
+							data.alt.pub.destinationName = command->details.pub.destinationName;
+							data.alt.pub.message.payload = command->details.pub.payload;
+							data.alt.pub.message.payloadlen = command->details.pub.payloadlen;
+							data.alt.pub.message.qos = command->details.pub.qos;
+							data.alt.pub.message.retained = command->details.pub.retained;
+							Log(TRACE_MIN, -1, "Calling publish success for client %s", m->c->clientID);
+							(*(command->onSuccess))(command->context, &data);
+						}
+						else if (command->onSuccess5)
+						{
+							MQTTAsync_successData5 data = MQTTAsync_successData5_initializer;
+
+							data.token = command->token;
+							data.alt.pub.destinationName = command->details.pub.destinationName;
+							data.alt.pub.message.payload = command->details.pub.payload;
+							data.alt.pub.message.payloadlen = command->details.pub.payloadlen;
+							data.alt.pub.message.qos = command->details.pub.qos;
+							data.alt.pub.message.retained = command->details.pub.retained;
+							data.properties = command->properties;
+							Log(TRACE_MIN, -1, "Calling publish success for client %s", m->c->clientID);
+							(*(command->onSuccess5))(command->context, &data);
+						}
+					}
+					else if (rc == -1)
+					{
+						if (command->onFailure)
+						{
+							MQTTAsync_failureData data;
+
+							data.token = command->token;
+							data.code = rc;
+							data.message = NULL;
+							Log(TRACE_MIN, -1, "Calling publish failure for client %s", m->c->clientID);
+							(*(command->onFailure))(command->context, &data);
+						}
+						else if (command->onFailure5)
+						{
+							MQTTAsync_failureData5 data;
+
+							data.token = command->token;
+							data.code = rc;
+							data.message = NULL;
+							data.packet_type = PUBLISH;
+							Log(TRACE_MIN, -1, "Calling publish failure for client %s", m->c->clientID);
+							(*(command->onFailure5))(command->context, &data);
+						}
+					}
+					else
+						com = NULL; /* Don't delete response we haven't acknowledged */
+				}
+				if (com)
+				{
+					Log(TRACE_PROTOCOL, -1, "writeComplete: Removing response for msgid %d", com->command.token);
+					ListDetach(m->responses, com);
+					MQTTAsync_freeCommand(com);
+				}
+			} /* if cur_response */
+			m->pending_write = NULL;
+		} /* if pending_write */
+	}
+	FUNC_EXIT;
+}
+
+
+static int MQTTAsync_processCommand(void)
+{
+	int rc = 0;
+	MQTTAsync_queuedCommand* command = NULL;
+	ListElement* cur_command = NULL;
+	List* ignored_clients = NULL;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+	MQTTAsync_lock_mutex(mqttcommand_mutex);
+
+	/* only the first command in the list must be processed for any particular client, so if we skip
+	   a command for a client, we must skip all following commands for that client.  Use a list of
+	   ignored clients to keep track
+	*/
+	ignored_clients = ListInitialize();
+
+	/* don't try a command until there isn't a pending write for that client, and we are not connecting */
+	while (ListNextElement(commands, &cur_command))
+	{
+		MQTTAsync_queuedCommand* cmd = (MQTTAsync_queuedCommand*)(cur_command->content);
+
+		if (ListFind(ignored_clients, cmd->client))
+			continue;
+
+		if (cmd->command.type == CONNECT || cmd->command.type == DISCONNECT || (cmd->client->c->connected &&
+			cmd->client->c->connect_state == NOT_IN_PROGRESS && MQTTAsync_Socket_noPendingWrites(cmd->client->c->net.socket)))
+		{
+			if ((cmd->command.type == PUBLISH || cmd->command.type == SUBSCRIBE || cmd->command.type == UNSUBSCRIBE) &&
+				cmd->client->c->outboundMsgs->count >= MAX_MSG_ID - 1)
+			{
+				; /* no more message ids available */
+			}
+			else if (cmd->client->c->MQTTVersion >= MQTTVERSION_5 &&
+				((cmd->command.type == PUBLISH && cmd->command.details.pub.qos > 0) ||
+						cmd->command.type == SUBSCRIBE || cmd->command.type == UNSUBSCRIBE) &&
+				(cmd->client->c->outboundMsgs->count >= cmd->client->c->maxInflightMessages))
+			{
+				Log(TRACE_MIN, -1, "Blocking on server receive maximum for client %s",
+						cmd->client->c->clientID); /* flow control */
+			}
+			else
+			{
+				command = cmd;
+				break;
+			}
+		}
+		ListAppend(ignored_clients, cmd->client, sizeof(cmd->client));
+	}
+	ListFreeNoContent(ignored_clients);
+	if (command)
+	{
+		ListDetach(commands, command);
+#if !defined(NO_PERSISTENCE)
+		if (command->client->c->persistence)
+			MQTTAsync_unpersistCommand(command);
+#endif
+	}
+	MQTTAsync_unlock_mutex(mqttcommand_mutex);
+
+	if (!command)
+		goto exit; /* nothing to do */
+
+	if (command->command.type == CONNECT)
+	{
+		if (command->client->c->connect_state != NOT_IN_PROGRESS || command->client->c->connected)
+			rc = 0;
+		else
+		{
+			char* serverURI = command->client->serverURI;
+
+			if (command->client->serverURIcount > 0)
+			{
+				serverURI = command->client->serverURIs[command->command.details.conn.currentURI];
+
+				if (strncmp(URI_TCP, serverURI, strlen(URI_TCP)) == 0)
+					serverURI += strlen(URI_TCP);
+		 		else if (strncmp(URI_WS, serverURI, strlen(URI_WS)) == 0)
+				{
+					serverURI += strlen(URI_WS);
+					command->client->websocket = 1;
+				}
+#if defined(OPENSSL)
+				else if (strncmp(URI_SSL, serverURI, strlen(URI_SSL)) == 0)
+				{
+					serverURI += strlen(URI_SSL);
+					command->client->ssl = 1;
+				}
+		 		else if (strncmp(URI_WSS, serverURI, strlen(URI_WSS)) == 0)
+				{
+					serverURI += strlen(URI_WSS);
+					command->client->ssl = 1;
+					command->client->websocket = 1;
+				}
+#endif
+			}
+
+			if (command->client->c->MQTTVersion == MQTTVERSION_DEFAULT)
+			{
+				if (command->command.details.conn.MQTTVersion == MQTTVERSION_DEFAULT)
+					command->command.details.conn.MQTTVersion = MQTTVERSION_3_1_1;
+				else if (command->command.details.conn.MQTTVersion == MQTTVERSION_3_1_1)
+					command->command.details.conn.MQTTVersion = MQTTVERSION_3_1;
+			}
+			else
+				command->command.details.conn.MQTTVersion = command->client->c->MQTTVersion;
+
+			Log(TRACE_PROTOCOL, -1, "Connecting to serverURI %s with MQTT version %d", serverURI, command->command.details.conn.MQTTVersion);
+#if defined(OPENSSL)
+			rc = MQTTProtocol_connect(serverURI, command->client->c, command->client->ssl, command->client->websocket,
+					command->command.details.conn.MQTTVersion, command->client->connectProps, command->client->willProps);
+#else
+			rc = MQTTProtocol_connect(serverURI, command->client->c, command->client->websocket,
+					command->command.details.conn.MQTTVersion, command->client->connectProps, command->client->willProps);
+#endif
+			if (command->client->c->connect_state == NOT_IN_PROGRESS)
+				rc = SOCKET_ERROR;
+
+			/* if the TCP connect is pending, then we must call select to determine when the connect has completed,
+			which is indicated by the socket being ready *either* for reading *or* writing.  The next couple of lines
+			make sure we check for writeability as well as readability, otherwise we wait around longer than we need to
+			in Socket_getReadySocket() */
+			if (rc == EINPROGRESS)
+				Socket_addPendingWrite(command->client->c->net.socket);
+		}
+	}
+	else if (command->command.type == SUBSCRIBE)
+	{
+		List* topics = ListInitialize();
+		List* qoss = ListInitialize();
+		MQTTProperties* props = NULL;
+		MQTTSubscribe_options* subopts = NULL;
+		int i;
+
+		for (i = 0; i < command->command.details.sub.count; i++)
+		{
+			ListAppend(topics, command->command.details.sub.topics[i], strlen(command->command.details.sub.topics[i]));
+			ListAppend(qoss, &command->command.details.sub.qoss[i], sizeof(int));
+		}
+		if (command->client->c->MQTTVersion >= MQTTVERSION_5)
+		{
+			props = &command->command.properties;
+			if (command->command.details.sub.count > 1)
+				subopts = command->command.details.sub.optlist;
+			else
+				subopts = &command->command.details.sub.opts;
+		}
+		rc = MQTTProtocol_subscribe(command->client->c, topics, qoss, command->command.token, subopts, props);
+		ListFreeNoContent(topics);
+		ListFreeNoContent(qoss);
+		if (command->client->c->MQTTVersion >= MQTTVERSION_5 && command->command.details.sub.count > 1)
+			free(command->command.details.sub.optlist);
+	}
+	else if (command->command.type == UNSUBSCRIBE)
+	{
+		List* topics = ListInitialize();
+		MQTTProperties* props = NULL;
+		int i;
+
+		for (i = 0; i < command->command.details.unsub.count; i++)
+			ListAppend(topics, command->command.details.unsub.topics[i], strlen(command->command.details.unsub.topics[i]));
+
+		if (command->client->c->MQTTVersion >= MQTTVERSION_5)
+			props = &command->command.properties;
+
+		rc = MQTTProtocol_unsubscribe(command->client->c, topics, command->command.token, props);
+		ListFreeNoContent(topics);
+	}
+	else if (command->command.type == PUBLISH)
+	{
+		Messages* msg = NULL;
+		Publish* p = NULL;
+		MQTTProperties initialized = MQTTProperties_initializer;
+
+		p = malloc(sizeof(Publish));
+
+		p->payload = command->command.details.pub.payload;
+		p->payloadlen = command->command.details.pub.payloadlen;
+		p->topic = command->command.details.pub.destinationName;
+		p->msgId = command->command.token;
+		p->MQTTVersion = command->client->c->MQTTVersion;
+		p->properties = initialized;
+		if (p->MQTTVersion >= MQTTVERSION_5)
+			p->properties = command->command.properties;
+
+		rc = MQTTProtocol_startPublish(command->client->c, p, command->command.details.pub.qos, command->command.details.pub.retained, &msg);
+
+		if (command->command.details.pub.qos == 0)
+		{
+			if (rc == TCPSOCKET_COMPLETE)
+			{
+				if (command->command.onSuccess)
+				{
+					MQTTAsync_successData data;
+
+					data.token = command->command.token;
+					data.alt.pub.destinationName = command->command.details.pub.destinationName;
+					data.alt.pub.message.payload = command->command.details.pub.payload;
+					data.alt.pub.message.payloadlen = command->command.details.pub.payloadlen;
+					data.alt.pub.message.qos = command->command.details.pub.qos;
+					data.alt.pub.message.retained = command->command.details.pub.retained;
+					Log(TRACE_MIN, -1, "Calling publish success for client %s", command->client->c->clientID);
+					(*(command->command.onSuccess))(command->command.context, &data);
+				}
+				else if (command->command.onSuccess5)
+				{
+					MQTTAsync_successData5 data = MQTTAsync_successData5_initializer;
+
+					data.token = command->command.token;
+					data.alt.pub.destinationName = command->command.details.pub.destinationName;
+					data.alt.pub.message.payload = command->command.details.pub.payload;
+					data.alt.pub.message.payloadlen = command->command.details.pub.payloadlen;
+					data.alt.pub.message.qos = command->command.details.pub.qos;
+					data.alt.pub.message.retained = command->command.details.pub.retained;
+					data.properties = command->command.properties;
+					Log(TRACE_MIN, -1, "Calling publish success for client %s", command->client->c->clientID);
+					(*(command->command.onSuccess5))(command->command.context, &data);
+				}
+			}
+			else
+			{
+				if (rc != SOCKET_ERROR)
+				  command->command.details.pub.destinationName = NULL; /* this will be freed by the protocol code */
+				command->client->pending_write = &command->command;
+			}
+		}
+		else
+			command->command.details.pub.destinationName = NULL; /* this will be freed by the protocol code */
+		free(p); /* should this be done if the write isn't complete? */
+	}
+	else if (command->command.type == DISCONNECT)
+	{
+		if (command->client->c->connect_state != NOT_IN_PROGRESS || command->client->c->connected != 0)
+		{
+			if (command->client->c->connect_state != NOT_IN_PROGRESS)
+			{
+				command->client->c->connect_state = DISCONNECTING;
+				if (command->client->connect.onFailure)
+				{
+					MQTTAsync_failureData data;
+
+					data.token = 0;
+					data.code = MQTTASYNC_OPERATION_INCOMPLETE;
+					data.message = NULL;
+					Log(TRACE_MIN, -1, "Calling connect failure for client %s", command->client->c->clientID);
+					(*(command->client->connect.onFailure))(command->client->connect.context, &data);
+				}
+				else if (command->client->connect.onFailure5)
+				{
+					MQTTAsync_failureData5 data;
+
+					data.token = 0;
+					data.code = MQTTASYNC_OPERATION_INCOMPLETE;
+					data.message = NULL;
+					Log(TRACE_MIN, -1, "Calling connect failure for client %s", command->client->c->clientID);
+					(*(command->client->connect.onFailure5))(command->client->connect.context, &data);
+				}
+			}
+			MQTTAsync_checkDisconnect(command->client, &command->command);
+		}
+	}
+
+	if (command->command.type == CONNECT && rc != SOCKET_ERROR && rc != MQTTASYNC_PERSISTENCE_ERROR)
+	{
+		command->client->connect = command->command;
+		MQTTAsync_freeCommand(command);
+	}
+	else if (command->command.type == DISCONNECT)
+	{
+		command->client->disconnect = command->command;
+		MQTTAsync_freeCommand(command);
+	}
+	else if (command->command.type == PUBLISH && command->command.details.pub.qos == 0 &&
+			rc != SOCKET_ERROR && rc != MQTTASYNC_PERSISTENCE_ERROR)
+	{
+		if (rc == TCPSOCKET_INTERRUPTED)
+			ListAppend(command->client->responses, command, sizeof(command));
+		else
+			MQTTAsync_freeCommand(command);
+	}
+	else if (rc == SOCKET_ERROR || rc == MQTTASYNC_PERSISTENCE_ERROR)
+	{
+		if (command->command.type == CONNECT)
+		{
+			MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+			MQTTAsync_disconnect(command->client, &opts); /* not "internal" because we don't want to call connection lost */
+			command->client->shouldBeConnected = 1; /* as above call is not "internal" we need to reset this */
+		}
+		else
+			MQTTAsync_disconnect_internal(command->client, 0);
+
+		if (command->command.type == CONNECT
+				&& MQTTAsync_checkConn(&command->command, command->client))
+		{
+			Log(TRACE_MIN, -1, "Connect failed, more to try");
+
+			if (command->client->c->MQTTVersion == MQTTVERSION_DEFAULT)
+			{
+				if (command->command.details.conn.MQTTVersion == MQTTVERSION_3_1)
+				{
+					command->command.details.conn.currentURI++;
+					command->command.details.conn.MQTTVersion = 	MQTTVERSION_DEFAULT;
+				}
+			} else
+				command->command.details.conn.currentURI++;
+
+			/* put the connect command back to the head of the command queue, using the next serverURI */
+			rc = MQTTAsync_addCommand(command,
+					sizeof(command->command.details.conn));
+		} else
+		{
+			if (command->command.onFailure)
+			{
+				MQTTAsync_failureData data;
+
+				data.token = 0;
+				data.code = rc;
+				data.message = NULL;
+				Log(TRACE_MIN, -1, "Calling command failure for client %s", command->client->c->clientID);
+				(*(command->command.onFailure))(command->command.context, &data);
+			}
+			else if (command->command.onFailure5)
+			{
+				MQTTAsync_failureData5 data = MQTTAsync_failureData5_initializer;
+
+				data.code = rc;
+				Log(TRACE_MIN, -1, "Calling command failure for client %s", command->client->c->clientID);
+				(*(command->command.onFailure5))(command->command.context, &data);
+			}
+			if (command->command.type == CONNECT)
+			{
+				command->client->connect = command->command;
+				MQTTAsync_startConnectRetry(command->client);
+			}
+			MQTTAsync_freeCommand(command);  /* free up the command if necessary */
+		}
+	}
+	else /* put the command into a waiting for response queue for each client, indexed by msgid */
+		ListAppend(command->client->responses, command, sizeof(command));
+
+exit:
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	rc = (command != NULL);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static void nextOrClose(MQTTAsyncs* m, int rc, char* message)
+{
+	FUNC_ENTRY;
+
+	if (MQTTAsync_checkConn(&m->connect, m))
+	{
+		MQTTAsync_queuedCommand* conn;
+
+		MQTTAsync_closeOnly(m->c, MQTTREASONCODE_SUCCESS, NULL);
+		/* put the connect command back to the head of the command queue, using the next serverURI */
+		conn = malloc(sizeof(MQTTAsync_queuedCommand));
+		memset(conn, '\0', sizeof(MQTTAsync_queuedCommand));
+		conn->client = m;
+		conn->command = m->connect;
+		Log(TRACE_MIN, -1, "Connect failed, more to try");
+
+		if (conn->client->c->MQTTVersion == MQTTVERSION_DEFAULT)
+		{
+			if (conn->command.details.conn.MQTTVersion == MQTTVERSION_3_1)
+			{
+				conn->command.details.conn.currentURI++;
+				conn->command.details.conn.MQTTVersion = MQTTVERSION_DEFAULT;
+			}
+		}
+		else
+			conn->command.details.conn.currentURI++;
+
+		MQTTAsync_addCommand(conn, sizeof(m->connect));
+	}
+	else
+	{
+		MQTTAsync_closeSession(m->c, MQTTREASONCODE_SUCCESS, NULL);
+		if (m->connect.onFailure)
+		{
+			MQTTAsync_failureData data;
+
+			data.token = 0;
+			data.code = rc;
+			data.message = message;
+			Log(TRACE_MIN, -1, "Calling connect failure for client %s", m->c->clientID);
+			(*(m->connect.onFailure))(m->connect.context, &data);
+		}
+		else if (m->connect.onFailure5)
+		{
+			MQTTAsync_failureData5 data = MQTTAsync_failureData5_initializer;
+
+			data.token = 0;
+			data.code = rc;
+			data.message = message;
+			Log(TRACE_MIN, -1, "Calling connect failure for client %s", m->c->clientID);
+			(*(m->connect.onFailure5))(m->connect.context, &data);
+		}
+		MQTTAsync_startConnectRetry(m);
+	}
+
+	FUNC_EXIT;
+}
+
+
+static void MQTTAsync_checkTimeouts(void)
+{
+	ListElement* current = NULL;
+	static time_t last = 0L;
+	time_t now;
+
+	FUNC_ENTRY;
+	time(&(now));
+	if (difftime(now, last) < 3)
+		goto exit;
+
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+	last = now;
+	while (ListNextElement(handles, &current))		/* for each client */
+	{
+		MQTTAsyncs* m = (MQTTAsyncs*)(current->content);
+
+		/* check disconnect timeout */
+		if (m->c->connect_state == DISCONNECTING)
+			MQTTAsync_checkDisconnect(m, &m->disconnect);
+
+		/* check connect timeout */
+		if (m->c->connect_state != NOT_IN_PROGRESS && MQTTAsync_elapsed(m->connect.start_time) > (m->connectTimeout * 1000))
+		{
+			nextOrClose(m, MQTTASYNC_FAILURE, "TCP connect timeout");
+			continue;
+		}
+
+		/* There was a section here that removed timed-out responses.  But if the command had completed and
+		 * there was a response, then we may as well report it, no?
+		 *
+		 * In any case, that section was disabled when automatic reconnect was implemented.
+		 */
+
+		if (m->automaticReconnect && m->retrying)
+		{
+			if (m->reconnectNow || MQTTAsync_elapsed(m->lastConnectionFailedTime) > (m->currentInterval * 1000))
+			{
+				/* to reconnect put the connect command to the head of the command queue */
+				MQTTAsync_queuedCommand* conn = malloc(sizeof(MQTTAsync_queuedCommand));
+				memset(conn, '\0', sizeof(MQTTAsync_queuedCommand));
+				conn->client = m;
+				conn->command = m->connect;
+	  			/* make sure that the version attempts are restarted */
+				if (m->c->MQTTVersion == MQTTVERSION_DEFAULT)
+					conn->command.details.conn.MQTTVersion = 0;
+				Log(TRACE_MIN, -1, "Automatically attempting to reconnect");
+				MQTTAsync_addCommand(conn, sizeof(m->connect));
+				m->reconnectNow = 0;
+			}
+		}
+	}
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+exit:
+	FUNC_EXIT;
+}
+
+
+static thread_return_type WINAPI MQTTAsync_sendThread(void* n)
+{
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+	sendThread_state = RUNNING;
+	sendThread_id = Thread_getid();
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	while (!tostop)
+	{
+		int rc;
+
+		while (commands->count > 0)
+		{
+			if (MQTTAsync_processCommand() == 0)
+				break;  /* no commands were processed, so go into a wait */
+		}
+#if !defined(WIN32) && !defined(WIN64)
+		if ((rc = Thread_wait_cond(send_cond, 1)) != 0 && rc != ETIMEDOUT)
+			Log(LOG_ERROR, -1, "Error %d waiting for condition variable", rc);
+#else
+		if ((rc = Thread_wait_sem(send_sem, 1000)) != 0 && rc != ETIMEDOUT)
+			Log(LOG_ERROR, -1, "Error %d waiting for semaphore", rc);
+#endif
+
+		MQTTAsync_checkTimeouts();
+	}
+	sendThread_state = STOPPING;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+	sendThread_state = STOPPED;
+	sendThread_id = 0;
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT;
+	return 0;
+}
+
+
+static void MQTTAsync_emptyMessageQueue(Clients* client)
+{
+	FUNC_ENTRY;
+	/* empty message queue */
+	if (client->messageQueue->count > 0)
+	{
+		ListElement* current = NULL;
+		while (ListNextElement(client->messageQueue, &current))
+		{
+			qEntry* qe = (qEntry*)(current->content);
+			free(qe->topicName);
+			free(qe->msg->payload);
+			free(qe->msg);
+		}
+		ListEmpty(client->messageQueue);
+	}
+	FUNC_EXIT;
+}
+
+
+static void MQTTAsync_removeResponsesAndCommands(MQTTAsyncs* m)
+{
+	int count = 0;
+	ListElement* current = NULL;
+	ListElement *next = NULL;
+
+	FUNC_ENTRY;
+	if (m->responses)
+	{
+		ListElement* cur_response = NULL;
+
+		while (ListNextElement(m->responses, &cur_response))
+		{
+			MQTTAsync_queuedCommand* command = (MQTTAsync_queuedCommand*)(cur_response->content);
+
+			if (command->command.onFailure)
+			{
+				MQTTAsync_failureData data;
+
+				data.token = command->command.token;
+				data.code = MQTTASYNC_OPERATION_INCOMPLETE; /* interrupted return code */
+				data.message = NULL;
+
+				Log(TRACE_MIN, -1, "Calling %s failure for client %s",
+						MQTTPacket_name(command->command.type), m->c->clientID);
+				(*(command->command.onFailure))(command->command.context, &data);
+			}
+			else if (command->command.onFailure5)
+			{
+				MQTTAsync_failureData5 data = MQTTAsync_failureData5_initializer;
+
+				data.token = command->command.token;
+				data.code = MQTTASYNC_OPERATION_INCOMPLETE; /* interrupted return code */
+				data.message = NULL;
+
+				Log(TRACE_MIN, -1, "Calling %s failure for client %s",
+						MQTTPacket_name(command->command.type), m->c->clientID);
+				(*(command->command.onFailure5))(command->command.context, &data);
+			}
+
+			MQTTAsync_freeCommand1(command);
+			count++;
+		}
+	}
+	ListEmpty(m->responses);
+	Log(TRACE_MINIMUM, -1, "%d responses removed for client %s", count, m->c->clientID);
+
+	/* remove commands in the command queue relating to this client */
+	count = 0;
+	current = ListNextElement(commands, &next);
+	ListNextElement(commands, &next);
+	while (current)
+	{
+		MQTTAsync_queuedCommand* command = (MQTTAsync_queuedCommand*)(current->content);
+
+		if (command->client == m)
+		{
+			ListDetach(commands, command);
+
+			if (command->command.onFailure)
+			{
+				MQTTAsync_failureData data;
+
+				data.token = command->command.token;
+				data.code = MQTTASYNC_OPERATION_INCOMPLETE; /* interrupted return code */
+				data.message = NULL;
+
+				Log(TRACE_MIN, -1, "Calling %s failure for client %s",
+							MQTTPacket_name(command->command.type), m->c->clientID);
+					(*(command->command.onFailure))(command->command.context, &data);
+			}
+			else if (command->command.onFailure5)
+			{
+				MQTTAsync_failureData5 data = MQTTAsync_failureData5_initializer;
+
+				data.token = command->command.token;
+				data.code = MQTTASYNC_OPERATION_INCOMPLETE; /* interrupted return code */
+				data.message = NULL;
+
+				Log(TRACE_MIN, -1, "Calling %s failure for client %s",
+							MQTTPacket_name(command->command.type), m->c->clientID);
+					(*(command->command.onFailure5))(command->command.context, &data);
+			}
+
+			MQTTAsync_freeCommand(command);
+			count++;
+		}
+		current = next;
+		ListNextElement(commands, &next);
+	}
+	Log(TRACE_MINIMUM, -1, "%d commands removed for client %s", count, m->c->clientID);
+	FUNC_EXIT;
+}
+
+
+void MQTTAsync_destroy(MQTTAsync* handle)
+{
+	MQTTAsyncs* m = *handle;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+
+	if (m == NULL)
+		goto exit;
+
+	MQTTAsync_closeSession(m->c, MQTTREASONCODE_SUCCESS, NULL);
+
+	MQTTAsync_removeResponsesAndCommands(m);
+	ListFree(m->responses);
+
+	if (m->c)
+	{
+		int saved_socket = m->c->net.socket;
+		char* saved_clientid = MQTTStrdup(m->c->clientID);
+#if !defined(NO_PERSISTENCE)
+		MQTTPersistence_close(m->c);
+#endif
+		MQTTAsync_emptyMessageQueue(m->c);
+		MQTTProtocol_freeClient(m->c);
+		if (!ListRemove(bstate->clients, m->c))
+			Log(LOG_ERROR, 0, NULL);
+		else
+			Log(TRACE_MIN, 1, NULL, saved_clientid, saved_socket);
+		free(saved_clientid);
+	}
+
+	if (m->serverURI)
+		free(m->serverURI);
+	if (m->createOptions)
+		free(m->createOptions);
+	MQTTAsync_freeServerURIs(m);
+	if (m->connectProps)
+	{
+		MQTTProperties_free(m->connectProps);
+		free(m->connectProps);
+		m->connectProps = NULL;
+	}
+	if (m->willProps)
+	{
+		MQTTProperties_free(m->willProps);
+		free(m->willProps);
+		m->willProps = NULL;
+	}
+	if (!ListRemove(handles, m))
+		Log(LOG_ERROR, -1, "free error");
+	*handle = NULL;
+	if (bstate->clients->count == 0)
+		MQTTAsync_terminate();
+
+exit:
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT;
+}
+
+
+void MQTTAsync_freeMessage(MQTTAsync_message** message)
+{
+	FUNC_ENTRY;
+	MQTTProperties_free(&(*message)->properties);
+	free((*message)->payload);
+	free(*message);
+	*message = NULL;
+	FUNC_EXIT;
+}
+
+
+void MQTTAsync_free(void* memory)
+{
+	FUNC_ENTRY;
+	free(memory);
+	FUNC_EXIT;
+}
+
+
+static int MQTTAsync_completeConnection(MQTTAsyncs* m, Connack* connack)
+{
+	int rc = MQTTASYNC_FAILURE;
+
+	FUNC_ENTRY;
+	if (m->c->connect_state == WAIT_FOR_CONNACK) /* MQTT connect sent - wait for CONNACK */
+	{
+		Log(LOG_PROTOCOL, 1, NULL, m->c->net.socket, m->c->clientID, connack->rc);
+		if ((rc = connack->rc) == MQTTASYNC_SUCCESS)
+		{
+			m->retrying = 0;
+			m->c->connected = 1;
+			m->c->good = 1;
+			m->c->connect_state = NOT_IN_PROGRESS;
+			if (m->c->cleansession || m->c->cleanstart)
+				rc = MQTTAsync_cleanSession(m->c);
+			else if (m->c->MQTTVersion >= MQTTVERSION_3_1_1 && connack->flags.bits.sessionPresent == 0)
+			{
+				Log(LOG_PROTOCOL, -1, "Cleaning session state on connect because sessionPresent is 0");
+				rc = MQTTAsync_cleanSession(m->c);
+			}
+			if (m->c->outboundMsgs->count > 0)
+			{
+				ListElement* outcurrent = NULL;
+
+				while (ListNextElement(m->c->outboundMsgs, &outcurrent))
+				{
+					Messages* messages = (Messages*)(outcurrent->content);
+					messages->lastTouch = 0;
+				}
+				MQTTProtocol_retry((time_t)0, 1, 1);
+				if (m->c->connected != 1)
+					rc = MQTTASYNC_DISCONNECTED;
+			}
+		}
+		m->pack = NULL;
+#if !defined(WIN32) && !defined(WIN64)
+		Thread_signal_cond(send_cond);
+#else
+		Thread_post_sem(send_sem);
+#endif
+	}
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/* This is the thread function that handles the calling of callback functions if set */
+static thread_return_type WINAPI MQTTAsync_receiveThread(void* n)
+{
+	long timeout = 10L; /* first time in we have a small timeout.  Gets things started more quickly */
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+	receiveThread_state = RUNNING;
+	receiveThread_id = Thread_getid();
+	while (!tostop)
+	{
+		int rc = SOCKET_ERROR;
+		int sock = -1;
+		MQTTAsyncs* m = NULL;
+		MQTTPacket* pack = NULL;
+
+		MQTTAsync_unlock_mutex(mqttasync_mutex);
+		pack = MQTTAsync_cycle(&sock, timeout, &rc);
+		MQTTAsync_lock_mutex(mqttasync_mutex);
+		if (tostop)
+			break;
+		timeout = 1000L;
+
+		if (sock == 0)
+			continue;
+		/* find client corresponding to socket */
+		if (ListFindItem(handles, &sock, clientSockCompare) == NULL)
+		{
+			Log(TRACE_MINIMUM, -1, "Could not find client corresponding to socket %d", sock);
+			/* Socket_close(sock); - removing socket in this case is not necessary (Bug 442400) */
+			continue;
+		}
+		m = (MQTTAsyncs*)(handles->current->content);
+		if (m == NULL)
+		{
+			Log(LOG_ERROR, -1, "Client structure was NULL for socket %d - removing socket", sock);
+			Socket_close(sock);
+			continue;
+		}
+		if (rc == SOCKET_ERROR)
+		{
+			Log(TRACE_MINIMUM, -1, "Error from MQTTAsync_cycle() - removing socket %d", sock);
+			if (m->c->connected == 1)
+				MQTTAsync_disconnect_internal(m, 0);
+			else if (m->c->connect_state != NOT_IN_PROGRESS)
+				nextOrClose(m, rc, "socket error");
+			else /* calling disconnect_internal won't have any effect if we're already disconnected */
+				MQTTAsync_closeOnly(m->c, MQTTREASONCODE_SUCCESS, NULL);
+		}
+		else
+		{
+			if (m->c->messageQueue->count > 0)
+			{
+				qEntry* qe = (qEntry*)(m->c->messageQueue->first->content);
+				int topicLen = qe->topicLen;
+
+				if (strlen(qe->topicName) == topicLen)
+					topicLen = 0;
+
+				if (m->ma)
+					rc = MQTTAsync_deliverMessage(m, qe->topicName, topicLen, qe->msg);
+				else
+					rc = 1;
+
+				if (rc)
+				{
+#if !defined(NO_PERSISTENCE)
+					if (m->c->persistence)
+						MQTTPersistence_unpersistQueueEntry(m->c, (MQTTPersistence_qEntry*)qe);
+#endif
+					ListRemove(m->c->messageQueue, qe); /* qe is freed here */
+				}
+				else
+					Log(TRACE_MIN, -1, "False returned from messageArrived for client %s, message remains on queue",
+						m->c->clientID);
+			}
+			if (pack)
+			{
+				if (pack->header.bits.type == CONNACK)
+				{
+					Connack* connack = (Connack*)pack;
+					int sessionPresent = connack->flags.bits.sessionPresent;
+          
+					rc = MQTTAsync_completeConnection(m, connack);
+					if (rc == MQTTASYNC_SUCCESS)
+					{
+						int onSuccess = 0;
+						if (m->serverURIcount > 0)
+							Log(TRACE_MIN, -1, "Connect succeeded to %s",
+								m->serverURIs[m->connect.details.conn.currentURI]);
+						onSuccess = (m->connect.onSuccess != NULL ||
+								m->connect.onSuccess5 != NULL); /* save setting of onSuccess callback */
+						if (m->connect.onSuccess)
+						{
+							MQTTAsync_successData data;
+							memset(&data, '\0', sizeof(data));
+							Log(TRACE_MIN, -1, "Calling connect success for client %s", m->c->clientID);
+							if (m->serverURIcount > 0)
+								data.alt.connect.serverURI = m->serverURIs[m->connect.details.conn.currentURI];
+							else
+								data.alt.connect.serverURI = m->serverURI;
+							data.alt.connect.MQTTVersion = m->connect.details.conn.MQTTVersion;
+							data.alt.connect.sessionPresent = sessionPresent;
+							(*(m->connect.onSuccess))(m->connect.context, &data);
+							m->connect.onSuccess = NULL; /* don't accidentally call it again */
+						}
+						else if (m->connect.onSuccess5)
+						{
+							MQTTAsync_successData5 data = MQTTAsync_successData5_initializer;
+							Log(TRACE_MIN, -1, "Calling connect success for client %s", m->c->clientID);
+							if (m->serverURIcount > 0)
+								data.alt.connect.serverURI = m->serverURIs[m->connect.details.conn.currentURI];
+							else
+								data.alt.connect.serverURI = m->serverURI;
+							data.alt.connect.MQTTVersion = m->connect.details.conn.MQTTVersion;
+							data.alt.connect.sessionPresent = sessionPresent;
+							data.properties = connack->properties;
+							data.reasonCode = connack->rc;
+							(*(m->connect.onSuccess5))(m->connect.context, &data);
+							m->connect.onSuccess5 = NULL; /* don't accidentally call it again */
+						}
+						if (m->connected)
+						{
+							char* reason = (onSuccess) ? "connect onSuccess called" : "automatic reconnect";
+							Log(TRACE_MIN, -1, "Calling connected for client %s", m->c->clientID);
+							(*(m->connected))(m->connected_context, reason);
+						}
+						if (m->c->MQTTVersion >= MQTTVERSION_5)
+						{
+							if (MQTTProperties_hasProperty(&connack->properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM))
+							{
+								int recv_max = MQTTProperties_getNumericValue(&connack->properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM);
+								if (m->c->maxInflightMessages > recv_max)
+									m->c->maxInflightMessages = recv_max;
+							}
+						}
+						MQTTPacket_freeConnack(connack);
+					}
+					else
+						nextOrClose(m, rc, "CONNACK return code");
+				}
+				else if (pack->header.bits.type == SUBACK)
+				{
+					ListElement* current = NULL;
+
+					/* use the msgid to find the callback to be called */
+					while (ListNextElement(m->responses, &current))
+					{
+						MQTTAsync_queuedCommand* command = (MQTTAsync_queuedCommand*)(current->content);
+						if (command->command.token == ((Suback*)pack)->msgId)
+						{
+							Suback* sub = (Suback*)pack;
+							if (!ListDetach(m->responses, command)) /* remove the response from the list */
+								Log(LOG_ERROR, -1, "Subscribe command not removed from command list");
+
+							/* Call the failure callback if there is one subscribe in the MQTT packet and
+							 * the return code is 0x80 (failure).  If the MQTT packet contains >1 subscription
+							 * request, then we call onSuccess with the list of returned QoSs, which inelegantly,
+							 * could include some failures, or worse, the whole list could have failed.
+							 */
+							if (m->c->MQTTVersion >= MQTTVERSION_5)
+							{
+								if (sub->qoss->count == 1 && *(int*)(sub->qoss->first->content) >= MQTTREASONCODE_UNSPECIFIED_ERROR)
+								{
+									if (command->command.onFailure5)
+									{
+										MQTTAsync_failureData5 data = MQTTAsync_failureData5_initializer;
+
+										data.token = command->command.token;
+										data.reasonCode = *(int*)(sub->qoss->first->content);
+										data.message = NULL;
+										data.properties = sub->properties;
+										Log(TRACE_MIN, -1, "Calling subscribe failure for client %s", m->c->clientID);
+										(*(command->command.onFailure5))(command->command.context, &data);
+									}
+								}
+								else if (command->command.onSuccess5)
+								{
+									MQTTAsync_successData5 data;
+									enum MQTTReasonCodes* array = NULL;
+
+									data.reasonCode = *(int*)(sub->qoss->first->content);
+									data.alt.sub.reasonCodeCount = sub->qoss->count;
+									if (sub->qoss->count > 1)
+									{
+										ListElement* cur_qos = NULL;
+										enum MQTTReasonCodes* element = array = data.alt.sub.reasonCodes = malloc(sub->qoss->count * sizeof(enum MQTTReasonCodes));
+										while (ListNextElement(sub->qoss, &cur_qos))
+											*element++ = *(int*)(cur_qos->content);
+									}
+									data.token = command->command.token;
+									data.properties = sub->properties;
+									Log(TRACE_MIN, -1, "Calling subscribe success for client %s", m->c->clientID);
+									(*(command->command.onSuccess5))(command->command.context, &data);
+									if (array)
+										free(array);
+								}
+							}
+							else if (sub->qoss->count == 1 && *(int*)(sub->qoss->first->content) == MQTT_BAD_SUBSCRIBE)
+							{
+								if (command->command.onFailure)
+								{
+									MQTTAsync_failureData data;
+
+									data.token = command->command.token;
+									data.code = *(int*)(sub->qoss->first->content);
+									data.message = NULL;
+									Log(TRACE_MIN, -1, "Calling subscribe failure for client %s", m->c->clientID);
+									(*(command->command.onFailure))(command->command.context, &data);
+								}
+							}
+							else if (command->command.onSuccess)
+							{
+								MQTTAsync_successData data;
+								int* array = NULL;
+
+								if (sub->qoss->count == 1)
+									data.alt.qos = *(int*)(sub->qoss->first->content);
+								else if (sub->qoss->count > 1)
+								{
+									ListElement* cur_qos = NULL;
+									int* element = array = data.alt.qosList = malloc(sub->qoss->count * sizeof(int));
+									while (ListNextElement(sub->qoss, &cur_qos))
+										*element++ = *(int*)(cur_qos->content);
+								}
+								data.token = command->command.token;
+								Log(TRACE_MIN, -1, "Calling subscribe success for client %s", m->c->clientID);
+								(*(command->command.onSuccess))(command->command.context, &data);
+								if (array)
+									free(array);
+							}
+							MQTTAsync_freeCommand(command);
+							break;
+						}
+					}
+					rc = MQTTProtocol_handleSubacks(pack, m->c->net.socket);
+				}
+				else if (pack->header.bits.type == UNSUBACK)
+				{
+					ListElement* current = NULL;
+					Unsuback* unsub = (Unsuback*)pack;
+
+					/* use the msgid to find the callback to be called */
+					while (ListNextElement(m->responses, &current))
+					{
+						MQTTAsync_queuedCommand* command = (MQTTAsync_queuedCommand*)(current->content);
+						if (command->command.token == ((Unsuback*)pack)->msgId)
+						{
+							if (!ListDetach(m->responses, command)) /* remove the response from the list */
+								Log(LOG_ERROR, -1, "Unsubscribe command not removed from command list");
+							if (command->command.onSuccess || command->command.onSuccess5)
+							{
+								Log(TRACE_MIN, -1, "Calling unsubscribe success for client %s", m->c->clientID);
+								if (command->command.onSuccess)
+								{
+									MQTTAsync_successData data;
+
+									memset(&data, '\0', sizeof(data));
+									data.token = command->command.token;
+									(*(command->command.onSuccess))(command->command.context, &data);
+								}
+								else
+								{
+									MQTTAsync_successData5 data = MQTTAsync_successData5_initializer;
+									enum MQTTReasonCodes* array = NULL;
+
+									data.reasonCode = *(enum MQTTReasonCodes*)(unsub->reasonCodes->first->content);
+									data.alt.unsub.reasonCodeCount = unsub->reasonCodes->count;
+									if (unsub->reasonCodes->count > 1)
+									{
+										ListElement* cur_rc = NULL;
+										enum MQTTReasonCodes* element = array = data.alt.unsub.reasonCodes = malloc(unsub->reasonCodes->count * sizeof(enum MQTTReasonCodes));
+										while (ListNextElement(unsub->reasonCodes, &cur_rc))
+											*element++ = *(enum MQTTReasonCodes*)(cur_rc->content);
+									}
+									data.token = command->command.token;
+									data.properties = unsub->properties;
+									Log(TRACE_MIN, -1, "Calling unsubscribe success for client %s", m->c->clientID);
+									(*(command->command.onSuccess5))(command->command.context, &data);
+									if (array)
+										free(array);
+								}
+							}
+							MQTTAsync_freeCommand(command);
+							break;
+						}
+					}
+					rc = MQTTProtocol_handleUnsubacks(pack, m->c->net.socket);
+				}
+				else if (pack->header.bits.type == DISCONNECT)
+				{
+					Ack* disc = (Ack*)pack;
+
+					if (m->disconnected)
+					{
+						Log(TRACE_MIN, -1, "Calling disconnected for client %s", m->c->clientID);
+						(*(m->disconnected))(m->disconnected_context, &disc->properties, disc->rc);
+					}
+					MQTTPacket_freeAck(disc);
+				}
+			}
+		}
+	}
+	receiveThread_state = STOPPED;
+	receiveThread_id = 0;
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+#if !defined(WIN32) && !defined(WIN64)
+	if (sendThread_state != STOPPED)
+		Thread_signal_cond(send_cond);
+#else
+	if (sendThread_state != STOPPED)
+		Thread_post_sem(send_sem);
+#endif
+	FUNC_EXIT;
+	return 0;
+}
+
+
+static void MQTTAsync_stop(void)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if (sendThread_state != STOPPED || receiveThread_state != STOPPED)
+	{
+		int conn_count = 0;
+		ListElement* current = NULL;
+
+		if (handles != NULL)
+		{
+			/* find out how many handles are still connected */
+			while (ListNextElement(handles, &current))
+			{
+				if (((MQTTAsyncs*)(current->content))->c->connect_state > NOT_IN_PROGRESS ||
+						((MQTTAsyncs*)(current->content))->c->connected)
+					++conn_count;
+			}
+		}
+		Log(TRACE_MIN, -1, "Conn_count is %d", conn_count);
+		/* stop the background thread, if we are the last one to be using it */
+		if (conn_count == 0)
+		{
+			int count = 0;
+			tostop = 1;
+			while ((sendThread_state != STOPPED || receiveThread_state != STOPPED) && ++count < 100)
+			{
+				MQTTAsync_unlock_mutex(mqttasync_mutex);
+				Log(TRACE_MIN, -1, "sleeping");
+				MQTTAsync_sleep(100L);
+				MQTTAsync_lock_mutex(mqttasync_mutex);
+			}
+			rc = 1;
+			tostop = 0;
+		}
+	}
+	FUNC_EXIT_RC(rc);
+}
+
+
+int MQTTAsync_setCallbacks(MQTTAsync handle, void* context,
+									MQTTAsync_connectionLost* cl,
+									MQTTAsync_messageArrived* ma,
+									MQTTAsync_deliveryComplete* dc)
+{
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsyncs* m = handle;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+
+	if (m == NULL || ma == NULL || m->c == NULL || m->c->connect_state != NOT_IN_PROGRESS)
+		rc = MQTTASYNC_FAILURE;
+	else
+	{
+		m->clContext = m->maContext = m->dcContext = context;
+		m->cl = cl;
+		m->ma = ma;
+		m->dc = dc;
+	}
+
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+int MQTTAsync_setConnectionLostCallback(MQTTAsync handle, void* context, 
+										MQTTAsync_connectionLost* cl)
+{
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsyncs* m = handle;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+
+	if (m == NULL || m->c->connect_state != 0)
+		rc = MQTTASYNC_FAILURE;
+	else
+	{
+		m->clContext = context;
+		m->cl = cl;
+	}
+
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTAsync_setMessageArrivedCallback(MQTTAsync handle, void* context, 
+										MQTTAsync_messageArrived* ma)
+{
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsyncs* m = handle;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+
+	if (m == NULL || ma == NULL || m->c->connect_state != 0)
+		rc = MQTTASYNC_FAILURE;
+	else
+	{
+		m->maContext = context;
+		m->ma = ma;
+	}
+
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+int MQTTAsync_setDeliveryCompleteCallback(MQTTAsync handle, void* context, 
+										  MQTTAsync_deliveryComplete* dc)
+{
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsyncs* m = handle;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+
+	if (m == NULL || m->c->connect_state != 0)
+		rc = MQTTASYNC_FAILURE;
+	else
+	{
+		m->dcContext = context;
+		m->dc = dc;
+	}
+
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+
+int MQTTAsync_setDisconnected(MQTTAsync handle, void* context, MQTTAsync_disconnected* disconnected)
+{
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsyncs* m = handle;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+
+	if (m == NULL || m->c->connect_state != NOT_IN_PROGRESS)
+		rc = MQTTASYNC_FAILURE;
+	else
+	{
+		m->disconnected_context = context;
+		m->disconnected = disconnected;
+	}
+
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTAsync_setConnected(MQTTAsync handle, void* context, MQTTAsync_connected* connected)
+{
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsyncs* m = handle;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+
+	if (m == NULL || m->c->connect_state != NOT_IN_PROGRESS)
+		rc = MQTTASYNC_FAILURE;
+	else
+	{
+		m->connected_context = context;
+		m->connected = connected;
+	}
+
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static void MQTTAsync_closeOnly(Clients* client, enum MQTTReasonCodes reasonCode, MQTTProperties* props)
+{
+	FUNC_ENTRY;
+	client->good = 0;
+	client->ping_outstanding = 0;
+	if (client->net.socket > 0)
+	{
+		MQTTProtocol_checkPendingWrites();
+		if (client->connected && Socket_noPendingWrites(client->net.socket))
+			MQTTPacket_send_disconnect(client, reasonCode, props);
+		Thread_lock_mutex(socket_mutex);
+		WebSocket_close(&client->net, WebSocket_CLOSE_NORMAL, NULL);
+#if defined(OPENSSL)
+		SSLSocket_close(&client->net);
+#endif
+		Socket_close(client->net.socket);
+		client->net.socket = 0;
+#if defined(OPENSSL)
+		client->net.ssl = NULL;
+#endif
+		Thread_unlock_mutex(socket_mutex);
+	}
+	client->connected = 0;
+	client->connect_state = NOT_IN_PROGRESS;
+	FUNC_EXIT;
+}
+
+
+static void MQTTAsync_closeSession(Clients* client, enum MQTTReasonCodes reasonCode, MQTTProperties* props)
+{
+	FUNC_ENTRY;
+	MQTTAsync_closeOnly(client, reasonCode, props);
+
+	if (client->cleansession ||
+			(client->MQTTVersion >= MQTTVERSION_5 && client->sessionExpiry == 0))
+		MQTTAsync_cleanSession(client);
+
+	FUNC_EXIT;
+}
+
+
+/**
+ * List callback function for comparing clients by client structure
+ * @param a Async structure
+ * @param b Client structure
+ * @return boolean indicating whether a and b are equal
+ */
+static int clientStructCompare(void* a, void* b)
+{
+	MQTTAsyncs* m = (MQTTAsyncs*)a;
+	return m->c == (Clients*)b;
+}
+
+
+static int MQTTAsync_cleanSession(Clients* client)
+{
+	int rc = 0;
+	ListElement* found = NULL;
+
+	FUNC_ENTRY;
+#if !defined(NO_PERSISTENCE)
+	rc = MQTTPersistence_clear(client);
+#endif
+	MQTTProtocol_emptyMessageList(client->inboundMsgs);
+	MQTTProtocol_emptyMessageList(client->outboundMsgs);
+	MQTTAsync_emptyMessageQueue(client);
+	client->msgID = 0;
+
+	if ((found = ListFindItem(handles, client, clientStructCompare)) != NULL)
+	{
+		MQTTAsyncs* m = (MQTTAsyncs*)(found->content);
+		MQTTAsync_removeResponsesAndCommands(m);
+	}
+	else
+		Log(LOG_ERROR, -1, "cleanSession: did not find client structure in handles list");
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static int MQTTAsync_deliverMessage(MQTTAsyncs* m, char* topicName, size_t topicLen, MQTTAsync_message* mm)
+{
+	int rc;
+
+	Log(TRACE_MIN, -1, "Calling messageArrived for client %s, queue depth %d",
+					m->c->clientID, m->c->messageQueue->count);
+	rc = (*(m->ma))(m->maContext, topicName, (int)topicLen, mm);
+	/* if 0 (false) is returned by the callback then it failed, so we don't remove the message from
+	 * the queue, and it will be retried later.  If 1 is returned then the message data may have been freed,
+	 * so we must be careful how we use it.
+	 */
+	return rc;
+}
+
+
+void Protocol_processPublication(Publish* publish, Clients* client)
+{
+	MQTTAsync_message* mm = NULL;
+	MQTTAsync_message initialized = MQTTAsync_message_initializer;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	mm = malloc(sizeof(MQTTAsync_message));
+	memcpy(mm, &initialized, sizeof(MQTTAsync_message));
+
+	/* If the message is QoS 2, then we have already stored the incoming payload
+	 * in an allocated buffer, so we don't need to copy again.
+	 */
+	if (publish->header.bits.qos == 2)
+		mm->payload = publish->payload;
+	else
+	{
+		mm->payload = malloc(publish->payloadlen);
+		memcpy(mm->payload, publish->payload, publish->payloadlen);
+	}
+
+	mm->payloadlen = publish->payloadlen;
+	mm->qos = publish->header.bits.qos;
+	mm->retained = publish->header.bits.retain;
+	if (publish->header.bits.qos == 2)
+		mm->dup = 0;  /* ensure that a QoS2 message is not passed to the application with dup = 1 */
+	else
+		mm->dup = publish->header.bits.dup;
+	mm->msgid = publish->msgId;
+
+	if (publish->MQTTVersion >= MQTTVERSION_5)
+		mm->properties = MQTTProperties_copy(&publish->properties);
+
+	if (client->messageQueue->count == 0 && client->connected)
+	{
+		ListElement* found = NULL;
+
+		if ((found = ListFindItem(handles, client, clientStructCompare)) == NULL)
+			Log(LOG_ERROR, -1, "processPublication: did not find client structure in handles list");
+		else
+		{
+			MQTTAsyncs* m = (MQTTAsyncs*)(found->content);
+
+			if (m->ma)
+				rc = MQTTAsync_deliverMessage(m, publish->topic, publish->topiclen, mm);
+		}
+	}
+
+	if (rc == 0) /* if message was not delivered, queue it up */
+	{
+		qEntry* qe = malloc(sizeof(qEntry));
+		qe->msg = mm;
+		qe->topicName = publish->topic;
+		qe->topicLen = publish->topiclen;
+		ListAppend(client->messageQueue, qe, sizeof(qe) + sizeof(mm) + mm->payloadlen + strlen(qe->topicName)+1);
+#if !defined(NO_PERSISTENCE)
+		if (client->persistence)
+			MQTTPersistence_persistQueueEntry(client, (MQTTPersistence_qEntry*)qe);
+#endif
+	}
+	publish->topic = NULL;
+	FUNC_EXIT;
+}
+
+
+static int retryLoopInterval = 5;
+
+static void setRetryLoopInterval(int keepalive)
+{
+	int proposed = keepalive / 10;
+
+	if (proposed < 1)
+		proposed = 1;
+	else if (proposed > 5)
+		proposed = 5;
+	if (proposed < retryLoopInterval)
+		retryLoopInterval = proposed;
+}
+
+
+int MQTTAsync_connect(MQTTAsync handle, const MQTTAsync_connectOptions* options)
+{
+	MQTTAsyncs* m = handle;
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsync_queuedCommand* conn;
+
+	FUNC_ENTRY;
+	if (options == NULL)
+	{
+		rc = MQTTASYNC_NULL_PARAMETER;
+		goto exit;
+	}
+
+	if (strncmp(options->struct_id, "MQTC", 4) != 0 || options->struct_version < 0 || options->struct_version > 6)
+	{
+		rc = MQTTASYNC_BAD_STRUCTURE;
+		goto exit;
+	}
+
+#if defined(OPENSSL)
+	if (m->ssl && options->ssl == NULL)
+	{
+		rc = MQTTCLIENT_NULL_PARAMETER;
+		goto exit;
+	}
+#endif
+
+	if (options->will) /* check validity of will options structure */
+	{
+		if (strncmp(options->will->struct_id, "MQTW", 4) != 0 || (options->will->struct_version != 0 && options->will->struct_version != 1))
+		{
+			rc = MQTTASYNC_BAD_STRUCTURE;
+			goto exit;
+		}
+		if (options->will->qos < 0 || options->will->qos > 2)
+		{
+			rc = MQTTASYNC_BAD_QOS;
+			goto exit;
+		}
+	}
+	if (options->struct_version != 0 && options->ssl) /* check validity of SSL options structure */
+	{
+		if (strncmp(options->ssl->struct_id, "MQTS", 4) != 0 || options->ssl->struct_version < 0 || options->ssl->struct_version > 4)
+		{
+			rc = MQTTASYNC_BAD_STRUCTURE;
+			goto exit;
+		}
+	}
+	if (options->MQTTVersion >= MQTTVERSION_5 && m->c->MQTTVersion < MQTTVERSION_5)
+	{
+		rc = MQTTASYNC_WRONG_MQTT_VERSION;
+		goto exit;
+	}
+	if ((options->username && !UTF8_validateString(options->username)) ||
+		(options->password && !UTF8_validateString(options->password)))
+	{
+		rc = MQTTASYNC_BAD_UTF8_STRING;
+		goto exit;
+	}
+	if (options->MQTTVersion >= MQTTVERSION_5 && options->struct_version < 6)
+	{
+		rc = MQTTASYNC_BAD_STRUCTURE;
+		goto exit;
+	}
+	if (options->MQTTVersion >= MQTTVERSION_5 && options->cleansession != 0)
+	{
+		rc = MQTTASYNC_BAD_MQTT_OPTION;
+		goto exit;
+	}
+	if (options->MQTTVersion < MQTTVERSION_5 && options->struct_version >= 6)
+	{
+		if (options->cleanstart != 0 || options->onFailure5 || options->onSuccess5 ||
+				options->connectProperties || options->willProperties)
+		{
+			rc = MQTTASYNC_BAD_MQTT_OPTION;
+			goto exit;
+		}
+	}
+
+	m->connect.onSuccess = options->onSuccess;
+	m->connect.onFailure = options->onFailure;
+	if (options->struct_version >= 6)
+	{
+		m->connect.onSuccess5 = options->onSuccess5;
+		m->connect.onFailure5 = options->onFailure5;
+	}
+	m->connect.context = options->context;
+	m->connectTimeout = options->connectTimeout;
+
+	tostop = 0;
+	if (sendThread_state != STARTING && sendThread_state != RUNNING)
+	{
+		MQTTAsync_lock_mutex(mqttasync_mutex);
+		sendThread_state = STARTING;
+		Thread_start(MQTTAsync_sendThread, NULL);
+		MQTTAsync_unlock_mutex(mqttasync_mutex);
+	}
+	if (receiveThread_state != STARTING && receiveThread_state != RUNNING)
+	{
+		MQTTAsync_lock_mutex(mqttasync_mutex);
+		receiveThread_state = STARTING;
+		Thread_start(MQTTAsync_receiveThread, handle);
+		MQTTAsync_unlock_mutex(mqttasync_mutex);
+	}
+
+	m->c->keepAliveInterval = options->keepAliveInterval;
+	setRetryLoopInterval(options->keepAliveInterval);
+	m->c->cleansession = options->cleansession;
+	m->c->maxInflightMessages = options->maxInflight;
+	if (options->struct_version >= 3)
+		m->c->MQTTVersion = options->MQTTVersion;
+	else
+		m->c->MQTTVersion = MQTTVERSION_DEFAULT;
+	if (options->struct_version >= 4)
+	{
+		m->automaticReconnect = options->automaticReconnect;
+		m->minRetryInterval = options->minRetryInterval;
+		m->maxRetryInterval = options->maxRetryInterval;
+	}
+
+	if (m->c->will)
+	{
+		free(m->c->will->payload);
+		free(m->c->will->topic);
+		free(m->c->will);
+		m->c->will = NULL;
+	}
+
+	if (options->will && (options->will->struct_version == 0 || options->will->struct_version == 1))
+	{
+		const void* source = NULL;
+
+		m->c->will = malloc(sizeof(willMessages));
+		if (options->will->message || (options->will->struct_version == 1 && options->will->payload.data))
+		{
+			if (options->will->struct_version == 1 && options->will->payload.data)
+			{
+				m->c->will->payloadlen = options->will->payload.len;
+				source = options->will->payload.data;
+			}
+			else
+			{
+				m->c->will->payloadlen = (int)strlen(options->will->message);
+				source = (void*)options->will->message;
+			}
+			m->c->will->payload = malloc(m->c->will->payloadlen);
+			memcpy(m->c->will->payload, source, m->c->will->payloadlen);
+		}
+		else
+		{
+			m->c->will->payload = NULL;
+			m->c->will->payloadlen = 0;
+		}
+		m->c->will->qos = options->will->qos;
+		m->c->will->retained = options->will->retained;
+		m->c->will->topic = MQTTStrdup(options->will->topicName);
+	}
+
+#if defined(OPENSSL)
+	if (m->c->sslopts)
+	{
+		if (m->c->sslopts->trustStore)
+			free((void*)m->c->sslopts->trustStore);
+		if (m->c->sslopts->keyStore)
+			free((void*)m->c->sslopts->keyStore);
+		if (m->c->sslopts->privateKey)
+			free((void*)m->c->sslopts->privateKey);
+		if (m->c->sslopts->privateKeyPassword)
+			free((void*)m->c->sslopts->privateKeyPassword);
+		if (m->c->sslopts->enabledCipherSuites)
+			free((void*)m->c->sslopts->enabledCipherSuites);
+		if (m->c->sslopts->struct_version >= 2)
+		{
+			if (m->c->sslopts->CApath)
+				free((void*)m->c->sslopts->CApath);
+		}
+		free((void*)m->c->sslopts);
+		m->c->sslopts = NULL;
+	}
+
+	if (options->struct_version != 0 && options->ssl)
+	{
+		m->c->sslopts = malloc(sizeof(MQTTClient_SSLOptions));
+		memset(m->c->sslopts, '\0', sizeof(MQTTClient_SSLOptions));
+		m->c->sslopts->struct_version = options->ssl->struct_version;
+		if (options->ssl->trustStore)
+			m->c->sslopts->trustStore = MQTTStrdup(options->ssl->trustStore);
+		if (options->ssl->keyStore)
+			m->c->sslopts->keyStore = MQTTStrdup(options->ssl->keyStore);
+		if (options->ssl->privateKey)
+			m->c->sslopts->privateKey = MQTTStrdup(options->ssl->privateKey);
+		if (options->ssl->privateKeyPassword)
+			m->c->sslopts->privateKeyPassword = MQTTStrdup(options->ssl->privateKeyPassword);
+		if (options->ssl->enabledCipherSuites)
+			m->c->sslopts->enabledCipherSuites = MQTTStrdup(options->ssl->enabledCipherSuites);
+		m->c->sslopts->enableServerCertAuth = options->ssl->enableServerCertAuth;
+		if (m->c->sslopts->struct_version >= 1)
+			m->c->sslopts->sslVersion = options->ssl->sslVersion;
+		if (m->c->sslopts->struct_version >= 2)
+		{
+			m->c->sslopts->verify = options->ssl->verify;
+			if (options->ssl->CApath)
+				m->c->sslopts->CApath = MQTTStrdup(options->ssl->CApath);
+		}
+		if (m->c->sslopts->struct_version >= 3)
+		{
+			m->c->sslopts->ssl_error_cb = options->ssl->ssl_error_cb;
+			m->c->sslopts->ssl_error_context = options->ssl->ssl_error_context;
+		}
+		if (m->c->sslopts->struct_version >= 4)
+		{
+			m->c->sslopts->ssl_psk_cb = options->ssl->ssl_psk_cb;
+			m->c->sslopts->ssl_psk_context = options->ssl->ssl_psk_context;
+			m->c->sslopts->disableDefaultTrustStore = options->ssl->disableDefaultTrustStore;
+		}
+	}
+#else
+	if (options->struct_version != 0 && options->ssl)
+	{
+		rc = MQTTASYNC_SSL_NOT_SUPPORTED;
+		goto exit;
+	}
+#endif
+
+	if (m->c->username)
+		free((void*)m->c->username);
+	if (options->username)
+		m->c->username = MQTTStrdup(options->username);
+	if (m->c->password)
+		free((void*)m->c->password);
+	if (options->password)
+	{
+		m->c->password = MQTTStrdup(options->password);
+		m->c->passwordlen = (int)strlen(options->password);
+	}
+	else if (options->struct_version >= 5 && options->binarypwd.data)
+	{
+		m->c->passwordlen = options->binarypwd.len;
+		m->c->password = malloc(m->c->passwordlen);
+		memcpy((void*)m->c->password, options->binarypwd.data, m->c->passwordlen);
+	}
+
+	m->c->retryInterval = options->retryInterval;
+	m->shouldBeConnected = 1;
+
+	m->connectTimeout = options->connectTimeout;
+
+	MQTTAsync_freeServerURIs(m);
+	if (options->struct_version >= 2 && options->serverURIcount > 0)
+	{
+		int i;
+
+		m->serverURIcount = options->serverURIcount;
+		m->serverURIs = malloc(options->serverURIcount * sizeof(char*));
+		for (i = 0; i < options->serverURIcount; ++i)
+			m->serverURIs[i] = MQTTStrdup(options->serverURIs[i]);
+	}
+
+	if (m->connectProps)
+	{
+		MQTTProperties_free(m->connectProps);
+		free(m->connectProps);
+		m->connectProps = NULL;
+	}
+	if (m->willProps)
+	{
+		MQTTProperties_free(m->willProps);
+		free(m->willProps);
+		m->willProps = NULL;
+	}
+	if (options->struct_version >=6)
+	{
+		if (options->connectProperties)
+		{
+			MQTTProperties initialized = MQTTProperties_initializer;
+
+			m->connectProps = malloc(sizeof(MQTTProperties));
+			*m->connectProps = initialized;
+			*m->connectProps = MQTTProperties_copy(options->connectProperties);
+
+			if (MQTTProperties_hasProperty(options->connectProperties, MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL))
+				m->c->sessionExpiry = MQTTProperties_getNumericValue(options->connectProperties,
+						MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL);
+
+		}
+		if (options->willProperties)
+		{
+			MQTTProperties initialized = MQTTProperties_initializer;
+
+			m->willProps = malloc(sizeof(MQTTProperties));
+			*m->willProps = initialized;
+			*m->willProps = MQTTProperties_copy(options->willProperties);
+		}
+		m->c->cleanstart = options->cleanstart;
+	}
+
+	/* Add connect request to operation queue */
+	conn = malloc(sizeof(MQTTAsync_queuedCommand));
+	memset(conn, '\0', sizeof(MQTTAsync_queuedCommand));
+	conn->client = m;
+	if (options)
+	{
+		conn->command.onSuccess = options->onSuccess;
+		conn->command.onFailure = options->onFailure;
+		conn->command.onSuccess5 = options->onSuccess5;
+		conn->command.onFailure5 = options->onFailure5;
+		conn->command.context = options->context;
+	}
+	conn->command.type = CONNECT;
+	conn->command.details.conn.currentURI = 0;
+	rc = MQTTAsync_addCommand(conn, sizeof(conn));
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static int MQTTAsync_disconnect1(MQTTAsync handle, const MQTTAsync_disconnectOptions* options, int internal)
+{
+	MQTTAsyncs* m = handle;
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsync_queuedCommand* dis;
+
+	FUNC_ENTRY;
+	if (m == NULL || m->c == NULL)
+	{
+		rc = MQTTASYNC_FAILURE;
+		goto exit;
+	}
+	if (!internal)
+		m->shouldBeConnected = 0;
+	if (m->c->connected == 0)
+	{
+		rc = MQTTASYNC_DISCONNECTED;
+		goto exit;
+	}
+
+	/* Add disconnect request to operation queue */
+	dis = malloc(sizeof(MQTTAsync_queuedCommand));
+	memset(dis, '\0', sizeof(MQTTAsync_queuedCommand));
+	dis->client = m;
+	if (options)
+	{
+		dis->command.onSuccess = options->onSuccess;
+		dis->command.onFailure = options->onFailure;
+		dis->command.onSuccess5 = options->onSuccess5;
+		dis->command.onFailure5 = options->onFailure5;
+		dis->command.context = options->context;
+		dis->command.details.dis.timeout = options->timeout;
+		if (m->c->MQTTVersion >= MQTTVERSION_5 && options->struct_version >= 1)
+		{
+			dis->command.properties = MQTTProperties_copy(&options->properties);
+			dis->command.details.dis.reasonCode = options->reasonCode;
+		}
+	}
+	dis->command.type = DISCONNECT;
+	dis->command.details.dis.internal = internal;
+	rc = MQTTAsync_addCommand(dis, sizeof(dis));
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static int MQTTAsync_disconnect_internal(MQTTAsync handle, int timeout)
+{
+	MQTTAsync_disconnectOptions options = MQTTAsync_disconnectOptions_initializer;
+
+	options.timeout = timeout;
+	return MQTTAsync_disconnect1(handle, &options, 1);
+}
+
+
+void MQTTProtocol_closeSession(Clients* c, int sendwill)
+{
+	MQTTAsync_disconnect_internal((MQTTAsync)c->context, 0);
+}
+
+
+int MQTTAsync_disconnect(MQTTAsync handle, const MQTTAsync_disconnectOptions* options)
+{
+	if (options != NULL && (strncmp(options->struct_id, "MQTD", 4) != 0 || options->struct_version < 0 || options->struct_version > 1))
+		return MQTTASYNC_BAD_STRUCTURE;
+	else
+		return MQTTAsync_disconnect1(handle, options, 0);
+}
+
+
+int MQTTAsync_isConnected(MQTTAsync handle)
+{
+	MQTTAsyncs* m = handle;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+	if (m && m->c)
+		rc = m->c->connected;
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static int cmdMessageIDCompare(void* a, void* b)
+{
+	MQTTAsync_queuedCommand* cmd = (MQTTAsync_queuedCommand*)a;
+	return cmd->command.token == *(int*)b;
+}
+
+
+/**
+ * Assign a new message id for a client.  Make sure it isn't already being used and does
+ * not exceed the maximum.
+ * @param m a client structure
+ * @return the next message id to use, or 0 if none available
+ */
+static int MQTTAsync_assignMsgId(MQTTAsyncs* m)
+{
+	int start_msgid = m->c->msgID;
+	int msgid = start_msgid;
+	thread_id_type thread_id = 0;
+	int locked = 0;
+
+	/* need to check: commands list and response list for a client */
+	FUNC_ENTRY;
+	/* We might be called in a callback. In which case, this mutex will be already locked. */
+	thread_id = Thread_getid();
+	if (thread_id != sendThread_id && thread_id != receiveThread_id)
+	{
+		MQTTAsync_lock_mutex(mqttasync_mutex);
+		locked = 1;
+	}
+
+	msgid = (msgid == MAX_MSG_ID) ? 1 : msgid + 1;
+	while (ListFindItem(commands, &msgid, cmdMessageIDCompare) ||
+			ListFindItem(m->responses, &msgid, cmdMessageIDCompare))
+	{
+		msgid = (msgid == MAX_MSG_ID) ? 1 : msgid + 1;
+		if (msgid == start_msgid)
+		{ /* we've tried them all - none free */
+			msgid = 0;
+			break;
+		}
+	}
+	if (msgid != 0)
+		m->c->msgID = msgid;
+	if (locked)
+		MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(msgid);
+	return msgid;
+}
+
+
+int MQTTAsync_subscribeMany(MQTTAsync handle, int count, char* const* topic, int* qos, MQTTAsync_responseOptions* response)
+{
+	MQTTAsyncs* m = handle;
+	int i = 0;
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsync_queuedCommand* sub;
+	int msgid = 0;
+
+	FUNC_ENTRY;
+	if (m == NULL || m->c == NULL)
+		rc = MQTTASYNC_FAILURE;
+	else if (m->c->connected == 0)
+		rc = MQTTASYNC_DISCONNECTED;
+	else for (i = 0; i < count; i++)
+	{
+		if (!UTF8_validateString(topic[i]))
+		{
+			rc = MQTTASYNC_BAD_UTF8_STRING;
+			break;
+		}
+		if (qos[i] < 0 || qos[i] > 2)
+		{
+			rc = MQTTASYNC_BAD_QOS;
+			break;
+		}
+	}
+	if (rc != MQTTASYNC_SUCCESS)
+		; /* don't overwrite a previous error code */
+	else if ((msgid = MQTTAsync_assignMsgId(m)) == 0)
+		rc = MQTTASYNC_NO_MORE_MSGIDS;
+	else if (m->c->MQTTVersion >= MQTTVERSION_5 && count > 1 && (count != response->subscribeOptionsCount
+			&& response->subscribeOptionsCount != 0))
+		rc = MQTTASYNC_BAD_MQTT_OPTION;
+	else if (response)
+	{
+		if (m->c->MQTTVersion >= MQTTVERSION_5)
+		{
+			if (response->struct_version == 0 || response->onFailure || response->onSuccess)
+				rc = MQTTASYNC_BAD_MQTT_OPTION;
+		}
+		else if (m->c->MQTTVersion < MQTTVERSION_5)
+		{
+			if (response->struct_version >= 1 && (response->onFailure5 || response->onSuccess5))
+				rc = MQTTASYNC_BAD_MQTT_OPTION;
+		}
+	}
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	/* Add subscribe request to operation queue */
+	sub = malloc(sizeof(MQTTAsync_queuedCommand));
+	memset(sub, '\0', sizeof(MQTTAsync_queuedCommand));
+	sub->client = m;
+	sub->command.token = msgid;
+	if (response)
+	{
+		sub->command.onSuccess = response->onSuccess;
+		sub->command.onFailure = response->onFailure;
+		sub->command.onSuccess5 = response->onSuccess5;
+		sub->command.onFailure5 = response->onFailure5;
+		sub->command.context = response->context;
+		response->token = sub->command.token;
+		if (m->c->MQTTVersion >= MQTTVERSION_5)
+		{
+			sub->command.properties = MQTTProperties_copy(&response->properties);
+			sub->command.details.sub.opts = response->subscribeOptions;
+			if (count > 1)
+			{
+				sub->command.details.sub.optlist = malloc(sizeof(MQTTSubscribe_options) * count);
+				if (response->subscribeOptionsCount == 0)
+				{
+					MQTTSubscribe_options initialized = MQTTSubscribe_options_initializer;
+					for (i = 0; i < count; ++i)
+						sub->command.details.sub.optlist[i] = initialized;
+				}
+				else
+				{
+					for (i = 0; i < count; ++i)
+						sub->command.details.sub.optlist[i] = response->subscribeOptionsList[i];
+				}
+			}
+		}
+	}
+	sub->command.type = SUBSCRIBE;
+	sub->command.details.sub.count = count;
+	sub->command.details.sub.topics = malloc(sizeof(char*) * count);
+	sub->command.details.sub.qoss = malloc(sizeof(int) * count);
+	for (i = 0; i < count; ++i)
+	{
+		sub->command.details.sub.topics[i] = MQTTStrdup(topic[i]);
+		sub->command.details.sub.qoss[i] = qos[i];
+	}
+	rc = MQTTAsync_addCommand(sub, sizeof(sub));
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTAsync_subscribe(MQTTAsync handle, const char* topic, int qos, MQTTAsync_responseOptions* response)
+{
+	int rc = 0;
+	char *const topics[] = {(char*)topic};
+	FUNC_ENTRY;
+	rc = MQTTAsync_subscribeMany(handle, 1, topics, &qos, response);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTAsync_unsubscribeMany(MQTTAsync handle, int count, char* const* topic, MQTTAsync_responseOptions* response)
+{
+	MQTTAsyncs* m = handle;
+	int i = 0;
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsync_queuedCommand* unsub;
+	int msgid = 0;
+
+	FUNC_ENTRY;
+	if (m == NULL || m->c == NULL)
+		rc = MQTTASYNC_FAILURE;
+	else if (m->c->connected == 0)
+		rc = MQTTASYNC_DISCONNECTED;
+	else for (i = 0; i < count; i++)
+	{
+		if (!UTF8_validateString(topic[i]))
+		{
+			rc = MQTTASYNC_BAD_UTF8_STRING;
+			break;
+		}
+	}
+	if (rc != MQTTASYNC_SUCCESS)
+		; /* don't overwrite a previous error code */
+	else if ((msgid = MQTTAsync_assignMsgId(m)) == 0)
+		rc = MQTTASYNC_NO_MORE_MSGIDS;
+	else if (response)
+	{
+		if (m->c->MQTTVersion >= MQTTVERSION_5)
+		{
+			if (response->struct_version == 0 || response->onFailure || response->onSuccess)
+				rc = MQTTASYNC_BAD_MQTT_OPTION;
+		}
+		else if (m->c->MQTTVersion < MQTTVERSION_5)
+		{
+			if (response->struct_version >= 1 && (response->onFailure5 || response->onSuccess5))
+				rc = MQTTASYNC_BAD_MQTT_OPTION;
+		}
+	}
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	/* Add unsubscribe request to operation queue */
+	unsub = malloc(sizeof(MQTTAsync_queuedCommand));
+	memset(unsub, '\0', sizeof(MQTTAsync_queuedCommand));
+	unsub->client = m;
+	unsub->command.type = UNSUBSCRIBE;
+	unsub->command.token = msgid;
+	if (response)
+	{
+		unsub->command.onSuccess = response->onSuccess;
+		unsub->command.onFailure = response->onFailure;
+		unsub->command.onSuccess5 = response->onSuccess5;
+		unsub->command.onFailure5 = response->onFailure5;
+		unsub->command.context = response->context;
+		response->token = unsub->command.token;
+		if (m->c->MQTTVersion >= MQTTVERSION_5)
+			unsub->command.properties = MQTTProperties_copy(&response->properties);
+	}
+	unsub->command.details.unsub.count = count;
+	unsub->command.details.unsub.topics = malloc(sizeof(char*) * count);
+	for (i = 0; i < count; ++i)
+		unsub->command.details.unsub.topics[i] = MQTTStrdup(topic[i]);
+	rc = MQTTAsync_addCommand(unsub, sizeof(unsub));
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTAsync_unsubscribe(MQTTAsync handle, const char* topic, MQTTAsync_responseOptions* response)
+{
+	int rc = 0;
+	char *const topics[] = {(char*)topic};
+	FUNC_ENTRY;
+	rc = MQTTAsync_unsubscribeMany(handle, 1, topics, response);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static int MQTTAsync_countBufferedMessages(MQTTAsyncs* m)
+{
+	ListElement* current = NULL;
+	int count = 0;
+
+	while (ListNextElement(commands, &current))
+	{
+		MQTTAsync_queuedCommand* cmd = (MQTTAsync_queuedCommand*)(current->content);
+
+		if (cmd->client == m && cmd->command.type == PUBLISH)
+			count++;
+	}
+	return count;
+}
+
+
+int MQTTAsync_send(MQTTAsync handle, const char* destinationName, int payloadlen, const void* payload,
+							 int qos, int retained, MQTTAsync_responseOptions* response)
+{
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsyncs* m = handle;
+	MQTTAsync_queuedCommand* pub;
+	int msgid = 0;
+
+	FUNC_ENTRY;
+	if (m == NULL || m->c == NULL)
+		rc = MQTTASYNC_FAILURE;
+	else if (m->c->connected == 0 && (m->createOptions == NULL ||
+		m->createOptions->sendWhileDisconnected == 0 || m->shouldBeConnected == 0))
+		rc = MQTTASYNC_DISCONNECTED;
+	else if (!UTF8_validateString(destinationName))
+		rc = MQTTASYNC_BAD_UTF8_STRING;
+	else if (qos < 0 || qos > 2)
+		rc = MQTTASYNC_BAD_QOS;
+	else if (qos > 0 && (msgid = MQTTAsync_assignMsgId(m)) == 0)
+		rc = MQTTASYNC_NO_MORE_MSGIDS;
+	else if (m->createOptions && (MQTTAsync_countBufferedMessages(m) >= m->createOptions->maxBufferedMessages))
+		rc = MQTTASYNC_MAX_BUFFERED_MESSAGES;
+	else if (response)
+	{
+		if (m->c->MQTTVersion >= MQTTVERSION_5)
+		{
+			if (response->struct_version == 0 || response->onFailure || response->onSuccess)
+				rc = MQTTASYNC_BAD_MQTT_OPTION;
+		}
+		else if (m->c->MQTTVersion < MQTTVERSION_5)
+		{
+			if (response->struct_version >= 1 && (response->onFailure5 || response->onSuccess5))
+				rc = MQTTASYNC_BAD_MQTT_OPTION;
+		}
+	}
+
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	/* Add publish request to operation queue */
+	pub = malloc(sizeof(MQTTAsync_queuedCommand));
+	memset(pub, '\0', sizeof(MQTTAsync_queuedCommand));
+	pub->client = m;
+	pub->command.type = PUBLISH;
+	pub->command.token = msgid;
+	if (response)
+	{
+		pub->command.onSuccess = response->onSuccess;
+		pub->command.onFailure = response->onFailure;
+		pub->command.onSuccess5 = response->onSuccess5;
+		pub->command.onFailure5 = response->onFailure5;
+		pub->command.context = response->context;
+		response->token = pub->command.token;
+		if (m->c->MQTTVersion >= MQTTVERSION_5)
+			pub->command.properties = MQTTProperties_copy(&response->properties);
+	}
+	pub->command.details.pub.destinationName = MQTTStrdup(destinationName);
+	pub->command.details.pub.payloadlen = payloadlen;
+	pub->command.details.pub.payload = malloc(payloadlen);
+	memcpy(pub->command.details.pub.payload, payload, payloadlen);
+	pub->command.details.pub.qos = qos;
+	pub->command.details.pub.retained = retained;
+	rc = MQTTAsync_addCommand(pub, sizeof(pub));
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+
+int MQTTAsync_sendMessage(MQTTAsync handle, const char* destinationName, const MQTTAsync_message* message,
+													 MQTTAsync_responseOptions* response)
+{
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsyncs* m = handle;
+
+	FUNC_ENTRY;
+	if (message == NULL)
+	{
+		rc = MQTTASYNC_NULL_PARAMETER;
+		goto exit;
+	}
+	if (strncmp(message->struct_id, "MQTM", 4) != 0 ||
+			(message->struct_version != 0 && message->struct_version != 1))
+	{
+		rc = MQTTASYNC_BAD_STRUCTURE;
+		goto exit;
+	}
+
+	if (m->c->MQTTVersion >= MQTTVERSION_5 && response)
+		response->properties = message->properties;
+
+	rc = MQTTAsync_send(handle, destinationName, message->payloadlen, message->payload,
+								message->qos, message->retained, response);
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static void MQTTAsync_retry(void)
+{
+	static time_t last = 0L;
+	time_t now;
+
+	FUNC_ENTRY;
+	time(&(now));
+	if (difftime(now, last) > retryLoopInterval)
+	{
+		time(&(last));
+		MQTTProtocol_keepalive(now);
+		MQTTProtocol_retry(now, 1, 0);
+	}
+	else
+		MQTTProtocol_retry(now, 0, 0);
+	FUNC_EXIT;
+}
+
+
+static int MQTTAsync_connecting(MQTTAsyncs* m)
+{
+	int rc = -1;
+
+	FUNC_ENTRY;
+	if (m->c->connect_state == TCP_IN_PROGRESS) /* TCP connect started - check for completion */
+	{
+		int error;
+		socklen_t len = sizeof(error);
+
+		if ((rc = getsockopt(m->c->net.socket, SOL_SOCKET, SO_ERROR, (char*)&error, &len)) == 0)
+			rc = error;
+
+		if (rc != 0)
+			goto exit;
+
+		Socket_clearPendingWrite(m->c->net.socket);
+
+#if defined(OPENSSL)
+		if (m->ssl)
+		{
+			int port;
+			size_t hostname_len;
+			int setSocketForSSLrc = 0;
+
+			hostname_len = MQTTProtocol_addressPort(m->serverURI, &port, NULL);
+			setSocketForSSLrc = SSLSocket_setSocketForSSL(&m->c->net, m->c->sslopts,
+				m->serverURI, hostname_len);
+
+			if (setSocketForSSLrc != MQTTASYNC_SUCCESS)
+			{
+				if (m->c->session != NULL)
+					if ((rc = SSL_set_session(m->c->net.ssl, m->c->session)) != 1)
+						Log(TRACE_MIN, -1, "Failed to set SSL session with stored data, non critical");
+				rc = m->c->sslopts->struct_version >= 3 ?
+					SSLSocket_connect(m->c->net.ssl, m->c->net.socket, m->serverURI,
+						m->c->sslopts->verify, m->c->sslopts->ssl_error_cb, m->c->sslopts->ssl_error_context) :
+					SSLSocket_connect(m->c->net.ssl, m->c->net.socket, m->serverURI,
+						m->c->sslopts->verify, NULL, NULL);
+				if (rc == TCPSOCKET_INTERRUPTED)
+				{
+					rc = MQTTCLIENT_SUCCESS; /* the connect is still in progress */
+					m->c->connect_state = SSL_IN_PROGRESS;
+				}
+				else if (rc == SSL_FATAL)
+				{
+					rc = SOCKET_ERROR;
+					goto exit;
+				}
+				else if (rc == 1)
+				{
+					if ( m->websocket )
+					{
+						m->c->connect_state = WEBSOCKET_IN_PROGRESS;
+						if ((rc = WebSocket_connect(&m->c->net, m->serverURI)) == SOCKET_ERROR )
+							goto exit;
+					}
+					else
+					{
+						rc = MQTTCLIENT_SUCCESS;
+						m->c->connect_state = WAIT_FOR_CONNACK;
+						if (MQTTPacket_send_connect(m->c, m->connect.details.conn.MQTTVersion,
+								m->connectProps, m->willProps) == SOCKET_ERROR)
+						{
+							rc = SOCKET_ERROR;
+							goto exit;
+						}
+					}
+					if (!m->c->cleansession && m->c->session == NULL)
+						m->c->session = SSL_get1_session(m->c->net.ssl);
+				}
+			}
+			else
+			{
+				rc = SOCKET_ERROR;
+				goto exit;
+			}
+		}
+		else
+		{
+#endif
+			if ( m->websocket )
+			{
+				m->c->connect_state = WEBSOCKET_IN_PROGRESS;
+				if ((rc = WebSocket_connect(&m->c->net, m->serverURI)) == SOCKET_ERROR )
+					goto exit;
+			}
+			else
+			{
+				m->c->connect_state = WAIT_FOR_CONNACK; /* TCP/SSL connect completed, in which case send the MQTT connect packet */
+				if ((rc = MQTTPacket_send_connect(m->c, m->connect.details.conn.MQTTVersion,
+						m->connectProps, m->willProps)) == SOCKET_ERROR)
+					goto exit;
+			}
+#if defined(OPENSSL)
+		}
+#endif
+	}
+#if defined(OPENSSL)
+	else if (m->c->connect_state == SSL_IN_PROGRESS) /* SSL connect sent - wait for completion */
+	{
+		rc = m->c->sslopts->struct_version >= 3 ?
+			SSLSocket_connect(m->c->net.ssl, m->c->net.socket, m->serverURI,
+				m->c->sslopts->verify, m->c->sslopts->ssl_error_cb, m->c->sslopts->ssl_error_context) :
+			SSLSocket_connect(m->c->net.ssl, m->c->net.socket, m->serverURI,
+				m->c->sslopts->verify, NULL, NULL);
+		if (rc != 1)
+			goto exit;
+
+		if(!m->c->cleansession && m->c->session == NULL)
+			m->c->session = SSL_get1_session(m->c->net.ssl);
+
+		if ( m->websocket )
+		{
+			m->c->connect_state = WEBSOCKET_IN_PROGRESS;
+			if ((rc = WebSocket_connect(&m->c->net, m->serverURI)) == SOCKET_ERROR )
+				goto exit;
+		}
+		else
+		{
+			m->c->connect_state = WAIT_FOR_CONNACK; /* SSL connect completed, in which case send the MQTT connect packet */
+			if ((rc = MQTTPacket_send_connect(m->c, m->connect.details.conn.MQTTVersion,
+					m->connectProps, m->willProps)) == SOCKET_ERROR)
+				goto exit;
+		}
+	}
+#endif
+	else if (m->c->connect_state == WEBSOCKET_IN_PROGRESS) /* Websocket connect sent - wait for completion */
+	{
+		if ((rc = WebSocket_upgrade( &m->c->net ) ) == SOCKET_ERROR )
+			goto exit;
+		else
+		{
+			m->c->connect_state = WAIT_FOR_CONNACK; /* Websocket upgrade completed, in which case send the MQTT connect packet */
+			if ((rc = MQTTPacket_send_connect(m->c, m->connect.details.conn.MQTTVersion, m->connectProps, m->willProps)) == SOCKET_ERROR)
+				goto exit;
+		}
+	}
+
+exit:
+	if ((rc != 0 && rc != TCPSOCKET_INTERRUPTED && (m->c->connect_state != SSL_IN_PROGRESS && m->c->connect_state != WEBSOCKET_IN_PROGRESS)) || (rc == SSL_FATAL))
+		nextOrClose(m, MQTTASYNC_FAILURE, "TCP/TLS connect failure");
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static MQTTPacket* MQTTAsync_cycle(int* sock, unsigned long timeout, int* rc)
+{
+	struct timeval tp = {0L, 0L};
+	MQTTPacket* pack = NULL;
+
+	FUNC_ENTRY;
+	if (timeout > 0L)
+	{
+		tp.tv_sec = timeout / 1000;
+		tp.tv_usec = (timeout % 1000) * 1000; /* this field is microseconds! */
+	}
+
+#if defined(OPENSSL)
+	if ((*sock = SSLSocket_getPendingRead()) == -1)
+	{
+#endif
+		/* 0 from getReadySocket indicates no work to do, -1 == error, but can happen normally */
+		*sock = Socket_getReadySocket(0, &tp,socket_mutex);
+		if (!tostop && *sock == 0 && (tp.tv_sec > 0L || tp.tv_usec > 0L))
+			MQTTAsync_sleep(100L);
+#if defined(OPENSSL)
+	}
+#endif
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+	if (*sock > 0)
+	{
+		MQTTAsyncs* m = NULL;
+		if (ListFindItem(handles, sock, clientSockCompare) != NULL)
+			m = (MQTTAsync)(handles->current->content);
+		if (m != NULL)
+		{
+			Log(TRACE_MINIMUM, -1, "m->c->connect_state = %d", m->c->connect_state);
+			if (m->c->connect_state == TCP_IN_PROGRESS || m->c->connect_state == SSL_IN_PROGRESS || m->c->connect_state == WEBSOCKET_IN_PROGRESS)
+				*rc = MQTTAsync_connecting(m);
+			else
+				pack = MQTTPacket_Factory(m->c->MQTTVersion, &m->c->net, rc);
+			if (m->c->connect_state == WAIT_FOR_CONNACK && *rc == SOCKET_ERROR)
+			{
+				Log(TRACE_MINIMUM, -1, "CONNECT sent but MQTTPacket_Factory has returned SOCKET_ERROR");
+				nextOrClose(m, MQTTASYNC_FAILURE, "TCP connect completion failure");
+			}
+		}
+		if (pack)
+		{
+			int freed = 1;
+
+			/* Note that these handle... functions free the packet structure that they are dealing with */
+			if (pack->header.bits.type == PUBLISH)
+				*rc = MQTTProtocol_handlePublishes(pack, *sock);
+			else if (pack->header.bits.type == PUBACK || pack->header.bits.type == PUBCOMP ||
+					pack->header.bits.type == PUBREC)
+			{
+				int msgid = 0,
+					msgtype = 0,
+					ackrc = 0,
+					mqttversion = 0;
+				MQTTProperties msgprops = MQTTProperties_initializer;
+
+				/* This block is so that the ack variable is local and isn't accidentally reused */
+				{
+					static Ack ack;
+					ack = *(Ack*)pack;
+					/* these values are stored because the packet structure is freed in the handle functions */
+					msgid = ack.msgId;
+					msgtype = pack->header.bits.type;
+					if (ack.MQTTVersion >= MQTTVERSION_5)
+					{
+						ackrc = ack.rc;
+						msgprops = MQTTProperties_copy(&ack.properties);
+						mqttversion = ack.MQTTVersion;
+					}
+				}
+
+				if (pack->header.bits.type == PUBCOMP)
+					*rc = MQTTProtocol_handlePubcomps(pack, *sock);
+				else if (pack->header.bits.type == PUBREC)
+					*rc = MQTTProtocol_handlePubrecs(pack, *sock);
+				else if (pack->header.bits.type == PUBACK)
+					*rc = MQTTProtocol_handlePubacks(pack, *sock);
+				if (!m)
+					Log(LOG_ERROR, -1, "PUBCOMP, PUBACK or PUBREC received for no client, msgid %d", msgid);
+				if (m && (msgtype != PUBREC || ackrc >= MQTTREASONCODE_UNSPECIFIED_ERROR))
+				{
+					ListElement* current = NULL;
+
+					if (m->dc)
+					{
+						Log(TRACE_MIN, -1, "Calling deliveryComplete for client %s, msgid %d", m->c->clientID, msgid);
+						(*(m->dc))(m->dcContext, msgid);
+					}
+					/* use the msgid to find the callback to be called */
+					while (ListNextElement(m->responses, &current))
+					{
+						MQTTAsync_queuedCommand* command = (MQTTAsync_queuedCommand*)(current->content);
+						if (command->command.token == msgid)
+						{
+							if (!ListDetach(m->responses, command)) /* then remove the response from the list */
+								Log(LOG_ERROR, -1, "Publish command not removed from command list");
+							if (command->command.onSuccess)
+							{
+								MQTTAsync_successData data;
+
+								data.token = command->command.token;
+								data.alt.pub.destinationName = command->command.details.pub.destinationName;
+								data.alt.pub.message.payload = command->command.details.pub.payload;
+								data.alt.pub.message.payloadlen = command->command.details.pub.payloadlen;
+								data.alt.pub.message.qos = command->command.details.pub.qos;
+								data.alt.pub.message.retained = command->command.details.pub.retained;
+								Log(TRACE_MIN, -1, "Calling publish success for client %s", m->c->clientID);
+								(*(command->command.onSuccess))(command->command.context, &data);
+							}
+							else if (command->command.onSuccess5 && ackrc < MQTTREASONCODE_UNSPECIFIED_ERROR)
+							{
+								MQTTAsync_successData5 data = MQTTAsync_successData5_initializer;
+
+								data.token = command->command.token;
+								data.alt.pub.destinationName = command->command.details.pub.destinationName;
+								data.alt.pub.message.payload = command->command.details.pub.payload;
+								data.alt.pub.message.payloadlen = command->command.details.pub.payloadlen;
+								data.alt.pub.message.qos = command->command.details.pub.qos;
+								data.alt.pub.message.retained = command->command.details.pub.retained;
+								data.properties = command->command.properties;
+								Log(TRACE_MIN, -1, "Calling publish success for client %s", m->c->clientID);
+								(*(command->command.onSuccess5))(command->command.context, &data);
+							}
+							else if (command->command.onFailure5 && ackrc >= MQTTREASONCODE_UNSPECIFIED_ERROR)
+							{
+								MQTTAsync_failureData5 data = MQTTAsync_failureData5_initializer;
+
+								data.token = command->command.token;
+								data.reasonCode = ackrc;
+								data.properties = msgprops;
+								data.packet_type = pack->header.bits.type;
+								Log(TRACE_MIN, -1, "Calling publish failure for client %s", m->c->clientID);
+								(*(command->command.onFailure5))(command->command.context, &data);
+							}
+							MQTTAsync_freeCommand(command);
+							if (mqttversion >= MQTTVERSION_5)
+								MQTTProperties_free(&msgprops);
+							break;
+						}
+					}
+				}
+			}
+			else if (pack->header.bits.type == PUBREL)
+				*rc = MQTTProtocol_handlePubrels(pack, *sock);
+			else if (pack->header.bits.type == PINGRESP)
+				*rc = MQTTProtocol_handlePingresps(pack, *sock);
+			else
+				freed = 0;
+			if (freed)
+				pack = NULL;
+		}
+	}
+	MQTTAsync_retry();
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(*rc);
+	return pack;
+}
+
+/*
+static int pubCompare(void* a, void* b)
+{
+	Messages* msg = (Messages*)a;
+	return msg->publish == (Publications*)b;
+}*/
+
+
+int MQTTAsync_getPendingTokens(MQTTAsync handle, MQTTAsync_token **tokens)
+{
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsyncs* m = handle;
+	ListElement* current = NULL;
+	int count = 0;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+	*tokens = NULL;
+
+	if (m == NULL)
+	{
+		rc = MQTTASYNC_FAILURE;
+		goto exit;
+	}
+
+	/* calculate the number of pending tokens - commands plus inflight */
+	while (ListNextElement(commands, &current))
+	{
+		MQTTAsync_queuedCommand* cmd = (MQTTAsync_queuedCommand*)(current->content);
+
+		if (cmd->client == m)
+			count++;
+	}
+	if (m->c)
+		count += m->c->outboundMsgs->count;
+	if (count == 0)
+		goto exit; /* no tokens to return */
+	*tokens = malloc(sizeof(MQTTAsync_token) * (count + 1));  /* add space for sentinel at end of list */
+
+	/* First add the unprocessed commands to the pending tokens */
+	current = NULL;
+	count = 0;
+	while (ListNextElement(commands, &current))
+	{
+		MQTTAsync_queuedCommand* cmd = (MQTTAsync_queuedCommand*)(current->content);
+
+		if (cmd->client == m)
+			(*tokens)[count++] = cmd->command.token;
+	}
+
+	/* Now add the inflight messages */
+	if (m->c && m->c->outboundMsgs->count > 0)
+	{
+		current = NULL;
+		while (ListNextElement(m->c->outboundMsgs, &current))
+		{
+			Messages* m = (Messages*)(current->content);
+			(*tokens)[count++] = m->msgid;
+		}
+	}
+	(*tokens)[count] = -1; /* indicate end of list */
+
+exit:
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTAsync_isComplete(MQTTAsync handle, MQTTAsync_token dt)
+{
+	int rc = MQTTASYNC_SUCCESS;
+	MQTTAsyncs* m = handle;
+	ListElement* current = NULL;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+
+	if (m == NULL)
+	{
+		rc = MQTTASYNC_FAILURE;
+		goto exit;
+	}
+
+	/* First check unprocessed commands */
+	current = NULL;
+	while (ListNextElement(commands, &current))
+	{
+		MQTTAsync_queuedCommand* cmd = (MQTTAsync_queuedCommand*)(current->content);
+
+		if (cmd->client == m && cmd->command.token == dt)
+			goto exit;
+	}
+
+	/* Now check the inflight messages */
+	if (m->c && m->c->outboundMsgs->count > 0)
+	{
+		current = NULL;
+		while (ListNextElement(m->c->outboundMsgs, &current))
+		{
+			Messages* m = (Messages*)(current->content);
+			if (m->msgid == dt)
+				goto exit;
+		}
+	}
+	rc = MQTTASYNC_TRUE; /* Can't find it, so it must be complete */
+
+exit:
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTAsync_waitForCompletion(MQTTAsync handle, MQTTAsync_token dt, unsigned long timeout)
+{
+	int rc = MQTTASYNC_FAILURE;
+	START_TIME_TYPE start = MQTTAsync_start_clock();
+	unsigned long elapsed = 0L;
+	MQTTAsyncs* m = handle;
+
+	FUNC_ENTRY;
+	MQTTAsync_lock_mutex(mqttasync_mutex);
+
+	if (m == NULL || m->c == NULL)
+	{
+		MQTTAsync_unlock_mutex(mqttasync_mutex);
+		rc = MQTTASYNC_FAILURE;
+		goto exit;
+	}
+	if (m->c->connected == 0)
+	{
+		MQTTAsync_unlock_mutex(mqttasync_mutex);
+		rc = MQTTASYNC_DISCONNECTED;
+		goto exit;
+	}
+	MQTTAsync_unlock_mutex(mqttasync_mutex);
+
+	if (MQTTAsync_isComplete(handle, dt) == 1)
+	{
+		rc = MQTTASYNC_SUCCESS; /* well we couldn't find it */
+		goto exit;
+	}
+
+	elapsed = MQTTAsync_elapsed(start);
+	while (elapsed < timeout)
+	{
+		MQTTAsync_sleep(100);
+		if (MQTTAsync_isComplete(handle, dt) == 1)
+		{
+			rc = MQTTASYNC_SUCCESS; /* well we couldn't find it */
+			goto exit;
+		}
+		elapsed = MQTTAsync_elapsed(start);
+	}
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+
+void MQTTAsync_setTraceLevel(enum MQTTASYNC_TRACE_LEVELS level)
+{
+	Log_setTraceLevel((enum LOG_LEVELS)level);
+}
+
+
+void MQTTAsync_setTraceCallback(MQTTAsync_traceCallback* callback)
+{
+	Log_setTraceCallback((Log_traceCallback*)callback);
+}
+
+
+MQTTAsync_nameValue* MQTTAsync_getVersionInfo(void)
+{
+	#define MAX_INFO_STRINGS 8
+	static MQTTAsync_nameValue libinfo[MAX_INFO_STRINGS + 1];
+	int i = 0;
+
+	libinfo[i].name = "Product name";
+	libinfo[i++].value = "Eclipse Paho Asynchronous MQTT C Client Library";
+
+	libinfo[i].name = "Version";
+	libinfo[i++].value = CLIENT_VERSION;
+
+	libinfo[i].name = "Build level";
+	libinfo[i++].value = BUILD_TIMESTAMP;
+#if defined(OPENSSL)
+	libinfo[i].name = "OpenSSL version";
+	libinfo[i++].value = SSLeay_version(SSLEAY_VERSION);
+
+	libinfo[i].name = "OpenSSL flags";
+	libinfo[i++].value = SSLeay_version(SSLEAY_CFLAGS);
+
+	libinfo[i].name = "OpenSSL build timestamp";
+	libinfo[i++].value = SSLeay_version(SSLEAY_BUILT_ON);
+
+	libinfo[i].name = "OpenSSL platform";
+	libinfo[i++].value = SSLeay_version(SSLEAY_PLATFORM);
+
+	libinfo[i].name = "OpenSSL directory";
+	libinfo[i++].value = SSLeay_version(SSLEAY_DIR);
+#endif
+	libinfo[i].name = NULL;
+	libinfo[i].value = NULL;
+	return libinfo;
+}
+
+
+const char* MQTTAsync_strerror(int code)
+{
+  static char buf[30];
+
+  switch (code) {
+    case MQTTASYNC_SUCCESS:
+      return "Success";
+    case MQTTASYNC_FAILURE:
+      return "Failure";
+    case MQTTASYNC_PERSISTENCE_ERROR:
+      return "Persistence error";
+    case MQTTASYNC_DISCONNECTED:
+      return "Disconnected";
+    case MQTTASYNC_MAX_MESSAGES_INFLIGHT:
+      return "Maximum in-flight messages amount reached";
+    case MQTTASYNC_BAD_UTF8_STRING:
+      return "Invalid UTF8 string";
+    case MQTTASYNC_NULL_PARAMETER:
+      return "Invalid (NULL) parameter";
+    case MQTTASYNC_TOPICNAME_TRUNCATED:
+      return "Topic containing NULL characters has been truncated";
+    case MQTTASYNC_BAD_STRUCTURE:
+      return "Bad structure";
+    case MQTTASYNC_BAD_QOS:
+      return "Invalid QoS value";
+    case MQTTASYNC_NO_MORE_MSGIDS:
+      return "Too many pending commands";
+    case MQTTASYNC_OPERATION_INCOMPLETE:
+      return "Operation discarded before completion";
+    case MQTTASYNC_MAX_BUFFERED_MESSAGES:
+      return "No more messages can be buffered";
+    case MQTTASYNC_SSL_NOT_SUPPORTED:
+      return "SSL is not supported";
+    case MQTTASYNC_BAD_PROTOCOL:
+      return "Invalid protocol scheme";
+    case MQTTASYNC_BAD_MQTT_OPTION:
+      return "Options for wrong MQTT version";
+    case MQTTASYNC_WRONG_MQTT_VERSION:
+    	  return "Client created for another version of MQTT";
+  }
+
+  sprintf(buf, "Unknown error code %d", code);
+  return buf;
+}
diff --git a/mqtt/src/src/MQTTAsync.h b/mqtt/src/src/MQTTAsync.h
new file mode 100644
index 00000000..400eeeb9
--- /dev/null
+++ b/mqtt/src/src/MQTTAsync.h
@@ -0,0 +1,2096 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL connections
+ *    Ian Craggs - multiple server connection support
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - fix for bug 444103 - success/failure callbacks not invoked
+ *    Ian Craggs - automatic reconnect and offline buffering (send while disconnected)
+ *    Ian Craggs - binary will message
+ *    Ian Craggs - binary password
+ *    Ian Craggs - remove const on eyecatchers #168
+ *    Ian Craggs - MQTT 5.0
+ *******************************************************************************/
+
+/********************************************************************/
+
+/**
+ * @cond MQTTAsync_main
+ * @mainpage Asynchronous MQTT client library for C
+ *
+ * &copy; Copyright IBM Corp. 2009, 2018
+ *
+ * @brief An Asynchronous MQTT client library for C.
+ *
+ * An MQTT client application connects to MQTT-capable servers.
+ * A typical client is responsible for collecting information from a telemetry
+ * device and publishing the information to the server. It can also subscribe
+ * to topics, receive messages, and use this information to control the
+ * telemetry device.
+ *
+ * MQTT clients implement the published MQTT v3 protocol. You can write your own
+ * API to the MQTT protocol using the programming language and platform of your
+ * choice. This can be time-consuming and error-prone.
+ *
+ * To simplify writing MQTT client applications, this library encapsulates
+ * the MQTT v3 protocol for you. Using this library enables a fully functional
+ * MQTT client application to be written in a few lines of code.
+ * The information presented here documents the API provided
+ * by the Asynchronous MQTT Client library for C.
+ *
+ * <b>Using the client</b><br>
+ * Applications that use the client library typically use a similar structure:
+ * <ul>
+ * <li>Create a client object</li>
+ * <li>Set the options to connect to an MQTT server</li>
+ * <li>Set up callback functions</li>
+ * <li>Connect the client to an MQTT server</li>
+ * <li>Subscribe to any topics the client needs to receive</li>
+ * <li>Repeat until finished:</li>
+ *     <ul>
+ *     <li>Publish any messages the client needs to</li>
+ *     <li>Handle any incoming messages</li>
+ *     </ul>
+ * <li>Disconnect the client</li>
+ * <li>Free any memory being used by the client</li>
+ * </ul>
+ * Some simple examples are shown here:
+ * <ul>
+ * <li>@ref publish</li>
+ * <li>@ref subscribe</li>
+ * </ul>
+ * Additional information about important concepts is provided here:
+ * <ul>
+ * <li>@ref async</li>
+ * <li>@ref wildcard</li>
+ * <li>@ref qos</li>
+ * <li>@ref tracing</li>
+ * <li>@ref auto_reconnect</li>
+ * <li>@ref offline_publish</li>
+ * </ul>
+ * @endcond
+ */
+
+/*
+/// @cond EXCLUDE
+*/
+#if !defined(MQTTASYNC_H)
+#define MQTTASYNC_H
+
+#if defined(__cplusplus)
+ extern "C" {
+#endif
+
+#if defined(WIN32) || defined(WIN64)
+  #define DLLImport __declspec(dllimport)
+  #define DLLExport __declspec(dllexport)
+#else
+  #define DLLImport extern
+  #define DLLExport  __attribute__ ((visibility ("default")))
+#endif
+
+#include <stdio.h>
+/*
+/// @endcond
+*/
+
+#include "MQTTProperties.h"
+#include "MQTTReasonCodes.h"
+#include "MQTTSubscribeOpts.h"
+#if !defined(NO_PERSISTENCE)
+#include "MQTTClientPersistence.h"
+#endif
+
+/**
+ * Return code: No error. Indicates successful completion of an MQTT client
+ * operation.
+ */
+#define MQTTASYNC_SUCCESS 0
+/**
+ * Return code: A generic error code indicating the failure of an MQTT client
+ * operation.
+ */
+#define MQTTASYNC_FAILURE -1
+
+/* error code -2 is MQTTAsync_PERSISTENCE_ERROR */
+
+#define MQTTASYNC_PERSISTENCE_ERROR -2
+
+/**
+ * Return code: The client is disconnected.
+ */
+#define MQTTASYNC_DISCONNECTED -3
+/**
+ * Return code: The maximum number of messages allowed to be simultaneously
+ * in-flight has been reached.
+ */
+#define MQTTASYNC_MAX_MESSAGES_INFLIGHT -4
+/**
+ * Return code: An invalid UTF-8 string has been detected.
+ */
+#define MQTTASYNC_BAD_UTF8_STRING -5
+/**
+ * Return code: A NULL parameter has been supplied when this is invalid.
+ */
+#define MQTTASYNC_NULL_PARAMETER -6
+/**
+ * Return code: The topic has been truncated (the topic string includes
+ * embedded NULL characters). String functions will not access the full topic.
+ * Use the topic length value to access the full topic.
+ */
+#define MQTTASYNC_TOPICNAME_TRUNCATED -7
+/**
+ * Return code: A structure parameter does not have the correct eyecatcher
+ * and version number.
+ */
+#define MQTTASYNC_BAD_STRUCTURE -8
+/**
+ * Return code: A qos parameter is not 0, 1 or 2
+ */
+#define MQTTASYNC_BAD_QOS -9
+/**
+ * Return code: All 65535 MQTT msgids are being used
+ */
+#define MQTTASYNC_NO_MORE_MSGIDS -10
+/**
+ * Return code: the request is being discarded when not complete
+ */
+#define MQTTASYNC_OPERATION_INCOMPLETE -11
+/**
+ * Return code: no more messages can be buffered
+ */
+#define MQTTASYNC_MAX_BUFFERED_MESSAGES -12
+/**
+ * Return code: Attempting SSL connection using non-SSL version of library
+ */
+#define MQTTASYNC_SSL_NOT_SUPPORTED -13
+ /**
+  * Return code: protocol prefix in serverURI should be tcp://, ssl://, ws:// or wss://
+  * The TLS enabled prefixes (ssl, wss) are only valid if the TLS version of the library
+  * is linked with.
+  */
+#define MQTTASYNC_BAD_PROTOCOL -14
+ /**
+  * Return code: don't use options for another version of MQTT
+  */
+ #define MQTTASYNC_BAD_MQTT_OPTION -15
+ /**
+  * Return code: call not applicable to the client's version of MQTT
+  */
+ #define MQTTASYNC_WRONG_MQTT_VERSION -16
+
+
+/**
+ * Default MQTT version to connect with.  Use 3.1.1 then fall back to 3.1
+ */
+#define MQTTVERSION_DEFAULT 0
+/**
+ * MQTT version to connect with: 3.1
+ */
+#define MQTTVERSION_3_1 3
+/**
+ * MQTT version to connect with: 3.1.1
+ */
+#define MQTTVERSION_3_1_1 4
+/**
+ * MQTT version to connect with: 5
+ */
+#define MQTTVERSION_5 5
+/**
+ * Bad return code from subscribe, as defined in the 3.1.1 specification
+ */
+#define MQTT_BAD_SUBSCRIBE 0x80
+
+
+/**
+ *  Initialization options
+ */
+typedef struct
+{
+	/** The eyecatcher for this structure.  Must be MQTG. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0 */
+	int struct_version;
+	/** 1 = we do openssl init, 0 = leave it to the application */
+	int do_openssl_init;
+} MQTTAsync_init_options;
+
+#define MQTTAsync_init_options_initializer { {'M', 'Q', 'T', 'G'}, 0, 0 }
+
+/**
+ * Global init of mqtt library. Call once on program start to set global behaviour.
+ * handle_openssl_init - if mqtt library should handle openssl init (1) or rely on the caller to init it before using mqtt (0)
+ */
+DLLExport void MQTTAsync_global_init(MQTTAsync_init_options* inits);
+
+/**
+ * A handle representing an MQTT client. A valid client handle is available
+ * following a successful call to MQTTAsync_create().
+ */
+typedef void* MQTTAsync;
+/**
+ * A value representing an MQTT message. A token is returned to the
+ * client application when a message is published. The token can then be used to
+ * check that the message was successfully delivered to its destination (see
+ * MQTTAsync_publish(),
+ * MQTTAsync_publishMessage(),
+ * MQTTAsync_deliveryComplete(), and
+ * MQTTAsync_getPendingTokens()).
+ */
+typedef int MQTTAsync_token;
+
+/**
+ * A structure representing the payload and attributes of an MQTT message. The
+ * message topic is not part of this structure (see MQTTAsync_publishMessage(),
+ * MQTTAsync_publish(), MQTTAsync_receive(), MQTTAsync_freeMessage()
+ * and MQTTAsync_messageArrived()).
+ */
+typedef struct
+{
+	/** The eyecatcher for this structure.  must be MQTM. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0 or 1.
+	 *  0 indicates no message properties */
+	int struct_version;
+	/** The length of the MQTT message payload in bytes. */
+	int payloadlen;
+	/** A pointer to the payload of the MQTT message. */
+	void* payload;
+	/**
+     * The quality of service (QoS) assigned to the message.
+     * There are three levels of QoS:
+     * <DL>
+     * <DT><B>QoS0</B></DT>
+     * <DD>Fire and forget - the message may not be delivered</DD>
+     * <DT><B>QoS1</B></DT>
+     * <DD>At least once - the message will be delivered, but may be
+     * delivered more than once in some circumstances.</DD>
+     * <DT><B>QoS2</B></DT>
+     * <DD>Once and one only - the message will be delivered exactly once.</DD>
+     * </DL>
+     */
+	int qos;
+	/**
+     * The retained flag serves two purposes depending on whether the message
+     * it is associated with is being published or received.
+     *
+     * <b>retained = true</b><br>
+     * For messages being published, a true setting indicates that the MQTT
+     * server should retain a copy of the message. The message will then be
+     * transmitted to new subscribers to a topic that matches the message topic.
+     * For subscribers registering a new subscription, the flag being true
+     * indicates that the received message is not a new one, but one that has
+     * been retained by the MQTT server.
+     *
+     * <b>retained = false</b> <br>
+     * For publishers, this indicates that this message should not be retained
+     * by the MQTT server. For subscribers, a false setting indicates this is
+     * a normal message, received as a result of it being published to the
+     * server.
+     */
+	int retained;
+	/**
+      * The dup flag indicates whether or not this message is a duplicate.
+      * It is only meaningful when receiving QoS1 messages. When true, the
+      * client application should take appropriate action to deal with the
+      * duplicate message.
+      */
+	int dup;
+	/** The message identifier is normally reserved for internal use by the
+      * MQTT client and server.
+      */
+	int msgid;
+	/**
+	 * The MQTT V5 properties associated with the message.
+	 */
+	MQTTProperties properties;
+} MQTTAsync_message;
+
+#define MQTTAsync_message_initializer { {'M', 'Q', 'T', 'M'}, 1, 0, NULL, 0, 0, 0, 0, MQTTProperties_initializer }
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * receipt of messages. The function is registered with the client library by
+ * passing it as an argument to MQTTAsync_setCallbacks(). It is
+ * called by the client library when a new message that matches a client
+ * subscription has been received from the server. This function is executed on
+ * a separate thread to the one on which the client application is running.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * MQTTAsync_setCallbacks(), which contains any application-specific context.
+ * @param topicName The topic associated with the received message.
+ * @param topicLen The length of the topic if there are one
+ * more NULL characters embedded in <i>topicName</i>, otherwise <i>topicLen</i>
+ * is 0. If <i>topicLen</i> is 0, the value returned by <i>strlen(topicName)</i>
+ * can be trusted. If <i>topicLen</i> is greater than 0, the full topic name
+ * can be retrieved by accessing <i>topicName</i> as a byte array of length
+ * <i>topicLen</i>.
+ * @param message The MQTTAsync_message structure for the received message.
+ * This structure contains the message payload and attributes.
+ * @return This function must return a boolean value indicating whether or not
+ * the message has been safely received by the client application. Returning
+ * true indicates that the message has been successfully handled.
+ * Returning false indicates that there was a problem. In this
+ * case, the client library will reinvoke MQTTAsync_messageArrived() to
+ * attempt to deliver the message to the application again.
+ */
+typedef int MQTTAsync_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message);
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of delivery of messages to the server. The function is
+ * registered with the client library by passing it as an argument to MQTTAsync_setCallbacks().
+ * It is called by the client library after the client application has
+ * published a message to the server. It indicates that the necessary
+ * handshaking and acknowledgements for the requested quality of service (see
+ * MQTTAsync_message.qos) have been completed. This function is executed on a
+ * separate thread to the one on which the client application is running.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * MQTTAsync_setCallbacks(), which contains any application-specific context.
+ * @param token The ::MQTTAsync_token associated with
+ * the published message. Applications can check that all messages have been
+ * correctly published by matching the tokens returned from calls to
+ * MQTTAsync_send() and MQTTAsync_sendMessage() with the tokens passed
+ * to this callback.
+ */
+typedef void MQTTAsync_deliveryComplete(void* context, MQTTAsync_token token);
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of the loss of connection to the server. The function is
+ * registered with the client library by passing it as an argument to
+ * MQTTAsync_setCallbacks(). It is called by the client library if the client
+ * loses its connection to the server. The client application must take
+ * appropriate action, such as trying to reconnect or reporting the problem.
+ * This function is executed on a separate thread to the one on which the
+ * client application is running.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * MQTTAsync_setCallbacks(), which contains any application-specific context.
+ * @param cause The reason for the disconnection.
+ * Currently, <i>cause</i> is always set to NULL.
+ */
+typedef void MQTTAsync_connectionLost(void* context, char* cause);
+
+
+/**
+ * This is a callback function, which will be called when the client
+ * library successfully connects.  This is superfluous when the connection
+ * is made in response to a MQTTAsync_connect call, because the onSuccess
+ * callback can be used.  It is intended for use when automatic reconnect
+ * is enabled, so that when a reconnection attempt succeeds in the background,
+ * the application is notified and can take any required actions.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * MQTTAsync_setCallbacks(), which contains any application-specific context.
+ * @param cause The reason for the disconnection.
+ * Currently, <i>cause</i> is always set to NULL.
+ */
+typedef void MQTTAsync_connected(void* context, char* cause);
+
+/**
+ * This is a callback function, which will be called when the client
+ * library receives a disconnect packet.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * MQTTAsync_setCallbacks(), which contains any application-specific context.
+ * @param properties the properties in the disconnect packet.
+ * @param properties the reason code from the disconnect packet
+ * Currently, <i>cause</i> is always set to NULL.
+ */
+typedef void MQTTAsync_disconnected(void* context, MQTTProperties* properties,
+		enum MQTTReasonCodes reasonCode);
+
+/**
+ * Sets the MQTTAsync_disconnected() callback function for a client.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the <i>context</i> pointer is passed to each of the callback functions to
+ * provide access to the context information in the callback.
+ * @param co A pointer to an MQTTAsync_connected() callback
+ * function.  NULL removes the callback setting.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+DLLExport int MQTTAsync_setDisconnected(MQTTAsync handle, void* context, MQTTAsync_disconnected* co);
+
+
+/** The data returned on completion of an unsuccessful API call in the response callback onFailure. */
+typedef struct
+{
+	/** A token identifying the failed request. */
+	MQTTAsync_token token;
+	/** A numeric code identifying the error. */
+	int code;
+	/** Optional text explaining the error. Can be NULL. */
+	const char *message;
+} MQTTAsync_failureData;
+
+
+/** The data returned on completion of an unsuccessful API call in the response callback onFailure. */
+typedef struct
+{
+	/** The eyecatcher for this structure.  Will be MQFD. */
+	char struct_id[4];
+	/** The version number of this structure.  Will be 0 */
+	int struct_version;
+	/** A token identifying the failed request. */
+	MQTTAsync_token token;
+	/** The MQTT reason code returned. */
+	enum MQTTReasonCodes reasonCode;
+	/** The MQTT properties on the ack, if any. */
+	MQTTProperties properties;
+	/** A numeric code identifying the MQTT client library error. */
+	int code;
+	/** Optional further text explaining the error. Can be NULL. */
+	const char *message;
+	/** Packet type on which the failure occurred - used for publish QoS 1/2 exchanges*/
+	int packet_type;
+} MQTTAsync_failureData5;
+
+#define MQTTAsync_failureData5_initializer {{'M', 'Q', 'F', 'D'}, 0, 0, MQTTREASONCODE_SUCCESS, MQTTProperties_initializer, 0, NULL}
+
+/** The data returned on completion of a successful API call in the response callback onSuccess. */
+typedef struct
+{
+	/** A token identifying the successful request. Can be used to refer to the request later. */
+	MQTTAsync_token token;
+	/** A union of the different values that can be returned for subscribe, unsubscribe and publish. */
+	union
+	{
+		/** For subscribe, the granted QoS of the subscription returned by the server. */
+		int qos;
+		/** For subscribeMany, the list of granted QoSs of the subscriptions returned by the server. */
+		int* qosList;
+		/** For publish, the message being sent to the server. */
+		struct
+		{
+			MQTTAsync_message message;
+			char* destinationName;
+		} pub;
+		/* For connect, the server connected to, MQTT version used, and sessionPresent flag */
+		struct
+		{
+			char* serverURI;
+			int MQTTVersion;
+			int sessionPresent;
+		} connect;
+	} alt;
+} MQTTAsync_successData;
+
+
+/** The data returned on completion of a successful API call in the response callback onSuccess. */
+typedef struct
+{
+	char struct_id[4];    	/**< The eyecatcher for this structure.  Will be MQSD. */
+	int struct_version;  	/**< The version number of this structure.  Will be 0 */
+	/** A token identifying the successful request. Can be used to refer to the request later. */
+	MQTTAsync_token token;
+	enum MQTTReasonCodes reasonCode;  	/**< MQTT V5 reason code returned */
+	MQTTProperties properties;  	        /**< MQTT V5 properties returned, if any */
+	/** A union of the different values that can be returned for subscribe, unsubscribe and publish. */
+	union
+	{
+		/** For subscribeMany, the list of reasonCodes returned by the server. */
+		struct
+		{
+			int reasonCodeCount; /**< the number of reason codes in the reasonCodes array */
+			enum MQTTReasonCodes* reasonCodes; /**< an array of reasonCodes */
+		} sub;
+		/** For publish, the message being sent to the server. */
+		struct
+		{
+			MQTTAsync_message message; /**< the message being sent to the server */
+			char* destinationName;     /**< the topic destination for the message */
+		} pub;
+		/* For connect, the server connected to, MQTT version used, and sessionPresent flag */
+		struct
+		{
+			char* serverURI;  /**< the connection string of the server */
+			int MQTTVersion;  /**< the version of MQTT being used */
+			int sessionPresent;  /**< the session present flag returned from the server */
+		} connect;
+		/** For unsubscribeMany, the list of reasonCodes returned by the server. */
+		struct
+		{
+			int reasonCodeCount; /**< the number of reason codes in the reasonCodes array */
+			enum MQTTReasonCodes* reasonCodes; /**< an array of reasonCodes */
+		} unsub;
+	} alt;
+} MQTTAsync_successData5;
+
+#define MQTTAsync_successData5_initializer {{'M', 'Q', 'S', 'D'}, 0, 0, MQTTREASONCODE_SUCCESS, MQTTProperties_initializer}
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of the successful completion of an API call. The function is
+ * registered with the client library by passing it as an argument in
+ * ::MQTTAsync_responseOptions.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * ::MQTTAsync_responseOptions, which contains any application-specific context.
+ * @param response Any success data associated with the API completion.
+ */
+typedef void MQTTAsync_onSuccess(void* context, MQTTAsync_successData* response);
+
+/**
+ * This is a callback function, the MQTT V5 version of ::MQTTAsync_onSuccess.
+ * The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of the successful completion of an API call. The function is
+ * registered with the client library by passing it as an argument in
+ * ::MQTTAsync_responseOptions.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * ::MQTTAsync_responseOptions, which contains any application-specific context.
+ * @param response Any success data associated with the API completion.
+ */
+typedef void MQTTAsync_onSuccess5(void* context, MQTTAsync_successData5* response);
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of the unsuccessful completion of an API call. The function is
+ * registered with the client library by passing it as an argument in
+ * ::MQTTAsync_responseOptions.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * ::MQTTAsync_responseOptions, which contains any application-specific context.
+ * @param response Failure data associated with the API completion.
+ */
+typedef void MQTTAsync_onFailure(void* context,  MQTTAsync_failureData* response);
+
+/**
+ * This is a callback function, the MQTT V5 version of ::MQTTAsync_onFailure.
+ * The application must provide an implementation of this function to enable asynchronous
+ * notification of the unsuccessful completion of an API call. The function is
+ * registered with the client library by passing it as an argument in
+ * ::MQTTAsync_responseOptions.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * ::MQTTAsync_responseOptions, which contains any application-specific context.
+ * @param response Failure data associated with the API completion.
+ */
+typedef void MQTTAsync_onFailure5(void* context,  MQTTAsync_failureData5* response);
+
+typedef struct MQTTAsync_responseOptions
+{
+	/** The eyecatcher for this structure.  Must be MQTR */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0 or 1
+	 *   if 0, no MQTTV5 options */
+	int struct_version;
+	/**
+    * A pointer to a callback function to be called if the API call successfully
+    * completes.  Can be set to NULL, in which case no indication of successful
+    * completion will be received.
+    */
+	MQTTAsync_onSuccess* onSuccess;
+	/**
+    * A pointer to a callback function to be called if the API call fails.
+    * Can be set to NULL, in which case no indication of unsuccessful
+    * completion will be received.
+    */
+	MQTTAsync_onFailure* onFailure;
+	/**
+    * A pointer to any application-specific context. The
+    * the <i>context</i> pointer is passed to success or failure callback functions to
+    * provide access to the context information in the callback.
+    */
+	void* context;
+	/**
+    * A token is returned from the call.  It can be used to track
+    * the state of this request, both in the callbacks and in future calls
+    * such as ::MQTTAsync_waitForCompletion.
+    */
+	MQTTAsync_token token;
+	/**
+    * A pointer to a callback function to be called if the API call successfully
+    * completes.  Can be set to NULL, in which case no indication of successful
+    * completion will be received.
+    */
+	MQTTAsync_onSuccess5* onSuccess5;
+	/**
+    * A pointer to a callback function to be called if the API call successfully
+    * completes.  Can be set to NULL, in which case no indication of successful
+    * completion will be received.
+    */
+	MQTTAsync_onFailure5* onFailure5;
+	/**
+	 * MQTT V5 input properties
+	 */
+	MQTTProperties properties;
+	/*
+	 * MQTT V5 subscribe options, when used with subscribe only.
+	 */
+	MQTTSubscribe_options subscribeOptions;
+	/*
+	 * MQTT V5 subscribe option count, when used with subscribeMany only.
+	 * The number of entries in the subscribe_options_list array.
+	 */
+	int subscribeOptionsCount;
+	/*
+	 * MQTT V5 subscribe option array, when used with subscribeMany only.
+	 */
+	MQTTSubscribe_options* subscribeOptionsList;
+} MQTTAsync_responseOptions;
+
+#define MQTTAsync_responseOptions_initializer { {'M', 'Q', 'T', 'R'}, 1, NULL, NULL, 0, 0, NULL, NULL, MQTTProperties_initializer, MQTTSubscribe_options_initializer, 0, NULL}
+
+typedef struct MQTTAsync_responseOptions MQTTAsync_callOptions;
+#define MQTTAsync_callOptions_initializer MQTTAsync_responseOptions_initializer
+
+/**
+ * This function sets the global callback functions for a specific client.
+ * If your client application doesn't use a particular callback, set the
+ * relevant parameter to NULL. Any necessary message acknowledgements and
+ * status communications are handled in the background without any intervention
+ * from the client application.  If you do not set a messageArrived callback
+ * function, you will not be notified of the receipt of any messages as a
+ * result of a subscription.
+ *
+ * <b>Note:</b> The MQTT client must be disconnected when this function is
+ * called.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the <i>context</i> pointer is passed to each of the callback functions to
+ * provide access to the context information in the callback.
+ * @param cl A pointer to an MQTTAsync_connectionLost() callback
+ * function. You can set this to NULL if your application doesn't handle
+ * disconnections.
+ * @param ma A pointer to an MQTTAsync_messageArrived() callback
+ * function.  You can set this to NULL if your application doesn't handle
+ * receipt of messages.
+ * @param dc A pointer to an MQTTAsync_deliveryComplete() callback
+ * function. You can set this to NULL if you do not want to check
+ * for successful delivery.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+DLLExport int MQTTAsync_setCallbacks(MQTTAsync handle, void* context, MQTTAsync_connectionLost* cl,
+									 MQTTAsync_messageArrived* ma, MQTTAsync_deliveryComplete* dc);
+
+/**
+ * This function sets the callback function for a connection lost event for
+ * a specific client. Any necessary message acknowledgements and status
+ * communications are handled in the background without any intervention
+ * from the client application.
+ *
+ * <b>Note:</b> The MQTT client must be disconnected when this function is
+ * called.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the <i>context</i> pointer is passed the callback functions to provide
+ * access to the context information in the callback.
+ * @param cl A pointer to an MQTTAsync_connectionLost() callback
+ * function. You can set this to NULL if your application doesn't handle
+ * disconnections.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+
+DLLExport int MQTTAsync_setConnectionLostCallback(MQTTAsync handle, void* context, 
+												  MQTTAsync_connectionLost* cl);
+
+/**
+ * This function sets the callback function for a message arrived event for
+ * a specific client. Any necessary message acknowledgements and status
+ * communications are handled in the background without any intervention
+ * from the client application.  If you do not set a messageArrived callback
+ * function, you will not be notified of the receipt of any messages as a
+ * result of a subscription.
+ *
+ * <b>Note:</b> The MQTT client must be disconnected when this function is
+ * called.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the <i>context</i> pointer is passed to the callback functions to provide
+ * access to the context information in the callback.
+ * @param ma A pointer to an MQTTAsync_messageArrived() callback
+ * function.  You can set this to NULL if your application doesn't handle
+ * receipt of messages.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+DLLExport int MQTTAsync_setMessageArrivedCallback(MQTTAsync handle, void* context, 
+												  MQTTAsync_messageArrived* ma);
+
+/**
+ * This function sets the callback function for a delivery complete event
+ * for a specific client. Any necessary message acknowledgements and status
+ * communications are handled in the background without any intervention
+ * from the client application.
+ *
+ * <b>Note:</b> The MQTT client must be disconnected when this function is
+ * called.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the <i>context</i> pointer is passed to the callback functions to provide
+ * access to the context information in the callback.
+ * @param dc A pointer to an MQTTAsync_deliveryComplete() callback
+ * function. You can set this to NULL if you do not want to check
+ * for successful delivery.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+DLLExport int MQTTAsync_setDeliveryCompleteCallback(MQTTAsync handle, void* context, 
+													MQTTAsync_deliveryComplete* dc);
+
+/**
+ * Sets the MQTTAsync_connected() callback function for a client.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param context A pointer to any application-specific context. The
+ * the <i>context</i> pointer is passed to each of the callback functions to
+ * provide access to the context information in the callback.
+ * @param co A pointer to an MQTTAsync_connected() callback
+ * function.  NULL removes the callback setting.
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+DLLExport int MQTTAsync_setConnected(MQTTAsync handle, void* context, MQTTAsync_connected* co);
+
+
+/**
+ * Reconnects a client with the previously used connect options.  Connect
+ * must have previously been called for this to work.
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @return ::MQTTASYNC_SUCCESS if the callbacks were correctly set,
+ * ::MQTTASYNC_FAILURE if an error occurred.
+ */
+DLLExport int MQTTAsync_reconnect(MQTTAsync handle);
+
+
+/**
+ * This function creates an MQTT client ready for connection to the
+ * specified server and using the specified persistent storage (see
+ * MQTTAsync_persistence). See also MQTTAsync_destroy().
+ * @param handle A pointer to an ::MQTTAsync handle. The handle is
+ * populated with a valid client reference following a successful return from
+ * this function.
+ * @param serverURI A null-terminated string specifying the server to
+ * which the client will connect. It takes the form <i>protocol://host:port</i>.
+ * <i>protocol</i> must be <i>tcp</i> or <i>ssl</i>. For <i>host</i>, you can
+ * specify either an IP address or a host name. For instance, to connect to
+ * a server running on the local machines with the default MQTT port, specify
+ * <i>tcp://localhost:1883</i>.
+ * @param clientId The client identifier passed to the server when the
+ * client connects to it. It is a null-terminated UTF-8 encoded string.
+ * @param persistence_type The type of persistence to be used by the client:
+ * <br>
+ * ::MQTTCLIENT_PERSISTENCE_NONE: Use in-memory persistence. If the device or
+ * system on which the client is running fails or is switched off, the current
+ * state of any in-flight messages is lost and some messages may not be
+ * delivered even at QoS1 and QoS2.
+ * <br>
+ * ::MQTTCLIENT_PERSISTENCE_DEFAULT: Use the default (file system-based)
+ * persistence mechanism. Status about in-flight messages is held in persistent
+ * storage and provides some protection against message loss in the case of
+ * unexpected failure.
+ * <br>
+ * ::MQTTCLIENT_PERSISTENCE_USER: Use an application-specific persistence
+ * implementation. Using this type of persistence gives control of the
+ * persistence mechanism to the application. The application has to implement
+ * the MQTTClient_persistence interface.
+ * @param persistence_context If the application uses
+ * ::MQTTCLIENT_PERSISTENCE_NONE persistence, this argument is unused and should
+ * be set to NULL. For ::MQTTCLIENT_PERSISTENCE_DEFAULT persistence, it
+ * should be set to the location of the persistence directory (if set
+ * to NULL, the persistence directory used is the working directory).
+ * Applications that use ::MQTTCLIENT_PERSISTENCE_USER persistence set this
+ * argument to point to a valid MQTTClient_persistence structure.
+ * @return ::MQTTASYNC_SUCCESS if the client is successfully created, otherwise
+ * an error code is returned.
+ */
+DLLExport int MQTTAsync_create(MQTTAsync* handle, const char* serverURI, const char* clientId,
+		int persistence_type, void* persistence_context);
+
+typedef struct
+{
+	/** The eyecatcher for this structure.  must be MQCO. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0 or 1
+	 * 0 means no MQTTVersion
+	 */
+	int struct_version;
+	/** Whether to allow messages to be sent when the client library is not connected. */
+	int sendWhileDisconnected;
+	/** the maximum number of messages allowed to be buffered while not connected. */
+	int maxBufferedMessages;
+	/** Whether the MQTT version is 3.1, 3.1.1, or 5.  To use V5, this must be set.
+	 *  MQTT V5 has to be chosen here, because during the create call the message persistence
+	 *  is initialized, and we want to know whether the format of any persisted messages
+	 *  is appropriate for the MQTT version we are going to connect with.  Selecting 3.1 or
+	 *  3.1.1 and attempting to read 5.0 persisted messages will result in an error on create.  */
+	int MQTTVersion;
+} MQTTAsync_createOptions;
+
+#define MQTTAsync_createOptions_initializer  { {'M', 'Q', 'C', 'O'}, 1, 0, 100, MQTTVERSION_DEFAULT }
+
+#define MQTTAsync_createOptions_initializer5 { {'M', 'Q', 'C', 'O'}, 1, 0, 100, MQTTVERSION_5 }
+
+
+DLLExport int MQTTAsync_createWithOptions(MQTTAsync* handle, const char* serverURI, const char* clientId,
+		int persistence_type, void* persistence_context, MQTTAsync_createOptions* options);
+
+/**
+ * MQTTAsync_willOptions defines the MQTT "Last Will and Testament" (LWT) settings for
+ * the client. In the event that a client unexpectedly loses its connection to
+ * the server, the server publishes the LWT message to the LWT topic on
+ * behalf of the client. This allows other clients (subscribed to the LWT topic)
+ * to be made aware that the client has disconnected. To enable the LWT
+ * function for a specific client, a valid pointer to an MQTTAsync_willOptions
+ * structure is passed in the MQTTAsync_connectOptions structure used in the
+ * MQTTAsync_connect() call that connects the client to the server. The pointer
+ * to MQTTAsync_willOptions can be set to NULL if the LWT function is not
+ * required.
+ */
+typedef struct
+{
+	/** The eyecatcher for this structure.  must be MQTW. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0 or 1
+	    0 indicates no binary will message support
+	 */
+	int struct_version;
+	/** The LWT topic to which the LWT message will be published. */
+	const char* topicName;
+	/** The LWT payload. */
+	const char* message;
+	/**
+      * The retained flag for the LWT message (see MQTTAsync_message.retained).
+      */
+	int retained;
+	/**
+      * The quality of service setting for the LWT message (see
+      * MQTTAsync_message.qos and @ref qos).
+      */
+	int qos;
+	/** The LWT payload in binary form. This is only checked and used if the message option is NULL */
+	struct
+	{
+  	int len;            /**< binary payload length */
+		const void* data;  /**< binary payload data */
+	} payload;
+} MQTTAsync_willOptions;
+
+#define MQTTAsync_willOptions_initializer { {'M', 'Q', 'T', 'W'}, 1, NULL, NULL, 0, 0, { 0, NULL } }
+
+#define MQTT_SSL_VERSION_DEFAULT 0
+#define MQTT_SSL_VERSION_TLS_1_0 1
+#define MQTT_SSL_VERSION_TLS_1_1 2
+#define MQTT_SSL_VERSION_TLS_1_2 3
+
+/**
+* MQTTAsync_sslProperties defines the settings to establish an SSL/TLS connection using the
+* OpenSSL library. It covers the following scenarios:
+* - Server authentication: The client needs the digital certificate of the server. It is included
+*   in a store containting trusted material (also known as "trust store").
+* - Mutual authentication: Both client and server are authenticated during the SSL handshake. In
+*   addition to the digital certificate of the server in a trust store, the client will need its own
+*   digital certificate and the private key used to sign its digital certificate stored in a "key store".
+* - Anonymous connection: Both client and server do not get authenticated and no credentials are needed
+*   to establish an SSL connection. Note that this scenario is not fully secure since it is subject to
+*   man-in-the-middle attacks.
+*/
+typedef struct
+{
+	/** The eyecatcher for this structure.  Must be MQTS */
+	char struct_id[4];
+	/** The version number of this structure.    Must be 0, or 1 to enable TLS version selection. */
+	int struct_version;
+
+	/** The file in PEM format containing the public digital certificates trusted by the client. */
+	const char* trustStore;
+
+	/** The file in PEM format containing the public certificate chain of the client. It may also include
+	* the client's private key.
+	*/
+	const char* keyStore;
+
+	/** If not included in the sslKeyStore, this setting points to the file in PEM format containing
+	* the client's private key.
+	*/
+	const char* privateKey;
+	/** The password to load the client's privateKey if encrypted. */
+	const char* privateKeyPassword;
+
+	/**
+	* The list of cipher suites that the client will present to the server during the SSL handshake. For a
+	* full explanation of the cipher list format, please see the OpenSSL on-line documentation:
+	* http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT
+	* If this setting is ommitted, its default value will be "ALL", that is, all the cipher suites -excluding
+	* those offering no encryption- will be considered.
+	* This setting can be used to set an SSL anonymous connection ("aNULL" string value, for instance).
+	*/
+	const char* enabledCipherSuites;
+
+    /** True/False option to enable verification of the server certificate **/
+    int enableServerCertAuth;
+
+    /** The SSL/TLS version to use. Specify one of MQTT_SSL_VERSION_DEFAULT (0),
+    * MQTT_SSL_VERSION_TLS_1_0 (1), MQTT_SSL_VERSION_TLS_1_1 (2) or MQTT_SSL_VERSION_TLS_1_2 (3).
+    * Only used if struct_version is >= 1.
+    */
+    int sslVersion;
+
+    /**
+     * Whether to carry out post-connect checks, including that a certificate
+     * matches the given host name.
+     * Exists only if struct_version >= 2
+     */
+    int verify;
+
+    /**
+     * From the OpenSSL documentation:
+     * If CApath is not NULL, it points to a directory containing CA certificates in PEM format.
+     * Exists only if struct_version >= 2
+	 */
+	const char* CApath;
+
+    /**
+     * Callback function for OpenSSL error handler ERR_print_errors_cb
+     * Exists only if struct_version >= 3
+     */
+    int (*ssl_error_cb) (const char *str, size_t len, void *u);
+
+    /**
+     * Application-specific contex for OpenSSL error handler ERR_print_errors_cb
+     * Exists only if struct_version >= 3
+     */
+    void* ssl_error_context;
+
+	/**
+	 * Callback function for setting TLS-PSK options. Parameters correspond to that of
+	 * SSL_CTX_set_psk_client_callback, except for u which is the pointer ssl_psk_context.
+	 * Exists only if struct_version >= 4
+	 */
+	unsigned int (*ssl_psk_cb) (const char *hint, char *identity, unsigned int max_identity_len, unsigned char *psk, unsigned int max_psk_len, void *u);
+
+	/**
+	 * Application-specific contex for ssl_psk_cb
+	 * Exists only if struct_version >= 4
+	 */
+	void* ssl_psk_context;
+
+	/**
+	 * Don't load default SSL CA. Should be used together with PSK to make sure
+	 * regular servers with certificate in place is not accepted.
+	 * Exists only if struct_version >= 4
+	 */
+	int disableDefaultTrustStore;
+
+} MQTTAsync_SSLOptions;
+
+#define MQTTAsync_SSLOptions_initializer { {'M', 'Q', 'T', 'S'}, 4, NULL, NULL, NULL, NULL, NULL, 1, MQTT_SSL_VERSION_DEFAULT, 0, NULL, NULL, NULL, NULL, NULL, 0}
+
+/**
+ * MQTTAsync_connectOptions defines several settings that control the way the
+ * client connects to an MQTT server.  Default values are set in
+ * MQTTAsync_connectOptions_initializer.
+ */
+typedef struct
+{
+	/** The eyecatcher for this structure.  must be MQTC. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0, 1, 2, 3 4 5 or 6.
+	  * 0 signifies no SSL options and no serverURIs
+	  * 1 signifies no serverURIs
+    * 2 signifies no MQTTVersion
+    * 3 signifies no automatic reconnect options
+    * 4 signifies no binary password option (just string)
+    * 5 signifies no MQTTV5 properties
+	  */
+	int struct_version;
+	/** The "keep alive" interval, measured in seconds, defines the maximum time
+      * that should pass without communication between the client and the server
+      * The client will ensure that at least one message travels across the
+      * network within each keep alive period.  In the absence of a data-related
+	  * message during the time period, the client sends a very small MQTT
+      * "ping" message, which the server will acknowledge. The keep alive
+      * interval enables the client to detect when the server is no longer
+	  * available without having to wait for the long TCP/IP timeout.
+	  * Set to 0 if you do not want any keep alive processing.
+	  */
+	int keepAliveInterval;
+	/**
+      * This is a boolean value. The cleansession setting controls the behaviour
+      * of both the client and the server at connection and disconnection time.
+      * The client and server both maintain session state information. This
+      * information is used to ensure "at least once" and "exactly once"
+      * delivery, and "exactly once" receipt of messages. Session state also
+      * includes subscriptions created by an MQTT client. You can choose to
+      * maintain or discard state information between sessions.
+      *
+      * When cleansession is true, the state information is discarded at
+      * connect and disconnect. Setting cleansession to false keeps the state
+      * information. When you connect an MQTT client application with
+      * MQTTAsync_connect(), the client identifies the connection using the
+      * client identifier and the address of the server. The server checks
+      * whether session information for this client
+      * has been saved from a previous connection to the server. If a previous
+      * session still exists, and cleansession=true, then the previous session
+      * information at the client and server is cleared. If cleansession=false,
+      * the previous session is resumed. If no previous session exists, a new
+      * session is started.
+	  */
+	int cleansession;
+	/**
+      * This controls how many messages can be in-flight simultaneously.
+	  */
+	int maxInflight;
+	/**
+      * This is a pointer to an MQTTAsync_willOptions structure. If your
+      * application does not make use of the Last Will and Testament feature,
+      * set this pointer to NULL.
+      */
+	MQTTAsync_willOptions* will;
+	/**
+      * MQTT servers that support the MQTT v3.1 protocol provide authentication
+      * and authorisation by user name and password. This is the user name
+      * parameter.
+      */
+	const char* username;
+	/**
+      * MQTT servers that support the MQTT v3.1 protocol provide authentication
+      * and authorisation by user name and password. This is the password
+      * parameter.
+      */
+	const char* password;
+	/**
+      * The time interval in seconds to allow a connect to complete.
+      */
+	int connectTimeout;
+	/**
+	 * The time interval in seconds after which unacknowledged publish requests are
+	 * retried during a TCP session.  With MQTT 3.1.1 and later, retries are
+	 * not required except on reconnect.  0 turns off in-session retries, and is the
+	 * recommended setting.  Adding retries to an already overloaded network only
+	 * exacerbates the problem.
+	 */
+	int retryInterval;
+	/**
+      * This is a pointer to an MQTTAsync_SSLOptions structure. If your
+      * application does not make use of SSL, set this pointer to NULL.
+      */
+	MQTTAsync_SSLOptions* ssl;
+	/**
+      * A pointer to a callback function to be called if the connect successfully
+      * completes.  Can be set to NULL, in which case no indication of successful
+      * completion will be received.
+      */
+	MQTTAsync_onSuccess* onSuccess;
+	/**
+      * A pointer to a callback function to be called if the connect fails.
+      * Can be set to NULL, in which case no indication of unsuccessful
+      * completion will be received.
+      */
+	MQTTAsync_onFailure* onFailure;
+	/**
+	  * A pointer to any application-specific context. The
+      * the <i>context</i> pointer is passed to success or failure callback functions to
+      * provide access to the context information in the callback.
+      */
+	void* context;
+	/**
+	  * The number of entries in the serverURIs array.
+	  */
+	int serverURIcount;
+	/**
+	  * An array of null-terminated strings specifying the servers to
+      * which the client will connect. Each string takes the form <i>protocol://host:port</i>.
+      * <i>protocol</i> must be <i>tcp</i> or <i>ssl</i>. For <i>host</i>, you can
+      * specify either an IP address or a domain name. For instance, to connect to
+      * a server running on the local machines with the default MQTT port, specify
+      * <i>tcp://localhost:1883</i>.
+      */
+	char* const* serverURIs;
+	/**
+      * Sets the version of MQTT to be used on the connect.
+      * MQTTVERSION_DEFAULT (0) = default: start with 3.1.1, and if that fails, fall back to 3.1
+      * MQTTVERSION_3_1 (3) = only try version 3.1
+      * MQTTVERSION_3_1_1 (4) = only try version 3.1.1
+	  */
+	int MQTTVersion;
+	/**
+	  * Reconnect automatically in the case of a connection being lost?
+	  */
+	int automaticReconnect;
+	/**
+	  * Minimum retry interval in seconds.  Doubled on each failed retry.
+	  */
+	int minRetryInterval;
+	/**
+	  * Maximum retry interval in seconds.  The doubling stops here on failed retries.
+	  */
+	int maxRetryInterval;
+	/**
+	 * Optional binary password.  Only checked and used if the password option is NULL
+	 */
+	struct {
+		int len;            /**< binary password length */
+		const void* data;  /**< binary password data */
+	} binarypwd;
+	/*
+	 * MQTT V5 clean start flag.  Only clears state at the beginning of the session.
+	 */
+	int cleanstart;
+	/**
+	 * MQTT V5 properties for connect
+	 */
+	MQTTProperties *connectProperties;
+	/**
+	 * MQTT V5 properties for the will message in the connect
+	 */
+	MQTTProperties *willProperties;
+	/**
+      * A pointer to a callback function to be called if the connect successfully
+      * completes.  Can be set to NULL, in which case no indication of successful
+      * completion will be received.
+      */
+	MQTTAsync_onSuccess5* onSuccess5;
+	/**
+      * A pointer to a callback function to be called if the connect fails.
+      * Can be set to NULL, in which case no indication of unsuccessful
+      * completion will be received.
+      */
+	MQTTAsync_onFailure5* onFailure5;
+} MQTTAsync_connectOptions;
+
+
+#define MQTTAsync_connectOptions_initializer { {'M', 'Q', 'T', 'C'}, 6, 60, 1, 65535, NULL, NULL, NULL, 30, 0,\
+NULL, NULL, NULL, NULL, 0, NULL, MQTTVERSION_DEFAULT, 0, 1, 60, {0, NULL}, 0, NULL, NULL, NULL, NULL}
+
+#define MQTTAsync_connectOptions_initializer5 { {'M', 'Q', 'T', 'C'}, 6, 60, 0, 65535, NULL, NULL, NULL, 30, 0,\
+NULL, NULL, NULL, NULL, 0, NULL, MQTTVERSION_5, 0, 1, 60, {0, NULL}, 1, NULL, NULL, NULL, NULL}
+
+
+/**
+  * This function attempts to connect a previously-created client (see
+  * MQTTAsync_create()) to an MQTT server using the specified options. If you
+  * want to enable asynchronous message and status notifications, you must call
+  * MQTTAsync_setCallbacks() prior to MQTTAsync_connect().
+  * @param handle A valid client handle from a successful call to
+  * MQTTAsync_create().
+  * @param options A pointer to a valid MQTTAsync_connectOptions
+  * structure.
+  * @return ::MQTTASYNC_SUCCESS if the client connect request was accepted.
+  * If the client was unable to connect to the server, an error code is
+  * returned via the onFailure callback, if set.
+  * Error codes greater than 0 are returned by the MQTT protocol:<br><br>
+  * <b>1</b>: Connection refused: Unacceptable protocol version<br>
+  * <b>2</b>: Connection refused: Identifier rejected<br>
+  * <b>3</b>: Connection refused: Server unavailable<br>
+  * <b>4</b>: Connection refused: Bad user name or password<br>
+  * <b>5</b>: Connection refused: Not authorized<br>
+  * <b>6-255</b>: Reserved for future use<br>
+  */
+DLLExport int MQTTAsync_connect(MQTTAsync handle, const MQTTAsync_connectOptions* options);
+
+
+typedef struct
+{
+	/** The eyecatcher for this structure. Must be MQTD. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0 or 1.  0 signifies no V5 properties */
+	int struct_version;
+	/**
+      * The client delays disconnection for up to this time (in
+      * milliseconds) in order to allow in-flight message transfers to complete.
+      */
+	int timeout;
+	/**
+    * A pointer to a callback function to be called if the disconnect successfully
+    * completes.  Can be set to NULL, in which case no indication of successful
+    * completion will be received.
+    */
+	MQTTAsync_onSuccess* onSuccess;
+	/**
+    * A pointer to a callback function to be called if the disconnect fails.
+    * Can be set to NULL, in which case no indication of unsuccessful
+    * completion will be received.
+    */
+	MQTTAsync_onFailure* onFailure;
+	/**
+	* A pointer to any application-specific context. The
+    * the <i>context</i> pointer is passed to success or failure callback functions to
+    * provide access to the context information in the callback.
+    */
+	void* context;
+	/**
+	 * MQTT V5 input properties
+	 */
+	MQTTProperties properties;
+	/**
+	 * Reason code for MQTTV5 disconnect
+	 */
+	enum MQTTReasonCodes reasonCode;
+	/**
+    * A pointer to a callback function to be called if the disconnect successfully
+    * completes.  Can be set to NULL, in which case no indication of successful
+    * completion will be received.
+    */
+	MQTTAsync_onSuccess5* onSuccess5;
+	/**
+    * A pointer to a callback function to be called if the disconnect fails.
+    * Can be set to NULL, in which case no indication of unsuccessful
+    * completion will be received.
+    */
+	MQTTAsync_onFailure5* onFailure5;
+} MQTTAsync_disconnectOptions;
+
+#define MQTTAsync_disconnectOptions_initializer { {'M', 'Q', 'T', 'D'}, 0, 0, NULL, NULL, NULL,\
+	MQTTProperties_initializer, MQTTREASONCODE_SUCCESS }
+
+#define MQTTAsync_disconnectOptions_initializer5 { {'M', 'Q', 'T', 'D'}, 1, 0, NULL, NULL, NULL,\
+	MQTTProperties_initializer, MQTTREASONCODE_SUCCESS, NULL, NULL }
+
+/**
+  * This function attempts to disconnect the client from the MQTT
+  * server. In order to allow the client time to complete handling of messages
+  * that are in-flight when this function is called, a timeout period is
+  * specified. When the timeout period has expired, the client disconnects even
+  * if there are still outstanding message acknowledgements.
+  * The next time the client connects to the same server, any QoS 1 or 2
+  * messages which have not completed will be retried depending on the
+  * cleansession settings for both the previous and the new connection (see
+  * MQTTAsync_connectOptions.cleansession and MQTTAsync_connect()).
+  * @param handle A valid client handle from a successful call to
+  * MQTTAsync_create().
+  * @param options The client delays disconnection for up to this time (in
+  * milliseconds) in order to allow in-flight message transfers to complete.
+  * @return ::MQTTASYNC_SUCCESS if the client successfully disconnects from
+  * the server. An error code is returned if the client was unable to disconnect
+  * from the server
+  */
+DLLExport int MQTTAsync_disconnect(MQTTAsync handle, const MQTTAsync_disconnectOptions* options);
+
+
+/**
+  * This function allows the client application to test whether or not a
+  * client is currently connected to the MQTT server.
+  * @param handle A valid client handle from a successful call to
+  * MQTTAsync_create().
+  * @return Boolean true if the client is connected, otherwise false.
+  */
+DLLExport int MQTTAsync_isConnected(MQTTAsync handle);
+
+
+/**
+  * This function attempts to subscribe a client to a single topic, which may
+  * contain wildcards (see @ref wildcard). This call also specifies the
+  * @ref qos requested for the subscription
+  * (see also MQTTAsync_subscribeMany()).
+  * @param handle A valid client handle from a successful call to
+  * MQTTAsync_create().
+  * @param topic The subscription topic, which may include wildcards.
+  * @param qos The requested quality of service for the subscription.
+  * @param response A pointer to a response options structure. Used to set callback functions.
+  * @return ::MQTTASYNC_SUCCESS if the subscription request is successful.
+  * An error code is returned if there was a problem registering the
+  * subscription.
+  */
+DLLExport int MQTTAsync_subscribe(MQTTAsync handle, const char* topic, int qos, MQTTAsync_responseOptions* response);
+
+
+/**
+  * This function attempts to subscribe a client to a list of topics, which may
+  * contain wildcards (see @ref wildcard). This call also specifies the
+  * @ref qos requested for each topic (see also MQTTAsync_subscribe()).
+  * @param handle A valid client handle from a successful call to
+  * MQTTAsync_create().
+  * @param count The number of topics for which the client is requesting
+  * subscriptions.
+  * @param topic An array (of length <i>count</i>) of pointers to
+  * topics, each of which may include wildcards.
+  * @param qos An array (of length <i>count</i>) of @ref qos
+  * values. qos[n] is the requested QoS for topic[n].
+  * @param response A pointer to a response options structure. Used to set callback functions.
+  * @return ::MQTTASYNC_SUCCESS if the subscription request is successful.
+  * An error code is returned if there was a problem registering the
+  * subscriptions.
+  */
+DLLExport int MQTTAsync_subscribeMany(MQTTAsync handle, int count, char* const* topic, int* qos, MQTTAsync_responseOptions* response);
+
+/**
+  * This function attempts to remove an existing subscription made by the
+  * specified client.
+  * @param handle A valid client handle from a successful call to
+  * MQTTAsync_create().
+  * @param topic The topic for the subscription to be removed, which may
+  * include wildcards (see @ref wildcard).
+  * @param response A pointer to a response options structure. Used to set callback functions.
+  * @return ::MQTTASYNC_SUCCESS if the subscription is removed.
+  * An error code is returned if there was a problem removing the
+  * subscription.
+  */
+DLLExport int MQTTAsync_unsubscribe(MQTTAsync handle, const char* topic, MQTTAsync_responseOptions* response);
+
+/**
+  * This function attempts to remove existing subscriptions to a list of topics
+  * made by the specified client.
+  * @param handle A valid client handle from a successful call to
+  * MQTTAsync_create().
+  * @param count The number subscriptions to be removed.
+  * @param topic An array (of length <i>count</i>) of pointers to the topics of
+  * the subscriptions to be removed, each of which may include wildcards.
+  * @param response A pointer to a response options structure. Used to set callback functions.
+  * @return ::MQTTASYNC_SUCCESS if the subscriptions are removed.
+  * An error code is returned if there was a problem removing the subscriptions.
+  */
+DLLExport int MQTTAsync_unsubscribeMany(MQTTAsync handle, int count, char* const* topic, MQTTAsync_responseOptions* response);
+
+
+/**
+  * This function attempts to publish a message to a given topic (see also
+  * ::MQTTAsync_sendMessage()). An ::MQTTAsync_token is issued when
+  * this function returns successfully. If the client application needs to
+  * test for successful delivery of messages, a callback should be set
+  * (see ::MQTTAsync_onSuccess() and ::MQTTAsync_deliveryComplete()).
+  * @param handle A valid client handle from a successful call to
+  * MQTTAsync_create().
+  * @param destinationName The topic associated with this message.
+  * @param payloadlen The length of the payload in bytes.
+  * @param payload A pointer to the byte array payload of the message.
+  * @param qos The @ref qos of the message.
+  * @param retained The retained flag for the message.
+  * @param response A pointer to an ::MQTTAsync_responseOptions structure. Used to set callback functions.
+  * This is optional and can be set to NULL.
+  * @return ::MQTTASYNC_SUCCESS if the message is accepted for publication.
+  * An error code is returned if there was a problem accepting the message.
+  */
+DLLExport int MQTTAsync_send(MQTTAsync handle, const char* destinationName, int payloadlen, const void* payload, int qos,
+		int retained, MQTTAsync_responseOptions* response);
+
+
+/**
+  * This function attempts to publish a message to a given topic (see also
+  * MQTTAsync_publish()). An ::MQTTAsync_token is issued when
+  * this function returns successfully. If the client application needs to
+  * test for successful delivery of messages, a callback should be set
+  * (see ::MQTTAsync_onSuccess() and ::MQTTAsync_deliveryComplete()).
+  * @param handle A valid client handle from a successful call to
+  * MQTTAsync_create().
+  * @param destinationName The topic associated with this message.
+  * @param msg A pointer to a valid MQTTAsync_message structure containing
+  * the payload and attributes of the message to be published.
+  * @param response A pointer to an ::MQTTAsync_responseOptions structure. Used to set callback functions.
+  * @return ::MQTTASYNC_SUCCESS if the message is accepted for publication.
+  * An error code is returned if there was a problem accepting the message.
+  */
+DLLExport int MQTTAsync_sendMessage(MQTTAsync handle, const char* destinationName, const MQTTAsync_message* msg, MQTTAsync_responseOptions* response);
+
+
+/**
+  * This function sets a pointer to an array of tokens for
+  * messages that are currently in-flight (pending completion).
+  *
+  * <b>Important note:</b> The memory used to hold the array of tokens is
+  * malloc()'d in this function. The client application is responsible for
+  * freeing this memory when it is no longer required.
+  * @param handle A valid client handle from a successful call to
+  * MQTTAsync_create().
+  * @param tokens The address of a pointer to an ::MQTTAsync_token.
+  * When the function returns successfully, the pointer is set to point to an
+  * array of tokens representing messages pending completion. The last member of
+  * the array is set to -1 to indicate there are no more tokens. If no tokens
+  * are pending, the pointer is set to NULL.
+  * @return ::MQTTASYNC_SUCCESS if the function returns successfully.
+  * An error code is returned if there was a problem obtaining the list of
+  * pending tokens.
+  */
+DLLExport int MQTTAsync_getPendingTokens(MQTTAsync handle, MQTTAsync_token **tokens);
+
+/**
+ * Tests whether a request corresponding to a token is complete.
+ *
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param token An ::MQTTAsync_token associated with a request.
+ * @return 1 if the request has been completed, 0 if not.
+ */
+#define MQTTASYNC_TRUE 1
+DLLExport int MQTTAsync_isComplete(MQTTAsync handle, MQTTAsync_token token);
+
+
+/**
+ * Waits for a request corresponding to a token to complete.
+ *
+ * @param handle A valid client handle from a successful call to
+ * MQTTAsync_create().
+ * @param token An ::MQTTAsync_token associated with a request.
+ * @param timeout the maximum time to wait for completion, in milliseconds
+ * @return ::MQTTASYNC_SUCCESS if the request has been completed in the time allocated,
+ *  ::MQTTASYNC_FAILURE if not.
+ */
+DLLExport int MQTTAsync_waitForCompletion(MQTTAsync handle, MQTTAsync_token token, unsigned long timeout);
+
+
+/**
+  * This function frees memory allocated to an MQTT message, including the
+  * additional memory allocated to the message payload. The client application
+  * calls this function when the message has been fully processed. <b>Important
+  * note:</b> This function does not free the memory allocated to a message
+  * topic string. It is the responsibility of the client application to free
+  * this memory using the MQTTAsync_free() library function.
+  * @param msg The address of a pointer to the ::MQTTAsync_message structure
+  * to be freed.
+  */
+DLLExport void MQTTAsync_freeMessage(MQTTAsync_message** msg);
+
+/**
+  * This function frees memory allocated by the MQTT C client library, especially the
+  * topic name. This is needed on Windows when the client libary and application
+  * program have been compiled with different versions of the C compiler.  It is
+  * thus good policy to always use this function when freeing any MQTT C client-
+  * allocated memory.
+  * @param ptr The pointer to the client library storage to be freed.
+  */
+DLLExport void MQTTAsync_free(void* ptr);
+
+/**
+  * This function frees the memory allocated to an MQTT client (see
+  * MQTTAsync_create()). It should be called when the client is no longer
+  * required.
+  * @param handle A pointer to the handle referring to the ::MQTTAsync
+  * structure to be freed.
+  */
+DLLExport void MQTTAsync_destroy(MQTTAsync* handle);
+
+
+
+enum MQTTASYNC_TRACE_LEVELS
+{
+	MQTTASYNC_TRACE_MAXIMUM = 1,
+	MQTTASYNC_TRACE_MEDIUM,
+	MQTTASYNC_TRACE_MINIMUM,
+	MQTTASYNC_TRACE_PROTOCOL,
+	MQTTASYNC_TRACE_ERROR,
+	MQTTASYNC_TRACE_SEVERE,
+	MQTTASYNC_TRACE_FATAL,
+};
+
+
+/**
+  * This function sets the level of trace information which will be
+  * returned in the trace callback.
+  * @param level the trace level required
+  */
+DLLExport void MQTTAsync_setTraceLevel(enum MQTTASYNC_TRACE_LEVELS level);
+
+
+/**
+  * This is a callback function prototype which must be implemented if you want
+  * to receive trace information.
+  * @param level the trace level of the message returned
+  * @param message the trace message.  This is a pointer to a static buffer which
+  * will be overwritten on each call.  You must copy the data if you want to keep
+  * it for later.
+  */
+typedef void MQTTAsync_traceCallback(enum MQTTASYNC_TRACE_LEVELS level, char* message);
+
+/**
+  * This function sets the trace callback if needed.  If set to NULL,
+  * no trace information will be returned.  The default trace level is
+  * MQTTASYNC_TRACE_MINIMUM.
+  * @param callback a pointer to the function which will handle the trace information
+  */
+DLLExport void MQTTAsync_setTraceCallback(MQTTAsync_traceCallback* callback);
+
+
+typedef struct
+{
+	const char* name;
+	const char* value;
+} MQTTAsync_nameValue;
+
+/**
+  * This function returns version information about the library.
+  * no trace information will be returned.  The default trace level is
+  * MQTTASYNC_TRACE_MINIMUM
+  * @return an array of strings describing the library.  The last entry is a NULL pointer.
+  */
+DLLExport MQTTAsync_nameValue* MQTTAsync_getVersionInfo(void);
+
+/**
+ * Returns a pointer to a string representation of the error code, or NULL.
+ * Do not free after use. Returns NULL if the error code is unknown.
+ * @param code the MQTTASYNC_ return code.
+ * @return a static string representation of the error code.
+ */
+DLLExport const char* MQTTAsync_strerror(int code);
+
+
+/**
+  * @cond MQTTAsync_main
+  * @page async Threading
+  * The client application runs on several threads.
+  * Processing of handshaking and maintaining
+  * the network connection is performed in the background.
+  * This API is thread safe: functions may be called by multiple application
+  * threads.
+  * Notifications of status and message reception are provided to the client
+  * application using callbacks registered with the library by the call to
+  * MQTTAsync_setCallbacks() (see MQTTAsync_messageArrived(),
+  * MQTTAsync_connectionLost() and MQTTAsync_deliveryComplete()).
+  * In addition, some functions allow success and failure callbacks to be set
+  * for individual requests, in the ::MQTTAsync_responseOptions structure.  Applications
+  * can be written as a chain of callback functions. Note that it is a theoretically
+  * possible but unlikely event, that a success or failure callback could be called
+  * before function requesting the callback has returned.  In this case the token
+  * delivered in the callback would not yet be known to the application program (see
+  * Race condition for MQTTAsync_token in MQTTAsync.c
+  * https://bugs.eclipse.org/bugs/show_bug.cgi?id=444093)
+  *
+  * @page auto_reconnect Automatic Reconnect
+  * The ability for the client library to reconnect automatically in the event
+  * of a connection failure was added in 1.1.  The connection lost callback
+  * allows a flexible response to the loss of a connection, so almost any
+  * behaviour can be implemented in that way.  Automatic reconnect does have the
+  * advantage of being a little simpler to use.
+  *
+  * To switch on automatic reconnect, the connect options field
+  * automaticReconnect should be set to non-zero.  The minimum and maximum times
+  * before the next connection attempt can also be set, the defaults being 1 and
+  * 60 seconds.  At each failure to reconnect, the retry interval is doubled until
+  * the maximum value is reached, and there it stays until the connection is
+  * successfully re-established whereupon it is reset.
+  *
+  * When a reconnection attempt is successful, the ::MQTTAsync_connected callback
+  * function is invoked, if set by calling ::MQTTAsync_setConnected.  This allows
+  * the application to take any actions needed, such as amending subscriptions.
+  *
+  * @page offline_publish Publish While Disconnected
+  * This feature was not originally available because with persistence enabled,
+  * messages could be stored locally without ever knowing if they could be sent.
+  * The client application could have created the client with an erroneous broker
+  * address or port for instance.
+  *
+  * To enable messages to be published when the application is disconnected
+  * ::MQTTAsync_createWithOptions must be used instead of ::MQTTAsync_create to
+  * create the client object.  The ::createOptions field sendWhileDisconnected
+  * must be set to non-zero, and the maxBufferedMessages field set as required -
+  * the default being 100.
+  *
+  * ::MQTTAsync_getPendingTokens can be called to return the ids of the messages
+  * waiting to be sent, or for which the sending process has not completed.
+  *
+  * @page wildcard Subscription wildcards
+  * Every MQTT message includes a topic that classifies it. MQTT servers use
+  * topics to determine which subscribers should receive messages published to
+  * the server.
+  *
+  * Consider the server receiving messages from several environmental sensors.
+  * Each sensor publishes its measurement data as a message with an associated
+  * topic. Subscribing applications need to know which sensor originally
+  * published each received message. A unique topic is thus used to identify
+  * each sensor and measurement type. Topics such as SENSOR1TEMP,
+  * SENSOR1HUMIDITY, SENSOR2TEMP and so on achieve this but are not very
+  * flexible. If additional sensors are added to the system at a later date,
+  * subscribing applications must be modified to receive them.
+  *
+  * To provide more flexibility, MQTT supports a hierarchical topic namespace.
+  * This allows application designers to organize topics to simplify their
+  * management. Levels in the hierarchy are delimited by the '/' character,
+  * such as SENSOR/1/HUMIDITY. Publishers and subscribers use these
+  * hierarchical topics as already described.
+  *
+  * For subscriptions, two wildcard characters are supported:
+  * <ul>
+  * <li>A '#' character represents a complete sub-tree of the hierarchy and
+  * thus must be the last character in a subscription topic string, such as
+  * SENSOR/#. This will match any topic starting with SENSOR/, such as
+  * SENSOR/1/TEMP and SENSOR/2/HUMIDITY.</li>
+  * <li> A '+' character represents a single level of the hierarchy and is
+  * used between delimiters. For example, SENSOR/+/TEMP will match
+  * SENSOR/1/TEMP and SENSOR/2/TEMP.</li>
+  * </ul>
+  * Publishers are not allowed to use the wildcard characters in their topic
+  * names.
+  *
+  * Deciding on your topic hierarchy is an important step in your system design.
+  *
+  * @page qos Quality of service
+  * The MQTT protocol provides three qualities of service for delivering
+  * messages between clients and servers: "at most once", "at least once" and
+  * "exactly once".
+  *
+  * Quality of service (QoS) is an attribute of an individual message being
+  * published. An application sets the QoS for a specific message by setting the
+  * MQTTAsync_message.qos field to the required value.
+  *
+  * A subscribing client can set the maximum quality of service a server uses
+  * to send messages that match the client subscriptions. The
+  * MQTTAsync_subscribe() and MQTTAsync_subscribeMany() functions set this
+  * maximum. The QoS of a message forwarded to a subscriber thus might be
+  * different to the QoS given to the message by the original publisher.
+  * The lower of the two values is used to forward a message.
+  *
+  * The three levels are:
+  *
+  * <b>QoS0, At most once:</b> The message is delivered at most once, or it
+  * may not be delivered at all. Its delivery across the network is not
+  * acknowledged. The message is not stored. The message could be lost if the
+  * client is disconnected, or if the server fails. QoS0 is the fastest mode of
+  * transfer. It is sometimes called "fire and forget".
+  *
+  * The MQTT protocol does not require servers to forward publications at QoS0
+  * to a client. If the client is disconnected at the time the server receives
+  * the publication, the publication might be discarded, depending on the
+  * server implementation.
+  *
+  * <b>QoS1, At least once:</b> The message is always delivered at least once.
+  * It might be delivered multiple times if there is a failure before an
+  * acknowledgment is received by the sender. The message must be stored
+  * locally at the sender, until the sender receives confirmation that the
+  * message has been published by the receiver. The message is stored in case
+  * the message must be sent again.
+  *
+  * <b>QoS2, Exactly once:</b> The message is always delivered exactly once.
+  * The message must be stored locally at the sender, until the sender receives
+  * confirmation that the message has been published by the receiver. The
+  * message is stored in case the message must be sent again. QoS2 is the
+  * safest, but slowest mode of transfer. A more sophisticated handshaking
+  * and acknowledgement sequence is used than for QoS1 to ensure no duplication
+  * of messages occurs.
+
+
+  * @page publish Publication example
+@code
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MQTTAsync.h"
+
+#define ADDRESS     "tcp://localhost:1883"
+#define CLIENTID    "ExampleClientPub"
+#define TOPIC       "MQTT Examples"
+#define PAYLOAD     "Hello World!"
+#define QOS         1
+#define TIMEOUT     10000L
+
+volatile MQTTAsync_token deliveredtoken;
+
+int finished = 0;
+
+void connlost(void *context, char *cause)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+	int rc;
+
+	printf("\nConnection lost\n");
+	printf("     cause: %s\n", cause);
+
+	printf("Reconnecting\n");
+	conn_opts.keepAliveInterval = 20;
+	conn_opts.cleansession = 1;
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start connect, return code %d\n", rc);
+ 		finished = 1;
+	}
+}
+
+
+void onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	printf("Successful disconnection\n");
+	finished = 1;
+}
+
+
+void onSend(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	printf("Message with token value %d delivery confirmed\n", response->token);
+
+	opts.onSuccess = onDisconnect;
+	opts.context = client;
+
+	if ((rc = MQTTAsync_disconnect(client, &opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start sendMessage, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+}
+
+
+void onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	printf("Connect failed, rc %d\n", response ? response->code : 0);
+	finished = 1;
+}
+
+
+void onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+
+	printf("Successful connection\n");
+
+	opts.onSuccess = onSend;
+	opts.context = client;
+
+	pubmsg.payload = PAYLOAD;
+	pubmsg.payloadlen = strlen(PAYLOAD);
+	pubmsg.qos = QOS;
+	pubmsg.retained = 0;
+	deliveredtoken = 0;
+
+	if ((rc = MQTTAsync_sendMessage(client, TOPIC, &pubmsg, &opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start sendMessage, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+}
+
+
+int main(int argc, char* argv[])
+{
+	MQTTAsync client;
+	MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MQTTAsync_token token;
+	int rc;
+
+	MQTTAsync_create(&client, ADDRESS, CLIENTID, MQTTCLIENT_PERSISTENCE_NONE, NULL);
+
+	MQTTAsync_setCallbacks(client, NULL, connlost, NULL, NULL);
+
+	conn_opts.keepAliveInterval = 20;
+	conn_opts.cleansession = 1;
+	conn_opts.onSuccess = onConnect;
+	conn_opts.onFailure = onConnectFailure;
+	conn_opts.context = client;
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start connect, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+
+	printf("Waiting for publication of %s\n"
+         "on topic %s for client with ClientID: %s\n",
+         PAYLOAD, TOPIC, CLIENTID);
+	while (!finished)
+		#if defined(WIN32) || defined(WIN64)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&client);
+ 	return rc;
+}
+
+  * @endcode
+  * @page subscribe Subscription example
+@code
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MQTTAsync.h"
+
+#define ADDRESS     "tcp://localhost:1883"
+#define CLIENTID    "ExampleClientSub"
+#define TOPIC       "MQTT Examples"
+#define PAYLOAD     "Hello World!"
+#define QOS         1
+#define TIMEOUT     10000L
+
+volatile MQTTAsync_token deliveredtoken;
+
+int disc_finished = 0;
+int subscribed = 0;
+int finished = 0;
+
+void connlost(void *context, char *cause)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+	int rc;
+
+	printf("\nConnection lost\n");
+	printf("     cause: %s\n", cause);
+
+	printf("Reconnecting\n");
+	conn_opts.keepAliveInterval = 20;
+	conn_opts.cleansession = 1;
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start connect, return code %d\n", rc);
+	    finished = 1;
+	}
+}
+
+
+int msgarrvd(void *context, char *topicName, int topicLen, MQTTAsync_message *message)
+{
+    int i;
+    char* payloadptr;
+
+    printf("Message arrived\n");
+    printf("     topic: %s\n", topicName);
+    printf("   message: ");
+
+    payloadptr = message->payload;
+    for(i=0; i<message->payloadlen; i++)
+    {
+        putchar(*payloadptr++);
+    }
+    putchar('\n');
+    MQTTAsync_freeMessage(&message);
+    MQTTAsync_free(topicName);
+    return 1;
+}
+
+
+void onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	printf("Successful disconnection\n");
+	disc_finished = 1;
+}
+
+
+void onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	printf("Subscribe succeeded\n");
+	subscribed = 1;
+}
+
+void onSubscribeFailure(void* context, MQTTAsync_failureData* response)
+{
+	printf("Subscribe failed, rc %d\n", response ? response->code : 0);
+	finished = 1;
+}
+
+
+void onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	printf("Connect failed, rc %d\n", response ? response->code : 0);
+	finished = 1;
+}
+
+
+void onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+
+	printf("Successful connection\n");
+
+	printf("Subscribing to topic %s\nfor client %s using QoS%d\n\n"
+           "Press Q<Enter> to quit\n\n", TOPIC, CLIENTID, QOS);
+	opts.onSuccess = onSubscribe;
+	opts.onFailure = onSubscribeFailure;
+	opts.context = client;
+
+	deliveredtoken = 0;
+
+	if ((rc = MQTTAsync_subscribe(client, TOPIC, QOS, &opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start subscribe, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+}
+
+
+int main(int argc, char* argv[])
+{
+	MQTTAsync client;
+	MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_disconnectOptions disc_opts = MQTTAsync_disconnectOptions_initializer;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MQTTAsync_token token;
+	int rc;
+	int ch;
+
+	MQTTAsync_create(&client, ADDRESS, CLIENTID, MQTTCLIENT_PERSISTENCE_NONE, NULL);
+
+	MQTTAsync_setCallbacks(client, NULL, connlost, msgarrvd, NULL);
+
+	conn_opts.keepAliveInterval = 20;
+	conn_opts.cleansession = 1;
+	conn_opts.onSuccess = onConnect;
+	conn_opts.onFailure = onConnectFailure;
+	conn_opts.context = client;
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start connect, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+
+	while	(!subscribed)
+		#if defined(WIN32) || defined(WIN64)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	if (finished)
+		goto exit;
+
+	do
+	{
+		ch = getchar();
+	} while (ch!='Q' && ch != 'q');
+
+	disc_opts.onSuccess = onDisconnect;
+	if ((rc = MQTTAsync_disconnect(client, &disc_opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start disconnect, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+ 	while	(!disc_finished)
+		#if defined(WIN32) || defined(WIN64)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+exit:
+	MQTTAsync_destroy(&client);
+ 	return rc;
+}
+
+  * @endcode
+* @page tracing Tracing
+  *
+  * Runtime tracing can be controlled by environment variables or API calls.
+  *
+  * #### Environment variables
+  *
+  * Tracing is switched on by setting the MQTT_C_CLIENT_TRACE environment variable.
+  * A value of ON, or stdout, prints to stdout, any other value is interpreted as a file name to use.
+  *
+  * The amount of trace detail is controlled with the MQTT_C_CLIENT_TRACE_LEVEL environment
+  * variable - valid values are ERROR, PROTOCOL, MINIMUM, MEDIUM and MAXIMUM
+  * (from least to most verbose).
+  *
+  * The variable MQTT_C_CLIENT_TRACE_MAX_LINES limits the number of lines of trace that are output
+  * to a file.  Two files are used at most, when they are full, the last one is overwritten with the
+  * new trace entries.  The default size is 1000 lines.
+  *
+  * #### Trace API calls
+  *
+  * MQTTAsync_traceCallback() is used to set a callback function which is called whenever trace
+  * information is available.  This will be the same information as that printed if the
+  * environment variables were used to control the trace.
+  *
+  * The MQTTAsync_setTraceLevel() calls is used to set the maximum level of trace entries that will be
+  * passed to the callback function.  The levels are:
+  * 1. ::MQTTASYNC_TRACE_MAXIMUM
+  * 2. ::MQTTASYNC_TRACE_MEDIUM
+  * 3. ::MQTTASYNC_TRACE_MINIMUM
+  * 4. ::MQTTASYNC_TRACE_PROTOCOL
+  * 5. ::MQTTASYNC_TRACE_ERROR
+  * 6. ::MQTTASYNC_TRACE_SEVERE
+  * 7. ::MQTTASYNC_TRACE_FATAL
+  *
+  * Selecting ::MQTTASYNC_TRACE_MAXIMUM will cause all trace entries at all levels to be returned.
+  * Choosing ::MQTTASYNC_TRACE_ERROR will cause ERROR, SEVERE and FATAL trace entries to be returned
+  * to the callback function.
+  *
+  * ### MQTT Packet Tracing
+  *
+  * A feature that can be very useful is printing the MQTT packets that are sent and received.  To
+  * achieve this, use the following environment variable settings:
+  * @code
+    MQTT_C_CLIENT_TRACE=ON
+    MQTT_C_CLIENT_TRACE_LEVEL=PROTOCOL
+  * @endcode
+  * The output you should see looks like this:
+  * @code
+    20130528 155936.813 3 stdout-subscriber -> CONNECT cleansession: 1 (0)
+    20130528 155936.813 3 stdout-subscriber <- CONNACK rc: 0
+    20130528 155936.813 3 stdout-subscriber -> SUBSCRIBE msgid: 1 (0)
+    20130528 155936.813 3 stdout-subscriber <- SUBACK msgid: 1
+    20130528 155941.818 3 stdout-subscriber -> DISCONNECT (0)
+  * @endcode
+  * where the fields are:
+  * 1. date
+  * 2. time
+  * 3. socket number
+  * 4. client id
+  * 5. direction (-> from client to server, <- from server to client)
+  * 6. packet details
+  *
+  * ### Default Level Tracing
+  *
+  * This is an extract of a default level trace of a call to connect:
+  * @code
+    19700101 010000.000 (1152206656) (0)> MQTTClient_connect:893
+    19700101 010000.000 (1152206656)  (1)> MQTTClient_connectURI:716
+    20130528 160447.479 Connecting to serverURI localhost:1883
+    20130528 160447.479 (1152206656)   (2)> MQTTProtocol_connect:98
+    20130528 160447.479 (1152206656)    (3)> MQTTProtocol_addressPort:48
+    20130528 160447.479 (1152206656)    (3)< MQTTProtocol_addressPort:73
+    20130528 160447.479 (1152206656)    (3)> Socket_new:599
+    20130528 160447.479 New socket 4 for localhost, port 1883
+    20130528 160447.479 (1152206656)     (4)> Socket_addSocket:163
+    20130528 160447.479 (1152206656)      (5)> Socket_setnonblocking:73
+    20130528 160447.479 (1152206656)      (5)< Socket_setnonblocking:78 (0)
+    20130528 160447.479 (1152206656)     (4)< Socket_addSocket:176 (0)
+    20130528 160447.479 (1152206656)     (4)> Socket_error:95
+    20130528 160447.479 (1152206656)     (4)< Socket_error:104 (115)
+    20130528 160447.479 Connect pending
+    20130528 160447.479 (1152206656)    (3)< Socket_new:683 (115)
+    20130528 160447.479 (1152206656)   (2)< MQTTProtocol_connect:131 (115)
+  * @endcode
+  * where the fields are:
+  * 1. date
+  * 2. time
+  * 3. thread id
+  * 4. function nesting level
+  * 5. function entry (>) or exit (<)
+  * 6. function name : line of source code file
+  * 7. return value (if there is one)
+  *
+  * ### Memory Allocation Tracing
+  *
+  * Setting the trace level to maximum causes memory allocations and frees to be traced along with
+  * the default trace entries, with messages like the following:
+  * @code
+    20130528 161819.657 Allocating 16 bytes in heap at file /home/icraggs/workspaces/mqrtc/mqttv3c/src/MQTTPacket.c line 177 ptr 0x179f930
+
+    20130528 161819.657 Freeing 16 bytes in heap at file /home/icraggs/workspaces/mqrtc/mqttv3c/src/MQTTPacket.c line 201, heap use now 896 bytes
+  * @endcode
+  * When the last MQTT client object is destroyed, if the trace is being recorded
+  * and all memory allocated by the client library has not been freed, an error message will be
+  * written to the trace.  This can help with fixing memory leaks.  The message will look like this:
+  * @code
+    20130528 163909.208 Some memory not freed at shutdown, possible memory leak
+    20130528 163909.208 Heap scan start, total 880 bytes
+    20130528 163909.208 Heap element size 32, line 354, file /home/icraggs/workspaces/mqrtc/mqttv3c/src/MQTTPacket.c, ptr 0x260cb00
+    20130528 163909.208   Content
+    20130528 163909.209 Heap scan end
+  * @endcode
+  * @endcond
+  */
+
+#ifdef __cplusplus
+     }
+#endif
+
+#endif
diff --git a/mqtt/src/src/MQTTClient.c b/mqtt/src/src/MQTTClient.c
new file mode 100644
index 00000000..2de27a0e
--- /dev/null
+++ b/mqtt/src/src/MQTTClient.c
@@ -0,0 +1,2785 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - bug 384016 - segv setting will message
+ *    Ian Craggs - bug 384053 - v1.0.0.7 - stop MQTTClient_receive on socket error
+ *    Ian Craggs, Allan Stockdill-Mander - add ability to connect with SSL
+ *    Ian Craggs - multiple server connection support
+ *    Ian Craggs - fix for bug 413429 - connectionLost not called
+ *    Ian Craggs - fix for bug 421103 - trying to write to same socket, in publish/retries
+ *    Ian Craggs - fix for bug 419233 - mutexes not reporting errors
+ *    Ian Craggs - fix for bug 420851
+ *    Ian Craggs - fix for bug 432903 - queue persistence
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - fix for bug 438176 - MQTT version selection
+ *    Rong Xiang, Ian Craggs - C++ compatibility
+ *    Ian Craggs - fix for bug 443724 - stack corruption
+ *    Ian Craggs - fix for bug 447672 - simultaneous access to socket structure
+ *    Ian Craggs - fix for bug 459791 - deadlock in WaitForCompletion for bad client
+ *    Ian Craggs - fix for bug 474905 - insufficient synchronization for subscribe, unsubscribe, connect
+ *    Ian Craggs - make it clear that yield and receive are not intended for multi-threaded mode (bug 474748)
+ *    Ian Craggs - SNI support, message queue unpersist bug
+ *    Ian Craggs - binary will message support
+ *    Ian Craggs - waitforCompletion fix #240
+ *    Ian Craggs - check for NULL SSL options #334
+ *    Ian Craggs - allocate username/password buffers #431
+ *    Ian Craggs - MQTT 5.0 support
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief Synchronous API implementation
+ *
+ */
+
+#define _GNU_SOURCE /* for pthread_mutexattr_settype */
+#include <stdlib.h>
+#include <string.h>
+#if !defined(WIN32) && !defined(WIN64)
+	#include <sys/time.h>
+#endif
+
+#include "MQTTClient.h"
+#if !defined(NO_PERSISTENCE)
+#include "MQTTPersistence.h"
+#endif
+
+#include "utf-8.h"
+#include "MQTTProtocol.h"
+#include "MQTTProtocolOut.h"
+#include "Thread.h"
+#include "SocketBuffer.h"
+#include "StackTrace.h"
+#include "Heap.h"
+
+#if defined(OPENSSL)
+#include <openssl/ssl.h>
+#else
+#define URI_SSL "ssl://"
+#endif
+
+#include "OsWrapper.h"
+
+#define URI_TCP "tcp://"
+#define URI_WS "ws://"
+#define URI_WSS "wss://"
+
+#include "VersionInfo.h"
+#include "WebSocket.h"
+
+const char *client_timestamp_eye = "MQTTClientV3_Timestamp " BUILD_TIMESTAMP;
+const char *client_version_eye = "MQTTClientV3_Version " CLIENT_VERSION;
+
+void MQTTClient_global_init(MQTTClient_init_options* inits)
+{
+#if defined(OPENSSL)
+	SSLSocket_handleOpensslInit(inits->do_openssl_init);
+#endif
+}
+
+static ClientStates ClientState =
+{
+	CLIENT_VERSION, /* version */
+	NULL /* client list */
+};
+
+ClientStates* bstate = &ClientState;
+
+MQTTProtocol state;
+
+#if defined(WIN32) || defined(WIN64)
+static mutex_type mqttclient_mutex = NULL;
+static mutex_type socket_mutex = NULL;
+static mutex_type subscribe_mutex = NULL;
+static mutex_type unsubscribe_mutex = NULL;
+static mutex_type connect_mutex = NULL;
+extern mutex_type stack_mutex;
+extern mutex_type heap_mutex;
+extern mutex_type log_mutex;
+BOOL APIENTRY DllMain(HANDLE hModule,
+					  DWORD  ul_reason_for_call,
+					  LPVOID lpReserved)
+{
+	switch (ul_reason_for_call)
+	{
+		case DLL_PROCESS_ATTACH:
+			Log(TRACE_MAX, -1, "DLL process attach");
+			if (mqttclient_mutex == NULL)
+			{
+				mqttclient_mutex = CreateMutex(NULL, 0, NULL);
+				subscribe_mutex = CreateMutex(NULL, 0, NULL);
+				unsubscribe_mutex = CreateMutex(NULL, 0, NULL);
+				connect_mutex = CreateMutex(NULL, 0, NULL);
+				stack_mutex = CreateMutex(NULL, 0, NULL);
+				heap_mutex = CreateMutex(NULL, 0, NULL);
+				log_mutex = CreateMutex(NULL, 0, NULL);
+				socket_mutex = CreateMutex(NULL, 0, NULL);
+			}
+		case DLL_THREAD_ATTACH:
+			Log(TRACE_MAX, -1, "DLL thread attach");
+		case DLL_THREAD_DETACH:
+			Log(TRACE_MAX, -1, "DLL thread detach");
+		case DLL_PROCESS_DETACH:
+			Log(TRACE_MAX, -1, "DLL process detach");
+	}
+	return TRUE;
+}
+#else
+static pthread_mutex_t mqttclient_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+static mutex_type mqttclient_mutex = &mqttclient_mutex_store;
+
+static pthread_mutex_t socket_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+static mutex_type socket_mutex = &socket_mutex_store;
+
+static pthread_mutex_t subscribe_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+static mutex_type subscribe_mutex = &subscribe_mutex_store;
+
+static pthread_mutex_t unsubscribe_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+static mutex_type unsubscribe_mutex = &unsubscribe_mutex_store;
+
+static pthread_mutex_t connect_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+static mutex_type connect_mutex = &connect_mutex_store;
+
+void MQTTClient_init(void)
+{
+	pthread_mutexattr_t attr;
+	int rc;
+
+	pthread_mutexattr_init(&attr);
+#if !defined(_WRS_KERNEL)
+	pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_ERRORCHECK);
+#else
+	/* #warning "no pthread_mutexattr_settype" */
+#endif /* !defined(_WRS_KERNEL) */
+	if ((rc = pthread_mutex_init(mqttclient_mutex, &attr)) != 0)
+		printf("MQTTClient: error %d initializing client_mutex\n", rc);
+	if ((rc = pthread_mutex_init(socket_mutex, &attr)) != 0)
+		printf("MQTTClient: error %d initializing socket_mutex\n", rc);
+	if ((rc = pthread_mutex_init(subscribe_mutex, &attr)) != 0)
+		printf("MQTTClient: error %d initializing subscribe_mutex\n", rc);
+	if ((rc = pthread_mutex_init(unsubscribe_mutex, &attr)) != 0)
+		printf("MQTTClient: error %d initializing unsubscribe_mutex\n", rc);
+	if ((rc = pthread_mutex_init(connect_mutex, &attr)) != 0)
+		printf("MQTTClient: error %d initializing connect_mutex\n", rc);
+}
+
+#define WINAPI
+#endif
+
+static volatile int library_initialized = 0;
+static List* handles = NULL;
+static int running = 0;
+static int tostop = 0;
+static thread_id_type run_id = 0;
+
+typedef struct
+{
+	MQTTClient_message* msg;
+	char* topicName;
+	int topicLen;
+	unsigned int seqno; /* only used on restore */
+} qEntry;
+
+
+typedef struct
+{
+	char* serverURI;
+#if defined(OPENSSL)
+	int ssl;
+#endif
+	int websocket;
+	Clients* c;
+	MQTTClient_connectionLost* cl;
+	MQTTClient_messageArrived* ma;
+	MQTTClient_deliveryComplete* dc;
+	void* context;
+
+	MQTTClient_disconnected* disconnected;
+	void* disconnected_context; /* the context to be associated with the disconnected callback*/
+
+	MQTTClient_published* published;
+	void* published_context; /* the context to be associated with the disconnected callback*/
+
+#if 0
+	MQTTClient_authHandle* auth_handle;
+	void* auth_handle_context; /* the context to be associated with the authHandle callback*/
+#endif
+
+	sem_type connect_sem;
+	int rc; /* getsockopt return code in connect */
+	sem_type connack_sem;
+	sem_type suback_sem;
+	sem_type unsuback_sem;
+	MQTTPacket* pack;
+
+} MQTTClients;
+
+struct props_rc_parms
+{
+	MQTTClients* m;
+	MQTTProperties* properties;
+	enum MQTTReasonCodes reasonCode;
+};
+
+void MQTTClient_sleep(long milliseconds)
+{
+	FUNC_ENTRY;
+#if defined(WIN32) || defined(WIN64)
+	Sleep(milliseconds);
+#else
+	usleep(milliseconds*1000);
+#endif
+	FUNC_EXIT;
+}
+
+
+#if defined(WIN32) || defined(WIN64)
+#define START_TIME_TYPE DWORD
+START_TIME_TYPE MQTTClient_start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE MQTTClient_start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_MONOTONIC, &start);
+	return start;
+}
+#else
+#define START_TIME_TYPE struct timeval
+START_TIME_TYPE MQTTClient_start_clock(void)
+{
+	static struct timeval start;
+	static struct timespec start_ts;
+
+	clock_gettime(CLOCK_MONOTONIC, &start_ts);
+	start.tv_sec = start_ts.tv_sec;
+	start.tv_usec = start_ts.tv_nsec / 1000;
+	return start;
+}
+#endif
+
+
+#if defined(WIN32) || defined(WIN64)
+long MQTTClient_elapsed(DWORD milliseconds)
+{
+	return GetTickCount() - milliseconds;
+}
+#elif defined(AIX)
+#define assert(a)
+long MQTTClient_elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_MONOTONIC, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long MQTTClient_elapsed(struct timeval start)
+{
+	struct timeval now, res;
+	static struct timespec now_ts;
+
+	clock_gettime(CLOCK_MONOTONIC, &now_ts);
+	now.tv_sec = now_ts.tv_sec;
+	now.tv_usec = now_ts.tv_nsec / 1000;
+	timersub(&now, &start, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+static void MQTTClient_terminate(void);
+static void MQTTClient_emptyMessageQueue(Clients* client);
+static int MQTTClient_deliverMessage(
+		int rc, MQTTClients* m,
+		char** topicName, int* topicLen,
+		MQTTClient_message** message);
+static int clientSockCompare(void* a, void* b);
+static thread_return_type WINAPI connectionLost_call(void* context);
+static thread_return_type WINAPI MQTTClient_run(void* n);
+static void MQTTClient_stop(void);
+static void MQTTClient_closeSession(Clients* client, enum MQTTReasonCodes reason, MQTTProperties* props);
+static int MQTTClient_cleanSession(Clients* client);
+static MQTTResponse MQTTClient_connectURIVersion(
+	MQTTClient handle, MQTTClient_connectOptions* options,
+	const char* serverURI, int MQTTVersion,
+	START_TIME_TYPE start, long millisecsTimeout,
+	MQTTProperties* connectProperties, MQTTProperties* willProperties);
+static MQTTResponse MQTTClient_connectURI(MQTTClient handle, MQTTClient_connectOptions* options, const char* serverURI,
+	MQTTProperties* connectProperties, MQTTProperties* willProperties);
+static int MQTTClient_disconnect1(MQTTClient handle, int timeout, int internal, int stop, enum MQTTReasonCodes, MQTTProperties*);
+static int MQTTClient_disconnect_internal(MQTTClient handle, int timeout);
+static void MQTTClient_retry(void);
+static MQTTPacket* MQTTClient_cycle(int* sock, unsigned long timeout, int* rc);
+static MQTTPacket* MQTTClient_waitfor(MQTTClient handle, int packet_type, int* rc, long timeout);
+/*static int pubCompare(void* a, void* b); */
+static void MQTTProtocol_checkPendingWrites(void);
+static void MQTTClient_writeComplete(int socket, int rc);
+
+
+int MQTTClient_createWithOptions(MQTTClient* handle, const char* serverURI, const char* clientId,
+		int persistence_type, void* persistence_context, MQTTClient_createOptions* options)
+{
+	int rc = 0;
+	MQTTClients *m = NULL;
+
+	FUNC_ENTRY;
+	rc = Thread_lock_mutex(mqttclient_mutex);
+
+	if (serverURI == NULL || clientId == NULL)
+	{
+		rc = MQTTCLIENT_NULL_PARAMETER;
+		goto exit;
+	}
+
+	if (!UTF8_validateString(clientId))
+	{
+		rc = MQTTCLIENT_BAD_UTF8_STRING;
+		goto exit;
+	}
+
+	if (strstr(serverURI, "://") != NULL)
+	{
+		if (strncmp(URI_TCP, serverURI, strlen(URI_TCP)) != 0
+		 && strncmp(URI_WS, serverURI, strlen(URI_WS)) != 0
+#if defined(OPENSSL)
+            && strncmp(URI_SSL, serverURI, strlen(URI_SSL)) != 0
+		 && strncmp(URI_WSS, serverURI, strlen(URI_WSS)) != 0
+#endif
+			)
+		{
+			rc = MQTTCLIENT_BAD_PROTOCOL;
+			goto exit;
+		}
+	}
+
+	if (options && (strncmp(options->struct_id, "MQCO", 4) != 0 || options->struct_version != 0))
+	{
+		rc = MQTTCLIENT_BAD_STRUCTURE;
+		goto exit;
+	}
+
+	if (!library_initialized)
+	{
+		#if defined(HEAP_H)
+			Heap_initialize();
+		#endif
+		Log_initialize((Log_nameValue*)MQTTClient_getVersionInfo());
+		bstate->clients = ListInitialize();
+		Socket_outInitialize();
+		Socket_setWriteCompleteCallback(MQTTClient_writeComplete);
+		handles = ListInitialize();
+#if defined(OPENSSL)
+		SSLSocket_initialize();
+#endif
+		library_initialized = 1;
+	}
+
+	m = malloc(sizeof(MQTTClients));
+	*handle = m;
+	memset(m, '\0', sizeof(MQTTClients));
+	if (strncmp(URI_TCP, serverURI, strlen(URI_TCP)) == 0)
+		serverURI += strlen(URI_TCP);
+	else if (strncmp(URI_WS, serverURI, strlen(URI_WS)) == 0)
+	{
+		serverURI += strlen(URI_WS);
+		m->websocket = 1;
+	}
+	else if (strncmp(URI_SSL, serverURI, strlen(URI_SSL)) == 0)
+	{
+#if defined(OPENSSL)
+		serverURI += strlen(URI_SSL);
+		m->ssl = 1;
+#else
+		rc = MQTTCLIENT_SSL_NOT_SUPPORTED;
+		goto exit;
+#endif
+	}
+	else if (strncmp(URI_WSS, serverURI, strlen(URI_WSS)) == 0)
+	{
+#if defined(OPENSSL)
+		serverURI += strlen(URI_WSS);
+		m->ssl = 1;
+		m->websocket = 1;
+#else
+		rc = MQTTCLIENT_SSL_NOT_SUPPORTED;
+		goto exit;
+#endif
+	}
+	m->serverURI = MQTTStrdup(serverURI);
+	ListAppend(handles, m, sizeof(MQTTClients));
+
+	m->c = malloc(sizeof(Clients));
+	memset(m->c, '\0', sizeof(Clients));
+	m->c->context = m;
+	m->c->MQTTVersion = (options) ? options->MQTTVersion : MQTTVERSION_DEFAULT;
+	m->c->outboundMsgs = ListInitialize();
+	m->c->inboundMsgs = ListInitialize();
+	m->c->messageQueue = ListInitialize();
+	m->c->clientID = MQTTStrdup(clientId);
+	m->connect_sem = Thread_create_sem();
+	m->connack_sem = Thread_create_sem();
+	m->suback_sem = Thread_create_sem();
+	m->unsuback_sem = Thread_create_sem();
+
+#if !defined(NO_PERSISTENCE)
+	rc = MQTTPersistence_create(&(m->c->persistence), persistence_type, persistence_context);
+	if (rc == 0)
+	{
+		rc = MQTTPersistence_initialize(m->c, m->serverURI);
+		if (rc == 0)
+			MQTTPersistence_restoreMessageQueue(m->c);
+	}
+#endif
+	ListAppend(bstate->clients, m->c, sizeof(Clients) + 3*sizeof(List));
+
+exit:
+	Thread_unlock_mutex(mqttclient_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTClient_create(MQTTClient* handle, const char* serverURI, const char* clientId,
+		int persistence_type, void* persistence_context)
+{
+	return MQTTClient_createWithOptions(handle, serverURI, clientId, persistence_type,
+		persistence_context, NULL);
+}
+
+
+static void MQTTClient_terminate(void)
+{
+	FUNC_ENTRY;
+	MQTTClient_stop();
+	if (library_initialized)
+	{
+		ListFree(bstate->clients);
+		ListFree(handles);
+		handles = NULL;
+		WebSocket_terminate();
+		#if defined(HEAP_H)
+			Heap_terminate();
+		#endif
+		Log_terminate();
+		library_initialized = 0;
+	}
+	FUNC_EXIT;
+}
+
+
+static void MQTTClient_emptyMessageQueue(Clients* client)
+{
+	FUNC_ENTRY;
+	/* empty message queue */
+	if (client->messageQueue->count > 0)
+	{
+		ListElement* current = NULL;
+		while (ListNextElement(client->messageQueue, &current))
+		{
+			qEntry* qe = (qEntry*)(current->content);
+			free(qe->topicName);
+			MQTTProperties_free(&qe->msg->properties);
+			free(qe->msg->payload);
+			free(qe->msg);
+		}
+		ListEmpty(client->messageQueue);
+	}
+	FUNC_EXIT;
+}
+
+
+void MQTTClient_destroy(MQTTClient* handle)
+{
+	MQTTClients* m = *handle;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(mqttclient_mutex);
+
+	if (m == NULL)
+		goto exit;
+
+	if (m->c)
+	{
+		int saved_socket = m->c->net.socket;
+		char* saved_clientid = MQTTStrdup(m->c->clientID);
+#if !defined(NO_PERSISTENCE)
+		MQTTPersistence_close(m->c);
+#endif
+		MQTTClient_emptyMessageQueue(m->c);
+		MQTTProtocol_freeClient(m->c);
+		if (!ListRemove(bstate->clients, m->c))
+			Log(LOG_ERROR, 0, NULL);
+		else
+			Log(TRACE_MIN, 1, NULL, saved_clientid, saved_socket);
+		free(saved_clientid);
+	}
+	if (m->serverURI)
+		free(m->serverURI);
+	Thread_destroy_sem(m->connect_sem);
+	Thread_destroy_sem(m->connack_sem);
+	Thread_destroy_sem(m->suback_sem);
+	Thread_destroy_sem(m->unsuback_sem);
+	if (!ListRemove(handles, m))
+		Log(LOG_ERROR, -1, "free error");
+	*handle = NULL;
+	if (bstate->clients->count == 0)
+		MQTTClient_terminate();
+
+exit:
+	Thread_unlock_mutex(mqttclient_mutex);
+	FUNC_EXIT;
+}
+
+
+void MQTTClient_freeMessage(MQTTClient_message** message)
+{
+	FUNC_ENTRY;
+	MQTTProperties_free(&(*message)->properties);
+	free((*message)->payload);
+	free(*message);
+	*message = NULL;
+	FUNC_EXIT;
+}
+
+
+void MQTTClient_free(void* memory)
+{
+	FUNC_ENTRY;
+	free(memory);
+	FUNC_EXIT;
+}
+
+
+DLLExport void MQTTResponse_free(MQTTResponse response)
+{
+	FUNC_ENTRY;
+	if (response.properties)
+	{
+		if (response.reasonCodeCount > 0 && response.reasonCodes)
+			free(response.reasonCodes);
+		MQTTProperties_free(response.properties);
+		free(response.properties);
+	}
+	FUNC_EXIT;
+}
+
+
+static int MQTTClient_deliverMessage(int rc, MQTTClients* m, char** topicName, int* topicLen, MQTTClient_message** message)
+{
+	qEntry* qe = (qEntry*)(m->c->messageQueue->first->content);
+
+	FUNC_ENTRY;
+	*message = qe->msg;
+	*topicName = qe->topicName;
+	*topicLen = qe->topicLen;
+	if (strlen(*topicName) != *topicLen)
+		rc = MQTTCLIENT_TOPICNAME_TRUNCATED;
+#if !defined(NO_PERSISTENCE)
+	if (m->c->persistence)
+		MQTTPersistence_unpersistQueueEntry(m->c, (MQTTPersistence_qEntry*)qe);
+#endif
+	ListRemove(m->c->messageQueue, m->c->messageQueue->first->content);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * List callback function for comparing clients by socket
+ * @param a first integer value
+ * @param b second integer value
+ * @return boolean indicating whether a and b are equal
+ */
+static int clientSockCompare(void* a, void* b)
+{
+	MQTTClients* m = (MQTTClients*)a;
+	return m->c->net.socket == *(int*)b;
+}
+
+
+/**
+ * Wrapper function to call connection lost on a separate thread.  A separate thread is needed to allow the
+ * connectionLost function to make API calls (e.g. connect)
+ * @param context a pointer to the relevant client
+ * @return thread_return_type standard thread return value - not used here
+ */
+static thread_return_type WINAPI connectionLost_call(void* context)
+{
+	MQTTClients* m = (MQTTClients*)context;
+
+	(*(m->cl))(m->context, NULL);
+	return 0;
+}
+
+
+int MQTTClient_setDisconnected(MQTTClient handle, void* context, MQTTClient_disconnected* disconnected)
+{
+	int rc = MQTTCLIENT_SUCCESS;
+	MQTTClients* m = handle;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(mqttclient_mutex);
+
+	if (m == NULL || m->c->connect_state != NOT_IN_PROGRESS)
+		rc = MQTTCLIENT_FAILURE;
+	else
+	{
+		m->disconnected_context = context;
+		m->disconnected = disconnected;
+	}
+
+	Thread_unlock_mutex(mqttclient_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+
+/**
+ * Wrapper function to call disconnected on a separate thread.  A separate thread is needed to allow the
+ * disconnected function to make API calls (e.g. connect)
+ * @param context a pointer to the relevant client
+ * @return thread_return_type standard thread return value - not used here
+ */
+static thread_return_type WINAPI call_disconnected(void* context)
+{
+	struct props_rc_parms* pr = (struct props_rc_parms*)context;
+
+	(*(pr->m->disconnected))(pr->m->disconnected_context, pr->properties, pr->reasonCode);
+	MQTTProperties_free(pr->properties);
+	free(pr->properties);
+	free(pr);
+	return 0;
+}
+
+
+int MQTTClient_setPublished(MQTTClient handle, void* context, MQTTClient_published* published)
+{
+	int rc = MQTTCLIENT_SUCCESS;
+	MQTTClients* m = handle;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(mqttclient_mutex);
+
+	if (m == NULL || m->c->connect_state != NOT_IN_PROGRESS)
+		rc = MQTTCLIENT_FAILURE;
+	else
+	{
+		m->published_context = context;
+		m->published = published;
+	}
+
+	Thread_unlock_mutex(mqttclient_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+#if 0
+int MQTTClient_setHandleAuth(MQTTClient handle, void* context, MQTTClient_handleAuth* auth_handle)
+{
+	int rc = MQTTCLIENT_SUCCESS;
+	MQTTClients* m = handle;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(mqttclient_mutex);
+
+	if (m == NULL || m->c->connect_state != NOT_IN_PROGRESS)
+		rc = MQTTCLIENT_FAILURE;
+	else
+	{
+		m->auth_handle_context = context;
+		m->auth_handle = auth_handle;
+	}
+
+	Thread_unlock_mutex(mqttclient_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Wrapper function to call authHandle on a separate thread.  A separate thread is needed to allow the
+ * disconnected function to make API calls (e.g. MQTTClient_auth)
+ * @param context a pointer to the relevant client
+ * @return thread_return_type standard thread return value - not used here
+ */
+static thread_return_type WINAPI call_auth_handle(void* context)
+{
+	struct props_rc_parms* pr = (struct props_rc_parms*)context;
+
+	(*(pr->m->auth_handle))(pr->m->auth_handle_context, pr->properties, pr->reasonCode);
+	MQTTProperties_free(pr->properties);
+	free(pr->properties);
+	free(pr);
+	return 0;
+}
+#endif
+
+
+/* This is the thread function that handles the calling of callback functions if set */
+static thread_return_type WINAPI MQTTClient_run(void* n)
+{
+	long timeout = 10L; /* first time in we have a small timeout.  Gets things started more quickly */
+
+	FUNC_ENTRY;
+	running = 1;
+	run_id = Thread_getid();
+
+	Thread_lock_mutex(mqttclient_mutex);
+	while (!tostop)
+	{
+		int rc = SOCKET_ERROR;
+		int sock = -1;
+		MQTTClients* m = NULL;
+		MQTTPacket* pack = NULL;
+
+		Thread_unlock_mutex(mqttclient_mutex);
+		pack = MQTTClient_cycle(&sock, timeout, &rc);
+		Thread_lock_mutex(mqttclient_mutex);
+		if (tostop)
+			break;
+		timeout = 1000L;
+
+		/* find client corresponding to socket */
+		if (ListFindItem(handles, &sock, clientSockCompare) == NULL)
+		{
+			/* assert: should not happen */
+			continue;
+		}
+		m = (MQTTClient)(handles->current->content);
+		if (m == NULL)
+		{
+			/* assert: should not happen */
+			continue;
+		}
+		if (rc == SOCKET_ERROR)
+		{
+			if (m->c->connected)
+				MQTTClient_disconnect_internal(m, 0);
+			else
+			{
+				if (m->c->connect_state == SSL_IN_PROGRESS)
+				{
+					Log(TRACE_MIN, -1, "Posting connect semaphore for client %s", m->c->clientID);
+					m->c->connect_state = NOT_IN_PROGRESS;
+					Thread_post_sem(m->connect_sem);
+				}
+				if (m->c->connect_state == WAIT_FOR_CONNACK)
+				{
+					Log(TRACE_MIN, -1, "Posting connack semaphore for client %s", m->c->clientID);
+					m->c->connect_state = NOT_IN_PROGRESS;
+					Thread_post_sem(m->connack_sem);
+				}
+			}
+		}
+		else
+		{
+			if (m->c->messageQueue->count > 0)
+			{
+				qEntry* qe = (qEntry*)(m->c->messageQueue->first->content);
+				int topicLen = qe->topicLen;
+
+				if (strlen(qe->topicName) == topicLen)
+					topicLen = 0;
+
+				Log(TRACE_MIN, -1, "Calling messageArrived for client %s, queue depth %d",
+					m->c->clientID, m->c->messageQueue->count);
+				Thread_unlock_mutex(mqttclient_mutex);
+				rc = (*(m->ma))(m->context, qe->topicName, topicLen, qe->msg);
+				Thread_lock_mutex(mqttclient_mutex);
+				/* if 0 (false) is returned by the callback then it failed, so we don't remove the message from
+				 * the queue, and it will be retried later.  If 1 is returned then the message data may have been freed,
+				 * so we must be careful how we use it.
+				 */
+				if (rc)
+				{
+					#if !defined(NO_PERSISTENCE)
+					if (m->c->persistence)
+						MQTTPersistence_unpersistQueueEntry(m->c, (MQTTPersistence_qEntry*)qe);
+					#endif
+					ListRemove(m->c->messageQueue, qe);
+				}
+				else
+					Log(TRACE_MIN, -1, "False returned from messageArrived for client %s, message remains on queue",
+						m->c->clientID);
+			}
+			if (pack)
+			{
+				if (pack->header.bits.type == CONNACK)
+				{
+					Log(TRACE_MIN, -1, "Posting connack semaphore for client %s", m->c->clientID);
+					m->pack = pack;
+					Thread_post_sem(m->connack_sem);
+				}
+				else if (pack->header.bits.type == SUBACK)
+				{
+					Log(TRACE_MIN, -1, "Posting suback semaphore for client %s", m->c->clientID);
+					m->pack = pack;
+					Thread_post_sem(m->suback_sem);
+				}
+				else if (pack->header.bits.type == UNSUBACK)
+				{
+					Log(TRACE_MIN, -1, "Posting unsuback semaphore for client %s", m->c->clientID);
+					m->pack = pack;
+					Thread_post_sem(m->unsuback_sem);
+				}
+				else if (m->c->MQTTVersion >= MQTTVERSION_5)
+				{
+					if (pack->header.bits.type == DISCONNECT && m->disconnected)
+					{
+						struct props_rc_parms* dp;
+						Ack* disc = (Ack*)pack;
+
+						dp = malloc(sizeof(struct props_rc_parms));
+						dp->m = m;
+						dp->reasonCode = disc->rc;
+						dp->properties = malloc(sizeof(MQTTProperties));
+						*(dp->properties) = disc->properties;
+						free(disc);
+						MQTTClient_disconnect1(m, 10, 0, 1, MQTTREASONCODE_SUCCESS, NULL);
+						Log(TRACE_MIN, -1, "Calling disconnected for client %s", m->c->clientID);
+						Thread_start(call_disconnected, dp);
+					}
+#if 0
+					if (pack->header.bits.type == AUTH && m->auth_handle)
+					{
+						struct props_rc_parms dp;
+						Ack* disc = (Ack*)pack;
+
+						dp.m = m;
+						dp.properties = &disc->properties;
+						dp.reasonCode = disc->rc;
+						free(pack);
+						Log(TRACE_MIN, -1, "Calling auth_handle for client %s", m->c->clientID);
+						Thread_start(call_auth_handle, &dp);
+					}
+#endif
+				}
+			}
+			else if (m->c->connect_state == TCP_IN_PROGRESS)
+			{
+				int error;
+				socklen_t len = sizeof(error);
+
+				if ((m->rc = getsockopt(m->c->net.socket, SOL_SOCKET, SO_ERROR, (char*)&error, &len)) == 0)
+					m->rc = error;
+				Log(TRACE_MIN, -1, "Posting connect semaphore for client %s rc %d", m->c->clientID, m->rc);
+				printf("Posting connect semaphore for client %s rc %d", m->c->clientID, m->rc);
+				m->c->connect_state = NOT_IN_PROGRESS;
+				Thread_post_sem(m->connect_sem);
+			}
+#if defined(OPENSSL)
+			else if (m->c->connect_state == SSL_IN_PROGRESS)
+			{
+				rc = m->c->sslopts->struct_version >= 3 ?
+					SSLSocket_connect(m->c->net.ssl, m->c->net.socket, m->serverURI, 
+						m->c->sslopts->verify, m->c->sslopts->ssl_error_cb, m->c->sslopts->ssl_error_context) :
+					SSLSocket_connect(m->c->net.ssl, m->c->net.socket, m->serverURI,
+						m->c->sslopts->verify, NULL, NULL);
+				if (rc == 1 || rc == SSL_FATAL)
+				{
+					if (rc == 1 && (m->c->cleansession == 0 && m->c->cleanstart == 0) && m->c->session == NULL)
+						m->c->session = SSL_get1_session(m->c->net.ssl);
+					m->rc = rc;
+					Log(TRACE_MIN, -1, "Posting connect semaphore for SSL client %s rc %d", m->c->clientID, m->rc);
+					m->c->connect_state = NOT_IN_PROGRESS;
+					Thread_post_sem(m->connect_sem);
+				}
+			}
+#endif
+			else if (m->c->connect_state == WEBSOCKET_IN_PROGRESS)
+			{
+				Log(TRACE_MIN, -1, "Posting websocket handshake for client %s rc %d", m->c->clientID, m->rc);
+				m->c->connect_state = WAIT_FOR_CONNACK;
+				Thread_post_sem(m->connect_sem);
+			}
+		}
+	}
+	run_id = 0;
+	running = tostop = 0;
+	Thread_unlock_mutex(mqttclient_mutex);
+	FUNC_EXIT;
+	return 0;
+}
+
+
+static void MQTTClient_stop(void)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if (running == 1 && tostop == 0)
+	{
+		int conn_count = 0;
+		ListElement* current = NULL;
+
+		if (handles != NULL)
+		{
+			/* find out how many handles are still connected */
+			while (ListNextElement(handles, &current))
+			{
+				if (((MQTTClients*)(current->content))->c->connect_state > NOT_IN_PROGRESS ||
+						((MQTTClients*)(current->content))->c->connected)
+					++conn_count;
+			}
+		}
+		Log(TRACE_MIN, -1, "Conn_count is %d", conn_count);
+		/* stop the background thread, if we are the last one to be using it */
+		if (conn_count == 0)
+		{
+			int count = 0;
+			tostop = 1;
+			if (Thread_getid() != run_id)
+			{
+				while (running && ++count < 100)
+				{
+					Thread_unlock_mutex(mqttclient_mutex);
+					Log(TRACE_MIN, -1, "sleeping");
+					MQTTClient_sleep(100L);
+					Thread_lock_mutex(mqttclient_mutex);
+				}
+			}
+			rc = 1;
+		}
+	}
+	FUNC_EXIT_RC(rc);
+}
+
+
+int MQTTClient_setCallbacks(MQTTClient handle, void* context, MQTTClient_connectionLost* cl,
+														MQTTClient_messageArrived* ma, MQTTClient_deliveryComplete* dc)
+{
+	int rc = MQTTCLIENT_SUCCESS;
+	MQTTClients* m = handle;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(mqttclient_mutex);
+
+	if (m == NULL || ma == NULL || m->c->connect_state != NOT_IN_PROGRESS)
+		rc = MQTTCLIENT_FAILURE;
+	else
+	{
+		m->context = context;
+		m->cl = cl;
+		m->ma = ma;
+		m->dc = dc;
+	}
+
+	Thread_unlock_mutex(mqttclient_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static void MQTTClient_closeSession(Clients* client, enum MQTTReasonCodes reason, MQTTProperties* props)
+{
+	FUNC_ENTRY;
+	client->good = 0;
+	client->ping_outstanding = 0;
+	if (client->net.socket > 0)
+	{
+		if (client->connected)
+			MQTTPacket_send_disconnect(client, reason, props);
+		Thread_lock_mutex(socket_mutex);
+		WebSocket_close(&client->net, WebSocket_CLOSE_NORMAL, NULL);
+
+#if defined(OPENSSL)
+		SSLSocket_close(&client->net);
+#endif
+		Socket_close(client->net.socket);
+		Thread_unlock_mutex(socket_mutex);
+		client->net.socket = 0;
+#if defined(OPENSSL)
+		client->net.ssl = NULL;
+#endif
+	}
+	client->connected = 0;
+	client->connect_state = NOT_IN_PROGRESS;
+
+	if (client->MQTTVersion < MQTTVERSION_5 && client->cleansession)
+		MQTTClient_cleanSession(client);
+	FUNC_EXIT;
+}
+
+
+static int MQTTClient_cleanSession(Clients* client)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+#if !defined(NO_PERSISTENCE)
+	rc = MQTTPersistence_clear(client);
+#endif
+	MQTTProtocol_emptyMessageList(client->inboundMsgs);
+	MQTTProtocol_emptyMessageList(client->outboundMsgs);
+	MQTTClient_emptyMessageQueue(client);
+	client->msgID = 0;
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+void Protocol_processPublication(Publish* publish, Clients* client)
+{
+	qEntry* qe = NULL;
+	MQTTClient_message* mm = NULL;
+	MQTTClient_message initialized = MQTTClient_message_initializer;
+
+	FUNC_ENTRY;
+	qe = malloc(sizeof(qEntry));
+	mm = malloc(sizeof(MQTTClient_message));
+	memcpy(mm, &initialized, sizeof(MQTTClient_message));
+
+	qe->msg = mm;
+
+	qe->topicName = publish->topic;
+	qe->topicLen = publish->topiclen;
+	publish->topic = NULL;
+
+	/* If the message is QoS 2, then we have already stored the incoming payload
+	 * in an allocated buffer, so we don't need to copy again.
+	 */
+	if (publish->header.bits.qos == 2)
+		mm->payload = publish->payload;
+	else
+	{
+		mm->payload = malloc(publish->payloadlen);
+		memcpy(mm->payload, publish->payload, publish->payloadlen);
+	}
+
+	mm->payloadlen = publish->payloadlen;
+	mm->qos = publish->header.bits.qos;
+	mm->retained = publish->header.bits.retain;
+	if (publish->header.bits.qos == 2)
+		mm->dup = 0;  /* ensure that a QoS2 message is not passed to the application with dup = 1 */
+	else
+		mm->dup = publish->header.bits.dup;
+	mm->msgid = publish->msgId;
+
+	if (publish->MQTTVersion >= 5)
+		mm->properties = MQTTProperties_copy(&publish->properties);
+
+	ListAppend(client->messageQueue, qe, sizeof(qe) + sizeof(mm) + mm->payloadlen + strlen(qe->topicName)+1);
+#if !defined(NO_PERSISTENCE)
+	if (client->persistence)
+		MQTTPersistence_persistQueueEntry(client, (MQTTPersistence_qEntry*)qe);
+#endif
+	FUNC_EXIT;
+}
+
+
+static MQTTResponse MQTTClient_connectURIVersion(MQTTClient handle, MQTTClient_connectOptions* options, const char* serverURI, int MQTTVersion,
+	START_TIME_TYPE start, long millisecsTimeout, MQTTProperties* connectProperties, MQTTProperties* willProperties)
+{
+	MQTTClients* m = handle;
+	int rc = SOCKET_ERROR;
+	int sessionPresent = 0;
+	MQTTResponse resp = MQTTResponse_initializer;
+
+	FUNC_ENTRY;
+	resp.reasonCode = SOCKET_ERROR;
+	if (m->ma && !running)
+	{
+		Thread_start(MQTTClient_run, handle);
+		if (MQTTClient_elapsed(start) >= millisecsTimeout)
+		{
+			rc = SOCKET_ERROR;
+			goto exit;
+		}
+		MQTTClient_sleep(100L);
+	}
+
+	Log(TRACE_MIN, -1, "Connecting to serverURI %s with MQTT version %d", serverURI, MQTTVersion);
+#if defined(OPENSSL)
+	rc = MQTTProtocol_connect(serverURI, m->c, m->ssl, m->websocket, MQTTVersion, connectProperties, willProperties);
+#else
+	rc = MQTTProtocol_connect(serverURI, m->c, m->websocket, MQTTVersion, connectProperties, willProperties);
+#endif
+	if (rc == SOCKET_ERROR)
+		goto exit;
+
+	if (m->c->connect_state == NOT_IN_PROGRESS)
+	{
+		rc = SOCKET_ERROR;
+		goto exit;
+	}
+
+	if (m->c->connect_state == TCP_IN_PROGRESS) /* TCP connect started - wait for completion */
+	{
+		Thread_unlock_mutex(mqttclient_mutex);
+		MQTTClient_waitfor(handle, CONNECT, &rc, millisecsTimeout - MQTTClient_elapsed(start));
+		Thread_lock_mutex(mqttclient_mutex);
+		if (rc != 0)
+		{
+			rc = SOCKET_ERROR;
+			goto exit;
+		}
+#if defined(OPENSSL)
+		if (m->ssl)
+		{
+			int port;
+			size_t hostname_len;
+			const char *topic;
+			int setSocketForSSLrc = 0;
+
+			hostname_len = MQTTProtocol_addressPort(m->serverURI, &port, &topic);
+			setSocketForSSLrc = SSLSocket_setSocketForSSL(&m->c->net, m->c->sslopts,
+				m->serverURI, hostname_len);
+
+			if (setSocketForSSLrc != MQTTCLIENT_SUCCESS)
+			{
+				if (m->c->session != NULL)
+					if ((rc = SSL_set_session(m->c->net.ssl, m->c->session)) != 1)
+						Log(TRACE_MIN, -1, "Failed to set SSL session with stored data, non critical");
+				rc = m->c->sslopts->struct_version >= 3 ?
+					SSLSocket_connect(m->c->net.ssl, m->c->net.socket, m->serverURI,
+						m->c->sslopts->verify, m->c->sslopts->ssl_error_cb, m->c->sslopts->ssl_error_context) :
+					SSLSocket_connect(m->c->net.ssl, m->c->net.socket, m->serverURI,
+						m->c->sslopts->verify, NULL, NULL);
+				if (rc == TCPSOCKET_INTERRUPTED)
+					m->c->connect_state = SSL_IN_PROGRESS;  /* the connect is still in progress */
+				else if (rc == SSL_FATAL)
+				{
+					rc = SOCKET_ERROR;
+					goto exit;
+				}
+				else if (rc == 1)
+				{
+					if (m->websocket)
+					{
+						m->c->connect_state = WEBSOCKET_IN_PROGRESS;
+						rc = WebSocket_connect(&m->c->net,m->serverURI);
+						if ( rc == SOCKET_ERROR )
+							goto exit;
+					}
+					else
+					{
+						rc = MQTTCLIENT_SUCCESS;
+						m->c->connect_state = WAIT_FOR_CONNACK;
+						if (MQTTPacket_send_connect(m->c, MQTTVersion, connectProperties, willProperties) == SOCKET_ERROR)
+						{
+							rc = SOCKET_ERROR;
+							goto exit;
+						}
+						if ((m->c->cleansession == 0 && m->c->cleanstart == 0) && m->c->session == NULL)
+							m->c->session = SSL_get1_session(m->c->net.ssl);
+					}
+				}
+			}
+			else
+			{
+				rc = SOCKET_ERROR;
+				goto exit;
+			}
+		}
+#endif
+		else if (m->websocket)
+		{
+			m->c->connect_state = WEBSOCKET_IN_PROGRESS;
+			if ( WebSocket_connect(&m->c->net, m->serverURI) == SOCKET_ERROR )
+			{
+				rc = SOCKET_ERROR;
+				goto exit;
+			}
+		}
+		else
+		{
+			m->c->connect_state = WAIT_FOR_CONNACK; /* TCP connect completed, in which case send the MQTT connect packet */
+			if (MQTTPacket_send_connect(m->c, MQTTVersion, connectProperties, willProperties) == SOCKET_ERROR)
+			{
+				rc = SOCKET_ERROR;
+				goto exit;
+			}
+		}
+	}
+
+#if defined(OPENSSL)
+	if (m->c->connect_state == SSL_IN_PROGRESS) /* SSL connect sent - wait for completion */
+	{
+		Thread_unlock_mutex(mqttclient_mutex);
+		MQTTClient_waitfor(handle, CONNECT, &rc, millisecsTimeout - MQTTClient_elapsed(start));
+		Thread_lock_mutex(mqttclient_mutex);
+		if (rc != 1)
+		{
+			rc = SOCKET_ERROR;
+			goto exit;
+		}
+		if((m->c->cleansession == 0 && m->c->cleanstart == 0) && m->c->session == NULL)
+			m->c->session = SSL_get1_session(m->c->net.ssl);
+
+		if ( m->websocket )
+		{
+			/* wait for websocket connect */
+			m->c->connect_state = WEBSOCKET_IN_PROGRESS;
+			rc = WebSocket_connect( &m->c->net, m->serverURI );
+			if ( rc != 1 )
+			{
+				rc = SOCKET_ERROR;
+				goto exit;
+			}
+		}
+		else
+		{
+			m->c->connect_state = WAIT_FOR_CONNACK; /* TCP connect completed, in which case send the MQTT connect packet */
+			if (MQTTPacket_send_connect(m->c, MQTTVersion, connectProperties, willProperties) == SOCKET_ERROR)
+			{
+				rc = SOCKET_ERROR;
+				goto exit;
+			}
+		}
+	}
+#endif
+
+	if (m->c->connect_state == WEBSOCKET_IN_PROGRESS) /* websocket request sent - wait for upgrade */
+	{
+		Thread_unlock_mutex(mqttclient_mutex);
+		MQTTClient_waitfor(handle, CONNECT, &rc, millisecsTimeout - MQTTClient_elapsed(start));
+		Thread_lock_mutex(mqttclient_mutex);
+		m->c->connect_state = WAIT_FOR_CONNACK; /* websocket upgrade complete */
+		if (MQTTPacket_send_connect(m->c, MQTTVersion, connectProperties, willProperties) == SOCKET_ERROR)
+		{
+			rc = SOCKET_ERROR;
+			goto exit;
+		}
+	}
+
+	if (m->c->connect_state == WAIT_FOR_CONNACK) /* MQTT connect sent - wait for CONNACK */
+	{
+		MQTTPacket* pack = NULL;
+		Thread_unlock_mutex(mqttclient_mutex);
+		pack = MQTTClient_waitfor(handle, CONNACK, &rc, millisecsTimeout - MQTTClient_elapsed(start));
+		Thread_lock_mutex(mqttclient_mutex);
+		if (pack == NULL)
+			rc = SOCKET_ERROR;
+		else
+		{
+			Connack* connack = (Connack*)pack;
+			Log(TRACE_PROTOCOL, 1, NULL, m->c->net.socket, m->c->clientID, connack->rc);
+			if ((rc = connack->rc) == MQTTCLIENT_SUCCESS)
+			{
+				m->c->connected = 1;
+				m->c->good = 1;
+				m->c->connect_state = NOT_IN_PROGRESS;
+				if (MQTTVersion == 4)
+					sessionPresent = connack->flags.bits.sessionPresent;
+				if (m->c->cleansession || m->c->cleanstart)
+					rc = MQTTClient_cleanSession(m->c);
+				if (m->c->outboundMsgs->count > 0)
+				{
+					ListElement* outcurrent = NULL;
+
+					while (ListNextElement(m->c->outboundMsgs, &outcurrent))
+					{
+						Messages* m = (Messages*)(outcurrent->content);
+						m->lastTouch = 0;
+					}
+					MQTTProtocol_retry((time_t)0, 1, 1);
+					if (m->c->connected != 1)
+						rc = MQTTCLIENT_DISCONNECTED;
+				}
+				if (m->c->MQTTVersion == MQTTVERSION_5)
+				{
+					resp.properties = malloc(sizeof(MQTTProperties));
+					*resp.properties = MQTTProperties_copy(&connack->properties);
+				}
+			}
+			MQTTPacket_freeConnack(connack);
+			m->pack = NULL;
+		}
+	}
+exit:
+	if (rc == MQTTCLIENT_SUCCESS)
+	{
+		if (options->struct_version >= 4) /* means we have to fill out return values */
+		{
+			options->returned.serverURI = serverURI;
+			options->returned.MQTTVersion = MQTTVersion;
+			options->returned.sessionPresent = sessionPresent;
+		}
+	}
+	else
+		MQTTClient_disconnect1(handle, 0, 0, (MQTTVersion == 3), MQTTREASONCODE_SUCCESS, NULL); /* don't want to call connection lost */
+
+	resp.reasonCode = rc;
+	FUNC_EXIT_RC(resp.reasonCode);
+	return resp;
+}
+
+static int retryLoopInterval = 5;
+
+static void setRetryLoopInterval(int keepalive)
+{
+	int proposed = keepalive / 10;
+
+	if (proposed < 1)
+		proposed = 1;
+	else if (proposed > 5)
+		proposed = 5;
+	if (proposed < retryLoopInterval)
+		retryLoopInterval = proposed;
+}
+
+
+static MQTTResponse MQTTClient_connectURI(MQTTClient handle, MQTTClient_connectOptions* options, const char* serverURI,
+		MQTTProperties* connectProperties, MQTTProperties* willProperties)
+{
+	MQTTClients* m = handle;
+	START_TIME_TYPE start;
+	long millisecsTimeout = 30000L;
+	MQTTResponse rc = MQTTResponse_initializer;
+	int MQTTVersion = 0;
+
+	FUNC_ENTRY;
+	rc.reasonCode = SOCKET_ERROR;
+	millisecsTimeout = options->connectTimeout * 1000;
+	start = MQTTClient_start_clock();
+
+	m->c->keepAliveInterval = options->keepAliveInterval;
+	m->c->retryInterval = options->retryInterval;
+	setRetryLoopInterval(options->keepAliveInterval);
+	m->c->MQTTVersion = options->MQTTVersion;
+	m->c->cleanstart = m->c->cleansession = 0;
+	if (m->c->MQTTVersion >= MQTTVERSION_5)
+		m->c->cleanstart = options->cleanstart;
+	else
+		m->c->cleansession = options->cleansession;
+	m->c->maxInflightMessages = (options->reliable) ? 1 : 10;
+	if (options->struct_version >= 6)
+	{
+		if (options->maxInflightMessages > 0)
+			m->c->maxInflightMessages = options->maxInflightMessages;
+	}
+
+	if (m->c->will)
+	{
+		free(m->c->will->payload);
+		free(m->c->will->topic);
+		free(m->c->will);
+		m->c->will = NULL;
+	}
+
+	if (options->will && (options->will->struct_version == 0 || options->will->struct_version == 1))
+	{
+		const void* source = NULL;
+
+		m->c->will = malloc(sizeof(willMessages));
+		if (options->will->message || (options->will->struct_version == 1 && options->will->payload.data))
+		{
+			if (options->will->struct_version == 1 && options->will->payload.data)
+			{
+				m->c->will->payloadlen = options->will->payload.len;
+				source = options->will->payload.data;
+			}
+			else
+			{
+				m->c->will->payloadlen = (int)strlen(options->will->message);
+				source = (void*)options->will->message;
+			}
+			m->c->will->payload = malloc(m->c->will->payloadlen);
+			memcpy(m->c->will->payload, source, m->c->will->payloadlen);
+		}
+		else
+		{
+			m->c->will->payload = NULL;
+			m->c->will->payloadlen = 0;
+		}
+		m->c->will->qos = options->will->qos;
+		m->c->will->retained = options->will->retained;
+		m->c->will->topic = MQTTStrdup(options->will->topicName);
+	}
+
+#if defined(OPENSSL)
+	if (m->c->sslopts)
+	{
+		if (m->c->sslopts->trustStore)
+			free((void*)m->c->sslopts->trustStore);
+		if (m->c->sslopts->keyStore)
+			free((void*)m->c->sslopts->keyStore);
+		if (m->c->sslopts->privateKey)
+			free((void*)m->c->sslopts->privateKey);
+		if (m->c->sslopts->privateKeyPassword)
+			free((void*)m->c->sslopts->privateKeyPassword);
+		if (m->c->sslopts->enabledCipherSuites)
+			free((void*)m->c->sslopts->enabledCipherSuites);
+		if (m->c->sslopts->struct_version >= 2)
+		{
+			if (m->c->sslopts->CApath)
+				free((void*)m->c->sslopts->CApath);
+		}
+		free(m->c->sslopts);
+		m->c->sslopts = NULL;
+	}
+
+	if (options->struct_version != 0 && options->ssl)
+	{
+		m->c->sslopts = malloc(sizeof(MQTTClient_SSLOptions));
+		memset(m->c->sslopts, '\0', sizeof(MQTTClient_SSLOptions));
+		m->c->sslopts->struct_version = options->ssl->struct_version;
+		if (options->ssl->trustStore)
+			m->c->sslopts->trustStore = MQTTStrdup(options->ssl->trustStore);
+		if (options->ssl->keyStore)
+			m->c->sslopts->keyStore = MQTTStrdup(options->ssl->keyStore);
+		if (options->ssl->privateKey)
+			m->c->sslopts->privateKey = MQTTStrdup(options->ssl->privateKey);
+		if (options->ssl->privateKeyPassword)
+			m->c->sslopts->privateKeyPassword = MQTTStrdup(options->ssl->privateKeyPassword);
+		if (options->ssl->enabledCipherSuites)
+			m->c->sslopts->enabledCipherSuites = MQTTStrdup(options->ssl->enabledCipherSuites);
+		m->c->sslopts->enableServerCertAuth = options->ssl->enableServerCertAuth;
+		if (m->c->sslopts->struct_version >= 1)
+			m->c->sslopts->sslVersion = options->ssl->sslVersion;
+		if (m->c->sslopts->struct_version >= 2)
+		{
+			m->c->sslopts->verify = options->ssl->verify;
+			if (options->ssl->CApath)
+				m->c->sslopts->CApath = MQTTStrdup(options->ssl->CApath);
+		}
+		if (m->c->sslopts->struct_version >= 3)
+		{
+			m->c->sslopts->ssl_error_cb = options->ssl->ssl_error_cb;
+			m->c->sslopts->ssl_error_context = options->ssl->ssl_error_context;
+		}
+		if (m->c->sslopts->struct_version >= 4)
+		{
+			m->c->sslopts->ssl_psk_cb = options->ssl->ssl_psk_cb;
+			m->c->sslopts->ssl_psk_context = options->ssl->ssl_psk_context;
+			m->c->sslopts->disableDefaultTrustStore = options->ssl->disableDefaultTrustStore;
+		}
+	}
+#endif
+
+	if (m->c->username)
+		free((void*)m->c->username);
+	if (options->username)
+		m->c->username = MQTTStrdup(options->username);
+	if (m->c->password)
+		free((void*)m->c->password);
+	if (options->password)
+	{
+		m->c->password = MQTTStrdup(options->password);
+		m->c->passwordlen = (int)strlen(options->password);
+	}
+	else if (options->struct_version >= 5 && options->binarypwd.data)
+	{
+		m->c->passwordlen = options->binarypwd.len;
+		m->c->password = malloc(m->c->passwordlen);
+		memcpy((void*)m->c->password, options->binarypwd.data, m->c->passwordlen);
+	}
+
+	if (options->struct_version >= 3)
+		MQTTVersion = options->MQTTVersion;
+	else
+		MQTTVersion = MQTTVERSION_DEFAULT;
+
+	if (MQTTVersion == MQTTVERSION_DEFAULT)
+	{
+		rc = MQTTClient_connectURIVersion(handle, options, serverURI, 4, start, millisecsTimeout,
+				connectProperties, willProperties);
+		if (rc.reasonCode != MQTTCLIENT_SUCCESS)
+		{
+			rc = MQTTClient_connectURIVersion(handle, options, serverURI, 3, start, millisecsTimeout,
+					connectProperties, willProperties);
+		}
+	}
+	else
+		rc = MQTTClient_connectURIVersion(handle, options, serverURI, MQTTVersion, start, millisecsTimeout,
+				connectProperties, willProperties);
+
+	FUNC_EXIT_RC(rc.reasonCode);
+	return rc;
+}
+
+MQTTResponse MQTTClient_connectAll(MQTTClient handle, MQTTClient_connectOptions* options,
+		MQTTProperties* connectProperties, MQTTProperties* willProperties);
+
+int MQTTClient_connect(MQTTClient handle, MQTTClient_connectOptions* options)
+{
+	MQTTClients* m = handle;
+
+	if (m->c->MQTTVersion >= MQTTVERSION_5)
+		return MQTTCLIENT_WRONG_MQTT_VERSION;
+
+	MQTTResponse response = MQTTClient_connectAll(handle, options, NULL, NULL);
+
+	return response.reasonCode;
+}
+
+
+MQTTResponse MQTTClient_connect5(MQTTClient handle, MQTTClient_connectOptions* options,
+		MQTTProperties* connectProperties, MQTTProperties* willProperties)
+{
+	MQTTClients* m = handle;
+	MQTTResponse response = MQTTResponse_initializer;
+
+	if (m->c->MQTTVersion < MQTTVERSION_5)
+	{
+		response.reasonCode = MQTTCLIENT_WRONG_MQTT_VERSION;
+		return response;
+	}
+
+	return MQTTClient_connectAll(handle, options, connectProperties, willProperties);
+}
+
+
+MQTTResponse MQTTClient_connectAll(MQTTClient handle, MQTTClient_connectOptions* options,
+		MQTTProperties* connectProperties, MQTTProperties* willProperties)
+{
+	MQTTClients* m = handle;
+	MQTTResponse rc = MQTTResponse_initializer;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(connect_mutex);
+	Thread_lock_mutex(mqttclient_mutex);
+
+	rc.reasonCode = SOCKET_ERROR;
+	if (options == NULL)
+	{
+		rc.reasonCode = MQTTCLIENT_NULL_PARAMETER;
+		goto exit;
+	}
+
+	if (strncmp(options->struct_id, "MQTC", 4) != 0 || options->struct_version < 0 || options->struct_version > 6)
+	{
+		rc.reasonCode = MQTTCLIENT_BAD_STRUCTURE;
+		goto exit;
+	}
+
+#if defined(OPENSSL)
+	if (m->ssl && options->ssl == NULL)
+	{
+		rc.reasonCode = MQTTCLIENT_NULL_PARAMETER;
+		goto exit;
+	}
+#endif
+
+	if (options->will) /* check validity of will options structure */
+	{
+		if (strncmp(options->will->struct_id, "MQTW", 4) != 0 || (options->will->struct_version != 0 && options->will->struct_version != 1))
+		{
+			rc.reasonCode = MQTTCLIENT_BAD_STRUCTURE;
+			goto exit;
+		}
+	}
+
+
+#if defined(OPENSSL)
+	if (options->struct_version != 0 && options->ssl) /* check validity of SSL options structure */
+	{
+		if (strncmp(options->ssl->struct_id, "MQTS", 4) != 0 || options->ssl->struct_version < 0 || options->ssl->struct_version > 4)
+		{
+			rc.reasonCode = MQTTCLIENT_BAD_STRUCTURE;
+			goto exit;
+		}
+	}
+#endif
+
+	if ((options->username && !UTF8_validateString(options->username)) ||
+		(options->password && !UTF8_validateString(options->password)))
+	{
+		rc.reasonCode = MQTTCLIENT_BAD_UTF8_STRING;
+		goto exit;
+	}
+
+	if (options->MQTTVersion != MQTTVERSION_DEFAULT &&
+			(options->MQTTVersion < MQTTVERSION_3_1 || options->MQTTVersion > MQTTVERSION_5))
+	{
+		rc.reasonCode = MQTTCLIENT_BAD_MQTT_VERSION;
+		goto exit;
+	}
+
+	if (options->MQTTVersion >= MQTTVERSION_5)
+	{
+		if (options->cleansession != 0)
+		{
+			rc.reasonCode = MQTTCLIENT_BAD_MQTT_OPTION;
+			goto exit;
+		}
+	}
+	else if (options->cleanstart != 0)
+	{
+		rc.reasonCode = MQTTCLIENT_BAD_MQTT_OPTION;
+		goto exit;
+	}
+
+	if (options->struct_version < 2 || options->serverURIcount == 0)
+	{
+		if ( !m )
+		{
+			rc.reasonCode = MQTTCLIENT_NULL_PARAMETER;
+			goto exit;
+		}
+		rc = MQTTClient_connectURI(handle, options, m->serverURI, connectProperties, willProperties);
+	}
+	else
+	{
+		int i;
+
+		for (i = 0; i < options->serverURIcount; ++i)
+		{
+			char* serverURI = options->serverURIs[i];
+
+			if (strncmp(URI_TCP, serverURI, strlen(URI_TCP)) == 0)
+				serverURI += strlen(URI_TCP);
+			else if (strncmp(URI_WS, serverURI, strlen(URI_WS)) == 0)
+			{
+				serverURI += strlen(URI_WS);
+				m->websocket = 1;
+			}
+#if defined(OPENSSL)
+			else if (strncmp(URI_SSL, serverURI, strlen(URI_SSL)) == 0)
+			{
+				serverURI += strlen(URI_SSL);
+				m->ssl = 1;
+			}
+			else if (strncmp(URI_WSS, serverURI, strlen(URI_WSS)) == 0)
+			{
+				serverURI += strlen(URI_WSS);
+				m->ssl = 1;
+				m->websocket = 1;
+			}
+#endif
+			rc = MQTTClient_connectURI(handle, options, serverURI, connectProperties, willProperties);
+			if (rc.reasonCode == MQTTREASONCODE_SUCCESS)
+				break;
+		}
+	}
+	if (rc.reasonCode == MQTTREASONCODE_SUCCESS)
+	{
+		if (rc.properties && MQTTProperties_hasProperty(rc.properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM))
+		{
+			int recv_max = MQTTProperties_getNumericValue(rc.properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM);
+			if (m->c->maxInflightMessages > recv_max)
+				m->c->maxInflightMessages = recv_max;
+		}
+	}
+
+exit:
+	if (m && m->c && m->c->will)
+	{
+		if (m->c->will->payload)
+			free(m->c->will->payload);
+		if (m->c->will->topic)
+			free(m->c->will->topic);
+		free(m->c->will);
+		m->c->will = NULL;
+	}
+	Thread_unlock_mutex(mqttclient_mutex);
+	Thread_unlock_mutex(connect_mutex);
+	FUNC_EXIT_RC(rc.reasonCode);
+	return rc;
+}
+
+
+/**
+ * mqttclient_mutex must be locked when you call this function, if multi threaded
+ */
+static int MQTTClient_disconnect1(MQTTClient handle, int timeout, int call_connection_lost, int stop,
+		enum MQTTReasonCodes reason, MQTTProperties* props)
+{
+	MQTTClients* m = handle;
+	START_TIME_TYPE start;
+	int rc = MQTTCLIENT_SUCCESS;
+	int was_connected = 0;
+
+	FUNC_ENTRY;
+	if (m == NULL || m->c == NULL)
+	{
+		rc = MQTTCLIENT_FAILURE;
+		goto exit;
+	}
+	if (m->c->connected == 0 && m->c->connect_state == NOT_IN_PROGRESS)
+	{
+		rc = MQTTCLIENT_DISCONNECTED;
+		goto exit;
+	}
+	was_connected = m->c->connected; /* should be 1 */
+	if (m->c->connected != 0)
+	{
+		start = MQTTClient_start_clock();
+		m->c->connect_state = DISCONNECTING; /* indicate disconnecting */
+		while (m->c->inboundMsgs->count > 0 || m->c->outboundMsgs->count > 0)
+		{ /* wait for all inflight message flows to finish, up to timeout */
+			if (MQTTClient_elapsed(start) >= timeout)
+				break;
+			Thread_unlock_mutex(mqttclient_mutex);
+			MQTTClient_yield();
+			Thread_lock_mutex(mqttclient_mutex);
+		}
+	}
+
+	MQTTClient_closeSession(m->c, reason, props);
+
+exit:
+	if (stop)
+		MQTTClient_stop();
+	if (call_connection_lost && m->cl && was_connected)
+	{
+		Log(TRACE_MIN, -1, "Calling connectionLost for client %s", m->c->clientID);
+		Thread_start(connectionLost_call, m);
+	}
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * mqttclient_mutex must be locked when you call this function, if multi threaded
+ */
+static int MQTTClient_disconnect_internal(MQTTClient handle, int timeout)
+{
+	return MQTTClient_disconnect1(handle, timeout, 1, 1, MQTTREASONCODE_SUCCESS, NULL);
+}
+
+
+/**
+ * mqttclient_mutex must be locked when you call this function, if multi threaded
+ */
+void MQTTProtocol_closeSession(Clients* c, int sendwill)
+{
+	MQTTClient_disconnect_internal((MQTTClient)c->context, 0);
+}
+
+
+int MQTTClient_disconnect(MQTTClient handle, int timeout)
+{
+	int rc = 0;
+
+	Thread_lock_mutex(mqttclient_mutex);
+	rc = MQTTClient_disconnect1(handle, timeout, 0, 1, MQTTREASONCODE_SUCCESS, NULL);
+	Thread_unlock_mutex(mqttclient_mutex);
+	return rc;
+}
+
+
+int MQTTClient_disconnect5(MQTTClient handle, int timeout, enum MQTTReasonCodes reason, MQTTProperties* props)
+{
+	int rc = 0;
+
+	Thread_lock_mutex(mqttclient_mutex);
+	rc = MQTTClient_disconnect1(handle, timeout, 0, 1, reason, props);
+	Thread_unlock_mutex(mqttclient_mutex);
+	return rc;
+}
+
+
+int MQTTClient_isConnected(MQTTClient handle)
+{
+	MQTTClients* m = handle;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(mqttclient_mutex);
+	if (m && m->c)
+		rc = m->c->connected;
+	Thread_unlock_mutex(mqttclient_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+MQTTResponse MQTTClient_subscribeMany5(MQTTClient handle, int count, char* const* topic,
+		int* qos, MQTTSubscribe_options* opts, MQTTProperties* props)
+{
+	MQTTClients* m = handle;
+	List* topics = NULL;
+	List* qoss = NULL;
+	int i = 0;
+	int rc = MQTTCLIENT_FAILURE;
+	MQTTResponse resp = MQTTResponse_initializer;
+	int msgid = 0;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(subscribe_mutex);
+	Thread_lock_mutex(mqttclient_mutex);
+
+	resp.reasonCode = MQTTCLIENT_FAILURE;
+	if (m == NULL || m->c == NULL)
+	{
+		rc = MQTTCLIENT_FAILURE;
+		goto exit;
+	}
+	if (m->c->connected == 0)
+	{
+		rc = MQTTCLIENT_DISCONNECTED;
+		goto exit;
+	}
+	for (i = 0; i < count; i++)
+	{
+		if (!UTF8_validateString(topic[i]))
+		{
+			rc = MQTTCLIENT_BAD_UTF8_STRING;
+			goto exit;
+		}
+
+		if (qos[i] < 0 || qos[i] > 2)
+		{
+			rc = MQTTCLIENT_BAD_QOS;
+			goto exit;
+		}
+	}
+	if ((msgid = MQTTProtocol_assignMsgId(m->c)) == 0)
+	{
+		rc = MQTTCLIENT_MAX_MESSAGES_INFLIGHT;
+		goto exit;
+	}
+
+	topics = ListInitialize();
+	qoss = ListInitialize();
+	for (i = 0; i < count; i++)
+	{
+		ListAppend(topics, topic[i], strlen(topic[i]));
+		ListAppend(qoss, &qos[i], sizeof(int));
+	}
+
+	rc = MQTTProtocol_subscribe(m->c, topics, qoss, msgid, opts, props);
+	ListFreeNoContent(topics);
+	ListFreeNoContent(qoss);
+
+	if (rc == TCPSOCKET_COMPLETE)
+	{
+		MQTTPacket* pack = NULL;
+
+		Thread_unlock_mutex(mqttclient_mutex);
+		pack = MQTTClient_waitfor(handle, SUBACK, &rc, 10000L);
+		Thread_lock_mutex(mqttclient_mutex);
+		if (pack != NULL)
+		{
+			Suback* sub = (Suback*)pack;
+
+			if (m->c->MQTTVersion == MQTTVERSION_5)
+			{
+				if (sub->properties.count > 0)
+				{
+					resp.properties = malloc(sizeof(MQTTProperties));
+					*resp.properties = MQTTProperties_copy(&sub->properties);
+				}
+				resp.reasonCodeCount = sub->qoss->count;
+				resp.reasonCode = *(int*)sub->qoss->first->content;
+				if (sub->qoss->count > 1)
+				{
+					ListElement* current = NULL;
+					int rc_count = 0;
+
+					resp.reasonCodes = malloc(sizeof(enum MQTTReasonCodes) * (sub->qoss->count));
+					while (ListNextElement(sub->qoss, &current))
+						(resp.reasonCodes)[rc_count++] = *(enum MQTTReasonCodes*)(current->content);
+				}
+			}
+			else
+			{
+				ListElement* current = NULL;
+				i = 0;
+				while (ListNextElement(sub->qoss, &current))
+				{
+					int* reqqos = (int*)(current->content);
+					qos[i++] = *reqqos;
+				}
+				resp.reasonCode = rc;
+			}
+			rc = MQTTProtocol_handleSubacks(pack, m->c->net.socket);
+			m->pack = NULL;
+		}
+		else
+			rc = SOCKET_ERROR;
+	}
+
+	if (rc == SOCKET_ERROR)
+		MQTTClient_disconnect_internal(handle, 0);
+	else if (rc == TCPSOCKET_COMPLETE)
+		rc = MQTTCLIENT_SUCCESS;
+
+exit:
+	if (rc < 0)
+		resp.reasonCode = rc;
+	Thread_unlock_mutex(mqttclient_mutex);
+	Thread_unlock_mutex(subscribe_mutex);
+	FUNC_EXIT_RC(resp.reasonCode);
+	return resp;
+}
+
+
+
+int MQTTClient_subscribeMany(MQTTClient handle, int count, char* const* topic, int* qos)
+{
+	MQTTClients* m = handle;
+	MQTTResponse response = MQTTResponse_initializer;
+
+	if (m->c->MQTTVersion >= MQTTVERSION_5)
+		response.reasonCode = MQTTCLIENT_BAD_MQTT_VERSION;
+	else
+		response = MQTTClient_subscribeMany5(handle, count, topic, qos, NULL, NULL);
+
+	return response.reasonCode;
+}
+
+
+
+MQTTResponse MQTTClient_subscribe5(MQTTClient handle, const char* topic, int qos,
+		MQTTSubscribe_options* opts, MQTTProperties* props)
+{
+	MQTTResponse rc;
+	char *const topics[] = {(char*)topic};
+
+	FUNC_ENTRY;
+	rc = MQTTClient_subscribeMany5(handle, 1, topics, &qos, opts, props);
+	if (qos == MQTT_BAD_SUBSCRIBE) /* addition for MQTT 3.1.1 - error code from subscribe */
+		rc.reasonCode = MQTT_BAD_SUBSCRIBE;
+	FUNC_EXIT_RC(rc.reasonCode);
+	return rc;
+}
+
+
+int MQTTClient_subscribe(MQTTClient handle, const char* topic, int qos)
+{
+	MQTTClients* m = handle;
+	MQTTResponse response = MQTTResponse_initializer;
+
+	if (m->c->MQTTVersion >= MQTTVERSION_5)
+		response.reasonCode = MQTTCLIENT_BAD_MQTT_VERSION;
+	else
+		response = MQTTClient_subscribe5(handle, topic, qos, NULL, NULL);
+
+	return response.reasonCode;
+}
+
+
+MQTTResponse MQTTClient_unsubscribeMany5(MQTTClient handle, int count, char* const* topic, MQTTProperties* props)
+{
+	MQTTClients* m = handle;
+	List* topics = NULL;
+	int i = 0;
+	int rc = SOCKET_ERROR;
+	MQTTResponse resp = MQTTResponse_initializer;
+	int msgid = 0;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(unsubscribe_mutex);
+	Thread_lock_mutex(mqttclient_mutex);
+
+	resp.reasonCode = MQTTCLIENT_FAILURE;
+	if (m == NULL || m->c == NULL)
+	{
+		rc = MQTTCLIENT_FAILURE;
+		goto exit;
+	}
+	if (m->c->connected == 0)
+	{
+		rc = MQTTCLIENT_DISCONNECTED;
+		goto exit;
+	}
+	for (i = 0; i < count; i++)
+	{
+		if (!UTF8_validateString(topic[i]))
+		{
+			rc = MQTTCLIENT_BAD_UTF8_STRING;
+			goto exit;
+		}
+	}
+	if ((msgid = MQTTProtocol_assignMsgId(m->c)) == 0)
+	{
+		rc = MQTTCLIENT_MAX_MESSAGES_INFLIGHT;
+		goto exit;
+	}
+
+	topics = ListInitialize();
+	for (i = 0; i < count; i++)
+		ListAppend(topics, topic[i], strlen(topic[i]));
+	rc = MQTTProtocol_unsubscribe(m->c, topics, msgid, props);
+	ListFreeNoContent(topics);
+
+	if (rc == TCPSOCKET_COMPLETE)
+	{
+		MQTTPacket* pack = NULL;
+
+		Thread_unlock_mutex(mqttclient_mutex);
+		pack = MQTTClient_waitfor(handle, UNSUBACK, &rc, 10000L);
+		Thread_lock_mutex(mqttclient_mutex);
+		if (pack != NULL)
+		{
+			Unsuback* unsub = (Unsuback*)pack;
+
+			if (m->c->MQTTVersion == MQTTVERSION_5)
+			{
+				if (unsub->properties.count > 0)
+				{
+					resp.properties = malloc(sizeof(MQTTProperties));
+					*resp.properties = MQTTProperties_copy(&unsub->properties);
+				}
+				resp.reasonCodeCount = unsub->reasonCodes->count;
+				resp.reasonCode = *(int*)unsub->reasonCodes->first->content;
+				if (unsub->reasonCodes->count > 1)
+				{
+					ListElement* current = NULL;
+					int rc_count = 0;
+
+					resp.reasonCodes = malloc(sizeof(enum MQTTReasonCodes) * (unsub->reasonCodes->count));
+					while (ListNextElement(unsub->reasonCodes, &current))
+						(resp.reasonCodes)[rc_count++] = *(enum MQTTReasonCodes*)(current->content);
+				}
+			}
+			else
+				resp.reasonCode = rc;
+			rc = MQTTProtocol_handleUnsubacks(pack, m->c->net.socket);
+			m->pack = NULL;
+		}
+		else
+			rc = SOCKET_ERROR;
+	}
+
+	if (rc == SOCKET_ERROR)
+		MQTTClient_disconnect_internal(handle, 0);
+
+exit:
+	if (rc < 0)
+		resp.reasonCode = rc;
+	Thread_unlock_mutex(mqttclient_mutex);
+	Thread_unlock_mutex(unsubscribe_mutex);
+	FUNC_EXIT_RC(resp.reasonCode);
+	return resp;
+}
+
+
+int MQTTClient_unsubscribeMany(MQTTClient handle, int count, char* const* topic)
+{
+	MQTTResponse response = MQTTClient_unsubscribeMany5(handle, count, topic, NULL);
+
+	return response.reasonCode;
+}
+
+
+MQTTResponse MQTTClient_unsubscribe5(MQTTClient handle, const char* topic, MQTTProperties* props)
+{
+	MQTTResponse rc;
+	char *const topics[] = {(char*)topic};
+
+	rc = MQTTClient_unsubscribeMany5(handle, 1, topics, props);
+	return rc;
+}
+
+
+int MQTTClient_unsubscribe(MQTTClient handle, const char* topic)
+{
+	MQTTResponse response = MQTTClient_unsubscribe5(handle, topic, NULL);
+
+	return response.reasonCode;
+}
+
+
+MQTTResponse MQTTClient_publish5(MQTTClient handle, const char* topicName, int payloadlen, const void* payload,
+		int qos, int retained, MQTTProperties* properties, MQTTClient_deliveryToken* deliveryToken)
+{
+	int rc = MQTTCLIENT_SUCCESS;
+	MQTTClients* m = handle;
+	Messages* msg = NULL;
+	Publish* p = NULL;
+	int blocked = 0;
+	int msgid = 0;
+	MQTTResponse resp = MQTTResponse_initializer;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(mqttclient_mutex);
+
+	if (m == NULL || m->c == NULL)
+		rc = MQTTCLIENT_FAILURE;
+	else if (m->c->connected == 0)
+		rc = MQTTCLIENT_DISCONNECTED;
+	else if (!UTF8_validateString(topicName))
+		rc = MQTTCLIENT_BAD_UTF8_STRING;
+
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	/* If outbound queue is full, block until it is not */
+	while (m->c->outboundMsgs->count >= m->c->maxInflightMessages ||
+         Socket_noPendingWrites(m->c->net.socket) == 0) /* wait until the socket is free of large packets being written */
+	{
+		if (blocked == 0)
+		{
+			blocked = 1;
+			Log(TRACE_MIN, -1, "Blocking publish on queue full for client %s", m->c->clientID);
+		}
+		Thread_unlock_mutex(mqttclient_mutex);
+		MQTTClient_yield();
+		Thread_lock_mutex(mqttclient_mutex);
+		if (m->c->connected == 0)
+		{
+			rc = MQTTCLIENT_FAILURE;
+			goto exit;
+		}
+	}
+	if (blocked == 1)
+		Log(TRACE_MIN, -1, "Resuming publish now queue not full for client %s", m->c->clientID);
+	if (qos > 0 && (msgid = MQTTProtocol_assignMsgId(m->c)) == 0)
+	{	/* this should never happen as we've waited for spaces in the queue */
+		rc = MQTTCLIENT_MAX_MESSAGES_INFLIGHT;
+		goto exit;
+	}
+
+	p = malloc(sizeof(Publish) + payloadlen);
+	p->payload = (void*)payload;
+	p->payloadlen = payloadlen;
+	if (payloadlen > 0)
+	{
+		p->payload = (char*)p + sizeof(Publish);
+		memcpy(p->payload, payload, payloadlen);
+		p->payloadlen = payloadlen;
+	}
+	p->topic = MQTTStrdup(topicName);
+	p->msgId = msgid;
+	p->MQTTVersion = m->c->MQTTVersion;
+	if (m->c->MQTTVersion >= MQTTVERSION_5)
+	{
+		if (properties)
+			p->properties = *properties;
+		else
+		{
+			MQTTProperties props = MQTTProperties_initializer;
+			p->properties = props;
+		}
+	}
+
+	rc = MQTTProtocol_startPublish(m->c, p, qos, retained, &msg);
+
+	/* If the packet was partially written to the socket, wait for it to complete.
+	 * However, if the client is disconnected during this time and qos is not 0, still return success, as
+	 * the packet has already been written to persistence and assigned a message id so will
+	 * be sent when the client next connects.
+	 */
+	if (rc == TCPSOCKET_INTERRUPTED)
+	{
+		while (m->c->connected == 1 && SocketBuffer_getWrite(m->c->net.socket))
+		{
+			Thread_unlock_mutex(mqttclient_mutex);
+			MQTTClient_yield();
+			Thread_lock_mutex(mqttclient_mutex);
+		}
+		rc = (qos > 0 || m->c->connected == 1) ? MQTTCLIENT_SUCCESS : MQTTCLIENT_FAILURE;
+	}
+
+	if (deliveryToken && qos > 0)
+		*deliveryToken = msg->msgid;
+
+	if (p->topic) free(p->topic);
+	free(p);
+
+	if (rc == SOCKET_ERROR)
+	{
+		MQTTClient_disconnect_internal(handle, 0);
+		/* Return success for qos > 0 as the send will be retried automatically */
+		rc = (qos > 0) ? MQTTCLIENT_SUCCESS : MQTTCLIENT_FAILURE;
+	}
+
+exit:
+	Thread_unlock_mutex(mqttclient_mutex);
+	resp.reasonCode = rc;
+	FUNC_EXIT_RC(resp.reasonCode);
+	return resp;
+}
+
+
+int MQTTClient_publish(MQTTClient handle, const char* topicName, int payloadlen, const void* payload,
+							 int qos, int retained, MQTTClient_deliveryToken* deliveryToken)
+{
+	MQTTClients* m = handle;
+	MQTTResponse rc = MQTTResponse_initializer;
+
+	if (m->c->MQTTVersion >= MQTTVERSION_5)
+		rc.reasonCode = MQTTCLIENT_BAD_MQTT_VERSION;
+	else
+		rc = MQTTClient_publish5(handle, topicName, payloadlen, payload, qos, retained, NULL, deliveryToken);
+	return rc.reasonCode;
+}
+
+
+MQTTResponse MQTTClient_publishMessage5(MQTTClient handle, const char* topicName, MQTTClient_message* message,
+								MQTTClient_deliveryToken* deliveryToken)
+{
+	MQTTResponse rc = MQTTResponse_initializer;
+	MQTTProperties* props = NULL;
+
+	FUNC_ENTRY;
+	if (message == NULL)
+	{
+		rc.reasonCode = MQTTCLIENT_NULL_PARAMETER;
+		goto exit;
+	}
+
+	if (strncmp(message->struct_id, "MQTM", 4) != 0 ||
+			(message->struct_version != 0 && message->struct_version != 1))
+	{
+		rc.reasonCode = MQTTCLIENT_BAD_STRUCTURE;
+		goto exit;
+	}
+
+	if (message->struct_version >= 1)
+		props = &message->properties;
+
+	rc = MQTTClient_publish5(handle, topicName, message->payloadlen, message->payload,
+								message->qos, message->retained, props, deliveryToken);
+exit:
+	FUNC_EXIT_RC(rc.reasonCode);
+	return rc;
+}
+
+
+int MQTTClient_publishMessage(MQTTClient handle, const char* topicName, MQTTClient_message* message,
+															 MQTTClient_deliveryToken* deliveryToken)
+{
+	MQTTClients* m = handle;
+	MQTTResponse rc = MQTTResponse_initializer;
+
+	if (strncmp(message->struct_id, "MQTM", 4) != 0 ||
+			(message->struct_version != 0 && message->struct_version != 1))
+		rc.reasonCode = MQTTCLIENT_BAD_STRUCTURE;
+	else if (m->c->MQTTVersion >= MQTTVERSION_5)
+		rc.reasonCode = MQTTCLIENT_BAD_MQTT_VERSION;
+	else
+		rc = MQTTClient_publishMessage5(handle, topicName, message, deliveryToken);
+	return rc.reasonCode;
+}
+
+
+static void MQTTClient_retry(void)
+{
+	static time_t last = 0L;
+	time_t now;
+
+	FUNC_ENTRY;
+	time(&(now));
+	if (difftime(now, last) > retryLoopInterval)
+	{
+		time(&(last));
+		MQTTProtocol_keepalive(now);
+		MQTTProtocol_retry(now, 1, 0);
+	}
+	else
+		MQTTProtocol_retry(now, 0, 0);
+	FUNC_EXIT;
+}
+
+
+static MQTTPacket* MQTTClient_cycle(int* sock, unsigned long timeout, int* rc)
+{
+	struct timeval tp = {0L, 0L};
+	static Ack ack;
+	MQTTPacket* pack = NULL;
+
+	FUNC_ENTRY;
+	if (timeout > 0L)
+	{
+		tp.tv_sec = timeout / 1000;
+		tp.tv_usec = (timeout % 1000) * 1000; /* this field is microseconds! */
+	}
+
+#if defined(OPENSSL)
+	if ((*sock = SSLSocket_getPendingRead()) == -1)
+	{
+		/* 0 from getReadySocket indicates no work to do, -1 == error, but can happen normally */
+#endif
+		*sock = Socket_getReadySocket(0, &tp, socket_mutex);
+#if defined(OPENSSL)
+	}
+#endif
+	Thread_lock_mutex(mqttclient_mutex);
+	if (*sock > 0)
+	{
+		MQTTClients* m = NULL;
+		if (ListFindItem(handles, sock, clientSockCompare) != NULL)
+			m = (MQTTClient)(handles->current->content);
+		if (m != NULL)
+		{
+			if (m->c->connect_state == TCP_IN_PROGRESS || m->c->connect_state == SSL_IN_PROGRESS)
+				*rc = 0;  /* waiting for connect state to clear */
+			else if (m->c->connect_state == WEBSOCKET_IN_PROGRESS)
+				*rc = WebSocket_upgrade(&m->c->net);
+			else
+			{
+				pack = MQTTPacket_Factory(m->c->MQTTVersion, &m->c->net, rc);
+				if (*rc == TCPSOCKET_INTERRUPTED)
+					*rc = 0;
+			}
+		}
+
+		if (pack)
+		{
+			int freed = 1;
+
+			/* Note that these handle... functions free the packet structure that they are dealing with */
+			if (pack->header.bits.type == PUBLISH)
+				*rc = MQTTProtocol_handlePublishes(pack, *sock);
+			else if (pack->header.bits.type == PUBACK || pack->header.bits.type == PUBCOMP)
+			{
+				int msgid;
+
+				ack = (pack->header.bits.type == PUBCOMP) ? *(Pubcomp*)pack : *(Puback*)pack;
+				msgid = ack.msgId;
+				if (m && m->c->MQTTVersion >= MQTTVERSION_5 && m->published)
+				{
+					Log(TRACE_MIN, -1, "Calling published for client %s, msgid %d", m->c->clientID, msgid);
+					(*(m->published))(m->published_context, msgid, pack->header.bits.type, &ack.properties, ack.rc);
+				}
+				*rc = (pack->header.bits.type == PUBCOMP) ?
+					MQTTProtocol_handlePubcomps(pack, *sock) : MQTTProtocol_handlePubacks(pack, *sock);
+				if (m && m->dc)
+				{
+					Log(TRACE_MIN, -1, "Calling deliveryComplete for client %s, msgid %d", m->c->clientID, msgid);
+					(*(m->dc))(m->context, msgid);
+				}
+			}
+			else if (pack->header.bits.type == PUBREC)
+			{
+				Pubrec* pubrec = (Pubrec*)pack;
+
+				if (m && m->c->MQTTVersion >= MQTTVERSION_5 && m->published && pubrec->rc >= MQTTREASONCODE_UNSPECIFIED_ERROR)
+				{
+					Log(TRACE_MIN, -1, "Calling published for client %s, msgid %d", m->c->clientID, ack.msgId);
+					(*(m->published))(m->published_context, pubrec->msgId, pack->header.bits.type,
+							&pubrec->properties, pubrec->rc);
+				}
+				*rc = MQTTProtocol_handlePubrecs(pack, *sock);
+			}
+			else if (pack->header.bits.type == PUBREL)
+				*rc = MQTTProtocol_handlePubrels(pack, *sock);
+			else if (pack->header.bits.type == PINGRESP)
+				*rc = MQTTProtocol_handlePingresps(pack, *sock);
+			else
+				freed = 0;
+			if (freed)
+				pack = NULL;
+		}
+	}
+	MQTTClient_retry();
+	Thread_unlock_mutex(mqttclient_mutex);
+	FUNC_EXIT_RC(*rc);
+	return pack;
+}
+
+
+static MQTTPacket* MQTTClient_waitfor(MQTTClient handle, int packet_type, int* rc, long timeout)
+{
+	MQTTPacket* pack = NULL;
+	MQTTClients* m = handle;
+	START_TIME_TYPE start = MQTTClient_start_clock();
+
+	FUNC_ENTRY;
+	if (((MQTTClients*)handle) == NULL || timeout <= 0L)
+	{
+		*rc = MQTTCLIENT_FAILURE;
+		goto exit;
+	}
+
+	if (running)
+	{
+		if (packet_type == CONNECT)
+		{
+			if ((*rc = Thread_wait_sem(m->connect_sem, timeout)) == 0)
+				*rc = m->rc;
+		}
+		else if (packet_type == CONNACK)
+			*rc = Thread_wait_sem(m->connack_sem, timeout);
+		else if (packet_type == SUBACK)
+			*rc = Thread_wait_sem(m->suback_sem, timeout);
+		else if (packet_type == UNSUBACK)
+			*rc = Thread_wait_sem(m->unsuback_sem, timeout);
+		if (*rc == 0 && packet_type != CONNECT && m->pack == NULL)
+			Log(LOG_ERROR, -1, "waitfor unexpectedly is NULL for client %s, packet_type %d, timeout %ld", m->c->clientID, packet_type, timeout);
+		pack = m->pack;
+	}
+	else
+	{
+		*rc = TCPSOCKET_COMPLETE;
+		while (1)
+		{
+			int sock = -1;
+			pack = MQTTClient_cycle(&sock, 100L, rc);
+			if (sock == m->c->net.socket)
+			{
+				if (*rc == SOCKET_ERROR)
+					break;
+				if (pack && (pack->header.bits.type == packet_type))
+					break;
+				if (m->c->connect_state == TCP_IN_PROGRESS)
+				{
+					int error;
+					socklen_t len = sizeof(error);
+
+					if ((*rc = getsockopt(m->c->net.socket, SOL_SOCKET, SO_ERROR, (char*)&error, &len)) == 0)
+						*rc = error;
+					break;
+				}
+#if defined(OPENSSL)
+				else if (m->c->connect_state == SSL_IN_PROGRESS)
+				{
+					*rc = m->c->sslopts->struct_version >= 3 ?
+						SSLSocket_connect(m->c->net.ssl, sock, m->serverURI,
+							m->c->sslopts->verify, m->c->sslopts->ssl_error_cb, m->c->sslopts->ssl_error_context) :
+						SSLSocket_connect(m->c->net.ssl, sock, m->serverURI,
+							m->c->sslopts->verify, NULL, NULL);
+					if (*rc == SSL_FATAL)
+						break;
+					else if (*rc == 1) /* rc == 1 means SSL connect has finished and succeeded */
+					{
+						if ((m->c->cleansession == 0 && m->c->cleanstart == 0) && m->c->session == NULL)
+							m->c->session = SSL_get1_session(m->c->net.ssl);
+						break;
+					}
+				}
+#endif
+				else if (m->c->connect_state == WEBSOCKET_IN_PROGRESS )
+				{
+					*rc = 1;
+					break;
+				}
+				else if (m->c->connect_state == WAIT_FOR_CONNACK)
+				{
+					int error;
+					socklen_t len = sizeof(error);
+					if (getsockopt(m->c->net.socket, SOL_SOCKET, SO_ERROR, (char*)&error, &len) == 0)
+					{
+						if (error)
+						{
+							*rc = error;
+							break;
+						}
+					}
+				}
+			}
+			if (MQTTClient_elapsed(start) > timeout)
+			{
+				pack = NULL;
+				break;
+			}
+		}
+	}
+
+exit:
+	FUNC_EXIT_RC(*rc);
+	return pack;
+}
+
+
+int MQTTClient_receive(MQTTClient handle, char** topicName, int* topicLen, MQTTClient_message** message,
+											 unsigned long timeout)
+{
+	int rc = TCPSOCKET_COMPLETE;
+	START_TIME_TYPE start = MQTTClient_start_clock();
+	unsigned long elapsed = 0L;
+	MQTTClients* m = handle;
+
+	FUNC_ENTRY;
+	if (m == NULL || m->c == NULL
+			|| running) /* receive is not meant to be called in a multi-thread environment */
+	{
+		rc = MQTTCLIENT_FAILURE;
+		goto exit;
+	}
+	if (m->c->connected == 0)
+	{
+		rc = MQTTCLIENT_DISCONNECTED;
+		goto exit;
+	}
+
+	*topicName = NULL;
+	*message = NULL;
+
+	/* if there is already a message waiting, don't hang around but still do some packet handling */
+	if (m->c->messageQueue->count > 0)
+		timeout = 0L;
+
+	elapsed = MQTTClient_elapsed(start);
+	do
+	{
+		int sock = 0;
+		MQTTClient_cycle(&sock, (timeout > elapsed) ? timeout - elapsed : 0L, &rc);
+
+		if (rc == SOCKET_ERROR)
+		{
+			if (ListFindItem(handles, &sock, clientSockCompare) && 	/* find client corresponding to socket */
+			  (MQTTClient)(handles->current->content) == handle)
+				break; /* there was an error on the socket we are interested in */
+		}
+		elapsed = MQTTClient_elapsed(start);
+	}
+	while (elapsed < timeout && m->c->messageQueue->count == 0);
+
+	if (m->c->messageQueue->count > 0)
+		rc = MQTTClient_deliverMessage(rc, m, topicName, topicLen, message);
+
+	if (rc == SOCKET_ERROR)
+		MQTTClient_disconnect_internal(handle, 0);
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+void MQTTClient_yield(void)
+{
+	START_TIME_TYPE start = MQTTClient_start_clock();
+	unsigned long elapsed = 0L;
+	unsigned long timeout = 100L;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if (running) /* yield is not meant to be called in a multi-thread environment */
+	{
+		MQTTClient_sleep(timeout);
+		goto exit;
+	}
+
+	elapsed = MQTTClient_elapsed(start);
+	do
+	{
+		int sock = -1;
+		MQTTClient_cycle(&sock, (timeout > elapsed) ? timeout - elapsed : 0L, &rc);
+		Thread_lock_mutex(mqttclient_mutex);
+		if (rc == SOCKET_ERROR && ListFindItem(handles, &sock, clientSockCompare))
+		{
+			MQTTClients* m = (MQTTClient)(handles->current->content);
+			if (m->c->connect_state != DISCONNECTING)
+				MQTTClient_disconnect_internal(m, 0);
+		}
+		Thread_unlock_mutex(mqttclient_mutex);
+		elapsed = MQTTClient_elapsed(start);
+	}
+	while (elapsed < timeout);
+exit:
+	FUNC_EXIT;
+}
+
+/*
+static int pubCompare(void* a, void* b)
+{
+	Messages* msg = (Messages*)a;
+	return msg->publish == (Publications*)b;
+}*/
+
+
+int MQTTClient_waitForCompletion(MQTTClient handle, MQTTClient_deliveryToken mdt, unsigned long timeout)
+{
+	int rc = MQTTCLIENT_FAILURE;
+	START_TIME_TYPE start = MQTTClient_start_clock();
+	unsigned long elapsed = 0L;
+	MQTTClients* m = handle;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(mqttclient_mutex);
+
+	if (m == NULL || m->c == NULL)
+	{
+		rc = MQTTCLIENT_FAILURE;
+		goto exit;
+	}
+
+	elapsed = MQTTClient_elapsed(start);
+	while (elapsed < timeout)
+	{
+		if (m->c->connected == 0)
+		{
+			rc = MQTTCLIENT_DISCONNECTED;
+			goto exit;
+		}
+		if (ListFindItem(m->c->outboundMsgs, &mdt, messageIDCompare) == NULL)
+		{
+			rc = MQTTCLIENT_SUCCESS; /* well we couldn't find it */
+			goto exit;
+		}
+		Thread_unlock_mutex(mqttclient_mutex);
+		MQTTClient_yield();
+		Thread_lock_mutex(mqttclient_mutex);
+		elapsed = MQTTClient_elapsed(start);
+	}
+
+exit:
+	Thread_unlock_mutex(mqttclient_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int MQTTClient_getPendingDeliveryTokens(MQTTClient handle, MQTTClient_deliveryToken **tokens)
+{
+	int rc = MQTTCLIENT_SUCCESS;
+	MQTTClients* m = handle;
+	*tokens = NULL;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(mqttclient_mutex);
+
+	if (m == NULL)
+	{
+		rc = MQTTCLIENT_FAILURE;
+		goto exit;
+	}
+
+	if (m->c && m->c->outboundMsgs->count > 0)
+	{
+		ListElement* current = NULL;
+		int count = 0;
+
+		*tokens = malloc(sizeof(MQTTClient_deliveryToken) * (m->c->outboundMsgs->count + 1));
+		/*Heap_unlink(__FILE__, __LINE__, *tokens);*/
+		while (ListNextElement(m->c->outboundMsgs, &current))
+		{
+			Messages* m = (Messages*)(current->content);
+			(*tokens)[count++] = m->msgid;
+		}
+		(*tokens)[count] = -1;
+	}
+
+exit:
+	Thread_unlock_mutex(mqttclient_mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+void MQTTClient_setTraceLevel(enum MQTTCLIENT_TRACE_LEVELS level)
+{
+	Log_setTraceLevel((enum LOG_LEVELS)level);
+}
+
+
+void MQTTClient_setTraceCallback(MQTTClient_traceCallback* callback)
+{
+	Log_setTraceCallback((Log_traceCallback*)callback);
+}
+
+
+MQTTClient_nameValue* MQTTClient_getVersionInfo(void)
+{
+	#define MAX_INFO_STRINGS 8
+	static MQTTClient_nameValue libinfo[MAX_INFO_STRINGS + 1];
+	int i = 0;
+
+	libinfo[i].name = "Product name";
+	libinfo[i++].value = "Eclipse Paho Synchronous MQTT C Client Library";
+
+	libinfo[i].name = "Version";
+	libinfo[i++].value = CLIENT_VERSION;
+
+	libinfo[i].name = "Build level";
+	libinfo[i++].value = BUILD_TIMESTAMP;
+#if defined(OPENSSL)
+	libinfo[i].name = "OpenSSL version";
+	libinfo[i++].value = SSLeay_version(SSLEAY_VERSION);
+
+	libinfo[i].name = "OpenSSL flags";
+	libinfo[i++].value = SSLeay_version(SSLEAY_CFLAGS);
+
+	libinfo[i].name = "OpenSSL build timestamp";
+	libinfo[i++].value = SSLeay_version(SSLEAY_BUILT_ON);
+
+	libinfo[i].name = "OpenSSL platform";
+	libinfo[i++].value = SSLeay_version(SSLEAY_PLATFORM);
+
+	libinfo[i].name = "OpenSSL directory";
+	libinfo[i++].value = SSLeay_version(SSLEAY_DIR);
+#endif
+	libinfo[i].name = NULL;
+	libinfo[i].value = NULL;
+	return libinfo;
+}
+
+
+const char* MQTTClient_strerror(int code)
+{
+  static char buf[30];
+
+  switch (code) {
+    case MQTTCLIENT_SUCCESS:
+      return "Success";
+    case MQTTCLIENT_FAILURE:
+      return "Failure";
+    case MQTTCLIENT_DISCONNECTED:
+      return "Disconnected";
+    case MQTTCLIENT_MAX_MESSAGES_INFLIGHT:
+      return "Maximum in-flight messages amount reached";
+    case MQTTCLIENT_BAD_UTF8_STRING:
+      return "Invalid UTF8 string";
+    case MQTTCLIENT_NULL_PARAMETER:
+      return "Invalid (NULL) parameter";
+    case MQTTCLIENT_TOPICNAME_TRUNCATED:
+      return "Topic containing NULL characters has been truncated";
+    case MQTTCLIENT_BAD_STRUCTURE:
+      return "Bad structure";
+    case MQTTCLIENT_BAD_QOS:
+      return "Invalid QoS value";
+    case MQTTCLIENT_SSL_NOT_SUPPORTED:
+      return "SSL is not supported";
+    case MQTTCLIENT_BAD_PROTOCOL:
+      return "Invalid protocol scheme";
+    case MQTTCLIENT_BAD_MQTT_OPTION:
+      return "Options for wrong MQTT version";
+    case MQTTCLIENT_WRONG_MQTT_VERSION:
+    	  return "Client created for another version of MQTT";
+  }
+
+  sprintf(buf, "Unknown error code %d", code);
+  return buf;
+}
+
+
+/**
+ * See if any pending writes have been completed, and cleanup if so.
+ * Cleaning up means removing any publication data that was stored because the write did
+ * not originally complete.
+ */
+static void MQTTProtocol_checkPendingWrites(void)
+{
+	FUNC_ENTRY;
+	if (state.pending_writes.count > 0)
+	{
+		ListElement* le = state.pending_writes.first;
+		while (le)
+		{
+			if (Socket_noPendingWrites(((pending_write*)(le->content))->socket))
+			{
+				MQTTProtocol_removePublication(((pending_write*)(le->content))->p);
+				state.pending_writes.current = le;
+				ListRemove(&(state.pending_writes), le->content); /* does NextElement itself */
+				le = state.pending_writes.current;
+			}
+			else
+				ListNextElement(&(state.pending_writes), &le);
+		}
+	}
+	FUNC_EXIT;
+}
+
+
+static void MQTTClient_writeComplete(int socket, int rc)
+{
+	ListElement* found = NULL;
+
+	FUNC_ENTRY;
+	/* a partial write is now complete for a socket - this will be on a publish*/
+
+	MQTTProtocol_checkPendingWrites();
+
+	/* find the client using this socket */
+	if ((found = ListFindItem(handles, &socket, clientSockCompare)) != NULL)
+	{
+		MQTTClients* m = (MQTTClients*)(found->content);
+
+		time(&(m->c->net.lastSent));
+	}
+	FUNC_EXIT;
+}
diff --git a/mqtt/src/src/MQTTClient.h b/mqtt/src/src/MQTTClient.h
new file mode 100644
index 00000000..831346b7
--- /dev/null
+++ b/mqtt/src/src/MQTTClient.h
@@ -0,0 +1,1692 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL updates
+ *    Ian Craggs - multiple server connection support
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - remove const from eyecatchers #168
+ *******************************************************************************/
+
+/**
+ * @cond MQTTClient_internal
+ * @mainpage MQTT Client Library Internals
+ * In the beginning there was one MQTT C client library, MQTTClient, as implemented in MQTTClient.c
+ * This library was designed to be easy to use for applications which didn't mind if some of the calls
+ * blocked for a while.  For instance, the MQTTClient_connect call will block until a successful
+ * connection has completed, or a connection has failed, which could be as long as the "connection
+ * timeout" interval, whose default is 30 seconds.
+ *
+ * However in mobile devices and other windowing environments, blocking on the GUI thread is a bad
+ * thing as it causes the user interface to freeze.  Hence a new API, MQTTAsync, implemented
+ * in MQTTAsync.c, was devised.  There are no blocking calls in this library, so it is well suited
+ * to GUI and mobile environments, at the expense of some extra complexity.
+ *
+ * Both libraries are designed to be sparing in the use of threads.  So multiple client objects are
+ * handled by one or two threads, with a select call in Socket_getReadySocket(), used to determine
+ * when a socket has incoming data.  This API is thread safe: functions may be called by multiple application
+ * threads, with the exception of ::MQTTClient_yield and ::MQTTClient_receive, which are intended
+ * for single threaded environments only.
+ *
+ * @endcond
+ * @cond MQTTClient_main
+ * @mainpage MQTT Client library for C
+ * &copy; Copyright IBM Corp. 2009, 2018
+ *
+ * @brief An MQTT client library in C.
+ *
+ * These pages describe the original more synchronous API which might be
+ * considered easier to use.  Some of the calls will block.  For the new
+ * totally asynchronous API where no calls block, which is especially suitable
+ * for use in windowed environments, see the
+ * <a href="../../MQTTAsync/html/index.html">MQTT C Client Asynchronous API Documentation</a>.
+ * The MQTTClient API is not thread safe, whereas the MQTTAsync API is.
+ *
+ * An MQTT client application connects to MQTT-capable servers.
+ * A typical client is responsible for collecting information from a telemetry
+ * device and publishing the information to the server. It can also subscribe
+ * to topics, receive messages, and use this information to control the
+ * telemetry device.
+ *
+ * MQTT clients implement the published MQTT v3 protocol. You can write your own
+ * API to the MQTT protocol using the programming language and platform of your
+ * choice. This can be time-consuming and error-prone.
+ *
+ * To simplify writing MQTT client applications, this library encapsulates
+ * the MQTT v3 protocol for you. Using this library enables a fully functional
+ * MQTT client application to be written in a few lines of code.
+ * The information presented here documents the API provided
+ * by the MQTT Client library for C.
+ *
+ * <b>Using the client</b><br>
+ * Applications that use the client library typically use a similar structure:
+ * <ul>
+ * <li>Create a client object</li>
+ * <li>Set the options to connect to an MQTT server</li>
+ * <li>Set up callback functions if multi-threaded (asynchronous mode)
+ * operation is being used (see @ref async).</li>
+ * <li>Subscribe to any topics the client needs to receive</li>
+ * <li>Repeat until finished:</li>
+ *     <ul>
+ *     <li>Publish any messages the client needs to</li>
+ *     <li>Handle any incoming messages</li>
+ *     </ul>
+ * <li>Disconnect the client</li>
+ * <li>Free any memory being used by the client</li>
+ * </ul>
+ * Some simple examples are shown here:
+ * <ul>
+ * <li>@ref pubsync</li>
+ * <li>@ref pubasync</li>
+ * <li>@ref subasync</li>
+ * </ul>
+ * Additional information about important concepts is provided here:
+ * <ul>
+ * <li>@ref async</li>
+ * <li>@ref wildcard</li>
+ * <li>@ref qos</li>
+ * <li>@ref tracing</li>
+ * </ul>
+ * @endcond
+ */
+
+/*
+/// @cond EXCLUDE
+*/
+#if !defined(MQTTCLIENT_H)
+#define MQTTCLIENT_H
+
+#if defined(__cplusplus)
+ extern "C" {
+#endif
+
+#if defined(WIN32) || defined(WIN64)
+  #define DLLImport __declspec(dllimport)
+  #define DLLExport __declspec(dllexport)
+#else
+  #define DLLImport extern
+  #define DLLExport __attribute__ ((visibility ("default")))
+#endif
+
+#include <stdio.h>
+/*
+/// @endcond
+*/
+
+#include "MQTTProperties.h"
+#include "MQTTReasonCodes.h"
+#include "MQTTSubscribeOpts.h"
+#if !defined(NO_PERSISTENCE)
+#include "MQTTClientPersistence.h"
+#endif
+
+/**
+ * Return code: No error. Indicates successful completion of an MQTT client
+ * operation.
+ */
+#define MQTTCLIENT_SUCCESS 0
+/**
+ * Return code: A generic error code indicating the failure of an MQTT client
+ * operation.
+ */
+#define MQTTCLIENT_FAILURE -1
+
+/* error code -2 is MQTTCLIENT_PERSISTENCE_ERROR */
+
+/**
+ * Return code: The client is disconnected.
+ */
+#define MQTTCLIENT_DISCONNECTED -3
+/**
+ * Return code: The maximum number of messages allowed to be simultaneously
+ * in-flight has been reached.
+ */
+#define MQTTCLIENT_MAX_MESSAGES_INFLIGHT -4
+/**
+ * Return code: An invalid UTF-8 string has been detected.
+ */
+#define MQTTCLIENT_BAD_UTF8_STRING -5
+/**
+ * Return code: A NULL parameter has been supplied when this is invalid.
+ */
+#define MQTTCLIENT_NULL_PARAMETER -6
+/**
+ * Return code: The topic has been truncated (the topic string includes
+ * embedded NULL characters). String functions will not access the full topic.
+ * Use the topic length value to access the full topic.
+ */
+#define MQTTCLIENT_TOPICNAME_TRUNCATED -7
+/**
+ * Return code: A structure parameter does not have the correct eyecatcher
+ * and version number.
+ */
+#define MQTTCLIENT_BAD_STRUCTURE -8
+/**
+ * Return code: A QoS value that falls outside of the acceptable range (0,1,2)
+ */
+#define MQTTCLIENT_BAD_QOS -9
+/**
+ * Return code: Attempting SSL connection using non-SSL version of library
+ */
+#define MQTTCLIENT_SSL_NOT_SUPPORTED -10
+ /**
+  * Return code: unrecognized MQTT version
+  */
+ #define MQTTCLIENT_BAD_MQTT_VERSION -11
+/**
+ * Return code: protocol prefix in serverURI should be tcp://, ssl://, ws:// or wss://
+ * The TLS enabled prefixes (ssl, wss) are only valid if the TLS version of the library
+ * is linked with.
+ */
+#define MQTTCLIENT_BAD_PROTOCOL -14
+ /**
+  * Return code: option not applicable to the requested version of MQTT
+  */
+ #define MQTTCLIENT_BAD_MQTT_OPTION -15
+ /**
+  * Return code: call not applicable to the requested version of MQTT
+  */
+ #define MQTTCLIENT_WRONG_MQTT_VERSION -16
+
+
+/**
+ * Default MQTT version to connect with.  Use 3.1.1 then fall back to 3.1
+ */
+#define MQTTVERSION_DEFAULT 0
+/**
+ * MQTT version to connect with: 3.1
+ */
+#define MQTTVERSION_3_1 3
+/**
+ * MQTT version to connect with: 3.1.1
+ */
+#define MQTTVERSION_3_1_1 4
+ /**
+  * MQTT version to connect with: 5
+  */
+ #define MQTTVERSION_5 5
+/**
+ * Bad return code from subscribe, as defined in the 3.1.1 specification
+ */
+#define MQTT_BAD_SUBSCRIBE 0x80
+
+/**
+ *  Initialization options
+ */
+typedef struct
+{
+	/** The eyecatcher for this structure.  Must be MQTG. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0 */
+	int struct_version;
+	/** 1 = we do openssl init, 0 = leave it to the application */
+	int do_openssl_init;
+} MQTTClient_init_options;
+
+#define MQTTClient_init_options_initializer { {'M', 'Q', 'T', 'G'}, 0, 0 }
+
+/**
+ * Global init of mqtt library. Call once on program start to set global behaviour.
+ * do_openssl_init - if mqtt library should initialize OpenSSL (1) or rely on the caller to do it before using the library (0)
+ */
+DLLExport void MQTTClient_global_init(MQTTClient_init_options* inits);
+
+/**
+ * A handle representing an MQTT client. A valid client handle is available
+ * following a successful call to MQTTClient_create().
+ */
+typedef void* MQTTClient;
+/**
+ * A value representing an MQTT message. A delivery token is returned to the
+ * client application when a message is published. The token can then be used to
+ * check that the message was successfully delivered to its destination (see
+ * MQTTClient_publish(),
+ * MQTTClient_publishMessage(),
+ * MQTTClient_deliveryComplete(),
+ * MQTTClient_waitForCompletion() and
+ * MQTTClient_getPendingDeliveryTokens()).
+ */
+typedef int MQTTClient_deliveryToken;
+typedef int MQTTClient_token;
+
+/**
+ * A structure representing the payload and attributes of an MQTT message. The
+ * message topic is not part of this structure (see MQTTClient_publishMessage(),
+ * MQTTClient_publish(), MQTTClient_receive(), MQTTClient_freeMessage()
+ * and MQTTClient_messageArrived()).
+ */
+typedef struct
+{
+	/** The eyecatcher for this structure.  must be MQTM. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0 or 1
+	 *  0 indicates no message properties */
+	int struct_version;
+	/** The length of the MQTT message payload in bytes. */
+	int payloadlen;
+	/** A pointer to the payload of the MQTT message. */
+	void* payload;
+	/**
+     * The quality of service (QoS) assigned to the message.
+     * There are three levels of QoS:
+     * <DL>
+     * <DT><B>QoS0</B></DT>
+     * <DD>Fire and forget - the message may not be delivered</DD>
+     * <DT><B>QoS1</B></DT>
+     * <DD>At least once - the message will be delivered, but may be
+     * delivered more than once in some circumstances.</DD>
+     * <DT><B>QoS2</B></DT>
+     * <DD>Once and one only - the message will be delivered exactly once.</DD>
+     * </DL>
+     */
+	int qos;
+	/**
+     * The retained flag serves two purposes depending on whether the message
+     * it is associated with is being published or received.
+     *
+     * <b>retained = true</b><br>
+     * For messages being published, a true setting indicates that the MQTT
+     * server should retain a copy of the message. The message will then be
+     * transmitted to new subscribers to a topic that matches the message topic.
+     * For subscribers registering a new subscription, the flag being true
+     * indicates that the received message is not a new one, but one that has
+     * been retained by the MQTT server.
+     *
+     * <b>retained = false</b> <br>
+     * For publishers, this indicates that this message should not be retained
+     * by the MQTT server. For subscribers, a false setting indicates this is
+     * a normal message, received as a result of it being published to the
+     * server.
+     */
+	int retained;
+	/**
+      * The dup flag indicates whether or not this message is a duplicate.
+      * It is only meaningful when receiving QoS1 messages. When true, the
+      * client application should take appropriate action to deal with the
+      * duplicate message.
+      */
+	int dup;
+	/** The message identifier is normally reserved for internal use by the
+      * MQTT client and server.
+      */
+	int msgid;
+	/**
+	 * The MQTT V5 properties associated with the message.
+	 */
+	MQTTProperties properties;
+} MQTTClient_message;
+
+#define MQTTClient_message_initializer { {'M', 'Q', 'T', 'M'}, 1, 0, NULL, 0, 0, 0, 0, MQTTProperties_initializer }
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * receipt of messages. The function is registered with the client library by
+ * passing it as an argument to MQTTClient_setCallbacks(). It is
+ * called by the client library when a new message that matches a client
+ * subscription has been received from the server. This function is executed on
+ * a separate thread to the one on which the client application is running.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * MQTTClient_setCallbacks(), which contains any application-specific context.
+ * @param topicName The topic associated with the received message.
+ * @param topicLen The length of the topic if there are one
+ * more NULL characters embedded in <i>topicName</i>, otherwise <i>topicLen</i>
+ * is 0. If <i>topicLen</i> is 0, the value returned by <i>strlen(topicName)</i>
+ * can be trusted. If <i>topicLen</i> is greater than 0, the full topic name
+ * can be retrieved by accessing <i>topicName</i> as a byte array of length
+ * <i>topicLen</i>.
+ * @param message The MQTTClient_message structure for the received message.
+ * This structure contains the message payload and attributes.
+ * @return This function must return a boolean value indicating whether or not
+ * the message has been safely received by the client application. Returning
+ * true indicates that the message has been successfully handled.
+ * Returning false indicates that there was a problem. In this
+ * case, the client library will reinvoke MQTTClient_messageArrived() to
+ * attempt to deliver the message to the application again.
+ */
+typedef int MQTTClient_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* message);
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of delivery of messages. The function is registered with the
+ * client library by passing it as an argument to MQTTClient_setCallbacks().
+ * It is called by the client library after the client application has
+ * published a message to the server. It indicates that the necessary
+ * handshaking and acknowledgements for the requested quality of service (see
+ * MQTTClient_message.qos) have been completed. This function is executed on a
+ * separate thread to the one on which the client application is running.
+ * <b>Note:</b>MQTTClient_deliveryComplete() is not called when messages are
+ * published at QoS0.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * MQTTClient_setCallbacks(), which contains any application-specific context.
+ * @param dt The ::MQTTClient_deliveryToken associated with
+ * the published message. Applications can check that all messages have been
+ * correctly published by matching the delivery tokens returned from calls to
+ * MQTTClient_publish() and MQTTClient_publishMessage() with the tokens passed
+ * to this callback.
+ */
+typedef void MQTTClient_deliveryComplete(void* context, MQTTClient_deliveryToken dt);
+
+/**
+ * This is a callback function. The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of the loss of connection to the server. The function is
+ * registered with the client library by passing it as an argument to
+ * MQTTClient_setCallbacks(). It is called by the client library if the client
+ * loses its connection to the server. The client application must take
+ * appropriate action, such as trying to reconnect or reporting the problem.
+ * This function is executed on a separate thread to the one on which the
+ * client application is running.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * MQTTClient_setCallbacks(), which contains any application-specific context.
+ * @param cause The reason for the disconnection.
+ * Currently, <i>cause</i> is always set to NULL.
+ */
+typedef void MQTTClient_connectionLost(void* context, char* cause);
+
+/**
+ * This function sets the callback functions for a specific client.
+ * If your client application doesn't use a particular callback, set the
+ * relevant parameter to NULL. Calling MQTTClient_setCallbacks() puts the
+ * client into multi-threaded mode. Any necessary message acknowledgements and
+ * status communications are handled in the background without any intervention
+ * from the client application. See @ref async for more information.
+ *
+ * <b>Note:</b> The MQTT client must be disconnected when this function is
+ * called.
+ * @param handle A valid client handle from a successful call to
+ * MQTTClient_create().
+ * @param context A pointer to any application-specific context. The
+ * the <i>context</i> pointer is passed to each of the callback functions to
+ * provide access to the context information in the callback.
+ * @param cl A pointer to an MQTTClient_connectionLost() callback
+ * function. You can set this to NULL if your application doesn't handle
+ * disconnections.
+ * @param ma A pointer to an MQTTClient_messageArrived() callback
+ * function. This callback function must be specified when you call
+ * MQTTClient_setCallbacks().
+ * @param dc A pointer to an MQTTClient_deliveryComplete() callback
+ * function. You can set this to NULL if your application publishes
+ * synchronously or if you do not want to check for successful delivery.
+ * @return ::MQTTCLIENT_SUCCESS if the callbacks were correctly set,
+ * ::MQTTCLIENT_FAILURE if an error occurred.
+ */
+DLLExport int MQTTClient_setCallbacks(MQTTClient handle, void* context, MQTTClient_connectionLost* cl,
+									MQTTClient_messageArrived* ma, MQTTClient_deliveryComplete* dc);
+
+
+/**
+ * This is a callback function, which will be called when the a disconnect
+ * packet is received from the server.  This applies to MQTT V5 and above only.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * ::MQTTAsync_setDisconnected(), which contains any application-specific context.
+ * @param properties The MQTT V5 properties received with the disconnect, if any.
+ * @param reasonCode The MQTT V5 reason code received with the disconnect.
+ * Currently, <i>cause</i> is always set to NULL.
+ */
+typedef void MQTTClient_disconnected(void* context, MQTTProperties* properties,
+		enum MQTTReasonCodes reasonCode);
+
+/**
+ * Sets the MQTTClient_disconnected() callback function for a client.  This will be called
+ * if a disconnect packet is received from the server.  Only valid for MQTT V5 and above.
+ * @param handle A valid client handle from a successful call to
+ * MQTTClient_create().
+ * @param context A pointer to any application-specific context. The
+ * the <i>context</i> pointer is passed to each of the callback functions to
+ * provide access to the context information in the callback.
+ * @param co A pointer to an MQTTClient_disconnected() callback
+ * function.  NULL removes the callback setting.
+ * @return ::MQTTCLIENT_SUCCESS if the callbacks were correctly set,
+ * ::MQTTCLIENT_FAILURE if an error occurred.
+ */
+DLLExport int MQTTClient_setDisconnected(MQTTClient handle, void* context, MQTTClient_disconnected* co);
+
+/**
+ * This is a callback function, the MQTT V5 version of MQTTClient_deliveryComplete().
+ * The client application
+ * must provide an implementation of this function to enable asynchronous
+ * notification of the completed delivery of messages.
+ * It is called by the client library after the client application has
+ * published a message to the server. It indicates that the necessary
+ * handshaking and acknowledgements for the requested quality of service (see
+ * MQTTClient_message.qos) have been completed. This function is executed on a
+ * separate thread to the one on which the client application is running.
+ * <b>Note:</b> It is not called when messages are published at QoS0.
+ * @param context A pointer to the <i>context</i> value originally passed to
+ * MQTTClient_setCallbacks(), which contains any application-specific context.
+ * @param dt The ::MQTTClient_deliveryToken associated with
+ * the published message. Applications can check that all messages have been
+ * correctly published by matching the delivery tokens returned from calls to
+ * MQTTClient_publish() and MQTTClient_publishMessage() with the tokens passed
+ * to this callback.
+ * @param packet_type the last received packet type for this completion. For QoS 1
+ * always PUBACK.  For QoS 2 could be PUBREC or PUBCOMP.
+ * @param properties the MQTT V5 properties returned with the last packet from the server
+ * @param reasonCode the reason code returned from the server
+ */
+typedef void MQTTClient_published(void* context, int dt, int packet_type, MQTTProperties* properties,
+		enum MQTTReasonCodes reasonCode);
+
+DLLExport int MQTTClient_setPublished(MQTTClient handle, void* context, MQTTClient_published* co);
+
+/**
+ * This function creates an MQTT client ready for connection to the
+ * specified server and using the specified persistent storage (see
+ * MQTTClient_persistence). See also MQTTClient_destroy().
+ * @param handle A pointer to an ::MQTTClient handle. The handle is
+ * populated with a valid client reference following a successful return from
+ * this function.
+ * @param serverURI A null-terminated string specifying the server to
+ * which the client will connect. It takes the form <i>protocol://host:port</i>.
+ * Currently, <i>protocol</i> must be <i>tcp</i> or <i>ssl</i>.
+ * For <i>host</i>, you can
+ * specify either an IP address or a host name. For instance, to connect to
+ * a server running on the local machines with the default MQTT port, specify
+ * <i>tcp://localhost:1883</i>.
+ * @param clientId The client identifier passed to the server when the
+ * client connects to it. It is a null-terminated UTF-8 encoded string.
+ * @param persistence_type The type of persistence to be used by the client:
+ * <br>
+ * ::MQTTCLIENT_PERSISTENCE_NONE: Use in-memory persistence. If the device or
+ * system on which the client is running fails or is switched off, the current
+ * state of any in-flight messages is lost and some messages may not be
+ * delivered even at QoS1 and QoS2.
+ * <br>
+ * ::MQTTCLIENT_PERSISTENCE_DEFAULT: Use the default (file system-based)
+ * persistence mechanism. Status about in-flight messages is held in persistent
+ * storage and provides some protection against message loss in the case of
+ * unexpected failure.
+ * <br>
+ * ::MQTTCLIENT_PERSISTENCE_USER: Use an application-specific persistence
+ * implementation. Using this type of persistence gives control of the
+ * persistence mechanism to the application. The application has to implement
+ * the MQTTClient_persistence interface.
+ * @param persistence_context If the application uses
+ * ::MQTTCLIENT_PERSISTENCE_NONE persistence, this argument is unused and should
+ * be set to NULL. For ::MQTTCLIENT_PERSISTENCE_DEFAULT persistence, it
+ * should be set to the location of the persistence directory (if set
+ * to NULL, the persistence directory used is the working directory).
+ * Applications that use ::MQTTCLIENT_PERSISTENCE_USER persistence set this
+ * argument to point to a valid MQTTClient_persistence structure.
+ * @return ::MQTTCLIENT_SUCCESS if the client is successfully created, otherwise
+ * an error code is returned.
+ */
+DLLExport int MQTTClient_create(MQTTClient* handle, const char* serverURI, const char* clientId,
+		int persistence_type, void* persistence_context);
+
+typedef struct
+{
+	/** The eyecatcher for this structure.  must be MQCO. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0 */
+	int struct_version;
+	/** Whether the MQTT version is 3.1, 3.1.1, or 5.  To use V5, this must be set.
+	 *  MQTT V5 has to be chosen here, because during the create call the message persistence
+	 *  is initialized, and we want to know whether the format of any persisted messages
+	 *  is appropriate for the MQTT version we are going to connect with.  Selecting 3.1 or
+	 *  3.1.1 and attempting to read 5.0 persisted messages will result in an error on create.  */
+	int MQTTVersion;
+} MQTTClient_createOptions;
+
+#define MQTTClient_createOptions_initializer { {'M', 'Q', 'C', 'O'}, 0, MQTTVERSION_DEFAULT }
+
+/**
+ * A version of :MQTTClient_create() with additional options.
+ * This function creates an MQTT client ready for connection to the
+ * specified server and using the specified persistent storage (see
+ * MQTTClient_persistence). See also MQTTClient_destroy().
+ * @param handle A pointer to an ::MQTTClient handle. The handle is
+ * populated with a valid client reference following a successful return from
+ * this function.
+ * @param serverURI A null-terminated string specifying the server to
+ * which the client will connect. It takes the form <i>protocol://host:port</i>.
+ * Currently, <i>protocol</i> must be <i>tcp</i> or <i>ssl</i>.
+ * For <i>host</i>, you can
+ * specify either an IP address or a host name. For instance, to connect to
+ * a server running on the local machines with the default MQTT port, specify
+ * <i>tcp://localhost:1883</i>.
+ * @param clientId The client identifier passed to the server when the
+ * client connects to it. It is a null-terminated UTF-8 encoded string.
+ * @param persistence_type The type of persistence to be used by the client:
+ * <br>
+ * ::MQTTCLIENT_PERSISTENCE_NONE: Use in-memory persistence. If the device or
+ * system on which the client is running fails or is switched off, the current
+ * state of any in-flight messages is lost and some messages may not be
+ * delivered even at QoS1 and QoS2.
+ * <br>
+ * ::MQTTCLIENT_PERSISTENCE_DEFAULT: Use the default (file system-based)
+ * persistence mechanism. Status about in-flight messages is held in persistent
+ * storage and provides some protection against message loss in the case of
+ * unexpected failure.
+ * <br>
+ * ::MQTTCLIENT_PERSISTENCE_USER: Use an application-specific persistence
+ * implementation. Using this type of persistence gives control of the
+ * persistence mechanism to the application. The application has to implement
+ * the MQTTClient_persistence interface.
+ * @param persistence_context If the application uses
+ * ::MQTTCLIENT_PERSISTENCE_NONE persistence, this argument is unused and should
+ * be set to NULL. For ::MQTTCLIENT_PERSISTENCE_DEFAULT persistence, it
+ * should be set to the location of the persistence directory (if set
+ * to NULL, the persistence directory used is the working directory).
+ * Applications that use ::MQTTCLIENT_PERSISTENCE_USER persistence set this
+ * argument to point to a valid MQTTClient_persistence structure.
+ * @param options additional options for the create.
+ * @return ::MQTTCLIENT_SUCCESS if the client is successfully created, otherwise
+ * an error code is returned.
+ */
+DLLExport int MQTTClient_createWithOptions(MQTTClient* handle, const char* serverURI, const char* clientId,
+		int persistence_type, void* persistence_context, MQTTClient_createOptions* options);
+
+/**
+ * MQTTClient_willOptions defines the MQTT "Last Will and Testament" (LWT) settings for
+ * the client. In the event that a client unexpectedly loses its connection to
+ * the server, the server publishes the LWT message to the LWT topic on
+ * behalf of the client. This allows other clients (subscribed to the LWT topic)
+ * to be made aware that the client has disconnected. To enable the LWT
+ * function for a specific client, a valid pointer to an MQTTClient_willOptions
+ * structure is passed in the MQTTClient_connectOptions structure used in the
+ * MQTTClient_connect() call that connects the client to the server. The pointer
+ * to MQTTClient_willOptions can be set to NULL if the LWT function is not
+ * required.
+ */
+typedef struct
+{
+	/** The eyecatcher for this structure.  must be MQTW. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0 or 1
+		   0 means there is no binary payload option
+	 */
+	int struct_version;
+	/** The LWT topic to which the LWT message will be published. */
+	const char* topicName;
+	/** The LWT payload in string form. */
+	const char* message;
+	/**
+	 * The retained flag for the LWT message (see MQTTClient_message.retained).
+	 */
+	int retained;
+	/**
+	 * The quality of service setting for the LWT message (see
+	 * MQTTClient_message.qos and @ref qos).
+	 */
+	int qos;
+  /** The LWT payload in binary form. This is only checked and used if the message option is NULL */
+	struct
+	{
+		int len;            /**< binary payload length */
+		const void* data;  /**< binary payload data */
+	} payload;
+} MQTTClient_willOptions;
+
+#define MQTTClient_willOptions_initializer { {'M', 'Q', 'T', 'W'}, 1, NULL, NULL, 0, 0, {0, NULL} }
+
+#define MQTT_SSL_VERSION_DEFAULT 0
+#define MQTT_SSL_VERSION_TLS_1_0 1
+#define MQTT_SSL_VERSION_TLS_1_1 2
+#define MQTT_SSL_VERSION_TLS_1_2 3
+
+/**
+* MQTTClient_sslProperties defines the settings to establish an SSL/TLS connection using the
+* OpenSSL library. It covers the following scenarios:
+* - Server authentication: The client needs the digital certificate of the server. It is included
+*   in a store containting trusted material (also known as "trust store").
+* - Mutual authentication: Both client and server are authenticated during the SSL handshake. In
+*   addition to the digital certificate of the server in a trust store, the client will need its own
+*   digital certificate and the private key used to sign its digital certificate stored in a "key store".
+* - Anonymous connection: Both client and server do not get authenticated and no credentials are needed
+*   to establish an SSL connection. Note that this scenario is not fully secure since it is subject to
+*   man-in-the-middle attacks.
+*/
+typedef struct
+{
+	/** The eyecatcher for this structure.  Must be MQTS */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0, or 1 to enable TLS version selection. */
+	int struct_version;
+
+	/** The file in PEM format containing the public digital certificates trusted by the client. */
+	const char* trustStore;
+
+	/** The file in PEM format containing the public certificate chain of the client. It may also include
+	* the client's private key.
+	*/
+	const char* keyStore;
+
+	/** If not included in the sslKeyStore, this setting points to the file in PEM format containing
+	* the client's private key.
+	*/
+	const char* privateKey;
+	/** The password to load the client's privateKey if encrypted. */
+	const char* privateKeyPassword;
+
+	/**
+	* The list of cipher suites that the client will present to the server during the SSL handshake. For a
+	* full explanation of the cipher list format, please see the OpenSSL on-line documentation:
+	* http://www.openssl.org/docs/apps/ciphers.html#CIPHER_LIST_FORMAT
+	* If this setting is ommitted, its default value will be "ALL", that is, all the cipher suites -excluding
+	* those offering no encryption- will be considered.
+	* This setting can be used to set an SSL anonymous connection ("aNULL" string value, for instance).
+	*/
+	const char* enabledCipherSuites;
+
+    /** True/False option to enable verification of the server certificate **/
+    int enableServerCertAuth;
+
+    /** The SSL/TLS version to use. Specify one of MQTT_SSL_VERSION_DEFAULT (0),
+    * MQTT_SSL_VERSION_TLS_1_0 (1), MQTT_SSL_VERSION_TLS_1_1 (2) or MQTT_SSL_VERSION_TLS_1_2 (3).
+    * Only used if struct_version is >= 1.
+    */
+    int sslVersion;
+
+    /**
+     * Whether to carry out post-connect checks, including that a certificate
+     * matches the given host name.
+     * Exists only if struct_version >= 2
+     */
+    int verify;
+
+    /**
+     * From the OpenSSL documentation:
+     * If CApath is not NULL, it points to a directory containing CA certificates in PEM format.
+     * Exists only if struct_version >= 2
+	 */
+	const char* CApath;
+
+    /**
+     * Callback function for OpenSSL error handler ERR_print_errors_cb
+     * Exists only if struct_version >= 3
+     */
+    int (*ssl_error_cb) (const char *str, size_t len, void *u);
+
+    /**
+     * Application-specific contex for OpenSSL error handler ERR_print_errors_cb
+     * Exists only if struct_version >= 3
+     */
+    void* ssl_error_context;
+
+	/**
+	 * Callback function for setting TLS-PSK options. Parameters correspond to that of
+	 * SSL_CTX_set_psk_client_callback, except for u which is the pointer ssl_psk_context.
+	 * Exists only if struct_version >= 4
+	 */
+	unsigned int (*ssl_psk_cb) (const char *hint, char *identity, unsigned int max_identity_len, unsigned char *psk, unsigned int max_psk_len, void *u);
+
+	/**
+	 * Application-specific contex for ssl_psk_cb
+	 * Exists only if struct_version >= 4
+	 */
+	void* ssl_psk_context;
+
+	/**
+	 * Don't load default SSL CA. Should be used together with PSK to make sure
+	 * regular servers with certificate in place is not accepted.
+	 * Exists only if struct_version >= 4
+	 */
+	int disableDefaultTrustStore;
+
+} MQTTClient_SSLOptions;
+
+#define MQTTClient_SSLOptions_initializer { {'M', 'Q', 'T', 'S'}, 4, NULL, NULL, NULL, NULL, NULL, 1, MQTT_SSL_VERSION_DEFAULT, 0, NULL, NULL, NULL, NULL, NULL, 0 }
+
+/**
+ * MQTTClient_connectOptions defines several settings that control the way the
+ * client connects to an MQTT server.
+ *
+ * <b>Note:</b> Default values are not defined for members of
+ * MQTTClient_connectOptions so it is good practice to specify all settings.
+ * If the MQTTClient_connectOptions structure is defined as an automatic
+ * variable, all members are set to random values and thus must be set by the
+ * client application. If the MQTTClient_connectOptions structure is defined
+ * as a static variable, initialization (in compliant compilers) sets all
+ * values to 0 (NULL for pointers). A #keepAliveInterval setting of 0 prevents
+ * correct operation of the client and so you <b>must</b> at least set a value
+ * for #keepAliveInterval.
+ */
+typedef struct
+{
+	/** The eyecatcher for this structure.  must be MQTC. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0, 1, 2, 3, 4, 5 or 6.
+	 * 0 signifies no SSL options and no serverURIs
+	 * 1 signifies no serverURIs
+	 * 2 signifies no MQTTVersion
+	 * 3 signifies no returned values
+	 * 4 signifies no binary password option
+	 * 5 signifies no maxInflightMessages and cleanstart
+	 */
+	int struct_version;
+	/** The "keep alive" interval, measured in seconds, defines the maximum time
+   * that should pass without communication between the client and the server
+   * The client will ensure that at least one message travels across the
+   * network within each keep alive period.  In the absence of a data-related
+	 * message during the time period, the client sends a very small MQTT
+   * "ping" message, which the server will acknowledge. The keep alive
+   * interval enables the client to detect when the server is no longer
+	 * available without having to wait for the long TCP/IP timeout.
+	 */
+	int keepAliveInterval;
+	/**
+   * This is a boolean value. The cleansession setting controls the behaviour
+   * of both the client and the server at connection and disconnection time.
+   * The client and server both maintain session state information. This
+   * information is used to ensure "at least once" and "exactly once"
+   * delivery, and "exactly once" receipt of messages. Session state also
+   * includes subscriptions created by an MQTT client. You can choose to
+   * maintain or discard state information between sessions.
+   *
+   * When cleansession is true, the state information is discarded at
+   * connect and disconnect. Setting cleansession to false keeps the state
+   * information. When you connect an MQTT client application with
+   * MQTTClient_connect(), the client identifies the connection using the
+   * client identifier and the address of the server. The server checks
+   * whether session information for this client
+   * has been saved from a previous connection to the server. If a previous
+   * session still exists, and cleansession=true, then the previous session
+   * information at the client and server is cleared. If cleansession=false,
+   * the previous session is resumed. If no previous session exists, a new
+   * session is started.
+	 */
+	int cleansession;
+	/**
+   * This is a boolean value that controls how many messages can be in-flight
+   * simultaneously. Setting <i>reliable</i> to true means that a published
+   * message must be completed (acknowledgements received) before another
+   * can be sent. Attempts to publish additional messages receive an
+   * ::MQTTCLIENT_MAX_MESSAGES_INFLIGHT return code. Setting this flag to
+   * false allows up to 10 messages to be in-flight. This can increase
+   * overall throughput in some circumstances.
+	 */
+	int reliable;
+	/**
+   * This is a pointer to an MQTTClient_willOptions structure. If your
+   * application does not make use of the Last Will and Testament feature,
+   * set this pointer to NULL.
+   */
+	MQTTClient_willOptions* will;
+	/**
+   * MQTT servers that support the MQTT v3.1.1 protocol provide authentication
+   * and authorisation by user name and password. This is the user name
+   * parameter.
+   */
+	const char* username;
+	/**
+   * MQTT servers that support the MQTT v3.1.1 protocol provide authentication
+   * and authorisation by user name and password. This is the password
+   * parameter.
+   */
+	const char* password;
+	/**
+   * The time interval in seconds to allow a connect to complete.
+   */
+	int connectTimeout;
+	/**
+	 * The time interval in seconds after which unacknowledged publish requests are
+	 * retried during a TCP session.  With MQTT 3.1.1 and later, retries are
+	 * not required except on reconnect.  0 turns off in-session retries, and is the
+	 * recommended setting.  Adding retries to an already overloaded network only
+	 * exacerbates the problem.
+	 */
+	int retryInterval;
+	/**
+   * This is a pointer to an MQTTClient_SSLOptions structure. If your
+   * application does not make use of SSL, set this pointer to NULL.
+   */
+	MQTTClient_SSLOptions* ssl;
+	/**
+	 * The number of entries in the optional serverURIs array. Defaults to 0.
+	 */
+	int serverURIcount;
+	/**
+   * An optional array of null-terminated strings specifying the servers to
+   * which the client will connect. Each string takes the form <i>protocol://host:port</i>.
+   * <i>protocol</i> must be <i>tcp</i> or <i>ssl</i>. For <i>host</i>, you can
+   * specify either an IP address or a host name. For instance, to connect to
+   * a server running on the local machines with the default MQTT port, specify
+   * <i>tcp://localhost:1883</i>.
+   * If this list is empty (the default), the server URI specified on MQTTClient_create()
+   * is used.
+   */
+	char* const* serverURIs;
+	/**
+	 * Sets the version of MQTT to be used on the connect.
+	 * MQTTVERSION_DEFAULT (0) = default: start with 3.1.1, and if that fails, fall back to 3.1
+	 * MQTTVERSION_3_1 (3) = only try version 3.1
+	 * MQTTVERSION_3_1_1 (4) = only try version 3.1.1
+	 * MQTTVERSION_5 (5) = only try version 5.0
+	 */
+	int MQTTVersion;
+	/**
+	 * Returned from the connect when the MQTT version used to connect is 3.1.1
+	 */
+	struct
+	{
+		const char* serverURI;     /**< the serverURI connected to */
+		int MQTTVersion;     /**< the MQTT version used to connect with */
+		int sessionPresent;  /**< if the MQTT version is 3.1.1, the value of sessionPresent returned in the connack */
+	} returned;
+	/**
+   * Optional binary password.  Only checked and used if the password option is NULL
+   */
+	struct
+	{
+		int len;           /**< binary password length */
+		const void* data;  /**< binary password data */
+	} binarypwd;
+	/**
+	 * The maximum number of messages in flight
+	 */
+	int maxInflightMessages;
+	/*
+	 * MQTT V5 clean start flag.  Only clears state at the beginning of the session.
+	 */
+	int cleanstart;
+} MQTTClient_connectOptions;
+
+#define MQTTClient_connectOptions_initializer { {'M', 'Q', 'T', 'C'}, 6, 60, 1, 1, NULL, NULL, NULL, 30, 0, NULL, 0, NULL, MQTTVERSION_DEFAULT, {NULL, 0, 0}, {0, NULL}, -1, 0}
+
+#define MQTTClient_connectOptions_initializer5 { {'M', 'Q', 'T', 'C'}, 6, 60, 0, 1, NULL, NULL, NULL, 30, 0, NULL, 0, NULL, MQTTVERSION_5, {NULL, 0, 0}, {0, NULL}, -1, 1}
+
+/**
+  * MQTTClient_libraryInfo is used to store details relating to the currently used
+  * library such as the version in use, the time it was built and relevant openSSL
+  * options.
+  * There is one static instance of this struct in MQTTClient.c
+  */
+
+typedef struct
+{
+	const char* name;
+	const char* value;
+} MQTTClient_nameValue;
+
+/**
+  * This function returns version information about the library.
+  * no trace information will be returned.
+  * @return an array of strings describing the library.  The last entry is a NULL pointer.
+  */
+DLLExport MQTTClient_nameValue* MQTTClient_getVersionInfo(void);
+
+/**
+  * This function attempts to connect a previously-created client (see
+  * MQTTClient_create()) to an MQTT server using the specified options. If you
+  * want to enable asynchronous message and status notifications, you must call
+  * MQTTClient_setCallbacks() prior to MQTTClient_connect().
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @param options A pointer to a valid MQTTClient_connectOptions
+  * structure.
+  * @return ::MQTTCLIENT_SUCCESS if the client successfully connects to the
+  * server. An error code is returned if the client was unable to connect to
+  * the server.
+  * Error codes greater than 0 are returned by the MQTT protocol:<br><br>
+  * <b>1</b>: Connection refused: Unacceptable protocol version<br>
+  * <b>2</b>: Connection refused: Identifier rejected<br>
+  * <b>3</b>: Connection refused: Server unavailable<br>
+  * <b>4</b>: Connection refused: Bad user name or password<br>
+  * <b>5</b>: Connection refused: Not authorized<br>
+  * <b>6-255</b>: Reserved for future use<br>
+  */
+DLLExport int MQTTClient_connect(MQTTClient handle, MQTTClient_connectOptions* options);
+
+
+typedef struct MQTTResponse
+{
+	int version;
+	enum MQTTReasonCodes reasonCode;
+	int reasonCodeCount;	               /* used for subscribeMany5 and unsubscribeMany5 */
+	enum MQTTReasonCodes* reasonCodes;  /* used for subscribeMany5 and unsubscribeMany5 */
+	MQTTProperties* properties;         /* optional */
+} MQTTResponse;
+
+#define MQTTResponse_initializer {1, MQTTREASONCODE_SUCCESS, 0, NULL, NULL}
+
+DLLExport void MQTTResponse_free(MQTTResponse response);
+
+DLLExport MQTTResponse MQTTClient_connect5(MQTTClient handle, MQTTClient_connectOptions* options,
+		MQTTProperties* connectProperties, MQTTProperties* willProperties);
+
+/**
+  * This function attempts to disconnect the client from the MQTT
+  * server. In order to allow the client time to complete handling of messages
+  * that are in-flight when this function is called, a timeout period is
+  * specified. When the timeout period has expired, the client disconnects even
+  * if there are still outstanding message acknowledgements.
+  * The next time the client connects to the same server, any QoS 1 or 2
+  * messages which have not completed will be retried depending on the
+  * cleansession settings for both the previous and the new connection (see
+  * MQTTClient_connectOptions.cleansession and MQTTClient_connect()).
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @param timeout The client delays disconnection for up to this time (in
+  * milliseconds) in order to allow in-flight message transfers to complete.
+  * @return ::MQTTCLIENT_SUCCESS if the client successfully disconnects from
+  * the server. An error code is returned if the client was unable to disconnect
+  * from the server
+  */
+DLLExport int MQTTClient_disconnect(MQTTClient handle, int timeout);
+
+DLLExport int MQTTClient_disconnect5(MQTTClient handle, int timeout, enum MQTTReasonCodes reason, MQTTProperties* props);
+
+/**
+  * This function allows the client application to test whether or not a
+  * client is currently connected to the MQTT server.
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @return Boolean true if the client is connected, otherwise false.
+  */
+DLLExport int MQTTClient_isConnected(MQTTClient handle);
+
+
+/* Subscribe is synchronous.  QoS list parameter is changed on return to granted QoSs.
+   Returns return code, MQTTCLIENT_SUCCESS == success, non-zero some sort of error (TBD) */
+
+/**
+  * This function attempts to subscribe a client to a single topic, which may
+  * contain wildcards (see @ref wildcard). This call also specifies the
+  * @ref qos requested for the subscription
+  * (see also MQTTClient_subscribeMany()).
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @param topic The subscription topic, which may include wildcards.
+  * @param qos The requested quality of service for the subscription.
+  * @return ::MQTTCLIENT_SUCCESS if the subscription request is successful.
+  * An error code is returned if there was a problem registering the
+  * subscription.
+  */
+DLLExport int MQTTClient_subscribe(MQTTClient handle, const char* topic, int qos);
+
+
+DLLExport MQTTResponse MQTTClient_subscribe5(MQTTClient handle, const char* topic, int qos,
+		MQTTSubscribe_options* opts, MQTTProperties* props);
+
+/**
+  * This function attempts to subscribe a client to a list of topics, which may
+  * contain wildcards (see @ref wildcard). This call also specifies the
+  * @ref qos requested for each topic (see also MQTTClient_subscribe()).
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @param count The number of topics for which the client is requesting
+  * subscriptions.
+  * @param topic An array (of length <i>count</i>) of pointers to
+  * topics, each of which may include wildcards.
+  * @param qos An array (of length <i>count</i>) of @ref qos
+  * values. qos[n] is the requested QoS for topic[n].
+  * @return ::MQTTCLIENT_SUCCESS if the subscription request is successful.
+  * An error code is returned if there was a problem registering the
+  * subscriptions.
+  */
+DLLExport int MQTTClient_subscribeMany(MQTTClient handle, int count, char* const* topic, int* qos);
+
+DLLExport MQTTResponse MQTTClient_subscribeMany5(MQTTClient handle, int count, char* const* topic,
+		int* qos, MQTTSubscribe_options* opts, MQTTProperties* props);
+
+/**
+  * This function attempts to remove an existing subscription made by the
+  * specified client.
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @param topic The topic for the subscription to be removed, which may
+  * include wildcards (see @ref wildcard).
+  * @return ::MQTTCLIENT_SUCCESS if the subscription is removed.
+  * An error code is returned if there was a problem removing the
+  * subscription.
+  */
+DLLExport int MQTTClient_unsubscribe(MQTTClient handle, const char* topic);
+
+DLLExport MQTTResponse MQTTClient_unsubscribe5(MQTTClient handle, const char* topic, MQTTProperties* props);
+
+/**
+  * This function attempts to remove existing subscriptions to a list of topics
+  * made by the specified client.
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @param count The number subscriptions to be removed.
+  * @param topic An array (of length <i>count</i>) of pointers to the topics of
+  * the subscriptions to be removed, each of which may include wildcards.
+  * @return ::MQTTCLIENT_SUCCESS if the subscriptions are removed.
+  * An error code is returned if there was a problem removing the subscriptions.
+  */
+DLLExport int MQTTClient_unsubscribeMany(MQTTClient handle, int count, char* const* topic);
+
+DLLExport MQTTResponse MQTTClient_unsubscribeMany5(MQTTClient handle, int count, char* const* topic, MQTTProperties* props);
+
+/**
+  * This function attempts to publish a message to a given topic (see also
+  * MQTTClient_publishMessage()). An ::MQTTClient_deliveryToken is issued when
+  * this function returns successfully. If the client application needs to
+  * test for succesful delivery of QoS1 and QoS2 messages, this can be done
+  * either asynchronously or synchronously (see @ref async,
+  * ::MQTTClient_waitForCompletion and MQTTClient_deliveryComplete()).
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @param topicName The topic associated with this message.
+  * @param payloadlen The length of the payload in bytes.
+  * @param payload A pointer to the byte array payload of the message.
+  * @param qos The @ref qos of the message.
+  * @param retained The retained flag for the message.
+  * @param dt A pointer to an ::MQTTClient_deliveryToken. This is populated
+  * with a token representing the message when the function returns
+  * successfully. If your application does not use delivery tokens, set this
+  * argument to NULL.
+  * @return ::MQTTCLIENT_SUCCESS if the message is accepted for publication.
+  * An error code is returned if there was a problem accepting the message.
+  */
+DLLExport int MQTTClient_publish(MQTTClient handle, const char* topicName, int payloadlen, const void* payload, int qos, int retained,
+																 MQTTClient_deliveryToken* dt);
+
+DLLExport MQTTResponse MQTTClient_publish5(MQTTClient handle, const char* topicName, int payloadlen, const void* payload,
+		int qos, int retained, MQTTProperties* properties, MQTTClient_deliveryToken* dt);
+/**
+  * This function attempts to publish a message to a given topic (see also
+  * MQTTClient_publish()). An ::MQTTClient_deliveryToken is issued when
+  * this function returns successfully. If the client application needs to
+  * test for succesful delivery of QoS1 and QoS2 messages, this can be done
+  * either asynchronously or synchronously (see @ref async,
+  * ::MQTTClient_waitForCompletion and MQTTClient_deliveryComplete()).
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @param topicName The topic associated with this message.
+  * @param msg A pointer to a valid MQTTClient_message structure containing
+  * the payload and attributes of the message to be published.
+  * @param dt A pointer to an ::MQTTClient_deliveryToken. This is populated
+  * with a token representing the message when the function returns
+  * successfully. If your application does not use delivery tokens, set this
+  * argument to NULL.
+  * @return ::MQTTCLIENT_SUCCESS if the message is accepted for publication.
+  * An error code is returned if there was a problem accepting the message.
+  */
+DLLExport int MQTTClient_publishMessage(MQTTClient handle, const char* topicName, MQTTClient_message* msg, MQTTClient_deliveryToken* dt);
+
+
+DLLExport MQTTResponse MQTTClient_publishMessage5(MQTTClient handle, const char* topicName, MQTTClient_message* msg,
+		MQTTClient_deliveryToken* dt);
+
+/**
+  * This function is called by the client application to synchronize execution
+  * of the main thread with completed publication of a message. When called,
+  * MQTTClient_waitForCompletion() blocks execution until the message has been
+  * successful delivered or the specified timeout has expired. See @ref async.
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @param dt The ::MQTTClient_deliveryToken that represents the message being
+  * tested for successful delivery. Delivery tokens are issued by the
+  * publishing functions MQTTClient_publish() and MQTTClient_publishMessage().
+  * @param timeout The maximum time to wait in milliseconds.
+  * @return ::MQTTCLIENT_SUCCESS if the message was successfully delivered.
+  * An error code is returned if the timeout expires or there was a problem
+  * checking the token.
+  */
+DLLExport int MQTTClient_waitForCompletion(MQTTClient handle, MQTTClient_deliveryToken dt, unsigned long timeout);
+
+
+/**
+  * This function sets a pointer to an array of delivery tokens for
+  * messages that are currently in-flight (pending completion).
+  *
+  * <b>Important note:</b> The memory used to hold the array of tokens is
+  * malloc()'d in this function. The client application is responsible for
+  * freeing this memory when it is no longer required.
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @param tokens The address of a pointer to an ::MQTTClient_deliveryToken.
+  * When the function returns successfully, the pointer is set to point to an
+  * array of tokens representing messages pending completion. The last member of
+  * the array is set to -1 to indicate there are no more tokens. If no tokens
+  * are pending, the pointer is set to NULL.
+  * @return ::MQTTCLIENT_SUCCESS if the function returns successfully.
+  * An error code is returned if there was a problem obtaining the list of
+  * pending tokens.
+  */
+DLLExport int MQTTClient_getPendingDeliveryTokens(MQTTClient handle, MQTTClient_deliveryToken **tokens);
+
+/**
+  * When implementing a single-threaded client, call this function periodically
+  * to allow processing of message retries and to send MQTT keepalive pings.
+  * If the application is calling MQTTClient_receive() regularly, then it is
+  * not necessary to call this function.
+  */
+DLLExport void MQTTClient_yield(void);
+
+/**
+  * This function performs a synchronous receive of incoming messages. It should
+  * be used only when the client application has not set callback methods to
+  * support asynchronous receipt of messages (see @ref async and
+  * MQTTClient_setCallbacks()). Using this function allows a single-threaded
+  * client subscriber application to be written. When called, this function
+  * blocks until the next message arrives or the specified timeout expires
+  *(see also MQTTClient_yield()).
+  *
+  * <b>Important note:</b> The application must free() the memory allocated
+  * to the topic and the message when processing is complete (see
+  * MQTTClient_freeMessage()).
+  * @param handle A valid client handle from a successful call to
+  * MQTTClient_create().
+  * @param topicName The address of a pointer to a topic. This function
+  * allocates the memory for the topic and returns it to the application
+  * by setting <i>topicName</i> to point to the topic.
+  * @param topicLen The length of the topic. If the return code from this
+  * function is ::MQTTCLIENT_TOPICNAME_TRUNCATED, the topic contains embedded
+  * NULL characters and the full topic should be retrieved by using
+  * <i>topicLen</i>.
+  * @param message The address of a pointer to the received message. This
+  * function allocates the memory for the message and returns it to the
+  * application by setting <i>message</i> to point to the received message.
+  * The pointer is set to NULL if the timeout expires.
+  * @param timeout The length of time to wait for a message in milliseconds.
+  * @return ::MQTTCLIENT_SUCCESS or ::MQTTCLIENT_TOPICNAME_TRUNCATED if a
+  * message is received. ::MQTTCLIENT_SUCCESS can also indicate that the
+  * timeout expired, in which case <i>message</i> is NULL. An error code is
+  * returned if there was a problem trying to receive a message.
+  */
+DLLExport int MQTTClient_receive(MQTTClient handle, char** topicName, int* topicLen, MQTTClient_message** message,
+		unsigned long timeout);
+
+/**
+  * This function frees memory allocated to an MQTT message, including the
+  * additional memory allocated to the message payload. The client application
+  * calls this function when the message has been fully processed. <b>Important
+  * note:</b> This function does not free the memory allocated to a message
+  * topic string. It is the responsibility of the client application to free
+  * this memory using the MQTTClient_free() library function.
+  * @param msg The address of a pointer to the ::MQTTClient_message structure
+  * to be freed.
+  */
+DLLExport void MQTTClient_freeMessage(MQTTClient_message** msg);
+
+/**
+  * This function frees memory allocated by the MQTT C client library, especially the
+  * topic name. This is needed on Windows when the client libary and application
+  * program have been compiled with different versions of the C compiler.  It is
+  * thus good policy to always use this function when freeing any MQTT C client-
+  * allocated memory.
+  * @param ptr The pointer to the client library storage to be freed.
+  */
+DLLExport void MQTTClient_free(void* ptr);
+
+/**
+  * This function frees the memory allocated to an MQTT client (see
+  * MQTTClient_create()). It should be called when the client is no longer
+  * required.
+  * @param handle A pointer to the handle referring to the ::MQTTClient
+  * structure to be freed.
+  */
+DLLExport void MQTTClient_destroy(MQTTClient* handle);
+
+
+enum MQTTCLIENT_TRACE_LEVELS
+{
+	MQTTCLIENT_TRACE_MAXIMUM = 1,
+	MQTTCLIENT_TRACE_MEDIUM,
+	MQTTCLIENT_TRACE_MINIMUM,
+	MQTTCLIENT_TRACE_PROTOCOL,
+	MQTTCLIENT_TRACE_ERROR,
+	MQTTCLIENT_TRACE_SEVERE,
+	MQTTCLIENT_TRACE_FATAL,
+};
+
+
+/**
+  * This function sets the level of trace information which will be
+  * returned in the trace callback.
+  * @param level the trace level required
+  */
+DLLExport void MQTTClient_setTraceLevel(enum MQTTCLIENT_TRACE_LEVELS level);
+
+
+/**
+  * This is a callback function prototype which must be implemented if you want
+  * to receive trace information.
+  * @param level the trace level of the message returned
+  * @param message the trace message.  This is a pointer to a static buffer which
+  * will be overwritten on each call.  You must copy the data if you want to keep
+  * it for later.
+  */
+typedef void MQTTClient_traceCallback(enum MQTTCLIENT_TRACE_LEVELS level, char* message);
+
+/**
+  * This function sets the trace callback if needed.  If set to NULL,
+  * no trace information will be returned.  The default trace level is
+  * MQTTASYNC_TRACE_MINIMUM.
+  * @param callback a pointer to the function which will handle the trace information
+  */
+DLLExport void MQTTClient_setTraceCallback(MQTTClient_traceCallback* callback);
+
+/**
+ * Returns a pointer to the string representation of the error or NULL.
+ *
+ * Do not free after use. Returns NULL if the error code is unknown.
+ */
+DLLExport const char* MQTTClient_strerror(int code);
+
+#ifdef __cplusplus
+     }
+#endif
+
+#endif
+
+/**
+  * @cond MQTTClient_main
+  * @page async Asynchronous vs synchronous client applications
+  * The client library supports two modes of operation. These are referred to
+  * as <b>synchronous</b> and <b>asynchronous</b> modes. If your application
+  * calls MQTTClient_setCallbacks(), this puts the client into asynchronous
+  * mode, otherwise it operates in synchronous mode.
+  *
+  * In synchronous mode, the client application runs on a single thread.
+  * Messages are published using the MQTTClient_publish() and
+  * MQTTClient_publishMessage() functions. To determine that a QoS1 or QoS2
+  * (see @ref qos) message has been successfully delivered, the application
+  * must call the MQTTClient_waitForCompletion() function. An example showing
+  * synchronous publication is shown in @ref pubsync. Receiving messages in
+  * synchronous mode uses the MQTTClient_receive() function. Client applications
+  * must call either MQTTClient_receive() or MQTTClient_yield() relatively
+  * frequently in order to allow processing of acknowledgements and the MQTT
+  * "pings" that keep the network connection to the server alive.
+  *
+  * In asynchronous mode, the client application runs on several threads. The
+  * main program calls functions in the client library to publish and subscribe,
+  * just as for the synchronous mode. Processing of handshaking and maintaining
+  * the network connection is performed in the background, however.
+  * Notifications of status and message reception are provided to the client
+  * application using callbacks registered with the library by the call to
+  * MQTTClient_setCallbacks() (see MQTTClient_messageArrived(),
+  * MQTTClient_connectionLost() and MQTTClient_deliveryComplete()).
+  * This API is not thread safe however - it is not possible to call it from multiple
+  * threads without synchronization.  You can use the MQTTAsync API for that.
+  *
+  * @page wildcard Subscription wildcards
+  * Every MQTT message includes a topic that classifies it. MQTT servers use
+  * topics to determine which subscribers should receive messages published to
+  * the server.
+  *
+  * Consider the server receiving messages from several environmental sensors.
+  * Each sensor publishes its measurement data as a message with an associated
+  * topic. Subscribing applications need to know which sensor originally
+  * published each received message. A unique topic is thus used to identify
+  * each sensor and measurement type. Topics such as SENSOR1TEMP,
+  * SENSOR1HUMIDITY, SENSOR2TEMP and so on achieve this but are not very
+  * flexible. If additional sensors are added to the system at a later date,
+  * subscribing applications must be modified to receive them.
+  *
+  * To provide more flexibility, MQTT supports a hierarchical topic namespace.
+  * This allows application designers to organize topics to simplify their
+  * management. Levels in the hierarchy are delimited by the '/' character,
+  * such as SENSOR/1/HUMIDITY. Publishers and subscribers use these
+  * hierarchical topics as already described.
+  *
+  * For subscriptions, two wildcard characters are supported:
+  * <ul>
+  * <li>A '#' character represents a complete sub-tree of the hierarchy and
+  * thus must be the last character in a subscription topic string, such as
+  * SENSOR/#. This will match any topic starting with SENSOR/, such as
+  * SENSOR/1/TEMP and SENSOR/2/HUMIDITY.</li>
+  * <li> A '+' character represents a single level of the hierarchy and is
+  * used between delimiters. For example, SENSOR/+/TEMP will match
+  * SENSOR/1/TEMP and SENSOR/2/TEMP.</li>
+  * </ul>
+  * Publishers are not allowed to use the wildcard characters in their topic
+  * names.
+  *
+  * Deciding on your topic hierarchy is an important step in your system design.
+  *
+  * @page qos Quality of service
+  * The MQTT protocol provides three qualities of service for delivering
+  * messages between clients and servers: "at most once", "at least once" and
+  * "exactly once".
+  *
+  * Quality of service (QoS) is an attribute of an individual message being
+  * published. An application sets the QoS for a specific message by setting the
+  * MQTTClient_message.qos field to the required value.
+  *
+  * A subscribing client can set the maximum quality of service a server uses
+  * to send messages that match the client subscriptions. The
+  * MQTTClient_subscribe() and MQTTClient_subscribeMany() functions set this
+  * maximum. The QoS of a message forwarded to a subscriber thus might be
+  * different to the QoS given to the message by the original publisher.
+  * The lower of the two values is used to forward a message.
+  *
+  * The three levels are:
+  *
+  * <b>QoS0, At most once:</b> The message is delivered at most once, or it
+  * may not be delivered at all. Its delivery across the network is not
+  * acknowledged. The message is not stored. The message could be lost if the
+  * client is disconnected, or if the server fails. QoS0 is the fastest mode of
+  * transfer. It is sometimes called "fire and forget".
+  *
+  * The MQTT protocol does not require servers to forward publications at QoS0
+  * to a client. If the client is disconnected at the time the server receives
+  * the publication, the publication might be discarded, depending on the
+  * server implementation.
+  *
+  * <b>QoS1, At least once:</b> The message is always delivered at least once.
+  * It might be delivered multiple times if there is a failure before an
+  * acknowledgment is received by the sender. The message must be stored
+  * locally at the sender, until the sender receives confirmation that the
+  * message has been published by the receiver. The message is stored in case
+  * the message must be sent again.
+  *
+  * <b>QoS2, Exactly once:</b> The message is always delivered exactly once.
+  * The message must be stored locally at the sender, until the sender receives
+  * confirmation that the message has been published by the receiver. The
+  * message is stored in case the message must be sent again. QoS2 is the
+  * safest, but slowest mode of transfer. A more sophisticated handshaking
+  * and acknowledgement sequence is used than for QoS1 to ensure no duplication
+  * of messages occurs.
+  * @page pubsync Synchronous publication example
+@code
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MQTTClient.h"
+
+#define ADDRESS     "tcp://localhost:1883"
+#define CLIENTID    "ExampleClientPub"
+#define TOPIC       "MQTT Examples"
+#define PAYLOAD     "Hello World!"
+#define QOS         1
+#define TIMEOUT     10000L
+
+int main(int argc, char* argv[])
+{
+    MQTTClient client;
+    MQTTClient_connectOptions conn_opts = MQTTClient_connectOptions_initializer;
+    MQTTClient_message pubmsg = MQTTClient_message_initializer;
+    MQTTClient_deliveryToken token;
+    int rc;
+
+    MQTTClient_create(&client, ADDRESS, CLIENTID,
+        MQTTCLIENT_PERSISTENCE_NONE, NULL);
+    conn_opts.keepAliveInterval = 20;
+    conn_opts.cleansession = 1;
+
+    if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS)
+    {
+        printf("Failed to connect, return code %d\n", rc);
+        exit(EXIT_FAILURE);
+    }
+    pubmsg.payload = PAYLOAD;
+    pubmsg.payloadlen = strlen(PAYLOAD);
+    pubmsg.qos = QOS;
+    pubmsg.retained = 0;
+    MQTTClient_publishMessage(client, TOPIC, &pubmsg, &token);
+    printf("Waiting for up to %d seconds for publication of %s\n"
+            "on topic %s for client with ClientID: %s\n",
+            (int)(TIMEOUT/1000), PAYLOAD, TOPIC, CLIENTID);
+    rc = MQTTClient_waitForCompletion(client, token, TIMEOUT);
+    printf("Message with delivery token %d delivered\n", token);
+    MQTTClient_disconnect(client, 10000);
+    MQTTClient_destroy(&client);
+    return rc;
+}
+
+  * @endcode
+  *
+  * @page pubasync Asynchronous publication example
+@code{.c}
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MQTTClient.h"
+
+#define ADDRESS     "tcp://localhost:1883"
+#define CLIENTID    "ExampleClientPub"
+#define TOPIC       "MQTT Examples"
+#define PAYLOAD     "Hello World!"
+#define QOS         1
+#define TIMEOUT     10000L
+
+volatile MQTTClient_deliveryToken deliveredtoken;
+
+void delivered(void *context, MQTTClient_deliveryToken dt)
+{
+    printf("Message with token value %d delivery confirmed\n", dt);
+    deliveredtoken = dt;
+}
+
+int msgarrvd(void *context, char *topicName, int topicLen, MQTTClient_message *message)
+{
+    int i;
+    char* payloadptr;
+
+    printf("Message arrived\n");
+    printf("     topic: %s\n", topicName);
+    printf("   message: ");
+
+    payloadptr = message->payload;
+    for(i=0; i<message->payloadlen; i++)
+    {
+        putchar(*payloadptr++);
+    }
+    putchar('\n');
+    MQTTClient_freeMessage(&message);
+    MQTTClient_free(topicName);
+    return 1;
+}
+
+void connlost(void *context, char *cause)
+{
+    printf("\nConnection lost\n");
+    printf("     cause: %s\n", cause);
+}
+
+int main(int argc, char* argv[])
+{
+    MQTTClient client;
+    MQTTClient_connectOptions conn_opts = MQTTClient_connectOptions_initializer;
+    MQTTClient_message pubmsg = MQTTClient_message_initializer;
+    MQTTClient_deliveryToken token;
+    int rc;
+
+    MQTTClient_create(&client, ADDRESS, CLIENTID,
+        MQTTCLIENT_PERSISTENCE_NONE, NULL);
+    conn_opts.keepAliveInterval = 20;
+    conn_opts.cleansession = 1;
+
+    MQTTClient_setCallbacks(client, NULL, connlost, msgarrvd, delivered);
+
+    if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS)
+    {
+        printf("Failed to connect, return code %d\n", rc);
+        exit(EXIT_FAILURE);
+    }
+    pubmsg.payload = PAYLOAD;
+    pubmsg.payloadlen = strlen(PAYLOAD);
+    pubmsg.qos = QOS;
+    pubmsg.retained = 0;
+    deliveredtoken = 0;
+    MQTTClient_publishMessage(client, TOPIC, &pubmsg, &token);
+    printf("Waiting for publication of %s\n"
+            "on topic %s for client with ClientID: %s\n",
+            PAYLOAD, TOPIC, CLIENTID);
+    while(deliveredtoken != token);
+    MQTTClient_disconnect(client, 10000);
+    MQTTClient_destroy(&client);
+    return rc;
+}
+
+  * @endcode
+  * @page subasync Asynchronous subscription example
+@code
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MQTTClient.h"
+
+#define ADDRESS     "tcp://localhost:1883"
+#define CLIENTID    "ExampleClientSub"
+#define TOPIC       "MQTT Examples"
+#define PAYLOAD     "Hello World!"
+#define QOS         1
+#define TIMEOUT     10000L
+
+volatile MQTTClient_deliveryToken deliveredtoken;
+
+void delivered(void *context, MQTTClient_deliveryToken dt)
+{
+    printf("Message with token value %d delivery confirmed\n", dt);
+    deliveredtoken = dt;
+}
+
+int msgarrvd(void *context, char *topicName, int topicLen, MQTTClient_message *message)
+{
+    int i;
+    char* payloadptr;
+
+    printf("Message arrived\n");
+    printf("     topic: %s\n", topicName);
+    printf("   message: ");
+
+    payloadptr = message->payload;
+    for(i=0; i<message->payloadlen; i++)
+    {
+        putchar(*payloadptr++);
+    }
+    putchar('\n');
+    MQTTClient_freeMessage(&message);
+    MQTTClient_free(topicName);
+    return 1;
+}
+
+void connlost(void *context, char *cause)
+{
+    printf("\nConnection lost\n");
+    printf("     cause: %s\n", cause);
+}
+
+int main(int argc, char* argv[])
+{
+    MQTTClient client;
+    MQTTClient_connectOptions conn_opts = MQTTClient_connectOptions_initializer;
+    int rc;
+    int ch;
+
+    MQTTClient_create(&client, ADDRESS, CLIENTID,
+        MQTTCLIENT_PERSISTENCE_NONE, NULL);
+    conn_opts.keepAliveInterval = 20;
+    conn_opts.cleansession = 1;
+
+    MQTTClient_setCallbacks(client, NULL, connlost, msgarrvd, delivered);
+
+    if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS)
+    {
+        printf("Failed to connect, return code %d\n", rc);
+        exit(EXIT_FAILURE);
+    }
+    printf("Subscribing to topic %s\nfor client %s using QoS%d\n\n"
+           "Press Q<Enter> to quit\n\n", TOPIC, CLIENTID, QOS);
+    MQTTClient_subscribe(client, TOPIC, QOS);
+
+    do
+    {
+        ch = getchar();
+    } while(ch!='Q' && ch != 'q');
+
+    MQTTClient_disconnect(client, 10000);
+    MQTTClient_destroy(&client);
+    return rc;
+}
+
+  * @endcode
+  * @page tracing Tracing
+  *
+  * Runtime tracing is controlled by environment variables.
+  *
+  * Tracing is switched on by setting MQTT_C_CLIENT_TRACE.  A value of ON, or stdout, prints to
+  * stdout, any other value is interpreted as a file name to use.
+  *
+  * The amount of trace detail is controlled with the MQTT_C_CLIENT_TRACE_LEVEL environment
+  * variable - valid values are ERROR, PROTOCOL, MINIMUM, MEDIUM and MAXIMUM
+  * (from least to most verbose).
+  *
+  * The variable MQTT_C_CLIENT_TRACE_MAX_LINES limits the number of lines of trace that are output
+  * to a file.  Two files are used at most, when they are full, the last one is overwritten with the
+  * new trace entries.  The default size is 1000 lines.
+  *
+  * ### MQTT Packet Tracing
+  *
+  * A feature that can be very useful is printing the MQTT packets that are sent and received.  To
+  * achieve this, use the following environment variable settings:
+  * @code
+    MQTT_C_CLIENT_TRACE=ON
+    MQTT_C_CLIENT_TRACE_LEVEL=PROTOCOL
+  * @endcode
+  * The output you should see looks like this:
+  * @code
+    20130528 155936.813 3 stdout-subscriber -> CONNECT cleansession: 1 (0)
+    20130528 155936.813 3 stdout-subscriber <- CONNACK rc: 0
+    20130528 155936.813 3 stdout-subscriber -> SUBSCRIBE msgid: 1 (0)
+    20130528 155936.813 3 stdout-subscriber <- SUBACK msgid: 1
+    20130528 155941.818 3 stdout-subscriber -> DISCONNECT (0)
+  * @endcode
+  * where the fields are:
+  * 1. date
+  * 2. time
+  * 3. socket number
+  * 4. client id
+  * 5. direction (-> from client to server, <- from server to client)
+  * 6. packet details
+  *
+  * ### Default Level Tracing
+  *
+  * This is an extract of a default level trace of a call to connect:
+  * @code
+    19700101 010000.000 (1152206656) (0)> MQTTClient_connect:893
+    19700101 010000.000 (1152206656)  (1)> MQTTClient_connectURI:716
+    20130528 160447.479 Connecting to serverURI localhost:1883
+    20130528 160447.479 (1152206656)   (2)> MQTTProtocol_connect:98
+    20130528 160447.479 (1152206656)    (3)> MQTTProtocol_addressPort:48
+    20130528 160447.479 (1152206656)    (3)< MQTTProtocol_addressPort:73
+    20130528 160447.479 (1152206656)    (3)> Socket_new:599
+    20130528 160447.479 New socket 4 for localhost, port 1883
+    20130528 160447.479 (1152206656)     (4)> Socket_addSocket:163
+    20130528 160447.479 (1152206656)      (5)> Socket_setnonblocking:73
+    20130528 160447.479 (1152206656)      (5)< Socket_setnonblocking:78 (0)
+    20130528 160447.479 (1152206656)     (4)< Socket_addSocket:176 (0)
+    20130528 160447.479 (1152206656)     (4)> Socket_error:95
+    20130528 160447.479 (1152206656)     (4)< Socket_error:104 (115)
+    20130528 160447.479 Connect pending
+    20130528 160447.479 (1152206656)    (3)< Socket_new:683 (115)
+    20130528 160447.479 (1152206656)   (2)< MQTTProtocol_connect:131 (115)
+  * @endcode
+  * where the fields are:
+  * 1. date
+  * 2. time
+  * 3. thread id
+  * 4. function nesting level
+  * 5. function entry (>) or exit (<)
+  * 6. function name : line of source code file
+  * 7. return value (if there is one)
+  *
+  * ### Memory Allocation Tracing
+  *
+  * Setting the trace level to maximum causes memory allocations and frees to be traced along with
+  * the default trace entries, with messages like the following:
+  * @code
+    20130528 161819.657 Allocating 16 bytes in heap at file /home/icraggs/workspaces/mqrtc/mqttv3c/src/MQTTPacket.c line 177 ptr 0x179f930
+
+    20130528 161819.657 Freeing 16 bytes in heap at file /home/icraggs/workspaces/mqrtc/mqttv3c/src/MQTTPacket.c line 201, heap use now 896 bytes
+  * @endcode
+  * When the last MQTT client object is destroyed, if the trace is being recorded
+  * and all memory allocated by the client library has not been freed, an error message will be
+  * written to the trace.  This can help with fixing memory leaks.  The message will look like this:
+  * @code
+    20130528 163909.208 Some memory not freed at shutdown, possible memory leak
+    20130528 163909.208 Heap scan start, total 880 bytes
+    20130528 163909.208 Heap element size 32, line 354, file /home/icraggs/workspaces/mqrtc/mqttv3c/src/MQTTPacket.c, ptr 0x260cb00
+    20130528 163909.208   Content
+    20130528 163909.209 Heap scan end
+  * @endcode
+  * @endcond
+  */
diff --git a/mqtt/src/src/MQTTClientPersistence.h b/mqtt/src/src/MQTTClientPersistence.h
new file mode 100644
index 00000000..4c9014d7
--- /dev/null
+++ b/mqtt/src/src/MQTTClientPersistence.h
@@ -0,0 +1,254 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2012 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief This structure represents a persistent data store, used to store 
+ * outbound and inbound messages, in order to achieve reliable messaging.
+ *
+ * The MQTT Client persists QoS1 and QoS2 messages in order to meet the
+ * assurances of delivery associated with these @ref qos levels. The messages 
+ * are saved in persistent storage
+ * The type and context of the persistence implementation are specified when 
+ * the MQTT client is created (see MQTTClient_create()). The default 
+ * persistence type (::MQTTCLIENT_PERSISTENCE_DEFAULT) uses a file system-based
+ * persistence mechanism. The <i>persistence_context</i> argument passed to 
+ * MQTTClient_create() when using the default peristence is a string 
+ * representing the location of the persistence directory. If the context 
+ * argument is NULL, the working directory will be used. 
+ *
+ * To use memory-based persistence, an application passes 
+ * ::MQTTCLIENT_PERSISTENCE_NONE as the <i>persistence_type</i> to 
+ * MQTTClient_create(). This can lead to message loss in certain situations, 
+ * but can be appropriate in some cases (see @ref qos).
+ *
+ * Client applications can provide their own persistence mechanism by passing
+ * ::MQTTCLIENT_PERSISTENCE_USER as the <i>persistence_type</i>. To implement a
+ * custom persistence mechanism, the application must pass an initialized
+ * ::MQTTClient_persistence structure as the <i>persistence_context</i> 
+ * argument to MQTTClient_create().
+ *
+ * If the functions defined return an ::MQTTCLIENT_PERSISTENCE_ERROR then the 
+ * state of the persisted data should remain as it was prior to the function 
+ * being called. For example, if Persistence_put() returns 
+ * ::MQTTCLIENT_PERSISTENCE_ERROR, then it is assumed tha tthe persistent store
+ * does not contain the data that was passed to the function. Similarly,  if 
+ * Persistence_remove() returns ::MQTTCLIENT_PERSISTENCE_ERROR then it is 
+ * assumed that the data to be removed is still held in the persistent store.
+ *
+ * It is up to the persistence implementation to log any error information that
+ * may be required to diagnose a persistence mechanism failure.
+ */
+
+/*
+/// @cond EXCLUDE
+*/
+#if !defined(MQTTCLIENTPERSISTENCE_H)
+#define MQTTCLIENTPERSISTENCE_H
+/*
+/// @endcond
+*/
+
+/**
+  * This <i>persistence_type</i> value specifies the default file system-based 
+  * persistence mechanism (see MQTTClient_create()).
+  */
+#define MQTTCLIENT_PERSISTENCE_DEFAULT 0
+/**
+  * This <i>persistence_type</i> value specifies a memory-based 
+  * persistence mechanism (see MQTTClient_create()).
+  */
+#define MQTTCLIENT_PERSISTENCE_NONE 1
+/**
+  * This <i>persistence_type</i> value specifies an application-specific 
+  * persistence mechanism (see MQTTClient_create()).
+  */
+#define MQTTCLIENT_PERSISTENCE_USER 2
+
+/** 
+  * Application-specific persistence functions must return this error code if 
+  * there is a problem executing the function. 
+  */
+#define MQTTCLIENT_PERSISTENCE_ERROR -2
+
+/**
+  * @brief Initialize the persistent store.
+  * 
+  * Either open the existing persistent store for this client ID or create a new
+  * one if one doesn't exist. If the persistent store is already open, return 
+  * without taking any action.
+  *
+  * An application can use the same client identifier to connect to many
+  * different servers. The <i>clientid</i> in conjunction with the 
+  * <i>serverURI</i> uniquely identifies the persistence store required.
+  *
+  * @param handle The address of a pointer to a handle for this persistence 
+  * implementation. This function must set handle to a valid reference to the 
+  * persistence following a successful return. 
+  * The handle pointer is passed as an argument to all the other
+  * persistence functions. It may include the context parameter and/or any other
+  * data for use by the persistence functions.
+  * @param clientID The client identifier for which the persistent store should 
+  * be opened.
+  * @param serverURI The connection string specified when the MQTT client was
+  * created (see MQTTClient_create()).
+  * @param context A pointer to any data required to initialize the persistent
+  * store (see ::MQTTClient_persistence).
+  * @return Return 0 if the function completes successfully, otherwise return
+  * ::MQTTCLIENT_PERSISTENCE_ERROR.
+  */
+typedef int (*Persistence_open)(void** handle, const char* clientID, const char* serverURI, void* context);
+
+/**
+  * @brief Close the persistent store referred to by the handle.
+  *
+  * @param handle The handle pointer from a successful call to 
+  * Persistence_open().
+  * @return Return 0 if the function completes successfully, otherwise return
+  * ::MQTTCLIENT_PERSISTENCE_ERROR.
+  */
+typedef int (*Persistence_close)(void* handle); 
+
+/**
+  * @brief Put the specified data into the persistent store.
+  *
+  * @param handle The handle pointer from a successful call to 
+  * Persistence_open().
+  * @param key A string used as the key for the data to be put in the store. The
+  * key is later used to retrieve data from the store with Persistence_get().
+  * @param bufcount The number of buffers to write to the persistence store.
+  * @param buffers An array of pointers to the data buffers associated with 
+  * this <i>key</i>.
+  * @param buflens An array of lengths of the data buffers. <i>buflen[n]</i> 
+  * gives the length of <i>buffer[n]</i>.
+  * @return Return 0 if the function completes successfully, otherwise return
+  * ::MQTTCLIENT_PERSISTENCE_ERROR.
+  */
+typedef int (*Persistence_put)(void* handle, char* key, int bufcount, char* buffers[], int buflens[]);
+
+/**
+  * @brief Retrieve the specified data from the persistent store. 
+  *
+  * @param handle The handle pointer from a successful call to 
+  * Persistence_open().
+  * @param key A string that is the key for the data to be retrieved. This is 
+  * the same key used to save the data to the store with Persistence_put().
+  * @param buffer The address of a pointer to a buffer. This function sets the
+  * pointer to point at the retrieved data, if successful.
+  * @param buflen The address of an int that is set to the length of 
+  * <i>buffer</i> by this function if successful.
+  * @return Return 0 if the function completes successfully, otherwise return
+  * ::MQTTCLIENT_PERSISTENCE_ERROR.
+  */
+typedef int (*Persistence_get)(void* handle, char* key, char** buffer, int* buflen);
+
+/**
+  * @brief Remove the data for the specified key from the store.
+  *
+  * @param handle The handle pointer from a successful call to 
+  * Persistence_open().
+  * @param key A string that is the key for the data to be removed from the
+  * store. This is the same key used to save the data to the store with 
+  * Persistence_put().
+  * @return Return 0 if the function completes successfully, otherwise return
+  * ::MQTTCLIENT_PERSISTENCE_ERROR.
+  */
+typedef int (*Persistence_remove)(void* handle, char* key);
+
+/**
+  * @brief Returns the keys in this persistent data store.
+  *
+  * @param handle The handle pointer from a successful call to 
+  * Persistence_open().
+  * @param keys The address of a pointer to pointers to strings. Assuming
+  * successful execution, this function allocates memory to hold the returned
+  * keys (strings used to store the data with Persistence_put()). It also 
+  * allocates memory to hold an array of pointers to these strings. <i>keys</i>
+  * is set to point to the array of pointers to strings.
+  * @param nkeys A pointer to the number of keys in this persistent data store. 
+  * This function sets the number of keys, if successful.
+  * @return Return 0 if the function completes successfully, otherwise return
+  * ::MQTTCLIENT_PERSISTENCE_ERROR.
+  */
+typedef int (*Persistence_keys)(void* handle, char*** keys, int* nkeys);
+
+/**
+  * @brief Clears the persistence store, so that it no longer contains any 
+  * persisted data.
+  *
+  * @param handle The handle pointer from a successful call to 
+  * Persistence_open().
+  * @return Return 0 if the function completes successfully, otherwise return
+  * ::MQTTCLIENT_PERSISTENCE_ERROR.
+  */
+typedef int (*Persistence_clear)(void* handle);
+
+/**
+  * @brief Returns whether any data has been persisted using the specified key.
+  *
+  * @param handle The handle pointer from a successful call to 
+  * Persistence_open().
+  * @param key The string to be tested for existence in the store.
+  * @return Return 0 if the key was found in the store, otherwise return
+  * ::MQTTCLIENT_PERSISTENCE_ERROR.
+  */
+typedef int (*Persistence_containskey)(void* handle, char* key);
+
+/**
+  * @brief A structure containing the function pointers to a persistence 
+  * implementation and the context or state that will be shared across all 
+  * the persistence functions.
+  */
+typedef struct {
+  /** 
+    * A pointer to any data required to initialize the persistent store.
+    */
+	void* context;
+  /** 
+    * A function pointer to an implementation of Persistence_open().
+    */
+	Persistence_open popen;
+  /** 
+    * A function pointer to an implementation of Persistence_close().
+    */
+	Persistence_close pclose;
+  /**
+    * A function pointer to an implementation of Persistence_put().
+    */
+	Persistence_put pput;
+  /** 
+    * A function pointer to an implementation of Persistence_get().
+    */
+	Persistence_get pget;
+  /** 
+    * A function pointer to an implementation of Persistence_remove().
+    */
+	Persistence_remove premove;
+  /** 
+    * A function pointer to an implementation of Persistence_keys().
+    */
+	Persistence_keys pkeys;
+  /** 
+    * A function pointer to an implementation of Persistence_clear().
+    */
+	Persistence_clear pclear;
+  /** 
+    * A function pointer to an implementation of Persistence_containskey().
+    */
+	Persistence_containskey pcontainskey;
+} MQTTClient_persistence;
+
+#endif
diff --git a/mqtt/src/src/MQTTPacket.c b/mqtt/src/src/MQTTPacket.c
new file mode 100644
index 00000000..57b17493
--- /dev/null
+++ b/mqtt/src/src/MQTTPacket.c
@@ -0,0 +1,1005 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL updates
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - fix for issue 453
+ *    Ian Craggs - MQTT 5.0 support
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief functions to deal with reading and writing of MQTT packets from and to sockets
+ *
+ * Some other related functions are in the MQTTPacketOut module
+ */
+
+#include "MQTTPacket.h"
+#include "Log.h"
+#if !defined(NO_PERSISTENCE)
+	#include "MQTTPersistence.h"
+#endif
+#include "Messages.h"
+#include "StackTrace.h"
+#include "WebSocket.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "Heap.h"
+
+#if !defined(min)
+#define min(A,B) ( (A) < (B) ? (A):(B))
+#endif
+
+/**
+ * List of the predefined MQTT v3/v5 packet names.
+ */
+static const char *packet_names[] =
+{
+	"RESERVED", "CONNECT", "CONNACK", "PUBLISH", "PUBACK", "PUBREC", "PUBREL",
+	"PUBCOMP", "SUBSCRIBE", "SUBACK", "UNSUBSCRIBE", "UNSUBACK",
+	"PINGREQ", "PINGRESP", "DISCONNECT", "AUTH"
+};
+
+const char** MQTTClient_packet_names = packet_names;
+
+
+/**
+ * Converts an MQTT packet code into its name
+ * @param ptype packet code
+ * @return the corresponding string, or "UNKNOWN"
+ */
+const char* MQTTPacket_name(int ptype)
+{
+	return (ptype >= 0 && ptype <= AUTH) ? packet_names[ptype] : "UNKNOWN";
+}
+
+/**
+ * Array of functions to build packets, indexed according to packet code
+ */
+pf new_packets[] =
+{
+	NULL,	/**< reserved */
+	NULL,	/**< MQTTPacket_connect*/
+	MQTTPacket_connack, /**< CONNACK */
+	MQTTPacket_publish,	/**< PUBLISH */
+	MQTTPacket_ack, /**< PUBACK */
+	MQTTPacket_ack, /**< PUBREC */
+	MQTTPacket_ack, /**< PUBREL */
+	MQTTPacket_ack, /**< PUBCOMP */
+	NULL, /**< MQTTPacket_subscribe*/
+	MQTTPacket_suback, /**< SUBACK */
+	NULL, /**< MQTTPacket_unsubscribe*/
+	MQTTPacket_unsuback, /**< UNSUBACK */
+	MQTTPacket_header_only, /**< PINGREQ */
+	MQTTPacket_header_only, /**< PINGRESP */
+	MQTTPacket_ack,  /**< DISCONNECT */
+	MQTTPacket_ack   /**< AUTH */
+};
+
+
+static char* readUTFlen(char** pptr, char* enddata, int* len);
+static int MQTTPacket_send_ack(int type, int msgid, int dup, networkHandles *net);
+
+/**
+ * Reads one MQTT packet from a socket.
+ * @param socket a socket from which to read an MQTT packet
+ * @param error pointer to the error code which is completed if no packet is returned
+ * @return the packet structure or NULL if there was an error
+ */
+void* MQTTPacket_Factory(int MQTTVersion, networkHandles* net, int* error)
+{
+	char* data = NULL;
+	static Header header;
+	size_t remaining_length;
+	int ptype;
+	void* pack = NULL;
+	size_t actual_len = 0;
+
+	FUNC_ENTRY;
+	*error = SOCKET_ERROR;  /* indicate whether an error occurred, or not */
+
+	/* read the packet data from the socket */
+	*error = WebSocket_getch(net, &header.byte);
+	if (*error != TCPSOCKET_COMPLETE)   /* first byte is the header byte */
+		goto exit; /* packet not read, *error indicates whether SOCKET_ERROR occurred */
+
+	/* now read the remaining length, so we know how much more to read */
+	if ((*error = MQTTPacket_decode(net, &remaining_length)) != TCPSOCKET_COMPLETE)
+		goto exit; /* packet not read, *error indicates whether SOCKET_ERROR occurred */
+
+	/* now read the rest, the variable header and payload */
+	data = WebSocket_getdata(net, remaining_length, &actual_len);
+	if (data == NULL)
+	{
+		*error = SOCKET_ERROR;
+		goto exit; /* socket error */
+	}
+
+	if (actual_len != remaining_length)
+		*error = TCPSOCKET_INTERRUPTED;
+	else
+	{
+		ptype = header.bits.type;
+		if (ptype < CONNECT || (MQTTVersion < MQTTVERSION_5 && ptype >= DISCONNECT) ||
+				(MQTTVersion >= MQTTVERSION_5 && ptype > AUTH) ||
+				new_packets[ptype] == NULL)
+			Log(TRACE_MIN, 2, NULL, ptype);
+		else
+		{
+			if ((pack = (*new_packets[ptype])(MQTTVersion, header.byte, data, remaining_length)) == NULL)
+			{
+				*error = SOCKET_ERROR; // was BAD_MQTT_PACKET;
+				Log(LOG_ERROR, -1, "Bad MQTT packet, type %d", ptype);
+			}
+#if !defined(NO_PERSISTENCE)
+			else if (header.bits.type == PUBLISH && header.bits.qos == 2)
+			{
+				int buf0len;
+				char *buf = malloc(10);
+				buf[0] = header.byte;
+				buf0len = 1 + MQTTPacket_encode(&buf[1], remaining_length);
+				*error = MQTTPersistence_put(net->socket, buf, buf0len, 1,
+					&data, &remaining_length, header.bits.type, ((Publish *)pack)->msgId, 1, MQTTVersion);
+				free(buf);
+			}
+#endif
+		}
+	}
+	if (pack)
+		time(&(net->lastReceived));
+exit:
+	FUNC_EXIT_RC(*error);
+	return pack;
+}
+
+
+/**
+ * Sends an MQTT packet in one system call write
+ * @param socket the socket to which to write the data
+ * @param header the one-byte MQTT header
+ * @param buffer the rest of the buffer to write (not including remaining length)
+ * @param buflen the length of the data in buffer to be written
+ * @param MQTTVersion the version of MQTT being used
+ * @return the completion code (TCPSOCKET_COMPLETE etc)
+ */
+int MQTTPacket_send(networkHandles* net, Header header, char* buffer, size_t buflen, int freeData,
+		int MQTTVersion)
+{
+	int rc;
+	size_t buf0len;
+	size_t ws_header;
+	char *buf;
+	int count = 0;
+
+	FUNC_ENTRY;
+	ws_header = WebSocket_calculateFrameHeaderSize(net, 1, buflen + 10);
+
+	buf = malloc(10 + ws_header);
+	if ( !buf ) return -1;
+	buf[ws_header] = header.byte;
+	buf0len = 1 + MQTTPacket_encode(&buf[ws_header + 1], buflen);
+
+	if (buffer != NULL)
+		count = 1;
+
+#if !defined(NO_PERSISTENCE)
+	if (header.bits.type == PUBREL)
+	{
+		char* ptraux = buffer;
+		int msgId = readInt(&ptraux);
+
+		rc = MQTTPersistence_put(net->socket, &buf[ws_header], buf0len, count, &buffer, &buflen,
+			header.bits.type, msgId, 0, MQTTVersion);
+	}
+#endif
+	rc = WebSocket_putdatas(net, &buf[ws_header], buf0len, count, &buffer, &buflen, &freeData);
+
+	if (rc == TCPSOCKET_COMPLETE)
+		time(&(net->lastSent));
+	
+	if (rc != TCPSOCKET_INTERRUPTED)
+	  free(buf);
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Sends an MQTT packet from multiple buffers in one system call write
+ * @param socket the socket to which to write the data
+ * @param header the one-byte MQTT header
+ * @param count the number of buffers
+ * @param buffers the rest of the buffers to write (not including remaining length)
+ * @param buflens the lengths of the data in the array of buffers to be written
+ * @param the MQTT version being used
+ * @return the completion code (TCPSOCKET_COMPLETE etc)
+ */
+int MQTTPacket_sends(networkHandles* net, Header header, int count, char** buffers, size_t* buflens,
+		int* frees, int MQTTVersion)
+{
+	int i, rc;
+	size_t buf0len, total = 0;
+	size_t ws_header;
+	char *buf;
+
+	FUNC_ENTRY;
+
+	for (i = 0; i < count; i++)
+		total += buflens[i];
+
+	ws_header = WebSocket_calculateFrameHeaderSize(net, 1, total + 10);
+	buf = malloc(10 + ws_header);
+	if ( !buf ) return -1;
+
+	buf[ws_header] = header.byte;
+	buf0len = 1 + MQTTPacket_encode(&buf[ws_header + 1], total);
+#if !defined(NO_PERSISTENCE)
+	if (header.bits.type == PUBLISH && header.bits.qos != 0)
+	{   /* persist PUBLISH QoS1 and Qo2 */
+		char *ptraux = buffers[2];
+		int msgId = readInt(&ptraux);
+		rc = MQTTPersistence_put(net->socket, &buf[ws_header], buf0len, count, buffers, buflens,
+			header.bits.type, msgId, 0, MQTTVersion);
+	}
+#endif
+	rc = WebSocket_putdatas(net, &buf[ws_header], buf0len, count, buffers, buflens, frees);
+
+	if (rc == TCPSOCKET_COMPLETE)
+		time(&(net->lastSent));
+	
+	if (rc != TCPSOCKET_INTERRUPTED)
+	  free(buf);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Encodes the message length according to the MQTT algorithm
+ * @param buf the buffer into which the encoded data is written
+ * @param length the length to be encoded
+ * @return the number of bytes written to buffer
+ */
+int MQTTPacket_encode(char* buf, size_t length)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	do
+	{
+		char d = length % 128;
+		length /= 128;
+		/* if there are more digits to encode, set the top bit of this digit */
+		if (length > 0)
+			d |= 0x80;
+		buf[rc++] = d;
+	} while (length > 0);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Decodes the message length according to the MQTT algorithm
+ * @param socket the socket from which to read the bytes
+ * @param value the decoded length returned
+ * @return the number of bytes read from the socket
+ */
+int MQTTPacket_decode(networkHandles* net, size_t* value)
+{
+	int rc = SOCKET_ERROR;
+	char c;
+	int multiplier = 1;
+	int len = 0;
+#define MAX_NO_OF_REMAINING_LENGTH_BYTES 4
+
+	FUNC_ENTRY;
+	*value = 0;
+	do
+	{
+		if (++len > MAX_NO_OF_REMAINING_LENGTH_BYTES)
+		{
+			rc = SOCKET_ERROR;	/* bad data */
+			goto exit;
+		}
+		rc = WebSocket_getch(net, &c);
+		if (rc != TCPSOCKET_COMPLETE)
+				goto exit;
+		*value += (c & 127) * multiplier;
+		multiplier *= 128;
+	} while ((c & 128) != 0);
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Calculates an integer from two bytes read from the input buffer
+ * @param pptr pointer to the input buffer - incremented by the number of bytes used & returned
+ * @return the integer value calculated
+ */
+int readInt(char** pptr)
+{
+	char* ptr = *pptr;
+	int len = 256*((unsigned char)(*ptr)) + (unsigned char)(*(ptr+1));
+	*pptr += 2;
+	return len;
+}
+
+
+/**
+ * Reads a "UTF" string from the input buffer.  UTF as in the MQTT v3 spec which really means
+ * a length delimited string.  So it reads the two byte length then the data according to
+ * that length.  The end of the buffer is provided too, so we can prevent buffer overruns caused
+ * by an incorrect length.
+ * @param pptr pointer to the input buffer - incremented by the number of bytes used & returned
+ * @param enddata pointer to the end of the buffer not to be read beyond
+ * @param len returns the calculcated value of the length bytes read
+ * @return an allocated C string holding the characters read, or NULL if the length read would
+ * have caused an overrun.
+ *
+ */
+static char* readUTFlen(char** pptr, char* enddata, int* len)
+{
+	char* string = NULL;
+
+	FUNC_ENTRY;
+	if (enddata - (*pptr) > 1) /* enough length to read the integer? */
+	{
+		*len = readInt(pptr);
+		if (&(*pptr)[*len] <= enddata)
+		{
+			string = malloc(*len+1);
+			memcpy(string, *pptr, *len);
+			string[*len] = '\0';
+			*pptr += *len;
+		}
+	}
+	FUNC_EXIT;
+	return string;
+}
+
+
+/**
+ * Reads a "UTF" string from the input buffer.  UTF as in the MQTT v3 spec which really means
+ * a length delimited string.  So it reads the two byte length then the data according to
+ * that length.  The end of the buffer is provided too, so we can prevent buffer overruns caused
+ * by an incorrect length.
+ * @param pptr pointer to the input buffer - incremented by the number of bytes used & returned
+ * @param enddata pointer to the end of the buffer not to be read beyond
+ * @return an allocated C string holding the characters read, or NULL if the length read would
+ * have caused an overrun.
+ */
+char* readUTF(char** pptr, char* enddata)
+{
+	int len;
+	return readUTFlen(pptr, enddata, &len);
+}
+
+
+/**
+ * Reads one character from the input buffer.
+ * @param pptr pointer to the input buffer - incremented by the number of bytes used & returned
+ * @return the character read
+ */
+unsigned char readChar(char** pptr)
+{
+	unsigned char c = **pptr;
+	(*pptr)++;
+	return c;
+}
+
+
+/**
+ * Writes one character to an output buffer.
+ * @param pptr pointer to the output buffer - incremented by the number of bytes used & returned
+ * @param c the character to write
+ */
+void writeChar(char** pptr, char c)
+{
+	**pptr = c;
+	(*pptr)++;
+}
+
+
+/**
+ * Writes an integer as 2 bytes to an output buffer.
+ * @param pptr pointer to the output buffer - incremented by the number of bytes used & returned
+ * @param anInt the integer to write
+ */
+void writeInt(char** pptr, int anInt)
+{
+	**pptr = (char)(anInt / 256);
+	(*pptr)++;
+	**pptr = (char)(anInt % 256);
+	(*pptr)++;
+}
+
+
+/**
+ * Writes a "UTF" string to an output buffer.  Converts C string to length-delimited.
+ * @param pptr pointer to the output buffer - incremented by the number of bytes used & returned
+ * @param string the C string to write
+ */
+void writeUTF(char** pptr, const char* string)
+{
+	size_t len = strlen(string);
+	writeInt(pptr, (int)len);
+	memcpy(*pptr, string, len);
+	*pptr += len;
+}
+
+
+/**
+ * Writes length delimited data to an output buffer
+ * @param pptr pointer to the output buffer - incremented by the number of bytes used & returned
+ * @param data the data to write
+ * @param datalen the length of the data to write
+ */
+void writeData(char** pptr, const void* data, int datalen)
+{
+	writeInt(pptr, datalen);
+	memcpy(*pptr, data, datalen);
+	*pptr += datalen;
+}
+
+
+/**
+ * Function used in the new packets table to create packets which have only a header.
+ * @param MQTTVersion the version of MQTT
+ * @param aHeader the MQTT header byte
+ * @param data the rest of the packet
+ * @param datalen the length of the rest of the packet
+ * @return pointer to the packet structure
+ */
+void* MQTTPacket_header_only(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen)
+{
+	static unsigned char header = 0;
+	header = aHeader;
+	return &header;
+}
+
+
+/**
+ * Send an MQTT disconnect packet down a socket.
+ * @param socket the open socket to send the data to
+ * @return the completion code (e.g. TCPSOCKET_COMPLETE)
+ */
+int MQTTPacket_send_disconnect(Clients* client, enum MQTTReasonCodes reason, MQTTProperties* props)
+{
+	Header header;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	header.byte = 0;
+	header.bits.type = DISCONNECT;
+
+	if (client->MQTTVersion >= 5 && (props || reason != MQTTREASONCODE_SUCCESS))
+	{
+		size_t buflen = 1 + ((props == NULL) ? 0 : MQTTProperties_len(props));
+		char *buf = malloc(buflen), *ptr = NULL;
+
+		ptr = buf;
+		writeChar(&ptr, reason);
+		if (props)
+			MQTTProperties_write(&ptr, props);
+		if ((rc = MQTTPacket_send(&client->net, header, buf, buflen, 1,
+				                   client->MQTTVersion)) != TCPSOCKET_INTERRUPTED)
+			free(buf);
+	}
+	else
+		rc = MQTTPacket_send(&client->net, header, NULL, 0, 0, client->MQTTVersion);
+	Log(LOG_PROTOCOL, 28, NULL, client->net.socket, client->clientID, rc);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Function used in the new packets table to create publish packets.
+ * @param MQTTVersion
+ * @param aHeader the MQTT header byte
+ * @param data the rest of the packet
+ * @param datalen the length of the rest of the packet
+ * @return pointer to the packet structure
+ */
+void* MQTTPacket_publish(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen)
+{
+	Publish* pack = NULL;
+	char* curdata = data;
+	char* enddata = &data[datalen];
+
+	FUNC_ENTRY;
+	if ((pack = malloc(sizeof(Publish))) == NULL)
+		goto exit;
+	memset(pack, '\0', sizeof(Publish));
+	pack->MQTTVersion = MQTTVersion;
+	pack->header.byte = aHeader;
+	if ((pack->topic = readUTFlen(&curdata, enddata, &pack->topiclen)) == NULL) /* Topic name on which to publish */
+	{
+		free(pack);
+		pack = NULL;
+		goto exit;
+	}
+	if (pack->header.bits.qos > 0)  /* Msgid only exists for QoS 1 or 2 */
+		pack->msgId = readInt(&curdata);
+	else
+		pack->msgId = 0;
+	if (MQTTVersion >= MQTTVERSION_5)
+	{
+		MQTTProperties props = MQTTProperties_initializer;
+		pack->properties = props;
+		if (MQTTProperties_read(&pack->properties, &curdata, enddata) != 1)
+		{
+			if (pack->properties.array)
+				free(pack->properties.array);
+			if (pack)
+				free(pack);
+			pack = NULL; /* signal protocol error */
+			goto exit;
+		}
+	}
+	pack->payload = curdata;
+	pack->payloadlen = (int)(datalen-(curdata-data));
+exit:
+	FUNC_EXIT;
+	return pack;
+}
+
+
+/**
+ * Free allocated storage for a publish packet.
+ * @param pack pointer to the publish packet structure
+ */
+void MQTTPacket_freePublish(Publish* pack)
+{
+	FUNC_ENTRY;
+	if (pack->topic != NULL)
+		free(pack->topic);
+	if (pack->MQTTVersion >= MQTTVERSION_5)
+		MQTTProperties_free(&pack->properties);
+	free(pack);
+	FUNC_EXIT;
+}
+
+
+/**
+ * Free allocated storage for an ack packet.
+ * @param pack pointer to the publish packet structure
+ */
+void MQTTPacket_freeAck(Ack* pack)
+{
+	FUNC_ENTRY;
+	if (pack->MQTTVersion >= MQTTVERSION_5)
+		MQTTProperties_free(&pack->properties);
+	free(pack);
+	FUNC_EXIT;
+}
+
+
+/**
+ * Send an MQTT acknowledgement packet down a socket.
+ * @param type the MQTT packet type e.g. SUBACK
+ * @param msgid the MQTT message id to use
+ * @param dup boolean - whether to set the MQTT DUP flag
+ * @param net the network handle to send the data to
+ * @return the completion code (e.g. TCPSOCKET_COMPLETE)
+ */
+static int MQTTPacket_send_ack(int type, int msgid, int dup, networkHandles *net)
+{
+	Header header;
+	int rc;
+	char *buf = malloc(2);
+	char *ptr = buf;
+
+	FUNC_ENTRY;
+	header.byte = 0;
+	header.bits.type = type;
+	header.bits.dup = dup;
+	if (type == PUBREL)
+	    header.bits.qos = 1;
+	writeInt(&ptr, msgid);
+	if ((rc = MQTTPacket_send(net, header, buf, 2, 1, MQTTVERSION_3_1_1)) != TCPSOCKET_INTERRUPTED)
+		free(buf);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Send an MQTT PUBACK packet down a socket.
+ * @param msgid the MQTT message id to use
+ * @param socket the open socket to send the data to
+ * @param clientID the string client identifier, only used for tracing
+ * @return the completion code (e.g. TCPSOCKET_COMPLETE)
+ */
+int MQTTPacket_send_puback(int msgid, networkHandles* net, const char* clientID)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	rc =  MQTTPacket_send_ack(PUBACK, msgid, 0, net);
+	Log(LOG_PROTOCOL, 12, NULL, net->socket, clientID, msgid, rc);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Free allocated storage for a suback packet.
+ * @param pack pointer to the suback packet structure
+ */
+void MQTTPacket_freeSuback(Suback* pack)
+{
+	FUNC_ENTRY;
+	if (pack->MQTTVersion >= MQTTVERSION_5)
+		MQTTProperties_free(&pack->properties);
+	if (pack->qoss != NULL)
+		ListFree(pack->qoss);
+	free(pack);
+	FUNC_EXIT;
+}
+
+
+/**
+ * Free allocated storage for a suback packet.
+ * @param pack pointer to the suback packet structure
+ */
+void MQTTPacket_freeUnsuback(Unsuback* pack)
+{
+	FUNC_ENTRY;
+	if (pack->MQTTVersion >= MQTTVERSION_5)
+	{
+		MQTTProperties_free(&pack->properties);
+		if (pack->reasonCodes != NULL)
+			ListFree(pack->reasonCodes);
+	}
+	free(pack);
+	FUNC_EXIT;
+}
+
+
+/**
+ * Send an MQTT PUBREC packet down a socket.
+ * @param msgid the MQTT message id to use
+ * @param socket the open socket to send the data to
+ * @param clientID the string client identifier, only used for tracing
+ * @return the completion code (e.g. TCPSOCKET_COMPLETE)
+ */
+int MQTTPacket_send_pubrec(int msgid, networkHandles* net, const char* clientID)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	rc =  MQTTPacket_send_ack(PUBREC, msgid, 0, net);
+	Log(LOG_PROTOCOL, 13, NULL, net->socket, clientID, msgid, rc);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Send an MQTT PUBREL packet down a socket.
+ * @param msgid the MQTT message id to use
+ * @param dup boolean - whether to set the MQTT DUP flag
+ * @param socket the open socket to send the data to
+ * @param clientID the string client identifier, only used for tracing
+ * @return the completion code (e.g. TCPSOCKET_COMPLETE)
+ */
+int MQTTPacket_send_pubrel(int msgid, int dup, networkHandles* net, const char* clientID)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	rc = MQTTPacket_send_ack(PUBREL, msgid, dup, net);
+	Log(LOG_PROTOCOL, 16, NULL, net->socket, clientID, msgid, rc);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Send an MQTT PUBCOMP packet down a socket.
+ * @param msgid the MQTT message id to use
+ * @param socket the open socket to send the data to
+ * @param clientID the string client identifier, only used for tracing
+ * @return the completion code (e.g. TCPSOCKET_COMPLETE)
+ */
+int MQTTPacket_send_pubcomp(int msgid, networkHandles* net, const char* clientID)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	rc = MQTTPacket_send_ack(PUBCOMP, msgid, 0, net);
+	Log(LOG_PROTOCOL, 18, NULL, net->socket, clientID, msgid, rc);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Function used in the new packets table to create acknowledgement packets.
+ * @param aHeader the MQTT header byte
+ * @param data the rest of the packet
+ * @param datalen the length of the rest of the packet
+ * @return pointer to the packet structure
+ */
+void* MQTTPacket_ack(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen)
+{
+	Ack* pack = NULL;
+	char* curdata = data;
+	char* enddata = &data[datalen];
+
+	FUNC_ENTRY;
+	if ((pack = malloc(sizeof(Ack))) == NULL)
+		goto exit;
+	pack->MQTTVersion = MQTTVersion;
+	pack->header.byte = aHeader;
+	if (pack->header.bits.type != DISCONNECT)
+		pack->msgId = readInt(&curdata);
+	if (MQTTVersion >= MQTTVERSION_5)
+	{
+		MQTTProperties props = MQTTProperties_initializer;
+
+		pack->rc = MQTTREASONCODE_SUCCESS;
+		pack->properties = props;
+
+		if (datalen > 2)
+			pack->rc = readChar(&curdata); /* reason code */
+
+		if (datalen > 3)
+		{
+			if (MQTTProperties_read(&pack->properties, &curdata, enddata) != 1)
+			{
+				if (pack->properties.array)
+					free(pack->properties.array);
+				if (pack)
+					free(pack);
+				pack = NULL; /* signal protocol error */
+				goto exit;
+			}
+		}
+	}
+exit:
+	FUNC_EXIT;
+	return pack;
+}
+
+
+/**
+ * Send an MQTT PUBLISH packet down a socket.
+ * @param pack a structure from which to get some values to use, e.g topic, payload
+ * @param dup boolean - whether to set the MQTT DUP flag
+ * @param qos the value to use for the MQTT QoS setting
+ * @param retained boolean - whether to set the MQTT retained flag
+ * @param socket the open socket to send the data to
+ * @param clientID the string client identifier, only used for tracing
+ * @return the completion code (e.g. TCPSOCKET_COMPLETE)
+ */
+int MQTTPacket_send_publish(Publish* pack, int dup, int qos, int retained, networkHandles* net, const char* clientID)
+{
+	Header header;
+	char *topiclen;
+	int rc = -1;
+
+	FUNC_ENTRY;
+	topiclen = malloc(2);
+
+	header.bits.type = PUBLISH;
+	header.bits.dup = dup;
+	header.bits.qos = qos;
+	header.bits.retain = retained;
+	if (qos > 0 || pack->MQTTVersion >= 5)
+	{
+		int buflen = ((qos > 0) ? 2 : 0) + ((pack->MQTTVersion >= 5) ? MQTTProperties_len(&pack->properties) : 0);
+		char *ptr = NULL;
+		char* bufs[4] = {topiclen, pack->topic, NULL, pack->payload};
+		size_t lens[4] = {2, strlen(pack->topic), buflen, pack->payloadlen};
+		int frees[4] = {1, 0, 1, 0};
+
+		bufs[2] = ptr = malloc(buflen);
+		if (qos > 0)
+			writeInt(&ptr, pack->msgId);
+		if (pack->MQTTVersion >= 5)
+			MQTTProperties_write(&ptr, &pack->properties);
+
+		ptr = topiclen;
+		writeInt(&ptr, (int)lens[1]);
+		rc = MQTTPacket_sends(net, header, 4, bufs, lens, frees, pack->MQTTVersion);
+		if (rc != TCPSOCKET_INTERRUPTED)
+			free(bufs[2]);
+	}
+	else
+	{
+		char* ptr = topiclen;
+		char* bufs[3] = {topiclen, pack->topic, pack->payload};
+		size_t lens[3] = {2, strlen(pack->topic), pack->payloadlen};
+		int frees[3] = {1, 0, 0};
+
+		writeInt(&ptr, (int)lens[1]);
+		rc = MQTTPacket_sends(net, header, 3, bufs, lens, frees, pack->MQTTVersion);
+	}
+	if (rc != TCPSOCKET_INTERRUPTED)
+		free(topiclen);
+	if (qos == 0)
+		Log(LOG_PROTOCOL, 27, NULL, net->socket, clientID, retained, rc);
+	else
+		Log(LOG_PROTOCOL, 10, NULL, net->socket, clientID, pack->msgId, qos, retained, rc,
+				min(20, pack->payloadlen), pack->payload);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Free allocated storage for a various packet tyoes
+ * @param pack pointer to the suback packet structure
+ */
+void MQTTPacket_free_packet(MQTTPacket* pack)
+{
+	FUNC_ENTRY;
+	if (pack->header.bits.type == PUBLISH)
+		MQTTPacket_freePublish((Publish*)pack);
+	/*else if (pack->header.type == SUBSCRIBE)
+		MQTTPacket_freeSubscribe((Subscribe*)pack, 1);
+	else if (pack->header.type == UNSUBSCRIBE)
+		MQTTPacket_freeUnsubscribe((Unsubscribe*)pack);*/
+	else
+		free(pack);
+	FUNC_EXIT;
+}
+
+
+/**
+ * Writes an integer as 4 bytes to an output buffer.
+ * @param pptr pointer to the output buffer - incremented by the number of bytes used & returned
+ * @param anInt the integer to write
+ */
+void writeInt4(char** pptr, int anInt)
+{
+  **pptr = (char)(anInt / 16777216);
+  (*pptr)++;
+  anInt %= 16777216;
+  **pptr = (char)(anInt / 65536);
+  (*pptr)++;
+  anInt %= 65536;
+	**pptr = (char)(anInt / 256);
+	(*pptr)++;
+	**pptr = (char)(anInt % 256);
+	(*pptr)++;
+}
+
+
+/**
+ * Calculates an integer from two bytes read from the input buffer
+ * @param pptr pointer to the input buffer - incremented by the number of bytes used & returned
+ * @return the integer value calculated
+ */
+int readInt4(char** pptr)
+{
+	unsigned char* ptr = (unsigned char*)*pptr;
+	int value = 16777216*(*ptr) + 65536*(*(ptr+1)) + 256*(*(ptr+2)) + (*(ptr+3));
+	*pptr += 4;
+	return value;
+}
+
+
+void writeMQTTLenString(char** pptr, MQTTLenString lenstring)
+{
+  writeInt(pptr, lenstring.len);
+  memcpy(*pptr, lenstring.data, lenstring.len);
+  *pptr += lenstring.len;
+}
+
+
+int MQTTLenStringRead(MQTTLenString* lenstring, char** pptr, char* enddata)
+{
+	int len = 0;
+
+	/* the first two bytes are the length of the string */
+	if (enddata - (*pptr) > 1) /* enough length to read the integer? */
+	{
+		lenstring->len = readInt(pptr); /* increments pptr to point past length */
+		if (&(*pptr)[lenstring->len] <= enddata)
+		{
+			lenstring->data = (char*)*pptr;
+			*pptr += lenstring->len;
+			len = 2 + lenstring->len;
+		}
+	}
+	return len;
+}
+
+/*
+if (prop->value.integer4 >= 0 && prop->value.integer4 <= 127)
+  len = 1;
+else if (prop->value.integer4 >= 128 && prop->value.integer4 <= 16383)
+  len = 2;
+else if (prop->value.integer4 >= 16384 && prop->value.integer4 < 2097151)
+  len = 3;
+else if (prop->value.integer4 >= 2097152 && prop->value.integer4 < 268435455)
+  len = 4;
+*/
+int MQTTPacket_VBIlen(int rem_len)
+{
+	int rc = 0;
+
+	if (rem_len < 128)
+		rc = 1;
+	else if (rem_len < 16384)
+		rc = 2;
+	else if (rem_len < 2097152)
+		rc = 3;
+	else
+		rc = 4;
+  return rc;
+}
+
+
+/**
+ * Decodes the message length according to the MQTT algorithm
+ * @param getcharfn pointer to function to read the next character from the data source
+ * @param value the decoded length returned
+ * @return the number of bytes read from the socket
+ */
+int MQTTPacket_VBIdecode(int (*getcharfn)(char*, int), unsigned int* value)
+{
+	char c;
+	int multiplier = 1;
+	int len = 0;
+#define MAX_NO_OF_REMAINING_LENGTH_BYTES 4
+
+	*value = 0;
+	do
+	{
+		int rc = MQTTPACKET_READ_ERROR;
+
+		if (++len > MAX_NO_OF_REMAINING_LENGTH_BYTES)
+		{
+			rc = MQTTPACKET_READ_ERROR;	/* bad data */
+			goto exit;
+		}
+		rc = (*getcharfn)(&c, 1);
+		if (rc != 1)
+			goto exit;
+		*value += (c & 127) * multiplier;
+		multiplier *= 128;
+	} while ((c & 128) != 0);
+exit:
+	return len;
+}
+
+
+static char* bufptr;
+
+int bufchar(char* c, int count)
+{
+	int i;
+
+	for (i = 0; i < count; ++i)
+		*c = *bufptr++;
+	return count;
+}
+
+
+int MQTTPacket_decodeBuf(char* buf, unsigned int* value)
+{
+	bufptr = buf;
+	return MQTTPacket_VBIdecode(bufchar, value);
+}
+
diff --git a/mqtt/src/src/MQTTPacket.h b/mqtt/src/src/MQTTPacket.h
new file mode 100644
index 00000000..eb070a21
--- /dev/null
+++ b/mqtt/src/src/MQTTPacket.h
@@ -0,0 +1,270 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL updates
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - big endian Linux reversed definition
+ *    Ian Craggs - MQTT 5.0 support
+ *******************************************************************************/
+
+#if !defined(MQTTPACKET_H)
+#define MQTTPACKET_H
+
+#include "Socket.h"
+#if defined(OPENSSL)
+#include "SSLSocket.h"
+#endif
+#include "LinkedList.h"
+#include "Clients.h"
+
+typedef unsigned int bool;
+typedef void* (*pf)(int, unsigned char, char*, size_t);
+
+#include "MQTTProperties.h"
+#include "MQTTReasonCodes.h"
+
+enum errors
+{
+	MQTTPACKET_BAD = -4,
+	MQTTPACKET_BUFFER_TOO_SHORT = -2,
+	MQTTPACKET_READ_ERROR = -1,
+	MQTTPACKET_READ_COMPLETE
+};
+
+
+enum msgTypes
+{
+	CONNECT = 1, CONNACK, PUBLISH, PUBACK, PUBREC, PUBREL,
+	PUBCOMP, SUBSCRIBE, SUBACK, UNSUBSCRIBE, UNSUBACK,
+	PINGREQ, PINGRESP, DISCONNECT, AUTH
+};
+
+#if defined(__linux__)
+#include <endian.h>
+#if __BYTE_ORDER == __BIG_ENDIAN
+	#define REVERSED 1
+#endif
+#endif
+
+/**
+ * Bitfields for the MQTT header byte.
+ */
+typedef union
+{
+	/*unsigned*/ char byte;	/**< the whole byte */
+#if defined(REVERSED)
+	struct
+	{
+		unsigned int type : 4;	/**< message type nibble */
+		bool dup : 1;			/**< DUP flag bit */
+		unsigned int qos : 2;	/**< QoS value, 0, 1 or 2 */
+		bool retain : 1;		/**< retained flag bit */
+	} bits;
+#else
+	struct
+	{
+		bool retain : 1;		/**< retained flag bit */
+		unsigned int qos : 2;	/**< QoS value, 0, 1 or 2 */
+		bool dup : 1;			/**< DUP flag bit */
+		unsigned int type : 4;	/**< message type nibble */
+	} bits;
+#endif
+} Header;
+
+
+/**
+ * Data for a connect packet.
+ */
+typedef struct
+{
+	Header header;	/**< MQTT header byte */
+	union
+	{
+		unsigned char all;	/**< all connect flags */
+#if defined(REVERSED)
+		struct
+		{
+			bool username : 1;			/**< 3.1 user name */
+			bool password : 1; 			/**< 3.1 password */
+			bool willRetain : 1;		/**< will retain setting */
+			unsigned int willQoS : 2;	/**< will QoS value */
+			bool will : 1;			/**< will flag */
+			bool cleanstart : 1;	/**< cleansession flag */
+			int : 1;	/**< unused */
+		} bits;
+#else
+		struct
+		{
+			int : 1;	/**< unused */
+			bool cleanstart : 1;	/**< cleansession flag */
+			bool will : 1;			/**< will flag */
+			unsigned int willQoS : 2;	/**< will QoS value */
+			bool willRetain : 1;		/**< will retain setting */
+			bool password : 1; 			/**< 3.1 password */
+			bool username : 1;			/**< 3.1 user name */
+		} bits;
+#endif
+	} flags;	/**< connect flags byte */
+
+	char *Protocol, /**< MQTT protocol name */
+		*clientID,	/**< string client id */
+        *willTopic,	/**< will topic */
+        *willMsg;	/**< will payload */
+
+	int keepAliveTimer;		/**< keepalive timeout value in seconds */
+	unsigned char version;	/**< MQTT version number */
+} Connect;
+
+
+/**
+ * Data for a connack packet.
+ */
+typedef struct
+{
+	Header header; /**< MQTT header byte */
+	union
+	{
+		unsigned char all;	/**< all connack flags */
+#if defined(REVERSED)
+		struct
+		{
+			unsigned int reserved : 7;	/**< message type nibble */
+			bool sessionPresent : 1;    /**< was a session found on the server? */
+		} bits;
+#else
+		struct
+		{
+			bool sessionPresent : 1;    /**< was a session found on the server? */
+			unsigned int reserved : 7;	/**< message type nibble */
+		} bits;
+#endif
+	} flags;	 /**< connack flags byte */
+	unsigned char rc; /**< connack reason code */
+	unsigned int MQTTVersion;  /**< the version of MQTT */
+	MQTTProperties properties; /**< MQTT 5.0 properties.  Not used for MQTT < 5.0 */
+} Connack;
+
+
+/**
+ * Data for a packet with header only.
+ */
+typedef struct
+{
+	Header header;	/**< MQTT header byte */
+} MQTTPacket;
+
+
+/**
+ * Data for a suback packet.
+ */
+typedef struct
+{
+	Header header;	/**< MQTT header byte */
+	int msgId;		/**< MQTT message id */
+	int MQTTVersion;  /**< the version of MQTT */
+	MQTTProperties properties; /**< MQTT 5.0 properties.  Not used for MQTT < 5.0 */
+	List* qoss;		/**< list of granted QoSs (MQTT 3/4) / reason codes (MQTT 5) */
+} Suback;
+
+
+/**
+ * Data for an MQTT V5 unsuback packet.
+ */
+typedef struct
+{
+	Header header;	/**< MQTT header byte */
+	int msgId;		/**< MQTT message id */
+	int MQTTVersion;  /**< the version of MQTT */
+	MQTTProperties properties; /**< MQTT 5.0 properties.  Not used for MQTT < 5.0 */
+	List* reasonCodes;	/**< list of reason codes */
+} Unsuback;
+
+
+/**
+ * Data for a publish packet.
+ */
+typedef struct
+{
+	Header header;	/**< MQTT header byte */
+	char* topic;	/**< topic string */
+	int topiclen;
+	int msgId;		/**< MQTT message id */
+	char* payload;	/**< binary payload, length delimited */
+	int payloadlen;	/**< payload length */
+	int MQTTVersion;  /**< the version of MQTT */
+	MQTTProperties properties; /**< MQTT 5.0 properties.  Not used for MQTT < 5.0 */
+} Publish;
+
+
+/**
+ * Data for one of the ack packets.
+ */
+typedef struct
+{
+	Header header;	/**< MQTT header byte */
+	int msgId;		/**< MQTT message id */
+	unsigned char rc; /**< MQTT 5 reason code */
+	int MQTTVersion;  /**< the version of MQTT */
+	MQTTProperties properties; /**< MQTT 5.0 properties.  Not used for MQTT < 5.0 */
+} Ack;
+
+typedef Ack Puback;
+typedef Ack Pubrec;
+typedef Ack Pubrel;
+typedef Ack Pubcomp;
+
+int MQTTPacket_encode(char* buf, size_t length);
+int MQTTPacket_decode(networkHandles* net, size_t* value);
+int readInt(char** pptr);
+char* readUTF(char** pptr, char* enddata);
+unsigned char readChar(char** pptr);
+void writeChar(char** pptr, char c);
+void writeInt(char** pptr, int anInt);
+void writeUTF(char** pptr, const char* string);
+void writeData(char** pptr, const void* data, int datalen);
+
+const char* MQTTPacket_name(int ptype);
+
+void* MQTTPacket_Factory(int MQTTVersion, networkHandles* net, int* error);
+int MQTTPacket_send(networkHandles* net, Header header, char* buffer, size_t buflen, int free, int MQTTVersion);
+int MQTTPacket_sends(networkHandles* net, Header header, int count, char** buffers, size_t* buflens, int* frees, int MQTTVersion);
+
+void* MQTTPacket_header_only(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen);
+int MQTTPacket_send_disconnect(Clients* client, enum MQTTReasonCodes reason, MQTTProperties* props);
+
+void* MQTTPacket_publish(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen);
+void MQTTPacket_freePublish(Publish* pack);
+int MQTTPacket_send_publish(Publish* pack, int dup, int qos, int retained, networkHandles* net, const char* clientID);
+int MQTTPacket_send_puback(int msgid, networkHandles* net, const char* clientID);
+void* MQTTPacket_ack(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen);
+
+void MQTTPacket_freeAck(Ack* pack);
+void MQTTPacket_freeSuback(Suback* pack);
+void MQTTPacket_freeUnsuback(Unsuback* pack);
+int MQTTPacket_send_pubrec(int msgid, networkHandles* net, const char* clientID);
+int MQTTPacket_send_pubrel(int msgid, int dup, networkHandles* net, const char* clientID);
+int MQTTPacket_send_pubcomp(int msgid, networkHandles* net, const char* clientID);
+
+void MQTTPacket_free_packet(MQTTPacket* pack);
+
+void writeInt4(char** pptr, int anInt);
+int readInt4(char** pptr);
+void writeMQTTLenString(char** pptr, MQTTLenString lenstring);
+int MQTTLenStringRead(MQTTLenString* lenstring, char** pptr, char* enddata);
+int MQTTPacket_VBIlen(int rem_len);
+int MQTTPacket_decodeBuf(char* buf, unsigned int* value);
+
+#include "MQTTPacketOut.h"
+
+#endif /* MQTTPACKET_H */
diff --git a/mqtt/src/src/MQTTPacketOut.c b/mqtt/src/src/MQTTPacketOut.c
new file mode 100644
index 00000000..335aecc4
--- /dev/null
+++ b/mqtt/src/src/MQTTPacketOut.c
@@ -0,0 +1,437 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL updates
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Rong Xiang, Ian Craggs - C++ compatibility
+ *    Ian Craggs - binary password and will payload
+ *    Ian Craggs - MQTT 5.0 support
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief functions to deal with reading and writing of MQTT packets from and to sockets
+ *
+ * Some other related functions are in the MQTTPacket module
+ */
+
+
+#include "MQTTPacketOut.h"
+#include "Log.h"
+#include "StackTrace.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+#include "Heap.h"
+
+
+/**
+ * Send an MQTT CONNECT packet down a socket for V5 or later
+ * @param client a structure from which to get all the required values
+ * @param MQTTVersion the MQTT version to connect with
+ * @param connectProperties MQTT V5 properties for the connect packet
+ * @param willProperties MQTT V5 properties for the will message, if any
+ * @return the completion code (e.g. TCPSOCKET_COMPLETE)
+ */
+int MQTTPacket_send_connect(Clients* client, int MQTTVersion,
+	               MQTTProperties* connectProperties, MQTTProperties* willProperties)
+{
+	char *buf, *ptr;
+	Connect packet;
+	int rc = -1, len;
+
+	FUNC_ENTRY;
+	packet.header.byte = 0;
+	packet.header.bits.type = CONNECT;
+
+	len = ((MQTTVersion == MQTTVERSION_3_1) ? 12 : 10) + (int)strlen(client->clientID)+2;
+	if (client->will)
+		len += (int)strlen(client->will->topic)+2 + client->will->payloadlen+2;
+	if (client->username)
+		len += (int)strlen(client->username)+2;
+	if (client->password)
+		len += client->passwordlen+2;
+	if (MQTTVersion >= MQTTVERSION_5)
+	{
+		len += MQTTProperties_len(connectProperties);
+		if (client->will)
+			len += MQTTProperties_len(willProperties);
+	}
+
+	ptr = buf = malloc(len);
+	if (MQTTVersion == MQTTVERSION_3_1)
+	{
+		writeUTF(&ptr, "MQIsdp");
+		writeChar(&ptr, (char)MQTTVERSION_3_1);
+	}
+	else if (MQTTVersion == MQTTVERSION_3_1_1 || MQTTVersion == MQTTVERSION_5)
+	{
+		writeUTF(&ptr, "MQTT");
+		writeChar(&ptr, (char)MQTTVersion);
+	}
+	else
+		goto exit;
+
+	packet.flags.all = 0;
+	if (MQTTVersion >= MQTTVERSION_5)
+		packet.flags.bits.cleanstart = client->cleanstart;
+	else
+		packet.flags.bits.cleanstart = client->cleansession;
+	packet.flags.bits.will = (client->will) ? 1 : 0;
+	if (packet.flags.bits.will)
+	{
+		packet.flags.bits.willQoS = client->will->qos;
+		packet.flags.bits.willRetain = client->will->retained;
+	}
+	if (client->username)
+		packet.flags.bits.username = 1;
+	if (client->password)
+		packet.flags.bits.password = 1;
+
+	writeChar(&ptr, packet.flags.all);
+	writeInt(&ptr, client->keepAliveInterval);
+	if (MQTTVersion >= MQTTVERSION_5)
+		MQTTProperties_write(&ptr, connectProperties);
+	writeUTF(&ptr, client->clientID);
+	if (client->will)
+	{
+		if (MQTTVersion >= MQTTVERSION_5)
+			MQTTProperties_write(&ptr, willProperties);
+		writeUTF(&ptr, client->will->topic);
+		writeData(&ptr, client->will->payload, client->will->payloadlen);
+	}
+	if (client->username)
+		writeUTF(&ptr, client->username);
+	if (client->password)
+		writeData(&ptr, client->password, client->passwordlen);
+
+	rc = MQTTPacket_send(&client->net, packet.header, buf, len, 1, MQTTVersion);
+	Log(LOG_PROTOCOL, 0, NULL, client->net.socket, client->clientID,
+			MQTTVersion, client->cleansession, rc);
+exit:
+	if (rc != TCPSOCKET_INTERRUPTED)
+		free(buf);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Function used in the new packets table to create connack packets.
+ * @param MQTTVersion MQTT 5 or less?
+ * @param aHeader the MQTT header byte
+ * @param data the rest of the packet
+ * @param datalen the length of the rest of the packet
+ * @return pointer to the packet structure
+ */
+void* MQTTPacket_connack(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen)
+{
+	Connack* pack = NULL;
+	char* curdata = data;
+	char* enddata = &data[datalen];
+
+	FUNC_ENTRY;
+	if ((pack = malloc(sizeof(Connack))) == NULL)
+		goto exit;
+	pack->MQTTVersion = MQTTVersion;
+	pack->header.byte = aHeader;
+	pack->flags.all = readChar(&curdata); /* connect flags */
+	pack->rc = readChar(&curdata); /* reason code */
+	if (MQTTVersion < MQTTVERSION_5)
+	{
+		if (datalen != 2)
+		{
+			free(pack);
+			pack = NULL;
+		}
+	}
+	else if (datalen > 2)
+	{
+		MQTTProperties props = MQTTProperties_initializer;
+		pack->properties = props;
+		if (MQTTProperties_read(&pack->properties, &curdata, enddata) != 1)
+		{
+			if (pack->properties.array)
+				free(pack->properties.array);
+			if (pack)
+				free(pack);
+			pack = NULL; /* signal protocol error */
+			goto exit;
+		}
+	}
+exit:
+	FUNC_EXIT;
+	return pack;
+}
+
+
+/**
+ * Free allocated storage for a connack packet.
+ * @param pack pointer to the connack packet structure
+ */
+void MQTTPacket_freeConnack(Connack* pack)
+{
+	FUNC_ENTRY;
+	if (pack->MQTTVersion >= MQTTVERSION_5)
+		MQTTProperties_free(&pack->properties);
+	free(pack);
+	FUNC_EXIT;
+}
+
+
+/**
+ * Send an MQTT PINGREQ packet down a socket.
+ * @param socket the open socket to send the data to
+ * @param clientID the string client identifier, only used for tracing
+ * @return the completion code (e.g. TCPSOCKET_COMPLETE)
+ */
+int MQTTPacket_send_pingreq(networkHandles* net, const char* clientID)
+{
+	Header header;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	header.byte = 0;
+	header.bits.type = PINGREQ;
+	rc = MQTTPacket_send(net, header, NULL, 0, 0, MQTTVERSION_3_1_1);
+	Log(LOG_PROTOCOL, 20, NULL, net->socket, clientID, rc);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Send an MQTT subscribe packet down a socket.
+ * @param topics list of topics
+ * @param qoss list of corresponding QoSs
+ * @param msgid the MQTT message id to use
+ * @param dup boolean - whether to set the MQTT DUP flag
+ * @param socket the open socket to send the data to
+ * @param clientID the string client identifier, only used for tracing
+ * @return the completion code (e.g. TCPSOCKET_COMPLETE)
+ */
+int MQTTPacket_send_subscribe(List* topics, List* qoss, MQTTSubscribe_options* opts, MQTTProperties* props,
+		int msgid, int dup, Clients* client)
+{
+	Header header;
+	char *data, *ptr;
+	int rc = -1;
+	ListElement *elem = NULL, *qosElem = NULL;
+	int datalen, i = 0;
+
+	FUNC_ENTRY;
+	header.bits.type = SUBSCRIBE;
+	header.bits.dup = dup;
+	header.bits.qos = 1;
+	header.bits.retain = 0;
+
+	datalen = 2 + topics->count * 3; /* utf length + char qos == 3 */
+	while (ListNextElement(topics, &elem))
+		datalen += (int)strlen((char*)(elem->content));
+	if (client->MQTTVersion >= MQTTVERSION_5)
+		datalen += MQTTProperties_len(props);
+
+	ptr = data = malloc(datalen);
+	writeInt(&ptr, msgid);
+
+	if (client->MQTTVersion >= MQTTVERSION_5)
+		MQTTProperties_write(&ptr, props);
+
+	elem = NULL;
+	while (ListNextElement(topics, &elem))
+	{
+		char subopts = 0;
+
+		ListNextElement(qoss, &qosElem);
+		writeUTF(&ptr, (char*)(elem->content));
+		subopts = *(int*)(qosElem->content);
+		if (client->MQTTVersion >= MQTTVERSION_5 && opts != NULL)
+		{
+			subopts |= (opts[i].noLocal << 2); /* 1 bit */
+			subopts |= (opts[i].retainAsPublished << 3); /* 1 bit */
+			subopts |= (opts[i].retainHandling << 4); /* 2 bits */
+		}
+		writeChar(&ptr, subopts);
+		++i;
+	}
+	rc = MQTTPacket_send(&client->net, header, data, datalen, 1, client->MQTTVersion);
+	Log(LOG_PROTOCOL, 22, NULL, client->net.socket, client->clientID, msgid, rc);
+	if (rc != TCPSOCKET_INTERRUPTED)
+		free(data);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Function used in the new packets table to create suback packets.
+ * @param MQTTVersion the version of MQTT
+ * @param aHeader the MQTT header byte
+ * @param data the rest of the packet
+ * @param datalen the length of the rest of the packet
+ * @return pointer to the packet structure
+ */
+void* MQTTPacket_suback(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen)
+{
+	Suback* pack = NULL;
+	char* curdata = data;
+	char* enddata = &data[datalen];
+
+	FUNC_ENTRY;
+	if ((pack = malloc(sizeof(Suback))) == NULL)
+		goto exit;
+	pack->MQTTVersion = MQTTVersion;
+	pack->header.byte = aHeader;
+	pack->msgId = readInt(&curdata);
+	if (MQTTVersion >= MQTTVERSION_5)
+	{
+		MQTTProperties props = MQTTProperties_initializer;
+		pack->properties = props;
+		if (MQTTProperties_read(&pack->properties, &curdata, enddata) != 1)
+		{
+			if (pack->properties.array)
+				free(pack->properties.array);
+			if (pack)
+				free(pack);
+			pack = NULL; /* signal protocol error */
+			goto exit;
+		}
+	}
+	pack->qoss = ListInitialize();
+	while ((size_t)(curdata - data) < datalen)
+	{
+		unsigned int* newint;
+		newint = malloc(sizeof(unsigned int));
+		*newint = (unsigned int)readChar(&curdata);
+		ListAppend(pack->qoss, newint, sizeof(unsigned int));
+	}
+	if (pack->qoss->count == 0)
+	{
+		if (pack->properties.array)
+			free(pack->properties.array);
+		if (pack)
+			free(pack);
+		ListFree(pack->qoss);
+		pack = NULL;
+	}
+exit:
+	FUNC_EXIT;
+	return pack;
+}
+
+
+/**
+ * Send an MQTT unsubscribe packet down a socket.
+ * @param topics list of topics
+ * @param msgid the MQTT message id to use
+ * @param dup boolean - whether to set the MQTT DUP flag
+ * @param socket the open socket to send the data to
+ * @param clientID the string client identifier, only used for tracing
+ * @return the completion code (e.g. TCPSOCKET_COMPLETE)
+ */
+int MQTTPacket_send_unsubscribe(List* topics, MQTTProperties* props, int msgid, int dup, Clients* client)
+{
+	Header header;
+	char *data, *ptr;
+	int rc = -1;
+	ListElement *elem = NULL;
+	int datalen;
+
+	FUNC_ENTRY;
+	header.bits.type = UNSUBSCRIBE;
+	header.bits.dup = dup;
+	header.bits.qos = 1;
+	header.bits.retain = 0;
+
+	datalen = 2 + topics->count * 2; /* utf length == 2 */
+	while (ListNextElement(topics, &elem))
+		datalen += (int)strlen((char*)(elem->content));
+	if (client->MQTTVersion >= MQTTVERSION_5)
+		datalen += MQTTProperties_len(props);
+	ptr = data = malloc(datalen);
+
+	writeInt(&ptr, msgid);
+
+	if (client->MQTTVersion >= MQTTVERSION_5)
+		MQTTProperties_write(&ptr, props);
+
+	elem = NULL;
+	while (ListNextElement(topics, &elem))
+		writeUTF(&ptr, (char*)(elem->content));
+	rc = MQTTPacket_send(&client->net, header, data, datalen, 1, client->MQTTVersion);
+	Log(LOG_PROTOCOL, 25, NULL, client->net.socket, client->clientID, msgid, rc);
+	if (rc != TCPSOCKET_INTERRUPTED)
+		free(data);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Function used in the new packets table to create unsuback packets.
+ * @param MQTTVersion the version of MQTT
+ * @param aHeader the MQTT header byte
+ * @param data the rest of the packet
+ * @param datalen the length of the rest of the packet
+ * @return pointer to the packet structure
+ */
+void* MQTTPacket_unsuback(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen)
+{
+	Unsuback* pack = NULL;
+	char* curdata = data;
+	char* enddata = &data[datalen];
+
+	FUNC_ENTRY;
+	if ((pack = malloc(sizeof(Unsuback))) == NULL)
+		goto exit;
+	pack->MQTTVersion = MQTTVersion;
+	pack->header.byte = aHeader;
+	pack->msgId = readInt(&curdata);
+	pack->reasonCodes = NULL;
+	if (MQTTVersion >= MQTTVERSION_5)
+	{
+		MQTTProperties props = MQTTProperties_initializer;
+		pack->properties = props;
+		if (MQTTProperties_read(&pack->properties, &curdata, enddata) != 1)
+		{
+			if (pack->properties.array)
+				free(pack->properties.array);
+			if (pack)
+				free(pack);
+			pack = NULL; /* signal protocol error */
+			goto exit;
+		}
+		pack->reasonCodes = ListInitialize();
+		while ((size_t)(curdata - data) < datalen)
+		{
+			enum MQTTReasonCodes* newrc;
+			newrc = malloc(sizeof(enum MQTTReasonCodes));
+			*newrc = (enum MQTTReasonCodes)readChar(&curdata);
+			ListAppend(pack->reasonCodes, newrc, sizeof(enum MQTTReasonCodes));
+		}
+		if (pack->reasonCodes->count == 0)
+		{
+			ListFree(pack->reasonCodes);
+			if (pack->properties.array)
+				free(pack->properties.array);
+			if (pack)
+				free(pack);
+			pack = NULL;
+		}
+	}
+exit:
+	FUNC_EXIT;
+	return pack;
+}
diff --git a/mqtt/src/src/MQTTPacketOut.h b/mqtt/src/src/MQTTPacketOut.h
new file mode 100644
index 00000000..4e0ae108
--- /dev/null
+++ b/mqtt/src/src/MQTTPacketOut.h
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL updates
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - MQTT 5.0 support
+ *******************************************************************************/
+
+#if !defined(MQTTPACKETOUT_H)
+#define MQTTPACKETOUT_H
+
+#include "MQTTPacket.h"
+
+int MQTTPacket_send_connect(Clients* client, int MQTTVersion,
+		MQTTProperties* connectProperties, MQTTProperties* willProperties);
+void* MQTTPacket_connack(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen);
+void MQTTPacket_freeConnack(Connack* pack);
+
+int MQTTPacket_send_pingreq(networkHandles* net, const char* clientID);
+
+int MQTTPacket_send_subscribe(List* topics, List* qoss, MQTTSubscribe_options* opts, MQTTProperties* props,
+		int msgid, int dup, Clients* client);
+void* MQTTPacket_suback(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen);
+
+int MQTTPacket_send_unsubscribe(List* topics, MQTTProperties* props, int msgid, int dup, Clients* client);
+void* MQTTPacket_unsuback(int MQTTVersion, unsigned char aHeader, char* data, size_t datalen);
+
+#endif
diff --git a/mqtt/src/src/MQTTPersistence.c b/mqtt/src/src/MQTTPersistence.c
new file mode 100644
index 00000000..efcdd772
--- /dev/null
+++ b/mqtt/src/src/MQTTPersistence.c
@@ -0,0 +1,761 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - async client updates
+ *    Ian Craggs - fix for bug 432903 - queue persistence
+ *    Ian Craggs - MQTT V5 updates
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief Functions that apply to persistence operations.
+ *
+ */
+
+#include <stdio.h>
+#include <string.h>
+
+#include "MQTTPersistence.h"
+#include "MQTTPersistenceDefault.h"
+#include "MQTTProtocolClient.h"
+#include "Heap.h"
+
+
+static MQTTPersistence_qEntry* MQTTPersistence_restoreQueueEntry(char* buffer, size_t buflen, int MQTTVersion);
+static void MQTTPersistence_insertInSeqOrder(List* list, MQTTPersistence_qEntry* qEntry, size_t size);
+
+/**
+ * Creates a ::MQTTClient_persistence structure representing a persistence implementation.
+ * @param persistence the ::MQTTClient_persistence structure.
+ * @param type the type of the persistence implementation. See ::MQTTClient_create.
+ * @param pcontext the context for this persistence implementation. See ::MQTTClient_create.
+ * @return 0 if success, #MQTTCLIENT_PERSISTENCE_ERROR otherwise.
+ */
+#include "StackTrace.h"
+
+int MQTTPersistence_create(MQTTClient_persistence** persistence, int type, void* pcontext)
+{
+	int rc = 0;
+	MQTTClient_persistence* per = NULL;
+
+	FUNC_ENTRY;
+#if !defined(NO_PERSISTENCE)
+	switch (type)
+	{
+		case MQTTCLIENT_PERSISTENCE_NONE :
+			per = NULL;
+			break;
+		case MQTTCLIENT_PERSISTENCE_DEFAULT :
+			per = malloc(sizeof(MQTTClient_persistence));
+			if ( per != NULL )
+			{
+				if ( pcontext != NULL )
+				{
+					per->context = malloc(strlen(pcontext) + 1);
+					strcpy(per->context, pcontext);
+				}
+				else
+					per->context = ".";  /* working directory */
+				/* file system functions */
+				per->popen        = pstopen;
+				per->pclose       = pstclose;
+				per->pput         = pstput;
+				per->pget         = pstget;
+				per->premove      = pstremove;
+				per->pkeys        = pstkeys;
+				per->pclear       = pstclear;
+				per->pcontainskey = pstcontainskey;
+			}
+			else
+				rc = MQTTCLIENT_PERSISTENCE_ERROR;
+			break;
+		case MQTTCLIENT_PERSISTENCE_USER :
+			per = (MQTTClient_persistence *)pcontext;
+			if ( per == NULL || (per != NULL && (per->context == NULL || per->pclear == NULL ||
+				per->pclose == NULL || per->pcontainskey == NULL || per->pget == NULL || per->pkeys == NULL ||
+				per->popen == NULL || per->pput == NULL || per->premove == NULL)) )
+				rc = MQTTCLIENT_PERSISTENCE_ERROR;
+			break;
+		default:
+			rc = MQTTCLIENT_PERSISTENCE_ERROR;
+			break;
+	}
+#endif
+
+	*persistence = per;
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Open persistent store and restore any persisted messages.
+ * @param client the client as ::Clients.
+ * @param serverURI the URI of the remote end.
+ * @return 0 if success, #MQTTCLIENT_PERSISTENCE_ERROR otherwise.
+ */
+int MQTTPersistence_initialize(Clients *c, const char *serverURI)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if ( c->persistence != NULL )
+	{
+		rc = c->persistence->popen(&(c->phandle), c->clientID, serverURI, c->persistence->context);
+		if ( rc == 0 )
+			rc = MQTTPersistence_restore(c);
+	}
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Close persistent store.
+ * @param client the client as ::Clients.
+ * @return 0 if success, #MQTTCLIENT_PERSISTENCE_ERROR otherwise.
+ */
+int MQTTPersistence_close(Clients *c)
+{
+	int rc =0;
+
+	FUNC_ENTRY;
+	if (c->persistence != NULL)
+	{
+		rc = c->persistence->pclose(c->phandle);
+		c->phandle = NULL;
+#if !defined(NO_PERSISTENCE)
+		if ( c->persistence->popen == pstopen )
+			free(c->persistence);
+#endif
+		c->persistence = NULL;
+	}
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+/**
+ * Clears the persistent store.
+ * @param client the client as ::Clients.
+ * @return 0 if success, #MQTTCLIENT_PERSISTENCE_ERROR otherwise.
+ */
+int MQTTPersistence_clear(Clients *c)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if (c->persistence != NULL)
+		rc = c->persistence->pclear(c->phandle);
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Restores the persisted records to the outbound and inbound message queues of the
+ * client.
+ * @param client the client as ::Clients.
+ * @return 0 if success, #MQTTCLIENT_PERSISTENCE_ERROR otherwise.
+ */
+int MQTTPersistence_restore(Clients *c)
+{
+	int rc = 0;
+	char **msgkeys = NULL,
+		 *buffer = NULL;
+	int nkeys, buflen;
+	int i = 0;
+	int msgs_sent = 0;
+	int msgs_rcvd = 0;
+
+	FUNC_ENTRY;
+	if (c->persistence && (rc = c->persistence->pkeys(c->phandle, &msgkeys, &nkeys)) == 0)
+	{
+		while (rc == 0 && i < nkeys)
+		{
+			if (strncmp(msgkeys[i], PERSISTENCE_COMMAND_KEY, strlen(PERSISTENCE_COMMAND_KEY)) == 0 ||
+				strncmp(msgkeys[i], PERSISTENCE_V5_COMMAND_KEY, strlen(PERSISTENCE_V5_COMMAND_KEY)) == 0)
+			{
+				;
+			}
+			else if (strncmp(msgkeys[i], PERSISTENCE_QUEUE_KEY, strlen(PERSISTENCE_QUEUE_KEY)) == 0 ||
+					 strncmp(msgkeys[i], PERSISTENCE_V5_QUEUE_KEY, strlen(PERSISTENCE_V5_QUEUE_KEY)) == 0)
+			{
+				;
+			}
+			else if ((rc = c->persistence->pget(c->phandle, msgkeys[i], &buffer, &buflen)) == 0)
+			{
+				int data_MQTTVersion = MQTTVERSION_3_1_1;
+				char* cur_key = msgkeys[i];
+
+				if (	strncmp(cur_key, PERSISTENCE_V5_PUBLISH_RECEIVED,
+							strlen(PERSISTENCE_V5_PUBLISH_RECEIVED)) == 0)
+				{
+					data_MQTTVersion = MQTTVERSION_5;
+					cur_key = PERSISTENCE_PUBLISH_RECEIVED;
+				}
+				else if (strncmp(cur_key, PERSISTENCE_V5_PUBLISH_SENT,
+							strlen(PERSISTENCE_V5_PUBLISH_SENT)) == 0)
+				{
+					data_MQTTVersion = MQTTVERSION_5;
+					cur_key = PERSISTENCE_PUBLISH_SENT;
+				}
+				else if (strncmp(cur_key, PERSISTENCE_V5_PUBREL,
+							strlen(PERSISTENCE_V5_PUBREL)) == 0)
+				{
+					data_MQTTVersion = MQTTVERSION_5;
+					cur_key = PERSISTENCE_PUBREL;
+				}
+
+				if (data_MQTTVersion == MQTTVERSION_5 && c->MQTTVersion < MQTTVERSION_5)
+				{
+					rc = MQTTCLIENT_PERSISTENCE_ERROR; /* can't restore version 5 data with a version 3 client */
+					goto exit;
+				}
+
+				MQTTPacket* pack = MQTTPersistence_restorePacket(data_MQTTVersion, buffer, buflen);
+				if ( pack != NULL )
+				{
+					if (strncmp(cur_key, PERSISTENCE_PUBLISH_RECEIVED,
+							      strlen(PERSISTENCE_PUBLISH_RECEIVED)) == 0)
+					{
+						Publish* publish = (Publish*)pack;
+						Messages* msg = NULL;
+						publish->MQTTVersion = c->MQTTVersion;
+						msg = MQTTProtocol_createMessage(publish, &msg, publish->header.bits.qos, publish->header.bits.retain);
+						msg->nextMessageType = PUBREL;
+						/* order does not matter for persisted received messages */
+						ListAppend(c->inboundMsgs, msg, msg->len);
+						if (c->MQTTVersion >= MQTTVERSION_5)
+						{
+							free(msg->publish->payload);
+							free(msg->publish->topic);
+						}
+						publish->topic = NULL;
+						MQTTPacket_freePublish(publish);
+						msgs_rcvd++;
+					}
+					else if (strncmp(cur_key, PERSISTENCE_PUBLISH_SENT,
+						               strlen(PERSISTENCE_PUBLISH_SENT)) == 0)
+					{
+						Publish* publish = (Publish*)pack;
+						Messages* msg = NULL;
+						char *key = malloc(MESSAGE_FILENAME_LENGTH + 1);
+
+						publish->MQTTVersion = c->MQTTVersion;
+						if (publish->MQTTVersion >= MQTTVERSION_5)
+							sprintf(key, "%s%d", PERSISTENCE_V5_PUBREL, publish->msgId);
+						else
+							sprintf(key, "%s%d", PERSISTENCE_PUBREL, publish->msgId);
+						msg = MQTTProtocol_createMessage(publish, &msg, publish->header.bits.qos, publish->header.bits.retain);
+						if (c->persistence->pcontainskey(c->phandle, key) == 0)
+							/* PUBLISH Qo2 and PUBREL sent */
+							msg->nextMessageType = PUBCOMP;
+						/* else: PUBLISH QoS1, or PUBLISH QoS2 and PUBREL not sent */
+						/* retry at the first opportunity */
+						msg->lastTouch = 0;
+						MQTTPersistence_insertInOrder(c->outboundMsgs, msg, msg->len);
+						publish->topic = NULL;
+						MQTTPacket_freePublish(publish);
+						free(key);
+						msgs_sent++;
+					}
+					else if (strncmp(cur_key, PERSISTENCE_PUBREL, strlen(PERSISTENCE_PUBREL)) == 0)
+					{
+						/* orphaned PUBRELs ? */
+						Pubrel* pubrel = (Pubrel*)pack;
+						char *key = malloc(MESSAGE_FILENAME_LENGTH + 1);
+
+						pubrel->MQTTVersion = c->MQTTVersion;
+						if (pubrel->MQTTVersion >= MQTTVERSION_5)
+							sprintf(key, "%s%d", PERSISTENCE_V5_PUBLISH_SENT, pubrel->msgId);
+						else
+							sprintf(key, "%s%d", PERSISTENCE_PUBLISH_SENT, pubrel->msgId);
+						if (c->persistence->pcontainskey(c->phandle, key) != 0)
+							rc = c->persistence->premove(c->phandle, msgkeys[i]);
+						free(pubrel);
+						free(key);
+					}
+				}
+				else  /* pack == NULL -> bad persisted record */
+					rc = c->persistence->premove(c->phandle, msgkeys[i]);
+			}
+			if (buffer)
+			{
+				free(buffer);
+				buffer = NULL;
+			}
+			if (msgkeys[i])
+				free(msgkeys[i]);
+			i++;
+		}
+		if (msgkeys)
+			free(msgkeys);
+	}
+	Log(TRACE_MINIMUM, -1, "%d sent messages and %d received messages restored for client %s\n", 
+		msgs_sent, msgs_rcvd, c->clientID);
+	MQTTPersistence_wrapMsgID(c);
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Returns a MQTT packet restored from persisted data.
+ * @param buffer the persisted data.
+ * @param buflen the number of bytes of the data buffer.
+ */
+void* MQTTPersistence_restorePacket(int MQTTVersion, char* buffer, size_t buflen)
+{
+	void* pack = NULL;
+	Header header;
+	int fixed_header_length = 1, ptype, remaining_length = 0;
+	char c;
+	int multiplier = 1;
+	extern pf new_packets[];
+
+	FUNC_ENTRY;
+	header.byte = buffer[0];
+	/* decode the message length according to the MQTT algorithm */
+	do
+	{
+		c = *(++buffer);
+		remaining_length += (c & 127) * multiplier;
+		multiplier *= 128;
+		fixed_header_length++;
+	} while ((c & 128) != 0);
+
+	if ( (fixed_header_length + remaining_length) == buflen )
+	{
+		ptype = header.bits.type;
+		if (ptype >= CONNECT && ptype <= DISCONNECT && new_packets[ptype] != NULL)
+			pack = (*new_packets[ptype])(MQTTVersion, header.byte, ++buffer, remaining_length);
+	}
+
+	FUNC_EXIT;
+	return pack;
+}
+
+
+/**
+ * Inserts the specified message into the list, maintaining message ID order.
+ * @param list the list to insert the message into.
+ * @param content the message to add.
+ * @param size size of the message.
+ */
+void MQTTPersistence_insertInOrder(List* list, void* content, size_t size)
+{
+	ListElement* index = NULL;
+	ListElement* current = NULL;
+
+	FUNC_ENTRY;
+	while(ListNextElement(list, &current) != NULL && index == NULL)
+	{
+		if ( ((Messages*)content)->msgid < ((Messages*)current->content)->msgid )
+			index = current;
+	}
+
+	ListInsert(list, content, size, index);
+	FUNC_EXIT;
+}
+
+
+/**
+ * Adds a record to the persistent store. This function must not be called for QoS0
+ * messages.
+ * @param socket the socket of the client.
+ * @param buf0 fixed header.
+ * @param buf0len length of the fixed header.
+ * @param count number of buffers representing the variable header and/or the payload.
+ * @param buffers the buffers representing the variable header and/or the payload.
+ * @param buflens length of the buffers representing the variable header and/or the payload.
+ * @param htype MQTT packet type - PUBLISH or PUBREL
+ * @param msgId the message ID.
+ * @param scr 0 indicates message in the sending direction; 1 indicates message in the
+ * receiving direction.
+ * @param the MQTT version being used (>= MQTTVERSION_5 means properties included)
+ * @return 0 if success, #MQTTCLIENT_PERSISTENCE_ERROR otherwise.
+ */
+int MQTTPersistence_put(int socket, char* buf0, size_t buf0len, int count,
+						char** buffers, size_t* buflens, int htype, int msgId, int scr, int MQTTVersion)
+{
+	int rc = 0;
+	extern ClientStates* bstate;
+	int nbufs, i;
+	int* lens = NULL;
+	char** bufs = NULL;
+	char *key;
+	Clients* client = NULL;
+
+	FUNC_ENTRY;
+	client = (Clients*)(ListFindItem(bstate->clients, &socket, clientSocketCompare)->content);
+	if (client->persistence != NULL)
+	{
+		key = malloc(MESSAGE_FILENAME_LENGTH + 1);
+		nbufs = 1 + count;
+		lens = (int *)malloc(nbufs * sizeof(int));
+		bufs = (char **)malloc(nbufs * sizeof(char *));
+		lens[0] = (int)buf0len;
+		bufs[0] = buf0;
+		for (i = 0; i < count; i++)
+		{
+			lens[i+1] = (int)buflens[i];
+			bufs[i+1] = buffers[i];
+		}
+
+		/* key */
+		if (scr == 0)
+		{  /* sending */
+			char* key_id = PERSISTENCE_PUBLISH_SENT;
+
+			if (htype == PUBLISH) /* PUBLISH QoS1 and QoS2*/
+			{
+				if (MQTTVersion >= MQTTVERSION_5)
+					key_id = PERSISTENCE_V5_PUBLISH_SENT;
+			}
+			else if (htype == PUBREL) /* PUBREL */
+			{
+				if (MQTTVersion >= MQTTVERSION_5)
+					key_id = PERSISTENCE_V5_PUBREL;
+				else
+					key_id = PERSISTENCE_PUBREL;
+			}
+			sprintf(key, "%s%d", key_id, msgId);
+		}
+		else if (scr == 1)  /* receiving PUBLISH QoS2 */
+		{
+			char* key_id = PERSISTENCE_PUBLISH_RECEIVED;
+
+			if (MQTTVersion >= MQTTVERSION_5)
+				key_id = PERSISTENCE_V5_PUBLISH_RECEIVED;
+			sprintf(key, "%s%d", key_id, msgId);
+		}
+
+		rc = client->persistence->pput(client->phandle, key, nbufs, bufs, lens);
+
+		free(key);
+		free(lens);
+		free(bufs);
+	}
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Deletes a record from the persistent store.
+ * @param client the client as ::Clients.
+ * @param type the type of the persisted record: #PERSISTENCE_PUBLISH_SENT, #PERSISTENCE_PUBREL
+ * or #PERSISTENCE_PUBLISH_RECEIVED.
+ * @param qos the qos field of the message.
+ * @param msgId the message ID.
+ * @return 0 if success, #MQTTCLIENT_PERSISTENCE_ERROR otherwise.
+ */
+int MQTTPersistence_remove(Clients* c, char *type, int qos, int msgId)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if (c->persistence != NULL)
+	{
+		char *key = malloc(MESSAGE_FILENAME_LENGTH + 1);
+		if (strcmp(type, PERSISTENCE_PUBLISH_SENT) == 0 ||
+				strcmp(type, PERSISTENCE_V5_PUBLISH_SENT) == 0)
+		{
+			sprintf(key, "%s%d", PERSISTENCE_V5_PUBLISH_SENT, msgId) ;
+			rc = c->persistence->premove(c->phandle, key);
+			sprintf(key, "%s%d", PERSISTENCE_V5_PUBREL, msgId) ;
+			rc += c->persistence->premove(c->phandle, key);
+			sprintf(key, "%s%d", PERSISTENCE_PUBLISH_SENT, msgId) ;
+			rc += c->persistence->premove(c->phandle, key);
+			sprintf(key, "%s%d", PERSISTENCE_PUBREL, msgId) ;
+			rc += c->persistence->premove(c->phandle, key);
+		}
+		else /* PERSISTENCE_PUBLISH_SENT && qos == 1 */
+		{    /* or PERSISTENCE_PUBLISH_RECEIVED */
+
+			sprintf(key, "%s%d", PERSISTENCE_V5_PUBLISH_RECEIVED, msgId);
+			rc = c->persistence->premove(c->phandle, key);
+			sprintf(key, "%s%d", PERSISTENCE_PUBLISH_RECEIVED, msgId);
+			rc += c->persistence->premove(c->phandle, key);
+		}
+		free(key);
+	}
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Checks whether the message IDs wrapped by looking for the largest gap between two consecutive
+ * message IDs in the outboundMsgs queue.
+ * @param client the client as ::Clients.
+ */
+void MQTTPersistence_wrapMsgID(Clients *client)
+{
+	ListElement* wrapel = NULL;
+	ListElement* current = NULL;
+
+	FUNC_ENTRY;
+	if ( client->outboundMsgs->count > 0 )
+	{
+		int firstMsgID = ((Messages*)client->outboundMsgs->first->content)->msgid;
+		int lastMsgID = ((Messages*)client->outboundMsgs->last->content)->msgid;
+		int gap = MAX_MSG_ID - lastMsgID + firstMsgID;
+		current = ListNextElement(client->outboundMsgs, &current);
+
+		while(ListNextElement(client->outboundMsgs, &current) != NULL)
+		{
+			int curMsgID = ((Messages*)current->content)->msgid;
+			int curPrevMsgID = ((Messages*)current->prev->content)->msgid;
+			int curgap = curMsgID - curPrevMsgID;
+			if ( curgap > gap )
+			{
+				gap = curgap;
+				wrapel = current;
+			}
+		}
+	}
+
+	if ( wrapel != NULL )
+	{
+		/* put wrapel at the beginning of the queue */
+		client->outboundMsgs->first->prev = client->outboundMsgs->last;
+		client->outboundMsgs->last->next = client->outboundMsgs->first;
+		client->outboundMsgs->first = wrapel;
+		client->outboundMsgs->last = wrapel->prev;
+		client->outboundMsgs->first->prev = NULL;
+		client->outboundMsgs->last->next = NULL;
+	}
+	FUNC_EXIT;
+}
+
+
+#if !defined(NO_PERSISTENCE)
+int MQTTPersistence_unpersistQueueEntry(Clients* client, MQTTPersistence_qEntry* qe)
+{
+	int rc = 0;
+	char key[PERSISTENCE_MAX_KEY_LENGTH + 1];
+	
+	FUNC_ENTRY;
+	if (client->MQTTVersion >= MQTTVERSION_5)
+		sprintf(key, "%s%u", PERSISTENCE_V5_QUEUE_KEY, qe->seqno);
+	else
+		sprintf(key, "%s%u", PERSISTENCE_QUEUE_KEY, qe->seqno);
+	if ((rc = client->persistence->premove(client->phandle, key)) != 0)
+		Log(LOG_ERROR, 0, "Error %d removing qEntry from persistence", rc);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+#define MAX_NO_OF_BUFFERS 9
+int MQTTPersistence_persistQueueEntry(Clients* aclient, MQTTPersistence_qEntry* qe)
+{
+	int rc = 0;
+	int bufindex = 0;
+	char key[PERSISTENCE_MAX_KEY_LENGTH + 1];
+	int lens[MAX_NO_OF_BUFFERS];
+	void* bufs[MAX_NO_OF_BUFFERS];
+	int props_allocated = 0;
+		
+	FUNC_ENTRY;
+	bufs[bufindex] = &qe->msg->payloadlen;
+	lens[bufindex++] = sizeof(qe->msg->payloadlen);
+				
+	bufs[bufindex] = qe->msg->payload;
+	lens[bufindex++] = qe->msg->payloadlen;
+		
+	bufs[bufindex] = &qe->msg->qos;
+	lens[bufindex++] = sizeof(qe->msg->qos);
+		
+	bufs[bufindex] = &qe->msg->retained;
+	lens[bufindex++] = sizeof(qe->msg->retained);
+		
+	bufs[bufindex] = &qe->msg->dup;
+	lens[bufindex++] = sizeof(qe->msg->dup);
+				
+	bufs[bufindex] = &qe->msg->msgid;
+	lens[bufindex++] = sizeof(qe->msg->msgid);
+						
+	bufs[bufindex] = qe->topicName;
+	lens[bufindex++] = (int)strlen(qe->topicName) + 1;
+				
+	bufs[bufindex] = &qe->topicLen;
+	lens[bufindex++] = sizeof(qe->topicLen);
+
+	if (aclient->MQTTVersion >= MQTTVERSION_5)  		/* persist properties */
+	{
+		MQTTProperties no_props = MQTTProperties_initializer;
+		MQTTProperties* props = &no_props;
+		int temp_len = 0;
+		char* ptr = NULL;
+
+		if (qe->msg->struct_version >= 1)
+			props = &qe->msg->properties;
+
+		temp_len = MQTTProperties_len(props);
+		ptr = bufs[bufindex] = malloc(temp_len);
+		props_allocated = bufindex;
+		rc = MQTTProperties_write(&ptr, props);
+		lens[bufindex++] = temp_len;
+
+		sprintf(key, "%s%u", PERSISTENCE_V5_QUEUE_KEY, ++aclient->qentry_seqno);
+	}
+	else
+		sprintf(key, "%s%u", PERSISTENCE_QUEUE_KEY, ++aclient->qentry_seqno);
+
+	qe->seqno = aclient->qentry_seqno;
+
+	if ((rc = aclient->persistence->pput(aclient->phandle, key, bufindex, (char**)bufs, lens)) != 0)
+		Log(LOG_ERROR, 0, "Error persisting queue entry, rc %d", rc);
+
+	if (props_allocated != 0)
+		free(bufs[props_allocated]);
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static MQTTPersistence_qEntry* MQTTPersistence_restoreQueueEntry(char* buffer, size_t buflen, int MQTTVersion)
+{
+	MQTTPersistence_qEntry* qe = NULL;
+	char* ptr = buffer;
+	int data_size;
+	
+	FUNC_ENTRY;
+	qe = malloc(sizeof(MQTTPersistence_qEntry));
+	memset(qe, '\0', sizeof(MQTTPersistence_qEntry));
+	
+	qe->msg = malloc(sizeof(MQTTPersistence_message));
+	memset(qe->msg, '\0', sizeof(MQTTPersistence_message));
+	
+	qe->msg->struct_version = 1;
+
+	qe->msg->payloadlen = *(int*)ptr;
+	ptr += sizeof(int);
+	
+	data_size = qe->msg->payloadlen;
+	qe->msg->payload = malloc(data_size);
+	memcpy(qe->msg->payload, ptr, data_size);
+	ptr += data_size;
+	
+	qe->msg->qos = *(int*)ptr;
+	ptr += sizeof(int);
+	
+	qe->msg->retained = *(int*)ptr;
+	ptr += sizeof(int);
+	
+	qe->msg->dup = *(int*)ptr;
+	ptr += sizeof(int);
+	
+	qe->msg->msgid = *(int*)ptr;
+	ptr += sizeof(int);
+	
+	data_size = (int)strlen(ptr) + 1;	
+	qe->topicName = malloc(data_size);
+	strcpy(qe->topicName, ptr);
+	ptr += data_size;
+	
+	qe->topicLen = *(int*)ptr;
+	ptr += sizeof(int);
+
+	if (MQTTVersion >= MQTTVERSION_5 &&
+		MQTTProperties_read(&qe->msg->properties, &ptr, buffer + buflen) != 1)
+			Log(LOG_ERROR, -1, "Error restoring properties from persistence");
+
+	FUNC_EXIT;
+	return qe;
+}
+
+
+static void MQTTPersistence_insertInSeqOrder(List* list, MQTTPersistence_qEntry* qEntry, size_t size)
+{
+	ListElement* index = NULL;
+	ListElement* current = NULL;
+
+	FUNC_ENTRY;
+	while (ListNextElement(list, &current) != NULL && index == NULL)
+	{
+		if (qEntry->seqno < ((MQTTPersistence_qEntry*)current->content)->seqno)
+			index = current;
+	}
+	ListInsert(list, qEntry, size, index);
+	FUNC_EXIT;
+}
+
+
+/**
+ * Restores a queue of messages from persistence to memory
+ * @param c the client as ::Clients - the client object to restore the messages to
+ * @return return code, 0 if successful
+ */
+int MQTTPersistence_restoreMessageQueue(Clients* c)
+{
+	int rc = 0;
+	char **msgkeys;
+	int nkeys;
+	int i = 0;
+	int entries_restored = 0;
+
+	FUNC_ENTRY;
+	if (c->persistence && (rc = c->persistence->pkeys(c->phandle, &msgkeys, &nkeys)) == 0)
+	{
+		while (rc == 0 && i < nkeys)
+		{
+			char *buffer = NULL;
+			int buflen;
+					
+			if (strncmp(msgkeys[i], PERSISTENCE_QUEUE_KEY, strlen(PERSISTENCE_QUEUE_KEY)) != 0 &&
+				strncmp(msgkeys[i], PERSISTENCE_V5_QUEUE_KEY, strlen(PERSISTENCE_V5_QUEUE_KEY)) != 0)
+			{
+				; /* ignore if not a queue entry key */
+			}
+			else if ((rc = c->persistence->pget(c->phandle, msgkeys[i], &buffer, &buflen)) == 0)
+			{
+				int MQTTVersion =
+					(strncmp(msgkeys[i], PERSISTENCE_V5_QUEUE_KEY, strlen(PERSISTENCE_V5_QUEUE_KEY)) == 0)
+					? MQTTVERSION_5 : MQTTVERSION_3_1_1;
+				MQTTPersistence_qEntry* qe = MQTTPersistence_restoreQueueEntry(buffer, buflen, MQTTVersion);
+				
+				if (qe)
+				{	
+					qe->seqno = atoi(strchr(msgkeys[i], '-')+1); /* key format is tag'-'seqno */
+					MQTTPersistence_insertInSeqOrder(c->messageQueue, qe, sizeof(MQTTPersistence_qEntry));
+					free(buffer);
+					c->qentry_seqno = max(c->qentry_seqno, qe->seqno);
+					entries_restored++;
+				}
+			}
+			if (msgkeys[i])
+			{
+				free(msgkeys[i]);
+			}
+			i++;
+		}
+		if (msgkeys != NULL)
+			free(msgkeys);
+	}
+	Log(TRACE_MINIMUM, -1, "%d queued messages restored for client %s", entries_restored, c->clientID);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+#endif
diff --git a/mqtt/src/src/MQTTPersistence.h b/mqtt/src/src/MQTTPersistence.h
new file mode 100644
index 00000000..67d1e664
--- /dev/null
+++ b/mqtt/src/src/MQTTPersistence.h
@@ -0,0 +1,94 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - async client updates
+ *    Ian Craggs - fix for bug 432903 - queue persistence
+ *    Ian Craggs - MQTT V5 updates
+ *******************************************************************************/
+
+#if !defined(MQTTPERSISTENCE_H)
+#define MQTTPERSISTENCE_H
+
+#if defined(__cplusplus)
+ extern "C" {
+#endif
+
+#include "Clients.h"
+#include "MQTTProperties.h"
+
+/** Stem of the key for a sent PUBLISH QoS1 or QoS2 */
+#define PERSISTENCE_PUBLISH_SENT "s-"
+/** Stem of the key for a sent PUBREL */
+#define PERSISTENCE_PUBREL "sc-"
+/** Stem of the key for a received PUBLISH QoS2 */
+#define PERSISTENCE_PUBLISH_RECEIVED "r-"
+
+/** Stem of the key for a sent MQTT V5 PUBLISH QoS1 or QoS2 */
+#define PERSISTENCE_V5_PUBLISH_SENT "s5-"
+/** Stem of the key for a sent MQTT V5 PUBREL */
+#define PERSISTENCE_V5_PUBREL "sc5-"
+/** Stem of the key for a received MQTT V5 PUBLISH QoS2 */
+#define PERSISTENCE_V5_PUBLISH_RECEIVED "r5-"
+
+/** Stem of the key for an async client command */
+#define PERSISTENCE_COMMAND_KEY "c-"
+/** Stem of the key for an MQTT V5 async client command */
+#define PERSISTENCE_V5_COMMAND_KEY "c5-"
+/** Stem of the key for an async client message queue */
+#define PERSISTENCE_QUEUE_KEY "q-"
+/** Stem of the key for an MQTT V5 message queue */
+#define PERSISTENCE_V5_QUEUE_KEY "q5-"
+#define PERSISTENCE_MAX_KEY_LENGTH 8
+
+int MQTTPersistence_create(MQTTClient_persistence** per, int type, void* pcontext);
+int MQTTPersistence_initialize(Clients* c, const char* serverURI);
+int MQTTPersistence_close(Clients* c);
+int MQTTPersistence_clear(Clients* c);
+int MQTTPersistence_restore(Clients* c);
+void* MQTTPersistence_restorePacket(int MQTTVersion, char* buffer, size_t buflen);
+void MQTTPersistence_insertInOrder(List* list, void* content, size_t size);
+int MQTTPersistence_put(int socket, char* buf0, size_t buf0len, int count, 
+						char** buffers, size_t* buflens, int htype, int msgId, int scr, int MQTTVersion);
+int MQTTPersistence_remove(Clients* c, char* type, int qos, int msgId);
+void MQTTPersistence_wrapMsgID(Clients *c);
+
+typedef struct
+{
+	char struct_id[4];
+	int struct_version;
+	int payloadlen;
+	void* payload;
+	int qos;
+	int retained;
+	int dup;
+	int msgid;
+	MQTTProperties properties;
+} MQTTPersistence_message;
+
+typedef struct
+{
+	MQTTPersistence_message* msg;
+	char* topicName;
+	int topicLen;
+	unsigned int seqno; /* only used on restore */
+} MQTTPersistence_qEntry;
+
+int MQTTPersistence_unpersistQueueEntry(Clients* client, MQTTPersistence_qEntry* qe);
+int MQTTPersistence_persistQueueEntry(Clients* aclient, MQTTPersistence_qEntry* qe);
+int MQTTPersistence_restoreMessageQueue(Clients* c);
+#ifdef __cplusplus
+     }
+#endif
+
+#endif
diff --git a/mqtt/src/src/MQTTPersistenceDefault.c b/mqtt/src/src/MQTTPersistenceDefault.c
new file mode 100644
index 00000000..af259525
--- /dev/null
+++ b/mqtt/src/src/MQTTPersistenceDefault.c
@@ -0,0 +1,852 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - async client updates
+ *    Ian Craggs - fix for bug 484496
+ *    Ian Craggs - fix for issue 285
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief A file system based persistence implementation.
+ *
+ * A directory is specified when the MQTT client is created. When the persistence is then
+ * opened (see ::Persistence_open), a sub-directory is made beneath the base for this
+ * particular client ID and connection key. This allows one persistence base directory to
+ * be shared by multiple clients.
+ *
+ */
+
+#if !defined(NO_PERSISTENCE)
+
+#include "OsWrapper.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <errno.h>
+
+#if defined(WIN32) || defined(WIN64)
+	#include <direct.h>
+	/* Windows doesn't have strtok_r, so remap it to strtok */
+	#define strtok_r( A, B, C ) strtok( A, B )
+	int keysWin32(char *, char ***, int *);
+	int clearWin32(char *);
+	int containskeyWin32(char *, char *);
+#else
+	#include <sys/stat.h>
+	#include <dirent.h>
+	#include <unistd.h>
+	int keysUnix(char *, char ***, int *);
+	int clearUnix(char *);
+	int containskeyUnix(char *, char *);
+#endif
+
+#include "MQTTClientPersistence.h"
+#include "MQTTPersistenceDefault.h"
+#include "StackTrace.h"
+#include "Heap.h"
+
+/** Create persistence directory for the client: context/clientID-serverURI.
+ *  See ::Persistence_open
+ */
+
+int pstopen(void **handle, const char* clientID, const char* serverURI, void* context)
+{
+	int rc = 0;
+	char *dataDir = context;
+	char *clientDir;
+	char *pToken = NULL;
+	char *save_ptr = NULL;
+	char *pCrtDirName = NULL;
+	char *pTokDirName = NULL;
+	char *perserverURI = NULL, *ptraux;
+
+	FUNC_ENTRY;
+	/* Note that serverURI=address:port, but ":" not allowed in Windows directories */
+	perserverURI = malloc(strlen(serverURI) + 1);
+	strcpy(perserverURI, serverURI);
+	while ((ptraux = strstr(perserverURI, ":")) != NULL)
+		*ptraux = '-' ;
+
+	/* consider '/'  +  '-'  +  '\0' */
+	clientDir = malloc(strlen(dataDir) + strlen(clientID) + strlen(perserverURI) + 3);
+	sprintf(clientDir, "%s/%s-%s", dataDir, clientID, perserverURI);
+
+
+	/* create clientDir directory */
+
+	/* pCrtDirName - holds the directory name we are currently trying to create.           */
+	/*               This gets built up level by level untipwdl the full path name is created.*/
+	/* pTokDirName - holds the directory name that gets used by strtok.         */
+	pCrtDirName = (char*)malloc( strlen(clientDir) + 1 );
+	pTokDirName = (char*)malloc( strlen(clientDir) + 1 );
+	strcpy( pTokDirName, clientDir );
+
+	/* If first character is directory separator, make sure it's in the created directory name #285 */
+	if (*pTokDirName == '/' || *pTokDirName == '\\')
+	{
+		*pCrtDirName = *pTokDirName;
+		pToken = strtok_r( pTokDirName + 1, "\\/", &save_ptr );
+		strcpy( pCrtDirName + 1, pToken );
+	}
+	else
+	{
+		pToken = strtok_r( pTokDirName, "\\/", &save_ptr );
+		strcpy( pCrtDirName, pToken );
+	}
+
+	rc = pstmkdir( pCrtDirName );
+	pToken = strtok_r( NULL, "\\/", &save_ptr );
+	while ( (pToken != NULL) && (rc == 0) )
+	{
+		/* Append the next directory level and try to create it */
+		strcat( pCrtDirName, "/" );
+		strcat( pCrtDirName, pToken );
+		rc = pstmkdir( pCrtDirName );
+		pToken = strtok_r( NULL, "\\/", &save_ptr );
+	}
+
+	*handle = clientDir;
+
+	free(pTokDirName);
+	free(pCrtDirName);
+	free(perserverURI);
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+/** Function to create a directory.
+ * Returns 0 on success or if the directory already exists.
+ */
+int pstmkdir( char *pPathname )
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+#if defined(WIN32) || defined(WIN64)
+	if ( _mkdir( pPathname ) != 0 )
+	{
+#else
+	/* Create a directory with read, write and execute access for the owner and read access for the group */
+#if !defined(_WRS_KERNEL)
+	if ( mkdir( pPathname, S_IRWXU | S_IRGRP ) != 0 )
+#else
+	if ( mkdir( pPathname ) != 0 )
+#endif /* !defined(_WRS_KERNEL) */
+	{
+#endif
+		if ( errno != EEXIST )
+			rc = MQTTCLIENT_PERSISTENCE_ERROR;
+	}
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+
+/** Write wire message to the client persistence directory.
+ *  See ::Persistence_put
+ */
+int pstput(void* handle, char* key, int bufcount, char* buffers[], int buflens[])
+{
+	int rc = 0;
+	char *clientDir = handle;
+	char *file;
+	FILE *fp;
+	size_t bytesWritten = 0,
+	       bytesTotal = 0;
+	int i;
+
+	FUNC_ENTRY;
+	if (clientDir == NULL)
+	{
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+		goto exit;
+	}
+
+	/* consider '/' + '\0' */
+	file = malloc(strlen(clientDir) + strlen(key) + strlen(MESSAGE_FILENAME_EXTENSION) + 2 );
+	sprintf(file, "%s/%s%s", clientDir, key, MESSAGE_FILENAME_EXTENSION);
+
+	fp = fopen(file, "wb");
+	if ( fp != NULL )
+	{
+		for(i=0; i<bufcount; i++)
+		{
+			bytesTotal += buflens[i];
+			bytesWritten += fwrite(buffers[i], sizeof(char), buflens[i], fp );
+		}
+		fclose(fp);
+		fp = NULL;
+	} else
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+
+	if (bytesWritten != bytesTotal)
+	{
+		pstremove(handle, key);
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+	}
+
+	free(file);
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+};
+
+
+/** Retrieve a wire message from the client persistence directory.
+ *  See ::Persistence_get
+ */
+int pstget(void* handle, char* key, char** buffer, int* buflen)
+{
+	int rc = 0;
+	FILE *fp;
+	char *clientDir = handle;
+	char *file;
+	char *buf;
+	unsigned long fileLen = 0;
+	unsigned long bytesRead = 0;
+
+	FUNC_ENTRY;
+	if (clientDir == NULL)
+	{
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+		goto exit;
+	}
+
+	/* consider '/' + '\0' */
+	file = malloc(strlen(clientDir) + strlen(key) + strlen(MESSAGE_FILENAME_EXTENSION) + 2);
+	sprintf(file, "%s/%s%s", clientDir, key, MESSAGE_FILENAME_EXTENSION);
+
+	fp = fopen(file, "rb");
+	if ( fp != NULL )
+	{
+		fseek(fp, 0, SEEK_END);
+		fileLen = ftell(fp);
+		fseek(fp, 0, SEEK_SET);
+		buf=(char *)malloc(fileLen);
+		bytesRead = (int)fread(buf, sizeof(char), fileLen, fp);
+		*buffer = buf;
+		*buflen = bytesRead;
+		if ( bytesRead != fileLen )
+			rc = MQTTCLIENT_PERSISTENCE_ERROR;
+		fclose(fp);
+		fp = NULL;
+	} else
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+
+	free(file);
+	/* the caller must free buf */
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+
+/** Delete a persisted message from the client persistence directory.
+ *  See ::Persistence_remove
+ */
+int pstremove(void* handle, char* key)
+{
+	int rc = 0;
+	char *clientDir = handle;
+	char *file;
+
+	FUNC_ENTRY;
+	if (clientDir == NULL)
+	{
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+		goto exit;
+	}
+
+	/* consider '/' + '\0' */
+	file = malloc(strlen(clientDir) + strlen(key) + strlen(MESSAGE_FILENAME_EXTENSION) + 2);
+	sprintf(file, "%s/%s%s", clientDir, key, MESSAGE_FILENAME_EXTENSION);
+
+#if defined(WIN32) || defined(WIN64)
+	if ( _unlink(file) != 0 )
+	{
+#else
+	if ( unlink(file) != 0 )
+	{
+#endif
+		if ( errno != ENOENT )
+			rc = MQTTCLIENT_PERSISTENCE_ERROR;
+	}
+
+	free(file);
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/** Delete client persistence directory (if empty).
+ *  See ::Persistence_close
+ */
+int pstclose(void* handle)
+{
+	int rc = 0;
+	char *clientDir = handle;
+
+	FUNC_ENTRY;
+	if (clientDir == NULL)
+	{
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+		goto exit;
+	}
+
+#if defined(WIN32) || defined(WIN64)
+	if ( _rmdir(clientDir) != 0 )
+	{
+#else
+	if ( rmdir(clientDir) != 0 )
+	{
+#endif
+		if ( errno != ENOENT && errno != ENOTEMPTY )
+			rc = MQTTCLIENT_PERSISTENCE_ERROR;
+	}
+
+	free(clientDir);
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/** Returns whether if a wire message is persisted in the client persistence directory.
+ * See ::Persistence_containskey
+ */
+int pstcontainskey(void *handle, char *key)
+{
+	int rc = 0;
+	char *clientDir = handle;
+
+	FUNC_ENTRY;
+	if (clientDir == NULL)
+	{
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+		goto exit;
+	}
+
+#if defined(WIN32) || defined(WIN64)
+	rc = containskeyWin32(clientDir, key);
+#else
+	rc = containskeyUnix(clientDir, key);
+#endif
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+#if defined(WIN32) || defined(WIN64)
+int containskeyWin32(char *dirname, char *key)
+{
+	int notFound = MQTTCLIENT_PERSISTENCE_ERROR;
+	int fFinished = 0;
+	char *filekey, *ptraux;
+	char dir[MAX_PATH+1];
+	WIN32_FIND_DATAA FileData;
+	HANDLE hDir;
+
+	FUNC_ENTRY;
+	sprintf(dir, "%s/*", dirname);
+
+	hDir = FindFirstFileA(dir, &FileData);
+	if (hDir != INVALID_HANDLE_VALUE)
+	{
+		while (!fFinished)
+		{
+			if (FileData.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)
+			{
+				filekey = malloc(strlen(FileData.cFileName) + 1);
+				strcpy(filekey, FileData.cFileName);
+				ptraux = strstr(filekey, MESSAGE_FILENAME_EXTENSION);
+				if ( ptraux != NULL )
+					*ptraux = '\0' ;
+				if(strcmp(filekey, key) == 0)
+				{
+					notFound = 0;
+					fFinished = 1;
+				}
+				free(filekey);
+			}
+			if (!FindNextFileA(hDir, &FileData))
+			{
+				if (GetLastError() == ERROR_NO_MORE_FILES)
+					fFinished = 1;
+			}
+		}
+		FindClose(hDir);
+	}
+
+	FUNC_EXIT_RC(notFound);
+	return notFound;
+}
+#else
+int containskeyUnix(char *dirname, char *key)
+{
+	int notFound = MQTTCLIENT_PERSISTENCE_ERROR;
+	char *filekey, *ptraux;
+	DIR *dp;
+	struct dirent *dir_entry;
+	struct stat stat_info;
+
+	FUNC_ENTRY;
+	if((dp = opendir(dirname)) != NULL)
+	{
+		while((dir_entry = readdir(dp)) != NULL && notFound)
+		{
+			char* filename = malloc(strlen(dirname) + strlen(dir_entry->d_name) + 2);
+			sprintf(filename, "%s/%s", dirname, dir_entry->d_name);
+			lstat(filename, &stat_info);
+			free(filename);
+			if(S_ISREG(stat_info.st_mode))
+			{
+				filekey = malloc(strlen(dir_entry->d_name) + 1);
+				strcpy(filekey, dir_entry->d_name);
+				ptraux = strstr(filekey, MESSAGE_FILENAME_EXTENSION);
+				if ( ptraux != NULL )
+					*ptraux = '\0' ;
+				if(strcmp(filekey, key) == 0)
+					notFound = 0;
+				free(filekey);
+			}
+		}
+		closedir(dp);
+	}
+
+	FUNC_EXIT_RC(notFound);
+	return notFound;
+}
+#endif
+
+
+/** Delete all the persisted message in the client persistence directory.
+ * See ::Persistence_clear
+ */
+int pstclear(void *handle)
+{
+	int rc = 0;
+	char *clientDir = handle;
+
+	FUNC_ENTRY;
+	if (clientDir == NULL)
+	{
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+		goto exit;
+	}
+
+#if defined(WIN32) || defined(WIN64)
+	rc = clearWin32(clientDir);
+#else
+	rc = clearUnix(clientDir);
+#endif
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+#if defined(WIN32) || defined(WIN64)
+int clearWin32(char *dirname)
+{
+	int rc = 0;
+	int fFinished = 0;
+	char *file;
+	char dir[MAX_PATH+1];
+	WIN32_FIND_DATAA FileData;
+	HANDLE hDir;
+
+	FUNC_ENTRY;
+	sprintf(dir, "%s/*", dirname);
+
+	hDir = FindFirstFileA(dir, &FileData);
+	if (hDir != INVALID_HANDLE_VALUE)
+	{
+		while (!fFinished)
+		{
+			if (FileData.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)
+			{
+				file = malloc(strlen(dirname) + strlen(FileData.cFileName) + 2);
+				sprintf(file, "%s/%s", dirname, FileData.cFileName);
+				rc = remove(file);
+				free(file);
+				if ( rc != 0 )
+				{
+					rc = MQTTCLIENT_PERSISTENCE_ERROR;
+					break;
+				}
+			}
+			if (!FindNextFileA(hDir, &FileData))
+			{
+				if (GetLastError() == ERROR_NO_MORE_FILES)
+					fFinished = 1;
+			}
+		}
+		FindClose(hDir);
+	} else
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+#else
+int clearUnix(char *dirname)
+{
+	int rc = 0;
+	DIR *dp;
+	struct dirent *dir_entry;
+	struct stat stat_info;
+
+	FUNC_ENTRY;
+	if((dp = opendir(dirname)) != NULL)
+	{
+		while((dir_entry = readdir(dp)) != NULL && rc == 0)
+		{
+			lstat(dir_entry->d_name, &stat_info);
+			if(S_ISREG(stat_info.st_mode))
+			{
+				if (remove(dir_entry->d_name) != 0 && errno != ENOENT)
+					rc = MQTTCLIENT_PERSISTENCE_ERROR;
+			}
+		}
+		closedir(dp);
+	} else
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+#endif
+
+
+/** Returns the keys (file names w/o the extension) in the client persistence directory.
+ *  See ::Persistence_keys
+ */
+int pstkeys(void *handle, char ***keys, int *nkeys)
+{
+	int rc = 0;
+	char *clientDir = handle;
+
+	FUNC_ENTRY;
+	if (clientDir == NULL)
+	{
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+		goto exit;
+	}
+
+#if defined(WIN32) || defined(WIN64)
+	rc = keysWin32(clientDir, keys, nkeys);
+#else
+	rc = keysUnix(clientDir, keys, nkeys);
+#endif
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+#if defined(WIN32) || defined(WIN64)
+int keysWin32(char *dirname, char ***keys, int *nkeys)
+{
+	int rc = 0;
+	char **fkeys = NULL;
+	int nfkeys = 0;
+	char dir[MAX_PATH+1];
+	WIN32_FIND_DATAA FileData;
+	HANDLE hDir;
+	int fFinished = 0;
+	char *ptraux;
+	int i;
+
+	FUNC_ENTRY;
+	sprintf(dir, "%s/*", dirname);
+
+	/* get number of keys */
+	hDir = FindFirstFileA(dir, &FileData);
+	if (hDir != INVALID_HANDLE_VALUE)
+	{
+		while (!fFinished)
+		{
+			if (FileData.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)
+				nfkeys++;
+			if (!FindNextFileA(hDir, &FileData))
+			{
+				if (GetLastError() == ERROR_NO_MORE_FILES)
+					fFinished = 1;
+			}
+		}
+		FindClose(hDir);
+	} else
+	{
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+		goto exit;
+	}
+
+	if (nfkeys != 0 )
+		fkeys = (char **)malloc(nfkeys * sizeof(char *));
+
+	/* copy the keys */
+	hDir = FindFirstFileA(dir, &FileData);
+	if (hDir != INVALID_HANDLE_VALUE)
+	{
+		fFinished = 0;
+		i = 0;
+		while (!fFinished)
+		{
+			if (FileData.dwFileAttributes & FILE_ATTRIBUTE_ARCHIVE)
+			{
+				fkeys[i] = malloc(strlen(FileData.cFileName) + 1);
+				strcpy(fkeys[i], FileData.cFileName);
+				ptraux = strstr(fkeys[i], MESSAGE_FILENAME_EXTENSION);
+				if ( ptraux != NULL )
+					*ptraux = '\0' ;
+				i++;
+			}
+			if (!FindNextFileA(hDir, &FileData))
+			{
+				if (GetLastError() == ERROR_NO_MORE_FILES)
+					fFinished = 1;
+			}
+		}
+		FindClose(hDir);
+	} else
+	{
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+		goto exit;
+	}
+
+	*nkeys = nfkeys;
+	*keys = fkeys;
+	/* the caller must free keys */
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+#else
+int keysUnix(char *dirname, char ***keys, int *nkeys)
+{
+	int rc = 0;
+	char **fkeys = NULL;
+	int nfkeys = 0;
+	char *ptraux;
+	int i;
+	DIR *dp;
+	struct dirent *dir_entry;
+	struct stat stat_info;
+
+	FUNC_ENTRY;
+	/* get number of keys */
+	if((dp = opendir(dirname)) != NULL)
+	{
+		while((dir_entry = readdir(dp)) != NULL)
+		{
+			char* temp = malloc(strlen(dirname)+strlen(dir_entry->d_name)+2);
+
+			sprintf(temp, "%s/%s", dirname, dir_entry->d_name);
+			if (lstat(temp, &stat_info) == 0 && S_ISREG(stat_info.st_mode))
+				nfkeys++;
+			free(temp);
+		}
+		closedir(dp);
+	} else
+	{
+		rc = MQTTCLIENT_PERSISTENCE_ERROR;
+		goto exit;
+	}
+
+	if (nfkeys != 0)
+	{
+		fkeys = (char **)malloc(nfkeys * sizeof(char *));
+
+		/* copy the keys */
+		if((dp = opendir(dirname)) != NULL)
+		{
+			i = 0;
+			while((dir_entry = readdir(dp)) != NULL)
+			{
+				char* temp = malloc(strlen(dirname)+strlen(dir_entry->d_name)+2);
+
+				sprintf(temp, "%s/%s", dirname, dir_entry->d_name);
+				if (lstat(temp, &stat_info) == 0 && S_ISREG(stat_info.st_mode))
+				{
+					fkeys[i] = malloc(strlen(dir_entry->d_name) + 1);
+					strcpy(fkeys[i], dir_entry->d_name);
+					ptraux = strstr(fkeys[i], MESSAGE_FILENAME_EXTENSION);
+					if ( ptraux != NULL )
+						*ptraux = '\0' ;
+					i++;
+				}
+				free(temp);
+			}
+			closedir(dp);
+		} else
+		{
+			rc = MQTTCLIENT_PERSISTENCE_ERROR;
+			goto exit;
+		}
+	}
+
+	*nkeys = nfkeys;
+	*keys = fkeys;
+	/* the caller must free keys */
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+#endif
+
+
+
+#if defined(UNIT_TESTS)
+int main (int argc, char *argv[])
+{
+#define MSTEM "m-"
+#define NMSGS 10
+#define NBUFS 4
+#define NDEL 2
+#define RC !rc ? "(Success)" : "(Failed) "
+
+	int rc;
+	char *handle;
+	char *perdir = ".";
+	const char *clientID = "TheUTClient";
+	const char *serverURI = "127.0.0.1:1883";
+
+	char *stem = MSTEM;
+	int msgId, i;
+	int nm[NDEL] = {5 , 8};  /* msgIds to get and remove */
+
+	char *key;
+	char **keys;
+	int nkeys;
+	char *buffer, *buff;
+	int buflen;
+
+	int nbufs = NBUFS;
+	char *bufs[NBUFS] = {"m0", "mm1", "mmm2" , "mmmm3"};  /* message content */
+	int buflens[NBUFS];
+	for(i=0;i<nbufs;i++)
+		buflens[i]=strlen(bufs[i]);
+
+	/* open */
+	/* printf("Persistence directory : %s\n", perdir); */
+	rc = pstopen((void**)&handle, clientID, serverURI, perdir);
+	printf("%s Persistence directory for client %s : %s\n", RC, clientID, handle);
+
+	/* put */
+	for(msgId=0;msgId<NMSGS;msgId++)
+	{
+		key = malloc(MESSAGE_FILENAME_LENGTH + 1);
+		sprintf(key, "%s%d", stem, msgId);
+		rc = pstput(handle, key, nbufs, bufs, buflens);
+		printf("%s Adding message %s\n", RC, key);
+		free(key);
+	}
+
+	/* keys ,ie, list keys added */
+	rc = pstkeys(handle, &keys, &nkeys);
+	printf("%s Found %d messages persisted in %s\n", RC, nkeys, handle);
+	for(i=0;i<nkeys;i++)
+		printf("%13s\n", keys[i]);
+
+	if (keys !=NULL)
+		free(keys);
+
+	/* containskey */
+	for(i=0;i<NDEL;i++)
+	{
+		key = malloc(MESSAGE_FILENAME_LENGTH + 1);
+		sprintf(key, "%s%d", stem, nm[i]);
+		rc = pstcontainskey(handle, key);
+		printf("%s Message %s is persisted ?\n", RC, key);
+		free(key);
+	}
+
+	/* get && remove*/
+	for(i=0;i<NDEL;i++)
+	{
+		key = malloc(MESSAGE_FILENAME_LENGTH + 1);
+		sprintf(key, "%s%d", stem, nm[i]);
+		rc = pstget(handle, key, &buffer, &buflen);
+		buff = malloc(buflen+1);
+		memcpy(buff, buffer, buflen);
+		buff[buflen] = '\0';
+		printf("%s Retrieving message %s : %s\n", RC, key, buff);
+		rc = pstremove(handle, key);
+		printf("%s Removing message %s\n", RC, key);
+		free(key);
+		free(buff);
+		free(buffer);
+	}
+
+	/* containskey */
+	for(i=0;i<NDEL;i++)
+	{
+		key = malloc(MESSAGE_FILENAME_LENGTH + 1);
+		sprintf(key, "%s%d", stem, nm[i]);
+		rc = pstcontainskey(handle, key);
+		printf("%s Message %s is persisted ?\n", RC, key);
+		free(key);
+	}
+
+	/* keys ,ie, list keys added */
+	rc = pstkeys(handle, &keys, &nkeys);
+	printf("%s Found %d messages persisted in %s\n", RC, nkeys, handle);
+	for(i=0;i<nkeys;i++)
+		printf("%13s\n", keys[i]);
+
+	if (keys != NULL)
+		free(keys);
+
+
+	/* close -> it will fail, since client persistence directory is not empty */
+	rc = pstclose(&handle);
+	printf("%s Closing client persistence directory for client %s\n", RC, clientID);
+
+	/* clear */
+	rc = pstclear(handle);
+	printf("%s Deleting all persisted messages in %s\n", RC, handle);
+
+	/* keys ,ie, list keys added */
+	rc = pstkeys(handle, &keys, &nkeys);
+	printf("%s Found %d messages persisted in %s\n", RC, nkeys, handle);
+	for(i=0;i<nkeys;i++)
+		printf("%13s\n", keys[i]);
+
+	if ( keys != NULL )
+		free(keys);
+
+	/* close */
+	rc = pstclose(&handle);
+	printf("%s Closing client persistence directory for client %s\n", RC, clientID);
+}
+#endif
+
+
+#endif /* NO_PERSISTENCE */
diff --git a/mqtt/src/src/MQTTPersistenceDefault.h b/mqtt/src/src/MQTTPersistenceDefault.h
new file mode 100644
index 00000000..9c1034cf
--- /dev/null
+++ b/mqtt/src/src/MQTTPersistenceDefault.h
@@ -0,0 +1,38 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#if !defined(MQTTPERSISTENCEDEFAULT_H)
+#define MQTTPERSISTENCEDEFAULT_H
+
+/** 8.3 filesystem */
+#define MESSAGE_FILENAME_LENGTH 8    
+/** Extension of the filename */
+#define MESSAGE_FILENAME_EXTENSION ".msg"
+
+/* prototypes of the functions for the default file system persistence */
+int pstopen(void** handle, const char* clientID, const char* serverURI, void* context); 
+int pstclose(void* handle); 
+int pstput(void* handle, char* key, int bufcount, char* buffers[], int buflens[]); 
+int pstget(void* handle, char* key, char** buffer, int* buflen); 
+int pstremove(void* handle, char* key); 
+int pstkeys(void* handle, char*** keys, int* nkeys); 
+int pstclear(void* handle); 
+int pstcontainskey(void* handle, char* key);
+
+int pstmkdir(char *pPathname);
+
+#endif
+
diff --git a/mqtt/src/src/MQTTProperties.c b/mqtt/src/src/MQTTProperties.c
new file mode 100644
index 00000000..876128be
--- /dev/null
+++ b/mqtt/src/src/MQTTProperties.c
@@ -0,0 +1,517 @@
+/*******************************************************************************
+ * Copyright (c) 2017, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#include "MQTTProperties.h"
+
+#include "MQTTPacket.h"
+#include "MQTTProtocolClient.h"
+#include "Heap.h"
+#include "StackTrace.h"
+
+#include <memory.h>
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+static struct nameToType
+{
+  enum MQTTPropertyCodes name;
+  enum MQTTPropertyTypes type;
+} namesToTypes[] =
+{
+  {MQTTPROPERTY_CODE_PAYLOAD_FORMAT_INDICATOR, MQTTPROPERTY_TYPE_BYTE},
+  {MQTTPROPERTY_CODE_MESSAGE_EXPIRY_INTERVAL, MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER},
+  {MQTTPROPERTY_CODE_CONTENT_TYPE, MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING},
+  {MQTTPROPERTY_CODE_RESPONSE_TOPIC, MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING},
+  {MQTTPROPERTY_CODE_CORRELATION_DATA, MQTTPROPERTY_TYPE_BINARY_DATA},
+  {MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER, MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER},
+  {MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL, MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER},
+  {MQTTPROPERTY_CODE_ASSIGNED_CLIENT_IDENTIFER, MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING},
+  {MQTTPROPERTY_CODE_SERVER_KEEP_ALIVE, MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER},
+  {MQTTPROPERTY_CODE_AUTHENTICATION_METHOD, MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING},
+  {MQTTPROPERTY_CODE_AUTHENTICATION_DATA, MQTTPROPERTY_TYPE_BINARY_DATA},
+  {MQTTPROPERTY_CODE_REQUEST_PROBLEM_INFORMATION, MQTTPROPERTY_TYPE_BYTE},
+  {MQTTPROPERTY_CODE_WILL_DELAY_INTERVAL, MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER},
+  {MQTTPROPERTY_CODE_REQUEST_RESPONSE_INFORMATION, MQTTPROPERTY_TYPE_BYTE},
+  {MQTTPROPERTY_CODE_RESPONSE_INFORMATION, MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING},
+  {MQTTPROPERTY_CODE_SERVER_REFERENCE, MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING},
+  {MQTTPROPERTY_CODE_REASON_STRING, MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING},
+  {MQTTPROPERTY_CODE_RECEIVE_MAXIMUM, MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER},
+  {MQTTPROPERTY_CODE_TOPIC_ALIAS_MAXIMUM, MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER},
+  {MQTTPROPERTY_CODE_TOPIC_ALIAS, MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER},
+  {MQTTPROPERTY_CODE_MAXIMUM_QOS, MQTTPROPERTY_TYPE_BYTE},
+  {MQTTPROPERTY_CODE_RETAIN_AVAILABLE, MQTTPROPERTY_TYPE_BYTE},
+  {MQTTPROPERTY_CODE_USER_PROPERTY, MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR},
+  {MQTTPROPERTY_CODE_MAXIMUM_PACKET_SIZE, MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER},
+  {MQTTPROPERTY_CODE_WILDCARD_SUBSCRIPTION_AVAILABLE, MQTTPROPERTY_TYPE_BYTE},
+  {MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIERS_AVAILABLE, MQTTPROPERTY_TYPE_BYTE},
+  {MQTTPROPERTY_CODE_SHARED_SUBSCRIPTION_AVAILABLE, MQTTPROPERTY_TYPE_BYTE}
+};
+
+
+static char* datadup(const MQTTLenString* str)
+{
+	char* temp = malloc(str->len);
+	memcpy(temp, str->data, str->len);
+	return temp;
+}
+
+
+int MQTTProperty_getType(enum MQTTPropertyCodes value)
+{
+  int i, rc = -1;
+
+  for (i = 0; i < ARRAY_SIZE(namesToTypes); ++i)
+  {
+    if (namesToTypes[i].name == value)
+    {
+      rc = namesToTypes[i].type;
+      break;
+    }
+  }
+  return rc;
+}
+
+
+int MQTTProperties_len(MQTTProperties* props)
+{
+  /* properties length is an mbi */
+  return (props == NULL) ? 1 : props->length + MQTTPacket_VBIlen(props->length);
+}
+
+
+int MQTTProperties_add(MQTTProperties* props, const MQTTProperty* prop)
+{
+  int rc = 0, type;
+
+  if ((type = MQTTProperty_getType(prop->identifier)) < 0)
+  {
+	/*StackTrace_printStack(stdout);*/
+    rc = MQTT_INVALID_PROPERTY_ID;
+    goto exit;
+  }
+  else if (props->array == NULL)
+  {
+    props->max_count = 10;
+    props->array = malloc(sizeof(MQTTProperty) * props->max_count);
+  }
+  else if (props->count == props->max_count)
+  {
+    props->max_count += 10;
+    props->array = realloc(props->array, sizeof(MQTTProperty) * props->max_count);
+  }
+
+  if (props->array)
+  {
+    int len = 0;
+
+    props->array[props->count++] = *prop;
+    /* calculate length */
+    switch (type)
+    {
+      case MQTTPROPERTY_TYPE_BYTE:
+        len = 1;
+        break;
+      case MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER:
+        len = 2;
+        break;
+      case MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER:
+        len = 4;
+        break;
+      case MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER:
+        len = MQTTPacket_VBIlen(prop->value.integer4);
+        break;
+      case MQTTPROPERTY_TYPE_BINARY_DATA:
+      case MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING:
+      case MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR:
+        len = 2 + prop->value.data.len;
+        props->array[props->count-1].value.data.data = datadup(&prop->value.data);
+        if (type == MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR)
+        {
+          len += 2 + prop->value.value.len;
+          props->array[props->count-1].value.value.data = datadup(&prop->value.value);
+        }
+        break;
+    }
+    props->length += len + 1; /* add identifier byte */
+  }
+
+exit:
+  return rc;
+}
+
+
+int MQTTProperty_write(char** pptr, MQTTProperty* prop)
+{
+  int rc = -1,
+      type = -1;
+
+  type = MQTTProperty_getType(prop->identifier);
+  if (type >= MQTTPROPERTY_TYPE_BYTE && type <= MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR)
+  {
+    writeChar(pptr, prop->identifier);
+    switch (type)
+    {
+      case MQTTPROPERTY_TYPE_BYTE:
+        writeChar(pptr, prop->value.byte);
+        rc = 1;
+        break;
+      case MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER:
+        writeInt(pptr, prop->value.integer2);
+        rc = 2;
+        break;
+      case MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER:
+        writeInt4(pptr, prop->value.integer4);
+        rc = 4;
+        break;
+      case MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER:
+        rc = MQTTPacket_encode(*pptr, prop->value.integer4);
+        *pptr += rc;
+        break;
+      case MQTTPROPERTY_TYPE_BINARY_DATA:
+      case MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING:
+        writeMQTTLenString(pptr, prop->value.data);
+        rc = prop->value.data.len + 2; /* include length field */
+        break;
+      case MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR:
+        writeMQTTLenString(pptr, prop->value.data);
+        writeMQTTLenString(pptr, prop->value.value);
+        rc = prop->value.data.len + prop->value.value.len + 4; /* include length fields */
+        break;
+    }
+  }
+  return rc + 1; /* include identifier byte */
+}
+
+
+int MQTTProperties_write(char** pptr, const MQTTProperties* properties)
+{
+  int rc = -1;
+  int i = 0, len = 0;
+
+  /* write the entire property list length first */
+  if (properties == NULL)
+  {
+	*pptr += MQTTPacket_encode(*pptr, 0);
+	rc = 1;
+  }
+  else
+  {
+    *pptr += MQTTPacket_encode(*pptr, properties->length);
+    len = rc = 1;
+    for (i = 0; i < properties->count; ++i)
+    {
+      rc = MQTTProperty_write(pptr, &properties->array[i]);
+      if (rc < 0)
+        break;
+      else
+        len += rc;
+    }
+    if (rc >= 0)
+      rc = len;
+  }
+  return rc;
+}
+
+
+int MQTTProperty_read(MQTTProperty* prop, char** pptr, char* enddata)
+{
+  int type = -1,
+    len = 0;
+
+  prop->identifier = readChar(pptr);
+  type = MQTTProperty_getType(prop->identifier);
+  if (type >= MQTTPROPERTY_TYPE_BYTE && type <= MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR)
+  {
+    switch (type)
+    {
+      case MQTTPROPERTY_TYPE_BYTE:
+        prop->value.byte = readChar(pptr);
+        len = 1;
+        break;
+      case MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER:
+        prop->value.integer2 = readInt(pptr);
+        len = 2;
+        break;
+      case MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER:
+        prop->value.integer4 = readInt4(pptr);
+        len = 4;
+        break;
+      case MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER:
+        len = MQTTPacket_decodeBuf(*pptr, &prop->value.integer4);
+        *pptr += len;
+        break;
+      case MQTTPROPERTY_TYPE_BINARY_DATA:
+      case MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING:
+      case MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR:
+        len = MQTTLenStringRead(&prop->value.data, pptr, enddata);
+        prop->value.data.data = datadup(&prop->value.data);
+        if (type == MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR)
+        {
+          len += MQTTLenStringRead(&prop->value.value, pptr, enddata);
+          prop->value.value.data = datadup(&prop->value.value);
+        }
+        break;
+    }
+  }
+  return len + 1; /* 1 byte for identifier */
+}
+
+
+int MQTTProperties_read(MQTTProperties* properties, char** pptr, char* enddata)
+{
+  int rc = 0;
+  unsigned int remlength = 0;
+
+  FUNC_ENTRY;
+  /* we assume an initialized properties structure */
+  if (enddata - (*pptr) > 0) /* enough length to read the VBI? */
+  {
+    *pptr += MQTTPacket_decodeBuf(*pptr, &remlength);
+    properties->length = remlength;
+    while (remlength > 0)
+    {
+    	  if (properties->count == properties->max_count)
+    	  {
+    		properties->max_count += 10;
+    		if (properties->max_count == 10)
+    		  properties->array = malloc(sizeof(MQTTProperty) * properties->max_count);
+    		else
+    		  properties->array = realloc(properties->array, sizeof(MQTTProperty) * properties->max_count);
+    	  }
+      remlength -= MQTTProperty_read(&properties->array[properties->count], pptr, enddata);
+      properties->count++;
+    }
+    if (remlength == 0)
+      rc = 1; /* data read successfully */
+  }
+
+  if (rc != 1 && properties->array != NULL)
+  {
+	  free(properties->array);
+	  properties->array = NULL;
+	  properties->max_count = properties->count = 0;
+  }
+  FUNC_EXIT_RC(rc);
+  return rc;
+}
+
+struct {
+	enum MQTTPropertyCodes value;
+	const char* name;
+} nameToString[] =
+{
+  {MQTTPROPERTY_CODE_PAYLOAD_FORMAT_INDICATOR, "PAYLOAD_FORMAT_INDICATOR"},
+  {MQTTPROPERTY_CODE_MESSAGE_EXPIRY_INTERVAL, "MESSAGE_EXPIRY_INTERVAL"},
+  {MQTTPROPERTY_CODE_CONTENT_TYPE, "CONTENT_TYPE"},
+  {MQTTPROPERTY_CODE_RESPONSE_TOPIC, "RESPONSE_TOPIC"},
+  {MQTTPROPERTY_CODE_CORRELATION_DATA, "CORRELATION_DATA"},
+  {MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER, "SUBSCRIPTION_IDENTIFIER"},
+  {MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL, "SESSION_EXPIRY_INTERVAL"},
+  {MQTTPROPERTY_CODE_ASSIGNED_CLIENT_IDENTIFER, "ASSIGNED_CLIENT_IDENTIFER"},
+  {MQTTPROPERTY_CODE_SERVER_KEEP_ALIVE, "SERVER_KEEP_ALIVE"},
+  {MQTTPROPERTY_CODE_AUTHENTICATION_METHOD, "AUTHENTICATION_METHOD"},
+  {MQTTPROPERTY_CODE_AUTHENTICATION_DATA, "AUTHENTICATION_DATA"},
+  {MQTTPROPERTY_CODE_REQUEST_PROBLEM_INFORMATION, "REQUEST_PROBLEM_INFORMATION"},
+  {MQTTPROPERTY_CODE_WILL_DELAY_INTERVAL, "WILL_DELAY_INTERVAL"},
+  {MQTTPROPERTY_CODE_REQUEST_RESPONSE_INFORMATION, "REQUEST_RESPONSE_INFORMATION"},
+  {MQTTPROPERTY_CODE_RESPONSE_INFORMATION, "RESPONSE_INFORMATION"},
+  {MQTTPROPERTY_CODE_SERVER_REFERENCE, "SERVER_REFERENCE"},
+  {MQTTPROPERTY_CODE_REASON_STRING, "REASON_STRING"},
+  {MQTTPROPERTY_CODE_RECEIVE_MAXIMUM, "RECEIVE_MAXIMUM"},
+  {MQTTPROPERTY_CODE_TOPIC_ALIAS_MAXIMUM, "TOPIC_ALIAS_MAXIMUM"},
+  {MQTTPROPERTY_CODE_TOPIC_ALIAS, "TOPIC_ALIAS"},
+  {MQTTPROPERTY_CODE_MAXIMUM_QOS, "MAXIMUM_QOS"},
+  {MQTTPROPERTY_CODE_RETAIN_AVAILABLE, "RETAIN_AVAILABLE"},
+  {MQTTPROPERTY_CODE_USER_PROPERTY, "USER_PROPERTY"},
+  {MQTTPROPERTY_CODE_MAXIMUM_PACKET_SIZE, "MAXIMUM_PACKET_SIZE"},
+  {MQTTPROPERTY_CODE_WILDCARD_SUBSCRIPTION_AVAILABLE, "WILDCARD_SUBSCRIPTION_AVAILABLE"},
+  {MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIERS_AVAILABLE, "SUBSCRIPTION_IDENTIFIERS_AVAILABLE"},
+  {MQTTPROPERTY_CODE_SHARED_SUBSCRIPTION_AVAILABLE, "SHARED_SUBSCRIPTION_AVAILABLE"}
+};
+
+const char* MQTTPropertyName(enum MQTTPropertyCodes value)
+{
+  int i = 0;
+  const char* result = NULL;
+
+  for (i = 0; i < ARRAY_SIZE(nameToString); ++i)
+  {
+    if (nameToString[i].value == value)
+    {
+    	  result = nameToString[i].name;
+    	  break;
+    }
+  }
+  return result;
+}
+
+
+DLLExport void MQTTProperties_free(MQTTProperties* props)
+{
+  int i = 0;
+
+  FUNC_ENTRY;
+  if (props == NULL)
+    goto exit;
+  for (i = 0; i < props->count; ++i)
+  {
+    int id = props->array[i].identifier;
+    int type = MQTTProperty_getType(id);
+
+    switch (type)
+    {
+    case MQTTPROPERTY_TYPE_BINARY_DATA:
+    	case MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING:
+    	case MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR:
+    	  free(props->array[i].value.data.data);
+    	  if (type == MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR)
+    	    free(props->array[i].value.value.data);
+	  break;
+    }
+  }
+  if (props->array)
+    free(props->array);
+  memset(props, '\0', sizeof(MQTTProperties)); /* zero all fields */
+exit:
+  FUNC_EXIT;
+}
+
+
+MQTTProperties MQTTProperties_copy(const MQTTProperties* props)
+{
+  int i = 0;
+  MQTTProperties result = MQTTProperties_initializer;
+
+  FUNC_ENTRY;
+  for (i = 0; i < props->count; ++i)
+  {
+	int rc = 0;
+
+	if ((rc = MQTTProperties_add(&result, &props->array[i])) != 0)
+		Log(LOG_ERROR, -1, "Error from MQTTProperties add %d", rc);
+  }
+
+  FUNC_EXIT;
+  return result;
+}
+
+
+int MQTTProperties_hasProperty(MQTTProperties *props, enum MQTTPropertyCodes propid)
+{
+	int i = 0;
+	int found = 0;
+
+	for (i = 0; i < props->count; ++i)
+	{
+		if (propid == props->array[i].identifier)
+		{
+			found = 1;
+			break;
+		}
+	}
+	return found;
+}
+
+
+int MQTTProperties_propertyCount(MQTTProperties *props, enum MQTTPropertyCodes propid)
+{
+	int i = 0;
+	int count = 0;
+
+	for (i = 0; i < props->count; ++i)
+	{
+		if (propid == props->array[i].identifier)
+			count++;
+	}
+	return count;
+}
+
+
+int MQTTProperties_getNumericValueAt(MQTTProperties *props, enum MQTTPropertyCodes propid, int index)
+{
+	int i = 0;
+	int rc = -9999999;
+	int cur_index = 0;
+
+	for (i = 0; i < props->count; ++i)
+	{
+		int id = props->array[i].identifier;
+
+		if (id == propid)
+		{
+			if (cur_index < index)
+			{
+				cur_index++;
+				continue;
+			}
+			switch (MQTTProperty_getType(id))
+			{
+			case MQTTPROPERTY_TYPE_BYTE:
+				rc = props->array[i].value.byte;
+				break;
+			case MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER:
+				rc = props->array[i].value.integer2;
+				break;
+			case MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER:
+			case MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER:
+				rc = props->array[i].value.integer4;
+				break;
+			default:
+				rc = -999999;
+				break;
+			}
+			break;
+		}
+	}
+	return rc;
+}
+
+
+int MQTTProperties_getNumericValue(MQTTProperties *props, enum MQTTPropertyCodes propid)
+{
+	return MQTTProperties_getNumericValueAt(props, propid, 0);
+}
+
+
+MQTTProperty* MQTTProperties_getPropertyAt(MQTTProperties *props, enum MQTTPropertyCodes propid, int index)
+{
+	int i = 0;
+	MQTTProperty* result = NULL;
+	int cur_index = 0;
+
+	for (i = 0; i < props->count; ++i)
+	{
+		int id = props->array[i].identifier;
+
+		if (id == propid)
+		{
+			if (cur_index == index)
+			{
+				result = &props->array[i];
+				break;
+			}
+			else
+				cur_index++;
+		}
+	}
+	return result;
+}
+
+
+MQTTProperty* MQTTProperties_getProperty(MQTTProperties *props, enum MQTTPropertyCodes propid)
+{
+	return MQTTProperties_getPropertyAt(props, propid, 0);
+}
diff --git a/mqtt/src/src/MQTTProperties.h b/mqtt/src/src/MQTTProperties.h
new file mode 100644
index 00000000..7e83638b
--- /dev/null
+++ b/mqtt/src/src/MQTTProperties.h
@@ -0,0 +1,225 @@
+/*******************************************************************************
+ * Copyright (c) 2017, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#if !defined(MQTTPROPERTIES_H)
+#define MQTTPROPERTIES_H
+
+#define MQTT_INVALID_PROPERTY_ID -2
+
+/** The one byte MQTT V5 property indicator */
+enum MQTTPropertyCodes {
+  MQTTPROPERTY_CODE_PAYLOAD_FORMAT_INDICATOR = 1,  /**< The value is 1 */
+  MQTTPROPERTY_CODE_MESSAGE_EXPIRY_INTERVAL = 2,   /**< The value is 2 */
+  MQTTPROPERTY_CODE_CONTENT_TYPE = 3,              /**< The value is 3 */
+  MQTTPROPERTY_CODE_RESPONSE_TOPIC = 8,            /**< The value is 8 */
+  MQTTPROPERTY_CODE_CORRELATION_DATA = 9,          /**< The value is 9 */
+  MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER = 11,  /**< The value is 11 */
+  MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL = 17,  /**< The value is 17 */
+  MQTTPROPERTY_CODE_ASSIGNED_CLIENT_IDENTIFER = 18,/**< The value is 18 */
+  MQTTPROPERTY_CODE_SERVER_KEEP_ALIVE = 19,        /**< The value is 19 */
+  MQTTPROPERTY_CODE_AUTHENTICATION_METHOD = 21,    /**< The value is 21 */
+  MQTTPROPERTY_CODE_AUTHENTICATION_DATA = 22,      /**< The value is 22 */
+  MQTTPROPERTY_CODE_REQUEST_PROBLEM_INFORMATION = 23,/**< The value is 23 */
+  MQTTPROPERTY_CODE_WILL_DELAY_INTERVAL = 24,      /**< The value is 24 */
+  MQTTPROPERTY_CODE_REQUEST_RESPONSE_INFORMATION = 25,/**< The value is 25 */
+  MQTTPROPERTY_CODE_RESPONSE_INFORMATION = 26,     /**< The value is 26 */
+  MQTTPROPERTY_CODE_SERVER_REFERENCE = 28,         /**< The value is 28 */
+  MQTTPROPERTY_CODE_REASON_STRING = 31,            /**< The value is 31 */
+  MQTTPROPERTY_CODE_RECEIVE_MAXIMUM = 33,          /**< The value is 33*/
+  MQTTPROPERTY_CODE_TOPIC_ALIAS_MAXIMUM = 34,      /**< The value is 34 */
+  MQTTPROPERTY_CODE_TOPIC_ALIAS = 35,              /**< The value is 35 */
+  MQTTPROPERTY_CODE_MAXIMUM_QOS = 36,              /**< The value is 36 */
+  MQTTPROPERTY_CODE_RETAIN_AVAILABLE = 37,         /**< The value is 37 */
+  MQTTPROPERTY_CODE_USER_PROPERTY = 38,            /**< The value is 38 */
+  MQTTPROPERTY_CODE_MAXIMUM_PACKET_SIZE = 39,      /**< The value is 39 */
+  MQTTPROPERTY_CODE_WILDCARD_SUBSCRIPTION_AVAILABLE = 40,/**< The value is 40 */
+  MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIERS_AVAILABLE = 41,/**< The value is 41 */
+  MQTTPROPERTY_CODE_SHARED_SUBSCRIPTION_AVAILABLE = 42/**< The value is 241 */
+};
+
+#if defined(WIN32) || defined(WIN64)
+  #define DLLImport __declspec(dllimport)
+  #define DLLExport __declspec(dllexport)
+#else
+  #define DLLImport extern
+  #define DLLExport __attribute__ ((visibility ("default")))
+#endif
+
+/**
+ * Returns a printable string description of an MQTT V5 property code.
+ * @param value an MQTT V5 property code.
+ * @return the printable string description of the input property code.
+ * NULL if the code was not found.
+ */
+DLLExport const char* MQTTPropertyName(enum MQTTPropertyCodes value);
+
+/** The one byte MQTT V5 property type */
+enum MQTTPropertyTypes {
+  MQTTPROPERTY_TYPE_BYTE,
+  MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER,
+  MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER,
+  MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER,
+  MQTTPROPERTY_TYPE_BINARY_DATA,
+  MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING,
+  MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR
+};
+
+/**
+ * Returns the MQTT V5 type code of an MQTT V5 property.
+ * @param value an MQTT V5 property code.
+ * @return the MQTT V5 type code of the input property. -1 if the code was not found.
+ */
+DLLExport int MQTTProperty_getType(enum MQTTPropertyCodes value);
+
+/**
+ * The data for a length delimited string
+ */
+typedef struct
+{
+	int len; /**< the length of the string */
+	char* data; /**< pointer to the string data */
+} MQTTLenString;
+
+
+/**
+ * Structure to hold an MQTT version 5 property of any type
+ */
+typedef struct
+{
+  enum MQTTPropertyCodes identifier; /**<  The MQTT V5 property id. A multi-byte integer. */
+  /** The value of the property, as a union of the different possible types. */
+  union {
+    unsigned char byte;       /**< holds the value of a byte property type */
+    unsigned short integer2;  /**< holds the value of a 2 byte integer property type */
+    unsigned int integer4;    /**< holds the value of a 4 byte integer property type */
+    struct {
+      MQTTLenString data;  /**< The value of a string property, or the name of a user property. */
+      MQTTLenString value; /**< The value of a user property. */
+    };
+  } value;
+} MQTTProperty;
+
+/**
+ * MQTT version 5 property list
+ */
+typedef struct MQTTProperties
+{
+  int count;     /**< number of property entries in the array */
+  int max_count; /**< max number of properties that the currently allocated array can store */
+  int length;    /**< mbi: byte length of all properties */
+  MQTTProperty *array;  /**< array of properties */
+} MQTTProperties;
+
+#define MQTTProperties_initializer {0, 0, 0, NULL}
+
+/**
+ * Returns the length of the properties structure when serialized ready for network transmission.
+ * @param props an MQTT V5 property structure.
+ * @return the length in bytes of the properties when serialized.
+ */
+int MQTTProperties_len(MQTTProperties* props);
+
+/**
+ * Add a property pointer to the property array.  There is no memory allocation.
+ * @param props The property list to add the property to.
+ * @param prop The property to add to the list.
+ * @return 0 on success, -1 on failure.
+ */
+DLLExport int MQTTProperties_add(MQTTProperties* props, const MQTTProperty* prop);
+
+/**
+ * Serialize the given property list to a character buffer, e.g. for writing to the network.
+ * @param pptr pointer to the buffer - move the pointer as we add data
+ * @param properties pointer to the property list, can be NULL
+ * @return whether the write succeeded or not: number of bytes written, or < 0 on failure.
+ */
+int MQTTProperties_write(char** pptr, const MQTTProperties* properties);
+
+/**
+ * Reads a property list from a character buffer into an array.
+ * @param properties pointer to the property list to be filled. Should be initalized but empty.
+ * @param pptr pointer to the character buffer.
+ * @param enddata pointer to the end of the character buffer so we don't read beyond.
+ * @return 1 if the properties were read successfully.
+ */
+int MQTTProperties_read(MQTTProperties* properties, char** pptr, char* enddata);
+
+/**
+ * Free all memory allocated to the property list, including any to individual properties.
+ * @param properties pointer to the property list.
+ */
+DLLExport void MQTTProperties_free(MQTTProperties* properties);
+
+/**
+ * Copy the contents of a property list, allocating additional memory if needed.
+ * @param props pointer to the property list.
+ * @return the duplicated property list.
+ */
+DLLExport MQTTProperties MQTTProperties_copy(const MQTTProperties* props);
+
+/**
+ * Checks if property list contains a specific property.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @return 1 if found, 0 if not.
+ */
+DLLExport int MQTTProperties_hasProperty(MQTTProperties *props, enum MQTTPropertyCodes propid);
+
+/**
+ * Returns the number of instances of a property id. Most properties can exist only once.
+ * User properties and subscription ids can exist more than once.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @return the number of times found.  Can be 0.
+ */
+DLLExport int MQTTProperties_propertyCount(MQTTProperties *props, enum MQTTPropertyCodes propid);
+
+/**
+ * Returns the integer value of a specific property.  The property given must be a numeric type.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @return the integer value of the property. -9999999 on failure.
+ */
+DLLExport int MQTTProperties_getNumericValue(MQTTProperties *props, enum MQTTPropertyCodes propid);
+
+/**
+ * Returns the integer value of a specific property when it's not the only instance.
+ * The property given must be a numeric type.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @param index the instance number, starting at 0.
+ * @return the integer value of the property. -9999999 on failure.
+ */
+DLLExport int MQTTProperties_getNumericValueAt(MQTTProperties *props, enum MQTTPropertyCodes propid, int index);
+
+/**
+ * Returns a pointer to the property structure for a specific property.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @return the pointer to the property structure if found.  NULL if not found.
+ */
+DLLExport MQTTProperty* MQTTProperties_getProperty(MQTTProperties *props, enum MQTTPropertyCodes propid);
+
+/**
+ * Returns a pointer to the property structure for a specific property when it's not the only instance.
+ * @param props pointer to the property list.
+ * @param propid the property id to check for.
+ * @param index the instance number, starting at 0.
+ * @return the pointer to the property structure if found.  NULL if not found.
+ */
+DLLExport MQTTProperty* MQTTProperties_getPropertyAt(MQTTProperties *props, enum MQTTPropertyCodes propid, int index);
+
+#endif /* MQTTPROPERTIES_H */
diff --git a/mqtt/src/src/MQTTProtocol.h b/mqtt/src/src/MQTTProtocol.h
new file mode 100644
index 00000000..74781030
--- /dev/null
+++ b/mqtt/src/src/MQTTProtocol.h
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2014 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - MQTT 3.1.1 updates
+ *******************************************************************************/
+
+#if !defined(MQTTPROTOCOL_H)
+#define MQTTPROTOCOL_H
+
+#include "LinkedList.h"
+#include "MQTTPacket.h"
+#include "Clients.h"
+
+#define MAX_MSG_ID 65535
+#define MAX_CLIENTID_LEN 65535
+
+typedef struct
+{
+	int socket;
+	Publications* p;
+} pending_write;
+
+
+typedef struct
+{
+	List publications;
+	unsigned int msgs_received;
+	unsigned int msgs_sent;
+	List pending_writes; /* for qos 0 writes not complete */
+} MQTTProtocol;
+
+
+#include "MQTTProtocolOut.h"
+
+#endif
diff --git a/mqtt/src/src/MQTTProtocolClient.c b/mqtt/src/src/MQTTProtocolClient.c
new file mode 100644
index 00000000..1dc04f13
--- /dev/null
+++ b/mqtt/src/src/MQTTProtocolClient.c
@@ -0,0 +1,877 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL updates
+ *    Ian Craggs - fix for bug 413429 - connectionLost not called
+ *    Ian Craggs - fix for bug 421103 - trying to write to same socket, in retry
+ *    Rong Xiang, Ian Craggs - C++ compatibility
+ *    Ian Craggs - turn off DUP flag for PUBREL - MQTT 3.1.1
+ *    Ian Craggs - ensure that acks are not sent if write is outstanding on socket
+ *    Ian Craggs - MQTT 5.0 support
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief Functions dealing with the MQTT protocol exchanges
+ *
+ * Some other related functions are in the MQTTProtocolOut module
+ * */
+
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "MQTTProtocolClient.h"
+#if !defined(NO_PERSISTENCE)
+#include "MQTTPersistence.h"
+#endif
+#include "SocketBuffer.h"
+#include "StackTrace.h"
+#include "Heap.h"
+
+#if !defined(min)
+#define min(A,B) ( (A) < (B) ? (A):(B))
+#endif
+
+extern MQTTProtocol state;
+extern ClientStates* bstate;
+
+
+static void MQTTProtocol_storeQoS0(Clients* pubclient, Publish* publish);
+static int MQTTProtocol_startPublishCommon(
+		Clients* pubclient,
+		Publish* publish,
+		int qos,
+		int retained);
+static void MQTTProtocol_retries(time_t now, Clients* client, int regardless);
+
+/**
+ * List callback function for comparing Message structures by message id
+ * @param a first integer value
+ * @param b second integer value
+ * @return boolean indicating whether a and b are equal
+ */
+int messageIDCompare(void* a, void* b)
+{
+	Messages* msg = (Messages*)a;
+	return msg->msgid == *(int*)b;
+}
+
+
+/**
+ * Assign a new message id for a client.  Make sure it isn't already being used and does
+ * not exceed the maximum.
+ * @param client a client structure
+ * @return the next message id to use, or 0 if none available
+ */
+int MQTTProtocol_assignMsgId(Clients* client)
+{
+	int start_msgid = client->msgID;
+	int msgid = start_msgid;
+
+	FUNC_ENTRY;
+	msgid = (msgid == MAX_MSG_ID) ? 1 : msgid + 1;
+	while (ListFindItem(client->outboundMsgs, &msgid, messageIDCompare) != NULL)
+	{
+		msgid = (msgid == MAX_MSG_ID) ? 1 : msgid + 1;
+		if (msgid == start_msgid)
+		{ /* we've tried them all - none free */
+			msgid = 0;
+			break;
+		}
+	}
+	if (msgid != 0)
+		client->msgID = msgid;
+	FUNC_EXIT_RC(msgid);
+	return msgid;
+}
+
+
+static void MQTTProtocol_storeQoS0(Clients* pubclient, Publish* publish)
+{
+	int len;
+	pending_write* pw = NULL;
+
+	FUNC_ENTRY;
+	/* store the publication until the write is finished */
+	pw = malloc(sizeof(pending_write));
+	Log(TRACE_MIN, 12, NULL);
+	pw->p = MQTTProtocol_storePublication(publish, &len);
+	pw->socket = pubclient->net.socket;
+	ListAppend(&(state.pending_writes), pw, sizeof(pending_write)+len);
+	/* we don't copy QoS 0 messages unless we have to, so now we have to tell the socket buffer where
+	the saved copy is */
+	if (SocketBuffer_updateWrite(pw->socket, pw->p->topic, pw->p->payload) == NULL)
+		Log(LOG_SEVERE, 0, "Error updating write");
+	FUNC_EXIT;
+}
+
+
+/**
+ * Utility function to start a new publish exchange.
+ * @param pubclient the client to send the publication to
+ * @param publish the publication data
+ * @param qos the MQTT QoS to use
+ * @param retained boolean - whether to set the MQTT retained flag
+ * @return the completion code
+ */
+static int MQTTProtocol_startPublishCommon(Clients* pubclient, Publish* publish, int qos, int retained)
+{
+	int rc = TCPSOCKET_COMPLETE;
+
+	FUNC_ENTRY;
+	rc = MQTTPacket_send_publish(publish, 0, qos, retained, &pubclient->net, pubclient->clientID);
+	if (qos == 0 && rc == TCPSOCKET_INTERRUPTED)
+		MQTTProtocol_storeQoS0(pubclient, publish);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Start a new publish exchange.  Store any state necessary and try to send the packet
+ * @param pubclient the client to send the publication to
+ * @param publish the publication data
+ * @param qos the MQTT QoS to use
+ * @param retained boolean - whether to set the MQTT retained flag
+ * @param mm - pointer to the message to send
+ * @return the completion code
+ */
+int MQTTProtocol_startPublish(Clients* pubclient, Publish* publish, int qos, int retained, Messages** mm)
+{
+	Publish p = *publish;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if (qos > 0)
+	{
+		*mm = MQTTProtocol_createMessage(publish, mm, qos, retained);
+		ListAppend(pubclient->outboundMsgs, *mm, (*mm)->len);
+		/* we change these pointers to the saved message location just in case the packet could not be written
+		entirely; the socket buffer will use these locations to finish writing the packet */
+		p.payload = (*mm)->publish->payload;
+		p.topic = (*mm)->publish->topic;
+		p.properties = (*mm)->properties;
+		p.MQTTVersion = (*mm)->MQTTVersion;
+	}
+	rc = MQTTProtocol_startPublishCommon(pubclient, &p, qos, retained);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Copy and store message data for retries
+ * @param publish the publication data
+ * @param mm - pointer to the message data to store
+ * @param qos the MQTT QoS to use
+ * @param retained boolean - whether to set the MQTT retained flag
+ * @return pointer to the message data stored
+ */
+Messages* MQTTProtocol_createMessage(Publish* publish, Messages **mm, int qos, int retained)
+{
+	Messages* m = malloc(sizeof(Messages));
+
+	FUNC_ENTRY;
+	m->len = sizeof(Messages);
+	if (*mm == NULL || (*mm)->publish == NULL)
+	{
+		int len1;
+		*mm = m;
+		m->publish = MQTTProtocol_storePublication(publish, &len1);
+		m->len += len1;
+	}
+	else
+	{
+		++(((*mm)->publish)->refcount);
+		m->publish = (*mm)->publish;
+	}
+	m->msgid = publish->msgId;
+	m->qos = qos;
+	m->retain = retained;
+	m->MQTTVersion = publish->MQTTVersion;
+	if (m->MQTTVersion >= 5)
+		m->properties = MQTTProperties_copy(&publish->properties);
+	time(&(m->lastTouch));
+	if (qos == 2)
+		m->nextMessageType = PUBREC;
+	FUNC_EXIT;
+	return m;
+}
+
+
+/**
+ * Store message data for possible retry
+ * @param publish the publication data
+ * @param len returned length of the data stored
+ * @return the publication stored
+ */
+Publications* MQTTProtocol_storePublication(Publish* publish, int* len)
+{
+	Publications* p = malloc(sizeof(Publications));
+
+	FUNC_ENTRY;
+	p->refcount = 1;
+
+	*len = (int)strlen(publish->topic)+1;
+	p->topic = malloc(*len);
+	strcpy(p->topic, publish->topic);
+	if (Heap_findItem(publish->topic))
+	{
+		free(publish->topic);
+		publish->topic = NULL;
+	}
+
+	*len += sizeof(Publications);
+
+	p->topiclen = publish->topiclen;
+	p->payloadlen = publish->payloadlen;
+	p->payload = malloc(publish->payloadlen);
+	memcpy(p->payload, publish->payload, p->payloadlen);
+	*len += publish->payloadlen;
+
+	ListAppend(&(state.publications), p, *len);
+	FUNC_EXIT;
+	return p;
+}
+
+/**
+ * Remove stored message data.  Opposite of storePublication
+ * @param p stored publication to remove
+ */
+void MQTTProtocol_removePublication(Publications* p)
+{
+	FUNC_ENTRY;
+	if (p && --(p->refcount) == 0)
+	{
+		free(p->payload);
+		free(p->topic);
+		ListRemove(&(state.publications), p);
+	}
+	FUNC_EXIT;
+}
+
+/**
+ * Process an incoming publish packet for a socket
+ * @param pack pointer to the publish packet
+ * @param sock the socket on which the packet was received
+ * @return completion code
+ */
+int MQTTProtocol_handlePublishes(void* pack, int sock)
+{
+	Publish* publish = (Publish*)pack;
+	Clients* client = NULL;
+	char* clientid = NULL;
+	int rc = TCPSOCKET_COMPLETE;
+
+	FUNC_ENTRY;
+	client = (Clients*)(ListFindItem(bstate->clients, &sock, clientSocketCompare)->content);
+	clientid = client->clientID;
+	Log(LOG_PROTOCOL, 11, NULL, sock, clientid, publish->msgId, publish->header.bits.qos,
+					publish->header.bits.retain, min(20, publish->payloadlen), publish->payload);
+
+	if (publish->header.bits.qos == 0)
+		Protocol_processPublication(publish, client);
+	else if (!Socket_noPendingWrites(sock))
+		rc = SOCKET_ERROR; /* queue acks? */
+	else if (publish->header.bits.qos == 1)
+	{
+	  /* send puback before processing the publications because a lot of return publications could fill up the socket buffer */
+	  rc = MQTTPacket_send_puback(publish->msgId, &client->net, client->clientID);
+	  /* if we get a socket error from sending the puback, should we ignore the publication? */
+	  Protocol_processPublication(publish, client);
+	}
+	else if (publish->header.bits.qos == 2)
+	{
+		/* store publication in inbound list */
+		int len;
+		int already_received = 0;
+		ListElement* listElem = NULL;
+		Messages* m = malloc(sizeof(Messages));
+		Publications* p = MQTTProtocol_storePublication(publish, &len);
+
+		m->publish = p;
+		m->msgid = publish->msgId;
+		m->qos = publish->header.bits.qos;
+		m->retain = publish->header.bits.retain;
+		m->MQTTVersion = publish->MQTTVersion;
+		if (m->MQTTVersion >= MQTTVERSION_5)
+			m->properties = MQTTProperties_copy(&publish->properties);
+		m->nextMessageType = PUBREL;
+		if ((listElem = ListFindItem(client->inboundMsgs, &(m->msgid), messageIDCompare)) != NULL)
+		{   /* discard queued publication with same msgID that the current incoming message */
+			Messages* msg = (Messages*)(listElem->content);
+			MQTTProtocol_removePublication(msg->publish);
+			if (msg->MQTTVersion >= MQTTVERSION_5)
+				MQTTProperties_free(&msg->properties);
+			ListInsert(client->inboundMsgs, m, sizeof(Messages) + len, listElem);
+			ListRemove(client->inboundMsgs, msg);
+			already_received = 1;
+		} else
+			ListAppend(client->inboundMsgs, m, sizeof(Messages) + len);
+		rc = MQTTPacket_send_pubrec(publish->msgId, &client->net, client->clientID);
+		if (m->MQTTVersion >= MQTTVERSION_5 && already_received == 0)
+		{
+			Publish publish1;
+
+			publish1.header.bits.qos = m->qos;
+			publish1.header.bits.retain = m->retain;
+			publish1.msgId = m->msgid;
+			publish1.topic = m->publish->topic;
+			publish1.topiclen = m->publish->topiclen;
+			publish1.payload = m->publish->payload;
+			publish1.payloadlen = m->publish->payloadlen;
+			publish1.MQTTVersion = m->MQTTVersion;
+			publish1.properties = m->properties;
+
+			Protocol_processPublication(&publish1, client);
+			ListRemove(&(state.publications), m->publish);
+			m->publish = NULL;
+		}
+		publish->topic = NULL;
+	}
+	MQTTPacket_freePublish(publish);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+/**
+ * Process an incoming puback packet for a socket
+ * @param pack pointer to the publish packet
+ * @param sock the socket on which the packet was received
+ * @return completion code
+ */
+int MQTTProtocol_handlePubacks(void* pack, int sock)
+{
+	Puback* puback = (Puback*)pack;
+	Clients* client = NULL;
+	int rc = TCPSOCKET_COMPLETE;
+
+	FUNC_ENTRY;
+	client = (Clients*)(ListFindItem(bstate->clients, &sock, clientSocketCompare)->content);
+	Log(LOG_PROTOCOL, 14, NULL, sock, client->clientID, puback->msgId);
+
+	/* look for the message by message id in the records of outbound messages for this client */
+	if (ListFindItem(client->outboundMsgs, &(puback->msgId), messageIDCompare) == NULL)
+		Log(TRACE_MIN, 3, NULL, "PUBACK", client->clientID, puback->msgId);
+	else
+	{
+		Messages* m = (Messages*)(client->outboundMsgs->current->content);
+		if (m->qos != 1)
+			Log(TRACE_MIN, 4, NULL, "PUBACK", client->clientID, puback->msgId, m->qos);
+		else
+		{
+			Log(TRACE_MIN, 6, NULL, "PUBACK", client->clientID, puback->msgId);
+			#if !defined(NO_PERSISTENCE)
+				rc = MQTTPersistence_remove(client,
+						(m->MQTTVersion >= MQTTVERSION_5) ? PERSISTENCE_V5_PUBLISH_SENT : PERSISTENCE_PUBLISH_SENT,
+								m->qos, puback->msgId);
+			#endif
+			MQTTProtocol_removePublication(m->publish);
+			if (m->MQTTVersion >= MQTTVERSION_5)
+				MQTTProperties_free(&m->properties);
+			ListRemove(client->outboundMsgs, m);
+		}
+	}
+	if (puback->MQTTVersion >= MQTTVERSION_5)
+		MQTTProperties_free(&puback->properties);
+	free(pack);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Process an incoming pubrec packet for a socket
+ * @param pack pointer to the publish packet
+ * @param sock the socket on which the packet was received
+ * @return completion code
+ */
+int MQTTProtocol_handlePubrecs(void* pack, int sock)
+{
+	Pubrec* pubrec = (Pubrec*)pack;
+	Clients* client = NULL;
+	int rc = TCPSOCKET_COMPLETE;
+
+	FUNC_ENTRY;
+	client = (Clients*)(ListFindItem(bstate->clients, &sock, clientSocketCompare)->content);
+	Log(LOG_PROTOCOL, 15, NULL, sock, client->clientID, pubrec->msgId);
+
+	/* look for the message by message id in the records of outbound messages for this client */
+	client->outboundMsgs->current = NULL;
+	if (ListFindItem(client->outboundMsgs, &(pubrec->msgId), messageIDCompare) == NULL)
+	{
+		if (pubrec->header.bits.dup == 0)
+			Log(TRACE_MIN, 3, NULL, "PUBREC", client->clientID, pubrec->msgId);
+	}
+	else
+	{
+		Messages* m = (Messages*)(client->outboundMsgs->current->content);
+		if (m->qos != 2)
+		{
+			if (pubrec->header.bits.dup == 0)
+				Log(TRACE_MIN, 4, NULL, "PUBREC", client->clientID, pubrec->msgId, m->qos);
+		}
+		else if (m->nextMessageType != PUBREC)
+		{
+			if (pubrec->header.bits.dup == 0)
+				Log(TRACE_MIN, 5, NULL, "PUBREC", client->clientID, pubrec->msgId);
+		}
+		else
+		{
+			if (pubrec->MQTTVersion >= MQTTVERSION_5 && pubrec->rc >= MQTTREASONCODE_UNSPECIFIED_ERROR)
+			{
+				Log(TRACE_MIN, -1, "Pubrec error %d received for client %s msgid %d, not sending PUBREL",
+						pubrec->rc, client->clientID, pubrec->msgId);
+				#if !defined(NO_PERSISTENCE)
+					rc = MQTTPersistence_remove(client,
+							(pubrec->MQTTVersion >= MQTTVERSION_5) ? PERSISTENCE_V5_PUBLISH_SENT : PERSISTENCE_PUBLISH_SENT,
+							m->qos, pubrec->msgId);
+				#endif
+				MQTTProtocol_removePublication(m->publish);
+				if (m->MQTTVersion >= MQTTVERSION_5)
+					MQTTProperties_free(&m->properties);
+				ListRemove(client->outboundMsgs, m);
+				(++state.msgs_sent);
+			}
+			else
+			{
+				rc = MQTTPacket_send_pubrel(pubrec->msgId, 0, &client->net, client->clientID);
+				m->nextMessageType = PUBCOMP;
+				time(&(m->lastTouch));
+			}
+		}
+	}
+	if (pubrec->MQTTVersion >= MQTTVERSION_5)
+		MQTTProperties_free(&pubrec->properties);
+	free(pack);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Process an incoming pubrel packet for a socket
+ * @param pack pointer to the publish packet
+ * @param sock the socket on which the packet was received
+ * @return completion code
+ */
+int MQTTProtocol_handlePubrels(void* pack, int sock)
+{
+	Pubrel* pubrel = (Pubrel*)pack;
+	Clients* client = NULL;
+	int rc = TCPSOCKET_COMPLETE;
+
+	FUNC_ENTRY;
+	client = (Clients*)(ListFindItem(bstate->clients, &sock, clientSocketCompare)->content);
+	Log(LOG_PROTOCOL, 17, NULL, sock, client->clientID, pubrel->msgId);
+
+	/* look for the message by message id in the records of inbound messages for this client */
+	if (ListFindItem(client->inboundMsgs, &(pubrel->msgId), messageIDCompare) == NULL)
+	{
+		if (pubrel->header.bits.dup == 0)
+			Log(TRACE_MIN, 3, NULL, "PUBREL", client->clientID, pubrel->msgId);
+		else if (!Socket_noPendingWrites(sock))
+			rc = SOCKET_ERROR; /* queue acks? */
+		else
+			/* Apparently this is "normal" behaviour, so we don't need to issue a warning */
+			rc = MQTTPacket_send_pubcomp(pubrel->msgId, &client->net, client->clientID);
+	}
+	else
+	{
+		Messages* m = (Messages*)(client->inboundMsgs->current->content);
+		if (m->qos != 2)
+			Log(TRACE_MIN, 4, NULL, "PUBREL", client->clientID, pubrel->msgId, m->qos);
+		else if (m->nextMessageType != PUBREL)
+			Log(TRACE_MIN, 5, NULL, "PUBREL", client->clientID, pubrel->msgId);
+		else if (!Socket_noPendingWrites(sock))
+		  rc = SOCKET_ERROR; /* queue acks? */
+		else
+		{
+			Publish publish;
+
+			memset(&publish, '\0', sizeof(publish));
+			/* send pubcomp before processing the publications because a lot of return publications could fill up the socket buffer */
+			rc = MQTTPacket_send_pubcomp(pubrel->msgId, &client->net, client->clientID);
+			publish.header.bits.qos = m->qos;
+			publish.header.bits.retain = m->retain;
+			publish.msgId = m->msgid;
+			if (m->publish)
+			{
+				publish.topic = m->publish->topic;
+				publish.topiclen = m->publish->topiclen;
+				publish.payload = m->publish->payload;
+				publish.payloadlen = m->publish->payloadlen;
+			}
+			publish.MQTTVersion = m->MQTTVersion;
+			if (publish.MQTTVersion >= MQTTVERSION_5)
+				publish.properties = m->properties;
+			else
+				Protocol_processPublication(&publish, client); /* only for 3.1.1 and lower */
+			#if !defined(NO_PERSISTENCE)
+				rc += MQTTPersistence_remove(client,
+						(m->MQTTVersion >= MQTTVERSION_5) ? PERSISTENCE_V5_PUBLISH_RECEIVED : PERSISTENCE_PUBLISH_RECEIVED,
+						m->qos, pubrel->msgId);
+			#endif
+			if (m->MQTTVersion >= MQTTVERSION_5)
+				MQTTProperties_free(&m->properties);
+			if (m->publish)
+				ListRemove(&(state.publications), m->publish);
+			ListRemove(client->inboundMsgs, m);
+			++(state.msgs_received);
+		}
+	}
+	if (pubrel->MQTTVersion >= MQTTVERSION_5)
+		MQTTProperties_free(&pubrel->properties);
+	free(pack);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Process an incoming pubcomp packet for a socket
+ * @param pack pointer to the publish packet
+ * @param sock the socket on which the packet was received
+ * @return completion code
+ */
+int MQTTProtocol_handlePubcomps(void* pack, int sock)
+{
+	Pubcomp* pubcomp = (Pubcomp*)pack;
+	Clients* client = NULL;
+	int rc = TCPSOCKET_COMPLETE;
+
+	FUNC_ENTRY;
+	client = (Clients*)(ListFindItem(bstate->clients, &sock, clientSocketCompare)->content);
+	Log(LOG_PROTOCOL, 19, NULL, sock, client->clientID, pubcomp->msgId);
+
+	/* look for the message by message id in the records of outbound messages for this client */
+	if (ListFindItem(client->outboundMsgs, &(pubcomp->msgId), messageIDCompare) == NULL)
+	{
+		if (pubcomp->header.bits.dup == 0)
+			Log(TRACE_MIN, 3, NULL, "PUBCOMP", client->clientID, pubcomp->msgId);
+	}
+	else
+	{
+		Messages* m = (Messages*)(client->outboundMsgs->current->content);
+		if (m->qos != 2)
+			Log(TRACE_MIN, 4, NULL, "PUBCOMP", client->clientID, pubcomp->msgId, m->qos);
+		else
+		{
+			if (m->nextMessageType != PUBCOMP)
+				Log(TRACE_MIN, 5, NULL, "PUBCOMP", client->clientID, pubcomp->msgId);
+			else
+			{
+				Log(TRACE_MIN, 6, NULL, "PUBCOMP", client->clientID, pubcomp->msgId);
+				#if !defined(NO_PERSISTENCE)
+					rc = MQTTPersistence_remove(client,
+							(m->MQTTVersion >= MQTTVERSION_5) ? PERSISTENCE_V5_PUBLISH_SENT : PERSISTENCE_PUBLISH_SENT,
+							m->qos, pubcomp->msgId);
+					if (rc != 0)
+						Log(LOG_ERROR, -1, "Error removing PUBCOMP for client id %s msgid %d from persistence", client->clientID, pubcomp->msgId);
+				#endif
+				MQTTProtocol_removePublication(m->publish);
+				if (m->MQTTVersion >= MQTTVERSION_5)
+					MQTTProperties_free(&m->properties);
+				ListRemove(client->outboundMsgs, m);
+				(++state.msgs_sent);
+			}
+		}
+	}
+	if (pubcomp->MQTTVersion >= MQTTVERSION_5)
+		MQTTProperties_free(&pubcomp->properties);
+	free(pack);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * MQTT protocol keepAlive processing.  Sends PINGREQ packets as required.
+ * @param now current time
+ */
+void MQTTProtocol_keepalive(time_t now)
+{
+	ListElement* current = NULL;
+
+	FUNC_ENTRY;
+	ListNextElement(bstate->clients, &current);
+	while (current)
+	{
+		Clients* client =	(Clients*)(current->content);
+		ListNextElement(bstate->clients, &current);
+
+		if (client->connected == 0 || client->keepAliveInterval == 0)
+			continue;
+
+		if (client->ping_outstanding == 1)
+		{
+			if (difftime(now, client->net.lastPing) >= client->keepAliveInterval)
+			{
+				Log(TRACE_PROTOCOL, -1, "PINGRESP not received in keepalive interval for client %s on socket %d, disconnecting", client->clientID, client->net.socket);
+				MQTTProtocol_closeSession(client, 1);
+			}
+		}
+		else if (difftime(now, client->net.lastSent) >= client->keepAliveInterval ||
+					difftime(now, client->net.lastReceived) >= client->keepAliveInterval)
+		{
+			if (Socket_noPendingWrites(client->net.socket))
+			{
+				if (MQTTPacket_send_pingreq(&client->net, client->clientID) != TCPSOCKET_COMPLETE)
+				{
+					Log(TRACE_PROTOCOL, -1, "Error sending PINGREQ for client %s on socket %d, disconnecting", client->clientID, client->net.socket);
+					MQTTProtocol_closeSession(client, 1);
+				}
+				else
+				{
+					client->net.lastPing = now;
+					client->ping_outstanding = 1;
+				}
+			}
+		}
+	}
+	FUNC_EXIT;
+}
+
+
+/**
+ * MQTT retry processing per client
+ * @param now current time
+ * @param client - the client to which to apply the retry processing
+ * @param regardless boolean - retry packets regardless of retry interval (used on reconnect)
+ */
+static void MQTTProtocol_retries(time_t now, Clients* client, int regardless)
+{
+	ListElement* outcurrent = NULL;
+
+	FUNC_ENTRY;
+
+	if (!regardless && client->retryInterval <= 0) /* 0 or -ive retryInterval turns off retry except on reconnect */
+		goto exit;
+
+	while (client && ListNextElement(client->outboundMsgs, &outcurrent) &&
+		   client->connected && client->good &&        /* client is connected and has no errors */
+		   Socket_noPendingWrites(client->net.socket)) /* there aren't any previous packets still stacked up on the socket */
+	{
+		Messages* m = (Messages*)(outcurrent->content);
+		if (regardless || difftime(now, m->lastTouch) > max(client->retryInterval, 10))
+		{
+			if (m->qos == 1 || (m->qos == 2 && m->nextMessageType == PUBREC))
+			{
+				Publish publish;
+				int rc;
+
+				Log(TRACE_MIN, 7, NULL, "PUBLISH", client->clientID, client->net.socket, m->msgid);
+				publish.msgId = m->msgid;
+				publish.topic = m->publish->topic;
+				publish.payload = m->publish->payload;
+				publish.payloadlen = m->publish->payloadlen;
+				publish.properties = m->properties;
+				publish.MQTTVersion = m->MQTTVersion;
+				rc = MQTTPacket_send_publish(&publish, 1, m->qos, m->retain, &client->net, client->clientID);
+				if (rc == SOCKET_ERROR)
+				{
+					client->good = 0;
+					Log(TRACE_PROTOCOL, 29, NULL, client->clientID, client->net.socket,
+												Socket_getpeer(client->net.socket));
+					MQTTProtocol_closeSession(client, 1);
+					client = NULL;
+				}
+				else
+				{
+					if (m->qos == 0 && rc == TCPSOCKET_INTERRUPTED)
+						MQTTProtocol_storeQoS0(client, &publish);
+					time(&(m->lastTouch));
+				}
+			}
+			else if (m->qos && m->nextMessageType == PUBCOMP)
+			{
+				Log(TRACE_MIN, 7, NULL, "PUBREL", client->clientID, client->net.socket, m->msgid);
+				if (MQTTPacket_send_pubrel(m->msgid, 0, &client->net, client->clientID) != TCPSOCKET_COMPLETE)
+				{
+					client->good = 0;
+					Log(TRACE_PROTOCOL, 29, NULL, client->clientID, client->net.socket,
+							Socket_getpeer(client->net.socket));
+					MQTTProtocol_closeSession(client, 1);
+					client = NULL;
+				}
+				else
+					time(&(m->lastTouch));
+			}
+			/* break; why not do all retries at once? */
+		}
+	}
+exit:
+	FUNC_EXIT;
+}
+
+
+/**
+ * MQTT retry protocol and socket pending writes processing.
+ * @param now current time
+ * @param doRetry boolean - retries as well as pending writes?
+ * @param regardless boolean - retry packets regardless of retry interval (used on reconnect)
+ */
+void MQTTProtocol_retry(time_t now, int doRetry, int regardless)
+{
+	ListElement* current = NULL;
+
+	FUNC_ENTRY;
+	ListNextElement(bstate->clients, &current);
+	/* look through the outbound message list of each client, checking to see if a retry is necessary */
+	while (current)
+	{
+		Clients* client = (Clients*)(current->content);
+		ListNextElement(bstate->clients, &current);
+		if (client->connected == 0)
+			continue;
+		if (client->good == 0)
+		{
+			MQTTProtocol_closeSession(client, 1);
+			continue;
+		}
+		if (Socket_noPendingWrites(client->net.socket) == 0)
+			continue;
+		if (doRetry)
+			MQTTProtocol_retries(now, client, regardless);
+	}
+	FUNC_EXIT;
+}
+
+
+/**
+ * Free a client structure
+ * @param client the client data to free
+ */
+void MQTTProtocol_freeClient(Clients* client)
+{
+	FUNC_ENTRY;
+	/* free up pending message lists here, and any other allocated data */
+	MQTTProtocol_freeMessageList(client->outboundMsgs);
+	MQTTProtocol_freeMessageList(client->inboundMsgs);
+	ListFree(client->messageQueue);
+	free(client->clientID);
+        client->clientID = NULL;
+	if (client->will)
+	{
+		free(client->will->payload);
+		free(client->will->topic);
+		free(client->will);
+                client->will = NULL;
+	}
+	if (client->username)
+		free((void*)client->username);
+	if (client->password)
+		free((void*)client->password);
+#if defined(OPENSSL)
+	if (client->sslopts)
+	{
+		if (client->sslopts->trustStore)
+			free((void*)client->sslopts->trustStore);
+		if (client->sslopts->keyStore)
+			free((void*)client->sslopts->keyStore);
+		if (client->sslopts->privateKey)
+			free((void*)client->sslopts->privateKey);
+		if (client->sslopts->privateKeyPassword)
+			free((void*)client->sslopts->privateKeyPassword);
+		if (client->sslopts->enabledCipherSuites)
+			free((void*)client->sslopts->enabledCipherSuites);
+		if (client->sslopts->struct_version >= 2)
+		{
+			if (client->sslopts->CApath)
+				free((void*)client->sslopts->CApath);
+		}
+		free(client->sslopts);
+                client->sslopts = NULL;
+	}
+#endif
+	/* don't free the client structure itself... this is done elsewhere */
+	FUNC_EXIT;
+}
+
+
+/**
+ * Empty a message list, leaving it able to accept new messages
+ * @param msgList the message list to empty
+ */
+void MQTTProtocol_emptyMessageList(List* msgList)
+{
+	ListElement* current = NULL;
+
+	FUNC_ENTRY;
+	while (ListNextElement(msgList, &current))
+	{
+		Messages* m = (Messages*)(current->content);
+		MQTTProtocol_removePublication(m->publish);
+		if (m->MQTTVersion >= MQTTVERSION_5)
+			MQTTProperties_free(&m->properties);
+	}
+	ListEmpty(msgList);
+	FUNC_EXIT;
+}
+
+
+/**
+ * Empty and free up all storage used by a message list
+ * @param msgList the message list to empty and free
+ */
+void MQTTProtocol_freeMessageList(List* msgList)
+{
+	FUNC_ENTRY;
+	MQTTProtocol_emptyMessageList(msgList);
+	ListFree(msgList);
+	FUNC_EXIT;
+}
+
+
+/**
+* Copy no more than dest_size -1 characters from the string pointed to by src to the array pointed to by dest.
+* The destination string will always be null-terminated.
+* @param dest the array which characters copy to
+* @param src the source string which characters copy from
+* @param dest_size the size of the memory pointed to by dest: copy no more than this -1 (allow for null).  Must be >= 1
+* @return the destination string pointer
+*/
+char* MQTTStrncpy(char *dest, const char *src, size_t dest_size)
+{
+  size_t count = dest_size;
+  char *temp = dest;
+
+  FUNC_ENTRY;
+  if (dest_size < strlen(src))
+    Log(TRACE_MIN, -1, "the src string is truncated");
+
+  /* We must copy only the first (dest_size - 1) bytes */
+  while (count > 1 && (*temp++ = *src++))
+    count--;
+
+  *temp = '\0';
+
+  FUNC_EXIT;
+  return dest;
+}
+
+
+/**
+* Duplicate a string, safely, allocating space on the heap
+* @param src the source string which characters copy from
+* @return the duplicated, allocated string
+*/
+char* MQTTStrdup(const char* src)
+{
+	size_t mlen = strlen(src) + 1;
+	char* temp = malloc(mlen);
+	MQTTStrncpy(temp, src, mlen);
+	return temp;
+}
diff --git a/mqtt/src/src/MQTTProtocolClient.h b/mqtt/src/src/MQTTProtocolClient.h
new file mode 100644
index 00000000..92b43a80
--- /dev/null
+++ b/mqtt/src/src/MQTTProtocolClient.h
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2017 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL updates
+ *    Ian Craggs - MQTT 3.1.1 updates
+ *    Rong Xiang, Ian Craggs - C++ compatibility
+ *    Ian Craggs - add debug definition of MQTTStrdup for when needed
+ *******************************************************************************/
+
+#if !defined(MQTTPROTOCOLCLIENT_H)
+#define MQTTPROTOCOLCLIENT_H
+
+#include "LinkedList.h"
+#include "MQTTPacket.h"
+#include "Log.h"
+#include "MQTTProtocol.h"
+#include "Messages.h"
+#include "MQTTProperties.h"
+
+#define MAX_MSG_ID 65535
+#define MAX_CLIENTID_LEN 65535
+
+int MQTTProtocol_startPublish(Clients* pubclient, Publish* publish, int qos, int retained, Messages** m);
+Messages* MQTTProtocol_createMessage(Publish* publish, Messages** mm, int qos, int retained);
+Publications* MQTTProtocol_storePublication(Publish* publish, int* len);
+int messageIDCompare(void* a, void* b);
+int MQTTProtocol_assignMsgId(Clients* client);
+void MQTTProtocol_removePublication(Publications* p);
+void Protocol_processPublication(Publish* publish, Clients* client);
+
+int MQTTProtocol_handlePublishes(void* pack, int sock);
+int MQTTProtocol_handlePubacks(void* pack, int sock);
+int MQTTProtocol_handlePubrecs(void* pack, int sock);
+int MQTTProtocol_handlePubrels(void* pack, int sock);
+int MQTTProtocol_handlePubcomps(void* pack, int sock);
+
+void MQTTProtocol_closeSession(Clients* c, int sendwill);
+void MQTTProtocol_keepalive(time_t);
+void MQTTProtocol_retry(time_t, int, int);
+void MQTTProtocol_freeClient(Clients* client);
+void MQTTProtocol_emptyMessageList(List* msgList);
+void MQTTProtocol_freeMessageList(List* msgList);
+
+char* MQTTStrncpy(char *dest, const char* src, size_t num);
+char* MQTTStrdup(const char* src);
+
+//#define MQTTStrdup(src) MQTTStrncpy(malloc(strlen(src)+1), src, strlen(src)+1)
+
+#endif
diff --git a/mqtt/src/src/MQTTProtocolOut.c b/mqtt/src/src/MQTTProtocolOut.c
new file mode 100644
index 00000000..779cbc51
--- /dev/null
+++ b/mqtt/src/src/MQTTProtocolOut.c
@@ -0,0 +1,259 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL updates
+ *    Ian Craggs - fix for buffer overflow in addressPort bug #433290
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Rong Xiang, Ian Craggs - C++ compatibility
+ *    Ian Craggs - fix for bug 479376
+ *    Ian Craggs - SNI support
+ *    Ian Craggs - fix for issue #164
+ *    Ian Craggs - fix for issue #179
+ *    Ian Craggs - MQTT 5.0 support
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief Functions dealing with the MQTT protocol exchanges
+ *
+ * Some other related functions are in the MQTTProtocolClient module
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "MQTTProtocolOut.h"
+#include "StackTrace.h"
+#include "Heap.h"
+#include "WebSocket.h"
+
+extern ClientStates* bstate;
+
+
+
+/**
+ * Separates an address:port into two separate values
+ * @param[in] uri the input string - hostname:port
+ * @param[out] port the returned port integer
+ * @param[out] topic optional topic portion of the address starting with '/'
+ * @return the address string
+ */
+size_t MQTTProtocol_addressPort(const char* uri, int* port, const char **topic)
+{
+	char* colon_pos = strrchr(uri, ':'); /* reverse find to allow for ':' in IPv6 addresses */
+	char* buf = (char*)uri;
+	size_t len;
+
+	FUNC_ENTRY;
+	if (uri[0] == '[')
+	{  /* ip v6 */
+		if (colon_pos < strrchr(uri, ']'))
+			colon_pos = NULL;  /* means it was an IPv6 separator, not for host:port */
+	}
+
+	if (colon_pos) /* have to strip off the port */
+	{
+		len = colon_pos - uri;
+		*port = atoi(colon_pos + 1);
+	}
+	else
+	{
+		len = strlen(buf);
+		*port = DEFAULT_PORT;
+	}
+
+	/* try and find topic portion */
+	if ( topic )
+	{
+		const char* addr_start = uri;
+		if ( colon_pos )
+			addr_start = colon_pos;
+		*topic = strchr( addr_start, '/' );
+	}
+
+	if (buf[len - 1] == ']')
+	{
+		/* we are stripping off the final ], so length is 1 shorter */
+		--len;
+	}
+	FUNC_EXIT;
+	return len;
+}
+
+
+/**
+ * MQTT outgoing connect processing for a client
+ * @param ip_address the TCP address:port to connect to
+ * @param aClient a structure with all MQTT data needed
+ * @param int ssl
+ * @param int MQTTVersion the MQTT version to connect with (3 or 4)
+ * @return return code
+ */
+#if defined(OPENSSL)
+int MQTTProtocol_connect(const char* ip_address, Clients* aClient, int ssl, int websocket, int MQTTVersion,
+		MQTTProperties* connectProperties, MQTTProperties* willProperties)
+#else
+int MQTTProtocol_connect(const char* ip_address, Clients* aClient, int websocket, int MQTTVersion,
+		MQTTProperties* connectProperties, MQTTProperties* willProperties)
+#endif
+{
+	int rc, port;
+	size_t addr_len;
+
+	FUNC_ENTRY;
+	aClient->good = 1;
+
+	addr_len = MQTTProtocol_addressPort(ip_address, &port, NULL);
+	rc = Socket_new(ip_address, addr_len, port, &(aClient->net.socket));
+	if (rc == EINPROGRESS || rc == EWOULDBLOCK)
+		aClient->connect_state = TCP_IN_PROGRESS; /* TCP connect called - wait for connect completion */
+	else if (rc == 0)
+	{	/* TCP connect completed. If SSL, send SSL connect */
+#if defined(OPENSSL)
+		if (ssl)
+		{
+			if (SSLSocket_setSocketForSSL(&aClient->net, aClient->sslopts, ip_address, addr_len) == 1)
+			{
+				rc = aClient->sslopts->struct_version >= 3 ?
+					SSLSocket_connect(aClient->net.ssl, aClient->net.socket, ip_address,
+						aClient->sslopts->verify, aClient->sslopts->ssl_error_cb, aClient->sslopts->ssl_error_context) :
+					SSLSocket_connect(aClient->net.ssl, aClient->net.socket, ip_address,
+						aClient->sslopts->verify, NULL, NULL);
+				if (rc == TCPSOCKET_INTERRUPTED)
+					aClient->connect_state = SSL_IN_PROGRESS; /* SSL connect called - wait for completion */
+			}
+			else
+				rc = SOCKET_ERROR;
+		}
+#endif
+		if ( websocket )
+		{
+			rc = WebSocket_connect( &aClient->net, ip_address );
+			if ( rc == TCPSOCKET_INTERRUPTED )
+				aClient->connect_state = WEBSOCKET_IN_PROGRESS; /* Websocket connect called - wait for completion */
+		}
+		if (rc == 0)
+		{
+			/* Now send the MQTT connect packet */
+			if ((rc = MQTTPacket_send_connect(aClient, MQTTVersion, connectProperties, willProperties)) == 0)
+				aClient->connect_state = WAIT_FOR_CONNACK; /* MQTT Connect sent - wait for CONNACK */
+			else
+				aClient->connect_state = NOT_IN_PROGRESS;
+		}
+	}
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Process an incoming pingresp packet for a socket
+ * @param pack pointer to the publish packet
+ * @param sock the socket on which the packet was received
+ * @return completion code
+ */
+int MQTTProtocol_handlePingresps(void* pack, int sock)
+{
+	Clients* client = NULL;
+	int rc = TCPSOCKET_COMPLETE;
+
+	FUNC_ENTRY;
+	client = (Clients*)(ListFindItem(bstate->clients, &sock, clientSocketCompare)->content);
+	Log(LOG_PROTOCOL, 21, NULL, sock, client->clientID);
+	client->ping_outstanding = 0;
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * MQTT outgoing subscribe processing for a client
+ * @param client the client structure
+ * @param topics list of topics
+ * @param qoss corresponding list of QoSs
+ * @param opts MQTT 5.0 subscribe options
+ * @param props MQTT 5.0 subscribe properties
+ * @return completion code
+ */
+int MQTTProtocol_subscribe(Clients* client, List* topics, List* qoss, int msgID,
+		MQTTSubscribe_options* opts, MQTTProperties* props)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	rc = MQTTPacket_send_subscribe(topics, qoss, opts, props, msgID, 0, client);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Process an incoming suback packet for a socket
+ * @param pack pointer to the publish packet
+ * @param sock the socket on which the packet was received
+ * @return completion code
+ */
+int MQTTProtocol_handleSubacks(void* pack, int sock)
+{
+	Suback* suback = (Suback*)pack;
+	Clients* client = NULL;
+	int rc = TCPSOCKET_COMPLETE;
+
+	FUNC_ENTRY;
+	client = (Clients*)(ListFindItem(bstate->clients, &sock, clientSocketCompare)->content);
+	Log(LOG_PROTOCOL, 23, NULL, sock, client->clientID, suback->msgId);
+	MQTTPacket_freeSuback(suback);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * MQTT outgoing unsubscribe processing for a client
+ * @param client the client structure
+ * @param topics list of topics
+ * @return completion code
+ */
+int MQTTProtocol_unsubscribe(Clients* client, List* topics, int msgID, MQTTProperties* props)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	rc = MQTTPacket_send_unsubscribe(topics, props, msgID, 0, client);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Process an incoming unsuback packet for a socket
+ * @param pack pointer to the publish packet
+ * @param sock the socket on which the packet was received
+ * @return completion code
+ */
+int MQTTProtocol_handleUnsubacks(void* pack, int sock)
+{
+	Unsuback* unsuback = (Unsuback*)pack;
+	Clients* client = NULL;
+	int rc = TCPSOCKET_COMPLETE;
+
+	FUNC_ENTRY;
+	client = (Clients*)(ListFindItem(bstate->clients, &sock, clientSocketCompare)->content);
+	Log(LOG_PROTOCOL, 24, NULL, sock, client->clientID, unsuback->msgId);
+	MQTTPacket_freeUnsuback(unsuback);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
diff --git a/mqtt/src/src/MQTTProtocolOut.h b/mqtt/src/src/MQTTProtocolOut.h
new file mode 100644
index 00000000..e2c26458
--- /dev/null
+++ b/mqtt/src/src/MQTTProtocolOut.h
@@ -0,0 +1,50 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL updates
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - SNI support
+ *    Ian Craggs - MQTT 5.0 support
+ *******************************************************************************/
+
+#if !defined(MQTTPROTOCOLOUT_H)
+#define MQTTPROTOCOLOUT_H
+
+#include "LinkedList.h"
+#include "MQTTPacket.h"
+#include "Clients.h"
+#include "Log.h"
+#include "Messages.h"
+#include "MQTTProtocol.h"
+#include "MQTTProtocolClient.h"
+
+#define DEFAULT_PORT 1883
+
+size_t MQTTProtocol_addressPort(const char* uri, int* port, const char **topic);
+void MQTTProtocol_reconnect(const char* ip_address, Clients* client);
+#if defined(OPENSSL)
+int MQTTProtocol_connect(const char* ip_address, Clients* acClients, int ssl, int websocket, int MQTTVersion,
+		MQTTProperties* connectProperties, MQTTProperties* willProperties);
+#else
+int MQTTProtocol_connect(const char* ip_address, Clients* acClients, int websocket, int MQTTVersion,
+		MQTTProperties* connectProperties, MQTTProperties* willProperties);
+#endif
+int MQTTProtocol_handlePingresps(void* pack, int sock);
+int MQTTProtocol_subscribe(Clients* client, List* topics, List* qoss, int msgID,
+		MQTTSubscribe_options* opts, MQTTProperties* props);
+int MQTTProtocol_handleSubacks(void* pack, int sock);
+int MQTTProtocol_unsubscribe(Clients* client, List* topics, int msgID, MQTTProperties* props);
+int MQTTProtocol_handleUnsubacks(void* pack, int sock);
+
+#endif
diff --git a/mqtt/src/src/MQTTReasonCodes.c b/mqtt/src/src/MQTTReasonCodes.c
new file mode 100644
index 00000000..3a1aac66
--- /dev/null
+++ b/mqtt/src/src/MQTTReasonCodes.c
@@ -0,0 +1,100 @@
+/*******************************************************************************
+ * Copyright (c) 2017, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#include "MQTTReasonCodes.h"
+
+#include "Heap.h"
+#include "StackTrace.h"
+
+#include <memory.h>
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+static struct {
+	enum MQTTReasonCodes value;
+	const char* name;
+} nameToString[] =
+{
+  {MQTTREASONCODE_SUCCESS, "SUCCESS"},
+  {MQTTREASONCODE_NORMAL_DISCONNECTION, "Normal disconnection"},
+  {MQTTREASONCODE_GRANTED_QOS_0, "Granted QoS 0"},
+  {MQTTREASONCODE_GRANTED_QOS_1, "Granted QoS 1"},
+  {MQTTREASONCODE_GRANTED_QOS_2, "Granted QoS 2"},
+  {MQTTREASONCODE_DISCONNECT_WITH_WILL_MESSAGE, "Disconnect with Will Messge"},
+  {MQTTREASONCODE_NO_MATCHING_SUBSCRIBERS, "No matching subscribers"},
+  {MQTTREASONCODE_NO_SUBSCRIPTION_FOUND, "No subscription found"},
+  {MQTTREASONCODE_CONTINUE_AUTHENTICATION, "Continue authentication"},
+  {MQTTREASONCODE_RE_AUTHENTICATE, "Re-authenticate"},
+  {MQTTREASONCODE_UNSPECIFIED_ERROR, "Unspecified error"},
+  {MQTTREASONCODE_MALFORMED_PACKET, "Malformed Packet"},
+  {MQTTREASONCODE_PROTOCOL_ERROR, "Protocol error"},
+  {MQTTREASONCODE_IMPLEMENTATION_SPECIFIC_ERROR, "Implementation specific error"},
+  {MQTTREASONCODE_UNSUPPORTED_PROTOCOL_VERSION, "Unsupported Protocol Version"},
+  {MQTTREASONCODE_CLIENT_IDENTIFIER_NOT_VALID, "Client Identifier not valid"},
+  {MQTTREASONCODE_BAD_USER_NAME_OR_PASSWORD, "Bad User Name or Password"},
+  {MQTTREASONCODE_NOT_AUTHORIZED, "Not authorized"},
+  {MQTTREASONCODE_SERVER_UNAVAILABLE, "Server unavailable"},
+  {MQTTREASONCODE_SERVER_BUSY, "Server busy"},
+  {MQTTREASONCODE_BANNED, "Banned"},
+  {MQTTREASONCODE_SERVER_SHUTTING_DOWN, "Server shutting down"},
+  {MQTTREASONCODE_BAD_AUTHENTICATION_METHOD, "Bad authentication method"},
+  {MQTTREASONCODE_KEEP_ALIVE_TIMEOUT, "Keep Alive timeout"},
+  {MQTTREASONCODE_SESSION_TAKEN_OVER, "Session taken over"},
+  {MQTTREASONCODE_TOPIC_FILTER_INVALID, "Topic filter invalid"},
+  {MQTTREASONCODE_TOPIC_NAME_INVALID, "Topic name invalid"},
+  {MQTTREASONCODE_PACKET_IDENTIFIER_IN_USE, "Packet Identifier in use"},
+  {MQTTREASONCODE_PACKET_IDENTIFIER_NOT_FOUND, "Packet Identifier not found"},
+  {MQTTREASONCODE_RECEIVE_MAXIMUM_EXCEEDED, "Receive Maximum exceeded"},
+  {MQTTREASONCODE_TOPIC_ALIAS_INVALID, "Topic Alias invalid"},
+  {MQTTREASONCODE_PACKET_TOO_LARGE, "Packet too large"},
+  {MQTTREASONCODE_MESSAGE_RATE_TOO_HIGH, "Message rate too high"},
+  {MQTTREASONCODE_QUOTA_EXCEEDED, "Quota exceeded"},
+  {MQTTREASONCODE_ADMINISTRATIVE_ACTION, "Administrative action"},
+  {MQTTREASONCODE_PAYLOAD_FORMAT_INVALID, "Payload format invalid"},
+  {MQTTREASONCODE_RETAIN_NOT_SUPPORTED, "Retain not supported"},
+  {MQTTREASONCODE_QOS_NOT_SUPPORTED, "QoS not supported"},
+  {MQTTREASONCODE_USE_ANOTHER_SERVER, "Use another server"},
+  {MQTTREASONCODE_SERVER_MOVED, "Server moved"},
+  {MQTTREASONCODE_SHARED_SUBSCRIPTIONS_NOT_SUPPORTED, "Shared subscriptions not supported"},
+  {MQTTREASONCODE_CONNECTION_RATE_EXCEEDED, "Connection rate exceeded"},
+  {MQTTREASONCODE_MAXIMUM_CONNECT_TIME, "Maximum connect time"},
+  {MQTTREASONCODE_SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED, "Subscription Identifiers not supported"},
+  {MQTTREASONCODE_WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED, "Wildcard Subscriptions not supported"}
+};
+
+const char* MQTTReasonCode_toString(enum MQTTReasonCodes value)
+{
+  int i = 0;
+  const char* result = NULL;
+
+  for (i = 0; i < ARRAY_SIZE(nameToString); ++i)
+  {
+    if (nameToString[i].value == value)
+    {
+    	  result = nameToString[i].name;
+    	  break;
+    }
+  }
+  return result;
+}
+
+
+
+
+
+
+
+
diff --git a/mqtt/src/src/MQTTReasonCodes.h b/mqtt/src/src/MQTTReasonCodes.h
new file mode 100644
index 00000000..369543b6
--- /dev/null
+++ b/mqtt/src/src/MQTTReasonCodes.h
@@ -0,0 +1,85 @@
+/*******************************************************************************
+ * Copyright (c) 2017, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#if !defined(MQTTREASONCODES_H)
+#define MQTTREASONCODES_H
+
+/** The MQTT V5 one byte reason code */
+enum MQTTReasonCodes {
+  MQTTREASONCODE_SUCCESS = 0,
+  MQTTREASONCODE_NORMAL_DISCONNECTION = 0,
+  MQTTREASONCODE_GRANTED_QOS_0 = 0,
+  MQTTREASONCODE_GRANTED_QOS_1 = 1,
+  MQTTREASONCODE_GRANTED_QOS_2 = 2,
+  MQTTREASONCODE_DISCONNECT_WITH_WILL_MESSAGE = 4,
+  MQTTREASONCODE_NO_MATCHING_SUBSCRIBERS = 16,
+  MQTTREASONCODE_NO_SUBSCRIPTION_FOUND = 17,
+  MQTTREASONCODE_CONTINUE_AUTHENTICATION = 24,
+  MQTTREASONCODE_RE_AUTHENTICATE = 25,
+  MQTTREASONCODE_UNSPECIFIED_ERROR = 128,
+  MQTTREASONCODE_MALFORMED_PACKET = 129,
+  MQTTREASONCODE_PROTOCOL_ERROR = 130,
+  MQTTREASONCODE_IMPLEMENTATION_SPECIFIC_ERROR = 131,
+  MQTTREASONCODE_UNSUPPORTED_PROTOCOL_VERSION = 132,
+  MQTTREASONCODE_CLIENT_IDENTIFIER_NOT_VALID = 133,
+  MQTTREASONCODE_BAD_USER_NAME_OR_PASSWORD = 134,
+  MQTTREASONCODE_NOT_AUTHORIZED = 135,
+  MQTTREASONCODE_SERVER_UNAVAILABLE = 136,
+  MQTTREASONCODE_SERVER_BUSY = 137,
+  MQTTREASONCODE_BANNED = 138,
+  MQTTREASONCODE_SERVER_SHUTTING_DOWN = 139,
+  MQTTREASONCODE_BAD_AUTHENTICATION_METHOD = 140,
+  MQTTREASONCODE_KEEP_ALIVE_TIMEOUT = 141,
+  MQTTREASONCODE_SESSION_TAKEN_OVER = 142,
+  MQTTREASONCODE_TOPIC_FILTER_INVALID = 143,
+  MQTTREASONCODE_TOPIC_NAME_INVALID = 144,
+  MQTTREASONCODE_PACKET_IDENTIFIER_IN_USE = 145,
+  MQTTREASONCODE_PACKET_IDENTIFIER_NOT_FOUND = 146,
+  MQTTREASONCODE_RECEIVE_MAXIMUM_EXCEEDED = 147,
+  MQTTREASONCODE_TOPIC_ALIAS_INVALID = 148,
+  MQTTREASONCODE_PACKET_TOO_LARGE = 149,
+  MQTTREASONCODE_MESSAGE_RATE_TOO_HIGH = 150,
+  MQTTREASONCODE_QUOTA_EXCEEDED = 151,
+  MQTTREASONCODE_ADMINISTRATIVE_ACTION = 152,
+  MQTTREASONCODE_PAYLOAD_FORMAT_INVALID = 153,
+  MQTTREASONCODE_RETAIN_NOT_SUPPORTED = 154,
+  MQTTREASONCODE_QOS_NOT_SUPPORTED = 155,
+  MQTTREASONCODE_USE_ANOTHER_SERVER = 156,
+  MQTTREASONCODE_SERVER_MOVED = 157,
+  MQTTREASONCODE_SHARED_SUBSCRIPTIONS_NOT_SUPPORTED = 158,
+  MQTTREASONCODE_CONNECTION_RATE_EXCEEDED = 159,
+  MQTTREASONCODE_MAXIMUM_CONNECT_TIME = 160,
+  MQTTREASONCODE_SUBSCRIPTION_IDENTIFIERS_NOT_SUPPORTED = 161,
+  MQTTREASONCODE_WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED = 162
+};
+
+#if defined(WIN32) || defined(WIN64)
+  #define DLLImport __declspec(dllimport)
+  #define DLLExport __declspec(dllexport)
+#else
+  #define DLLImport extern
+  #define DLLExport __attribute__ ((visibility ("default")))
+#endif
+
+/**
+ * Returns a printable string description of an MQTT V5 reason code.
+ * @param value an MQTT V5 reason code.
+ * @return the printable string description of the input reason code.
+ * NULL if the code was not found.
+ */
+DLLExport const char* MQTTReasonCode_toString(enum MQTTReasonCodes value);
+
+#endif
diff --git a/mqtt/src/src/MQTTSubscribeOpts.h b/mqtt/src/src/MQTTSubscribeOpts.h
new file mode 100644
index 00000000..1ae46780
--- /dev/null
+++ b/mqtt/src/src/MQTTSubscribeOpts.h
@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * Copyright (c) 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#if !defined(SUBOPTS_H)
+#define SUBOPTS_H
+
+/** The MQTT V5 subscribe options, apart from QoS which existed before V5. */
+typedef struct MQTTSubscribe_options
+{
+	/** The eyecatcher for this structure. Must be MQSO. */
+	char struct_id[4];
+	/** The version number of this structure.  Must be 0.
+	 */
+	int struct_version;
+	/** To not receive our own publications, set to 1.
+	 *  0 is the original MQTT behaviour - all messages matching the subscription are received.
+	 */
+	unsigned char noLocal;
+	/** To keep the retain flag as on the original publish message, set to 1.
+	 *  If 0, defaults to the original MQTT behaviour where the retain flag is only set on
+	 *  publications sent by a broker if in response to a subscribe request.
+	 */
+	unsigned char retainAsPublished;
+	/** 0 - send retained messages at the time of the subscribe (original MQTT behaviour)
+	 *  1 - send retained messages on subscribe only if the subscription is new
+	 *  2 - do not send retained messages at all
+	 */
+	unsigned char retainHandling;
+} MQTTSubscribe_options;
+
+#define MQTTSubscribe_options_initializer { {'M', 'Q', 'S', 'O'}, 0, 0, 0, 0 }
+
+#endif
diff --git a/mqtt/src/src/MQTTVersion.c b/mqtt/src/src/MQTTVersion.c
new file mode 100644
index 00000000..8e7ee36d
--- /dev/null
+++ b/mqtt/src/src/MQTTVersion.c
@@ -0,0 +1,230 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#include <stdio.h>
+
+#if !defined(_WRS_KERNEL)
+
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/types.h>
+#include <ctype.h>
+#include "MQTTAsync.h"
+
+#if defined(WIN32) || defined(WIN64)
+#include <windows.h>
+#include <tchar.h>
+#include <io.h>
+#include <sys/stat.h>
+#else
+#include <dlfcn.h>
+#include <sys/mman.h>
+#include <unistd.h>
+#endif
+
+
+/**
+ *
+ * @file
+ * \brief MQTTVersion - display the version and build information strings for a library.
+ *
+ * With no arguments, we try to load and call the version string for the libraries we 
+ * know about: mqttv3c, mqttv3cs, mqttv3a, mqttv3as.
+ * With an argument:
+ *   1) we try to load the named library, call getVersionInfo and display those values. 
+ *   2) If that doesn't work, we look through the binary for eyecatchers, and display those.  
+ *      This will work if the library is not executable in the current environment.
+ *
+ * */
+ 
+ 
+ static const char* libraries[] = {"paho-mqtt3c", "paho-mqtt3cs", "paho-mqtt3a", "paho-mqtt3as"};
+ static const char* eyecatchers[] = {"MQTTAsyncV3_Version", "MQTTAsyncV3_Timestamp",
+ 					 "MQTTClientV3_Version", "MQTTClientV3_Timestamp"};
+ 
+
+char* FindString(char* filename, const char* eyecatcher_input);
+int printVersionInfo(MQTTAsync_nameValue* info);
+int loadandcall(const char* libname);
+void printEyecatchers(char* filename);
+
+
+/**
+ * Finds an eyecatcher in a binary file and returns the following value.
+ * @param filename the name of the file
+ * @param eyecatcher_input the eyecatcher string to look for
+ * @return the value found - "" if not found 
+ */
+char* FindString(char* filename, const char* eyecatcher_input)
+{
+	FILE* infile = NULL;
+	static char value[100];
+	const char* eyecatcher = eyecatcher_input;
+	
+	memset(value, 0, 100);
+	if ((infile = fopen(filename, "rb")) != NULL)
+	{
+		size_t buflen = strlen(eyecatcher);
+		char* buffer = (char*) malloc(buflen + 1); /* added space for unused null terminator to stop LGTM complaint */
+
+		if (buffer != NULL)
+		{
+			int c = fgetc(infile);
+
+			while (feof(infile) == 0)
+			{
+				int count = 0;
+				buffer[count++] = c;
+				if (memcmp(eyecatcher, buffer, buflen) == 0)
+				{
+					char* ptr = value;
+					c = fgetc(infile); /* skip space */
+					c = fgetc(infile);
+					while (isprint(c))
+					{
+						*ptr++ = c;
+						c = fgetc(infile);
+					}
+					break;
+				}
+				if (count == buflen)
+				{
+					memmove(buffer, &buffer[1], buflen - 1);
+					count--;
+				}
+				c = fgetc(infile);
+			}
+			free(buffer);
+		}
+
+		fclose(infile);
+	}
+	return value;
+}
+
+
+int printVersionInfo(MQTTAsync_nameValue* info)
+{
+	int rc = 0;
+	
+	while (info->name)
+	{
+		printf("%s: %s\n", info->name, info->value);
+		info++;
+		rc = 1;  /* at least one value printed */
+	}
+	return rc;
+}
+
+typedef MQTTAsync_nameValue* (*func_type)(void);
+
+int loadandcall(const char* libname)
+{
+	int rc = 0;
+	MQTTAsync_nameValue* (*func_address)(void) = NULL;
+#if defined(WIN32) || defined(WIN64)
+	HMODULE APILibrary;
+
+	if ((APILibrary = LoadLibraryA(libname)) == NULL)
+		printf("Error loading library %s, error code %d\n", libname, GetLastError());
+	else
+	{
+		func_address = (func_type)GetProcAddress(APILibrary, "MQTTAsync_getVersionInfo");
+		if (func_address == NULL) 
+			func_address = (func_type)GetProcAddress(APILibrary, "MQTTClient_getVersionInfo");
+		if (func_address)
+			rc = printVersionInfo((*func_address)());
+		FreeLibrary(APILibrary);
+	}
+#else
+	void* APILibrary = dlopen(libname, RTLD_LAZY); /* Open the Library in question */
+	char* ErrorOutput = dlerror(); 	               /* Check it opened properly */
+	if (ErrorOutput != NULL)
+		printf("Error loading library %s, error %s\n", libname, ErrorOutput);
+	else
+	{	
+		*(void **) (&func_address) = dlsym(APILibrary, "MQTTAsync_getVersionInfo");
+		if (func_address == NULL)
+			func_address = dlsym(APILibrary, "MQTTClient_getVersionInfo");
+		if (func_address)
+			rc = printVersionInfo((*func_address)());
+		dlclose(APILibrary);
+	}
+#endif
+	return rc;
+}
+ 
+	
+#if !defined(ARRAY_SIZE)
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+#endif
+
+void printEyecatchers(char* filename)
+{
+	int i = 0;
+	
+	for (i = 0; i < ARRAY_SIZE(eyecatchers); ++i)
+	{
+		char* value = FindString(filename, eyecatchers[i]);
+		if (value[0]) 
+			printf("%s: %s\n", eyecatchers[i], value);
+	}
+}
+
+
+int main(int argc, char** argv)
+{
+	printf("MQTTVersion: print the version strings of an MQTT client library\n"); 
+	printf("Copyright (c) 2012, 2018 IBM Corp.\n");
+	
+	if (argc == 1)
+	{
+		int i = 0;
+		char namebuf[60];
+		
+		printf("Specify a particular library name if it is not in the current directory, or not executable on this platform\n");
+		 
+		for (i = 0; i < ARRAY_SIZE(libraries); ++i)
+		{
+#if defined(WIN32) || defined(WIN64)
+			sprintf(namebuf, "%s.dll", libraries[i]);
+#elif defined(OSX)
+			sprintf(namebuf, "lib%s.1.dylib", libraries[i]);
+#else
+			sprintf(namebuf, "lib%s.so.1", libraries[i]);
+#endif
+			printf("--- Trying library %s ---\n", libraries[i]);
+			if (!loadandcall(namebuf))
+				printEyecatchers(namebuf);
+		}
+	}
+	else
+	{
+		if (!loadandcall(argv[1]))
+			printEyecatchers(argv[1]);
+	}
+
+	return 0;
+}
+#else
+int main(void)
+{
+    fprintf(stderr, "This tool is not supported on this platform yet.\n");
+    return 1;
+}
+#endif /* !defined(_WRS_KERNEL) */
diff --git a/mqtt/src/src/Messages.c b/mqtt/src/src/Messages.c
new file mode 100644
index 00000000..c54ade57
--- /dev/null
+++ b/mqtt/src/src/Messages.c
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2013 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief Trace messages
+ *
+ */
+
+
+#include "Messages.h"
+#include "Log.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "Heap.h"
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+#define max_msg_len 120
+
+static const char *protocol_message_list[] =
+{
+	"%d %s -> CONNECT version %d clean: %d (%d)", /* 0, was 131, 68 and 69 */
+	"%d %s <- CONNACK rc: %d", /* 1, was 132 */
+	"%d %s -> CONNACK rc: %d (%d)", /* 2, was 138 */
+	"%d %s <- PINGREQ", /* 3, was 35 */
+	"%d %s -> PINGRESP (%d)", /* 4 */
+	"%d %s <- DISCONNECT", /* 5 */
+	"%d %s <- SUBSCRIBE msgid: %d", /* 6, was 39 */
+	"%d %s -> SUBACK msgid: %d (%d)", /* 7, was 40 */
+	"%d %s <- UNSUBSCRIBE msgid: %d", /* 8, was 41 */
+	"%d %s -> UNSUBACK msgid: %d (%d)", /* 9 */
+	"%d %s -> PUBLISH msgid: %d qos: %d retained: %d (%d) payload: %.*s", /* 10, was 42 */
+	"%d %s <- PUBLISH msgid: %d qos: %d retained: %d payload: %.*s", /* 11, was 46 */
+	"%d %s -> PUBACK msgid: %d (%d)", /* 12, was 47 */
+	"%d %s -> PUBREC msgid: %d (%d)", /* 13, was 48 */
+	"%d %s <- PUBACK msgid: %d", /* 14, was 49 */
+	"%d %s <- PUBREC msgid: %d", /* 15, was 53 */
+	"%d %s -> PUBREL msgid: %d (%d)", /* 16, was 57 */
+	"%d %s <- PUBREL msgid %d", /* 17, was 58 */
+	"%d %s -> PUBCOMP msgid %d (%d)", /* 18, was 62 */
+	"%d %s <- PUBCOMP msgid:%d", /* 19, was 63 */
+	"%d %s -> PINGREQ (%d)", /* 20, was 137 */
+	"%d %s <- PINGRESP", /* 21, was 70 */
+	"%d %s -> SUBSCRIBE msgid: %d (%d)", /* 22, was 72 */
+	"%d %s <- SUBACK msgid: %d", /* 23, was 73 */
+	"%d %s <- UNSUBACK msgid: %d", /* 24, was 74 */
+	"%d %s -> UNSUBSCRIBE msgid: %d (%d)", /* 25, was 106 */
+	"%d %s <- CONNECT", /* 26 */
+	"%d %s -> PUBLISH qos: 0 retained: %d (%d)", /* 27 */
+	"%d %s -> DISCONNECT (%d)", /* 28 */
+	"Socket error for client identifier %s, socket %d, peer address %s; ending connection", /* 29 */
+};
+
+static const char *trace_message_list[] =
+{
+	"Failed to remove client from bstate->clients", /* 0 */
+	"Removed client %s from bstate->clients, socket %d", /* 1 */
+	"Packet_Factory: unhandled packet type %d", /* 2 */
+	"Packet %s received from client %s for message identifier %d, but no record of that message identifier found", /* 3 */
+	"Packet %s received from client %s for message identifier %d, but message is wrong QoS, %d", /* 4 */
+	"Packet %s received from client %s for message identifier %d, but message is in wrong state", /* 5 */
+	"%s received from client %s for message id %d - removing publication", /* 6 */
+	"Trying %s again for client %s, socket %d, message identifier %d", /* 7 */
+	"", /* 8 */
+	"(%lu) %*s(%d)> %s:%d", /* 9 */
+	"(%lu) %*s(%d)< %s:%d", /* 10 */
+	"(%lu) %*s(%d)< %s:%d (%d)", /* 11 */
+	"Storing unsent QoS 0 message", /* 12 */
+};
+
+/**
+ * Get a log message by its index
+ * @param index the integer index
+ * @param log_level the log level, used to determine which message list to use
+ * @return the message format string
+ */
+const char* Messages_get(int index, enum LOG_LEVELS log_level)
+{
+	const char *msg = NULL;
+
+	if (log_level == TRACE_PROTOCOL)
+		msg = (index >= 0 && index < ARRAY_SIZE(protocol_message_list)) ? protocol_message_list[index] : NULL;
+	else
+		msg = (index >= 0 && index < ARRAY_SIZE(trace_message_list)) ? trace_message_list[index] : NULL;
+	return msg;
+}
+
diff --git a/mqtt/src/src/Messages.h b/mqtt/src/src/Messages.h
new file mode 100644
index 00000000..08f292f8
--- /dev/null
+++ b/mqtt/src/src/Messages.h
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2013 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#if !defined(MESSAGES_H)
+#define MESSAGES_H
+
+#include "Log.h"
+
+const char* Messages_get(int, enum LOG_LEVELS);
+
+#endif
diff --git a/mqtt/src/src/OsWrapper.c b/mqtt/src/src/OsWrapper.c
new file mode 100644
index 00000000..6d2f97ca
--- /dev/null
+++ b/mqtt/src/src/OsWrapper.c
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 logi.cals GmbH
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Gunter Raidl - timer support for VxWorks
+ *    Rainer Poisel - reusability
+ *******************************************************************************/
+
+#include "OsWrapper.h"
+
+#if defined(_WRS_KERNEL)
+void usleep(useconds_t useconds)
+{
+	struct timespec tv;
+	tv.tv_sec = useconds / 1000000;
+	tv.tv_nsec = (useconds % 1000000) * 1000;
+	nanosleep(&tv, NULL);
+}
+#endif /* defined(_WRS_KERNEL) */
diff --git a/mqtt/src/src/OsWrapper.h b/mqtt/src/src/OsWrapper.h
new file mode 100644
index 00000000..f657ab12
--- /dev/null
+++ b/mqtt/src/src/OsWrapper.h
@@ -0,0 +1,42 @@
+/*******************************************************************************
+ * Copyright (c) 2016, 2017 logi.cals GmbH
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Gunter Raidl - timer support for VxWorks
+ *    Rainer Poisel - reusability
+ *******************************************************************************/
+
+#if !defined(OSWRAPPER_H)
+#define OSWRAPPER_H
+
+#if defined(_WRS_KERNEL)
+#include <time.h>
+
+#define lstat stat
+
+typedef unsigned long useconds_t;
+void usleep(useconds_t useconds);
+
+#define timersub(a, b, result) \
+	do \
+	{ \
+		(result)->tv_sec = (a)->tv_sec - (b)->tv_sec; \
+		(result)->tv_usec = (a)->tv_usec - (b)->tv_usec; \
+		if ((result)->tv_usec < 0) \
+		{ \
+			--(result)->tv_sec; \
+			(result)->tv_usec += 1000000L; \
+		} \
+	} while (0)
+#endif /* defined(_WRS_KERNEL) */
+
+#endif /* OSWRAPPER_H */
diff --git a/mqtt/src/src/SHA1.c b/mqtt/src/src/SHA1.c
new file mode 100644
index 00000000..9bb1175c
--- /dev/null
+++ b/mqtt/src/src/SHA1.c
@@ -0,0 +1,249 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Wind River Systems, Inc. All Rights Reserved.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Keith Holman - initial implementation and documentation
+ *******************************************************************************/
+
+#include "SHA1.h"
+
+#if !defined(OPENSSL)
+#if defined(WIN32) || defined(WIN64)
+#pragma comment(lib, "crypt32.lib")
+
+int SHA1_Init(SHA_CTX *c)
+{
+	if (!CryptAcquireContext(&c->hProv, NULL, NULL,
+		PROV_RSA_FULL, CRYPT_VERIFYCONTEXT))
+		return 0;
+	if (!CryptCreateHash(c->hProv, CALG_SHA1, 0, 0, &c->hHash))
+	{
+		CryptReleaseContext(c->hProv, 0);
+		return 0;
+	}
+	return 1;
+}
+
+int SHA1_Update(SHA_CTX *c, const void *data, size_t len)
+{
+	int rv = 1;
+	if (!CryptHashData(c->hHash, data, (DWORD)len, 0))
+		rv = 0;
+	return rv;
+}
+
+int SHA1_Final(unsigned char *md, SHA_CTX *c)
+{
+	int rv = 0;
+	DWORD md_len = SHA1_DIGEST_LENGTH;
+	if (CryptGetHashParam(c->hHash, HP_HASHVAL, md, &md_len, 0))
+		rv = 1;
+	CryptDestroyHash(c->hHash);
+	CryptReleaseContext(c->hProv, 0);
+	return rv;
+}
+
+#else /* if defined(WIN32) || defined(WIN64) */
+#if defined(__linux__)
+#  include <endian.h>
+#elif defined(__APPLE__)
+#  include <libkern/OSByteOrder.h>
+#  define htobe32(x) OSSwapHostToBigInt32(x)
+#  define be32toh(x) OSSwapBigToHostInt32(x)
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#  include <sys/endian.h>
+#endif
+#include <string.h>
+static unsigned char pad[64] = {
+	0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
+
+int SHA1_Init(SHA_CTX *ctx)
+{
+	int ret = 0;
+	if ( ctx )
+	{
+		ctx->h[0] = 0x67452301;
+		ctx->h[1] = 0xEFCDAB89;
+		ctx->h[2] = 0x98BADCFE;
+		ctx->h[3] = 0x10325476;
+		ctx->h[4] = 0xC3D2E1F0;
+		ctx->size = 0u;
+		ctx->total = 0u;
+		ret = 1;
+	}
+	return ret;
+}
+
+#define ROTATE_LEFT32(a, n)  (((a) << (n)) | ((a) >> (32 - (n))))
+static void SHA1_ProcessBlock(SHA_CTX *ctx)
+{
+	uint32_t blks[5];
+	uint32_t *w;
+	int i;
+
+	/* initialize */
+	for ( i = 0; i < 5; ++i )
+		blks[i] = ctx->h[i];
+
+	w = ctx->w;
+
+	/* perform SHA-1 hash */
+	for ( i = 0; i < 16; ++i )
+		w[i] = be32toh(w[i]);
+
+	for( i = 0; i < 80; ++i )
+	{
+		int tmp;
+		if ( i >= 16 )
+			w[i & 0x0F] = ROTATE_LEFT32( w[(i+13) & 0x0F] ^ w[(i+8) & 0x0F] ^ w[(i+2) & 0x0F] ^ w[i & 0x0F], 1 );
+
+		if ( i < 20 )
+			tmp = ROTATE_LEFT32(blks[0], 5) + ((blks[1] & blks[2]) | (~(blks[1]) & blks[3])) + blks[4] + w[i & 0x0F] + 0x5A827999;
+		else if ( i < 40 )
+			tmp = ROTATE_LEFT32(blks[0], 5) + (blks[1]^blks[2]^blks[3]) + blks[4] + w[i & 0x0F] + 0x6ED9EBA1;
+		else if ( i < 60 )
+			tmp = ROTATE_LEFT32(blks[0], 5) + ((blks[1] & blks[2]) | (blks[1] & blks[3]) | (blks[2] & blks[3])) + blks[4] + w[i & 0x0F] + 0x8F1BBCDC;
+		else
+			tmp = ROTATE_LEFT32(blks[0], 5) + (blks[1]^blks[2]^blks[3]) + blks[4] + w[i & 0x0F] + 0xCA62C1D6;
+
+		/* update registers */
+		blks[4] = blks[3];
+		blks[3] = blks[2];
+		blks[2] = ROTATE_LEFT32(blks[1], 30);
+		blks[1] = blks[0];
+		blks[0] = tmp;
+	}
+
+	/* update of hash */
+	for ( i = 0; i < 5; ++i )
+		ctx->h[i] += blks[i];
+}
+
+int SHA1_Final(unsigned char *md, SHA_CTX *ctx)
+{
+	int i;
+	int ret = 0;
+	size_t pad_amount;
+	uint64_t total;
+
+	/* length before pad */
+	total = ctx->total * 8;
+
+	if ( ctx->size < 56 )
+		pad_amount = 56 - ctx->size;
+	else
+		pad_amount = 64 + 56 - ctx->size;
+
+	SHA1_Update(ctx, pad, pad_amount);
+
+	ctx->w[14] = htobe32((uint32_t)(total >> 32));
+	ctx->w[15] = htobe32((uint32_t)total);
+
+	SHA1_ProcessBlock(ctx);
+
+	for ( i = 0; i < 5; ++i )
+		ctx->h[i] = htobe32(ctx->h[i]);
+
+	if ( md )
+	{
+		memcpy( md, &ctx->h[0], SHA1_DIGEST_LENGTH );
+		ret = 1;
+	}
+
+	return ret;
+}
+
+int SHA1_Update(SHA_CTX *ctx, const void *data, size_t len)
+{
+	while ( len > 0 )
+	{
+		unsigned int n = 64 - ctx->size;
+		if ( len < n )
+			n = len;
+
+		memcpy(ctx->buffer + ctx->size, data, n);
+
+		ctx->size += n;
+		ctx->total += n;
+
+		data = (uint8_t *)data + n;
+		len -= n;
+
+		if ( ctx->size == 64 )
+		{
+			SHA1_ProcessBlock(ctx);
+			ctx->size = 0;
+		}
+	}
+	return 1;
+}
+
+#endif /* else if defined(WIN32) || defined(WIN64) */
+#endif /* elif !defined(OPENSSL) */
+
+#if defined(SHA1_TEST)
+#include <stdio.h>
+#include <string.h>
+
+#define TEST_EXPECT(i,x) if (!(x)) {fprintf( stderr, "failed test: %s (for i == %d)\n", #x, i ); ++fails;}
+
+int main(int argc, char *argv[])
+{
+	struct _td
+	{
+		const char *in;
+		const char *out;
+	};
+
+	int i;
+	unsigned int fails = 0u;
+	struct _td test_data[] = {
+		{ "", "da39a3ee5e6b4b0d3255bfef95601890afd80709" },
+		{ "this string", "fda4e74bc7489a18b146abdf23346d166663dab8" },
+		{ NULL, NULL }
+	};
+
+	/* only 1 update */
+	i = 0;
+	while ( test_data[i].in != NULL )
+	{
+		int r[3] = { 1, 1, 1 };
+		unsigned char sha_out[SHA1_DIGEST_LENGTH];
+		char out[SHA1_DIGEST_LENGTH * 2 + 1];
+		SHA_CTX c;
+		int j;
+		r[0] = SHA1_Init( &c );
+		r[1] = SHA1_Update( &c, test_data[i].in, strlen(test_data[i].in));
+		r[2] = SHA1_Final( sha_out, &c );
+		for ( j = 0u; j < SHA1_DIGEST_LENGTH; ++j )
+			snprintf( &out[j*2], 3u, "%02x", sha_out[j] );
+		out[SHA1_DIGEST_LENGTH * 2] = '\0';
+		TEST_EXPECT( i, r[0] == 1 && r[1] == 1 && r[2] == 1 && strncmp(out, test_data[i].out, strlen(test_data[i].out)) == 0 );
+		++i;
+	}
+
+	if ( fails )
+		printf( "%u test failed!\n", fails );
+	else
+		printf( "all tests passed\n" );
+	return fails;
+}
+#endif /* if defined(SHA1_TEST) */
+
diff --git a/mqtt/src/src/SHA1.h b/mqtt/src/src/SHA1.h
new file mode 100644
index 00000000..f8e8abd0
--- /dev/null
+++ b/mqtt/src/src/SHA1.h
@@ -0,0 +1,91 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Wind River Systems, Inc. All Rights Reserved.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Keith Holman - initial implementation and documentation
+ *******************************************************************************/
+
+#if !defined(SHA1_H)
+#define SHA1_H
+
+#if defined(OPENSSL)
+#include <openssl/sha.h>
+
+/** SHA-1 Digest Length */
+#define SHA1_DIGEST_LENGTH SHA_DIGEST_LENGTH
+
+#else /* if defined(OPENSSL) */
+
+#if defined(WIN32) || defined(WIN64)
+#include <Windows.h>
+#include <WinCrypt.h>
+typedef struct SHA_CTX_S
+{
+	HCRYPTPROV hProv;
+	HCRYPTHASH hHash;
+} SHA_CTX;
+#else /* if defined(WIN32) || defined(WIN64) */
+
+#include <stdint.h>
+typedef struct SHA_CTX_S {
+	uint32_t h[5];
+	union {
+		uint32_t w[16];
+		uint8_t buffer[64];
+	};
+	unsigned int size;
+	unsigned int total;
+} SHA_CTX;
+#endif /* else if defined(WIN32) || defined(WIN64) */
+
+#include <stddef.h>
+
+/** SHA-1 Digest Length (number of bytes in SHA1) */
+#define SHA1_DIGEST_LENGTH (160/8)
+
+/**
+ * Initializes the SHA1 hashing algorithm
+ *
+ * @param[in,out]  ctx                 hashing context structure
+ *
+ * @see SHA1_Update
+ * @see SHA1_Final
+ */
+int SHA1_Init(SHA_CTX *ctx);
+
+/**
+ * Updates a block to the SHA1 hash
+ *
+ * @param[in,out]  ctx                 hashing context structure
+ * @param[in]      data                block of data to hash
+ * @param[in]      len                 length of block to hash
+ *
+ * @see SHA1_Init
+ * @see SHA1_Final
+ */
+int SHA1_Update(SHA_CTX *ctx, const void *data, size_t len);
+
+/**
+ * Produce final SHA1 hash
+ *
+ * @param[out]     md                  SHA1 hash produced (must be atleast
+ *                                     @p SHA1_DIGEST_LENGTH in length)
+ * @param[in,out]  ctx                 hashing context structure
+ *
+ * @see SHA1_Init
+ * @see SHA1_Final
+ */
+int SHA1_Final(unsigned char *md, SHA_CTX *ctx);
+
+#endif /* if defined(OPENSSL) */
+#endif /* SHA1_H */
+
diff --git a/mqtt/src/src/SSLSocket.c b/mqtt/src/src/SSLSocket.c
new file mode 100644
index 00000000..92fc5e98
--- /dev/null
+++ b/mqtt/src/src/SSLSocket.c
@@ -0,0 +1,1045 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs, Allan Stockdill-Mander - initial implementation
+ *    Ian Craggs - fix for bug #409702
+ *    Ian Craggs - allow compilation for OpenSSL < 1.0
+ *    Ian Craggs - fix for bug #453883
+ *    Ian Craggs - fix for bug #480363, issue 13
+ *    Ian Craggs - SNI support
+ *    Ian Craggs - fix for issues #155, #160
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief SSL  related functions
+ *
+ */
+
+#if defined(OPENSSL)
+
+#include "SocketBuffer.h"
+#include "MQTTClient.h"
+#include "MQTTProtocolOut.h"
+#include "SSLSocket.h"
+#include "Log.h"
+#include "StackTrace.h"
+#include "Socket.h"
+
+#include "Heap.h"
+
+#include <string.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#include <openssl/crypto.h>
+#include <openssl/x509v3.h>
+
+extern Sockets s;
+
+static int SSLSocket_error(char* aString, SSL* ssl, int sock, int rc, int (*cb)(const char *str, size_t len, void *u), void* u);
+char* SSL_get_verify_result_string(int rc);
+void SSL_CTX_info_callback(const SSL* ssl, int where, int ret);
+char* SSLSocket_get_version_string(int version);
+void SSL_CTX_msg_callback(
+		int write_p,
+		int version,
+		int content_type,
+		const void* buf, size_t len,
+		SSL* ssl, void* arg);
+int pem_passwd_cb(char* buf, int size, int rwflag, void* userdata);
+int SSL_create_mutex(ssl_mutex_type* mutex);
+int SSL_lock_mutex(ssl_mutex_type* mutex);
+int SSL_unlock_mutex(ssl_mutex_type* mutex);
+void SSL_destroy_mutex(ssl_mutex_type* mutex);
+#if (OPENSSL_VERSION_NUMBER >= 0x010000000)
+extern void SSLThread_id(CRYPTO_THREADID *id);
+#else
+extern unsigned long SSLThread_id(void);
+#endif
+extern void SSLLocks_callback(int mode, int n, const char *file, int line);
+int SSLSocket_createContext(networkHandles* net, MQTTClient_SSLOptions* opts);
+void SSLSocket_destroyContext(networkHandles* net);
+void SSLSocket_addPendingRead(int sock);
+
+/* 1 ~ we are responsible for initializing openssl; 0 ~ openssl init is done externally */
+static int handle_openssl_init = 1;
+static ssl_mutex_type* sslLocks = NULL;
+static ssl_mutex_type sslCoreMutex;
+
+/* Used to store MQTTClient_SSLOptions for TLS-PSK callback */
+static int tls_ex_index_ssl_opts;
+
+#if defined(WIN32) || defined(WIN64)
+#define iov_len len
+#define iov_base buf
+#endif
+
+/**
+ * Gets the specific error corresponding to SOCKET_ERROR
+ * @param aString the function that was being used when the error occurred
+ * @param sock the socket on which the error occurred
+ * @param rc the return code
+ * @param cb the callback function to be passed as first argument to ERR_print_errors_cb
+ * @param u context to be passed as second argument to ERR_print_errors_cb
+ * @return the specific TCP error code
+ */
+static int SSLSocket_error(char* aString, SSL* ssl, int sock, int rc, int (*cb)(const char *str, size_t len, void *u), void* u)
+{
+    int error;
+
+    FUNC_ENTRY;
+    if (ssl)
+        error = SSL_get_error(ssl, rc);
+    else
+        error = ERR_get_error();
+    if (error == SSL_ERROR_WANT_READ || error == SSL_ERROR_WANT_WRITE)
+    {
+		Log(TRACE_MIN, -1, "SSLSocket error WANT_READ/WANT_WRITE");
+    }
+    else
+    {
+        static char buf[120];
+
+        if (strcmp(aString, "shutdown") != 0)
+        	Log(TRACE_MIN, -1, "SSLSocket error %s(%d) in %s for socket %d rc %d errno %d %s\n", buf, error, aString, sock, rc, errno, strerror(errno));
+        if (cb)
+            ERR_print_errors_cb(cb, u);
+		if (error == SSL_ERROR_SSL || error == SSL_ERROR_SYSCALL)
+			error = SSL_FATAL;
+    }
+    FUNC_EXIT_RC(error);
+    return error;
+}
+
+static struct
+{
+	int code;
+	char* string;
+}
+X509_message_table[] =
+{
+	{ X509_V_OK, "X509_V_OK" },
+	{ X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT, "X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT" },
+	{ X509_V_ERR_UNABLE_TO_GET_CRL, "X509_V_ERR_UNABLE_TO_GET_CRL" },
+	{ X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE, "X509_V_ERR_UNABLE_TO_DECRYPT_CERT_SIGNATURE" },
+	{ X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE, "X509_V_ERR_UNABLE_TO_DECRYPT_CRL_SIGNATURE" },
+	{ X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY, "X509_V_ERR_UNABLE_TO_DECODE_ISSUER_PUBLIC_KEY" },
+	{ X509_V_ERR_CERT_SIGNATURE_FAILURE, "X509_V_ERR_CERT_SIGNATURE_FAILURE" },
+	{ X509_V_ERR_CRL_SIGNATURE_FAILURE, "X509_V_ERR_CRL_SIGNATURE_FAILURE" },
+	{ X509_V_ERR_CERT_NOT_YET_VALID, "X509_V_ERR_CERT_NOT_YET_VALID" },
+	{ X509_V_ERR_CERT_HAS_EXPIRED, "X509_V_ERR_CERT_HAS_EXPIRED" },
+	{ X509_V_ERR_CRL_NOT_YET_VALID, "X509_V_ERR_CRL_NOT_YET_VALID" },
+	{ X509_V_ERR_CRL_HAS_EXPIRED, "X509_V_ERR_CRL_HAS_EXPIRED" },
+	{ X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD, "X509_V_ERR_ERROR_IN_CERT_NOT_BEFORE_FIELD" },
+	{ X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD, "X509_V_ERR_ERROR_IN_CERT_NOT_AFTER_FIELD" },
+	{ X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD, "X509_V_ERR_ERROR_IN_CRL_LAST_UPDATE_FIELD" },
+	{ X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD, "X509_V_ERR_ERROR_IN_CRL_NEXT_UPDATE_FIELD" },
+	{ X509_V_ERR_OUT_OF_MEM, "X509_V_ERR_OUT_OF_MEM" },
+	{ X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT, "X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT" },
+	{ X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN, "X509_V_ERR_SELF_SIGNED_CERT_IN_CHAIN" },
+	{ X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, "X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY" },
+	{ X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE, "X509_V_ERR_UNABLE_TO_VERIFY_LEAF_SIGNATURE" },
+	{ X509_V_ERR_CERT_CHAIN_TOO_LONG, "X509_V_ERR_CERT_CHAIN_TOO_LONG" },
+	{ X509_V_ERR_CERT_REVOKED, "X509_V_ERR_CERT_REVOKED" },
+	{ X509_V_ERR_INVALID_CA, "X509_V_ERR_INVALID_CA" },
+	{ X509_V_ERR_PATH_LENGTH_EXCEEDED, "X509_V_ERR_PATH_LENGTH_EXCEEDED" },
+	{ X509_V_ERR_INVALID_PURPOSE, "X509_V_ERR_INVALID_PURPOSE" },
+	{ X509_V_ERR_CERT_UNTRUSTED, "X509_V_ERR_CERT_UNTRUSTED" },
+	{ X509_V_ERR_CERT_REJECTED, "X509_V_ERR_CERT_REJECTED" },
+	{ X509_V_ERR_SUBJECT_ISSUER_MISMATCH, "X509_V_ERR_SUBJECT_ISSUER_MISMATCH" },
+	{ X509_V_ERR_AKID_SKID_MISMATCH, "X509_V_ERR_AKID_SKID_MISMATCH" },
+	{ X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH, "X509_V_ERR_AKID_ISSUER_SERIAL_MISMATCH" },
+	{ X509_V_ERR_KEYUSAGE_NO_CERTSIGN, "X509_V_ERR_KEYUSAGE_NO_CERTSIGN" },
+	{ X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER, "X509_V_ERR_UNABLE_TO_GET_CRL_ISSUER" },
+	{ X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION, "X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION" },
+	{ X509_V_ERR_KEYUSAGE_NO_CRL_SIGN, "X509_V_ERR_KEYUSAGE_NO_CRL_SIGN" },
+	{ X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION, "X509_V_ERR_UNHANDLED_CRITICAL_CRL_EXTENSION" },
+	{ X509_V_ERR_INVALID_NON_CA, "X509_V_ERR_INVALID_NON_CA" },
+	{ X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED, "X509_V_ERR_PROXY_PATH_LENGTH_EXCEEDED" },
+	{ X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE, "X509_V_ERR_KEYUSAGE_NO_DIGITAL_SIGNATURE" },
+	{ X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED, "X509_V_ERR_PROXY_CERTIFICATES_NOT_ALLOWED" },
+	{ X509_V_ERR_INVALID_EXTENSION, "X509_V_ERR_INVALID_EXTENSION" },
+	{ X509_V_ERR_INVALID_POLICY_EXTENSION, "X509_V_ERR_INVALID_POLICY_EXTENSION" },
+	{ X509_V_ERR_NO_EXPLICIT_POLICY, "X509_V_ERR_NO_EXPLICIT_POLICY" },
+	{ X509_V_ERR_UNNESTED_RESOURCE, "X509_V_ERR_UNNESTED_RESOURCE" },
+#if defined(X509_V_ERR_DIFFERENT_CRL_SCOPE)
+	{ X509_V_ERR_DIFFERENT_CRL_SCOPE, "X509_V_ERR_DIFFERENT_CRL_SCOPE" },
+	{ X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE, "X509_V_ERR_UNSUPPORTED_EXTENSION_FEATURE" },
+	{ X509_V_ERR_PERMITTED_VIOLATION, "X509_V_ERR_PERMITTED_VIOLATION" },
+	{ X509_V_ERR_EXCLUDED_VIOLATION, "X509_V_ERR_EXCLUDED_VIOLATION" },
+	{ X509_V_ERR_SUBTREE_MINMAX, "X509_V_ERR_SUBTREE_MINMAX" },
+	{ X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE, "X509_V_ERR_UNSUPPORTED_CONSTRAINT_TYPE" },
+	{ X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX, "X509_V_ERR_UNSUPPORTED_CONSTRAINT_SYNTAX" },
+	{ X509_V_ERR_UNSUPPORTED_NAME_SYNTAX, "X509_V_ERR_UNSUPPORTED_NAME_SYNTAX" },
+#endif
+};
+
+#if !defined(ARRAY_SIZE)
+/**
+ * Macro to calculate the number of entries in an array
+ */
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+#endif
+
+char* SSL_get_verify_result_string(int rc)
+{
+	int i;
+	char* retstring = "undef";
+
+	for (i = 0; i < ARRAY_SIZE(X509_message_table); ++i)
+	{
+		if (X509_message_table[i].code == rc)
+		{
+			retstring = X509_message_table[i].string;
+			break;
+		}
+	}
+	return retstring;
+}
+
+
+void SSL_CTX_info_callback(const SSL* ssl, int where, int ret)
+{
+	if (where & SSL_CB_LOOP)
+	{
+		Log(TRACE_PROTOCOL, 1, "SSL state %s:%s:%s",
+                  (where & SSL_ST_CONNECT) ? "connect" : (where & SSL_ST_ACCEPT) ? "accept" : "undef",
+                    SSL_state_string_long(ssl), SSL_get_cipher_name(ssl));
+	}
+	else if (where & SSL_CB_EXIT)
+	{
+		Log(TRACE_PROTOCOL, 1, "SSL %s:%s",
+                  (where & SSL_ST_CONNECT) ? "connect" : (where & SSL_ST_ACCEPT) ? "accept" : "undef",
+                    SSL_state_string_long(ssl));
+	}
+	else if (where & SSL_CB_ALERT)
+	{
+		Log(TRACE_PROTOCOL, 1, "SSL alert %s:%s:%s",
+                  (where & SSL_CB_READ) ? "read" : "write",
+                    SSL_alert_type_string_long(ret), SSL_alert_desc_string_long(ret));
+	}
+	else if (where & SSL_CB_HANDSHAKE_START)
+	{
+		Log(TRACE_PROTOCOL, 1, "SSL handshake started %s:%s:%s",
+                  (where & SSL_CB_READ) ? "read" : "write",
+                    SSL_alert_type_string_long(ret), SSL_alert_desc_string_long(ret));
+	}
+	else if (where & SSL_CB_HANDSHAKE_DONE)
+	{
+		Log(TRACE_PROTOCOL, 1, "SSL handshake done %s:%s:%s",
+                  (where & SSL_CB_READ) ? "read" : "write",
+                    SSL_alert_type_string_long(ret), SSL_alert_desc_string_long(ret));
+		Log(TRACE_PROTOCOL, 1, "SSL certificate verification: %s",
+                    SSL_get_verify_result_string(SSL_get_verify_result(ssl)));
+	}
+	else
+	{
+		Log(TRACE_PROTOCOL, 1, "SSL state %s:%s:%s", SSL_state_string_long(ssl),
+                   SSL_alert_type_string_long(ret), SSL_alert_desc_string_long(ret));
+	}
+}
+
+
+char* SSLSocket_get_version_string(int version)
+{
+	int i;
+	static char buf[20];
+	char* retstring = NULL;
+	static struct
+	{
+		int code;
+		char* string;
+	}
+	version_string_table[] =
+	{
+		{ SSL2_VERSION, "SSL 2.0" },
+		{ SSL3_VERSION, "SSL 3.0" },
+		{ TLS1_VERSION, "TLS 1.0" },
+#if defined(TLS2_VERSION)
+		{ TLS2_VERSION, "TLS 1.1" },
+#endif
+#if defined(TLS3_VERSION)
+		{ TLS3_VERSION, "TLS 1.2" },
+#endif
+	};
+
+	for (i = 0; i < ARRAY_SIZE(version_string_table); ++i)
+	{
+		if (version_string_table[i].code == version)
+		{
+			retstring = version_string_table[i].string;
+			break;
+		}
+	}
+
+	if (retstring == NULL)
+	{
+		sprintf(buf, "%i", version);
+		retstring = buf;
+	}
+	return retstring;
+}
+
+
+void SSL_CTX_msg_callback(int write_p, int version, int content_type, const void* buf, size_t len,
+        SSL* ssl, void* arg)
+{
+
+/*
+called by the SSL/TLS library for a protocol message, the function arguments have the following meaning:
+
+write_p
+This flag is 0 when a protocol message has been received and 1 when a protocol message has been sent.
+
+version
+The protocol version according to which the protocol message is interpreted by the library. Currently, this is one of SSL2_VERSION, SSL3_VERSION and TLS1_VERSION (for SSL 2.0, SSL 3.0 and TLS 1.0, respectively).
+
+content_type
+In the case of SSL 2.0, this is always 0. In the case of SSL 3.0 or TLS 1.0, this is one of the ContentType values defined in the protocol specification (change_cipher_spec(20), alert(21), handshake(22); but never application_data(23) because the callback will only be called for protocol messages).
+
+buf, len
+buf points to a buffer containing the protocol message, which consists of len bytes. The buffer is no longer valid after the callback function has returned.
+
+ssl
+The SSL object that received or sent the message.
+
+arg
+The user-defined argument optionally defined by SSL_CTX_set_msg_callback_arg() or SSL_set_msg_callback_arg().
+
+*/
+
+	Log(TRACE_MINIMUM, -1, "%s %s %d buflen %d", (write_p ? "sent" : "received"),
+		SSLSocket_get_version_string(version),
+		content_type, (int)len);
+}
+
+
+int pem_passwd_cb(char* buf, int size, int rwflag, void* userdata)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if (!rwflag)
+	{
+		strncpy(buf, (char*)(userdata), size);
+		buf[size-1] = '\0';
+		rc = (int)strlen(buf);
+	}
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+int SSL_create_mutex(ssl_mutex_type* mutex)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+#if defined(WIN32) || defined(WIN64)
+	*mutex = CreateMutex(NULL, 0, NULL);
+#else
+	rc = pthread_mutex_init(mutex, NULL);
+#endif
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+int SSL_lock_mutex(ssl_mutex_type* mutex)
+{
+	int rc = -1;
+
+	/* don't add entry/exit trace points, as trace gets lock too, and it might happen quite frequently  */
+#if defined(WIN32) || defined(WIN64)
+	if (WaitForSingleObject(*mutex, INFINITE) != WAIT_FAILED)
+#else
+	if ((rc = pthread_mutex_lock(mutex)) == 0)
+#endif
+	rc = 0;
+
+	return rc;
+}
+
+int SSL_unlock_mutex(ssl_mutex_type* mutex)
+{
+	int rc = -1;
+
+	/* don't add entry/exit trace points, as trace gets lock too, and it might happen quite frequently  */
+#if defined(WIN32) || defined(WIN64)
+	if (ReleaseMutex(*mutex) != 0)
+#else
+	if ((rc = pthread_mutex_unlock(mutex)) == 0)
+#endif
+	rc = 0;
+
+	return rc;
+}
+
+void SSL_destroy_mutex(ssl_mutex_type* mutex)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+#if defined(WIN32) || defined(WIN64)
+	rc = CloseHandle(*mutex);
+#else
+	rc = pthread_mutex_destroy(mutex);
+#endif
+	FUNC_EXIT_RC(rc);
+}
+
+
+
+#if (OPENSSL_VERSION_NUMBER >= 0x010000000)
+extern void SSLThread_id(CRYPTO_THREADID *id)
+{
+#if defined(WIN32) || defined(WIN64)
+	CRYPTO_THREADID_set_numeric(id, (unsigned long)GetCurrentThreadId());
+#else
+	CRYPTO_THREADID_set_numeric(id, (unsigned long)pthread_self());
+#endif
+}
+#else
+extern unsigned long SSLThread_id(void)
+{
+#if defined(WIN32) || defined(WIN64)
+	return (unsigned long)GetCurrentThreadId();
+#else
+	return (unsigned long)pthread_self();
+#endif
+}
+#endif
+
+extern void SSLLocks_callback(int mode, int n, const char *file, int line)
+{
+	if (sslLocks)
+	{
+		if (mode & CRYPTO_LOCK)
+			SSL_lock_mutex(&sslLocks[n]);
+		else
+			SSL_unlock_mutex(&sslLocks[n]);
+	}
+}
+
+
+void SSLSocket_handleOpensslInit(int bool_value)
+{
+	handle_openssl_init = bool_value;
+}
+
+
+int SSLSocket_initialize(void)
+{
+	int rc = 0;
+	/*int prc;*/
+	int i;
+	int lockMemSize;
+
+	FUNC_ENTRY;
+
+	if (handle_openssl_init)
+	{
+		if ((rc = SSL_library_init()) != 1)
+			rc = -1;
+
+		ERR_load_crypto_strings();
+		SSL_load_error_strings();
+
+		/* OpenSSL 0.9.8o and 1.0.0a and later added SHA2 algorithms to SSL_library_init().
+		Applications which need to use SHA2 in earlier versions of OpenSSL should call
+		OpenSSL_add_all_algorithms() as well. */
+
+		OpenSSL_add_all_algorithms();
+
+		lockMemSize = CRYPTO_num_locks() * sizeof(ssl_mutex_type);
+
+		sslLocks = malloc(lockMemSize);
+		if (!sslLocks)
+		{
+			rc = -1;
+			goto exit;
+		}
+		else
+			memset(sslLocks, 0, lockMemSize);
+
+		for (i = 0; i < CRYPTO_num_locks(); i++)
+		{
+			/* prc = */SSL_create_mutex(&sslLocks[i]);
+		}
+
+#if (OPENSSL_VERSION_NUMBER >= 0x010000000)
+		CRYPTO_THREADID_set_callback(SSLThread_id);
+#else
+		CRYPTO_set_id_callback(SSLThread_id);
+#endif
+		CRYPTO_set_locking_callback(SSLLocks_callback);
+
+	}
+
+	SSL_create_mutex(&sslCoreMutex);
+
+	tls_ex_index_ssl_opts = SSL_get_ex_new_index(0, "paho ssl options", NULL, NULL, NULL);
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+void SSLSocket_terminate(void)
+{
+	FUNC_ENTRY;
+
+	if (handle_openssl_init)
+	{
+		EVP_cleanup();
+		ERR_free_strings();
+		CRYPTO_set_locking_callback(NULL);
+		if (sslLocks)
+		{
+			int i = 0;
+
+			for (i = 0; i < CRYPTO_num_locks(); i++)
+			{
+				SSL_destroy_mutex(&sslLocks[i]);
+			}
+			free(sslLocks);
+		}
+	}
+
+	SSL_destroy_mutex(&sslCoreMutex);
+
+	FUNC_EXIT;
+}
+
+static unsigned int call_ssl_psk_cb(SSL *ssl, const char *hint, char *identity, unsigned int max_identity_len, unsigned char *psk, unsigned int max_psk_len)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+
+	SSL_CTX *ctx = SSL_get_SSL_CTX(ssl);
+	MQTTClient_SSLOptions* opts = SSL_CTX_get_ex_data(ctx, tls_ex_index_ssl_opts);
+
+	if (opts == NULL)
+		goto exit;
+
+	if (opts->ssl_psk_cb != NULL)
+		rc = opts->ssl_psk_cb(hint, identity, max_identity_len, psk, max_psk_len, opts->ssl_psk_context);
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+int SSLSocket_createContext(networkHandles* net, MQTTClient_SSLOptions* opts)
+{
+	int rc = 1;
+
+	FUNC_ENTRY;
+	if (net->ctx == NULL)
+	{
+#if (OPENSSL_VERSION_NUMBER >= 0x10100000L)
+		net->ctx = SSL_CTX_new(TLS_client_method());
+#else
+		int sslVersion = MQTT_SSL_VERSION_DEFAULT;
+		if (opts->struct_version >= 1) sslVersion = opts->sslVersion;
+/* SSL_OP_NO_TLSv1_1 is defined in ssl.h if the library version supports TLSv1.1.
+ * OPENSSL_NO_TLS1 is defined in opensslconf.h or on the compiler command line
+ * if TLS1.x was removed at OpenSSL library build time via Configure options.
+ */
+		switch (sslVersion)
+		{
+		case MQTT_SSL_VERSION_DEFAULT:
+			net->ctx = SSL_CTX_new(SSLv23_client_method()); /* SSLv23 for compatibility with SSLv2, SSLv3 and TLSv1 */
+			break;
+#if defined(SSL_OP_NO_TLSv1) && !defined(OPENSSL_NO_TLS1)
+		case MQTT_SSL_VERSION_TLS_1_0:
+			net->ctx = SSL_CTX_new(TLSv1_client_method());
+			break;
+#endif
+#if defined(SSL_OP_NO_TLSv1_1) && !defined(OPENSSL_NO_TLS1)
+		case MQTT_SSL_VERSION_TLS_1_1:
+			net->ctx = SSL_CTX_new(TLSv1_1_client_method());
+			break;
+#endif
+#if defined(SSL_OP_NO_TLSv1_2) && !defined(OPENSSL_NO_TLS1)
+		case MQTT_SSL_VERSION_TLS_1_2:
+			net->ctx = SSL_CTX_new(TLSv1_2_client_method());
+			break;
+#endif
+		default:
+			break;
+		}
+#endif
+		if (net->ctx == NULL)
+		{
+			if (opts->struct_version >= 3)
+				SSLSocket_error("SSL_CTX_new", NULL, net->socket, rc, opts->ssl_error_cb, opts->ssl_error_context);
+			else
+				SSLSocket_error("SSL_CTX_new", NULL, net->socket, rc, NULL, NULL);
+			goto exit;
+		}
+	}
+
+	if (opts->keyStore)
+	{
+		if ((rc = SSL_CTX_use_certificate_chain_file(net->ctx, opts->keyStore)) != 1)
+		{
+			if (opts->struct_version >= 3)
+				SSLSocket_error("SSL_CTX_use_certificate_chain_file", NULL, net->socket, rc, opts->ssl_error_cb, opts->ssl_error_context);
+			else
+				SSLSocket_error("SSL_CTX_use_certificate_chain_file", NULL, net->socket, rc, NULL, NULL);
+			goto free_ctx; /*If we can't load the certificate (chain) file then loading the privatekey won't work either as it needs a matching cert already loaded */
+		}
+
+		if (opts->privateKey == NULL)
+			opts->privateKey = opts->keyStore;   /* the privateKey can be included in the keyStore */
+
+		if (opts->privateKeyPassword != NULL)
+		{
+			SSL_CTX_set_default_passwd_cb(net->ctx, pem_passwd_cb);
+			SSL_CTX_set_default_passwd_cb_userdata(net->ctx, (void*)opts->privateKeyPassword);
+		}
+
+		/* support for ASN.1 == DER format? DER can contain only one certificate? */
+		rc = SSL_CTX_use_PrivateKey_file(net->ctx, opts->privateKey, SSL_FILETYPE_PEM);
+		if (opts->privateKey == opts->keyStore)
+			opts->privateKey = NULL;
+		if (rc != 1)
+		{
+			if (opts->struct_version >= 3)
+				SSLSocket_error("SSL_CTX_use_PrivateKey_file", NULL, net->socket, rc, opts->ssl_error_cb, opts->ssl_error_context);
+			else
+				SSLSocket_error("SSL_CTX_use_PrivateKey_file", NULL, net->socket, rc, NULL, NULL);
+			goto free_ctx;
+		}
+	}
+
+	if (opts->trustStore || opts->CApath)
+	{
+		if ((rc = SSL_CTX_load_verify_locations(net->ctx, opts->trustStore, opts->CApath)) != 1)
+		{
+			if (opts->struct_version >= 3)
+				SSLSocket_error("SSL_CTX_load_verify_locations", NULL, net->socket, rc, opts->ssl_error_cb, opts->ssl_error_context);
+			else
+				SSLSocket_error("SSL_CTX_load_verify_locations", NULL, net->socket, rc, NULL, NULL);
+			goto free_ctx;
+		}
+	}
+	else if (!opts->disableDefaultTrustStore)
+	{
+		if ((rc = SSL_CTX_set_default_verify_paths(net->ctx)) != 1)
+		{
+			if (opts->struct_version >= 3)
+				SSLSocket_error("SSL_CTX_set_default_verify_paths", NULL, net->socket, rc, opts->ssl_error_cb, opts->ssl_error_context);
+			else
+				SSLSocket_error("SSL_CTX_set_default_verify_paths", NULL, net->socket, rc, NULL, NULL);
+			goto free_ctx;
+		}
+	}
+
+	if (opts->enabledCipherSuites)
+	{
+		if ((rc = SSL_CTX_set_cipher_list(net->ctx, opts->enabledCipherSuites)) != 1)
+		{
+			if (opts->struct_version >= 3)
+				SSLSocket_error("SSL_CTX_set_cipher_list", NULL, net->socket, rc, opts->ssl_error_cb, opts->ssl_error_context);
+			else
+				SSLSocket_error("SSL_CTX_set_cipher_list", NULL, net->socket, rc, NULL, NULL);
+			goto free_ctx;
+		}
+	}
+
+#ifndef OPENSSL_NO_PSK
+	if (opts->ssl_psk_cb != NULL)
+	{
+		SSL_CTX_set_ex_data(net->ctx, tls_ex_index_ssl_opts, opts);
+		SSL_CTX_set_psk_client_callback(net->ctx, call_ssl_psk_cb);
+	}
+#endif
+
+	SSL_CTX_set_mode(net->ctx, SSL_MODE_ACCEPT_MOVING_WRITE_BUFFER);
+
+	goto exit;
+free_ctx:
+	SSL_CTX_free(net->ctx);
+	net->ctx = NULL;
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+int SSLSocket_setSocketForSSL(networkHandles* net, MQTTClient_SSLOptions* opts,
+	const char* hostname, size_t hostname_len)
+{
+	int rc = 1;
+
+	FUNC_ENTRY;
+
+	if (net->ctx != NULL || (rc = SSLSocket_createContext(net, opts)) == 1)
+	{
+		char *hostname_plus_null;
+		int i;
+
+		SSL_CTX_set_info_callback(net->ctx, SSL_CTX_info_callback);
+		SSL_CTX_set_msg_callback(net->ctx, SSL_CTX_msg_callback);
+   		if (opts->enableServerCertAuth)
+			SSL_CTX_set_verify(net->ctx, SSL_VERIFY_PEER, NULL);
+
+		net->ssl = SSL_new(net->ctx);
+
+		/* Log all ciphers available to the SSL sessions (loaded in ctx) */
+		for (i = 0; ;i++)
+		{
+			const char* cipher = SSL_get_cipher_list(net->ssl, i);
+			if (cipher == NULL)
+				break;
+			Log(TRACE_PROTOCOL, 1, "SSL cipher available: %d:%s", i, cipher);
+		}
+		if ((rc = SSL_set_fd(net->ssl, net->socket)) != 1) {
+			if (opts->struct_version >= 3)
+				SSLSocket_error("SSL_set_fd", net->ssl, net->socket, rc, opts->ssl_error_cb, opts->ssl_error_context);
+			else
+				SSLSocket_error("SSL_set_fd", net->ssl, net->socket, rc, NULL, NULL);
+		}
+		hostname_plus_null = malloc(hostname_len + 1u );
+		MQTTStrncpy(hostname_plus_null, hostname, hostname_len + 1u);
+		if ((rc = SSL_set_tlsext_host_name(net->ssl, hostname_plus_null)) != 1) {
+			if (opts->struct_version >= 3)
+				SSLSocket_error("SSL_set_tlsext_host_name", NULL, net->socket, rc, opts->ssl_error_cb, opts->ssl_error_context);
+			else
+				SSLSocket_error("SSL_set_tlsext_host_name", NULL, net->socket, rc, NULL, NULL);
+		}
+		free(hostname_plus_null);
+	}
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+/*
+ * Return value: 1 - success, TCPSOCKET_INTERRUPTED - try again, anything else is failure
+ */
+int SSLSocket_connect(SSL* ssl, int sock, const char* hostname, int verify, int (*cb)(const char *str, size_t len, void *u), void* u)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+
+	rc = SSL_connect(ssl);
+	if (rc != 1)
+	{
+		int error;
+		error = SSLSocket_error("SSL_connect", ssl, sock, rc, cb, u);
+		if (error == SSL_FATAL)
+			rc = error;
+		if (error == SSL_ERROR_WANT_READ || error == SSL_ERROR_WANT_WRITE)
+			rc = TCPSOCKET_INTERRUPTED;
+	}
+#if (OPENSSL_VERSION_NUMBER >= 0x010002000) /* 1.0.2 and later */
+	else if (verify == 1)
+	{
+		char* peername = NULL;
+		int port;
+		size_t hostname_len;
+
+		X509* cert = SSL_get_peer_certificate(ssl);
+		hostname_len = MQTTProtocol_addressPort(hostname, &port, NULL);
+
+		rc = X509_check_host(cert, hostname, hostname_len, 0, &peername);
+		if (rc == 1)
+			Log(TRACE_PROTOCOL, -1, "peername from X509_check_host is %s", peername);
+		else
+			Log(TRACE_PROTOCOL, -1, "X509_check_host for hostname %.*s failed, rc %d",
+					hostname_len, hostname, rc);
+
+		if (peername != NULL)
+			OPENSSL_free(peername);
+
+		// 0 == fail, -1 == SSL internal error, -2 == mailformed input
+		if (rc == 0 || rc == -1 || rc == -2)
+		{
+			char* ip_addr = malloc(hostname_len + 1);
+			// cannot use = strndup(hostname, hostname_len); here because of custom Heap
+			if (ip_addr)
+			{
+				strncpy(ip_addr, hostname, hostname_len);
+				ip_addr[hostname_len] = '\0';
+
+				rc = X509_check_ip_asc(cert, ip_addr, 0);
+				Log(TRACE_MIN, -1, "rc from X509_check_ip_asc is %d", rc);
+
+				free(ip_addr);
+			}
+
+			if (rc == 0 || rc == -1 || rc == -2)
+				rc = SSL_FATAL;
+		}
+
+		if (cert)
+			X509_free(cert);
+	}
+#endif
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+
+/**
+ *  Reads one byte from a socket
+ *  @param socket the socket to read from
+ *  @param c the character read, returned
+ *  @return completion code
+ */
+int SSLSocket_getch(SSL* ssl, int socket, char* c)
+{
+	int rc = SOCKET_ERROR;
+
+	FUNC_ENTRY;
+	if ((rc = SocketBuffer_getQueuedChar(socket, c)) != SOCKETBUFFER_INTERRUPTED)
+		goto exit;
+
+	if ((rc = SSL_read(ssl, c, (size_t)1)) < 0)
+	{
+		int err = SSLSocket_error("SSL_read - getch", ssl, socket, rc, NULL, NULL);
+		if (err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE)
+		{
+			rc = TCPSOCKET_INTERRUPTED;
+			SocketBuffer_interrupted(socket, 0);
+		}
+	}
+	else if (rc == 0)
+		rc = SOCKET_ERROR; 	/* The return value from recv is 0 when the peer has performed an orderly shutdown. */
+	else if (rc == 1)
+	{
+		SocketBuffer_queueChar(socket, *c);
+		rc = TCPSOCKET_COMPLETE;
+	}
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+
+/**
+ *  Attempts to read a number of bytes from a socket, non-blocking. If a previous read did not
+ *  finish, then retrieve that data.
+ *  @param socket the socket to read from
+ *  @param bytes the number of bytes to read
+ *  @param actual_len the actual number of bytes read
+ *  @return completion code
+ */
+char *SSLSocket_getdata(SSL* ssl, int socket, size_t bytes, size_t* actual_len)
+{
+	int rc;
+	char* buf;
+
+	FUNC_ENTRY;
+	if (bytes == 0)
+	{
+		buf = SocketBuffer_complete(socket);
+		goto exit;
+	}
+
+	buf = SocketBuffer_getQueuedData(socket, bytes, actual_len);
+
+	if ((rc = SSL_read(ssl, buf + (*actual_len), (int)(bytes - (*actual_len)))) < 0)
+	{
+		rc = SSLSocket_error("SSL_read - getdata", ssl, socket, rc, NULL, NULL);
+		if (rc != SSL_ERROR_WANT_READ && rc != SSL_ERROR_WANT_WRITE)
+		{
+			buf = NULL;
+			goto exit;
+		}
+	}
+	else if (rc == 0) /* rc 0 means the other end closed the socket */
+	{
+		buf = NULL;
+		goto exit;
+	}
+	else
+		*actual_len += rc;
+
+	if (*actual_len == bytes)
+	{
+		SocketBuffer_complete(socket);
+		/* if we read the whole packet, there might still be data waiting in the SSL buffer, which
+		isn't picked up by select.  So here we should check for any data remaining in the SSL buffer, and
+		if so, add this socket to a new "pending SSL reads" list.
+		*/
+		if (SSL_pending(ssl) > 0) /* return no of bytes pending */
+			SSLSocket_addPendingRead(socket);
+	}
+	else /* we didn't read the whole packet */
+	{
+		SocketBuffer_interrupted(socket, *actual_len);
+		Log(TRACE_MAX, -1, "SSL_read: %d bytes expected but %d bytes now received", bytes, *actual_len);
+	}
+exit:
+	FUNC_EXIT;
+	return buf;
+}
+
+void SSLSocket_destroyContext(networkHandles* net)
+{
+	FUNC_ENTRY;
+	if (net->ctx)
+		SSL_CTX_free(net->ctx);
+	net->ctx = NULL;
+	FUNC_EXIT;
+}
+
+static List pending_reads = {NULL, NULL, NULL, 0, 0};
+
+int SSLSocket_close(networkHandles* net)
+{
+	int rc = 1;
+
+	FUNC_ENTRY;
+	/* clean up any pending reads for this socket */
+	if (pending_reads.count > 0 && ListFindItem(&pending_reads, &net->socket, intcompare))
+		ListRemoveItem(&pending_reads, &net->socket, intcompare);
+
+	if (net->ssl)
+	{
+		rc = SSL_shutdown(net->ssl);
+		SSL_free(net->ssl);
+		net->ssl = NULL;
+	}
+	SSLSocket_destroyContext(net);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/* No SSL_writev() provided by OpenSSL. Boo. */
+int SSLSocket_putdatas(SSL* ssl, int socket, char* buf0, size_t buf0len, int count, char** buffers, size_t* buflens, int* frees)
+{
+	int rc = 0;
+	int i;
+	char *ptr;
+	iobuf iovec;
+	int sslerror;
+
+	FUNC_ENTRY;
+	iovec.iov_len = (ULONG)buf0len;
+	for (i = 0; i < count; i++)
+		iovec.iov_len += (ULONG)buflens[i];
+
+	ptr = iovec.iov_base = (char *)malloc(iovec.iov_len);
+	memcpy(ptr, buf0, buf0len);
+	ptr += buf0len;
+	for (i = 0; i < count; i++)
+	{
+		memcpy(ptr, buffers[i], buflens[i]);
+		ptr += buflens[i];
+	}
+
+	SSL_lock_mutex(&sslCoreMutex);
+	if ((rc = SSL_write(ssl, iovec.iov_base, iovec.iov_len)) == iovec.iov_len)
+		rc = TCPSOCKET_COMPLETE;
+	else
+	{
+		sslerror = SSLSocket_error("SSL_write", ssl, socket, rc, NULL, NULL);
+
+		if (sslerror == SSL_ERROR_WANT_WRITE)
+		{
+			int* sockmem = (int*)malloc(sizeof(int));
+			int free = 1;
+
+			Log(TRACE_MIN, -1, "Partial write: incomplete write of %d bytes on SSL socket %d",
+				iovec.iov_len, socket);
+			SocketBuffer_pendingWrite(socket, ssl, 1, &iovec, &free, iovec.iov_len, 0);
+			*sockmem = socket;
+			ListAppend(s.write_pending, sockmem, sizeof(int));
+			FD_SET(socket, &(s.pending_wset));
+			rc = TCPSOCKET_INTERRUPTED;
+		}
+		else
+			rc = SOCKET_ERROR;
+	}
+	SSL_unlock_mutex(&sslCoreMutex);
+
+	if (rc != TCPSOCKET_INTERRUPTED)
+		free(iovec.iov_base);
+	else
+	{
+		int i;
+		free(buf0);
+		for (i = 0; i < count; ++i)
+		{
+		    if (frees[i])
+		    {
+			free(buffers[i]);
+			buffers[i] = NULL;
+		    }
+		}	
+	}
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+void SSLSocket_addPendingRead(int sock)
+{
+	FUNC_ENTRY;
+	if (ListFindItem(&pending_reads, &sock, intcompare) == NULL) /* make sure we don't add the same socket twice */
+	{
+		int* psock = (int*)malloc(sizeof(sock));
+		*psock = sock;
+		ListAppend(&pending_reads, psock, sizeof(sock));
+	}
+	else
+		Log(TRACE_MIN, -1, "SSLSocket_addPendingRead: socket %d already in the list", sock);
+
+	FUNC_EXIT;
+}
+
+
+int SSLSocket_getPendingRead(void)
+{
+	int sock = -1;
+
+	if (pending_reads.count > 0)
+	{
+		sock = *(int*)(pending_reads.first->content);
+		ListRemoveHead(&pending_reads);
+	}
+	return sock;
+}
+
+
+int SSLSocket_continueWrite(pending_writes* pw)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if ((rc = SSL_write(pw->ssl, pw->iovecs[0].iov_base, pw->iovecs[0].iov_len)) == pw->iovecs[0].iov_len)
+	{
+		/* topic and payload buffers are freed elsewhere, when all references to them have been removed */
+		free(pw->iovecs[0].iov_base);
+		Log(TRACE_MIN, -1, "SSL continueWrite: partial write now complete for socket %d", pw->socket);
+		rc = 1;
+	}
+	else
+	{
+		int sslerror = SSLSocket_error("SSL_write", pw->ssl, pw->socket, rc, NULL, NULL);
+		if (sslerror == SSL_ERROR_WANT_WRITE)
+			rc = 0; /* indicate we haven't finished writing the payload yet */
+	}
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+#endif
diff --git a/mqtt/src/src/SSLSocket.h b/mqtt/src/src/SSLSocket.h
new file mode 100644
index 00000000..09547fd9
--- /dev/null
+++ b/mqtt/src/src/SSLSocket.h
@@ -0,0 +1,52 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs, Allan Stockdill-Mander - initial implementation 
+ *    Ian Craggs - SNI support
+ *    Ian Craggs - post connect checks and CApath
+ *******************************************************************************/
+#if !defined(SSLSOCKET_H)
+#define SSLSOCKET_H
+
+#if defined(WIN32) || defined(WIN64)
+	#define ssl_mutex_type HANDLE
+#else
+	#include <pthread.h>
+	#include <semaphore.h>
+	#define ssl_mutex_type pthread_mutex_t
+#endif
+
+#include <openssl/ssl.h>
+#include "SocketBuffer.h"
+#include "Clients.h"
+
+#define URI_SSL "ssl://"
+
+/** if we should handle openssl initialization (bool_value == 1) or depend on it to be initalized externally (bool_value == 0) */
+void SSLSocket_handleOpensslInit(int bool_value);
+
+int SSLSocket_initialize(void);
+void SSLSocket_terminate(void);
+int SSLSocket_setSocketForSSL(networkHandles* net, MQTTClient_SSLOptions* opts, const char* hostname, size_t hostname_len);
+
+int SSLSocket_getch(SSL* ssl, int socket, char* c);
+char *SSLSocket_getdata(SSL* ssl, int socket, size_t bytes, size_t* actual_len);
+
+int SSLSocket_close(networkHandles* net);
+int SSLSocket_putdatas(SSL* ssl, int socket, char* buf0, size_t buf0len, int count, char** buffers, size_t* buflens, int* frees);
+int SSLSocket_connect(SSL* ssl, int sock, const char* hostname, int verify, int (*cb)(const char *str, size_t len, void *u), void* u);
+
+int SSLSocket_getPendingRead(void);
+int SSLSocket_continueWrite(pending_writes* pw);
+
+#endif
diff --git a/mqtt/src/src/Socket.c b/mqtt/src/src/Socket.c
new file mode 100644
index 00000000..d681a760
--- /dev/null
+++ b/mqtt/src/src/Socket.c
@@ -0,0 +1,1022 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial implementation and documentation
+ *    Ian Craggs - async client updates
+ *    Ian Craggs - fix for bug 484496
+ *    Juergen Kosel, Ian Craggs - fix for issue #135
+ *    Ian Craggs - issue #217
+ *    Ian Craggs - fix for issue #186
+ *    Ian Craggs - remove StackTrace print debugging calls
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief Socket related functions
+ *
+ * Some other related functions are in the SocketBuffer module
+ */
+
+
+#include "Socket.h"
+#include "Log.h"
+#include "SocketBuffer.h"
+#include "Messages.h"
+#include "StackTrace.h"
+#if defined(OPENSSL)
+#include "SSLSocket.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <ctype.h>
+
+#include "Heap.h"
+
+int Socket_setnonblocking(int sock);
+int Socket_error(char* aString, int sock);
+int Socket_addSocket(int newSd);
+int isReady(int socket, fd_set* read_set, fd_set* write_set);
+int Socket_writev(int socket, iobuf* iovecs, int count, unsigned long* bytes);
+int Socket_close_only(int socket);
+int Socket_continueWrite(int socket);
+int Socket_continueWrites(fd_set* pwset);
+char* Socket_getaddrname(struct sockaddr* sa, int sock);
+int Socket_abortWrite(int socket);
+
+#if defined(WIN32) || defined(WIN64)
+#define iov_len len
+#define iov_base buf
+#endif
+
+/**
+ * Structure to hold all socket data for the module
+ */
+Sockets s;
+static fd_set wset;
+
+/**
+ * Set a socket non-blocking, OS independently
+ * @param sock the socket to set non-blocking
+ * @return TCP call error code
+ */
+int Socket_setnonblocking(int sock)
+{
+	int rc;
+#if defined(WIN32) || defined(WIN64)
+	u_long flag = 1L;
+
+	FUNC_ENTRY;
+	rc = ioctl(sock, FIONBIO, &flag);
+#else
+	int flags;
+
+	FUNC_ENTRY;
+	if ((flags = fcntl(sock, F_GETFL, 0)))
+		flags = 0;
+	rc = fcntl(sock, F_SETFL, flags | O_NONBLOCK);
+#endif
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Gets the specific error corresponding to SOCKET_ERROR
+ * @param aString the function that was being used when the error occurred
+ * @param sock the socket on which the error occurred
+ * @return the specific TCP error code
+ */
+int Socket_error(char* aString, int sock)
+{
+#if defined(WIN32) || defined(WIN64)
+	int errno;
+#endif
+
+#if defined(WIN32) || defined(WIN64)
+	errno = WSAGetLastError();
+#endif
+	if (errno != EINTR && errno != EAGAIN && errno != EINPROGRESS && errno != EWOULDBLOCK)
+	{
+		if (strcmp(aString, "shutdown") != 0 || (errno != ENOTCONN && errno != ECONNRESET))
+			Log(TRACE_MINIMUM, -1, "Socket error %s(%d) in %s for socket %d", strerror(errno), errno, aString, sock);
+	}
+	return errno;
+}
+
+
+/**
+ * Initialize the socket module
+ */
+void Socket_outInitialize(void)
+{
+#if defined(WIN32) || defined(WIN64)
+	WORD    winsockVer = 0x0202;
+	WSADATA wsd;
+
+	FUNC_ENTRY;
+	WSAStartup(winsockVer, &wsd);
+#else
+	FUNC_ENTRY;
+	signal(SIGPIPE, SIG_IGN);
+#endif
+
+	SocketBuffer_initialize();
+	s.clientsds = ListInitialize();
+	s.connect_pending = ListInitialize();
+	s.write_pending = ListInitialize();
+	s.cur_clientsds = NULL;
+	FD_ZERO(&(s.rset));														/* Initialize the descriptor set */
+	FD_ZERO(&(s.pending_wset));
+	s.maxfdp1 = 0;
+	memcpy((void*)&(s.rset_saved), (void*)&(s.rset), sizeof(s.rset_saved));
+	FUNC_EXIT;
+}
+
+
+/**
+ * Terminate the socket module
+ */
+void Socket_outTerminate(void)
+{
+	FUNC_ENTRY;
+	ListFree(s.connect_pending);
+	ListFree(s.write_pending);
+	ListFree(s.clientsds);
+	SocketBuffer_terminate();
+#if defined(WIN32) || defined(WIN64)
+	WSACleanup();
+#endif
+	FUNC_EXIT;
+}
+
+
+/**
+ * Add a socket to the list of socket to check with select
+ * @param newSd the new socket to add
+ */
+int Socket_addSocket(int newSd)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if (ListFindItem(s.clientsds, &newSd, intcompare) == NULL) /* make sure we don't add the same socket twice */
+	{
+		if (s.clientsds->count >= FD_SETSIZE)
+		{
+			Log(LOG_ERROR, -1, "addSocket: exceeded FD_SETSIZE %d", FD_SETSIZE);
+			rc = SOCKET_ERROR;
+		}
+		else
+		{
+			int* pnewSd = (int*)malloc(sizeof(newSd));
+			*pnewSd = newSd;
+			ListAppend(s.clientsds, pnewSd, sizeof(newSd));
+			FD_SET(newSd, &(s.rset_saved));
+			s.maxfdp1 = max(s.maxfdp1, newSd + 1);
+			rc = Socket_setnonblocking(newSd);
+			if (rc == SOCKET_ERROR)
+				Log(LOG_ERROR, -1, "addSocket: setnonblocking");
+		}
+	}
+	else
+		Log(LOG_ERROR, -1, "addSocket: socket %d already in the list", newSd);
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Don't accept work from a client unless it is accepting work back, i.e. its socket is writeable
+ * this seems like a reasonable form of flow control, and practically, seems to work.
+ * @param socket the socket to check
+ * @param read_set the socket read set (see select doc)
+ * @param write_set the socket write set (see select doc)
+ * @return boolean - is the socket ready to go?
+ */
+int isReady(int socket, fd_set* read_set, fd_set* write_set)
+{
+	int rc = 1;
+
+	FUNC_ENTRY;
+	if  (ListFindItem(s.connect_pending, &socket, intcompare) && FD_ISSET(socket, write_set))
+		ListRemoveItem(s.connect_pending, &socket, intcompare);
+	else
+		rc = FD_ISSET(socket, read_set) && FD_ISSET(socket, write_set) && Socket_noPendingWrites(socket);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ *  Returns the next socket ready for communications as indicated by select
+ *  @param more_work flag to indicate more work is waiting, and thus a timeout value of 0 should
+ *  be used for the select
+ *  @param tp the timeout to be used for the select, unless overridden
+ *  @return the socket next ready, or 0 if none is ready
+ */
+int Socket_getReadySocket(int more_work, struct timeval *tp, mutex_type mutex)
+{
+	int rc = 0;
+	static struct timeval zero = {0L, 0L}; /* 0 seconds */
+	static struct timeval one = {1L, 0L}; /* 1 second */
+	struct timeval timeout = one;
+
+	FUNC_ENTRY;
+	Thread_lock_mutex(mutex);
+	if (s.clientsds->count == 0)
+		goto exit;
+
+	if (more_work)
+		timeout = zero;
+	else if (tp)
+		timeout = *tp;
+
+	while (s.cur_clientsds != NULL)
+	{
+		if (isReady(*((int*)(s.cur_clientsds->content)), &(s.rset), &wset))
+			break;
+		ListNextElement(s.clientsds, &s.cur_clientsds);
+	}
+
+	if (s.cur_clientsds == NULL)
+	{
+		int rc1;
+		fd_set pwset;
+
+		memcpy((void*)&(s.rset), (void*)&(s.rset_saved), sizeof(s.rset));
+		memcpy((void*)&(pwset), (void*)&(s.pending_wset), sizeof(pwset));
+		/* Prevent performance issue by unlocking the socket_mutex while waiting for a ready socket. */
+		Thread_unlock_mutex(mutex);
+		rc = select(s.maxfdp1, &(s.rset), &pwset, NULL, &timeout);
+		Thread_lock_mutex(mutex);
+		if (rc == SOCKET_ERROR)
+		{
+			Socket_error("read select", 0);
+			goto exit;
+		}
+		Log(TRACE_MAX, -1, "Return code %d from read select", rc);
+
+		if (Socket_continueWrites(&pwset) == SOCKET_ERROR)
+		{
+			rc = 0;
+			goto exit;
+		}
+
+		memcpy((void*)&wset, (void*)&(s.rset_saved), sizeof(wset));
+		if ((rc1 = select(s.maxfdp1, NULL, &(wset), NULL, &zero)) == SOCKET_ERROR)
+		{
+			Socket_error("write select", 0);
+			rc = rc1;
+			goto exit;
+		}
+		Log(TRACE_MAX, -1, "Return code %d from write select", rc1);
+
+		if (rc == 0 && rc1 == 0)
+			goto exit; /* no work to do */
+
+		s.cur_clientsds = s.clientsds->first;
+		while (s.cur_clientsds != NULL)
+		{
+			int cursock = *((int*)(s.cur_clientsds->content));
+			if (isReady(cursock, &(s.rset), &wset))
+				break;
+			ListNextElement(s.clientsds, &s.cur_clientsds);
+		}
+	}
+
+	if (s.cur_clientsds == NULL)
+		rc = 0;
+	else
+	{
+		rc = *((int*)(s.cur_clientsds->content));
+		ListNextElement(s.clientsds, &s.cur_clientsds);
+	}
+exit:
+	Thread_unlock_mutex(mutex);
+	FUNC_EXIT_RC(rc);
+	return rc;
+} /* end getReadySocket */
+
+
+/**
+ *  Reads one byte from a socket
+ *  @param socket the socket to read from
+ *  @param c the character read, returned
+ *  @return completion code
+ */
+int Socket_getch(int socket, char* c)
+{
+	int rc = SOCKET_ERROR;
+
+	FUNC_ENTRY;
+	if ((rc = SocketBuffer_getQueuedChar(socket, c)) != SOCKETBUFFER_INTERRUPTED)
+		goto exit;
+
+	if ((rc = recv(socket, c, (size_t)1, 0)) == SOCKET_ERROR)
+	{
+		int err = Socket_error("recv - getch", socket);
+		if (err == EWOULDBLOCK || err == EAGAIN)
+		{
+			rc = TCPSOCKET_INTERRUPTED;
+			SocketBuffer_interrupted(socket, 0);
+		}
+	}
+	else if (rc == 0)
+		rc = SOCKET_ERROR; 	/* The return value from recv is 0 when the peer has performed an orderly shutdown. */
+	else if (rc == 1)
+	{
+		SocketBuffer_queueChar(socket, *c);
+		rc = TCPSOCKET_COMPLETE;
+	}
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ *  Attempts to read a number of bytes from a socket, non-blocking. If a previous read did not
+ *  finish, then retrieve that data.
+ *  @param socket the socket to read from
+ *  @param bytes the number of bytes to read
+ *  @param actual_len the actual number of bytes read
+ *  @return completion code
+ */
+char *Socket_getdata(int socket, size_t bytes, size_t* actual_len)
+{
+	int rc;
+	char* buf;
+
+	FUNC_ENTRY;
+	if (bytes == 0)
+	{
+		buf = SocketBuffer_complete(socket);
+		goto exit;
+	}
+
+	buf = SocketBuffer_getQueuedData(socket, bytes, actual_len);
+
+	if ((rc = recv(socket, buf + (*actual_len), (int)(bytes - (*actual_len)), 0)) == SOCKET_ERROR)
+	{
+		rc = Socket_error("recv - getdata", socket);
+		if (rc != EAGAIN && rc != EWOULDBLOCK)
+		{
+			buf = NULL;
+			goto exit;
+		}
+	}
+	else if (rc == 0) /* rc 0 means the other end closed the socket, albeit "gracefully" */
+	{
+		buf = NULL;
+		goto exit;
+	}
+	else
+		*actual_len += rc;
+
+	if (*actual_len == bytes)
+		SocketBuffer_complete(socket);
+	else /* we didn't read the whole packet */
+	{
+		SocketBuffer_interrupted(socket, *actual_len);
+		Log(TRACE_MAX, -1, "%d bytes expected but %d bytes now received", (int)bytes, (int)*actual_len);
+	}
+exit:
+	FUNC_EXIT;
+	return buf;
+}
+
+
+/**
+ *  Indicate whether any data is pending outbound for a socket.
+ *  @return boolean - true == data pending.
+ */
+int Socket_noPendingWrites(int socket)
+{
+	int cursock = socket;
+	return ListFindItem(s.write_pending, &cursock, intcompare) == NULL;
+}
+
+
+/**
+ *  Attempts to write a series of iovec buffers to a socket in *one* system call so that
+ *  they are sent as one packet.
+ *  @param socket the socket to write to
+ *  @param iovecs an array of buffers to write
+ *  @param count number of buffers in iovecs
+ *  @param bytes number of bytes actually written returned
+ *  @return completion code, especially TCPSOCKET_INTERRUPTED
+ */
+int Socket_writev(int socket, iobuf* iovecs, int count, unsigned long* bytes)
+{
+	int rc;
+
+	FUNC_ENTRY;
+	*bytes = 0L;
+#if defined(WIN32) || defined(WIN64)
+	rc = WSASend(socket, iovecs, count, (LPDWORD)bytes, 0, NULL, NULL);
+	if (rc == SOCKET_ERROR)
+	{
+		int err = Socket_error("WSASend - putdatas", socket);
+		if (err == EWOULDBLOCK || err == EAGAIN)
+			rc = TCPSOCKET_INTERRUPTED;
+	}
+#else
+/*#define TCPSOCKET_INTERRUPTED_TESTING
+This section forces the occasional return of TCPSOCKET_INTERRUPTED,
+for testing purposes only!
+*/
+#if defined(TCPSOCKET_INTERRUPTED_TESTING)
+  static int i = 0;
+	if (++i >= 10 && i < 21)
+	{
+		if (1)
+		{
+		  printf("Deliberately simulating TCPSOCKET_INTERRUPTED\n");
+		  rc = TCPSOCKET_INTERRUPTED; /* simulate a network wait */
+	  }
+		else
+		{
+			printf("Deliberately simulating SOCKET_ERROR\n");
+		  rc = SOCKET_ERROR;
+		}
+		/* should *bytes always be 0? */
+		if (i == 20)
+		{
+		  printf("Shutdown socket\n");
+		  shutdown(socket, SHUT_WR);
+	  }
+	}
+	else
+	{
+#endif
+	rc = writev(socket, iovecs, count);
+	if (rc == SOCKET_ERROR)
+	{
+		int err = Socket_error("writev - putdatas", socket);
+		if (err == EWOULDBLOCK || err == EAGAIN)
+			rc = TCPSOCKET_INTERRUPTED;
+	}
+	else
+		*bytes = rc;
+#if defined(TCPSOCKET_INTERRUPTED_TESTING)
+	}
+#endif
+#endif
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ *  Attempts to write a series of buffers to a socket in *one* system call so that they are
+ *  sent as one packet.
+ *  @param socket the socket to write to
+ *  @param buf0 the first buffer
+ *  @param buf0len the length of data in the first buffer
+ *  @param count number of buffers
+ *  @param buffers an array of buffers to write
+ *  @param buflens an array of corresponding buffer lengths
+ *  @return completion code, especially TCPSOCKET_INTERRUPTED
+ */
+int Socket_putdatas(int socket, char* buf0, size_t buf0len, int count, char** buffers, size_t* buflens, int* frees)
+{
+	unsigned long bytes = 0L;
+	iobuf iovecs[5];
+	int frees1[5];
+	int rc = TCPSOCKET_INTERRUPTED, i;
+	size_t total = buf0len;
+
+	FUNC_ENTRY;
+	if (!Socket_noPendingWrites(socket))
+	{
+		Log(LOG_SEVERE, -1, "Trying to write to socket %d for which there is already pending output", socket);
+		rc = SOCKET_ERROR;
+		goto exit;
+	}
+
+	for (i = 0; i < count; i++)
+		total += buflens[i];
+
+	iovecs[0].iov_base = buf0;
+	iovecs[0].iov_len = (ULONG)buf0len;
+	frees1[0] = 1; /* this buffer should be freed by SocketBuffer if the write is interrupted */
+	for (i = 0; i < count; i++)
+	{
+		iovecs[i+1].iov_base = buffers[i];
+		iovecs[i+1].iov_len = (ULONG)buflens[i];
+		frees1[i+1] = frees[i];
+	}
+
+	if ((rc = Socket_writev(socket, iovecs, count+1, &bytes)) != SOCKET_ERROR)
+	{
+		if (bytes == total)
+			rc = TCPSOCKET_COMPLETE;
+		else
+		{
+			int* sockmem = (int*)malloc(sizeof(int));
+			Log(TRACE_MIN, -1, "Partial write: %lu bytes of %lu actually written on socket %d",
+					bytes, total, socket);
+#if defined(OPENSSL)
+			SocketBuffer_pendingWrite(socket, NULL, count+1, iovecs, frees1, total, bytes);
+#else
+			SocketBuffer_pendingWrite(socket, count+1, iovecs, frees1, total, bytes);
+#endif
+			*sockmem = socket;
+			ListAppend(s.write_pending, sockmem, sizeof(int));
+			FD_SET(socket, &(s.pending_wset));
+			rc = TCPSOCKET_INTERRUPTED;
+		}
+	}
+exit:
+#if 0
+        if (rc == TCPSOCKET_INTERRUPTED)
+        {
+            Log(LOG_ERROR, -1, "Socket_putdatas: TCPSOCKET_INTERRUPTED");
+        }
+#endif
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ *  Add a socket to the pending write list, so that it is checked for writing in select.  This is used
+ *  in connect processing when the TCP connect is incomplete, as we need to check the socket for both
+ *  ready to read and write states.
+ *  @param socket the socket to add
+ */
+void Socket_addPendingWrite(int socket)
+{
+	FD_SET(socket, &(s.pending_wset));
+}
+
+
+/**
+ *  Clear a socket from the pending write list - if one was added with Socket_addPendingWrite
+ *  @param socket the socket to remove
+ */
+void Socket_clearPendingWrite(int socket)
+{
+	if (FD_ISSET(socket, &(s.pending_wset)))
+		FD_CLR(socket, &(s.pending_wset));
+}
+
+
+/**
+ *  Close a socket without removing it from the select list.
+ *  @param socket the socket to close
+ *  @return completion code
+ */
+int Socket_close_only(int socket)
+{
+	int rc;
+
+	FUNC_ENTRY;
+#if defined(WIN32) || defined(WIN64)
+	if (shutdown(socket, SD_BOTH) == SOCKET_ERROR)
+		Socket_error("shutdown", socket);
+	if ((rc = closesocket(socket)) == SOCKET_ERROR)
+		Socket_error("close", socket);
+#else
+	if (shutdown(socket, SHUT_WR) == SOCKET_ERROR)
+		Socket_error("shutdown", socket);
+	if ((rc = recv(socket, NULL, (size_t)0, 0)) == SOCKET_ERROR)
+		Socket_error("shutdown", socket);
+	if ((rc = close(socket)) == SOCKET_ERROR)
+		Socket_error("close", socket);
+#endif
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ *  Close a socket and remove it from the select list.
+ *  @param socket the socket to close
+ *  @return completion code
+ */
+void Socket_close(int socket)
+{
+	FUNC_ENTRY;
+	Socket_close_only(socket);
+	FD_CLR(socket, &(s.rset_saved));
+	if (FD_ISSET(socket, &(s.pending_wset)))
+		FD_CLR(socket, &(s.pending_wset));
+	if (s.cur_clientsds != NULL && *(int*)(s.cur_clientsds->content) == socket)
+		s.cur_clientsds = s.cur_clientsds->next;
+	Socket_abortWrite(socket);
+	SocketBuffer_cleanup(socket);
+	ListRemoveItem(s.connect_pending, &socket, intcompare);
+	ListRemoveItem(s.write_pending, &socket, intcompare);
+
+	if (ListRemoveItem(s.clientsds, &socket, intcompare))
+		Log(TRACE_MIN, -1, "Removed socket %d", socket);
+	else
+		Log(LOG_ERROR, -1, "Failed to remove socket %d", socket);
+	if (socket + 1 >= s.maxfdp1)
+	{
+		/* now we have to reset s.maxfdp1 */
+		ListElement* cur_clientsds = NULL;
+
+		s.maxfdp1 = 0;
+		while (ListNextElement(s.clientsds, &cur_clientsds))
+			s.maxfdp1 = max(*((int*)(cur_clientsds->content)), s.maxfdp1);
+		++(s.maxfdp1);
+		Log(TRACE_MAX, -1, "Reset max fdp1 to %d", s.maxfdp1);
+	}
+	FUNC_EXIT;
+}
+
+
+/**
+ *  Create a new socket and TCP connect to an address/port
+ *  @param addr the address string
+ *  @param port the TCP port
+ *  @param sock returns the new socket
+ *  @return completion code
+ */
+int Socket_new(const char* addr, size_t addr_len, int port, int* sock)
+{
+	int type = SOCK_STREAM;
+	char *addr_mem;
+	struct sockaddr_in address;
+#if defined(AF_INET6)
+	struct sockaddr_in6 address6;
+#endif
+	int rc = SOCKET_ERROR;
+#if defined(WIN32) || defined(WIN64)
+	short family;
+#else
+	sa_family_t family = AF_INET;
+#endif
+	struct addrinfo *result = NULL;
+	struct addrinfo hints = {0, AF_UNSPEC, SOCK_STREAM, IPPROTO_TCP, 0, NULL, NULL, NULL};
+
+	FUNC_ENTRY;
+	*sock = -1;
+	memset(&address6, '\0', sizeof(address6));
+
+	if (addr[0] == '[')
+	{
+		++addr;
+		--addr_len;
+	}
+
+	addr_mem = malloc( addr_len + 1u );
+	memcpy( addr_mem, addr, addr_len );
+	addr_mem[addr_len] = '\0';
+
+	if ((rc = getaddrinfo(addr_mem, NULL, &hints, &result)) == 0)
+	{
+		struct addrinfo* res = result;
+
+		while (res)
+		{	/* prefer ip4 addresses */
+			if (res->ai_family == AF_INET || res->ai_next == NULL)
+				break;
+			res = res->ai_next;
+		}
+
+		if (res == NULL)
+			rc = -1;
+		else
+#if defined(AF_INET6)
+		if (res->ai_family == AF_INET6)
+		{
+			address6.sin6_port = htons(port);
+			address6.sin6_family = family = AF_INET6;
+			memcpy(&address6.sin6_addr, &((struct sockaddr_in6*)(res->ai_addr))->sin6_addr, sizeof(address6.sin6_addr));
+		}
+		else
+#endif
+		if (res->ai_family == AF_INET)
+		{
+			memset(&address.sin_zero, 0, sizeof(address.sin_zero));
+			address.sin_port = htons(port);
+			address.sin_family = family = AF_INET;
+			address.sin_addr = ((struct sockaddr_in*)(res->ai_addr))->sin_addr;
+		}
+		else
+			rc = -1;
+
+		freeaddrinfo(result);
+	}
+	else
+	  	Log(LOG_ERROR, -1, "getaddrinfo failed for addr %s with rc %d", addr_mem, rc);
+
+	if (rc != 0)
+		Log(LOG_ERROR, -1, "%s is not a valid IP address", addr_mem);
+	else
+	{
+		*sock =	(int)socket(family, type, 0);
+		if (*sock == INVALID_SOCKET)
+			rc = Socket_error("socket", *sock);
+		else
+		{
+#if defined(NOSIGPIPE)
+			int opt = 1;
+
+			if (setsockopt(*sock, SOL_SOCKET, SO_NOSIGPIPE, (void*)&opt, sizeof(opt)) != 0)
+				Log(LOG_ERROR, -1, "Could not set SO_NOSIGPIPE for socket %d", *sock);
+#endif
+/*#define SMALL_TCP_BUFFER_TESTING
+  This section sets the TCP send buffer to a small amount to provoke TCPSOCKET_INTERRUPTED
+	return codes from send, for testing only!
+*/
+#if defined(SMALL_TCP_BUFFER_TESTING)
+        if (1)
+				{
+					int optsend = 100; //2 * 1440;
+					printf("Setting optsend to %d\n", optsend);
+					if (setsockopt(*sock, SOL_SOCKET, SO_SNDBUF, (void*)&optsend, sizeof(optsend)) != 0)
+						Log(LOG_ERROR, -1, "Could not set SO_SNDBUF for socket %d", *sock);
+				}
+#endif
+			Log(TRACE_MIN, -1, "New socket %d for %s, port %d",	*sock, addr, port);
+			if (Socket_addSocket(*sock) == SOCKET_ERROR)
+				rc = Socket_error("addSocket", *sock);
+			else
+			{
+				/* this could complete immmediately, even though we are non-blocking */
+				if (family == AF_INET)
+					rc = connect(*sock, (struct sockaddr*)&address, sizeof(address));
+	#if defined(AF_INET6)
+				else
+					rc = connect(*sock, (struct sockaddr*)&address6, sizeof(address6));
+	#endif
+				if (rc == SOCKET_ERROR)
+					rc = Socket_error("connect", *sock);
+				if (rc == EINPROGRESS || rc == EWOULDBLOCK)
+				{
+					int* pnewSd = (int*)malloc(sizeof(int));
+					*pnewSd = *sock;
+					ListAppend(s.connect_pending, pnewSd, sizeof(int));
+					Log(TRACE_MIN, 15, "Connect pending");
+				}
+			}
+                        /* Prevent socket leak by closing unusable sockets,
+                         * as reported in
+                         * https://github.com/eclipse/paho.mqtt.c/issues/135
+                         */
+                        if (rc != 0 && (rc != EINPROGRESS) && (rc != EWOULDBLOCK))
+                        {
+                            Socket_close(*sock); /* close socket and remove from our list of sockets */
+                            *sock = -1; /* as initialized before */
+                        }
+		}
+	}
+
+	if (addr_mem)
+		free(addr_mem);
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+static Socket_writeComplete* writecomplete = NULL;
+
+void Socket_setWriteCompleteCallback(Socket_writeComplete* mywritecomplete)
+{
+	writecomplete = mywritecomplete;
+}
+
+
+
+/**
+ *  Continue an outstanding write for a particular socket
+ *  @param socket that socket
+ *  @return completion code: 0=incomplete, 1=complete, -1=socket error
+ */
+int Socket_continueWrite(int socket)
+{
+	int rc = 0;
+	pending_writes* pw;
+	unsigned long curbuflen = 0L, /* cumulative total of buffer lengths */
+		bytes = 0L;
+	int curbuf = -1, i;
+	iobuf iovecs1[5];
+
+	FUNC_ENTRY;
+	pw = SocketBuffer_getWrite(socket);
+
+#if defined(OPENSSL)
+	if (pw->ssl)
+	{
+		rc = SSLSocket_continueWrite(pw);
+		goto exit;
+	}
+#endif
+
+	for (i = 0; i < pw->count; ++i)
+	{
+		if (pw->bytes <= curbuflen)
+		{ /* if previously written length is less than the buffer we are currently looking at,
+				add the whole buffer */
+			iovecs1[++curbuf].iov_len = pw->iovecs[i].iov_len;
+			iovecs1[curbuf].iov_base = pw->iovecs[i].iov_base;
+		}
+		else if (pw->bytes < curbuflen + pw->iovecs[i].iov_len)
+		{ /* if previously written length is in the middle of the buffer we are currently looking at,
+				add some of the buffer */
+			size_t offset = pw->bytes - curbuflen;
+			iovecs1[++curbuf].iov_len = pw->iovecs[i].iov_len - (ULONG)offset;
+			iovecs1[curbuf].iov_base = (char*)pw->iovecs[i].iov_base + offset;
+			break;
+		}
+		curbuflen += pw->iovecs[i].iov_len;
+	}
+
+	if ((rc = Socket_writev(socket, iovecs1, curbuf+1, &bytes)) != SOCKET_ERROR)
+	{
+		pw->bytes += bytes;
+		if ((rc = (pw->bytes == pw->total)))
+		{  /* topic and payload buffers are freed elsewhere, when all references to them have been removed */
+			for (i = 0; i < pw->count; i++)
+			{
+				if (pw->frees[i])
+                                {
+					free(pw->iovecs[i].iov_base);
+                                        pw->iovecs[i].iov_base = NULL;
+                                }
+			}
+			rc = 1; /* signal complete */
+			Log(TRACE_MIN, -1, "ContinueWrite: partial write now complete for socket %d", socket);
+		}
+		else
+		{
+			rc = 0; /* signal not complete */
+			Log(TRACE_MIN, -1, "ContinueWrite wrote +%lu bytes on socket %d", bytes, socket);
+		}
+	}
+	else /* if we got SOCKET_ERROR we need to clean up anyway - a partial write is no good anymore */
+	{
+		for (i = 0; i < pw->count; i++)
+		{
+			if (pw->frees[i])
+                        {
+				free(pw->iovecs[i].iov_base);
+                                pw->iovecs[i].iov_base = NULL;
+                        }
+		}
+	}
+#if defined(OPENSSL)
+exit:
+#endif
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+
+/**
+ *  Continue an outstanding write for a particular socket
+ *  @param socket that socket
+ *  @return completion code: 0=incomplete, 1=complete, -1=socket error
+ */
+int Socket_abortWrite(int socket)
+{
+	int i = -1, rc = 0;
+	pending_writes* pw;
+
+	FUNC_ENTRY;
+	if ((pw = SocketBuffer_getWrite(socket)) == NULL)
+	  goto exit;
+
+#if defined(OPENSSL)
+	if (pw->ssl)
+		goto exit;
+#endif
+
+	for (i = 0; i < pw->count; i++)
+	{
+		if (pw->frees[i])
+		{
+			printf("cleaning in abortwrite for socket %d\n", socket);
+			free(pw->iovecs[i].iov_base);
+		}
+	}
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ *  Continue any outstanding writes for a socket set
+ *  @param pwset the set of sockets
+ *  @return completion code
+ */
+int Socket_continueWrites(fd_set* pwset)
+{
+	int rc1 = 0;
+	ListElement* curpending = s.write_pending->first;
+
+	FUNC_ENTRY;
+	while (curpending)
+	{
+		int socket = *(int*)(curpending->content);
+		int rc = 0;
+
+		if (FD_ISSET(socket, pwset) && ((rc = Socket_continueWrite(socket)) != 0))
+		{
+			if (!SocketBuffer_writeComplete(socket))
+				Log(LOG_SEVERE, -1, "Failed to remove pending write from socket buffer list");
+			FD_CLR(socket, &(s.pending_wset));
+			if (!ListRemove(s.write_pending, curpending->content))
+			{
+				Log(LOG_SEVERE, -1, "Failed to remove pending write from list");
+				ListNextElement(s.write_pending, &curpending);
+			}
+			curpending = s.write_pending->current;
+
+			if (writecomplete)
+				(*writecomplete)(socket, rc);
+		}
+		else
+			ListNextElement(s.write_pending, &curpending);
+	}
+	FUNC_EXIT_RC(rc1);
+	return rc1;
+}
+
+
+/**
+ *  Convert a numeric address to character string
+ *  @param sa	socket numerical address
+ *  @param sock socket
+ *  @return the peer information
+ */
+char* Socket_getaddrname(struct sockaddr* sa, int sock)
+{
+/**
+ * maximum length of the address string
+ */
+#define ADDRLEN INET6_ADDRSTRLEN+1
+/**
+ * maximum length of the port string
+ */
+#define PORTLEN 10
+	static char addr_string[ADDRLEN + PORTLEN];
+
+#if defined(WIN32) || defined(WIN64)
+	int buflen = ADDRLEN*2;
+	wchar_t buf[ADDRLEN*2];
+	if (WSAAddressToStringW(sa, sizeof(struct sockaddr_in6), NULL, buf, (LPDWORD)&buflen) == SOCKET_ERROR)
+		Socket_error("WSAAddressToString", sock);
+	else
+		wcstombs(addr_string, buf, sizeof(addr_string));
+	/* TODO: append the port information - format: [00:00:00::]:port */
+	/* strcpy(&addr_string[strlen(addr_string)], "what?"); */
+#else
+	struct sockaddr_in *sin = (struct sockaddr_in *)sa;
+	inet_ntop(sin->sin_family, &sin->sin_addr, addr_string, ADDRLEN);
+	sprintf(&addr_string[strlen(addr_string)], ":%d", ntohs(sin->sin_port));
+#endif
+	return addr_string;
+}
+
+
+/**
+ *  Get information about the other end connected to a socket
+ *  @param sock the socket to inquire on
+ *  @return the peer information
+ */
+char* Socket_getpeer(int sock)
+{
+	struct sockaddr_in6 sa;
+	socklen_t sal = sizeof(sa);
+
+	if (getpeername(sock, (struct sockaddr*)&sa, &sal) == SOCKET_ERROR)
+	{
+		Socket_error("getpeername", sock);
+		return "unknown";
+	}
+
+	return Socket_getaddrname((struct sockaddr*)&sa, sock);
+}
+
+
+#if defined(Socket_TEST)
+
+int main(int argc, char *argv[])
+{
+	Socket_connect("127.0.0.1", 1883);
+	Socket_connect("localhost", 1883);
+	Socket_connect("loadsadsacalhost", 1883);
+}
+
+#endif
diff --git a/mqtt/src/src/Socket.h b/mqtt/src/src/Socket.h
new file mode 100644
index 00000000..e0420693
--- /dev/null
+++ b/mqtt/src/src/Socket.h
@@ -0,0 +1,145 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2014 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial implementation and documentation
+ *    Ian Craggs - async client updates
+ *******************************************************************************/
+
+#if !defined(SOCKET_H)
+#define SOCKET_H
+
+#include <sys/types.h>
+
+#if defined(WIN32) || defined(WIN64)
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#define MAXHOSTNAMELEN 256
+#if !defined(SSLSOCKET_H)
+#undef EAGAIN
+#define EAGAIN WSAEWOULDBLOCK
+#undef EINTR
+#define EINTR WSAEINTR
+#undef EINPROGRESS
+#define EINPROGRESS WSAEINPROGRESS
+#undef EWOULDBLOCK
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#undef ENOTCONN
+#define ENOTCONN WSAENOTCONN
+#undef ECONNRESET
+#define ECONNRESET WSAECONNRESET
+#undef ETIMEDOUT
+#define ETIMEDOUT WAIT_TIMEOUT
+#endif
+#define ioctl ioctlsocket
+#define socklen_t int
+#else
+#define INVALID_SOCKET SOCKET_ERROR
+#include <sys/socket.h>
+#if !defined(_WRS_KERNEL)
+#include <sys/param.h>
+#include <sys/time.h>
+#include <sys/select.h>
+#include <sys/uio.h>
+#else
+#include <selectLib.h>
+#endif
+#include <netinet/in.h>
+#include <netinet/tcp.h>
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <unistd.h>
+#define ULONG size_t
+#endif
+
+#include "mutex_type.h" /* Needed for mutex_type */
+
+/** socket operation completed successfully */
+#define TCPSOCKET_COMPLETE 0
+#if !defined(SOCKET_ERROR)
+	/** error in socket operation */
+	#define SOCKET_ERROR -1
+#endif
+/** must be the same as SOCKETBUFFER_INTERRUPTED */
+#define TCPSOCKET_INTERRUPTED -22
+#define SSL_FATAL -3
+
+#if !defined(INET6_ADDRSTRLEN)
+#define INET6_ADDRSTRLEN 46 /** only needed for gcc/cygwin on windows */
+#endif
+
+
+#if !defined(max)
+#define max(A,B) ( (A) > (B) ? (A):(B))
+#endif
+
+#include "LinkedList.h"
+
+/*BE
+def FD_SET
+{
+   128 n8 "data"
+}
+
+def SOCKETS
+{
+	FD_SET "rset"
+	FD_SET "rset_saved"
+	n32 dec "maxfdp1"
+	n32 ptr INTList "clientsds"
+	n32 ptr INTItem "cur_clientsds"
+	n32 ptr INTList "connect_pending"
+	n32 ptr INTList "write_pending"
+	FD_SET "pending_wset"
+}
+BE*/
+
+
+/**
+ * Structure to hold all socket data for the module
+ */
+typedef struct
+{
+	fd_set rset, /**< socket read set (see select doc) */
+		rset_saved; /**< saved socket read set */
+	int maxfdp1; /**< max descriptor used +1 (again see select doc) */
+	List* clientsds; /**< list of client socket descriptors */
+	ListElement* cur_clientsds; /**< current client socket descriptor (iterator) */
+	List* connect_pending; /**< list of sockets for which a connect is pending */
+	List* write_pending; /**< list of sockets for which a write is pending */
+	fd_set pending_wset; /**< socket pending write set for select */
+} Sockets;
+
+
+void Socket_outInitialize(void);
+void Socket_outTerminate(void);
+int Socket_getReadySocket(int more_work, struct timeval *tp, mutex_type mutex);
+int Socket_getch(int socket, char* c);
+char *Socket_getdata(int socket, size_t bytes, size_t* actual_len);
+int Socket_putdatas(int socket, char* buf0, size_t buf0len, int count, char** buffers, size_t* buflens, int* frees);
+void Socket_close(int socket);
+int Socket_new(const char* addr, size_t addr_len, int port, int* socket);
+
+int Socket_noPendingWrites(int socket);
+char* Socket_getpeer(int sock);
+
+void Socket_addPendingWrite(int socket);
+void Socket_clearPendingWrite(int socket);
+
+typedef void Socket_writeComplete(int socket, int rc);
+void Socket_setWriteCompleteCallback(Socket_writeComplete*);
+
+#endif /* SOCKET_H */
diff --git a/mqtt/src/src/SocketBuffer.c b/mqtt/src/src/SocketBuffer.c
new file mode 100644
index 00000000..5d9f5d9b
--- /dev/null
+++ b/mqtt/src/src/SocketBuffer.c
@@ -0,0 +1,415 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL updates
+ *    Ian Craggs - fix for issue #244, issue #20
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief Socket buffering related functions
+ *
+ * Some other related functions are in the Socket module
+ */
+#include "SocketBuffer.h"
+#include "LinkedList.h"
+#include "Log.h"
+#include "Messages.h"
+#include "StackTrace.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "Heap.h"
+
+#if defined(WIN32) || defined(WIN64)
+#define iov_len len
+#define iov_base buf
+#endif
+
+/**
+ * Default input queue buffer
+ */
+static socket_queue* def_queue;
+
+/**
+ * List of queued input buffers
+ */
+static List* queues;
+
+/**
+ * List of queued write buffers
+ */
+static List writes;
+
+
+int socketcompare(void* a, void* b);
+void SocketBuffer_newDefQ(void);
+void SocketBuffer_freeDefQ(void);
+int pending_socketcompare(void* a, void* b);
+
+
+/**
+ * List callback function for comparing socket_queues by socket
+ * @param a first integer value
+ * @param b second integer value
+ * @return boolean indicating whether a and b are equal
+ */
+int socketcompare(void* a, void* b)
+{
+	return ((socket_queue*)a)->socket == *(int*)b;
+}
+
+
+/**
+ * Create a new default queue when one has just been used.
+ */
+void SocketBuffer_newDefQ(void)
+{
+	def_queue = malloc(sizeof(socket_queue));
+	def_queue->buflen = 1000;
+	def_queue->buf = malloc(def_queue->buflen);
+	def_queue->socket = def_queue->index = 0;
+	def_queue->buflen = def_queue->datalen = 0;
+}
+
+
+/**
+ * Initialize the socketBuffer module
+ */
+void SocketBuffer_initialize(void)
+{
+	FUNC_ENTRY;
+	SocketBuffer_newDefQ();
+	queues = ListInitialize();
+	ListZero(&writes);
+	FUNC_EXIT;
+}
+
+
+/**
+ * Free the default queue memory
+ */
+void SocketBuffer_freeDefQ(void)
+{
+	free(def_queue->buf);
+	free(def_queue);
+        def_queue = NULL;
+}
+
+
+/**
+ * Terminate the socketBuffer module
+ */
+void SocketBuffer_terminate(void)
+{
+	ListElement* cur = NULL;
+	ListEmpty(&writes);
+
+	FUNC_ENTRY;
+	while (ListNextElement(queues, &cur))
+		free(((socket_queue*)(cur->content))->buf);
+	ListFree(queues);
+	SocketBuffer_freeDefQ();
+	FUNC_EXIT;
+}
+
+
+/**
+ * Cleanup any buffers for a specific socket
+ * @param socket the socket to clean up
+ */
+void SocketBuffer_cleanup(int socket)
+{
+	FUNC_ENTRY;
+	SocketBuffer_writeComplete(socket); /* clean up write buffers */
+	if (ListFindItem(queues, &socket, socketcompare))
+	{
+		free(((socket_queue*)(queues->current->content))->buf);
+		ListRemove(queues, queues->current->content);
+	}
+	if (def_queue->socket == socket)
+	{
+		def_queue->socket = def_queue->index = 0;
+		def_queue->headerlen = def_queue->datalen = 0;
+	}
+	FUNC_EXIT;
+}
+
+
+/**
+ * Get any queued data for a specific socket
+ * @param socket the socket to get queued data for
+ * @param bytes the number of bytes of data to retrieve
+ * @param actual_len the actual length returned
+ * @return the actual data
+ */
+char* SocketBuffer_getQueuedData(int socket, size_t bytes, size_t* actual_len)
+{
+	socket_queue* queue = NULL;
+
+	FUNC_ENTRY;
+	if (ListFindItem(queues, &socket, socketcompare))
+	{  /* if there is queued data for this socket, add any data read to it */
+		queue = (socket_queue*)(queues->current->content);
+		*actual_len = queue->datalen;
+	}
+	else
+	{
+		*actual_len = 0;
+		queue = def_queue;
+	}
+	if (bytes > queue->buflen)
+	{
+		if (queue->datalen > 0)
+		{
+			void* newmem = malloc(bytes);
+			memcpy(newmem, queue->buf, queue->datalen);
+			free(queue->buf);
+			queue->buf = newmem;
+		}
+		else
+			queue->buf = realloc(queue->buf, bytes);
+		queue->buflen = bytes;
+	}
+
+	FUNC_EXIT;
+	return queue->buf;
+}
+
+
+/**
+ * Get any queued character for a specific socket
+ * @param socket the socket to get queued data for
+ * @param c the character returned if any
+ * @return completion code
+ */
+int SocketBuffer_getQueuedChar(int socket, char* c)
+{
+	int rc = SOCKETBUFFER_INTERRUPTED;
+
+	FUNC_ENTRY;
+	if (ListFindItem(queues, &socket, socketcompare))
+	{  /* if there is queued data for this socket, read that first */
+		socket_queue* queue = (socket_queue*)(queues->current->content);
+		if (queue->index < queue->headerlen)
+		{
+			*c = queue->fixed_header[(queue->index)++];
+			Log(TRACE_MAX, -1, "index is now %d, headerlen %d", queue->index, (int)queue->headerlen);
+			rc = SOCKETBUFFER_COMPLETE;
+			goto exit;
+		}
+		else if (queue->index > 4)
+		{
+			Log(LOG_FATAL, -1, "header is already at full length");
+			rc = SOCKET_ERROR;
+			goto exit;
+		}
+	}
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;  /* there was no queued char if rc is SOCKETBUFFER_INTERRUPTED*/
+}
+
+
+/**
+ * A socket read was interrupted so we need to queue data
+ * @param socket the socket to get queued data for
+ * @param actual_len the actual length of data that was read
+ */
+void SocketBuffer_interrupted(int socket, size_t actual_len)
+{
+	socket_queue* queue = NULL;
+
+	FUNC_ENTRY;
+	if (ListFindItem(queues, &socket, socketcompare))
+		queue = (socket_queue*)(queues->current->content);
+	else /* new saved queue */
+	{
+		queue = def_queue;
+		/* if SocketBuffer_queueChar() has not yet been called, then the socket number
+		  in def_queue will not have been set.  Issue #244.
+		  If actual_len == 0 then we may not need to do anything - I'll leave that
+		  optimization for another time. */
+		queue->socket = socket;
+		ListAppend(queues, def_queue, sizeof(socket_queue)+def_queue->buflen);
+		SocketBuffer_newDefQ();
+	}
+	queue->index = 0;
+	queue->datalen = actual_len;
+	FUNC_EXIT;
+}
+
+
+/**
+ * A socket read has now completed so we can get rid of the queue
+ * @param socket the socket for which the operation is now complete
+ * @return pointer to the default queue data
+ */
+char* SocketBuffer_complete(int socket)
+{
+	FUNC_ENTRY;
+	if (ListFindItem(queues, &socket, socketcompare))
+	{
+		socket_queue* queue = (socket_queue*)(queues->current->content);
+		SocketBuffer_freeDefQ();
+		def_queue = queue;
+		ListDetach(queues, queue);
+	}
+	def_queue->socket = def_queue->index = 0;
+	def_queue->headerlen = def_queue->datalen = 0;
+	FUNC_EXIT;
+	return def_queue->buf;
+}
+
+
+/**
+ * A socket operation had now completed so we can get rid of the queue
+ * @param socket the socket for which the operation is now complete
+ * @param c the character to queue
+ */
+void SocketBuffer_queueChar(int socket, char c)
+{
+	int error = 0;
+	socket_queue* curq = def_queue;
+
+	FUNC_ENTRY;
+	if (ListFindItem(queues, &socket, socketcompare))
+		curq = (socket_queue*)(queues->current->content);
+	else if (def_queue->socket == 0)
+	{
+		def_queue->socket = socket;
+		def_queue->index = 0;
+		def_queue->datalen = 0;
+	}
+	else if (def_queue->socket != socket)
+	{
+		Log(LOG_FATAL, -1, "attempt to reuse socket queue");
+		error = 1;
+	}
+	if (curq->index > 4)
+	{
+		Log(LOG_FATAL, -1, "socket queue fixed_header field full");
+		error = 1;
+	}
+	if (!error)
+	{
+		curq->fixed_header[(curq->index)++] = c;
+		curq->headerlen = curq->index;
+	}
+	Log(TRACE_MAX, -1, "queueChar: index is now %d, headerlen %d", curq->index, (int)curq->headerlen);
+	FUNC_EXIT;
+}
+
+
+/**
+ * A socket write was interrupted so store the remaining data
+ * @param socket the socket for which the write was interrupted
+ * @param count the number of iovec buffers
+ * @param iovecs buffer array
+ * @param frees a set of flags indicating which of the iovecs array should be freed
+ * @param total total data length to be written
+ * @param bytes actual data length that was written
+ */
+#if defined(OPENSSL)
+void SocketBuffer_pendingWrite(int socket, SSL* ssl, int count, iobuf* iovecs, int* frees, size_t total, size_t bytes)
+#else
+void SocketBuffer_pendingWrite(int socket, int count, iobuf* iovecs, int* frees, size_t total, size_t bytes)
+#endif
+{
+	int i = 0;
+	pending_writes* pw = NULL;
+
+	FUNC_ENTRY;
+	/* store the buffers until the whole packet is written */
+	pw = malloc(sizeof(pending_writes));
+	pw->socket = socket;
+#if defined(OPENSSL)
+	pw->ssl = ssl;
+#endif
+	pw->bytes = bytes;
+	pw->total = total;
+	pw->count = count;
+	for (i = 0; i < count; i++)
+	{
+		pw->iovecs[i] = iovecs[i];
+		pw->frees[i] = frees[i];
+	}
+	ListAppend(&writes, pw, sizeof(pw) + total);
+	FUNC_EXIT;
+}
+
+
+/**
+ * List callback function for comparing pending_writes by socket
+ * @param a first integer value
+ * @param b second integer value
+ * @return boolean indicating whether a and b are equal
+ */
+int pending_socketcompare(void* a, void* b)
+{
+	return ((pending_writes*)a)->socket == *(int*)b;
+}
+
+
+/**
+ * Get any queued write data for a specific socket
+ * @param socket the socket to get queued data for
+ * @return pointer to the queued data or NULL
+ */
+pending_writes* SocketBuffer_getWrite(int socket)
+{
+	ListElement* le = ListFindItem(&writes, &socket, pending_socketcompare);
+	return (le) ? (pending_writes*)(le->content) : NULL;
+}
+
+
+/**
+ * A socket write has now completed so we can get rid of the queue
+ * @param socket the socket for which the operation is now complete
+ * @return completion code, boolean - was the queue removed?
+ */
+int SocketBuffer_writeComplete(int socket)
+{
+	return ListRemoveItem(&writes, &socket, pending_socketcompare);
+}
+
+
+/**
+ * Update the queued write data for a socket in the case of QoS 0 messages.
+ * @param socket the socket for which the operation is now complete
+ * @param topic the topic of the QoS 0 write
+ * @param payload the payload of the QoS 0 write
+ * @return pointer to the updated queued data structure, or NULL
+ */
+pending_writes* SocketBuffer_updateWrite(int socket, char* topic, char* payload)
+{
+	pending_writes* pw = NULL;
+	ListElement* le = NULL;
+
+	FUNC_ENTRY;
+	if ((le = ListFindItem(&writes, &socket, pending_socketcompare)) != NULL)
+	{
+		pw = (pending_writes*)(le->content);
+		if (pw->count == 4)
+		{
+			pw->iovecs[2].iov_base = topic;
+			pw->iovecs[3].iov_base = payload;
+		}
+	}
+
+	FUNC_EXIT;
+	return pw;
+}
diff --git a/mqtt/src/src/SocketBuffer.h b/mqtt/src/src/SocketBuffer.h
new file mode 100644
index 00000000..f7702dc8
--- /dev/null
+++ b/mqtt/src/src/SocketBuffer.h
@@ -0,0 +1,84 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2014 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs, Allan Stockdill-Mander - SSL updates
+ *******************************************************************************/
+
+#if !defined(SOCKETBUFFER_H)
+#define SOCKETBUFFER_H
+
+#if defined(WIN32) || defined(WIN64)
+#include <winsock2.h>
+#else
+#include <sys/socket.h>
+#endif
+
+#if defined(OPENSSL)
+#include <openssl/ssl.h>
+#endif
+
+#if defined(WIN32) || defined(WIN64)
+	typedef WSABUF iobuf;
+#else
+	typedef struct iovec iobuf;
+#endif
+
+typedef struct
+{
+	int socket;
+	unsigned int index;
+	size_t headerlen;
+	char fixed_header[5];	/**< header plus up to 4 length bytes */
+	size_t buflen, 			/**< total length of the buffer */
+		datalen; 			/**< current length of data in buf */
+	char* buf;
+} socket_queue;
+
+typedef struct
+{
+	int socket, count;
+	size_t total;
+#if defined(OPENSSL)
+	SSL* ssl;
+#endif
+	size_t bytes;
+	iobuf iovecs[5];
+	int frees[5];
+} pending_writes;
+
+#define SOCKETBUFFER_COMPLETE 0
+#if !defined(SOCKET_ERROR)
+	#define SOCKET_ERROR -1
+#endif
+#define SOCKETBUFFER_INTERRUPTED -22 /* must be the same value as TCPSOCKET_INTERRUPTED */
+
+void SocketBuffer_initialize(void);
+void SocketBuffer_terminate(void);
+void SocketBuffer_cleanup(int socket);
+char* SocketBuffer_getQueuedData(int socket, size_t bytes, size_t* actual_len);
+int SocketBuffer_getQueuedChar(int socket, char* c);
+void SocketBuffer_interrupted(int socket, size_t actual_len);
+char* SocketBuffer_complete(int socket);
+void SocketBuffer_queueChar(int socket, char c);
+
+#if defined(OPENSSL)
+void SocketBuffer_pendingWrite(int socket, SSL* ssl, int count, iobuf* iovecs, int* frees, size_t total, size_t bytes);
+#else
+void SocketBuffer_pendingWrite(int socket, int count, iobuf* iovecs, int* frees, size_t total, size_t bytes);
+#endif
+pending_writes* SocketBuffer_getWrite(int socket);
+int SocketBuffer_writeComplete(int socket);
+pending_writes* SocketBuffer_updateWrite(int socket, char* topic, char* payload);
+
+#endif
diff --git a/mqtt/src/src/StackTrace.c b/mqtt/src/src/StackTrace.c
new file mode 100644
index 00000000..37435c6e
--- /dev/null
+++ b/mqtt/src/src/StackTrace.c
@@ -0,0 +1,204 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#include "StackTrace.h"
+#include "Log.h"
+#include "LinkedList.h"
+
+#include "Clients.h"
+#include "Thread.h"
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#if defined(WIN32) || defined(WIN64)
+#define snprintf _snprintf
+#endif
+
+/*BE
+def STACKENTRY
+{
+	n32 ptr STRING open "name"
+	n32 dec "line"
+}
+
+defList(STACKENTRY)
+BE*/
+
+#define MAX_STACK_DEPTH 50
+#define MAX_FUNCTION_NAME_LENGTH 30
+#define MAX_THREADS 255
+
+typedef struct
+{
+	thread_id_type threadid;
+	char name[MAX_FUNCTION_NAME_LENGTH];
+	int line;
+} stackEntry;
+
+typedef struct
+{
+	thread_id_type id;
+	int maxdepth;
+	int current_depth;
+	stackEntry callstack[MAX_STACK_DEPTH];
+} threadEntry;
+
+#include "StackTrace.h"
+
+static int thread_count = 0;
+static threadEntry threads[MAX_THREADS];
+static threadEntry *my_thread = NULL;
+
+#if defined(WIN32) || defined(WIN64)
+mutex_type stack_mutex;
+#else
+static pthread_mutex_t stack_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+static mutex_type stack_mutex = &stack_mutex_store;
+#endif
+
+
+int setStack(int create);
+
+
+int setStack(int create)
+{
+	int i = -1;
+	thread_id_type curid = Thread_getid();
+
+	my_thread = NULL;
+	for (i = 0; i < MAX_THREADS && i < thread_count; ++i)
+	{
+		if (threads[i].id == curid)
+		{
+			my_thread = &threads[i];
+			break;
+		}
+	}
+
+	if (my_thread == NULL && create && thread_count < MAX_THREADS)
+	{
+		my_thread = &threads[thread_count];
+		my_thread->id = curid;
+		my_thread->maxdepth = 0;
+		my_thread->current_depth = 0;
+		++thread_count;
+	}
+	return my_thread != NULL; /* good == 1 */
+}
+
+void StackTrace_entry(const char* name, int line, enum LOG_LEVELS trace_level)
+{
+	Thread_lock_mutex(stack_mutex);
+	if (!setStack(1))
+		goto exit;
+	if (trace_level != -1)
+		Log_stackTrace(trace_level, 9, (int)my_thread->id, my_thread->current_depth, name, line, NULL);
+	strncpy(my_thread->callstack[my_thread->current_depth].name, name, sizeof(my_thread->callstack[0].name)-1);
+	my_thread->callstack[(my_thread->current_depth)++].line = line;
+	if (my_thread->current_depth > my_thread->maxdepth)
+		my_thread->maxdepth = my_thread->current_depth;
+	if (my_thread->current_depth >= MAX_STACK_DEPTH)
+		Log(LOG_FATAL, -1, "Max stack depth exceeded");
+exit:
+	Thread_unlock_mutex(stack_mutex);
+}
+
+
+void StackTrace_exit(const char* name, int line, void* rc, enum LOG_LEVELS trace_level)
+{
+	Thread_lock_mutex(stack_mutex);
+	if (!setStack(0))
+		goto exit;
+	if (--(my_thread->current_depth) < 0)
+		Log(LOG_FATAL, -1, "Minimum stack depth exceeded for thread %lu", my_thread->id);
+	if (strncmp(my_thread->callstack[my_thread->current_depth].name, name, sizeof(my_thread->callstack[0].name)-1) != 0)
+		Log(LOG_FATAL, -1, "Stack mismatch. Entry:%s Exit:%s\n", my_thread->callstack[my_thread->current_depth].name, name);
+	if (trace_level != -1)
+	{
+		if (rc == NULL)
+			Log_stackTrace(trace_level, 10, (int)my_thread->id, my_thread->current_depth, name, line, NULL);
+		else
+			Log_stackTrace(trace_level, 11, (int)my_thread->id, my_thread->current_depth, name, line, (int*)rc);
+	}
+exit:
+	Thread_unlock_mutex(stack_mutex);
+}
+
+
+void StackTrace_printStack(FILE* dest)
+{
+	FILE* file = stdout;
+	int t = 0;
+
+	if (dest)
+		file = dest;
+	for (t = 0; t < thread_count; ++t)
+	{
+		threadEntry *cur_thread = &threads[t];
+
+		if (cur_thread->id > 0)
+		{
+			int i = cur_thread->current_depth - 1;
+
+			fprintf(file, "=========== Start of stack trace for thread %lu ==========\n", (unsigned long)cur_thread->id);
+			if (i >= 0)
+			{
+				fprintf(file, "%s (%d)\n", cur_thread->callstack[i].name, cur_thread->callstack[i].line);
+				while (--i >= 0)
+					fprintf(file, "   at %s (%d)\n", cur_thread->callstack[i].name, cur_thread->callstack[i].line);
+			}
+			fprintf(file, "=========== End of stack trace for thread %lu ==========\n\n", (unsigned long)cur_thread->id);
+		}
+	}
+	if (file != stdout && file != stderr && file != NULL)
+		fclose(file);
+}
+
+
+char* StackTrace_get(thread_id_type threadid, char* buf, int bufsize)
+{
+	int t = 0;
+
+	if (bufsize < 100)
+		goto exit;
+	buf[0] = '\0';
+	for (t = 0; t < thread_count; ++t)
+	{
+		threadEntry *cur_thread = &threads[t];
+
+		if (cur_thread->id == threadid)
+		{
+			int i = cur_thread->current_depth - 1;
+			int curpos = 0;
+
+			if (i >= 0)
+			{
+				curpos += snprintf(&buf[curpos], bufsize - curpos -1,
+						"%s (%d)\n", cur_thread->callstack[i].name, cur_thread->callstack[i].line);
+				while (--i >= 0)
+					curpos += snprintf(&buf[curpos], bufsize - curpos -1, /* lgtm [cpp/overflowing-snprintf] */
+							"   at %s (%d)\n", cur_thread->callstack[i].name, cur_thread->callstack[i].line);
+				if (buf[--curpos] == '\n')
+					buf[curpos] = '\0';
+			}
+			break;
+		}
+	}
+exit:
+	return buf;
+}
diff --git a/mqtt/src/src/StackTrace.h b/mqtt/src/src/StackTrace.h
new file mode 100644
index 00000000..21a0a646
--- /dev/null
+++ b/mqtt/src/src/StackTrace.h
@@ -0,0 +1,71 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2017 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#ifndef STACKTRACE_H_
+#define STACKTRACE_H_
+
+#include <stdio.h>
+#include "Log.h"
+#include "Thread.h"
+
+#if defined(NOSTACKTRACE)
+#define FUNC_ENTRY
+#define FUNC_ENTRY_NOLOG
+#define FUNC_ENTRY_MED
+#define FUNC_ENTRY_MAX
+#define FUNC_EXIT
+#define FUNC_EXIT_NOLOG
+#define FUNC_EXIT_MED
+#define FUNC_EXIT_MAX
+#define FUNC_EXIT_RC(x)
+#define FUNC_EXIT_MED_RC(x)
+#define FUNC_EXIT_MAX_RC(x)
+#else
+#if defined(WIN32) || defined(WIN64)
+#define inline __inline
+#define FUNC_ENTRY StackTrace_entry(__FUNCTION__, __LINE__, TRACE_MINIMUM)
+#define FUNC_ENTRY_NOLOG StackTrace_entry(__FUNCTION__, __LINE__, -1)
+#define FUNC_ENTRY_MED StackTrace_entry(__FUNCTION__, __LINE__, TRACE_MEDIUM)
+#define FUNC_ENTRY_MAX StackTrace_entry(__FUNCTION__, __LINE__, TRACE_MAXIMUM)
+#define FUNC_EXIT StackTrace_exit(__FUNCTION__, __LINE__, NULL, TRACE_MINIMUM)
+#define FUNC_EXIT_NOLOG StackTrace_exit(__FUNCTION__, __LINE__, -1)
+#define FUNC_EXIT_MED StackTrace_exit(__FUNCTION__, __LINE__, NULL, TRACE_MEDIUM)
+#define FUNC_EXIT_MAX StackTrace_exit(__FUNCTION__, __LINE__, NULL, TRACE_MAXIMUM)
+#define FUNC_EXIT_RC(x) StackTrace_exit(__FUNCTION__, __LINE__, &x, TRACE_MINIMUM)
+#define FUNC_EXIT_MED_RC(x) StackTrace_exit(__FUNCTION__, __LINE__, &x, TRACE_MEDIUM)
+#define FUNC_EXIT_MAX_RC(x) StackTrace_exit(__FUNCTION__, __LINE__, &x, TRACE_MAXIMUM)
+#else
+#define FUNC_ENTRY StackTrace_entry(__func__, __LINE__, TRACE_MINIMUM)
+#define FUNC_ENTRY_NOLOG StackTrace_entry(__func__, __LINE__, -1)
+#define FUNC_ENTRY_MED StackTrace_entry(__func__, __LINE__, TRACE_MEDIUM)
+#define FUNC_ENTRY_MAX StackTrace_entry(__func__, __LINE__, TRACE_MAXIMUM)
+#define FUNC_EXIT StackTrace_exit(__func__, __LINE__, NULL, TRACE_MINIMUM)
+#define FUNC_EXIT_NOLOG StackTrace_exit(__func__, __LINE__, NULL, -1)
+#define FUNC_EXIT_MED StackTrace_exit(__func__, __LINE__, NULL, TRACE_MEDIUM)
+#define FUNC_EXIT_MAX StackTrace_exit(__func__, __LINE__, NULL, TRACE_MAXIMUM)
+#define FUNC_EXIT_RC(x) StackTrace_exit(__func__, __LINE__, &x, TRACE_MINIMUM)
+#define FUNC_EXIT_MED_RC(x) StackTrace_exit(__func__, __LINE__, &x, TRACE_MEDIUM)
+#define FUNC_EXIT_MAX_RC(x) StackTrace_exit(__func__, __LINE__, &x, TRACE_MAXIMUM)
+#endif
+#endif
+
+void StackTrace_entry(const char* name, int line, enum LOG_LEVELS trace);
+void StackTrace_exit(const char* name, int line, void* return_value, enum LOG_LEVELS trace);
+
+void StackTrace_printStack(FILE* dest);
+char* StackTrace_get(thread_id_type, char* buf, int bufsize);
+
+#endif /* STACKTRACE_H_ */
diff --git a/mqtt/src/src/Thread.c b/mqtt/src/src/Thread.c
new file mode 100644
index 00000000..4536c0ae
--- /dev/null
+++ b/mqtt/src/src/Thread.c
@@ -0,0 +1,641 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial implementation
+ *    Ian Craggs, Allan Stockdill-Mander - async client updates
+ *    Ian Craggs - bug #415042 - start Linux thread as disconnected
+ *    Ian Craggs - fix for bug #420851
+ *    Ian Craggs - change MacOS semaphore implementation
+ *    Ian Craggs - fix for clock #284
+ *******************************************************************************/
+
+/**
+ * @file
+ * \brief Threading related functions
+ *
+ * Used to create platform independent threading functions
+ */
+
+
+#include "Thread.h"
+#if defined(THREAD_UNIT_TESTS)
+#define NOSTACKTRACE
+#endif
+#include "Log.h"
+#include "StackTrace.h"
+
+#undef malloc
+#undef realloc
+#undef free
+
+#if !defined(WIN32) && !defined(WIN64)
+#include <errno.h>
+#include <unistd.h>
+#include <sys/time.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <limits.h>
+#endif
+#include <stdlib.h>
+
+#include "OsWrapper.h"
+
+/**
+ * Start a new thread
+ * @param fn the function to run, must be of the correct signature
+ * @param parameter pointer to the function parameter, can be NULL
+ * @return the new thread
+ */
+thread_type Thread_start(thread_fn fn, void* parameter)
+{
+#if defined(WIN32) || defined(WIN64)
+	thread_type thread = NULL;
+#else
+	thread_type thread = 0;
+	pthread_attr_t attr;
+#endif
+
+	FUNC_ENTRY;
+#if defined(WIN32) || defined(WIN64)
+	thread = CreateThread(NULL, 0, fn, parameter, 0, NULL);
+#else
+	pthread_attr_init(&attr);
+	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
+	if (pthread_create(&thread, &attr, fn, parameter) != 0)
+		thread = 0;
+	pthread_attr_destroy(&attr);
+#endif
+	FUNC_EXIT;
+	return thread;
+}
+
+
+/**
+ * Create a new mutex
+ * @return the new mutex
+ */
+mutex_type Thread_create_mutex(void)
+{
+	mutex_type mutex = NULL;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	#if defined(WIN32) || defined(WIN64)
+		mutex = CreateMutex(NULL, 0, NULL);
+		if (mutex == NULL)
+			rc = GetLastError();
+	#else
+		mutex = malloc(sizeof(pthread_mutex_t));
+		rc = pthread_mutex_init(mutex, NULL);
+	#endif
+	FUNC_EXIT_RC(rc);
+	return mutex;
+}
+
+
+/**
+ * Lock a mutex which has alrea
+ * @return completion code, 0 is success
+ */
+int Thread_lock_mutex(mutex_type mutex)
+{
+	int rc = -1;
+
+	/* don't add entry/exit trace points as the stack log uses mutexes - recursion beckons */
+	#if defined(WIN32) || defined(WIN64)
+		/* WaitForSingleObject returns WAIT_OBJECT_0 (0), on success */
+		rc = WaitForSingleObject(mutex, INFINITE);
+	#else
+		rc = pthread_mutex_lock(mutex);
+	#endif
+
+	return rc;
+}
+
+
+/**
+ * Unlock a mutex which has already been locked
+ * @param mutex the mutex
+ * @return completion code, 0 is success
+ */
+int Thread_unlock_mutex(mutex_type mutex)
+{
+	int rc = -1;
+
+	/* don't add entry/exit trace points as the stack log uses mutexes - recursion beckons */
+	#if defined(WIN32) || defined(WIN64)
+		/* if ReleaseMutex fails, the return value is 0 */
+		if (ReleaseMutex(mutex) == 0)
+			rc = GetLastError();
+		else
+			rc = 0;
+	#else
+		rc = pthread_mutex_unlock(mutex);
+	#endif
+
+	return rc;
+}
+
+
+/**
+ * Destroy a mutex which has already been created
+ * @param mutex the mutex
+ */
+void Thread_destroy_mutex(mutex_type mutex)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	#if defined(WIN32) || defined(WIN64)
+		rc = CloseHandle(mutex);
+	#else
+		rc = pthread_mutex_destroy(mutex);
+		free(mutex);
+	#endif
+	FUNC_EXIT_RC(rc);
+}
+
+
+/**
+ * Get the thread id of the thread from which this function is called
+ * @return thread id, type varying according to OS
+ */
+thread_id_type Thread_getid(void)
+{
+	#if defined(WIN32) || defined(WIN64)
+		return GetCurrentThreadId();
+	#else
+		return pthread_self();
+	#endif
+}
+
+
+/**
+ * Create a new semaphore
+ * @return the new condition variable
+ */
+sem_type Thread_create_sem(void)
+{
+	sem_type sem = NULL;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	#if defined(WIN32) || defined(WIN64)
+		sem = CreateEvent(
+		        NULL,               /* default security attributes */
+		        FALSE,              /* manual-reset event? */
+		        FALSE,              /* initial state is nonsignaled */
+		        NULL                /* object name */
+		        );
+#if 0
+		sem = CreateSemaphore(
+				NULL,				/* default security attributes */
+				0,       	        /* initial count - non signaled */
+				1, 					/* maximum count */
+				NULL 				/* unnamed semaphore */
+		);
+#endif
+	#elif defined(OSX)
+		sem = dispatch_semaphore_create(0L);
+		rc = (sem == NULL) ? -1 : 0;
+	#else
+		sem = malloc(sizeof(sem_t));
+		rc = sem_init(sem, 0, 0);
+	#endif
+	FUNC_EXIT_RC(rc);
+	return sem;
+}
+
+
+/**
+ * Wait for a semaphore to be posted, or timeout.
+ * @param sem the semaphore
+ * @param timeout the maximum time to wait, in milliseconds
+ * @return completion code
+ */
+int Thread_wait_sem(sem_type sem, int timeout)
+{
+/* sem_timedwait is the obvious call to use, but seemed not to work on the Viper,
+ * so I've used trywait in a loop instead. Ian Craggs 23/7/2010
+ */
+	int rc = -1;
+#if !defined(WIN32) && !defined(WIN64) && !defined(OSX)
+#define USE_TRYWAIT
+#if defined(USE_TRYWAIT)
+	int i = 0;
+	useconds_t interval = 10000; /* 10000 microseconds: 10 milliseconds */
+	int count = (1000 * timeout) / interval; /* how many intervals in timeout period */
+#else
+	struct timespec ts;
+#endif
+#endif
+
+	FUNC_ENTRY;
+	#if defined(WIN32) || defined(WIN64)
+		/* returns 0 (WAIT_OBJECT_0) on success, non-zero (WAIT_TIMEOUT) if timeout occurred */
+		rc = WaitForSingleObject(sem, timeout < 0 ? 0 : timeout);
+		if (rc == WAIT_TIMEOUT)
+			rc = ETIMEDOUT;
+	#elif defined(OSX)
+		/* returns 0 on success, non-zero if timeout occurred */
+		rc = (int)dispatch_semaphore_wait(sem, dispatch_time(DISPATCH_TIME_NOW, (int64_t)timeout*1000000L));
+		if (rc != 0)
+			rc = ETIMEDOUT;
+	#elif defined(USE_TRYWAIT)
+		while (++i < count && (rc = sem_trywait(sem)) != 0)
+		{
+			if (rc == -1 && ((rc = errno) != EAGAIN))
+			{
+				rc = 0;
+				break;
+			}
+			usleep(interval); /* microseconds - .1 of a second */
+		}
+	#else
+		/* We have to use CLOCK_REALTIME rather than MONOTONIC for sem_timedwait interval.
+		 * Does this make it susceptible to system clock changes?
+		 * The intervals are small enough, and repeated, that I think it's not an issue.
+		 */
+		if (clock_gettime(CLOCK_REALTIME, &ts) != -1)
+		{
+			ts.tv_sec += timeout;
+			rc = sem_timedwait(sem, &ts);
+		}
+	#endif
+
+ 	FUNC_EXIT_RC(rc);
+ 	return rc;
+}
+
+
+/**
+ * Check to see if a semaphore has been posted, without waiting
+ * The semaphore will be unchanged, if the return value is false.
+ * The semaphore will have been decremented, if the return value is true.
+ * @param sem the semaphore
+ * @return 0 (false) or 1 (true)
+ */
+int Thread_check_sem(sem_type sem)
+{
+#if defined(WIN32) || defined(WIN64)
+	/* if the return value is not 0, the semaphore will not have been decremented */
+	return WaitForSingleObject(sem, 0) == WAIT_OBJECT_0;
+#elif defined(OSX)
+	/* if the return value is not 0, the semaphore will not have been decremented */
+	return dispatch_semaphore_wait(sem, DISPATCH_TIME_NOW) == 0;
+#else
+	/* If the call was unsuccessful, the state of the semaphore shall be unchanged,
+	 * and the function shall return a value of -1 */
+	return sem_trywait(sem) == 0;
+#endif
+}
+
+
+/**
+ * Post a semaphore
+ * @param sem the semaphore
+ * @return 0 on success
+ */
+int Thread_post_sem(sem_type sem)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	#if defined(WIN32) || defined(WIN64)
+		if (SetEvent(sem) == 0)
+			rc = GetLastError();
+	#elif defined(OSX)
+		rc = (int)dispatch_semaphore_signal(sem);
+	#else
+		int val;
+		int rc1 = sem_getvalue(sem, &val);
+		if (val == 0 && sem_post(sem) == -1)
+			rc = errno;
+	#endif
+
+ 	FUNC_EXIT_RC(rc);
+  return rc;
+}
+
+
+/**
+ * Destroy a semaphore which has already been created
+ * @param sem the semaphore
+ */
+int Thread_destroy_sem(sem_type sem)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	#if defined(WIN32) || defined(WIN64)
+		rc = CloseHandle(sem);
+  #elif defined(OSX)
+	  dispatch_release(sem);
+	#else
+		rc = sem_destroy(sem);
+		free(sem);
+	#endif
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+#if !defined(WIN32) && !defined(WIN64)
+
+/**
+ * Create a new condition variable
+ * @return the condition variable struct
+ */
+cond_type Thread_create_cond(void)
+{
+	cond_type condvar = NULL;
+	pthread_condattr_t attr;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	pthread_condattr_init(&attr);
+
+#if 0
+    /* in theory, a monotonic clock should be able to be used.  However on at least
+     * one system reported, even though setclock() reported success, it didn't work.
+     */
+	if ((rc = pthread_condattr_setclock(&attr, CLOCK_MONOTONIC)) == 0)
+		use_clock_monotonic = 1;
+	else
+		Log(LOG_ERROR, -1, "Error %d calling pthread_condattr_setclock(CLOCK_MONOTONIC)", rc);
+#endif
+
+	condvar = malloc(sizeof(cond_type_struct));
+	rc = pthread_cond_init(&condvar->cond, &attr);
+	rc = pthread_mutex_init(&condvar->mutex, NULL);
+
+	FUNC_EXIT_RC(rc);
+	return condvar;
+}
+
+/**
+ * Signal a condition variable
+ * @return completion code
+ */
+int Thread_signal_cond(cond_type condvar)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	pthread_mutex_lock(&condvar->mutex);
+	rc = pthread_cond_signal(&condvar->cond);
+	pthread_mutex_unlock(&condvar->mutex);
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+/**
+ * Wait with a timeout (seconds) for condition variable
+ * @return 0 for success, ETIMEDOUT otherwise
+ */
+int Thread_wait_cond(cond_type condvar, int timeout)
+{
+	int rc = 0;
+	struct timespec cond_timeout;
+
+	FUNC_ENTRY;
+	clock_gettime(CLOCK_REALTIME, &cond_timeout);
+
+	cond_timeout.tv_sec += timeout;
+	pthread_mutex_lock(&condvar->mutex);
+	rc = pthread_cond_timedwait(&condvar->cond, &condvar->mutex, &cond_timeout);
+	pthread_mutex_unlock(&condvar->mutex);
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+/**
+ * Destroy a condition variable
+ * @return completion code
+ */
+int Thread_destroy_cond(cond_type condvar)
+{
+	int rc = 0;
+
+	rc = pthread_mutex_destroy(&condvar->mutex);
+	rc = pthread_cond_destroy(&condvar->cond);
+	free(condvar);
+
+	return rc;
+}
+#endif
+
+
+#if defined(THREAD_UNIT_TESTS)
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+
+int tests = 0, failures = 0;
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		printf("Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		//cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+        //                description, filename, lineno);
+	}
+    else
+    		printf("Assertion succeeded, file %s, line %d, description: %s\n", filename, lineno, description);
+}
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+#include <stdio.h>
+
+thread_return_type cond_secondary(void* n)
+{
+	int rc = 0;
+	cond_type cond = n;
+
+	printf("This should return immediately as it was posted already\n");
+	rc = Thread_wait_cond(cond, 99999);
+	assert("rc 1 from wait_cond", rc == 1, "rc was %d", rc);
+
+	printf("This should hang around a few seconds\n");
+	rc = Thread_wait_cond(cond, 99999);
+	assert("rc 1 from wait_cond", rc == 1, "rc was %d", rc);
+
+	printf("Secondary cond thread ending\n");
+	return 0;
+}
+
+
+int cond_test()
+{
+	int rc = 0;
+	cond_type cond = Thread_create_cond();
+	thread_type thread;
+
+	printf("Post secondary so it should return immediately\n");
+	rc = Thread_signal_cond(cond);
+	assert("rc 0 from signal cond", rc == 0, "rc was %d", rc);
+
+	printf("Starting secondary thread\n");
+	thread = Thread_start(cond_secondary, (void*)cond);
+
+	sleep(3);
+
+	printf("post secondary\n");
+	rc = Thread_signal_cond(cond);
+	assert("rc 1 from signal cond", rc == 1, "rc was %d", rc);
+
+	sleep(3);
+
+	printf("Main thread ending\n");
+
+	return failures;
+}
+
+
+thread_return_type sem_secondary(void* n)
+{
+	int rc = 0;
+	sem_type sem = n;
+
+	printf("Secondary semaphore pointer %p\n", sem);
+
+	rc = Thread_check_sem(sem);
+	assert("rc 1 from check_sem", rc == 1, "rc was %d", rc);
+
+	printf("Secondary thread about to wait\n");
+	rc = Thread_wait_sem(sem, 99999);
+	printf("Secondary thread returned from wait %d\n", rc);
+
+	printf("Secondary thread about to wait\n");
+	rc = Thread_wait_sem(sem, 99999);
+	printf("Secondary thread returned from wait %d\n", rc);
+	printf("Secondary check sem %d\n", Thread_check_sem(sem));
+
+	printf("Secondary thread ending\n");
+	return 0;
+}
+
+
+int sem_test()
+{
+	int rc = 0;
+	sem_type sem = Thread_create_sem();
+	thread_type thread;
+
+	printf("Primary semaphore pointer %p\n", sem);
+
+	rc = Thread_check_sem(sem);
+	assert("rc 0 from check_sem", rc == 0, "rc was %d\n", rc);
+
+	printf("post secondary so then check should be 1\n");
+	rc = Thread_post_sem(sem);
+	assert("rc 0 from post_sem", rc == 0, "rc was %d\n", rc);
+
+	rc = Thread_check_sem(sem);
+	assert("rc 1 from check_sem", rc == 1, "rc was %d", rc);
+
+	printf("Starting secondary thread\n");
+	thread = Thread_start(sem_secondary, (void*)sem);
+
+	sleep(3);
+	rc = Thread_check_sem(sem);
+	assert("rc 1 from check_sem", rc == 1, "rc was %d", rc);
+
+	printf("post secondary\n");
+	rc = Thread_post_sem(sem);
+	assert("rc 1 from post_sem", rc == 1, "rc was %d", rc);
+
+	sleep(3);
+
+	printf("Main thread ending\n");
+
+	return failures;
+}
+
+
+int main(int argc, char *argv[])
+{
+	sem_test();
+	//cond_test();
+}
+
+#endif
diff --git a/mqtt/src/src/Thread.h b/mqtt/src/src/Thread.h
new file mode 100644
index 00000000..88fd008c
--- /dev/null
+++ b/mqtt/src/src/Thread.h
@@ -0,0 +1,75 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial implementation
+ *    Ian Craggs, Allan Stockdill-Mander - async client updates
+ *    Ian Craggs - fix for bug #420851
+ *    Ian Craggs - change MacOS semaphore implementation
+ *******************************************************************************/
+#include "MQTTClient.h"
+
+#if !defined(THREAD_H)
+#define THREAD_H
+
+#include "mutex_type.h" /* Needed for mutex_type */
+
+#if defined(WIN32) || defined(WIN64)
+	#include <windows.h>
+	#define thread_type HANDLE
+	#define thread_id_type DWORD
+	#define thread_return_type DWORD
+	#define thread_fn LPTHREAD_START_ROUTINE
+	#define cond_type HANDLE
+	#define sem_type HANDLE
+	#undef ETIMEDOUT
+	#define ETIMEDOUT WSAETIMEDOUT
+#else
+	#include <pthread.h>
+
+	#define thread_type pthread_t
+	#define thread_id_type pthread_t
+	#define thread_return_type void*
+	typedef thread_return_type (*thread_fn)(void*);
+	typedef struct { pthread_cond_t cond; pthread_mutex_t mutex; } cond_type_struct;
+	typedef cond_type_struct *cond_type;
+	#if defined(OSX)
+	  #include <dispatch/dispatch.h>
+	  typedef dispatch_semaphore_t sem_type;
+	#else
+	  #include <semaphore.h>
+	  typedef sem_t *sem_type;
+	#endif
+
+	cond_type Thread_create_cond(void);
+	int Thread_signal_cond(cond_type);
+	int Thread_wait_cond(cond_type condvar, int timeout);
+	int Thread_destroy_cond(cond_type);
+#endif
+
+DLLExport thread_type Thread_start(thread_fn, void*);
+
+DLLExport mutex_type Thread_create_mutex();
+DLLExport int Thread_lock_mutex(mutex_type);
+DLLExport int Thread_unlock_mutex(mutex_type);
+void Thread_destroy_mutex(mutex_type);
+
+DLLExport thread_id_type Thread_getid();
+
+sem_type Thread_create_sem(void);
+int Thread_wait_sem(sem_type sem, int timeout);
+int Thread_check_sem(sem_type sem);
+int Thread_post_sem(sem_type sem);
+int Thread_destroy_sem(sem_type sem);
+
+
+#endif
diff --git a/mqtt/src/src/Tree.c b/mqtt/src/src/Tree.c
new file mode 100644
index 00000000..bc6b7640
--- /dev/null
+++ b/mqtt/src/src/Tree.c
@@ -0,0 +1,726 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial implementation and documentation
+ *******************************************************************************/
+
+/** @file
+ * \brief functions which apply to tree structures.
+ *
+ * These trees can hold data of any sort, pointed to by the content pointer of the
+ * Node structure.
+ * */
+
+#define NO_HEAP_TRACKING 1
+
+#include "Tree.h"
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "Heap.h"
+
+
+int isRed(Node* aNode);
+int isBlack(Node* aNode);
+/*int TreeWalk(Node* curnode, int depth);*/
+/*int TreeMaxDepth(Tree *aTree);*/
+void TreeRotate(Tree* aTree, Node* curnode, int direction, int index);
+Node* TreeBAASub(Tree* aTree, Node* curnode, int which, int index);
+void TreeBalanceAfterAdd(Tree* aTree, Node* curnode, int index);
+void* TreeAddByIndex(Tree* aTree, void* content, size_t size, int index);
+Node* TreeFindIndex1(Tree* aTree, void* key, int index, int value);
+Node* TreeFindContentIndex(Tree* aTree, void* key, int index);
+Node* TreeMinimum(Node* curnode);
+Node* TreeSuccessor(Node* curnode);
+Node* TreeNextElementIndex(Tree* aTree, Node* curnode, int index);
+Node* TreeBARSub(Tree* aTree, Node* curnode, int which, int index);
+void TreeBalanceAfterRemove(Tree* aTree, Node* curnode, int index);
+void* TreeRemoveIndex(Tree* aTree, void* content, int index);
+
+
+void TreeInitializeNoMalloc(Tree* aTree, int(*compare)(void*, void*, int))
+{
+	memset(aTree, '\0', sizeof(Tree));
+	aTree->heap_tracking = 1;
+	aTree->index[0].compare = compare;
+	aTree->indexes = 1;
+}
+
+/**
+ * Allocates and initializes a new tree structure.
+ * @return a pointer to the new tree structure
+ */
+Tree* TreeInitialize(int(*compare)(void*, void*, int))
+{
+#if defined(UNIT_TESTS)
+	Tree* newt = malloc(sizeof(Tree));
+#else
+	Tree* newt = mymalloc(__FILE__, __LINE__, sizeof(Tree));
+#endif
+	TreeInitializeNoMalloc(newt, compare);
+	return newt;
+}
+
+
+void TreeAddIndex(Tree* aTree, int(*compare)(void*, void*, int))
+{
+	aTree->index[aTree->indexes].compare = compare;
+	++(aTree->indexes);
+}
+
+
+void TreeFree(Tree* aTree)
+{
+#if defined(UNIT_TESTS)
+	free(aTree);
+#else
+	(aTree->heap_tracking) ? myfree(__FILE__, __LINE__, aTree) : free(aTree);
+#endif
+}
+
+
+#define LEFT 0
+#define RIGHT 1
+#if !defined(max)
+#define max(a, b) (a > b) ? a : b;
+#endif
+
+
+
+int isRed(Node* aNode)
+{
+	return (aNode != NULL) && (aNode->red);
+}
+
+
+int isBlack(Node* aNode)
+{
+	return (aNode == NULL) || (aNode->red == 0);
+}
+
+#if 0
+int TreeWalk(Node* curnode, int depth)
+{
+	if (curnode)
+	{
+		int left = TreeWalk(curnode->child[LEFT], depth+1);
+		int right = TreeWalk(curnode->child[RIGHT], depth+1);
+		depth = max(left, right);
+		if (curnode->red)
+		{
+			/*if (isRed(curnode->child[LEFT]) || isRed(curnode->child[RIGHT]))
+			{
+				printf("red/black tree violation %p\n", curnode->content);
+				exit(-99);
+			}*/;
+		}
+	}
+	return depth;
+}
+
+
+int TreeMaxDepth(Tree *aTree)
+{
+	int rc = TreeWalk(aTree->index[0].root, 0);
+	/*if (aTree->root->red)
+	{
+		printf("root node should not be red %p\n", aTree->root->content);
+		exit(-99);
+	}*/
+	return rc;
+}
+#endif
+
+void TreeRotate(Tree* aTree, Node* curnode, int direction, int index)
+{
+	Node* other = curnode->child[!direction];
+
+	curnode->child[!direction] = other->child[direction];
+	if (other->child[direction] != NULL)
+		other->child[direction]->parent = curnode;
+	other->parent = curnode->parent;
+	if (curnode->parent == NULL)
+		aTree->index[index].root = other;
+	else if (curnode == curnode->parent->child[direction])
+		curnode->parent->child[direction] = other;
+	else
+		curnode->parent->child[!direction] = other;
+	other->child[direction] = curnode;
+	curnode->parent = other;
+}
+
+
+Node* TreeBAASub(Tree* aTree, Node* curnode, int which, int index)
+{
+	Node* uncle = curnode->parent->parent->child[which];
+
+	if (isRed(uncle))
+	{
+		curnode->parent->red = uncle->red = 0;
+		curnode = curnode->parent->parent;
+		curnode->red = 1;
+	}
+	else
+	{
+		if (curnode == curnode->parent->child[which])
+		{
+			curnode = curnode->parent;
+			TreeRotate(aTree, curnode, !which, index);
+		}
+		curnode->parent->red = 0;
+		curnode->parent->parent->red = 1;
+		TreeRotate(aTree, curnode->parent->parent, which, index);
+	}
+	return curnode;
+}
+
+
+void TreeBalanceAfterAdd(Tree* aTree, Node* curnode, int index)
+{
+	while (curnode && isRed(curnode->parent) && curnode->parent->parent)
+	{
+		if (curnode->parent == curnode->parent->parent->child[LEFT])
+			curnode = TreeBAASub(aTree, curnode, RIGHT, index);
+		else
+			curnode = TreeBAASub(aTree, curnode, LEFT, index);
+  }
+  aTree->index[index].root->red = 0;
+}
+
+
+/**
+ * Add an item to a tree
+ * @param aTree the list to which the item is to be added
+ * @param content the list item content itself
+ * @param size the size of the element
+ */
+void* TreeAddByIndex(Tree* aTree, void* content, size_t size, int index)
+{
+	Node* curparent = NULL;
+	Node* curnode = aTree->index[index].root;
+	Node* newel = NULL;
+	int left = 0;
+	int result = 1;
+	void* rc = NULL;
+
+	while (curnode)
+	{
+		result = aTree->index[index].compare(curnode->content, content, 1);
+		left = (result > 0);
+		if (result == 0)
+			break;
+		else
+		{
+			curparent = curnode;
+			curnode = curnode->child[left];
+		}
+	}
+	
+	if (result == 0)
+	{
+		if (aTree->allow_duplicates)
+			goto exit; /* exit(-99); */
+		else
+		{
+			newel = curnode;
+			rc = newel->content;
+			if (index == 0)
+				aTree->size += (size - curnode->size);
+		}
+	}
+	else
+	{
+		#if defined(UNIT_TESTS)
+			newel = malloc(sizeof(Node));
+		#else
+			newel = (aTree->heap_tracking) ? mymalloc(__FILE__, __LINE__, sizeof(Node)) : malloc(sizeof(Node));
+		#endif
+		memset(newel, '\0', sizeof(Node));
+		if (curparent)
+			curparent->child[left] = newel;
+		else
+			aTree->index[index].root = newel;
+		newel->parent = curparent;
+		newel->red = 1;
+		if (index == 0)
+		{
+			++(aTree->count);
+			aTree->size += size;
+		}
+	}
+	newel->content = content;
+	newel->size = size;
+	TreeBalanceAfterAdd(aTree, newel, index);
+exit:
+	return rc;
+}
+
+
+void* TreeAdd(Tree* aTree, void* content, size_t size)
+{
+	void* rc = NULL;
+	int i;
+
+	for (i = 0; i < aTree->indexes; ++i)
+		rc = TreeAddByIndex(aTree, content, size, i);
+
+	return rc;
+}
+
+
+Node* TreeFindIndex1(Tree* aTree, void* key, int index, int value)
+{
+	int result = 0;
+	Node* curnode = aTree->index[index].root;
+
+	while (curnode)
+	{
+		result = aTree->index[index].compare(curnode->content, key, value);
+		if (result == 0)
+			break;
+		else
+			curnode = curnode->child[result > 0];
+	}
+	return curnode;
+}
+
+
+Node* TreeFindIndex(Tree* aTree, void* key, int index)
+{
+	return TreeFindIndex1(aTree, key, index, 0);
+}
+
+
+Node* TreeFindContentIndex(Tree* aTree, void* key, int index)
+{
+	return TreeFindIndex1(aTree, key, index, 1);
+}
+
+
+Node* TreeFind(Tree* aTree, void* key)
+{
+	return TreeFindIndex(aTree, key, 0);
+}
+
+
+Node* TreeMinimum(Node* curnode)
+{
+	if (curnode)
+		while (curnode->child[LEFT])
+			curnode = curnode->child[LEFT];
+	return curnode;
+}
+
+
+Node* TreeSuccessor(Node* curnode)
+{
+	if (curnode->child[RIGHT])
+		curnode = TreeMinimum(curnode->child[RIGHT]);
+	else
+	{
+		Node* curparent = curnode->parent;
+		while (curparent && curnode == curparent->child[RIGHT])
+		{
+			curnode = curparent;
+			curparent = curparent->parent;
+		}
+		curnode = curparent;
+	}
+	return curnode;
+}
+
+
+Node* TreeNextElementIndex(Tree* aTree, Node* curnode, int index)
+{
+	if (curnode == NULL)
+		curnode = TreeMinimum(aTree->index[index].root);
+	else
+		curnode = TreeSuccessor(curnode);
+	return curnode;
+}
+
+
+Node* TreeNextElement(Tree* aTree, Node* curnode)
+{
+	return TreeNextElementIndex(aTree, curnode, 0);
+}
+
+
+Node* TreeBARSub(Tree* aTree, Node* curnode, int which, int index)
+{
+	Node* sibling = curnode->parent->child[which];
+
+	if (isRed(sibling))
+	{
+		sibling->red = 0;
+		curnode->parent->red = 1;
+		TreeRotate(aTree, curnode->parent, !which, index);
+		sibling = curnode->parent->child[which];
+	}
+	if (!sibling)
+		curnode = curnode->parent;
+	else if (isBlack(sibling->child[!which]) && isBlack(sibling->child[which]))
+	{
+		sibling->red = 1;
+		curnode = curnode->parent;
+	}
+	else
+	{
+		if (isBlack(sibling->child[which]))
+		{
+			sibling->child[!which]->red = 0;
+			sibling->red = 1;
+			TreeRotate(aTree, sibling, which, index);
+			sibling = curnode->parent->child[which];
+		}
+		sibling->red = curnode->parent->red;
+		curnode->parent->red = 0;
+		sibling->child[which]->red = 0;
+		TreeRotate(aTree, curnode->parent, !which, index);
+		curnode = aTree->index[index].root;
+	}
+	return curnode;
+}
+
+
+void TreeBalanceAfterRemove(Tree* aTree, Node* curnode, int index)
+{
+	while (curnode != aTree->index[index].root && isBlack(curnode))
+	{
+		/* curnode->content == NULL must equal curnode == NULL */
+		if (((curnode->content) ? curnode : NULL) == curnode->parent->child[LEFT])
+			curnode = TreeBARSub(aTree, curnode, RIGHT, index);
+		else
+			curnode = TreeBARSub(aTree, curnode, LEFT, index);
+    }
+	curnode->red = 0;
+}
+
+
+/**
+ * Remove an item from a tree
+ * @param aTree the list to which the item is to be added
+ * @param curnode the list item content itself
+ */
+void* TreeRemoveNodeIndex(Tree* aTree, Node* curnode, int index)
+{
+	Node* redundant = curnode;
+	Node* curchild = NULL;
+	size_t size = curnode->size;
+	void* content = curnode->content;
+
+	/* if the node to remove has 0 or 1 children, it can be removed without involving another node */
+	if (curnode->child[LEFT] && curnode->child[RIGHT]) /* 2 children */
+		redundant = TreeSuccessor(curnode); 	/* now redundant must have at most one child */
+
+	curchild = redundant->child[(redundant->child[LEFT] != NULL) ? LEFT : RIGHT];
+	if (curchild) /* we could have no children at all */
+		curchild->parent = redundant->parent;
+
+	if (redundant->parent == NULL)
+		aTree->index[index].root = curchild;
+	else
+	{
+		if (redundant == redundant->parent->child[LEFT])
+			redundant->parent->child[LEFT] = curchild;
+		else
+			redundant->parent->child[RIGHT] = curchild;
+	}
+
+	if (redundant != curnode)
+	{
+		curnode->content = redundant->content;
+		curnode->size = redundant->size;
+	}
+
+	if (isBlack(redundant))
+	{
+		if (curchild == NULL)
+		{
+			if (redundant->parent)
+			{
+				Node temp;
+				memset(&temp, '\0', sizeof(Node));
+				temp.parent = redundant->parent;
+				temp.red = 0;
+				TreeBalanceAfterRemove(aTree, &temp, index);
+			}
+		}
+		else
+			TreeBalanceAfterRemove(aTree, curchild, index);
+	}
+
+#if defined(UNIT_TESTS)
+	free(redundant);
+#else
+	(aTree->heap_tracking) ? myfree(__FILE__, __LINE__, redundant) : free(redundant);
+#endif
+	if (index == 0)
+	{
+		aTree->size -= size;
+		--(aTree->count);
+	}
+	return content;
+}
+
+
+/**
+ * Remove an item from a tree
+ * @param aTree the list to which the item is to be added
+ * @param curnode the list item content itself
+ */
+void* TreeRemoveIndex(Tree* aTree, void* content, int index)
+{
+	Node* curnode = TreeFindContentIndex(aTree, content, index);
+
+	if (curnode == NULL)
+		return NULL;
+
+	return TreeRemoveNodeIndex(aTree, curnode, index);
+}
+
+
+void* TreeRemove(Tree* aTree, void* content)
+{
+	int i;
+	void* rc = NULL;
+
+	for (i = 0; i < aTree->indexes; ++i)
+		rc = TreeRemoveIndex(aTree, content, i);
+
+	return rc;
+}
+
+
+void* TreeRemoveKeyIndex(Tree* aTree, void* key, int index)
+{
+	Node* curnode = TreeFindIndex(aTree, key, index);
+	void* content = NULL;
+	int i;
+
+	if (curnode == NULL)
+		return NULL;
+
+	content = TreeRemoveNodeIndex(aTree, curnode, index);
+	for (i = 0; i < aTree->indexes; ++i)
+	{
+		if (i != index)
+			content = TreeRemoveIndex(aTree, content, i);
+	}
+	return content;
+}
+
+
+void* TreeRemoveKey(Tree* aTree, void* key)
+{
+	return TreeRemoveKeyIndex(aTree, key, 0);
+}
+
+
+int TreeIntCompare(void* a, void* b, int content)
+{
+	int i = *((int*)a);
+	int j = *((int*)b);
+
+	/* printf("comparing %d %d\n", *((int*)a), *((int*)b)); */
+	return (i > j) ? -1 : (i == j) ? 0 : 1;
+}
+
+
+int TreePtrCompare(void* a, void* b, int content)
+{
+	return (a > b) ? -1 : (a == b) ? 0 : 1;
+}
+
+
+int TreeStringCompare(void* a, void* b, int content)
+{
+	return strcmp((char*)a, (char*)b);
+}
+
+
+#if defined(UNIT_TESTS)
+
+int check(Tree *t)
+{
+	Node* curnode = NULL;
+	int rc = 0;
+
+	curnode = TreeNextElement(t, curnode);
+	while (curnode)
+	{
+		Node* prevnode = curnode;
+
+		curnode = TreeNextElement(t, curnode);
+
+		if (prevnode && curnode && (*(int*)(curnode->content) < *(int*)(prevnode->content)))
+		{
+			printf("out of order %d < %d\n", *(int*)(curnode->content), *(int*)(prevnode->content));
+			rc = 99;
+		}
+	}
+	return rc;
+}
+
+
+int traverse(Tree *t, int lookfor)
+{
+	Node* curnode = NULL;
+	int rc = 0;
+
+	printf("Traversing\n");
+	curnode = TreeNextElement(t, curnode);
+	/* printf("content int %d\n", *(int*)(curnode->content)); */
+	while (curnode)
+	{
+		Node* prevnode = curnode;
+
+		curnode = TreeNextElement(t, curnode);
+		/* if (curnode)
+			printf("content int %d\n", *(int*)(curnode->content)); */
+		if (prevnode && curnode && (*(int*)(curnode->content) < *(int*)(prevnode->content)))
+		{
+			printf("out of order %d < %d\n", *(int*)(curnode->content), *(int*)(prevnode->content));
+		}
+		if (curnode && (lookfor == *(int*)(curnode->content)))
+			printf("missing item %d actually found\n", lookfor);
+	}
+	printf("End traverse %d\n", rc);
+	return rc;
+}
+
+
+int test(int limit)
+{
+	int i, *ip, *todelete;
+	Node* current = NULL;
+	Tree* t = TreeInitialize(TreeIntCompare);
+	int rc = 0;
+
+	printf("Tree initialized\n");
+
+	srand(time(NULL));
+
+	ip = malloc(sizeof(int));
+	*ip = 2;
+	TreeAdd(t, (void*)ip, sizeof(int));
+
+	check(t);
+
+	i = 2;
+	void* result = TreeRemove(t, (void*)&i);
+	if (result)
+		free(result);
+
+	int actual[limit];
+	for (i = 0; i < limit; i++)
+	{
+		void* replaced = NULL;
+
+		ip = malloc(sizeof(int));
+		*ip = rand();
+		replaced = TreeAdd(t, (void*)ip, sizeof(int));
+		if (replaced) /* duplicate */
+		{
+			free(replaced);
+			actual[i] = -1;
+		}
+		else
+			actual[i] = *ip;
+		if (i==5)
+			todelete = ip;
+		printf("Tree element added %d\n",  *ip);
+		if (1 % 1000 == 0)
+		{
+			rc = check(t);
+			printf("%d elements, check result %d\n", i+1, rc);
+			if (rc != 0)
+				return 88;
+		}
+	}
+
+	check(t);
+
+	for (i = 0; i < limit; i++)
+	{
+		int parm = actual[i];
+
+		if (parm == -1)
+			continue;
+
+		Node* found = TreeFind(t, (void*)&parm);
+		if (found)
+			printf("Tree find %d %d\n", parm, *(int*)(found->content));
+		else
+		{
+			printf("%d not found\n", parm);
+			traverse(t, parm);
+			return -2;
+		}
+	}
+
+	check(t);
+
+	for (i = limit -1; i >= 0; i--)
+	{
+		int parm = actual[i];
+		void *found;
+
+		if (parm == -1) /* skip duplicate */
+			continue;
+
+		found = TreeRemove(t, (void*)&parm);
+		if (found)
+		{
+			printf("%d Tree remove %d %d\n", i, parm, *(int*)(found));
+			free(found);
+		}
+		else
+		{
+			int count = 0;
+			printf("%d %d not found\n", i, parm);
+			traverse(t, parm);
+			for (i = 0; i < limit; i++)
+				if (actual[i] == parm)
+					++count;
+			printf("%d occurs %d times\n", parm, count);
+			return -2;
+		}
+		if (i % 1000 == 0)
+		{
+			rc = check(t);
+			printf("%d elements, check result %d\n", i+1, rc);
+			if (rc != 0)
+				return 88;
+		}
+	}
+	printf("finished\n");
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	int rc = 0;
+
+	while (rc == 0)
+		rc = test(999999);
+}
+
+#endif
+
+
+
+
+
diff --git a/mqtt/src/src/Tree.h b/mqtt/src/src/Tree.h
new file mode 100644
index 00000000..bbbd014f
--- /dev/null
+++ b/mqtt/src/src/Tree.h
@@ -0,0 +1,115 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2013 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial implementation and documentation
+ *******************************************************************************/
+
+
+#if !defined(TREE_H)
+#define TREE_H
+
+#include <stdlib.h> /* for size_t definition */
+
+/*BE
+defm defTree(T) // macro to define a tree
+
+def T concat Node
+{
+	n32 ptr T concat Node "parent"
+	n32 ptr T concat Node "left"
+	n32 ptr T concat Node "right"
+	n32 ptr T id2str(T)
+	n32 suppress "size"
+}
+
+
+def T concat Tree
+{
+	struct
+	{
+		n32 ptr T concat Node suppress "root"
+		n32 ptr DATA suppress "compare"
+	} 
+	struct
+	{
+		n32 ptr T concat Node suppress "root"
+		n32 ptr DATA suppress "compare"
+	} 
+	n32 dec "count"
+	n32 dec suppress "size"
+}
+
+endm
+
+defTree(INT)
+defTree(STRING)
+defTree(TMP)
+
+BE*/
+
+/**
+ * Structure to hold all data for one list element
+ */
+typedef struct NodeStruct
+{
+	struct NodeStruct *parent,   /**< pointer to parent tree node, in case we need it */
+					  *child[2]; /**< pointers to child tree nodes 0 = left, 1 = right */
+	void* content;				 /**< pointer to element content */
+	size_t size;					 /**< size of content */
+	unsigned int red : 1;
+} Node;
+
+
+/**
+ * Structure to hold all data for one tree
+ */
+typedef struct
+{
+	struct
+	{
+		Node *root;	/**< root node pointer */
+		int (*compare)(void*, void*, int); /**< comparison function */
+	} index[2];
+	int indexes,  /**< no of indexes into tree */
+		count;    /**< no of items */
+	size_t size;  /**< heap storage used */
+	unsigned int heap_tracking : 1; /**< switch on heap tracking for this tree? */
+	unsigned int allow_duplicates : 1; /**< switch to allow duplicate entries */
+} Tree;
+
+
+Tree* TreeInitialize(int(*compare)(void*, void*, int));
+void TreeInitializeNoMalloc(Tree* aTree, int(*compare)(void*, void*, int));
+void TreeAddIndex(Tree* aTree, int(*compare)(void*, void*, int));
+
+void* TreeAdd(Tree* aTree, void* content, size_t size);
+
+void* TreeRemove(Tree* aTree, void* content);
+
+void* TreeRemoveKey(Tree* aTree, void* key);
+void* TreeRemoveKeyIndex(Tree* aTree, void* key, int index);
+
+void* TreeRemoveNodeIndex(Tree* aTree, Node* aNode, int index);
+
+void TreeFree(Tree* aTree);
+
+Node* TreeFind(Tree* aTree, void* key);
+Node* TreeFindIndex(Tree* aTree, void* key, int index);
+
+Node* TreeNextElement(Tree* aTree, Node* curnode);
+
+int TreeIntCompare(void* a, void* b, int);
+int TreePtrCompare(void* a, void* b, int);
+int TreeStringCompare(void* a, void* b, int);
+
+#endif
diff --git a/mqtt/src/src/VersionInfo.h.in b/mqtt/src/src/VersionInfo.h.in
new file mode 100644
index 00000000..5b91bf3a
--- /dev/null
+++ b/mqtt/src/src/VersionInfo.h.in
@@ -0,0 +1,7 @@
+#ifndef VERSIONINFO_H
+#define VERSIONINFO_H
+
+#define BUILD_TIMESTAMP "@BUILD_TIMESTAMP@"
+#define CLIENT_VERSION  "@CLIENT_VERSION@"
+
+#endif /* VERSIONINFO_H */
diff --git a/mqtt/src/src/WebSocket.c b/mqtt/src/src/WebSocket.c
new file mode 100644
index 00000000..e3e15b36
--- /dev/null
+++ b/mqtt/src/src/WebSocket.c
@@ -0,0 +1,1208 @@
+/*******************************************************************************
+ * Copyright (c) 2018, 2019 Wind River Systems, Inc. and others. All Rights Reserved.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Keith Holman - initial implementation and documentation
+ *    Ian Craggs - use memory tracking
+ *******************************************************************************/
+
+#include <stdint.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "WebSocket.h"
+
+#include "Base64.h"
+#include "Log.h"
+#include "SHA1.h"
+#include "LinkedList.h"
+#include "MQTTProtocolOut.h"
+#include "SocketBuffer.h"
+#include "StackTrace.h"
+
+#if defined(__linux__)
+#  include <endian.h>
+#elif defined(__APPLE__)
+#  include <libkern/OSByteOrder.h>
+#  define htobe16(x) OSSwapHostToBigInt16(x)
+#  define htobe32(x) OSSwapHostToBigInt32(x)
+#  define htobe64(x) OSSwapHostToBigInt64(x)
+#  define be16toh(x) OSSwapBigToHostInt16(x)
+#  define be32toh(x) OSSwapBigToHostInt32(x)
+#  define be64toh(x) OSSwapBigToHostInt64(x)
+#elif defined(__FreeBSD__) || defined(__NetBSD__)
+#  include <sys/endian.h>
+#elif defined(WIN32) || defined(WIN64)
+#  pragma comment(lib, "rpcrt4.lib")
+#  include <Rpc.h>
+#  define strncasecmp(s1,s2,c) _strnicmp(s1,s2,c)
+#  if BYTE_ORDER == LITTLE_ENDIAN
+#    define htobe16(x)   htons(x)
+#    define htobe32(x)   htonl(x)
+#    define htobe64(x)   htonll(x)
+#    define be16toh(x)   ntohs(x)
+#    define be32toh(x)   ntohl(x)
+#    define be64toh(x)   ntohll(x)
+#  elif BTYE_ORDER == BIG_ENDIAN
+#    define htobe16(x)   (x)
+#    define htobe32(x)   (x)
+#    define htobe64(x)   (x)
+#    define be16toh(x)   (x)
+#    define be32toh(x)   (x)
+#    define be64toh(x)   (x)
+#  else
+#    error "unknown endian"
+#  endif
+   /* For Microsoft Visual Studio 2013 */
+#  if !defined( snprintf )
+#    define snprintf _snprintf
+#  endif /* if !defined( snprintf ) */
+#endif
+
+#if defined(OPENSSL)
+#include "SSLSocket.h"
+#endif /* defined(OPENSSL) */
+#include "Socket.h"
+
+#if !(defined(WIN32) || defined(WIN64))
+#if defined(LIBUUID)
+#include <uuid/uuid.h>
+#else /* if defined(USE_LIBUUID) */
+#include <limits.h>
+#include <stdlib.h>
+#include <time.h>
+
+#if defined(OPENSSL)
+#include <openssl/rand.h>
+#endif /* if defined(OPENSSL) */
+
+#include "Heap.h"
+
+/** @brief raw uuid type */
+typedef unsigned char uuid_t[16];
+
+/**
+ * @brief generates a uuid, compatible with RFC 4122, version 4 (random)
+ * @note Uses a very insecure algorithm but no external dependencies
+ */
+void uuid_generate( uuid_t out )
+{
+#if defined(OPENSSL)
+	int rc = RAND_bytes( out, sizeof(uuid_t));
+	if ( !rc )
+#endif /* defined (OPENSSL) */
+	{
+		/* very insecure, but generates a random uuid */
+		srand(time(NULL));
+		int i;
+		for ( i = 0; i < 16; ++i )
+			out[i] = (unsigned char)(rand() % UCHAR_MAX);
+		out[6] = (out[6] & 0x0f) | 0x40;
+		out[8] = (out[8] & 0x3F) | 0x80;
+	}
+}
+
+/** @brief converts a uuid to a string */
+void uuid_unparse( uuid_t uu, char *out )
+{
+	int i;
+	for ( i = 0; i < 16; ++i )
+	{
+		if ( i == 4 || i == 6 || i == 8 || i == 10 )
+		{
+			*out = '-';
+			++out;
+		}
+		out += sprintf( out, "%02x", uu[i] );
+	}
+	*out = '\0';
+}
+#endif /* else if defined(LIBUUID) */
+#endif /* if !(defined(WIN32) || defined(WIN64)) */
+
+/** raw websocket frame data */
+struct ws_frame
+{
+	size_t len; /**< length of frame */
+	size_t pos; /**< current position within the buffer */
+};
+
+/** Current frame being processed */
+struct ws_frame *last_frame = NULL;
+
+/** Holds any received websocket frames, to be process */
+static List* in_frames = NULL;
+
+static char * frame_buffer = NULL;
+static size_t frame_buffer_len = 0;
+static size_t frame_buffer_index = 0;
+static size_t frame_buffer_data_len = 0;
+
+/* static function declarations */
+static const char *WebSocket_strcasefind(
+	const char *buf, const char *str, size_t len);
+
+static char *WebSocket_getRawSocketData(
+	networkHandles *net, size_t bytes, size_t* actual_len);
+
+static void WebSocket_rewindData( void );
+
+static void WebSocket_pong(
+	networkHandles *net, char *app_data, size_t app_data_len);
+
+static int WebSocket_receiveFrame(networkHandles *net,
+	size_t bytes, size_t *actual_len );
+
+
+/**
+ * @brief builds a websocket frame for data transmission
+ *
+ * write a websocket header and will mask the payload in all the passed in
+ * buffers
+ *
+ * @param[in,out]  net                 network connection
+ * @param[in]      opcode              websocket opcode for the packet
+ * @param[in]      mask_data           whether to maskt he data
+ * @param[in,out]  buf0                first buffer, will write before this
+ * @param[in]      buf0len             size of first buffer
+ * @param[in]      count               number of payload buffers
+ * @param[in,out]  buffers             array of paylaod buffers
+ * @param[in]      buflens             array of payload buffer sizes
+ * @param[in]      freeData            array indicating to free payload buffers
+ *
+ * @return amount of data to write to socket
+ */
+static int WebSocket_buildFrame(networkHandles* net, int opcode, int mask_data,
+	char* buf0, size_t buf0len, int count, char** buffers, size_t* buflens)
+{
+	int i;
+	int buf_len = 0u;
+	size_t data_len = buf0len;
+
+	FUNC_ENTRY;
+	for (i = 0; i < count; ++i)
+		data_len += buflens[i];
+
+	buf0 -= WebSocket_calculateFrameHeaderSize(net, mask_data, data_len);
+	if ( net->websocket )
+	{
+		uint8_t mask[4];
+		/* genearate mask, since we are a client */
+#if defined(OPENSSL)
+		RAND_bytes( &mask[0], sizeof(mask) );
+#else /* if defined(OPENSSL) */
+		mask[0] = (rand() % UINT8_MAX);
+		mask[1] = (rand() % UINT8_MAX);
+		mask[2] = (rand() % UINT8_MAX);
+		mask[3] = (rand() % UINT8_MAX);
+#endif /* else if defined(OPENSSL) */
+
+		/* 1st byte */
+		buf0[buf_len] = (char)(1 << 7); /* final flag */
+		/* 3 bits reserved for negotiation of protocol */
+		buf0[buf_len] |= (char)(opcode & 0x0F); /* op code */
+		++buf_len;
+
+		/* 2nd byte */
+		buf0[buf_len] = (char)((mask_data & 0x1) << 7); /* masking bit */
+
+		/* payload length */
+		if ( data_len < 126u )
+			buf0[buf_len++] |= data_len & 0x7F;
+
+		/* 3rd byte & 4th bytes - extended payload length */
+		else if ( data_len < 65536u )
+		{
+			uint16_t len = htobe16((uint16_t)data_len);
+			buf0[buf_len++] |= (126u & 0x7F);
+			memcpy( &buf0[buf_len], &len, 2u );
+			buf_len += 2;
+		}
+		else if ( data_len < 0xFFFFFFFFFFFFFFFF )
+		{
+			uint64_t len = htobe64((uint64_t)data_len);
+			buf0[buf_len++] |= (127u & 0x7F);
+			memcpy( &buf0[buf_len], &len, 8 );
+			buf_len += 8;
+		}
+		else
+		{
+			Log(TRACE_PROTOCOL, 1, "Data too large for websocket frame" );
+			buf_len = -1;
+		}
+
+		/* masking key */
+		if ( (mask_data & 0x1) && buf_len > 0 )
+		{
+			memcpy( &buf0[buf_len], &mask, sizeof(uint32_t));
+			buf_len += sizeof(uint32_t);
+		}
+
+		/* mask data */
+		if ( mask_data & 0x1 )
+		{
+			size_t idx = 0u;
+			/* packet fixed header */
+			for (i = 0; i < (int)buf0len; ++i, ++idx)
+				buf0[buf_len + i] ^= mask[idx % 4];
+
+			/* variable data buffers */
+			for (i = 0; i < count; ++i)
+			{
+				size_t j;
+				for ( j = 0u; j < buflens[i]; ++j, ++idx )
+					buffers[i][j] ^= mask[idx % 4];
+			}
+		}
+	}
+
+	FUNC_EXIT_RC(buf_len);
+	return buf_len;
+}
+
+/**
+ * calculates the amount of data required for the websocket header
+ *
+ * this function is used to calculate how much offset is required before calling
+ * @p WebSocket_putdatas, as that function will write data before the passed in
+ * buffer
+ *
+ * @param[in,out]  net                 network connection
+ * @param[in]      mask_data           whether to mask the data
+ * @param[in]      data_len            amount of data in the payload
+ *
+ * @return the size in bytes of the websocket header required
+ *
+ * @see WebSocket_putdatas
+ */
+size_t WebSocket_calculateFrameHeaderSize(networkHandles *net, int mask_data,
+	size_t data_len)
+{
+	int ret = 0;
+	if ( net && net->websocket )
+	{
+		if ( data_len < 126u)
+			ret = 2; /* header 2 bytes */
+		else if ( data_len < 65536u )
+			ret = 4; /* for extra 2-bytes for payload length */
+		else if ( data_len < 0xFFFFFFFFFFFFFFFF )
+			ret = 10; /* for extra 8-bytes for payload length */
+		if ( mask_data & 0x1 )
+			ret += sizeof(uint32_t); /* for mask */
+	}
+	return ret;
+}
+
+/**
+ * sends out a websocket request on the given uri
+ *
+ * @param[in]      net                 network connection
+ * @param[in]      uri                 uri to connect to
+ *
+ * @retval SOCKET_ERROR                on failure
+ * @retval 1                           on success
+ *
+ * @see WebSocket_upgrade
+ */
+int WebSocket_connect( networkHandles *net, const char *uri )
+{
+	int rc;
+	char *buf = NULL;
+	int i, buf_len = 0;
+	size_t hostname_len;
+	int port = 80;
+	const char *topic = NULL;
+
+	FUNC_ENTRY;
+	/* Generate UUID */
+	if (net->websocket_key == NULL)
+		net->websocket_key = malloc(25u);
+	else
+		net->websocket_key = realloc(net->websocket_key, 25u);
+#if defined(WIN32) || defined(WIN64)
+	UUID uuid;
+	ZeroMemory( &uuid, sizeof(UUID) );
+	UuidCreate( &uuid );
+	Base64_encode( net->websocket_key, 25u, (const b64_data_t*)&uuid, sizeof(UUID) );
+#else /* if defined(WIN32) || defined(WIN64) */
+	uuid_t uuid;
+	uuid_generate( uuid );
+	Base64_encode( net->websocket_key, 25u, uuid, sizeof(uuid_t) );
+#endif /* else if defined(WIN32) || defined(WIN64) */
+
+	hostname_len = MQTTProtocol_addressPort(uri, &port, &topic);
+
+	/* if no topic, use default */
+	if ( !topic )
+		topic = "/mqtt";
+
+	for ( i = 0; i < 2; ++i )
+	{
+		buf_len = snprintf( buf, (size_t)buf_len,
+			"GET %s HTTP/1.1\r\n"
+			"Host: %.*s:%d\r\n"
+			"Upgrade: websocket\r\n"
+			"Connection: Upgrade\r\n"
+			"Origin: http://%.*s:%d\r\n"
+			"Sec-WebSocket-Key: %s\r\n"
+			"Sec-WebSocket-Version: 13\r\n"
+			"Sec-WebSocket-Protocol: mqtt\r\n"
+			"\r\n", topic,
+			(int)hostname_len, uri, port,
+			(int)hostname_len, uri, port,
+			net->websocket_key );
+
+		if ( i == 0 && buf_len > 0 )
+		{
+			++buf_len; /* need 1 extra byte for ending '\0' */
+			buf = malloc( buf_len );
+		}
+	}
+
+	if ( buf )
+	{
+#if defined(OPENSSL)
+		if (net->ssl)
+			SSLSocket_putdatas(net->ssl, net->socket,
+				buf, buf_len, 0, NULL, NULL, NULL );
+		else
+#endif
+			Socket_putdatas( net->socket, buf, buf_len,
+				0, NULL, NULL, NULL );
+		free( buf );
+		rc = 1;
+	}
+	else
+	{
+		free(net->websocket_key);
+		net->websocket_key = NULL;
+		rc = SOCKET_ERROR;
+	}
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+/**
+ * closes a websocket connection
+ *
+ * @param[in,out]  net                 structure containing network connection
+ * @param[in]      status_code         websocket close status code
+ * @param[in]      reason              reason for closing connection (optional)
+ */
+void WebSocket_close(networkHandles *net, int status_code, const char *reason)
+{
+	FUNC_ENTRY;
+
+	if ( net->websocket )
+	{
+		char *buf0;
+		size_t buf0len = sizeof(uint16_t);
+		size_t header_len;
+		uint16_t status_code_be;
+		const int mask_data = 0;
+
+		if ( status_code < WebSocket_CLOSE_NORMAL ||
+			status_code > WebSocket_CLOSE_TLS_FAIL )
+			status_code = WebSocket_CLOSE_GOING_AWAY;
+
+		if ( reason )
+			buf0len += strlen(reason);
+
+		header_len = WebSocket_calculateFrameHeaderSize(net,
+			mask_data, buf0len);
+		buf0 = malloc(header_len + buf0len);
+		if ( !buf0 ) return;
+
+		/* encode status code */
+		status_code_be = htobe16((uint16_t)status_code);
+		memcpy( &buf0[header_len], &status_code_be, sizeof(uint16_t));
+
+		/* encode reason, if provided */
+		if ( reason )
+			strcpy( &buf0[header_len + sizeof(uint16_t)], reason );
+
+		WebSocket_buildFrame( net, WebSocket_OP_CLOSE, mask_data,
+			&buf0[header_len], buf0len, 0, NULL, NULL );
+
+		buf0len += header_len;
+#if defined(OPENSSL)
+		if (net->ssl)
+			SSLSocket_putdatas(net->ssl, net->socket,
+				buf0, buf0len, 0, NULL, NULL, NULL);
+		else
+#endif
+			Socket_putdatas(net->socket, buf0, buf0len, 0,
+				NULL, NULL, NULL);
+
+		/* websocket connection is now closed */
+		net->websocket = 0;
+		free( buf0 );
+	}
+	if ( net->websocket_key )
+	{
+		free( net->websocket_key );
+		net->websocket_key = NULL;
+	}
+
+	FUNC_EXIT;
+}
+
+/**
+ * @brief receives 1 byte from a socket
+ *
+ * @param[in,out]  net                 network connection
+ * @param[out]     c                   byte that was read
+ *
+ * @retval SOCKET_ERROR                on error
+ * @retval TCPSOCKET_INTERRUPTED       no data available
+ * @retval TCPSOCKET_COMPLETE          on success
+ *
+ * @see WebSocket_getdata
+ */
+int WebSocket_getch(networkHandles *net, char* c)
+{
+	int rc = SOCKET_ERROR;
+
+	FUNC_ENTRY;
+	if ( net->websocket )
+	{
+		struct ws_frame *frame = NULL;
+
+		if ( in_frames && in_frames->first )
+			frame = in_frames->first->content;
+
+		if ( !frame )
+		{
+			size_t actual_len = 0u;
+			rc =  WebSocket_receiveFrame( net, 1u, &actual_len );
+			if ( rc != TCPSOCKET_COMPLETE )
+				goto exit;
+
+			/* we got a frame, let take off the top of queue */
+			if ( in_frames->first )
+				frame = in_frames->first->content;
+		}
+
+		/* set current working frame */
+		if (frame && frame->len > frame->pos)
+		{
+			unsigned char *buf =
+				(unsigned char *)frame + sizeof(struct ws_frame);
+			*c = buf[frame->pos++];
+			rc = TCPSOCKET_COMPLETE;
+		}
+	}
+#if defined(OPENSSL)
+	else if ( net->ssl )
+		rc = SSLSocket_getch(net->ssl, net->socket, c);
+#endif
+	else
+		rc = Socket_getch(net->socket, c);
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+/**
+ * @brief receives data from a socket
+ *
+ * @param[in,out]  net                 network connection
+ * @param[in]      bytes               amount of data to get (0 if last packet)
+ * @param[out]     actual_len          amount of data read
+ *
+ * @return a pointer to the read data
+ *
+ * @see WebSocket_getch
+ */
+char *WebSocket_getdata(networkHandles *net, size_t bytes, size_t* actual_len)
+{
+	char *rv = NULL;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if ( net->websocket )
+	{
+		struct ws_frame *frame = NULL;
+
+		if ( bytes == 0u )
+		{
+			/* done with current frame, move it to last frame */
+			if ( in_frames && in_frames->first )
+				frame = in_frames->first->content;
+
+			/* return the data from the next frame, if we have one */
+			if ( frame )
+			{
+				rv = (char *)frame +
+					sizeof(struct ws_frame) + frame->pos;
+				*actual_len = frame->len - frame->pos;
+
+				if ( last_frame )
+					free( last_frame );
+				last_frame = ListDetachHead(in_frames);
+			}
+			goto exit;
+		}
+
+		/* no current frame, let's see if there's one in the list */
+		if ( in_frames && in_frames->first )
+			frame = in_frames->first->content;
+
+		/* no current frame, so let's go receive one for the network */
+		if ( !frame )
+		{
+			const int rc =
+				WebSocket_receiveFrame( net, bytes, actual_len );
+
+			if ( rc == TCPSOCKET_COMPLETE && in_frames && in_frames->first)
+				frame = in_frames->first->content;
+		}
+
+		if ( frame )
+		{
+			rv = (char *)frame + sizeof(struct ws_frame) + frame->pos;
+			*actual_len = frame->len - frame->pos;
+
+			if ( *actual_len == bytes && in_frames)
+			{
+				/* set new frame as current frame */
+				if ( last_frame )
+					free( last_frame );
+				last_frame = ListDetachHead(in_frames);
+			}
+		}
+	}
+#if defined(OPENSSL)
+	else if ( net->ssl )
+		rv = SSLSocket_getdata(net->ssl, net->socket, bytes, actual_len);
+#endif
+	else
+		rv = Socket_getdata(net->socket, bytes, actual_len);
+
+exit:
+	rc = rv != NULL;
+	FUNC_EXIT_RC(rc);
+	return rv;
+}
+
+void WebSocket_rewindData( void )
+{
+	frame_buffer_index = 0;
+}
+
+/**
+ * reads raw socket data for underlying layers
+ *
+ * @param[in]      net                 network connection
+ * @param[in]      bytes               number of bytes to read, 0 to complete packet
+ * @param[in]      actual_len          amount of data read
+ *
+ * @return a buffer containing raw data
+ */
+char *WebSocket_getRawSocketData(
+	networkHandles *net, size_t bytes, size_t* actual_len)
+{
+	char *rv;
+
+	if (bytes > 0)
+	{
+		if (frame_buffer_data_len - frame_buffer_index >= bytes)
+		{
+			*actual_len = bytes;
+			rv = frame_buffer + frame_buffer_index;
+			frame_buffer_index += bytes;
+
+			goto exit;
+		}
+		else
+		{
+			bytes = bytes - (frame_buffer_data_len - frame_buffer_index);
+		}
+	}
+
+	*actual_len = 0;
+	
+	// not enough data in the buffer, get data from socket
+#if defined(OPENSSL)
+	if ( net->ssl )
+		rv = SSLSocket_getdata(net->ssl, net->socket, bytes, actual_len);
+	else
+#endif
+		rv = Socket_getdata(net->socket, bytes, actual_len);
+
+	// clear buffer
+	if (bytes == 0)
+	{
+		frame_buffer_index = 0;
+		frame_buffer_data_len = 0;
+		frame_buffer_len = 0;
+		
+		free (frame_buffer);
+		frame_buffer = NULL;
+	}
+	// append data to the buffer
+	else if (rv != NULL)
+	{
+		// no buffer allocated
+		if (!frame_buffer)
+		{
+			frame_buffer = (char *)malloc(*actual_len);
+			memcpy(frame_buffer, rv, *actual_len);
+
+			frame_buffer_index = 0;
+			frame_buffer_data_len = *actual_len;
+			frame_buffer_len = *actual_len;
+		}
+		// buffer size is big enough
+		else if (frame_buffer_data_len + *actual_len < frame_buffer_len)
+		{
+			memcpy(frame_buffer + frame_buffer_data_len, rv, *actual_len);
+			frame_buffer_data_len += *actual_len;
+		}
+		// resize buffer
+		else
+		{
+			frame_buffer = realloc(frame_buffer, frame_buffer_data_len + *actual_len);
+			frame_buffer_len = frame_buffer_data_len + *actual_len;
+
+			memcpy(frame_buffer + frame_buffer_data_len, rv, *actual_len);
+			frame_buffer_data_len += *actual_len;
+		}
+
+		SocketBuffer_complete(net->socket);
+	}
+	else 
+	{
+		return rv;
+	}
+
+	// if possible, return data from the buffer
+	if (bytes > 0)
+	{
+		if (frame_buffer_data_len - frame_buffer_index >= bytes)
+		{
+			*actual_len = bytes;
+			rv = frame_buffer + frame_buffer_index;
+			frame_buffer_index += bytes;
+		}
+		else
+		{
+			*actual_len = frame_buffer_data_len - frame_buffer_index;
+			rv = frame_buffer + frame_buffer_index;
+			frame_buffer_index += *actual_len;
+		}
+	}
+
+exit:
+	return rv;
+}
+
+/**
+ * sends a "websocket pong" message
+ *
+ * @param[in]      net                 network connection
+ * @param[in]      app_data            application data to put in payload
+ * @param[in]      app_data_len        application data length
+ */
+void WebSocket_pong(networkHandles *net, char *app_data,
+	size_t app_data_len)
+{
+	FUNC_ENTRY;
+	if ( net->websocket )
+	{
+		char *buf0;
+		size_t header_len;
+		int freeData = 0;
+		const int mask_data = 0;
+
+		header_len = WebSocket_calculateFrameHeaderSize(net, mask_data,
+			app_data_len);
+		buf0 = malloc(header_len);
+		if ( !buf0 ) return;
+
+		WebSocket_buildFrame( net, WebSocket_OP_PONG, 1,
+			&buf0[header_len], header_len, mask_data, &app_data,
+				&app_data_len );
+
+		Log(TRACE_PROTOCOL, 1, "Sending WebSocket PONG" );
+
+#if defined(OPENSSL)
+		if (net->ssl)
+			SSLSocket_putdatas(net->ssl, net->socket, buf0,
+				header_len + app_data_len, 1,
+				&app_data, &app_data_len, &freeData);
+		else
+#endif
+			Socket_putdatas(net->socket, buf0,
+				header_len + app_data_len, 1,
+				&app_data, &app_data_len, &freeData );
+
+		/* clean up memory */
+		free( buf0 );
+	}
+	FUNC_EXIT;
+}
+
+/**
+ * writes data to a socket (websocket header will be prepended if required)
+ *
+ * @warning buf0 will be expanded (backwords before @p buf0 buffer, to add a
+ * websocket frame header to the data if required).  So use
+ * @p WebSocket_calculateFrameHeader, to determine if extra space is needed
+ * before the @p buf0 pointer.
+ *
+ * @param[in,out]  net                 network connection
+ * @param[in,out]  buf0                first buffer
+ * @param[in]      buf0len             size of first buffer
+ * @param[in]      count               number of payload buffers
+ * @param[in,out]  buffers             array of paylaod buffers
+ * @param[in]      buflens             array of payload buffer sizes
+ * @param[in]      freeData            array indicating to free payload buffers
+ *
+ * @return amount of data wrote to socket
+ *
+ * @see WebSocket_calculateFrameHeaderSize
+ */
+int WebSocket_putdatas(networkHandles* net, char* buf0, size_t buf0len,
+	int count, char** buffers, size_t* buflens, int* freeData)
+{
+	int rc;
+
+	FUNC_ENTRY;
+	/* prepend WebSocket frame */
+	if ( net->websocket )
+	{
+		size_t data_len = buf0len + 4u;
+		size_t header_len;
+		const int mask_data = 1;
+
+		for (rc = 0; rc < count; ++rc)
+			data_len += buflens[rc];
+
+		header_len = WebSocket_calculateFrameHeaderSize(
+			net, mask_data, data_len);
+		rc = WebSocket_buildFrame(
+			net, WebSocket_OP_BINARY, mask_data, buf0, buf0len,
+			count, buffers, buflens );
+
+		/* header added so adjust buffer */
+		if ( rc > 0 )
+		{
+			buf0 -= header_len;
+			buf0len += header_len;
+		}
+	}
+
+#if defined(OPENSSL)
+	if (net->ssl)
+		rc = SSLSocket_putdatas(net->ssl, net->socket, buf0, buf0len, count, buffers, buflens, freeData);
+	else
+#endif
+		rc = Socket_putdatas(net->socket, buf0, buf0len, count, buffers, buflens, freeData);
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+/**
+ * receives incoming socket data and parses websocket frames
+ *
+ * @param[in]      net                 network connection
+ * @param[in]      bytes               amount of data to receive
+ * @param[out]     actual_len          amount of data actually read
+ *
+ * @retval TCPSOCKET_COMPLETE          packet received
+ * @retval TCPSOCKET_INTERRUPTED       incomplete packet received
+ * @retval SOCKET_ERROR                an error was encountered
+ */
+int WebSocket_receiveFrame(networkHandles *net,
+	size_t bytes, size_t *actual_len )
+{
+	struct ws_frame *res = NULL;
+	int rc = TCPSOCKET_COMPLETE;
+
+	FUNC_ENTRY;
+	if ( !in_frames )
+		in_frames = ListInitialize();
+
+	/* see if there is frame acurrently on queue */
+	if ( in_frames->first )
+		res = in_frames->first->content;
+
+	while( !res )
+	{
+		int opcode = WebSocket_OP_BINARY;
+		do
+		{
+			/* obtain all frames in the sequence */
+			int final = 0;
+			while ( !final )
+			{
+				char *b;
+				size_t len = 0u;
+				int tmp_opcode;
+				int has_mask;
+				size_t cur_len = 0u;
+				uint8_t mask[4] = { 0u, 0u, 0u, 0u };
+				size_t payload_len;
+
+				b = WebSocket_getRawSocketData(net, 2u, &len);
+				if ( !b )
+				{
+					rc = SOCKET_ERROR;
+					goto exit;
+				} 
+				else if (len < 2u )
+				{
+					rc = TCPSOCKET_INTERRUPTED;
+					goto exit;
+				}
+
+				/* 1st byte */
+				final = (b[0] & 0xFF) >> 7;
+				tmp_opcode = (b[0] & 0x0F);
+
+				if ( tmp_opcode ) /* not a continuation frame */
+					opcode = tmp_opcode;
+
+				/* invalid websocket packet must return error */
+				if ( opcode < WebSocket_OP_CONTINUE ||
+				     opcode > WebSocket_OP_PONG ||
+				     ( opcode > WebSocket_OP_BINARY &&
+				       opcode < WebSocket_OP_CLOSE ) )
+				{
+					rc = SOCKET_ERROR;
+					goto exit;
+				}
+
+				/* 2nd byte */
+				has_mask = (b[1] & 0xFF) >> 7;
+				payload_len = (b[1] & 0x7F);
+
+				/* determine payload length */
+				if ( payload_len == 126 )
+				{
+					b = WebSocket_getRawSocketData( net,
+						2u, &len);
+					if ( !b )
+					{
+						rc = SOCKET_ERROR;
+						goto exit;
+					} 
+					else if (len < 2u )
+					{
+						rc = TCPSOCKET_INTERRUPTED;
+						goto exit;
+					}
+					/* convert from big endian 16 to host */
+					payload_len = be16toh(*(uint16_t*)b);
+				}
+				else if ( payload_len == 127 )
+				{
+					b = WebSocket_getRawSocketData( net,
+						8u, &len);
+					if ( !b )
+					{
+						rc = SOCKET_ERROR;
+						goto exit;
+					} 
+					else if (len < 8u )
+					{
+						rc = TCPSOCKET_INTERRUPTED;
+						goto exit;
+					}
+					/* convert from big-endian 64 to host */
+					payload_len = (size_t)be64toh(*(uint64_t*)b);
+				}
+
+				if ( has_mask )
+				{
+					uint8_t mask[4];
+					b = WebSocket_getRawSocketData(net, 4u, &len);
+					if ( !b )
+					{
+						rc = SOCKET_ERROR;
+						goto exit;
+					} 
+					else if (len < 4u )
+					{
+						rc = TCPSOCKET_INTERRUPTED;
+						goto exit;
+					}
+					memcpy( &mask[0], b, sizeof(uint32_t));
+				}
+
+				b = WebSocket_getRawSocketData(net,
+					payload_len, &len);
+
+				if ( !b )
+				{
+					rc = SOCKET_ERROR;
+					goto exit;
+				} 
+				else if (len < payload_len )
+				{
+					rc = TCPSOCKET_INTERRUPTED;
+					goto exit;
+				}
+
+				/* unmask data */
+				if ( has_mask )
+				{
+					size_t i;
+					for ( i = 0u; i < payload_len; ++i )
+						b[i] ^= mask[i % 4];
+				}
+
+				if ( res )
+					cur_len = res->len;
+
+				if (res == NULL)
+					res = malloc( sizeof(struct ws_frame) + cur_len + len );
+				else
+					res = realloc( res, sizeof(struct ws_frame) + cur_len + len );
+				memcpy( (unsigned char *)res + sizeof(struct ws_frame) + cur_len, b, len );
+				res->pos = 0u;
+				res->len = cur_len + len;
+
+				WebSocket_getRawSocketData(net, 0u, &len);
+			}
+
+			if ( opcode == WebSocket_OP_PING || opcode == WebSocket_OP_PONG )
+			{
+				/* respond to a "ping" with a "pong" */
+				if ( opcode == WebSocket_OP_PING )
+					WebSocket_pong( net,
+						(char *)res + sizeof(struct ws_frame),
+						res->len );
+
+				/* discard message */
+				free( res );
+				res = NULL;
+			}
+			else if ( opcode == WebSocket_OP_CLOSE )
+			{
+				/* server end closed websocket connection */
+				free( res );
+				WebSocket_close( net, WebSocket_CLOSE_GOING_AWAY, NULL );
+				rc = SOCKET_ERROR; /* closes socket */
+				goto exit;
+			}
+		} while ( opcode == WebSocket_OP_PING || opcode == WebSocket_OP_PONG );
+	}
+
+	/* add new frame to end of list */
+	ListAppend( in_frames, res, sizeof(struct ws_frame) + res->len);
+	*actual_len = res->len - res->pos;
+
+exit:
+	if (rc == TCPSOCKET_INTERRUPTED)
+	{
+		WebSocket_rewindData();
+	}
+
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+/**
+ * case-insensitive string search
+ *
+ * similar to @p strcase, but takes a maximum length
+ *
+ * @param[in]      buf                 buffer to search
+ * @param[in]      str                 string to find
+ * @param[in]       len                length of the buffer
+ *
+ * @retval !NULL                       location of string found
+ * @retval NULL                        string not found
+ */
+const char *WebSocket_strcasefind(const char *buf, const char *str, size_t len)
+{
+	const char *res = NULL;
+	if ( buf && len > 0u && str )
+	{
+		const size_t str_len = strlen( str );
+		while ( len >= str_len && !res )
+		{
+			if ( strncasecmp( buf, str, str_len ) == 0 )
+				res = buf;
+			++buf;
+			--len;
+		}
+	}
+	return res;
+}
+
+/**
+ * releases resources used by the websocket sub-system
+ */
+void WebSocket_terminate( void )
+{
+	FUNC_ENTRY;
+	/* clean up and un-processed websocket frames */
+	if ( in_frames )
+	{
+		struct ws_frame *f = ListDetachHead( in_frames );
+		while ( f )
+		{
+			free( f );
+			f = ListDetachHead( in_frames );
+		}
+		ListFree( in_frames );
+		in_frames = NULL;
+	}
+	if ( last_frame )
+	{
+		free( last_frame );
+		last_frame = NULL;
+	}
+	
+	if ( frame_buffer )
+	{
+		free( frame_buffer );
+		frame_buffer = NULL;
+	}
+	
+	frame_buffer_len = 0;
+	frame_buffer_index = 0;
+	frame_buffer_data_len = 0;
+
+	Socket_outTerminate();
+#if defined(OPENSSL)
+	SSLSocket_terminate();
+#endif
+	FUNC_EXIT;
+}
+
+/**
+ * handles the websocket upgrade response
+ *
+ * @param[in,out]  net                 network connection to upgrade
+ *
+ * @retval SOCKET_ERROR                failed to upgrade network connection
+ * @retval 1                           socket upgraded to use websockets
+ *
+ * @see WebSocket_connect
+ */
+int WebSocket_upgrade( networkHandles *net )
+{
+	static const char *const ws_guid =
+		"258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
+	int rc = SOCKET_ERROR;
+
+	FUNC_ENTRY;
+	if ( net->websocket_key )
+	{
+		SHA_CTX ctx;
+		char ws_key[62u] = { 0 };
+		unsigned char sha_hash[SHA1_DIGEST_LENGTH];
+		size_t rcv = 0u;
+		char *read_buf;
+
+		/* calculate the expected websocket key, expected from server */
+		snprintf( ws_key, sizeof(ws_key), "%s%s", net->websocket_key, ws_guid );
+		SHA1_Init( &ctx );
+		SHA1_Update( &ctx, ws_key, strlen(ws_key));
+		SHA1_Final( sha_hash, &ctx );
+		Base64_encode( ws_key, sizeof(ws_key), sha_hash, SHA1_DIGEST_LENGTH );
+
+		rc = TCPSOCKET_INTERRUPTED;
+		read_buf = WebSocket_getRawSocketData( net, 12u, &rcv );
+
+		if ( rcv > 0 && strncmp( read_buf, "HTTP/1.1", 8u ) == 0 )
+		{
+			if (strncmp( &read_buf[9], "101", 3u ) != 0)
+			{
+				Log(TRACE_PROTOCOL, 1, "WebSocket HTTP rc %.3s", &read_buf[9]);
+				rc = SOCKET_ERROR;
+				goto exit;
+			}
+		}
+
+		if ( rcv > 0 && strncmp( read_buf, "HTTP/1.1 101", 12u ) == 0 )
+		{
+			const char *p;
+			read_buf = WebSocket_getRawSocketData( net, 500u, &rcv );
+
+			/* check for upgrade */
+			p = WebSocket_strcasefind(
+				read_buf, "Connection", rcv );
+			if ( p )
+			{
+				const char *eol;
+				eol = memchr( p, '\n', rcv-(read_buf-p) );
+				if ( eol )
+					p = WebSocket_strcasefind(
+						p, "Upgrade", eol - p);
+				else
+					p = NULL;
+			}
+
+			/* check key hash */
+			if ( p )
+				p = WebSocket_strcasefind( read_buf,
+					"sec-websocket-accept", rcv );
+			if ( p )
+			{
+				const char *eol;
+				eol = memchr( p, '\n', rcv-(read_buf-p) );
+				if ( eol )
+				{
+					p = memchr( p, ':', eol-p );
+					if ( p )
+					{
+						size_t hash_len = eol-p-1;
+						while ( *p == ':' || *p == ' ' )
+						{
+							++p;
+							--hash_len;
+						}
+
+						if ( strncmp( p, ws_key, hash_len ) != 0 )
+							p = NULL;
+					}
+				}
+				else
+					p = NULL;
+			}
+
+			if ( p )
+			{
+				net->websocket = 1;
+				Log(TRACE_PROTOCOL, 1, "WebSocket connection upgraded" );
+				rc = 1;
+			}
+			else
+			{
+				Log(TRACE_PROTOCOL, 1, "WebSocket failed to upgrade connection" );
+				rc = SOCKET_ERROR;
+			}
+
+			if ( net->websocket_key )
+			{
+				free(net->websocket_key);
+				net->websocket_key = NULL;
+			}
+
+			/* indicate that we done with the packet */
+			WebSocket_getRawSocketData( net, 0u, &rcv );
+		}
+	}
+
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
diff --git a/mqtt/src/src/WebSocket.h b/mqtt/src/src/WebSocket.h
new file mode 100644
index 00000000..33cc8442
--- /dev/null
+++ b/mqtt/src/src/WebSocket.h
@@ -0,0 +1,77 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Wind River Systems, Inc. All Rights Reserved.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Keith Holman - initial implementation and documentation
+ *******************************************************************************/
+
+#if !defined(WEBSOCKET_H)
+#define WEBSOCKET_H
+
+#include "Clients.h"
+
+/**
+ * WebSocket op codes
+ * @{
+ */
+#define WebSocket_OP_CONTINUE 0x0 /* 0000 - continue frame */
+#define WebSocket_OP_TEXT     0x1 /* 0001 - text frame */
+#define WebSocket_OP_BINARY   0x2 /* 0010 - binary frame */
+#define WebSocket_OP_CLOSE    0x8 /* 1000 - close frame */
+#define WebSocket_OP_PING     0x9 /* 1001 - ping frame */
+#define WebSocket_OP_PONG     0xA /* 1010 - pong frame */
+/** @} */
+
+/**
+ * Various close status codes
+ * @{
+ */
+#define WebSocket_CLOSE_NORMAL          1000
+#define WebSocket_CLOSE_GOING_AWAY      1001
+#define WebSocket_CLOSE_PROTOCOL_ERROR  1002
+#define WebSocket_CLOSE_UNKNOWN_DATA    1003
+#define WebSocket_CLOSE_RESERVED        1004
+#define WebSocket_CLOSE_NO_STATUS_CODE  1005 /* reserved: not to be used */
+#define WebSocket_CLOSE_ABNORMAL        1006 /* reserved: not to be used */
+#define WebSocket_CLOSE_BAD_DATA        1007
+#define WebSocket_CLOSE_POLICY          1008
+#define WebSocket_CLOSE_MSG_TOO_BIG     1009
+#define WebSocket_CLOSE_NO_EXTENSION    1010
+#define WebScoket_CLOSE_UNEXPECTED      1011
+#define WebSocket_CLOSE_TLS_FAIL        1015 /* reserved: not be used */
+/** @} */
+
+/* closes a websocket connection */
+void WebSocket_close(networkHandles *net, int status_code, const char *reason);
+
+/* sends upgrade request */
+int WebSocket_connect(networkHandles *net, const char *uri);
+
+/* calculates the extra data required in a packet to hold a WebSocket frame header */
+size_t WebSocket_calculateFrameHeaderSize(networkHandles *net, int mask_data,
+	size_t data_len);
+
+/* obtain data from network socket */
+int WebSocket_getch(networkHandles *net, char* c);
+char *WebSocket_getdata(networkHandles *net, size_t bytes, size_t* actual_len);
+
+/* send data out, in websocket format only if required */
+int WebSocket_putdatas(networkHandles* net, char* buf0, size_t buf0len,
+	int count, char** buffers, size_t* buflens, int* freeData);
+
+/* releases any resources used by the websocket system */
+void WebSocket_terminate(void);
+
+/* handles websocket upgrade request */
+int WebSocket_upgrade(networkHandles *net);
+
+#endif /* WEBSOCKET_H */
diff --git a/mqtt/src/src/mutex_type.h b/mqtt/src/src/mutex_type.h
new file mode 100644
index 00000000..5760b370
--- /dev/null
+++ b/mqtt/src/src/mutex_type.h
@@ -0,0 +1,25 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ *******************************************************************************/
+#if !defined(_MUTEX_TYPE_H_)
+#define _MUTEX_TYPE_H_
+
+#if defined(WIN32) || defined(WIN64)
+	#include <windows.h>
+	#define mutex_type HANDLE
+#else
+	#include <pthread.h>
+	#define mutex_type pthread_mutex_t*
+#endif
+
+#endif /* _MUTEX_TYPE_H_ */
diff --git a/mqtt/src/src/samples/CMakeLists.txt b/mqtt/src/src/samples/CMakeLists.txt
new file mode 100644
index 00000000..5dddd7ba
--- /dev/null
+++ b/mqtt/src/src/samples/CMakeLists.txt
@@ -0,0 +1,65 @@
+#*******************************************************************************
+#  Copyright (c) 2015, 2017 logi.cals GmbH and others
+#
+#  All rights reserved. This program and the accompanying materials
+#  are made available under the terms of the Eclipse Public License v1.0
+#  and Eclipse Distribution License v1.0 which accompany this distribution.
+#
+#  The Eclipse Public License is available at
+#     http://www.eclipse.org/legal/epl-v10.html
+#  and the Eclipse Distribution License is available at
+#    http://www.eclipse.org/org/documents/edl-v10.php.
+#
+#  Contributors:
+#     Rainer Poisel - initial version
+#     Ian Craggs - update sample names
+#*******************************************************************************/
+
+# Note: on OS X you should install XCode and the associated command-line tools
+
+## compilation/linkage settings
+INCLUDE_DIRECTORIES(
+    .
+    ${PROJECT_SOURCE_DIR}/src
+    ${PROJECT_BINARY_DIR}
+    )
+
+IF (WIN32)
+  	ADD_DEFINITIONS(/DCMAKE_BUILD /D_CRT_SECURE_NO_DEPRECATE)
+ENDIF()
+
+# sample files c
+ADD_EXECUTABLE(paho_c_pub paho_c_pub.c pubsub_opts.c)
+ADD_EXECUTABLE(paho_c_sub paho_c_sub.c pubsub_opts.c)
+ADD_EXECUTABLE(paho_cs_pub paho_cs_pub.c pubsub_opts.c)
+ADD_EXECUTABLE(paho_cs_sub paho_cs_sub.c pubsub_opts.c)
+
+TARGET_LINK_LIBRARIES(paho_c_pub paho-mqtt3as)
+TARGET_LINK_LIBRARIES(paho_c_sub paho-mqtt3as)
+TARGET_LINK_LIBRARIES(paho_cs_pub paho-mqtt3cs)
+TARGET_LINK_LIBRARIES(paho_cs_sub paho-mqtt3cs)
+
+ADD_EXECUTABLE(MQTTAsync_subscribe MQTTAsync_subscribe.c)
+ADD_EXECUTABLE(MQTTAsync_publish MQTTAsync_publish.c)
+ADD_EXECUTABLE(MQTTClient_subscribe MQTTClient_subscribe.c)
+ADD_EXECUTABLE(MQTTClient_publish MQTTClient_publish.c)
+ADD_EXECUTABLE(MQTTClient_publish_async MQTTClient_publish_async.c)
+
+TARGET_LINK_LIBRARIES(MQTTAsync_subscribe paho-mqtt3a)
+TARGET_LINK_LIBRARIES(MQTTAsync_publish paho-mqtt3a)
+TARGET_LINK_LIBRARIES(MQTTClient_subscribe paho-mqtt3c)
+TARGET_LINK_LIBRARIES(MQTTClient_publish paho-mqtt3c)
+TARGET_LINK_LIBRARIES(MQTTClient_publish_async paho-mqtt3c)
+
+INSTALL(TARGETS paho_c_sub
+                paho_c_pub
+                paho_cs_sub
+                paho_cs_pub
+                MQTTAsync_subscribe
+                MQTTAsync_publish
+                MQTTClient_subscribe
+                MQTTClient_publish
+                MQTTClient_publish_async
+
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/mqtt/src/src/samples/MQTTAsync_publish.c b/mqtt/src/src/samples/MQTTAsync_publish.c
new file mode 100644
index 00000000..4c479269
--- /dev/null
+++ b/mqtt/src/src/samples/MQTTAsync_publish.c
@@ -0,0 +1,156 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *   http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial contribution
+ *******************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MQTTAsync.h"
+
+#if !defined(WIN32)
+#include <unistd.h>
+#else
+#include <windows.h>
+#endif
+
+#if defined(_WRS_KERNEL)
+#include <OsWrapper.h>
+#endif
+
+#define ADDRESS     "tcp://mqtt.eclipse.org:1883"
+#define CLIENTID    "ExampleClientPub"
+#define TOPIC       "MQTT Examples"
+#define PAYLOAD     "Hello World!"
+#define QOS         1
+#define TIMEOUT     10000L
+
+volatile MQTTAsync_token deliveredtoken;
+
+int finished = 0;
+
+void connlost(void *context, char *cause)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+	int rc;
+
+	printf("\nConnection lost\n");
+	printf("     cause: %s\n", cause);
+
+	printf("Reconnecting\n");
+	conn_opts.keepAliveInterval = 20;
+	conn_opts.cleansession = 1;
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start connect, return code %d\n", rc);
+ 		finished = 1;
+	}
+}
+
+
+void onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	printf("Successful disconnection\n");
+	finished = 1;
+}
+
+
+void onSend(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	printf("Message with token value %d delivery confirmed\n", response->token);
+
+	opts.onSuccess = onDisconnect;
+	opts.context = client;
+
+	if ((rc = MQTTAsync_disconnect(client, &opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start sendMessage, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+}
+
+
+void onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	printf("Connect failed, rc %d\n", response ? response->code : 0);
+	finished = 1;
+}
+
+
+void onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+
+	printf("Successful connection\n");
+	
+	opts.onSuccess = onSend;
+	opts.context = client;
+
+	pubmsg.payload = PAYLOAD;
+	pubmsg.payloadlen = (int)strlen(PAYLOAD);
+	pubmsg.qos = QOS;
+	pubmsg.retained = 0;
+	deliveredtoken = 0;
+
+	if ((rc = MQTTAsync_sendMessage(client, TOPIC, &pubmsg, &opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start sendMessage, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+}
+
+
+int main(int argc, char* argv[])
+{
+	MQTTAsync client;
+	MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+	int rc;
+
+	MQTTAsync_create(&client, ADDRESS, CLIENTID, MQTTCLIENT_PERSISTENCE_NONE, NULL);
+
+	MQTTAsync_setCallbacks(client, NULL, connlost, NULL, NULL);
+
+	conn_opts.keepAliveInterval = 20;
+	conn_opts.cleansession = 1;
+	conn_opts.onSuccess = onConnect;
+	conn_opts.onFailure = onConnectFailure;
+	conn_opts.context = client;
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start connect, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+
+	printf("Waiting for publication of %s\n"
+         "on topic %s for client with ClientID: %s\n",
+         PAYLOAD, TOPIC, CLIENTID);
+	while (!finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&client);
+ 	return rc;
+}
+  
diff --git a/mqtt/src/src/samples/MQTTAsync_subscribe.c b/mqtt/src/src/samples/MQTTAsync_subscribe.c
new file mode 100644
index 00000000..e0db3746
--- /dev/null
+++ b/mqtt/src/src/samples/MQTTAsync_subscribe.c
@@ -0,0 +1,192 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *   http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial contribution
+ *******************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MQTTAsync.h"
+
+#if !defined(WIN32)
+#include <unistd.h>
+#else
+#include <windows.h>
+#endif
+
+#if defined(_WRS_KERNEL)
+#include <OsWrapper.h>
+#endif
+
+#define ADDRESS     "tcp://localhost:1883"
+#define CLIENTID    "ExampleClientSub"
+#define TOPIC       "MQTT Examples"
+#define PAYLOAD     "Hello World!"
+#define QOS         1
+#define TIMEOUT     10000L
+
+volatile MQTTAsync_token deliveredtoken;
+
+int disc_finished = 0;
+int subscribed = 0;
+int finished = 0;
+
+void connlost(void *context, char *cause)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+	int rc;
+
+	printf("\nConnection lost\n");
+	if (cause)
+		printf("     cause: %s\n", cause);
+
+	printf("Reconnecting\n");
+	conn_opts.keepAliveInterval = 20;
+	conn_opts.cleansession = 1;
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start connect, return code %d\n", rc);
+		finished = 1;
+	}
+}
+
+
+int msgarrvd(void *context, char *topicName, int topicLen, MQTTAsync_message *message)
+{
+    int i;
+    char* payloadptr;
+
+    printf("Message arrived\n");
+    printf("     topic: %s\n", topicName);
+    printf("   message: ");
+
+    payloadptr = message->payload;
+    for(i=0; i<message->payloadlen; i++)
+    {
+        putchar(*payloadptr++);
+    }
+    putchar('\n');
+    MQTTAsync_freeMessage(&message);
+    MQTTAsync_free(topicName);
+    return 1;
+}
+
+
+void onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	printf("Successful disconnection\n");
+	disc_finished = 1;
+}
+
+
+void onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	printf("Subscribe succeeded\n");
+	subscribed = 1;
+}
+
+void onSubscribeFailure(void* context, MQTTAsync_failureData* response)
+{
+	printf("Subscribe failed, rc %d\n", response ? response->code : 0);
+	finished = 1;
+}
+
+
+void onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	printf("Connect failed, rc %d\n", response ? response->code : 0);
+	finished = 1;
+}
+
+
+void onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	printf("Successful connection\n");
+
+	printf("Subscribing to topic %s\nfor client %s using QoS%d\n\n"
+           "Press Q<Enter> to quit\n\n", TOPIC, CLIENTID, QOS);
+	opts.onSuccess = onSubscribe;
+	opts.onFailure = onSubscribeFailure;
+	opts.context = client;
+
+	deliveredtoken = 0;
+
+	if ((rc = MQTTAsync_subscribe(client, TOPIC, QOS, &opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start subscribe, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+}
+
+
+int main(int argc, char* argv[])
+{
+	MQTTAsync client;
+	MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_disconnectOptions disc_opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+	int ch;
+
+	MQTTAsync_create(&client, ADDRESS, CLIENTID, MQTTCLIENT_PERSISTENCE_NONE, NULL);
+
+	MQTTAsync_setCallbacks(client, client, connlost, msgarrvd, NULL);
+
+	conn_opts.keepAliveInterval = 20;
+	conn_opts.cleansession = 1;
+	conn_opts.onSuccess = onConnect;
+	conn_opts.onFailure = onConnectFailure;
+	conn_opts.context = client;
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start connect, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+
+	while	(!subscribed)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	if (finished)
+		goto exit;
+
+	do 
+	{
+		ch = getchar();
+	} while (ch!='Q' && ch != 'q');
+
+	disc_opts.onSuccess = onDisconnect;
+	if ((rc = MQTTAsync_disconnect(client, &disc_opts)) != MQTTASYNC_SUCCESS)
+	{
+		printf("Failed to start disconnect, return code %d\n", rc);
+		exit(EXIT_FAILURE);
+	}
+ 	while	(!disc_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+exit:
+	MQTTAsync_destroy(&client);
+ 	return rc;
+}
diff --git a/mqtt/src/src/samples/MQTTClient_publish.c b/mqtt/src/src/samples/MQTTClient_publish.c
new file mode 100644
index 00000000..a0f183cf
--- /dev/null
+++ b/mqtt/src/src/samples/MQTTClient_publish.c
@@ -0,0 +1,60 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2017 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *   http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial contribution
+ *******************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MQTTClient.h"
+
+#define ADDRESS     "tcp://localhost:1883"
+#define CLIENTID    "ExampleClientPub"
+#define TOPIC       "MQTT Examples"
+#define PAYLOAD     "Hello World!"
+#define QOS         1
+#define TIMEOUT     10000L
+
+int main(int argc, char* argv[])
+{
+    MQTTClient client;
+    MQTTClient_connectOptions conn_opts = MQTTClient_connectOptions_initializer;
+    MQTTClient_message pubmsg = MQTTClient_message_initializer;
+    MQTTClient_deliveryToken token;
+    int rc;
+
+    MQTTClient_create(&client, ADDRESS, CLIENTID,
+        MQTTCLIENT_PERSISTENCE_NONE, NULL);
+    conn_opts.keepAliveInterval = 20;
+    conn_opts.cleansession = 1;
+
+    if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS)
+    {
+        printf("Failed to connect, return code %d\n", rc);
+        exit(EXIT_FAILURE);
+    }
+    pubmsg.payload = PAYLOAD;
+    pubmsg.payloadlen = (int)strlen(PAYLOAD);
+    pubmsg.qos = QOS;
+    pubmsg.retained = 0;
+    MQTTClient_publishMessage(client, TOPIC, &pubmsg, &token);
+    printf("Waiting for up to %d seconds for publication of %s\n"
+            "on topic %s for client with ClientID: %s\n",
+            (int)(TIMEOUT/1000), PAYLOAD, TOPIC, CLIENTID);
+    rc = MQTTClient_waitForCompletion(client, token, TIMEOUT);
+    printf("Message with delivery token %d delivered\n", token);
+    MQTTClient_disconnect(client, 10000);
+    MQTTClient_destroy(&client);
+    return rc;
+}
diff --git a/mqtt/src/src/samples/MQTTClient_publish_async.c b/mqtt/src/src/samples/MQTTClient_publish_async.c
new file mode 100755
index 00000000..f1592c68
--- /dev/null
+++ b/mqtt/src/src/samples/MQTTClient_publish_async.c
@@ -0,0 +1,104 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2017 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial contribution
+ *******************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MQTTClient.h"
+
+#define ADDRESS     "tcp://120.24.80.203:1883"
+#define CLIENTID    "e4956e400000"
+#define TOPIC       "MQTT Examples"
+#define PAYLOAD     "Hello World!"
+#define QOS         1
+#define TIMEOUT     10000L
+
+volatile MQTTClient_deliveryToken deliveredtoken;
+
+void delivered(void *context, MQTTClient_deliveryToken dt)
+{
+    printf("Message with token value %d delivery confirmed\n", dt);
+    deliveredtoken = dt;
+}
+
+int msgarrvd(void *context, char *topicName, int topicLen, MQTTClient_message *message)
+{
+    int i;
+    char* payloadptr;
+
+    printf("Message arrived\n");
+    printf("     topic: %s\n", topicName);
+    printf("   message: ");
+
+    payloadptr = message->payload;
+    for(i=0; i<message->payloadlen; i++)
+    {
+        putchar(*payloadptr++);
+    }
+    putchar('\n');
+    MQTTClient_freeMessage(&message);
+    MQTTClient_free(topicName);
+    return 1;
+}
+
+void connlost(void *context, char *cause)
+{
+    printf("\nConnection lost\n");
+    printf("     cause: %s\n", cause);
+}
+
+int main(int argc, char* argv[])
+{
+    MQTTClient client;
+    MQTTClient_connectOptions conn_opts = MQTTClient_connectOptions_initializer;
+    MQTTClient_message pubmsg = MQTTClient_message_initializer;
+    MQTTClient_deliveryToken token;
+    int rc;
+
+    MQTTClient_create(&client, ADDRESS, CLIENTID,
+        MQTTCLIENT_PERSISTENCE_NONE, NULL);
+    conn_opts.keepAliveInterval = 20;
+    conn_opts.cleansession = 1;
+    conn_opts.username = "glinet";
+    conn_opts.password = "Goodlife1";
+
+    MQTTClient_setCallbacks(client, NULL, connlost, msgarrvd, delivered);
+
+    if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS)
+    {
+        printf("Failed to connect, return code %d\n", rc);
+        exit(EXIT_FAILURE);
+    }
+    pubmsg.payload = PAYLOAD;
+    pubmsg.payloadlen = (int)strlen(PAYLOAD);
+    pubmsg.qos = QOS;
+    pubmsg.retained = 0;
+    deliveredtoken = 0;
+    // MQTTClient_publishMessage(client, TOPIC, &pubmsg, &token);
+    // printf("Waiting for publication of %s\n"
+    //         "on topic %s for client with ClientID: %s\n",
+    //         PAYLOAD, TOPIC, CLIENTID);
+    // while(deliveredtoken != token);
+
+    int ch;
+    do {
+        ch = getchar();
+    } while (ch != 'Q' && ch != 'q');
+
+    MQTTClient_disconnect(client, 10000);
+    MQTTClient_destroy(&client);
+    return rc;
+}
diff --git a/mqtt/src/src/samples/MQTTClient_subscribe.c b/mqtt/src/src/samples/MQTTClient_subscribe.c
new file mode 100644
index 00000000..c675ecc5
--- /dev/null
+++ b/mqtt/src/src/samples/MQTTClient_subscribe.c
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2017 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *   http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial contribution
+ *******************************************************************************/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MQTTClient.h"
+
+#define ADDRESS     "tcp://localhost:1883"
+#define CLIENTID    "ExampleClientSub"
+#define TOPIC       "MQTT Examples"
+#define PAYLOAD     "Hello World!"
+#define QOS         1
+#define TIMEOUT     10000L
+
+volatile MQTTClient_deliveryToken deliveredtoken;
+
+void delivered(void *context, MQTTClient_deliveryToken dt)
+{
+    printf("Message with token value %d delivery confirmed\n", dt);
+    deliveredtoken = dt;
+}
+
+int msgarrvd(void *context, char *topicName, int topicLen, MQTTClient_message *message)
+{
+    int i;
+    char* payloadptr;
+
+    printf("Message arrived\n");
+    printf("     topic: %s\n", topicName);
+    printf("   message: ");
+
+    payloadptr = message->payload;
+    for(i=0; i<message->payloadlen; i++)
+    {
+        putchar(*payloadptr++);
+    }
+    putchar('\n');
+    MQTTClient_freeMessage(&message);
+    MQTTClient_free(topicName);
+    return 1;
+}
+
+void connlost(void *context, char *cause)
+{
+    printf("\nConnection lost\n");
+    printf("     cause: %s\n", cause);
+}
+
+int main(int argc, char* argv[])
+{
+    MQTTClient client;
+    MQTTClient_connectOptions conn_opts = MQTTClient_connectOptions_initializer;
+    int rc;
+    int ch;
+
+    MQTTClient_create(&client, ADDRESS, CLIENTID,
+        MQTTCLIENT_PERSISTENCE_NONE, NULL);
+    conn_opts.keepAliveInterval = 20;
+    conn_opts.cleansession = 1;
+
+    MQTTClient_setCallbacks(client, NULL, connlost, msgarrvd, delivered);
+
+    if ((rc = MQTTClient_connect(client, &conn_opts)) != MQTTCLIENT_SUCCESS)
+    {
+        printf("Failed to connect, return code %d\n", rc);
+        exit(EXIT_FAILURE);
+    }
+    printf("Subscribing to topic %s\nfor client %s using QoS%d\n\n"
+           "Press Q<Enter> to quit\n\n", TOPIC, CLIENTID, QOS);
+    MQTTClient_subscribe(client, TOPIC, QOS);
+
+    do 
+    {
+        ch = getchar();
+    } while(ch!='Q' && ch != 'q');
+
+    MQTTClient_unsubscribe(client, TOPIC);
+    MQTTClient_disconnect(client, 10000);
+    MQTTClient_destroy(&client);
+    return rc;
+}
diff --git a/mqtt/src/src/samples/paho_c_pub.c b/mqtt/src/src/samples/paho_c_pub.c
new file mode 100644
index 00000000..ab04acbe
--- /dev/null
+++ b/mqtt/src/src/samples/paho_c_pub.c
@@ -0,0 +1,509 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp., and others
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial contribution
+ *    Guilherme Maciel Ferreira - add keep alive option
+ *    Ian Craggs - add full capability
+ *******************************************************************************/
+
+#include "MQTTAsync.h"
+#include "pubsub_opts.h"
+
+#include <stdio.h>
+#include <signal.h>
+#include <string.h>
+#include <stdlib.h>
+
+#if defined(WIN32)
+#include <windows.h>
+#define sleep Sleep
+#else
+#include <unistd.h>
+#include <sys/time.h>
+#include <unistd.h>
+#endif
+
+#if defined(_WRS_KERNEL)
+#include <OsWrapper.h>
+#endif
+
+volatile int toStop = 0;
+
+struct pubsub_opts opts =
+{
+	1, 0, 0, 0, "\n", 100,  	/* debug/app options */
+	NULL, NULL, 1, 0, 0, /* message options */
+	MQTTVERSION_DEFAULT, NULL, "paho-c-pub", 0, 0, NULL, NULL, "localhost", "1883", NULL, 10, /* MQTT options */
+	NULL, NULL, 0, 0, /* will options */
+	0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* TLS options */
+	0, {NULL, NULL}, /* MQTT V5 options */
+};
+
+MQTTAsync_responseOptions pub_opts = MQTTAsync_responseOptions_initializer;
+MQTTProperty property;
+MQTTProperties props = MQTTProperties_initializer;
+
+
+void mysleep(int ms)
+{
+	#if defined(WIN32)
+		Sleep(ms);
+	#else
+		usleep(ms * 1000);
+	#endif
+}
+
+void cfinish(int sig)
+{
+	signal(SIGINT, NULL);
+	toStop = 1;
+}
+
+
+int messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* m)
+{
+	/* not expecting any messages */
+	return 1;
+}
+
+
+static int disconnected = 0;
+
+void onDisconnect5(void* context, MQTTAsync_successData5* response)
+{
+	disconnected = 1;
+}
+
+void onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	disconnected = 1;
+}
+
+
+static int connected = 0;
+void myconnect(MQTTAsync client);
+int mypublish(MQTTAsync client, int datalen, char* data);
+
+void onConnectFailure5(void* context, MQTTAsync_failureData5* response)
+{
+	fprintf(stderr, "Connect failed, rc %s reason code %s\n",
+		MQTTAsync_strerror(response->code),
+		MQTTReasonCode_toString(response->reasonCode));
+	connected = -1;
+
+	MQTTAsync client = (MQTTAsync)context;
+}
+
+void onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	fprintf(stderr, "Connect failed, rc %s\n", response ? MQTTAsync_strerror(response->code) : "none");
+	connected = -1;
+
+	MQTTAsync client = (MQTTAsync)context;
+}
+
+
+void onConnect5(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	int rc = 0;
+
+	if (opts.verbose)
+		printf("Connected\n");
+
+	if (opts.null_message == 1)
+		rc = mypublish(client, 0, "");
+	else if (opts.message)
+		rc = mypublish(client, (int)strlen(opts.message), opts.message);
+	else if (opts.filename)
+	{
+		int data_len = 0;
+		char* buffer = readfile(&data_len, &opts);
+
+		if (buffer == NULL)
+			toStop = 1;
+		else
+		{
+			rc = mypublish(client, data_len, buffer);
+			free(buffer);
+		}
+	}
+
+	connected = 1;
+}
+
+void onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	int rc = 0;
+
+	if (opts.verbose)
+		printf("Connected\n");
+
+	if (opts.null_message == 1)
+		rc = mypublish(client, 0, "");
+	else if (opts.message)
+		rc = mypublish(client, (int)strlen(opts.message), opts.message);
+	else if (opts.filename)
+	{
+		int data_len = 0;
+		char* buffer = readfile(&data_len, &opts);
+
+		if (buffer == NULL)
+			toStop = 1;
+		else
+		{
+			rc = mypublish(client, data_len, buffer);
+			free(buffer);
+		}
+	}
+
+	connected = 1;
+}
+
+
+static int published = 0;
+
+void onPublishFailure5(void* context, MQTTAsync_failureData5* response)
+{
+	if (opts.verbose)
+		fprintf(stderr, "Publish failed, rc %s reason code %s\n",
+				MQTTAsync_strerror(response->code),
+				MQTTReasonCode_toString(response->reasonCode));
+	published = -1;
+}
+
+void onPublishFailure(void* context, MQTTAsync_failureData* response)
+{
+	if (opts.verbose)
+		fprintf(stderr, "Publish failed, rc %s\n", MQTTAsync_strerror(response->code));
+	published = -1;
+}
+
+
+void onPublish5(void* context, MQTTAsync_successData5* response)
+{
+	if (opts.verbose)
+		printf("Publish succeeded, reason code %s\n",
+				MQTTReasonCode_toString(response->reasonCode));
+
+	if (opts.null_message || opts.message || opts.filename)
+		toStop = 1;
+
+	published = 1;
+}
+
+
+void onPublish(void* context, MQTTAsync_successData* response)
+{
+	if (opts.verbose)
+		printf("Publish succeeded\n");
+
+	if (opts.null_message || opts.message || opts.filename)
+		toStop = 1;
+
+	published = 1;
+}
+
+
+static int onSSLError(const char *str, size_t len, void *context)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	return fprintf(stderr, "SSL error: %s\n", str);
+}
+
+static unsigned int onPSKAuth(const char* hint,
+                              char* identity,
+                              unsigned int max_identity_len,
+                              unsigned char* psk,
+                              unsigned int max_psk_len,
+                              void* context)
+{
+	int psk_len;
+	int k, n;
+
+	int rc = 0;
+	struct pubsub_opts* opts = context;
+
+	printf("Trying TLS-PSK auth with hint: %s\n", hint);
+
+	if (opts->psk == NULL || opts->psk_identity == NULL)
+	{
+		printf("No PSK entered\n");
+		goto exit;
+	}
+
+	/* psk should be array of bytes. This is a quick and dirty way to
+	 * convert hex to bytes without input validation */
+	psk_len = strlen(opts->psk) / 2;
+	if (psk_len > max_psk_len)
+	{
+		printf("PSK too long\n");
+		goto exit;
+	}
+	for (k=0, n=0; k < psk_len; k++, n += 2)
+	{
+		sscanf(&opts->psk[n], "%2hhx", &psk[k]);
+	}
+
+	/* identity should be NULL terminated string */
+	strncpy(identity, opts->psk_identity, max_identity_len);
+	if (identity[max_identity_len - 1] != '\0')
+	{
+		printf("Identity too long\n");
+		goto exit;
+	}
+
+	/* Function should return length of psk on success. */
+	rc = psk_len;
+
+exit:
+	return rc;
+}
+
+void myconnect(MQTTAsync client)
+{
+	MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_SSLOptions ssl_opts = MQTTAsync_SSLOptions_initializer;
+	MQTTAsync_willOptions will_opts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+
+	if (opts.verbose)
+		printf("Connecting\n");
+	if (opts.MQTTVersion == MQTTVERSION_5)
+	{
+		MQTTAsync_connectOptions conn_opts5 = MQTTAsync_connectOptions_initializer5;
+		conn_opts = conn_opts5;
+		conn_opts.onSuccess5 = onConnect5;
+		conn_opts.onFailure5 = onConnectFailure5;
+		conn_opts.cleanstart = 1;
+	}
+	else
+	{
+		conn_opts.onSuccess = onConnect;
+		conn_opts.onFailure = onConnectFailure;
+		conn_opts.cleansession = 1;
+	}
+	conn_opts.keepAliveInterval = opts.keepalive;
+	conn_opts.username = opts.username;
+	conn_opts.password = opts.password;
+	conn_opts.MQTTVersion = opts.MQTTVersion;
+	conn_opts.context = client;
+	conn_opts.automaticReconnect = 1;
+
+	if (opts.will_topic) 	/* will options */
+	{
+		will_opts.message = opts.will_payload;
+		will_opts.topicName = opts.will_topic;
+		will_opts.qos = opts.will_qos;
+		will_opts.retained = opts.will_retain;
+		conn_opts.will = &will_opts;
+	}
+
+	if (opts.connection && (strncmp(opts.connection, "ssl://", 6) == 0 ||
+			strncmp(opts.connection, "wss://", 6) == 0))
+	{
+		if (opts.insecure)
+			ssl_opts.verify = 0;
+		else
+			ssl_opts.verify = 1;
+		ssl_opts.CApath = opts.capath;
+		ssl_opts.keyStore = opts.cert;
+		ssl_opts.trustStore = opts.cafile;
+		ssl_opts.privateKey = opts.key;
+		ssl_opts.privateKeyPassword = opts.keypass;
+		ssl_opts.enabledCipherSuites = opts.ciphers;
+		ssl_opts.ssl_error_cb = onSSLError;
+		ssl_opts.ssl_error_context = client;
+		ssl_opts.ssl_psk_cb = onPSKAuth;
+		ssl_opts.ssl_psk_context = &opts;
+		conn_opts.ssl = &ssl_opts;
+	}
+
+	connected = 0;
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		fprintf(stderr, "Failed to start connect, return code %s\n", MQTTAsync_strerror(rc));
+		exit(EXIT_FAILURE);
+	}
+}
+
+
+int mypublish(MQTTAsync client, int datalen, char* data)
+{
+	int rc;
+
+	if (opts.verbose)
+		printf("Publishing data of length %d\n", datalen);
+
+	rc = MQTTAsync_send(client, opts.topic, datalen, data, opts.qos, opts.retained, &pub_opts);
+	if (opts.verbose && rc != MQTTASYNC_SUCCESS && !opts.quiet)
+		fprintf(stderr, "Error from MQTTAsync_send: %s\n", MQTTAsync_strerror(rc));
+
+	return rc;
+}
+
+
+void trace_callback(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	fprintf(stderr, "Trace : %d, %s\n", level, message);
+}
+
+
+int main(int argc, char** argv)
+{
+	MQTTAsync_disconnectOptions disc_opts = MQTTAsync_disconnectOptions_initializer;
+	MQTTAsync_createOptions create_opts = MQTTAsync_createOptions_initializer;
+	MQTTAsync client;
+	char* buffer = NULL;
+	char* url = NULL;
+	int rc = 0;
+	const char* version = NULL;
+	const char* program_name = "paho_c_pub";
+	MQTTAsync_nameValue* infos = MQTTAsync_getVersionInfo();
+#if !defined(WIN32)
+    struct sigaction sa;
+#endif
+
+	if (argc < 2)
+		usage(&opts, (pubsub_opts_nameValue*)infos, program_name);
+
+	if (getopts(argc, argv, &opts) != 0)
+		usage(&opts, (pubsub_opts_nameValue*)infos, program_name);
+
+	if (opts.connection)
+		url = opts.connection;
+	else
+	{
+		url = malloc(100);
+		sprintf(url, "%s:%s", opts.host, opts.port);
+	}
+	if (opts.verbose)
+		printf("URL is %s\n", url);
+
+	if (opts.tracelevel > 0)
+	{
+		MQTTAsync_setTraceCallback(trace_callback);
+		MQTTAsync_setTraceLevel(opts.tracelevel);
+	}
+
+	create_opts.sendWhileDisconnected = 1;
+	if (opts.MQTTVersion >= MQTTVERSION_5)
+		create_opts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&client, url, opts.clientid, MQTTCLIENT_PERSISTENCE_NONE, NULL, &create_opts);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to create client, return code: %s\n", MQTTAsync_strerror(rc));
+		exit(EXIT_FAILURE);
+	}
+
+#if defined(WIN32)
+	signal(SIGINT, cfinish);
+	signal(SIGTERM, cfinish);
+#else
+    memset(&sa, 0, sizeof(struct sigaction));
+    sa.sa_handler = cfinish;
+    sa.sa_flags = 0;
+
+    sigaction(SIGINT, &sa, NULL);
+    sigaction(SIGTERM, &sa, NULL);
+#endif
+
+	rc = MQTTAsync_setCallbacks(client, client, NULL, messageArrived, NULL);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to set callbacks, return code: %s\n", MQTTAsync_strerror(rc));
+		exit(EXIT_FAILURE);
+	}
+
+	if (opts.MQTTVersion >= MQTTVERSION_5)
+	{
+		pub_opts.onSuccess5 = onPublish5;
+		pub_opts.onFailure5 = onPublishFailure5;
+
+		if (opts.message_expiry > 0)
+		{
+			property.identifier = MQTTPROPERTY_CODE_MESSAGE_EXPIRY_INTERVAL;
+			property.value.integer4 = opts.message_expiry;
+			MQTTProperties_add(&props, &property);
+		}
+		if (opts.user_property.name)
+		{
+			property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+			property.value.data.data = opts.user_property.name;
+			property.value.data.len = (int)strlen(opts.user_property.name);
+			property.value.value.data = opts.user_property.value;
+			property.value.value.len = (int)strlen(opts.user_property.value);
+			MQTTProperties_add(&props, &property);
+		}
+		pub_opts.properties = props;
+	}
+	else
+	{
+		pub_opts.onSuccess = onPublish;
+		pub_opts.onFailure = onPublishFailure;
+	}
+
+	myconnect(client);
+
+	while (!toStop)
+	{
+		int data_len = 0;
+		int delim_len = 0;
+
+		if (opts.stdin_lines)
+		{
+			buffer = malloc(opts.maxdatalen);
+
+			delim_len = (int)strlen(opts.delimiter);
+			do
+			{
+				buffer[data_len++] = getchar();
+				if (data_len > delim_len)
+				{
+					if (strncmp(opts.delimiter, &buffer[data_len - delim_len], delim_len) == 0)
+						break;
+				}
+			} while (data_len < opts.maxdatalen);
+
+			rc = mypublish(client, data_len, buffer);
+		}
+		else
+			mysleep(100);
+	}
+
+	if (opts.message == 0 && opts.null_message == 0 && opts.filename == 0)
+		free(buffer);
+
+	if (opts.MQTTVersion >= MQTTVERSION_5)
+		disc_opts.onSuccess5 = onDisconnect5;
+	else
+		disc_opts.onSuccess = onDisconnect;
+	if ((rc = MQTTAsync_disconnect(client, &disc_opts)) != MQTTASYNC_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to start disconnect, return code: %s\n", MQTTAsync_strerror(rc));
+		exit(EXIT_FAILURE);
+	}
+
+	while (!disconnected)
+		mysleep(100);
+
+	MQTTAsync_destroy(&client);
+
+	return EXIT_SUCCESS;
+}
+
+
diff --git a/mqtt/src/src/samples/paho_c_sub.c b/mqtt/src/src/samples/paho_c_sub.c
new file mode 100644
index 00000000..7301dcad
--- /dev/null
+++ b/mqtt/src/src/samples/paho_c_sub.c
@@ -0,0 +1,346 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2019 IBM Corp., and others
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial contribution
+ *    Ian Craggs - fix for bug 413429 - connectionLost not called
+ *    Guilherme Maciel Ferreira - add keep alive option
+ *    Ian Craggs - add full capability
+ *******************************************************************************/
+
+#include "MQTTAsync.h"
+#include "MQTTClientPersistence.h"
+#include "pubsub_opts.h"
+
+#include <stdio.h>
+#include <signal.h>
+#include <string.h>
+#include <stdlib.h>
+
+
+#if defined(WIN32)
+#include <windows.h>
+#define sleep Sleep
+#else
+#include <sys/time.h>
+#include <unistd.h>
+#endif
+
+#if defined(_WRS_KERNEL)
+#include <OsWrapper.h>
+#endif
+
+volatile int finished = 0;
+int subscribed = 0;
+int disconnected = 0;
+
+
+void mysleep(int ms)
+{
+	#if defined(WIN32)
+		Sleep(ms);
+	#else
+		usleep(ms * 1000);
+	#endif
+}
+
+void cfinish(int sig)
+{
+	signal(SIGINT, NULL);
+	finished = 1;
+}
+
+
+struct pubsub_opts opts =
+{
+	0, 0, 0, 0, "\n", 100,  	/* debug/app options */
+	NULL, NULL, 1, 0, 0, /* message options */
+	MQTTVERSION_DEFAULT, NULL, "paho-c-sub", 0, 0, NULL, NULL, "localhost", "1883", NULL, 10, /* MQTT options */
+	NULL, NULL, 0, 0, /* will options */
+	0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* TLS options */
+	0, {NULL, NULL}, /* MQTT V5 options */
+};
+
+
+int messageArrived(void *context, char *topicName, int topicLen, MQTTAsync_message *message)
+{
+	size_t delimlen = 0;
+
+	if (opts.verbose)
+		printf("%d %s\t", message->payloadlen, topicName);
+	if (opts.delimiter)
+		delimlen = strlen(opts.delimiter);
+	if (opts.delimiter == NULL || (message->payloadlen > delimlen &&
+		strncmp(opts.delimiter, &((char*)message->payload)[message->payloadlen - delimlen], delimlen) == 0))
+		printf("%.*s", message->payloadlen, (char*)message->payload);
+	else
+		printf("%.*s%s", message->payloadlen, (char*)message->payload, opts.delimiter);
+	if (message->struct_version == 1 && opts.verbose)
+		logProperties(&message->properties);
+	fflush(stdout);
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+	return 1;
+}
+
+
+void onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	disconnected = 1;
+}
+
+
+void onSubscribe5(void* context, MQTTAsync_successData5* response)
+{
+	subscribed = 1;
+}
+
+void onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	subscribed = 1;
+}
+
+
+void onSubscribeFailure5(void* context, MQTTAsync_failureData5* response)
+{
+	if (!opts.quiet)
+		fprintf(stderr, "Subscribe failed, rc %s reason code %s\n",
+				MQTTAsync_strerror(response->code),
+				MQTTReasonCode_toString(response->reasonCode));
+	finished = 1;
+}
+
+
+void onSubscribeFailure(void* context, MQTTAsync_failureData* response)
+{
+	if (!opts.quiet)
+		fprintf(stderr, "Subscribe failed, rc %s\n",
+			MQTTAsync_strerror(response->code));
+	finished = 1;
+}
+
+
+void onConnectFailure5(void* context, MQTTAsync_failureData5* response)
+{
+	if (!opts.quiet)
+		fprintf(stderr, "Connect failed, rc %s reason code %s\n",
+			MQTTAsync_strerror(response->code),
+			MQTTReasonCode_toString(response->reasonCode));
+	finished = 1;
+}
+
+
+void onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	if (!opts.quiet)
+		fprintf(stderr, "Connect failed, rc %s\n", response ? MQTTAsync_strerror(response->code) : "none");
+	finished = 1;
+}
+
+
+void onConnect5(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_callOptions copts = MQTTAsync_callOptions_initializer;
+	int rc;
+
+	if (opts.verbose)
+		printf("Subscribing to topic %s with client %s at QoS %d\n", opts.topic, opts.clientid, opts.qos);
+
+	copts.onSuccess5 = onSubscribe5;
+	copts.onFailure5 = onSubscribeFailure5;
+	copts.context = client;
+	if ((rc = MQTTAsync_subscribe(client, opts.topic, opts.qos, &copts)) != MQTTASYNC_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to start subscribe, return code %s\n", MQTTAsync_strerror(rc));
+		finished = 1;
+	}
+}
+
+
+void onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync client = (MQTTAsync)context;
+	MQTTAsync_responseOptions ropts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	if (opts.verbose)
+		printf("Subscribing to topic %s with client %s at QoS %d\n", opts.topic, opts.clientid, opts.qos);
+
+	ropts.onSuccess = onSubscribe;
+	ropts.onFailure = onSubscribeFailure;
+	ropts.context = client;
+	if ((rc = MQTTAsync_subscribe(client, opts.topic, opts.qos, &ropts)) != MQTTASYNC_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to start subscribe, return code %s\n", MQTTAsync_strerror(rc));
+		finished = 1;
+	}
+}
+
+MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+
+
+void trace_callback(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	fprintf(stderr, "Trace : %d, %s\n", level, message);
+}
+
+
+int main(int argc, char** argv)
+{
+	MQTTAsync client;
+	MQTTAsync_disconnectOptions disc_opts = MQTTAsync_disconnectOptions_initializer;
+	MQTTAsync_createOptions create_opts = MQTTAsync_createOptions_initializer;
+	MQTTAsync_willOptions will_opts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions ssl_opts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	char* url = NULL;
+	const char* version = NULL;
+	const char* program_name = "paho_c_sub";
+	MQTTAsync_nameValue* infos = MQTTAsync_getVersionInfo();
+#if !defined(WIN32)
+    struct sigaction sa;
+#endif
+
+	if (argc < 2)
+		usage(&opts, (pubsub_opts_nameValue*)infos, program_name);
+
+	if (getopts(argc, argv, &opts) != 0)
+		usage(&opts, (pubsub_opts_nameValue*)infos, program_name);
+
+	if (strchr(opts.topic, '#') || strchr(opts.topic, '+'))
+		opts.verbose = 1;
+
+	if (opts.connection)
+		url = opts.connection;
+	else
+	{
+		url = malloc(100);
+		sprintf(url, "%s:%s", opts.host, opts.port);
+	}
+	if (opts.verbose)
+		printf("URL is %s\n", url);
+
+	if (opts.tracelevel > 0)
+	{
+		MQTTAsync_setTraceCallback(trace_callback);
+		MQTTAsync_setTraceLevel(opts.tracelevel);
+	}
+
+	if (opts.MQTTVersion >= MQTTVERSION_5)
+		create_opts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&client, url, opts.clientid, MQTTCLIENT_PERSISTENCE_NONE,
+			NULL, &create_opts);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to create client, return code: %s\n", MQTTAsync_strerror(rc));
+		exit(EXIT_FAILURE);
+	}
+
+	rc = MQTTAsync_setCallbacks(client, client, NULL, messageArrived, NULL);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to set callbacks, return code: %s\n", MQTTAsync_strerror(rc));
+		exit(EXIT_FAILURE);
+	}
+
+#if defined(WIN32)
+	signal(SIGINT, cfinish);
+	signal(SIGTERM, cfinish);
+#else
+    memset(&sa, 0, sizeof(struct sigaction));
+    sa.sa_handler = cfinish;
+    sa.sa_flags = 0;
+
+    sigaction(SIGINT, &sa, NULL);
+    sigaction(SIGTERM, &sa, NULL);
+#endif
+
+	if (opts.MQTTVersion == MQTTVERSION_5)
+	{
+		MQTTAsync_connectOptions conn_opts5 = MQTTAsync_connectOptions_initializer5;
+		conn_opts = conn_opts5;
+		conn_opts.onSuccess5 = onConnect5;
+		conn_opts.onFailure5 = onConnectFailure5;
+		conn_opts.cleanstart = 1;
+	}
+	else
+	{
+		conn_opts.onSuccess = onConnect;
+		conn_opts.onFailure = onConnectFailure;
+		conn_opts.cleansession = 1;
+	}
+	conn_opts.keepAliveInterval = opts.keepalive;
+	conn_opts.username = opts.username;
+	conn_opts.password = opts.password;
+	conn_opts.MQTTVersion = opts.MQTTVersion;
+	conn_opts.context = client;
+	conn_opts.automaticReconnect = 1;
+
+	if (opts.will_topic) 	/* will options */
+	{
+		will_opts.message = opts.will_payload;
+		will_opts.topicName = opts.will_topic;
+		will_opts.qos = opts.will_qos;
+		will_opts.retained = opts.will_retain;
+		conn_opts.will = &will_opts;
+	}
+
+	if (opts.connection && (strncmp(opts.connection, "ssl://", 6) == 0 ||
+			strncmp(opts.connection, "wss://", 6) == 0))
+	{
+		ssl_opts.verify = (opts.insecure) ? 0 : 1;
+		ssl_opts.CApath = opts.capath;
+		ssl_opts.keyStore = opts.cert;
+		ssl_opts.trustStore = opts.cafile;
+		ssl_opts.privateKey = opts.key;
+		ssl_opts.privateKeyPassword = opts.keypass;
+		ssl_opts.enabledCipherSuites = opts.ciphers;
+		conn_opts.ssl = &ssl_opts;
+	}
+
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to start connect, return code %s\n", MQTTAsync_strerror(rc));
+		exit(EXIT_FAILURE);
+	}
+
+	while (!subscribed)
+		mysleep(100);
+
+	if (finished)
+		goto exit;
+
+	while (!finished)
+		mysleep(100);
+
+	disc_opts.onSuccess = onDisconnect;
+	if ((rc = MQTTAsync_disconnect(client, &disc_opts)) != MQTTASYNC_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to start disconnect, return code: %s\n", MQTTAsync_strerror(rc));
+		exit(EXIT_FAILURE);
+	}
+
+	while (!disconnected)
+		mysleep(100);
+
+exit:
+	MQTTAsync_destroy(&client);
+
+	return EXIT_SUCCESS;
+}
diff --git a/mqtt/src/src/samples/paho_cs_pub.c b/mqtt/src/src/samples/paho_cs_pub.c
new file mode 100644
index 00000000..0a5fec1b
--- /dev/null
+++ b/mqtt/src/src/samples/paho_cs_pub.c
@@ -0,0 +1,309 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial contribution
+ *    Ian Craggs - add full capability
+ *******************************************************************************/
+
+#include "MQTTClient.h"
+#include "MQTTClientPersistence.h"
+#include "pubsub_opts.h"
+
+#include <stdio.h>
+#include <signal.h>
+#include <string.h>
+#include <stdlib.h>
+
+#if defined(WIN32)
+#define sleep Sleep
+#else
+#include <sys/time.h>
+#endif
+
+volatile int toStop = 0;
+
+
+void cfinish(int sig)
+{
+	signal(SIGINT, NULL);
+	toStop = 1;
+}
+
+
+struct pubsub_opts opts =
+{
+	1, 0, 0, 0, "\n", 100,  	/* debug/app options */
+	NULL, NULL, 1, 0, 0, /* message options */
+	MQTTVERSION_DEFAULT, NULL, "paho-cs-pub", 0, 0, NULL, NULL, "localhost", "1883", NULL, 10, /* MQTT options */
+	NULL, NULL, 0, 0, /* will options */
+	0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* TLS options */
+	0, {NULL, NULL}, /* MQTT V5 options */
+};
+
+
+int myconnect(MQTTClient* client)
+{
+	MQTTClient_connectOptions conn_opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_SSLOptions ssl_opts = MQTTClient_SSLOptions_initializer;
+	MQTTClient_willOptions will_opts = MQTTClient_willOptions_initializer;
+	int rc = 0;
+
+	if (opts.verbose)
+		printf("Connecting\n");
+
+	if (opts.MQTTVersion == MQTTVERSION_5)
+	{
+		MQTTClient_connectOptions conn_opts5 = MQTTClient_connectOptions_initializer5;
+		conn_opts = conn_opts5;
+	}
+
+	conn_opts.keepAliveInterval = opts.keepalive;
+	conn_opts.username = opts.username;
+	conn_opts.password = opts.password;
+	conn_opts.MQTTVersion = opts.MQTTVersion;
+
+	if (opts.will_topic) 	/* will options */
+	{
+		will_opts.message = opts.will_payload;
+		will_opts.topicName = opts.will_topic;
+		will_opts.qos = opts.will_qos;
+		will_opts.retained = opts.will_retain;
+		conn_opts.will = &will_opts;
+	}
+
+	if (opts.connection && (strncmp(opts.connection, "ssl://", 6) == 0 ||
+			strncmp(opts.connection, "wss://", 6) == 0))
+	{
+		if (opts.insecure)
+			ssl_opts.verify = 0;
+		else
+			ssl_opts.verify = 1;
+		ssl_opts.CApath = opts.capath;
+		ssl_opts.keyStore = opts.cert;
+		ssl_opts.trustStore = opts.cafile;
+		ssl_opts.privateKey = opts.key;
+		ssl_opts.privateKeyPassword = opts.keypass;
+		ssl_opts.enabledCipherSuites = opts.ciphers;
+		conn_opts.ssl = &ssl_opts;
+	}
+
+	if (opts.MQTTVersion == MQTTVERSION_5)
+	{
+		MQTTProperties props = MQTTProperties_initializer;
+		MQTTProperties willProps = MQTTProperties_initializer;
+		MQTTResponse response = MQTTResponse_initializer;
+
+		conn_opts.cleanstart = 1;
+		response = MQTTClient_connect5(client, &conn_opts, &props, &willProps);
+		rc = response.reasonCode;
+	}
+	else
+	{
+		conn_opts.cleansession = 1;
+		rc = MQTTClient_connect(client, &conn_opts);
+	}
+
+	if (opts.verbose && rc == MQTTCLIENT_SUCCESS)
+		printf("Connected\n");
+	else if (rc != MQTTCLIENT_SUCCESS && !opts.quiet)
+		fprintf(stderr, "Connect failed return code: %s\n", MQTTClient_strerror(rc));
+
+	return rc;
+}
+
+
+int messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* m)
+{
+	/* not expecting any messages */
+	return 1;
+}
+
+
+void trace_callback(enum MQTTCLIENT_TRACE_LEVELS level, char* message)
+{
+	fprintf(stderr, "Trace : %d, %s\n", level, message);
+}
+
+
+int main(int argc, char** argv)
+{
+	MQTTClient client;
+	MQTTProperties pub_props = MQTTProperties_initializer;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+	char* buffer = NULL;
+	int rc = 0;
+	char* url;
+	const char* version = NULL;
+#if !defined(WIN32)
+    struct sigaction sa;
+#endif
+	const char* program_name = "paho_cs_pub";
+	MQTTClient_nameValue* infos = MQTTClient_getVersionInfo();
+
+	if (argc < 2)
+		usage(&opts, (pubsub_opts_nameValue*)infos, program_name);
+
+	if (getopts(argc, argv, &opts) != 0)
+		usage(&opts, (pubsub_opts_nameValue*)infos, program_name);
+
+	if (opts.connection)
+		url = opts.connection;
+	else
+	{
+		url = malloc(100);
+		sprintf(url, "%s:%s", opts.host, opts.port);
+	}
+	if (opts.verbose)
+		printf("URL is %s\n", url);
+
+	if (opts.tracelevel > 0)
+	{
+		MQTTClient_setTraceCallback(trace_callback);
+		MQTTClient_setTraceLevel(opts.tracelevel);
+	}
+
+	if (opts.MQTTVersion >= MQTTVERSION_5)
+		createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&client, url, opts.clientid, MQTTCLIENT_PERSISTENCE_NONE,
+			NULL, &createOpts);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to create client, return code: %s\n", MQTTClient_strerror(rc));
+		exit(EXIT_FAILURE);
+	}
+
+#if defined(WIN32)
+	signal(SIGINT, cfinish);
+	signal(SIGTERM, cfinish);
+#else
+    memset(&sa, 0, sizeof(struct sigaction));
+    sa.sa_handler = cfinish;
+    sa.sa_flags = 0;
+
+    sigaction(SIGINT, &sa, NULL);
+    sigaction(SIGTERM, &sa, NULL);
+#endif
+
+	rc = MQTTClient_setCallbacks(client, NULL, NULL, messageArrived, NULL);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to set callbacks, return code: %s\n", MQTTClient_strerror(rc));
+		exit(EXIT_FAILURE);
+	}
+
+	if (myconnect(client) != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (opts.MQTTVersion >= MQTTVERSION_5)
+	{
+		MQTTProperty property;
+
+		if (opts.message_expiry > 0)
+		{
+			property.identifier = MQTTPROPERTY_CODE_MESSAGE_EXPIRY_INTERVAL;
+			property.value.integer4 = opts.message_expiry;
+			MQTTProperties_add(&pub_props, &property);
+		}
+		if (opts.user_property.name)
+		{
+			property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+			property.value.data.data = opts.user_property.name;
+			property.value.data.len = (int)strlen(opts.user_property.name);
+			property.value.value.data = opts.user_property.value;
+			property.value.value.len = (int)strlen(opts.user_property.value);
+			MQTTProperties_add(&pub_props, &property);
+		}
+	}
+
+	while (!toStop)
+	{
+		int data_len = 0;
+		int delim_len = 0;
+
+		if (opts.stdin_lines)
+		{
+			buffer = malloc(opts.maxdatalen);
+
+			delim_len = (int)strlen(opts.delimiter);
+			do
+			{
+				int c = getchar();
+
+				if (c < 0)
+					goto exit;
+				buffer[data_len++] = c;
+				if (data_len > delim_len)
+				{
+					if (strncmp(opts.delimiter, &buffer[data_len - delim_len], delim_len) == 0)
+						break;
+				}
+			} while (data_len < opts.maxdatalen);
+		}
+		else if (opts.message)
+		{
+			buffer = opts.message;
+			data_len = (int)strlen(opts.message);
+		}
+		else if (opts.filename)
+		{
+			buffer = readfile(&data_len, &opts);
+			if (buffer == NULL)
+				goto exit;
+		}
+		if (opts.verbose)
+			fprintf(stderr, "Publishing data of length %d\n", data_len);
+
+		if (opts.MQTTVersion == MQTTVERSION_5)
+		{
+			MQTTResponse response = MQTTResponse_initializer;
+
+			response = MQTTClient_publish5(client, opts.topic, data_len, buffer, opts.qos, opts.retained, &pub_props, NULL);
+			rc = response.reasonCode;
+		}
+		else
+			rc = MQTTClient_publish(client, opts.topic, data_len, buffer, opts.qos, opts.retained, NULL);
+		if (opts.stdin_lines == 0)
+			break;
+
+		if (rc != 0)
+		{
+			myconnect(client);
+			if (opts.MQTTVersion == MQTTVERSION_5)
+			{
+				MQTTResponse response = MQTTResponse_initializer;
+
+				response = MQTTClient_publish5(client, opts.topic, data_len, buffer, opts.qos, opts.retained, &pub_props, NULL);
+				rc = response.reasonCode;
+			}
+			else
+				rc = MQTTClient_publish(client, opts.topic, data_len, buffer, opts.qos, opts.retained, NULL);
+		}
+		if (opts.qos > 0)
+			MQTTClient_yield();
+	}
+
+exit:
+	if (opts.filename || opts.stdin_lines)
+		free(buffer);
+
+	if (opts.MQTTVersion == MQTTVERSION_5)
+		rc = MQTTClient_disconnect5(client, 0, MQTTREASONCODE_SUCCESS, NULL);
+	else
+		rc = MQTTClient_disconnect(client, 0);
+
+ 	MQTTClient_destroy(&client);
+
+	return EXIT_SUCCESS;
+}
diff --git a/mqtt/src/src/samples/paho_cs_sub.c b/mqtt/src/src/samples/paho_cs_sub.c
new file mode 100644
index 00000000..d70042a0
--- /dev/null
+++ b/mqtt/src/src/samples/paho_cs_sub.c
@@ -0,0 +1,252 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp., and others
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial contribution
+ *    Ian Craggs - change delimiter option from char to string
+ *    Guilherme Maciel Ferreira - add keep alive option
+ *    Ian Craggs - add full capability
+ *******************************************************************************/
+
+#include "MQTTClient.h"
+#include "MQTTClientPersistence.h"
+#include "pubsub_opts.h"
+
+#include <stdio.h>
+#include <signal.h>
+#include <string.h>
+#include <stdlib.h>
+
+
+#if defined(WIN32)
+#define sleep Sleep
+#else
+#include <sys/time.h>
+#endif
+
+
+volatile int toStop = 0;
+
+
+struct pubsub_opts opts =
+{
+	0, 0, 0, 0, "\n", 100,  	/* debug/app options */
+	NULL, NULL, 1, 0, 0, /* message options */
+	MQTTVERSION_DEFAULT, NULL, "paho-cs-sub", 0, 0, NULL, NULL, "localhost", "1883", NULL, 10, /* MQTT options */
+	NULL, NULL, 0, 0, /* will options */
+	0, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, /* TLS options */
+	0, {NULL, NULL}, /* MQTT V5 options */
+};
+
+
+int myconnect(MQTTClient* client)
+{
+	MQTTClient_connectOptions conn_opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_SSLOptions ssl_opts = MQTTClient_SSLOptions_initializer;
+	MQTTClient_willOptions will_opts = MQTTClient_willOptions_initializer;
+	int rc = 0;
+
+	if (opts.verbose)
+		printf("Connecting\n");
+
+	if (opts.MQTTVersion == MQTTVERSION_5)
+	{
+		MQTTClient_connectOptions conn_opts5 = MQTTClient_connectOptions_initializer5;
+		conn_opts = conn_opts5;
+	}
+
+	conn_opts.keepAliveInterval = opts.keepalive;
+	conn_opts.username = opts.username;
+	conn_opts.password = opts.password;
+	conn_opts.MQTTVersion = opts.MQTTVersion;
+
+	if (opts.will_topic) 	/* will options */
+	{
+		will_opts.message = opts.will_payload;
+		will_opts.topicName = opts.will_topic;
+		will_opts.qos = opts.will_qos;
+		will_opts.retained = opts.will_retain;
+		conn_opts.will = &will_opts;
+	}
+
+	if (opts.connection && (strncmp(opts.connection, "ssl://", 6) == 0 ||
+			strncmp(opts.connection, "wss://", 6) == 0))
+	{
+		if (opts.insecure)
+			ssl_opts.verify = 0;
+		else
+			ssl_opts.verify = 1;
+		ssl_opts.CApath = opts.capath;
+		ssl_opts.keyStore = opts.cert;
+		ssl_opts.trustStore = opts.cafile;
+		ssl_opts.privateKey = opts.key;
+		ssl_opts.privateKeyPassword = opts.keypass;
+		ssl_opts.enabledCipherSuites = opts.ciphers;
+		conn_opts.ssl = &ssl_opts;
+	}
+
+	if (opts.MQTTVersion == MQTTVERSION_5)
+	{
+		MQTTProperties props = MQTTProperties_initializer;
+		MQTTProperties willProps = MQTTProperties_initializer;
+		MQTTResponse response = MQTTResponse_initializer;
+
+		conn_opts.cleanstart = 1;
+		response = MQTTClient_connect5(client, &conn_opts, &props, &willProps);
+		rc = response.reasonCode;
+		MQTTResponse_free(response);
+	}
+	else
+	{
+		conn_opts.cleansession = 1;
+		rc = MQTTClient_connect(client, &conn_opts);
+	}
+
+	if (opts.verbose && rc == MQTTCLIENT_SUCCESS)
+		fprintf(stderr, "Connected\n");
+	else if (rc != MQTTCLIENT_SUCCESS && !opts.quiet)
+		fprintf(stderr, "Connect failed return code: %s\n", MQTTClient_strerror(rc));
+
+	return rc;
+}
+
+
+void cfinish(int sig)
+{
+	signal(SIGINT, NULL);
+	toStop = 1;
+}
+
+
+void trace_callback(enum MQTTCLIENT_TRACE_LEVELS level, char* message)
+{
+	fprintf(stderr, "Trace : %d, %s\n", level, message);
+}
+
+
+int main(int argc, char** argv)
+{
+	MQTTClient client;
+	MQTTClient_connectOptions conn_opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+	int rc = 0;
+	char* url;
+	const char* version = NULL;
+#if !defined(WIN32)
+    struct sigaction sa;
+#endif
+	const char* program_name = "paho_cs_sub";
+	MQTTClient_nameValue* infos = MQTTClient_getVersionInfo();
+
+	if (argc < 2)
+		usage(&opts, (pubsub_opts_nameValue*)infos, program_name);
+
+	if (getopts(argc, argv, &opts) != 0)
+		usage(&opts, (pubsub_opts_nameValue*)infos, program_name);
+
+	if (strchr(opts.topic, '#') || strchr(opts.topic, '+'))
+		opts.verbose = 1;
+
+	if (opts.connection)
+		url = opts.connection;
+	else
+	{
+		url = malloc(100);
+		sprintf(url, "%s:%s", opts.host, opts.port);
+	}
+	if (opts.verbose)
+		printf("URL is %s\n", url);
+
+	if (opts.tracelevel > 0)
+	{
+		MQTTClient_setTraceCallback(trace_callback);
+		MQTTClient_setTraceLevel(opts.tracelevel);
+	}
+
+	if (opts.MQTTVersion >= MQTTVERSION_5)
+		createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&client, url, opts.clientid, MQTTCLIENT_PERSISTENCE_NONE,
+			NULL, &createOpts);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Failed to create client, return code: %s\n", MQTTClient_strerror(rc));
+		exit(EXIT_FAILURE);
+	}
+
+#if defined(WIN32)
+	signal(SIGINT, cfinish);
+	signal(SIGTERM, cfinish);
+#else
+    memset(&sa, 0, sizeof(struct sigaction));
+    sa.sa_handler = cfinish;
+    sa.sa_flags = 0;
+
+    sigaction(SIGINT, &sa, NULL);
+    sigaction(SIGTERM, &sa, NULL);
+#endif
+
+	if (myconnect(client) != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (opts.MQTTVersion >= MQTTVERSION_5)
+	{
+		MQTTResponse response = MQTTClient_subscribe5(client, opts.topic, opts.qos, NULL, NULL);
+		rc = response.reasonCode;
+		MQTTResponse_free(response);
+	}
+	else
+		rc = MQTTClient_subscribe(client, opts.topic, opts.qos);
+	if (rc != MQTTCLIENT_SUCCESS && rc != opts.qos)
+	{
+		if (!opts.quiet)
+			fprintf(stderr, "Error %d subscribing to topic %s\n", rc, opts.topic);
+		goto exit;
+	}
+
+	while (!toStop)
+	{
+		char* topicName = NULL;
+		int topicLen;
+		MQTTClient_message* message = NULL;
+
+		rc = MQTTClient_receive(client, &topicName, &topicLen, &message, 1000);
+		if (message)
+		{
+			size_t delimlen = 0;
+
+			if (opts.verbose)
+				printf("%s\t", topicName);
+			if (opts.delimiter)
+				delimlen = strlen(opts.delimiter);
+			if (opts.delimiter == NULL || (message->payloadlen > delimlen &&
+				strncmp(opts.delimiter, &((char*)message->payload)[message->payloadlen - delimlen], delimlen) == 0))
+				printf("%.*s", message->payloadlen, (char*)message->payload);
+			else
+				printf("%.*s%s", message->payloadlen, (char*)message->payload, opts.delimiter);
+			if (message->struct_version == 1 && opts.verbose)
+				logProperties(&message->properties);
+			fflush(stdout);
+			MQTTClient_freeMessage(&message);
+			MQTTClient_free(topicName);
+		}
+		if (rc != 0)
+			myconnect(&client);
+	}
+
+exit:
+	MQTTClient_disconnect(client, 0);
+
+	MQTTClient_destroy(&client);
+
+	return EXIT_SUCCESS;
+}
diff --git a/mqtt/src/src/samples/pubsub_opts.c b/mqtt/src/src/samples/pubsub_opts.c
new file mode 100644
index 00000000..b6ef7ad3
--- /dev/null
+++ b/mqtt/src/src/samples/pubsub_opts.c
@@ -0,0 +1,502 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial contribution
+ *******************************************************************************/
+
+#include "pubsub_opts.h"
+
+#include <string.h>
+#include <stdlib.h>
+
+
+int printVersionInfo(pubsub_opts_nameValue* info)
+{
+	int rc = 0;
+
+	printf("\nLibrary information:\n");
+	while (info->name)
+	{
+		printf("%s: %s\n", info->name, info->value);
+		info++;
+		rc = 1;  /* at least one value printed */
+	}
+	if (rc == 1)
+		printf("\n");
+	return rc;
+}
+
+
+void usage(struct pubsub_opts* opts, pubsub_opts_nameValue* name_values, const char* program_name)
+{
+	printf("Eclipse Paho MQTT C %s\n", opts->publisher ? "publisher" : "subscriber");
+	printVersionInfo(name_values);
+
+	printf("Usage: %s [topicname] [-t topic] [-c connection] [-h host] [-p port]\n"
+		   "       [-q qos] [-i clientid] [-u username] [-P password] [-k keepalive_timeout]\n"
+			, program_name);
+	printf("       [-V MQTT-version] [--quiet] [--trace trace-level]\n");
+	if (opts->publisher)
+	{
+		printf("       [-r] [-n] [-m message] [-f filename]\n");
+		printf("       [--maxdatalen len] [--message-expiry seconds] [--user-property name value]\n");
+	}
+	else
+		printf("       [-R] [--no-delimiter]\n");
+	printf("       [--will-topic topic] [--will-payload message] [--will-qos qos] [--will-retain]\n");
+	printf("       [--cafile filename] [--capath dirname] [--cert filename] [--key filename]\n"
+		   "       [--keypass string] [--ciphers string] [--insecure]");
+
+	printf(
+	"\n\n  -t (--topic)        : MQTT topic to %s to\n"
+	"  -c (--connection)   : connection string, overrides host/port e.g wss://hostname:port/ws.  Use this option\n"
+	"                        rather than host/port to connect with TLS and/or web sockets. No default.\n"
+	"  -h (--host)         : host to connect to.  Default is %s.\n"
+	"  -p (--port)         : network port to connect to. Default is %s.\n"
+	"  -q (--qos)          : MQTT QoS to %s with (0, 1 or 2). Default is %d.\n"
+	"  -V (--MQTTversion)  : MQTT version (31, 311, or 5).  Default is 311.\n"
+	"  --quiet             : do not print error messages.\n"
+	"  --trace             : print internal trace (\"error\", \"min\", \"max\" or \"protocol\").\n",
+			opts->publisher ? "publish" : "subscribe", opts->host, opts->port,
+			opts->publisher ? "publish" : "subscribe", opts->qos);
+
+	if (opts->publisher)
+	{
+		printf("  -r (--retained)   : use MQTT retain option.  Default is off.\n");
+		printf("  -n (--null-message) : send 0-length message.\n");
+		printf("  -m (--message)    : the payload to send.\n");
+		printf("  -f (--filename)   : use the contents of the named file as the payload.\n");
+	}
+
+	printf(
+	"  -i (--clientid)     : MQTT client id. Default is %s.\n"
+	"  -u (--username)     : MQTT username. No default.\n"
+	"  -P (--password)     : MQTT password. No default.\n"
+	"  -k (--keepalive)    : MQTT keepalive timeout value. Default is %d seconds.\n"
+	"  --delimiter         : delimiter string.  Default is \\n.\n",
+	opts->clientid,  opts->keepalive);
+
+	if (opts->publisher)
+	{
+		printf("  --maxdatalen        : maximum length of data to read when publishing strings (default is %d)\n",
+				opts->maxdatalen);
+		printf("  --message-expiry    : MQTT 5 only.  Sets the message expiry property in seconds.\n");
+		printf("  --user-property     : MQTT 5 only.  Sets a user property.\n");
+	}
+	else
+	{
+		printf("  --no-delimiter      : do not use a delimiter string between messages.\n");
+		printf("  -R (--no-retained)  : do not print retained messages.\n");
+	}
+
+	printf(
+	"  --will-topic        : will topic on connect.  No default.\n"
+	"  --will-payload      : will message.  If the will topic is set, but not payload, a null message will be set.\n"
+	"  --will-retain       : set the retained flag on the will message.  The default is off.\n"
+	"  --will-qos          : the will message QoS.  The default is 0.\n"
+	);
+
+	printf(
+	"  --cafile            : a filename for the TLS truststore.\n"
+	"  --capath            : a directory name containing TLS trusted server certificates.\n"
+	"  --cert              : a filename for the TLS keystore containing client certificates.\n"
+	"  --key               : client private key file.\n"
+	"  --keypass           : password for the client private key file.\n"
+	"  --ciphers           : the list of cipher suites that the client will present to the server during\n"
+	"                        the TLS handshake.\n"
+	"  --insecure          : don't check that the server certificate common name matches the hostname.\n"
+	"  --psk               : pre-shared-key in hexadecimal (no leading 0x) \n"
+	"  --psk-identity      : client identity string for TLS-PSK mode.\n"
+	);
+
+	printf("\nSee http://eclipse.org/paho for more information about the Eclipse Paho project.\n");
+	exit(EXIT_FAILURE);
+}
+
+
+
+int getopts(int argc, char** argv, struct pubsub_opts* opts)
+{
+	int count = 1;
+
+	if (argv[1][0] != '-')
+	{
+		opts->topic = argv[1];
+		count = 2;
+	}
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--verbose") == 0 || strcmp(argv[count], "-v") == 0)
+			opts->verbose = 1;
+		else if (strcmp(argv[count], "--quiet") == 0)
+			opts->quiet = 1;
+		else if (strcmp(argv[count], "--qos") == 0 || strcmp(argv[count], "-q") == 0)
+		{
+			if (++count < argc)
+			{
+				if (strcmp(argv[count], "0") == 0)
+					opts->qos = 0;
+				else if (strcmp(argv[count], "1") == 0)
+					opts->qos = 1;
+				else if (strcmp(argv[count], "2") == 0)
+					opts->qos = 2;
+				else
+					return 1;
+			}
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--connection") == 0 || strcmp(argv[count], "-c") == 0)
+		{
+			if (++count < argc)
+				opts->connection = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--host") == 0 || strcmp(argv[count], "-h") == 0)
+		{
+			if (++count < argc)
+				opts->host = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--port") == 0 || strcmp(argv[count], "-p") == 0)
+		{
+			if (++count < argc)
+				opts->port = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--clientid") == 0 || strcmp(argv[count], "-i") == 0)
+		{
+			if (++count < argc)
+				opts->clientid = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--username") == 0 || strcmp(argv[count], "-u") == 0)
+		{
+			if (++count < argc)
+				opts->username = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--password") == 0 || strcmp(argv[count], "-P") == 0)
+		{
+			if (++count < argc)
+				opts->password = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--maxdatalen") == 0)
+		{
+			if (++count < argc)
+				opts->maxdatalen = atoi(argv[count]);
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--delimiter") == 0)
+		{
+			if (++count < argc)
+				opts->delimiter = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--no-delimiter") == 0)
+			opts->delimiter = NULL;
+		else if (strcmp(argv[count], "--keepalive") == 0 || strcmp(argv[count], "-k") == 0)
+		{
+			if (++count < argc)
+				opts->keepalive = atoi(argv[count]);
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--topic") == 0 || strcmp(argv[count], "-t") == 0)
+		{
+			if (++count < argc)
+				opts->topic = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--will-topic") == 0)
+		{
+			if (++count < argc)
+				opts->will_topic = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--will-payload") == 0)
+		{
+			if (++count < argc)
+				opts->will_payload = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--will-qos") == 0)
+		{
+			if (++count < argc)
+				opts->will_qos = atoi(argv[count]);
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--will-retain") == 0)
+		{
+			if (++count < argc)
+				opts->will_retain = 1;
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--insecure") == 0)
+			opts->insecure = 1;
+		else if (strcmp(argv[count], "--capath") == 0)
+		{
+			if (++count < argc)
+				opts->capath = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--cafile") == 0)
+		{
+			if (++count < argc)
+				opts->cafile = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--cert") == 0)
+		{
+			if (++count < argc)
+				opts->cert = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--key") == 0)
+		{
+			if (++count < argc)
+				opts->key = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--keypass") == 0)
+		{
+			if (++count < argc)
+				opts->keypass = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--ciphers") == 0)
+		{
+			if (++count < argc)
+				opts->ciphers = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--psk") == 0)
+		{
+			if (++count < argc)
+				opts->psk = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--psk-identity") == 0)
+		{
+			if (++count < argc)
+				opts->psk_identity = argv[count];
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "-V") == 0)
+		{
+			if (++count < argc)
+			{
+				if (strcmp(argv[count], "mqttv31") == 0 || strcmp(argv[count], "31") == 0)
+					opts->MQTTVersion = MQTTVERSION_3_1;
+				else if (strcmp(argv[count], "mqttv311") == 0 || strcmp(argv[count], "311") == 0)
+					opts->MQTTVersion = MQTTVERSION_3_1_1;
+				else if (strcmp(argv[count], "mqttv5") == 0 || strcmp(argv[count], "5") == 0)
+					opts->MQTTVersion = MQTTVERSION_5;
+				else
+					return 1;
+			}
+			else
+				return 1;
+		}
+		else if (strcmp(argv[count], "--trace") == 0)
+		{
+			if (++count < argc)
+			{
+				if (strcmp(argv[count], "error") == 0)
+					opts->tracelevel = MQTTASYNC_TRACE_ERROR;
+				else if (strcmp(argv[count], "protocol") == 0)
+					opts->tracelevel = MQTTASYNC_TRACE_PROTOCOL;
+				else if (strcmp(argv[count], "min") == 0 || strcmp(argv[count], "on") == 0)
+					opts->tracelevel = MQTTASYNC_TRACE_MINIMUM;
+				else if (strcmp(argv[count], "max") == 0)
+					opts->tracelevel = MQTTASYNC_TRACE_MAXIMUM;
+				else
+					return 1;
+			}
+			else
+				return 1;
+		}
+		else if (opts->publisher == 0)
+		{
+			if (strcmp(argv[count], "--no-retained") == 0 || strcmp(argv[count], "-R") == 0)
+				opts->retained = 1;
+			else
+			{
+				fprintf(stderr, "Unknown option %s\n", argv[count]);
+				return 1;
+			}
+		}
+		else if (opts->publisher == 1)
+		{
+			if (strcmp(argv[count], "--retained") == 0 || strcmp(argv[count], "-r") == 0)
+				opts->retained = 1;
+			else if (strcmp(argv[count], "--user-property") == 0)
+			{
+				if (count + 2 < argc)
+				{
+					opts->user_property.name = argv[++count];
+					opts->user_property.value = argv[++count];
+				}
+				else
+					return 1;
+			}
+			else if (strcmp(argv[count], "--message-expiry") == 0)
+			{
+				if (++count < argc)
+					opts->message_expiry = atoi(argv[count]);
+				else
+					return 1;
+			}
+			else if (strcmp(argv[count], "-m") == 0 || strcmp(argv[count], "--message") == 0)
+			{
+				if (++count < argc)
+				{
+					opts->stdin_lines = 0;
+					opts->message = argv[count];
+				}
+				else
+					return 1;
+			}
+			else if (strcmp(argv[count], "-f") == 0 || strcmp(argv[count], "--filename") == 0)
+			{
+				if (++count < argc)
+				{
+					opts->stdin_lines = 0;
+					opts->filename = argv[count];
+				}
+				else
+					return 1;
+			}
+			else if (strcmp(argv[count], "-n") == 0 || strcmp(argv[count], "--null-message") == 0)
+			{
+				opts->stdin_lines = 0;
+				opts->null_message = 1;
+			}
+			else
+			{
+				fprintf(stderr, "Unknown option %s\n", argv[count]);
+				return 1;
+			}
+		}
+		else
+		{
+			fprintf(stderr, "Unknown option %s\n", argv[count]);
+			return 1;
+		}
+
+		count++;
+	}
+
+	if (opts->topic == NULL)
+		return 1;
+
+	return 0;
+}
+
+
+char* readfile(int* data_len, struct pubsub_opts* opts)
+{
+	char* buffer = NULL;
+	long filesize = 0L;
+	FILE* infile = fopen(opts->filename, "rb");
+
+	if (infile == NULL)
+	{
+		fprintf(stderr, "Can't open file %s\n", opts->filename);
+		return NULL;
+	}
+	fseek(infile, 0, SEEK_END);
+	filesize = ftell(infile);
+	rewind(infile);
+
+	buffer = malloc(sizeof(char)*filesize);
+	if (buffer == NULL)
+	{
+		fprintf(stderr, "Can't allocate buffer to read file %s\n", opts->filename);
+		fclose(infile);
+		return NULL;
+	}
+	*data_len = (int)fread(buffer, 1, filesize, infile);
+	if (*data_len != filesize)
+	{
+		fprintf(stderr, "%d bytes read of %ld expected for file %s\n", *data_len, filesize, opts->filename);
+		fclose(infile);
+		free(buffer);
+		return NULL;
+	}
+
+	fclose(infile);
+	return buffer;
+}
+
+
+void logProperties(MQTTProperties *props)
+{
+	int i = 0;
+
+	for (i = 0; i < props->count; ++i)
+	{
+		int id = props->array[i].identifier;
+		const char* name = MQTTPropertyName(id);
+		char* intformat = "Property name %s value %d\n";
+
+		switch (MQTTProperty_getType(id))
+		{
+		case MQTTPROPERTY_TYPE_BYTE:
+		  printf(intformat, name, props->array[i].value.byte);
+		  break;
+		case MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER:
+		  printf(intformat, name, props->array[i].value.integer2);
+		  break;
+		case MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER:
+		  printf(intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER:
+		  printf(intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_BINARY_DATA:
+		case MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING:
+		  printf("Property name %s value len %.*s\n", name,
+				  props->array[i].value.data.len, props->array[i].value.data.data);
+		  break;
+		case MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR:
+		  printf("Property name %s key %.*s value %.*s\n", name,
+			  props->array[i].value.data.len, props->array[i].value.data.data,
+		  	  props->array[i].value.value.len, props->array[i].value.value.data);
+		  break;
+		}
+	}
+}
diff --git a/mqtt/src/src/samples/pubsub_opts.h b/mqtt/src/src/samples/pubsub_opts.h
new file mode 100644
index 00000000..462bf040
--- /dev/null
+++ b/mqtt/src/src/samples/pubsub_opts.h
@@ -0,0 +1,88 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *   http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial contribution
+ *    Guilherme Maciel Ferreira - add keep alive option
+ *******************************************************************************/
+
+#if !defined(PUBSUB_OPTS_H)
+#define PUBSUB_OPTS_H
+
+#include "MQTTAsync.h"
+#include "MQTTClientPersistence.h"
+
+struct pubsub_opts
+{
+	/* debug app options */
+	int publisher;  /* publisher app? */
+	int quiet;
+	int verbose;
+	int tracelevel;
+	char* delimiter;
+	int maxdatalen;
+	/* message options */
+	char* message;
+	char* filename;
+	int stdin_lines;
+	int stdlin_complete;
+	int null_message;
+	/* MQTT options */
+	int MQTTVersion;
+	char* topic;
+	char* clientid;
+	int qos;
+	int retained;
+	char* username;
+	char* password;
+	char* host;
+	char* port;
+	char* connection;
+	int keepalive;
+	/* will options */
+	char* will_topic;
+	char* will_payload;
+	int will_qos;
+	int will_retain;
+	/* TLS options */
+	int insecure;
+	char* capath;
+	char* cert;
+	char* cafile;
+	char* key;
+	char* keypass;
+	char* ciphers;
+	char* psk_identity;
+	char* psk;
+	/* MQTT V5 options */
+	int message_expiry;
+	struct {
+		char *name;
+		char *value;
+	} user_property;
+};
+
+typedef struct
+{
+	const char* name;
+	const char* value;
+} pubsub_opts_nameValue;
+
+//void usage(struct pubsub_opts* opts, const char* version, const char* program_name);
+void usage(struct pubsub_opts* opts, pubsub_opts_nameValue* name_values, const char* program_name);
+int getopts(int argc, char** argv, struct pubsub_opts* opts);
+char* readfile(int* data_len, struct pubsub_opts* opts);
+void logProperties(MQTTProperties *props);
+
+#endif
+
+
diff --git a/mqtt/src/src/utf-8.c b/mqtt/src/src/utf-8.c
new file mode 100644
index 00000000..6fd10c8f
--- /dev/null
+++ b/mqtt/src/src/utf-8.c
@@ -0,0 +1,228 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * \brief Functions for checking that strings contain UTF-8 characters only
+ *
+ * See page 104 of the Unicode Standard 5.0 for the list of well formed
+ * UTF-8 byte sequences.
+ *
+ */
+#include "utf-8.h"
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "StackTrace.h"
+
+/**
+ * Macro to determine the number of elements in a single-dimension array
+ */
+#if !defined(ARRAY_SIZE)
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+#endif
+
+
+/**
+ * Structure to hold the valid ranges of UTF-8 characters, for each byte up to 4
+ */
+struct
+{
+	int len; /**< number of elements in the following array (1 to 4) */
+	struct
+	{
+		char lower; /**< lower limit of valid range */
+		char upper; /**< upper limit of valid range */
+	} bytes[4];   /**< up to 4 bytes can be used per character */
+}
+valid_ranges[] =
+{
+		{1, { {00, 0x7F} } },
+		{2, { {0xC2, 0xDF}, {0x80, 0xBF} } },
+		{3, { {0xE0, 0xE0}, {0xA0, 0xBF}, {0x80, 0xBF} } },
+		{3, { {0xE1, 0xEC}, {0x80, 0xBF}, {0x80, 0xBF} } },
+		{3, { {0xED, 0xED}, {0x80, 0x9F}, {0x80, 0xBF} } },
+		{3, { {0xEE, 0xEF}, {0x80, 0xBF}, {0x80, 0xBF} } },
+		{4, { {0xF0, 0xF0}, {0x90, 0xBF}, {0x80, 0xBF}, {0x80, 0xBF} } },
+		{4, { {0xF1, 0xF3}, {0x80, 0xBF}, {0x80, 0xBF}, {0x80, 0xBF} } },
+		{4, { {0xF4, 0xF4}, {0x80, 0x8F}, {0x80, 0xBF}, {0x80, 0xBF} } },
+};
+
+
+static const char* UTF8_char_validate(int len, const char* data);
+
+
+/**
+ * Validate a single UTF-8 character
+ * @param len the length of the string in "data"
+ * @param data the bytes to check for a valid UTF-8 char
+ * @return pointer to the start of the next UTF-8 character in "data"
+ */
+static const char* UTF8_char_validate(int len, const char* data)
+{
+	int good = 0;
+	int charlen = 2;
+	int i, j;
+	const char *rc = NULL;
+
+	/* first work out how many bytes this char is encoded in */
+	if ((data[0] & 128) == 0)
+		charlen = 1;
+	else if ((data[0] & 0xF0) == 0xF0)
+		charlen = 4;
+	else if ((data[0] & 0xE0) == 0xE0)
+		charlen = 3;
+
+	if (charlen > len)
+		goto exit;	/* not enough characters in the string we were given */
+
+	for (i = 0; i < ARRAY_SIZE(valid_ranges); ++i)
+	{ /* just has to match one of these rows */
+		if (valid_ranges[i].len == charlen)
+		{
+			good = 1;
+			for (j = 0; j < charlen; ++j)
+			{
+				if (data[j] < valid_ranges[i].bytes[j].lower ||
+						data[j] > valid_ranges[i].bytes[j].upper)
+				{
+					good = 0;  /* failed the check */
+					break;
+				}
+			}
+			if (good)
+				break;
+		}
+	}
+
+	if (good)
+		rc = data + charlen;
+	exit:
+	return rc;
+}
+
+
+/**
+ * Validate a length-delimited string has only UTF-8 characters
+ * @param len the length of the string in "data"
+ * @param data the bytes to check for valid UTF-8 characters
+ * @return 1 (true) if the string has only UTF-8 characters, 0 (false) otherwise
+ */
+int UTF8_validate(int len, const char* data)
+{
+	const char* curdata = NULL;
+	int rc = 0;
+
+	FUNC_ENTRY;
+	if (len == 0)
+	{
+		rc = 1;
+		goto exit;
+	}
+	curdata = UTF8_char_validate(len, data);
+	while (curdata && (curdata < data + len))
+		curdata = UTF8_char_validate((int)(data + len - curdata), curdata);
+
+	rc = curdata != NULL;
+exit:
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+/**
+ * Validate a null-terminated string has only UTF-8 characters
+ * @param string the string to check for valid UTF-8 characters
+ * @return 1 (true) if the string has only UTF-8 characters, 0 (false) otherwise
+ */
+int UTF8_validateString(const char* string)
+{
+	int rc = 0;
+
+	FUNC_ENTRY;
+	rc = UTF8_validate((int)strlen(string), string);
+	FUNC_EXIT_RC(rc);
+	return rc;
+}
+
+
+
+#if defined(UNIT_TESTS)
+#include <stdio.h>
+
+typedef struct
+{
+	int len;
+	char data[20];
+} tests;
+
+tests valid_strings[] =
+{
+		{3, "hjk" },
+		{7, {0x41, 0xE2, 0x89, 0xA2, 0xCE, 0x91, 0x2E} },
+		{3, {'f', 0xC9, 0xB1 } },
+		{9, {0xED, 0x95, 0x9C, 0xEA, 0xB5, 0xAD, 0xEC, 0x96, 0xB4} },
+		{9, {0xE6, 0x97, 0xA5, 0xE6, 0x9C, 0xAC, 0xE8, 0xAA, 0x9E} },
+		{4, {0x2F, 0x2E, 0x2E, 0x2F} },
+		{7, {0xEF, 0xBB, 0xBF, 0xF0, 0xA3, 0x8E, 0xB4} },
+};
+
+tests invalid_strings[] =
+{
+		{2, {0xC0, 0x80} },
+		{5, {0x2F, 0xC0, 0xAE, 0x2E, 0x2F} },
+		{6, {0xED, 0xA1, 0x8C, 0xED, 0xBE, 0xB4} },
+		{1, {0xF4} },
+};
+
+int main (int argc, char *argv[])
+{
+	int i, failed = 0;
+
+	for (i = 0; i < ARRAY_SIZE(valid_strings); ++i)
+	{
+		if (!UTF8_validate(valid_strings[i].len, valid_strings[i].data))
+		{
+			printf("valid test %d failed\n", i);
+			failed = 1;
+		}
+		else
+			printf("valid test %d passed\n", i);
+	}
+
+	for (i = 0; i < ARRAY_SIZE(invalid_strings); ++i)
+	{
+		if (UTF8_validate(invalid_strings[i].len, invalid_strings[i].data))
+		{
+			printf("invalid test %d failed\n", i);
+			failed = 1;
+		}
+		else
+			printf("invalid test %d passed\n", i);
+	}
+
+	if (failed)
+		printf("Failed\n");
+	else
+		printf("Passed\n");
+
+	return 0;
+} /* End of main function*/
+
+#endif
+
diff --git a/mqtt/src/src/utf-8.h b/mqtt/src/src/utf-8.h
new file mode 100644
index 00000000..8bce4b36
--- /dev/null
+++ b/mqtt/src/src/utf-8.h
@@ -0,0 +1,23 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2013 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+#if !defined(UTF8_H)
+#define UTF8_H
+
+int UTF8_validate(int len, const char *data);
+int UTF8_validateString(const char* string);
+
+#endif
diff --git a/mqtt/src/test/CMakeLists.txt b/mqtt/src/test/CMakeLists.txt
new file mode 100644
index 00000000..80f4cd83
--- /dev/null
+++ b/mqtt/src/test/CMakeLists.txt
@@ -0,0 +1,858 @@
+PROJECT(mqtt-tests C)
+
+SET(MQTT_TEST_BROKER "tcp://localhost:1883" CACHE STRING "Hostname of a test MQTT broker to use")
+SET(MQTT_TEST_PROXY "tcp://localhost:1884" CACHE STRING "Hostname of the test proxy to use")
+SET(MQTT_SSL_HOSTNAME "localhost" CACHE STRING "Hostname of a test SSL MQTT broker to use")
+IF (WIN32)
+  SET(CERTDIR $ENV{APPVEYOR_BUILD_FOLDER}/test/ssl)
+ELSE ()
+  SET(CERTDIR $ENV{TRAVIS_BUILD_DIR}/test/ssl)
+ENDIF ()
+
+
+IF (PAHO_WITH_SSL)
+    SET(OPENSSL_SEARCH_PATH "" CACHE PATH "Directory containing OpenSSL libraries and includes")
+
+    IF (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+      SET(OPENSSL_SEARCH_PATH "/usr/local/opt/openssl")
+    ENDIF (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+
+    IF (WIN32)
+      SET(OPENSSL_SEARCH_PATH "C:/OpenSSL-Win64")
+      IF (DEFINED ENV{PAHO_WINDOWS_BUILD_BIT})
+        IF ($ENV{PAHO_WINDOWS_BUILD_BIT} STREQUAL "x86")
+          SET(OPENSSL_SEARCH_PATH "C:/OpenSSL-Win32")
+        ENDIF ()
+      ENDIF ()
+    ENDIF ()
+
+    FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
+        HINTS ${OPENSSL_SEARCH_PATH}/include)
+
+    MESSAGE(STATUS "OpenSSL hints: ${OPENSSL_SEARCH_PATH}")
+    MESSAGE(STATUS "OpenSSL headers found at ${OPENSSL_INCLUDE_DIR}")
+
+    INCLUDE_DIRECTORIES(
+        ${OPENSSL_INCLUDE_DIR}
+    )
+ENDIF ()
+
+IF (WIN32)
+    SET(LIBS_SYSTEM ws2_32)
+ELSEIF (UNIX)
+    IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+        SET(LIBS_SYSTEM c dl pthread)
+    ELSEIF (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+        SET(LIBS_SYSTEM compat pthread)
+    ELSE()
+        SET(LIBS_SYSTEM c pthread)
+    ENDIF()
+ENDIF()
+
+ADD_EXECUTABLE(
+	thread
+	thread.c ../src/Thread.c
+)
+
+SET_TARGET_PROPERTIES(
+  thread PROPERTIES
+  COMPILE_DEFINITIONS "NOSTACKTRACE;NOLOG_MESSAGES" 
+)
+
+TARGET_LINK_LIBRARIES(
+	thread 
+	${LIBS_SYSTEM}
+)
+
+ADD_EXECUTABLE(
+	test1
+	test1.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test1
+	paho-mqtt3c
+)
+
+IF (WIN32)
+	ADD_CUSTOM_COMMAND(
+		TARGET test1 PRE_BUILD
+		COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_SOURCE_DIR}/dll-copy.cmake
+		COMMENT "Copying DLLs to test directory"
+	)
+ENDIF()
+
+ADD_TEST(
+	NAME test1-1-single-thread-client
+	COMMAND "test1" "--test_no" "1" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test1-2-multithread-callbacks
+	COMMAND "test1" "--test_no" "2" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test1-3-connack-return-codes
+	COMMAND "test1" "--test_no" "3" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test1-4-client-persistence
+	COMMAND "test1" "--test_no" "4" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test1-5-disconnect-with-quiesce
+	COMMAND "test1" "--test_no" "5" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test1-6-connlost-will-message
+	COMMAND "test1" "--test_no" "6" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test1-7-connlost-binary-will-message
+	COMMAND "test1" "--test_no" "7" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+SET_TESTS_PROPERTIES(
+	test1-1-single-thread-client
+	test1-2-multithread-callbacks
+	test1-3-connack-return-codes
+	test1-4-client-persistence
+	test1-5-disconnect-with-quiesce
+	test1-6-connlost-will-message
+	test1-7-connlost-binary-will-message
+	PROPERTIES TIMEOUT 540
+)
+
+ADD_EXECUTABLE(
+	test15
+	test15.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test15
+	paho-mqtt3c
+)
+
+ADD_TEST(
+	NAME test15-1-single-thread-client
+	COMMAND "test15" "--test_no" "1" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test15-2-multithread-callbacks
+	COMMAND "test15" "--test_no" "2" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test15-3-connack-return-codes
+	COMMAND "test15" "--test_no" "3" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test15-4-client-persistence
+	COMMAND "test15" "--test_no" "4" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test15-5-disconnect-with-quiesce
+	COMMAND "test15" "--test_no" "5" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test15-6-connlost-will-message
+	COMMAND "test15" "--test_no" "6" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test15-7-connlost-binary-will-message
+	COMMAND "test15" "--test_no" "7" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+SET_TESTS_PROPERTIES(
+	test15-1-single-thread-client
+	test15-2-multithread-callbacks
+	test15-3-connack-return-codes
+	test15-4-client-persistence
+	test15-5-disconnect-with-quiesce
+	test15-6-connlost-will-message
+	test15-7-connlost-binary-will-message
+	PROPERTIES TIMEOUT 540
+)
+
+ADD_EXECUTABLE(
+	test2
+	test2.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test2
+	paho-mqtt3c
+)
+
+ADD_TEST(
+	NAME test2-1-multiple-threads-single-client
+	COMMAND test2 "--connection" ${MQTT_TEST_BROKER}
+)
+
+SET_TESTS_PROPERTIES(
+	test2-1-multiple-threads-single-client
+	PROPERTIES TIMEOUT 540
+)
+
+IF (PAHO_WITH_SSL)
+	ADD_EXECUTABLE(
+		test3
+		test3.c
+	)
+
+	TARGET_LINK_LIBRARIES(
+		test3
+		paho-mqtt3cs
+	)
+
+ADD_TEST(
+	NAME test3-1-ssl-conn-to-non-SSL-broker
+	COMMAND test3 "--test_no" "1" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key"	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test3-2as-mutual-ssl-auth-single-thread
+	COMMAND test3 "--test_no" "2" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key"	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test3-2am-mutual-ssl-auth-multi-thread
+	COMMAND test3 "--test_no" "3" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key"	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test3-2b-mutual-ssl-broker-missing-client-cert
+	COMMAND test3 "--test_no" "4" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key"	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test3-2c-mutual-ssl-client-missing-broker-cert
+	COMMAND test3 "--test_no" "5" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key"	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test3-3as-broker-auth-server-cert-in-client-store-single-thread
+	COMMAND test3 "--test_no" "6" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key"	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test3-3am-broker-auth-server-cert-in-client-store-multi-thread
+	COMMAND test3 "--test_no" "7" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key"	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test3-3b-broker-auth-client-missing-broker-cert
+	COMMAND test3 "--test_no" "8" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key"	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test3-4s-broker-auth-accept-invalid-certificate-single-thread
+	COMMAND test3 "--test_no" "9" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key"	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test3-4m-broker-auth-accept-invalid-certificate-multi-thread
+	COMMAND test3 "--test_no" "10" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key"	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+#ADD_TEST(
+#	NAME test3-6-psk-ssl-auth
+#	COMMAND test3 "--test_no" "11" "--hostname" ${MQTT_SSL_HOSTNAME}
+#)
+
+SET_TESTS_PROPERTIES(
+	test3-1-ssl-conn-to-non-SSL-broker
+	test3-2as-mutual-ssl-auth-single-thread
+	test3-2am-mutual-ssl-auth-multi-thread
+	test3-2b-mutual-ssl-broker-missing-client-cert
+	test3-2c-mutual-ssl-client-missing-broker-cert
+	test3-3as-broker-auth-server-cert-in-client-store-single-thread
+	test3-3am-broker-auth-server-cert-in-client-store-multi-thread
+	test3-3b-broker-auth-client-missing-broker-cert
+	test3-4s-broker-auth-accept-invalid-certificate-single-thread
+	test3-4m-broker-auth-accept-invalid-certificate-multi-thread
+#	test3-6-psk-ssl-auth
+	PROPERTIES TIMEOUT 540
+)
+
+ENDIF()
+
+ADD_EXECUTABLE(
+	test4
+	test4.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test4
+	paho-mqtt3a
+)
+
+ADD_TEST(
+	NAME test4-1-basic-connect-subscribe-receive
+	COMMAND test4 "--test_no" "1" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test4-2-connect-timeout
+	COMMAND test4 "--test_no" "2" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test4-3-multiple-client-objs-simultaneous-working
+	COMMAND test4 "--test_no" "3" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test4-4-send-receive-big-messages
+	COMMAND test4 "--test_no" "4" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test4-5-connack-return-codes
+	COMMAND test4 "--test_no" "5" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test4-6-ha-connections
+	COMMAND test4 "--test_no" "6" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test4-7-pending-tokens
+	COMMAND test4 "--test_no" "7" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test4-8-incomplete-commands-requests
+	COMMAND test4 "--test_no" "8" "--connection" ${MQTT_TEST_BROKER}
+)
+
+SET_TESTS_PROPERTIES(
+	test4-1-basic-connect-subscribe-receive
+	test4-2-connect-timeout
+	test4-3-multiple-client-objs-simultaneous-working
+	test4-4-send-receive-big-messages
+	test4-5-connack-return-codes
+	test4-6-ha-connections
+	test4-7-pending-tokens
+	test4-8-incomplete-commands-requests
+	PROPERTIES TIMEOUT 540
+)
+
+ADD_EXECUTABLE(
+	test45
+	test45.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test45
+	paho-mqtt3a
+)
+
+ADD_TEST(
+	NAME test45-1-basic-connect-subscribe-receive
+	COMMAND test45 "--test_no" "1" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test45-2-connect-timeout
+	COMMAND test45 "--test_no" "2" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test45-3-multiple-client-objs-simultaneous-working
+	COMMAND test45 "--test_no" "3" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test45-4-send-receive-big-messages
+	COMMAND test45 "--test_no" "4" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test45-5-connack-return-codes
+	COMMAND test45 "--test_no" "5" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test45-6-ha-connections
+	COMMAND test45 "--test_no" "6" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test45-7-pending-tokens
+	COMMAND test45 "--test_no" "7" --verbose "--connection" ${MQTT_TEST_BROKER} 
+)
+
+ADD_TEST(
+	NAME test45-8-incomplete-commands-requests
+	COMMAND test45 "--test_no" "8" "--connection" ${MQTT_TEST_BROKER}
+)
+
+SET_TESTS_PROPERTIES(
+	test45-1-basic-connect-subscribe-receive
+	test45-2-connect-timeout
+	test45-3-multiple-client-objs-simultaneous-working
+	test45-4-send-receive-big-messages
+	test45-5-connack-return-codes
+	test45-6-ha-connections
+	test45-7-pending-tokens
+	test45-8-incomplete-commands-requests
+	PROPERTIES TIMEOUT 540
+)
+
+IF (PAHO_WITH_SSL)
+	ADD_EXECUTABLE(
+		test5
+		test5.c
+	)
+
+	TARGET_LINK_LIBRARIES(
+		test5
+		paho-mqtt3as
+	)
+
+ADD_TEST(
+	NAME test5-1-ssl-connection-to-no-SSL-server
+	COMMAND test5 "--test_no" "1" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test5-2a-multual-ssl-auth-certificates-in-place
+	COMMAND test5 "--test_no" "2" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test5-2b-multual-ssl-auth-broker-missing-client-cert
+	COMMAND test5 "--test_no" "3" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test5-2c-multual-ssl-auth-client-missing-broker-cert
+	COMMAND test5 "--test_no" "4" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test5-2d-multual-ssl-auth-client-missing-client-cert
+	COMMAND test5 "--test_no" "5" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test5-3a-server-auth-server-cert-in-client-store
+	COMMAND test5 "--test_no" "6" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test5-3b-server-auth-client-missing-broker-cert
+	COMMAND test5 "--test_no" "7" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test5-4-accept-invalid-certificates
+	COMMAND test5 "--test_no" "8" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test5-6-multiple-connections
+	COMMAND test5 "--test_no" "9" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+ADD_TEST(
+	NAME test5-7-big-messages
+	COMMAND test5 "--test_no" "10" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--server_key"	"${CERTDIR}/test-root-ca.crt"
+)
+
+#ADD_TEST(
+#	NAME test5-8-psk-ssl-auth
+#	COMMAND test5 "--test_no" "11" "--hostname" ${MQTT_SSL_HOSTNAME}
+#)
+
+IF (NOT WIN32)
+# OpenSSL CApath tests rely on Unix-type filesystem - can it work on Windows?
+ADD_TEST(
+	NAME test5-5-server-verify-with-capath
+	COMMAND test5 "--test_no" "12" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--capath"	"${CERTDIR}/capath"
+)
+
+ADD_TEST(
+	NAME test5-6-server-verify-with-capath
+	COMMAND test5 "--test_no" "13" "--hostname" ${MQTT_SSL_HOSTNAME} "--client_key" 	"${CERTDIR}/client.pem" "--capath"	"${CERTDIR}/notexist"
+)
+
+SET_TESTS_PROPERTIES(
+	test5-5-server-verify-with-capath
+	test5-6-server-verify-with-capath
+	PROPERTIES TIMEOUT 540
+)
+ENDIF ()
+
+
+SET_TESTS_PROPERTIES(
+	test5-1-ssl-connection-to-no-SSL-server
+	test5-2a-multual-ssl-auth-certificates-in-place
+	test5-2b-multual-ssl-auth-broker-missing-client-cert
+	test5-2c-multual-ssl-auth-client-missing-broker-cert
+	test5-2d-multual-ssl-auth-client-missing-client-cert
+	test5-3a-server-auth-server-cert-in-client-store
+	test5-3b-server-auth-client-missing-broker-cert
+	test5-4-accept-invalid-certificates
+	test5-6-multiple-connections
+	test5-7-big-messages
+#	test5-8-psk-ssl-auth
+	PROPERTIES TIMEOUT 540
+)
+
+ENDIF()
+
+ADD_EXECUTABLE(
+	test6
+	test6.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test6
+	paho-mqtt3a
+)
+
+ADD_TEST(
+	NAME test6-restart-recovery
+	COMMAND test6 "--connection" ${MQTT_TEST_BROKER}
+)
+
+SET_TESTS_PROPERTIES(
+	test6-restart-recovery
+	PROPERTIES TIMEOUT 540
+)
+
+ADD_EXECUTABLE(
+	test8
+	test8.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test8
+	paho-mqtt3a
+)
+
+ADD_TEST(
+	NAME test8-1-basic-connect-subscribe-receive
+	COMMAND test8 "--test_no" "1" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test8-2-connect-timeout
+	COMMAND test8 "--test_no" "2" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test8-3-multiple-client-objects-simultaneous-working
+	COMMAND test8 "--test_no" "3" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test8-4-send-receive-big-messages
+	COMMAND test8 "--test_no" "4" "--connection" ${MQTT_TEST_BROKER} "--size" "500000"
+)
+
+ADD_TEST(
+	NAME test8-5a-all-ha-connections-out-of-service
+	COMMAND test8 "--test_no" "5" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test8-5b-all-ha-connections-out-of-service-except-the-last-one
+	COMMAND test8 "--test_no" "6" "--connection" ${MQTT_TEST_BROKER}
+)
+
+ADD_TEST(
+	NAME test8-5c-all-ha-connections-out-of-service-except-the-first-one
+	COMMAND test8 "--test_no" "7" "--connection" ${MQTT_TEST_BROKER}
+)
+
+SET_TESTS_PROPERTIES(
+	test8-1-basic-connect-subscribe-receive
+	test8-2-connect-timeout
+	test8-3-multiple-client-objects-simultaneous-working
+	test8-4-send-receive-big-messages
+        test8-5a-all-ha-connections-out-of-service
+        test8-5b-all-ha-connections-out-of-service-except-the-last-one
+        test8-5c-all-ha-connections-out-of-service-except-the-first-one
+	PROPERTIES TIMEOUT 540
+)
+
+
+ADD_EXECUTABLE(
+	test9
+	test9.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test9
+	paho-mqtt3a
+)
+
+ADD_TEST(
+	NAME test9-1-offline-buffering-send-disconnected
+	COMMAND test9 "--test_no" "1" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test9-2-offline-buffering-send-disconnected-serverURIs
+	COMMAND test9 "--test_no" "2" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test9-3-offline-buffering-auto-reconnect
+	COMMAND test9 "--test_no" "3" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test9-4-offline-buffering-auto-reconnect-serverURIs
+	COMMAND test9 "--test_no" "4" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test9-5-offline-buffering-max-buffered
+	COMMAND test9 "--test_no" "5" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test9-6-offline-buffering-max-buffered-binary-will
+	COMMAND test9 "--test_no" "6" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+SET_TESTS_PROPERTIES(
+	test9-1-offline-buffering-send-disconnected
+	test9-2-offline-buffering-send-disconnected-serverURIs
+	test9-3-offline-buffering-auto-reconnect
+	test9-4-offline-buffering-auto-reconnect-serverURIs
+	test9-5-offline-buffering-max-buffered
+	test9-6-offline-buffering-max-buffered-binary-will
+	PROPERTIES TIMEOUT 540
+)
+
+ADD_EXECUTABLE(
+	test95
+	test95.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test95
+	paho-mqtt3a
+)
+
+ADD_TEST(
+	NAME test95-1-offline-buffering-send-disconnected
+	COMMAND test95 "--test_no" "1" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test95-2-offline-buffering-send-disconnected-serverURIs
+	COMMAND test95 "--test_no" "2" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test95-3-offline-buffering-auto-reconnect
+	COMMAND test95 "--test_no" "3" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test95-4-offline-buffering-auto-reconnect-serverURIs
+	COMMAND test95 "--test_no" "4" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test95-5-offline-buffering-max-buffered
+	COMMAND test95 "--test_no" "5" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test95-6-offline-buffering-max-buffered-binary-will
+	COMMAND test95 "--test_no" "6" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+SET_TESTS_PROPERTIES(
+	test95-1-offline-buffering-send-disconnected
+	test95-2-offline-buffering-send-disconnected-serverURIs
+	test95-3-offline-buffering-auto-reconnect
+	test95-4-offline-buffering-auto-reconnect-serverURIs
+	test95-5-offline-buffering-max-buffered
+	test95-6-offline-buffering-max-buffered-binary-will
+	PROPERTIES TIMEOUT 540
+)
+
+ADD_EXECUTABLE(
+	test10
+	test10.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test10
+	paho-mqtt3c
+)
+
+ADD_TEST(
+	NAME test10-1-client_topic_aliases
+	COMMAND "test10" "--test_no" "1" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test10-2-server_topic_aliases
+	COMMAND "test10" "--test_no" "2" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test10-3-subscription_ids
+	COMMAND "test10" "--test_no" "3" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test10-4-flow_control
+	COMMAND "test10" "--test_no" "4" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test10-5-error_handling
+	COMMAND "test10" "--test_no" "5" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test10-6-qos_1_2_errors
+	COMMAND "test10" "--test_no" "6" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test10-7-request_response
+	COMMAND "test10" "--test_no" "7" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test10-8-subscribe_options
+	COMMAND "test10" "--test_no" "8" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test10-9-shared_subscriptions
+	COMMAND "test10" "--test_no" "9" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+SET_TESTS_PROPERTIES(
+	test10-1-client_topic_aliases
+	test10-2-server_topic_aliases
+	test10-3-subscription_ids
+	test10-4-flow_control
+	test10-5-error_handling
+	test10-6-qos_1_2_errors
+	test10-7-request_response
+	test10-8-subscribe_options
+	test10-9-shared_subscriptions
+	PROPERTIES TIMEOUT 540
+)
+
+ADD_EXECUTABLE(
+	test11
+	test11.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test11
+	paho-mqtt3a
+)
+
+ADD_TEST(
+	NAME test11-1-client_topic_aliases
+	COMMAND "test11" "--test_no" "1" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test11-2-server_topic_aliases
+	COMMAND "test11" "--test_no" "2" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test11-3-subscription_ids
+	COMMAND "test11" "--test_no" "3" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test11-4-flow_control
+	COMMAND "test11" "--test_no" "4" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test11-5-error_handling
+	COMMAND "test11" "--test_no" "5" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test11-6-qos_1_2_errors
+	COMMAND "test11" "--test_no" "6" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test11-7-request_response
+	COMMAND "test11" "--test_no" "7" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test11-8-subscribe_options
+	COMMAND "test11" "--test_no" "8" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+ADD_TEST(
+	NAME test11-9-shared_subscriptions
+	COMMAND "test11" "--test_no" "9" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+SET_TESTS_PROPERTIES(
+	test11-1-client_topic_aliases
+	test11-2-server_topic_aliases
+	test11-3-subscription_ids
+	test11-4-flow_control
+	test11-5-error_handling
+	test11-6-qos_1_2_errors
+	test11-7-request_response
+	test11-8-subscribe_options
+	test11-9-shared_subscriptions
+	PROPERTIES TIMEOUT 540
+)
+
+ADD_EXECUTABLE(
+	test_issue373
+	test_issue373.c
+)
+
+TARGET_LINK_LIBRARIES(
+	test_issue373
+	paho-mqtt3a
+)
+
+ADD_EXECUTABLE(
+        test_sync_session_present
+        test_sync_session_present.c
+)
+
+TARGET_LINK_LIBRARIES(
+        test_sync_session_present
+        paho-mqtt3c
+)
+
+ADD_TEST(
+        NAME test_sync_session_present-1-client_session_present_after_reconnect
+        COMMAND "test_sync_session_present" "--test_no" "1" "--connection" ${MQTT_TEST_BROKER} "--proxy_connection" ${MQTT_TEST_PROXY}
+)
+
+SET_TESTS_PROPERTIES(
+        test_sync_session_present-1-client_session_present_after_reconnect
+        PROPERTIES TIMEOUT 540
+)
diff --git a/mqtt/src/test/MQTTV311.py b/mqtt/src/test/MQTTV311.py
new file mode 100644
index 00000000..36cea823
--- /dev/null
+++ b/mqtt/src/test/MQTTV311.py
@@ -0,0 +1,919 @@
+"""
+*******************************************************************
+  Copyright (c) 2013, 2018 IBM Corp.
+
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  and Eclipse Distribution License v1.0 which accompany this distribution.
+
+  The Eclipse Public License is available at
+     http://www.eclipse.org/legal/epl-v10.html
+  and the Eclipse Distribution License is available at
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+  Contributors:
+     Ian Craggs - initial implementation and/or documentation
+*******************************************************************
+"""
+
+"""
+
+Assertions are used to validate incoming data, but are omitted from outgoing packets.  This is
+so that the tests that use this package can send invalid data for error testing.
+
+"""
+
+import logging
+
+logger = logging.getLogger("mqttsas")
+
+# Low-level protocol interface
+
+class MQTTException(Exception):
+  pass
+
+
+# Message types
+CONNECT, CONNACK, PUBLISH, PUBACK, PUBREC, PUBREL, \
+PUBCOMP, SUBSCRIBE, SUBACK, UNSUBSCRIBE, UNSUBACK, \
+PINGREQ, PINGRESP, DISCONNECT = range(1, 15)
+
+packetNames = [ "reserved", \
+"Connect", "Connack", "Publish", "Puback", "Pubrec", "Pubrel", \
+"Pubcomp", "Subscribe", "Suback", "Unsubscribe", "Unsuback", \
+"Pingreq", "Pingresp", "Disconnect"]
+
+classNames = [ "reserved", \
+"Connects", "Connacks", "Publishes", "Pubacks", "Pubrecs", "Pubrels", \
+"Pubcomps", "Subscribes", "Subacks", "Unsubscribes", "Unsubacks", \
+"Pingreqs", "Pingresps", "Disconnects"]
+
+
+def MessageType(byte):
+  if byte != None:
+    rc = byte[0] >> 4
+  else:
+    rc = None
+  return rc
+
+
+def getPacket(aSocket):
+  "receive the next packet"
+  buf = aSocket.recv(1) # get the first byte fixed header
+  if buf == b"":
+    return None
+  if str(aSocket).find("[closed]") != -1:
+    closed = True
+  else:
+    closed = False
+  if closed:
+    return None
+  # now get the remaining length
+  multiplier = 1
+  remlength = 0
+  while 1:
+    next = aSocket.recv(1)
+    while len(next) == 0:
+      next = aSocket.recv(1)
+    buf += next
+    digit = buf[-1]
+    remlength += (digit & 127) * multiplier
+    if digit & 128 == 0:
+      break
+    multiplier *= 128
+  # receive the remaining length if there is any
+  rest = bytes([])
+  if remlength > 0:
+    while len(rest) < remlength:
+      rest += aSocket.recv(remlength-len(rest))
+  assert len(rest) == remlength
+  return buf + rest
+
+
+class FixedHeaders:
+
+  def __init__(self, aMessageType):
+    self.MessageType = aMessageType
+    self.DUP = False
+    self.QoS = 0
+    self.RETAIN = False
+    self.remainingLength = 0
+
+  def __eq__(self, fh):
+    return self.MessageType == fh.MessageType and \
+           self.DUP == fh.DUP and \
+           self.QoS == fh.QoS and \
+           self.RETAIN == fh.RETAIN # and \
+           # self.remainingLength == fh.remainingLength
+
+  def __str__(self):
+    "return printable stresentation of our data"
+    return classNames[self.MessageType]+'(DUP='+str(self.DUP)+ \
+           ", QoS="+str(self.QoS)+", Retain="+str(self.RETAIN)
+
+  def pack(self, length):
+    "pack data into string buffer ready for transmission down socket"
+    buffer = bytes([(self.MessageType << 4) | (self.DUP << 3) |\
+                         (self.QoS << 1) | self.RETAIN])
+    self.remainingLength = length
+    buffer += self.encode(length)
+    return buffer
+
+  def encode(self, x):
+    assert 0 <= x <= 268435455
+    buffer = b''
+    while 1:
+      digit = x % 128
+      x //= 128
+      if x > 0:
+        digit |= 0x80
+      buffer += bytes([digit])
+      if x == 0:
+        break
+    return buffer
+
+  def unpack(self, buffer):
+    "unpack data from string buffer into separate fields"
+    b0 = buffer[0]
+    self.MessageType = b0 >> 4
+    self.DUP = ((b0 >> 3) & 0x01) == 1
+    self.QoS = (b0 >> 1) & 0x03
+    self.RETAIN = (b0 & 0x01) == 1
+    (self.remainingLength, bytes) = self.decode(buffer[1:])
+    return bytes + 1 # length of fixed header
+
+  def decode(self, buffer):
+    multiplier = 1
+    value = 0
+    bytes = 0
+    while 1:
+      bytes += 1
+      digit = buffer[0]
+      buffer = buffer[1:]
+      value += (digit & 127) * multiplier
+      if digit & 128 == 0:
+        break
+      multiplier *= 128
+    return (value, bytes)
+
+
+def writeInt16(length):
+  return bytes([length // 256, length % 256])
+
+def readInt16(buf):
+  return buf[0]*256 + buf[1]
+
+def writeUTF(data):
+  # data could be a string, or bytes.  If string, encode into bytes with utf-8
+  return writeInt16(len(data)) + (data if type(data) == type(b"") else bytes(data, "utf-8"))
+
+def readUTF(buffer, maxlen):
+  if maxlen >= 2:
+    length = readInt16(buffer)
+  else:
+    raise MQTTException("Not enough data to read string length")
+  maxlen -= 2
+  if length > maxlen:
+    raise MQTTException("Length delimited string too long")
+  buf = buffer[2:2+length].decode("utf-8")
+  logger.info("[MQTT-4.7.3-2] topic names and filters not include null")
+  zz = buf.find("\x00") # look for null in the UTF string
+  if zz != -1:
+    raise MQTTException("[MQTT-1.5.3-2] Null found in UTF data "+buf)
+  for c in range (0xD800, 0xDFFF):
+    zz = buf.find(chr(c)) # look for D800-DFFF in the UTF string
+    if zz != -1:
+      raise MQTTException("[MQTT-1.5.3-1] D800-DFFF found in UTF data "+buf)
+  if buf.find("\uFEFF") != -1:
+    logger.info("[MQTT-1.5.3-3] U+FEFF in UTF string")
+  return buf
+
+def writeBytes(buffer):
+  return writeInt16(len(buffer)) + buffer
+
+def readBytes(buffer):
+  length = readInt16(buffer)
+  return buffer[2:2+length]
+
+
+class Packets:
+
+  def pack(self):
+    buffer = self.fh.pack(0)
+    return buffer
+
+  def __str__(self):
+    return str(self.fh)
+
+  def __eq__(self, packet):
+    return self.fh == packet.fh if packet else False
+
+
+class Connects(Packets):
+
+  def __init__(self, buffer = None):
+    self.fh = FixedHeaders(CONNECT)
+
+    # variable header
+    self.ProtocolName = "MQTT"
+    self.ProtocolVersion = 4
+    self.CleanSession = True
+    self.WillFlag = False
+    self.WillQoS = 0
+    self.WillRETAIN = 0
+    self.KeepAliveTimer = 30
+    self.usernameFlag = False
+    self.passwordFlag = False
+
+    # Payload
+    self.ClientIdentifier = ""   # UTF-8
+    self.WillTopic = None        # UTF-8
+    self.WillMessage = None      # binary
+    self.username = None         # UTF-8
+    self.password = None         # binary
+
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    connectFlags = bytes([(self.CleanSession << 1) | (self.WillFlag << 2) | \
+                       (self.WillQoS << 3) | (self.WillRETAIN << 5) | \
+                       (self.usernameFlag << 6) | (self.passwordFlag << 7)])
+    buffer = writeUTF(self.ProtocolName) + bytes([self.ProtocolVersion]) + \
+              connectFlags + writeInt16(self.KeepAliveTimer)
+    buffer += writeUTF(self.ClientIdentifier)
+    if self.WillFlag:
+      buffer += writeUTF(self.WillTopic)
+      buffer += writeBytes(self.WillMessage)
+    if self.usernameFlag:
+      buffer += writeUTF(self.username)
+    if self.passwordFlag:
+      buffer += writeBytes(self.password)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == CONNECT
+
+    try:
+      fhlen = self.fh.unpack(buffer)
+      packlen = fhlen + self.fh.remainingLength
+      assert len(buffer) >= packlen, "buffer length %d packet length %d" % (len(buffer), packlen)
+      curlen = fhlen # points to after header + remaining length
+      assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+      assert self.fh.QoS == 0, "[MQTT-2.1.2-1] QoS was not 0, was %d" % self.fh.QoS
+      assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+
+      self.ProtocolName = readUTF(buffer[curlen:], packlen - curlen)
+      curlen += len(self.ProtocolName) + 2
+      assert self.ProtocolName == "MQTT", "Wrong protocol name %s" % self.ProtocolName
+
+      self.ProtocolVersion = buffer[curlen]
+      curlen += 1
+
+      connectFlags = buffer[curlen]
+      assert (connectFlags & 0x01) == 0, "[MQTT-3.1.2-3] reserved connect flag must be 0"
+      self.CleanSession = ((connectFlags >> 1) & 0x01) == 1
+      self.WillFlag = ((connectFlags >> 2) & 0x01) == 1
+      self.WillQoS = (connectFlags >> 3) & 0x03
+      self.WillRETAIN = (connectFlags >> 5) & 0x01
+      self.passwordFlag = ((connectFlags >> 6) & 0x01) == 1
+      self.usernameFlag = ((connectFlags >> 7) & 0x01) == 1
+      curlen +=1
+
+      if self.WillFlag:
+        assert self.WillQoS in [0, 1, 2], "[MQTT-3.1.2-14] will qos must not be 3"
+      else:
+        assert self.WillQoS == 0, "[MQTT-3.1.2-13] will qos must be 0, if will flag is false"
+        assert self.WillRETAIN == False, "[MQTT-3.1.2-14] will retain must be false, if will flag is false"
+
+      self.KeepAliveTimer = readInt16(buffer[curlen:])
+      curlen += 2
+      logger.info("[MQTT-3.1.3-3] Clientid must be present, and first field")
+      logger.info("[MQTT-3.1.3-4] Clientid must be Unicode, and between 0 and 65535 bytes long")
+      self.ClientIdentifier = readUTF(buffer[curlen:], packlen - curlen)
+      curlen += len(self.ClientIdentifier) + 2
+
+      if self.WillFlag:
+        self.WillTopic = readUTF(buffer[curlen:], packlen - curlen)
+        curlen += len(self.WillTopic) + 2
+        self.WillMessage = readBytes(buffer[curlen:])
+        curlen += len(self.WillMessage) + 2
+        logger.info("[[MQTT-3.1.2-9] will topic and will message fields must be present")
+      else:
+        self.WillTopic = self.WillMessage = None
+
+      if self.usernameFlag:
+        assert len(buffer) > curlen+2, "Buffer too short to read username length"
+        self.username = readUTF(buffer[curlen:], packlen - curlen)
+        curlen += len(self.username) + 2
+        logger.info("[MQTT-3.1.2-19] username must be in payload if user name flag is 1")
+      else:
+        logger.info("[MQTT-3.1.2-18] username must not be in payload if user name flag is 0")
+        assert self.passwordFlag == False, "[MQTT-3.1.2-22] password flag must be 0 if username flag is 0"
+
+      if self.passwordFlag:
+        assert len(buffer) > curlen+2, "Buffer too short to read password length"
+        self.password = readBytes(buffer[curlen:])
+        curlen += len(self.password) + 2
+        logger.info("[MQTT-3.1.2-21] password must be in payload if password flag is 0")
+      else:
+        logger.info("[MQTT-3.1.2-20] password must not be in payload if password flag is 0")
+
+      if self.WillFlag and self.usernameFlag and self.passwordFlag:
+        logger.info("[MQTT-3.1.3-1] clientid, will topic, will message, username and password all present")
+
+      assert curlen == packlen, "Packet is wrong length curlen %d != packlen %d"
+    except:
+      logger.exception("[MQTT-3.1.4-1] server must validate connect packet and close connection without connack if it does not conform")
+      raise
+
+
+
+  def __str__(self):
+    buf = str(self.fh)+", ProtocolName="+str(self.ProtocolName)+", ProtocolVersion=" +\
+          str(self.ProtocolVersion)+", CleanSession="+str(self.CleanSession) +\
+          ", WillFlag="+str(self.WillFlag)+", KeepAliveTimer=" +\
+          str(self.KeepAliveTimer)+", ClientId="+str(self.ClientIdentifier) +\
+          ", usernameFlag="+str(self.usernameFlag)+", passwordFlag="+str(self.passwordFlag)
+    if self.WillFlag:
+      buf += ", WillQoS=" + str(self.WillQoS) +\
+             ", WillRETAIN=" + str(self.WillRETAIN) +\
+             ", WillTopic='"+ self.WillTopic +\
+             "', WillMessage='"+str(self.WillMessage)+"'"
+    if self.username:
+      buf += ", username="+self.username
+    if self.password:
+      buf += ", password="+str(self.password)
+    return buf+")"
+
+  def __eq__(self, packet):
+    rc = Packets.__eq__(self, packet) and \
+           self.ProtocolName == packet.ProtocolName and \
+           self.ProtocolVersion == packet.ProtocolVersion and \
+           self.CleanSession == packet.CleanSession and \
+           self.WillFlag == packet.WillFlag and \
+           self.KeepAliveTimer == packet.KeepAliveTimer and \
+           self.ClientIdentifier == packet.ClientIdentifier and \
+           self.WillFlag == packet.WillFlag
+    if rc and self.WillFlag:
+      rc = self.WillQoS == packet.WillQoS and \
+           self.WillRETAIN == packet.WillRETAIN and \
+           self.WillTopic == packet.WillTopic and \
+           self.WillMessage == packet.WillMessage
+    return rc
+
+
+class Connacks(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, ReturnCode=0):
+    self.fh = FixedHeaders(CONNACK)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    self.flags = 0
+    self.returnCode = ReturnCode
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = bytes([self.flags, self.returnCode])
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 4
+    assert MessageType(buffer) == CONNACK
+    self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 2, "Connack packet is wrong length %d" % self.fh.remainingLength
+    assert buffer[2] in  [0, 1], "Connect Acknowledge Flags"
+    self.returnCode = buffer[3]
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+
+  def __str__(self):
+    return str(self.fh)+", Session present="+str((self.flags & 0x01) == 1)+", ReturnCode="+str(self.returnCode)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.returnCode == packet.returnCode
+
+
+class Disconnects(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False):
+    self.fh = FixedHeaders(DISCONNECT)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    if buffer != None:
+      self.unpack(buffer)
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == DISCONNECT
+    self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 0, "Disconnect packet is wrong length %d" % self.fh.remainingLength
+    logger.info("[MQTT-3.14.1-1] disconnect reserved bits must be 0")
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+
+  def __str__(self):
+    return str(self.fh)+")"
+
+
+class Publishes(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0, TopicName="", Payload=b""):
+    self.fh = FixedHeaders(PUBLISH)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.topicName = TopicName
+    self.messageIdentifier = MsgId
+    # payload
+    self.data = Payload
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeUTF(self.topicName)
+    if self.fh.QoS != 0:
+      buffer +=  writeInt16(self.messageIdentifier)
+    buffer += self.data
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PUBLISH
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.QoS in [0, 1, 2], "QoS in Publish must be 0, 1, or 2"
+    packlen = fhlen + self.fh.remainingLength
+    assert len(buffer) >= packlen
+    curlen = fhlen
+    try:
+      self.topicName = readUTF(buffer[fhlen:], packlen - curlen)
+    except UnicodeDecodeError:
+      logger.info("[MQTT-3.3.2-1] topic name in publish must be utf-8")
+      raise
+    curlen += len(self.topicName) + 2
+    if self.fh.QoS != 0:
+      self.messageIdentifier = readInt16(buffer[curlen:])
+      logger.info("[MQTT-2.3.1-1] packet indentifier must be in publish if QoS is 1 or 2")
+      curlen += 2
+      assert self.messageIdentifier > 0, "[MQTT-2.3.1-1] packet indentifier must be > 0"
+    else:
+      logger.info("[MQTT-2.3.1-5] no packet indentifier in publish if QoS is 0")
+      self.messageIdentifier = 0
+    self.data = buffer[curlen:fhlen + self.fh.remainingLength]
+    if self.fh.QoS == 0:
+      assert self.fh.DUP == False, "[MQTT-2.1.2-4]"
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    rc = str(self.fh)
+    if self.fh.QoS != 0:
+      rc += ", MsgId="+str(self.messageIdentifier)
+    rc += ", TopicName="+str(self.topicName)+", Payload="+str(self.data)+")"
+    return rc
+
+  def __eq__(self, packet):
+    rc = Packets.__eq__(self, packet) and \
+         self.topicName == packet.topicName and \
+         self.data == packet.data
+    if rc and self.fh.QoS != 0:
+      rc = self.messageIdentifier == packet.messageIdentifier
+    return rc
+
+
+class Pubacks(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0):
+    self.fh = FixedHeaders(PUBACK)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PUBACK
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 2, "Puback packet is wrong length %d" % self.fh.remainingLength
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] Puback reserved bits must be 0"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] Puback reserved bits must be 0"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] Puback reserved bits must be 0"
+    return fhlen + 2
+
+  def __str__(self):
+    return str(self.fh)+", MsgId "+str(self.messageIdentifier)
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier
+
+
+class Pubrecs(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0):
+    self.fh = FixedHeaders(PUBREC)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PUBREC
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 2, "Pubrec packet is wrong length %d" % self.fh.remainingLength
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] Pubrec reserved bits must be 0"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] Pubrec reserved bits must be 0"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] Pubrec reserved bits must be 0"
+    return fhlen + 2
+
+  def __str__(self):
+    return str(self.fh)+", MsgId="+str(self.messageIdentifier)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier
+
+
+class Pubrels(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=1, Retain=False, MsgId=0):
+    self.fh = FixedHeaders(PUBREL)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PUBREL
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 2, "Pubrel packet is wrong length %d" % self.fh.remainingLength
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DUP should be False in PUBREL"
+    assert self.fh.QoS == 1, "[MQTT-2.1.2-1] QoS should be 1 in PUBREL"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] RETAIN should be False in PUBREL"
+    logger.info("[MQTT-3.6.1-1] bits in fixed header for pubrel are ok")
+    return fhlen + 2
+
+  def __str__(self):
+    return str(self.fh)+", MsgId="+str(self.messageIdentifier)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier
+
+
+class Pubcomps(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0):
+    self.fh = FixedHeaders(PUBCOMP)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PUBCOMP
+    fhlen = self.fh.unpack(buffer)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    assert self.fh.remainingLength == 2, "Pubcomp packet is wrong length %d" % self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DUP should be False in Pubcomp"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] QoS should be 0 in Pubcomp"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] Retain should be false in Pubcomp"
+    return fhlen + 2
+
+  def __str__(self):
+    return str(self.fh)+", MsgId="+str(self.messageIdentifier)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier
+
+
+class Subscribes(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=1, Retain=False, MsgId=0, Data=[]):
+    self.fh = FixedHeaders(SUBSCRIBE)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    # payload - list of topic, qos pairs
+    self.data = Data[:]
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    for d in self.data:
+      buffer += writeUTF(d[0]) + bytes([d[1]])
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == SUBSCRIBE
+    fhlen = self.fh.unpack(buffer)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    logger.info("[MQTT-2.3.1-1] packet indentifier must be in subscribe")
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.messageIdentifier > 0, "[MQTT-2.3.1-1] packet indentifier must be > 0"
+    leftlen = self.fh.remainingLength - 2
+    self.data = []
+    while leftlen > 0:
+      topic = readUTF(buffer[-leftlen:], leftlen)
+      leftlen -= len(topic) + 2
+      qos = buffer[-leftlen]
+      assert qos in [0, 1, 2], "[MQTT-3-8.3-2] reserved bits must be zero"
+      leftlen -= 1
+      self.data.append((topic, qos))
+    assert len(self.data) > 0, "[MQTT-3.8.3-1] at least one topic, qos pair must be in subscribe"
+    assert leftlen == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DUP must be false in subscribe"
+    assert self.fh.QoS == 1, "[MQTT-2.1.2-1] QoS must be 1 in subscribe"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] RETAIN must be false in subscribe"
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    return str(self.fh)+", MsgId="+str(self.messageIdentifier)+\
+           ", Data="+str(self.data)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier and \
+           self.data == packet.data
+
+
+class Subacks(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0, Data=[]):
+    self.fh = FixedHeaders(SUBACK)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    # payload - list of qos
+    self.data = Data[:]
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    for d in self.data:
+      buffer += bytes([d])
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == SUBACK
+    fhlen = self.fh.unpack(buffer)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    leftlen = self.fh.remainingLength - 2
+    self.data = []
+    while leftlen > 0:
+      qos = buffer[-leftlen]
+      assert qos in [0, 1, 2, 0x80], "[MQTT-3.9.3-2] return code in QoS must be 0, 1, 2 or 0x80"
+      leftlen -= 1
+      self.data.append(qos)
+    assert leftlen == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DUP should be false in suback"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] QoS should be 0 in suback"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] Retain should be false in suback"
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    return str(self.fh)+", MsgId="+str(self.messageIdentifier)+\
+           ", Data="+str(self.data)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier and \
+           self.data == packet.data
+
+
+class Unsubscribes(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=1, Retain=False, MsgId=0, Data=[]):
+    self.fh = FixedHeaders(UNSUBSCRIBE)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    # payload - list of topics
+    self.data = Data[:]
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    for d in self.data:
+      buffer += writeUTF(d)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == UNSUBSCRIBE
+    fhlen = self.fh.unpack(buffer)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    logger.info("[MQTT-2.3.1-1] packet indentifier must be in unsubscribe")
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.messageIdentifier > 0, "[MQTT-2.3.1-1] packet indentifier must be > 0"
+    leftlen = self.fh.remainingLength - 2
+    self.data = []
+    while leftlen > 0:
+      topic = readUTF(buffer[-leftlen:], leftlen)
+      leftlen -= len(topic) + 2
+      self.data.append(topic)
+    assert leftlen == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 1, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+    logger.info("[MQTT-3-10.1-1] fixed header bits are 0,0,1,0")
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    return str(self.fh)+", MsgId="+str(self.messageIdentifier)+\
+           ", Data="+str(self.data)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier and \
+           self.data == packet.data
+
+
+class Unsubacks(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0):
+    self.fh = FixedHeaders(UNSUBACK)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == UNSUBACK
+    fhlen = self.fh.unpack(buffer)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.messageIdentifier > 0, "[MQTT-2.3.1-1] packet indentifier must be > 0"
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    return str(self.fh)+", MsgId="+str(self.messageIdentifier)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier
+
+
+class Pingreqs(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False):
+    self.fh = FixedHeaders(PINGREQ)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    if buffer != None:
+      self.unpack(buffer)
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PINGREQ
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+    return fhlen
+
+  def __str__(self):
+    return str(self.fh)+")"
+
+
+class Pingresps(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False):
+    self.fh = FixedHeaders(PINGRESP)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    if buffer != None:
+      self.unpack(buffer)
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PINGRESP
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+    return fhlen
+
+  def __str__(self):
+    return str(self.fh)+")"
+
+classes = [None, Connects, Connacks, Publishes, Pubacks, Pubrecs,
+           Pubrels, Pubcomps, Subscribes, Subacks, Unsubscribes,
+           Unsubacks, Pingreqs, Pingresps, Disconnects]
+
+def unpackPacket(buffer):
+  if MessageType(buffer) != None:
+    packet = classes[MessageType(buffer)]()
+    packet.unpack(buffer)
+  else:
+    packet = None
+  return packet
+
+if __name__ == "__main__":
+  fh = FixedHeaders(CONNECT)
+  tests = [0, 56, 127, 128, 8888, 16383, 16384, 65535, 2097151, 2097152,
+           20555666, 268435454, 268435455]
+  for x in tests:
+    try:
+      assert x == fh.decode(fh.encode(x))[0]
+    except AssertionError:
+      print("Test failed for x =", x, fh.decode(fh.encode(x)))
+  try:
+    fh.decode(fh.encode(268435456))
+    print("Error")
+  except AssertionError:
+    pass
+
+  for packet in classes[1:]:
+    before = str(packet())
+    after = str(unpackPacket(packet().pack()))
+    try:
+      assert before == after
+    except:
+      print("before:", before, "\nafter:", after)
+  print("End")
diff --git a/mqtt/src/test/MQTTV3112.py b/mqtt/src/test/MQTTV3112.py
new file mode 100644
index 00000000..773fdcca
--- /dev/null
+++ b/mqtt/src/test/MQTTV3112.py
@@ -0,0 +1,923 @@
+"""
+*******************************************************************
+  Copyright (c) 2013, 2014 IBM Corp.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  and Eclipse Distribution License v1.0 which accompany this distribution. 
+ 
+  The Eclipse Public License is available at 
+     http://www.eclipse.org/legal/epl-v10.html
+  and the Eclipse Distribution License is available at 
+    http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+  Contributors:
+     Ian Craggs - initial implementation and/or documentation
+*******************************************************************
+"""
+from __future__ import print_function
+
+"""
+
+Assertions are used to validate incoming data, but are omitted from outgoing packets.  This is
+so that the tests that use this package can send invalid data for error testing.
+
+"""
+
+
+import logging
+
+logger = logging.getLogger("mqttsas")
+
+# Low-level protocol interface
+
+class MQTTException(Exception):
+  pass
+   
+
+# Message types
+CONNECT, CONNACK, PUBLISH, PUBACK, PUBREC, PUBREL, \
+PUBCOMP, SUBSCRIBE, SUBACK, UNSUBSCRIBE, UNSUBACK, \
+PINGREQ, PINGRESP, DISCONNECT = range(1, 15)
+
+packetNames = [ "reserved", \
+"Connect", "Connack", "Publish", "Puback", "Pubrec", "Pubrel", \
+"Pubcomp", "Subscribe", "Suback", "Unsubscribe", "Unsuback", \
+"Pingreq", "Pingresp", "Disconnect"]
+
+classNames = [ "reserved", \
+"Connects", "Connacks", "Publishes", "Pubacks", "Pubrecs", "Pubrels", \
+"Pubcomps", "Subscribes", "Subacks", "Unsubscribes", "Unsubacks", \
+"Pingreqs", "Pingresps", "Disconnects"]
+
+
+def MessageType(byte):
+  if byte != None:
+    rc = ord(byte[0]) >> 4
+  else:
+    rc = None
+  return rc
+
+
+def getPacket(aSocket):
+  "receive the next packet"
+  buf = aSocket.recv(1) # get the first byte fixed header
+  if buf == b"":
+    return None
+  if str(aSocket).find("[closed]") != -1:
+    closed = True
+  else:
+    closed = False
+  if closed:
+    return None
+  # now get the remaining length
+  multiplier = 1
+  remlength = 0
+  while 1:
+    next = aSocket.recv(1)
+    while len(next) == 0:
+      next = aSocket.recv(1)
+    buf += next
+    digit = ord(buf[-1])
+    remlength += (digit & 127) * multiplier
+    if digit & 128 == 0:
+      break
+    multiplier *= 128
+  # receive the remaining length if there is any
+  rest = ''
+  if remlength > 0:
+    while len(rest) < remlength:
+      rest += aSocket.recv(remlength-len(rest))
+  assert len(rest) == remlength
+  return buf + rest
+
+
+class FixedHeaders:
+
+  def __init__(self, aMessageType):
+    self.MessageType = aMessageType
+    self.DUP = False
+    self.QoS = 0
+    self.RETAIN = False
+    self.remainingLength = 0
+
+  def __eq__(self, fh):
+    return self.MessageType == fh.MessageType and \
+           self.DUP == fh.DUP and \
+           self.QoS == fh.QoS and \
+           self.RETAIN == fh.RETAIN # and \
+           # self.remainingLength == fh.remainingLength
+
+  def __repr__(self):
+    "return printable representation of our data"
+    return classNames[self.MessageType]+'(DUP='+repr(self.DUP)+ \
+           ", QoS="+repr(self.QoS)+", Retain="+repr(self.RETAIN)
+
+  def pack(self, length):
+    "pack data into string buffer ready for transmission down socket"
+    buffer = bytes([(self.MessageType << 4) | (self.DUP << 3) |\
+                         (self.QoS << 1) | self.RETAIN])
+    self.remainingLength = length
+    buffer += self.encode(length)
+    return buffer
+
+  def encode(self, x):
+    assert 0 <= x <= 268435455
+    buffer = b''
+    while 1:
+      digit = x % 128
+      x //= 128
+      if x > 0:
+        digit |= 0x80
+      buffer += bytes([digit])
+      if x == 0:
+        break
+    return buffer
+
+  def unpack(self, buffer):
+    "unpack data from string buffer into separate fields"
+    b0 = ord(buffer[0])
+    self.MessageType = b0 >> 4
+    self.DUP = ((b0 >> 3) & 0x01) == 1
+    self.QoS = (b0 >> 1) & 0x03
+    self.RETAIN = (b0 & 0x01) == 1
+    (self.remainingLength, bytes) = self.decode(buffer[1:])
+    return bytes + 1 # length of fixed header
+
+  def decode(self, buffer):
+    multiplier = 1
+    value = 0
+    bytes = 0
+    while 1:
+      bytes += 1
+      digit = ord(buffer[0])
+      buffer = buffer[1:]
+      value += (digit & 127) * multiplier
+      if digit & 128 == 0:
+        break
+      multiplier *= 128
+    return (value, bytes)
+
+
+def writeInt16(length):
+  return bytes([length // 256, length % 256])
+
+def readInt16(buf):
+  return ord(buf[0])*256 + ord(buf[1])
+
+def writeUTF(data):
+  # data could be a string, or bytes.  If string, encode into bytes with utf-8
+  return writeInt16(len(data)) + (data if type(data) == type(b"") else bytes(data, "utf-8"))
+
+def readUTF(buffer, maxlen):
+  if maxlen >= 2:
+    length = readInt16(buffer)
+  else:
+    raise MQTTException("Not enough data to read string length")
+  maxlen -= 2
+  if length > maxlen:
+    raise MQTTException("Length delimited string too long")
+  buf = buffer[2:2+length].decode("utf-8")
+  logger.info("[MQTT-4.7.3-2] topic names and filters not include null")
+  zz = buf.find("\x00") # look for null in the UTF string
+  if zz != -1:
+    raise MQTTException("[MQTT-1.5.3-2] Null found in UTF data "+buf)
+  """for c in range (0xD800, 0xDFFF):
+    zz = buf.find(chr(c)) # look for D800-DFFF in the UTF string
+    if zz != -1:
+      raise MQTTException("[MQTT-1.5.3-1] D800-DFFF found in UTF data "+buf)
+  """
+  if buf.find("\uFEFF") != -1:
+    logger.info("[MQTT-1.5.3-3] U+FEFF in UTF string") 
+  return buf
+
+def writeBytes(buffer):
+  return writeInt16(len(buffer)) + buffer
+
+def readBytes(buffer):
+  length = readInt16(buffer)
+  return buffer[2:2+length]
+
+
+class Packets:
+
+  def pack(self):
+    buffer = self.fh.pack(0)
+    return buffer
+
+  def __repr__(self):
+    return repr(self.fh)
+
+  def __eq__(self, packet):
+    return self.fh == packet.fh if packet else False
+
+
+class Connects(Packets):
+
+  def __init__(self, buffer = None):
+    self.fh = FixedHeaders(CONNECT)
+
+    # variable header
+    self.ProtocolName = "MQTT"
+    self.ProtocolVersion = 4
+    self.CleanSession = True
+    self.WillFlag = False
+    self.WillQoS = 0
+    self.WillRETAIN = 0
+    self.KeepAliveTimer = 30
+    self.usernameFlag = False
+    self.passwordFlag = False
+
+    # Payload
+    self.ClientIdentifier = ""   # UTF-8
+    self.WillTopic = None        # UTF-8
+    self.WillMessage = None      # binary
+    self.username = None         # UTF-8
+    self.password = None         # binary
+
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):    
+    connectFlags = bytes([(self.CleanSession << 1) | (self.WillFlag << 2) | \
+                       (self.WillQoS << 3) | (self.WillRETAIN << 5) | \
+                       (self.usernameFlag << 6) | (self.passwordFlag << 7)])
+    buffer = writeUTF(self.ProtocolName) + bytes([self.ProtocolVersion]) + \
+              connectFlags + writeInt16(self.KeepAliveTimer)
+    buffer += writeUTF(self.ClientIdentifier) 
+    if self.WillFlag:
+      buffer += writeUTF(self.WillTopic) 
+      buffer += writeBytes(self.WillMessage) 
+    if self.usernameFlag:
+      buffer += writeUTF(self.username) 
+    if self.passwordFlag:
+      buffer += writeBytes(self.password) 
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == CONNECT
+
+    try:
+      fhlen = self.fh.unpack(buffer)
+      packlen = fhlen + self.fh.remainingLength
+      assert len(buffer) >= packlen, "buffer length %d packet length %d" % (len(buffer), packlen)
+      curlen = fhlen # points to after header + remaining length
+      assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+      assert self.fh.QoS == 0, "[MQTT-2.1.2-1] QoS was not 0, was %d" % self.fh.QoS
+      assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+
+      self.ProtocolName = readUTF(buffer[curlen:], packlen - curlen)
+      curlen += len(self.ProtocolName) + 2
+      assert self.ProtocolName == "MQTT", "Wrong protocol name %s" % self.ProtocolName
+
+      self.ProtocolVersion = ord(buffer[curlen])
+      curlen += 1
+
+      connectFlags = ord(buffer[curlen])
+      assert (connectFlags & 0x01) == 0, "[MQTT-3.1.2-3] reserved connect flag must be 0"
+      self.CleanSession = ((connectFlags >> 1) & 0x01) == 1
+      self.WillFlag = ((connectFlags >> 2) & 0x01) == 1
+      self.WillQoS = (connectFlags >> 3) & 0x03
+      self.WillRETAIN = (connectFlags >> 5) & 0x01
+      self.passwordFlag = ((connectFlags >> 6) & 0x01) == 1
+      self.usernameFlag = ((connectFlags >> 7) & 0x01) == 1
+      curlen +=1
+
+      if self.WillFlag:
+        assert self.WillQoS in [0, 1, 2], "[MQTT-3.1.2-14] will qos must not be 3"
+      else:
+        assert self.WillQoS == 0, "[MQTT-3.1.2-13] will qos must be 0, if will flag is false"
+        assert self.WillRETAIN == False, "[MQTT-3.1.2-14] will retain must be false, if will flag is false"
+
+      self.KeepAliveTimer = readInt16(buffer[curlen:])
+      curlen += 2
+      logger.info("[MQTT-3.1.3-3] Clientid must be present, and first field")
+      logger.info("[MQTT-3.1.3-4] Clientid must be Unicode, and between 0 and 65535 bytes long")
+      self.ClientIdentifier = readUTF(buffer[curlen:], packlen - curlen)
+      curlen += len(self.ClientIdentifier) + 2
+
+      if self.WillFlag:
+        self.WillTopic = readUTF(buffer[curlen:], packlen - curlen)
+        curlen += len(self.WillTopic) + 2
+        self.WillMessage = readBytes(buffer[curlen:])
+        curlen += len(self.WillMessage) + 2
+        logger.info("[[MQTT-3.1.2-9] will topic and will message fields must be present")
+      else:
+        self.WillTopic = self.WillMessage = None
+
+      if self.usernameFlag:
+        assert len(buffer) > curlen+2, "Buffer too short to read username length"
+        self.username = readUTF(buffer[curlen:], packlen - curlen)
+        curlen += len(self.username) + 2
+        logger.info("[MQTT-3.1.2-19] username must be in payload if user name flag is 1")
+      else:
+        logger.info("[MQTT-3.1.2-18] username must not be in payload if user name flag is 0")
+        assert self.passwordFlag == False, "[MQTT-3.1.2-22] password flag must be 0 if username flag is 0"
+
+      if self.passwordFlag:
+        assert len(buffer) > curlen+2, "Buffer too short to read password length"
+        self.password = readBytes(buffer[curlen:])
+        curlen += len(self.password) + 2
+        logger.info("[MQTT-3.1.2-21] password must be in payload if password flag is 0")
+      else:
+        logger.info("[MQTT-3.1.2-20] password must not be in payload if password flag is 0")
+
+      if self.WillFlag and self.usernameFlag and self.passwordFlag:
+        logger.info("[MQTT-3.1.3-1] clientid, will topic, will message, username and password all present")
+
+      assert curlen == packlen, "Packet is wrong length curlen %d != packlen %d"
+    except:
+      logger.exception("[MQTT-3.1.4-1] server must validate connect packet and close connection without connack if it does not conform")
+      raise
+
+
+
+  def __repr__(self):
+    buf = repr(self.fh)+", ProtocolName="+str(self.ProtocolName)+", ProtocolVersion=" +\
+          repr(self.ProtocolVersion)+", CleanSession="+repr(self.CleanSession) +\
+          ", WillFlag="+repr(self.WillFlag)+", KeepAliveTimer=" +\
+          repr(self.KeepAliveTimer)+", ClientId="+str(self.ClientIdentifier) +\
+          ", usernameFlag="+repr(self.usernameFlag)+", passwordFlag="+repr(self.passwordFlag)
+    if self.WillFlag:
+      buf += ", WillQoS=" + repr(self.WillQoS) +\
+             ", WillRETAIN=" + repr(self.WillRETAIN) +\
+             ", WillTopic='"+ self.WillTopic +\
+             "', WillMessage='"+str(self.WillMessage)+"'"
+    if self.username:
+      buf += ", username="+self.username
+    if self.password:
+      buf += ", password="+str(self.password)
+    return buf+")"
+
+  def __eq__(self, packet):
+    rc = Packets.__eq__(self, packet) and \
+           self.ProtocolName == packet.ProtocolName and \
+           self.ProtocolVersion == packet.ProtocolVersion and \
+           self.CleanSession == packet.CleanSession and \
+           self.WillFlag == packet.WillFlag and \
+           self.KeepAliveTimer == packet.KeepAliveTimer and \
+           self.ClientIdentifier == packet.ClientIdentifier and \
+           self.WillFlag == packet.WillFlag
+    if rc and self.WillFlag:
+      rc = self.WillQoS == packet.WillQoS and \
+           self.WillRETAIN == packet.WillRETAIN and \
+           self.WillTopic == packet.WillTopic and \
+           self.WillMessage == packet.WillMessage
+    return rc
+
+
+class Connacks(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, ReturnCode=0):
+    self.fh = FixedHeaders(CONNACK)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    self.flags = 0
+    self.returnCode = ReturnCode
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = bytes([self.flags, self.returnCode])
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 4
+    assert MessageType(buffer) == CONNACK
+    self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 2, "Connack packet is wrong length %d" % self.fh.remainingLength
+    assert ord(buffer[2]) in  [0, 1], "Connect Acknowledge Flags"
+    self.returnCode = ord(buffer[3])
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+
+  def __repr__(self):
+    return repr(self.fh)+", Session present="+str((self.flags & 0x01) == 1)+", ReturnCode="+repr(self.returnCode)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.returnCode == packet.returnCode
+
+
+class Disconnects(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False):
+    self.fh = FixedHeaders(DISCONNECT)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    if buffer != None:
+      self.unpack(buffer)
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == DISCONNECT
+    self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 0, "Disconnect packet is wrong length %d" % self.fh.remainingLength
+    logger.info("[MQTT-3.14.1-1] disconnect reserved bits must be 0")
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+
+  def __repr__(self):
+    return repr(self.fh)+")"
+
+
+class Publishes(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0, TopicName="", Payload=b""):
+    self.fh = FixedHeaders(PUBLISH)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.topicName = TopicName
+    self.messageIdentifier = MsgId
+    # payload
+    self.data = Payload
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeUTF(self.topicName)
+    if self.fh.QoS != 0:
+      buffer +=  writeInt16(self.messageIdentifier)
+    buffer += self.data
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PUBLISH
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.QoS in [0, 1, 2], "QoS in Publish must be 0, 1, or 2"
+    packlen = fhlen + self.fh.remainingLength
+    assert len(buffer) >= packlen
+    curlen = fhlen
+    try:
+      self.topicName = readUTF(buffer[fhlen:], packlen - curlen)
+    except UnicodeDecodeError:
+      logger.info("[MQTT-3.3.2-1] topic name in publish must be utf-8")
+      raise
+    curlen += len(self.topicName) + 2
+    if self.fh.QoS != 0:
+      self.messageIdentifier = readInt16(buffer[curlen:])
+      logger.info("[MQTT-2.3.1-1] packet indentifier must be in publish if QoS is 1 or 2")
+      curlen += 2
+      assert self.messageIdentifier > 0, "[MQTT-2.3.1-1] packet indentifier must be > 0"
+    else:
+      logger.info("[MQTT-2.3.1-5] no packet indentifier in publish if QoS is 0")
+      self.messageIdentifier = 0
+    self.data = buffer[curlen:fhlen + self.fh.remainingLength]
+    if self.fh.QoS == 0:
+      assert self.fh.DUP == False, "[MQTT-2.1.2-4]"
+    return fhlen + self.fh.remainingLength
+
+  def __repr__(self):
+    rc = repr(self.fh)
+    if self.fh.QoS != 0:
+      rc += ", MsgId="+repr(self.messageIdentifier)
+    rc += ", TopicName="+repr(self.topicName)+", Payload="+repr(self.data)+")"
+    return rc
+
+  def __eq__(self, packet):
+    rc = Packets.__eq__(self, packet) and \
+         self.topicName == packet.topicName and \
+         self.data == packet.data
+    if rc and self.fh.QoS != 0:
+      rc = self.messageIdentifier == packet.messageIdentifier
+    return rc
+
+
+class Pubacks(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0):
+    self.fh = FixedHeaders(PUBACK)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PUBACK
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 2, "Puback packet is wrong length %d" % self.fh.remainingLength
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] Puback reserved bits must be 0"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] Puback reserved bits must be 0"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] Puback reserved bits must be 0"
+    return fhlen + 2
+
+  def __repr__(self):
+    return repr(self.fh)+", MsgId "+repr(self.messageIdentifier)
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier
+
+
+class Pubrecs(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0):
+    self.fh = FixedHeaders(PUBREC)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PUBREC
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 2, "Pubrec packet is wrong length %d" % self.fh.remainingLength
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] Pubrec reserved bits must be 0"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] Pubrec reserved bits must be 0"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] Pubrec reserved bits must be 0"
+    return fhlen + 2
+
+  def __repr__(self):
+    return repr(self.fh)+", MsgId="+repr(self.messageIdentifier)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier
+
+
+class Pubrels(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=1, Retain=False, MsgId=0):
+    self.fh = FixedHeaders(PUBREL)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PUBREL
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 2, "Pubrel packet is wrong length %d" % self.fh.remainingLength
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DUP should be False in PUBREL"
+    assert self.fh.QoS == 1, "[MQTT-2.1.2-1] QoS should be 1 in PUBREL"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] RETAIN should be False in PUBREL"
+    logger.info("[MQTT-3.6.1-1] bits in fixed header for pubrel are ok")
+    return fhlen + 2
+
+  def __repr__(self):
+    return repr(self.fh)+", MsgId="+repr(self.messageIdentifier)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier
+
+
+class Pubcomps(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0):
+    self.fh = FixedHeaders(PUBCOMP)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PUBCOMP
+    fhlen = self.fh.unpack(buffer)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    assert self.fh.remainingLength == 2, "Pubcomp packet is wrong length %d" % self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DUP should be False in Pubcomp"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] QoS should be 0 in Pubcomp"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] Retain should be false in Pubcomp"
+    return fhlen + 2
+
+  def __repr__(self):
+    return repr(self.fh)+", MsgId="+repr(self.messageIdentifier)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier
+
+
+class Subscribes(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=1, Retain=False, MsgId=0, Data=[]):
+    self.fh = FixedHeaders(SUBSCRIBE)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    # payload - list of topic, qos pairs
+    self.data = Data[:]
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    for d in self.data:
+      buffer += writeUTF(d[0]) + bytes([d[1]])
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == SUBSCRIBE
+    fhlen = self.fh.unpack(buffer)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    logger.info("[MQTT-2.3.1-1] packet indentifier must be in subscribe")
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.messageIdentifier > 0, "[MQTT-2.3.1-1] packet indentifier must be > 0"
+    leftlen = self.fh.remainingLength - 2
+    self.data = []
+    while leftlen > 0:
+      topic = readUTF(buffer[-leftlen:], leftlen)
+      leftlen -= len(topic) + 2
+      qos = ord(buffer[-leftlen])
+      assert qos in [0, 1, 2], "[MQTT-3-8.3-2] reserved bits must be zero"
+      leftlen -= 1
+      self.data.append((topic, qos))
+    assert len(self.data) > 0, "[MQTT-3.8.3-1] at least one topic, qos pair must be in subscribe"
+    assert leftlen == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DUP must be false in subscribe"
+    assert self.fh.QoS == 1, "[MQTT-2.1.2-1] QoS must be 1 in subscribe"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] RETAIN must be false in subscribe"
+    return fhlen + self.fh.remainingLength
+
+  def __repr__(self):
+    return repr(self.fh)+", MsgId="+repr(self.messageIdentifier)+\
+           ", Data="+repr(self.data)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier and \
+           self.data == packet.data
+
+
+class Subacks(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0, Data=[]):
+    self.fh = FixedHeaders(SUBACK)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    # payload - list of qos
+    self.data = Data[:]
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    for d in self.data:
+      buffer += bytes([d])
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == SUBACK
+    fhlen = self.fh.unpack(buffer)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    leftlen = self.fh.remainingLength - 2
+    self.data = []
+    while leftlen > 0:
+      qos = buffer[-leftlen]
+      assert ord(qos) in [0, 1, 2, 0x80], "[MQTT-3.9.3-2] return code in QoS must be 0, 1, 2 or 0x80, was "+ord(qos)
+      leftlen -= 1
+      self.data.append(qos)
+    assert leftlen == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DUP should be false in suback"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] QoS should be 0 in suback"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] Retain should be false in suback"
+    return fhlen + self.fh.remainingLength
+
+  def __repr__(self):
+    return repr(self.fh)+", MsgId="+repr(self.messageIdentifier)+\
+           ", Data="+repr(self.data)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier and \
+           self.data == packet.data
+
+
+class Unsubscribes(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=1, Retain=False, MsgId=0, Data=[]):
+    self.fh = FixedHeaders(UNSUBSCRIBE)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    # payload - list of topics
+    self.data = Data[:]
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    for d in self.data:
+      buffer += writeUTF(d)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == UNSUBSCRIBE
+    fhlen = self.fh.unpack(buffer)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    logger.info("[MQTT-2.3.1-1] packet indentifier must be in unsubscribe")
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.messageIdentifier > 0, "[MQTT-2.3.1-1] packet indentifier must be > 0"
+    leftlen = self.fh.remainingLength - 2
+    self.data = []
+    while leftlen > 0:
+      topic = readUTF(buffer[-leftlen:], leftlen)
+      leftlen -= len(topic) + 2
+      self.data.append(topic)
+    assert leftlen == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 1, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+    logger.info("[MQTT-3-10.1-1] fixed header bits are 0,0,1,0")
+    return fhlen + self.fh.remainingLength
+
+  def __repr__(self):
+    return repr(self.fh)+", MsgId="+repr(self.messageIdentifier)+\
+           ", Data="+repr(self.data)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier and \
+           self.data == packet.data
+
+
+class Unsubacks(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False, MsgId=0):
+    self.fh = FixedHeaders(UNSUBACK)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    # variable header
+    self.messageIdentifier = MsgId
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.messageIdentifier)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == UNSUBACK
+    fhlen = self.fh.unpack(buffer)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.messageIdentifier > 0, "[MQTT-2.3.1-1] packet indentifier must be > 0"
+    self.messageIdentifier = readInt16(buffer[fhlen:])
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+    return fhlen + self.fh.remainingLength
+
+  def __repr__(self):
+    return repr(self.fh)+", MsgId="+repr(self.messageIdentifier)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.messageIdentifier == packet.messageIdentifier
+
+
+class Pingreqs(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False):
+    self.fh = FixedHeaders(PINGREQ)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    if buffer != None:
+      self.unpack(buffer)
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PINGREQ
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+    return fhlen
+
+  def __repr__(self):
+    return repr(self.fh)+")"
+
+
+class Pingresps(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, Retain=False):
+    self.fh = FixedHeaders(PINGRESP)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.Retain = Retain
+    if buffer != None:
+      self.unpack(buffer)
+
+  def unpack(self, buffer):
+    assert len(buffer) >= 2
+    assert MessageType(buffer) == PINGRESP
+    fhlen = self.fh.unpack(buffer)
+    assert self.fh.remainingLength == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+    return fhlen
+
+  def __repr__(self):
+    return repr(self.fh)+")"
+
+classes = [None, Connects, Connacks, Publishes, Pubacks, Pubrecs,
+           Pubrels, Pubcomps, Subscribes, Subacks, Unsubscribes,
+           Unsubacks, Pingreqs, Pingresps, Disconnects]
+
+def unpackPacket(buffer):
+  if MessageType(buffer) != None:
+    packet = classes[MessageType(buffer)]()
+    packet.unpack(buffer)
+  else:
+    packet = None
+  return packet
+
+if __name__ == "__main__":
+  fh = FixedHeaders(CONNECT)
+  tests = [0, 56, 127, 128, 8888, 16383, 16384, 65535, 2097151, 2097152,
+           20555666, 268435454, 268435455]
+  for x in tests:
+    try:
+      assert x == fh.decode(fh.encode(x))[0]
+    except AssertionError:
+      print("Test failed for x =", x, fh.decode(fh.encode(x)))
+  try:
+    fh.decode(fh.encode(268435456))
+    print("Error")
+  except AssertionError:
+    pass
+
+  for packet in classes[1:]:
+    before = str(packet())   
+    after = str(unpackPacket(packet().pack()))
+    try:
+      assert before == after
+    except:
+      print("before:", before, "\nafter:", after)
+  print("End")
+
diff --git a/mqtt/src/test/MQTTV5.py b/mqtt/src/test/MQTTV5.py
new file mode 100644
index 00000000..567aa77f
--- /dev/null
+++ b/mqtt/src/test/MQTTV5.py
@@ -0,0 +1,1464 @@
+"""
+*******************************************************************
+  Copyright (c) 2013, 2018 IBM Corp.
+
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  and Eclipse Distribution License v1.0 which accompany this distribution.
+
+  The Eclipse Public License is available at
+     http://www.eclipse.org/legal/epl-v10.html
+  and the Eclipse Distribution License is available at
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+  Contributors:
+     Ian Craggs - initial implementation and/or documentation
+     Ian Craggs - take MQTT 3.1.1 and create MQTT 5.0 version
+*******************************************************************
+"""
+
+"""
+
+Assertions are used to validate incoming data, but are omitted from outgoing packets.  This is
+so that the tests that use this package can send invalid data for error testing.
+
+"""
+
+import logging, struct
+
+logger = logging.getLogger('MQTTV5')
+
+# Low-level protocol interface
+
+class MQTTException(Exception):
+  pass
+
+class MalformedPacket(MQTTException):
+  pass
+
+class ProtocolError(MQTTException):
+  pass
+
+MAX_PACKET_SIZE = 2**28-1
+MAX_PACKETID = 2**16-1
+
+class PacketTypes:
+
+  indexes = range(1, 16)
+
+  # Packet types
+  CONNECT, CONNACK, PUBLISH, PUBACK, PUBREC, PUBREL, \
+  PUBCOMP, SUBSCRIBE, SUBACK, UNSUBSCRIBE, UNSUBACK, \
+  PINGREQ, PINGRESP, DISCONNECT, AUTH = indexes
+
+  # Dummy packet type for properties use - will delay only applies to will
+  WILLMESSAGE = 99
+
+
+class Packets(object):
+
+  Names = [ "reserved", \
+    "Connect", "Connack", "Publish", "Puback", "Pubrec", "Pubrel", \
+    "Pubcomp", "Subscribe", "Suback", "Unsubscribe", "Unsuback", \
+    "Pingreq", "Pingresp", "Disconnect", "Auth"]
+
+  classNames = [name+'es' if name == "Publish" else
+                name+'s' if name != "reserved" else name for name in Names]
+
+  def pack(self):
+    buffer = self.fh.pack(0)
+    return buffer
+
+  def __str__(self):
+    return str(self.fh)
+
+  def __eq__(self, packet):
+    return self.fh == packet.fh if packet else False
+
+  def __setattr__(self, name, value):
+    if name not in self.names:
+      raise MQTTException(name + " Attribute name must be one of "+str(self.names))
+    object.__setattr__(self, name, value)
+
+
+def PacketType(byte):
+  """
+    Retrieve the message type from the first byte of the fixed header.
+  """
+  if byte != None:
+    rc = byte[0] >> 4
+  else:
+    rc = None
+  return rc
+
+class ReasonCodes:
+  """
+    The reason code used in MQTT V5.0
+
+  """
+
+  def __getName__(self, packetType, identifier):
+    """
+    used when displaying the reason code
+    """
+    assert identifier in self.names.keys(), identifier
+    names = self.names[identifier]
+    namelist = [name for name in names.keys() if packetType in names[name]]
+    assert len(namelist) == 1
+    return namelist[0]
+
+  def getId(self, name):
+    """
+    used when setting the reason code for a packetType
+    check that only valid codes for the packet are set
+    """
+    identifier = None
+    for code in self.names.keys():
+      if name in self.names[code].keys():
+        if self.packetType in self.names[code][name]:
+          identifier = code
+        break
+    assert identifier != None, name
+    return identifier
+
+  def set(self, name):
+    self.value = self.getId(name)
+
+  def unpack(self, buffer):
+    name = self.__getName__(self.packetType, buffer[0])
+    self.value = self.getId(name)
+    return 1
+
+  def getName(self):
+    return self.__getName__(self.packetType, self.value)
+
+  def __str__(self):
+    return self.getName()
+
+  def pack(self):
+    return bytes([self.value])
+
+  def __init__(self, packetType, aName="Success", identifier=-1):
+    self.packetType = packetType
+    self.names = {
+    0 : { "Success" : [PacketTypes.CONNACK, PacketTypes.PUBACK,
+        PacketTypes.PUBREC, PacketTypes.PUBREL, PacketTypes.PUBCOMP,
+        PacketTypes.UNSUBACK, PacketTypes.AUTH],
+          "Normal disconnection" : [PacketTypes.DISCONNECT],
+          "Granted QoS 0" : [PacketTypes.SUBACK] },
+    1 : { "Granted QoS 1" : [PacketTypes.SUBACK] },
+    2 : { "Granted QoS 2" : [PacketTypes.SUBACK] },
+    4 : { "Disconnect with will message" : [PacketTypes.DISCONNECT] },
+    16 : { "No matching subscribers" :
+      [PacketTypes.PUBACK, PacketTypes.PUBREC] },
+    17 : { "No subscription found" : [PacketTypes.UNSUBACK] },
+    24 : { "Continue authentication" : [PacketTypes.AUTH] },
+    25 : { "Re-authenticate" : [PacketTypes.AUTH] },
+    128 : { "Unspecified error" : [PacketTypes.CONNACK, PacketTypes.PUBACK,
+      PacketTypes.PUBREC, PacketTypes.SUBACK, PacketTypes.UNSUBACK,
+      PacketTypes.DISCONNECT], },
+    129 : { "Malformed packet" :
+          [PacketTypes.CONNACK, PacketTypes.DISCONNECT] },
+    130 : { "Protocol error" :
+          [PacketTypes.CONNACK, PacketTypes.DISCONNECT] },
+    131 : { "Implementation specific error": [PacketTypes.CONNACK,
+          PacketTypes.PUBACK, PacketTypes.PUBREC, PacketTypes.SUBACK,
+          PacketTypes.UNSUBACK, PacketTypes.DISCONNECT], },
+    132 : { "Unsupported protocol version" : [PacketTypes.CONNACK] },
+    133 : { "Client identifier not valid" : [PacketTypes.CONNACK] },
+    134 : { "Bad user name or password" : [PacketTypes.CONNACK] },
+    135 : { "Not authorized" : [PacketTypes.CONNACK, PacketTypes.PUBACK,
+              PacketTypes.PUBREC, PacketTypes.SUBACK, PacketTypes.UNSUBACK,
+              PacketTypes.DISCONNECT], },
+    136 : { "Server unavailable" : [PacketTypes.CONNACK] },
+    137 : { "Server busy" : [PacketTypes.CONNACK, PacketTypes.DISCONNECT] },
+    138 : { "Banned" : [PacketTypes.CONNACK] },
+    139 : { "Server shutting down" : [PacketTypes.DISCONNECT] },
+    140 : { "Bad authentication method" :
+            [PacketTypes.CONNACK, PacketTypes.DISCONNECT] },
+    141 : { "Keep alive timeout" : [PacketTypes.DISCONNECT] },
+    142 : { "Session taken over" : [PacketTypes.DISCONNECT] },
+    143 : { "Topic filter invalid" :
+            [PacketTypes.SUBACK, PacketTypes.UNSUBACK, PacketTypes.DISCONNECT]},
+    144 : { "Topic name invalid" :
+            [PacketTypes.CONNACK, PacketTypes.PUBACK,
+            PacketTypes.PUBREC, PacketTypes.DISCONNECT]},
+    145 : { "Packet identifier in use" :
+            [PacketTypes.PUBACK, PacketTypes.PUBREC,
+             PacketTypes.SUBACK, PacketTypes.UNSUBACK]},
+    146 : { "Packet identifier not found" :
+            [PacketTypes.PUBREL, PacketTypes.PUBCOMP] },
+    147 : { "Receive maximum exceeded": [PacketTypes.DISCONNECT] },
+    148 : { "Topic alias invalid": [PacketTypes.DISCONNECT] },
+    149 : { "Packet too large": [PacketTypes.CONNACK, PacketTypes.DISCONNECT] },
+    150 : { "Message rate too high": [PacketTypes.DISCONNECT] },
+    151 : { "Quota exceeded": [PacketTypes.CONNACK, PacketTypes.PUBACK,
+          PacketTypes.PUBREC, PacketTypes.SUBACK, PacketTypes.DISCONNECT], },
+    152 : { "Administrative action" : [PacketTypes.DISCONNECT] },
+    153 : { "Payload format invalid" :
+            [PacketTypes.PUBACK, PacketTypes.PUBREC, PacketTypes.DISCONNECT]},
+    154 : { "Retain not supported" :
+            [PacketTypes.CONNACK, PacketTypes.DISCONNECT] },
+    155 : { "QoS not supported" :
+            [PacketTypes.CONNACK, PacketTypes.DISCONNECT] },
+    156 : { "Use another server" :
+            [PacketTypes.CONNACK, PacketTypes.DISCONNECT] },
+    157 : { "Server moved" :
+            [PacketTypes.CONNACK, PacketTypes.DISCONNECT] },
+    158 : { "Shared subscription not supported" :
+            [PacketTypes.SUBACK, PacketTypes.DISCONNECT] },
+    159 : { "Connection rate exceeded" :
+            [PacketTypes.CONNACK, PacketTypes.DISCONNECT] },
+    160 : { "Maximum connect time" :
+            [PacketTypes.DISCONNECT] },
+    161 : { "Subscription identifiers not supported" :
+            [PacketTypes.SUBACK, PacketTypes.DISCONNECT] },
+    162 : { "Wildcard subscription not supported" :
+            [PacketTypes.SUBACK, PacketTypes.DISCONNECT] },
+    }
+    if identifier == -1:
+      self.set(aName)
+    else:
+      self.value = identifier
+      self.getName() # check it's good
+
+
+class VBIs:  # Variable Byte Integer
+
+  @staticmethod
+  def encode(x):
+    """
+      Convert an integer 0 <= x <= 268435455 into multi-byte format.
+      Returns the buffer convered from the integer.
+    """
+    assert 0 <= x <= 268435455
+    buffer = b''
+    while 1:
+      digit = x % 128
+      x //= 128
+      if x > 0:
+        digit |= 0x80
+      buffer += bytes([digit])
+      if x == 0:
+        break
+    return buffer
+
+  @staticmethod
+  def decode(buffer):
+    """
+      Get the value of a multi-byte integer from a buffer
+      Return the value, and the number of bytes used.
+
+      [MQTT-1.5.5-1] the encoded value MUST use the minimum number of bytes necessary to represent the value
+    """
+    multiplier = 1
+    value = 0
+    bytes = 0
+    while 1:
+      bytes += 1
+      digit = buffer[0]
+      buffer = buffer[1:]
+      value += (digit & 127) * multiplier
+      if digit & 128 == 0:
+        break
+      multiplier *= 128
+    return (value, bytes)
+
+def getPacket(aSocket):
+  "receive the next packet"
+  buf = aSocket.recv(1) # get the first byte fixed header
+  if buf == b"":
+    return None
+  if str(aSocket).find("[closed]") != -1:
+    closed = True
+  else:
+    closed = False
+  if closed:
+    return None
+  # now get the remaining length
+  multiplier = 1
+  remlength = 0
+  while 1:
+    next = aSocket.recv(1)
+    while len(next) == 0:
+      next = aSocket.recv(1)
+    buf += next
+    digit = buf[-1]
+    remlength += (digit & 127) * multiplier
+    if digit & 128 == 0:
+      break
+    multiplier *= 128
+  # receive the remaining length if there is any
+  rest = bytes([])
+  if remlength > 0:
+    while len(rest) < remlength:
+      rest += aSocket.recv(remlength-len(rest))
+  assert len(rest) == remlength
+  return buf + rest
+
+
+class FixedHeaders(object):
+
+  def __init__(self, aPacketType):
+    self.PacketType = aPacketType
+    self.DUP = False
+    self.QoS = 0
+    self.RETAIN = False
+    self.remainingLength = 0
+
+  def __eq__(self, fh):
+    return self.PacketType == fh.PacketType and \
+           self.DUP == fh.DUP and \
+           self.QoS == fh.QoS and \
+           self.RETAIN == fh.RETAIN # and \
+           # self.remainingLength == fh.remainingLength
+
+  def __setattr__(self, name, value):
+    names = ["PacketType", "DUP", "QoS", "RETAIN", "remainingLength"]
+    if name not in names:
+      raise MQTTException(name + " Attribute name must be one of "+str(names))
+    object.__setattr__(self, name, value)
+
+  def __str__(self):
+    "return printable representation of our data"
+    return Packets.classNames[self.PacketType]+'(fh.DUP='+str(self.DUP)+ \
+           ", fh.QoS="+str(self.QoS)+", fh.RETAIN="+str(self.RETAIN)
+
+  def pack(self, length):
+    "pack data into string buffer ready for transmission down socket"
+    buffer = bytes([(self.PacketType << 4) | (self.DUP << 3) |\
+                         (self.QoS << 1) | self.RETAIN])
+    self.remainingLength = length
+    buffer += VBIs.encode(length)
+    return buffer
+
+  def unpack(self, buffer, maximumPacketSize):
+    "unpack data from string buffer into separate fields"
+    b0 = buffer[0]
+    self.PacketType = b0 >> 4
+    self.DUP = ((b0 >> 3) & 0x01) == 1
+    self.QoS = (b0 >> 1) & 0x03
+    self.RETAIN = (b0 & 0x01) == 1
+    (self.remainingLength, bytes) = VBIs.decode(buffer[1:])
+    if self.remainingLength + bytes + 1 > maximumPacketSize:
+       raise ProtocolError("Packet too large")
+    return bytes + 1 # length of fixed header
+
+
+def writeInt16(length):
+  return bytes([length // 256, length % 256])
+
+def readInt16(buf):
+  return buf[0]*256 + buf[1]
+
+def writeInt32(length):
+  buffer = [length // 16777216]
+  length %= 16777216
+  buffer += [length // 65536]
+  length %= 65536
+  buffer += [length // 256, length % 256]
+  return bytes(buffer)
+
+def readInt32(buf):
+  return buf[0]*16777216 + buf[1]*65536 + buf[2]*256 + buf[3]
+
+def writeUTF(data):
+  # data could be a string, or bytes.  If string, encode into bytes with utf-8
+  return writeInt16(len(data)) + (data if type(data) == type(b"") else bytes(data, "utf-8"))
+
+def readUTF(buffer, maxlen):
+  if maxlen >= 2:
+    length = readInt16(buffer)
+  else:
+    raise MalformedPacket("Not enough data to read string length")
+  maxlen -= 2
+  if length > maxlen:
+    raise MalformedPacket("Length delimited string too long")
+  buf = buffer[2:2+length].decode("utf-8")
+  logger.info("[MQTT-4.7.3-2] topic names and filters must not include null")
+  zz = buf.find("\x00") # look for null in the UTF string
+  if zz != -1:
+    raise MalformedPacket("[MQTT-1.5.4-2] Null found in UTF data "+buf)
+  for c in range (0xD800, 0xDFFF):
+    zz = buf.find(chr(c)) # look for D800-DFFF in the UTF string
+    if zz != -1:
+      raise MalformedPacket("[MQTT-1.5.4-1] D800-DFFF found in UTF data "+buf)
+  if buf.find("\uFEFF") != -1:
+    logger.info("[MQTT-1.5.4-3] U+FEFF in UTF string")
+  return buf, length+2
+
+def writeBytes(buffer):
+  return writeInt16(len(buffer)) + buffer
+
+def readBytes(buffer):
+  length = readInt16(buffer)
+  return buffer[2:2+length], length+2
+
+
+class Properties(object):
+
+  def __init__(self, packetType):
+    self.packetType = packetType
+    self.types = ["Byte", "Two Byte Integer", "Four Byte Integer", "Variable Byte Integer",
+       "Binary Data", "UTF-8 Encoded String", "UTF-8 String Pair"]
+
+    self.names = {
+      "Payload Format Indicator" : 1,
+      "Message Expiry Interval" : 2,
+      "Content Type" : 3,
+      "Response Topic" : 8,
+      "Correlation Data" : 9,
+      "Subscription Identifier" : 11,
+      "Session Expiry Interval" : 17,
+      "Assigned Client Identifier" : 18,
+      "Server Keep Alive" : 19,
+      "Authentication Method" : 21,
+      "Authentication Data" : 22,
+      "Request Problem Information" : 23,
+      "Will Delay Interval" : 24,
+      "Request Response Information" : 25,
+      "Response Information" : 26,
+      "Server Reference" : 28,
+      "Reason String" : 31,
+      "Receive Maximum" : 33,
+      "Topic Alias Maximum" : 34,
+      "Topic Alias" : 35,
+      "Maximum QoS" : 36,
+      "Retain Available" : 37,
+      "User Property List" : 38,
+      "Maximum Packet Size" : 39,
+      "Wildcard Subscription Available" : 40,
+      "Subscription Identifier Available" : 41,
+      "Shared Subscription Available" : 42
+    }
+
+    self.properties = {
+    # id:  type, packets
+      1  : (self.types.index("Byte"), [PacketTypes.PUBLISH, PacketTypes.WILLMESSAGE]), # payload format indicator
+      2  : (self.types.index("Four Byte Integer"), [PacketTypes.PUBLISH, PacketTypes.WILLMESSAGE]),
+      3  : (self.types.index("UTF-8 Encoded String"), [PacketTypes.PUBLISH, PacketTypes.WILLMESSAGE]),
+      8  : (self.types.index("UTF-8 Encoded String"), [PacketTypes.PUBLISH, PacketTypes.WILLMESSAGE]),
+      9  : (self.types.index("Binary Data"), [PacketTypes.PUBLISH, PacketTypes.WILLMESSAGE]),
+      11 : (self.types.index("Variable Byte Integer"),
+           [PacketTypes.PUBLISH, PacketTypes.SUBSCRIBE]),
+      17 : (self.types.index("Four Byte Integer"),
+           [PacketTypes.CONNECT, PacketTypes.CONNACK, PacketTypes.DISCONNECT]),
+      18 : (self.types.index("UTF-8 Encoded String"), [PacketTypes.CONNACK]),
+      19 : (self.types.index("Two Byte Integer"), [PacketTypes.CONNACK]),
+      21 : (self.types.index("UTF-8 Encoded String"),
+           [PacketTypes.CONNECT, PacketTypes.CONNACK, PacketTypes.AUTH]),
+      22 : (self.types.index("Binary Data"),
+           [PacketTypes.CONNECT, PacketTypes.CONNACK, PacketTypes.AUTH]),
+      23 : (self.types.index("Byte"),
+           [PacketTypes.CONNECT]),
+      24 : (self.types.index("Four Byte Integer"), [PacketTypes.WILLMESSAGE]),
+      25 : (self.types.index("Byte"), [PacketTypes.CONNECT]),
+      26 : (self.types.index("UTF-8 Encoded String"), [PacketTypes.CONNACK]),
+      28 : (self.types.index("UTF-8 Encoded String"),
+           [PacketTypes.CONNACK, PacketTypes.DISCONNECT]),
+      31 : (self.types.index("UTF-8 Encoded String"),
+           [PacketTypes.CONNACK, PacketTypes.PUBACK, PacketTypes.PUBREC,
+            PacketTypes.PUBREL, PacketTypes.PUBCOMP, PacketTypes.SUBACK,
+            PacketTypes.UNSUBACK, PacketTypes.DISCONNECT, PacketTypes.AUTH]),
+      33 : (self.types.index("Two Byte Integer"),
+           [PacketTypes.CONNECT, PacketTypes.CONNACK]),
+      34 : (self.types.index("Two Byte Integer"),
+           [PacketTypes.CONNECT, PacketTypes.CONNACK]),
+      35 : (self.types.index("Two Byte Integer"), [PacketTypes.PUBLISH]),
+      36 : (self.types.index("Byte"), [PacketTypes.CONNACK]),
+      37 : (self.types.index("Byte"), [PacketTypes.CONNACK]),
+      38 : (self.types.index("UTF-8 String Pair"),
+           [PacketTypes.CONNECT, PacketTypes.CONNACK,
+           PacketTypes.PUBLISH, PacketTypes.PUBACK,
+           PacketTypes.PUBREC, PacketTypes.PUBREL, PacketTypes.PUBCOMP,
+           PacketTypes.SUBSCRIBE, PacketTypes.SUBACK,
+           PacketTypes.UNSUBSCRIBE, PacketTypes.UNSUBACK,
+           PacketTypes.DISCONNECT, PacketTypes.AUTH, PacketTypes.WILLMESSAGE]),
+      39 : (self.types.index("Four Byte Integer"),
+           [PacketTypes.CONNECT, PacketTypes.CONNACK]),
+      40 : (self.types.index("Byte"), [PacketTypes.CONNACK]),
+      41 : (self.types.index("Byte"), [PacketTypes.CONNACK]),
+      42 : (self.types.index("Byte"), [PacketTypes.CONNACK]),
+    }
+
+  def getIdentFromName(self, compressedName):
+    # return the identifier corresponding to the property name
+    result = -1
+    for name in self.names.keys():
+      if compressedName == name.replace(' ', ''):
+         result = self.names[name]
+         break
+    return result
+
+  def __setattr__(self, name, value):
+    name = name.replace(' ', '')
+    privateVars = ["packetType", "types", "names", "properties"]
+    if name in privateVars:
+      object.__setattr__(self, name, value)
+    else:
+      # the name could have spaces in, or not.  Remove spaces before assignment
+      if name not in [name.replace(' ', '') for name in self.names.keys()]:
+        raise MQTTException("Attribute name must be one of "+str(self.names.keys()))
+      # check that this attribute applies to the packet type
+      if self.packetType not in self.properties[self.getIdentFromName(name)][1]:
+        raise MQTTException("Attribute %s does not apply to packet type %s"
+            % (name, Packets.Names[self.packetType]) )
+      object.__setattr__(self, name, value)
+
+  def __str__(self):
+    buffer = "["
+    first = True
+    for name in self.names.keys():
+      compressedName = name.replace(' ', '')
+      if hasattr(self, compressedName):
+        if not first:
+          buffer += ", "
+        buffer += compressedName +" : "+str(getattr(self, compressedName))
+        first = False
+    buffer += "]"
+    return buffer
+
+  def isEmpty(self):
+    rc = True
+    for name in self.names.keys():
+      compressedName = name.replace(' ', '')
+      if hasattr(self, compressedName):
+        rc = False
+        break
+    return rc
+
+  def clear(self):
+    for name in self.names.keys():
+      compressedName = name.replace(' ', '')
+      if hasattr(self, compressedName):
+        delattr(self, compressedName)
+
+  def writeProperty(self, identifier, type, value):
+    buffer = b""
+    buffer += VBIs.encode(identifier) # identifier
+    if type == self.types.index("Byte"): # value
+      buffer += bytes([value])
+    elif type == self.types.index("Two Byte Integer"):
+      buffer += writeInt16(value)
+    elif type == self.types.index("Four Byte Integer"):
+      buffer += writeInt32(value)
+    elif type == self.types.index("Variable Byte Integer"):
+      buffer += VBIs.encode(value)
+    elif type == self.types.index("Binary Data"):
+      buffer += writeBytes(value)
+    elif type == self.types.index("UTF-8 Encoded String"):
+      buffer += writeUTF(value)
+    elif type == self.types.index("UTF-8 String Pair"):
+      buffer += writeUTF(value[0]) + writeUTF(value[1])
+    return buffer
+
+  def pack(self):
+    # serialize properties into buffer for sending over network
+    buffer = b""
+    for name in self.names.keys():
+      compressedName = name.replace(' ', '')
+      isList = False
+      if compressedName.endswith('List'):
+        isList = True
+      if hasattr(self, compressedName):
+        identifier = self.getIdentFromName(compressedName)
+        attr_type = self.properties[identifier][0]
+        if isList:
+          for prop in getattr(self, compressedName):
+            buffer += self.writeProperty(identifier, attr_type, prop)
+        else:
+          buffer += self.writeProperty(identifier, attr_type,
+                           getattr(self, compressedName))
+    return VBIs.encode(len(buffer)) + buffer
+
+  def readProperty(self, buffer, type, propslen):
+    if type == self.types.index("Byte"):
+      value = buffer[0]
+      valuelen = 1
+    elif type == self.types.index("Two Byte Integer"):
+      value = readInt16(buffer)
+      valuelen = 2
+    elif type == self.types.index("Four Byte Integer"):
+      value = readInt32(buffer)
+      valuelen = 4
+    elif type == self.types.index("Variable Byte Integer"):
+      value, valuelen = VBIs.decode(buffer)
+    elif type == self.types.index("Binary Data"):
+      value, valuelen = readBytes(buffer)
+    elif type == self.types.index("UTF-8 Encoded String"):
+      value, valuelen = readUTF(buffer, propslen)
+    elif type == self.types.index("UTF-8 String Pair"):
+      value, valuelen = readUTF(buffer, propslen)
+      buffer = buffer[valuelen:] # strip the bytes used by the value
+      value1, valuelen1 = readUTF(buffer, propslen - valuelen)
+      value = (value, value1)
+      valuelen += valuelen1
+    return value, valuelen
+
+  def getNameFromIdent(self, identifier):
+    rc = None
+    for name in self.names:
+      if self.names[name] == identifier:
+        rc = name
+    return rc
+
+  def unpack(self, buffer):
+    self.clear()
+    # deserialize properties into attributes from buffer received from network
+    propslen, VBIlen = VBIs.decode(buffer)
+    buffer = buffer[VBIlen:] # strip the bytes used by the VBI
+    propslenleft = propslen
+    while propslenleft > 0: # properties length is 0 if there are none
+      identifier, VBIlen = VBIs.decode(buffer) # property identifier
+      buffer = buffer[VBIlen:] # strip the bytes used by the VBI
+      propslenleft -= VBIlen
+      attr_type = self.properties[identifier][0]
+      value, valuelen = self.readProperty(buffer, attr_type, propslenleft)
+      buffer = buffer[valuelen:] # strip the bytes used by the value
+      propslenleft -= valuelen
+      propname = self.getNameFromIdent(identifier)
+      compressedName = propname.replace(' ', '')
+      if propname.endswith('List'):
+        if not hasattr(self, compressedName):
+          setattr(self, propname, [value])
+        else:
+          setattr(self, propname, getattr(self, compressedName) + [value])
+      else:
+        if hasattr(self, compressedName):
+          raise MQTTException("Property '%s' must not exist more than once" % property)
+        setattr(self, propname, value)
+    return self, propslen + VBIlen
+
+
+class Connects(Packets):
+
+  def __init__(self, buffer = None):
+    object.__setattr__(self, "names",
+         ["fh", "properties", "willProperties", "ProtocolName", "ProtocolVersion",
+          "ClientIdentifier", "CleanStart", "KeepAliveTimer",
+          "WillFlag", "WillQoS", "WillRETAIN", "WillTopic", "WillMessage",
+          "usernameFlag", "passwordFlag", "username", "password"])
+
+    self.fh = FixedHeaders(PacketTypes.CONNECT)
+
+    # variable header
+    self.ProtocolName = "MQTT"
+    self.ProtocolVersion = 5
+    self.CleanStart = True
+    self.WillFlag = False
+    self.WillQoS = 0
+    self.WillRETAIN = 0
+    self.KeepAliveTimer = 30
+    self.usernameFlag = False
+    self.passwordFlag = False
+
+    self.properties = Properties(PacketTypes.CONNECT)
+    self.willProperties = Properties(PacketTypes.WILLMESSAGE)
+
+    # Payload
+    self.ClientIdentifier = ""   # UTF-8
+    self.WillTopic = None        # UTF-8
+    self.WillMessage = None      # binary
+    self.username = None         # UTF-8
+    self.password = None         # binary
+
+    #self.properties = Properties()
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    connectFlags = bytes([(self.CleanStart << 1) | (self.WillFlag << 2) | \
+                       (self.WillQoS << 3) | (self.WillRETAIN << 5) | \
+                       (self.usernameFlag << 6) | (self.passwordFlag << 7)])
+    buffer = writeUTF(self.ProtocolName) + bytes([self.ProtocolVersion]) + \
+              connectFlags + writeInt16(self.KeepAliveTimer)
+    buffer += self.properties.pack()
+    buffer += writeUTF(self.ClientIdentifier)
+    if self.WillFlag:
+      assert self.willProperties.packetType == PacketTypes.WILLMESSAGE
+      buffer += self.willProperties.pack()
+      buffer += writeUTF(self.WillTopic)
+      buffer += writeBytes(self.WillMessage)
+    if self.usernameFlag:
+      buffer += writeUTF(self.username)
+    if self.passwordFlag:
+      buffer += writeBytes(self.password)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer, maximumPacketSize):
+    assert len(buffer) >= 2
+    assert PacketType(buffer) == PacketTypes.CONNECT
+
+    try:
+      fhlen = self.fh.unpack(buffer, maximumPacketSize)
+      packlen = fhlen + self.fh.remainingLength
+      assert len(buffer) >= packlen, "buffer length %d packet length %d" % (len(buffer), packlen)
+      curlen = fhlen # points to after header + remaining length
+      assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+      assert self.fh.QoS == 0, "[MQTT-2.1.2-1] QoS was not 0, was %d" % self.fh.QoS
+      assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+
+      # to allow the server to send back a CONNACK with unsupported protocol version,
+      # the following two assertions will need to be disabled
+      self.ProtocolName, valuelen = readUTF(buffer[curlen:], packlen - curlen)
+      curlen += valuelen
+      assert self.ProtocolName == "MQTT", "Wrong protocol name %s" % self.ProtocolName
+
+      self.ProtocolVersion = buffer[curlen]
+      curlen += 1
+      assert self.ProtocolVersion == 5, "Wrong protocol version %s" % self.ProtocolVersion
+
+      connectFlags = buffer[curlen]
+      assert (connectFlags & 0x01) == 0, "[MQTT-3.1.2-3] reserved connect flag must be 0"
+      self.CleanStart = ((connectFlags >> 1) & 0x01) == 1
+      self.WillFlag = ((connectFlags >> 2) & 0x01) == 1
+      self.WillQoS = (connectFlags >> 3) & 0x03
+      self.WillRETAIN = (connectFlags >> 5) & 0x01
+      self.passwordFlag = ((connectFlags >> 6) & 0x01) == 1
+      self.usernameFlag = ((connectFlags >> 7) & 0x01) == 1
+      curlen += 1
+
+      if self.WillFlag:
+        assert self.WillQoS in [0, 1, 2], "[MQTT-3.1.2-12] will qos must not be 3"
+      else:
+        assert self.WillQoS == 0, "[MQTT-3.1.2-11] will qos must be 0, if will flag is false"
+        assert self.WillRETAIN == False, "[MQTT-3.1.2-13] will retain must be false, if will flag is false"
+
+      self.KeepAliveTimer = readInt16(buffer[curlen:])
+      curlen += 2
+
+      curlen += self.properties.unpack(buffer[curlen:])[1]
+
+      logger.info("[MQTT-3.1.3-3] Clientid must be present, and first field")
+      logger.info("[MQTT-3.1.3-4] Clientid must be Unicode, and between 0 and 65535 bytes long")
+      self.ClientIdentifier, valuelen = readUTF(buffer[curlen:], packlen - curlen)
+      curlen += valuelen
+
+      if self.WillFlag:
+        curlen += self.willProperties.unpack(buffer[curlen:])[1]
+        self.WillTopic, valuelen = readUTF(buffer[curlen:], packlen - curlen)
+        curlen += valuelen
+        self.WillMessage, valuelen = readBytes(buffer[curlen:])
+        curlen += valuelen
+        logger.info("[[MQTT-3.1.2-9] will topic and will message fields must be present")
+      else:
+        self.WillTopic = self.WillMessage = None
+
+      if self.usernameFlag:
+        assert len(buffer) > curlen+2, "Buffer too short to read username length"
+        self.username, valuelen = readUTF(buffer[curlen:], packlen - curlen)
+        curlen += valuelen
+        logger.info("[MQTT-3.1.2-19] username must be in payload if user name flag is 1")
+      else:
+        logger.info("[MQTT-3.1.2-18] username must not be in payload if user name flag is 0")
+        assert self.passwordFlag == False, "[MQTT-3.1.2-22] password flag must be 0 if username flag is 0"
+
+      if self.passwordFlag:
+        assert len(buffer) > curlen+2, "Buffer too short to read password length"
+        self.password, valuelen = readBytes(buffer[curlen:])
+        curlen += valuelen
+        logger.info("[MQTT-3.1.2-21] password must be in payload if password flag is 0")
+      else:
+        logger.info("[MQTT-3.1.2-20] password must not be in payload if password flag is 0")
+
+      if self.WillFlag and self.usernameFlag and self.passwordFlag:
+        logger.info("[MQTT-3.1.3-1] clientid, will topic, will message, username and password all present")
+
+      assert curlen == packlen, "Packet is wrong length curlen %d != packlen %d" % (curlen, packlen)
+    except:
+      logger.exception("[MQTT-3.1.4-1] server must validate connect packet and close connection without connack if it does not conform")
+      raise
+
+  def __str__(self):
+    buf = str(self.fh)+", ProtocolName="+str(self.ProtocolName)+", ProtocolVersion=" +\
+          str(self.ProtocolVersion)+", CleanStart="+str(self.CleanStart) +\
+          ", WillFlag="+str(self.WillFlag)+", KeepAliveTimer=" +\
+          str(self.KeepAliveTimer)+", ClientId="+str(self.ClientIdentifier) +\
+          ", usernameFlag="+str(self.usernameFlag)+", passwordFlag="+str(self.passwordFlag)
+    if self.WillFlag:
+      buf += ", WillQoS=" + str(self.WillQoS) +\
+             ", WillRETAIN=" + str(self.WillRETAIN) +\
+             ", WillTopic='"+ self.WillTopic +\
+             "', WillMessage='"+str(self.WillMessage)+"'"
+    if self.username:
+      buf += ", username="+self.username
+    if self.password:
+      buf += ", password="+str(self.password)
+    buf += ", properties="+str(self.properties)
+    return buf+")"
+
+  def __eq__(self, packet):
+    rc = Packets.__eq__(self, packet) and \
+           self.ProtocolName == packet.ProtocolName and \
+           self.ProtocolVersion == packet.ProtocolVersion and \
+           self.CleanStart == packet.CleanStart and \
+           self.WillFlag == packet.WillFlag and \
+           self.KeepAliveTimer == packet.KeepAliveTimer and \
+           self.ClientIdentifier == packet.ClientIdentifier and \
+           self.WillFlag == packet.WillFlag
+    if rc and self.WillFlag:
+      rc = self.WillQoS == packet.WillQoS and \
+           self.WillRETAIN == packet.WillRETAIN and \
+           self.WillTopic == packet.WillTopic and \
+           self.WillMessage == packet.WillMessage
+    if rc:
+      rc = self.properties == packet.properties
+    return rc
+
+
+class Connacks(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False, ReasonCode="Success"):
+    object.__setattr__(self, "names",
+         ["fh", "sessionPresent", "reasonCode", "properties"])
+    self.fh = FixedHeaders(PacketTypes.CONNACK)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.RETAIN = RETAIN
+    self.sessionPresent = False
+    self.reasonCode = ReasonCodes(PacketTypes.CONNACK, ReasonCode)
+    self.properties = Properties(PacketTypes.CONNACK)
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    flags = 0x01 if self.sessionPresent else 0x00
+    buffer = bytes([flags])
+    buffer += self.reasonCode.pack()
+    buffer += self.properties.pack()
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer, maximumPacketSize):
+    assert len(buffer) >= 4
+    assert PacketType(buffer) == PacketTypes.CONNACK
+    curlen = self.fh.unpack(buffer, maximumPacketSize)
+    assert buffer[curlen] in [0, 1], "Connect Acknowledge Flags"
+    self.sessionPresent = (buffer[curlen] == 0x01)
+    curlen += 1
+    curlen += self.reasonCode.unpack(buffer[curlen:])
+    curlen += self.properties.unpack(buffer[curlen:])[1]
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+
+  def __str__(self):
+    return str(self.fh)+", Session present="+str((self.sessionPresent & 0x01) == 1)+\
+          ", ReturnCode="+str(self.reasonCode)+\
+          ", properties="+str(self.properties)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.reasonCode == packet.reasonCode
+
+
+class Disconnects(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False,
+          reasonCode="Normal disconnection"):
+    object.__setattr__(self, "names",
+        ["fh", "DUP", "QoS", "RETAIN", "reasonCode", "properties"])
+    self.fh = FixedHeaders(PacketTypes.DISCONNECT)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.RETAIN = RETAIN
+    # variable header
+    self.reasonCode = ReasonCodes(PacketTypes.DISCONNECT, identifier=reasonCode)
+    self.properties = Properties(PacketTypes.DISCONNECT)
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = b""
+    if self.reasonCode.getName() != "Normal disconnection" or not self.properties.isEmpty():
+      buffer += self.reasonCode.pack()
+      if not self.properties.isEmpty():
+        buffer += self.properties.pack()
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer, maximumPacketSize):
+    self.properties.clear()
+    self.reasonCode.set("Normal disconnection")
+    assert len(buffer) >= 2
+    assert PacketType(buffer) == PacketTypes.DISCONNECT
+    fhlen = self.fh.unpack(buffer, maximumPacketSize)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DISCONNECT reserved bits must be 0"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] DISCONNECT reserved bits must be 0"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] DISCONNECT reserved bits must be 0"
+    curlen = 0
+    if self.fh.remainingLength > 0:
+      self.reasonCode.unpack(buffer[curlen:])
+      curlen += 1
+    if self.fh.remainingLength > 1:
+      curlen += self.properties.unpack(buffer[curlen:])[1]
+    assert curlen == self.fh.remainingLength, \
+            "DISCONNECT packet is wrong length %d" % self.fh.remainingLength
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    return str(self.fh)+", ReasonCode: "+str(self.reasonCode)+", Properties: "+str(self.properties)
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.reasonCode == packet.reasonCode and \
+           self.properties == packet.properties
+
+
+class Publishes(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False, MsgId=1, TopicName="", Payload=b""):
+    object.__setattr__(self, "names",
+          ["fh", "DUP", "QoS", "RETAIN", "topicName", "packetIdentifier",
+           "properties", "data", "qos2state", "receivedTime"])
+    self.fh = FixedHeaders(PacketTypes.PUBLISH)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.RETAIN = RETAIN
+    # variable header
+    self.topicName = TopicName
+    self.packetIdentifier = MsgId
+    self.properties = Properties(PacketTypes.PUBLISH)
+    # payload
+    self.data = Payload
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeUTF(self.topicName)
+    if self.fh.QoS != 0:
+      buffer +=  writeInt16(self.packetIdentifier)
+    buffer += self.properties.pack()
+    buffer += self.data
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer, maximumPacketSize):
+    assert len(buffer) >= 2
+    assert PacketType(buffer) == PacketTypes.PUBLISH
+    fhlen = self.fh.unpack(buffer, maximumPacketSize)
+    assert self.fh.QoS in [0, 1, 2], "QoS in Publish must be 0, 1, or 2"
+    packlen = fhlen + self.fh.remainingLength
+    assert len(buffer) >= packlen
+    curlen = fhlen
+    try:
+      self.topicName, valuelen = readUTF(buffer[fhlen:], packlen - curlen)
+    except UnicodeDecodeError:
+      logger.info("[MQTT-3.3.2-1] topic name in publish must be utf-8")
+      raise
+    curlen += valuelen
+    if self.fh.QoS != 0:
+      self.packetIdentifier = readInt16(buffer[curlen:])
+      logger.info("[MQTT-2.3.1-1] packet indentifier must be in publish if QoS is 1 or 2")
+      curlen += 2
+      assert self.packetIdentifier > 0, "[MQTT-2.3.1-1] packet indentifier must be > 0"
+    else:
+      logger.info("[MQTT-2.3.1-5] no packet indentifier in publish if QoS is 0")
+      self.packetIdentifier = 0
+    curlen += self.properties.unpack(buffer[curlen:])[1]
+    self.data = buffer[curlen:fhlen + self.fh.remainingLength]
+    if self.fh.QoS == 0:
+      assert self.fh.DUP == False, "[MQTT-2.1.2-4]"
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    rc = str(self.fh)
+    if self.fh.QoS != 0:
+      rc += ", PacketId="+str(self.packetIdentifier)
+    rc += ", Properties: "+str(self.properties)
+    rc += ", TopicName="+str(self.topicName)+", Payload="+str(self.data)+")"
+    return rc
+
+  def __eq__(self, packet):
+    rc = Packets.__eq__(self, packet) and \
+         self.topicName == packet.topicName and \
+         self.data == packet.data
+    if rc and self.fh.QoS != 0:
+      rc = self.packetIdentifier == packet.packetIdentifier
+    return rc
+
+
+class Acks(Packets):
+
+  def __init__(self, ackType, buffer, DUP, QoS, RETAIN, packetId):
+    object.__setattr__(self, "names",
+        ["fh", "DUP", "QoS", "RETAIN", "packetIdentifier",
+         "reasonCode", "properties"])
+    self.fh = FixedHeaders(ackType)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.RETAIN = RETAIN
+    # variable header
+    self.packetIdentifier = packetId
+    self.reasonCode = ReasonCodes(ackType)
+    self.properties = Properties(ackType)
+    object.__setattr__(self, "ackType", ackType)
+    object.__setattr__(self, "ackName", Packets.Names[self.ackType])
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.packetIdentifier)
+    if self.reasonCode.getName() != "Success" or not self.properties.isEmpty():
+      buffer += self.reasonCode.pack()
+      if not self.properties.isEmpty():
+        buffer += self.properties.pack()
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer, maximumPacketSize):
+    self.properties.clear()
+    self.reasonCode.set("Success")
+    assert len(buffer) >= 2
+    assert PacketType(buffer) == self.ackType
+    fhlen = self.fh.unpack(buffer, maximumPacketSize)
+    assert self.fh.remainingLength in [2, 3, 4], \
+        "%s packet is wrong length %d" % (self.ackName, self.fh.remainingLength)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.packetIdentifier = readInt16(buffer[fhlen:])
+    curlen = fhlen + 2
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] %s reserved bits must be 0" %\
+      self.ackName
+    if self.ackType == PacketTypes.PUBREL:
+      assert self.fh.QoS == 1, "[MQTT-3.6.1-1] %s reserved bits must be 0010" %\
+        self.ackName
+    else:
+      assert self.fh.QoS == 0, "[MQTT-2.1.2-1] %s reserved bits must be 0" %\
+        self.ackName
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] %s reserved bits must be 0" %\
+      self.ackName
+    if self.fh.remainingLength > 2:
+      self.reasonCode.unpack(buffer[curlen:])
+      curlen += 1
+    if self.fh.remainingLength > 3:
+      self.properties.unpack(buffer[curlen:])
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    return str(self.fh)+", PacketId="+str(self.packetIdentifier)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.packetIdentifier == packet.packetIdentifier
+
+
+class Pubacks(Acks):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False, PacketId=1):
+    Acks.__init__(self, PacketTypes.PUBACK, buffer, DUP, QoS, RETAIN, PacketId)
+
+class Pubrecs(Acks):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False, PacketId=1):
+    Acks.__init__(self, PacketTypes.PUBREC, buffer, DUP, QoS, RETAIN, PacketId)
+
+class Pubrels(Acks):
+
+  def __init__(self, buffer=None, DUP=False, QoS=1, RETAIN=False, PacketId=1):
+    Acks.__init__(self, PacketTypes.PUBREL, buffer, DUP, QoS, RETAIN, PacketId)
+
+class Pubcomps(Acks):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False, PacketId=1):
+    Acks.__init__(self, PacketTypes.PUBCOMP, buffer, DUP, QoS, RETAIN, PacketId)
+
+class SubscribeOptions(object):
+
+  def __init__(self, QoS=0, noLocal=False, retainAsPublished=False, retainHandling=0):
+    object.__setattr__(self, "names",
+           ["QoS", "noLocal", "retainAsPublished", "retainHandling"])
+    self.QoS = QoS # bits 0,1
+    self.noLocal = noLocal # bit 2
+    self.retainAsPublished = retainAsPublished # bit 3
+    self.retainHandling = retainHandling # bits 4 and 5: 0, 1 or 2
+
+  def __setattr__(self, name, value):
+    if name not in self.names:
+      raise MQTTException(name + " Attribute name must be one of "+str(self.names))
+    object.__setattr__(self, name, value)
+
+  def pack(self):
+    assert self.QoS in [0, 1, 2]
+    assert self.retainHandling in [0, 1, 2]
+    noLocal = 1 if self.noLocal else 0
+    retainAsPublished = 1 if self.retainAsPublished else 0
+    buffer = bytes([(self.retainHandling << 4) | (retainAsPublished << 3) |\
+                         (noLocal << 2) | self.QoS])
+    return buffer
+
+  def unpack(self, buffer):
+    b0 = buffer[0]
+    self.retainHandling = ((b0 >> 4) & 0x03)
+    self.retainAsPublished = True if ((b0 >> 3) & 0x01) == 1 else False
+    self.noLocal = True if ((b0 >> 2) & 0x01) == 1 else False
+    self.QoS = (b0 & 0x03)
+    assert self.retainHandling in [0, 1, 2]
+    assert self.QoS in [0, 1, 2]
+    return 1
+
+  def __str__(self):
+    return "{QoS="+str(self.QoS)+", noLocal="+str(self.noLocal)+\
+        ", retainAsPublished="+str(self.retainAsPublished)+\
+        ", retainHandling="+str(self.retainHandling)+"}"
+
+
+class Subscribes(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=1, RETAIN=False, MsgId=1, Data=[]):
+    object.__setattr__(self, "names",
+       ["fh", "DUP", "QoS", "RETAIN", "packetIdentifier",
+        "properties", "data"])
+    self.fh = FixedHeaders(PacketTypes.SUBSCRIBE)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.RETAIN = RETAIN
+    # variable header
+    self.packetIdentifier = MsgId
+    self.properties = Properties(PacketTypes.SUBSCRIBE)
+    # payload - list of topic, subscribe option pairs
+    self.data = Data[:]
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.packetIdentifier)
+    buffer += self.properties.pack()
+    for d in self.data:
+      buffer += writeUTF(d[0]) + d[1].pack()
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer, maximumPacketSize):
+    self.properties.clear()
+    assert len(buffer) >= 2
+    assert PacketType(buffer) == PacketTypes.SUBSCRIBE
+    fhlen = self.fh.unpack(buffer, maximumPacketSize)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    logger.info("[MQTT-2.3.1-1] packet indentifier must be in subscribe")
+    self.packetIdentifier = readInt16(buffer[fhlen:])
+    assert self.packetIdentifier > 0, "[MQTT-2.3.1-1] packet indentifier must be > 0"
+    leftlen = self.fh.remainingLength - 2
+    leftlen -= self.properties.unpack(buffer[-leftlen:])[1]
+    self.data = []
+    while leftlen > 0:
+      topic, topiclen = readUTF(buffer[-leftlen:], leftlen)
+      leftlen -= topiclen
+      options = SubscribeOptions()
+      options.unpack(buffer[-leftlen:])
+      leftlen -= 1
+      self.data.append((topic, options))
+    assert len(self.data) > 0, "[MQTT-3.8.3-1] at least one topic, qos pair must be in subscribe"
+    assert leftlen == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DUP must be false in subscribe"
+    assert self.fh.QoS == 1, "[MQTT-2.1.2-1] QoS must be 1 in subscribe"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] RETAIN must be false in subscribe"
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    return str(self.fh)+", PacketId="+str(self.packetIdentifier)+\
+           ", Properties: "+str(self.properties)+\
+           ", Data="+str( [(x, str(y)) for (x, y) in self.data] ) +")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.packetIdentifier == packet.packetIdentifier and \
+           self.data == packet.data
+
+
+class UnsubSubacks(Packets):
+
+  def __init__(self, packetType, buffer, DUP, QoS, RETAIN, PacketId, reasonCodes):
+    object.__setattr__(self, "names",
+      ["fh", "DUP", "QoS", "RETAIN", "packetIdentifier",
+       "reasonCodes", "properties"])
+    object.__setattr__(self, "packetType", packetType)
+    self.fh = FixedHeaders(self.packetType)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.RETAIN = RETAIN
+    # variable header
+    self.packetIdentifier = PacketId
+    self.properties = Properties(self.packetType)
+    # payload - list of reason codes corresponding to topics in subscribe
+    self.reasonCodes = reasonCodes[:]
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.packetIdentifier)
+    buffer += self.properties.pack()
+    for reasonCode in self.reasonCodes:
+      buffer += reasonCode.pack()
+    buffer = self.fh.pack(len(buffer)) + buffer
+    assert len(buffer) >= 3 # must have property field, even if empty
+    return buffer
+
+  def unpack(self, buffer, maximumPacketSize):
+    assert len(buffer) >= 3
+    assert PacketType(buffer) == self.packetType
+    fhlen = self.fh.unpack(buffer, maximumPacketSize)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    self.packetIdentifier = readInt16(buffer[fhlen:])
+    leftlen = self.fh.remainingLength - 2
+    leftlen -= self.properties.unpack(buffer[-leftlen:])[1]
+    self.reasonCodes = []
+    while leftlen > 0:
+      if self.packetType == PacketTypes.SUBACK:
+        reasonCode = ReasonCodes(self.packetType, "Granted QoS 0")
+      else:
+        reasonCode = ReasonCodes(self.packetType, "Success")
+      reasonCode.unpack(buffer[-leftlen:])
+      assert reasonCode.value in [0, 1, 2, 0x80], "[MQTT-3.9.3-2] return code in QoS must be 0, 1, 2 or 0x80"
+      leftlen -= 1
+      self.reasonCodes.append(reasonCode)
+    assert leftlen == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DUP should be false in suback"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] QoS should be 0 in suback"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] Retain should be false in suback"
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    return str(self.fh)+", PacketId="+str(self.packetIdentifier)+\
+           ", Properties: "+str(self.properties)+\
+           ", reason codes="+str([str(rc) for rc in self.reasonCodes])+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.packetIdentifier == packet.packetIdentifier and \
+           self.data == packet.data
+
+
+class Subacks(UnsubSubacks):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False, PacketId=1, reasonCodes=[]):
+      UnsubSubacks.__init__(self, PacketTypes.SUBACK, buffer, DUP, QoS, RETAIN, PacketId, reasonCodes)
+
+
+class Unsubscribes(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=1, RETAIN=False, PacketId=1, TopicFilters=[]):
+    object.__setattr__(self, "names",
+       ["fh", "DUP", "QoS", "RETAIN", "packetIdentifier", "properties", "topicFilters"])
+    self.fh = FixedHeaders(PacketTypes.UNSUBSCRIBE)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.RETAIN = RETAIN
+    # variable header
+    self.packetIdentifier = PacketId
+    self.properties = Properties(PacketTypes.UNSUBSCRIBE)
+    # payload - list of topics
+    self.topicFilters = TopicFilters[:]
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = writeInt16(self.packetIdentifier)
+    buffer += self.properties.pack()
+    for topicFilter in self.topicFilters:
+      buffer += writeUTF(topicFilter)
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer, maximumPacketSize):
+    assert len(buffer) >= 2
+    assert PacketType(buffer) == PacketTypes.UNSUBSCRIBE
+    fhlen = self.fh.unpack(buffer, maximumPacketSize)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    logger.info("[MQTT-2.3.1-1] packet indentifier must be in unsubscribe")
+    self.packetIdentifier = readInt16(buffer[fhlen:])
+    assert self.packetIdentifier > 0, "[MQTT-2.3.1-1] packet indentifier must be > 0"
+    leftlen = self.fh.remainingLength - 2
+    leftlen -= self.properties.unpack(buffer[-leftlen:])[1]
+    self.topicFilters = []
+    while leftlen > 0:
+      topic, topiclen = readUTF(buffer[-leftlen:], leftlen)
+      leftlen -= topiclen
+      self.topicFilters.append(topic)
+    assert leftlen == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 1, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+    logger.info("[MQTT-3-10.1-1] fixed header bits are 0,0,1,0")
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    return str(self.fh)+", PacketId="+str(self.packetIdentifier)+\
+           ", Properties: "+str(self.properties)+\
+           ", Data="+str(self.topicFilters)+")"
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.packetIdentifier == packet.packetIdentifier and \
+           self.topicFilters == packet.topicFilters
+
+
+class Unsubacks(UnsubSubacks):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False, PacketId=1, reasonCodes=[]):
+      UnsubSubacks.__init__(self, PacketTypes.UNSUBACK, buffer, DUP, QoS, RETAIN,
+          PacketId, reasonCodes)
+
+
+class Pingreqs(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False):
+    object.__setattr__(self, "names", ["fh", "DUP", "QoS", "RETAIN"])
+    self.fh = FixedHeaders(PacketTypes.PINGREQ)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.RETAIN = RETAIN
+    if buffer != None:
+      self.unpack(buffer)
+
+  def unpack(self, buffer, maximumPacketSize):
+    assert len(buffer) >= 2
+    assert PacketType(buffer) == PacketTypes.PINGREQ
+    fhlen = self.fh.unpack(buffer, maximumPacketSize)
+    assert self.fh.remainingLength == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+    return fhlen
+
+  def __str__(self):
+    return str(self.fh)+")"
+
+
+class Pingresps(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False):
+    object.__setattr__(self, "names", ["fh", "DUP", "QoS", "RETAIN"])
+    self.fh = FixedHeaders(PacketTypes.PINGRESP)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.RETAIN = RETAIN
+    if buffer != None:
+      self.unpack(buffer)
+
+  def unpack(self, buffer, maximumPacketSize):
+    assert len(buffer) >= 2
+    assert PacketType(buffer) == PacketTypes.PINGRESP
+    fhlen = self.fh.unpack(buffer, maximumPacketSize)
+    assert self.fh.remainingLength == 0
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1]"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1]"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1]"
+    return fhlen
+
+  def __str__(self):
+    return str(self.fh)+")"
+
+
+class Disconnects(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False,
+          reasonCode="Normal disconnection"):
+    object.__setattr__(self, "names",
+        ["fh", "DUP", "QoS", "RETAIN", "reasonCode", "properties"])
+    self.fh = FixedHeaders(PacketTypes.DISCONNECT)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.RETAIN = RETAIN
+    # variable header
+    self.reasonCode = ReasonCodes(PacketTypes.DISCONNECT, aName=reasonCode)
+    self.properties = Properties(PacketTypes.DISCONNECT)
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = b""
+    if self.reasonCode.getName() != "Normal disconnection" or not self.properties.isEmpty():
+      buffer += self.reasonCode.pack()
+      if not self.properties.isEmpty():
+        buffer += self.properties.pack()
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer, maximumPacketSize):
+    self.properties.clear()
+    self.reasonCode.set("Normal disconnection")
+    assert len(buffer) >= 2
+    assert PacketType(buffer) == PacketTypes.DISCONNECT
+    fhlen = self.fh.unpack(buffer, maximumPacketSize)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] DISCONNECT reserved bits must be 0"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] DISCONNECT reserved bits must be 0"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] DISCONNECT reserved bits must be 0"
+    curlen = fhlen
+    if self.fh.remainingLength > 0:
+      self.reasonCode.unpack(buffer[curlen:])
+      curlen += 1
+    if self.fh.remainingLength > 1:
+      curlen += self.properties.unpack(buffer[curlen:])[1]
+    assert curlen == fhlen + self.fh.remainingLength, \
+            "DISCONNECT packet is wrong length %d" % self.fh.remainingLength
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    return str(self.fh)+", ReasonCode: "+str(self.reasonCode)+", Properties: "+str(self.properties)
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.reasonCode == packet.reasonCode and \
+           self.properties == packet.properties
+
+
+class Auths(Packets):
+
+  def __init__(self, buffer=None, DUP=False, QoS=0, RETAIN=False,
+          reasonCode="Success"):
+    object.__setattr__(self, "names",
+        ["fh", "DUP", "QoS", "RETAIN", "reasonCode", "properties"])
+    self.fh = FixedHeaders(PacketTypes.AUTH)
+    self.fh.DUP = DUP
+    self.fh.QoS = QoS
+    self.fh.RETAIN = RETAIN
+    # variable header
+    self.reasonCode = ReasonCodes(PacketTypes.AUTH, reasonCode)
+    self.properties = Properties(PacketTypes.AUTH)
+    if buffer != None:
+      self.unpack(buffer)
+
+  def pack(self):
+    buffer = self.reasonCode.pack()
+    buffer += self.properties.pack()
+    buffer = self.fh.pack(len(buffer)) + buffer
+    return buffer
+
+  def unpack(self, buffer, maximumPacketSize):
+    assert len(buffer) >= 2
+    assert PacketType(buffer) == PacketTypes.AUTH
+    fhlen = self.fh.unpack(buffer, maximumPacketSize)
+    assert len(buffer) >= fhlen + self.fh.remainingLength
+    assert self.fh.DUP == False, "[MQTT-2.1.2-1] AUTH reserved bits must be 0"
+    assert self.fh.QoS == 0, "[MQTT-2.1.2-1] AUTH reserved bits must be 0"
+    assert self.fh.RETAIN == False, "[MQTT-2.1.2-1] AUTH reserved bits must be 0"
+    curlen = fhlen
+    curlen += self.reasonCode.unpack(buffer[curlen:])
+    curlen += self.properties.unpack(buffer[curlen:])[1]
+    assert curlen == fhlen + self.fh.remainingLength, \
+            "AUTH packet is wrong length %d %d" % (self.fh.remainingLength, curlen)
+    return fhlen + self.fh.remainingLength
+
+  def __str__(self):
+    return str(self.fh)+", ReasonCode: "+str(self.reasonCode)+", Properties: "+str(self.properties)
+
+  def __eq__(self, packet):
+    return Packets.__eq__(self, packet) and \
+           self.reasonCode == packet.reasonCode and \
+           self.properties == packet.properties
+
+
+classes = [Connects, Connacks, Publishes, Pubacks, Pubrecs,
+           Pubrels, Pubcomps, Subscribes, Subacks, Unsubscribes,
+           Unsubacks, Pingreqs, Pingresps, Disconnects, Auths]
+
+def unpackPacket(buffer, maximumPacketSize=MAX_PACKET_SIZE):
+  if PacketType(buffer) != None:
+    packet = classes[PacketType(buffer)-1]()
+    packet.unpack(buffer, maximumPacketSize=maximumPacketSize)
+  else:
+    packet = None
+  return packet
diff --git a/mqtt/src/test/dll-copy.cmake b/mqtt/src/test/dll-copy.cmake
new file mode 100644
index 00000000..79bdf6ba
--- /dev/null
+++ b/mqtt/src/test/dll-copy.cmake
@@ -0,0 +1,6 @@
+FILE(GLOB dlls ${CMAKE_BINARY_DIR}/../src/*.dll)
+MESSAGE(STATUS "Files to copy: ${dlls}. From: ${CMAKE_BINARY_DIR}")
+FOREACH(dll ${dlls}) 
+	MESSAGE(STATUS "Copying dll runtime file ${dll} to runtime dir ${CMAKE_BINARY_DIR}")
+	FILE(COPY ${dll} DESTINATION ${CMAKE_BINARY_DIR})
+ENDFOREACH(dll)
\ No newline at end of file
diff --git a/mqtt/src/test/mqttsas.py b/mqtt/src/test/mqttsas.py
new file mode 100755
index 00000000..63195250
--- /dev/null
+++ b/mqtt/src/test/mqttsas.py
@@ -0,0 +1,156 @@
+"""
+*******************************************************************
+  Copyright (c) 2013, 2018 IBM Corp.
+
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  and Eclipse Distribution License v1.0 which accompany this distribution.
+
+  The Eclipse Public License is available at
+     http://www.eclipse.org/legal/epl-v10.html
+  and the Eclipse Distribution License is available at
+    http://www.eclipse.org/org/documents/edl-v10.php.
+
+  Contributors:
+     Ian Craggs - initial implementation and/or documentation
+     Ian Craggs - add MQTTV5 support
+*******************************************************************
+"""
+from __future__ import print_function
+
+import socket, sys, select, traceback, datetime, os
+try:
+  import socketserver
+  import MQTTV311    # Trace MQTT traffic - Python 3 version
+  import MQTTV5
+except:
+  traceback.print_exc()
+  import SocketServer as socketserver
+  import MQTTV3112 as MQTTV311   # Trace MQTT traffic - Python 2 version
+  import MQTTV5
+
+MQTT = MQTTV311
+logging = True
+myWindow = None
+
+
+def timestamp():
+  now = datetime.datetime.now()
+  return now.strftime('%Y%m%d %H%M%S')+str(float("."+str(now.microsecond)))[1:]
+
+suspended = []
+
+class MyHandler(socketserver.StreamRequestHandler):
+
+  def handle(self):
+    global MQTT
+    if not hasattr(self, "ids"):
+      self.ids = {}
+    if not hasattr(self, "versions"):
+      self.versions = {}
+    inbuf = True
+    i = o = e = None
+    try:
+      clients = self.request
+      brokers = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+      brokers.connect((brokerhost, brokerport))
+      terminated = False
+      while inbuf != None and not terminated:
+        (i, o, e) = select.select([clients, brokers], [], [])
+        for s in i:
+          if s in suspended:
+             print("suspended")
+          if s == clients and s not in suspended:
+            inbuf = MQTT.getPacket(clients) # get one packet
+            if inbuf == None:
+              break
+            try:
+              # if connect, this could be MQTTV3 or MQTTV5
+              if inbuf[0] >> 4 == 1: # connect packet
+                protocol_string = b'MQTT'
+                pos = inbuf.find(protocol_string)
+                if pos != -1:
+                  version = inbuf[pos + len(protocol_string)]
+                  if version == 5:
+                    MQTT = MQTTV5
+                  else:
+                    MQTT = MQTTV311
+              packet = MQTT.unpackPacket(inbuf)
+              if hasattr(packet.fh, "MessageType"):
+                packet_type = packet.fh.MessageType
+                publish_type = MQTT.PUBLISH
+                connect_type = MQTT.CONNECT
+              else:
+                packet_type = packet.fh.PacketType
+                publish_type = MQTT.PacketTypes.PUBLISH
+                connect_type = MQTT.PacketTypes.CONNECT
+              if packet_type == publish_type and \
+                  packet.topicName == "MQTTSAS topic" and \
+                  packet.data == b"TERMINATE":
+                print("Terminating client", self.ids[id(clients)])
+                brokers.close()
+                clients.close()
+                terminated = True
+                break
+              elif packet_type == publish_type and \
+                  packet.topicName == "MQTTSAS topic" and \
+                  packet.data == b"TERMINATE_SERVER":
+                print("Suspending client ", self.ids[id(clients)])
+                suspended.append(clients)
+              elif packet_type == connect_type:
+                self.ids[id(clients)] = packet.ClientIdentifier
+                self.versions[id(clients)] = 3
+              print(timestamp() , "C to S", self.ids[id(clients)], str(packet))
+              #print([hex(b) for b in inbuf])
+              #print(inbuf)
+            except:
+              traceback.print_exc()
+            brokers.send(inbuf)       # pass it on
+          elif s == brokers:
+            inbuf = MQTT.getPacket(brokers) # get one packet
+            if inbuf == None:
+              break
+            try:
+              print(timestamp(), "S to C", self.ids[id(clients)], str(MQTT.unpackPacket(inbuf)))
+            except:
+              traceback.print_exc()
+            clients.send(inbuf)
+      print(timestamp()+" client "+self.ids[id(clients)]+" connection closing")
+    except:
+      print(repr((i, o, e)), repr(inbuf))
+      traceback.print_exc()
+    if id(clients) in self.ids.keys():
+      del self.ids[id(clients)]
+    elif id(clients) in self.versions.keys():
+      del self.versions[id(clients)]
+
+class ThreadingTCPServer(socketserver.ThreadingMixIn, socketserver.TCPServer):
+  pass
+
+def run():
+  global brokerhost, brokerport
+  myhost = '127.0.0.1'
+  if len(sys.argv) > 1:
+    brokerhost = sys.argv[1]
+  else:
+    brokerhost = '127.0.0.1'
+
+  if len(sys.argv) > 2:
+    brokerport = int(sys.argv[2])
+  else:
+    brokerport = 1883
+
+  if len(sys.argv) > 3:
+    myport = int(sys.argv[3])
+  else:
+    if brokerhost == myhost:
+      myport = brokerport + 1
+    else:
+      myport = 1883
+
+  print("Listening on port", str(myport)+", broker on port", brokerport)
+  s = ThreadingTCPServer(("127.0.0.1", myport), MyHandler)
+  s.serve_forever()
+
+if __name__ == "__main__":
+  run()
diff --git a/mqtt/src/test/openssl/applink.c b/mqtt/src/test/openssl/applink.c
new file mode 100644
index 00000000..2831b39e
--- /dev/null
+++ b/mqtt/src/test/openssl/applink.c
@@ -0,0 +1,129 @@
+#define APPLINK_STDIN   1
+#define APPLINK_STDOUT  2
+#define APPLINK_STDERR  3
+#define APPLINK_FPRINTF 4
+#define APPLINK_FGETS   5
+#define APPLINK_FREAD   6
+#define APPLINK_FWRITE  7
+#define APPLINK_FSETMOD 8
+#define APPLINK_FEOF    9
+#define APPLINK_FCLOSE  10      /* should not be used */
+
+#define APPLINK_FOPEN   11      /* solely for completeness */
+#define APPLINK_FSEEK   12
+#define APPLINK_FTELL   13
+#define APPLINK_FFLUSH  14
+#define APPLINK_FERROR  15
+#define APPLINK_CLEARERR 16
+#define APPLINK_FILENO  17      /* to be used with below */
+
+#define APPLINK_OPEN    18      /* formally can't be used, as flags can vary */
+#define APPLINK_READ    19
+#define APPLINK_WRITE   20
+#define APPLINK_LSEEK   21
+#define APPLINK_CLOSE   22
+#define APPLINK_MAX     22      /* always same as last macro */
+
+#ifndef APPMACROS_ONLY
+# include <stdio.h>
+# include <io.h>
+# include <fcntl.h>
+
+static void *app_stdin(void)
+{
+    return stdin;
+}
+
+static void *app_stdout(void)
+{
+    return stdout;
+}
+
+static void *app_stderr(void)
+{
+    return stderr;
+}
+
+static int app_feof(FILE *fp)
+{
+    return feof(fp);
+}
+
+static int app_ferror(FILE *fp)
+{
+    return ferror(fp);
+}
+
+static void app_clearerr(FILE *fp)
+{
+    clearerr(fp);
+}
+
+static int app_fileno(FILE *fp)
+{
+    return _fileno(fp);
+}
+
+static int app_fsetmod(FILE *fp, char mod)
+{
+    return _setmode(_fileno(fp), mod == 'b' ? _O_BINARY : _O_TEXT);
+}
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+__declspec(dllexport)
+void **
+# if defined(__BORLANDC__)
+/*
+ * __stdcall appears to be the only way to get the name
+ * decoration right with Borland C. Otherwise it works
+ * purely incidentally, as we pass no parameters.
+ */
+ __stdcall
+# else
+ __cdecl
+# endif
+OPENSSL_Applink(void)
+{
+    static int once = 1;
+    static void *OPENSSL_ApplinkTable[APPLINK_MAX + 1] =
+        { (void *)APPLINK_MAX };
+
+    if (once) {
+        OPENSSL_ApplinkTable[APPLINK_STDIN] = app_stdin;
+        OPENSSL_ApplinkTable[APPLINK_STDOUT] = app_stdout;
+        OPENSSL_ApplinkTable[APPLINK_STDERR] = app_stderr;
+        OPENSSL_ApplinkTable[APPLINK_FPRINTF] = fprintf;
+        OPENSSL_ApplinkTable[APPLINK_FGETS] = fgets;
+        OPENSSL_ApplinkTable[APPLINK_FREAD] = fread;
+        OPENSSL_ApplinkTable[APPLINK_FWRITE] = fwrite;
+        OPENSSL_ApplinkTable[APPLINK_FSETMOD] = app_fsetmod;
+        OPENSSL_ApplinkTable[APPLINK_FEOF] = app_feof;
+        OPENSSL_ApplinkTable[APPLINK_FCLOSE] = fclose;
+
+        OPENSSL_ApplinkTable[APPLINK_FOPEN] = fopen;
+        OPENSSL_ApplinkTable[APPLINK_FSEEK] = fseek;
+        OPENSSL_ApplinkTable[APPLINK_FTELL] = ftell;
+        OPENSSL_ApplinkTable[APPLINK_FFLUSH] = fflush;
+        OPENSSL_ApplinkTable[APPLINK_FERROR] = app_ferror;
+        OPENSSL_ApplinkTable[APPLINK_CLEARERR] = app_clearerr;
+        OPENSSL_ApplinkTable[APPLINK_FILENO] = app_fileno;
+
+        OPENSSL_ApplinkTable[APPLINK_OPEN] = _open;
+        OPENSSL_ApplinkTable[APPLINK_READ] = _read;
+        OPENSSL_ApplinkTable[APPLINK_WRITE] = _write;
+        OPENSSL_ApplinkTable[APPLINK_LSEEK] = _lseek;
+        OPENSSL_ApplinkTable[APPLINK_CLOSE] = _close;
+
+        once = 0;
+    }
+
+    return OPENSSL_ApplinkTable;
+}
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/mqtt/src/test/python/controlVMnetworkstate.py b/mqtt/src/test/python/controlVMnetworkstate.py
new file mode 100755
index 00000000..29566b4c
--- /dev/null
+++ b/mqtt/src/test/python/controlVMnetworkstate.py
@@ -0,0 +1,74 @@
+#!/usr/bin/python
+import os
+import sys
+import time
+import subprocess
+import random
+bindir='/usr/bin'
+sys.path.append(bindir)
+
+def input_sel(prompt,max_,selectionoption):
+    # let the user choose the VM and verify selection
+    while True:
+        try:
+            print ('Please select from the list of running VMs\n\n'+'\n'.join(selectionoption))
+            userin = int(raw_input(prompt))
+        except ValueError:
+            print('\nThat was not a number\n\n')
+            continue
+        if userin > max_:
+            print('\nInput must be less than or equal to {0}.\n\n'.format(max_))
+        elif userin < 1:
+            print('\nInput must be greater than or equal to 1\n\n')
+        else:
+            return userin
+
+def statustext(result):
+    if result == 0:
+        status = 'OK'
+    else:
+        status = 'Failed'
+    return status
+
+def controlvmnetworkstate():
+    try:
+        offtime = 600
+        ontime = 14
+        vmdict={}
+        vmlist=[]
+        executable = os.path.join(bindir, 'VBoxManage')
+
+        #retrieve a list of all running VMs
+        runningvms= subprocess.check_output('%s list runningvms' %executable,shell=True).splitlines()
+        if len(runningvms) != 0:
+            for n in range(0, len(runningvms)):
+                vmlist.append('%s: %s' %(n+1,runningvms[n].rsplit(' ',1)[0].strip('"')))
+                vmdict[n+1]=runningvms[n].rsplit(' ',1)[-1]
+            usersel=input_sel('\nEnter the number of the VM: ',len(runningvms),vmlist)
+
+        else:
+            print('Can not retrieve list of running VMs')
+            sys.exit()
+
+        vmuuid=vmdict[usersel]
+        while True:
+            offtime = random.randint(60, 90)
+            ontime = random.randint(10, 90)
+            timenow = time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime())
+            on = subprocess.call('%s controlvm %s setlinkstate1 on' %(executable,vmuuid),
+                                 shell=True)
+            status=statustext(on)
+            print ('%s: Plug Network cable into VM %s for %ds: %s' % (timenow, runningvms[usersel-1].rsplit(' ',1)[0].strip('"'),ontime, str(status)))
+            time.sleep(ontime)
+            timenow = time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime())
+            off = subprocess.call('%s controlvm %s setlinkstate1 off' %(executable,vmuuid),
+                                  shell=True)
+            status = statustext(off)
+            print ('%s: Unplug Network cable from VM %s for %ds: %s' % (timenow, runningvms[usersel-1].rsplit(' ',1)[0].strip('"'),offtime, str(status)))
+            time.sleep(offtime)
+    except KeyboardInterrupt:
+        sys.exit('\nUser Interrupt')
+    except Exception as e:
+        print("Error in %s in function %s: %s" % (__name__, sys._getframe().f_code.co_name, e.message))
+if __name__ == "__main__":
+    sys.exit(controlvmnetworkstate())
diff --git a/mqtt/src/test/python/mqttasync_module.c b/mqtt/src/test/python/mqttasync_module.c
new file mode 100644
index 00000000..f7dc6ff0
--- /dev/null
+++ b/mqtt/src/test/python/mqttasync_module.c
@@ -0,0 +1,1026 @@
+#include <Python.h>
+
+#include "MQTTAsync.h"
+#include "LinkedList.h"
+
+static PyObject *MqttV3Error;
+
+
+static PyObject* mqttv3_create(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	char* serverURI;
+	char* clientId;
+	int persistence_option = MQTTCLIENT_PERSISTENCE_DEFAULT;
+	PyObject *pyoptions = NULL, *temp;
+	MQTTAsync_createOptions options = MQTTAsync_createOptions_initializer;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "ss|iO", &serverURI, &clientId,
+			&persistence_option, &pyoptions))
+		return NULL;
+
+	if (persistence_option != MQTTCLIENT_PERSISTENCE_DEFAULT
+			&& persistence_option != MQTTCLIENT_PERSISTENCE_NONE)
+	{
+		PyErr_SetString(PyExc_TypeError, "persistence must be DEFAULT or NONE");
+		return NULL;
+	}
+
+	if (pyoptions)
+	{
+
+		if (!PyDict_Check(pyoptions))
+		{
+			PyErr_SetString(PyExc_TypeError,
+					"Create options parameter must be a dictionary");
+			return NULL;
+		}
+
+		if ((temp = PyDict_GetItemString(pyoptions, "sendWhileDisconnected"))
+				!= NULL)
+		{
+			if (PyInt_Check(temp))
+				options.sendWhileDisconnected = (int) PyInt_AsLong(temp);
+			else
+			{
+				PyErr_SetString(PyExc_TypeError, "sendWhileDisconnected value must be int");
+				return NULL;
+			}
+		}
+
+		if ((temp = PyDict_GetItemString(pyoptions, "maxBufferedMessages"))
+				!= NULL)
+		{
+			if (PyInt_Check(temp))
+				options.maxBufferedMessages = (int) PyInt_AsLong(temp);
+			else
+			{
+				PyErr_SetString(PyExc_TypeError, "maxBufferedMessages value must be int");
+				return NULL;
+			}
+		}
+		rc = MQTTAsync_createWithOptions(&c, serverURI, clientId, persistence_option, NULL, &options);
+	}
+	else
+		rc = MQTTAsync_create(&c, serverURI, clientId, persistence_option, NULL);
+
+
+	return Py_BuildValue("ik", rc, c);
+}
+
+
+static List* callbacks = NULL;
+static List* connected_callbacks = NULL;
+
+enum msgTypes
+{
+	CONNECT, PUBLISH, SUBSCRIBE, SUBSCRIBE_MANY, UNSUBSCRIBE
+};
+
+typedef struct
+{
+	MQTTAsync c;
+	PyObject *context;
+	PyObject *cl, *ma, *dc;
+} CallbackEntry;
+
+
+typedef struct
+{
+	MQTTAsync c;
+	PyObject *context;
+	PyObject *co;
+} ConnectedEntry;
+
+
+int clientCompare(void* a, void* b)
+{
+	CallbackEntry* e = (CallbackEntry*) a;
+	return e->c == (MQTTAsync) b;
+}
+
+
+int connectedCompare(void* a, void* b)
+{
+	ConnectedEntry* e = (ConnectedEntry*) a;
+	return e->c == (MQTTAsync) b;
+}
+
+
+void connected(void* context, char* cause)
+{
+	/* call the right Python function, using the context */
+	PyObject *arglist;
+	PyObject *result;
+	ConnectedEntry* e = context;
+	PyGILState_STATE gstate;
+
+	gstate = PyGILState_Ensure();
+	arglist = Py_BuildValue("Os", e->context, cause);
+	result = PyEval_CallObject(e->co, arglist);
+	Py_DECREF(arglist);
+	PyGILState_Release(gstate);
+}
+
+
+void connectionLost(void* context, char* cause)
+{
+	/* call the right Python function, using the context */
+	PyObject *arglist;
+	PyObject *result;
+	CallbackEntry* e = context;
+	PyGILState_STATE gstate;
+
+	gstate = PyGILState_Ensure();
+	arglist = Py_BuildValue("Os", e->context, cause);
+	result = PyEval_CallObject(e->cl, arglist);
+	Py_DECREF(arglist);
+	PyGILState_Release(gstate);
+}
+
+
+int messageArrived(void* context, char* topicName, int topicLen,
+		MQTTAsync_message* message)
+{
+	PyObject *result = NULL;
+	CallbackEntry* e = context;
+	int rc = -99;
+	PyGILState_STATE gstate;
+
+	gstate = PyGILState_Ensure();
+	if (topicLen == 0)
+		result = PyObject_CallFunction(e->ma, "Os{ss#sisisisi}", e->context,
+				topicName, "payload", message->payload, message->payloadlen,
+				"qos", message->qos, "retained", message->retained, "dup",
+				message->dup, "msgid", message->msgid);
+	else
+		result = PyObject_CallFunction(e->ma, "Os#{ss#sisisisi}", e->context,
+				topicName, topicLen, "payload", message->payload,
+				message->payloadlen, "qos", message->qos, "retained",
+				message->retained, "dup", message->dup, "msgid",
+				message->msgid);
+	if (result)
+	{
+		if (PyInt_Check(result))
+			rc = (int) PyInt_AsLong(result);
+		Py_DECREF(result);
+	}
+	PyGILState_Release(gstate);
+	MQTTAsync_free(topicName);
+	MQTTAsync_freeMessage(&message);
+	return rc;
+}
+
+
+void deliveryComplete(void* context, MQTTAsync_token dt)
+{
+	PyObject *arglist;
+	PyObject *result;
+	CallbackEntry* e = context;
+	PyGILState_STATE gstate;
+
+	gstate = PyGILState_Ensure();
+	arglist = Py_BuildValue("Oi", e->context, dt);
+	result = PyEval_CallObject(e->dc, arglist);
+	Py_DECREF(arglist);
+	PyGILState_Release(gstate);
+}
+
+
+static PyObject* mqttv3_setcallbacks(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	CallbackEntry* e = NULL;
+	int rc;
+
+	e = malloc(sizeof(CallbackEntry));
+
+	if (!PyArg_ParseTuple(args, "kOOOO", &c, (PyObject**) &e->context, &e->cl,
+			&e->ma, &e->dc))
+		return NULL;
+	e->c = c;
+
+	if ((e->cl != Py_None && !PyCallable_Check(e->cl))
+			|| (e->ma != Py_None && !PyCallable_Check(e->ma))
+			|| (e->dc != Py_None && !PyCallable_Check(e->dc)))
+	{
+		PyErr_SetString(PyExc_TypeError,
+				"3rd, 4th and 5th parameters must be callable or None");
+		return NULL;
+	}
+
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_setCallbacks(c, e, connectionLost, messageArrived, deliveryComplete);
+	Py_END_ALLOW_THREADS
+
+	if (rc == MQTTASYNC_SUCCESS)
+	{
+		ListElement* temp = NULL;
+		if ((temp = ListFindItem(callbacks, c, clientCompare)) != NULL)
+		{
+			ListDetach(callbacks, temp->content);
+			free(temp->content);
+		}
+		ListAppend(callbacks, e, sizeof(e));
+		Py_XINCREF(e->cl);
+		Py_XINCREF(e->ma);
+		Py_XINCREF(e->dc);
+		Py_XINCREF(e->context);
+	}
+
+	return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_setconnected(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	ConnectedEntry* e = NULL;
+	int rc;
+
+	e = malloc(sizeof(ConnectedEntry));
+
+	if (!PyArg_ParseTuple(args, "kOO", &c, (PyObject**) &e->context, &e->co))
+		return NULL;
+	e->c = c;
+
+	if (e->co != Py_None && !PyCallable_Check(e->co))
+	{
+		PyErr_SetString(PyExc_TypeError,
+				"3rd parameter must be callable or None");
+		return NULL;
+	}
+
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_setConnected(c, e, connected);
+	Py_END_ALLOW_THREADS
+
+	if (rc == MQTTASYNC_SUCCESS)
+	{
+		ListElement* temp = NULL;
+		if ((temp = ListFindItem(connected_callbacks, c, connectedCompare)) != NULL)
+		{
+			ListDetach(connected_callbacks, temp->content);
+			free(temp->content);
+		}
+		ListAppend(connected_callbacks, e, sizeof(e));
+		Py_XINCREF(e->co);
+		Py_XINCREF(e->context);
+	}
+
+	return Py_BuildValue("i", rc);
+}
+
+
+typedef struct
+{
+	MQTTAsync c;
+	PyObject *context;
+	PyObject *onSuccess, *onFailure;
+	enum msgTypes msgType;
+} ResponseEntry;
+
+
+void onSuccess(void* context, MQTTAsync_successData* response)
+{
+	PyObject *result = NULL;
+	ResponseEntry* e = context;
+	PyGILState_STATE gstate;
+
+	gstate = PyGILState_Ensure();
+	switch (e->msgType)
+	{
+	case CONNECT:
+		result = PyObject_CallFunction(e->onSuccess, "O{sisiss}", (e->context) ? e->context : Py_None,
+			"MQTTVersion", response->alt.connect.MQTTVersion,
+			"sessionPresent", response->alt.connect.sessionPresent,
+			"serverURI", response->alt.connect.serverURI);
+		break;
+
+	case PUBLISH:
+		result = PyObject_CallFunction(e->onSuccess, "O{si ss s{ss# sisi}}", (e->context) ? e->context : Py_None,
+			"token", response->token,
+			"destinationName", response->alt.pub.destinationName,
+			"message",
+			"payload", response->alt.pub.message.payload,
+			response->alt.pub.message.payloadlen,
+			"qos", response->alt.pub.message.qos,
+			"retained", response->alt.pub.message.retained);
+		break;
+
+	case SUBSCRIBE:
+		result = PyObject_CallFunction(e->onSuccess, "O{sisi}", (e->context) ? e->context : Py_None,
+			"token", response->token,
+			"qos", response->alt.qos);
+		break;
+
+	case SUBSCRIBE_MANY:
+		result = PyObject_CallFunction(e->onSuccess, "O{sis[i]}", (e->context) ? e->context : Py_None,
+			"token", response->token,
+			"qosList", response->alt.qosList[0]);
+		break;
+
+	case UNSUBSCRIBE:
+		result = PyObject_CallFunction(e->onSuccess, "O{si}", (e->context) ? e->context : Py_None,
+					"token", response->token);
+		break;
+	}
+	if (result)
+	{
+		Py_DECREF(result);
+		printf("decrementing reference count for result\n");
+	}
+	PyGILState_Release(gstate);
+	free(e);
+}
+
+
+void onFailure(void* context, MQTTAsync_failureData* response)
+{
+	PyObject *result = NULL;
+	PyObject *arglist = NULL;
+	ResponseEntry* e = context;
+	PyGILState_STATE gstate;
+
+	gstate = PyGILState_Ensure();
+
+	// TODO: convert response into Python structure
+	if (e->context)
+		arglist = Py_BuildValue("OO", e->context, response);
+	else
+		arglist = Py_BuildValue("OO", Py_None, response);
+
+	result = PyEval_CallObject(e->onFailure, arglist);
+	Py_DECREF(arglist);
+	PyGILState_Release(gstate);
+	free(e);
+}
+
+
+/* return true if ok, false otherwise */
+int getResponseOptions(MQTTAsync c, PyObject *pyoptions, MQTTAsync_responseOptions* responseOptions,
+		enum msgTypes msgType)
+{
+	PyObject *temp = NULL;
+
+	if (!pyoptions)
+		return 1;
+
+	if (!PyDict_Check(pyoptions))
+	{
+		PyErr_SetString(PyExc_TypeError, "Response options must be a dictionary");
+		return 0;
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "onSuccess")) != NULL)
+	{
+		if (PyCallable_Check(temp)) /* temp points to Python function */
+			responseOptions->onSuccess = (MQTTAsync_onSuccess*)temp;
+		else
+		{
+			PyErr_SetString(PyExc_TypeError,
+					"onSuccess value must be callable");
+			return 0;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "onFailure")) != NULL)
+	{
+		if (PyCallable_Check(temp))
+			responseOptions->onFailure = (MQTTAsync_onFailure*)temp;
+		else
+		{
+			PyErr_SetString(PyExc_TypeError,
+					"onFailure value must be callable");
+			return 0;
+		}
+	}
+
+	responseOptions->context = PyDict_GetItemString(pyoptions, "context");
+
+	if (responseOptions->onFailure || responseOptions->onSuccess)
+	{
+		ResponseEntry* r = malloc(sizeof(ResponseEntry));
+		r->c = c;
+		r->context = responseOptions->context;
+		responseOptions->context = r;
+		r->onSuccess = (PyObject*)responseOptions->onSuccess;
+		responseOptions->onSuccess = onSuccess;
+		r->onFailure = (PyObject*)responseOptions->onFailure;
+		responseOptions->onFailure = onFailure;
+		r->msgType = msgType;
+	}
+
+	return 1;  /* not an error, if we get here */
+}
+
+
+static PyObject* mqttv3_connect(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	PyObject *pyoptions = NULL, *temp;
+	MQTTAsync_connectOptions connectOptions = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions willOptions = MQTTAsync_willOptions_initializer;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "k|O", &c, &pyoptions))
+		return NULL;
+
+	if (!pyoptions)
+		goto skip;
+
+	if (!PyDict_Check(pyoptions))
+	{
+		PyErr_SetString(PyExc_TypeError, "2nd parameter must be a dictionary");
+		return NULL;
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "onSuccess")) != NULL)
+	{
+		if (PyCallable_Check(temp)) /* temp points to Python function */
+			connectOptions.onSuccess = (MQTTAsync_onSuccess*)temp;
+		else
+		{
+			PyErr_SetString(PyExc_TypeError,
+					"onSuccess value must be callable");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "onFailure")) != NULL)
+	{
+		if (PyCallable_Check(temp))
+			connectOptions.onFailure = (MQTTAsync_onFailure*)temp;
+		else
+		{
+			PyErr_SetString(PyExc_TypeError,
+					"onFailure value must be callable");
+			return NULL;
+		}
+	}
+
+	connectOptions.context = PyDict_GetItemString(pyoptions, "context");
+
+	if (connectOptions.onFailure || connectOptions.onSuccess)
+	{
+		ResponseEntry* r = malloc(sizeof(ResponseEntry));
+		r->c = c;
+		r->context = connectOptions.context;
+		connectOptions.context = r;
+		r->onSuccess = (PyObject*)connectOptions.onSuccess;
+		connectOptions.onSuccess = onSuccess;
+		r->onFailure = (PyObject*)connectOptions.onFailure;
+		connectOptions.onFailure = onFailure;
+		r->msgType = CONNECT;
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "keepAliveInterval")) != NULL)
+	{
+		if (PyInt_Check(temp))
+			connectOptions.keepAliveInterval = (int) PyInt_AsLong(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError,
+					"keepAliveLiveInterval value must be int");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "cleansession")) != NULL)
+	{
+		if (PyInt_Check(temp))
+			connectOptions.cleansession = (int) PyInt_AsLong(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "cleansession value must be int");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "will")) != NULL)
+	{
+		if (PyDict_Check(temp))
+		{
+			PyObject *wtemp = NULL;
+			if ((wtemp = PyDict_GetItemString(temp, "topicName")) == NULL)
+			{
+				PyErr_SetString(PyExc_TypeError,
+						"will topicName value must be set");
+				return NULL;
+			}
+			else
+			{
+				if (PyString_Check(wtemp))
+					willOptions.topicName = PyString_AsString(wtemp);
+				else
+				{
+					PyErr_SetString(PyExc_TypeError,
+							"will topicName value must be string");
+					return NULL;
+				}
+			}
+			if ((wtemp = PyDict_GetItemString(temp, "message")) == NULL)
+			{
+				PyErr_SetString(PyExc_TypeError,
+						"will message value must be set");
+				return NULL;
+			}
+			else
+			{
+				if (PyString_Check(wtemp))
+					willOptions.message = PyString_AsString(wtemp);
+				else
+				{
+					PyErr_SetString(PyExc_TypeError,
+							"will message value must be string");
+					return NULL;
+				}
+			}
+			if ((wtemp = PyDict_GetItemString(temp, "retained")) != NULL)
+			{
+				if (PyInt_Check(wtemp))
+					willOptions.retained = (int) PyInt_AsLong(wtemp);
+				else
+				{
+					PyErr_SetString(PyExc_TypeError,
+							"will retained value must be int");
+					return NULL;
+				}
+			}
+			if ((wtemp = PyDict_GetItemString(temp, "qos")) != NULL)
+			{
+				if (PyInt_Check(wtemp))
+					willOptions.qos = (int) PyInt_AsLong(wtemp);
+				else
+				{
+					PyErr_SetString(PyExc_TypeError,
+							"will qos value must be int");
+					return NULL;
+				}
+			}
+			connectOptions.will = &willOptions;
+		}
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "will value must be dictionary");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "username")) != NULL)
+	{
+		if (PyString_Check(temp))
+			connectOptions.username = PyString_AsString(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "username value must be string");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "password")) != NULL)
+	{
+		if (PyString_Check(temp))
+			connectOptions.username = PyString_AsString(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "password value must be string");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "automaticReconnect")) != NULL)
+	{
+		if (PyInt_Check(temp))
+			connectOptions.automaticReconnect = (int) PyInt_AsLong(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "automatic reconnect value must be int");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "minRetryInterval")) != NULL)
+	{
+		if (PyInt_Check(temp))
+			connectOptions.minRetryInterval = (int) PyInt_AsLong(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "minRetryInterval value must be int");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "maxRetryInterval")) != NULL)
+	{
+		if (PyInt_Check(temp))
+			connectOptions.maxRetryInterval = (int) PyInt_AsLong(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "maxRetryInterval value must be int");
+			return NULL;
+		}
+	}
+
+skip:
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_connect(c, &connectOptions);
+	Py_END_ALLOW_THREADS
+	return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_disconnect(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	MQTTAsync_disconnectOptions options = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "k|i", &c, &options.timeout))
+		return NULL;
+
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_disconnect(c, &options);
+	Py_END_ALLOW_THREADS
+	return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_isConnected(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "k", &c))
+		return NULL;
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_isConnected(c);
+	Py_END_ALLOW_THREADS
+	return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_subscribe(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	MQTTAsync_responseOptions response = MQTTAsync_responseOptions_initializer;
+	PyObject *pyoptions = NULL;
+	char* topic;
+	int qos = 2;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "ks|iO", &c, &topic, &qos, &pyoptions))
+		return NULL;
+
+	if (!getResponseOptions(c, pyoptions, &response, SUBSCRIBE))
+		return NULL;
+
+	Py_BEGIN_ALLOW_THREADS;
+	rc = MQTTAsync_subscribe(c, topic, qos, &response);
+	Py_END_ALLOW_THREADS;
+	return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_subscribeMany(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	MQTTAsync_responseOptions response = MQTTAsync_responseOptions_initializer;
+	PyObject* topicList;
+	PyObject* qosList;
+	PyObject *pyoptions = NULL;
+
+	int count;
+	char** topics;
+	int* qoss;
+
+	int i, rc = 0;
+
+	if (!PyArg_ParseTuple(args, "kOO|O", &c, &topicList, &qosList, &pyoptions))
+		return NULL;
+
+	if (!getResponseOptions(c, pyoptions, &response, SUBSCRIBE))
+		return NULL;
+
+	if (!PySequence_Check(topicList) || !PySequence_Check(qosList))
+	{
+		PyErr_SetString(PyExc_TypeError,
+				"3rd and 4th parameters must be sequences");
+		return NULL;
+	}
+
+	if ((count = PySequence_Length(topicList)) != PySequence_Length(qosList))
+	{
+		PyErr_SetString(PyExc_TypeError,
+				"3rd and 4th parameters must be sequences of the same length");
+		return NULL;
+	}
+
+	topics = malloc(count * sizeof(char*));
+	for (i = 0; i < count; ++i)
+		topics[i] = PyString_AsString(PySequence_GetItem(topicList, i));
+
+	qoss = malloc(count * sizeof(int));
+	for (i = 0; i < count; ++i)
+		qoss[i] = (int) PyInt_AsLong(PySequence_GetItem(qosList, i));
+
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_subscribeMany(c, count, topics,	qoss, &response);
+	Py_END_ALLOW_THREADS
+
+	for (i = 0; i < count; ++i)
+		PySequence_SetItem(qosList, i, PyInt_FromLong((long) qoss[i]));
+
+	free(topics);
+	free(qoss);
+
+	if (rc == MQTTASYNC_SUCCESS)
+		return Py_BuildValue("iO", rc, qosList);
+	else
+		return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_unsubscribe(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	MQTTAsync_responseOptions response = MQTTAsync_responseOptions_initializer;
+	PyObject *pyoptions = NULL;
+	char* topic;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "ks|O", &c, &topic, &pyoptions))
+		return NULL;
+
+	if (!getResponseOptions(c, pyoptions, &response, UNSUBSCRIBE))
+		return NULL;
+
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_unsubscribe(c, topic, &response);
+	Py_END_ALLOW_THREADS
+	return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_unsubscribeMany(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	MQTTAsync_responseOptions response = MQTTAsync_responseOptions_initializer;
+	PyObject* topicList;
+	PyObject *pyoptions = NULL;
+
+	int count;
+	char** topics;
+
+	int i, rc = 0;
+
+	if (!PyArg_ParseTuple(args, "kO|O", &c, &topicList, &pyoptions))
+		return NULL;
+
+	if (!getResponseOptions(c, pyoptions, &response, UNSUBSCRIBE))
+		return NULL;
+
+	if (!PySequence_Check(topicList))
+	{
+		PyErr_SetString(PyExc_TypeError, "3rd parameter must be sequences");
+		return NULL;
+	}
+
+	count = PySequence_Length(topicList);
+	topics = malloc(count * sizeof(char*));
+	for (i = 0; i < count; ++i)
+		topics[i] = PyString_AsString(PySequence_GetItem(topicList, i));
+
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_unsubscribeMany(c, count, topics, &response);
+	Py_END_ALLOW_THREADS
+
+	free(topics);
+
+	return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_send(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	char* destinationName;
+	int payloadlen;
+	void* payload;
+	int qos = 0;
+	int retained = 0;
+	MQTTAsync_responseOptions response = MQTTAsync_responseOptions_initializer;
+	PyObject *pyoptions = NULL;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "kss#|iiO", &c, &destinationName, &payload,
+			&payloadlen, &qos, &retained, &pyoptions))
+		return NULL;
+
+	if (!getResponseOptions(c, pyoptions, &response, PUBLISH))
+		return NULL;
+
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_send(c, destinationName, payloadlen, payload, qos, retained, &response);
+	Py_END_ALLOW_THREADS
+
+	if (rc == MQTTASYNC_SUCCESS && qos > 0)
+		return Py_BuildValue("ii", rc, response);
+	else
+		return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_sendMessage(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	char* destinationName;
+	PyObject *message, *temp;
+	MQTTAsync_message msg = MQTTAsync_message_initializer;
+	MQTTAsync_responseOptions response = MQTTAsync_responseOptions_initializer;
+	PyObject *pyoptions = NULL;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "ksO|O", &c, &destinationName, &message, &pyoptions))
+		return NULL;
+
+	if (!getResponseOptions(c, pyoptions, &response, PUBLISH))
+		return NULL;
+
+	if (!PyDict_Check(message))
+	{
+		PyErr_SetString(PyExc_TypeError, "3rd parameter must be a dictionary");
+		return NULL;
+	}
+
+	if ((temp = PyDict_GetItemString(message, "payload")) == NULL)
+	{
+		PyErr_SetString(PyExc_TypeError, "dictionary must have payload key");
+		return NULL;
+	}
+
+	if (PyString_Check(temp))
+		PyString_AsStringAndSize(temp, (char**) &msg.payload,
+				(Py_ssize_t*) &msg.payloadlen);
+	else
+	{
+		PyErr_SetString(PyExc_TypeError, "payload value must be string");
+		return NULL;
+	}
+
+	if ((temp = PyDict_GetItemString(message, "qos")) == NULL)
+		msg.qos = (int) PyInt_AsLong(temp);
+
+	if ((temp = PyDict_GetItemString(message, "retained")) == NULL)
+		msg.retained = (int) PyInt_AsLong(temp);
+
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_sendMessage(c, destinationName, &msg, &response);
+	Py_END_ALLOW_THREADS
+
+	if (rc == MQTTASYNC_SUCCESS && msg.qos > 0)
+		return Py_BuildValue("ii", rc, response);
+	else
+		return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_waitForCompletion(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	unsigned long timeout = 1000L;
+	MQTTAsync_token dt;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "ki|i", &c, &dt, &timeout))
+		return NULL;
+
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_waitForCompletion(c, dt, timeout);
+	Py_END_ALLOW_THREADS
+
+	return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_getPendingTokens(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	MQTTAsync_token* tokens;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "k", &c))
+		return NULL;
+
+	Py_BEGIN_ALLOW_THREADS
+	rc = MQTTAsync_getPendingTokens(c, &tokens);
+	Py_END_ALLOW_THREADS
+
+	if (rc == MQTTASYNC_SUCCESS)
+	{
+		int i = 0;
+		PyObject* dts = PyList_New(0);
+
+		while (tokens[i] != -1)
+			PyList_Append(dts, PyInt_FromLong((long) tokens[i]));
+
+		return Py_BuildValue("iO", rc, dts);
+	}
+	else
+		return Py_BuildValue("i", rc);
+}
+
+
+static PyObject* mqttv3_destroy(PyObject* self, PyObject *args)
+{
+	MQTTAsync c;
+	ListElement* temp = NULL;
+
+	if (!PyArg_ParseTuple(args, "k", &c))
+		return NULL;
+
+	if ((temp = ListFindItem(callbacks, c, clientCompare)) != NULL)
+	{
+		ListDetach(callbacks, temp->content);
+		free(temp->content);
+	}
+
+	if ((temp = ListFindItem(connected_callbacks, c, connectedCompare)) != NULL)
+	{
+		ListDetach(connected_callbacks, temp->content);
+		free(temp->content);
+	}
+
+	MQTTAsync_destroy(&c);
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+
+static PyMethodDef MqttV3Methods[] =
+	{
+		{ "create", mqttv3_create, METH_VARARGS, "Create an MQTTv3 client." },
+		{ "setcallbacks", mqttv3_setcallbacks, METH_VARARGS,
+				"Sets the callback functions for a particular client." },
+		{ "setconnected", mqttv3_setconnected, METH_VARARGS,
+				"Sets the connected callback function for a particular client." },
+		{ "connect", mqttv3_connect, METH_VARARGS,
+				"Connects to a server using the specified options." },
+		{ "disconnect", mqttv3_disconnect, METH_VARARGS,
+				"Disconnects from a server." },
+		{ "isConnected", mqttv3_isConnected, METH_VARARGS,
+				"Determines if this client is currently connected to the server." },
+		{ "subscribe", mqttv3_subscribe, METH_VARARGS,
+				"Subscribe to the given topic." },
+		{ "subscribeMany", mqttv3_subscribeMany, METH_VARARGS,
+				"Subscribe to the given topics." },
+		{ "unsubscribe", mqttv3_unsubscribe, METH_VARARGS,
+				"Unsubscribe from the given topic." },
+		{ "unsubscribeMany", mqttv3_unsubscribeMany, METH_VARARGS,
+				"Unsubscribe from the given topics." },
+		{ "send", mqttv3_send, METH_VARARGS,
+				"Publish a message to the given topic." },
+		{ "sendMessage", mqttv3_sendMessage, METH_VARARGS,
+				"Publish a message to the given topic." },
+		{ "waitForCompletion", mqttv3_waitForCompletion, METH_VARARGS,
+				"Waits for the completion of the delivery of the message represented by a delivery token." },
+		{ "getPendingTokens", mqttv3_getPendingTokens, METH_VARARGS,
+				"Returns the tokens pending of completion." },
+		{ "destroy", mqttv3_destroy, METH_VARARGS,
+				"Free memory allocated to a MQTT client. It is the opposite to create." },
+		{ NULL, NULL, 0, NULL } /* Sentinel */
+	};
+
+
+PyMODINIT_FUNC initpaho_mqtt3a(void)
+{
+	PyObject *m;
+
+	PyEval_InitThreads();
+
+	callbacks = ListInitialize();
+	connected_callbacks = ListInitialize();
+
+	m = Py_InitModule("paho_mqtt3a", MqttV3Methods);
+	if (m == NULL)
+		return;
+
+	MqttV3Error = PyErr_NewException("paho_mqtt3a.error", NULL, NULL);
+	Py_INCREF(MqttV3Error);
+	PyModule_AddObject(m, "error", MqttV3Error);
+
+	PyModule_AddIntConstant(m, "SUCCESS", MQTTASYNC_SUCCESS);
+	PyModule_AddIntConstant(m, "FAILURE", MQTTASYNC_FAILURE);
+	PyModule_AddIntConstant(m, "DISCONNECTED", MQTTASYNC_DISCONNECTED);
+	PyModule_AddIntConstant(m, "MAX_MESSAGES_INFLIGHT",	MQTTASYNC_MAX_MESSAGES_INFLIGHT);
+	PyModule_AddIntConstant(m, "BAD_UTF8_STRING", MQTTASYNC_BAD_UTF8_STRING);
+	PyModule_AddIntConstant(m, "BAD_NULL_PARAMETER", MQTTASYNC_NULL_PARAMETER);
+	PyModule_AddIntConstant(m, "BAD_TOPICNAME_TRUNCATED", MQTTASYNC_TOPICNAME_TRUNCATED);
+	PyModule_AddIntConstant(m, "PERSISTENCE_DEFAULT", MQTTCLIENT_PERSISTENCE_DEFAULT);
+	PyModule_AddIntConstant(m, "PERSISTENCE_NONE", MQTTCLIENT_PERSISTENCE_NONE);
+	PyModule_AddIntConstant(m, "PERSISTENCE_USER", MQTTCLIENT_PERSISTENCE_USER);
+	PyModule_AddIntConstant(m, "PERSISTENCE_ERROR",
+	MQTTCLIENT_PERSISTENCE_ERROR);
+}
diff --git a/mqtt/src/test/python/mqttclient_module.c b/mqtt/src/test/python/mqttclient_module.c
new file mode 100644
index 00000000..1879b9c0
--- /dev/null
+++ b/mqtt/src/test/python/mqttclient_module.c
@@ -0,0 +1,693 @@
+#include <Python.h>
+
+#include "MQTTClient.h"
+#include "LinkedList.h"
+
+static PyObject *MqttV3Error;
+
+static PyObject* mqttv3_create(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	char* serverURI;
+	char* clientId;
+	int persistence_option = MQTTCLIENT_PERSISTENCE_DEFAULT;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "ss|i", &serverURI, &clientId,
+			&persistence_option))
+		return NULL;
+
+	if (persistence_option != MQTTCLIENT_PERSISTENCE_DEFAULT
+			&& persistence_option != MQTTCLIENT_PERSISTENCE_NONE)
+	{
+		PyErr_SetString(PyExc_TypeError, "persistence must be DEFAULT or NONE");
+		return NULL;
+	}
+
+	rc = MQTTClient_create(&c, serverURI, clientId, persistence_option, NULL);
+
+	printf("create MQTTClient pointer %p\n", c);
+
+	return Py_BuildValue("ik", rc, c);
+}
+
+static List* callbacks = NULL;
+
+typedef struct
+{
+	MQTTClient c;
+	PyObject *context;
+	PyObject *cl, *ma, *dc;
+} CallbackEntry;
+
+int clientCompare(void* a, void* b)
+{
+	CallbackEntry* e = (CallbackEntry*) a;
+	return e->c == (MQTTClient) b;
+}
+
+void connectionLost(void* context, char* cause)
+{
+	/* call the right Python function, using the context */
+	PyObject *arglist;
+	PyObject *result;
+	CallbackEntry* e = context;
+	PyGILState_STATE gstate;
+
+	gstate = PyGILState_Ensure();
+	arglist = Py_BuildValue("Os", e->context, cause);
+	result = PyEval_CallObject(e->cl, arglist);
+	Py_DECREF(arglist);
+	PyGILState_Release(gstate);
+}
+
+int messageArrived(void* context, char* topicName, int topicLen,
+		MQTTClient_message* message)
+{
+	PyObject *result = NULL;
+	CallbackEntry* e = context;
+	int rc = -99;
+	PyGILState_STATE gstate;
+
+	//printf("messageArrived %s %s %d %.*s\n", PyString_AsString(e->context), topicName, topicLen,
+	//	message->payloadlen, (char*)message->payload);
+
+	gstate = PyGILState_Ensure();
+	if (topicLen == 0)
+		result = PyEval_CallFunction(e->ma, "Os{ss#sisisisi}", e->context,
+				topicName, "payload", message->payload, message->payloadlen,
+				"qos", message->qos, "retained", message->retained, "dup",
+				message->dup, "msgid", message->msgid);
+	else
+		result = PyEval_CallFunction(e->ma, "Os#{ss#sisisisi}", e->context,
+				topicName, topicLen, "payload", message->payload,
+				message->payloadlen, "qos", message->qos, "retained",
+				message->retained, "dup", message->dup, "msgid",
+				message->msgid);
+	if (result)
+	{
+		if (PyInt_Check(result))
+			rc = (int) PyInt_AsLong(result);
+		Py_DECREF(result);
+	}
+	PyGILState_Release(gstate);
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&message);
+	return rc;
+}
+
+void deliveryComplete(void* context, MQTTClient_deliveryToken dt)
+{
+	PyObject *arglist;
+	PyObject *result;
+	CallbackEntry* e = context;
+	PyGILState_STATE gstate;
+
+	gstate = PyGILState_Ensure();
+	arglist = Py_BuildValue("Oi", e->context, dt);
+	result = PyEval_CallObject(e->dc, arglist);
+	Py_DECREF(arglist);
+	PyGILState_Release(gstate);
+}
+
+static PyObject* mqttv3_setcallbacks(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	CallbackEntry* e = NULL;
+	int rc;
+
+	e = malloc(sizeof(CallbackEntry));
+
+	if (!PyArg_ParseTuple(args, "kOOOO", &c, (PyObject**) &e->context, &e->cl,
+			&e->ma, &e->dc))
+		return NULL;
+	e->c = c;
+
+	printf("setCallbacks MQTTClient pointer %p\n", c);
+
+	if ((e->cl != Py_None && !PyCallable_Check(e->cl))
+			|| (e->ma != Py_None && !PyCallable_Check(e->ma))
+			|| (e->dc != Py_None && !PyCallable_Check(e->dc)))
+	{
+		PyErr_SetString(PyExc_TypeError,
+				"3rd, 4th and 5th parameters must be callable or None");
+		return NULL;
+	}
+
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_setCallbacks(c, e, connectionLost,
+			messageArrived, deliveryComplete);
+	Py_END_ALLOW_THREADS
+
+	if (rc == MQTTCLIENT_SUCCESS)
+	{
+		ListElement* temp = NULL;
+		if ((temp = ListFindItem(callbacks, c, clientCompare)) != NULL)
+		{
+			ListDetach(callbacks, temp->content);
+			free(temp->content);
+		}
+		ListAppend(callbacks, e, sizeof(e));
+		Py_XINCREF(e->cl);
+		Py_XINCREF(e->ma);
+		Py_XINCREF(e->dc);
+		Py_XINCREF(e->context);
+	}
+
+	return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_connect(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	PyObject *pyoptions = NULL, *temp;
+	MQTTClient_connectOptions options = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions woptions = MQTTClient_willOptions_initializer;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "k|O", &c, &pyoptions))
+		return NULL;
+
+	printf("connect MQTTClient pointer %p\n", c);
+	if (!pyoptions)
+		goto skip;
+
+	if (!PyDict_Check(pyoptions))
+	{
+		PyErr_SetString(PyExc_TypeError, "2nd parameter must be a dictionary");
+		return NULL;
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "keepAliveInterval")) != NULL)
+	{
+		if (PyInt_Check(temp))
+			options.keepAliveInterval = (int) PyInt_AsLong(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError,
+					"keepAliveLiveInterval value must be int");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "cleansession")) != NULL)
+	{
+		if (PyInt_Check(temp))
+			options.cleansession = (int) PyInt_AsLong(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "cleansession value must be int");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "reliable")) != NULL)
+	{
+		if (PyInt_Check(temp))
+			options.reliable = (int) PyInt_AsLong(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "reliable value must be int");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "will")) != NULL)
+	{
+		if (PyDict_Check(temp))
+		{
+			PyObject *wtemp = NULL;
+			if ((wtemp = PyDict_GetItemString(temp, "topicName")) == NULL)
+			{
+				PyErr_SetString(PyExc_TypeError,
+						"will topicName value must be set");
+				return NULL;
+			}
+			else
+			{
+				if (PyString_Check(wtemp))
+					woptions.topicName = PyString_AsString(wtemp);
+				else
+				{
+					PyErr_SetString(PyExc_TypeError,
+							"will topicName value must be string");
+					return NULL;
+				}
+			}
+			if ((wtemp = PyDict_GetItemString(temp, "message")) == NULL)
+			{
+				PyErr_SetString(PyExc_TypeError,
+						"will message value must be set");
+				return NULL;
+			}
+			else
+			{
+				if (PyString_Check(wtemp))
+					woptions.message = PyString_AsString(wtemp);
+				else
+				{
+					PyErr_SetString(PyExc_TypeError,
+							"will message value must be string");
+					return NULL;
+				}
+			}
+			if ((wtemp = PyDict_GetItemString(temp, "retained")) != NULL)
+			{
+				if (PyInt_Check(wtemp))
+					woptions.retained = (int) PyInt_AsLong(wtemp);
+				else
+				{
+					PyErr_SetString(PyExc_TypeError,
+							"will retained value must be int");
+					return NULL;
+				}
+			}
+			if ((wtemp = PyDict_GetItemString(temp, "qos")) != NULL)
+			{
+				if (PyInt_Check(wtemp))
+					woptions.qos = (int) PyInt_AsLong(wtemp);
+				else
+				{
+					PyErr_SetString(PyExc_TypeError,
+							"will qos value must be int");
+					return NULL;
+				}
+			}
+			options.will = &woptions;
+		}
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "will value must be dictionary");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "username")) != NULL)
+	{
+		if (PyString_Check(temp))
+			options.username = PyString_AsString(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "username value must be string");
+			return NULL;
+		}
+	}
+
+	if ((temp = PyDict_GetItemString(pyoptions, "password")) != NULL)
+	{
+		if (PyString_Check(temp))
+			options.username = PyString_AsString(temp);
+		else
+		{
+			PyErr_SetString(PyExc_TypeError, "password value must be string");
+			return NULL;
+		}
+	}
+
+	skip: Py_BEGIN_ALLOW_THREADS rc = MQTTClient_connect(c, &options);
+	Py_END_ALLOW_THREADS
+	return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_disconnect(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	int timeout = 0;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "k|i", &c, &timeout))
+		return NULL;
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_disconnect(c, timeout);
+	Py_END_ALLOW_THREADS
+	return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_isConnected(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "k", &c))
+		return NULL;
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_isConnected(c);
+	Py_END_ALLOW_THREADS
+	return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_subscribe(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	char* topic;
+	int qos = 2;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "ks|i", &c, &topic, &qos))
+		return NULL;
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_subscribe(c, topic, qos);
+	Py_END_ALLOW_THREADS
+	return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_subscribeMany(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	PyObject* topicList;
+	PyObject* qosList;
+
+	int count;
+	char** topics;
+	int* qoss;
+
+	int i, rc = 0;
+
+	if (!PyArg_ParseTuple(args, "kOO", &c, &topicList, &qosList))
+		return NULL;
+
+	if (!PySequence_Check(topicList) || !PySequence_Check(qosList))
+	{
+		PyErr_SetString(PyExc_TypeError,
+				"3rd and 4th parameters must be sequences");
+		return NULL;
+	}
+
+	if ((count = PySequence_Length(topicList)) != PySequence_Length(qosList))
+	{
+		PyErr_SetString(PyExc_TypeError,
+				"3rd and 4th parameters must be sequences of the same length");
+		return NULL;
+	}
+
+	topics = malloc(count * sizeof(char*));
+	for (i = 0; i < count; ++i)
+		topics[i] = PyString_AsString(PySequence_GetItem(topicList, i));
+
+	qoss = malloc(count * sizeof(int));
+	for (i = 0; i < count; ++i)
+		qoss[i] = (int) PyInt_AsLong(PySequence_GetItem(qosList, i));
+
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_subscribeMany(c, count, topics,
+			qoss);
+	Py_END_ALLOW_THREADS
+
+	for (i = 0; i < count; ++i)
+		PySequence_SetItem(qosList, i, PyInt_FromLong((long) qoss[i]));
+
+	free(topics);
+	free(qoss);
+
+	if (rc == MQTTCLIENT_SUCCESS)
+		return Py_BuildValue("iO", rc, qosList);
+	else
+		return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_unsubscribe(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	char* topic;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "ks", &c, &topic))
+		return NULL;
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_unsubscribe(c, topic);
+	Py_END_ALLOW_THREADS
+	return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_unsubscribeMany(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	PyObject* topicList;
+
+	int count;
+	char** topics;
+
+	int i, rc = 0;
+
+	if (!PyArg_ParseTuple(args, "kOO", &c, &topicList))
+		return NULL;
+
+	if (!PySequence_Check(topicList))
+	{
+		PyErr_SetString(PyExc_TypeError, "3rd parameter must be sequences");
+		return NULL;
+	}
+
+	count = PySequence_Length(topicList);
+	topics = malloc(count * sizeof(char*));
+	for (i = 0; i < count; ++i)
+		topics[i] = PyString_AsString(PySequence_GetItem(topicList, i));
+
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_unsubscribeMany(c, count, topics);
+	Py_END_ALLOW_THREADS
+
+	free( topics);
+
+	return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_publish(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	char* topicName;
+	int payloadlen;
+	void* payload;
+	int qos = 0;
+	int retained = 0;
+	MQTTClient_deliveryToken dt;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "kss#|ii", &c, &topicName, &payload,
+			&payloadlen, &qos, &retained))
+		return NULL;
+
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_publish(c, topicName, payloadlen,
+			payload, qos, retained, &dt);
+	Py_END_ALLOW_THREADS
+
+	if (rc == MQTTCLIENT_SUCCESS && qos > 0)
+		return Py_BuildValue("ii", rc, dt);
+	else
+		return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_publishMessage(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	char* topicName;
+	PyObject *message, *temp;
+	MQTTClient_message msg = MQTTClient_message_initializer;
+	MQTTClient_deliveryToken dt;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "ksO", &c, &topicName, &message))
+		return NULL;
+
+	if (!PyDict_Check(message))
+	{
+		PyErr_SetString(PyExc_TypeError, "3rd parameter must be a dictionary");
+		return NULL;
+	}
+
+	if ((temp = PyDict_GetItemString(message, "payload")) == NULL)
+	{
+		PyErr_SetString(PyExc_TypeError, "dictionary must have payload key");
+		return NULL;
+	}
+
+	if (PyString_Check(temp))
+		PyString_AsStringAndSize(temp, (char**) &msg.payload,
+				(Py_ssize_t*) &msg.payloadlen);
+	else
+	{
+		PyErr_SetString(PyExc_TypeError, "payload value must be string");
+		return NULL;
+	}
+
+	if ((temp = PyDict_GetItemString(message, "qos")) == NULL)
+		msg.qos = (int) PyInt_AsLong(temp);
+
+	if ((temp = PyDict_GetItemString(message, "retained")) == NULL)
+		msg.retained = (int) PyInt_AsLong(temp);
+
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_publishMessage(c, topicName, &msg,
+			&dt);
+	Py_END_ALLOW_THREADS
+
+	if (rc == MQTTCLIENT_SUCCESS && msg.qos > 0)
+		return Py_BuildValue("ii", rc, dt);
+	else
+		return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_waitForCompletion(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	unsigned long timeout = 1000L;
+	MQTTClient_deliveryToken dt;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "ki|i", &c, &dt, &timeout))
+		return NULL;
+
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_waitForCompletion(c, dt, timeout);
+	Py_END_ALLOW_THREADS
+
+	return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_getPendingDeliveryTokens(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	MQTTClient_deliveryToken* tokens;
+	int rc;
+
+	if (!PyArg_ParseTuple(args, "k", &c))
+		return NULL;
+
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_getPendingDeliveryTokens(c, &tokens);
+	Py_END_ALLOW_THREADS
+
+	if (rc == MQTTCLIENT_SUCCESS)
+	{
+		int i = 0;
+		PyObject* dts = PyList_New(0);
+
+		while (tokens[i] != -1)
+			PyList_Append(dts, PyInt_FromLong((long) tokens[i]));
+
+		return Py_BuildValue("iO", rc, dts);
+	}
+	else
+		return Py_BuildValue("i", rc);
+}
+
+static PyObject* mqttv3_yield(PyObject* self, PyObject *args)
+{
+	if (!PyArg_ParseTuple(args, ""))
+		return NULL;
+
+	Py_BEGIN_ALLOW_THREADS
+	MQTTClient_yield();
+	Py_END_ALLOW_THREADS
+
+	Py_INCREF( Py_None);
+	return Py_None;
+}
+
+static PyObject* mqttv3_receive(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	unsigned long timeout = 1000L;
+	int rc;
+	PyObject* temp = NULL;
+
+	char* topicName;
+	int topicLen;
+	MQTTClient_message* message;
+
+	if (!PyArg_ParseTuple(args, "k|k", &c, &timeout))
+		return NULL;
+	Py_BEGIN_ALLOW_THREADS rc = MQTTClient_receive(c, &topicName, &topicLen,
+			&message, timeout);
+	Py_END_ALLOW_THREADS
+	if (message)
+	{
+		temp = Py_BuildValue("is#{ss#sisisisi}", rc, topicName, topicLen,
+				"payload", message->payload, message->payloadlen, "qos",
+				message->qos, "retained", message->retained, "dup",
+				message->dup, "msgid", message->msgid);
+		free(topicName);
+		MQTTClient_freeMessage(&message);
+	}
+	else
+		temp = Py_BuildValue("iz", rc, NULL);
+
+	return temp;
+}
+
+static PyObject* mqttv3_destroy(PyObject* self, PyObject *args)
+{
+	MQTTClient c;
+	ListElement* temp = NULL;
+
+	if (!PyArg_ParseTuple(args, "k", &c))
+		return NULL;
+
+	if ((temp = ListFindItem(callbacks, c, clientCompare)) != NULL)
+	{
+		ListDetach(callbacks, temp->content);
+		free(temp->content);
+	}
+
+	MQTTClient_destroy(&c);
+
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
+static PyMethodDef MqttV3Methods[] =
+		{
+		{ "create", mqttv3_create, METH_VARARGS, "Create an MQTTv3 client." },
+		{ "setcallbacks", mqttv3_setcallbacks, METH_VARARGS,
+				"Sets the callback functions for a particular client." },
+		{ "connect", mqttv3_connect, METH_VARARGS,
+				"Connects to a server using the specified options." },
+		{ "disconnect", mqttv3_disconnect, METH_VARARGS,
+				"Disconnects from a server." },
+				{ "isConnected", mqttv3_isConnected, METH_VARARGS,
+						"Determines if this client is currently connected to the server." },
+				{ "subscribe", mqttv3_subscribe, METH_VARARGS,
+						"Subscribe to the given topic." },
+				{ "subscribeMany", mqttv3_subscribeMany, METH_VARARGS,
+						"Subscribe to the given topics." },
+				{ "unsubscribe", mqttv3_unsubscribe, METH_VARARGS,
+						"Unsubscribe from the given topic." },
+				{ "unsubscribeMany", mqttv3_unsubscribeMany, METH_VARARGS,
+						"Unsubscribe from the given topics." },
+				{ "publish", mqttv3_publish, METH_VARARGS,
+						"Publish a message to the given topic." },
+				{ "publishMessage", mqttv3_publishMessage, METH_VARARGS,
+						"Publish a message to the given topic." },
+				{ "waitForCompletion", mqttv3_waitForCompletion, METH_VARARGS,
+						"Waits for the completion of the delivery of the message represented by a delivery token." },
+				{ "getPendingDeliveryTokens", mqttv3_getPendingDeliveryTokens,
+						METH_VARARGS,
+						"Returns the delivery tokens pending of completion." },
+				{ "yield", mqttv3_yield, METH_VARARGS,
+						"Single-thread keep alive but don't receive message." },
+				{ "receive", mqttv3_receive, METH_VARARGS,
+						"Single-thread receive message if available." },
+				{ "destroy", mqttv3_destroy, METH_VARARGS,
+						"Free memory allocated to a MQTT client. It is the opposite to create." },
+				{ NULL, NULL, 0, NULL } /* Sentinel */
+		};
+
+PyMODINIT_FUNC initpaho_mqtt3c(void)
+{
+	PyObject *m;
+
+	PyEval_InitThreads();
+
+	callbacks = ListInitialize();
+
+	m = Py_InitModule("paho_mqtt3c", MqttV3Methods);
+	if (m == NULL)
+		return;
+
+	MqttV3Error = PyErr_NewException("paho_mqtt3c.error", NULL, NULL);
+	Py_INCREF(MqttV3Error);
+	PyModule_AddObject(m, "error", MqttV3Error);
+
+	PyModule_AddIntConstant(m, "SUCCESS", MQTTCLIENT_SUCCESS);
+	PyModule_AddIntConstant(m, "FAILURE", MQTTCLIENT_FAILURE);
+	PyModule_AddIntConstant(m, "DISCONNECTED", MQTTCLIENT_DISCONNECTED);
+	PyModule_AddIntConstant(m, "MAX_MESSAGES_INFLIGHT",	MQTTCLIENT_MAX_MESSAGES_INFLIGHT);
+	PyModule_AddIntConstant(m, "BAD_UTF8_STRING", MQTTCLIENT_BAD_UTF8_STRING);
+	PyModule_AddIntConstant(m, "BAD_NULL_PARAMETER", MQTTCLIENT_NULL_PARAMETER);
+	PyModule_AddIntConstant(m, "BAD_TOPICNAME_TRUNCATED", MQTTCLIENT_TOPICNAME_TRUNCATED);
+	PyModule_AddIntConstant(m, "PERSISTENCE_DEFAULT", MQTTCLIENT_PERSISTENCE_DEFAULT);
+	PyModule_AddIntConstant(m, "PERSISTENCE_NONE", MQTTCLIENT_PERSISTENCE_NONE);
+	PyModule_AddIntConstant(m, "PERSISTENCE_USER", MQTTCLIENT_PERSISTENCE_USER);
+	PyModule_AddIntConstant(m, "PERSISTENCE_ERROR",
+	MQTTCLIENT_PERSISTENCE_ERROR);
+}
diff --git a/mqtt/src/test/python/setup.py b/mqtt/src/test/python/setup.py
new file mode 100644
index 00000000..05c7f60b
--- /dev/null
+++ b/mqtt/src/test/python/setup.py
@@ -0,0 +1,20 @@
+from distutils.core import setup, Extension
+
+paho_mqtt3c = Extension('paho_mqtt3c',
+              define_macros = [('NO_HEAP_TRACKING', '1')],
+              sources = ['mqttclient_module.c', '../../src/LinkedList.c'],
+					    libraries = ['paho-mqtt3c'],
+						library_dirs = ['../../build/output'],
+              include_dirs = ['../../src'])
+
+paho_mqtt3a = Extension('paho_mqtt3a',
+              define_macros = [('NO_HEAP_TRACKING', '1')],
+              sources = ['mqttasync_module.c', '../../src/LinkedList.c'],
+                        libraries = ['paho-mqtt3a'],
+                        library_dirs = ['../../build/output'],
+              include_dirs = ['../../src'])
+
+setup (name = 'EclipsePahoMQTTClient',
+       version = '1.0',
+       description = 'Binding to the Eclipse Paho C clients',
+       ext_modules = [paho_mqtt3c, paho_mqtt3a])
diff --git a/mqtt/src/test/python/test1.py b/mqtt/src/test/python/test1.py
new file mode 100644
index 00000000..4f177be0
--- /dev/null
+++ b/mqtt/src/test/python/test1.py
@@ -0,0 +1,52 @@
+import paho_mqtt3c as mqttv3, time, random
+
+print dir(mqttv3)
+
+host = "localhost"
+clientid = "myclientid"
+noclients = 4
+
+def deliveryComplete(context, msgid):
+	print "deliveryComplete", msgid
+
+def connectionLost(context, cause):
+	print "connectionLost"
+	print "rc from reconnect is", mqttv3.connect(self.client)
+
+def messageArrived(context, topicName, message):
+	print "clientid", context
+	print "topicName", topicName
+	print "message", message
+	return 1
+
+print messageArrived
+
+myclientid = None
+clients = []
+for i in range(noclients):
+	myclientid = clientid+str(i)
+	rc, client = mqttv3.create("tcp://"+host+":1883", myclientid)
+	print "client is", hex(client)
+	print "rc from create is", rc
+	print "rc from setcallbacks is", mqttv3.setcallbacks(client, client, connectionLost, messageArrived, deliveryComplete)
+	print "client is", hex(client)
+	print "rc from connect is", mqttv3.connect(client, {})
+	clients.append(client)
+	
+for client in clients:
+	print "rc from subscribe is", mqttv3.subscribe(client, "$SYS/#")
+
+for client in clients:
+	print "rc from publish is", mqttv3.publish(client, "a topic", "a message")
+	print "rc from publish is", mqttv3.publish(client, "a topic", "a message", 1)
+	print "rc from publish is", mqttv3.publish(client, "a topic", "a message", 2)
+	
+print "about to sleep"
+time.sleep(10)
+print "finished sleeping"
+	
+for client in clients:
+	print "rc from isConnected is", mqttv3.isConnected(client)
+	print "rc from disconnect is", mqttv3.disconnect(client)
+	mqttv3.destroy(client)
+
diff --git a/mqtt/src/test/python/test2.py b/mqtt/src/test/python/test2.py
new file mode 100644
index 00000000..48e7fb9e
--- /dev/null
+++ b/mqtt/src/test/python/test2.py
@@ -0,0 +1,73 @@
+import paho_mqtt3a as mqttv3, time, random
+import contextlib
+
+print dir(mqttv3)
+
+hostname = "localhost"
+clientid = "myclientid"
+topic = "test2_topic"
+
+def deliveryComplete(context, msgid):
+	print "deliveryComplete", msgid
+
+def connectionLost(context, cause):
+	print "connectionLost"
+	print "rc from reconnect is", mqttv3.connect(self.client)
+
+def messageArrived(context, topicName, message):
+	print "messageArrived", message
+	#print "clientid", context
+	#print "topicName", topicName
+	return 1
+
+def onSuccess(context, successData):
+	print "onSuccess for", context["clientid"], context["state"], successData
+	responseOptions = {"context": context, "onSuccess": onSuccess, "onFailure" : onFailure}
+	#responseOptions = {"context": context}
+	if context["state"] == "connecting":
+		context["state"] = "subscribing"
+		print "rc from subscribe is", mqttv3.subscribe(client, topic, 2, responseOptions)
+	elif context["state"] == "subscribing":
+		context["state"] = "publishing qos 0"
+		print "rc from publish is", mqttv3.send(client, topic, "a QoS 0 message", 0, 0, responseOptions)
+	elif context["state"] == "publishing qos 0":
+		context["state"] = "publishing qos 1"
+		print "rc from publish is", mqttv3.send(client, topic, "a QoS 1 message", 1, 0, responseOptions)
+	elif context["state"] == "publishing qos 1":
+		context["state"] = "publishing qos 2"
+		print "rc from publish is", mqttv3.send(client, topic, "a QoS 2 message", 2, 0, responseOptions)
+	elif context["state"] == "publishing qos 2":
+		context["state"] = "finished"
+	print "leaving onSuccess"
+	
+def onFailure(context, failureData):
+	print "onFailure for", context["clientid"]
+	context["state"] = "finished"
+
+noclients = 1
+myclientid = None
+clients = []
+for i in range(noclients):
+	myclientid = clientid+str(i)
+	rc, client = mqttv3.create("tcp://"+hostname+":1883", myclientid)
+	#print "client is", hex(client)
+	print "rc from create is", rc
+	print "rc from setcallbacks is", mqttv3.setcallbacks(client, client, connectionLost, messageArrived, deliveryComplete)
+	
+	context = {"client" : client, "clientid" : clientid, "state" : "connecting"}
+	
+	print "rc from connect is", mqttv3.connect(client, {"context": context, "onSuccess": onSuccess, "onFailure": onFailure})
+	
+	clients.append(context)
+
+while [x for x in clients if x["state"] != "finished"]:
+	print [x for x in clients if x["state"] != "finished"]
+	time.sleep(1)
+
+for client in clients:
+	if mqttv3.isConnected(client["client"]):
+		print "rc from disconnect is", mqttv3.disconnect(client["client"], 1000)
+	time.sleep(1)
+	mqttv3.destroy(client["client"])
+	print "after destroy"
+
diff --git a/mqtt/src/test/python/test_offline.py b/mqtt/src/test/python/test_offline.py
new file mode 100644
index 00000000..bed2fe40
--- /dev/null
+++ b/mqtt/src/test/python/test_offline.py
@@ -0,0 +1,83 @@
+import paho_mqtt3a as mqttv3, time, random
+import contextlib
+
+print dir(mqttv3)
+
+hostname = "localhost"
+clientid = "myclientid"
+topic = "test2_topic"
+
+def deliveryComplete(context, msgid):
+	print "deliveryComplete", msgid
+
+def connectionLost(context, cause):
+	print "connectionLost", cause
+	client = context
+	responseOptions = {"context": context, "onSuccess": onSuccess, "onFailure" : onFailure}
+	print "rc from publish while disconnected is", mqttv3.send(client, topic, "message while disconnected", 2, 0, responseOptions)
+
+def messageArrived(context, topicName, message):
+	print "messageArrived", message
+	#print "clientid", context
+	#print "topicName", topicName
+	return 1
+
+def connected(context, cause):
+	print "connected", cause
+
+def onSuccess(context, successData):
+	print "onSuccess for", context["clientid"], context["state"], successData
+	responseOptions = {"context": context, "onSuccess": onSuccess, "onFailure" : onFailure}
+	if context["state"] == "connecting":
+		context["state"] = "subscribing"
+		print "rc from subscribe is", mqttv3.subscribe(client, topic, 2, responseOptions)
+	elif context["state"] == "subscribing":
+		context["state"] = "publishing qos 0"
+		print "rc from publish is", mqttv3.send(client, topic, "a QoS 0 message", 0, 0, responseOptions)
+	elif context["state"] == "publishing qos 0":
+		context["state"] = "publishing qos 1"
+		print "rc from publish is", mqttv3.send(client, topic, "a QoS 1 message", 1, 0, responseOptions)
+	elif context["state"] == "publishing qos 1":
+		context["state"] = "publishing qos 2"
+		print "rc from publish is", mqttv3.send(client, topic, "a QoS 2 message", 2, 0, responseOptions)
+	elif context["state"] == "publishing qos 2":
+		context["state"] = "finished"
+	print "leaving onSuccess"
+	
+def onFailure(context, failureData):
+	print "onFailure for", context["clientid"]
+	context["state"] = "finished"
+
+noclients = 1
+myclientid = None
+clients = []
+for i in range(noclients):
+	myclientid = clientid+str(i)
+	rc, client = mqttv3.create("tcp://"+hostname+":1883", myclientid, mqttv3.PERSISTENCE_DEFAULT, {"sendWhileDisconnected" : 1})
+	#print "client is", hex(client)
+	print "rc from create is", rc
+	print "rc from setcallbacks is", mqttv3.setcallbacks(client, client, connectionLost, messageArrived, deliveryComplete)
+	
+	print "rc from setconnected is", mqttv3.setconnected(client, client, connected)
+
+	
+	context = {"client" : client, "clientid" : clientid, "state" : "connecting"}
+	
+	print "rc from connect is", mqttv3.connect(client, {"cleansession" : 0, "automaticReconnect": 1, "context": context, "onSuccess": onSuccess, "onFailure": onFailure})
+	
+	clients.append(context)
+
+while [x for x in clients if x["state"] != "finished"]:
+	print [x for x in clients if x["state"] != "finished"]
+	time.sleep(1)
+
+print "waiting for 60 seconds"	
+time.sleep(60)
+
+for client in clients:
+	if mqttv3.isConnected(client["client"]):
+		print "rc from disconnect is", mqttv3.disconnect(client["client"], 1000)
+	time.sleep(1)
+	mqttv3.destroy(client["client"])
+	print "after destroy"
+
diff --git a/mqtt/src/test/ssl/all-ca.crt b/mqtt/src/test/ssl/all-ca.crt
new file mode 100644
index 00000000..96fb285e
--- /dev/null
+++ b/mqtt/src/test/ssl/all-ca.crt
@@ -0,0 +1,75 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, L=Derby, O=Mosquitto Project, OU=Testing, CN=Root CA
+        Validity
+            Not Before: Mar  1 18:53:36 2018 GMT
+            Not After : Feb 28 18:53:36 2023 GMT
+        Subject: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:af:ad:b0:e4:78:b8:73:01:6a:9e:78:1e:bf:36:
+                    5b:60:dc:ee:28:ce:16:3c:73:30:b3:02:cd:5c:07:
+                    a2:36:ee:a1:c5:43:32:0c:46:57:cb:fb:1c:52:db:
+                    4e:65:85:8a:5d:a6:cd:66:43:ad:bc:70:1b:e6:b0:
+                    11:0f:d8:54:1f:57:9e:29:4e:2b:1b:c5:70:b2:3d:
+                    38:a7:63:3f:1a:06:2f:6d:09:2c:7c:90:60:db:8c:
+                    3a:11:20:a7:db:20:25:d9:c6:97:74:50:5a:e0:fd:
+                    81:aa:de:ea:1d:e5:be:61:59:0d:76:e5:ab:7f:3b:
+                    b2:a6:38:b9:bb:32:aa:72:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+            X509v3 Authority Key Identifier: 
+                keyid:1C:B4:4E:8B:84:0D:1E:0F:C4:CC:F4:17:87:DB:CA:F2:55:F1:34:39
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         6c:2d:41:ca:7b:89:84:27:ca:b3:64:d5:73:b2:5b:dd:fc:6f:
+         d4:68:ae:f1:30:3e:9e:ca:28:2b:d3:2e:0c:61:3e:d5:9a:fd:
+         67:b1:60:e5:54:9f:a4:95:51:5b:00:2d:f9:46:82:de:49:df:
+         ce:2a:f3:f6:2e:8f:8f:64:2b:c9:2f:ce:ff:d2:53:a0:0a:c4:
+         4a:e9:20:fa:5e:79:45:21:18:c2:d6:c1:64:92:e4:67:3a:92:
+         04:46:5e:6a:39:84:c8:f1:0e:42:3c:fd:b2:c2:7b:e9:af:44:
+         2c:19:30:61:01:39:47:6d:38:85:90:4b:e5:04:f4:87:72:46:
+         4a:9a
+-----BEGIN CERTIFICATE-----
+MIICnTCCAgagAwIBAgIBATANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEOMAwGA1UEBwwFRGVyYnkxGjAYBgNVBAoMEU1v
+c3F1aXR0byBQcm9qZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRAwDgYDVQQDDAdSb290
+IENBMB4XDTE4MDMwMTE4NTMzNloXDTIzMDIyODE4NTMzNlowZTELMAkGA1UEBhMC
+R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxGjAYBgNVBAoMEU1vc3F1aXR0byBQcm9q
+ZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRMwEQYDVQQDDApTaWduaW5nIENBMIGfMA0G
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvrbDkeLhzAWqeeB6/Nltg3O4ozhY8czCz
+As1cB6I27qHFQzIMRlfL+xxS205lhYpdps1mQ628cBvmsBEP2FQfV54pTisbxXCy
+PTinYz8aBi9tCSx8kGDbjDoRIKfbICXZxpd0UFrg/YGq3uod5b5hWQ125at/O7Km
+OLm7Mqpy7wIDAQABo1AwTjAdBgNVHQ4EFgQUnlQ+5S/l6kBK/DeWbEW7GnkOyqsw
+HwYDVR0jBBgwFoAUHLROi4QNHg/EzPQXh9vK8lXxNDkwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQsFAAOBgQBsLUHKe4mEJ8qzZNVzslvd/G/UaK7xMD6eyigr0y4M
+YT7Vmv1nsWDlVJ+klVFbAC35RoLeSd/OKvP2Lo+PZCvJL87/0lOgCsRK6SD6XnlF
+IRjC1sFkkuRnOpIERl5qOYTI8Q5CPP2ywnvpr0QsGTBhATlHbTiFkEvlBPSHckZK
+mg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICtDCCAh2gAwIBAgIJAObVjC0tPL4iMA0GCSqGSIb3DQEBCwUAMHIxCzAJBgNV
+BAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJieTEaMBgG
+A1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3RpbmcxEDAOBgNV
+BAMMB1Jvb3QgQ0EwIBcNMTgwMzAxMTg1MzM2WhgPMjEwMDA0MjAxODUzMzZaMHIx
+CzAJBgNVBAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJi
+eTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3Rpbmcx
+EDAOBgNVBAMMB1Jvb3QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANSZ
+3aRYdHcnta24XXJGfomsg2OpYys3KkqK76aWEwhqRvdH2m54yBvHTZ2LsMLQro0q
+r4oGLyvlupC9fxwQF4ZDFHrn7VbxU947V+cipGkRaECXiGVO1ngUSpKti8nrIUkn
+FXkLmVaGuVv1jVOGBi6/6f3ct6LsNyFqXzaSw9DtAgMBAAGjUDBOMB0GA1UdDgQW
+BBQctE6LhA0eD8TM9BeH28ryVfE0OTAfBgNVHSMEGDAWgBQctE6LhA0eD8TM9BeH
+28ryVfE0OTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBAHVShEeqQRjP
+IoMU8MFnnC1ZadADvSn1E6gRR7eoNU0MeMpTYmTA+TIklEzhaRHSkQqyPHAe/YMl
+WLmq1NqyxPv9uKekVlatJxYbm1ME4e+wGs3U9OGsIKX0nFcBO8iqpj5s7GZmSYyY
+u1YJnq1oe0C5IblVB9amcoB743/YyMme
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/capath/374b031c.0 b/mqtt/src/test/ssl/capath/374b031c.0
new file mode 120000
index 00000000..8f18c71d
--- /dev/null
+++ b/mqtt/src/test/ssl/capath/374b031c.0
@@ -0,0 +1 @@
+server.pem
\ No newline at end of file
diff --git a/mqtt/src/test/ssl/capath/ab88c291.0 b/mqtt/src/test/ssl/capath/ab88c291.0
new file mode 120000
index 00000000..708ac696
--- /dev/null
+++ b/mqtt/src/test/ssl/capath/ab88c291.0
@@ -0,0 +1 @@
+test-root-ca.pem
\ No newline at end of file
diff --git a/mqtt/src/test/ssl/capath/server.pem b/mqtt/src/test/ssl/capath/server.pem
new file mode 100644
index 00000000..b6009a77
--- /dev/null
+++ b/mqtt/src/test/ssl/capath/server.pem
@@ -0,0 +1,60 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Mar  1 18:53:44 2018 GMT
+            Not After : Feb 28 18:53:44 2023 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=localhost
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:c9:18:e1:6a:c4:45:58:0e:b7:65:3a:b8:6f:df:
+                    0a:d8:5d:18:aa:40:08:d6:d5:79:fa:ca:79:6b:9e:
+                    ce:55:85:c9:d5:4f:bb:7f:5a:81:c8:3c:5d:aa:ed:
+                    7f:48:87:c2:f1:4c:62:00:c3:8d:9a:a3:c2:77:25:
+                    c6:70:cc:ef:d1:8f:17:7d:1b:c3:ab:66:3e:90:f0:
+                    44:e3:85:8b:77:86:21:b2:dd:0b:2c:ed:a0:16:a0:
+                    16:63:49:b9:bb:90:45:44:f1:f7:1e:ad:57:1c:45:
+                    a2:08:99:13:05:e3:13:76:ef:f3:cd:f3:3a:21:73:
+                    21:75:0a:2d:58:e2:0a:3a:3d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                7E:42:6C:12:CB:42:12:36:54:03:29:B6:D8:21:CA:E1:65:48:C5:67
+            X509v3 Authority Key Identifier: 
+                keyid:9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+
+    Signature Algorithm: sha256WithRSAEncryption
+         08:e1:a9:a0:e9:c4:1b:65:8d:b0:71:60:68:18:d8:af:49:8f:
+         0b:41:62:bb:f8:23:71:65:f2:c7:cf:59:23:63:48:fa:ba:26:
+         5f:2d:2e:4c:18:e4:f0:6e:cb:38:be:51:d0:e2:cc:76:ab:f6:
+         13:c2:49:68:e2:ef:da:86:a9:3d:80:29:9f:ee:33:be:cd:4c:
+         b2:4c:14:04:e3:46:46:46:ec:c1:4a:63:de:f3:5a:7b:0f:28:
+         a1:92:c8:96:07:b3:73:96:f4:9e:a0:bf:36:ea:f1:1a:8b:f7:
+         d5:ed:6c:e2:bf:cd:61:bc:a4:ca:ee:fa:75:af:ad:4c:54:4b:
+         af:18
+-----BEGIN CERTIFICATE-----
+MIICzDCCAjWgAwIBAgIBATANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3Qx
+EDAOBgNVBAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwHhcNMTgwMzAx
+MTg1MzQ0WhcNMjMwMjI4MTg1MzQ0WjB2MQswCQYDVQQGEwJHQjEYMBYGA1UECAwP
+Tm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHDApOb3R0aW5naGFtMQ8wDQYDVQQKDAZT
+ZXJ2ZXIxEzARBgNVBAsMClByb2R1Y3Rpb24xEjAQBgNVBAMMCWxvY2FsaG9zdDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyRjhasRFWA63ZTq4b98K2F0YqkAI
+1tV5+sp5a57OVYXJ1U+7f1qByDxdqu1/SIfC8UxiAMONmqPCdyXGcMzv0Y8XfRvD
+q2Y+kPBE44WLd4Yhst0LLO2gFqAWY0m5u5BFRPH3Hq1XHEWiCJkTBeMTdu/zzfM6
+IXMhdQotWOIKOj0CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYd
+T3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFH5CbBLLQhI2
+VAMpttghyuFlSMVnMB8GA1UdIwQYMBaAFJ5UPuUv5epASvw3lmxFuxp5DsqrMA0G
+CSqGSIb3DQEBCwUAA4GBAAjhqaDpxBtljbBxYGgY2K9JjwtBYrv4I3Fl8sfPWSNj
+SPq6Jl8tLkwY5PBuyzi+UdDizHar9hPCSWji79qGqT2AKZ/uM77NTLJMFATjRkZG
+7MFKY97zWnsPKKGSyJYHs3OW9J6gvzbq8RqL99XtbOK/zWG8pMru+nWvrUxUS68Y
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/capath/test-root-ca.pem b/mqtt/src/test/ssl/capath/test-root-ca.pem
new file mode 100644
index 00000000..02ec098a
--- /dev/null
+++ b/mqtt/src/test/ssl/capath/test-root-ca.pem
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICtDCCAh2gAwIBAgIJAObVjC0tPL4iMA0GCSqGSIb3DQEBCwUAMHIxCzAJBgNV
+BAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJieTEaMBgG
+A1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3RpbmcxEDAOBgNV
+BAMMB1Jvb3QgQ0EwIBcNMTgwMzAxMTg1MzM2WhgPMjEwMDA0MjAxODUzMzZaMHIx
+CzAJBgNVBAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJi
+eTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3Rpbmcx
+EDAOBgNVBAMMB1Jvb3QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANSZ
+3aRYdHcnta24XXJGfomsg2OpYys3KkqK76aWEwhqRvdH2m54yBvHTZ2LsMLQro0q
+r4oGLyvlupC9fxwQF4ZDFHrn7VbxU947V+cipGkRaECXiGVO1ngUSpKti8nrIUkn
+FXkLmVaGuVv1jVOGBi6/6f3ct6LsNyFqXzaSw9DtAgMBAAGjUDBOMB0GA1UdDgQW
+BBQctE6LhA0eD8TM9BeH28ryVfE0OTAfBgNVHSMEGDAWgBQctE6LhA0eD8TM9BeH
+28ryVfE0OTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBAHVShEeqQRjP
+IoMU8MFnnC1ZadADvSn1E6gRR7eoNU0MeMpTYmTA+TIklEzhaRHSkQqyPHAe/YMl
+WLmq1NqyxPv9uKekVlatJxYbm1ME4e+wGs3U9OGsIKX0nFcBO8iqpj5s7GZmSYyY
+u1YJnq1oe0C5IblVB9amcoB743/YyMme
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/client-expired.crt b/mqtt/src/test/ssl/client-expired.crt
new file mode 100644
index 00000000..22421981
--- /dev/null
+++ b/mqtt/src/test/ssl/client-expired.crt
@@ -0,0 +1,61 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 3 (0x3)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Aug 20 00:00:00 2012 GMT
+            Not After : Aug 21 00:00:00 2012 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=test client expired
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:b8:67:87:cf:05:35:29:81:b1:16:e3:0a:1c:59:
+                    83:36:dc:31:db:af:f2:a9:12:97:e7:96:c8:91:7c:
+                    a4:52:65:43:79:f4:20:e0:5f:ed:c0:b4:32:9d:c7:
+                    3d:21:9a:9e:92:6c:42:08:06:88:65:d5:4f:5e:70:
+                    d9:7d:e1:de:4b:be:26:e2:06:99:4a:54:f7:e7:1c:
+                    d6:7c:6f:d5:16:8d:b0:9d:ce:5d:29:f1:51:e9:12:
+                    fd:2f:ed:d6:fc:e1:cc:d6:31:0e:ce:0e:74:02:f3:
+                    1e:70:41:44:5d:67:ed:3b:9d:2f:43:b8:89:6f:90:
+                    52:9b:f1:e9:fc:ed:f8:35:d1
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                27:DF:0F:D3:9A:8F:34:C8:9E:C1:6D:B9:29:99:0F:0D:3A:D1:BB:BD
+            X509v3 Authority Key Identifier: 
+                keyid:9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+
+    Signature Algorithm: sha256WithRSAEncryption
+         96:28:72:b2:16:af:2b:f2:92:d9:8b:e7:15:2c:e2:e1:55:48:
+         ce:45:d0:89:7a:80:41:ec:3e:b5:01:ee:b9:2e:62:44:7d:b5:
+         b2:f0:e5:83:62:1d:6f:3b:b5:69:4c:dd:c7:20:fb:b0:70:5a:
+         c5:f6:4a:97:14:4a:63:8f:da:3b:0d:27:e3:b9:06:a3:53:1c:
+         db:d3:9d:8a:8a:aa:7c:d7:a0:39:15:d5:03:8b:4f:0e:ab:78:
+         2f:05:69:8c:a3:5a:6b:70:6b:9e:b1:23:ad:d3:ef:a9:5d:01:
+         1b:37:7e:07:0f:97:cb:79:3a:7f:02:3d:40:62:20:63:a8:80:
+         92:da
+-----BEGIN CERTIFICATE-----
+MIIC1zCCAkCgAwIBAgIBAzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3Qx
+EDAOBgNVBAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwHhcNMTIwODIw
+MDAwMDAwWhcNMTIwODIxMDAwMDAwWjCBgDELMAkGA1UEBhMCR0IxGDAWBgNVBAgM
+D05vdHRpbmdoYW1zaGlyZTETMBEGA1UEBwwKTm90dGluZ2hhbTEPMA0GA1UECgwG
+U2VydmVyMRMwEQYDVQQLDApQcm9kdWN0aW9uMRwwGgYDVQQDDBN0ZXN0IGNsaWVu
+dCBleHBpcmVkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4Z4fPBTUpgbEW
+4wocWYM23DHbr/KpEpfnlsiRfKRSZUN59CDgX+3AtDKdxz0hmp6SbEIIBohl1U9e
+cNl94d5LvibiBplKVPfnHNZ8b9UWjbCdzl0p8VHpEv0v7db84czWMQ7ODnQC8x5w
+QURdZ+07nS9DuIlvkFKb8en87fg10QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+FgQUJ98P05qPNMiewW25KZkPDTrRu70wHwYDVR0jBBgwFoAUnlQ+5S/l6kBK/DeW
+bEW7GnkOyqswDQYJKoZIhvcNAQELBQADgYEAlihyshavK/KS2YvnFSzi4VVIzkXQ
+iXqAQew+tQHuuS5iRH21svDlg2Idbzu1aUzdxyD7sHBaxfZKlxRKY4/aOw0n47kG
+o1Mc29OdioqqfNegORXVA4tPDqt4LwVpjKNaa3BrnrEjrdPvqV0BGzd+Bw+Xy3k6
+fwI9QGIgY6iAkto=
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/client-expired.csr b/mqtt/src/test/ssl/client-expired.csr
new file mode 100644
index 00000000..3bc37f0a
--- /dev/null
+++ b/mqtt/src/test/ssl/client-expired.csr
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBwTCCASoCAQAwgYAxCzAJBgNVBAYTAkdCMRgwFgYDVQQIDA9Ob3R0aW5naGFt
+c2hpcmUxEzARBgNVBAcMCk5vdHRpbmdoYW0xDzANBgNVBAoMBlNlcnZlcjETMBEG
+A1UECwwKUHJvZHVjdGlvbjEcMBoGA1UEAwwTdGVzdCBjbGllbnQgZXhwaXJlZDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAuGeHzwU1KYGxFuMKHFmDNtwx26/y
+qRKX55bIkXykUmVDefQg4F/twLQyncc9IZqekmxCCAaIZdVPXnDZfeHeS74m4gaZ
+SlT35xzWfG/VFo2wnc5dKfFR6RL9L+3W/OHM1jEOzg50AvMecEFEXWftO50vQ7iJ
+b5BSm/Hp/O34NdECAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4GBAJApMCk6dQ5JLqES
+o3owRsIQb9cNv0D65uRFx02DK2kkC4j1k+QztieaXAcH6mlS3DlpeTvSw7HutypE
+L8XaG1yt+Yj11ZQydq1kb867nkIrRboGP16Zq5jiaI/q2OqmIz6kLU98mmDkgFdn
+ME6BEnpw2VeRojXkrTqUpCgbX9E8
+-----END CERTIFICATE REQUEST-----
diff --git a/mqtt/src/test/ssl/client-revoked.crt b/mqtt/src/test/ssl/client-revoked.crt
new file mode 100644
index 00000000..6d60fb28
--- /dev/null
+++ b/mqtt/src/test/ssl/client-revoked.crt
@@ -0,0 +1,61 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4 (0x4)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Mar  1 18:53:51 2018 GMT
+            Not After : Feb 28 18:53:51 2023 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=test client revoked
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:ca:88:c0:97:79:0c:af:97:dc:f2:06:5a:12:3d:
+                    07:bf:d0:ca:f3:90:e2:fa:a6:36:c7:67:0c:50:30:
+                    b6:98:1c:83:16:03:fa:7d:00:77:37:00:49:93:3d:
+                    20:0b:e8:fb:8f:20:a2:6a:29:df:ae:ee:38:38:a8:
+                    3b:76:b2:92:96:63:46:0b:b2:47:5f:5d:9b:8d:dc:
+                    31:95:3b:ac:e9:ab:c6:89:00:46:61:58:7f:b5:39:
+                    c6:97:7e:5c:f5:06:f0:ea:82:e6:11:27:18:1f:af:
+                    2c:cb:21:43:75:e3:cf:fa:41:d8:17:17:87:ce:29:
+                    df:7f:75:d6:1f:20:d7:29:03
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                53:1F:81:85:BB:93:78:8A:B4:22:F8:8C:E0:6C:99:5F:B6:AA:B5:9B
+            X509v3 Authority Key Identifier: 
+                keyid:9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+
+    Signature Algorithm: sha256WithRSAEncryption
+         24:f6:97:b8:b2:ac:eb:83:35:d8:fa:3e:86:13:a6:44:85:10:
+         c5:ba:33:c5:58:98:bc:6e:fe:30:60:12:41:ce:ac:3f:ed:38:
+         e6:5f:ff:b5:29:73:a7:f6:60:41:b2:10:23:da:74:f2:29:d6:
+         f1:bb:94:38:14:fc:75:50:64:f4:4d:d2:6a:3d:f0:da:e0:e8:
+         e2:b9:be:a4:30:b4:c7:c3:22:60:c4:a4:34:31:13:7b:46:9d:
+         bb:5f:8e:cd:21:9d:52:78:e5:e3:e9:e6:e8:62:16:a1:f0:af:
+         14:c8:2c:39:a6:2f:a9:f4:98:cf:8c:20:20:87:c2:15:78:e4:
+         53:23
+-----BEGIN CERTIFICATE-----
+MIIC1zCCAkCgAwIBAgIBBDANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3Qx
+EDAOBgNVBAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwHhcNMTgwMzAx
+MTg1MzUxWhcNMjMwMjI4MTg1MzUxWjCBgDELMAkGA1UEBhMCR0IxGDAWBgNVBAgM
+D05vdHRpbmdoYW1zaGlyZTETMBEGA1UEBwwKTm90dGluZ2hhbTEPMA0GA1UECgwG
+U2VydmVyMRMwEQYDVQQLDApQcm9kdWN0aW9uMRwwGgYDVQQDDBN0ZXN0IGNsaWVu
+dCByZXZva2VkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKiMCXeQyvl9zy
+BloSPQe/0MrzkOL6pjbHZwxQMLaYHIMWA/p9AHc3AEmTPSAL6PuPIKJqKd+u7jg4
+qDt2spKWY0YLskdfXZuN3DGVO6zpq8aJAEZhWH+1OcaXflz1BvDqguYRJxgfryzL
+IUN148/6QdgXF4fOKd9/ddYfINcpAwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+FgQUUx+BhbuTeIq0IviM4GyZX7aqtZswHwYDVR0jBBgwFoAUnlQ+5S/l6kBK/DeW
+bEW7GnkOyqswDQYJKoZIhvcNAQELBQADgYEAJPaXuLKs64M12Po+hhOmRIUQxboz
+xViYvG7+MGASQc6sP+045l//tSlzp/ZgQbIQI9p08inW8buUOBT8dVBk9E3Saj3w
+2uDo4rm+pDC0x8MiYMSkNDETe0adu1+OzSGdUnjl4+nm6GIWofCvFMgsOaYvqfSY
+z4wgIIfCFXjkUyM=
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/client-revoked.csr b/mqtt/src/test/ssl/client-revoked.csr
new file mode 100644
index 00000000..5ed50746
--- /dev/null
+++ b/mqtt/src/test/ssl/client-revoked.csr
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBwTCCASoCAQAwgYAxCzAJBgNVBAYTAkdCMRgwFgYDVQQIDA9Ob3R0aW5naGFt
+c2hpcmUxEzARBgNVBAcMCk5vdHRpbmdoYW0xDzANBgNVBAoMBlNlcnZlcjETMBEG
+A1UECwwKUHJvZHVjdGlvbjEcMBoGA1UEAwwTdGVzdCBjbGllbnQgcmV2b2tlZDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyojAl3kMr5fc8gZaEj0Hv9DK85Di
++qY2x2cMUDC2mByDFgP6fQB3NwBJkz0gC+j7jyCiainfru44OKg7drKSlmNGC7JH
+X12bjdwxlTus6avGiQBGYVh/tTnGl35c9Qbw6oLmEScYH68syyFDdePP+kHYFxeH
+zinff3XWHyDXKQMCAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4GBAGzSotjaZM3jQb4d
++RMmTpkWpOkhhyrhbFnzuMHN78hoS0VKdD/DsfQ+k7ARah3Y8CAicSZFc6IJHhic
+Cmj4m/jOQGAhq1sfuGiEd6FNdwOSJZb2bhhk+EKFaYM3Sool/u20Lt16R4xpBEVy
+K/zE75Uy+L9MzyXqzTee1ujLoPD+
+-----END CERTIFICATE REQUEST-----
diff --git a/mqtt/src/test/ssl/client-revoked.key b/mqtt/src/test/ssl/client-revoked.key
new file mode 100644
index 00000000..68f4465b
--- /dev/null
+++ b/mqtt/src/test/ssl/client-revoked.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQDKiMCXeQyvl9zyBloSPQe/0MrzkOL6pjbHZwxQMLaYHIMWA/p9
+AHc3AEmTPSAL6PuPIKJqKd+u7jg4qDt2spKWY0YLskdfXZuN3DGVO6zpq8aJAEZh
+WH+1OcaXflz1BvDqguYRJxgfryzLIUN148/6QdgXF4fOKd9/ddYfINcpAwIDAQAB
+AoGAHsbvNVVwxxI1whWTBGh/z/dDkAW5aEtv0ZdoOJtec/kJNoQ+QVabxyDlDVnh
+j83ExHg6FhXs5uFOa9Wsy5nRSoGDIBcxsvz3aN1RKPxoT82D3+52oe5rXZCoemRX
+xYQYOvNoElms8GvqodUH/GfeAfpfK6LIxLhlFSPmrRAtEpkCQQD+hsbHWUwHZd10
+5vD12yYS4UGsnO8zMh5Fj3efRU63Jifyz+2x2aj3niSH8FOTmTvcnlrBAuwuNfA1
+vTXZqfBPAkEAy7TrjrrqyEEbSyS+gNtl7mZpOTjlxGlt0yGiLTuJuxExDc+b8hZw
+HUw8CHQuEIFYQhUa9e77THWe9PCA10B7DQJBAMKR3xT3U2J4YXGDNYKMU6+tGNpO
+YaDeWDvOr6BGiCUD+xfoEYmanUslTkHI2usDAbrmJvRTOp8cxpMeIDNTcIsCQQCQ
+olBt8wEoVjHO1LP+QcjJ0CT94AwjvMehlMvVWeSc0cQGjlWnOY84/hvR1MuwJGZJ
+5TpTS+9Zhlnqh6izLLExAkEAx/56MWBwhQQ+WIvKxHHe+u6rCSM4qRRZtAlKxqH1
+0KhILw+gtafscbyb4rfpvHr9TUY/g0v1OGgFERUXSj+jAA==
+-----END RSA PRIVATE KEY-----
diff --git a/mqtt/src/test/ssl/client.crt b/mqtt/src/test/ssl/client.crt
new file mode 100644
index 00000000..9cc8671b
--- /dev/null
+++ b/mqtt/src/test/ssl/client.crt
@@ -0,0 +1,61 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Mar  1 18:53:47 2018 GMT
+            Not After : Feb 28 18:53:47 2023 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=test client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:b8:67:87:cf:05:35:29:81:b1:16:e3:0a:1c:59:
+                    83:36:dc:31:db:af:f2:a9:12:97:e7:96:c8:91:7c:
+                    a4:52:65:43:79:f4:20:e0:5f:ed:c0:b4:32:9d:c7:
+                    3d:21:9a:9e:92:6c:42:08:06:88:65:d5:4f:5e:70:
+                    d9:7d:e1:de:4b:be:26:e2:06:99:4a:54:f7:e7:1c:
+                    d6:7c:6f:d5:16:8d:b0:9d:ce:5d:29:f1:51:e9:12:
+                    fd:2f:ed:d6:fc:e1:cc:d6:31:0e:ce:0e:74:02:f3:
+                    1e:70:41:44:5d:67:ed:3b:9d:2f:43:b8:89:6f:90:
+                    52:9b:f1:e9:fc:ed:f8:35:d1
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                27:DF:0F:D3:9A:8F:34:C8:9E:C1:6D:B9:29:99:0F:0D:3A:D1:BB:BD
+            X509v3 Authority Key Identifier: 
+                keyid:9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+
+    Signature Algorithm: sha256WithRSAEncryption
+         a1:0d:e1:4b:25:ef:4e:67:28:93:33:68:49:65:0e:18:eb:3f:
+         17:ae:47:68:75:4d:72:f5:41:6b:c5:f0:1d:06:0d:25:3d:fa:
+         ab:39:17:f4:e2:34:b7:49:9d:69:a1:92:4a:69:1b:17:42:5b:
+         c6:79:6f:20:31:81:5c:52:c2:58:6b:a0:ba:9a:fe:55:0e:8d:
+         0b:80:9f:4a:97:ed:05:05:90:a6:13:23:70:d0:56:93:a6:f4:
+         66:af:f0:96:05:8b:67:89:72:67:04:f4:5e:44:36:20:4e:b4:
+         97:b4:b2:3b:aa:e2:44:b1:ee:49:13:2c:af:e7:6d:37:e8:09:
+         50:6d
+-----BEGIN CERTIFICATE-----
+MIICzjCCAjegAwIBAgIBAjANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3Qx
+EDAOBgNVBAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwHhcNMTgwMzAx
+MTg1MzQ3WhcNMjMwMjI4MTg1MzQ3WjB4MQswCQYDVQQGEwJHQjEYMBYGA1UECAwP
+Tm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHDApOb3R0aW5naGFtMQ8wDQYDVQQKDAZT
+ZXJ2ZXIxEzARBgNVBAsMClByb2R1Y3Rpb24xFDASBgNVBAMMC3Rlc3QgY2xpZW50
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4Z4fPBTUpgbEW4wocWYM23DHb
+r/KpEpfnlsiRfKRSZUN59CDgX+3AtDKdxz0hmp6SbEIIBohl1U9ecNl94d5Lvibi
+BplKVPfnHNZ8b9UWjbCdzl0p8VHpEv0v7db84czWMQ7ODnQC8x5wQURdZ+07nS9D
+uIlvkFKb8en87fg10QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQf
+Fh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJ98P05qP
+NMiewW25KZkPDTrRu70wHwYDVR0jBBgwFoAUnlQ+5S/l6kBK/DeWbEW7GnkOyqsw
+DQYJKoZIhvcNAQELBQADgYEAoQ3hSyXvTmcokzNoSWUOGOs/F65HaHVNcvVBa8Xw
+HQYNJT36qzkX9OI0t0mdaaGSSmkbF0JbxnlvIDGBXFLCWGugupr+VQ6NC4CfSpft
+BQWQphMjcNBWk6b0Zq/wlgWLZ4lyZwT0XkQ2IE60l7SyO6riRLHuSRMsr+dtN+gJ
+UG0=
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/client.csr b/mqtt/src/test/ssl/client.csr
new file mode 100644
index 00000000..6d2f6a39
--- /dev/null
+++ b/mqtt/src/test/ssl/client.csr
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBuDCCASECAQAweDELMAkGA1UEBhMCR0IxGDAWBgNVBAgMD05vdHRpbmdoYW1z
+aGlyZTETMBEGA1UEBwwKTm90dGluZ2hhbTEPMA0GA1UECgwGU2VydmVyMRMwEQYD
+VQQLDApQcm9kdWN0aW9uMRQwEgYDVQQDDAt0ZXN0IGNsaWVudDCBnzANBgkqhkiG
+9w0BAQEFAAOBjQAwgYkCgYEAuGeHzwU1KYGxFuMKHFmDNtwx26/yqRKX55bIkXyk
+UmVDefQg4F/twLQyncc9IZqekmxCCAaIZdVPXnDZfeHeS74m4gaZSlT35xzWfG/V
+Fo2wnc5dKfFR6RL9L+3W/OHM1jEOzg50AvMecEFEXWftO50vQ7iJb5BSm/Hp/O34
+NdECAwEAAaAAMA0GCSqGSIb3DQEBCwUAA4GBABHID597FhoqxMtsvA8ggyW3S1Cc
+v8ycjmt3hn0fEg1SkSsCKL3CY98fxnhL71Eprsx0j7CcuwLaRiOkxzEFflzMAdDU
+3nMFyKc0YVKh3+j2yzE2oSKWQVGtg17pGw1DX17gerDe7iKLpZt855agtwawHvCZ
+kdwNWoUR43fFT2i7
+-----END CERTIFICATE REQUEST-----
diff --git a/mqtt/src/test/ssl/client.key b/mqtt/src/test/ssl/client.key
new file mode 100644
index 00000000..36540b02
--- /dev/null
+++ b/mqtt/src/test/ssl/client.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQC4Z4fPBTUpgbEW4wocWYM23DHbr/KpEpfnlsiRfKRSZUN59CDg
+X+3AtDKdxz0hmp6SbEIIBohl1U9ecNl94d5LvibiBplKVPfnHNZ8b9UWjbCdzl0p
+8VHpEv0v7db84czWMQ7ODnQC8x5wQURdZ+07nS9DuIlvkFKb8en87fg10QIDAQAB
+AoGAPTRfpx6bXoNlO6tvl6k+G99JzRjA+czqDjvFpkQwZgimNLwKjW5Jg0RL6IJQ
+j+654u97mx5P9zytczMRfO6S0RCd7Ba/bYzUr+zP3yAiZt1B71Iu+emOlrRtIglT
+P/jee3Z3017Hqe1K0l/xu0F/a2cKKEMxBDwEvMn3jhkvumECQQDhxKMHavo+nDAc
+YNrwE2VxWYhZApGVzsGzO8tgQ95IN/BlmYptGQPyssNNItWvbfF6EjB0rTwcMWF2
+hCEoeg2bAkEA0Rjws4kGaP9jwOi7lEOKIrutv5Dfb6euioyvhDD/YxXt7YCijVwG
+ATZLkVEiL8G0E5tvkMR7O4ho6hHft5V3AwJBAK9LIx4OVNCqKrzOAxAmrzwMPU6H
+LQy5JTKJ+cX7zCocrN3mElHU+3jEjdllc66rWbPjTZY6L5LgUIFZ4/juk4MCQQCM
+4x8b+VHGYX5XNvlc9v0WVhrGHtlOJE+orw58JX+OxfHgu3HLiZvKKUlVirNcNkod
+g/fyNVFLVahLPuvciOr9AkEA1gzbg9q7kxKlFLlOYtowbLbMS/u8BUsaQJv1g05A
+Yua6Wg8D4gr3/aNKQhLLXe7fHCAPs61n/KyD2aat8I2xBQ==
+-----END RSA PRIVATE KEY-----
diff --git a/mqtt/src/test/ssl/client.pem b/mqtt/src/test/ssl/client.pem
new file mode 100644
index 00000000..03a728d1
--- /dev/null
+++ b/mqtt/src/test/ssl/client.pem
@@ -0,0 +1,151 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Mar  1 18:53:47 2018 GMT
+            Not After : Feb 28 18:53:47 2023 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=test client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:b8:67:87:cf:05:35:29:81:b1:16:e3:0a:1c:59:
+                    83:36:dc:31:db:af:f2:a9:12:97:e7:96:c8:91:7c:
+                    a4:52:65:43:79:f4:20:e0:5f:ed:c0:b4:32:9d:c7:
+                    3d:21:9a:9e:92:6c:42:08:06:88:65:d5:4f:5e:70:
+                    d9:7d:e1:de:4b:be:26:e2:06:99:4a:54:f7:e7:1c:
+                    d6:7c:6f:d5:16:8d:b0:9d:ce:5d:29:f1:51:e9:12:
+                    fd:2f:ed:d6:fc:e1:cc:d6:31:0e:ce:0e:74:02:f3:
+                    1e:70:41:44:5d:67:ed:3b:9d:2f:43:b8:89:6f:90:
+                    52:9b:f1:e9:fc:ed:f8:35:d1
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                27:DF:0F:D3:9A:8F:34:C8:9E:C1:6D:B9:29:99:0F:0D:3A:D1:BB:BD
+            X509v3 Authority Key Identifier: 
+                keyid:9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+
+    Signature Algorithm: sha256WithRSAEncryption
+         a1:0d:e1:4b:25:ef:4e:67:28:93:33:68:49:65:0e:18:eb:3f:
+         17:ae:47:68:75:4d:72:f5:41:6b:c5:f0:1d:06:0d:25:3d:fa:
+         ab:39:17:f4:e2:34:b7:49:9d:69:a1:92:4a:69:1b:17:42:5b:
+         c6:79:6f:20:31:81:5c:52:c2:58:6b:a0:ba:9a:fe:55:0e:8d:
+         0b:80:9f:4a:97:ed:05:05:90:a6:13:23:70:d0:56:93:a6:f4:
+         66:af:f0:96:05:8b:67:89:72:67:04:f4:5e:44:36:20:4e:b4:
+         97:b4:b2:3b:aa:e2:44:b1:ee:49:13:2c:af:e7:6d:37:e8:09:
+         50:6d
+-----BEGIN CERTIFICATE-----
+MIICzjCCAjegAwIBAgIBAjANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3Qx
+EDAOBgNVBAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwHhcNMTgwMzAx
+MTg1MzQ3WhcNMjMwMjI4MTg1MzQ3WjB4MQswCQYDVQQGEwJHQjEYMBYGA1UECAwP
+Tm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHDApOb3R0aW5naGFtMQ8wDQYDVQQKDAZT
+ZXJ2ZXIxEzARBgNVBAsMClByb2R1Y3Rpb24xFDASBgNVBAMMC3Rlc3QgY2xpZW50
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4Z4fPBTUpgbEW4wocWYM23DHb
+r/KpEpfnlsiRfKRSZUN59CDgX+3AtDKdxz0hmp6SbEIIBohl1U9ecNl94d5Lvibi
+BplKVPfnHNZ8b9UWjbCdzl0p8VHpEv0v7db84czWMQ7ODnQC8x5wQURdZ+07nS9D
+uIlvkFKb8en87fg10QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQf
+Fh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJ98P05qP
+NMiewW25KZkPDTrRu70wHwYDVR0jBBgwFoAUnlQ+5S/l6kBK/DeWbEW7GnkOyqsw
+DQYJKoZIhvcNAQELBQADgYEAoQ3hSyXvTmcokzNoSWUOGOs/F65HaHVNcvVBa8Xw
+HQYNJT36qzkX9OI0t0mdaaGSSmkbF0JbxnlvIDGBXFLCWGugupr+VQ6NC4CfSpft
+BQWQphMjcNBWk6b0Zq/wlgWLZ4lyZwT0XkQ2IE60l7SyO6riRLHuSRMsr+dtN+gJ
+UG0=
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIICXgIBAAKBgQC4Z4fPBTUpgbEW4wocWYM23DHbr/KpEpfnlsiRfKRSZUN59CDg
+X+3AtDKdxz0hmp6SbEIIBohl1U9ecNl94d5LvibiBplKVPfnHNZ8b9UWjbCdzl0p
+8VHpEv0v7db84czWMQ7ODnQC8x5wQURdZ+07nS9DuIlvkFKb8en87fg10QIDAQAB
+AoGAPTRfpx6bXoNlO6tvl6k+G99JzRjA+czqDjvFpkQwZgimNLwKjW5Jg0RL6IJQ
+j+654u97mx5P9zytczMRfO6S0RCd7Ba/bYzUr+zP3yAiZt1B71Iu+emOlrRtIglT
+P/jee3Z3017Hqe1K0l/xu0F/a2cKKEMxBDwEvMn3jhkvumECQQDhxKMHavo+nDAc
+YNrwE2VxWYhZApGVzsGzO8tgQ95IN/BlmYptGQPyssNNItWvbfF6EjB0rTwcMWF2
+hCEoeg2bAkEA0Rjws4kGaP9jwOi7lEOKIrutv5Dfb6euioyvhDD/YxXt7YCijVwG
+ATZLkVEiL8G0E5tvkMR7O4ho6hHft5V3AwJBAK9LIx4OVNCqKrzOAxAmrzwMPU6H
+LQy5JTKJ+cX7zCocrN3mElHU+3jEjdllc66rWbPjTZY6L5LgUIFZ4/juk4MCQQCM
+4x8b+VHGYX5XNvlc9v0WVhrGHtlOJE+orw58JX+OxfHgu3HLiZvKKUlVirNcNkod
+g/fyNVFLVahLPuvciOr9AkEA1gzbg9q7kxKlFLlOYtowbLbMS/u8BUsaQJv1g05A
+Yua6Wg8D4gr3/aNKQhLLXe7fHCAPs61n/KyD2aat8I2xBQ==
+-----END RSA PRIVATE KEY-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, L=Derby, O=Mosquitto Project, OU=Testing, CN=Root CA
+        Validity
+            Not Before: Mar  1 18:53:36 2018 GMT
+            Not After : Feb 28 18:53:36 2023 GMT
+        Subject: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:af:ad:b0:e4:78:b8:73:01:6a:9e:78:1e:bf:36:
+                    5b:60:dc:ee:28:ce:16:3c:73:30:b3:02:cd:5c:07:
+                    a2:36:ee:a1:c5:43:32:0c:46:57:cb:fb:1c:52:db:
+                    4e:65:85:8a:5d:a6:cd:66:43:ad:bc:70:1b:e6:b0:
+                    11:0f:d8:54:1f:57:9e:29:4e:2b:1b:c5:70:b2:3d:
+                    38:a7:63:3f:1a:06:2f:6d:09:2c:7c:90:60:db:8c:
+                    3a:11:20:a7:db:20:25:d9:c6:97:74:50:5a:e0:fd:
+                    81:aa:de:ea:1d:e5:be:61:59:0d:76:e5:ab:7f:3b:
+                    b2:a6:38:b9:bb:32:aa:72:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+            X509v3 Authority Key Identifier: 
+                keyid:1C:B4:4E:8B:84:0D:1E:0F:C4:CC:F4:17:87:DB:CA:F2:55:F1:34:39
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         6c:2d:41:ca:7b:89:84:27:ca:b3:64:d5:73:b2:5b:dd:fc:6f:
+         d4:68:ae:f1:30:3e:9e:ca:28:2b:d3:2e:0c:61:3e:d5:9a:fd:
+         67:b1:60:e5:54:9f:a4:95:51:5b:00:2d:f9:46:82:de:49:df:
+         ce:2a:f3:f6:2e:8f:8f:64:2b:c9:2f:ce:ff:d2:53:a0:0a:c4:
+         4a:e9:20:fa:5e:79:45:21:18:c2:d6:c1:64:92:e4:67:3a:92:
+         04:46:5e:6a:39:84:c8:f1:0e:42:3c:fd:b2:c2:7b:e9:af:44:
+         2c:19:30:61:01:39:47:6d:38:85:90:4b:e5:04:f4:87:72:46:
+         4a:9a
+-----BEGIN CERTIFICATE-----
+MIICnTCCAgagAwIBAgIBATANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEOMAwGA1UEBwwFRGVyYnkxGjAYBgNVBAoMEU1v
+c3F1aXR0byBQcm9qZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRAwDgYDVQQDDAdSb290
+IENBMB4XDTE4MDMwMTE4NTMzNloXDTIzMDIyODE4NTMzNlowZTELMAkGA1UEBhMC
+R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxGjAYBgNVBAoMEU1vc3F1aXR0byBQcm9q
+ZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRMwEQYDVQQDDApTaWduaW5nIENBMIGfMA0G
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvrbDkeLhzAWqeeB6/Nltg3O4ozhY8czCz
+As1cB6I27qHFQzIMRlfL+xxS205lhYpdps1mQ628cBvmsBEP2FQfV54pTisbxXCy
+PTinYz8aBi9tCSx8kGDbjDoRIKfbICXZxpd0UFrg/YGq3uod5b5hWQ125at/O7Km
+OLm7Mqpy7wIDAQABo1AwTjAdBgNVHQ4EFgQUnlQ+5S/l6kBK/DeWbEW7GnkOyqsw
+HwYDVR0jBBgwFoAUHLROi4QNHg/EzPQXh9vK8lXxNDkwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQsFAAOBgQBsLUHKe4mEJ8qzZNVzslvd/G/UaK7xMD6eyigr0y4M
+YT7Vmv1nsWDlVJ+klVFbAC35RoLeSd/OKvP2Lo+PZCvJL87/0lOgCsRK6SD6XnlF
+IRjC1sFkkuRnOpIERl5qOYTI8Q5CPP2ywnvpr0QsGTBhATlHbTiFkEvlBPSHckZK
+mg==
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICtDCCAh2gAwIBAgIJAObVjC0tPL4iMA0GCSqGSIb3DQEBCwUAMHIxCzAJBgNV
+BAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJieTEaMBgG
+A1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3RpbmcxEDAOBgNV
+BAMMB1Jvb3QgQ0EwIBcNMTgwMzAxMTg1MzM2WhgPMjEwMDA0MjAxODUzMzZaMHIx
+CzAJBgNVBAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJi
+eTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3Rpbmcx
+EDAOBgNVBAMMB1Jvb3QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANSZ
+3aRYdHcnta24XXJGfomsg2OpYys3KkqK76aWEwhqRvdH2m54yBvHTZ2LsMLQro0q
+r4oGLyvlupC9fxwQF4ZDFHrn7VbxU947V+cipGkRaECXiGVO1ngUSpKti8nrIUkn
+FXkLmVaGuVv1jVOGBi6/6f3ct6LsNyFqXzaSw9DtAgMBAAGjUDBOMB0GA1UdDgQW
+BBQctE6LhA0eD8TM9BeH28ryVfE0OTAfBgNVHSMEGDAWgBQctE6LhA0eD8TM9BeH
+28ryVfE0OTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBAHVShEeqQRjP
+IoMU8MFnnC1ZadADvSn1E6gRR7eoNU0MeMpTYmTA+TIklEzhaRHSkQqyPHAe/YMl
+WLmq1NqyxPv9uKekVlatJxYbm1ME4e+wGs3U9OGsIKX0nFcBO8iqpj5s7GZmSYyY
+u1YJnq1oe0C5IblVB9amcoB743/YyMme
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/crl.pem b/mqtt/src/test/ssl/crl.pem
new file mode 100644
index 00000000..228cd0a8
--- /dev/null
+++ b/mqtt/src/test/ssl/crl.pem
@@ -0,0 +1,10 @@
+-----BEGIN X509 CRL-----
+MIIBUzCBvQIBATANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJHQjETMBEGA1UE
+CAwKRGVyYnlzaGlyZTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNV
+BAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EXDTE4MDMwMTE4NTM1M1oX
+DTE4MDMzMTE4NTM1M1owFDASAgEEFw0xODAzMDExODUzNTNaoA4wDDAKBgNVHRQE
+AwIBATANBgkqhkiG9w0BAQsFAAOBgQBsUN/A26sGOL0rL7IOq2LoJ7bi4jfD+wjk
+M+UkOn9Q7dvJFkXmyqFUYj8DQCDrSNB20X0O76sW1KHkoJp3Xf2zwKQUXY6oqhtW
+nEOoB0ELViIo02VeboVoPIHSxt7nYEopAoVoqVMqUkVYugge9EVF/c++SMNvzy+L
+I7L8YKQ8/g==
+-----END X509 CRL-----
diff --git a/mqtt/src/test/ssl/gen.sh b/mqtt/src/test/ssl/gen.sh
new file mode 100755
index 00000000..60bce2f5
--- /dev/null
+++ b/mqtt/src/test/ssl/gen.sh
@@ -0,0 +1,72 @@
+# This file generates the keys and certificates used for testing mosquitto.
+# None of the keys are encrypted, so do not just use this script to generate
+# files for your own use.
+
+rm -f *.crt *.key *.csr
+for a in root signing; do
+	rm -rf ${a}CA/
+	mkdir -p ${a}CA/newcerts
+	touch ${a}CA/index.txt
+	echo 01 > ${a}CA/serial
+	echo 01 > ${a}CA/crlnumber
+done
+rm -rf certs
+
+BASESUBJ="/C=GB/ST=Derbyshire/L=Derby/O=Mosquitto Project/OU=Testing"
+SBASESUBJ="/C=GB/ST=Nottinghamshire/L=Nottingham/O=Server/OU=Production"
+BBASESUBJ="/C=GB/ST=Nottinghamshire/L=Nottingham/O=Server/OU=Bridge"
+
+# The root CA
+openssl genrsa -out test-root-ca.key 1024
+openssl req -new -x509 -days 30000 -key test-root-ca.key -out test-root-ca.crt -config openssl.cnf -subj "${BASESUBJ}/CN=Root CA/"
+
+# Another root CA that doesn't sign anything
+openssl genrsa -out test-bad-root-ca.key 1024
+openssl req -new -x509 -days 30000 -key test-bad-root-ca.key -out test-bad-root-ca.crt -config openssl.cnf -subj "${BASESUBJ}/CN=Bad Root CA/"
+
+# This is a root CA that has the exact same details as the real root CA, but is a different key and certificate. Effectively a "fake" CA.
+openssl genrsa -out test-fake-root-ca.key 1024
+openssl req -new -x509 -days 30000 -key test-fake-root-ca.key -out test-fake-root-ca.crt -config openssl.cnf -subj "${BASESUBJ}/CN=Root CA/"
+
+# An intermediate CA, signed by the root CA, used to sign server/client csrs.
+openssl genrsa -out test-signing-ca.key 1024
+openssl req -out test-signing-ca.csr -key test-signing-ca.key -new -config openssl.cnf -subj "${BASESUBJ}/CN=Signing CA/"
+openssl ca -config openssl.cnf -name CA_root -extensions v3_ca -out test-signing-ca.crt -infiles test-signing-ca.csr
+
+# An alternative intermediate CA, signed by the root CA, not used to sign anything.
+openssl genrsa -out test-alt-ca.key 1024
+openssl req -out test-alt-ca.csr -key test-alt-ca.key -new -config openssl.cnf -subj "${BASESUBJ}/CN=Alternative Signing CA/"
+openssl ca -config openssl.cnf -name CA_root -extensions v3_ca -out test-alt-ca.crt -infiles test-alt-ca.csr
+
+# Valid server key and certificate.
+openssl genrsa -out server.key 1024
+openssl req -new -key server.key -out server.csr -config openssl.cnf -subj "${SBASESUBJ}/CN=localhost/"
+openssl ca -config openssl.cnf -name CA_signing -out server.crt -infiles server.csr 
+
+# Expired server certificate, based on the above server key.
+openssl req -new -days 1 -key server.key -out server-expired.csr -config openssl.cnf -subj "${SBASESUBJ}/CN=localhost/"
+openssl ca -config openssl.cnf -name CA_signing -days 1 -startdate 120820000000Z -enddate 120821000000Z -out server-expired.crt -infiles server-expired.csr 
+
+# Valid client key and certificate.
+openssl genrsa -out client.key 1024
+openssl req -new -key client.key -out client.csr -config openssl.cnf -subj "${SBASESUBJ}/CN=test client/"
+openssl ca -config openssl.cnf -name CA_signing -out client.crt -infiles client.csr 
+
+# Expired client certificate, based on the above client key.
+openssl req -new -days 1 -key client.key -out client-expired.csr -config openssl.cnf -subj "${SBASESUBJ}/CN=test client expired/"
+openssl ca -config openssl.cnf -name CA_signing -days 1 -startdate 120820000000Z -enddate 120821000000Z -out client-expired.crt -infiles client-expired.csr 
+
+# Revoked client certificate, based on a new client key.
+openssl genrsa -out client-revoked.key 1024
+openssl req -new -days 1 -key client-revoked.key -out client-revoked.csr -config openssl.cnf -subj "${SBASESUBJ}/CN=test client revoked/"
+openssl ca -config openssl.cnf -name CA_signing -out client-revoked.crt -infiles client-revoked.csr 
+openssl ca -config openssl.cnf -name CA_signing -revoke client-revoked.crt
+openssl ca -config openssl.cnf -name CA_signing -gencrl -out crl.pem
+
+cat test-signing-ca.crt test-root-ca.crt > all-ca.crt
+
+cat client.crt client.key all-ca.crt > client.pem
+#mkdir certs
+#cp test-signing-ca.crt certs/test-signing-ca.pem
+#cp test-root-ca.crt certs/test-root.ca.pem
+c_rehash certs
diff --git a/mqtt/src/test/ssl/openssl.cnf b/mqtt/src/test/ssl/openssl.cnf
new file mode 100644
index 00000000..e0cff18f
--- /dev/null
+++ b/mqtt/src/test/ssl/openssl.cnf
@@ -0,0 +1,406 @@
+#
+# OpenSSL example configuration file.
+# This is mostly being used for generation of certificate requests.
+#
+
+# This definition stops the following lines choking if HOME isn't
+# defined.
+HOME			= .
+RANDFILE		= $ENV::HOME/.rnd
+
+# Extra OBJECT IDENTIFIER info:
+#oid_file		= $ENV::HOME/.oid
+oid_section		= new_oids
+
+# To use this configuration file with the "-extfile" option of the
+# "openssl x509" utility, name here the section containing the
+# X.509v3 extensions to use:
+# extensions		= 
+# (Alternatively, use a configuration file that has only
+# X.509v3 extensions in its main [= default] section.)
+
+[ new_oids ]
+
+# We can add new OIDs in here for use by 'ca', 'req' and 'ts'.
+# Add a simple OID like this:
+# testoid1=1.2.3.4
+# Or use config file substitution like this:
+# testoid2=${testoid1}.5.6
+
+# Policies used by the TSA examples.
+tsa_policy1 = 1.2.3.4.1
+tsa_policy2 = 1.2.3.4.5.6
+tsa_policy3 = 1.2.3.4.5.7
+
+####################################################################
+[ ca ]
+default_ca	= CA_default		# The default ca section
+
+####################################################################
+[ CA_signing ]
+
+dir		= ./signingCA		# Where everything is kept
+certs		= $dir/certs		# Where the issued certs are kept
+crl_dir		= $dir/crl		# Where the issued crl are kept
+database	= $dir/index.txt	# database index file.
+#unique_subject	= no			# Set to 'no' to allow creation of
+					# several ctificates with same subject.
+new_certs_dir	= $dir/newcerts		# default place for new certs.
+
+certificate	= test-signing-ca.crt 	# The CA certificate
+serial		= $dir/serial 		# The current serial number
+crlnumber	= $dir/crlnumber	# the current crl number
+					# must be commented out to leave a V1 CRL
+crl		= $dir/crl.pem 		# The current CRL
+private_key	= test-signing-ca.key # The private key
+RANDFILE	= $dir/.rand	# private random number file
+
+x509_extensions	= usr_cert		# The extentions to add to the cert
+
+# Comment out the following two lines for the "traditional"
+# (and highly broken) format.
+name_opt 	= ca_default		# Subject Name options
+cert_opt 	= ca_default		# Certificate field options
+
+# Extension copying option: use with caution.
+# copy_extensions = copy
+
+# Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
+# so this is commented out by default to leave a V1 CRL.
+# crlnumber must also be commented out to leave a V1 CRL.
+# crl_extensions	= crl_ext
+
+default_days	= 1825			# how long to certify for
+default_crl_days= 30			# how long before next CRL
+default_md	= default		# use public key default MD
+preserve	= no			# keep passed DN ordering
+
+# A few difference way of specifying how similar the request should look
+# For type CA, the listed attributes must be the same, and the optional
+# and supplied fields are just that :-)
+policy		= policy_anything
+
+[ CA_inter ]
+dir = ./interCA
+certs = $dir/certs
+crl_dir = $dir/crl
+database = $dir/index.txt
+new_certs_dir = $dir/newcerts
+
+certificate = test-inter-ca.crt
+serial = $dir/serial
+crlnumber = $dir/crlnumber
+crl = $dir/crl.pem
+private_key = test-inter-ca.key
+RANDFILE = $dir/.rand
+
+#x509_extensions = v3_ca
+x509_extensions = usr_cert
+
+name_opt = ca_default
+cert_opt = ca_default
+
+default_days = 1825
+default_crl_days = 30
+default_md = default
+preserve = no
+
+policy = policy_match
+unique_subject = yes
+
+[ CA_root ]
+dir = ./rootCA
+certs = $dir/certs
+crl_dir = $dir/crl
+database = $dir/index.txt
+new_certs_dir = $dir/newcerts
+
+certificate = test-root-ca.crt
+serial = $dir/serial
+crlnumber = $dir/crlnumber
+crl = $dir/crl.pem
+private_key = test-root-ca.key
+RANDFILE = $dir/.rand
+
+x509_extensions = v3_ca
+
+name_opt = ca_default
+cert_opt = ca_default
+
+default_days = 1825
+default_crl_days = 30
+default_md = default
+preserve = no
+
+policy = policy_match
+unique_subject = yes
+
+# For the CA policy
+[ policy_match ]
+countryName		= match
+stateOrProvinceName	= match
+organizationName	= match
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+
+# For the 'anything' policy
+# At this point in time, you must list all acceptable 'object'
+# types.
+[ policy_anything ]
+countryName		= optional
+stateOrProvinceName	= optional
+localityName		= optional
+organizationName	= optional
+organizationalUnitName	= optional
+commonName		= supplied
+emailAddress		= optional
+
+####################################################################
+[ req ]
+default_bits		= 2048
+default_keyfile 	= privkey.pem
+distinguished_name	= req_distinguished_name
+attributes		= req_attributes
+x509_extensions	= v3_ca	# The extentions to add to the self signed cert
+
+# Passwords for private keys if not present they will be prompted for
+# input_password = secret
+# output_password = secret
+
+# This sets a mask for permitted string types. There are several options. 
+# default: PrintableString, T61String, BMPString.
+# pkix	 : PrintableString, BMPString (PKIX recommendation before 2004)
+# utf8only: only UTF8Strings (PKIX recommendation after 2004).
+# nombstr : PrintableString, T61String (no BMPStrings or UTF8Strings).
+# MASK:XXXX a literal mask value.
+# WARNING: ancient versions of Netscape crash on BMPStrings or UTF8Strings.
+string_mask = utf8only
+
+# req_extensions = v3_req # The extensions to add to a certificate request
+
+[ req_distinguished_name ]
+countryName			= Country Name (2 letter code)
+countryName_default		= GB
+countryName_min			= 2
+countryName_max			= 2
+
+stateOrProvinceName		= State or Province Name (full name)
+stateOrProvinceName_default	= Derbyshire
+
+localityName			= Locality Name (eg, city)
+localityName_default	= Derby
+
+0.organizationName		= Organization Name (eg, company)
+0.organizationName_default	= Mosquitto Project
+
+# we can do this but it is not needed normally :-)
+#1.organizationName		= Second Organization Name (eg, company)
+#1.organizationName_default	= World Wide Web Pty Ltd
+
+organizationalUnitName		= Organizational Unit Name (eg, section)
+organizationalUnitName_default	= Testing
+
+commonName			= Common Name (e.g. server FQDN or YOUR name)
+commonName_max			= 64
+
+emailAddress			= Email Address
+emailAddress_max		= 64
+
+# SET-ex3			= SET extension number 3
+
+[ req_attributes ]
+challengePassword		= A challenge password
+challengePassword_min		= 4
+challengePassword_max		= 20
+
+unstructuredName		= An optional company name
+
+[ usr_cert ]
+
+# These extensions are added when 'ca' signs a request.
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType			= server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment			= "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+# This is required for TSA certificates.
+# extendedKeyUsage = critical,timeStamping
+
+[ v3_req ]
+
+# Extensions to add to a certificate request
+
+basicConstraints = CA:FALSE
+keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+[ v3_ca ]
+
+
+# Extensions for a typical CA
+
+
+# PKIX recommendation.
+
+subjectKeyIdentifier=hash
+
+authorityKeyIdentifier=keyid:always,issuer
+
+# This is what PKIX recommends but some broken software chokes on critical
+# extensions.
+#basicConstraints = critical,CA:true
+# So we do this instead.
+basicConstraints = CA:true
+
+# Key usage: this is typical for a CA certificate. However since it will
+# prevent it being used as an test self-signed certificate it is best
+# left out by default.
+# keyUsage = cRLSign, keyCertSign
+
+# Some might want this also
+# nsCertType = sslCA, emailCA
+
+# Include email address in subject alt name: another PKIX recommendation
+# subjectAltName=email:copy
+# Copy issuer details
+# issuerAltName=issuer:copy
+
+# DER hex encoding of an extension: beware experts only!
+# obj=DER:02:03
+# Where 'obj' is a standard or added object
+# You can even override a supported extension:
+# basicConstraints= critical, DER:30:03:01:01:FF
+
+[ crl_ext ]
+
+# CRL extensions.
+# Only issuerAltName and authorityKeyIdentifier make any sense in a CRL.
+
+# issuerAltName=issuer:copy
+authorityKeyIdentifier=keyid:always
+
+[ proxy_cert_ext ]
+# These extensions should be added when creating a proxy certificate
+
+# This goes against PKIX guidelines but some CAs do it and some software
+# requires this to avoid interpreting an end user certificate as a CA.
+
+basicConstraints=CA:FALSE
+
+# Here are some examples of the usage of nsCertType. If it is omitted
+# the certificate can be used for anything *except* object signing.
+
+# This is OK for an SSL server.
+# nsCertType			= server
+
+# For an object signing certificate this would be used.
+# nsCertType = objsign
+
+# For normal client use this is typical
+# nsCertType = client, email
+
+# and for everything including object signing:
+# nsCertType = client, email, objsign
+
+# This is typical in keyUsage for a client certificate.
+# keyUsage = nonRepudiation, digitalSignature, keyEncipherment
+
+# This will be displayed in Netscape's comment listbox.
+nsComment			= "OpenSSL Generated Certificate"
+
+# PKIX recommendations harmless if included in all certificates.
+subjectKeyIdentifier=hash
+authorityKeyIdentifier=keyid,issuer
+
+# This stuff is for subjectAltName and issuerAltname.
+# Import the email address.
+# subjectAltName=email:copy
+# An alternative to produce certificates that aren't
+# deprecated according to PKIX.
+# subjectAltName=email:move
+
+# Copy subject details
+# issuerAltName=issuer:copy
+
+#nsCaRevocationUrl		= http://www.domain.dom/ca-crl.pem
+#nsBaseUrl
+#nsRevocationUrl
+#nsRenewalUrl
+#nsCaPolicyUrl
+#nsSslServerName
+
+# This really needs to be in place for it to be a proxy certificate.
+proxyCertInfo=critical,language:id-ppl-anyLanguage,pathlen:3,policy:foo
+
+####################################################################
+[ tsa ]
+
+default_tsa = tsa_config1	# the default TSA section
+
+[ tsa_config1 ]
+
+# These are used by the TSA reply generation only.
+dir		= ./demoCA		# TSA root directory
+serial		= $dir/tsaserial	# The current serial number (mandatory)
+crypto_device	= builtin		# OpenSSL engine to use for signing
+signer_cert	= $dir/tsacert.pem 	# The TSA signing certificate
+					# (optional)
+certs		= $dir/cacert.pem	# Certificate chain to include in reply
+					# (optional)
+signer_key	= $dir/private/tsakey.pem # The TSA private key (optional)
+
+default_policy	= tsa_policy1		# Policy if request did not specify it
+					# (optional)
+other_policies	= tsa_policy2, tsa_policy3	# acceptable policies (optional)
+digests		= md5, sha1		# Acceptable message digests (mandatory)
+accuracy	= secs:1, millisecs:500, microsecs:100	# (optional)
+clock_precision_digits  = 0	# number of digits after dot. (optional)
+ordering		= yes	# Is ordering defined for timestamps?
+				# (optional, default: no)
+tsa_name		= yes	# Must the TSA name be included in the reply?
+				# (optional, default: no)
+ess_cert_id_chain	= no	# Must the ESS cert id chain be included?
+				# (optional, default: no)
diff --git a/mqtt/src/test/ssl/rootCA/crlnumber b/mqtt/src/test/ssl/rootCA/crlnumber
new file mode 100644
index 00000000..8a0f05e1
--- /dev/null
+++ b/mqtt/src/test/ssl/rootCA/crlnumber
@@ -0,0 +1 @@
+01
diff --git a/mqtt/src/test/ssl/rootCA/index.txt b/mqtt/src/test/ssl/rootCA/index.txt
new file mode 100644
index 00000000..7104f16a
--- /dev/null
+++ b/mqtt/src/test/ssl/rootCA/index.txt
@@ -0,0 +1,2 @@
+V	230228185336Z		01	unknown	/C=GB/ST=Derbyshire/O=Mosquitto Project/OU=Testing/CN=Signing CA
+V	230228185342Z		02	unknown	/C=GB/ST=Derbyshire/O=Mosquitto Project/OU=Testing/CN=Alternative Signing CA
diff --git a/mqtt/src/test/ssl/rootCA/index.txt.attr b/mqtt/src/test/ssl/rootCA/index.txt.attr
new file mode 100644
index 00000000..8f7e63a3
--- /dev/null
+++ b/mqtt/src/test/ssl/rootCA/index.txt.attr
@@ -0,0 +1 @@
+unique_subject = yes
diff --git a/mqtt/src/test/ssl/rootCA/index.txt.attr.old b/mqtt/src/test/ssl/rootCA/index.txt.attr.old
new file mode 100644
index 00000000..8f7e63a3
--- /dev/null
+++ b/mqtt/src/test/ssl/rootCA/index.txt.attr.old
@@ -0,0 +1 @@
+unique_subject = yes
diff --git a/mqtt/src/test/ssl/rootCA/index.txt.old b/mqtt/src/test/ssl/rootCA/index.txt.old
new file mode 100644
index 00000000..93a2fa84
--- /dev/null
+++ b/mqtt/src/test/ssl/rootCA/index.txt.old
@@ -0,0 +1 @@
+V	230228185336Z		01	unknown	/C=GB/ST=Derbyshire/O=Mosquitto Project/OU=Testing/CN=Signing CA
diff --git a/mqtt/src/test/ssl/rootCA/newcerts/01.pem b/mqtt/src/test/ssl/rootCA/newcerts/01.pem
new file mode 100644
index 00000000..ef58024a
--- /dev/null
+++ b/mqtt/src/test/ssl/rootCA/newcerts/01.pem
@@ -0,0 +1,58 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, L=Derby, O=Mosquitto Project, OU=Testing, CN=Root CA
+        Validity
+            Not Before: Mar  1 18:53:36 2018 GMT
+            Not After : Feb 28 18:53:36 2023 GMT
+        Subject: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:af:ad:b0:e4:78:b8:73:01:6a:9e:78:1e:bf:36:
+                    5b:60:dc:ee:28:ce:16:3c:73:30:b3:02:cd:5c:07:
+                    a2:36:ee:a1:c5:43:32:0c:46:57:cb:fb:1c:52:db:
+                    4e:65:85:8a:5d:a6:cd:66:43:ad:bc:70:1b:e6:b0:
+                    11:0f:d8:54:1f:57:9e:29:4e:2b:1b:c5:70:b2:3d:
+                    38:a7:63:3f:1a:06:2f:6d:09:2c:7c:90:60:db:8c:
+                    3a:11:20:a7:db:20:25:d9:c6:97:74:50:5a:e0:fd:
+                    81:aa:de:ea:1d:e5:be:61:59:0d:76:e5:ab:7f:3b:
+                    b2:a6:38:b9:bb:32:aa:72:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+            X509v3 Authority Key Identifier: 
+                keyid:1C:B4:4E:8B:84:0D:1E:0F:C4:CC:F4:17:87:DB:CA:F2:55:F1:34:39
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         6c:2d:41:ca:7b:89:84:27:ca:b3:64:d5:73:b2:5b:dd:fc:6f:
+         d4:68:ae:f1:30:3e:9e:ca:28:2b:d3:2e:0c:61:3e:d5:9a:fd:
+         67:b1:60:e5:54:9f:a4:95:51:5b:00:2d:f9:46:82:de:49:df:
+         ce:2a:f3:f6:2e:8f:8f:64:2b:c9:2f:ce:ff:d2:53:a0:0a:c4:
+         4a:e9:20:fa:5e:79:45:21:18:c2:d6:c1:64:92:e4:67:3a:92:
+         04:46:5e:6a:39:84:c8:f1:0e:42:3c:fd:b2:c2:7b:e9:af:44:
+         2c:19:30:61:01:39:47:6d:38:85:90:4b:e5:04:f4:87:72:46:
+         4a:9a
+-----BEGIN CERTIFICATE-----
+MIICnTCCAgagAwIBAgIBATANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEOMAwGA1UEBwwFRGVyYnkxGjAYBgNVBAoMEU1v
+c3F1aXR0byBQcm9qZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRAwDgYDVQQDDAdSb290
+IENBMB4XDTE4MDMwMTE4NTMzNloXDTIzMDIyODE4NTMzNlowZTELMAkGA1UEBhMC
+R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxGjAYBgNVBAoMEU1vc3F1aXR0byBQcm9q
+ZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRMwEQYDVQQDDApTaWduaW5nIENBMIGfMA0G
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvrbDkeLhzAWqeeB6/Nltg3O4ozhY8czCz
+As1cB6I27qHFQzIMRlfL+xxS205lhYpdps1mQ628cBvmsBEP2FQfV54pTisbxXCy
+PTinYz8aBi9tCSx8kGDbjDoRIKfbICXZxpd0UFrg/YGq3uod5b5hWQ125at/O7Km
+OLm7Mqpy7wIDAQABo1AwTjAdBgNVHQ4EFgQUnlQ+5S/l6kBK/DeWbEW7GnkOyqsw
+HwYDVR0jBBgwFoAUHLROi4QNHg/EzPQXh9vK8lXxNDkwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQsFAAOBgQBsLUHKe4mEJ8qzZNVzslvd/G/UaK7xMD6eyigr0y4M
+YT7Vmv1nsWDlVJ+klVFbAC35RoLeSd/OKvP2Lo+PZCvJL87/0lOgCsRK6SD6XnlF
+IRjC1sFkkuRnOpIERl5qOYTI8Q5CPP2ywnvpr0QsGTBhATlHbTiFkEvlBPSHckZK
+mg==
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/rootCA/newcerts/02.pem b/mqtt/src/test/ssl/rootCA/newcerts/02.pem
new file mode 100644
index 00000000..8e706cfa
--- /dev/null
+++ b/mqtt/src/test/ssl/rootCA/newcerts/02.pem
@@ -0,0 +1,58 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, L=Derby, O=Mosquitto Project, OU=Testing, CN=Root CA
+        Validity
+            Not Before: Mar  1 18:53:42 2018 GMT
+            Not After : Feb 28 18:53:42 2023 GMT
+        Subject: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Alternative Signing CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:bd:8b:92:ed:6a:d6:b7:73:88:e7:fa:80:bd:bc:
+                    ee:fb:6a:47:f4:36:4e:48:ab:88:8a:a6:66:98:84:
+                    6a:4c:a8:88:5f:cc:26:98:81:fe:8b:22:c4:c0:91:
+                    70:74:72:22:48:1d:e1:b8:44:71:23:74:17:59:bc:
+                    a6:51:18:97:4c:6d:50:8c:0a:c5:33:cc:28:2a:cf:
+                    78:04:a2:20:75:72:29:4a:46:7b:c7:46:a5:f5:5e:
+                    ec:6f:53:bc:d7:ad:b5:29:dd:22:24:4e:b7:88:e2:
+                    94:58:04:fe:6d:04:13:8d:c8:72:d0:74:2a:ef:18:
+                    87:6d:cf:ce:6e:4a:08:73:c3
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                78:CC:8C:66:81:0F:8F:DA:56:5C:39:A2:30:C2:28:9E:53:A6:87:CA
+            X509v3 Authority Key Identifier: 
+                keyid:1C:B4:4E:8B:84:0D:1E:0F:C4:CC:F4:17:87:DB:CA:F2:55:F1:34:39
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         27:3c:17:44:29:8f:17:a7:c0:b7:81:eb:76:ca:53:85:9a:ad:
+         31:68:85:95:69:d6:ab:02:75:a8:ac:71:6f:4d:20:23:6d:5c:
+         09:1d:0a:85:f4:e6:6f:6e:1e:c1:1f:34:1e:87:6e:d3:b9:e0:
+         b2:2f:08:82:fb:4b:28:36:a9:68:54:18:9b:16:6a:f2:ab:ae:
+         bd:7a:40:d2:a7:64:46:4c:f5:cb:15:07:02:7b:3f:44:5e:e1:
+         35:83:99:3f:46:7d:99:76:d2:89:3c:9f:a6:70:13:dd:8e:bd:
+         d2:b1:51:ec:9c:db:2e:f4:fd:f7:1d:de:2c:27:f3:55:9b:81:
+         07:81
+-----BEGIN CERTIFICATE-----
+MIICqTCCAhKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEOMAwGA1UEBwwFRGVyYnkxGjAYBgNVBAoMEU1v
+c3F1aXR0byBQcm9qZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRAwDgYDVQQDDAdSb290
+IENBMB4XDTE4MDMwMTE4NTM0MloXDTIzMDIyODE4NTM0MlowcTELMAkGA1UEBhMC
+R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxGjAYBgNVBAoMEU1vc3F1aXR0byBQcm9q
+ZWN0MRAwDgYDVQQLDAdUZXN0aW5nMR8wHQYDVQQDDBZBbHRlcm5hdGl2ZSBTaWdu
+aW5nIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9i5Ltata3c4jn+oC9
+vO77akf0Nk5Iq4iKpmaYhGpMqIhfzCaYgf6LIsTAkXB0ciJIHeG4RHEjdBdZvKZR
+GJdMbVCMCsUzzCgqz3gEoiB1cilKRnvHRqX1XuxvU7zXrbUp3SIkTreI4pRYBP5t
+BBONyHLQdCrvGIdtz85uSghzwwIDAQABo1AwTjAdBgNVHQ4EFgQUeMyMZoEPj9pW
+XDmiMMIonlOmh8owHwYDVR0jBBgwFoAUHLROi4QNHg/EzPQXh9vK8lXxNDkwDAYD
+VR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQAnPBdEKY8Xp8C3get2ylOFmq0x
+aIWVadarAnWorHFvTSAjbVwJHQqF9OZvbh7BHzQeh27TueCyLwiC+0soNqloVBib
+Fmryq669ekDSp2RGTPXLFQcCez9EXuE1g5k/Rn2ZdtKJPJ+mcBPdjr3SsVHsnNsu
+9P33Hd4sJ/NVm4EHgQ==
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/rootCA/serial b/mqtt/src/test/ssl/rootCA/serial
new file mode 100644
index 00000000..75016ea3
--- /dev/null
+++ b/mqtt/src/test/ssl/rootCA/serial
@@ -0,0 +1 @@
+03
diff --git a/mqtt/src/test/ssl/rootCA/serial.old b/mqtt/src/test/ssl/rootCA/serial.old
new file mode 100644
index 00000000..9e22bcb8
--- /dev/null
+++ b/mqtt/src/test/ssl/rootCA/serial.old
@@ -0,0 +1 @@
+02
diff --git a/mqtt/src/test/ssl/server-expired.crt b/mqtt/src/test/ssl/server-expired.crt
new file mode 100644
index 00000000..e69de29b
diff --git a/mqtt/src/test/ssl/server-expired.csr b/mqtt/src/test/ssl/server-expired.csr
new file mode 100644
index 00000000..7651a6a7
--- /dev/null
+++ b/mqtt/src/test/ssl/server-expired.csr
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBtjCCAR8CAQAwdjELMAkGA1UEBhMCR0IxGDAWBgNVBAgMD05vdHRpbmdoYW1z
+aGlyZTETMBEGA1UEBwwKTm90dGluZ2hhbTEPMA0GA1UECgwGU2VydmVyMRMwEQYD
+VQQLDApQcm9kdWN0aW9uMRIwEAYDVQQDDAlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcN
+AQEBBQADgY0AMIGJAoGBAMkY4WrERVgOt2U6uG/fCthdGKpACNbVefrKeWuezlWF
+ydVPu39agcg8Xartf0iHwvFMYgDDjZqjwnclxnDM79GPF30bw6tmPpDwROOFi3eG
+IbLdCyztoBagFmNJubuQRUTx9x6tVxxFogiZEwXjE3bv883zOiFzIXUKLVjiCjo9
+AgMBAAGgADANBgkqhkiG9w0BAQsFAAOBgQCyLfIr0Ze/Vo1eswPb5khaZh9A6B54
+NmhmdGNCBC4z+PNfFM1UX47ttnU9f/7bhhKT92W6QhO0COzf9UzTkW0rRJipCOeR
+vatPpPC8WNoH4YHEeTdGey6YYG4448b3+Los22H/BtZSbHqluztE2yNPFA7S50xO
+JP/+Qtt+I+Y8JA==
+-----END CERTIFICATE REQUEST-----
diff --git a/mqtt/src/test/ssl/server.crt b/mqtt/src/test/ssl/server.crt
new file mode 100644
index 00000000..b6009a77
--- /dev/null
+++ b/mqtt/src/test/ssl/server.crt
@@ -0,0 +1,60 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Mar  1 18:53:44 2018 GMT
+            Not After : Feb 28 18:53:44 2023 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=localhost
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:c9:18:e1:6a:c4:45:58:0e:b7:65:3a:b8:6f:df:
+                    0a:d8:5d:18:aa:40:08:d6:d5:79:fa:ca:79:6b:9e:
+                    ce:55:85:c9:d5:4f:bb:7f:5a:81:c8:3c:5d:aa:ed:
+                    7f:48:87:c2:f1:4c:62:00:c3:8d:9a:a3:c2:77:25:
+                    c6:70:cc:ef:d1:8f:17:7d:1b:c3:ab:66:3e:90:f0:
+                    44:e3:85:8b:77:86:21:b2:dd:0b:2c:ed:a0:16:a0:
+                    16:63:49:b9:bb:90:45:44:f1:f7:1e:ad:57:1c:45:
+                    a2:08:99:13:05:e3:13:76:ef:f3:cd:f3:3a:21:73:
+                    21:75:0a:2d:58:e2:0a:3a:3d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                7E:42:6C:12:CB:42:12:36:54:03:29:B6:D8:21:CA:E1:65:48:C5:67
+            X509v3 Authority Key Identifier: 
+                keyid:9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+
+    Signature Algorithm: sha256WithRSAEncryption
+         08:e1:a9:a0:e9:c4:1b:65:8d:b0:71:60:68:18:d8:af:49:8f:
+         0b:41:62:bb:f8:23:71:65:f2:c7:cf:59:23:63:48:fa:ba:26:
+         5f:2d:2e:4c:18:e4:f0:6e:cb:38:be:51:d0:e2:cc:76:ab:f6:
+         13:c2:49:68:e2:ef:da:86:a9:3d:80:29:9f:ee:33:be:cd:4c:
+         b2:4c:14:04:e3:46:46:46:ec:c1:4a:63:de:f3:5a:7b:0f:28:
+         a1:92:c8:96:07:b3:73:96:f4:9e:a0:bf:36:ea:f1:1a:8b:f7:
+         d5:ed:6c:e2:bf:cd:61:bc:a4:ca:ee:fa:75:af:ad:4c:54:4b:
+         af:18
+-----BEGIN CERTIFICATE-----
+MIICzDCCAjWgAwIBAgIBATANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3Qx
+EDAOBgNVBAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwHhcNMTgwMzAx
+MTg1MzQ0WhcNMjMwMjI4MTg1MzQ0WjB2MQswCQYDVQQGEwJHQjEYMBYGA1UECAwP
+Tm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHDApOb3R0aW5naGFtMQ8wDQYDVQQKDAZT
+ZXJ2ZXIxEzARBgNVBAsMClByb2R1Y3Rpb24xEjAQBgNVBAMMCWxvY2FsaG9zdDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyRjhasRFWA63ZTq4b98K2F0YqkAI
+1tV5+sp5a57OVYXJ1U+7f1qByDxdqu1/SIfC8UxiAMONmqPCdyXGcMzv0Y8XfRvD
+q2Y+kPBE44WLd4Yhst0LLO2gFqAWY0m5u5BFRPH3Hq1XHEWiCJkTBeMTdu/zzfM6
+IXMhdQotWOIKOj0CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYd
+T3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFH5CbBLLQhI2
+VAMpttghyuFlSMVnMB8GA1UdIwQYMBaAFJ5UPuUv5epASvw3lmxFuxp5DsqrMA0G
+CSqGSIb3DQEBCwUAA4GBAAjhqaDpxBtljbBxYGgY2K9JjwtBYrv4I3Fl8sfPWSNj
+SPq6Jl8tLkwY5PBuyzi+UdDizHar9hPCSWji79qGqT2AKZ/uM77NTLJMFATjRkZG
+7MFKY97zWnsPKKGSyJYHs3OW9J6gvzbq8RqL99XtbOK/zWG8pMru+nWvrUxUS68Y
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/server.csr b/mqtt/src/test/ssl/server.csr
new file mode 100644
index 00000000..7651a6a7
--- /dev/null
+++ b/mqtt/src/test/ssl/server.csr
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBtjCCAR8CAQAwdjELMAkGA1UEBhMCR0IxGDAWBgNVBAgMD05vdHRpbmdoYW1z
+aGlyZTETMBEGA1UEBwwKTm90dGluZ2hhbTEPMA0GA1UECgwGU2VydmVyMRMwEQYD
+VQQLDApQcm9kdWN0aW9uMRIwEAYDVQQDDAlsb2NhbGhvc3QwgZ8wDQYJKoZIhvcN
+AQEBBQADgY0AMIGJAoGBAMkY4WrERVgOt2U6uG/fCthdGKpACNbVefrKeWuezlWF
+ydVPu39agcg8Xartf0iHwvFMYgDDjZqjwnclxnDM79GPF30bw6tmPpDwROOFi3eG
+IbLdCyztoBagFmNJubuQRUTx9x6tVxxFogiZEwXjE3bv883zOiFzIXUKLVjiCjo9
+AgMBAAGgADANBgkqhkiG9w0BAQsFAAOBgQCyLfIr0Ze/Vo1eswPb5khaZh9A6B54
+NmhmdGNCBC4z+PNfFM1UX47ttnU9f/7bhhKT92W6QhO0COzf9UzTkW0rRJipCOeR
+vatPpPC8WNoH4YHEeTdGey6YYG4448b3+Los22H/BtZSbHqluztE2yNPFA7S50xO
+JP/+Qtt+I+Y8JA==
+-----END CERTIFICATE REQUEST-----
diff --git a/mqtt/src/test/ssl/server.key b/mqtt/src/test/ssl/server.key
new file mode 100644
index 00000000..3f242909
--- /dev/null
+++ b/mqtt/src/test/ssl/server.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQDJGOFqxEVYDrdlOrhv3wrYXRiqQAjW1Xn6ynlrns5VhcnVT7t/
+WoHIPF2q7X9Ih8LxTGIAw42ao8J3JcZwzO/Rjxd9G8OrZj6Q8ETjhYt3hiGy3Qss
+7aAWoBZjSbm7kEVE8fcerVccRaIImRMF4xN27/PN8zohcyF1Ci1Y4go6PQIDAQAB
+AoGAFXX0SIKdq+IWLFVx7W5uJ9z3juO6jcLGe78z6gpOls3qVjtmFRdBlm7qyB0E
+YmcqpLm0E8TKzeAAFtsPLGaSiSg+EDoK/ov0d79FZ2h/lDl1xJUpJC5Up7kzJz5M
+P9iEUN1I1BWMkXUl0pYQFlbTQk77s1l5abKyYOqEMzH7oHkCQQDndfRgtFELix94
+mxHOqK1cenWBs4wDmlCA1Z2mG9OBHM+rs/eHymRJ6D/mGuyhtnLIfcglevzrVdek
+ySuuur73AkEA3mrVFIu1Ku8LIrPljoNzFU1qMqZsAX2uxlltFJd1iaAGh20yL9kJ
+CEUtXGpbnpGcDAIzAHNCP3cmVLuYOGefawJACerL5bjUICJ93rUGNkyT4Pp+Pmhq
+/1yFRn/gmVVn4ohRfZHgcTkCwwfodPuCWAtxL5X0FWcHny22Z6EW9g2aUQJATDCo
+gXtCOkzcsaySbHlXCOsV//fGc9RL9KJZnX4sw1JQKkAbuwxL7ctUuJ2ueOlEXVC7
+i+HvxbHZLZl9kYTdtQJAc/9z7pgMk7OQoQo+1dJEbrZ0+t1jAc7mAF2FjzyQ4XUU
+on/k8gVN8Ruy52qfzKP2MqwjlEJ9HOhENmknjlazUA==
+-----END RSA PRIVATE KEY-----
diff --git a/mqtt/src/test/ssl/signingCA/crlnumber b/mqtt/src/test/ssl/signingCA/crlnumber
new file mode 100644
index 00000000..9e22bcb8
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/crlnumber
@@ -0,0 +1 @@
+02
diff --git a/mqtt/src/test/ssl/signingCA/crlnumber.old b/mqtt/src/test/ssl/signingCA/crlnumber.old
new file mode 100644
index 00000000..8a0f05e1
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/crlnumber.old
@@ -0,0 +1 @@
+01
diff --git a/mqtt/src/test/ssl/signingCA/index.txt b/mqtt/src/test/ssl/signingCA/index.txt
new file mode 100644
index 00000000..47aa8c2f
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/index.txt
@@ -0,0 +1,4 @@
+V	230228185344Z		01	unknown	/C=GB/ST=Nottinghamshire/L=Nottingham/O=Server/OU=Production/CN=localhost
+V	230228185347Z		02	unknown	/C=GB/ST=Nottinghamshire/L=Nottingham/O=Server/OU=Production/CN=test client
+V	120821000000Z		03	unknown	/C=GB/ST=Nottinghamshire/L=Nottingham/O=Server/OU=Production/CN=test client expired
+R	230228185351Z	180301185353Z	04	unknown	/C=GB/ST=Nottinghamshire/L=Nottingham/O=Server/OU=Production/CN=test client revoked
diff --git a/mqtt/src/test/ssl/signingCA/index.txt.attr b/mqtt/src/test/ssl/signingCA/index.txt.attr
new file mode 100644
index 00000000..8f7e63a3
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/index.txt.attr
@@ -0,0 +1 @@
+unique_subject = yes
diff --git a/mqtt/src/test/ssl/signingCA/index.txt.attr.old b/mqtt/src/test/ssl/signingCA/index.txt.attr.old
new file mode 100644
index 00000000..8f7e63a3
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/index.txt.attr.old
@@ -0,0 +1 @@
+unique_subject = yes
diff --git a/mqtt/src/test/ssl/signingCA/index.txt.old b/mqtt/src/test/ssl/signingCA/index.txt.old
new file mode 100644
index 00000000..e2b3fe18
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/index.txt.old
@@ -0,0 +1,4 @@
+V	230228185344Z		01	unknown	/C=GB/ST=Nottinghamshire/L=Nottingham/O=Server/OU=Production/CN=localhost
+V	230228185347Z		02	unknown	/C=GB/ST=Nottinghamshire/L=Nottingham/O=Server/OU=Production/CN=test client
+V	120821000000Z		03	unknown	/C=GB/ST=Nottinghamshire/L=Nottingham/O=Server/OU=Production/CN=test client expired
+V	230228185351Z		04	unknown	/C=GB/ST=Nottinghamshire/L=Nottingham/O=Server/OU=Production/CN=test client revoked
diff --git a/mqtt/src/test/ssl/signingCA/newcerts/01.pem b/mqtt/src/test/ssl/signingCA/newcerts/01.pem
new file mode 100644
index 00000000..b6009a77
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/newcerts/01.pem
@@ -0,0 +1,60 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Mar  1 18:53:44 2018 GMT
+            Not After : Feb 28 18:53:44 2023 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=localhost
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:c9:18:e1:6a:c4:45:58:0e:b7:65:3a:b8:6f:df:
+                    0a:d8:5d:18:aa:40:08:d6:d5:79:fa:ca:79:6b:9e:
+                    ce:55:85:c9:d5:4f:bb:7f:5a:81:c8:3c:5d:aa:ed:
+                    7f:48:87:c2:f1:4c:62:00:c3:8d:9a:a3:c2:77:25:
+                    c6:70:cc:ef:d1:8f:17:7d:1b:c3:ab:66:3e:90:f0:
+                    44:e3:85:8b:77:86:21:b2:dd:0b:2c:ed:a0:16:a0:
+                    16:63:49:b9:bb:90:45:44:f1:f7:1e:ad:57:1c:45:
+                    a2:08:99:13:05:e3:13:76:ef:f3:cd:f3:3a:21:73:
+                    21:75:0a:2d:58:e2:0a:3a:3d
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                7E:42:6C:12:CB:42:12:36:54:03:29:B6:D8:21:CA:E1:65:48:C5:67
+            X509v3 Authority Key Identifier: 
+                keyid:9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+
+    Signature Algorithm: sha256WithRSAEncryption
+         08:e1:a9:a0:e9:c4:1b:65:8d:b0:71:60:68:18:d8:af:49:8f:
+         0b:41:62:bb:f8:23:71:65:f2:c7:cf:59:23:63:48:fa:ba:26:
+         5f:2d:2e:4c:18:e4:f0:6e:cb:38:be:51:d0:e2:cc:76:ab:f6:
+         13:c2:49:68:e2:ef:da:86:a9:3d:80:29:9f:ee:33:be:cd:4c:
+         b2:4c:14:04:e3:46:46:46:ec:c1:4a:63:de:f3:5a:7b:0f:28:
+         a1:92:c8:96:07:b3:73:96:f4:9e:a0:bf:36:ea:f1:1a:8b:f7:
+         d5:ed:6c:e2:bf:cd:61:bc:a4:ca:ee:fa:75:af:ad:4c:54:4b:
+         af:18
+-----BEGIN CERTIFICATE-----
+MIICzDCCAjWgAwIBAgIBATANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3Qx
+EDAOBgNVBAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwHhcNMTgwMzAx
+MTg1MzQ0WhcNMjMwMjI4MTg1MzQ0WjB2MQswCQYDVQQGEwJHQjEYMBYGA1UECAwP
+Tm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHDApOb3R0aW5naGFtMQ8wDQYDVQQKDAZT
+ZXJ2ZXIxEzARBgNVBAsMClByb2R1Y3Rpb24xEjAQBgNVBAMMCWxvY2FsaG9zdDCB
+nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyRjhasRFWA63ZTq4b98K2F0YqkAI
+1tV5+sp5a57OVYXJ1U+7f1qByDxdqu1/SIfC8UxiAMONmqPCdyXGcMzv0Y8XfRvD
+q2Y+kPBE44WLd4Yhst0LLO2gFqAWY0m5u5BFRPH3Hq1XHEWiCJkTBeMTdu/zzfM6
+IXMhdQotWOIKOj0CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYd
+T3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFH5CbBLLQhI2
+VAMpttghyuFlSMVnMB8GA1UdIwQYMBaAFJ5UPuUv5epASvw3lmxFuxp5DsqrMA0G
+CSqGSIb3DQEBCwUAA4GBAAjhqaDpxBtljbBxYGgY2K9JjwtBYrv4I3Fl8sfPWSNj
+SPq6Jl8tLkwY5PBuyzi+UdDizHar9hPCSWji79qGqT2AKZ/uM77NTLJMFATjRkZG
+7MFKY97zWnsPKKGSyJYHs3OW9J6gvzbq8RqL99XtbOK/zWG8pMru+nWvrUxUS68Y
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/signingCA/newcerts/02.pem b/mqtt/src/test/ssl/signingCA/newcerts/02.pem
new file mode 100644
index 00000000..9cc8671b
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/newcerts/02.pem
@@ -0,0 +1,61 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Mar  1 18:53:47 2018 GMT
+            Not After : Feb 28 18:53:47 2023 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=test client
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:b8:67:87:cf:05:35:29:81:b1:16:e3:0a:1c:59:
+                    83:36:dc:31:db:af:f2:a9:12:97:e7:96:c8:91:7c:
+                    a4:52:65:43:79:f4:20:e0:5f:ed:c0:b4:32:9d:c7:
+                    3d:21:9a:9e:92:6c:42:08:06:88:65:d5:4f:5e:70:
+                    d9:7d:e1:de:4b:be:26:e2:06:99:4a:54:f7:e7:1c:
+                    d6:7c:6f:d5:16:8d:b0:9d:ce:5d:29:f1:51:e9:12:
+                    fd:2f:ed:d6:fc:e1:cc:d6:31:0e:ce:0e:74:02:f3:
+                    1e:70:41:44:5d:67:ed:3b:9d:2f:43:b8:89:6f:90:
+                    52:9b:f1:e9:fc:ed:f8:35:d1
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                27:DF:0F:D3:9A:8F:34:C8:9E:C1:6D:B9:29:99:0F:0D:3A:D1:BB:BD
+            X509v3 Authority Key Identifier: 
+                keyid:9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+
+    Signature Algorithm: sha256WithRSAEncryption
+         a1:0d:e1:4b:25:ef:4e:67:28:93:33:68:49:65:0e:18:eb:3f:
+         17:ae:47:68:75:4d:72:f5:41:6b:c5:f0:1d:06:0d:25:3d:fa:
+         ab:39:17:f4:e2:34:b7:49:9d:69:a1:92:4a:69:1b:17:42:5b:
+         c6:79:6f:20:31:81:5c:52:c2:58:6b:a0:ba:9a:fe:55:0e:8d:
+         0b:80:9f:4a:97:ed:05:05:90:a6:13:23:70:d0:56:93:a6:f4:
+         66:af:f0:96:05:8b:67:89:72:67:04:f4:5e:44:36:20:4e:b4:
+         97:b4:b2:3b:aa:e2:44:b1:ee:49:13:2c:af:e7:6d:37:e8:09:
+         50:6d
+-----BEGIN CERTIFICATE-----
+MIICzjCCAjegAwIBAgIBAjANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3Qx
+EDAOBgNVBAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwHhcNMTgwMzAx
+MTg1MzQ3WhcNMjMwMjI4MTg1MzQ3WjB4MQswCQYDVQQGEwJHQjEYMBYGA1UECAwP
+Tm90dGluZ2hhbXNoaXJlMRMwEQYDVQQHDApOb3R0aW5naGFtMQ8wDQYDVQQKDAZT
+ZXJ2ZXIxEzARBgNVBAsMClByb2R1Y3Rpb24xFDASBgNVBAMMC3Rlc3QgY2xpZW50
+MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4Z4fPBTUpgbEW4wocWYM23DHb
+r/KpEpfnlsiRfKRSZUN59CDgX+3AtDKdxz0hmp6SbEIIBohl1U9ecNl94d5Lvibi
+BplKVPfnHNZ8b9UWjbCdzl0p8VHpEv0v7db84czWMQ7ODnQC8x5wQURdZ+07nS9D
+uIlvkFKb8en87fg10QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQf
+Fh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUJ98P05qP
+NMiewW25KZkPDTrRu70wHwYDVR0jBBgwFoAUnlQ+5S/l6kBK/DeWbEW7GnkOyqsw
+DQYJKoZIhvcNAQELBQADgYEAoQ3hSyXvTmcokzNoSWUOGOs/F65HaHVNcvVBa8Xw
+HQYNJT36qzkX9OI0t0mdaaGSSmkbF0JbxnlvIDGBXFLCWGugupr+VQ6NC4CfSpft
+BQWQphMjcNBWk6b0Zq/wlgWLZ4lyZwT0XkQ2IE60l7SyO6riRLHuSRMsr+dtN+gJ
+UG0=
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/signingCA/newcerts/03.pem b/mqtt/src/test/ssl/signingCA/newcerts/03.pem
new file mode 100644
index 00000000..22421981
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/newcerts/03.pem
@@ -0,0 +1,61 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 3 (0x3)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Aug 20 00:00:00 2012 GMT
+            Not After : Aug 21 00:00:00 2012 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=test client expired
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:b8:67:87:cf:05:35:29:81:b1:16:e3:0a:1c:59:
+                    83:36:dc:31:db:af:f2:a9:12:97:e7:96:c8:91:7c:
+                    a4:52:65:43:79:f4:20:e0:5f:ed:c0:b4:32:9d:c7:
+                    3d:21:9a:9e:92:6c:42:08:06:88:65:d5:4f:5e:70:
+                    d9:7d:e1:de:4b:be:26:e2:06:99:4a:54:f7:e7:1c:
+                    d6:7c:6f:d5:16:8d:b0:9d:ce:5d:29:f1:51:e9:12:
+                    fd:2f:ed:d6:fc:e1:cc:d6:31:0e:ce:0e:74:02:f3:
+                    1e:70:41:44:5d:67:ed:3b:9d:2f:43:b8:89:6f:90:
+                    52:9b:f1:e9:fc:ed:f8:35:d1
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                27:DF:0F:D3:9A:8F:34:C8:9E:C1:6D:B9:29:99:0F:0D:3A:D1:BB:BD
+            X509v3 Authority Key Identifier: 
+                keyid:9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+
+    Signature Algorithm: sha256WithRSAEncryption
+         96:28:72:b2:16:af:2b:f2:92:d9:8b:e7:15:2c:e2:e1:55:48:
+         ce:45:d0:89:7a:80:41:ec:3e:b5:01:ee:b9:2e:62:44:7d:b5:
+         b2:f0:e5:83:62:1d:6f:3b:b5:69:4c:dd:c7:20:fb:b0:70:5a:
+         c5:f6:4a:97:14:4a:63:8f:da:3b:0d:27:e3:b9:06:a3:53:1c:
+         db:d3:9d:8a:8a:aa:7c:d7:a0:39:15:d5:03:8b:4f:0e:ab:78:
+         2f:05:69:8c:a3:5a:6b:70:6b:9e:b1:23:ad:d3:ef:a9:5d:01:
+         1b:37:7e:07:0f:97:cb:79:3a:7f:02:3d:40:62:20:63:a8:80:
+         92:da
+-----BEGIN CERTIFICATE-----
+MIIC1zCCAkCgAwIBAgIBAzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3Qx
+EDAOBgNVBAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwHhcNMTIwODIw
+MDAwMDAwWhcNMTIwODIxMDAwMDAwWjCBgDELMAkGA1UEBhMCR0IxGDAWBgNVBAgM
+D05vdHRpbmdoYW1zaGlyZTETMBEGA1UEBwwKTm90dGluZ2hhbTEPMA0GA1UECgwG
+U2VydmVyMRMwEQYDVQQLDApQcm9kdWN0aW9uMRwwGgYDVQQDDBN0ZXN0IGNsaWVu
+dCBleHBpcmVkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4Z4fPBTUpgbEW
+4wocWYM23DHbr/KpEpfnlsiRfKRSZUN59CDgX+3AtDKdxz0hmp6SbEIIBohl1U9e
+cNl94d5LvibiBplKVPfnHNZ8b9UWjbCdzl0p8VHpEv0v7db84czWMQ7ODnQC8x5w
+QURdZ+07nS9DuIlvkFKb8en87fg10QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+FgQUJ98P05qPNMiewW25KZkPDTrRu70wHwYDVR0jBBgwFoAUnlQ+5S/l6kBK/DeW
+bEW7GnkOyqswDQYJKoZIhvcNAQELBQADgYEAlihyshavK/KS2YvnFSzi4VVIzkXQ
+iXqAQew+tQHuuS5iRH21svDlg2Idbzu1aUzdxyD7sHBaxfZKlxRKY4/aOw0n47kG
+o1Mc29OdioqqfNegORXVA4tPDqt4LwVpjKNaa3BrnrEjrdPvqV0BGzd+Bw+Xy3k6
+fwI9QGIgY6iAkto=
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/signingCA/newcerts/04.pem b/mqtt/src/test/ssl/signingCA/newcerts/04.pem
new file mode 100644
index 00000000..6d60fb28
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/newcerts/04.pem
@@ -0,0 +1,61 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 4 (0x4)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Mar  1 18:53:51 2018 GMT
+            Not After : Feb 28 18:53:51 2023 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=test client revoked
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:ca:88:c0:97:79:0c:af:97:dc:f2:06:5a:12:3d:
+                    07:bf:d0:ca:f3:90:e2:fa:a6:36:c7:67:0c:50:30:
+                    b6:98:1c:83:16:03:fa:7d:00:77:37:00:49:93:3d:
+                    20:0b:e8:fb:8f:20:a2:6a:29:df:ae:ee:38:38:a8:
+                    3b:76:b2:92:96:63:46:0b:b2:47:5f:5d:9b:8d:dc:
+                    31:95:3b:ac:e9:ab:c6:89:00:46:61:58:7f:b5:39:
+                    c6:97:7e:5c:f5:06:f0:ea:82:e6:11:27:18:1f:af:
+                    2c:cb:21:43:75:e3:cf:fa:41:d8:17:17:87:ce:29:
+                    df:7f:75:d6:1f:20:d7:29:03
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                53:1F:81:85:BB:93:78:8A:B4:22:F8:8C:E0:6C:99:5F:B6:AA:B5:9B
+            X509v3 Authority Key Identifier: 
+                keyid:9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+
+    Signature Algorithm: sha256WithRSAEncryption
+         24:f6:97:b8:b2:ac:eb:83:35:d8:fa:3e:86:13:a6:44:85:10:
+         c5:ba:33:c5:58:98:bc:6e:fe:30:60:12:41:ce:ac:3f:ed:38:
+         e6:5f:ff:b5:29:73:a7:f6:60:41:b2:10:23:da:74:f2:29:d6:
+         f1:bb:94:38:14:fc:75:50:64:f4:4d:d2:6a:3d:f0:da:e0:e8:
+         e2:b9:be:a4:30:b4:c7:c3:22:60:c4:a4:34:31:13:7b:46:9d:
+         bb:5f:8e:cd:21:9d:52:78:e5:e3:e9:e6:e8:62:16:a1:f0:af:
+         14:c8:2c:39:a6:2f:a9:f4:98:cf:8c:20:20:87:c2:15:78:e4:
+         53:23
+-----BEGIN CERTIFICATE-----
+MIIC1zCCAkCgAwIBAgIBBDANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3Qx
+EDAOBgNVBAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwHhcNMTgwMzAx
+MTg1MzUxWhcNMjMwMjI4MTg1MzUxWjCBgDELMAkGA1UEBhMCR0IxGDAWBgNVBAgM
+D05vdHRpbmdoYW1zaGlyZTETMBEGA1UEBwwKTm90dGluZ2hhbTEPMA0GA1UECgwG
+U2VydmVyMRMwEQYDVQQLDApQcm9kdWN0aW9uMRwwGgYDVQQDDBN0ZXN0IGNsaWVu
+dCByZXZva2VkMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDKiMCXeQyvl9zy
+BloSPQe/0MrzkOL6pjbHZwxQMLaYHIMWA/p9AHc3AEmTPSAL6PuPIKJqKd+u7jg4
+qDt2spKWY0YLskdfXZuN3DGVO6zpq8aJAEZhWH+1OcaXflz1BvDqguYRJxgfryzL
+IUN148/6QdgXF4fOKd9/ddYfINcpAwIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+FgQUUx+BhbuTeIq0IviM4GyZX7aqtZswHwYDVR0jBBgwFoAUnlQ+5S/l6kBK/DeW
+bEW7GnkOyqswDQYJKoZIhvcNAQELBQADgYEAJPaXuLKs64M12Po+hhOmRIUQxboz
+xViYvG7+MGASQc6sP+045l//tSlzp/ZgQbIQI9p08inW8buUOBT8dVBk9E3Saj3w
+2uDo4rm+pDC0x8MiYMSkNDETe0adu1+OzSGdUnjl4+nm6GIWofCvFMgsOaYvqfSY
+z4wgIIfCFXjkUyM=
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/signingCA/serial b/mqtt/src/test/ssl/signingCA/serial
new file mode 100644
index 00000000..eeee65ec
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/serial
@@ -0,0 +1 @@
+05
diff --git a/mqtt/src/test/ssl/signingCA/serial.old b/mqtt/src/test/ssl/signingCA/serial.old
new file mode 100644
index 00000000..64969239
--- /dev/null
+++ b/mqtt/src/test/ssl/signingCA/serial.old
@@ -0,0 +1 @@
+04
diff --git a/mqtt/src/test/ssl/test-alt-ca.crt b/mqtt/src/test/ssl/test-alt-ca.crt
new file mode 100644
index 00000000..8e706cfa
--- /dev/null
+++ b/mqtt/src/test/ssl/test-alt-ca.crt
@@ -0,0 +1,58 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, L=Derby, O=Mosquitto Project, OU=Testing, CN=Root CA
+        Validity
+            Not Before: Mar  1 18:53:42 2018 GMT
+            Not After : Feb 28 18:53:42 2023 GMT
+        Subject: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Alternative Signing CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:bd:8b:92:ed:6a:d6:b7:73:88:e7:fa:80:bd:bc:
+                    ee:fb:6a:47:f4:36:4e:48:ab:88:8a:a6:66:98:84:
+                    6a:4c:a8:88:5f:cc:26:98:81:fe:8b:22:c4:c0:91:
+                    70:74:72:22:48:1d:e1:b8:44:71:23:74:17:59:bc:
+                    a6:51:18:97:4c:6d:50:8c:0a:c5:33:cc:28:2a:cf:
+                    78:04:a2:20:75:72:29:4a:46:7b:c7:46:a5:f5:5e:
+                    ec:6f:53:bc:d7:ad:b5:29:dd:22:24:4e:b7:88:e2:
+                    94:58:04:fe:6d:04:13:8d:c8:72:d0:74:2a:ef:18:
+                    87:6d:cf:ce:6e:4a:08:73:c3
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                78:CC:8C:66:81:0F:8F:DA:56:5C:39:A2:30:C2:28:9E:53:A6:87:CA
+            X509v3 Authority Key Identifier: 
+                keyid:1C:B4:4E:8B:84:0D:1E:0F:C4:CC:F4:17:87:DB:CA:F2:55:F1:34:39
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         27:3c:17:44:29:8f:17:a7:c0:b7:81:eb:76:ca:53:85:9a:ad:
+         31:68:85:95:69:d6:ab:02:75:a8:ac:71:6f:4d:20:23:6d:5c:
+         09:1d:0a:85:f4:e6:6f:6e:1e:c1:1f:34:1e:87:6e:d3:b9:e0:
+         b2:2f:08:82:fb:4b:28:36:a9:68:54:18:9b:16:6a:f2:ab:ae:
+         bd:7a:40:d2:a7:64:46:4c:f5:cb:15:07:02:7b:3f:44:5e:e1:
+         35:83:99:3f:46:7d:99:76:d2:89:3c:9f:a6:70:13:dd:8e:bd:
+         d2:b1:51:ec:9c:db:2e:f4:fd:f7:1d:de:2c:27:f3:55:9b:81:
+         07:81
+-----BEGIN CERTIFICATE-----
+MIICqTCCAhKgAwIBAgIBAjANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEOMAwGA1UEBwwFRGVyYnkxGjAYBgNVBAoMEU1v
+c3F1aXR0byBQcm9qZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRAwDgYDVQQDDAdSb290
+IENBMB4XDTE4MDMwMTE4NTM0MloXDTIzMDIyODE4NTM0MlowcTELMAkGA1UEBhMC
+R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxGjAYBgNVBAoMEU1vc3F1aXR0byBQcm9q
+ZWN0MRAwDgYDVQQLDAdUZXN0aW5nMR8wHQYDVQQDDBZBbHRlcm5hdGl2ZSBTaWdu
+aW5nIENBMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC9i5Ltata3c4jn+oC9
+vO77akf0Nk5Iq4iKpmaYhGpMqIhfzCaYgf6LIsTAkXB0ciJIHeG4RHEjdBdZvKZR
+GJdMbVCMCsUzzCgqz3gEoiB1cilKRnvHRqX1XuxvU7zXrbUp3SIkTreI4pRYBP5t
+BBONyHLQdCrvGIdtz85uSghzwwIDAQABo1AwTjAdBgNVHQ4EFgQUeMyMZoEPj9pW
+XDmiMMIonlOmh8owHwYDVR0jBBgwFoAUHLROi4QNHg/EzPQXh9vK8lXxNDkwDAYD
+VR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOBgQAnPBdEKY8Xp8C3get2ylOFmq0x
+aIWVadarAnWorHFvTSAjbVwJHQqF9OZvbh7BHzQeh27TueCyLwiC+0soNqloVBib
+Fmryq669ekDSp2RGTPXLFQcCez9EXuE1g5k/Rn2ZdtKJPJ+mcBPdjr3SsVHsnNsu
+9P33Hd4sJ/NVm4EHgQ==
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/test-alt-ca.csr b/mqtt/src/test/ssl/test-alt-ca.csr
new file mode 100644
index 00000000..bad186fb
--- /dev/null
+++ b/mqtt/src/test/ssl/test-alt-ca.csr
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBwjCCASsCAQAwgYExCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJl
+MQ4wDAYDVQQHDAVEZXJieTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAO
+BgNVBAsMB1Rlc3RpbmcxHzAdBgNVBAMMFkFsdGVybmF0aXZlIFNpZ25pbmcgQ0Ew
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAL2Lku1q1rdziOf6gL287vtqR/Q2
+TkiriIqmZpiEakyoiF/MJpiB/osixMCRcHRyIkgd4bhEcSN0F1m8plEYl0xtUIwK
+xTPMKCrPeASiIHVyKUpGe8dGpfVe7G9TvNettSndIiROt4jilFgE/m0EE43IctB0
+Ku8Yh23Pzm5KCHPDAgMBAAGgADANBgkqhkiG9w0BAQsFAAOBgQCOf7hqhZDVZ4Iw
+wtZQy8AXgeHhRngSCWfIsCJqpm9LRK5FOz/cBuTCrwao5Ifds4ogwCu7wARXdF/B
+cLT9/LhaEV8lvFabF/01o3y4xcO4TOXWzz4YcfbtX1p3SA1xE1WeQJvsbm2CPhRI
+hzgxpLYJJ95ajM60tkmJS41+rlEohw==
+-----END CERTIFICATE REQUEST-----
diff --git a/mqtt/src/test/ssl/test-alt-ca.key b/mqtt/src/test/ssl/test-alt-ca.key
new file mode 100644
index 00000000..9f366568
--- /dev/null
+++ b/mqtt/src/test/ssl/test-alt-ca.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQC9i5Ltata3c4jn+oC9vO77akf0Nk5Iq4iKpmaYhGpMqIhfzCaY
+gf6LIsTAkXB0ciJIHeG4RHEjdBdZvKZRGJdMbVCMCsUzzCgqz3gEoiB1cilKRnvH
+RqX1XuxvU7zXrbUp3SIkTreI4pRYBP5tBBONyHLQdCrvGIdtz85uSghzwwIDAQAB
+AoGBAI4z+LdGQHDBrSTdO1keNe1Jf1Ioq/K5PmdHEBG8xkNc7XNxpkMkw+N+4j3W
+35d9SVrxkDa+omMG5b3dWqnc2SSf/kXIkkdK0EY8DDnfrHMJSdByeQEOLJUcr4TI
+R76PdddyGxrSe7x5IV2q+AAkqeIhgUCPALbW2jpxc7/VJ+gBAkEA/JMO8TS0sawM
+IQ3iuh/sxUSsfRrTwL+QehPopomONvMYOoDOR+mE8yo2iqY9rk6Q5TBFcxz2kvqr
+RaG7tP2HQQJBAMAdrWG/u1lXdawRtrZm5zKy/5uC1qlmldRpDgIw1eFzTv2WWwma
+XvasaDlWC102/6ktigDMS4ngTy7hYc/mXgMCQE0RHiURPPVdltHbJ8w9A4TpwGvn
+7KbKjO4C9yEhpcg0grcPKGIe6dc8kSnbMcTm6iVUhkxqkP4mCG6Vu+2s0kECQD4V
+mSFcr7PIkst/kfdSO+bjd70OxEZMU6EoLhHBLG1GMUG8JEFvNL8sqiXVS6jdDDPk
+9pMZclPlPFGfHlfsT3cCQQCbhnQwKusj7swD0Ca1I0Df2U+WKgiMOBrCbbl7dwmP
+tIdTr7/fy3mF3m2l2GY7PD/VXWH2dFcKWe4wa6b7cRB9
+-----END RSA PRIVATE KEY-----
diff --git a/mqtt/src/test/ssl/test-bad-root-ca.crt b/mqtt/src/test/ssl/test-bad-root-ca.crt
new file mode 100644
index 00000000..8104f273
--- /dev/null
+++ b/mqtt/src/test/ssl/test-bad-root-ca.crt
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICvDCCAiWgAwIBAgIJAIYNkcQqtmgUMA0GCSqGSIb3DQEBCwUAMHYxCzAJBgNV
+BAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJieTEaMBgG
+A1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3RpbmcxFDASBgNV
+BAMMC0JhZCBSb290IENBMCAXDTE4MDMwMTE4NTMzNloYDzIxMDAwNDIwMTg1MzM2
+WjB2MQswCQYDVQQGEwJHQjETMBEGA1UECAwKRGVyYnlzaGlyZTEOMAwGA1UEBwwF
+RGVyYnkxGjAYBgNVBAoMEU1vc3F1aXR0byBQcm9qZWN0MRAwDgYDVQQLDAdUZXN0
+aW5nMRQwEgYDVQQDDAtCYWQgUm9vdCBDQTCBnzANBgkqhkiG9w0BAQEFAAOBjQAw
+gYkCgYEAqB3XEqOnZtKrVGgfHacwnruZtLKOsIdsL8ohLHIZfO/h+AZwbkTfrDry
+9MtpQRGSuGWPccaV6dAr+TTLqqJN0WidwB2Qu+29HLm6kJRycpJiXQSUlZdJMaxO
+WfX9s2TUKZtIYMX53SnD1050185JrotGW6rjsFZpItpn9j5EitECAwEAAaNQME4w
+HQYDVR0OBBYEFK1okpAhv8xOcMbCGv5TA6669bpzMB8GA1UdIwQYMBaAFK1okpAh
+v8xOcMbCGv5TA6669bpzMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQELBQADgYEA
+WlQr7YtNie0ckbw/QOKU+lEtLezX0SkrYtZB1xbNCvMbFpFs93Id3yQkGRG673s4
+XpMK+uJxkdzaZR6EQtAg/3qLxpJSeHeZ5haywg0CpxQFXsKKczsspz86h9bF/uct
+qX+p/Jnfx9WxDG5TYLpmE3wJKJ5ZLP3z84XjZyIQDoU=
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/test-bad-root-ca.key b/mqtt/src/test/ssl/test-bad-root-ca.key
new file mode 100644
index 00000000..5f54f451
--- /dev/null
+++ b/mqtt/src/test/ssl/test-bad-root-ca.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQCoHdcSo6dm0qtUaB8dpzCeu5m0so6wh2wvyiEschl87+H4BnBu
+RN+sOvL0y2lBEZK4ZY9xxpXp0Cv5NMuqok3RaJ3AHZC77b0cubqQlHJykmJdBJSV
+l0kxrE5Z9f2zZNQpm0hgxfndKcPXTnTXzkmui0ZbquOwVmki2mf2PkSK0QIDAQAB
+AoGAGUEqTuWAv0SEclCV5Al6l03NQETWhJRDX0Z5B0k4pPkQNAcbmqUECMZuOvHX
+pOuz47l1+/x+Brq78FrLAZ4SHFXA6FhiH9XGMn+qX6+DnMoy/8yoLYLn/T/dB7or
+jp0JWex9DgvI4V8WhbF+6otlVxC140SicsPuwtGoisS5fbECQQDXNGxNsU7qofOe
+EfP2MLeQ73At/ZbgFCB2qEb7DiSzCxCheDNDi1Jxzwvg16We9xBQ9+tTTuoX5W7f
+FAIKVdbtAkEAx/xLRoMv9alj4OUjQ893FzFlwuf2zvywRidElr0XUzafmQfIzcph
+bTNCeDvC9jJwuJq7ejLWJe2KuuIMqjAC9QJARAuNWxt/Km0+zHI8w1EwGaG7xK70
+L7HteddHakZUkFAlWAjbnLXGwbmHtfY5pgPUouVhARxopFmlLt/yrTXrGQJAUk+X
+M/h+3t/PShtFfn1/iL4+IhCTVvJOIzG6W0iMtyU+XyADGCB6JRX5/76pKefs2S5m
+h48w8P9qIC02BT4pmQJAdrG3UOC4UT69WYsDDbKRU/6R6fMd4FS081T/KCwnUgLc
+/2mSl6TJNnxuiRYjpsgcP+2LZzuzhW26rZiCx6QJHw==
+-----END RSA PRIVATE KEY-----
diff --git a/mqtt/src/test/ssl/test-fake-root-ca.crt b/mqtt/src/test/ssl/test-fake-root-ca.crt
new file mode 100644
index 00000000..212feff3
--- /dev/null
+++ b/mqtt/src/test/ssl/test-fake-root-ca.crt
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICtDCCAh2gAwIBAgIJAOKVfgVed/sFMA0GCSqGSIb3DQEBCwUAMHIxCzAJBgNV
+BAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJieTEaMBgG
+A1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3RpbmcxEDAOBgNV
+BAMMB1Jvb3QgQ0EwIBcNMTgwMzAxMTg1MzM2WhgPMjEwMDA0MjAxODUzMzZaMHIx
+CzAJBgNVBAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJi
+eTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3Rpbmcx
+EDAOBgNVBAMMB1Jvb3QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAPRh
+wQ5WorDeUQv4jMGwpZRO/neV7g8+6Syrvmh25TtjRLr0hXiqX13F5NU5szZgLnwq
+IGYoj/UunirquStjWqkypaoP4hNmv0BuAD96ySZbu86u1BsnY+N4Am9awIUoEyjW
+qdyp7SRxWkIhpXcFdX2NtuN1mWoYeCvUy7orSVXtAgMBAAGjUDBOMB0GA1UdDgQW
+BBScKh34/EmyZHmLM5MwG60sHT3BCjAfBgNVHSMEGDAWgBScKh34/EmyZHmLM5Mw
+G60sHT3BCjAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBAFKGwkW7wCH4
+cM5Pt3P0TMmqV3qM5t+IfsWciK35crFwuy6/7GjCm+ptum+J4J10NfvJHtQxLjBi
+uoR7vCh0X9BAMqFZfFyfdNko6Kc9ggL3voduSORMYq4PDCUuawxN8gXvIr90aGbb
+zaYxDxaxBc0u54YJAFM3tuB0E86r03Ct
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/test-fake-root-ca.key b/mqtt/src/test/ssl/test-fake-root-ca.key
new file mode 100644
index 00000000..5b5b92dd
--- /dev/null
+++ b/mqtt/src/test/ssl/test-fake-root-ca.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQD0YcEOVqKw3lEL+IzBsKWUTv53le4PPuksq75oduU7Y0S69IV4
+ql9dxeTVObM2YC58KiBmKI/1Lp4q6rkrY1qpMqWqD+ITZr9AbgA/eskmW7vOrtQb
+J2PjeAJvWsCFKBMo1qncqe0kcVpCIaV3BXV9jbbjdZlqGHgr1Mu6K0lV7QIDAQAB
+AoGALsxBcgN5KDGKh6ZTHgw7yQjPhgr6CYVcladV0R9jilnaIYsNvCu0E3r/9S0V
+eoY0oKZYifeeia8hrspAJ2ThSUGQ1+tDk62ATxRNg2HB4+4C7dEs/ubYa4O8NC9h
+Dati+z1jsqE+D8x/weiChjkdnpO2XziuoQQI6qPvCcs5zAECQQD+DCgk32KM4P7y
+I8OoV14g15qLNcZwVd74ItHti2QmKlGsYwem+xXi6u4PujLU+qh+NgUSZhpgzIqI
+bf38GNJtAkEA9kKUenZfEn6TT0yPF9BbBNvidjcneYGWbTG9lT6nbIoEEyqkHiSV
+NxkTXF1HTBo7T53bLxCuWj9CjP6vH7xhgQJAMc7OXBRT7Qz7zxuF885VTRkYWqzL
+YCDl2z5wbCNFGlp3stWjnXBi5R9sVzcJWkpemIgczHOqPko76u2tuyxerQJBAOeT
+Uscam2rr5qEysHlHcOBP2lUqpo9nokrK9KntQkoaO5y+g5jo8/zdMsyv1wUkwdOr
+8VsAB8VMKcwnEA36+4ECQCUL6et8GrAuO2dlR3wV8cEU/dxo0LOzfzA9g6X/Ey09
+f2hq7sL85Ni3FmA9OutYVxTv6FAB52RCcj1qIoQyot8=
+-----END RSA PRIVATE KEY-----
diff --git a/mqtt/src/test/ssl/test-root-ca.crt b/mqtt/src/test/ssl/test-root-ca.crt
new file mode 100644
index 00000000..02ec098a
--- /dev/null
+++ b/mqtt/src/test/ssl/test-root-ca.crt
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICtDCCAh2gAwIBAgIJAObVjC0tPL4iMA0GCSqGSIb3DQEBCwUAMHIxCzAJBgNV
+BAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJieTEaMBgG
+A1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3RpbmcxEDAOBgNV
+BAMMB1Jvb3QgQ0EwIBcNMTgwMzAxMTg1MzM2WhgPMjEwMDA0MjAxODUzMzZaMHIx
+CzAJBgNVBAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJi
+eTEaMBgGA1UECgwRTW9zcXVpdHRvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3Rpbmcx
+EDAOBgNVBAMMB1Jvb3QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANSZ
+3aRYdHcnta24XXJGfomsg2OpYys3KkqK76aWEwhqRvdH2m54yBvHTZ2LsMLQro0q
+r4oGLyvlupC9fxwQF4ZDFHrn7VbxU947V+cipGkRaECXiGVO1ngUSpKti8nrIUkn
+FXkLmVaGuVv1jVOGBi6/6f3ct6LsNyFqXzaSw9DtAgMBAAGjUDBOMB0GA1UdDgQW
+BBQctE6LhA0eD8TM9BeH28ryVfE0OTAfBgNVHSMEGDAWgBQctE6LhA0eD8TM9BeH
+28ryVfE0OTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4GBAHVShEeqQRjP
+IoMU8MFnnC1ZadADvSn1E6gRR7eoNU0MeMpTYmTA+TIklEzhaRHSkQqyPHAe/YMl
+WLmq1NqyxPv9uKekVlatJxYbm1ME4e+wGs3U9OGsIKX0nFcBO8iqpj5s7GZmSYyY
+u1YJnq1oe0C5IblVB9amcoB743/YyMme
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/test-root-ca.key b/mqtt/src/test/ssl/test-root-ca.key
new file mode 100644
index 00000000..4ca2bb73
--- /dev/null
+++ b/mqtt/src/test/ssl/test-root-ca.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQDUmd2kWHR3J7WtuF1yRn6JrINjqWMrNypKiu+mlhMIakb3R9pu
+eMgbx02di7DC0K6NKq+KBi8r5bqQvX8cEBeGQxR65+1W8VPeO1fnIqRpEWhAl4hl
+TtZ4FEqSrYvJ6yFJJxV5C5lWhrlb9Y1ThgYuv+n93Lei7Dchal82ksPQ7QIDAQAB
+AoGANQkxVpdObo80bmLoxOI7HOMxX8JY3+YCIdhpEnirxNSmYXfGUPrGiM9+WEgJ
+z3+5m7PDWL5UNDI6CXOMaxbElyBKpMa6fnyexVvw1OOGWWl0Qi5GjOrmKl4ETVmv
+gTr37U4syzvAhDFdDz7YFwsjo59NZM+sXluGAc3/QOlLRg0CQQD0xquDOn0pj6kX
+VYQ1rZv7D3O7JFVlZuzZ/JKnGZ581z+O48YnRIki0+oQjKa/lEJ7f+GQ4yU4eEh4
+sAXiil6rAkEA3lmBhJ86MAgyZ6qfnLn4EqQXfxIaUVQHHVN5jPRO79A95GL4NA1m
+kCSiA7QfXDEVw1d1pGw4jlzyF2uYFpSuxwJBAJl5yCisD7ZzgU5ELHWLuXWdpq78
+hR7jfjbgCwQDKECWph9t6dzNOD9CKEzgI92TlGvjLwetpLTXlnk1xTraD6kCQCGj
+kve4izoXE2EhrDIu5HwVfUSJPZgOSWFDbsFHeOXJMIPsATcGy/yEvkonJxNwjaVX
+BwJQKSJIp4upiIHqDqMCQQDAPOg7FniJE+3ZA7IC1YEYTb2rCyOQe6HykDRo3zGa
+NEfQBes9GC74NqLNYK9cV2ajHcyg7oHnupt79iFgifin
+-----END RSA PRIVATE KEY-----
diff --git a/mqtt/src/test/ssl/test-signing-ca.crt b/mqtt/src/test/ssl/test-signing-ca.crt
new file mode 100644
index 00000000..ef58024a
--- /dev/null
+++ b/mqtt/src/test/ssl/test-signing-ca.crt
@@ -0,0 +1,58 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, L=Derby, O=Mosquitto Project, OU=Testing, CN=Root CA
+        Validity
+            Not Before: Mar  1 18:53:36 2018 GMT
+            Not After : Feb 28 18:53:36 2023 GMT
+        Subject: C=GB, ST=Derbyshire, O=Mosquitto Project, OU=Testing, CN=Signing CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:af:ad:b0:e4:78:b8:73:01:6a:9e:78:1e:bf:36:
+                    5b:60:dc:ee:28:ce:16:3c:73:30:b3:02:cd:5c:07:
+                    a2:36:ee:a1:c5:43:32:0c:46:57:cb:fb:1c:52:db:
+                    4e:65:85:8a:5d:a6:cd:66:43:ad:bc:70:1b:e6:b0:
+                    11:0f:d8:54:1f:57:9e:29:4e:2b:1b:c5:70:b2:3d:
+                    38:a7:63:3f:1a:06:2f:6d:09:2c:7c:90:60:db:8c:
+                    3a:11:20:a7:db:20:25:d9:c6:97:74:50:5a:e0:fd:
+                    81:aa:de:ea:1d:e5:be:61:59:0d:76:e5:ab:7f:3b:
+                    b2:a6:38:b9:bb:32:aa:72:ef
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                9E:54:3E:E5:2F:E5:EA:40:4A:FC:37:96:6C:45:BB:1A:79:0E:CA:AB
+            X509v3 Authority Key Identifier: 
+                keyid:1C:B4:4E:8B:84:0D:1E:0F:C4:CC:F4:17:87:DB:CA:F2:55:F1:34:39
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         6c:2d:41:ca:7b:89:84:27:ca:b3:64:d5:73:b2:5b:dd:fc:6f:
+         d4:68:ae:f1:30:3e:9e:ca:28:2b:d3:2e:0c:61:3e:d5:9a:fd:
+         67:b1:60:e5:54:9f:a4:95:51:5b:00:2d:f9:46:82:de:49:df:
+         ce:2a:f3:f6:2e:8f:8f:64:2b:c9:2f:ce:ff:d2:53:a0:0a:c4:
+         4a:e9:20:fa:5e:79:45:21:18:c2:d6:c1:64:92:e4:67:3a:92:
+         04:46:5e:6a:39:84:c8:f1:0e:42:3c:fd:b2:c2:7b:e9:af:44:
+         2c:19:30:61:01:39:47:6d:38:85:90:4b:e5:04:f4:87:72:46:
+         4a:9a
+-----BEGIN CERTIFICATE-----
+MIICnTCCAgagAwIBAgIBATANBgkqhkiG9w0BAQsFADByMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEOMAwGA1UEBwwFRGVyYnkxGjAYBgNVBAoMEU1v
+c3F1aXR0byBQcm9qZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRAwDgYDVQQDDAdSb290
+IENBMB4XDTE4MDMwMTE4NTMzNloXDTIzMDIyODE4NTMzNlowZTELMAkGA1UEBhMC
+R0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxGjAYBgNVBAoMEU1vc3F1aXR0byBQcm9q
+ZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRMwEQYDVQQDDApTaWduaW5nIENBMIGfMA0G
+CSqGSIb3DQEBAQUAA4GNADCBiQKBgQCvrbDkeLhzAWqeeB6/Nltg3O4ozhY8czCz
+As1cB6I27qHFQzIMRlfL+xxS205lhYpdps1mQ628cBvmsBEP2FQfV54pTisbxXCy
+PTinYz8aBi9tCSx8kGDbjDoRIKfbICXZxpd0UFrg/YGq3uod5b5hWQ125at/O7Km
+OLm7Mqpy7wIDAQABo1AwTjAdBgNVHQ4EFgQUnlQ+5S/l6kBK/DeWbEW7GnkOyqsw
+HwYDVR0jBBgwFoAUHLROi4QNHg/EzPQXh9vK8lXxNDkwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQsFAAOBgQBsLUHKe4mEJ8qzZNVzslvd/G/UaK7xMD6eyigr0y4M
+YT7Vmv1nsWDlVJ+klVFbAC35RoLeSd/OKvP2Lo+PZCvJL87/0lOgCsRK6SD6XnlF
+IRjC1sFkkuRnOpIERl5qOYTI8Q5CPP2ywnvpr0QsGTBhATlHbTiFkEvlBPSHckZK
+mg==
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/ssl/test-signing-ca.csr b/mqtt/src/test/ssl/test-signing-ca.csr
new file mode 100644
index 00000000..94dcfc5a
--- /dev/null
+++ b/mqtt/src/test/ssl/test-signing-ca.csr
@@ -0,0 +1,12 @@
+-----BEGIN CERTIFICATE REQUEST-----
+MIIBtTCCAR4CAQAwdTELMAkGA1UEBhMCR0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUx
+DjAMBgNVBAcMBURlcmJ5MRowGAYDVQQKDBFNb3NxdWl0dG8gUHJvamVjdDEQMA4G
+A1UECwwHVGVzdGluZzETMBEGA1UEAwwKU2lnbmluZyBDQTCBnzANBgkqhkiG9w0B
+AQEFAAOBjQAwgYkCgYEAr62w5Hi4cwFqnngevzZbYNzuKM4WPHMwswLNXAeiNu6h
+xUMyDEZXy/scUttOZYWKXabNZkOtvHAb5rARD9hUH1eeKU4rG8Vwsj04p2M/GgYv
+bQksfJBg24w6ESCn2yAl2caXdFBa4P2Bqt7qHeW+YVkNduWrfzuypji5uzKqcu8C
+AwEAAaAAMA0GCSqGSIb3DQEBCwUAA4GBAKKZrxWCi6ydSuEw5xmt63XajvrmD6IE
+GvhJ8xbuGtV3wjVbzvZS3Ti6z/cmIw1pAzSTtSaaT8u013dO4+qf1ViGlZVr5+UN
+OK22B5PelCMium324HIJQnA5Q9UtbhCDuK7C77JlWpiqac7DyJBDMNAVFN7JnfDl
+h42vtity4W0i
+-----END CERTIFICATE REQUEST-----
diff --git a/mqtt/src/test/ssl/test-signing-ca.key b/mqtt/src/test/ssl/test-signing-ca.key
new file mode 100644
index 00000000..e5731df7
--- /dev/null
+++ b/mqtt/src/test/ssl/test-signing-ca.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCvrbDkeLhzAWqeeB6/Nltg3O4ozhY8czCzAs1cB6I27qHFQzIM
+RlfL+xxS205lhYpdps1mQ628cBvmsBEP2FQfV54pTisbxXCyPTinYz8aBi9tCSx8
+kGDbjDoRIKfbICXZxpd0UFrg/YGq3uod5b5hWQ125at/O7KmOLm7Mqpy7wIDAQAB
+AoGAMoVxzJKHANPUdJQ4y2Z3aui+OM/jhyjdRW213xR26vM/ZHpJh0wnbYref1mA
+NyPrQbl5ckJeUUWwUGwry/G7ZvnEtyOdKB0GA2hSMa1C4jSRZK2pN1eYhJMNKY8F
+gdQY5rhEzLx2+oIZ0R3LjSSISQ2PYUsjg1hNH8qoq/leUtECQQDjnd253yHiX7tT
+xP+KMffXB6d5wF58nCVw3nwswC9kjtCA9IPmHyQuzTCgsFjwqwN3aABCsoqCPgKA
+qjIUyMdJAkEAxZXRoEXlBVydxnsV6zfDsbwb6DPiMSn/eY9TNU54ML9hYg8L8bpw
+0pzMnbSdjT2rhjn4E39JL7sGlFgyR5dQdwJAdPeVD4U4lmn3i866Orv+zoNibtCK
+PaLIIr5SNXT1Zcl2IC6G8WSjZWGQUaMNsW9QMrZBHAU/5DoVcyUC42dh8QJAJ+kp
+XMyBhGG+5Pa76LVs7BvpLzA7wl6PYkiXMC9Xi9E8pIgRi5RzcbeGhVyUbpFEcmqH
+N7kAWYnXvGNMVLW15QJBAKvlGhRxugM5E8qVRCf+0Pl/Dcet0JOHlG9taKY32rWN
+VDqpBBu2dzU+7pdFtARDxPqjJ7twfyTlhVAqEGk/s7U=
+-----END RSA PRIVATE KEY-----
diff --git a/mqtt/src/test/sync_client_test.c b/mqtt/src/test/sync_client_test.c
new file mode 100644
index 00000000..94ee88ee
--- /dev/null
+++ b/mqtt/src/test/sync_client_test.c
@@ -0,0 +1,1122 @@
+/*******************************************************************
+  Copyright (c) 2013, 2014 IBM Corp.
+ 
+  All rights reserved. This program and the accompanying materials
+  are made available under the terms of the Eclipse Public License v1.0
+  and Eclipse Distribution License v1.0 which accompany this distribution. 
+ 
+  The Eclipse Public License is available at 
+     http://www.eclipse.org/legal/epl-v10.html
+  and the Eclipse Distribution License is available at 
+    http://www.eclipse.org/org/documents/edl-v10.php.
+ 
+  Contributors:
+     Ian Craggs - initial implementation and/or documentation
+*******************************************************************/
+
+#include "MQTTClient.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+  	#include <sys/socket.h>
+	#include <unistd.h>
+  	#include <errno.h>
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#define MAXHOSTNAMELEN 256
+#define EAGAIN WSAEWOULDBLOCK
+#define EINTR WSAEINTR
+#define EINPROGRESS WSAEINPROGRESS
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define ENOTCONN WSAENOTCONN
+#define ECONNRESET WSAECONNRESET
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+
+char* topics[] =  {"TopicA", "TopicA/B", "Topic/C", "TopicA/C", "/TopicA"};
+char* wildtopics[] = {"TopicA/+", "+/C", "#", "/#", "/+", "+/+", "TopicA/#"};
+char* nosubscribe_topics[] = {"nosubscribe",};
+
+struct Options
+{
+	char* connection;         /**< connection to system under test. */
+	char* clientid1;
+	char* clientid2;
+	char* username;
+	char* password;
+	int verbose;
+	int MQTTVersion;
+	int iterations;
+	int run_dollar_topics_test;
+	int run_subscribe_failure_test;
+} options =
+{
+	"tcp://localhost:1883",
+	"myclientid",
+	"myclientid2",
+	NULL,
+	NULL,
+	0,
+	MQTTVERSION_3_1_1,
+	1,
+	0,
+	0,
+};
+
+
+void usage(void)
+{
+	printf("options:\n  connection, clientid1, clientid2, username, password, MQTTversion, iterations, verbose\n");
+	exit(EXIT_FAILURE);
+}
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+	
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--dollar_topics_test") == 0 || strcmp(argv[count], "--$") == 0)
+		{
+			options.run_dollar_topics_test = 1;
+			printf("Running $ topics test\n");
+		}
+		else if (strcmp(argv[count], "--subscribe_failure_test") == 0 || strcmp(argv[count], "-s") == 0)
+		{
+			options.run_subscribe_failure_test = 1;
+			printf("Running subscribe failure test\n");
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+			{
+				options.connection = argv[count];
+				printf("Setting connection to %s\n", options.connection);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--clientid1") == 0)
+		{
+			if (++count < argc)
+			{
+				options.clientid1 = argv[count];
+				printf("Setting clientid1 to %s\n", options.clientid1);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--clientid2") == 0)
+		{
+			if (++count < argc)
+			{
+				options.clientid2 = argv[count];
+				printf("Setting clientid2 to %s\n", options.clientid2);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--username") == 0)
+		{
+			if (++count < argc)
+			{
+				options.username = argv[count];
+				printf("Setting username to %s\n", options.username);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--password") == 0)
+		{
+			if (++count < argc)
+			{
+				options.password = argv[count];
+				printf("Setting password to %s\n", options.password);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--MQTTversion") == 0)
+		{
+			if (++count < argc)
+			{
+				options.MQTTVersion = atoi(argv[count]);
+				printf("Setting MQTT version to %d\n", options.MQTTVersion);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--iterations") == 0)
+		{
+			if (++count < argc)
+			{
+				options.iterations = atoi(argv[count]);
+				printf("Setting iterations to %d\n", options.iterations);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+		{
+			options.verbose = 1;
+			printf("\nSetting verbose on\n");
+		}
+		count++;
+	}
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define msleep Sleep
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define msleep(A) usleep(A*1000)
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+	
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+
+int tests = 0;
+int failures = 0;
+
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		int count;
+		va_list args;
+
+		++failures;
+		printf("Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		count = vprintf(format, args);
+		va_end(args);
+		if (count)
+			printf("\n");
+
+		//cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n", 
+        //               description, filename, lineno);
+	}
+    else
+    	MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);  
+}
+
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+typedef struct
+{
+	char* topicName;
+	int topicLen;
+	MQTTClient_message* m;
+} messageStruct;
+
+messageStruct messagesArrived[1000];
+int messageCount = 0;
+
+int messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* m)
+{
+	messagesArrived[messageCount].topicName = topicName;
+	messagesArrived[messageCount].topicLen = topicLen;
+	messagesArrived[messageCount++].m = m;
+	MyLog(LOGA_DEBUG, "Callback: %d message received on topic %s is %.*s.",
+					messageCount, topicName, m->payloadlen, (char*)(m->payload));
+	return 1;
+}
+
+
+void clearMessages(void)
+{
+	int i;
+
+	for (i = 0; i < messageCount; ++i)
+	{
+		MQTTClient_free(messagesArrived[i].topicName);
+		MQTTClient_freeMessage(&messagesArrived[i].m);
+	}
+	messageCount = 0;
+}
+
+void cleanup(void)
+{
+	// clean all client state
+	char* clientids[] = {options.clientid1, options.clientid2};
+	int i, rc;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient aclient;
+
+	MyLog(LOGA_INFO, "Cleaning up");
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = options.username;
+	opts.password = options.password;
+	opts.MQTTVersion = options.MQTTVersion;
+	
+	for (i = 0; i < 2; ++i)
+	{
+		rc = MQTTClient_create(&aclient, options.connection, clientids[i], MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+		assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+		rc = MQTTClient_connect(aclient, &opts);
+		assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+		rc = MQTTClient_disconnect(aclient, 100);
+		assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+		MQTTClient_destroy(&aclient);
+	}
+
+	// clean retained messages 
+	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_setCallbacks(aclient, NULL, NULL, messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_subscribe(aclient, "#", 0);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	msleep(2000); // wait for all retained messages to arrive
+
+	rc = MQTTClient_unsubscribe(aclient, "#");
+	assert("Good rc from unsubscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	for (i = 0; i < messageCount; ++i)
+	{
+		if (messagesArrived[i].m->retained)
+		{
+			MyLog(LOGA_INFO, "Deleting retained message for topic %s", (char*)messagesArrived[i].topicName);
+			rc = MQTTClient_publish(aclient, messagesArrived[i].topicName, 0, "", 0, 1, NULL);
+			assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		}
+	}
+
+	rc = MQTTClient_disconnect(aclient, 100);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&aclient);
+
+	clearMessages();
+
+	MyLog(LOGA_INFO, "Finished cleaning up");
+}
+
+ 
+int basic_test(void)
+{
+	int i, rc;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient aclient;
+
+	MyLog(LOGA_INFO, "Starting basic test");
+
+	tests = failures = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = options.username;
+	opts.password = options.password;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_setCallbacks(aclient, NULL, NULL, messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_disconnect(aclient, 100);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_subscribe(aclient, topics[0], 0);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(aclient, topics[0], 5, "qos 0", 0, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(aclient, topics[0], 5, "qos 1", 1, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(aclient, topics[0], 5, "qos 2", 2, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	msleep(1000);
+
+	rc = MQTTClient_disconnect(aclient, 10000);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	assert("3 Messages received", messageCount == 3, "messageCount was %d", messageCount);
+	clearMessages();
+
+	/*opts.MQTTVersion = MQTTVERSION_3_1;
+	rc = MQTTClient_connect(aclient, &opts); // should fail - wrong protocol version
+	assert("Bad rc from connect", rc == MQTTCLIENT_FAILURE, "rc was %d", rc);*/
+	
+	MQTTClient_destroy(&aclient);
+
+	MyLog(LOGA_INFO, "Basic test %s", (failures == 0) ?  "succeeded" : "failed");
+	return failures;
+}
+
+
+
+int offline_message_queueing_test(void)
+{
+	int i, rc;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient aclient;
+	MQTTClient bclient;
+
+	MyLog(LOGA_INFO, "Offline message queueing test");
+
+	tests = failures = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 0;
+	opts.username = options.username;
+	opts.password = options.password;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_setCallbacks(aclient, NULL, NULL, messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_subscribe(aclient, wildtopics[5], 2);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_disconnect(aclient, 100);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_create(&bclient, options.connection, options.clientid2, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	opts.cleansession = 1;
+	rc = MQTTClient_connect(bclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(bclient, topics[1], 5, "qos 0", 0, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(bclient, topics[2], 5, "qos 1", 1, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);	
+
+	rc = MQTTClient_publish(bclient, topics[3], 5, "qos 2", 2, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	msleep(2000);
+
+	rc = MQTTClient_disconnect(bclient, 100);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&bclient);
+
+	opts.cleansession = 0;
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+    msleep(1000);  // receive the queued messages
+
+	rc = MQTTClient_disconnect(aclient, 100);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&aclient);
+
+	assert("2 or 3 messages received", messageCount == 3 || messageCount == 2, "messageCount was %d", messageCount);
+
+	MyLog(LOGA_INFO, "This server %s queueing QoS 0 messages for offline clients", (messageCount == 3) ? "is" : "is not");
+
+	clearMessages();
+
+	MyLog(LOGA_INFO, "Offline message queueing test %s", (failures == 0) ?  "succeeded" : "failed");
+	return failures;
+}
+
+
+int retained_message_test(void)
+{ 
+	int i, rc;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient aclient;
+
+	MyLog(LOGA_INFO, "Retained message test");
+
+	tests = failures = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = options.username;
+	opts.password = options.password;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	assert("0 messages received", messageCount == 0, "messageCount was %d", messageCount);
+  
+    // set retained messages
+	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_setCallbacks(aclient, NULL, NULL, messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(aclient, topics[1], 5, "qos 0", 0, 1, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(aclient, topics[2], 5, "qos 1", 1, 1, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);	
+
+	rc = MQTTClient_publish(aclient, topics[3], 5, "qos 2", 2, 1, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+    msleep(1000);
+
+	rc = MQTTClient_subscribe(aclient, wildtopics[5], 2);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+    msleep(2000);
+
+	rc = MQTTClient_disconnect(aclient, 100);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	assert("3 messages received", messageCount == 3, "messageCount was %d", messageCount);
+
+	for (i = 0; i < messageCount; ++i)
+	{
+		assert("messages should be retained", messagesArrived[i].m->retained, "retained was %d", 
+			messagesArrived[i].m->retained);
+		MQTTClient_free(messagesArrived[i].topicName);
+		MQTTClient_freeMessage(&messagesArrived[i].m);
+	}
+	messageCount = 0;
+
+    // clear retained messages
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(aclient, topics[1], 0, "", 0, 1, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(aclient, topics[2], 0, "", 1, 1, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);	
+
+	rc = MQTTClient_publish(aclient, topics[3], 0, "", 2, 1, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+    msleep(200); // wait for QoS 2 exchange to be completed
+	rc = MQTTClient_subscribe(aclient, wildtopics[5], 2);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+    msleep(200);
+
+	rc = MQTTClient_disconnect(aclient, 100);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	assert("0 messages received", messageCount == 0, "messageCount was %d", messageCount);
+
+	MQTTClient_destroy(&aclient);
+
+	MyLog(LOGA_INFO, "Retained message test %s", (failures == 0) ?  "succeeded" : "failed");
+	return failures;
+}
+
+#define SOCKET_ERROR -1
+
+int test6_socket_error(char* aString, int sock)
+{
+#if defined(WIN32)
+	int errno;
+#endif
+
+#if defined(WIN32)
+	errno = WSAGetLastError();
+#endif
+	if (errno != EINTR && errno != EAGAIN && errno != EINPROGRESS && errno != EWOULDBLOCK)
+	{
+		if (strcmp(aString, "shutdown") != 0 || (errno != ENOTCONN && errno != ECONNRESET))
+			printf("Socket error %d in %s for socket %d", errno, aString, sock);
+	}
+	return errno;
+}
+
+int test6_socket_close(int socket)
+{
+	int rc;
+
+#if defined(WIN32)
+	if (shutdown(socket, SD_BOTH) == SOCKET_ERROR)
+		test6_socket_error("shutdown", socket);
+	if ((rc = closesocket(socket)) == SOCKET_ERROR)
+		test6_socket_error("close", socket);
+#else
+	if (shutdown(socket, SHUT_RDWR) == SOCKET_ERROR)
+		test6_socket_error("shutdown", socket);
+	if ((rc = close(socket)) == SOCKET_ERROR)
+		test6_socket_error("close", socket);
+#endif
+	return rc;
+}
+
+typedef struct
+{
+	int socket;
+	time_t lastContact;
+#if defined(OPENSSL)
+	SSL* ssl;
+	SSL_CTX* ctx;
+#endif
+} networkHandles;
+
+
+typedef struct
+{
+	char* clientID;					/**< the string id of the client */
+	char* username;					/**< MQTT v3.1 user name */
+	char* password;					/**< MQTT v3.1 password */
+	unsigned int cleansession : 1;	/**< MQTT clean session flag */
+	unsigned int connected : 1;		/**< whether it is currently connected */
+	unsigned int good : 1; 			/**< if we have an error on the socket we turn this off */
+	unsigned int ping_outstanding : 1;
+	int connect_state : 4;
+	networkHandles net;
+/* ... */
+} Clients;
+
+
+typedef struct
+{
+	char* serverURI;
+	Clients* c;
+	MQTTClient_connectionLost* cl;
+	MQTTClient_messageArrived* ma;
+	MQTTClient_deliveryComplete* dc;
+	void* context;
+
+	int connect_sem;
+	int rc; /* getsockopt return code in connect */
+	int connack_sem;
+	int suback_sem;
+	int unsuback_sem;
+	void* pack;
+} MQTTClients;
+
+ 
+int will_message_test(void)
+{
+	int i, rc, count = 0;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts =  MQTTClient_willOptions_initializer;
+	MQTTClient aclient, bclient;
+
+	MyLog(LOGA_INFO, "Will message test");
+
+	tests = failures = 0;
+
+	opts.keepAliveInterval = 2;
+	opts.cleansession = 1;
+	opts.username = options.username;
+	opts.password = options.password;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	opts.will = &wopts;
+	opts.will->message = "client not disconnected";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = topics[2];
+
+	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_create(&bclient, options.connection, options.clientid2, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_setCallbacks(bclient, NULL, NULL, messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.will = NULL;
+	rc = MQTTClient_connect(bclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_subscribe(bclient, topics[2], 2);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+    msleep(100);
+
+   	test6_socket_close(((MQTTClients*)aclient)->c->net.socket); 
+
+	while (messageCount == 0 && ++count < 10)
+    	msleep(1000);
+
+	rc = MQTTClient_disconnect(bclient, 100);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&bclient);
+
+	assert("will message received", messageCount == 1, "messageCount was %d", messageCount);
+
+	rc = MQTTClient_disconnect(aclient, 100);
+
+	MQTTClient_destroy(&aclient);
+
+	MyLog(LOGA_INFO, "Will message test %s", (failures == 0) ?  "succeeded" : "failed");
+	return failures;
+}
+
+
+int overlapping_subscriptions_test(void)
+{
+  /* overlapping subscriptions. When there is more than one matching subscription for the same client for a topic,
+   the server may send back one message with the highest QoS of any matching subscription, or one message for
+   each subscription with a matching QoS. */
+
+	int i, rc;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient aclient;
+	char* topicList[] = {wildtopics[6], wildtopics[0]};
+	int qosList[] = {2, 1};
+
+	MyLog(LOGA_INFO, "Starting overlapping subscriptions test");
+
+	clearMessages();
+	tests = failures = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = options.username;
+	opts.password = options.password;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_setCallbacks(aclient, NULL, NULL, messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_subscribeMany(aclient, 2, topicList, qosList);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(aclient, topics[3], strlen("overlapping topic filters") + 1, 
+                "overlapping topic filters", 2, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+    msleep(1000);
+
+	assert("1 or 2 messages received", messageCount == 1 || messageCount == 2, "messageCount was %d", messageCount);
+
+    if (messageCount == 1)
+	{
+		MyLog(LOGA_INFO, "This server is publishing one message for all matching overlapping subscriptions, not one for each.");
+		assert("QoS should be 2", messagesArrived[0].m->qos == 2, "QoS was %d", messagesArrived[0].m->qos);
+	}
+    else
+	{
+		MyLog(LOGA_INFO, "This server is publishing one message per each matching overlapping subscription.");
+		assert1("QoSs should be 1 and 2", 
+			(messagesArrived[0].m->qos == 2 && messagesArrived[1].m->qos == 1) ||
+      		(messagesArrived[0].m->qos == 1 && messagesArrived[1].m->qos == 2),
+		"QoSs were %d %d", messagesArrived[0].m->qos, messagesArrived[1].m->qos);
+	}
+
+	rc = MQTTClient_disconnect(aclient, 100);
+
+	MQTTClient_destroy(&aclient);
+
+	MyLog(LOGA_INFO, "Overlapping subscription test %s", (failures == 0) ?  "succeeded" : "failed");
+	return failures;
+}
+
+
+int keepalive_test(void)
+{
+	/* keepalive processing.  We should be kicked off by the server if we don't send or receive any data, and don't send
+	any pings either. */
+
+	int i, rc, count = 0;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts =  MQTTClient_willOptions_initializer;
+	MQTTClient aclient, bclient;
+
+	MyLog(LOGA_INFO, "Starting keepalive test");
+
+	tests = failures = 0;
+	clearMessages();
+
+	opts.cleansession = 1;
+	opts.username = options.username;
+	opts.password = options.password;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	opts.will = &wopts;
+	opts.will->message = "keepalive expiry";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = topics[4];
+
+	opts.keepAliveInterval = 20;
+	rc = MQTTClient_create(&bclient, options.connection, options.clientid2, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_setCallbacks(bclient, NULL, NULL, messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_connect(bclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_subscribe(bclient, topics[4], 2);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 2;
+	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	while (messageCount == 0 && ++count < 20)
+    	msleep(1000);
+
+	rc = MQTTClient_disconnect(bclient, 100);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	assert("Should have will message", messageCount == 1, "messageCount was %d", messageCount);
+
+	rc = MQTTClient_disconnect(aclient, 100);
+
+	MQTTClient_destroy(&aclient);
+
+	MyLog(LOGA_INFO, "Keepalive test %s", (failures == 0) ?  "succeeded" : "failed");
+	return failures;
+}
+
+
+
+int redelivery_on_reconnect_test(void)
+{
+	/* redelivery on reconnect. When a QoS 1 or 2 exchange has not been completed, the server should retry the 
+	 appropriate MQTT packets */
+
+	int i, rc, count = 0;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient aclient;
+
+	MyLog(LOGA_INFO, "Starting redelivery on reconnect test");
+
+	tests = failures = 0;
+	clearMessages();
+
+	opts.keepAliveInterval = 0;
+	opts.cleansession = 0;
+	opts.username = options.username;
+	opts.password = options.password;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_subscribe(aclient, wildtopics[6], 2);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	MQTTClient_yield();
+
+    // no background processing because no callback has been set
+	rc = MQTTClient_publish(aclient, topics[1], 6, "qos 1", 2, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(aclient, topics[3], 6, "qos 2", 2, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_disconnect(aclient, 0);
+
+	assert("No messages should have been received yet", messageCount == 0, "messageCount was %d", messageCount);
+
+	rc = MQTTClient_setCallbacks(aclient, NULL, NULL, messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	while (messageCount < 2 && ++count < 5)
+		msleep(1000);
+
+	assert("Should have 2 messages", messageCount == 2, "messageCount was %d", messageCount);
+
+	rc = MQTTClient_disconnect(aclient, 100);
+
+	MQTTClient_destroy(&aclient);
+
+	MyLog(LOGA_INFO, "Redelivery on reconnect test %s", (failures == 0) ?  "succeeded" : "failed");
+	return failures;
+}
+
+
+
+int zero_length_clientid_test(void)
+{
+	int i, rc, count = 0;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient aclient;
+
+	MyLog(LOGA_INFO, "Starting zero length clientid test");
+
+	tests = failures = 0;
+	clearMessages();
+
+	opts.keepAliveInterval = 0;
+	opts.cleansession = 0;
+	opts.username = options.username;
+	opts.password = options.password;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	rc = MQTTClient_create(&aclient, options.connection, "", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("rc 2 from connect", rc == 2, "rc was %d", rc); // this should always fail
+
+	opts.cleansession = 1;
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Connack rc should be 0 or 2", rc == MQTTCLIENT_SUCCESS || rc == 2, "rc was %d", rc);
+
+	MyLog(LOGA_INFO, "This server %s support zero length clientids", (rc == 2) ? "does not" : "does");
+
+	if (rc == MQTTCLIENT_SUCCESS)
+		rc = MQTTClient_disconnect(aclient, 100);
+
+	MQTTClient_destroy(&aclient);
+
+	MyLog(LOGA_INFO, "Zero length clientid test %s", (failures == 0) ?  "succeeded" : "failed");
+	return failures;
+}
+
+
+int dollar_topics_test(void)
+{
+  /* $ topics. The specification says that a topic filter which starts with a wildcard does not match topic names that
+   	begin with a $.  Publishing to a topic which starts with a $ may not be allowed on some servers (which is entirely valid),
+   	so this test will not work and should be omitted in that case.
+	*/
+	int i, rc, count = 0;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient aclient;
+	char dollartopic[20];
+
+	MyLog(LOGA_INFO, "Starting $ topics test");
+
+	sprintf(dollartopic, "$%s", topics[1]);
+  
+    clearMessages();
+
+	opts.keepAliveInterval = 5;
+	opts.cleansession = 1;
+	opts.username = options.username;
+	opts.password = options.password;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_setCallbacks(aclient, NULL, NULL, messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_subscribe(aclient, wildtopics[5], 2);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+    msleep(1000); // wait for any retained messages, hopefully
+    clearMessages();
+
+	rc = MQTTClient_publish(aclient, topics[1], 20, "not sent to dollar topic", 1, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_publish(aclient, dollartopic, 20, "sent to dollar topic", 1, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+    msleep(1000);
+	assert("Should have 1 message", messageCount == 1, "messageCount was %d", messageCount);
+
+	rc = MQTTClient_disconnect(aclient, 100);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&aclient);
+
+	MyLog(LOGA_INFO, "$ topics test %s", (failures == 0) ?  "succeeded" : "failed");
+	return failures;
+}
+
+
+int subscribe_failure_test(void)
+{
+  /* Subscribe failure.  A new feature of MQTT 3.1.1 is the ability to send back negative reponses to subscribe
+   requests.  One way of doing this is to subscribe to a topic which is not allowed to be subscribed to.
+  */
+	int i, rc, count = 0;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient aclient;
+	int subqos = 2;
+
+	MyLog(LOGA_INFO, "Starting subscribe failure test");
+  
+    clearMessages();
+
+	opts.keepAliveInterval = 5;
+	opts.cleansession = 1;
+	opts.username = options.username;
+	opts.password = options.password;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	rc = MQTTClient_create(&aclient, options.connection, options.clientid1, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_setCallbacks(aclient, NULL, NULL, messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_connect(aclient, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+ 
+	rc = MQTTClient_subscribeMany(aclient, 1, &nosubscribe_topics[0], &subqos);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	assert("0x80 rc from subscribe", subqos == 0x80, "subqos was %d", subqos);
+
+	rc = MQTTClient_disconnect(aclient, 100);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&aclient);
+
+	MyLog(LOGA_INFO, "Subscribe failure test %s", (failures == 0) ?  "succeeded" : "failed");
+	return failures;
+}
+
+
+int main(int argc, char** argv)
+{
+	int i;
+	int all_failures = 0;
+
+	getopts(argc, argv);
+
+	for (i = 0; i < options.iterations; ++i)
+	{
+		cleanup();
+		all_failures += basic_test() + 
+						offline_message_queueing_test() +
+		                retained_message_test() +
+		                will_message_test() +
+		                overlapping_subscriptions_test() +
+		                keepalive_test() +
+						redelivery_on_reconnect_test() + 
+						zero_length_clientid_test();
+
+		if (options.run_dollar_topics_test)
+			all_failures += dollar_topics_test();
+		
+		if (options.run_subscribe_failure_test)
+			all_failures += subscribe_failure_test();
+	}
+
+	MyLog(LOGA_INFO, "Test suite %s", (all_failures == 0) ?  "succeeded" : "failed");
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+
+
+
+
diff --git a/mqtt/src/test/test1.c b/mqtt/src/test/test1.c
new file mode 100644
index 00000000..0e4e2e9e
--- /dev/null
+++ b/mqtt/src/test/test1.c
@@ -0,0 +1,1185 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - change will message test back to using proxy
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * Tests for the MQ Telemetry MQTT C client
+ */
+
+#include "MQTTClient.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+  #include <sys/time.h>
+  #include <sys/socket.h>
+  #include <unistd.h>
+  #include <errno.h>
+#else
+  #include <windows.h>
+  #define setenv(a, b, c) _putenv_s(a, b)
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;         /**< connection to system under test. */
+	char** haconnections;
+	char* proxy_connection;
+	int hacount;
+	int verbose;
+	int test_no;
+	int MQTTVersion;
+	int iterations;
+} options =
+{
+	"tcp://mqtt.eclipse.org:1883",
+	NULL,
+	"tcp://localhost:1883",
+	0,
+	0,
+	0,
+	MQTTVERSION_DEFAULT,
+	1,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+			{
+				options.connection = argv[count];
+				printf("\nSetting connection to %s\n", options.connection);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--haconnections") == 0)
+		{
+			if (++count < argc)
+			{
+				char* tok = strtok(argv[count], " ");
+				options.hacount = 0;
+				options.haconnections = malloc(sizeof(char*) * 5);
+				while (tok)
+				{
+					options.haconnections[options.hacount] = malloc(strlen(tok) + 1);
+					strcpy(options.haconnections[options.hacount], tok);
+					options.hacount++;
+					tok = strtok(NULL, " ");
+				}
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--proxy_connection") == 0)
+		{
+			if (++count < argc)
+				options.proxy_connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--MQTTversion") == 0)
+		{
+			if (++count < argc)
+			{
+				options.MQTTVersion = atoi(argv[count]);
+				printf("setting MQTT version to %d\n", options.MQTTVersion);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--iterations") == 0)
+		{
+			if (++count < argc)
+				options.iterations = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+		{
+			options.verbose = 1;
+			printf("\nSetting verbose on\n");
+		}
+		count++;
+	}
+}
+
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		MyLog(LOGA_INFO, "Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+	else
+		MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+}
+
+
+/*********************************************************************
+
+Test1: single-threaded client
+
+*********************************************************************/
+void test1_sendAndReceive(MQTTClient* c, int qos, char* test_topic)
+{
+	MQTTClient_deliveryToken dt;
+	MQTTClient_message pubmsg = MQTTClient_message_initializer;
+	MQTTClient_message* m = NULL;
+	char* topicName = NULL;
+	int topicLen;
+	int i = 0;
+	int iterations = 50;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "%d messages at QoS %d", iterations, qos);
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = qos;
+	pubmsg.retained = 0;
+
+	for (i = 0; i< iterations; ++i)
+	{
+		if (i % 10 == 0)
+			rc = MQTTClient_publish(c, test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, &dt);
+		else
+			rc = MQTTClient_publishMessage(c, test_topic, &pubmsg, &dt);
+		assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+		if (qos > 0)
+		{
+			rc = MQTTClient_waitForCompletion(c, dt, 5000L);
+			assert("Good rc from waitforCompletion", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		}
+
+		rc = MQTTClient_receive(c, &topicName, &topicLen, &m, 5000);
+		assert("Good rc from receive", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		if (topicName)
+		{
+			MyLog(LOGA_DEBUG, "Message received on topic %s is %.*s", topicName, m->payloadlen, (char*)(m->payload));
+			if (pubmsg.payloadlen != m->payloadlen ||
+					memcmp(m->payload, pubmsg.payload, m->payloadlen) != 0)
+			{
+				failures++;
+				MyLog(LOGA_INFO, "Error: wrong data - received lengths %d %d", pubmsg.payloadlen, m->payloadlen);
+				break;
+			}
+			MQTTClient_free(topicName);
+			MQTTClient_freeMessage(&m);
+		}
+		else
+			printf("No message received within timeout period\n");
+	}
+
+	/* receive any outstanding messages */
+	MQTTClient_receive(c, &topicName, &topicLen, &m, 2000);
+	while (topicName)
+	{
+		printf("Message received on topic %s is %.*s.\n", topicName, m->payloadlen, (char*)(m->payload));
+		MQTTClient_free(topicName);
+		MQTTClient_freeMessage(&m);
+		MQTTClient_receive(c, &topicName, &topicLen, &m, 2000);
+	}
+}
+
+
+int test1(struct Options options)
+{
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"single threaded client using receive\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 1 - single threaded client using receive");
+
+	rc = MQTTClient_create(&c, options.connection, "single_threaded_test",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTClient_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	test1_sendAndReceive(c, 0, test_topic);
+	test1_sendAndReceive(c, 1, test_topic);
+	test1_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping\n");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	rc = MQTTClient_disconnect(c, 0);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	/* Just to make sure we can connect again */
+	rc = MQTTClient_connect(c, &opts);
+	assert("Connect successful",  rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	rc = MQTTClient_disconnect(c, 0);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST1: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test2: multi-threaded client using callbacks
+
+*********************************************************************/
+volatile int test2_arrivedcount = 0;
+int test2_deliveryCompleted = 0;
+MQTTClient_message test2_pubmsg = MQTTClient_message_initializer;
+
+void test2_deliveryComplete(void* context, MQTTClient_deliveryToken dt)
+{
+	++test2_deliveryCompleted;
+}
+
+int test2_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* m)
+{
+	++test2_arrivedcount;
+	MyLog(LOGA_DEBUG, "Callback: %d message received on topic %s is %.*s.",
+					test2_arrivedcount, topicName, m->payloadlen, (char*)(m->payload));
+	if (test2_pubmsg.payloadlen != m->payloadlen ||
+					memcmp(m->payload, test2_pubmsg.payload, m->payloadlen) != 0)
+	{
+		failures++;
+		MyLog(LOGA_INFO, "Error: wrong data received lengths %d %d\n", test2_pubmsg.payloadlen, m->payloadlen);
+	}
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&m);
+	return 1;
+}
+
+
+void test2_sendAndReceive(MQTTClient* c, int qos, char* test_topic)
+{
+	MQTTClient_deliveryToken dt;
+	int i = 0;
+	int iterations = 50;
+	int rc = 0;
+	int wait_seconds = 0;
+
+	test2_deliveryCompleted = 0;
+
+	MyLog(LOGA_INFO, "%d messages at QoS %d", iterations, qos);
+	test2_pubmsg.payload = "a much longer message that we can shorten to the extent that we need to";
+	test2_pubmsg.payloadlen = 27;
+	test2_pubmsg.qos = qos;
+	test2_pubmsg.retained = 0;
+
+	for (i = 1; i <= iterations; ++i)
+	{
+		if (i % 10 == 0)
+			rc = MQTTClient_publish(c, test_topic, test2_pubmsg.payloadlen, test2_pubmsg.payload,
+                   test2_pubmsg.qos, test2_pubmsg.retained, NULL);
+		else
+			rc = MQTTClient_publishMessage(c, test_topic, &test2_pubmsg, &dt);
+		assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(100000L);
+		#endif
+
+		wait_seconds = 10;
+		while ((test2_arrivedcount < i) && (wait_seconds-- > 0))
+		{
+			MyLog(LOGA_DEBUG, "Arrived %d count %d", test2_arrivedcount, i);
+			#if defined(WIN32)
+				Sleep(1000);
+			#else
+				usleep(1000000L);
+			#endif
+		}
+		assert("Message Arrived", wait_seconds > 0,
+				"Time out waiting for message %d\n", i );
+	}
+	if (qos > 0)
+	{
+		/* MQ Telemetry can send a message to a subscriber before the server has
+		   completed the QoS 2 handshake with the publisher. For QoS 1 and 2,
+		   allow time for the final delivery complete callback before checking
+		   that all expected callbacks have been made */
+		wait_seconds = 10;
+		while ((test2_deliveryCompleted < iterations) && (wait_seconds-- > 0))
+		{
+			MyLog(LOGA_DEBUG, "Delivery Completed %d count %d", test2_deliveryCompleted, i);
+			#if defined(WIN32)
+				Sleep(1000);
+			#else
+				usleep(1000000L);
+			#endif
+		}
+		assert("All Deliveries Complete", wait_seconds > 0,
+			   "Number of deliveryCompleted callbacks was %d\n",
+			   test2_deliveryCompleted);
+	}
+}
+
+
+int test2(struct Options options)
+{
+	char* testname = "test2";
+	int subsqos = 2;
+	/* TODO - usused - remove ? MQTTClient_deliveryToken* dt = NULL; */
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test2";
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"multi-threaded client using callbacks\"");
+	MyLog(LOGA_INFO, "Starting test 2 - multi-threaded client using callbacks");
+	global_start_time = start_clock();
+	failures = 0;
+
+	MQTTClient_create(&c, options.connection, "multi_threaded_sample", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.username = "testuser";
+	opts.binarypwd.data = "testpassword";
+	opts.binarypwd.len = (int)strlen(opts.binarypwd.data);
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test2_messageArrived, test2_deliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTClient_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	test2_sendAndReceive(c, 0, test_topic);
+	test2_sendAndReceive(c, 1, test_topic);
+	test2_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	rc = MQTTClient_disconnect(c, 0);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test 3: connack return codes
+
+for AMQTDD, needs an amqtdd.cfg of:
+
+	allow_anonymous false
+  password_file passwords
+
+and a passwords file of:
+
+	Admin:Admin
+
+*********************************************************************/
+int test3(struct Options options)
+{
+	char* testname = "test3";
+	int rc;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"connack return codes\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 3 - connack return codes");
+
+#if 0
+	/* clientid too long (RC = 2) */
+	rc = MQTTClient_create(&c, options.connection, "client_ID_too_long_for_MQTT_protocol_version_3",
+		MQTTCLIENT_PERSISTENCE_NONE, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	rc = MQTTClient_connect(c, &opts);
+	assert("identifier rejected", rc == 2, "rc was %d\n", rc);
+	MQTTClient_destroy(&c);
+#endif
+	/* broker unavailable (RC = 3)  - TDD when allow_anonymous not set*/
+	rc = MQTTClient_create(&c, options.connection, "The C Client", MQTTCLIENT_PERSISTENCE_NONE, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+#if 0
+	rc = MQTTClient_connect(c, &opts);
+	assert("broker unavailable", rc == 3, "rc was %d\n", rc);
+
+	/* authentication failure (RC = 4) */
+	opts.username = "Admin";
+	opts.password = "fred";
+	rc = MQTTClient_connect(c, &opts);
+	assert("Bad user name or password", rc == 4, "rc was %d\n", rc);
+#endif
+
+	/* authorization failure (RC = 5) */
+	opts.username = "Admin";
+	opts.password = "Admin";
+	/*opts.will = &wopts;    "Admin" not authorized to publish to Will topic by default
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";*/
+	rc = MQTTClient_connect(c, &opts);
+	//assert("Not authorized", rc == 5, "rc was %d\n", rc);
+
+#if 0
+	/* successful connection (RC = 0) */
+	opts.username = "Admin";
+	opts.password = "Admin";
+  opts.will = NULL;
+	rc = MQTTClient_connect(c, &opts);
+	assert("successful connection", rc == MQTTCLIENT_SUCCESS,  "rc was %d\n", rc);
+	MQTTClient_disconnect(c, 0);
+	MQTTClient_destroy(&c);
+#endif
+
+/* TODO - unused - remove ? exit: */
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test 4: client persistence 1
+
+
+*********************************************************************/
+int test4_run(int qos)
+{
+	char* testname = "test 4";
+	char* topic = "Persistence test 1";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_message* m = NULL;
+	char* topicName = NULL;
+	int topicLen;
+	MQTTClient_deliveryToken* tokens = NULL;
+	int mytoken = -99;
+	char buffer[100];
+	int count = 3;
+	int i, rc;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 4 - persistence, qos %d", qos);
+
+	MQTTClient_create(&c, options.connection, "xrctest1_test_4", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+
+	opts.keepAliveInterval = 20;
+	opts.reliable = 0;
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	MyLog(LOGA_DEBUG, "Cleanup by connecting clean session\n");
+	opts.cleansession = 1;
+	if ((rc = MQTTClient_connect(c, &opts)) != 0)
+	{
+  		assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		return -1;
+	}
+	opts.cleansession = 0;
+	MQTTClient_disconnect(c, 0);
+
+	MyLog(LOGA_DEBUG, "Connecting\n");
+	if ((rc = MQTTClient_connect(c, &opts)) != 0)
+	{
+  		assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		return -1;
+	}
+
+	/* subscribe so we can get messages back */
+	rc = MQTTClient_subscribe(c, topic, subsqos);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	/* send messages so that we can receive the same ones */
+	for (i = 0; i < count; ++i)
+	{
+		sprintf(buffer, "Message sequence no %d", i);
+		rc = MQTTClient_publish(c, topic, 10, buffer, qos, 0, NULL);
+		assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	}
+
+	/* disconnect immediately without receiving the incoming messages */
+	MQTTClient_disconnect(c, 0); /* now there should be "orphaned" publications */
+
+	rc = MQTTClient_getPendingDeliveryTokens(c, &tokens);
+ 	assert("getPendingDeliveryTokens rc == 0", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	assert("should get some tokens back", tokens != NULL, "tokens was %p", tokens);
+	if (tokens)
+	{
+		int i = 0;
+
+		while (tokens[i] != -1)
+			MyLog(LOGA_DEBUG, "Pending delivery token %d", tokens[i++]);
+		MQTTClient_free(tokens);
+		assert1("no of tokens should be count", i == count, "no of tokens %d count %d", i, count);
+		mytoken = tokens[0];
+	}
+
+	MQTTClient_destroy(&c); /* force re-reading persistence on create */
+
+	MQTTClient_create(&c, options.connection, "xrctest1_test_4", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+
+	rc = MQTTClient_getPendingDeliveryTokens(c, &tokens);
+	assert("getPendingDeliveryTokens rc == 0", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	assert("should get some tokens back", tokens != NULL, "tokens was %p", tokens);
+	if (tokens)
+	{
+		int i = 0;
+		while (tokens[i] != -1)
+			MyLog(LOGA_DEBUG, "Pending delivery token %d", tokens[i++]);
+		MQTTClient_free(tokens);
+		assert1("no of tokens should be count", i == count, "no of tokens %d count %d", i, count);
+	}
+
+	MyLog(LOGA_DEBUG, "Reconnecting");
+	if (MQTTClient_connect(c, &opts) != 0)
+	{
+		assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		return -1;
+	}
+
+	for (i = 0; i < count; ++i)
+	{
+  		int dup = 0;
+		do
+		{
+    		dup = 0;
+			MQTTClient_receive(c, &topicName, &topicLen, &m, 5000);
+			if (m && m->dup)
+			{
+				assert("No duplicates should be received for qos 2", qos == 1, "qos is %d", qos);
+				MyLog(LOGA_DEBUG, "Duplicate message id %d", m->msgid);
+				MQTTClient_freeMessage(&m);
+				MQTTClient_free(topicName);
+  	    		dup = 1;
+			}
+		} while (dup == 1);
+		assert("should get a message", m != NULL, "m was %p", m);
+		if (m)
+		{
+			MyLog(LOGA_DEBUG, "Received message id %d", m->msgid);
+			assert("topicName is correct", strcmp(topicName, topic) == 0, "topicName is %s", topicName);
+			MQTTClient_freeMessage(&m);
+			MQTTClient_free(topicName);
+		}
+	}
+
+	MQTTClient_yield();  /* allow any unfinished protocol exchanges to finish */
+
+	rc = MQTTClient_getPendingDeliveryTokens(c, &tokens);
+	assert("getPendingDeliveryTokens rc == 0", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	assert("should get no tokens back", tokens == NULL, "tokens was %p", tokens);
+
+	MQTTClient_disconnect(c, 0);
+
+	MQTTClient_destroy(&c);
+
+/* TODO - unused -remove? exit: */
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+
+	return failures;
+}
+
+
+int test4(struct Options options)
+{
+	int rc = 0;
+	fprintf(xml, "<testcase classname=\"test1\" name=\"persistence\"");
+	global_start_time = start_clock();
+	rc = test4_run(1) + test4_run(2);
+	fprintf(xml, " time=\"%ld\" >\n", elapsed(global_start_time) / 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+	return rc;
+}
+
+
+/*********************************************************************
+
+Test 5: disconnect with quiesce timeout should allow exchanges to complete
+
+*********************************************************************/
+int test5(struct Options options)
+{
+	char* testname = "test 5";
+	char* topic = "Persistence test 2";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_deliveryToken* tokens = NULL;
+	char buffer[100];
+	int count = 5;
+	int i, rc;
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"disconnect with quiesce timeout should allow exchanges to complete\"");
+	global_start_time = start_clock();
+	failures = 0;
+ 	MyLog(LOGA_INFO, "Starting test 5 - disconnect with quiesce timeout should allow exchanges to complete");
+
+	MQTTClient_create(&c, options.connection, "xrctest1_test_5", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 0;
+	opts.reliable = 0;
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	if ((rc = MQTTClient_connect(c, &opts)) != 0)
+	{
+		assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTClient_subscribe(c, topic, subsqos);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	for (i = 0; i < count; ++i)
+	{
+		sprintf(buffer, "Message sequence no %d", i);
+		rc = MQTTClient_publish(c, topic, 10, buffer, 1, 0, NULL);
+		assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	}
+
+	MQTTClient_disconnect(c, 1000); /* now there should be no "orphaned" publications */
+	MyLog(LOGA_DEBUG, "Disconnected");
+
+	rc = MQTTClient_getPendingDeliveryTokens(c, &tokens);
+ 	assert("getPendingDeliveryTokens rc == 0", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	assert("should get no tokens back", tokens == NULL, "tokens was %p", tokens);
+
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test 6: connectionLost and will message
+
+*********************************************************************/
+MQTTClient test6_c1, test6_c2;
+volatile int test6_will_message_arrived = 0;
+volatile int test6_connection_lost_called = 0;
+
+void test6_connectionLost(void* context, char* cause)
+{
+	MQTTClient c = (MQTTClient)context;
+	printf("%s -> Callback: connection lost\n", (c == test6_c1) ? "Client-1" : "Client-2");
+	test6_connection_lost_called = 1;
+}
+
+void test6_deliveryComplete(void* context, MQTTClient_deliveryToken token)
+{
+	printf("Client-2 -> Callback: publish complete for token %d\n", token);
+}
+
+char* test6_will_topic = "C Test 2: will topic";
+char* test6_will_message = "will message from Client-1";
+
+int test6_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* m)
+{
+	MQTTClient c = (MQTTClient)context;
+	printf("%s -> Callback: message received on topic '%s' is '%.*s'.\n",
+			 (c == test6_c1) ? "Client-1" : "Client-2", topicName, m->payloadlen, (char*)(m->payload));
+	if (c == test6_c2 && strcmp(topicName, test6_will_topic) == 0 && memcmp(m->payload, test6_will_message, m->payloadlen) == 0)
+		test6_will_message_arrived = 1;
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&m);
+	return 1;
+}
+
+
+int test6(struct Options options)
+{
+	char* testname = "test6";
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts =  MQTTClient_willOptions_initializer;
+	MQTTClient_connectOptions opts2 = MQTTClient_connectOptions_initializer;
+	int rc, count;
+	char* mqttsas_topic = "MQTTSAS topic";
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 6 - connectionLost and will messages");
+	fprintf(xml, "<testcase classname=\"test1\" name=\"connectionLost and will messages\"");
+	global_start_time = start_clock();
+
+	opts.keepAliveInterval = 2;
+	opts.cleansession = 1;
+	opts.MQTTVersion = MQTTVERSION_3_1_1;
+	opts.will = &wopts;
+	opts.will->message = test6_will_message;
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = test6_will_topic;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	/* Client-1 with Will options */
+	rc = MQTTClient_create(&test6_c1, options.proxy_connection, "Client_1", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	rc = MQTTClient_setCallbacks(test6_c1, (void*)test6_c1, test6_connectionLost, test6_messageArrived, test6_deliveryComplete);
+	assert("good rc from setCallbacks",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	/* Connect to the broker */
+	rc = MQTTClient_connect(test6_c1, &opts);
+	assert("good rc from connect",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	/* Client - 2 (multi-threaded) */
+	rc = MQTTClient_create(&test6_c2, options.connection, "Client_2", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	/* Set the callback functions for the client */
+	rc = MQTTClient_setCallbacks(test6_c2, (void*)test6_c2, test6_connectionLost, test6_messageArrived, test6_deliveryComplete);
+	assert("good rc from setCallbacks",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	/* Connect to the broker */
+	opts2.keepAliveInterval = 20;
+	opts2.cleansession = 1;
+	MyLog(LOGA_INFO, "Connecting Client_2 ...");
+	rc = MQTTClient_connect(test6_c2, &opts2);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_subscribe(test6_c2, test6_will_topic, 2);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	/* now send the command which will break the connection and cause the will message to be sent */
+	rc = MQTTClient_publish(test6_c1, mqttsas_topic, (int)strlen("TERMINATE"), "TERMINATE", 0, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	MyLog(LOGA_INFO, "Waiting to receive the will message");
+	count = 0;
+	while (++count < 40)
+	{
+		#if defined(WIN32)
+			Sleep(1000L);
+		#else
+			sleep(1);
+		#endif
+		if (test6_will_message_arrived == 1 && test6_connection_lost_called == 1)
+			break;
+	}
+	assert("will message arrived", test6_will_message_arrived == 1,
+							"will_message_arrived was %d\n", test6_will_message_arrived);
+	assert("connection lost called", test6_connection_lost_called == 1,
+			         "connection_lost_called %d\n", test6_connection_lost_called);
+
+	rc = MQTTClient_unsubscribe(test6_c2, test6_will_topic);
+	assert("Good rc from unsubscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_isConnected(test6_c2);
+	assert("Client-2 still connected", rc == 1, "isconnected is %d", rc);
+
+	rc = MQTTClient_isConnected(test6_c1);
+	assert("Client-1 not connected", rc == 0, "isconnected is %d", rc);
+
+	rc = MQTTClient_disconnect(test6_c2, 100L);
+	assert("Good rc from disconnect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&test6_c1);
+	MQTTClient_destroy(&test6_c2);
+
+exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.\n",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+int test6a(struct Options options)
+{
+	char* testname = "test6a";
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts =  MQTTClient_willOptions_initializer;
+	MQTTClient_connectOptions opts2 = MQTTClient_connectOptions_initializer;
+	int rc, count;
+	char* mqttsas_topic = "MQTTSAS topic";
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 6 - connectionLost and binary will messages");
+	fprintf(xml, "<testcase classname=\"test1\" name=\"connectionLost and binary will messages\"");
+	global_start_time = start_clock();
+
+	opts.keepAliveInterval = 2;
+	opts.cleansession = 1;
+	opts.MQTTVersion = MQTTVERSION_3_1_1;
+	opts.will = &wopts;
+	opts.will->payload.data = test6_will_message;
+	opts.will->payload.len = (int)strlen(test6_will_message) + 1;
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = test6_will_topic;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	/* Client-1 with Will options */
+	rc = MQTTClient_create(&test6_c1, options.proxy_connection, "Client_1", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	rc = MQTTClient_setCallbacks(test6_c1, (void*)test6_c1, test6_connectionLost, test6_messageArrived, test6_deliveryComplete);
+	assert("good rc from setCallbacks",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	/* Connect to the broker */
+	rc = MQTTClient_connect(test6_c1, &opts);
+	assert("good rc from connect",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	/* Client - 2 (multi-threaded) */
+	rc = MQTTClient_create(&test6_c2, options.connection, "Client_2", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	/* Set the callback functions for the client */
+	rc = MQTTClient_setCallbacks(test6_c2, (void*)test6_c2, test6_connectionLost, test6_messageArrived, test6_deliveryComplete);
+	assert("good rc from setCallbacks",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	/* Connect to the broker */
+	opts2.keepAliveInterval = 20;
+	opts2.cleansession = 1;
+	MyLog(LOGA_INFO, "Connecting Client_2 ...");
+	rc = MQTTClient_connect(test6_c2, &opts2);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	rc = MQTTClient_subscribe(test6_c2, test6_will_topic, 2);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	/* now send the command which will break the connection and cause the will message to be sent */
+	rc = MQTTClient_publish(test6_c1, mqttsas_topic, (int)strlen("TERMINATE"), "TERMINATE", 0, 0, NULL);
+	assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	MyLog(LOGA_INFO, "Waiting to receive the will message");
+	count = 0;
+	while (++count < 40)
+	{
+		#if defined(WIN32)
+			Sleep(1000L);
+		#else
+			sleep(1);
+		#endif
+		if (test6_will_message_arrived == 1 && test6_connection_lost_called == 1)
+			break;
+	}
+	assert("will message arrived", test6_will_message_arrived == 1,
+							"will_message_arrived was %d\n", test6_will_message_arrived);
+	assert("connection lost called", test6_connection_lost_called == 1,
+			         "connection_lost_called %d\n", test6_connection_lost_called);
+
+	rc = MQTTClient_unsubscribe(test6_c2, test6_will_topic);
+	assert("Good rc from unsubscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_isConnected(test6_c2);
+	assert("Client-2 still connected", rc == 1, "isconnected is %d", rc);
+
+	rc = MQTTClient_isConnected(test6_c1);
+	assert("Client-1 not connected", rc == 0, "isconnected is %d", rc);
+
+	rc = MQTTClient_disconnect(test6_c2, 100L);
+	assert("Good rc from disconnect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&test6_c1);
+	MQTTClient_destroy(&test6_c2);
+
+exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.\n",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+int main(int argc, char** argv)
+{
+	int rc = 0;
+ 	int (*tests[])() = {NULL, test1, test2, test3, test4, test5, test6, test6a};
+	int i;
+
+	xml = fopen("TEST-test1.xml", "w");
+	fprintf(xml, "<testsuite name=\"test1\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));
+
+	setenv("MQTT_C_CLIENT_TRACE", "ON", 1);
+	setenv("MQTT_C_CLIENT_TRACE_LEVEL", "ERROR", 1);
+
+	getopts(argc, argv);
+
+	for (i = 0; i < options.iterations; ++i)
+	{
+	 	if (options.test_no == 0)
+		{ /* run all the tests */
+ 		   	for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+		}
+		else
+ 		   	rc = tests[options.test_no](options); /* run just the selected test */
+	}
+
+ 	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+	return rc;
+}
diff --git a/mqtt/src/test/test10.c b/mqtt/src/test/test10.c
new file mode 100644
index 00000000..cbd08f7d
--- /dev/null
+++ b/mqtt/src/test/test10.c
@@ -0,0 +1,1847 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - MQTT 5.0 support
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * MQTT V5 specific tests for the MQTT C client
+ *
+ *  - topic aliases
+ *  - subscription ids
+ *  - session expiry
+ *  - payload format
+ *  - flow control
+ *  - QoS 2 exchange termination
+ *  - request/response
+ *  - shared subscriptions
+ *  - server initiated disconnect
+ *  - auth packets
+ *  - server assigned clientid returned in a property
+ *  - server defined keepalive
+ *  - subscribe failure
+ */
+
+
+#include "MQTTClient.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+  #include <sys/time.h>
+  #include <sys/socket.h>
+  #include <unistd.h>
+  #include <errno.h>
+#else
+  #include <windows.h>
+  #define setenv(a, b, c) _putenv_s(a, b)
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;         /**< connection to system under test. */
+	char** haconnections;
+	char* proxy_connection;
+	int hacount;
+	int verbose;
+	int test_no;
+	int MQTTVersion;
+	int iterations;
+} options =
+{
+	"tcp://localhost:1883",
+	NULL,
+	"tcp://localhost:1884",
+	0,
+	0,
+	0,
+	MQTTVERSION_5,
+	1,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+			{
+				options.connection = argv[count];
+				printf("\nSetting connection to %s\n", options.connection);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--haconnections") == 0)
+		{
+			if (++count < argc)
+			{
+				char* tok = strtok(argv[count], " ");
+				options.hacount = 0;
+				options.haconnections = malloc(sizeof(char*) * 5);
+				while (tok)
+				{
+					options.haconnections[options.hacount] = malloc(strlen(tok) + 1);
+					strcpy(options.haconnections[options.hacount], tok);
+					options.hacount++;
+					tok = strtok(NULL, " ");
+				}
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--proxy_connection") == 0)
+		{
+			if (++count < argc)
+				options.proxy_connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--MQTTversion") == 0)
+		{
+			if (++count < argc)
+			{
+				options.MQTTVersion = atoi(argv[count]);
+				printf("setting MQTT version to %d\n", options.MQTTVersion);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--iterations") == 0)
+		{
+			if (++count < argc)
+				options.iterations = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+		{
+			options.verbose = 1;
+			printf("\nSetting verbose on\n");
+		}
+		count++;
+	}
+}
+
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+
+	strcpy(msg_buf, "");
+	ftime(&ts);
+#if defined(WIN32) || defined(_WINDOWS)
+	localtime_s(&timeinfo, &ts.time);
+#else
+	localtime_r(&ts.time, &timeinfo);
+#endif
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", &timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		MyLog(LOGA_INFO, "Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+	else
+		MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+}
+
+
+void logProperties(MQTTProperties *props)
+{
+	int i = 0;
+
+	for (i = 0; i < props->count; ++i)
+	{
+		int id = props->array[i].identifier;
+		const char* name = MQTTPropertyName(id);
+		char* intformat = "Property name %s value %d";
+
+		switch (MQTTProperty_getType(id))
+		{
+		case MQTTPROPERTY_TYPE_BYTE:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.byte);
+		  break;
+		case MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.integer2);
+		  break;
+		case MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_BINARY_DATA:
+		case MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING:
+		  MyLog(LOGA_INFO, "Property name value %s %.*s", name,
+			  props->array[i].value.data.len, props->array[i].value.data.data);
+		  break;
+		case MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR:
+		  MyLog(LOGA_INFO, "Property name %s key %.*s value %.*s", name,
+			  props->array[i].value.data.len, props->array[i].value.data.data,
+		  	  props->array[i].value.value.len, props->array[i].value.value.data);
+		  break;
+		}
+	}
+}
+
+struct
+{
+	int disconnected;
+} test_topic_aliases_globals =
+{
+	0,
+};
+
+void disconnected(void* context, MQTTProperties* props, enum MQTTReasonCodes rc)
+{
+	MQTTClient c = (MQTTClient)context;
+	MyLog(LOGA_INFO, "Callback: disconnected, reason code \"%s\"", MQTTReasonCode_toString(rc));
+	logProperties(props);
+	test_topic_aliases_globals.disconnected = 1;
+}
+
+static int messages_arrived = 0;
+
+int messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* message)
+{
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	if (message->struct_version == 1)
+	{
+		const int props_count = 0;
+
+		assert("Properties count should be 0", message->properties.count == props_count,
+			"Properties count was %d\n", message->properties.count);
+		logProperties(&message->properties);
+	}
+	messages_arrived++;
+
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&message);
+	return 1;
+}
+
+
+int test_client_topic_aliases(struct Options options)
+{
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperties connect_props = MQTTProperties_initializer;
+	MQTTProperty property;
+	MQTTSubscribe_options subopts = MQTTSubscribe_options_initializer;
+	MQTTClient_message pubmsg = MQTTClient_message_initializer;
+	MQTTResponse response = MQTTResponse_initializer;
+	MQTTClient_deliveryToken dt;
+	int rc = 0;
+	int count = 0;
+	char* test_topic = "test_client_topic_aliases";
+	int topicAliasMaximum = 0;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test_client_topic_aliases\" name=\"client topic aliases\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 1 - client topic aliases");
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "client_topic_alias_test",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_setDisconnected(c, c, disconnected);
+	assert("Good rc from setDisconnected", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, NULL, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 1;
+	pubmsg.retained = 0;
+
+	/* a Topic Alias of 0 is not allowed, so we should be disconnected */
+	property.identifier = MQTTPROPERTY_CODE_TOPIC_ALIAS;
+	property.value.integer2 = 0;
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	response = MQTTClient_publishMessage5(c, test_topic, &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+
+	/* Now we expect to receive a disconnect packet telling us why */
+	count = 0;
+	while (test_topic_aliases_globals.disconnected == 0 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("Disconnected should be called", test_topic_aliases_globals.disconnected == 1,
+			"was %d", test_topic_aliases_globals.disconnected);
+
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&connect_props, &property);
+
+	/* Now try a valid topic alias */
+	response = MQTTClient_connect5(c, &opts, &connect_props, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		if (MQTTProperties_hasProperty(response.properties, MQTTPROPERTY_CODE_TOPIC_ALIAS_MAXIMUM))
+			topicAliasMaximum = MQTTProperties_getNumericValue(response.properties, MQTTPROPERTY_CODE_TOPIC_ALIAS_MAXIMUM);
+
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+	assert("topicAliasMaximum > 0", topicAliasMaximum > 0, "topicAliasMaximum was %d", topicAliasMaximum);
+
+	/* subscribe to a topic */
+	response = MQTTClient_subscribe5(c, test_topic, 2, NULL, NULL);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+
+	/* then publish to the topic */
+	MQTTProperties_free(&pubmsg.properties);
+	property.identifier = MQTTPROPERTY_CODE_TOPIC_ALIAS;
+	property.value.integer2 = 1;
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	messages_arrived = 0;
+	response = MQTTClient_publishMessage5(c, test_topic, &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+
+	/* should get a response */
+	while (messages_arrived == 0 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("1 message should have arrived", messages_arrived == 1, "was %d", messages_arrived);
+
+	/* now publish to the topic alias only */
+	messages_arrived = 0;
+	response = MQTTClient_publishMessage5(c, "", &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+
+	/* should get a response */
+	while (messages_arrived == 0 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("1 message should have arrived", messages_arrived == 1, "was %d", messages_arrived);
+
+	rc = MQTTClient_disconnect5(c, 1000, MQTTREASONCODE_SUCCESS, NULL);
+
+	/* Reconnect.  Topic aliases should be deleted, but not subscription */
+	opts.cleanstart = 0;
+	response = MQTTClient_connect5(c, &opts, NULL, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	MQTTResponse_free(response);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	/* then publish to the topic */
+	MQTTProperties_free(&pubmsg.properties);
+	messages_arrived = 0;
+	response = MQTTClient_publishMessage5(c, test_topic, &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+
+	/* should get a response */
+	while (messages_arrived == 0 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("1 message should have arrived", messages_arrived == 1, "was %d", messages_arrived);
+
+	/* now publish to the topic alias only */
+	test_topic_aliases_globals.disconnected = 0;
+	messages_arrived = 0;
+	property.identifier = MQTTPROPERTY_CODE_TOPIC_ALIAS;
+	property.value.integer2 = 1;
+	MQTTProperties_add(&pubmsg.properties, &property);
+	response = MQTTClient_publishMessage5(c, "", &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+
+	/* should not get a response */
+	while (messages_arrived == 0 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("No message should have arrived", messages_arrived == 0, "was %d", messages_arrived);
+
+	/* Now we expect to receive a disconnect packet telling us why */
+	count = 0;
+	while (test_topic_aliases_globals.disconnected == 0 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("Disconnected should be called", test_topic_aliases_globals.disconnected == 1,
+			"was %d", test_topic_aliases_globals.disconnected);
+
+	MQTTProperties_free(&pubmsg.properties);
+	MQTTProperties_free(&props);
+	MQTTProperties_free(&connect_props);
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST1: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+int test2_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* message)
+{
+	static int received = 0;
+	static int first_topic_alias = 0;
+	int topicAlias = 0;
+
+	received++;
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	if (message->struct_version == 1)
+	{
+		const int props_count = 0;
+
+		if (MQTTProperties_hasProperty(&message->properties, MQTTPROPERTY_CODE_TOPIC_ALIAS))
+			topicAlias = MQTTProperties_getNumericValue(&message->properties, MQTTPROPERTY_CODE_TOPIC_ALIAS);
+
+		if (received == 1)
+			first_topic_alias = topicAlias;
+		else
+			assert("All topic aliases should be the same", topicAlias == first_topic_alias,
+					"Topic alias was %d\n", topicAlias);
+
+		assert("topicAlias should not be 0", topicAlias > 0, "Topic alias was %d\n", topicAlias);
+		logProperties(&message->properties);
+	}
+	messages_arrived++;
+
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&message);
+	return 1;
+}
+
+
+int test_server_topic_aliases(struct Options options)
+{
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTProperties connect_props = MQTTProperties_initializer;
+	MQTTProperty property;
+	MQTTClient_message pubmsg = MQTTClient_message_initializer;
+	MQTTResponse response = MQTTResponse_initializer;
+	MQTTClient_deliveryToken dt;
+	int rc = 0;
+	int count = 0;
+	char* test_topic = "test_server_topic_aliases";
+	int topicAliasMaximum = 0;
+	int qos = 0;
+	const int msg_count = 3;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test_server_topic_aliases\" name=\"server topic aliases\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 2 - server topic aliases");
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "server_topic_alias_test",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test2_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	/* Allow at least one server topic alias */
+	property.identifier = MQTTPROPERTY_CODE_TOPIC_ALIAS_MAXIMUM;
+	property.value.integer2 = 1;
+	MQTTProperties_add(&connect_props, &property);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, &connect_props, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		if (MQTTProperties_hasProperty(response.properties, MQTTPROPERTY_CODE_TOPIC_ALIAS_MAXIMUM))
+			topicAliasMaximum = MQTTProperties_getNumericValue(response.properties, MQTTPROPERTY_CODE_TOPIC_ALIAS_MAXIMUM);
+
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	/* subscribe to a topic */
+	response = MQTTClient_subscribe5(c, test_topic, 2, NULL, NULL);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+
+	messages_arrived = 0;
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.retained = 0;
+	for (qos = 0; qos < msg_count; ++qos)
+	{
+		pubmsg.qos = qos;
+		response = MQTTClient_publishMessage5(c, test_topic, &pubmsg, &dt);
+		assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	}
+
+	/* should get responses */
+	while (messages_arrived < msg_count && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("3 messages should have arrived", messages_arrived == msg_count, "was %d", messages_arrived);
+
+	rc = MQTTClient_disconnect5(c, 1000, MQTTREASONCODE_SUCCESS, NULL);
+
+	MQTTProperties_free(&pubmsg.properties);
+	MQTTProperties_free(&connect_props);
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST2: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+int test_subscription_ids_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* message)
+{
+	static int received = 0;
+	static int first_topic_alias = 0;
+	int topicAlias = 0;
+
+	received++;
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	if (message->struct_version == 1)
+	{
+		int subsidcount = 0, i = 0;
+
+		subsidcount = MQTTProperties_propertyCount(&message->properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER);
+
+		for (i = 0; i < subsidcount; ++i)
+		{
+			int subsid = MQTTProperties_getNumericValueAt(&message->properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER, i);
+			assert("Subsid is i+1", subsid == i+1, "subsid is not correct %d\n", subsid);
+		}
+		logProperties(&message->properties);
+	}
+	messages_arrived++;
+
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&message);
+	return 1;
+}
+
+
+int test_subscription_ids(struct Options options)
+{
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTProperties connect_props = MQTTProperties_initializer;
+	MQTTProperties subs_props = MQTTProperties_initializer;
+	MQTTProperty property;
+	MQTTClient_message pubmsg = MQTTClient_message_initializer;
+	MQTTResponse response = MQTTResponse_initializer;
+	MQTTClient_deliveryToken dt;
+	int rc = 0;
+	int count = 0;
+	char* test_topic = "test_subscription_ids";
+	const int msg_count = 1;
+	int subsids = 1;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test_subscription_ids\" name=\"subscription ids\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 3 - subscription ids");
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "subscription_ids",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test_subscription_ids_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, &connect_props, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		if (MQTTProperties_hasProperty(response.properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIERS_AVAILABLE))
+			subsids = MQTTProperties_getNumericValue(response.properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIERS_AVAILABLE);
+
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+	assert("Subscription ids must be available", subsids == 1, "subsids is %d", subsids);
+
+	/* subscribe to the test topic */
+	property.identifier = MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER;
+	property.value.integer4 = 1;
+	MQTTProperties_add(&subs_props, &property);
+	response = MQTTClient_subscribe5(c, test_topic, 2, NULL, &subs_props);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+
+	/* now to an overlapping topic */
+	property.value.integer4 = 2;
+	subs_props.array[0].value.integer4 = 2;
+	response = MQTTClient_subscribe5(c, "+", 2, NULL, &subs_props);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+
+	messages_arrived = 0;
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.retained = 0;
+	pubmsg.qos = 2;
+
+	response = MQTTClient_publishMessage5(c, test_topic, &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+
+	/* should get responses */
+	while (messages_arrived < msg_count && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("1 message should have arrived", messages_arrived == msg_count, "was %d", messages_arrived);
+
+	rc = MQTTClient_disconnect5(c, 1000, MQTTREASONCODE_SUCCESS, NULL);
+
+	MQTTProperties_free(&pubmsg.properties);
+	MQTTProperties_free(&subs_props);
+	MQTTProperties_free(&connect_props);
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST3: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+int test_flow_control_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* message)
+{
+	static int received = 0;
+	static int first_topic_alias = 0;
+	int topicAlias = 0;
+
+	received++;
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	messages_arrived++;
+
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&message);
+	return 1;
+}
+
+static int blocking_found = 0;
+
+void test_flow_control_trace_callback(enum MQTTCLIENT_TRACE_LEVELS level, char* message)
+{
+	static char* msg = "Blocking publish on queue full";
+
+	if (strstr(message, msg) != NULL)
+		blocking_found = 1;
+}
+
+
+int test_flow_control(struct Options options)
+{
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTProperties connect_props = MQTTProperties_initializer;
+	MQTTClient_message pubmsg = MQTTClient_message_initializer;
+	MQTTResponse response = MQTTResponse_initializer;
+	MQTTClient_deliveryToken dt;
+	int rc = 0, i = 0, count = 0;
+	char* test_topic = "test_flow_control";
+	int receive_maximum = 65535;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test_flow_control\" name=\"flow control\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test - flow control");
+
+	//MQTTClient_setTraceCallback(test_flow_control_trace_callback);
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "flow_control",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test_flow_control_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.reliable = 0;
+	opts.maxInflightMessages = 100;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, &connect_props, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		if (MQTTProperties_hasProperty(response.properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM))
+			receive_maximum = MQTTProperties_getNumericValue(response.properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM);
+
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	response = MQTTClient_subscribe5(c, test_topic, 2, NULL, NULL);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+
+	messages_arrived = 0;
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.retained = 0;
+	pubmsg.qos = 2;
+	for (i = 0; i < receive_maximum + 2; ++i)
+	{
+		response = MQTTClient_publishMessage5(c, test_topic, &pubmsg, &dt);
+		assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	}
+
+	/* should get responses */
+	while (messages_arrived < receive_maximum + 2 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("messages should have arrived", messages_arrived == receive_maximum + 2, "was %d", messages_arrived);
+	assert("should have blocked", blocking_found == 1, "was %d\n", blocking_found);
+
+	rc = MQTTClient_disconnect5(c, 1000, MQTTREASONCODE_SUCCESS, NULL);
+
+exit:
+	MQTTClient_setTraceCallback(NULL);
+	MQTTProperties_free(&pubmsg.properties);
+	MQTTProperties_free(&connect_props);
+	MQTTClient_destroy(&c);
+
+	MyLog(LOGA_INFO, "TEST3: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+int test_error_reporting(struct Options options)
+{
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperty property;
+	MQTTResponse response = MQTTResponse_initializer;
+	int rc = 0, i = 0, count = 0;
+	char* test_topic = "test_error_reporting";
+	int receive_maximum = 65535;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test_error_reporting\" name=\"error reporting\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test - error reporting");
+
+	//MQTTClient_setTraceCallback(test_flow_control_trace_callback);
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "error_reporting",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test_flow_control_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, NULL, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		if (MQTTProperties_hasProperty(response.properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM))
+			receive_maximum = MQTTProperties_getNumericValue(response.properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM);
+
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "unsub user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "unsub user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&props, &property);
+	response = MQTTClient_subscribe5(c, test_topic, 2, NULL, &props);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+	assert("Properties should exist", response.properties != NULL, "props was %p", response.properties);
+	if (response.properties)
+	{
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	response = MQTTClient_unsubscribe5(c, test_topic, &props);
+	assert("Good rc from unsubscribe", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	assert("Properties should exist", response.properties != NULL, "props was %p", response.properties);
+	if (response.properties)
+	{
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	rc = MQTTClient_disconnect5(c, 1000, MQTTREASONCODE_SUCCESS, NULL);
+
+exit:
+	MQTTClient_setTraceCallback(NULL);
+	MQTTProperties_free(&props);
+	MQTTClient_destroy(&c);
+
+	MyLog(LOGA_INFO, "TEST3: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+struct
+{
+	int published;
+	int packet_type;
+	enum MQTTReasonCodes rc;
+} test_qos_1_2_errors_globals =
+{
+	0, -1, MQTTREASONCODE_SUCCESS
+};
+
+
+void published(void* context, int msgid, int packet_type, MQTTProperties* props, enum MQTTReasonCodes rc)
+{
+	MQTTClient c = (MQTTClient)context;
+	MyLog(LOGA_INFO, "Callback: published, reason code \"%s\" msgid: %d packet type: %d",
+			MQTTReasonCode_toString(rc), msgid, packet_type);
+	test_qos_1_2_errors_globals.packet_type = packet_type;
+	test_qos_1_2_errors_globals.rc = rc;
+	if (props)
+	{
+		MyLog(LOGA_INFO, "Callback: published, properties:");
+		logProperties(props);
+	}
+	test_qos_1_2_errors_globals.published = 1;
+}
+
+void test_trace_callback(enum MQTTCLIENT_TRACE_LEVELS level, char* message)
+{
+	printf("%s\n", message);
+}
+
+enum msgTypes
+{
+	CONNECT = 1, CONNACK, PUBLISH, PUBACK, PUBREC, PUBREL,
+	PUBCOMP, SUBSCRIBE, SUBACK, UNSUBSCRIBE, UNSUBACK,
+	PINGREQ, PINGRESP, DISCONNECT, AUTH
+};
+
+
+int test_qos_1_2_errors(struct Options options)
+{
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperty property;
+	MQTTResponse response = MQTTResponse_initializer;
+	MQTTClient_deliveryToken dt;
+	MQTTClient_message pubmsg = MQTTClient_message_initializer;
+	int rc = 0, i = 0, count = 0;
+	char* test_topic = "test_qos_1_2_errors";
+	int receive_maximum = 65535;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test_qos_1_2_errors\" name=\"qos 1 2 errors\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test - qos 1 and 2 errors");
+
+	//MQTTClient_setTraceCallback(test_trace_callback);
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "error_reporting",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test_flow_control_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_setPublished(c, c, published);
+	assert("Good rc from setPublished", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, NULL, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		if (MQTTProperties_hasProperty(response.properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM))
+			receive_maximum = MQTTProperties_getNumericValue(response.properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM);
+
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 1;
+	pubmsg.retained = 0;
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "unsub user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "unsub user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	response = MQTTClient_publishMessage5(c, test_topic, &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTREASONCODE_SUCCESS, "rc was %d", response.reasonCode);
+
+	count = 0;
+	while (test_qos_1_2_errors_globals.published == 0 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("Published called", test_qos_1_2_errors_globals.published == 1,
+			"published was %d", test_qos_1_2_errors_globals.published);
+	assert("Reason code was packet identifier not found",
+			test_qos_1_2_errors_globals.rc == MQTTREASONCODE_NOT_AUTHORIZED,
+			"Reason code was %d", test_qos_1_2_errors_globals.rc);
+	assert("Packet type was PUBACK", test_qos_1_2_errors_globals.packet_type == PUBACK,
+			"packet type was %d", test_qos_1_2_errors_globals.packet_type);
+
+	test_qos_1_2_errors_globals.published = 0;
+	pubmsg.qos = 2;
+	response = MQTTClient_publishMessage5(c, test_topic, &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+
+	count = 0;
+	while (test_qos_1_2_errors_globals.published == 0 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("Published called", test_qos_1_2_errors_globals.published == 1,
+				"published was %d", test_qos_1_2_errors_globals.published);
+	assert("Reason code was packet identifier not found",
+			test_qos_1_2_errors_globals.rc == MQTTREASONCODE_NOT_AUTHORIZED,
+			"Reason code was %d", test_qos_1_2_errors_globals.rc);
+	assert("Packet type was PUBREC", test_qos_1_2_errors_globals.packet_type == PUBREC,
+			"packet type was %d", test_qos_1_2_errors_globals.packet_type);
+
+	test_qos_1_2_errors_globals.published = 0;
+	response = MQTTClient_publishMessage5(c, "test_qos_1_2_errors_pubcomp", &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTREASONCODE_SUCCESS, "rc was %d", response.reasonCode);
+
+	count = 0;
+	while (test_qos_1_2_errors_globals.published == 0 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("Published called", test_qos_1_2_errors_globals.published == 1,
+				"published was %d", test_qos_1_2_errors_globals.published);
+	assert("Reason code was packet identifier not found",
+			test_qos_1_2_errors_globals.rc == MQTTREASONCODE_PACKET_IDENTIFIER_NOT_FOUND,
+			"Reason code was %d", test_qos_1_2_errors_globals.rc);
+	assert("Packet type was PUBCOMP", test_qos_1_2_errors_globals.packet_type == PUBCOMP,
+			"packet type was %d", test_qos_1_2_errors_globals.packet_type);
+
+	rc = MQTTClient_disconnect5(c, 1000, MQTTREASONCODE_SUCCESS, NULL);
+
+exit:
+	MQTTClient_setTraceCallback(NULL);
+	MQTTProperties_free(&props);
+	MQTTClient_destroy(&c);
+
+	MyLog(LOGA_INFO, "TEST6: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+struct
+{
+	char* response_topic;
+	char* request_topic;
+	int messages_arrived;
+	char* correlation_id;
+} test_request_response_globals =
+{
+	"my response topic",
+	"my request topic",
+	0,
+	"request no 1",
+};
+
+
+int test_request_response_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* message)
+{
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	if (message->struct_version == 1)
+	{
+		const int props_count = 0;
+
+		MyLog(LOGA_INFO, "Message properties:");
+		logProperties(&message->properties);
+	}
+	test_request_response_globals.messages_arrived++;
+
+	if (test_request_response_globals.messages_arrived == 1)
+	{
+		MQTTProperty *prop;
+
+		assert("Topic should be request",
+				strcmp(test_request_response_globals.request_topic, topicName) == 0,
+				"topic was %s\n", topicName);
+
+		if (MQTTProperties_hasProperty(&message->properties, MQTTPROPERTY_CODE_RESPONSE_TOPIC))
+			prop = MQTTProperties_getProperty(&message->properties, MQTTPROPERTY_CODE_RESPONSE_TOPIC);
+
+		assert("Topic should be response",
+		strncmp(test_request_response_globals.response_topic, prop->value.data.data, prop->value.data.len) == 0,
+			"topic was %.4s\n", prop->value.data.data);
+
+		if (MQTTProperties_hasProperty(&message->properties, MQTTPROPERTY_CODE_CORRELATION_DATA))
+			prop = MQTTProperties_getProperty(&message->properties, MQTTPROPERTY_CODE_CORRELATION_DATA);
+
+		assert("Correlation data should be",
+		strncmp(test_request_response_globals.correlation_id, prop->value.data.data, prop->value.data.len) == 0,
+			"Correlation data was %.4s\n", prop->value.data.data);
+
+	}
+	else if (test_request_response_globals.messages_arrived == 2)
+	{
+		assert("Topic should be response",
+				strcmp(test_request_response_globals.response_topic, topicName) == 0,
+				"topic was %s\n", topicName);
+	}
+
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&message);
+	return 1;
+}
+
+
+int test_request_response(struct Options options)
+{
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTProperties connect_props = MQTTProperties_initializer;
+	MQTTProperties subs_props = MQTTProperties_initializer;
+	MQTTProperty property;
+	MQTTClient_message pubmsg = MQTTClient_message_initializer;
+	MQTTResponse response = MQTTResponse_initializer;
+	MQTTClient_deliveryToken dt;
+	int rc = 0;
+	int count = 0;
+	char* test_topic = "test_request_response";
+	const int msg_count = 1;
+	int subsids = 1;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test_request_response\" name=\"request/response\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 7 - request response");
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "request_response",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test_request_response_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, &connect_props, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		if (MQTTProperties_hasProperty(response.properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIERS_AVAILABLE))
+			subsids = MQTTProperties_getNumericValue(response.properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIERS_AVAILABLE);
+
+		MyLog(LOGA_INFO, "Connack properties:");
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	response = MQTTClient_subscribe5(c, test_request_response_globals.response_topic, 2, NULL, NULL);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+
+	response = MQTTClient_subscribe5(c, test_request_response_globals.request_topic, 2, NULL, NULL);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+
+	messages_arrived = 0;
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.retained = 0;
+	pubmsg.qos = 2;
+
+	property.identifier = MQTTPROPERTY_CODE_RESPONSE_TOPIC;
+	property.value.data.data = test_request_response_globals.response_topic;
+	property.value.data.len = (int)strlen(property.value.data.data);
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	property.identifier = MQTTPROPERTY_CODE_CORRELATION_DATA;
+	property.value.data.data = test_request_response_globals.correlation_id;
+	property.value.data.len = (int)strlen(property.value.data.data);
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	response = MQTTClient_publishMessage5(c, test_request_response_globals.request_topic, &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTREASONCODE_SUCCESS, "rc was %d", response.reasonCode);
+
+	/* should get the request */
+	while (test_request_response_globals.messages_arrived < 1 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("1 message should have arrived", test_request_response_globals.messages_arrived == 1, "was %d",
+			test_request_response_globals.messages_arrived);
+
+	MQTTProperties_free(&pubmsg.properties);
+	property.identifier = MQTTPROPERTY_CODE_CORRELATION_DATA;
+	property.value.data.data = "request no 1";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	response = MQTTClient_publishMessage5(c, test_request_response_globals.response_topic, &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTREASONCODE_SUCCESS, "rc was %d", response.reasonCode);
+
+	/* should get the response */
+	while (test_request_response_globals.messages_arrived < 1 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("1 message should have arrived", test_request_response_globals.messages_arrived == 1, "was %d",
+			test_request_response_globals.messages_arrived);
+
+	rc = MQTTClient_disconnect5(c, 1000, MQTTREASONCODE_SUCCESS, NULL);
+
+	MQTTProperties_free(&pubmsg.properties);
+	MQTTProperties_free(&subs_props);
+	MQTTProperties_free(&connect_props);
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST7: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+struct
+{
+	char* topic;
+	int messages_arrived;
+} test_subscribe_options_globals =
+{
+	"my response topic",
+	0,
+};
+
+
+int test_subscribe_options_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* message)
+{
+	int subsidcount = 0, i = 0, subsid = -1;
+
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	if (message->struct_version == 1)
+	{
+		const int props_count = 0;
+
+		MyLog(LOGA_INFO, "Message properties:");
+		logProperties(&message->properties);
+	}
+	test_subscribe_options_globals.messages_arrived++;
+
+	if (test_subscribe_options_globals.messages_arrived == 1)
+	{
+		subsidcount = MQTTProperties_propertyCount(&message->properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER);
+		assert("Subsidcount is i", subsidcount == 1, "subsidcount is not correct %d\n", subsidcount);
+
+		subsid = MQTTProperties_getNumericValueAt(&message->properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER, 0);
+		assert("Subsid is 2", subsid == 2, "subsid is not correct %d\n", subsid);
+	}
+
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&message);
+	return 1;
+}
+
+
+int test_subscribe_options(struct Options options)
+{
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTProperties connect_props = MQTTProperties_initializer;
+	MQTTProperties subs_props = MQTTProperties_initializer;
+	MQTTProperty property;
+	MQTTClient_message pubmsg = MQTTClient_message_initializer;
+	MQTTResponse response = MQTTResponse_initializer;
+	MQTTClient_deliveryToken dt;
+	int rc = 0;
+	int count = 0;
+	const int msg_count = 1;
+	MQTTSubscribe_options subopts = MQTTSubscribe_options_initializer;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test_subscribe_options\" name=\"subscribe options\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 8 - subscribe options");
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "subscribe_options",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test_subscribe_options_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, &connect_props, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		MyLog(LOGA_INFO, "Connack properties:");
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	property.identifier = MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER;
+	property.value.integer4 = 1;
+	MQTTProperties_add(&subs_props, &property);
+	subopts.noLocal = 1;
+	response = MQTTClient_subscribe5(c, test_subscribe_options_globals.topic, 2, &subopts, &subs_props);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+
+	subs_props.array[0].value.integer4 = 2;
+	subopts.noLocal = 0;
+	subopts.retainHandling = 1;
+	response = MQTTClient_subscribe5(c, "#", 2, &subopts, &subs_props);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+
+	messages_arrived = 0;
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.retained = 0;
+	pubmsg.qos = 2;
+
+	response = MQTTClient_publishMessage5(c, test_subscribe_options_globals.topic, &pubmsg, &dt);
+	assert("Good rc from publish", response.reasonCode == MQTTREASONCODE_SUCCESS, "rc was %d", response.reasonCode);
+
+	/* should get the request */
+	while (test_subscribe_options_globals.messages_arrived < 1 && ++count < 10)
+	{
+#if defined(WIN32)
+		Sleep(1000);
+#else
+		usleep(1000000L);
+#endif
+	}
+	assert("1 message should have arrived", test_subscribe_options_globals.messages_arrived == 1, "was %d",
+			test_subscribe_options_globals.messages_arrived);
+
+	rc = MQTTClient_disconnect5(c, 1000, MQTTREASONCODE_SUCCESS, NULL);
+
+	MQTTProperties_free(&pubmsg.properties);
+	MQTTProperties_free(&subs_props);
+	MQTTProperties_free(&connect_props);
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST8: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+struct
+{
+	char* shared_topic;
+	char* topic;
+	int messages_arrived;
+} test_shared_subscriptions_globals =
+{
+	"$share/share_test/#",
+	"a",
+	0,
+};
+
+MQTTClient c, d;
+
+int test_shared_subscriptions_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* message)
+{
+	int subsidcount = 0, i = 0, subsid = -1;
+
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	if (message->struct_version == 1)
+	{
+		const int props_count = 0;
+
+		if (message->properties.count > 0)
+		{
+			MyLog(LOGA_INFO, "Message properties:");
+			logProperties(&message->properties);
+		}
+	}
+	test_shared_subscriptions_globals.messages_arrived++;
+
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&message);
+	return 1;
+}
+
+
+int test_shared_subscriptions(struct Options options)
+{
+	int subsqos = 2;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTProperties connect_props = MQTTProperties_initializer;
+	MQTTProperties subs_props = MQTTProperties_initializer;
+	MQTTClient_message pubmsg = MQTTClient_message_initializer;
+	MQTTResponse response = MQTTResponse_initializer;
+	MQTTClient_deliveryToken dt;
+	int rc = 0;
+	int count = 0;
+	const int msg_count = 1;
+	MQTTSubscribe_options subopts = MQTTSubscribe_options_initializer;
+	int i;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test_shared_subscriptions\" name=\"shared subscriptions\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 8 - shared subscriptions");
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "shared_subscriptions",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTClient_createWithOptions(&d, options.connection, "shared_subscriptions_1",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&d);
+		goto exit;
+	}
+
+	rc = MQTTClient_setCallbacks(c, c, NULL, test_shared_subscriptions_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_setCallbacks(d, d, NULL, test_shared_subscriptions_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, &connect_props, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		MyLog(LOGA_INFO, "Connack properties:");
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(d, &opts, &connect_props, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		MyLog(LOGA_INFO, "Connack properties:");
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	response = MQTTClient_subscribe5(c, test_shared_subscriptions_globals.shared_topic, 2, &subopts, &subs_props);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+
+	response = MQTTClient_subscribe5(d, test_shared_subscriptions_globals.shared_topic, 2, &subopts, &subs_props);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d", response.reasonCode);
+
+	messages_arrived = 0;
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.retained = 0;
+	pubmsg.qos = 2;
+
+	test_shared_subscriptions_globals.messages_arrived = 0;
+	for (i = 0; i < 10; ++i)
+	{
+		response = MQTTClient_publishMessage5(c, test_shared_subscriptions_globals.topic, &pubmsg, &dt);
+		assert("Good rc from publish", response.reasonCode == MQTTREASONCODE_SUCCESS, "rc was %d", response.reasonCode);
+
+		/* should get the request */
+		while (test_shared_subscriptions_globals.messages_arrived < i+1 && ++count < 100)
+		{
+#if defined(WIN32)
+			Sleep(100);
+#else
+			usleep(100000L);
+#endif
+		}
+		assert("1 message should have arrived", test_shared_subscriptions_globals.messages_arrived == i+1, "was %d",
+			test_shared_subscriptions_globals.messages_arrived);
+	}
+
+	rc = MQTTClient_disconnect5(c, 1000, MQTTREASONCODE_SUCCESS, NULL);
+
+	MQTTProperties_free(&pubmsg.properties);
+	MQTTProperties_free(&subs_props);
+	MQTTProperties_free(&connect_props);
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST9: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+int main(int argc, char** argv)
+{
+	int rc = 0,
+		i;
+ 	int (*tests[])() = {NULL,
+ 		test_client_topic_aliases,
+		test_server_topic_aliases,
+ 		test_subscription_ids,
+ 		test_flow_control,
+		test_error_reporting,
+		test_qos_1_2_errors,
+		test_request_response,
+		test_subscribe_options,
+		test_shared_subscriptions
+ 	};
+
+	xml = fopen("TEST-test1.xml", "w");
+	fprintf(xml, "<testsuite name=\"test1\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));
+
+	MQTTClient_setTraceCallback(test_flow_control_trace_callback);
+
+	getopts(argc, argv);
+
+	for (i = 0; i < options.iterations; ++i)
+	{
+	 	if (options.test_no == 0)
+		{ /* run all the tests */
+ 		   	for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+		}
+		else
+ 		   	rc = tests[options.test_no](options); /* run just the selected test */
+	}
+
+ 	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+	return rc;
+}
diff --git a/mqtt/src/test/test11.c b/mqtt/src/test/test11.c
new file mode 100644
index 00000000..59fc6c1d
--- /dev/null
+++ b/mqtt/src/test/test11.c
@@ -0,0 +1,2142 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - test8 - failure callbacks
+ *    Ian Craggs - MQTT V5
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * Tests for the Paho Asynchronous MQTT C client
+ */
+
+
+#include "MQTTAsync.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+  #include <sys/socket.h>
+	#include <unistd.h>
+  #include <errno.h>
+#else
+	#include <windows.h>
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;         /**< connection to system under test. */
+	int verbose;
+	int test_no;
+	int size;									/**< size of big message */
+	int MQTTVersion;
+	int iterations;
+} options =
+{
+	"localhost:1883",
+	0,
+	-1,
+	10000,
+	MQTTVERSION_5,
+	1,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--size") == 0)
+		{
+			if (++count < argc)
+				options.size = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+				options.connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--MQTTversion") == 0)
+		{
+			if (++count < argc)
+			{
+				options.MQTTVersion = atoi(argv[count]);
+				printf("setting MQTT version to %d\n", options.MQTTVersion);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--iterations") == 0)
+		{
+			if (++count < argc)
+				options.iterations = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+			options.verbose = 1;
+		count++;
+	}
+}
+
+#if 0
+#include <logaX.h>   /* For general log messages                      */
+#define MyLog logaLine
+#else
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+#endif
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		printf("Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+    else
+    	MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+}
+
+
+void logProperties(MQTTProperties *props)
+{
+	int i = 0;
+
+	for (i = 0; i < props->count; ++i)
+	{
+		int id = props->array[i].identifier;
+		const char* name = MQTTPropertyName(id);
+		char* intformat = "Property name %s value %d";
+
+		switch (MQTTProperty_getType(id))
+		{
+		case MQTTPROPERTY_TYPE_BYTE:
+		  MyLog(LOGA_DEBUG, intformat, name, props->array[i].value.byte);
+		  break;
+		case MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER:
+		  MyLog(LOGA_DEBUG, intformat, name, props->array[i].value.integer2);
+		  break;
+		case MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER:
+		  MyLog(LOGA_DEBUG, intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER:
+		  MyLog(LOGA_DEBUG, intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_BINARY_DATA:
+		case MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING:
+		  MyLog(LOGA_DEBUG, "Property name %s value len %.*s", name,
+				  props->array[i].value.data.len, props->array[i].value.data.data);
+		  break;
+		case MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR:
+		  MyLog(LOGA_DEBUG, "Property name %s key %.*s value %.*s", name,
+			  props->array[i].value.data.len, props->array[i].value.data.data,
+		  	  props->array[i].value.value.len, props->array[i].value.value.data);
+		  break;
+		}
+	}
+}
+
+
+struct
+{
+	int disconnected;
+	char* test_topic;
+	int test_finished;
+} test_client_topic_aliases_globals =
+{
+	0, "client topic aliases topic", 0
+};
+
+
+void test1_onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+	test_client_topic_aliases_globals.test_finished = 1;
+}
+
+
+int test_client_topic_aliases_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int received = 0;
+
+	received++;
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	if (message->struct_version == 1)
+	{
+		const int props_count = 0;
+
+		assert("No topic alias", MQTTProperties_hasProperty(&message->properties, MQTTPROPERTY_CODE_TOPIC_ALIAS) == 0,
+				"topic alias is %d\n", MQTTProperties_hasProperty(&message->properties, MQTTPROPERTY_CODE_TOPIC_ALIAS));
+
+		assert("Topic should be name", strcmp(topicName, test_client_topic_aliases_globals.test_topic) == 0,
+					"Topic name was %s\n", topicName);
+
+		logProperties(&message->properties);
+	}
+
+	if (received == 2)
+		test_client_topic_aliases_globals.test_finished = 1;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+void test_client_topic_aliases_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTProperty property;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "Suback properties:");
+	logProperties(&response->properties);
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.retained = 0;
+	pubmsg.qos = 1;
+
+	/* first set the topic alias */
+	property.identifier = MQTTPROPERTY_CODE_TOPIC_ALIAS;
+	property.value.integer2 = 1;
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	rc = MQTTAsync_sendMessage(c, test_client_topic_aliases_globals.test_topic, &pubmsg, &opts);
+	assert("Good rc from send", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_client_topic_aliases_globals.test_finished = 1;
+	else
+	{
+		/* now send the publish with topic alias only */
+		rc = MQTTAsync_sendMessage(c, "", &pubmsg, &opts);
+		assert("Good rc from send", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+			test_client_topic_aliases_globals.test_finished = 1;
+	}
+	MQTTProperties_free(&pubmsg.properties);
+}
+
+
+void test_client_topic_aliases_disconnected(void* context, MQTTProperties* props, enum MQTTReasonCodes rc)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "Callback: disconnected, reason code \"%s\"", MQTTReasonCode_toString(rc));
+	logProperties(props);
+	test_client_topic_aliases_globals.disconnected = 1;
+}
+
+
+void test_client_topic_aliases_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTProperty property;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+	static int first = 1;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_SUCCESS,
+		   "Reason code was %d\n", response->reasonCode);
+
+	MyLog(LOGA_DEBUG, "Connack properties:");
+	logProperties(&response->properties);
+
+	if (first)
+	{
+		first = 0;
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = 1;
+		pubmsg.retained = 0;
+
+		/* a Topic Alias of 0 is not allowed, so we should be disconnected */
+		property.identifier = MQTTPROPERTY_CODE_TOPIC_ALIAS;
+		property.value.integer2 = 0;
+		MQTTProperties_add(&pubmsg.properties, &property);
+
+		rc = MQTTAsync_sendMessage(c, test_client_topic_aliases_globals.test_topic, &pubmsg, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+			test_client_topic_aliases_globals.test_finished = 1;
+		MQTTProperties_free(&pubmsg.properties);
+	}
+	else
+	{
+		opts.onSuccess5 = test_client_topic_aliases_onSubscribe;
+		opts.context = c;
+		rc = MQTTAsync_subscribe(c, test_client_topic_aliases_globals.test_topic, 2, &opts);
+		assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+			test_client_topic_aliases_globals.test_finished = 1;
+
+	}
+}
+
+
+/*********************************************************************
+
+Test1: client topic aliases
+
+*********************************************************************/
+int test_client_topic_aliases(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperties willProps = MQTTProperties_initializer;
+	MQTTProperty property;
+	int rc = 0;
+	char* test_topic = "V5 C client test client topic aliases";
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+
+	MyLog(LOGA_INFO, "Starting V5 test 1 - client topic aliases");
+	fprintf(xml, "<testcase classname=\"test11\" name=\"client topic aliases\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "async_test_aliases",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test_client_topic_aliases_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTAsync_setDisconnected(c, c, test_client_topic_aliases_disconnected);
+
+	opts.keepAliveInterval = 20;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.cleanstart = 1;
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess5 = test_client_topic_aliases_onConnect;
+	opts.onFailure5 = NULL;
+	opts.context = c;
+
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&props, &property);
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "test user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "test user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&props, &property);
+
+	opts.connectProperties = &props;
+	opts.willProperties = &willProps;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (test_client_topic_aliases_globals.disconnected == 0)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	/* Now try a valid topic alias */
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (test_client_topic_aliases_globals.test_finished == 0)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTProperties_free(&props);
+	MQTTProperties_free(&willProps);
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST1: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+struct
+{
+	char* test_topic;
+	int test_finished;
+	int messages_arrived;
+	int msg_count;
+} test_server_topic_aliases_globals =
+{
+	"server topic aliases topic", 0, 0, 3
+};
+
+
+int test_server_topic_aliases_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int received = 0;
+	static int first_topic_alias = 0;
+	int topicAlias = 0;
+
+	received++;
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	if (message->struct_version == 1)
+	{
+		const int props_count = 0;
+
+		if (MQTTProperties_hasProperty(&message->properties, MQTTPROPERTY_CODE_TOPIC_ALIAS))
+			topicAlias = MQTTProperties_getNumericValue(&message->properties, MQTTPROPERTY_CODE_TOPIC_ALIAS);
+
+		if (received == 1)
+		{
+			first_topic_alias = topicAlias;
+			assert("Topic should be name", strcmp(topicName, test_server_topic_aliases_globals.test_topic) == 0,
+					"Topic name was %s\n", topicName);
+		}
+		else
+		{
+			assert("All topic aliases should be the same", topicAlias == first_topic_alias,
+					"Topic alias was %d\n", topicAlias);
+			assert("Topic should be 0 length", strcmp(topicName, "") == 0,
+					"Topic name was %s\n", topicName);
+		}
+
+		assert("topicAlias should not be 0", topicAlias > 0, "Topic alias was %d\n", topicAlias);
+		logProperties(&message->properties);
+	}
+	test_server_topic_aliases_globals.messages_arrived++;
+
+	if (test_server_topic_aliases_globals.messages_arrived == test_server_topic_aliases_globals.msg_count)
+		test_server_topic_aliases_globals.test_finished = 1;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+void test_server_topic_aliases_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int qos = 0, rc;
+
+	MyLog(LOGA_DEBUG, "Suback properties:");
+	logProperties(&response->properties);
+
+	test_server_topic_aliases_globals.messages_arrived = 0;
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.retained = 0;
+	for (qos = 0; qos < test_server_topic_aliases_globals.msg_count; ++qos)
+	{
+		pubmsg.qos = qos;
+		rc = MQTTAsync_sendMessage(c, test_server_topic_aliases_globals.test_topic, &pubmsg, &opts);
+		assert("Good rc from send", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+		{
+			test_server_topic_aliases_globals.test_finished = 1;
+			break;
+		}
+	}
+}
+
+
+void test_server_topic_aliases_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_SUCCESS,
+		   "Reason code was %d\n", response->reasonCode);
+
+	MyLog(LOGA_DEBUG, "Connack properties:");
+	logProperties(&response->properties);
+
+	opts.onSuccess5 = test_server_topic_aliases_onSubscribe;
+	opts.context = c;
+	rc = MQTTAsync_subscribe(c, test_server_topic_aliases_globals.test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_server_topic_aliases_globals.test_finished = 1;
+}
+
+
+/*********************************************************************
+
+Test2: server topic aliases
+
+*********************************************************************/
+int test_server_topic_aliases(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTProperties connect_props = MQTTProperties_initializer;
+	MQTTProperty property;
+	int rc = 0;
+	char* test_topic = "V5 C client test server topic aliases";
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+
+	MyLog(LOGA_INFO, "Starting V5 test 2 - server topic aliases");
+	fprintf(xml, "<testcase classname=\"test11\" name=\"server topic aliases\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "server_topic_aliases",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test_server_topic_aliases_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* Allow at least one server topic alias */
+	property.identifier = MQTTPROPERTY_CODE_TOPIC_ALIAS_MAXIMUM;
+	property.value.integer2 = 1;
+	MQTTProperties_add(&connect_props, &property);
+
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.onSuccess5 = test_server_topic_aliases_onConnect;
+	opts.context = c;
+	opts.connectProperties = &connect_props;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (test_server_topic_aliases_globals.test_finished == 0)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTProperties_free(&connect_props);
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST2: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+/*********************************************************************
+
+Test3: subscription ids
+
+*********************************************************************/
+
+struct
+{
+	char* test_topic;
+	int test_finished;
+	int messages_arrived;
+} test_subscription_ids_globals =
+{
+	"server subscription ids topic", 0, 0
+};
+
+
+int test_subscription_ids_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	test_subscription_ids_globals.messages_arrived++;
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	if (message->struct_version == 1)
+	{
+		int subsidcount = 0, i = 0;
+
+		subsidcount = MQTTProperties_propertyCount(&message->properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER);
+
+		for (i = 0; i < subsidcount; ++i)
+		{
+			int subsid = MQTTProperties_getNumericValueAt(&message->properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER, i);
+			assert("Subsid is i+1", subsid == i+1, "subsid is not correct %d\n", subsid);
+		}
+		logProperties(&message->properties);
+	}
+
+	test_subscription_ids_globals.test_finished = 1;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+void test_subscription_ids_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTProperty property;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+	static int subs_count = 0;
+
+	MyLog(LOGA_DEBUG, "Suback properties:");
+	logProperties(&response->properties);
+
+	if (++subs_count == 1)
+	{
+		/* subscribe to a wildcard */
+		property.identifier = MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER;
+		property.value.integer4 = 2;
+		MQTTProperties_add(&opts.properties, &property);
+
+		opts.onSuccess5 = test_subscription_ids_onSubscribe;
+		opts.context = c;
+
+		rc = MQTTAsync_subscribe(c, "+", 2, &opts);
+		assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+			test_subscription_ids_globals.test_finished = 1;
+
+		MQTTProperties_free(&opts.properties);
+	}
+	else
+	{
+		test_subscription_ids_globals.messages_arrived = 0;
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.retained = 0;
+		pubmsg.qos = 1;
+		rc = MQTTAsync_sendMessage(c, test_subscription_ids_globals.test_topic, &pubmsg, &opts);
+		assert("Good rc from send", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+			test_subscription_ids_globals.test_finished = 1;
+	}
+}
+
+
+void test_subscription_ids_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTProperty property;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_SUCCESS,
+		   "Reason code was %d\n", response->reasonCode);
+
+	MyLog(LOGA_DEBUG, "Connack properties:");
+	logProperties(&response->properties);
+
+	opts.onSuccess5 = test_subscription_ids_onSubscribe;
+	opts.context = c;
+	/* subscribe to the test topic */
+	property.identifier = MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER;
+	property.value.integer4 = 1;
+	MQTTProperties_add(&opts.properties, &property);
+
+	rc = MQTTAsync_subscribe(c, test_subscription_ids_globals.test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_subscription_ids_globals.test_finished = 1;
+
+	MQTTProperties_free(&opts.properties);
+}
+
+
+int test_subscription_ids(struct Options options)
+{
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+
+	MyLog(LOGA_INFO, "Starting V5 test 3 - subscription ids");
+	fprintf(xml, "<testcase classname=\"test11\" name=\"subscription ids\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "subscription_ids",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test_subscription_ids_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.onSuccess5 = test_subscription_ids_onConnect;
+	opts.context = c;
+	opts.cleanstart = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (test_subscription_ids_globals.test_finished == 0)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST3: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test: flow control
+
+*********************************************************************/
+
+struct
+{
+	char * test_topic;
+	int test_finished;
+	int messages_arrived;
+	int receive_maximum;
+	int blocking_found;
+} test_flow_control_globals =
+{
+	"flow control topic", 0, 0, 65535, 0
+};
+
+
+int test_flow_control_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	test_flow_control_globals.messages_arrived++;
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	if (message->struct_version == 1)
+		logProperties(&message->properties);
+
+	if (test_flow_control_globals.messages_arrived == test_flow_control_globals.receive_maximum + 2)
+		test_flow_control_globals.test_finished = 1;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+void test_flow_control_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+	int i = 0;
+
+	MyLog(LOGA_DEBUG, "Suback properties:");
+	logProperties(&response->properties);
+
+	test_flow_control_globals.messages_arrived = 0;
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.retained = 0;
+	pubmsg.qos = 2;
+
+	for (i = 0; i < test_flow_control_globals.receive_maximum + 2; ++i)
+	{
+		rc = MQTTAsync_sendMessage(c, test_flow_control_globals.test_topic, &pubmsg, &opts);
+		assert("Good rc from send", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+			test_flow_control_globals.test_finished = 1;
+	}
+}
+
+
+void test_flow_control_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_SUCCESS,
+		   "Reason code was %d\n", response->reasonCode);
+
+	MyLog(LOGA_DEBUG, "Connack properties:");
+	logProperties(&response->properties);
+
+	if (MQTTProperties_hasProperty(&response->properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM))
+		test_flow_control_globals.receive_maximum = MQTTProperties_getNumericValue(&response->properties, MQTTPROPERTY_CODE_RECEIVE_MAXIMUM);
+
+	opts.onSuccess5 = test_flow_control_onSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribe(c, test_flow_control_globals.test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_flow_control_globals.test_finished = 1;
+
+	MQTTProperties_free(&opts.properties);
+}
+
+
+void flow_control_trace_callback(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	static char* msg = "Blocking on server receive maximum";
+
+	if (strstr(message, msg) != NULL)
+		test_flow_control_globals.blocking_found = 1;
+}
+
+
+int test_flow_control(struct Options options)
+{
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+
+	MyLog(LOGA_INFO, "Starting V5 test - flow control");
+	fprintf(xml, "<testcase classname=\"test11\" name=\"flow control\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "flow_control",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	MQTTAsync_setTraceCallback(flow_control_trace_callback);
+	MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_MINIMUM);
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test_flow_control_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.onSuccess5 = test_flow_control_onConnect;
+	opts.context = c;
+	opts.cleanstart = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (test_flow_control_globals.test_finished == 0)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	assert("should have blocked", test_flow_control_globals.blocking_found == 1, "was %d\n",
+			test_flow_control_globals.blocking_found);
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST4: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+struct
+{
+	char* test_topic;
+	int test_finished;
+	int messages_arrived;
+} test_error_reporting_globals =
+{
+	"error reporting topic", 0, 0
+};
+
+
+void test_error_reporting_onUnsubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int i = 0;
+
+	MyLog(LOGA_DEBUG, "Unsuback properties:");
+	logProperties(&response->properties);
+
+	assert("Reason code count should be 2", response->alt.unsub.reasonCodeCount == 2,
+		   "Reason code count was %d\n", response->alt.unsub.reasonCodeCount);
+
+	if (response->alt.unsub.reasonCodeCount == 1)
+		MyLog(LOGA_DEBUG, "reason code %d", response->reasonCode);
+	else if (response->alt.unsub.reasonCodeCount > 1)
+	{
+		for (i = 0; i < response->alt.unsub.reasonCodeCount; ++i)
+		{
+			MyLog(LOGA_DEBUG, "Unsubscribe reason code %d", response->alt.unsub.reasonCodes[i]);
+		}
+	}
+
+	test_error_reporting_globals.test_finished = 1;
+}
+
+
+void test_error_reporting_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTProperty property;
+	char* topics[2] = {test_error_reporting_globals.test_topic, "+"};
+	int rc;
+	int i = 0;
+
+	MyLog(LOGA_DEBUG, "Suback properties:");
+	logProperties(&response->properties);
+
+	assert("Reason code count should be 2", response->alt.sub.reasonCodeCount == 2,
+		   "Reason code count was %d\n", response->alt.sub.reasonCodeCount);
+
+	if (response->alt.sub.reasonCodeCount == 1)
+		MyLog(LOGA_DEBUG, "reason code %d", response->reasonCode);
+	else if (response->alt.sub.reasonCodeCount > 1)
+	{
+		for (i = 0; i < response->alt.sub.reasonCodeCount; ++i)
+		{
+			MyLog(LOGA_DEBUG, "Subscribe reason code %d", response->alt.sub.reasonCodes[i]);
+		}
+	}
+
+	opts.onSuccess5 = test_error_reporting_onUnsubscribe;
+	opts.context = c;
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "test user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "test user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&opts.properties, &property);
+
+	rc = MQTTAsync_unsubscribeMany(c, 2, topics, &opts);
+	assert("Good rc from unsubscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_flow_control_globals.test_finished = 1;
+
+	MQTTProperties_free(&opts.properties);
+}
+
+void test_error_reporting_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	char* topics[2] = {test_error_reporting_globals.test_topic, "+"};
+	int qoss[2] = {2, 2};
+	MQTTSubscribe_options subopts[2] = {MQTTSubscribe_options_initializer, MQTTSubscribe_options_initializer};
+	MQTTProperty property;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_SUCCESS,
+		   "Reason code was %d\n", response->reasonCode);
+
+	MyLog(LOGA_DEBUG, "Connack properties:");
+	logProperties(&response->properties);
+
+	opts.onSuccess5 = test_error_reporting_onSubscribe;
+	opts.context = c;
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "test user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "test user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&opts.properties, &property);
+
+	opts.subscribeOptionsCount = 2;
+	opts.subscribeOptionsList = subopts;
+
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_flow_control_globals.test_finished = 1;
+
+	MQTTProperties_free(&opts.properties);
+}
+
+
+int test_error_reporting(struct Options options)
+{
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+
+	MyLog(LOGA_INFO, "Starting V5 test - error reporting");
+	fprintf(xml, "<testcase classname=\"test11\" name=\"error reporting\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "error reporting",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test_flow_control_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.onSuccess5 = test_error_reporting_onConnect;
+	opts.context = c;
+	opts.cleanstart = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (test_error_reporting_globals.test_finished == 0)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST5: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+struct
+{
+	int test_finished;
+	char* test_topic;
+} test_qos_1_2_errors_globals =
+{
+	0, "test_qos_1_2_errors"
+};
+
+
+void test_qos_1_2_errors_onPublishSuccess(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "Callback: publish success, reason code \"%s\" msgid: %d",
+			MQTTReasonCode_toString(response->reasonCode), response->token);
+
+	logProperties(&response->properties);
+
+	test_qos_1_2_errors_globals.test_finished = 1;
+}
+
+
+void test_qos_1_2_errors_onPublishFailure3(void* context, MQTTAsync_failureData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+	MyLog(LOGA_DEBUG, "Callback: publish failure, reason code \"%s\" msgid: %d packet type: %d",
+			MQTTReasonCode_toString(response->reasonCode), response->token, response->packet_type);
+
+	logProperties(&response->properties);
+
+	test_qos_1_2_errors_globals.test_finished = 1;
+}
+
+
+void test_qos_1_2_errors_onPublishFailure2(void* context, MQTTAsync_failureData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MQTTProperty property;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "Callback: publish failure, reason code \"%s\" msgid: %d packet type: %d",
+			MQTTReasonCode_toString(response->reasonCode), response->token, response->packet_type);
+
+	logProperties(&response->properties);
+
+	opts.onSuccess5 = test_qos_1_2_errors_onPublishSuccess;
+	opts.onFailure5 = test_qos_1_2_errors_onPublishFailure3;
+	opts.context = c;
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "pub user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "pub user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	rc = MQTTAsync_sendMessage(c, "test_qos_1_2_errors_pubcomp", &pubmsg, &opts);
+	assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTREASONCODE_SUCCESS)
+		test_qos_1_2_errors_globals.test_finished = 1;
+
+	MQTTProperties_free(&pubmsg.properties);
+}
+
+
+void test_qos_1_2_errors_onPublishFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MQTTProperty property;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "Callback: publish failure, reason code \"%s\" msgid: %d packet type: %d",
+			MQTTReasonCode_toString(response->reasonCode), response->token, response->packet_type);
+
+	logProperties(&response->properties);
+
+	opts.onSuccess5 = test_qos_1_2_errors_onPublishSuccess;
+	opts.onFailure5 = test_qos_1_2_errors_onPublishFailure2;
+	opts.context = c;
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "pub user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "pub user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	rc = MQTTAsync_sendMessage(c, test_qos_1_2_errors_globals.test_topic, &pubmsg, &opts);
+	assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTREASONCODE_SUCCESS)
+		test_qos_1_2_errors_globals.test_finished = 1;
+
+	MQTTProperties_free(&pubmsg.properties);
+}
+
+
+void test_qos_1_2_errors_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTProperty property;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_SUCCESS,
+		   "Reason code was %d\n", response->reasonCode);
+
+	MyLog(LOGA_DEBUG, "Connack properties:");
+	logProperties(&response->properties);
+
+	opts.onSuccess5 = test_qos_1_2_errors_onPublishSuccess;
+	opts.onFailure5 = test_qos_1_2_errors_onPublishFailure;
+	opts.context = c;
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 1;
+	pubmsg.retained = 0;
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "pub user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "pub user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	rc = MQTTAsync_sendMessage(c, test_qos_1_2_errors_globals.test_topic, &pubmsg, &opts);
+	assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTREASONCODE_SUCCESS)
+		test_qos_1_2_errors_globals.test_finished = 1;
+
+	MQTTProperties_free(&pubmsg.properties);
+}
+
+
+int test_qos_1_2_errors(struct Options options)
+{
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+
+	MyLog(LOGA_INFO, "Starting V5 test - qos 1 and 2 errors");
+	fprintf(xml, "<testcase classname=\"test11\" name=\"qos 1 and 2 errors\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "qos 1 and 2 errors",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test_flow_control_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.onSuccess5 = test_qos_1_2_errors_onConnect;
+	opts.context = c;
+	opts.cleanstart = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (test_qos_1_2_errors_globals.test_finished == 0)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST6: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+struct
+{
+	int test_finished;
+	char* response_topic;
+	char* request_topic;
+	char* correlation_id;
+	int messages_arrived;
+} test_request_response_globals =
+{
+	0,
+	"test_7_request",
+	"test_7_response",
+	"test_7_correlation_id",
+	0
+};
+
+
+int test_request_response_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+
+	test_request_response_globals.messages_arrived++;
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	if (message->struct_version == 1)
+		logProperties(&message->properties);
+
+	if (test_request_response_globals.messages_arrived == 1)
+	{
+		/* this is the request */
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		MQTTProperty *corr_prop = NULL, *response_topic_prop = NULL;
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTProperty property;
+		char myTopicName[100];
+
+		assert("Topic should be request",
+				strcmp(test_request_response_globals.request_topic, topicName) == 0,
+				"topic was %s\n", topicName);
+
+		if (MQTTProperties_hasProperty(&message->properties, MQTTPROPERTY_CODE_RESPONSE_TOPIC))
+			response_topic_prop = MQTTProperties_getProperty(&message->properties, MQTTPROPERTY_CODE_RESPONSE_TOPIC);
+
+		assert("Topic should be response",
+		strncmp(test_request_response_globals.response_topic, response_topic_prop->value.data.data,
+				response_topic_prop->value.data.len) == 0,
+			"topic was %.4s\n", response_topic_prop->value.data.data);
+
+		if (MQTTProperties_hasProperty(&message->properties, MQTTPROPERTY_CODE_CORRELATION_DATA))
+			corr_prop = MQTTProperties_getProperty(&message->properties, MQTTPROPERTY_CODE_CORRELATION_DATA);
+
+		assert("Correlation data should be",
+		strncmp(test_request_response_globals.correlation_id, corr_prop->value.data.data,
+				corr_prop->value.data.len) == 0,
+			"Correlation data was %.4s\n", corr_prop->value.data.data);
+
+		/* send response */
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.retained = 0;
+		pubmsg.qos = 1;
+
+		property.identifier = MQTTPROPERTY_CODE_CORRELATION_DATA;
+		property.value.data.data = test_request_response_globals.correlation_id;
+		property.value.data.len = (int)strlen(property.value.data.data);
+		MQTTProperties_add(&pubmsg.properties, &property);
+
+		memcpy(myTopicName, response_topic_prop->value.data.data, response_topic_prop->value.data.len);
+		myTopicName[response_topic_prop->value.data.len] = '\0';
+		rc = MQTTAsync_sendMessage(c, myTopicName, &pubmsg, &opts);
+		if (rc != MQTTREASONCODE_SUCCESS)
+			test_request_response_globals.test_finished = 1;
+		assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+		MQTTProperties_free(&pubmsg.properties);
+	}
+	else if (test_request_response_globals.messages_arrived == 2)
+	{
+		MQTTProperty *corr_prop = NULL;
+
+		/* this should be response */
+		assert("Topic should be response",
+				strcmp(test_request_response_globals.response_topic, topicName) == 0,
+				"topic was %s\n", topicName);
+
+		if (MQTTProperties_hasProperty(&message->properties, MQTTPROPERTY_CODE_CORRELATION_DATA))
+			corr_prop = MQTTProperties_getProperty(&message->properties, MQTTPROPERTY_CODE_CORRELATION_DATA);
+
+		assert("Correlation data should be",
+		strncmp(test_request_response_globals.correlation_id, corr_prop->value.data.data,
+				corr_prop->value.data.len) == 0,
+			"Correlation data was %.4s\n", corr_prop->value.data.data);
+
+		test_request_response_globals.test_finished = 1;
+	}
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+void test_request_response_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MQTTProperty property;
+	char* topics[2] = {test_error_reporting_globals.test_topic, "+"};
+	int rc;
+	int i = 0;
+
+	MyLog(LOGA_DEBUG, "Suback properties:");
+	logProperties(&response->properties);
+
+	assert("Reason code count should be 2", response->alt.sub.reasonCodeCount == 2,
+		   "Reason code count was %d\n", response->alt.sub.reasonCodeCount);
+
+	if (response->alt.sub.reasonCodeCount == 1)
+		MyLog(LOGA_DEBUG, "reason code %d", response->reasonCode);
+	else if (response->alt.sub.reasonCodeCount > 1)
+	{
+		for (i = 0; i < response->alt.sub.reasonCodeCount; ++i)
+		{
+			MyLog(LOGA_DEBUG, "Subscribe reason code %d", response->alt.sub.reasonCodes[i]);
+			assert("Reason code should be 2", response->alt.sub.reasonCodes[i] == MQTTREASONCODE_GRANTED_QOS_2,
+				   "Reason code was %d\n", response->alt.sub.reasonCodes[i]);
+		}
+	}
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.retained = 0;
+	pubmsg.qos = 1;
+
+	property.identifier = MQTTPROPERTY_CODE_RESPONSE_TOPIC;
+	property.value.data.data = test_request_response_globals.response_topic;
+	property.value.data.len = (int)strlen(property.value.data.data);
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	property.identifier = MQTTPROPERTY_CODE_CORRELATION_DATA;
+	property.value.data.data = test_request_response_globals.correlation_id;
+	property.value.data.len = (int)strlen(property.value.data.data);
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	rc = MQTTAsync_sendMessage(c, test_request_response_globals.request_topic, &pubmsg, &opts);
+	if (rc != MQTTREASONCODE_SUCCESS)
+		test_request_response_globals.test_finished = 1;
+	assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MQTTProperties_free(&pubmsg.properties);
+}
+
+
+void test_request_response_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	char* topics[2] = {test_request_response_globals.request_topic,
+					test_request_response_globals.response_topic};
+	int qos[2] = {2, 2};
+
+	MyLog(LOGA_DEBUG, "In request response connect onSuccess callback, context %p", context);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_SUCCESS,
+		   "Reason code was %d\n", response->reasonCode);
+
+	MyLog(LOGA_DEBUG, "Connack properties:");
+	logProperties(&response->properties);
+
+	opts.onSuccess5 = test_request_response_onSubscribe;
+	opts.context = c;
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qos, &opts);
+	if (rc != MQTTREASONCODE_SUCCESS)
+		test_request_response_globals.test_finished = 1;
+	assert("Good rc from subscribeMany", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test_request_response(struct Options options)
+{
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+
+	MyLog(LOGA_INFO, "Starting V5 test - request response");
+	fprintf(xml, "<testcase classname=\"test11\" name=\"request response\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "request response",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test_request_response_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.onSuccess5 = test_request_response_onConnect;
+	opts.context = c;
+	opts.cleanstart = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (test_request_response_globals.test_finished == 0)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST7: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+struct
+{
+	int test_finished;
+	char* topic1;
+	char* topic2;
+	int messages_arrived;
+} test_subscribeOptions_globals =
+{
+	0,
+	"subscribe options topic",
+	"+",
+	0
+};
+
+
+int test_subscribeOptions_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	test_subscribeOptions_globals.messages_arrived++;
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	if (message->struct_version == 1)
+		logProperties(&message->properties);
+
+	if (test_subscribeOptions_globals.messages_arrived == 1)
+	{
+		int subsidcount, subsid;
+
+		subsidcount = MQTTProperties_propertyCount(&message->properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER);
+		assert("Subsidcount is i", subsidcount == 1, "subsidcount is not correct %d\n", subsidcount);
+
+		subsid = MQTTProperties_getNumericValueAt(&message->properties, MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER, 0);
+		assert("Subsid is 2", subsid == 2, "subsid is not correct %d\n", subsid);
+
+		test_subscribeOptions_globals.test_finished = 1;
+	}
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+void test_subscribeOptions_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	static int called = 0;
+
+	MyLog(LOGA_DEBUG, "In subscribe options connect onSuccess callback, context %p", context);
+	called++;
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_GRANTED_QOS_2,
+		   "Reason code was %d\n", response->reasonCode);
+
+	if (response->properties.count > 0)
+	{
+		MyLog(LOGA_DEBUG, "Suback properties:");
+		logProperties(&response->properties);
+	}
+
+	if (called == 1)
+	{
+		MQTTProperty property;
+
+		property.identifier = MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER;
+		property.value.integer4 = 2;
+		MQTTProperties_add(&opts.properties, &property);
+
+		opts.onSuccess5 = test_subscribeOptions_onSubscribe;
+		opts.context = c;
+		opts.subscribeOptions.retainHandling = 2;
+		opts.subscribeOptions.retainAsPublished = 1;
+		rc = MQTTAsync_subscribe(c, test_subscribeOptions_globals.topic2, 2, &opts);
+		if (rc != MQTTREASONCODE_SUCCESS)
+			test_subscribeOptions_globals.test_finished = 1;
+		assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+		MQTTProperties_free(&opts.properties);
+	}
+	else if (called == 2)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.retained = 0;
+		pubmsg.qos = 2;
+
+		rc = MQTTAsync_sendMessage(c, test_subscribeOptions_globals.topic1, &pubmsg, &opts);
+		assert("Good rc from send", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+			test_subscribeOptions_globals.test_finished = 1;
+	}
+}
+
+
+void test_subscribeOptions_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTProperty property;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In subscribe options connect onSuccess callback, context %p", context);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_SUCCESS,
+		   "Reason code was %d\n", response->reasonCode);
+
+	MyLog(LOGA_DEBUG, "Connack properties:");
+	logProperties(&response->properties);
+
+	property.identifier = MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER;
+	property.value.integer4 = 1;
+	MQTTProperties_add(&opts.properties, &property);
+	opts.subscribeOptions.noLocal = 1;
+
+	opts.onSuccess5 = test_subscribeOptions_onSubscribe;
+	opts.context = c;
+	rc = MQTTAsync_subscribe(c, test_subscribeOptions_globals.topic1, 2, &opts);
+	if (rc != MQTTREASONCODE_SUCCESS)
+		test_request_response_globals.test_finished = 1;
+	assert("Good rc from subscribeMany", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MQTTProperties_free(&opts.properties);
+}
+
+
+int test_subscribeOptions(struct Options options)
+{
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+
+	MyLog(LOGA_INFO, "Starting V5 test - subscribe options");
+	fprintf(xml, "<testcase classname=\"test11\" name=\"subscribe options\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "subscribe options",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test_subscribeOptions_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.onSuccess5 = test_subscribeOptions_onConnect;
+	opts.context = c;
+	opts.cleanstart = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (test_subscribeOptions_globals.test_finished == 0)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST8: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+struct
+{
+	char* shared_topic;
+	char* topic;
+	int messages_arrived;
+	int test_finished;
+	int message_count;
+} test_shared_subscriptions_globals =
+{
+	"$share/share_test/any",
+	"any",
+	0,
+	0,
+	10,
+};
+
+
+int test_shared_subscriptions_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	test_shared_subscriptions_globals.messages_arrived++;
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	MyLog(LOGA_DEBUG, "Callback: message received on topic %s is %.*s.",
+				 topicName, message->payloadlen, (char*)(message->payload));
+
+	if (message->struct_version == 1)
+		logProperties(&message->properties);
+
+	if (test_shared_subscriptions_globals.message_count == test_shared_subscriptions_globals.messages_arrived)
+		test_shared_subscriptions_globals.test_finished = 1;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+void test_shared_subscriptions_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	static int called = 0;
+
+	called++;
+	MyLog(LOGA_DEBUG, "In subscribe options connect onSuccess callback, context %p, called %d", context, called);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_GRANTED_QOS_2,
+		   "Reason code was %d\n", response->reasonCode);
+
+	if (response->properties.count > 0)
+	{
+		MyLog(LOGA_DEBUG, "Suback properties:");
+		logProperties(&response->properties);
+	}
+
+	if (called == 2) /* both clients now connected and subscribed */
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		int i = 0;
+		char buf[100];
+
+		/* for each message we publish, only one of the subscribers should get it, not both */
+		sprintf(buf, "shared subscriptions sequence number %d", i);
+		pubmsg.payload = buf;
+		pubmsg.payloadlen = (int)strlen(buf);
+		pubmsg.retained = 0;
+		pubmsg.qos = 2;
+
+		for (i = 0; i < test_shared_subscriptions_globals.message_count; ++i)
+		{
+			rc = MQTTAsync_sendMessage(c, test_shared_subscriptions_globals.topic, &pubmsg, &opts);
+			assert("Good rc from send", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+			if (rc != MQTTASYNC_SUCCESS)
+			{
+				test_subscribeOptions_globals.test_finished = 1;
+				break;
+			}
+		}
+	}
+}
+
+
+void test_shared_subscriptions_onConnectd(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync d = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In shared subscriptions connect d onSuccess callback, context %p", context);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_SUCCESS,
+		   "Reason code was %d\n", response->reasonCode);
+
+	opts.onSuccess5 = test_shared_subscriptions_onSubscribe;
+	opts.context = d;
+	rc = MQTTAsync_subscribe(d, test_shared_subscriptions_globals.shared_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTREASONCODE_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTREASONCODE_SUCCESS)
+		test_shared_subscriptions_globals.test_finished = 1;
+}
+
+
+void test_shared_subscriptions_onConnectc(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In shared subscriptions connect c onSuccess callback, context %p", context);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_SUCCESS,
+		   "Reason code was %d\n", response->reasonCode);
+
+	opts.onSuccess5 = test_shared_subscriptions_onSubscribe;
+	opts.context = c;
+	rc = MQTTAsync_subscribe(c, test_shared_subscriptions_globals.shared_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTREASONCODE_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTREASONCODE_SUCCESS)
+		test_shared_subscriptions_globals.test_finished = 1;
+}
+
+
+int test_shared_subscriptions(struct Options options)
+{
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+	int rc = 0, count = 0;
+
+	MyLog(LOGA_INFO, "Starting V5 test - shared subscriptions");
+	fprintf(xml, "<testcase classname=\"test11\" name=\"shared subscriptions\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "shared subscriptions c",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_createWithOptions(&d, options.connection, "shared subscriptions d",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test_shared_subscriptions_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test_shared_subscriptions_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.onSuccess5 = test_shared_subscriptions_onConnectc;
+	opts.context = c;
+	opts.cleanstart = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	opts.onSuccess5 = test_shared_subscriptions_onConnectd;
+	opts.context = d;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (test_shared_subscriptions_globals.test_finished == 0 && ++count < 1000)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	/* sleep a bit more to see if any other messages arrive */
+	#if defined(WIN32)
+		Sleep(100);
+	#else
+		usleep(10000L);
+	#endif
+	assert("Correct number of messages arrived",
+			test_shared_subscriptions_globals.message_count == test_shared_subscriptions_globals.messages_arrived,
+			"Actual number of messages received %d\n", test_shared_subscriptions_globals.messages_arrived);
+
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+
+exit:
+	MyLog(LOGA_INFO, "TEST9: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+void trace_callback(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	printf("Trace : %d, %s\n", level, message);
+}
+
+
+int main(int argc, char** argv)
+{
+	int rc = -1;
+ 	int (*tests[])() = {NULL,
+ 		test_client_topic_aliases,
+		test_server_topic_aliases,
+		test_subscription_ids,
+		test_flow_control,
+		test_error_reporting,
+		test_qos_1_2_errors,
+		test_request_response,
+		test_subscribeOptions,
+		test_shared_subscriptions
+ 	}; /* indexed starting from 1 */
+	MQTTAsync_nameValue* info;
+	int i;
+
+	xml = fopen("TEST-test4.xml", "w");
+	fprintf(xml, "<testsuite name=\"test4\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests)) - 1);
+
+	getopts(argc, argv);
+
+	MQTTAsync_setTraceCallback(trace_callback);
+
+	info = MQTTAsync_getVersionInfo();
+	while (info->name)
+	{
+	  MyLog(LOGA_INFO, "%s: %s", info->name, info->value);
+	  info++;
+	}
+
+	for (i = 0; i < options.iterations; ++i)
+	{
+	 	if (options.test_no == -1)
+		{ /* run all the tests */
+			for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+			{
+				failures = rc = 0;
+				MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+			}
+		}
+		else
+		{
+			if (options.test_no >= ARRAY_SIZE(tests))
+				MyLog(LOGA_INFO, "No test number %d", options.test_no);
+			else
+			{
+				MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+				rc = tests[options.test_no](options); /* run just the selected test */
+			}
+		}
+	}
+
+	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+
+	return rc;
+}
diff --git a/mqtt/src/test/test15.c b/mqtt/src/test/test15.c
new file mode 100644
index 00000000..f2d9851d
--- /dev/null
+++ b/mqtt/src/test/test15.c
@@ -0,0 +1,1430 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - change will message test back to using proxy
+ *    Ian Craggs - MQTT 5.0 support
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * Tests for the MQTT C client
+ */
+
+
+#include "MQTTClient.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+  #include <sys/time.h>
+  #include <sys/socket.h>
+  #include <unistd.h>
+  #include <errno.h>
+#else
+  #include <windows.h>
+  #define setenv(a, b, c) _putenv_s(a, b)
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;         /**< connection to system under test. */
+	char** haconnections;
+	char* proxy_connection;
+	int hacount;
+	int verbose;
+	int test_no;
+	int MQTTVersion;
+	int iterations;
+} options =
+{
+	"tcp://localhost:1883",
+	NULL,
+	"tcp://localhost:1884",
+	0,
+	0,
+	0,
+	MQTTVERSION_5,
+	1,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+			{
+				options.connection = argv[count];
+				printf("\nSetting connection to %s\n", options.connection);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--haconnections") == 0)
+		{
+			if (++count < argc)
+			{
+				char* tok = strtok(argv[count], " ");
+				options.hacount = 0;
+				options.haconnections = malloc(sizeof(char*) * 5);
+				while (tok)
+				{
+					options.haconnections[options.hacount] = malloc(strlen(tok) + 1);
+					strcpy(options.haconnections[options.hacount], tok);
+					options.hacount++;
+					tok = strtok(NULL, " ");
+				}
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--proxy_connection") == 0)
+		{
+			if (++count < argc)
+				options.proxy_connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--MQTTversion") == 0)
+		{
+			if (++count < argc)
+			{
+				options.MQTTVersion = atoi(argv[count]);
+				printf("setting MQTT version to %d\n", options.MQTTVersion);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--iterations") == 0)
+		{
+			if (++count < argc)
+				options.iterations = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+		{
+			options.verbose = 1;
+			printf("\nSetting verbose on\n");
+		}
+		count++;
+	}
+}
+
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		MyLog(LOGA_INFO, "Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+	else
+		MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+}
+
+
+/*********************************************************************
+
+Test1: single-threaded client
+
+*********************************************************************/
+void test1_sendAndReceive(MQTTClient* c, int qos, char* test_topic)
+{
+	MQTTClient_deliveryToken dt;
+	MQTTClient_message pubmsg = MQTTClient_message_initializer;
+	MQTTClient_message* m = NULL;
+	char* topicName = NULL;
+	int topicLen;
+	int i = 0;
+	int iterations = 50;
+	int rc;
+	MQTTResponse resp;
+	MQTTProperty property;
+
+	MyLog(LOGA_DEBUG, "%d messages at QoS %d", iterations, qos);
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = qos;
+	pubmsg.retained = 0;
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "test user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "test user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&pubmsg.properties, &property);
+
+	for (i = 0; i < iterations; ++i)
+	{
+		if (i % 10 == 0)
+			resp = MQTTClient_publish5(c, test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained,
+					&pubmsg.properties, &dt);
+		else
+			resp = MQTTClient_publishMessage5(c, test_topic, &pubmsg, &dt);
+		assert("Good rc from publish", resp.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", resp.reasonCode);
+
+		if (qos > 0)
+		{
+			rc = MQTTClient_waitForCompletion(c, dt, 5000L);
+			assert("Good rc from waitforCompletion", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		}
+		rc = MQTTClient_receive(c, &topicName, &topicLen, &m, 5000);
+		assert("Good rc from receive", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		if (topicName)
+		{
+			MyLog(LOGA_DEBUG, "Message received on topic %s is %.*s", topicName, m->payloadlen, (char*)(m->payload));
+			if (pubmsg.payloadlen != m->payloadlen ||
+					memcmp(m->payload, pubmsg.payload, m->payloadlen) != 0)
+			{
+				failures++;
+				MyLog(LOGA_INFO, "Error: wrong data - received lengths %d %d", pubmsg.payloadlen, m->payloadlen);
+				break;
+			}
+			assert("Property count should be > 0", m->properties.count > 0, "property count was %d", m->properties.count);
+			MQTTClient_free(topicName);
+			MQTTClient_freeMessage(&m);
+		}
+		else
+			printf("No message received within timeout period\n");
+	}
+
+	/* receive any outstanding messages */
+	MQTTClient_receive(c, &topicName, &topicLen, &m, 2000);
+	while (topicName)
+	{
+		printf("Message received on topic %s is %.*s.\n", topicName, m->payloadlen, (char*)(m->payload));
+		MQTTClient_free(topicName);
+		MQTTClient_freeMessage(&m);
+		MQTTClient_receive(c, &topicName, &topicLen, &m, 2000);
+	}
+
+	MQTTProperties_free(&pubmsg.properties);
+}
+
+void logProperties(MQTTProperties *props)
+{
+	int i = 0;
+
+	for (i = 0; i < props->count; ++i)
+	{
+		int id = props->array[i].identifier;
+		const char* name = MQTTPropertyName(id);
+		char* intformat = "Property name %s value %d";
+
+		switch (MQTTProperty_getType(id))
+		{
+		case MQTTPROPERTY_TYPE_BYTE:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.byte);
+		  break;
+		case MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.integer2);
+		  break;
+		case MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_BINARY_DATA:
+		case MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING:
+		  MyLog(LOGA_INFO, "Property name %s value %.*s", name,
+				  props->array[i].value.data.len, props->array[i].value.data.data);
+		  break;
+		case MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR:
+		  MyLog(LOGA_INFO, "Property name %s key %.*s value %.*s", name,
+			  props->array[i].value.data.len, props->array[i].value.data.data,
+		  	  props->array[i].value.value.len, props->array[i].value.value.data);
+		  break;
+		}
+	}
+}
+
+int test1(struct Options options)
+{
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperties willProps = MQTTProperties_initializer;
+	MQTTProperty property;
+	MQTTSubscribe_options subopts = MQTTSubscribe_options_initializer;
+	MQTTResponse response = MQTTResponse_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"single threaded client using receive\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 1 - single threaded client using receive");
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "single_threaded_test",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = options.MQTTVersion;
+	printf("test MQTT version %d\n", options.MQTTVersion);
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&props, &property);
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "test user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "test user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&props, &property);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, &props, &willProps);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	MQTTProperties_free(&props);
+	MQTTProperties_free(&willProps);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	if (response.properties)
+	{
+		logProperties(response.properties);
+		MQTTResponse_free(response);
+	}
+
+	subopts.retainAsPublished = 1;
+	property.identifier = MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER;
+	property.value.integer4 = 33;
+	MQTTProperties_add(&props, &property);
+	response = MQTTClient_subscribe5(c, test_topic, subsqos, &subopts, &props);
+	assert("Good rc from subscribe", response.reasonCode == subsqos, "rc was %d", response.reasonCode);
+	MQTTProperties_free(&props);
+
+	if (response.properties)
+	{
+		logProperties(response.properties);
+		MQTTProperties_free(response.properties);
+	}
+
+	test1_sendAndReceive(c, 0, test_topic);
+	test1_sendAndReceive(c, 1, test_topic);
+	test1_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping\n");
+
+	MQTTProperties_free(&props);
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "User property name";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "User property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&props, &property);
+
+	response = MQTTClient_unsubscribe5(c, test_topic, &props);
+	assert("Unsubscribe successful", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	MQTTResponse_free(response);
+
+	MQTTProperties_free(&props);
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 0;
+	MQTTProperties_add(&props, &property);
+
+	rc = MQTTClient_disconnect5(c, 0, MQTTREASONCODE_SUCCESS, &props);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	/* Just to make sure we can connect again */
+	response = MQTTClient_connect5(c, &opts, NULL, NULL);
+	assert("Connect successful",  response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	MQTTResponse_free(response);
+	rc = MQTTClient_disconnect5(c, 0, MQTTREASONCODE_SUCCESS, &props);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTProperties_free(&props);
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST1: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test2: multi-threaded client using callbacks
+
+*********************************************************************/
+volatile int test2_arrivedcount = 0;
+int test2_deliveryCompleted = 0;
+MQTTClient_message test2_pubmsg = MQTTClient_message_initializer;
+
+void test2_deliveryComplete(void* context, MQTTClient_deliveryToken dt)
+{
+	++test2_deliveryCompleted;
+}
+
+int test2_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* message)
+{
+	++test2_arrivedcount;
+	MyLog(LOGA_DEBUG, "Callback: %d message received on topic %s is %.*s.",
+					test2_arrivedcount, topicName, message->payloadlen, (char*)(message->payload));
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+				"message->struct_version was %d", message->struct_version);
+	if (message->struct_version == 1)
+	{
+		const int props_count = 0;
+
+		assert("Properties count should be 0", message->properties.count == props_count,
+			"Properties count was %d\n", message->properties.count);
+		logProperties(&message->properties);
+	}
+
+	if (test2_pubmsg.payloadlen != message->payloadlen ||
+					memcmp(message->payload, test2_pubmsg.payload, message->payloadlen) != 0)
+	{
+		failures++;
+		MyLog(LOGA_INFO, "Error: wrong data received lengths %d %d\n", test2_pubmsg.payloadlen, message->payloadlen);
+	}
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&message);
+	return 1;
+}
+
+
+void test2_sendAndReceive(MQTTClient* c, int qos, char* test_topic)
+{
+	MQTTClient_deliveryToken dt;
+	int i = 0;
+	int iterations = 50;
+	MQTTResponse response = MQTTResponse_initializer;
+	int wait_seconds = 0;
+
+	test2_deliveryCompleted = 0;
+
+	MyLog(LOGA_INFO, "%d messages at QoS %d", iterations, qos);
+	test2_pubmsg.payload = "a much longer message that we can shorten to the extent that we need to";
+	test2_pubmsg.payloadlen = 27;
+	test2_pubmsg.qos = qos;
+	test2_pubmsg.retained = 0;
+
+	for (i = 1; i <= iterations; ++i)
+	{
+		if (i % 10 == 0)
+			response = MQTTClient_publish5(c, test_topic, test2_pubmsg.payloadlen, test2_pubmsg.payload,
+                   test2_pubmsg.qos, test2_pubmsg.retained, NULL, NULL);
+		else
+			response = MQTTClient_publishMessage5(c, test_topic, &test2_pubmsg, &dt);
+		assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(100000L);
+		#endif
+
+		wait_seconds = 10;
+		while ((test2_arrivedcount < i) && (wait_seconds-- > 0))
+		{
+			MyLog(LOGA_DEBUG, "Arrived %d count %d", test2_arrivedcount, i);
+			#if defined(WIN32)
+				Sleep(1000);
+			#else
+				usleep(1000000L);
+			#endif
+		}
+		assert("Message Arrived", wait_seconds > 0,
+				"Time out waiting for message %d\n", i );
+	}
+	if (qos > 0)
+	{
+		/* MQ Telemetry can send a message to a subscriber before the server has
+		   completed the QoS 2 handshake with the publisher. For QoS 1 and 2,
+		   allow time for the final delivery complete callback before checking
+		   that all expected callbacks have been made */
+		wait_seconds = 10;
+		while ((test2_deliveryCompleted < iterations) && (wait_seconds-- > 0))
+		{
+			MyLog(LOGA_DEBUG, "Delivery Completed %d count %d", test2_deliveryCompleted, i);
+			#if defined(WIN32)
+				Sleep(1000);
+			#else
+				usleep(1000000L);
+			#endif
+		}
+		assert("All Deliveries Complete", wait_seconds > 0,
+			   "Number of deliveryCompleted callbacks was %d\n",
+			   test2_deliveryCompleted);
+	}
+}
+
+
+int test2(struct Options options)
+{
+	char* testname = "test2";
+	int subsqos = 2;
+	/* TODO - usused - remove ? MQTTClient_deliveryToken* dt = NULL; */
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperties willProps = MQTTProperties_initializer;
+	MQTTResponse response = MQTTResponse_initializer;
+	MQTTSubscribe_options subopts = MQTTSubscribe_options_initializer;
+	int rc = 0;
+	char* test_topic = "C client test2";
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"multi-threaded client using callbacks\"");
+	MyLog(LOGA_INFO, "Starting test 2 - multi-threaded client using callbacks");
+	global_start_time = start_clock();
+	failures = 0;
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	MQTTClient_createWithOptions(&c, options.connection, "multi_threaded_sample",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.username = "testuser";
+	opts.binarypwd.data = "testpassword";
+	opts.binarypwd.len = (int)strlen(opts.binarypwd.data);
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test2_messageArrived, test2_deliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, &props, &willProps);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS,
+			"rc was %d", response.reasonCode);
+	MQTTResponse_free(response);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	response = MQTTClient_subscribe5(c, test_topic, subsqos, &subopts, &props);
+	assert("Good rc from subscribe", response.reasonCode == subsqos, "rc was %d", rc);
+
+	test2_sendAndReceive(c, 0, test_topic);
+	test2_sendAndReceive(c, 1, test_topic);
+	test2_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	response = MQTTClient_unsubscribe5(c, test_topic, &props);
+	assert("Unsubscribe successful", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	rc = MQTTClient_disconnect5(c, 0, MQTTREASONCODE_SUCCESS, &props);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test 3: connack return codes
+
+for AMQTDD, needs an amqtdd.cfg of:
+
+	allow_anonymous false
+  password_file passwords
+
+and a passwords file of:
+
+	Admin:Admin
+
+*********************************************************************/
+int test3(struct Options options)
+{
+	char* testname = "test3";
+	int rc;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTResponse response;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"connack return codes\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 3 - connack return codes");
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+
+#if 0
+	/* clientid too long (RC = 2) */
+	rc = MQTTClient_create(&c, options.connection, "client_ID_too_long_for_MQTT_protocol_version_3",
+		MQTTCLIENT_PERSISTENCE_NONE, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	rc = MQTTClient_connect(c, &opts);
+	assert("identifier rejected", rc == 2, "rc was %d\n", rc);
+	MQTTClient_destroy(&c);
+#endif
+	/* broker unavailable (RC = 3)  - TDD when allow_anonymous not set*/
+	rc = MQTTClient_createWithOptions(&c, options.connection, "The C Client", MQTTCLIENT_PERSISTENCE_NONE,
+			NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+#if 0
+	rc = MQTTClient_connect(c, &opts);
+	assert("broker unavailable", rc == 3, "rc was %d\n", rc);
+
+	/* authentication failure (RC = 4) */
+	opts.username = "Admin";
+	opts.password = "fred";
+	rc = MQTTClient_connect(c, &opts);
+	assert("Bad user name or password", rc == 4, "rc was %d\n", rc);
+#endif
+
+	/* authorization failure (RC = 5) */
+	opts.username = "Admin";
+	opts.password = "Admin";
+	/*opts.will = &wopts;    "Admin" not authorized to publish to Will topic by default
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";*/
+	response = MQTTClient_connect5(c, &opts, NULL, NULL);
+	//assert("Not authorized", rc == 5, "rc was %d\n", rc);
+	MQTTResponse_free(response);
+
+#if 0
+	/* successful connection (RC = 0) */
+	opts.username = "Admin";
+	opts.password = "Admin";
+  opts.will = NULL;
+	rc = MQTTClient_connect(c, &opts);
+	assert("successful connection", rc == MQTTCLIENT_SUCCESS,  "rc was %d\n", rc);
+	MQTTClient_disconnect(c, 0);
+	MQTTClient_destroy(&c);
+#endif
+
+/* TODO - unused - remove ? exit: */
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test 4: client persistence 1
+
+
+*********************************************************************/
+int test4_run(int qos, int start_mqtt_version, int restore_mqtt_version)
+{
+	char* testname = "test 4";
+	char* topic = "Persistence test 1";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTClient_message* m = NULL;
+	char* topicName = NULL;
+	int topicLen;
+	MQTTClient_deliveryToken* tokens = NULL;
+	int mytoken = -99;
+	char buffer[100];
+	int count = 3;
+	MQTTProperty property;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperties pub_props = MQTTProperties_initializer;
+	MQTTResponse response = MQTTResponse_initializer;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+	int i, rc;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 4 - persistence, qos %d, MQTT versions: %s then %s", qos,
+			(start_mqtt_version == MQTTVERSION_5) ? "5" : "3.1.1",
+			(restore_mqtt_version == MQTTVERSION_5) ? "5" : "3.1.1");
+
+	createOpts.MQTTVersion = start_mqtt_version;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "xrctest15_test_4",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("Good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	/* we might get some tokens back because they may not be cleaned up until
+	 * we connect cleanstart
+	 */
+	rc = MQTTClient_getPendingDeliveryTokens(c, &tokens);
+ 	assert("getPendingDeliveryTokens rc == 0", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+ 	if (tokens)
+ 		MQTTClient_free(tokens);
+
+	opts.keepAliveInterval = 20;
+	opts.reliable = 0;
+	opts.MQTTVersion = start_mqtt_version;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	if (start_mqtt_version == MQTTVERSION_5)
+	{
+		MyLog(LOGA_DEBUG, "Cleanup by connecting clean start, add session expiry > 0\n");
+		opts.cleanstart = 1;
+		property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+		property.value.integer4 = 30; /* in seconds */
+		MQTTProperties_add(&props, &property);
+		response = MQTTClient_connect5(c, &opts, &props, NULL);
+		assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS,
+				"rc was %d", response.reasonCode);
+		MQTTResponse_free(response);
+		if (response.reasonCode != MQTTCLIENT_SUCCESS)
+			return -1;
+	}
+	else
+	{
+		MyLog(LOGA_DEBUG, "Cleanup by connecting clean session, then reconnecting non-cleansession\n");
+		opts.cleanstart = 0; /* only applies to MQTT V5 */
+		opts.cleansession = 1;
+		rc = MQTTClient_connect(c, &opts);
+		assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS,	"rc was %d", rc);
+		rc = MQTTClient_disconnect(c, 1000);
+		assert("Good rc from disconnect", rc == MQTTCLIENT_SUCCESS,	"rc was %d", rc);
+		opts.cleansession = 0;
+		rc = MQTTClient_connect(c, &opts);
+		assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS,	"rc was %d", rc);
+		if (rc != MQTTCLIENT_SUCCESS)
+			return -1;
+	}
+
+	/* subscribe so we can get messages back */
+	if (start_mqtt_version == MQTTVERSION_5)
+	{
+		response = MQTTClient_subscribe5(c, topic, subsqos, NULL, NULL);
+		assert("Good rc from subscribe", response.reasonCode == subsqos, "rc was %d", response.reasonCode);
+	}
+	else
+	{
+		rc = MQTTClient_subscribe(c, topic, subsqos);
+		assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	}
+
+	/* send messages so that we can receive the same ones */
+	if (start_mqtt_version == MQTTVERSION_5)
+	{
+		property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+		property.value.data.data = "test user property";
+		property.value.data.len = (int)strlen(property.value.data.data);
+		property.value.value.data = "test user property value";
+		property.value.value.len = (int)strlen(property.value.value.data);
+		MQTTProperties_add(&pub_props, &property);
+	}
+
+	for (i = 0; i < count; ++i)
+	{
+		sprintf(buffer, "Message sequence no %d", i);
+		if (start_mqtt_version == MQTTVERSION_5)
+		{
+			response = MQTTClient_publish5(c, topic, 10, buffer, qos, 0, &pub_props, NULL);
+			assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+		}
+		else
+		{
+			rc = MQTTClient_publish(c, topic, 10, buffer, qos, 0, NULL);
+			assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		}
+	}
+
+	/* disconnect immediately without receiving the incoming messages */
+	if (start_mqtt_version == MQTTVERSION_5)
+		rc = MQTTClient_disconnect5(c, 0, MQTTREASONCODE_SUCCESS, NULL); /* now there should be "orphaned" publications */
+	else
+		rc = MQTTClient_disconnect(c, 0); /* now there should be "orphaned" publications */
+	assert("Good rc from disconnect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_getPendingDeliveryTokens(c, &tokens);
+ 	assert("getPendingDeliveryTokens rc == 0", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	assert("should get some tokens back", tokens != NULL, "tokens was %p", tokens);
+	if (tokens)
+	{
+		int i = 0;
+
+		while (tokens[i] != -1)
+			MyLog(LOGA_DEBUG, "Pending delivery token %d", tokens[i++]);
+		MQTTClient_free(tokens);
+		assert1("no of tokens should be count", i == count, "no of tokens %d count %d", i, count);
+		mytoken = tokens[0];
+	}
+	MQTTProperties_free(&props);
+	MQTTProperties_free(&pub_props);
+	MQTTClient_destroy(&c); /* force re-reading persistence on create */
+
+	createOpts.MQTTVersion = restore_mqtt_version;
+	rc = MQTTClient_createWithOptions(&c, options.connection, "xrctest15_test_4",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	if (start_mqtt_version == MQTTVERSION_5 && restore_mqtt_version == MQTTVERSION_3_1_1)
+	{
+		assert("Persistence error from create", rc == MQTTCLIENT_PERSISTENCE_ERROR, "rc was %d", rc);
+		goto exit;
+	}
+	else
+		assert("Good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_getPendingDeliveryTokens(c, &tokens);
+	assert("getPendingDeliveryTokens rc == 0", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	assert("should get some tokens back", tokens != NULL, "tokens was %p", tokens);
+	if (tokens)
+	{
+		int i = 0;
+		while (tokens[i] != -1)
+			MyLog(LOGA_DEBUG, "Pending delivery token %d", tokens[i++]);
+		MQTTClient_free(tokens);
+		assert1("no of tokens should be count", i == count, "no of tokens %d count %d", i, count);
+	}
+
+	MyLog(LOGA_DEBUG, "Reconnecting");
+	opts.cleanstart = 0;
+	response = MQTTClient_connect5(c, &opts, NULL, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	MQTTResponse_free(response);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		return -1;
+
+	for (i = 0; i < count; ++i)
+	{
+  		int dup = 0;
+		do
+		{
+    			dup = 0;
+			MQTTClient_receive(c, &topicName, &topicLen, &m, 5000);
+			if (m && m->dup)
+			{
+				assert("No duplicates should be received for qos 2", qos == 1, "qos is %d", qos);
+				MyLog(LOGA_DEBUG, "Duplicate message id %d", m->msgid);
+				assert("properties are received", m->properties.count > 0, "property count is %d",
+						m->properties.count);
+				logProperties(&m->properties);
+				MQTTClient_freeMessage(&m);
+				MQTTClient_free(topicName);
+  	    			dup = 1;
+			}
+		} while (dup == 1);
+		assert("should get a message", m != NULL, "m was %p", m);
+		if (m)
+		{
+			MyLog(LOGA_DEBUG, "Received message id %d", m->msgid);
+			assert("topicName is correct", strcmp(topicName, topic) == 0, "topicName is %s", topicName);
+			if (start_mqtt_version == MQTTVERSION_5)
+				assert("properties are received", m->properties.count > 0, "property count is %d",
+					m->properties.count);
+			else
+				assert("properties are not received", m->properties.count == 0, "property count is %d",
+					m->properties.count);
+			logProperties(&m->properties);
+			MQTTClient_freeMessage(&m);
+			MQTTClient_free(topicName);
+		}
+	}
+
+	MQTTClient_yield();  /* allow any unfinished protocol exchanges to finish */
+
+	rc = MQTTClient_getPendingDeliveryTokens(c, &tokens);
+	assert("getPendingDeliveryTokens rc == 0", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	assert("should get no tokens back", tokens == NULL, "tokens was %p", tokens);
+
+	rc = MQTTClient_disconnect5(c, 0, MQTTREASONCODE_SUCCESS, NULL);
+
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+
+	return failures;
+}
+
+
+int test4(struct Options options)
+{
+	int rc = 0;
+	fprintf(xml, "<testcase classname=\"test4\" name=\"persistence\"");
+	global_start_time = start_clock();
+	rc = test4_run(1, MQTTVERSION_5, MQTTVERSION_5) +
+		 test4_run(2, MQTTVERSION_5, MQTTVERSION_5) +
+		 test4_run(2, MQTTVERSION_3_1_1, MQTTVERSION_5) +
+		 test4_run(2, MQTTVERSION_5, MQTTVERSION_3_1_1);
+	fprintf(xml, " time=\"%ld\" >\n", elapsed(global_start_time) / 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+	return rc;
+}
+
+
+/*********************************************************************
+
+Test 5: disconnect with quiesce timeout should allow exchanges to complete
+
+*********************************************************************/
+int test5(struct Options options)
+{
+	char* testname = "test 5";
+	char* topic = "Persistence test 2";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTClient_deliveryToken* tokens = NULL;
+	char buffer[100];
+	int count = 5;
+	MQTTProperty property;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTResponse response = MQTTResponse_initializer;
+	int i, rc;
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"disconnect with quiesce timeout should allow exchanges to complete\"");
+	global_start_time = start_clock();
+	failures = 0;
+ 	MyLog(LOGA_INFO, "Starting test 5 - disconnect with quiesce timeout should allow exchanges to complete");
+
+ 	createOpts.MQTTVersion = MQTTVERSION_5;
+	MQTTClient_createWithOptions(&c, options.connection, "xrctest15_test_5", MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOpts);
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.reliable = 0;
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&props, &property);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	response = MQTTClient_connect5(c, &opts, &props, NULL);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	MQTTResponse_free(response);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	response = MQTTClient_subscribe5(c, topic, subsqos, NULL, NULL);
+	assert("Good rc from subscribe", response.reasonCode == subsqos, "rc was %d", response.reasonCode);
+
+	for (i = 0; i < count; ++i)
+	{
+		sprintf(buffer, "Message sequence no %d", i);
+		response = MQTTClient_publish5(c, topic, 10, buffer, 1, 0, NULL, NULL);
+		assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+	}
+
+	MQTTClient_disconnect5(c, 1000, MQTTREASONCODE_SUCCESS, NULL); /* now there should be no "orphaned" publications */
+	MyLog(LOGA_DEBUG, "Disconnected");
+
+	rc = MQTTClient_getPendingDeliveryTokens(c, &tokens);
+ 	assert("getPendingDeliveryTokens rc == 0", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	assert("should get no tokens back", tokens == NULL, "tokens was %p", tokens);
+
+	MQTTProperties_free(&props);
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test 6: connectionLost and will message
+
+*********************************************************************/
+MQTTClient test6_c1, test6_c2;
+volatile int test6_will_message_arrived = 0;
+volatile int test6_connection_lost_called = 0;
+
+void test6_connectionLost(void* context, char* cause)
+{
+	MQTTClient c = (MQTTClient)context;
+	printf("%s -> Callback: connection lost\n", (c == test6_c1) ? "Client-1" : "Client-2");
+	test6_connection_lost_called = 1;
+}
+
+void test6_deliveryComplete(void* context, MQTTClient_deliveryToken token)
+{
+	printf("Client-2 -> Callback: publish complete for token %d\n", token);
+}
+
+char* test6_will_topic = "C Test 2: will topic";
+char* test6_will_message = "will message from Client-1";
+
+int test6_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* m)
+{
+	MQTTClient c = (MQTTClient)context;
+	printf("%s -> Callback: message received on topic '%s' is '%.*s'.\n",
+			 (c == test6_c1) ? "Client-1" : "Client-2", topicName, m->payloadlen, (char*)(m->payload));
+	if (c == test6_c2 && strcmp(topicName, test6_will_topic) == 0 && memcmp(m->payload, test6_will_message, m->payloadlen) == 0)
+		test6_will_message_arrived = 1;
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&m);
+	return 1;
+}
+
+
+int test6(struct Options options)
+{
+	char* testname = "test6";
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTClient_willOptions wopts =  MQTTClient_willOptions_initializer;
+	MQTTClient_connectOptions opts2 = MQTTClient_connectOptions_initializer5;
+	MQTTResponse response = MQTTResponse_initializer;
+	int rc, count;
+	char* mqttsas_topic = "MQTTSAS topic";
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 6 - connectionLost and will messages");
+	fprintf(xml, "<testcase classname=\"test1\" name=\"connectionLost and will messages\"");
+	global_start_time = start_clock();
+
+	opts.keepAliveInterval = 2;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.will = &wopts;
+	opts.will->message = test6_will_message;
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = test6_will_topic;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	/* Client-1 with Will options */
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&test6_c1, options.proxy_connection, "Client_1", MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOpts);
+	assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	rc = MQTTClient_setCallbacks(test6_c1, (void*)test6_c1, test6_connectionLost, test6_messageArrived, test6_deliveryComplete);
+	assert("good rc from setCallbacks",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	/* Connect to the broker */
+	response = MQTTClient_connect5(test6_c1, &opts, NULL, NULL);
+	assert("good rc from connect",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	MQTTResponse_free(response);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	/* Client - 2 (multi-threaded) */
+	rc = MQTTClient_createWithOptions(&test6_c2, options.connection, "Client_2", MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	/* Set the callback functions for the client */
+	rc = MQTTClient_setCallbacks(test6_c2, (void*)test6_c2, test6_connectionLost, test6_messageArrived, test6_deliveryComplete);
+	assert("good rc from setCallbacks",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	/* Connect to the broker */
+	opts2.keepAliveInterval = 20;
+	opts2.cleanstart = 1;
+	MyLog(LOGA_INFO, "Connecting Client_2 ...");
+	response = MQTTClient_connect5(test6_c2, &opts2, NULL, NULL);
+	MQTTResponse_free(response);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d\n", response.reasonCode);
+
+	response = MQTTClient_subscribe5(test6_c2, test6_will_topic, 2, NULL, NULL);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d\n", response.reasonCode);
+
+	/* now send the command which will break the connection and cause the will message to be sent */
+	response = MQTTClient_publish5(test6_c1, mqttsas_topic, (int)strlen("TERMINATE"), "TERMINATE", 0, 0, NULL, NULL);
+	assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d\n", response.reasonCode);
+
+	MyLog(LOGA_INFO, "Waiting to receive the will message");
+	count = 0;
+	while (++count < 40)
+	{
+		#if defined(WIN32)
+			Sleep(1000L);
+		#else
+			sleep(1);
+		#endif
+		if (test6_will_message_arrived == 1 && test6_connection_lost_called == 1)
+			break;
+	}
+	assert("will message arrived", test6_will_message_arrived == 1,
+							"will_message_arrived was %d\n", test6_will_message_arrived);
+	assert("connection lost called", test6_connection_lost_called == 1,
+			         "connection_lost_called %d\n", test6_connection_lost_called);
+
+	response = MQTTClient_unsubscribe5(test6_c2, test6_will_topic, NULL);
+	assert("Good rc from unsubscribe", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+
+	rc = MQTTClient_isConnected(test6_c2);
+	assert("Client-2 still connected", rc == 1, "isconnected is %d", rc);
+
+	rc = MQTTClient_isConnected(test6_c1);
+	assert("Client-1 not connected", rc == 0, "isconnected is %d", rc);
+
+	rc = MQTTClient_disconnect5(test6_c2, 100L, MQTTREASONCODE_SUCCESS, NULL);
+	assert("Good rc from disconnect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&test6_c1);
+	MQTTClient_destroy(&test6_c2);
+
+exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.\n",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+int test6a(struct Options options)
+{
+	char* testname = "test6a";
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer5;
+	MQTTClient_willOptions wopts =  MQTTClient_willOptions_initializer;
+	MQTTClient_connectOptions opts2 = MQTTClient_connectOptions_initializer5;
+	int rc, count;
+	MQTTResponse response = MQTTResponse_initializer;
+	char* mqttsas_topic = "MQTTSAS topic";
+	MQTTClient_createOptions createOpts = MQTTClient_createOptions_initializer;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 6 - connectionLost and binary will messages");
+	fprintf(xml, "<testcase classname=\"test1\" name=\"connectionLost and binary will messages\"");
+	global_start_time = start_clock();
+
+	opts.keepAliveInterval = 2;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	opts.will = &wopts;
+	opts.will->payload.data = test6_will_message;
+	opts.will->payload.len = (int)strlen(test6_will_message) + 1;
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = test6_will_topic;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	/* Client-1 with Will options */
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTClient_createWithOptions(&test6_c1, options.proxy_connection, "Client_1", MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOpts);
+	assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	rc = MQTTClient_setCallbacks(test6_c1, (void*)test6_c1, test6_connectionLost, test6_messageArrived, test6_deliveryComplete);
+	assert("good rc from setCallbacks",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	/* Connect to the broker */
+	response = MQTTClient_connect5(test6_c1, &opts, NULL, NULL);
+	assert("good rc from connect",  response.reasonCode == MQTTCLIENT_SUCCESS,
+			"rc was %d\n", response.reasonCode);
+	MQTTResponse_free(response);
+	if (response.reasonCode != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	/* Client - 2 (multi-threaded) */
+	rc = MQTTClient_createWithOptions(&test6_c2, options.connection, "Client_2", MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	/* Set the callback functions for the client */
+	rc = MQTTClient_setCallbacks(test6_c2, (void*)test6_c2, test6_connectionLost, test6_messageArrived, test6_deliveryComplete);
+	assert("good rc from setCallbacks",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+
+	/* Connect to the broker */
+	opts2.keepAliveInterval = 20;
+	opts2.cleanstart = 1;
+	MyLog(LOGA_INFO, "Connecting Client_2 ...");
+	response = MQTTClient_connect5(test6_c2, &opts2, NULL, NULL);
+	MQTTResponse_free(response);
+	assert("Good rc from connect", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d\n", response.reasonCode);
+
+	response = MQTTClient_subscribe5(test6_c2, test6_will_topic, 2, NULL, NULL);
+	assert("Good rc from subscribe", response.reasonCode == MQTTREASONCODE_GRANTED_QOS_2, "rc was %d\n", response.reasonCode);
+
+	/* now send the command which will break the connection and cause the will message to be sent */
+	response = MQTTClient_publish5(test6_c1, mqttsas_topic, (int)strlen("TERMINATE"), "TERMINATE", 0, 0, NULL, NULL);
+	assert("Good rc from publish", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d\n", response.reasonCode);
+
+	MyLog(LOGA_INFO, "Waiting to receive the will message");
+	count = 0;
+	while (++count < 40)
+	{
+		#if defined(WIN32)
+			Sleep(1000L);
+		#else
+			sleep(1);
+		#endif
+		if (test6_will_message_arrived == 1 && test6_connection_lost_called == 1)
+			break;
+	}
+	assert("will message arrived", test6_will_message_arrived == 1,
+							"will_message_arrived was %d\n", test6_will_message_arrived);
+	assert("connection lost called", test6_connection_lost_called == 1,
+			         "connection_lost_called %d\n", test6_connection_lost_called);
+
+	response = MQTTClient_unsubscribe5(test6_c2, test6_will_topic, NULL);
+	assert("Good rc from unsubscribe", response.reasonCode == MQTTCLIENT_SUCCESS, "rc was %d", response.reasonCode);
+
+	rc = MQTTClient_isConnected(test6_c2);
+	assert("Client-2 still connected", rc == 1, "isconnected is %d", rc);
+
+	rc = MQTTClient_isConnected(test6_c1);
+	assert("Client-1 not connected", rc == 0, "isconnected is %d", rc);
+
+	rc = MQTTClient_disconnect5(test6_c2, 100L, MQTTREASONCODE_SUCCESS, NULL);
+	assert("Good rc from disconnect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&test6_c1);
+	MQTTClient_destroy(&test6_c2);
+
+exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.\n",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+int main(int argc, char** argv)
+{
+	int rc = 0;
+ 	int (*tests[])() = {NULL, test1, test2, test3, test4, test5, test6, test6a};
+	int i;
+
+	xml = fopen("TEST-test1.xml", "w");
+	fprintf(xml, "<testsuite name=\"test1\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));
+
+	setenv("MQTT_C_CLIENT_TRACE", "ON", 1);
+	setenv("MQTT_C_CLIENT_TRACE_LEVEL", "ERROR", 1);
+
+	getopts(argc, argv);
+
+	for (i = 0; i < options.iterations; ++i)
+	{
+	 	if (options.test_no == 0)
+		{ /* run all the tests */
+ 		   	for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+		}
+		else
+ 		   	rc = tests[options.test_no](options); /* run just the selected test */
+	}
+
+ 	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+	return rc;
+}
diff --git a/mqtt/src/test/test2.c b/mqtt/src/test/test2.c
new file mode 100644
index 00000000..c5806a56
--- /dev/null
+++ b/mqtt/src/test/test2.c
@@ -0,0 +1,701 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - fix thread id display
+ *******************************************************************************/
+
+/**
+ * @file
+ * Multi-threaded tests for the Eclipse Paho MQTT C client
+ */
+
+#include "MQTTClient.h"
+#include "Thread.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+	#include <sys/socket.h>
+	#include <unistd.h>
+  #include <errno.h>
+	#define WINAPI
+#else
+	#include <windows.h>
+	#define setenv(a, b, c) _putenv_s(a, b)
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;         /**< connection to system under test. */
+	char** haconnections;
+	int hacount;
+	int verbose;
+	int test_no;
+	int MQTTVersion;
+	int iterations;
+} options =
+{
+	"tcp://m2m.eclipse.org:1883",
+	NULL,
+	0,
+	0,
+	0,
+	MQTTVERSION_DEFAULT,
+	1,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+			{
+				options.connection = argv[count];
+				printf("\nSetting connection to %s\n", options.connection);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--haconnections") == 0)
+		{
+			if (++count < argc)
+			{
+				char* tok = strtok(argv[count], " ");
+				options.hacount = 0;
+				options.haconnections = malloc(sizeof(char*) * 5);
+				while (tok)
+				{
+					options.haconnections[options.hacount] = malloc(strlen(tok) + 1);
+					strcpy(options.haconnections[options.hacount], tok);
+					options.hacount++;
+					tok = strtok(NULL, " ");
+				}
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--MQTTversion") == 0)
+		{
+			if (++count < argc)
+			{
+				options.MQTTVersion = atoi(argv[count]);
+				printf("setting MQTT version to %d\n", options.MQTTVersion);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--iterations") == 0)
+		{
+			if (++count < argc)
+				options.iterations = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+		{
+			options.verbose = 1;
+			printf("\nSetting verbose on\n");
+		}
+		count++;
+	}
+}
+
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		MyLog(LOGA_INFO, "Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+    else
+    	MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+}
+
+
+#if defined(WIN32) || defined(WIN64)
+mutex_type deliveryCompleted_mutex = NULL;
+#else
+pthread_mutex_t deliveryCompleted_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+mutex_type deliveryCompleted_mutex = &deliveryCompleted_mutex_store;
+#endif
+
+void lock_mutex(mutex_type amutex)
+{
+	int rc = Thread_lock_mutex(amutex);
+	if (rc != 0)
+		MyLog(LOGA_INFO, "Error %s locking mutex", strerror(rc));
+}
+
+void unlock_mutex(mutex_type amutex)
+{
+	int rc = Thread_unlock_mutex(amutex);
+	if (rc != 0)
+		MyLog(LOGA_INFO, "Error %s unlocking mutex", strerror(rc));
+}
+
+
+/*********************************************************************
+
+Test1: multiple threads to single client object
+
+*********************************************************************/
+volatile int test1_arrivedcount = 0;
+volatile int test1_arrivedcount_qos[3] = {0, 0, 0};
+volatile int test1_deliveryCompleted = 0;
+MQTTClient_message test1_pubmsg_check = MQTTClient_message_initializer;
+
+
+void test1_deliveryComplete(void* context, MQTTClient_deliveryToken dt)
+{
+	lock_mutex(deliveryCompleted_mutex);
+	MyLog(LOGA_DEBUG, "Delivery complete for token %d", dt);
+	++test1_deliveryCompleted;
+	unlock_mutex(deliveryCompleted_mutex);
+}
+
+int test1_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* m)
+{
+	++(test1_arrivedcount_qos[m->qos]);
+	++test1_arrivedcount;
+
+	MyLog(LOGA_DEBUG, "messageArrived: %d message received on topic %s is %.*s.",
+					test1_arrivedcount, topicName, m->payloadlen, (char*)(m->payload));
+	if (test1_pubmsg_check.payloadlen != m->payloadlen ||
+					memcmp(m->payload, test1_pubmsg_check.payload, m->payloadlen) != 0)
+	{
+		failures++;
+		MyLog(LOGA_INFO, "Error: wrong data received lengths %d %d\n", test1_pubmsg_check.payloadlen, m->payloadlen);
+	}
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&m);
+	return 1;
+}
+
+
+struct thread_parms
+{
+	MQTTClient* c;
+	int qos;
+	char* test_topic;
+};
+
+static int iterations = 50;
+
+thread_return_type WINAPI test1_sendAndReceive(void* n)
+{
+	MQTTClient_deliveryToken dt;
+	int i = 0;
+	int rc = 0;
+	int wait_seconds = 30;
+	MQTTClient_message test1_pubmsg = MQTTClient_message_initializer;
+	int subsqos = 2;
+
+	struct thread_parms *parms = n;
+	MQTTClient* c = parms->c;
+	int qos = parms->qos;
+	char* test_topic = parms->test_topic;
+
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_INFO, "Thread %u, %d messages at QoS %d", Thread_getid(), iterations, qos);
+	test1_pubmsg.payload = test1_pubmsg_check.payload;
+	test1_pubmsg.payloadlen = test1_pubmsg_check.payloadlen;
+	test1_pubmsg.retained = 0;
+	test1_pubmsg.qos = qos;
+
+	for (i = 1; i <= iterations; ++i)
+	{
+		if (i % 10 == 0)
+			rc = MQTTClient_publish(c, test_topic, test1_pubmsg.payloadlen, test1_pubmsg.payload,
+                   qos, test1_pubmsg.retained, &dt);
+		else
+			rc = MQTTClient_publishMessage(c, test_topic, &test1_pubmsg, &dt);
+		assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(100000L);
+		#endif
+
+		wait_seconds = 30;
+		while ((test1_arrivedcount_qos[qos] < i) && (wait_seconds-- > 0))
+		{
+			MyLog(LOGA_DEBUG, "Arrived %d count %d", test1_arrivedcount_qos[qos], i);
+			#if defined(WIN32)
+				Sleep(1000);
+			#else
+				usleep(1000000L);
+			#endif
+		}
+		assert("Message Arrived", wait_seconds > 0,
+				"Timed out waiting for message %d\n", i);
+	}
+
+#if defined(_WINDOWS)
+	return 0;
+#else
+	return NULL;
+#endif
+}
+
+
+int test1(struct Options options)
+{
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"multiple threads using same client object\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 1 - multiple threads using same client object");
+
+	rc = MQTTClient_create(&c, options.connection, "single_object, multiple threads",
+			MQTTCLIENT_PERSISTENCE_NONE, NULL);
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test1_messageArrived, test1_deliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTClient_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	test1_pubmsg_check.payload = "a much longer message that we can shorten to the extent that we need to";
+	test1_pubmsg_check.payloadlen = 27;
+	test1_deliveryCompleted = test1_arrivedcount = 0;
+
+	struct thread_parms parms0 = {c, 0, test_topic};
+	Thread_start(test1_sendAndReceive, (void*)&parms0);
+
+	struct thread_parms parms1 = {c, 1, test_topic};
+	Thread_start(test1_sendAndReceive, (void*)&parms1);
+
+	struct thread_parms parms2 = {c, 2, test_topic};
+	Thread_start(test1_sendAndReceive, (void*)&parms2);
+
+	/* MQTT servers can send a message to a subscriber before the server has
+	   completed the QoS 2 handshake with the publisher. For QoS 1 and 2,
+	   allow time for the final delivery complete callback before checking
+	   that all expected callbacks have been made */
+
+	int wait_seconds = 90;
+	while (((test1_arrivedcount < iterations*3) || (test1_deliveryCompleted < iterations*2)) && (wait_seconds-- > 0))
+	{
+		#if defined(WIN32)
+			Sleep(1000);
+		#else
+			usleep(1000000L);
+		#endif
+	}
+	assert("Arrived count == 150", test1_arrivedcount == iterations*3, "arrivedcount was %d", test1_arrivedcount);
+  assert("All Deliveries Complete", test1_deliveryCompleted == iterations*2,
+			   "Number of deliveryCompleted callbacks was %d\n", test1_deliveryCompleted);
+
+	MyLog(LOGA_DEBUG, "Stopping\n");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	rc = MQTTClient_disconnect(c, 0);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	/* Just to make sure we can connect again */
+	rc = MQTTClient_connect(c, &opts);
+	assert("Connect successful",  rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	rc = MQTTClient_disconnect(c, 0);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST1: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test2: multiple client objects used from multiple threads
+
+*********************************************************************/
+volatile int test2_arrivedcount = 0;
+
+volatile int test2_deliveryCompleted = 0;
+
+MQTTClient_message test2_pubmsg = MQTTClient_message_initializer;
+
+void test2_deliveryComplete(void* context, MQTTClient_deliveryToken dt)
+{
+	lock_mutex(deliveryCompleted_mutex);
+	MyLog(LOGA_DEBUG, "Delivery complete for token %d", dt);
+	++test2_deliveryCompleted;
+	unlock_mutex(deliveryCompleted_mutex);
+}
+
+int test2_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* m)
+{
+	++test2_arrivedcount;
+	MyLog(LOGA_DEBUG, "Callback: %d message received on topic %s is %.*s.",
+					test2_arrivedcount, topicName, m->payloadlen, (char*)(m->payload));
+	if (test2_pubmsg.payloadlen != m->payloadlen ||
+					memcmp(m->payload, test2_pubmsg.payload, m->payloadlen) != 0)
+	{
+		failures++;
+		MyLog(LOGA_INFO, "Error: wrong data received lengths %d %d\n", test2_pubmsg.payloadlen, m->payloadlen);
+	}
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&m);
+	return 1;
+}
+
+
+void test2_sendAndReceive(MQTTClient* c, int qos, char* test_topic)
+{
+	MQTTClient_deliveryToken dt;
+	int i = 0;
+	int iterations = 50;
+	int rc = 0;
+	int wait_seconds = 0;
+
+	test2_deliveryCompleted = 0;
+
+	MyLog(LOGA_INFO, "%d messages at QoS %d", iterations, qos);
+	test2_pubmsg.payload = "a much longer message that we can shorten to the extent that we need to";
+	test2_pubmsg.payloadlen = 27;
+	test2_pubmsg.qos = qos;
+	test2_pubmsg.retained = 0;
+
+	for (i = 1; i <= iterations; ++i)
+	{
+		if (i % 10 == 0)
+			rc = MQTTClient_publish(c, test_topic, test2_pubmsg.payloadlen, test2_pubmsg.payload,
+                   test2_pubmsg.qos, test2_pubmsg.retained, NULL);
+		else
+			rc = MQTTClient_publishMessage(c, test_topic, &test2_pubmsg, &dt);
+		assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(100000L);
+		#endif
+
+		wait_seconds = 10;
+		while ((test2_arrivedcount < i) && (wait_seconds-- > 0))
+		{
+			MyLog(LOGA_DEBUG, "Arrived %d count %d", test2_arrivedcount, i);
+			#if defined(WIN32)
+				Sleep(1000);
+			#else
+				usleep(1000000L);
+			#endif
+		}
+		assert("Message Arrived", wait_seconds > 0,
+				"Time out waiting for message %d\n", i );
+	}
+	if (qos > 0)
+	{
+		/* MQ Telemetry can send a message to a subscriber before the server has
+		   completed the QoS 2 handshake with the publisher. For QoS 1 and 2,
+		   allow time for the final delivery complete callback before checking
+		   that all expected callbacks have been made */
+		wait_seconds = 40;
+		while ((test2_deliveryCompleted < iterations) && (wait_seconds-- > 0))
+		{
+			MyLog(LOGA_DEBUG, "Delivery Completed %d count %d", test2_deliveryCompleted, i);
+			#if defined(WIN32)
+				Sleep(1000);
+			#else
+				usleep(1000000L);
+			#endif
+		}
+		assert("All Deliveries Complete", test2_deliveryCompleted == iterations,
+			   "Number of deliveryCompleted callbacks was %d\n",
+			   test2_deliveryCompleted);
+	}
+}
+
+
+int test2(struct Options options)
+{
+	char* testname = "test2";
+	int subsqos = 2;
+	/* TODO - usused - remove ? MQTTClient_deliveryToken* dt = NULL; */
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test2";
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"multi-threaded client using callbacks\"");
+	MyLog(LOGA_INFO, "Starting test 2 - multi-threaded client using callbacks");
+	global_start_time = start_clock();
+	failures = 0;
+
+	MQTTClient_create(&c, options.connection, "multi_threaded_sample", MQTTCLIENT_PERSISTENCE_NONE, NULL);
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.MQTTVersion = options.MQTTVersion;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test2_messageArrived, test2_deliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTClient_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	test2_sendAndReceive(c, 0, test_topic);
+	test2_sendAndReceive(c, 1, test_topic);
+	test2_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	rc = MQTTClient_disconnect(c, 0);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+int main(int argc, char** argv)
+{
+	int rc = 0;
+ 	int (*tests[])() = {NULL, test1};
+	int i;
+
+	#if defined(WIN32) || defined(WIN64)
+	deliveryCompleted_mutex = CreateMutex(NULL, 0, NULL);
+	#endif
+
+	xml = fopen("TEST-test2.xml", "w");
+	fprintf(xml, "<testsuite name=\"test1\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));
+
+	setenv("MQTT_C_CLIENT_TRACE", "ON", 1);
+	setenv("MQTT_C_CLIENT_TRACE_LEVEL", "ERROR", 0);
+
+	getopts(argc, argv);
+
+	for (i = 0; i < options.iterations; ++i)
+	{
+	 	if (options.test_no == 0)
+		{ /* run all the tests */
+ 		   	for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+		}
+		else
+ 		   	rc = tests[options.test_no](options); /* run just the selected test */
+	}
+
+ 	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+	return rc;
+}
diff --git a/mqtt/src/test/test3.c b/mqtt/src/test/test3.c
new file mode 100644
index 00000000..1429aa36
--- /dev/null
+++ b/mqtt/src/test/test3.c
@@ -0,0 +1,1639 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Allan Stockdill-Mander - initial API and implementation and/or initial documentation
+ *    Ian Craggs - add SSL options NULL test
+ *******************************************************************************/
+
+/**
+ * @file
+ * SSL tests for the Eclipse Paho MQTT C client
+ */
+
+#include "MQTTClient.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if defined(_WINDOWS)
+  #include <windows.h>
+  #include <openssl/applink.c>
+  #define MAXHOSTNAMELEN 256
+  #define snprintf _snprintf
+  #define setenv(a, b, c) _putenv_s(a, b)
+#else
+  #include <sys/time.h>
+  #include <sys/socket.h>
+  #include <unistd.h>
+  #include <errno.h>
+#endif
+
+#if defined(IOS)
+char skeytmp[1024];
+char ckeytmp[1024];
+char persistenceStore[1024];
+#else
+char* persistenceStore = NULL;
+#endif
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("Options:\n");
+	printf("\t--test_no <test_no> - Run test number <test_no>\n");
+	printf("\t--connection <mqtt URL> - Connect to <mqtt URL> for tests\n");
+	printf("\t--haconnections \"<mqtt URLs>\" - Use \"<mqtt URLs>\" as the list of servers for HA tests (space separated)\n");
+	printf("\t--client_key <key_file> - Use <key_file> as the client certificate for SSL authentication\n");
+	printf("\t--client_key_pass <password> - Use <password> to access the private key in the client certificate\n");
+	printf("\t--client_privatekey <file> - Client private key file if not in certificate file\n");
+	printf("\t--server_key <key_file> - Use <key_file> as the trusted certificate for server\n");
+	printf("\t--verbose - Enable verbose output \n");
+	printf("\tserver connection URLs should be in the form; (tcp|ssl)://hostname:port\n");
+	printf("\t--help - This help output\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char connection[100];
+	char mutual_auth_connection[100];   /**< connection to system under test. */
+	char nocert_mutual_auth_connection[100];
+	char server_auth_connection[100];
+	char anon_connection[100];
+	char psk_connection[100];
+	char** haconnections;         	/**< connection to system under test. */
+	int hacount;
+	char* client_key_file;
+	char* client_key_pass;
+	char* server_key_file;
+	char* client_private_key_file;
+	int verbose;
+	int test_no;
+	int websockets;
+} options =
+{
+	"ssl://m2m.eclipse.org:18883",
+	"ssl://m2m.eclipse.org:18884",
+	"ssl://m2m.eclipse.org:18887",
+	"ssl://m2m.eclipse.org:18885",
+	"ssl://m2m.eclipse.org:18886",
+	"ssl://m2m.eclipse.org:18888",
+	NULL,
+	0,
+	"../../../test/ssl/client.pem",
+	NULL,
+	"../../../test/ssl/test-root-ca.crt",
+	NULL,
+	0,
+	0,
+	0,
+};
+
+
+char* test_map[] =
+{
+  "none",
+  "1",         // 1
+  "2a_s",      // 2
+  "2a_m",      // 3
+  "2b",        // 4
+  "2c",        // 5
+  "3a_s",      // 6
+  "3a_m",      // 7
+  "3b",        // 8
+  "4s",        // 9
+  "4m",        // 10
+  "5a",        // 11
+  "5b",        // 12
+  "5c",        // 13
+};
+
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--help") == 0)
+			usage();
+		else if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+			{
+				int i;
+
+				for (i = 1; i < ARRAY_SIZE(test_map); ++i)
+				{
+					if (strcmp(argv[count], test_map[i]) == 0)
+					{
+						options.test_no = i;
+						break;
+					}
+				}
+				if (options.test_no == 0)
+					options.test_no = atoi(argv[count]);
+
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--hostname") == 0)
+		{
+			if (++count < argc)
+			{
+				char* prefix = (options.websockets) ? "wss" : "ssl";
+
+				sprintf(options.connection, "%s://%s:18883", prefix, argv[count]);
+				printf("Setting connection to %s\n", options.connection);
+				sprintf(options.mutual_auth_connection, "%s://%s:18884", prefix, argv[count]);
+				printf("Setting mutual_auth_connection to %s\n", options.mutual_auth_connection);
+				sprintf(options.nocert_mutual_auth_connection, "%s://%s:18887", prefix, argv[count]);
+				printf("Setting nocert_mutual_auth_connection to %s\n",
+					options.nocert_mutual_auth_connection);
+				sprintf(options.server_auth_connection, "%s://%s:18885", prefix, argv[count]);
+				printf("Setting server_auth_connection to %s\n", options.server_auth_connection);
+				sprintf(options.anon_connection, "%s://%s:18886", prefix, argv[count]);
+				printf("Setting anon_connection to %s\n", options.anon_connection);
+				sprintf(options.psk_connection, "%s://%s:18888", prefix, argv[count]);
+				printf("Setting psk_connection to %s\n", options.psk_connection);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--haconnections") == 0)
+		{
+			if (++count < argc)
+			{
+				char* tok = strtok(argv[count], " ");
+				options.hacount = 0;
+				options.haconnections = malloc(sizeof(char*) * 5);
+				while (tok)
+				{
+					options.haconnections[options.hacount] = malloc(strlen(tok) + 1);
+					strcpy(options.haconnections[options.hacount], tok);
+					options.hacount++;
+					tok = strtok(NULL, " ");
+				}
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--client_key") == 0)
+		{
+			if (++count < argc)
+        		{
+#if defined(IOS)
+        		        strcat(ckeytmp, getenv("HOME"));
+        		        strcat(ckeytmp, argv[count]);
+        		        options.client_key_file = ckeytmp;
+#else
+				options.client_key_file = argv[count];
+#endif
+        		}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--client_privatekey") == 0)
+		{
+			if (++count < argc)
+        		{
+#if defined(IOS)
+        		        strcat(ckeytmp, getenv("HOME"));
+        		        strcat(ckeytmp, argv[count]);
+        		        options.client_private_key_file = ckeytmp;
+#else
+				options.client_private_key_file = argv[count];
+#endif
+        		}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--client_key_pass") == 0)
+		{
+			if (++count < argc)
+				options.client_key_pass = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--server_key") == 0)
+		{
+			if (++count < argc)
+			{
+#if defined(IOS)
+		                strcat(skeytmp, getenv("HOME"));
+		                strcat(skeytmp, argv[count]);
+		                options.server_key_file = skeytmp;
+#else
+		                options.server_key_file = argv[count];
+#endif
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+		{
+			options.verbose = 1;
+			printf("\nSetting verbose on\n");
+		}
+		else if (strcmp(argv[count], "--ws") == 0)
+		{
+			options.websockets = 1;
+			printf("\nSetting websockets on\n");
+		}
+		count++;
+	}
+#if defined(IOS)
+	strcpy(persistenceStore, getenv("HOME"));
+	strcat(persistenceStore, "/Library/Caches");
+#endif
+}
+
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+
+int myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		printf("Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+	else
+		MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+	return value;
+}
+
+
+/*********************************************************************
+
+Test: single-threaded client
+
+*********************************************************************/
+void singleThread_sendAndReceive(MQTTClient* c, int qos, char* test_topic)
+{
+	MQTTClient_deliveryToken dt;
+	MQTTClient_message pubmsg = MQTTClient_message_initializer;
+	MQTTClient_message* m = NULL;
+	char* topicName = NULL;
+	int topicLen;
+	int i = 0;
+	int iterations = 50;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "%d messages at QoS %d", iterations, qos);
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = qos;
+	pubmsg.retained = 0;
+
+	for (i = 0; i< iterations; ++i)
+	{
+		if (i % 10 == 0)
+			rc = MQTTClient_publish(c, test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, NULL);
+		else
+			rc = MQTTClient_publishMessage(c, test_topic, &pubmsg, &dt);
+		assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+		if (qos > 0)
+		{
+			rc = MQTTClient_waitForCompletion(c, dt, 20000L);
+			assert("Good rc from waitforCompletion", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		}
+
+		rc = MQTTClient_receive(c, &topicName, &topicLen, &m, 10000);
+		assert("Good rc from receive", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+		if (topicName)
+		{
+			MyLog(LOGA_DEBUG, "Message received on topic %s is %.*s", topicName, m->payloadlen, (char*)(m->payload));
+			if (pubmsg.payloadlen != m->payloadlen ||
+					memcmp(m->payload, pubmsg.payload, m->payloadlen) != 0)
+			{
+				failures++;
+				MyLog(LOGA_INFO, "Error: wrong data - received lengths %d %d", pubmsg.payloadlen, m->payloadlen);
+				break;
+			}
+			MQTTClient_free(topicName);
+			MQTTClient_freeMessage(&m);
+		}
+		else
+			printf("No message received within timeout period\n");
+	}
+
+	/* receive any outstanding messages */
+	MQTTClient_receive(c, &topicName, &topicLen, &m, 1000);
+	while (topicName)
+	{
+		printf("Message received on topic %s is %.*s.\n", topicName, m->payloadlen, (char*)(m->payload));
+		MQTTClient_free(topicName);
+		MQTTClient_freeMessage(&m);
+		MQTTClient_receive(c, &topicName, &topicLen, &m, 1000);
+	}
+}
+
+/*********************************************************************
+
+Test: multi-threaded client using callbacks
+
+*********************************************************************/
+volatile int multiThread_arrivedcount = 0;
+int multiThread_deliveryCompleted = 0;
+MQTTClient_message multiThread_pubmsg = MQTTClient_message_initializer;
+
+void multiThread_deliveryComplete(void* context, MQTTClient_deliveryToken dt)
+{
+	++multiThread_deliveryCompleted;
+}
+
+int multiThread_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* m)
+{
+	++multiThread_arrivedcount;
+	MyLog(LOGA_DEBUG, "Callback: %d message received on topic %s is %.*s.",
+					multiThread_arrivedcount, topicName, m->payloadlen, (char*)(m->payload));
+	if (multiThread_pubmsg.payloadlen != m->payloadlen ||
+					memcmp(m->payload, multiThread_pubmsg.payload, m->payloadlen) != 0)
+	{
+		failures++;
+		MyLog(LOGA_INFO, "Error: wrong data received lengths %d %d\n", multiThread_pubmsg.payloadlen, m->payloadlen);
+	}
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&m);
+	return 1;
+}
+
+
+void multiThread_sendAndReceive(MQTTClient* c, int qos, char* test_topic)
+{
+	MQTTClient_deliveryToken dt;
+	int i = 0;
+	int iterations = 50;
+	int rc = 0;
+	int wait_seconds = 0;
+
+	multiThread_deliveryCompleted = 0;
+	multiThread_arrivedcount = 0;
+
+	MyLog(LOGA_DEBUG, "%d messages at QoS %d", iterations, qos);
+	multiThread_pubmsg.payload = "a much longer message that we can shorten to the extent that we need to";
+	multiThread_pubmsg.payloadlen = 27;
+	multiThread_pubmsg.qos = qos;
+	multiThread_pubmsg.retained = 0;
+
+	for (i = 1; i <= iterations; ++i)
+	{
+		if (i % 10 == 0)
+			rc = MQTTClient_publish(c, test_topic, multiThread_pubmsg.payloadlen, multiThread_pubmsg.payload,
+                   multiThread_pubmsg.qos, multiThread_pubmsg.retained, NULL);
+		else
+			rc = MQTTClient_publishMessage(c, test_topic, &multiThread_pubmsg, &dt);
+		assert("Good rc from publish", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(100000L);
+		#endif
+
+		wait_seconds = 20;
+		while ((multiThread_arrivedcount < i) && (wait_seconds-- > 0))
+		{
+			MyLog(LOGA_DEBUG, "Arrived %d count %d", multiThread_arrivedcount, i);
+			#if defined(WIN32)
+				Sleep(1000);
+			#else
+				usleep(1000000L);
+			#endif
+		}
+		assert("Message Arrived", wait_seconds > 0,
+				"Time out waiting for message %d\n", i );
+	}
+	if (qos > 0)
+	{
+		/* MQ Telemetry can send a message to a subscriber before the server has
+		   completed the QoS 2 handshake with the publisher. For QoS 1 and 2,
+		   allow time for the final delivery complete callback before checking
+		   that all expected callbacks have been made */
+		wait_seconds = 10;
+		while ((multiThread_deliveryCompleted < iterations) && (wait_seconds-- > 0))
+		{
+			MyLog(LOGA_DEBUG, "Delivery Completed %d count %d", multiThread_deliveryCompleted, i);
+			#if defined(WIN32)
+				Sleep(1000);
+			#else
+				usleep(1000000L);
+			#endif
+		}
+		assert("All Deliveries Complete", wait_seconds > 0,
+			   "Number of deliveryCompleted callbacks was %d\n",
+			   multiThread_deliveryCompleted);
+	}
+}
+
+
+/*********************************************************************
+
+Test1: SSL connection to non SSL MQTT server
+
+*********************************************************************/
+int test1(struct Options options)
+{
+	char* testname = "test1";
+	char* test_topic = "C client SSL test1";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting SSL test 1 - connection to nonSSL MQTT server");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"SSL connect fail to nonSSL MQTT server\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, "a b://wrong protocol", "test1",	MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	assert("bad rc from create", rc == MQTTCLIENT_BAD_PROTOCOL, "rc was %d \n", rc);
+
+	rc = MQTTClient_create(&c, options.connection, "test1",	MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d \n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	/* Try with ssl opts == NULL - should get error */
+	rc = MQTTClient_connect(c, &opts);
+	assert("Connect should fail", rc == MQTTCLIENT_NULL_PARAMETER, "rc was %d ", rc);
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file != NULL)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Connect should fail", rc == MQTTCLIENT_FAILURE, "rc was %d ", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test2a: Mutual SSL Authentication - Certificates in place on client and server - single threaded
+
+*********************************************************************/
+
+int test2a_s(struct Options options)
+{
+	char* testname = "test2a_s";
+	char* test_topic = "C client test2a_s";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 2a_s - Mutual SSL authentication - single threaded client using receive");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 2a_s\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.server_auth_connection, "test2a_s", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	if (options.client_key_pass)
+		opts.ssl->privateKeyPassword = options.client_key_pass;
+	if (options.client_private_key_file)
+		opts.ssl->privateKey = options.client_private_key_file;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	if (!(assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	singleThread_sendAndReceive(c, 0, test_topic);
+	singleThread_sendAndReceive(c, 1, test_topic);
+	singleThread_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping\n");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	if (!(assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	/* Just to make sure we can connect again */
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Connect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test2a: Mutual SSL Authentication - Certificates in place on client and server - multi threaded
+
+*********************************************************************/
+
+int test2a_m(struct Options options)
+{
+	char* testname = "test2a_m";
+	char* test_topic = "C client test2a_m";
+	int subsqos = 2;
+	/* TODO - usused - remove ? MQTTClient_deliveryToken* dt = NULL; */
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 2a_m - Mutual SSL authentication - multi-threaded client using callbacks");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 2a_m\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.mutual_auth_connection, "test2a_m", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	if (options.client_key_pass)
+		opts.ssl->privateKeyPassword = options.client_key_pass;
+	if (options.client_private_key_file)
+		opts.ssl->privateKey = options.client_private_key_file;
+	//opts.ssl->enabledCipherSuites = "DEFAULT";
+	//opts.ssl->enabledServerCertAuth = 1;
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, multiThread_messageArrived, multiThread_deliveryComplete);
+	if (!(assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	if (!(assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	multiThread_sendAndReceive(c, 0, test_topic);
+	multiThread_sendAndReceive(c, 1, test_topic);
+	multiThread_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	if (!(assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test2b: Mutual SSL Authentication - Server does not have Client cert, connection fails
+
+*********************************************************************/
+int test2b(struct Options options)
+{
+	char* testname = "test2b";
+	char* test_topic = "C client test2b";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 2b - connection to SSL MQTT server with clientauth=req but server does not have client cert");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 2b\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.nocert_mutual_auth_connection, "test2b", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	if (options.client_key_pass)
+		opts.ssl->privateKeyPassword = options.client_key_pass;
+	if (options.client_private_key_file)
+		opts.ssl->privateKey = options.client_private_key_file;
+	//opts.ssl->enabledCipherSuites = "DEFAULT";
+	//opts.ssl->enabledServerCertAuth = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Bad rc from connect", rc == MQTTCLIENT_FAILURE, "rc was %d\n", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test2c: Mutual SSL Authentication - Client does not have Server cert
+
+*********************************************************************/
+int test2c(struct Options options)
+{
+	char* testname = "test2c";
+	char* test_topic = "C client test2c";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 2c - connection to SSL MQTT server, server auth enabled but unknown cert");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 2c\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.mutual_auth_connection, "test2c", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+    	//if (options.server_key_file)
+	//	opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	if (options.client_key_pass)
+		opts.ssl->privateKeyPassword = options.client_key_pass;
+	if (options.client_private_key_file)
+		opts.ssl->privateKey = options.client_private_key_file;
+	//opts.ssl->enabledCipherSuites = "DEFAULT";
+	//opts.ssl->enabledServerCertAuth = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Good rc from connect", rc == MQTTCLIENT_FAILURE, "rc was %d", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test3a: Server Authentication - server certificate in client trust store - single threaded
+
+*********************************************************************/
+
+int test3a_s(struct Options options)
+{
+	char* testname = "test3a_s";
+	char* test_topic = "C client test3a_s";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 3a_s - Server authentication - single threaded client using receive");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 3a_s\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.server_auth_connection, "test3a_s", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file != NULL)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	if (!(assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+
+	singleThread_sendAndReceive(c, 0, test_topic);
+	singleThread_sendAndReceive(c, 1, test_topic);
+	singleThread_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping\n");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	if (!(assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	/* Just to make sure we can connect again */
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Connect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test3a: Server Authentication - server certificate in client trust store - multi threaded
+
+*********************************************************************/
+
+int test3a_m(struct Options options)
+{
+	char* testname = "test3a_m";
+	char* test_topic = "C client test3a_m";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 3a_m - Server authentication - multi-threaded client using callbacks");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 3a_m\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.server_auth_connection, "test3a_m", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file != NULL)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, multiThread_messageArrived,	multiThread_deliveryComplete);
+	if (!(assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	if (!(assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	multiThread_sendAndReceive(c, 0, test_topic);
+	multiThread_sendAndReceive(c, 1, test_topic);
+	multiThread_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping\n");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	if (!(assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test3b: Server Authentication - Client does not have server cert
+
+*********************************************************************/
+int test3b(struct Options options)
+{
+	char* testname = "test3b";
+	char* test_topic = "C client test3b";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 3b - connection to SSL MQTT server with clientauth=opt but client does not have server cert");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 3b\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.server_auth_connection, "test3b", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Bad rc from connect", rc == MQTTCLIENT_FAILURE, "rc was %d", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test4_s: Accept invalid server certificates - single threaded
+
+*********************************************************************/
+
+int test4_s(struct Options options)
+{
+	char* testname = "test4_s";
+	char* test_topic = "C client test4_s";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 4_s - accept invalid server certificates - single threaded");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 4_s\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.server_auth_connection, "test4_s", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+	opts.ssl->enableServerCertAuth = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	if (!(assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	singleThread_sendAndReceive(c, 0, test_topic);
+	singleThread_sendAndReceive(c, 1, test_topic);
+	singleThread_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping\n");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	if (!(assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	/* Just to make sure we can connect again */
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Connect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test4_m: Accept invalid server certificates - multi threaded
+
+*********************************************************************/
+
+int test4_m(struct Options options)
+{
+	char* testname = "test4_m";
+	char* test_topic = "C client test4_m";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 4_m - accept invalid server certificates - multi-threaded");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 4_m\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.server_auth_connection, "test4_m", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+	opts.ssl->enableServerCertAuth = 0;
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, multiThread_messageArrived, multiThread_deliveryComplete);
+	if (!(assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	if (!(assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	multiThread_sendAndReceive(c, 0, test_topic);
+	multiThread_sendAndReceive(c, 1, test_topic);
+	multiThread_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	if (!(assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test5a: Anonymous ciphers - server auth disabled
+
+*********************************************************************/
+
+int test5a(struct Options options)
+{
+	char* testname = "test5a";
+	char* test_topic = "C client SSL test5a";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting SSL test 5a - Anonymous ciphers - server authentication disabled");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 5a\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.anon_connection, "test5a", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create",	rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+	opts.ssl->enabledCipherSuites = "aNULL";
+	opts.ssl->enableServerCertAuth = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	if (!(assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	singleThread_sendAndReceive(c, 0, test_topic);
+	singleThread_sendAndReceive(c, 1, test_topic);
+	singleThread_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping\n");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	if (!(assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	/* Just to make sure we can connect again */
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Connect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test5b: Anonymous ciphers - server auth enabled
+
+*********************************************************************/
+
+int test5b(struct Options options)
+{
+	char* testname = "test5b";
+	char* test_topic = "C client SSL test5b";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting SSL test 5b - Anonymous ciphers - server authentication enabled");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 5b\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.anon_connection, "test5b", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+	//opts.ssl->trustStore = /*file of certificates trusted by client*/
+	//opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	//if (options.client_key_pass != NULL) opts.ssl->privateKeyPassword = options.client_key_pass;
+	opts.ssl->enabledCipherSuites = "aNULL";
+	opts.ssl->enableServerCertAuth = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	if (!(assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	singleThread_sendAndReceive(c, 0, test_topic);
+	singleThread_sendAndReceive(c, 1, test_topic);
+	singleThread_sendAndReceive(c, 2, test_topic);
+
+	MyLog(LOGA_DEBUG, "Stopping\n");
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	if (!(assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+	/* Just to make sure we can connect again */
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Connect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test5c: Anonymous ciphers - client not using anonymous ciphers
+
+*********************************************************************/
+
+int test5c(struct Options options)
+{
+	char* testname = "test5c";
+	char* test_topic = "C client SSL test5c";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting SSL test 5c - Anonymous ciphers - client not using anonymous cipher");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"test 5c\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.anon_connection, "test5c", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+	//opts.ssl->trustStore = /*file of certificates trusted by client*/
+	//opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	//if (options.client_key_pass != NULL) opts.ssl->privateKeyPassword = options.client_key_pass;
+	opts.ssl->enabledCipherSuites = "DEFAULT";
+	opts.ssl->enableServerCertAuth = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Good rc from connect", rc == MQTTCLIENT_FAILURE, "rc was %d", rc)))
+		goto exit;
+
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test6: TLS-PSK - client and server has a common pre-shared key
+
+*********************************************************************/
+static unsigned int onPSKAuth(const char* hint,
+                              char* identity,
+                              unsigned int max_identity_len,
+                              unsigned char* psk,
+                              unsigned int max_psk_len,
+                              void* context)
+{
+	unsigned char test_psk[] = {0x50, 0x53, 0x4B, 0x00}; /* {'P', 'S', 'K', '\0' } */
+	MyLog(LOGA_DEBUG, "PSK auth callback");
+
+	if (!(assert("Good application context in onPSKAuth", context == (void *) 42, "context was %d\n", context)))
+		return 0;
+
+	strncpy(identity, "id", max_identity_len);
+	memcpy(psk, test_psk, sizeof(test_psk));
+	return sizeof(test_psk);
+}
+
+
+int test6(struct Options options)
+{
+	char* testname = "test6";
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	MQTTClient_SSLOptions sslopts = MQTTClient_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 6 - TLS-PSK - client and server has a common pre-shared key");
+	fprintf(xml, "<testcase classname=\"test6\" name=\"test 6\"");
+	global_start_time = start_clock();
+
+	rc = MQTTClient_create(&c, options.psk_connection, "test6", MQTTCLIENT_PERSISTENCE_DEFAULT, persistenceStore);
+	if (!(assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.ssl = &sslopts;
+	opts.ssl->ssl_psk_cb = onPSKAuth;
+	opts.ssl->ssl_psk_context = (void *) 42;
+	opts.ssl->enabledCipherSuites = "PSK-AES128-CBC-SHA";
+
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	rc = MQTTClient_connect(c, &opts);
+	if (!(assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+
+	MyLog(LOGA_DEBUG, "Stopping\n");
+
+	rc = MQTTClient_disconnect(c, 0);
+	if (!(assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc)))
+		goto exit;
+exit:
+	MQTTClient_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+typedef struct
+{
+	char* clientID;					/**< the string id of the client */
+	char* username;					/**< MQTT v3.1 user name */
+	char* password;					/**< MQTT v3.1 password */
+	unsigned int cleansession : 1;			/**< MQTT clean session flag */
+	unsigned int connected : 1;			/**< whether it is currently connected */
+	unsigned int good : 1; 			/**< if we have an error on the socket we turn this off */
+	unsigned int ping_outstanding : 1;
+	unsigned int connect_state : 2;
+	int socket;
+	int msgID;
+	int keepAliveInterval;
+	int retryInterval;
+	int maxInflightMessages;
+	time_t lastContact;
+	void* will;
+	void* inboundMsgs;
+	void* outboundMsgs;				/**< in flight */
+	void* messageQueue;
+	void* phandle;  /* the persistence handle */
+	MQTTClient_persistence* persistence; /* a persistence implementation */
+	int connectOptionsVersion;
+} Clients;
+
+typedef struct
+{
+	char* serverURI;
+	Clients* c;
+	MQTTClient_connectionLost* cl;
+	MQTTClient_messageArrived* ma;
+	MQTTClient_deliveryComplete* dc;
+	void* context;
+
+	int connect_sem;
+	int rc; /* getsockopt return code in connect */
+	int connack_sem;
+	int suback_sem;
+	int unsuback_sem;
+	void* pack;
+} MQTTClients;
+
+
+int main(int argc, char** argv)
+{
+	int* numtests = &tests;
+	int rc = 0;
+ 	int (*tests[])() = {NULL, test1, test2a_s, test2a_m, test2b, test2c, test3a_s, test3a_m, test3b, test4_s, test4_m, test6, /*test5a, test5b,test5c */};
+	//MQTTClient_nameValue* info;
+
+	xml = fopen("TEST-test3.xml", "w");
+	fprintf(xml, "<testsuite name=\"test3\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));
+
+	setenv("MQTT_C_CLIENT_TRACE", "ON", 1);
+	setenv("MQTT_C_CLIENT_TRACE_LEVEL", "ERROR", 0);
+	getopts(argc, argv);
+ 	if (options.test_no == 0)
+	{ /* run all the tests */
+		for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+			rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+	}
+	else
+		rc = tests[options.test_no](options); /* run just the selected test */
+
+	MyLog(LOGA_INFO, "Total tests run: %d", *numtests);
+	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+
+	return rc;
+}
diff --git a/mqtt/src/test/test4.c b/mqtt/src/test/test4.c
new file mode 100644
index 00000000..953ec209
--- /dev/null
+++ b/mqtt/src/test/test4.c
@@ -0,0 +1,1741 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2014 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - test8 - failure callbacks
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * Tests for the Paho Asynchronous MQTT C client
+ */
+
+
+#include "MQTTAsync.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+  #include <sys/socket.h>
+	#include <unistd.h>
+  #include <errno.h>
+#else
+	#include <windows.h>
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;         /**< connection to system under test. */
+	int verbose;
+	int test_no;
+	int size;									/**< size of big message */
+	int MQTTVersion;
+	int iterations;
+} options =
+{
+	"mqtt.eclipse.org:1883",
+	0,
+	-1,
+	10000,
+	MQTTVERSION_DEFAULT,
+	1,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--size") == 0)
+		{
+			if (++count < argc)
+				options.size = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+				options.connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--MQTTversion") == 0)
+		{
+			if (++count < argc)
+			{
+				options.MQTTVersion = atoi(argv[count]);
+				printf("setting MQTT version to %d\n", options.MQTTVersion);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--iterations") == 0)
+		{
+			if (++count < argc)
+				options.iterations = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+			options.verbose = 1;
+		count++;
+	}
+}
+
+#if 0
+#include <logaX.h>   /* For general log messages                      */
+#define MyLog logaLine
+#else
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+#endif
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		printf("Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+    else
+    	MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+}
+
+volatile int test_finished = 0;
+
+char* test_topic = "async test topic";
+
+
+void test1_onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+	test_finished = 1;
+}
+
+
+void test1_onUnsubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In onUnsubscribe onSuccess callback %p", c);
+	opts.onSuccess = test1_onDisconnect;
+	opts.context = c;
+
+	rc = MQTTAsync_disconnect(c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test1_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In messageArrived callback %p", c);
+
+	if (++message_count == 1)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = 2;
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+		assert("Good rc from send", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	else
+	{
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		opts.onSuccess = test1_onUnsubscribe;
+		opts.context = c;
+		rc = MQTTAsync_unsubscribe(c, test_topic, &opts);
+		assert("Unsubscribe successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+void test1_onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback %p granted qos %d", c, response->alt.qos);
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	rc = MQTTAsync_send(c, test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, NULL);
+	assert("Good rc from send", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+void test1_onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.onSuccess = test1_onSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribe(c, test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+
+/*********************************************************************
+
+Test1: Basic connect, subscribe send and receive.
+
+*********************************************************************/
+int test1(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+
+	MyLog(LOGA_INFO, "Starting test 1 - asynchronous connect");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"asynchronous connect\"");
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, options.connection, "async_test",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = options.MQTTVersion;
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test1_onConnect;
+	opts.onFailure = NULL;
+	opts.context = c;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST1: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+int test2_onFailure_called = 0;
+
+void test2_onFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test2_onFailure_called++;
+	test_finished = 1;
+}
+
+
+void test2_onConnect(void* context, MQTTAsync_successData* response)
+{
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p\n", context);
+
+	assert("Connect should not succeed", 0, "connect success callback was called", 0);
+
+	test_finished = 1;
+}
+
+/*********************************************************************
+
+Test2: connect timeout
+
+*********************************************************************/
+int test2(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test2";
+
+	test_finished = 0;
+
+	MyLog(LOGA_INFO, "Starting test 2 - connect timeout");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"connect timeout\"");
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, "tcp://9.20.96.160:66", "connect timeout",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.connectTimeout = 5;
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.binarypwd.data = "testpassword";
+	opts.binarypwd.len = (int)strlen(opts.binarypwd.data);
+	opts.MQTTVersion = options.MQTTVersion;
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test2_onConnect;
+	opts.onFailure = test2_onFailure;
+	opts.context = c;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	assert("Connect onFailure should be called once", test2_onFailure_called == 1,
+			"connect onFailure was called %d times", test2_onFailure_called);
+
+	MyLog(LOGA_INFO, "TEST2: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+typedef struct
+{
+	MQTTAsync c;
+	int index;
+	char clientid[24];
+	char test_topic[100];
+	int	message_count;
+} client_data;
+
+
+void test3_onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	client_data* cd = (client_data*)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect callback for client \"%s\"", cd->clientid);
+	test_finished++;
+}
+
+
+void test3_onPublish(void* context,  MQTTAsync_successData* response)
+{
+	client_data* cd = (client_data*)context;
+	MyLog(LOGA_DEBUG, "In QoS 0 onPublish callback for client \"%s\"", cd->clientid);
+}
+
+
+void test3_onUnsubscribe(void* context, MQTTAsync_successData* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In onUnsubscribe onSuccess callback \"%s\"", cd->clientid);
+	opts.onSuccess = test3_onDisconnect;
+	opts.context = cd;
+
+	rc = MQTTAsync_disconnect(cd->c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test3_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	client_data* cd = (client_data*)context;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In messageArrived callback \"%s\" message count ", cd->clientid);
+
+	if (++cd->message_count == 1)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 25;
+		pubmsg.qos = 1;
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(cd->c, cd->test_topic, &pubmsg, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	else if (cd->message_count == 2)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		pubmsg.payload = "a QoS 0 message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 29;
+		pubmsg.qos = 0;
+		pubmsg.retained = 0;
+		opts.context = cd;
+		opts.onSuccess = test3_onPublish;
+
+		rc = MQTTAsync_sendMessage(cd->c, cd->test_topic, &pubmsg, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	else
+	{
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		opts.onSuccess = test3_onUnsubscribe;
+		opts.context = cd;
+		rc = MQTTAsync_unsubscribe(cd->c, cd->test_topic, &opts);
+		assert("Unsubscribe successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+	return 1;
+}
+
+void test3_onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback \"%s\"", cd->clientid);
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	rc = MQTTAsync_send(cd->c, cd->test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, NULL);
+	assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+void test3_onConnect(void* context, MQTTAsync_successData* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, \"%s\"", cd->clientid);
+	opts.onSuccess = test3_onSubscribe;
+	opts.context = cd;
+
+	rc = MQTTAsync_subscribe(cd->c, cd->test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished++;
+}
+
+
+void test3_onFailure(void* context, MQTTAsync_failureData* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+	assert("Should have connected", 0, "%s failed to connect\n", cd->clientid);
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, \"%s\" rc %d\n", cd->clientid, response ? response->code : -999);
+	if (response && response->message)
+		MyLog(LOGA_DEBUG, "In connect onFailure callback, \"%s\"\n", response->message);
+
+	test_finished++;
+}
+
+
+/*********************************************************************
+
+Test3: More than one client object - simultaneous working.
+
+*********************************************************************/
+int test3(struct Options options)
+{
+	#define num_clients 10
+	int subsqos = 2;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	int i;
+	client_data clientdata[num_clients];
+
+	test_finished = 0;
+	MyLog(LOGA_INFO, "Starting test 3 - multiple connections");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"multiple connections\"");
+	global_start_time = start_clock();
+
+	for (i = 0; i < num_clients; ++i)
+	{
+		sprintf(clientdata[i].clientid, "async_test3_num_%d", i);
+		sprintf(clientdata[i].test_topic, "async test3 topic num %d", i);
+		clientdata[i].index = i;
+		clientdata[i].message_count = 0;
+
+		rc = MQTTAsync_create(&(clientdata[i].c), options.connection, clientdata[i].clientid,
+			MQTTCLIENT_PERSISTENCE_NONE, NULL);
+		assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+
+		rc = MQTTAsync_setCallbacks(clientdata[i].c, &clientdata[i], NULL, test3_messageArrived, NULL);
+		assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+		opts.keepAliveInterval = 20;
+		opts.cleansession = 1;
+		opts.username = "testuser";
+		opts.password = "testpassword";
+		opts.MQTTVersion = options.MQTTVersion;
+
+		opts.will = &wopts;
+		opts.will->message = "will message";
+		opts.will->qos = 1;
+		opts.will->retained = 0;
+		opts.will->topicName = "will topic";
+		opts.onSuccess = test3_onConnect;
+		opts.onFailure = test3_onFailure;
+		opts.context = &clientdata[i];
+
+		MyLog(LOGA_DEBUG, "Connecting");
+		rc = MQTTAsync_connect(clientdata[i].c, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	while (test_finished < num_clients)
+	{
+		MyLog(LOGA_DEBUG, "num_clients %d test_finished %d\n", num_clients, test_finished);
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+	}
+
+	MyLog(LOGA_DEBUG, "TEST3: destroying clients");
+
+	for (i = 0; i < num_clients; ++i)
+		MQTTAsync_destroy(&clientdata[i].c);
+
+//exit:
+	MyLog(LOGA_INFO, "TEST3: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+void* test4_payload = NULL;
+int test4_payloadlen = 0;
+
+void test4_onPublish(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In publish onSuccess callback, context %p", context);
+}
+
+int test4_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+	int rc, i;
+
+	MyLog(LOGA_DEBUG, "In messageArrived callback %p", c);
+
+	assert("Message size correct", message->payloadlen == test4_payloadlen,
+				 "message size was %d", message->payloadlen);
+
+	for (i = 0; i < options.size; ++i)
+	{
+		if (((char*)test4_payload)[i] != ((char*)message->payload)[i])
+		{
+			assert("Message contents correct", ((char*)test4_payload)[i] != ((char*)message->payload)[i],
+				 "message content was %c", ((char*)message->payload)[i]);
+			break;
+		}
+	}
+
+	if (++message_count == 1)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		pubmsg.payload = test4_payload;
+		pubmsg.payloadlen = test4_payloadlen;
+		pubmsg.qos = 1;
+		pubmsg.retained = 0;
+		opts.onSuccess = test4_onPublish;
+		opts.context = c;
+
+		rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	}
+	else if (message_count == 2)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		pubmsg.payload = test4_payload;
+		pubmsg.payloadlen = test4_payloadlen;
+		pubmsg.qos = 0;
+		pubmsg.retained = 0;
+		opts.onSuccess = test4_onPublish;
+		opts.context = c;
+		rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	}
+	else
+	{
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		opts.onSuccess = test1_onUnsubscribe;
+		opts.context = c;
+		rc = MQTTAsync_unsubscribe(c, test_topic, &opts);
+		assert("Unsubscribe successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+void test4_onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc, i;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback %p", c);
+
+	pubmsg.payload = test4_payload = malloc(options.size);
+	pubmsg.payloadlen = test4_payloadlen = options.size;
+
+	srand(33);
+	for (i = 0; i < options.size; ++i)
+		((char*)pubmsg.payload)[i] = rand() % 256;
+
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	rc = MQTTAsync_send(c, test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, NULL);
+}
+
+
+void test4_onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.onSuccess = test4_onSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribe(c, test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+
+/*********************************************************************
+
+Test4: Send and receive big messages
+
+*********************************************************************/
+int test4(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test4";
+
+	test_finished = failures = 0;
+	MyLog(LOGA_INFO, "Starting test 4 - big messages");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"big messages\"");
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, options.connection, "async_test_4",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test4_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = options.MQTTVersion;
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test4_onConnect;
+	opts.onFailure = NULL;
+	opts.context = c;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(1000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST4: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+void test5_onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	MyLog(LOGA_INFO, "Connack rc is %d", response ? response->code : -999);
+
+	test_finished = 1;
+}
+
+
+void test5_onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test_finished = 1;
+}
+
+
+/********************************************************************
+
+Test5: Connack return codes
+
+*********************************************************************/
+int test5(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+
+	test_finished = failures = 0;
+	MyLog(LOGA_INFO, "Starting test 5 - connack return codes");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"connack return codes\"");
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, options.connection, "a clientid that is too long to be accepted",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.onSuccess = test5_onConnect;
+	opts.onFailure = test5_onConnectFailure;
+	opts.context = c;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST5: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+typedef struct
+{
+	MQTTAsync c;
+	int should_fail;
+} test6_client_info;
+
+void test6_onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	test6_client_info cinfo = *(test6_client_info*)context;
+
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	if (response)
+		MyLog(LOGA_INFO, "Connack rc is %d", response->code);
+
+	assert("Should fail to connect", cinfo.should_fail, "should_fail was %d", cinfo.should_fail);
+
+	test_finished = 1;
+}
+
+
+void test6_onConnect(void* context, MQTTAsync_successData* response)
+{
+	test6_client_info cinfo = *(test6_client_info*)context;
+
+	MyLog(LOGA_DEBUG, "In connect success callback, context %p", context);
+
+	assert("Should connect correctly", !cinfo.should_fail, "should_fail was %d", cinfo.should_fail);
+
+	test_finished = 1;
+}
+
+
+/********************************************************************
+
+Test6: HA connections
+
+*********************************************************************/
+int test6(struct Options options)
+{
+	int subsqos = 2;
+	test6_client_info cinfo;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+	char* uris[2] = {options.connection, options.connection};
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 6 - HA connections");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"HA connections\"");
+	global_start_time = start_clock();
+
+	test_finished = 0;
+	cinfo.should_fail = 1; /* fail to connect */
+	rc = MQTTAsync_create(&cinfo.c, "tcp://rubbish:1883", "async ha connection",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&cinfo.c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(cinfo.c, cinfo.c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.onSuccess = test6_onConnect;
+	opts.onFailure = test6_onConnectFailure;
+	opts.context = &cinfo;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(cinfo.c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	test_finished = 0;
+	cinfo.should_fail = 0; /* should connect */
+	rc = MQTTAsync_create(&cinfo.c, "tcp://rubbish:1883", "async ha connection",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&cinfo.c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(cinfo.c, cinfo.c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.onSuccess = test6_onConnect;
+	opts.onFailure = test6_onConnectFailure;
+	opts.context = &cinfo;
+	opts.serverURIs = uris;
+	opts.serverURIcount = 2;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(cinfo.c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&cinfo.c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST6: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+/********************************************************************
+
+Test7: Persistence
+
+*********************************************************************/
+
+char* test7_topic = "C client test7";
+int test7_messageCount = 0;
+
+void test7_onDisconnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect failure callback %p", c);
+
+	assert("Successful disconnect", 0, "disconnect failed", 0);
+
+	test_finished = 1;
+}
+
+void test7_onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+	test_finished = 1;
+}
+
+
+void test7_onUnsubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In onUnsubscribe onSuccess callback %p", c);
+	opts.onSuccess = test7_onDisconnect;
+	opts.context = c;
+
+	rc = MQTTAsync_disconnect(c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test7_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Test7: received message id %d", message->msgid);
+
+	test7_messageCount++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+static int test7_subscribed = 0;
+
+void test7_onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback %p granted qos %d", c, response->alt.qos);
+
+	test7_subscribed = 1;
+}
+
+
+void test7_onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.onSuccess = test7_onSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribe(c, test7_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+
+void test7_onConnectOnly(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions dopts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	dopts.context = context;
+	dopts.timeout = 1000;
+	dopts.onSuccess = test7_onDisconnect;
+	rc = MQTTAsync_disconnect(c, &dopts);
+
+	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+
+/*********************************************************************
+
+Test7: Pending tokens
+
+*********************************************************************/
+int test7(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MQTTAsync_responseOptions ropts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_disconnectOptions dopts = MQTTAsync_disconnectOptions_initializer;
+	MQTTAsync_token* tokens = NULL;
+	int msg_count = 6;
+
+	MyLog(LOGA_INFO, "Starting test 7 - pending tokens");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"pending tokens\"");
+	global_start_time = start_clock();
+	test_finished = 0;
+
+	rc = MQTTAsync_create(&c, options.connection, "async_test7",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test7_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = options.MQTTVersion;
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+
+	opts.onFailure = NULL;
+	opts.context = c;
+
+	opts.cleansession = 1;
+	opts.onSuccess = test7_onConnectOnly;
+	MyLog(LOGA_DEBUG, "Connecting to clean up");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	test_finished = 0;
+	MyLog(LOGA_DEBUG, "Connecting");
+	opts.cleansession = 0;
+	opts.onSuccess = test7_onConnect;
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test7_subscribed)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+	rc = MQTTAsync_send(c, test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, &ropts);
+	MyLog(LOGA_DEBUG, "Token was %d", ropts.token);
+	rc = MQTTAsync_isComplete(c, ropts.token);
+	/*assert("0 rc from isComplete", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);*/
+	rc = MQTTAsync_waitForCompletion(c, ropts.token, 5000L);
+	assert("Good rc from waitForCompletion", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	rc = MQTTAsync_isComplete(c, ropts.token);
+	assert("1 rc from isComplete", rc == 1, "rc was %d", rc);
+
+	test7_messageCount = 0;
+	int i = 0;
+	pubmsg.qos = 2;
+	for (i = 0; i < msg_count; ++i)
+	{
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		//pubmsg.qos = (pubmsg.qos == 2) ? 1 : 2;
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &ropts);
+	}
+	/* disconnect immediately without receiving the incoming messages */
+	dopts.timeout = 0;
+	dopts.onSuccess = test7_onDisconnect;
+	dopts.context = c;
+	MQTTAsync_disconnect(c, &dopts); /* now there should be "orphaned" publications */
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+	test_finished = 0;
+
+	rc = MQTTAsync_getPendingTokens(c, &tokens);
+ 	assert("getPendingTokens rc == 0", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	assert("should get some tokens back", tokens != NULL, "tokens was %p", tokens);
+	MQTTAsync_free(tokens);
+
+	MQTTAsync_destroy(&c); /* force re-reading persistence on create */
+
+	MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+	rc = MQTTAsync_create(&c, options.connection, "async_test7", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_getPendingTokens(c, &tokens);
+	assert("getPendingTokens rc == 0", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	assert("should get some tokens back", tokens != NULL, "tokens was %p", tokens);
+	if (tokens)
+	{
+		int i = 0;
+		while (tokens[i] != -1)
+			MyLog(LOGA_DEBUG, "Delivery token %d", tokens[i++]);
+		MQTTAsync_free(tokens);
+		//The following assertion should work, does with RSMB, but not Mosquitto
+		//assert1("no of tokens should be count", i == msg_count, "no of tokens %d count %d", i, msg_count);
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test7_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Reconnecting");
+	opts.context = c;
+	if (MQTTAsync_connect(c, &opts) != 0)
+	{
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		goto exit;
+	}
+
+	#if defined(WIN32)
+		Sleep(5000);
+	#else
+		usleep(5000000L);
+	#endif
+
+	rc = MQTTAsync_getPendingTokens(c, &tokens);
+	assert("getPendingTokens rc == 0", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	/* assert("should get no tokens back", tokens == NULL, "tokens was %p", tokens);
+
+	assert1("no of messages should be count", test7_messageCount == msg_count, "no of tokens %d count %d",
+			test7_messageCount, msg_count);
+
+	assertions fail against Mosquitto - needs testing */
+
+	dopts.onFailure = test7_onDisconnectFailure;
+	dopts.onSuccess = test7_onDisconnect;
+	dopts.timeout = 1000;
+	MQTTAsync_disconnect(c, &dopts);
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST7: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+/*********************************************************************
+
+Test8: Incomplete commands and requests
+
+*********************************************************************/
+
+char* test8_topic = "C client test8";
+int test8_messageCount = 0;
+int test8_subscribed = 0;
+int test8_publishFailures = 0;
+
+void test8_onPublish(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In publish onSuccess callback %p token %d", c, response->token);
+
+}
+
+void test8_onPublishFailure(void* context, MQTTAsync_failureData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onPublish failure callback %p", c);
+
+	assert("Response code should be interrupted", response->code == MQTTASYNC_OPERATION_INCOMPLETE,
+			"rc was %d", response->code);
+
+	test8_publishFailures++;
+}
+
+
+void test8_onDisconnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect failure callback %p", c);
+
+	assert("Successful disconnect", 0, "disconnect failed", 0);
+
+	test_finished = 1;
+}
+
+
+void test8_onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+	test_finished = 1;
+}
+
+
+void test8_onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback %p granted qos %d", c, response->alt.qos);
+
+	test8_subscribed = 1;
+}
+
+
+void test8_onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.onSuccess = test8_onSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribe(c, test8_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+int test8_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Test8: received message id %d", message->msgid);
+
+	test8_messageCount++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+int test8(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	int rc = 0;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MQTTAsync_responseOptions ropts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_disconnectOptions dopts = MQTTAsync_disconnectOptions_initializer;
+	MQTTAsync_token* tokens = NULL;
+	int msg_count = 6;
+
+	MyLog(LOGA_INFO, "Starting test 8 - incomplete commands");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"incomplete commands\"");
+	global_start_time = start_clock();
+	test_finished = 0;
+
+	rc = MQTTAsync_create(&c, options.connection, "async_test8",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test8_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = options.MQTTVersion;
+
+	opts.onFailure = NULL;
+	opts.context = c;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	opts.cleansession = 1;
+	opts.onSuccess = test8_onConnect;
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test8_subscribed)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	int i = 0;
+	pubmsg.qos = 2;
+	ropts.onSuccess = test8_onPublish;
+	ropts.onFailure = test8_onPublishFailure;
+	ropts.context = c;
+	for (i = 0; i < msg_count; ++i)
+	{
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = (pubmsg.qos == 2) ? 1 : 2; /* alternate */
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(c, test8_topic, &pubmsg, &ropts);
+		assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	/* disconnect immediately without completing the commands */
+	dopts.timeout = 0;
+	dopts.onSuccess = test8_onDisconnect;
+	dopts.context = c;
+	rc = MQTTAsync_disconnect(c, &dopts); /* now there should be incomplete commands */
+	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+	test_finished = 0;
+
+	rc = MQTTAsync_getPendingTokens(c, &tokens);
+ 	assert("getPendingTokens rc == 0", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	assert("should get no tokens back", tokens == NULL, "tokens was %p", tokens);
+
+	assert("test8_publishFailures > 0", test8_publishFailures > 0,
+		   "test8_publishFailures = %d", test8_publishFailures);
+
+	/* Now elicit failure callbacks on destroy */
+
+	test8_subscribed = test8_publishFailures = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	opts.cleansession = 0;
+	opts.onSuccess = test8_onConnect;
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test8_subscribed)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	i = 0;
+	pubmsg.qos = 2;
+	ropts.onSuccess = test8_onPublish;
+	ropts.onFailure = test8_onPublishFailure;
+	ropts.context = c;
+	for (i = 0; i < msg_count; ++i)
+	{
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = (pubmsg.qos == 2) ? 1 : 2; /* alternate */
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(c, test8_topic, &pubmsg, &ropts);
+		assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	/* disconnect immediately without completing the commands */
+	dopts.timeout = 0;
+	dopts.onSuccess = test8_onDisconnect;
+	dopts.context = c;
+	rc = MQTTAsync_disconnect(c, &dopts); /* now there should be incomplete commands */
+	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+	test_finished = 0;
+
+	rc = MQTTAsync_getPendingTokens(c, &tokens);
+	assert("getPendingTokens rc == 0", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	assert("should get some tokens back", tokens != NULL, "tokens was %p", tokens);
+	MQTTAsync_free(tokens);
+
+	assert("test8_publishFailures == 0", test8_publishFailures == 0,
+		   "test8_publishFailures = %d", test8_publishFailures);
+
+	MQTTAsync_destroy(&c);
+
+	assert("test8_publishFailures > 0", test8_publishFailures > 0,
+		   "test8_publishFailures = %d", test8_publishFailures);
+
+exit:
+	MyLog(LOGA_INFO, "TEST8: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+void trace_callback(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	printf("Trace : %d, %s\n", level, message);
+}
+
+
+
+
+int main(int argc, char** argv)
+{
+	int rc = 0;
+ 	int (*tests[])() = {NULL, test1, test2, test3, test4, test5, test6, test7, test8}; /* indexed starting from 1 */
+	MQTTAsync_nameValue* info;
+	int i;
+
+	xml = fopen("TEST-test4.xml", "w");
+	fprintf(xml, "<testsuite name=\"test4\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests)) - 1);
+
+	getopts(argc, argv);
+
+	MQTTAsync_setTraceCallback(trace_callback);
+
+	info = MQTTAsync_getVersionInfo();
+	while (info->name)
+	{
+	  MyLog(LOGA_INFO, "%s: %s", info->name, info->value);
+	  info++;
+	}
+
+	for (i = 0; i < options.iterations; ++i)
+	{
+	 	if (options.test_no == -1)
+		{ /* run all the tests */
+			for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+			{
+				failures = 0;
+				MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+			}
+		}
+		else
+		{
+			MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+			rc = tests[options.test_no](options); /* run just the selected test */
+		}
+	}
+
+	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+
+	return rc;
+}
diff --git a/mqtt/src/test/test45.c b/mqtt/src/test/test45.c
new file mode 100644
index 00000000..0022269e
--- /dev/null
+++ b/mqtt/src/test/test45.c
@@ -0,0 +1,2042 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - MQTT 3.1.1 support
+ *    Ian Craggs - test8 - failure callbacks
+ *    Ian Craggs - MQTT V5
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * Tests for the Paho Asynchronous MQTT C client
+ */
+
+
+#include "MQTTAsync.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+  #include <sys/socket.h>
+	#include <unistd.h>
+  #include <errno.h>
+#else
+	#include <windows.h>
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;         /**< connection to system under test. */
+	int verbose;
+	int test_no;
+	int size;									/**< size of big message */
+	int MQTTVersion;
+	int iterations;
+} options =
+{
+	"localhost:1883",
+	0,
+	-1,
+	10000,
+	MQTTVERSION_5,
+	1,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--size") == 0)
+		{
+			if (++count < argc)
+				options.size = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+				options.connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--MQTTversion") == 0)
+		{
+			if (++count < argc)
+			{
+				options.MQTTVersion = atoi(argv[count]);
+				printf("setting MQTT version to %d\n", options.MQTTVersion);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--iterations") == 0)
+		{
+			if (++count < argc)
+				options.iterations = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+			options.verbose = 1;
+		count++;
+	}
+}
+
+#if 0
+#include <logaX.h>   /* For general log messages                      */
+#define MyLog logaLine
+#else
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+
+	ftime(&ts);
+#if defined(WIN32) || defined(_WINDOWS)
+	localtime_s(&timeinfo, &ts.time);
+#else
+	localtime_r(&ts.time, &timeinfo);
+#endif
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", &timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+#endif
+
+
+void MySleep(long milliseconds)
+{
+#if defined(WIN32) || defined(WIN64)
+	Sleep(milliseconds);
+#else
+	usleep(milliseconds*1000);
+#endif
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		printf("Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+    else
+    	MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+}
+
+
+void logProperties(MQTTProperties *props)
+{
+	int i = 0;
+
+	for (i = 0; i < props->count; ++i)
+	{
+		int id = props->array[i].identifier;
+		const char* name = MQTTPropertyName(id);
+		char* intformat = "Property name %s value %d";
+
+		switch (MQTTProperty_getType(id))
+		{
+		case MQTTPROPERTY_TYPE_BYTE:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.byte);
+		  break;
+		case MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.integer2);
+		  break;
+		case MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER:
+		  MyLog(LOGA_INFO, intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_BINARY_DATA:
+		case MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING:
+		  MyLog(LOGA_INFO, "Property name %s value len %.*s", name,
+				  props->array[i].value.data.len, props->array[i].value.data.data);
+		  break;
+		case MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR:
+		  MyLog(LOGA_INFO, "Property name %s key %.*s value %.*s", name,
+			  props->array[i].value.data.len, props->array[i].value.data.data,
+		  	  props->array[i].value.value.len, props->array[i].value.value.data);
+		  break;
+		}
+	}
+}
+
+
+void waitForNoPendingTokens(MQTTAsync c)
+{
+	int i = 0, rc = 0, count = 0;
+	MQTTAsync_token *tokens;
+
+	/* acks for outgoing messages could arrive after incoming exchanges are complete */
+	do
+	{
+		rc = MQTTAsync_getPendingTokens(c, &tokens);
+		assert("Good rc from getPendingTokens", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+		i = 0;
+		if (tokens)
+		{
+			while (tokens[i] != -1)
+				++i;
+			MQTTAsync_free(tokens);
+		}
+		if (i > 0)
+			MySleep(100);
+	}
+	while (i > 0 && ++count < 10);
+	assert("Number of getPendingTokens should be 0", i == 0, "i was %d ", i);
+}
+
+
+volatile int test_finished = 0;
+
+char* test_topic = "async test topic";
+
+
+void test1_onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+	test_finished = 1;
+}
+
+
+void test1_onUnsubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	MQTTProperty property;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In onUnsubscribe onSuccess callback %p", c);
+	MyLog(LOGA_INFO, "Unsuback properties:");
+	logProperties(&response->properties);
+	assert("A property should exist", response->properties.count > 0,
+			"Property count was %d\n", response->properties);
+
+	opts.onSuccess = test1_onDisconnect;
+	opts.context = c;
+	opts.reasonCode = MQTTREASONCODE_UNSPECIFIED_ERROR;
+
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 0;
+	MQTTProperties_add(&opts.properties, &property);
+
+	rc = MQTTAsync_disconnect(c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	MQTTProperties_free(&opts.properties);
+}
+
+
+int test1_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In messageArrived callback %p", c);
+
+	assert("Message structure version should be 1", message->struct_version == 1,
+			"message->struct_version was %d", message->struct_version);
+	if (message->struct_version == 1)
+	{
+		assert("Properties count should be 2", message->properties.count == 2,
+			"Properties count was %d\n", message->properties.count);
+		logProperties(&message->properties);
+	}
+
+	if (++message_count == 1)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_callOptions opts = MQTTAsync_callOptions_initializer;
+		MQTTProperty property;
+		MQTTProperties props = MQTTProperties_initializer;
+
+		property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+		property.value.data.data = "test user property";
+		property.value.data.len = (int)strlen(property.value.data.data);
+		property.value.value.data = "test user property value";
+		property.value.value.len = (int)strlen(property.value.value.data);
+		MQTTProperties_add(&props, &property);
+		pubmsg.properties = props;
+
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = 2;
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+		assert("Publish should return 0", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		MQTTProperties_free(&props);
+	}
+	else
+	{
+		MQTTProperty property;
+		MQTTProperties props = MQTTProperties_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+		property.value.data.data = "test user property";
+		property.value.data.len = (int)strlen(property.value.data.data);
+		property.value.value.data = "test user property value";
+		property.value.value.len = (int)strlen(property.value.value.data);
+		MQTTProperties_add(&props, &property);
+		opts.properties = props;
+
+		opts.onSuccess5 = test1_onUnsubscribe;
+		opts.context = c;
+		rc = MQTTAsync_unsubscribe(c, test_topic, &opts);
+		assert("Unsubscribe successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		MQTTProperties_free(&props);
+	}
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+void test1_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+	MQTTProperty property;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTAsync_callOptions opts = MQTTAsync_callOptions_initializer;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback %p granted qos %d", c, response->reasonCode);
+	assert("Subscribe response should be 2", response->reasonCode == MQTTREASONCODE_GRANTED_QOS_2,
+			"response was %d", response->reasonCode);
+
+	MyLog(LOGA_INFO, "Suback properties:");
+	logProperties(&response->properties);
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "test user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "test user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&props, &property);
+	opts.properties = props;
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	rc = MQTTAsync_send(c, test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, &opts);
+	MQTTProperties_free(&props);
+}
+
+
+void test1_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTProperty property;
+	MQTTProperties props = MQTTProperties_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+
+	assert("Reason code should be 0", response->reasonCode == MQTTREASONCODE_SUCCESS,
+		   "Reason code was %d\n", response->reasonCode);
+
+	MyLog(LOGA_INFO, "Connack properties:");
+	logProperties(&response->properties);
+
+	opts.onSuccess5 = test1_onSubscribe;
+	opts.context = c;
+
+	property.identifier = MQTTPROPERTY_CODE_SUBSCRIPTION_IDENTIFIER;
+	property.value.integer4 = 33;
+	MQTTProperties_add(&props, &property);
+	opts.properties = props;
+
+	opts.subscribeOptions.retainAsPublished = 1;
+
+	rc = MQTTAsync_subscribe(c, test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+	MQTTProperties_free(&props);
+}
+
+
+/*********************************************************************
+
+Test1: Basic connect, subscribe send and receive.
+
+*********************************************************************/
+int test1(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperties willProps = MQTTProperties_initializer;
+	MQTTProperty property;
+	int rc = 0;
+	char* test_topic = "V5 C client test1";
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+
+	MyLog(LOGA_INFO, "Starting V5 test 1 - asynchronous connect");
+	fprintf(xml, "<testcase classname=\"test45\" name=\"asynchronous connect\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "async_test",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = options.MQTTVersion;
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess5 = test1_onConnect;
+	opts.onFailure5 = NULL;
+	opts.context = c;
+
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&props, &property);
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "test user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "test user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&props, &property);
+
+	opts.connectProperties = &props;
+	opts.willProperties = &willProps;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		MySleep(100);
+
+	MQTTProperties_free(&props);
+	MQTTProperties_free(&willProps);
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST1: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+int test2_onFailure_called = 0;
+
+void test2_onFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test2_onFailure_called++;
+	test_finished = 1;
+}
+
+
+void test2_onConnect(void* context, MQTTAsync_successData5* response)
+{
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p\n", context);
+
+	assert("Connect should not succeed", 0, "connect success callback was called", 0);
+
+	test_finished = 1;
+}
+
+/*********************************************************************
+
+Test2: connect timeout
+
+*********************************************************************/
+int test2(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test2";
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+
+	test_finished = 0;
+
+	MyLog(LOGA_INFO, "Starting test 2 - connect timeout");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"connect timeout\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, "tcp://9.20.96.160:66", "connect timeout",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.connectTimeout = 5;
+	opts.keepAliveInterval = 20;
+	opts.username = "testuser";
+	opts.binarypwd.data = "testpassword";
+	opts.binarypwd.len = (int)strlen(opts.binarypwd.data);
+	opts.MQTTVersion = options.MQTTVersion;
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess5 = test2_onConnect;
+	opts.onFailure5 = test2_onFailure;
+	opts.context = c;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		MySleep(100);
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	assert("Connect onFailure should be called once", test2_onFailure_called == 1,
+			"connect onFailure was called %d times", test2_onFailure_called);
+
+	MyLog(LOGA_INFO, "TEST2: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+typedef struct
+{
+	MQTTAsync c;
+	int index;
+	char clientid[24];
+	char test_topic[100];
+	int	message_count;
+} client_data;
+
+
+void test3_onDisconnect(void* context, MQTTAsync_successData5* response)
+{
+	client_data* cd = (client_data*)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect callback for client \"%s\"", cd->clientid);
+	test_finished++;
+}
+
+
+void test3_onPublish(void* context,  MQTTAsync_successData5* response)
+{
+	client_data* cd = (client_data*)context;
+	MyLog(LOGA_DEBUG, "In QoS 0 onPublish callback for client \"%s\"", cd->clientid);
+}
+
+
+void test3_onUnsubscribe(void* context, MQTTAsync_successData5* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In onUnsubscribe onSuccess callback \"%s\"", cd->clientid);
+	opts.onSuccess5 = test3_onDisconnect;
+	opts.context = cd;
+
+	rc = MQTTAsync_disconnect(cd->c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test3_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	client_data* cd = (client_data*)context;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In messageArrived callback \"%s\" message count ", cd->clientid);
+
+	if (++cd->message_count == 1)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 25;
+		pubmsg.qos = 1;
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(cd->c, cd->test_topic, &pubmsg, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	else if (cd->message_count == 2)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		pubmsg.payload = "a QoS 0 message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 29;
+		pubmsg.qos = 0;
+		pubmsg.retained = 0;
+		opts.context = cd;
+		opts.onSuccess5 = test3_onPublish;
+
+		rc = MQTTAsync_sendMessage(cd->c, cd->test_topic, &pubmsg, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	else
+	{
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		opts.onSuccess5 = test3_onUnsubscribe;
+		opts.context = cd;
+		rc = MQTTAsync_unsubscribe(cd->c, cd->test_topic, &opts);
+		assert("Unsubscribe successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+	return 1;
+}
+
+void test3_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback \"%s\"", cd->clientid);
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	rc = MQTTAsync_send(cd->c, cd->test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, NULL);
+	assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+void test3_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_callOptions opts = MQTTAsync_callOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, \"%s\"", cd->clientid);
+	opts.onSuccess5 = test3_onSubscribe;
+	opts.context = cd;
+
+	rc = MQTTAsync_subscribe(cd->c, cd->test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished++;
+}
+
+
+void test3_onFailure(void* context, MQTTAsync_failureData5* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+	assert("Should have connected", 0, "%s failed to connect\n", cd->clientid);
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, \"%s\" rc %d\n", cd->clientid, response ? response->reasonCode : -999);
+	if (response && response->message)
+		MyLog(LOGA_DEBUG, "In connect onFailure callback, \"%s\"\n", response->message);
+
+	test_finished++;
+}
+
+
+/*********************************************************************
+
+Test3: More than one client object - simultaneous working.
+
+*********************************************************************/
+int test3(struct Options options)
+{
+	#define num_clients 10
+	int subsqos = 2;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	int i;
+	client_data clientdata[num_clients];
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+
+	test_finished = 0;
+	MyLog(LOGA_INFO, "Starting test 3 - multiple connections");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"multiple connections\"");
+	global_start_time = start_clock();
+
+	for (i = 0; i < num_clients; ++i)
+	{
+		sprintf(clientdata[i].clientid, "async_test3_num_%d", i);
+		sprintf(clientdata[i].test_topic, "async test3 topic num %d", i);
+		clientdata[i].index = i;
+		clientdata[i].message_count = 0;
+
+		createOpts.MQTTVersion = MQTTVERSION_5;
+		rc = MQTTAsync_createWithOptions(&(clientdata[i].c), options.connection, clientdata[i].clientid,
+			MQTTCLIENT_PERSISTENCE_NONE, NULL, &createOpts);
+		assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+
+		rc = MQTTAsync_setCallbacks(clientdata[i].c, &clientdata[i], NULL, test3_messageArrived, NULL);
+		assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+		opts.keepAliveInterval = 20;
+		opts.username = "testuser";
+		opts.password = "testpassword";
+		opts.MQTTVersion = options.MQTTVersion;
+
+		opts.will = &wopts;
+		opts.will->message = "will message";
+		opts.will->qos = 1;
+		opts.will->retained = 0;
+		opts.will->topicName = "will topic";
+		opts.onSuccess5 = test3_onConnect;
+		opts.onFailure5 = test3_onFailure;
+		opts.context = &clientdata[i];
+
+		MyLog(LOGA_DEBUG, "Connecting");
+		rc = MQTTAsync_connect(clientdata[i].c, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	while (test_finished < num_clients)
+	{
+		MyLog(LOGA_DEBUG, "num_clients %d test_finished %d\n", num_clients, test_finished);
+		MySleep(100);
+	}
+
+	MyLog(LOGA_DEBUG, "TEST3: destroying clients");
+
+	for (i = 0; i < num_clients; ++i)
+		MQTTAsync_destroy(&clientdata[i].c);
+
+//exit:
+	MyLog(LOGA_INFO, "TEST3: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+void* test4_payload = NULL;
+int test4_payloadlen = 0;
+
+void test4_onPublish(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In publish onSuccess callback, context %p", context);
+}
+
+int test4_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+	int rc, i;
+
+	MyLog(LOGA_DEBUG, "In messageArrived callback %p", c);
+
+	assert("Message size correct", message->payloadlen == test4_payloadlen,
+				 "message size was %d", message->payloadlen);
+
+	for (i = 0; i < options.size; ++i)
+	{
+		if (((char*)test4_payload)[i] != ((char*)message->payload)[i])
+		{
+			assert("Message contents correct", ((char*)test4_payload)[i] != ((char*)message->payload)[i],
+				 "message content was %c", ((char*)message->payload)[i]);
+			break;
+		}
+	}
+
+	if (++message_count == 1)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_callOptions opts = MQTTAsync_callOptions_initializer;
+
+		pubmsg.payload = test4_payload;
+		pubmsg.payloadlen = test4_payloadlen;
+		pubmsg.qos = 1;
+		pubmsg.retained = 0;
+		opts.onSuccess5 = test4_onPublish;
+		opts.context = c;
+
+		rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	}
+	else if (message_count == 2)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_callOptions opts = MQTTAsync_callOptions_initializer;
+
+		pubmsg.payload = test4_payload;
+		pubmsg.payloadlen = test4_payloadlen;
+		pubmsg.qos = 0;
+		pubmsg.retained = 0;
+		opts.onSuccess5 = test4_onPublish;
+		opts.context = c;
+		rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	}
+	else
+	{
+		MQTTAsync_callOptions opts = MQTTAsync_callOptions_initializer;
+		MQTTProperties props = MQTTProperties_initializer;
+		MQTTProperty property;
+
+		opts.onSuccess5 = test1_onUnsubscribe;
+		opts.context = c;
+
+		property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+		property.value.data.data = "test user property";
+		property.value.data.len = (int)strlen(property.value.data.data);
+		property.value.value.data = "test user property value";
+		property.value.value.len = (int)strlen(property.value.value.data);
+		MQTTProperties_add(&props, &property);
+
+		opts.properties = props;
+		rc = MQTTAsync_unsubscribe(c, test_topic, &opts);
+		assert("Unsubscribe successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		MQTTProperties_free(&props);
+	}
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+int test4_packet_size = 10000;
+
+#if !defined(min)
+#define min(a, b) ((a < b) ? a : b)
+#endif
+
+void test4_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc, i;
+	int max_packet_size = min(test4_packet_size, options.size);
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback %p", c);
+
+	pubmsg.payload = test4_payload = malloc(options.size);
+	pubmsg.payloadlen = test4_payloadlen = options.size;
+
+	MyLog(LOGA_INFO, "Max packet size %d", max_packet_size);
+	srand(33);
+	for (i = 0; i < (max_packet_size-100); ++i)
+		((char*)pubmsg.payload)[i] = rand() % 256;
+
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	rc = MQTTAsync_send(c, test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, NULL);
+}
+
+
+void test4_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_callOptions opts = MQTTAsync_callOptions_initializer;
+	int rc;
+
+	test4_packet_size = MQTTProperties_getNumericValue(&response->properties, MQTTPROPERTY_CODE_MAXIMUM_PACKET_SIZE);
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.onSuccess5 = test4_onSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribe(c, test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+
+/*********************************************************************
+
+Test4: Send and receive big messages
+
+*********************************************************************/
+int test4(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test4";
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+
+	test_finished = failures = 0;
+	MyLog(LOGA_INFO, "Starting test 4 - big messages");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"big messages\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "async_test_4",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test4_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = options.MQTTVersion;
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess5 = test4_onConnect;
+	opts.onFailure5 = NULL;
+	opts.context = c;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		MySleep(100);
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST4: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+void test5_onConnectFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	MyLog(LOGA_INFO, "Connack rc is %d", response ? response->reasonCode : -999);
+
+	test_finished = 1;
+}
+
+
+void test5_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test_finished = 1;
+}
+
+
+/********************************************************************
+
+Test5: Connack return codes
+
+*********************************************************************/
+int test5(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+
+	test_finished = failures = 0;
+	MyLog(LOGA_INFO, "Starting test 5 - connack return codes");
+	fprintf(xml, "<testcase classname=\"test45\" name=\"connack return codes\"");
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "a clientid that is too long to be accepted",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.onSuccess5 = test5_onConnect;
+	opts.onFailure5 = test5_onConnectFailure;
+	opts.context = c;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		MySleep(100);
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST5: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+typedef struct
+{
+	MQTTAsync c;
+	int should_fail;
+} test6_client_info;
+
+void test6_onConnectFailure(void* context, MQTTAsync_failureData5* response)
+{
+	test6_client_info cinfo = *(test6_client_info*)context;
+
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	if (response)
+		MyLog(LOGA_INFO, "Connack rc is %d", response->reasonCode);
+
+	assert("Should fail to connect", cinfo.should_fail, "should_fail was %d", cinfo.should_fail);
+
+	test_finished = 1;
+}
+
+
+void test6_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	test6_client_info cinfo = *(test6_client_info*)context;
+
+	MyLog(LOGA_DEBUG, "In connect success callback, context %p", context);
+
+	assert("Should connect correctly", !cinfo.should_fail, "should_fail was %d", cinfo.should_fail);
+
+	test_finished = 1;
+}
+
+
+/********************************************************************
+
+Test6: HA connections
+
+*********************************************************************/
+int test6(struct Options options)
+{
+	int subsqos = 2;
+	test6_client_info cinfo;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+	char* uris[2] = {options.connection, options.connection};
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 6 - HA connections");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"HA connections\"");
+	global_start_time = start_clock();
+
+	test_finished = 0;
+	cinfo.should_fail = 1; /* fail to connect */
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&cinfo.c, "tcp://rubbish:1883", "async ha connection",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&cinfo.c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(cinfo.c, cinfo.c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.onSuccess5 = test6_onConnect;
+	opts.onFailure5 = test6_onConnectFailure;
+	opts.context = &cinfo;
+	opts.MQTTVersion = options.MQTTVersion;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(cinfo.c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		MySleep(100);
+
+	test_finished = 0;
+	cinfo.should_fail = 0; /* should connect */
+	rc = MQTTAsync_createWithOptions(&cinfo.c, "tcp://rubbish:1883", "async ha connection",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&cinfo.c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(cinfo.c, cinfo.c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.onSuccess5 = test6_onConnect;
+	opts.onFailure5 = test6_onConnectFailure;
+	opts.context = &cinfo;
+	opts.serverURIs = uris;
+	opts.serverURIcount = 2;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(cinfo.c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		MySleep(100);
+
+	MQTTAsync_destroy(&cinfo.c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST6: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+/********************************************************************
+
+Test7: Persistence
+
+*********************************************************************/
+
+char* test7_topic = "C client test7";
+int test7_messageCount = 0;
+
+
+void test7_onDisconnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect failure callback %p", c);
+
+	assert("Successful disconnect", 0, "disconnect failed", 0);
+
+	test_finished = 1;
+}
+
+
+void test7_onDisconnectFailure5(void* context, MQTTAsync_failureData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect5 failure callback %p", c);
+
+	assert("Successful disconnect", 0, "disconnect failed", 0);
+
+	test_finished = 1;
+}
+
+
+void test7_onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+	test_finished = 1;
+}
+
+
+void test7_onDisconnect5(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect5 callback %p", c);
+	test_finished = 1;
+}
+
+
+void test7_onUnsubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In onUnsubscribe onSuccess callback %p", c);
+	opts.onSuccess = test7_onDisconnect;
+	opts.context = c;
+
+	rc = MQTTAsync_disconnect(c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+void test7_onUnsubscribe5(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In onUnsubscribe onSuccess5 callback %p", c);
+	opts.onSuccess5 = test7_onDisconnect5;
+	opts.context = c;
+
+	rc = MQTTAsync_disconnect(c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test7_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Test7: received message id %d, %.*s", message->msgid,
+			message->payloadlen, message->payload);
+
+	test7_messageCount++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+static int test7_subscribed = 0;
+
+void test7_onSubscribe5(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess5 callback %p granted qos %d", c, response->reasonCode);
+
+	test7_subscribed = 1;
+}
+
+
+void test7_onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback %p granted qos %d", c,
+			response->alt.qos);
+
+	test7_subscribed = 1;
+}
+
+static int test7_just_connect = 0;
+
+void test7_onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+
+	if (test7_just_connect == 1)
+	{
+		test7_just_connect = 2;
+		return;
+	}
+
+	opts.onSuccess = test7_onSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribe(c, test7_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+
+void test7_onConnect5(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess5 callback, context %p", context);
+	opts.onSuccess5 = test7_onSubscribe5;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribe(c, test7_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+
+/*********************************************************************
+
+Test7: Pending tokens
+
+*********************************************************************/
+int test7_run(int qos, int start_mqtt_version, int restore_mqtt_version)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MQTTAsync_responseOptions ropts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_disconnectOptions dopts = MQTTAsync_disconnectOptions_initializer;
+	MQTTAsync_token* tokens = NULL;
+	int msg_count = 6;
+	MQTTProperty property;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+	int i = 0;
+
+	MyLog(LOGA_INFO, "Starting test 7 - persistence, qos %d, MQTT versions: %s then %s", qos,
+			(start_mqtt_version == MQTTVERSION_5) ? "5" : "3.1.1",
+			(restore_mqtt_version == MQTTVERSION_5) ? "5" : "3.1.1");
+
+	fprintf(xml, "<testcase classname=\"test45\" name=\"pending tokens\"");
+	global_start_time = start_clock();
+	test_finished = 0;
+
+	createOpts.MQTTVersion = start_mqtt_version;
+	MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_PROTOCOL);
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "async_test7",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test7_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = start_mqtt_version;
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.context = c;
+
+	/* connect clean and then leave messages lying around */
+	test_finished = 0;
+	test7_subscribed = 0;
+	MyLog(LOGA_DEBUG, "Connecting");
+
+	if (start_mqtt_version == MQTTVERSION_5)
+	{
+		opts.cleanstart = 1;
+		opts.connectProperties = &props;
+		property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+		property.value.integer4 = 999999;
+		MQTTProperties_add(opts.connectProperties, &property);
+		opts.onSuccess5 = test7_onConnect5;
+		opts.onFailure5 = NULL;
+		rc = MQTTAsync_connect(c, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		MQTTProperties_free(opts.connectProperties);
+		if (rc != MQTTASYNC_SUCCESS)
+			goto exit;
+	}
+	else
+	{	/* MQTT 3 version */
+		opts.cleanstart = 0;
+		opts.cleansession = 1; /* clean up */
+		test7_just_connect = 1;
+		opts.onSuccess = test7_onConnect;
+		opts.onFailure = NULL;
+		rc = MQTTAsync_connect(c, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+			goto exit;
+		while (test7_just_connect < 2)
+			MySleep(100);
+		test_finished = 0;
+		dopts.onSuccess5 = NULL;
+		dopts.onFailure5 = NULL;
+		dopts.onFailure = test7_onDisconnectFailure;
+		dopts.onSuccess = test7_onDisconnect;
+		rc = MQTTAsync_disconnect(c, &dopts);
+		assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		while (!test_finished)
+			MySleep(100);
+		test_finished = 0;
+		opts.cleansession = 0; /* now it's clean */
+		test7_just_connect = 0;
+		rc = MQTTAsync_connect(c, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+			goto exit;
+	}
+
+	while (!test7_subscribed)
+		MySleep(100);
+
+	test7_messageCount = 0;
+	pubmsg.payload = "first test of a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = qos;
+	pubmsg.retained = 0;
+	rc = MQTTAsync_send(c, test7_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, &ropts);
+	assert("Good rc from send", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	MyLog(LOGA_DEBUG, "Token was %d", ropts.token);
+	rc = MQTTAsync_isComplete(c, ropts.token);
+	assert("0 rc from isComplete", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	rc = MQTTAsync_waitForCompletion(c, ropts.token, 5000L);
+	assert("Good rc from waitForCompletion", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	rc = MQTTAsync_isComplete(c, ropts.token);
+	assert("1 rc from isComplete", rc == 1, "rc was %d", rc);
+
+	i = 0;
+	pubmsg.qos = qos;
+	for (i = 0; i < msg_count; ++i)
+	{
+		char buf[100];
+		sprintf(buf, "%d a much longer message that we can shorten to the extent that we need", i);
+		pubmsg.payload = buf;
+		pubmsg.payloadlen = 11 + i;
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(c, test7_topic, &pubmsg, &ropts);
+	}
+	/* disconnect immediately without receiving the incoming messages */
+	dopts.timeout = 0;
+	if (start_mqtt_version == MQTTVERSION_5)
+		dopts.onSuccess5 = test7_onDisconnect5;
+	else
+		dopts.onSuccess = test7_onDisconnect;
+	dopts.context = c;
+	dopts.timeout = 0;
+	MQTTAsync_disconnect(c, &dopts); /* now there should be "orphaned" publications */
+
+	while (!test_finished)
+		MySleep(100);
+	test_finished = 0;
+
+	rc = MQTTAsync_getPendingTokens(c, &tokens);
+ 	assert("getPendingTokens rc == 0", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	assert("should get some tokens back", tokens != NULL, "tokens was %p", tokens);
+	if (tokens)
+		MQTTAsync_free(tokens);
+	MQTTProperties_free(opts.connectProperties);
+
+	MQTTAsync_destroy(&c); /* force re-reading persistence on create */
+
+	MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_PROTOCOL);
+	createOpts.MQTTVersion = restore_mqtt_version;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "async_test7",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+
+	if (start_mqtt_version == MQTTVERSION_5 && restore_mqtt_version == MQTTVERSION_3_1_1)
+		assert("Persistence error from create", rc == MQTTASYNC_PERSISTENCE_ERROR, "rc was %d", rc);
+	else
+		assert("Good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		//MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_getPendingTokens(c, &tokens);
+	assert("getPendingTokens rc == 0", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	assert("should get some tokens back", tokens != NULL, "tokens was %p", tokens);
+	if (tokens)
+	{
+		int i = 0;
+		while (tokens[i] != -1)
+			MyLog(LOGA_DEBUG, "Delivery token %d", tokens[i++]);
+		MQTTAsync_free(tokens);
+		assert("no of tokens should be > 0", i > 0, "no of tokens %d", i);
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test7_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Reconnecting");
+	opts.context = c;
+	opts.MQTTVersion = restore_mqtt_version;
+	if (restore_mqtt_version == MQTTVERSION_5)
+	{
+		opts.cleanstart = opts.cleansession = 0;
+		opts.connectProperties = &props;
+		property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+		property.value.integer4 = 999999;
+		MQTTProperties_add(opts.connectProperties, &property);
+		opts.onSuccess = NULL;
+		opts.onFailure = NULL;
+		opts.onSuccess5 = test7_onConnect5;
+		opts.onFailure5 = NULL;
+		rc = MQTTAsync_connect(c, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		MQTTProperties_free(opts.connectProperties);
+		if (rc != MQTTASYNC_SUCCESS)
+			goto exit;
+	}
+	else
+	{	/* MQTT 3 version */
+		opts.cleanstart = opts.cleansession = 0;
+		opts.onSuccess5 = NULL;
+		opts.onFailure5 = NULL;
+		opts.onSuccess = test7_onConnect;
+		opts.onFailure = NULL;
+		rc = MQTTAsync_connect(c, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+			goto exit;
+	}
+
+	waitForNoPendingTokens(c);
+
+	if (qos == 2)
+		assert("no of messages should be count", test7_messageCount == msg_count + 1,
+				"messages received %d\n", test7_messageCount);
+	else if (qos == 1)
+		assert("no of messages should be at least count", test7_messageCount >= msg_count + 1,
+				"messages received %d\n", test7_messageCount);
+
+	if (restore_mqtt_version == MQTTVERSION_5)
+	{
+		dopts.onFailure5 = test7_onDisconnectFailure5;
+		dopts.onSuccess5 = test7_onDisconnect5;
+	}
+	else
+	{
+		dopts.onFailure = test7_onDisconnectFailure;
+		dopts.onSuccess = test7_onDisconnect;
+	}
+	dopts.timeout = 300;
+	rc = MQTTAsync_disconnect(c, &dopts);
+	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	while (!test_finished)
+		MySleep(100);
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST7: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+int test7(struct Options options)
+{
+	int rc = 0;
+	fprintf(xml, "<testcase classname=\"test7\" name=\"persistence\"");
+	global_start_time = start_clock();
+	rc = test7_run(1, MQTTVERSION_5, MQTTVERSION_5) +
+		 test7_run(2, MQTTVERSION_5, MQTTVERSION_5) +
+		 test7_run(2, MQTTVERSION_3_1_1, MQTTVERSION_5) +
+		 test7_run(2, MQTTVERSION_5, MQTTVERSION_3_1_1);
+	fprintf(xml, " time=\"%ld\" >\n", elapsed(global_start_time) / 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+	return rc;
+}
+
+
+
+/*********************************************************************
+
+Test8: Incomplete commands and requests
+
+*********************************************************************/
+
+char* test8_topic = "C client test8";
+int test8_messageCount = 0;
+int test8_subscribed = 0;
+int test8_publishFailures = 0;
+
+void test8_onPublish(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In publish onSuccess callback %p token %d", c, response->token);
+
+}
+
+void test8_onPublishFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onPublish failure callback %p", c);
+
+	assert("Response code should be interrupted", response->code == MQTTASYNC_OPERATION_INCOMPLETE,
+			"rc was %d", response->code);
+
+	test8_publishFailures++;
+}
+
+
+void test8_onDisconnectFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect failure callback %p", c);
+
+	assert("Successful disconnect", 0, "disconnect failed", 0);
+
+	test_finished = 1;
+}
+
+
+void test8_onDisconnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+	test_finished = 1;
+}
+
+
+void test8_onSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback %p granted qos %d", c, response->reasonCode);
+
+	test8_subscribed = 1;
+}
+
+
+void test8_onConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.onSuccess5 = test8_onSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribe(c, test8_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+int test8_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Test8: received message id %d", message->msgid);
+
+	test8_messageCount++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+int test8(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	int rc = 0;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MQTTAsync_responseOptions ropts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_disconnectOptions dopts = MQTTAsync_disconnectOptions_initializer;
+	MQTTAsync_token* tokens = NULL;
+	int msg_count = 6;
+	MQTTProperty property;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+
+	MyLog(LOGA_INFO, "Starting test 8 - incomplete commands");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"incomplete commands\"");
+	global_start_time = start_clock();
+	test_finished = 0;
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.connection, "async_test8",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOpts);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test8_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = options.MQTTVersion;
+
+	opts.onFailure = NULL;
+	opts.context = c;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	opts.cleanstart = 1;
+	opts.onSuccess5 = test8_onConnect;
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test8_subscribed)
+		MySleep(100);
+
+	int i = 0;
+	pubmsg.qos = 2;
+	ropts.onSuccess5 = test8_onPublish;
+	ropts.onFailure5 = test8_onPublishFailure;
+	ropts.context = c;
+	for (i = 0; i < msg_count; ++i)
+	{
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = (pubmsg.qos == 2) ? 1 : 2; /* alternate */
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(c, test8_topic, &pubmsg, &ropts);
+		assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	/* disconnect immediately without completing the commands */
+	dopts.timeout = 0;
+	dopts.onSuccess5 = test8_onDisconnect;
+	dopts.context = c;
+	rc = MQTTAsync_disconnect(c, &dopts); /* now there should be incomplete commands */
+	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	while (!test_finished)
+		MySleep(100);
+	test_finished = 0;
+
+	waitForNoPendingTokens(c);
+
+	assert("test8_publishFailures > 0", test8_publishFailures > 0,
+		   "test8_publishFailures = %d", test8_publishFailures);
+
+	/* Now elicit failure callbacks on destroy */
+
+	test8_subscribed = test8_publishFailures = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	opts.onSuccess5 = test8_onConnect;
+
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&props, &property);
+
+	opts.connectProperties = &props;
+
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test8_subscribed)
+		MySleep(100);
+
+	i = 0;
+	pubmsg.qos = 2;
+	ropts.onSuccess5 = test8_onPublish;
+	ropts.onFailure5 = test8_onPublishFailure;
+	ropts.context = c;
+	for (i = 0; i < msg_count; ++i)
+	{
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = (pubmsg.qos == 2) ? 1 : 2; /* alternate */
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(c, test8_topic, &pubmsg, &ropts);
+		assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	/* disconnect immediately without completing the commands */
+	dopts.timeout = 0;
+	dopts.onSuccess5 = test8_onDisconnect;
+	dopts.context = c;
+	rc = MQTTAsync_disconnect(c, &dopts); /* now there should be incomplete commands */
+	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	while (!test_finished)
+		MySleep(100);
+	test_finished = 0;
+
+	rc = MQTTAsync_getPendingTokens(c, &tokens);
+	assert("getPendingTokens rc == 0", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	assert("should get some tokens back", tokens != NULL, "tokens was %p", tokens);
+	MQTTAsync_free(tokens);
+	MQTTProperties_free(&props);
+
+	assert("test8_publishFailures == 0", test8_publishFailures == 0,
+		   "test8_publishFailures = %d", test8_publishFailures);
+
+	MQTTAsync_destroy(&c);
+
+	assert("test8_publishFailures > 0", test8_publishFailures > 0,
+		   "test8_publishFailures = %d", test8_publishFailures);
+
+exit:
+	MyLog(LOGA_INFO, "TEST8: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+void trace_callback(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	printf("Trace : %d, %s\n", level, message);
+}
+
+
+
+
+int main(int argc, char** argv)
+{
+	int rc = -1;
+ 	int (*tests[])() = {NULL, test1, test2, test3, test4, test5, test6, test7, test8}; /* indexed starting from 1 */
+	MQTTAsync_nameValue* info;
+	int i;
+
+	xml = fopen("TEST-test4.xml", "w");
+	fprintf(xml, "<testsuite name=\"test4\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests)) - 1);
+
+	getopts(argc, argv);
+
+	MQTTAsync_setTraceCallback(trace_callback);
+
+	info = MQTTAsync_getVersionInfo();
+	while (info->name)
+	{
+	  MyLog(LOGA_INFO, "%s: %s", info->name, info->value);
+	  info++;
+	}
+
+	for (i = 0; i < options.iterations; ++i)
+	{
+	 	if (options.test_no == -1)
+		{ /* run all the tests */
+			for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+			{
+				failures = rc = 0;
+				MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+			}
+		}
+		else
+		{
+			if (options.test_no >= ARRAY_SIZE(tests))
+				MyLog(LOGA_INFO, "No test number %d", options.test_no);
+			else
+			{
+				MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+				rc = tests[options.test_no](options); /* run just the selected test */
+			}
+		}
+	}
+
+	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+
+	return rc;
+}
diff --git a/mqtt/src/test/test5.c b/mqtt/src/test/test5.c
new file mode 100644
index 00000000..99f0a59d
--- /dev/null
+++ b/mqtt/src/test/test5.c
@@ -0,0 +1,2583 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Allan Stockdill-Mander - initial API and implementation and/or initial documentation
+ *    Ian Craggs - fix Windows includes
+ *******************************************************************************/
+
+/**
+ * @file
+ * SSL tests for the Eclipse Paho Asynchronous MQTT C client
+ */
+
+#include "MQTTAsync.h"
+#include <string.h>
+#include <stdlib.h>
+#include "Thread.h"
+
+#if defined(_WINDOWS)
+#include <windows.h>
+#include <openssl/applink.c>
+#define MAXHOSTNAMELEN 256
+#define snprintf _snprintf
+#else
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <errno.h>
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("Options:\n");
+	printf("\t--test_no <test_no> - Run test number <test_no>\n");
+	printf("\t--hostname <hostname> - Connect to <hostname> for tests\n");
+	printf("\t--client_key <key_file> - Use <key_file> as the client certificate for SSL authentication\n");
+	printf("\t--client_key_pass <password> - Use <password> to access the private key in the client certificate\n");
+	printf("\t--server_key <key_file> - Use <key_file> as the trusted certificate for server\n");
+	printf("\t--verbose - Enable verbose output \n");
+	printf("\t--help - This help output\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char connection[100]; /**< connection to system under test. */
+	char mutual_auth_connection[100];   /**< connection to system under test. */
+	char nocert_mutual_auth_connection[100];
+	char server_auth_connection[100];
+	char anon_connection[100];
+	char psk_connection[100];
+	char* client_key_file;
+	char* client_key_pass;
+	char* server_key_file;
+	char* client_private_key_file;
+	char* capath;
+	int verbose;
+	int test_no;
+	int size;
+	int websockets;
+} options =
+{
+	"ssl://m2m.eclipse.org:18883",
+	"ssl://m2m.eclipse.org:18884",
+	"ssl://m2m.eclipse.org:18887",
+	"ssl://m2m.eclipse.org:18885",
+	"ssl://m2m.eclipse.org:18886",
+	"ssl://m2m.eclipse.org:18888",
+	"../../../test/ssl/client.pem",
+	NULL,
+	NULL, // "../../../test/ssl/test-root-ca.crt",
+	NULL, // "../../../test/ssl/capath",
+	NULL,
+	0,
+	0,
+	5000000,
+	0,
+};
+
+typedef struct
+{
+	MQTTAsync client;
+	char clientid[24];
+	char topic[100];
+	int maxmsgs;
+	int rcvdmsgs[3];
+	int sentmsgs[3];
+	int testFinished;
+	int subscribed;
+} AsyncTestClient;
+
+#define AsyncTestClient_initializer {NULL, "\0", "\0", 0, {0, 0, 0}, {0, 0, 0}, 0, 0}
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--help") == 0)
+		{
+			usage();
+		}
+		else if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--client_key") == 0)
+		{
+			if (++count < argc)
+				options.client_key_file = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--client_key_pass") == 0)
+		{
+			if (++count < argc)
+				options.client_key_pass = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--server_key") == 0)
+		{
+			if (++count < argc)
+				options.server_key_file = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--capath") == 0)
+		{
+			if (++count < argc)
+				options.capath = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+		{
+			options.verbose = 1;
+			printf("\nSetting verbose on\n");
+		}
+		else if (strcmp(argv[count], "--hostname") == 0)
+		{
+			if (++count < argc)
+			{
+				char* prefix = (options.websockets) ? "wss" : "ssl";
+
+				sprintf(options.connection, "%s://%s:18883", prefix, argv[count]);
+				printf("Setting connection to %s\n", options.connection);
+				sprintf(options.mutual_auth_connection, "%s://%s:18884", prefix, argv[count]);
+				printf("Setting mutual_auth_connection to %s\n", options.mutual_auth_connection);
+				sprintf(options.nocert_mutual_auth_connection, "%s://%s:18887", prefix, argv[count]);
+				printf("Setting nocert_mutual_auth_connection to %s\n",
+					options.nocert_mutual_auth_connection);
+				sprintf(options.server_auth_connection, "%s://%s:18885", prefix, argv[count]);
+				printf("Setting server_auth_connection to %s\n", options.server_auth_connection);
+				sprintf(options.anon_connection, "%s://%s:18886", prefix, argv[count]);
+				printf("Setting anon_connection to %s\n", options.anon_connection);
+				sprintf(options.psk_connection, "%s://%s:18888", prefix, argv[count]);
+				printf("Setting psk_connection to %s\n", options.psk_connection);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--ws") == 0)
+		{
+			options.websockets = 1;
+			printf("\nSetting websockets on\n");
+		}
+		count++;
+	}
+}
+
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+		return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf),
+			format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec) * 1000 + (res.tv_usec) / 1000;
+}
+#endif
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+#define MAXMSGS 30;
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+void myassert(char* filename, int lineno, char* description, int value,
+		char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		printf("Assertion failed, file %s, line %d, description: %s", filename,
+				lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+	else
+		MyLog(LOGA_DEBUG,
+				"Assertion succeeded, file %s, line %d, description: %s",
+				filename, lineno, description);
+}
+
+/*********************************************************************
+
+ Test: multi-threaded client using callbacks
+
+ *********************************************************************/
+volatile int multiThread_arrivedcount = 0;
+int multiThread_deliveryCompleted = 0;
+MQTTAsync_message multiThread_pubmsg = MQTTAsync_message_initializer;
+
+void multiThread_deliveryComplete(void* context, MQTTAsync_token dt)
+{
+	++multiThread_deliveryCompleted;
+}
+
+int multiThread_messageArrived(void* context, char* topicName, int topicLen,
+		MQTTAsync_message* m)
+{
+	++multiThread_arrivedcount;
+	MyLog(LOGA_DEBUG, "Callback: %d message received on topic %s is %.*s.",
+			multiThread_arrivedcount, topicName, m->payloadlen,
+			(char*) (m->payload));
+	if (multiThread_pubmsg.payloadlen != m->payloadlen || memcmp(m->payload,
+			multiThread_pubmsg.payload, m->payloadlen) != 0)
+	{
+		failures++;
+		MyLog(LOGA_INFO, "Error: wrong data received lengths %d %d\n",
+				multiThread_pubmsg.payloadlen, m->payloadlen);
+	}
+	MQTTAsync_free(topicName);
+	MQTTAsync_freeMessage(&m);
+	return 1;
+}
+
+void sendAndReceive(MQTTAsync* c, int qos, char* test_topic)
+{
+	MQTTAsync_responseOptions ropts;
+	int i = 0;
+	int iterations = 50;
+	int rc = 0;
+	int wait_seconds = 0;
+
+	multiThread_deliveryCompleted = 0;
+	multiThread_arrivedcount = 0;
+
+	MyLog(LOGA_DEBUG, "%d messages at QoS %d", iterations, qos);
+	multiThread_pubmsg.payload
+			= "a much longer message that we can shorten to the extent that we need to";
+	multiThread_pubmsg.payloadlen = 27;
+	multiThread_pubmsg.qos = qos;
+	multiThread_pubmsg.retained = 0;
+
+	for (i = 1; i <= iterations; ++i)
+	{
+		if (i % 10 == 0)
+			rc = MQTTAsync_send(c, test_topic, multiThread_pubmsg.payloadlen,
+					multiThread_pubmsg.payload, multiThread_pubmsg.qos,
+					multiThread_pubmsg.retained, NULL);
+		else
+			rc = MQTTAsync_sendMessage(c, test_topic, &multiThread_pubmsg,
+					&ropts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(100000L);
+#endif
+
+		wait_seconds = 10;
+		while ((multiThread_arrivedcount < i) && (wait_seconds-- > 0))
+		{
+			MyLog(LOGA_DEBUG, "Arrived %d count %d", multiThread_arrivedcount,
+					i);
+#if defined(WIN32)
+			Sleep(1000);
+#else
+			usleep(1000000L);
+#endif
+		}
+		assert("Message Arrived", wait_seconds > 0,
+				"Time out waiting for message %d\n", i );
+	}
+	if (qos > 0)
+	{
+		/* MQ Telemetry can send a message to a subscriber before the server has
+		 completed the QoS 2 handshake with the publisher. For QoS 1 and 2,
+		 allow time for the final delivery complete callback before checking
+		 that all expected callbacks have been made */
+		wait_seconds = 10;
+		while ((multiThread_deliveryCompleted < iterations) && (wait_seconds--
+				> 0))
+		{
+			MyLog(LOGA_DEBUG, "Delivery Completed %d count %d",
+					multiThread_deliveryCompleted, i);
+#if defined(WIN32)
+			Sleep(1000);
+#else
+			usleep(1000000L);
+#endif
+		}
+		assert("All Deliveries Complete", wait_seconds > 0,
+				"Number of deliveryCompleted callbacks was %d\n",
+				multiThread_deliveryCompleted);
+	}
+}
+
+/*********************************************************************
+
+ Async Callbacks - generic callbacks for send/receive tests
+
+ *********************************************************************/
+
+//static mutex_type client_mutex = NULL;
+//static pthread_mutex_t client_mutex_store = PTHREAD_MUTEX_INITIALIZER;
+//static mutex_type client_mutex = &client_mutex_store;
+
+void asyncTestOnDisconnect(void* context, MQTTAsync_successData* response)
+{
+	//int rc;
+
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In asyncTestOnDisconnect callback, %s", tc->clientid);
+	//rc = Thread_lock_mutex(client_mutex);
+	tc->testFinished = 1;
+	//rc = Thread_unlock_mutex(client_mutex);
+}
+
+void asyncTestOnSend(void* context, MQTTAsync_successData* response)
+{
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+	//int rc;
+	int qos = response->alt.pub.message.qos;
+	MyLog(LOGA_DEBUG, "In asyncTestOnSend callback, %s", tc->clientid);
+	//rc = Thread_lock_mutex(client_mutex);
+	tc->sentmsgs[qos]++;
+	//rc = Thread_unlock_mutex(client_mutex);
+}
+
+void asyncTestOnSubscribeFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In asyncTestOnSubscribeFailure callback, %s",
+			tc->clientid);
+
+	assert("There should be no failures in this test. ", 0, "asyncTestOnSubscribeFailure callback was called\n", 0);
+}
+
+void asyncTestOnUnsubscribe(void* context, MQTTAsync_successData* response)
+{
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In asyncTestOnUnsubscribe callback, %s", tc->clientid);
+	opts.onSuccess = asyncTestOnDisconnect;
+	opts.context = tc;
+
+	rc = MQTTAsync_disconnect(tc->client, &opts);
+}
+
+void asyncTestOnSubscribe(void* context, MQTTAsync_successData* response)
+{
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+	int rc, i;
+	MyLog(LOGA_DEBUG, "In asyncTestOnSubscribe callback, %s", tc->clientid);
+	//rc = Thread_lock_mutex(client_mutex);
+	tc->subscribed = 1;
+	//rc = Thread_unlock_mutex(client_mutex);
+	for (i = 0; i < 3; i++)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+
+		pubmsg.payload
+				= "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = i;
+		pubmsg.retained = 0;
+
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		//opts.onSuccess = asyncTestOnSend;
+		opts.context = &tc;
+
+		rc = MQTTAsync_send(tc->client, tc->topic, pubmsg.payloadlen,
+				pubmsg.payload, pubmsg.qos, pubmsg.retained, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		tc->sentmsgs[i]++;
+		MyLog(LOGA_DEBUG, "Maxmsgs %d", tc->maxmsgs);
+	}
+}
+
+int asyncTestMessageArrived(void* context, char* topicName, int topicLen,
+		MQTTAsync_message* m)
+{
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+	int rc;
+	//rc = Thread_lock_mutex(client_mutex);
+	tc->rcvdmsgs[m->qos]++;
+
+	//printf("Received messages: %d\n", tc->rcvdmsgs[m->qos]);
+
+	MyLog(
+			LOGA_DEBUG,
+			"In asyncTestMessageArrived callback, %s total to exit %d, total received %d,%d,%d",
+			tc->clientid, (tc->maxmsgs * 3), tc->rcvdmsgs[0], tc->rcvdmsgs[1],
+			tc->rcvdmsgs[2]);
+
+	if (tc->sentmsgs[m->qos] < tc->maxmsgs)
+	{
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		//opts.onSuccess = asyncTestOnSend;
+		opts.context = tc;
+
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		pubmsg.payload
+				= "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = m->qos;
+		pubmsg.retained = 0;
+
+		rc = MQTTAsync_send(tc->client, tc->topic, pubmsg.payloadlen,
+				pubmsg.payload, pubmsg.qos, pubmsg.retained, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d messages sent %d,%d,%d", rc);
+		MyLog(LOGA_DEBUG, "Messages sent %d,%d,%d", tc->sentmsgs[0],
+				tc->sentmsgs[1], tc->sentmsgs[2]);
+		tc->sentmsgs[m->qos]++;
+	}
+	if ((tc->rcvdmsgs[0] + tc->rcvdmsgs[1] + tc->rcvdmsgs[2]) == (tc->maxmsgs
+			* 3))
+	{
+		MyLog(LOGA_DEBUG, "Ready to unsubscribe");
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		opts.onSuccess = asyncTestOnUnsubscribe;
+		opts.context = tc;
+		rc = MQTTAsync_unsubscribe(tc->client, tc->topic, &opts);
+		assert("Unsubscribe successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	//rc = Thread_unlock_mutex(client_mutex);
+	MyLog(LOGA_DEBUG, "Leaving asyncTestMessageArrived callback");
+	MQTTAsync_freeMessage(&m);
+	MQTTAsync_free(topicName);
+	return 1;
+}
+
+void asyncTestOnDeliveryComplete(void* context, MQTTAsync_token token)
+{
+
+}
+
+void asyncTestOnConnect(void* context, MQTTAsync_successData* response)
+{
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+	int subsqos = 2;
+	int rc;
+	MyLog(LOGA_DEBUG, "In asyncTestOnConnect callback, %s", tc->clientid);
+
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	opts.onSuccess = asyncTestOnSubscribe;
+	opts.onFailure = asyncTestOnSubscribeFailure;
+	opts.context = tc;
+
+	rc = MQTTAsync_subscribe(tc->client, tc->topic, subsqos, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+/*********************************************************************
+
+ Test1: SSL connection to non SSL MQTT server
+
+ *********************************************************************/
+
+int test1Finished = 0;
+
+int test1OnFailureCalled = 0;
+
+void test1OnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test1OnFailureCalled++;
+	test1Finished = 1;
+}
+
+void test1OnConnect(void* context, MQTTAsync_successData* response)
+{
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p\n", context);
+
+	assert("Connect should not succeed", 0, "connect success callback was called", 0);
+
+	test1Finished = 1;
+}
+
+int test1(struct Options options)
+{
+	char* testname = "test1";
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client SSL test1";
+	int count = 0;
+
+	test1Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting SSL test 1 - connection to nonSSL MQTT server");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, "rubbish://wrong", "test1", MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL);
+	assert("bad rc from create", rc == MQTTASYNC_BAD_PROTOCOL, "rc was %d \n", rc);
+
+	rc = MQTTAsync_create(&c, options.connection, "test1", MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test1OnConnect;
+	opts.onFailure = test1OnFailure;
+	opts.context = c;
+
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Bad rc from connect", rc == MQTTASYNC_NULL_PARAMETER, "rc was %d ", rc);
+
+	opts.ssl = &sslopts;
+	opts.ssl->enableServerCertAuth = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for success or failure callback */
+	while (!test1Finished && ++count < 10000)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	exit: MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test2a: Mutual SSL Authentication - Certificates in place on client and server
+
+ *********************************************************************/
+
+void test2aOnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* client = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In test2aOnConnectFailure callback, %s",
+			client->clientid);
+
+	assert("There should be no failures in this test. ", 0, "test2aOnConnectFailure callback was called\n", 0);
+	client->testFinished = 1;
+}
+
+void test2aOnPublishFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* client = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In test2aOnPublishFailure callback, %s",
+			client->clientid);
+
+	assert("There should be no failures in this test. ", 0, "test2aOnPublishFailure callback was called\n", 0);
+}
+
+int test2a(struct Options options)
+{
+	char* testname = "test2a";
+
+	AsyncTestClient tc =
+	AsyncTestClient_initializer;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 2a - Mutual SSL authentication");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	MQTTAsync_create(&c, options.mutual_auth_connection, "test2a", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	tc.client = c;
+	sprintf(tc.clientid, "%s", testname);
+	sprintf(tc.topic, "C client SSL test2a");
+	tc.maxmsgs = MAXMSGS;
+	//tc.rcvdmsgs = 0;
+	tc.subscribed = 0;
+	tc.testFinished = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = asyncTestOnConnect;
+	opts.onFailure = test2aOnConnectFailure;
+	opts.context = &tc;
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file != NULL)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	opts.ssl->keyStore = options.client_key_file; /*file of certificate for client to present to server*/
+	if (options.client_key_pass != NULL)
+		opts.ssl->privateKeyPassword = options.client_key_pass;
+	//opts.ssl->enabledCipherSuites = "DEFAULT";
+	//opts.ssl->enabledServerCertAuth = 1;
+	opts.ssl->verify = 1;
+	MyLog(LOGA_DEBUG, "enableServerCertAuth %d\n", opts.ssl->enableServerCertAuth);
+	MyLog(LOGA_DEBUG, "verify %d\n", opts.ssl->verify);
+
+	rc = MQTTAsync_setCallbacks(c, &tc, NULL, asyncTestMessageArrived,
+			asyncTestOnDeliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!tc.subscribed && !tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	if (tc.testFinished)
+		goto exit;
+
+	while (!tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	exit: MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test2b: Mutual SSL Authentication - Server does not have Client cert
+
+ *********************************************************************/
+
+int test2bFinished;
+
+void test2bOnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In test2bOnConnectFailure callback, context %p", context);
+
+	assert("This test should call test2bOnConnectFailure. ", 1, "test2bOnConnectFailure callback was called\n", 1);
+	test2bFinished = 1;
+}
+
+void test2bOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MyLog(LOGA_DEBUG, "In test2bOnConnectFailure callback, context %p", context);
+
+	assert("This connect should not succeed. ", 0, "test2bOnConnect callback was called\n", 0);
+	test2bFinished = 1;
+}
+
+int test2b(struct Options options)
+{
+	char* testname = "test2b";
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	int count = 0;
+
+	test2bFinished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO,
+			"Starting test 2b - connection to SSL MQTT server with clientauth=req but server does not have client cert");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, options.nocert_mutual_auth_connection,
+            "test2b", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test2bOnConnect;
+	opts.onFailure = test2bOnConnectFailure;
+	opts.context = c;
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file != NULL)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	opts.ssl->keyStore = options.client_key_file; /*file of certificate for client to present to server*/
+	if (options.client_key_pass != NULL)
+		opts.ssl->privateKeyPassword = options.client_key_pass;
+	//opts.ssl->enabledCipherSuites = "DEFAULT";
+	//opts.ssl->enabledServerCertAuth = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test2bFinished && ++count < 10000)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	exit: MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test2c: Mutual SSL Authentication - Client does not have Server cert
+
+ *********************************************************************/
+
+int test2cFinished;
+
+void test2cOnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In test2cOnConnectFailure callback, context %p", context);
+
+	assert("This test should call test2cOnConnectFailure. ", 1, "test2cOnConnectFailure callback was called\n", 0);
+	test2cFinished = 1;
+}
+
+void test2cOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MyLog(LOGA_DEBUG, "In test2cOnConnect callback, context %p", context);
+
+	assert("This connect should not succeed. ", 0, "test2cOnConnect callback was called\n", 0);
+	test2cFinished = 1;
+}
+
+int test2c(struct Options options)
+{
+	char* testname = "test2c";
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test2c";
+	int count = 0;
+
+	failures = 0;
+	MyLog(
+			LOGA_INFO,
+			"Starting test 2c - connection to SSL MQTT server, server auth enabled but unknown cert");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, options.nocert_mutual_auth_connection,
+            "test2c", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test2cOnConnect;
+	opts.onFailure = test2cOnConnectFailure;
+	opts.context = c;
+
+	opts.ssl = &sslopts;
+	//if (options.server_key_file != NULL) opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	opts.ssl->keyStore = options.client_key_file; /*file of certificate for client to present to server*/
+	if (options.client_key_pass != NULL)
+		opts.ssl->privateKeyPassword = options.client_key_pass;
+	//opts.ssl->enabledCipherSuites = "DEFAULT";
+	//opts.ssl->enabledServerCertAuth = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	while (!test2cFinished && ++count < 10000)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	exit: MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+ Test2d: Mutual SSL Authentication - client has no certs
+
+ *********************************************************************/
+
+int test2dFinished;
+
+void test2dOnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In test2dOnConnectFailure callback, context %p", context);
+
+	assert("This test should call test2dOnConnectFailure. ", 1, "test2dOnConnectFailure callback was called\n", 0);
+	test2dFinished = 1;
+}
+
+void test2dOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MyLog(LOGA_DEBUG, "In test2dOnConnect callback, context %p", context);
+
+	assert("This connect should not succeed. ", 0, "test2dOnConnect callback was called\n", 0);
+	test2dFinished = 1;
+}
+
+int test2d(struct Options options)
+{
+	char* testname = "test2d";
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test2d";
+	int count = 0;
+	unsigned int iteration = 0;
+
+	failures = 0;
+	MyLog(
+			LOGA_INFO,
+			"Starting test 2d - connection to SSL MQTT server, server auth enabled but unknown cert");
+	fprintf(xml, "<testcase classname=\"test2d\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	// As reported in https://github.com/eclipse/paho.mqtt.c/issues/190
+	// there is/was some race condition, which caused _sometimes_ that the library failed to detect,
+	// that the connect attempt has already failed.
+	// Therefore we need to test this several times!
+	for (iteration = 0; !failures && (iteration < 20) ; iteration++)
+	{
+		count = 0;
+		MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+
+		rc = MQTTAsync_create(&c, options.mutual_auth_connection,
+				      "test2d", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+		assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+
+		if (rc != MQTTASYNC_SUCCESS)
+		{
+			MQTTAsync_destroy(&c);
+			failures++;
+			break;
+		}
+
+		opts.keepAliveInterval = 60;
+		opts.cleansession = 1;
+
+		opts.will = &wopts;
+		opts.will->message = "will message";
+		opts.will->qos = 1;
+		opts.will->retained = 0;
+		opts.will->topicName = "will topic";
+		opts.will = NULL;
+		opts.onSuccess = test2dOnConnect;
+		opts.onFailure = test2dOnConnectFailure;
+		opts.context = c;
+
+		opts.ssl = &sslopts;
+		if (options.server_key_file != NULL) opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+		opts.ssl->keyStore = NULL; /*file of certificate for client to present to server - In this test the client has no certificate! */
+
+		test2dFinished = 0;
+		MyLog(LOGA_DEBUG, "Connecting");
+		rc = MQTTAsync_connect(c, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		if (rc != MQTTASYNC_SUCCESS)
+		{
+			failures++;
+			MyLog(LOGA_INFO, "Failed in iteration %d\n",iteration);
+			MQTTAsync_destroy(&c);
+			break;
+		}
+#define TEST2D_COUNT 1000
+		while (!test2dFinished && ++count < TEST2D_COUNT)
+		{
+#if defined(WIN32)
+			Sleep(100);
+#else
+			usleep(10000L);
+#endif
+		}
+		if (!test2dFinished && count >= TEST2D_COUNT)
+		{
+			MyLog(LOGA_INFO, "Failed in iteration %d\n",iteration);
+			failures++;
+		}
+		MQTTAsync_destroy(&c);
+	}
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test3a: Server Authentication - server certificate in client trust store
+
+ *********************************************************************/
+
+void test3aOnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* client = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In test3aOnConnectFailure callback, context %p", context);
+
+	assert("There should be no failures in this test. ", 0, "test3aOnConnectFailure callback was called\n", 0);
+	client->testFinished = 1;
+}
+
+int test3a(struct Options options)
+{
+	char* testname = "test3a";
+	int subsqos = 2;
+	/* TODO - usused - remove ? MQTTAsync_deliveryToken* dt = NULL; */
+	AsyncTestClient tc =
+	AsyncTestClient_initializer;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	int i;
+
+	failures = 0;
+
+	MyLog(LOGA_INFO, "Starting test 3a - Server authentication");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	MQTTAsync_create(&c, options.server_auth_connection, "test3a", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+
+	tc.client = c;
+	sprintf(tc.clientid, "%s", testname);
+	sprintf(tc.topic, "C client SSL test3a");
+	tc.maxmsgs = MAXMSGS;
+	//tc.rcvdmsgs = 0;
+	tc.subscribed = 0;
+	tc.testFinished = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = asyncTestOnConnect;
+	opts.onFailure = test3aOnConnectFailure;
+	opts.context = &tc;
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file != NULL)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	//opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	//if (options.client_key_pass != NULL) opts.ssl->privateKeyPassword = options.client_key_pass;
+	//opts.ssl->enabledCipherSuites = "DEFAULT";
+	//opts.ssl->enabledServerCertAuth = 1;
+
+	rc = MQTTAsync_setCallbacks(c, &tc, NULL, asyncTestMessageArrived,
+			asyncTestOnDeliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!tc.subscribed && !tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	if (tc.testFinished)
+		goto exit;
+
+	for (i = 0; i < 3; i++)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+
+		pubmsg.payload
+				= "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = i;
+		pubmsg.retained = 0;
+
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		opts.onSuccess = asyncTestOnSend;
+		opts.context = &tc;
+
+		rc = MQTTAsync_send(c, tc.topic, pubmsg.payloadlen, pubmsg.payload,
+				pubmsg.qos, pubmsg.retained, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	while (!tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	MQTTAsync_destroy(&c);
+
+	exit: MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.", (failures
+			== 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test3b: Server Authentication - Client does not have server cert
+
+ *********************************************************************/
+
+int test3bFinished;
+
+void test3bOnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In test3bOnConnectFailure callback, context %p", context);
+
+	assert("This test should call test3bOnConnectFailure. ", 1, "test3bOnConnectFailure callback was called\n", 1);
+	test3bFinished = 1;
+}
+
+void test3bOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MyLog(LOGA_DEBUG, "In test3bOnConnectFailure callback, context %p", context);
+
+	assert("This connect should not succeed. ", 0, "test3bOnConnect callback was called\n", 0);
+	test3bFinished = 1;
+}
+
+int test3b(struct Options options)
+{
+	char* testname = "test3b";
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	int count = 0;
+
+	test3bFinished = 0;
+	failures = 0;
+	MyLog(
+			LOGA_INFO,
+			"Starting test 3b - connection to SSL MQTT server with clientauth=opt but client does not have server cert");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, options.server_auth_connection, "test3b", MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test3bOnConnect;
+	opts.onFailure = test3bOnConnectFailure;
+	opts.context = c;
+
+	opts.ssl = &sslopts;
+	//if (options.server_key_file != NULL) opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	//opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	//if (options.client_key_pass != NULL) opts.ssl->privateKeyPassword = options.client_key_pass;
+	//opts.ssl->enabledCipherSuites = "DEFAULT";
+	//opts.ssl->enabledServerCertAuth = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test3bFinished && ++count < 10000)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	exit: MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test4: Accept invalid server certificates
+
+ *********************************************************************/
+
+void test4OnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* client = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In test4OnConnectFailure callback, context %p", context);
+
+	assert("There should be no failures in this test. ", 0, "test4OnConnectFailure callback was called\n", 0);
+	client->testFinished = 1;
+}
+
+void test4OnPublishFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In test4OnPublishFailure callback, context %p", context);
+
+	assert("There should be no failures in this test. ", 0, "test4OnPublishFailure callback was called\n", 0);
+}
+
+int test4(struct Options options)
+{
+	char* testname = "test4";
+	int subsqos = 2;
+	/* TODO - usused - remove ? MQTTAsync_deliveryToken* dt = NULL; */
+	AsyncTestClient tc =
+	AsyncTestClient_initializer;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	int i;
+
+	failures = 0;
+
+	MyLog(LOGA_INFO, "Starting test 4 - accept invalid server certificates");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	MQTTAsync_create(&c, options.server_auth_connection, "test4", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+
+	tc.client = c;
+	sprintf(tc.clientid, "%s", testname);
+	sprintf(tc.topic, "C client SSL test4");
+	tc.maxmsgs = MAXMSGS;
+	//tc.rcvdmsgs = 0;
+	tc.subscribed = 0;
+	tc.testFinished = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = asyncTestOnConnect;
+	opts.onFailure = test4OnConnectFailure;
+	opts.context = &tc;
+
+	opts.ssl = &sslopts;
+	//if (options.server_key_file != NULL) opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	//opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	//if (options.client_key_pass != NULL) opts.ssl->privateKeyPassword = options.client_key_pass;
+	//opts.ssl->enabledCipherSuites = "DEFAULT";
+	opts.ssl->enableServerCertAuth = 0;
+
+	rc = MQTTAsync_setCallbacks(c, &tc, NULL, asyncTestMessageArrived,
+			asyncTestOnDeliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!tc.subscribed && !tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	if (tc.testFinished)
+		goto exit;
+
+	for (i = 0; i < 3; i++)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+
+		pubmsg.payload
+				= "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = i;
+		pubmsg.retained = 0;
+
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		opts.onSuccess = asyncTestOnSend;
+		opts.context = &tc;
+
+		rc = MQTTAsync_send(c, tc.topic, pubmsg.payloadlen, pubmsg.payload,
+				pubmsg.qos, pubmsg.retained, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	while (!tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	exit: MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test5a: Anonymous ciphers - server auth disabled
+
+ *********************************************************************/
+
+void test5aOnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* client = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In test5aOnConnectFailure callback, context %p", context);
+
+	assert("There should be no failures in this test. ", 0, "test5aOnConnectFailure callback was called\n", 0);
+	client->testFinished = 1;
+}
+
+void test5aOnPublishFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In test5aOnPublishFailure callback, context %p", context);
+
+	assert("There should be no failures in this test. ", 0, "test5aOnPublishFailure callback was called\n", 0);
+}
+
+int test5a(struct Options options)
+{
+	char* testname = "test5a";
+
+	AsyncTestClient tc =
+	AsyncTestClient_initializer;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	int i;
+
+	failures = 0;
+
+	MyLog(LOGA_INFO,
+			"Starting SSL test 5a - Anonymous ciphers - server authentication disabled");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, options.anon_connection, "test5a", MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	tc.client = c;
+	sprintf(tc.clientid, "%s", testname);
+	sprintf(tc.topic, "C client SSL test5a");
+	tc.maxmsgs = MAXMSGS;
+	//tc.rcvdmsgs = 0;
+	tc.subscribed = 0;
+	tc.testFinished = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = asyncTestOnConnect;
+	opts.onFailure = test5aOnConnectFailure;
+	opts.context = &tc;
+
+	opts.ssl = &sslopts;
+	//opts.ssl->trustStore = /*file of certificates trusted by client*/
+	//opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	//if (options.client_key_pass != NULL) opts.ssl->privateKeyPassword = options.client_key_pass;
+	opts.ssl->enabledCipherSuites = "aNULL";
+	opts.ssl->enableServerCertAuth = 0;
+
+	rc = MQTTAsync_setCallbacks(c, &tc, NULL, asyncTestMessageArrived,
+			asyncTestOnDeliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!tc.subscribed && !tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	if (tc.testFinished)
+		goto exit;
+
+	for (i = 0; i < 3; i++)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+
+		pubmsg.payload
+				= "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = i;
+		pubmsg.retained = 0;
+
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		opts.onSuccess = asyncTestOnSend;
+		opts.context = &tc;
+
+		rc = MQTTAsync_send(c, tc.topic, pubmsg.payloadlen, pubmsg.payload,
+				pubmsg.qos, pubmsg.retained, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	while (!tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	exit: MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test5b: Anonymous ciphers - server auth enabled
+
+ ********************************************************************/
+
+void test5bOnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* client = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In test5bOnConnectFailure callback, context %p", context);
+
+	assert("There should be no failures in this test. ", 0, "test5bOnConnectFailure callback was called\n", 0);
+	client->testFinished = 1;
+}
+
+void test5bOnPublishFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In test5bOnPublishFailure callback, context %p", context);
+
+	assert("There should be no failures in this test. ", 0, "test5bOnPublishFailure callback was called\n", 0);
+}
+
+int test5b(struct Options options)
+{
+	char* testname = "test5b";
+
+	AsyncTestClient tc =
+	AsyncTestClient_initializer;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	int i;
+
+	failures = 0;
+
+	MyLog(LOGA_INFO,
+			"Starting SSL test 5b - Anonymous ciphers - server authentication enabled");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, options.anon_connection, "test5b", MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	tc.client = c;
+	sprintf(tc.clientid, "%s", testname);
+	sprintf(tc.topic, "C client SSL test5b");
+	tc.maxmsgs = MAXMSGS;
+	//tc.rcvdmsgs = 0;
+	tc.subscribed = 0;
+	tc.testFinished = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = asyncTestOnConnect;
+	opts.onFailure = test5bOnConnectFailure;
+	opts.context = &tc;
+
+	opts.ssl = &sslopts;
+	//opts.ssl->trustStore = /*file of certificates trusted by client*/
+	//opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	//if (options.client_key_pass != NULL) opts.ssl->privateKeyPassword = options.client_key_pass;
+	opts.ssl->enabledCipherSuites = "aNULL";
+	opts.ssl->enableServerCertAuth = 1;
+
+	rc = MQTTAsync_setCallbacks(c, &tc, NULL, asyncTestMessageArrived,
+			asyncTestOnDeliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!tc.subscribed && !tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	if (tc.testFinished)
+		goto exit;
+
+	for (i = 0; i < 3; i++)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+
+		pubmsg.payload
+				= "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = i;
+		pubmsg.retained = 0;
+
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		opts.onSuccess = asyncTestOnSend;
+		opts.context = &tc;
+
+		rc = MQTTAsync_send(c, tc.topic, pubmsg.payloadlen, pubmsg.payload,
+				pubmsg.qos, pubmsg.retained, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	while (!tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	exit: MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test5c: Anonymous ciphers - client not using anonymous ciphers
+
+ *********************************************************************/
+
+int test5cFinished;
+
+void test5cOnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In test5cOnConnectFailure callback, context %p", context);
+
+	assert("This test should call test5cOnConnectFailure. ", 1, "test5cOnConnectFailure callback was called\n", 1);
+	test5cFinished = 1;
+}
+
+void test5cOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MyLog(LOGA_DEBUG, "In test5cOnConnectFailure callback, context %p", context);
+
+	assert("This connect should not succeed. ", 0, "test5cOnConnect callback was called\n", 0);
+	test5cFinished = 1;
+}
+
+int test5c(struct Options options)
+{
+	char* testname = "test5c";
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	int count = 0;
+
+	test5cFinished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO,
+			"Starting SSL test 5c - Anonymous ciphers - client not using anonymous cipher");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, options.anon_connection, "test5c", MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test5cOnConnect;
+	opts.onFailure = test5cOnConnectFailure;
+	opts.context = c;
+
+	opts.ssl = &sslopts;
+	//opts.ssl->trustStore = /*file of certificates trusted by client*/
+	//opts.ssl->keyStore = options.client_key_file;  /*file of certificate for client to present to server*/
+	//if (options.client_key_pass != NULL) opts.ssl->privateKeyPassword = options.client_key_pass;
+	//opts.ssl->enabledCipherSuites = "DEFAULT";
+	opts.ssl->enableServerCertAuth = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test5cFinished && ++count < 10000)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+exit:
+	MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test6: More than one client object - simultaneous working.
+
+ *********************************************************************/
+
+void test6OnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* client = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In test6OnConnectFailure callback, context %p", context);
+
+	assert("There should be no failures in this test. ", 0, "test6OnConnectFailure callback was called\n", 0);
+	client->testFinished = 1;
+}
+
+void test6OnPublishFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In test6OnPublishFailure callback, context %p", context);
+
+	assert("There should be no failures in this test. ", 0, "test6OnPublishFailure callback was called\n", 0);
+}
+
+int test6(struct Options options)
+{
+	char* testname = "test6";
+#define num_clients 10
+	int subsqos = 2;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	int i;
+	AsyncTestClient tc[num_clients];
+	int test6finished = 0;
+
+	MyLog(LOGA_INFO, "Starting test 6 - multiple connections");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	for (i = 0; i < num_clients; ++i)
+	{
+		tc[i].maxmsgs = MAXMSGS;
+		tc[i].rcvdmsgs[0] = 0;
+		tc[i].rcvdmsgs[1] = 0;
+		tc[i].rcvdmsgs[2] = 0;
+		tc[i].sentmsgs[0] = 0;
+		tc[i].sentmsgs[1] = 0;
+		tc[i].sentmsgs[2] = 0;
+		tc[i].testFinished = 0;
+		sprintf(tc[i].clientid, "sslasync_test6_num_%d", i);
+		sprintf(tc[i].topic, "sslasync test6 topic num %d", i);
+
+		rc = MQTTAsync_create(&(tc[i].client), options.server_auth_connection, tc[i].clientid,
+				MQTTCLIENT_PERSISTENCE_NONE, NULL);
+		assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+
+		rc = MQTTAsync_setCallbacks(tc[i].client, &tc[i], NULL,
+				asyncTestMessageArrived, NULL);
+		assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+		opts.keepAliveInterval = 20;
+		opts.cleansession = 1;
+		opts.username = "testuser";
+		opts.password = "testpassword";
+
+		opts.will = &wopts;
+		opts.will->message = "will message";
+		opts.will->qos = 1;
+		opts.will->retained = 0;
+		opts.will->topicName = "will topic";
+		opts.onSuccess = asyncTestOnConnect;
+		opts.onFailure = test6OnConnectFailure;
+		opts.context = &tc[i];
+
+		opts.ssl = &sslopts;
+		if (options.server_key_file != NULL)
+			opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+		opts.ssl->keyStore = options.client_key_file; /*file of certificate for client to present to server*/
+		if (options.client_key_pass != NULL)
+			opts.ssl->privateKeyPassword = options.client_key_pass;
+		//opts.ssl->enabledCipherSuites = "DEFAULT";
+		//opts.ssl->enabledServerCertAuth = 1;
+
+		MyLog(LOGA_DEBUG, "Connecting");
+		rc = MQTTAsync_connect(tc[i].client, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	while (test6finished < num_clients)
+	{
+		MyLog(LOGA_DEBUG, "num_clients %d test_finished %d\n", num_clients,
+				test6finished);
+#if defined(WIN32)
+		Sleep(100);
+
+#else
+		usleep(10000L);
+#endif
+		for (i = 0; i < num_clients; ++i)
+		{
+			if (tc[i].testFinished)
+			{
+				test6finished++;
+				tc[i].testFinished = 0;
+			}
+		}
+	}
+
+	MyLog(LOGA_DEBUG, "test6: destroying clients");
+
+	for (i = 0; i < num_clients; ++i)
+		MQTTAsync_destroy(&tc[i].client);
+
+//exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+		(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test7: Send and receive big messages
+
+ *********************************************************************/
+
+void* test7_payload = NULL;
+int test7_payloadlen = 0;
+
+void test7OnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* client = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In test7OnConnectFailure callback, %s", client->clientid);
+
+	assert("There should be no failures in this test. ", 0, "test7OnConnectFailure callback was called\n", 0);
+	client->testFinished = 1;
+}
+
+int test7OnPublishSuccessCount = 0;
+int test7OnUnsubscribed = 0;
+
+void test7OnPublishSuccess(void* context, MQTTAsync_successData* response)
+{
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+
+	MyLog(LOGA_DEBUG, "In test7OnPublishSuccess callback, %s, qos %d", tc->clientid,
+				response->alt.pub.message.qos);
+
+	test7OnPublishSuccessCount++;
+
+	if (test7OnUnsubscribed == 1 && test7OnPublishSuccessCount == 3)
+	{
+		MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+		int rc;
+
+		opts.onSuccess = asyncTestOnDisconnect;
+		opts.context = tc;
+		rc = MQTTAsync_disconnect(tc->client, &opts);
+	}
+}
+
+void test7OnPublishFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* client = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In test7OnPublishFailure callback, %s %d", client->clientid);
+
+	assert("There should be no failures in this test. ", 0, "test7OnPublishFailure callback was called\n", 0);
+	client->testFinished = 1;
+}
+
+void test7OnUnsubscribe(void* context, MQTTAsync_successData* response)
+{
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In test7OnUnsubscribe callback, %s %d %d", tc->clientid,
+			test7OnUnsubscribed, test7OnPublishSuccessCount);
+	opts.onSuccess = asyncTestOnDisconnect;
+	opts.context = tc;
+
+	test7OnUnsubscribed++;
+
+	if (test7OnUnsubscribed == 1 && test7OnPublishSuccessCount == 3)
+		rc = MQTTAsync_disconnect(tc->client, &opts);
+}
+
+int test7MessageArrived(void* context, char* topicName, int topicLen,
+		MQTTAsync_message* message)
+{
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+	static int message_count = 0;
+	int rc, i;
+
+	MyLog(LOGA_DEBUG, "In messageArrived callback %p", tc);
+
+	assert("Message size correct", message->payloadlen == test7_payloadlen,
+			"message size was %d", message->payloadlen);
+
+	for (i = 0; i < options.size; ++i)
+	{
+		if (((char*) test7_payload)[i] != ((char*) message->payload)[i])
+		{
+			assert("Message contents correct", ((char*)test7_payload)[i] != ((char*)message->payload)[i],
+					"message content was %c", ((char*)message->payload)[i]);
+			break;
+		}
+	}
+
+	if (++message_count == 1)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		pubmsg.payload = test7_payload;
+		pubmsg.payloadlen = test7_payloadlen;
+		pubmsg.qos = 1;
+		pubmsg.retained = 0;
+		opts.onSuccess = test7OnPublishSuccess;
+		opts.onFailure = test7OnPublishFailure;
+		opts.context = tc;
+
+		rc = MQTTAsync_sendMessage(tc->client, tc->topic, &pubmsg, &opts);
+	}
+	else if (message_count == 2)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		pubmsg.payload = test7_payload;
+		pubmsg.payloadlen = test7_payloadlen;
+		pubmsg.qos = 0;
+		pubmsg.retained = 0;
+		opts.onSuccess = test7OnPublishSuccess;
+		opts.onFailure = test7OnPublishFailure;
+		opts.context = tc;
+		rc = MQTTAsync_sendMessage(tc->client, tc->topic, &pubmsg, &opts);
+	}
+	else
+	{
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		opts.onSuccess = test7OnUnsubscribe;
+		opts.context = tc;
+		rc = MQTTAsync_unsubscribe(tc->client, tc->topic, &opts);
+		assert("Unsubscribe successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+void test7OnSubscribe(void* context, MQTTAsync_successData* response)
+{
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc, i;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback %p", tc);
+
+	pubmsg.payload = test7_payload = malloc(options.size);
+	pubmsg.payloadlen = test7_payloadlen = options.size;
+
+	srand(33);
+	for (i = 0; i < options.size; ++i)
+		((char*) pubmsg.payload)[i] = rand() % 256;
+
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	pubmsg.payload = test7_payload;
+	pubmsg.payloadlen = test7_payloadlen;
+	opts.onSuccess = test7OnPublishSuccess;
+	opts.onFailure = test7OnPublishFailure;
+	opts.context = tc;
+
+	rc = MQTTAsync_send(tc->client, tc->topic, pubmsg.payloadlen, pubmsg.payload,
+			pubmsg.qos, pubmsg.retained, &opts);
+}
+
+void test7OnConnect(void* context, MQTTAsync_successData* response)
+{
+	AsyncTestClient* tc = (AsyncTestClient*) context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.onSuccess = test7OnSubscribe;
+	opts.context = tc;
+
+	rc = MQTTAsync_subscribe(tc->client, tc->topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		tc->testFinished = 1;
+}
+
+int test7(struct Options options)
+{
+	char* testname = "test7";
+	int subsqos = 2;
+	AsyncTestClient tc = AsyncTestClient_initializer;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test7";
+	int test_finished;
+
+	test_finished = failures = 0;
+
+	MyLog(LOGA_INFO, "Starting test 7 - big messages");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, options.server_auth_connection, "async_test_7", MQTTCLIENT_PERSISTENCE_NONE,
+			NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, &tc, NULL, test7MessageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	tc.client = c;
+	sprintf(tc.clientid, "%s", testname);
+	sprintf(tc.topic, "C client SSL test7");
+	tc.maxmsgs = MAXMSGS;
+	//tc.rcvdmsgs = 0;
+	tc.subscribed = 0;
+	tc.testFinished = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test7OnConnect;
+	opts.onFailure = test7OnConnectFailure;
+	opts.context = &tc;
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file != NULL)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	opts.ssl->keyStore = options.client_key_file; /*file of certificate for client to present to server*/
+	if (options.client_key_pass != NULL)
+		opts.ssl->privateKeyPassword = options.client_key_pass;
+	//opts.ssl->enabledCipherSuites = "DEFAULT";
+	//opts.ssl->enabledServerCertAuth = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(1000L);
+#endif
+
+	MQTTAsync_destroy(&c);
+
+	exit: MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+Test8: TLS-PSK - client and server has a common pre-shared key
+
+*********************************************************************/
+
+static unsigned int onPSKAuth(const char* hint,
+                              char* identity,
+                              unsigned int max_identity_len,
+                              unsigned char* psk,
+                              unsigned int max_psk_len,
+                              void* context)
+{
+	unsigned char test_psk[] = {0x50, 0x53, 0x4B, 0x00}; /* {'P', 'S', 'K', '\0' } */
+	MyLog(LOGA_DEBUG, "PSK auth callback");
+
+	assert("Good application context in onPSKAuth", context == (void *) 42, "context was %d\n", context);
+
+	strncpy(identity, "id", max_identity_len);
+	memcpy(psk, test_psk, sizeof(test_psk));
+	return sizeof(test_psk);
+}
+
+
+int test8(struct Options options)
+{
+	char* testname = "test8";
+
+	AsyncTestClient tc =
+	AsyncTestClient_initializer;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 8 - TLS-PSK - client and server has a common pre-shared key");
+	fprintf(xml, "<testcase classname=\"test8\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	MQTTAsync_create(&c, options.psk_connection, "test8", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	tc.client = c;
+	sprintf(tc.clientid, "%s", testname);
+	sprintf(tc.topic, "C client SSL test8");
+	tc.maxmsgs = MAXMSGS;
+	tc.subscribed = 0;
+	tc.testFinished = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.onSuccess = asyncTestOnConnect;
+	opts.onFailure = asyncTestOnSubscribeFailure;
+	opts.context = &tc;
+
+	opts.ssl = &sslopts;
+	opts.ssl->ssl_psk_cb = onPSKAuth;
+	opts.ssl->ssl_psk_context = (void *) 42;
+	opts.ssl->enabledCipherSuites = "PSK-AES128-CBC-SHA";
+
+	rc = MQTTAsync_setCallbacks(c, &tc, NULL, asyncTestMessageArrived,
+			asyncTestOnDeliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!tc.subscribed && !tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	if (tc.testFinished)
+		goto exit;
+
+	while (!tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+exit:
+	MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+ Test9: Mutual SSL Authentication - Testing CApath
+
+ *********************************************************************/
+
+void test9OnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* client = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In test9OnConnectFailure callback, %s",
+			client->clientid);
+
+	assert("There should be no failures in this test. ", 0, "test9OnConnectFailure callback was called\n", 0);
+	client->testFinished = 1;
+}
+
+int test9(struct Options options)
+{
+	char* testname = "test9";
+
+	AsyncTestClient tc =
+	AsyncTestClient_initializer;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 9 - Mutual SSL authentication with CApath");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	MQTTAsync_create(&c, options.mutual_auth_connection, "test9", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	tc.client = c;
+	sprintf(tc.clientid, "%s", testname);
+	sprintf(tc.topic, "C client SSL test9");
+	tc.maxmsgs = MAXMSGS;
+	//tc.rcvdmsgs = 0;
+	tc.subscribed = 0;
+	tc.testFinished = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = asyncTestOnConnect;
+	opts.onFailure = test9OnConnectFailure;
+	opts.context = &tc;
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file != NULL)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	opts.ssl->keyStore = options.client_key_file; /*file of certificate for client to present to server*/
+	if (options.client_key_pass != NULL)
+		opts.ssl->privateKeyPassword = options.client_key_pass;
+	opts.ssl->CApath = options.capath;
+	opts.ssl->enableServerCertAuth = 1;
+	opts.ssl->verify = 1;
+	MyLog(LOGA_DEBUG, "enableServerCertAuth %d\n", opts.ssl->enableServerCertAuth);
+	MyLog(LOGA_DEBUG, "verify %d\n", opts.ssl->verify);
+
+	rc = MQTTAsync_setCallbacks(c, &tc, NULL, asyncTestMessageArrived,
+			asyncTestOnDeliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!tc.subscribed && !tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	if (tc.testFinished)
+		goto exit;
+
+	while (!tc.testFinished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	exit: MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ Test10: Mutual SSL Authentication - Testing CApath
+
+ *********************************************************************/
+
+int test10Finished;
+
+void test10OnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	AsyncTestClient* client = (AsyncTestClient*) context;
+	MyLog(LOGA_DEBUG, "In test10OnConnectFailure callback, %s",
+			client->clientid);
+
+	assert("This test should call test10OnConnectFailure. ", 1, "test10OnConnectFailure callback was called\n", 1);
+	test10Finished = 1;
+}
+
+void test10OnConnect(void* context, MQTTAsync_successData* response)
+{
+	MyLog(LOGA_DEBUG, "In test10OnConnect callback, context %p", context);
+
+	assert("This connect should not succeed. ", 0, "test10OnConnect callback was called\n", 0);
+	test10Finished = 1;
+}
+
+int test10(struct Options options)
+{
+	char* testname = "test10";
+
+	AsyncTestClient tc =
+	AsyncTestClient_initializer;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_SSLOptions sslopts = MQTTAsync_SSLOptions_initializer;
+	int rc = 0;
+
+	failures = 0;
+	test10Finished = 0;
+	MyLog(LOGA_INFO, "Starting test 10 - dummy CApath");
+	fprintf(xml, "<testcase classname=\"test10\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	MQTTAsync_create(&c, options.mutual_auth_connection, "test10", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+
+	tc.client = c;
+	sprintf(tc.clientid, "%s", testname);
+	sprintf(tc.topic, "C client SSL test10");
+	tc.maxmsgs = MAXMSGS;
+	//tc.rcvdmsgs = 0;
+	tc.subscribed = 0;
+	tc.testFinished = 0;
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test10OnConnect;
+	opts.onFailure = test10OnConnectFailure;
+	opts.context = &tc;
+
+	opts.ssl = &sslopts;
+	if (options.server_key_file != NULL)
+		opts.ssl->trustStore = options.server_key_file; /*file of certificates trusted by client*/
+	opts.ssl->keyStore = options.client_key_file; /*file of certificate for client to present to server*/
+	if (options.client_key_pass != NULL)
+		opts.ssl->privateKeyPassword = options.client_key_pass;
+	opts.ssl->CApath = "DUMMY";
+	opts.ssl->enableServerCertAuth = 1;
+	opts.ssl->verify = 1;
+	MyLog(LOGA_DEBUG, "enableServerCertAuth %d\n", opts.ssl->enableServerCertAuth);
+	MyLog(LOGA_DEBUG, "verify %d\n", opts.ssl->verify);
+
+	rc = MQTTAsync_setCallbacks(c, &tc, NULL, asyncTestMessageArrived,
+			asyncTestOnDeliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test10Finished)
+#if defined(WIN32)
+		Sleep(100);
+#else
+		usleep(10000L);
+#endif
+	MyLog(LOGA_DEBUG, "Stopping");
+
+	exit: MQTTAsync_destroy(&c);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+void handleTrace(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	printf("%s\n", message);
+}
+
+
+int main(int argc, char** argv)
+{
+	int* numtests = &tests;
+	int rc = 0;
+	int (*tests[])() =
+            { NULL, test1, test2a, test2b, test2c, test2d, test3a, test3b, test4, /* test5a,
+			test5b, test5c, */ test6, test7, test8, test9, test10 };
+
+	xml = fopen("TEST-test5.xml", "w");
+	fprintf(xml, "<testsuite name=\"test5\" tests=\"%d\">\n", (int)ARRAY_SIZE(tests) - 1);
+
+	MQTTAsync_setTraceCallback(handleTrace);
+	getopts(argc, argv);
+
+	if (options.test_no == 0)
+	{ /* run all the tests */
+		for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+		{
+			failures = 0;
+			MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+			rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+		}
+	}
+	else
+	{
+		MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+		rc = tests[options.test_no](options); /* run just the selected test */
+	}
+
+	MyLog(LOGA_INFO, "Total tests run: %d", *numtests);
+	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+
+	return rc;
+}
+
+/* Local Variables: */
+/* indent-tabs-mode: t */
+/* c-basic-offset: 8 */
+/* End: */
diff --git a/mqtt/src/test/test6.c b/mqtt/src/test/test6.c
new file mode 100644
index 00000000..a23e9ff7
--- /dev/null
+++ b/mqtt/src/test/test6.c
@@ -0,0 +1,1035 @@
+/*******************************************************************************
+ * Copyright (c) 2011, 2014 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * Async C client program for the MQTT v3 restart/recovery test suite.
+ */
+
+#include "MQTTAsync.h"
+#define NO_HEAP_TRACKING
+#include "Heap.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+	#include <unistd.h>
+  #include <signal.h>
+#else
+	#include <windows.h>
+#endif
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+static char pub_topic[200];
+static char sub_topic[200];
+
+struct
+{
+	char* connection;         /**< connection to system under test. */
+	char** connections;        /**< HA connection list */
+	int connection_count;
+	char* control_connection; /**< MQTT control connection, for test sync */
+	char* topic;
+	char* control_topic;
+	char* clientid;
+	int slot_no;
+	int qos;
+	int retained;
+	char* username;
+	char* password;
+	int verbose;
+	int persistence;
+} opts =
+{
+	"tcp://localhost:1884",
+	NULL,
+	0,
+	"tcp://localhost:7777",
+	"Eclipse/Paho/restart_test",
+	"Eclipse/Paho/restart_test/control",
+	"C_broken_client",
+	1,
+	2,
+	0,
+	NULL,
+	NULL,
+	0,
+	0,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--qos") == 0)
+		{
+			if (++count < argc)
+			{
+				if (strcmp(argv[count], "0") == 0)
+					opts.qos = 0;
+				else if (strcmp(argv[count], "1") == 0)
+					opts.qos = 1;
+				else if (strcmp(argv[count], "2") == 0)
+					opts.qos = 2;
+				else
+					usage();
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--slot_no") == 0)
+		{
+			if (++count < argc)
+				opts.slot_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+				opts.connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connections") == 0)
+		{
+			if (++count < argc)
+			{
+				opts.connection_count = 0;
+				opts.connections = malloc(sizeof(char*) * 5);
+				char* tok = strtok(argv[count], " ");
+				while (tok)
+				{
+					opts.connections[opts.connection_count] = malloc(strlen(tok)+1);
+					strcpy(opts.connections[opts.connection_count], tok);
+					opts.connection_count++;
+					tok = strtok(NULL, " ");
+				}
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--control_connection") == 0)
+		{
+			if (++count < argc)
+				opts.control_connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--clientid") == 0)
+		{
+			if (++count < argc)
+				opts.clientid = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--username") == 0)
+		{
+			if (++count < argc)
+				opts.username = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--password") == 0)
+		{
+			if (++count < argc)
+				opts.password = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--persistent") == 0)
+			opts.persistence = 1;
+		else if (strcmp(argv[count], "--verbose") == 0)
+			opts.verbose = 1;
+		count++;
+	}
+}
+
+#define LOGA_DEBUG 0
+#define LOGA_ALWAYS 1
+#define LOGA_INFO 2
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int log_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (log_level == LOGA_DEBUG && opts.verbose == 0)
+	  return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	sprintf(&msg_buf[strlen(msg_buf)], "%s ", opts.clientid);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+void MySleep(long milliseconds)
+{
+#if defined(WIN32) || defined(WIN64)
+	Sleep(milliseconds);
+#else
+	usleep(milliseconds*1000);
+#endif
+}
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+MQTTAsync control_client;
+MQTTAsync_connectOptions conn_opts = MQTTAsync_connectOptions_initializer;
+MQTTAsync client;
+int arrivedCount = 0;
+int expectedCount = 0;
+int measuring = 0;
+long roundtrip_time = 0L;
+int errors = 0;
+int stopping = 0;
+int connection_lost = 0; /* for use with the persistence option */
+int recreated = 0;
+int client_cleaned = 0;
+
+char* wait_message = NULL;
+char* wait_message2 = NULL;
+int control_found = 0;
+long last_completion_time = -1;
+int test_count = 1000;
+
+void control_connectionLost(void* context, char* cause)
+{
+	MyLog(LOGA_ALWAYS, "Control connection lost - stopping");
+
+	stopping = 1;
+}
+
+/**-----------------------------------------------------------------------------
+ * Callback which receives messages from the control connection
+ * @param context
+ * @param topicName the name of the topic on which the message is received
+ * @param topicLen the length of the topic name (in case of embedded nulls)
+ * @param m pointer to the message received
+ * @return boolean
+ */
+int control_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* m)
+{
+	MyLog(LOGA_ALWAYS, "Control message arrived: %.*s wait message: %s",
+				m->payloadlen, m->payload, (wait_message == NULL) ? "None" : wait_message);
+	if (strncmp(m->payload, "stop", 4) == 0)
+	{
+		MyLog(LOGA_ALWAYS, "Stop message arrived, stopping...");
+		stopping = 1;
+	}
+	else if (wait_message != NULL && strncmp(wait_message, m->payload,
+																					 strlen(wait_message)) == 0)
+	{
+		MyLog(LOGA_ALWAYS, "Wait message %s found", wait_message);
+		control_found = 1;
+		wait_message = NULL;
+	}
+	else if (wait_message2 != NULL && strncmp(wait_message2, m->payload,
+																						strlen(wait_message2)) == 0)
+	{
+		MyLog(LOGA_ALWAYS, "Wait message2 %s found", wait_message);
+		control_found = 2;
+		wait_message2 = NULL;
+	}
+
+	MQTTAsync_free(topicName);
+	MQTTAsync_freeMessage(&m);
+	return 1;
+}
+
+
+int control_send(char* message)
+{
+	char buf[156];
+	int rc = 0;
+	MQTTAsync_responseOptions ropts = MQTTAsync_responseOptions_initializer;
+
+	sprintf(buf, "%s: %s", opts.clientid, message);
+	 MyLog(LOGA_ALWAYS, "Sending control message: %s", message);
+	rc = MQTTAsync_send(control_client, pub_topic, (int)strlen(buf),
+															buf, 1, 0, &ropts);
+	MyLog(LOGA_DEBUG, "Control message sent: %s", buf);
+
+	return rc;
+}
+
+
+/* wait for a specific message on the control topic. */
+int control_wait(char* message)
+{
+	int count = 0;
+	char buf[120];
+
+	control_found = 0;
+	wait_message = message;
+
+	sprintf(buf, "waiting for: %s", message);
+	control_send(buf);
+
+	MyLog(LOGA_ALWAYS, "Waiting for: %s", message);
+	while (control_found == 0 && stopping == 0)
+	{
+		if (++count == 300)
+		{
+			stopping = 1;
+			MyLog(LOGA_ALWAYS, "Failed to receive message %s, stopping ", message);
+			return 0; /* time out and tell the caller the message was not found */
+		}
+		MySleep(1000);
+	}
+	MyLog(LOGA_ALWAYS, "Control message found: %s, control_found %d", message, control_found);
+	return control_found;
+}
+
+
+/* wait for a specific message on the control topic. */
+int control_which(char* message1, char* message2)
+{
+	int count = 0;
+	control_found = 0;
+	wait_message = message1;
+	wait_message2 = message2;
+
+	while (control_found == 0)
+	{
+		if (++count == 300)
+		  break; /* time out and tell the caller the message was not found */
+		MySleep(1000);
+	}
+	return control_found;
+}
+
+
+START_TIME_TYPE global_start_time;
+
+int messageArrived(void* context, char* topicName, int topicLen,
+									 MQTTAsync_message* m)
+{
+	int seqno = -1;
+	char* token = NULL;
+
+	token = strtok(m->payload, " ");
+	token = strtok(NULL, " ");
+	token = strtok(NULL, " ");
+
+	if (token)
+		seqno = atoi(token);
+	if (m->qos != opts.qos)
+	{
+		MyLog(LOGA_ALWAYS, "Error, expecting QoS %d but got %d", opts.qos,
+				m->qos);
+		errors++;
+	} else if (seqno != arrivedCount + 1)
+	{
+		if (m->qos == 2 || (m->qos == 1 && seqno > arrivedCount + 1))
+		{
+			if (seqno == -1)
+				MyLog(LOGA_ALWAYS,
+					"Error, expecting sequence number %d but got message id %d, payload was %.*s",
+							arrivedCount + 1, m->msgid, m->payloadlen, m->payload);
+			else
+				MyLog(LOGA_ALWAYS,
+					"Error, expecting sequence number %d but got %d message id %d",
+					arrivedCount + 1, seqno, m->msgid);
+			errors++;
+		}
+	}
+	arrivedCount++;
+	MQTTAsync_free(topicName);
+	MQTTAsync_freeMessage(&m);
+
+	if (measuring && arrivedCount == test_count)
+		roundtrip_time = elapsed(global_start_time);
+	return 1;
+}
+
+
+void client_onReconnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_ALWAYS, "Successfully reconnected");
+}
+
+
+void client_onReconnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+
+	MyLog(LOGA_ALWAYS, "Failed to reconnect with return code %d", (response) ? response->code : -9999);
+
+	conn_opts.context = context;
+	conn_opts.keepAliveInterval = 10;
+	conn_opts.username = opts.username;
+	conn_opts.password = opts.password;
+	conn_opts.cleansession = 0;
+	conn_opts.onSuccess = client_onReconnect;
+	conn_opts.onFailure = client_onReconnectFailure;
+	rc = MQTTAsync_connect(c, &conn_opts);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MyLog(LOGA_ALWAYS, "Failed to start reconnect with return code %d", rc);
+		stopping = 1;
+	}
+}
+
+
+void connectionLost(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	int rc = 0;
+
+	MyLog(LOGA_ALWAYS, "Connection lost when %d messages arrived out of %d expected",
+			arrivedCount, expectedCount);
+	//dotrace = 1;
+
+	if (opts.persistence)
+		connection_lost = 1;
+	else
+	{
+		conn_opts.context = context;
+		conn_opts.keepAliveInterval = 10;
+		conn_opts.username = opts.username;
+		conn_opts.password = opts.password;
+		conn_opts.cleansession = 0;
+		conn_opts.onSuccess = client_onReconnect;
+		conn_opts.onFailure = client_onReconnectFailure;
+		if (opts.connections)
+		{
+			conn_opts.serverURIcount = opts.connection_count;
+			conn_opts.serverURIs = opts.connections;
+		}
+		else
+		{
+			conn_opts.serverURIcount = 0;
+			conn_opts.serverURIs = NULL;
+		}
+		//printf("reconnecting to first serverURI %s\n", conn_opts.serverURIs[0]);
+		MyLog(LOGA_ALWAYS, "Starting reconnect attempt");
+		rc = MQTTAsync_connect(context, &conn_opts);
+		if (rc != MQTTASYNC_SUCCESS)
+		{
+			MyLog(LOGA_ALWAYS, "Failed to start reconnect with return code %d", rc);
+			stopping = 1;
+		}
+	}
+}
+
+
+int recreateReconnect(void)
+{
+	int rc;
+
+	if (recreated == 0)
+	{
+		MyLog(LOGA_ALWAYS, "Recreating client");
+
+		MQTTAsync_destroy(&client); /* destroy the client object so that we force persistence to be read on recreate */
+#if !defined(_WINDOWS)
+		heap_info* mqtt_mem = 0;
+		/*mqtt_mem = Heap_get_info();
+		MyLog(LOGA_INFO, "MQTT mem current %ld, max %ld",mqtt_mem->current_size,mqtt_mem->max_size);
+		if (mqtt_mem->current_size > 20)
+		  HeapScan(5); */
+#endif
+		rc = MQTTAsync_create(&client, opts.connection, opts.clientid, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+		if (rc != MQTTASYNC_SUCCESS)
+		{
+			MyLog(LOGA_ALWAYS, "MQTTAsync_create failed, rc %d", rc);
+			goto exit;
+		}
+
+		if ((rc = MQTTAsync_setCallbacks(client, client, connectionLost,
+														messageArrived, NULL)) != MQTTASYNC_SUCCESS)
+		{
+			MyLog(LOGA_ALWAYS, "MQTTAsync_setCallbacks failed, rc %d", rc);
+			goto exit;
+		}
+		recreated = 1;
+	}
+
+	MyLog(LOGA_ALWAYS, "Reconnecting client");
+	conn_opts.keepAliveInterval = 10;
+	conn_opts.username = opts.username;
+	conn_opts.password = opts.password;
+	conn_opts.cleansession = 0;
+	conn_opts.context = client;
+	conn_opts.onSuccess = client_onReconnect;
+	conn_opts.onFailure = client_onReconnectFailure;
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+		MyLog(LOGA_ALWAYS, "MQTTAsync_connect failed, rc %d", rc);
+	else
+		connection_lost = 0;
+
+exit:
+	return rc;
+}
+
+
+int success(int count)
+{
+	int rc = 1;
+
+	if (errors)
+	{
+		MyLog(LOGA_ALWAYS, "Workload test failed because the callback had errors");
+		rc = 0;
+	}
+	if (arrivedCount != count)
+	{
+		if (opts.qos == 2 || (opts.qos == 1 && arrivedCount < count))
+		{
+			MyLog(LOGA_ALWAYS,
+					"Workload test failed because the wrong number of messages"
+					" was received: %d whereas %d were expected",
+					arrivedCount, count);
+			rc = 0;
+		}
+	}
+	if (rc == 1)
+		control_send("verdict: pass");
+	else
+		control_send("verdict: fail");
+	return rc;
+}
+
+
+int waitForCompletion(START_TIME_TYPE start_time)
+{
+	int lastreport = 0;
+	int wait_count = 0;
+	int limit = 120;
+
+	MyLog(LOGA_ALWAYS, "Wait for completion");
+  if (opts.qos == 0)
+	  limit = 30; /* we aren't going to get back all QoS 0 messages anyway */
+	MySleep(1000);
+	while (arrivedCount < expectedCount)
+	{
+		if (arrivedCount > lastreport)
+		{
+			MyLog(LOGA_ALWAYS, "%d messages arrived out of %d expected, in %d seconds",
+					arrivedCount, expectedCount, elapsed(start_time) / 1000);
+			lastreport = arrivedCount;
+		}
+		MySleep(1000);
+		if (opts.persistence && connection_lost)
+				recreateReconnect();
+		if (++wait_count > limit || stopping)
+			break;
+	}
+	last_completion_time = elapsed(start_time) / 1000;
+	if (opts.qos > 0)
+	{
+	  MyLog(LOGA_ALWAYS, "Extra wait to see if any duplicates arrive");
+	  MySleep(10000);            /* check if any duplicate messages arrive */
+	}
+	MyLog(LOGA_ALWAYS, "%d messages arrived out of %d expected, in %d seconds",
+				arrivedCount, expectedCount, elapsed(start_time) / 1000);
+	return success(expectedCount);
+}
+
+int messagesSent = 0;
+
+void messageSent(void* context, MQTTAsync_successData* response)
+{
+	messagesSent++;
+}
+
+
+void one_iteration(void)
+{
+	int interval = 0;
+	int i = 0;
+	int seqno = 0;
+	int rc = 0;
+	START_TIME_TYPE start_time;
+	int last_expected_count = expectedCount;
+	int test_interval = 30;
+
+	if (control_wait("start_measuring") == 0)
+		goto exit;
+
+	connection_lost = 0;
+	recreated = 0;
+
+	/* find the time for evaluation_count round-trip messages */
+	MyLog(LOGA_INFO, "Evaluating how many messages needed");
+	expectedCount = arrivedCount = 0;
+	measuring = 1;
+	global_start_time = start_clock();
+	for (i = 1; i <= test_count; ++i)
+	{
+		char payload[128];
+
+		sprintf(payload, "message number %d", i);
+
+		rc = MQTTAsync_send(client, opts.topic, (int)(strlen(payload)+1), payload,
+				        opts.qos, opts.retained, NULL);
+		while (rc != MQTTASYNC_SUCCESS)
+		{
+			if (opts.persistence && (connection_lost || rc == MQTTASYNC_DISCONNECTED))
+				recreateReconnect();
+			if (stopping)
+				goto exit;
+			MySleep(1000);
+			rc = MQTTAsync_send(client, opts.topic, (int)(strlen(payload)+1), payload,
+					opts.qos, opts.retained, NULL);
+			while (seqno - messagesSent > 2000)
+				MySleep(1000);
+		}
+	}
+	MyLog(LOGA_INFO, "Messages sent... waiting for echoes");
+	while (arrivedCount < test_count)
+	{
+		if (opts.persistence && connection_lost)
+			recreateReconnect();
+		if (stopping)
+			goto exit;
+		MySleep(1000);
+		MyLog(LOGA_ALWAYS, "arrivedCount %d", arrivedCount);
+	}
+	measuring = 0;
+
+	/* Now set a target of 30 seconds total round trip */
+	if (1) //last_completion_time == -1)
+	{
+		MyLog(LOGA_ALWAYS, "Round trip time for %d messages is %d ms", test_count, roundtrip_time);
+		// test_count messages in 3039 ms: (test_interval * 1000) / roundtrip_time * test_count
+		//expectedCount = 1000 * test_count * test_interval / roundtrip_time / 2;
+		expectedCount = (test_interval * 1000) / roundtrip_time * test_count;
+	}
+	else
+	{
+		MyLog(LOGA_ALWAYS, "Last time, %d messages took %d s.", last_expected_count, last_completion_time);
+		expectedCount = last_expected_count * test_interval / last_completion_time;
+	}
+	MyLog(LOGA_ALWAYS, "Therefore %d messages needed for 30 seconds", expectedCount);
+
+	if (control_wait("start_test") == 0) /* now synchronize the test interval */
+		goto exit;
+
+	MyLog(LOGA_ALWAYS, "Starting 30 second test run with %d messages", expectedCount);
+	arrivedCount = 0;
+	messagesSent = 0;
+	start_time = start_clock();
+	while (seqno < expectedCount)
+	{
+		MQTTAsync_responseOptions ropts = MQTTAsync_responseOptions_initializer;
+		char payload[128];
+
+		ropts.onSuccess = messageSent;
+		seqno++;
+		sprintf(payload, "message number %d", seqno);
+		rc = MQTTAsync_send(client, opts.topic, (int)(strlen(payload)+1), payload,
+				opts.qos, opts.retained, &ropts);
+		while (rc != MQTTASYNC_SUCCESS)
+		{
+			MyLog(LOGA_INFO, "Rc %d from publish with payload %s, retrying", rc, payload);
+			if (opts.persistence && (connection_lost || rc == MQTTASYNC_DISCONNECTED))
+				recreateReconnect();
+			if (stopping)
+				goto exit;
+			MySleep(1000);
+			rc = MQTTAsync_send(client, opts.topic, (int)(strlen(payload)+1), payload,
+				opts.qos, opts.retained, &ropts);
+		}
+		//MyLog(LOGA_DEBUG, "Successful publish with payload %s", payload);
+		//while (seqno - messagesSent > 2000)
+		//{
+		//if (opts.persistence && (connection_lost || rc == MQTTASYNC_DISCONNECTED))
+		//	recreateReconnect();
+		//}
+		//	MySleep(1000);
+	}
+	MyLog(LOGA_ALWAYS, "%d messages sent in %d seconds", expectedCount, elapsed(start_time) / 1000);
+
+	waitForCompletion(start_time);
+	control_wait("test finished");
+exit:
+	; /* dummy statement for target of exit */
+}
+
+
+static int client_subscribed = 0;
+
+void client_onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In client subscribe onSuccess callback %p granted qos %d", c, response->alt.qos);
+
+	client_subscribed = 1;
+}
+
+void client_onFailure(void* context, MQTTAsync_failureData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_INFO, "In failure callback");
+
+	client_subscribed = -1;
+}
+
+
+void client_onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions ropts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	sprintf(sub_topic, "%s/send", opts.control_topic);
+	sprintf(pub_topic, "%s/receive", opts.control_topic);
+	ropts.context = context;
+	ropts.onSuccess = client_onSubscribe;
+	ropts.onFailure = client_onFailure;
+	ropts.context = c;
+	if ((rc = MQTTAsync_subscribe(c, opts.topic, opts.qos, &ropts)) != MQTTASYNC_SUCCESS)
+	{
+		MyLog(LOGA_ALWAYS, "client MQTTAsync_subscribe failed, rc %d", rc);
+		client_subscribed = -1;
+	}
+}
+
+
+void client_onCleanedDisconnected(void* context, MQTTAsync_successData* response)
+{
+	client_cleaned = 1;
+}
+
+
+void client_onCleaned(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions dopts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	dopts.context = context;
+	dopts.onSuccess = client_onCleanedDisconnected;
+	dopts.onFailure = client_onFailure;
+	dopts.context = c;
+	if ((rc = MQTTAsync_disconnect(c, &dopts)) != MQTTASYNC_SUCCESS)
+	{
+		MyLog(LOGA_ALWAYS, "client MQTTAsync_disconnect failed, rc %d", rc);
+		stopping = 1;
+	}
+}
+
+
+int sendAndReceive(void)
+{
+	int rc = 0;
+	int persistence = MQTTCLIENT_PERSISTENCE_NONE;
+
+	MyLog(LOGA_ALWAYS, "v3 async C client topic workload using QoS %d", opts.qos);
+	MyLog(LOGA_DEBUG, "Connecting to %s", opts.connection);
+
+	if (opts.persistence)
+		persistence = MQTTCLIENT_PERSISTENCE_DEFAULT;
+
+	rc = MQTTAsync_create(&client, opts.connection, opts.clientid, persistence, NULL);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MyLog(LOGA_ALWAYS, "MQTTAsync_create failed, rc %d", rc);
+		rc = 99;
+		goto exit;
+	}
+
+	if ((rc = MQTTAsync_setCallbacks(client, client, connectionLost,
+                messageArrived, NULL)) != MQTTASYNC_SUCCESS)
+	{
+		MyLog(LOGA_ALWAYS, "MQTTAsync_setCallbacks failed, rc %d", rc);
+		rc = 99;
+		goto destroy_exit;
+	}
+
+	/* wait to know that the controlling process is running before connecting to the SUT */
+	if (control_wait("who is ready?") == 0)
+	{
+		MyLog(LOGA_ALWAYS, "Wait for controller failed");
+		goto exit;
+	}
+
+	/* connect cleansession, and then disconnect, to clean up */
+	conn_opts.keepAliveInterval = 10;
+	conn_opts.username = opts.username;
+	conn_opts.password = opts.password;
+	conn_opts.cleansession = 1;
+	conn_opts.context = client;
+	conn_opts.onSuccess = client_onCleaned;
+	conn_opts.onFailure = client_onFailure;
+	if (opts.connections)
+	{
+		conn_opts.serverURIcount = opts.connection_count;
+		conn_opts.serverURIs = opts.connections;
+	}
+	else
+	{
+		conn_opts.serverURIcount = 0;
+		conn_opts.serverURIs = NULL;
+	}
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		MyLog(LOGA_ALWAYS, "MQTTAsync_connect failed, rc %d", rc);
+		rc = 99;
+		goto destroy_exit;
+	}
+
+	while (client_cleaned == 0)
+		MySleep(1000);
+
+	MyLog(LOGA_ALWAYS, "Client state cleaned up");
+
+	conn_opts.cleansession = 0;
+	conn_opts.context = client;
+	conn_opts.onSuccess = client_onConnect;
+	conn_opts.onFailure = client_onFailure;
+	conn_opts.retryInterval = 1;
+	if ((rc = MQTTAsync_connect(client, &conn_opts)) != MQTTASYNC_SUCCESS)
+	{
+		MyLog(LOGA_ALWAYS, "MQTTAsync_connect failed, rc %d", rc);
+		rc = 99;
+		goto destroy_exit;
+	}
+
+	/* wait until subscribed */
+	while (client_subscribed == 0)
+		MySleep(1000);
+
+	if (client_subscribed != 1)
+		goto disconnect_exit;
+
+	while (1)
+	{
+		control_send("Ready");
+		if (control_which("who is ready?", "continue") == 2)
+			break;
+		control_send("Ready");
+	}
+
+	while (!stopping)
+	{
+		one_iteration();
+	}
+
+disconnect_exit:
+	MQTTAsync_disconnect(client, 0);
+
+destroy_exit:
+ 	MQTTAsync_destroy(&client);
+
+exit:
+	return rc;
+}
+
+
+static int control_subscribed = 0;
+
+void control_onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In control subscribe onSuccess callback %p granted qos %d", c, response->alt.qos);
+
+	control_subscribed = 1;
+	MyLog(LOGA_ALWAYS, "Connected and subscribed to control connection");
+}
+
+void control_onFailure(void* context, MQTTAsync_failureData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	control_subscribed = -1;
+}
+
+
+void control_onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions ropts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	sprintf(sub_topic, "%s/send", opts.control_topic);
+	sprintf(pub_topic, "%s/receive", opts.control_topic);
+	ropts.onSuccess = control_onSubscribe;
+	ropts.onFailure = control_onFailure;
+	ropts.context = c;
+	MyLog(LOGA_ALWAYS, "Subscribing to control topic %s", sub_topic);
+	if ((rc = MQTTAsync_subscribe(c, sub_topic, 2, &ropts)) != MQTTASYNC_SUCCESS)
+	{
+		MyLog(LOGA_ALWAYS, "control MQTTAsync_subscribe failed, rc %d", rc);
+		control_subscribed = -1;
+	}
+}
+
+void trace_callback(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	//if (level == MQTTASYNC_TRACE_ERROR || strstr(message, "Connect") || strstr(message, "failed"))
+		printf("Trace : %d, %s\n", level, message);
+}
+
+int main(int argc, char** argv)
+{
+	MQTTAsync_connectOptions control_conn_opts = MQTTAsync_connectOptions_initializer;
+	int rc = 0;
+	static char topic_buf[200];
+	static char clientid[40];
+
+#if !defined(WIN32)
+	signal(SIGPIPE, SIG_IGN);
+#endif
+
+	MQTTAsync_nameValue* info = MQTTAsync_getVersionInfo();
+
+	while (info->name)
+	{
+	  MyLog(LOGA_ALWAYS, "%s: %s\n", info->name, info->value);
+	  info++;
+	}
+
+	getopts(argc, argv);
+
+	sprintf(topic_buf, "%s_%d", opts.topic, opts.slot_no);
+	opts.topic = topic_buf;
+
+	sprintf(clientid, "%s_%d", opts.clientid, opts.slot_no);
+	opts.clientid = clientid;
+
+	MyLog(LOGA_ALWAYS, "Starting with clientid %s", opts.clientid);
+
+	MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+	MQTTAsync_setTraceCallback(trace_callback);
+
+	rc = MQTTAsync_create(&control_client, opts.control_connection,
+	                                     opts.clientid, MQTTCLIENT_PERSISTENCE_NONE, NULL);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MyLog(LOGA_ALWAYS, "control MQTTAsync_create failed, rc %d", rc);
+		rc = 99;
+		goto exit;
+	}
+
+	if ((rc = MQTTAsync_setCallbacks(control_client, control_client, control_connectionLost,
+						control_messageArrived, NULL)) != MQTTASYNC_SUCCESS)
+	{
+		MyLog(LOGA_ALWAYS, "control MQTTAsync_setCallbacks failed, rc %d", rc);
+		rc = 99;
+		goto destroy_exit;
+	}
+
+	control_subscribed = 0;
+	control_conn_opts.context = control_client;
+	control_conn_opts.keepAliveInterval = 10;
+	control_conn_opts.onSuccess = control_onConnect;
+	control_conn_opts.onFailure = control_onFailure;
+	if ((rc = MQTTAsync_connect(control_client, &control_conn_opts))
+			!= MQTTASYNC_SUCCESS)
+	{
+		MyLog(LOGA_ALWAYS, "control MQTTAsync_connect failed, rc %d", rc);
+		rc = 99;
+		goto destroy_exit;
+	}
+
+	while (control_subscribed == 0)
+		MySleep(1000);
+
+	if (control_subscribed != 1)
+		goto destroy_exit;
+
+	sendAndReceive();
+
+exit:
+	MQTTAsync_disconnect(control_client, 0);
+
+destroy_exit:
+	MQTTAsync_destroy(&control_client);
+
+	return 0;
+}
diff --git a/mqtt/src/test/test8.c b/mqtt/src/test/test8.c
new file mode 100644
index 00000000..f5f8bdbb
--- /dev/null
+++ b/mqtt/src/test/test8.c
@@ -0,0 +1,1133 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+/**
+ * @file
+ * Tests for the Paho MQTT Async C client
+ */
+
+
+#include "MQTTAsync.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+  #include <sys/socket.h>
+	#include <unistd.h>
+  #include <errno.h>
+#else
+	#include <windows.h>
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;         /**< connection to system under test. */
+	int verbose;
+  int test_no;
+	int size;									/**< size of big message */
+} options =
+{
+	"tcp://localhost:1883",
+	0,
+	-1,
+	5000000,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--size") == 0)
+		{
+			if (++count < argc)
+				options.size = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+				options.connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+			options.verbose = 1;
+		count++;
+	}
+}
+
+#if 0
+#include <logaX.h>   /* For general log messages                      */
+#define MyLog logaLine
+#else
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+#endif
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+
+START_TIME_TYPE global_start_time;
+
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+
+int tests = 0;
+int failures = 0;
+
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		printf("Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+	}
+    else
+    	MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+}
+
+volatile int test_finished = 0;
+
+char* test_topic = "async test topic";
+
+
+void test1_onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+	test_finished = 1;
+}
+
+
+void test1_onUnsubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In onUnsubscribe onSuccess callback %p", c);
+	opts.onSuccess = test1_onDisconnect;
+	opts.context = c;
+
+	rc = MQTTAsync_disconnect(c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test1_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In messageArrived callback %p", c);
+
+	if (++message_count == 1)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 11;
+		pubmsg.qos = 2;
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	}
+	else
+	{
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		opts.onSuccess = test1_onUnsubscribe;
+		opts.context = c;
+		rc = MQTTAsync_unsubscribe(c, test_topic, &opts);
+		assert("Unsubscribe successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+void test1_onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback %p granted qos %d", c, response->alt.qos);
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	rc = MQTTAsync_send(c, test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, NULL);
+}
+
+
+void test1_onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.onSuccess = test1_onSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribe(c, test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+
+void test1_onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test_finished = 1;
+}
+
+
+/*********************************************************************
+
+Test1: Basic connect, subscribe send and receive.
+
+*********************************************************************/
+int test1(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+	char* serverURIs[2] = {"tcp://localhost:1882", options.connection};
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 1 - asynchronous connect");
+
+	rc = MQTTAsync_create(&c, options.connection, "async_8_test1",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test1_onConnect;
+	opts.onFailure = test1_onConnectFailure;
+	opts.context = c;
+	opts.serverURIcount = 2;
+	opts.serverURIs = serverURIs;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST1: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+
+	return failures;
+}
+
+int test2_onFailure_called = 0;
+
+void test2_onFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test2_onFailure_called++;
+	test_finished = 1;
+}
+
+
+void test2_onConnect(void* context, MQTTAsync_successData* response)
+{
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p\n", context);
+
+	assert("Connect should not succeed", 0, "connect success callback was called", 0);
+
+	test_finished = 1;
+}
+
+/*********************************************************************
+
+Test2: connect timeout
+
+*********************************************************************/
+int test2(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test2";
+
+	test_finished = 0;
+
+	MyLog(LOGA_INFO, "Starting test 2 - connect timeout");
+
+	rc = MQTTAsync_create(&c, "tcp://9.20.96.160:66", "connect timeout",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.connectTimeout = 5;
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test2_onConnect;
+	opts.onFailure = test2_onFailure;
+	opts.context = c;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	assert("Connect onFailure should be called once", test2_onFailure_called == 1,
+			"connect onFailure was called %d times", test2_onFailure_called);
+
+	MyLog(LOGA_INFO, "TEST2: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+
+	return failures;
+}
+
+
+typedef struct
+{
+	MQTTAsync c;
+	int index;
+	char clientid[24];
+	char test_topic[100];
+	int	message_count;
+} client_data;
+
+
+void test3_onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	client_data* cd = (client_data*)context;
+	MyLog(LOGA_DEBUG, "In onDisconnect callback for client \"%s\"", cd->clientid);
+	test_finished++;
+}
+
+
+void test3_onPublish(void* context,  MQTTAsync_successData* response)
+{
+	client_data* cd = (client_data*)context;
+	MyLog(LOGA_DEBUG, "In QoS 0 onPublish callback for client \"%s\"", cd->clientid);
+}
+
+
+void test3_onUnsubscribe(void* context, MQTTAsync_successData* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In onUnsubscribe onSuccess callback \"%s\"", cd->clientid);
+	opts.onSuccess = test3_onDisconnect;
+	opts.context = cd;
+
+	rc = MQTTAsync_disconnect(cd->c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test3_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	client_data* cd = (client_data*)context;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In messageArrived callback \"%s\" message count ", cd->clientid);
+
+	if (++cd->message_count == 1)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 25;
+		pubmsg.qos = 1;
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(cd->c, cd->test_topic, &pubmsg, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	else if (cd->message_count == 2)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		pubmsg.payload = "a QoS 0 message that we can shorten to the extent that we need to payload up to 11";
+		pubmsg.payloadlen = 29;
+		pubmsg.qos = 0;
+		pubmsg.retained = 0;
+		opts.context = cd;
+		opts.onSuccess = test3_onPublish;
+
+		rc = MQTTAsync_sendMessage(cd->c, cd->test_topic, &pubmsg, &opts);
+		assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	else
+	{
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		opts.onSuccess = test3_onUnsubscribe;
+		opts.context = cd;
+		rc = MQTTAsync_unsubscribe(cd->c, cd->test_topic, &opts);
+		assert("Unsubscribe successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+	return 1;
+}
+
+void test3_onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback \"%s\"", cd->clientid);
+
+	pubmsg.payload = "a much longer message that we can shorten to the extent that we need to payload up to 11";
+	pubmsg.payloadlen = 11;
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	rc = MQTTAsync_send(cd->c, cd->test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, NULL);
+	assert("Good rc from publish", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+void test3_onConnect(void* context, MQTTAsync_successData* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, \"%s\"", cd->clientid);
+	opts.onSuccess = test3_onSubscribe;
+	opts.context = cd;
+
+	rc = MQTTAsync_subscribe(cd->c, cd->test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished++;
+}
+
+
+void test3_onFailure(void* context, MQTTAsync_failureData* response)
+{
+	client_data* cd = (client_data*)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+	assert("Should have connected", 0, "failed to connect", NULL);
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, \"%s\" rc %d\n", cd->clientid, response->code);
+	if (response->message)
+		MyLog(LOGA_DEBUG, "In connect onFailure callback, \"%s\"\n", response->message);
+
+	test_finished++;
+}
+
+
+/*********************************************************************
+
+Test3: More than one client object - simultaneous working.
+
+*********************************************************************/
+int test3(struct Options options)
+{
+	#define TEST3_CLIENTS 10
+	int num_clients = TEST3_CLIENTS;
+	int subsqos = 2;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	int i;
+	client_data clientdata[TEST3_CLIENTS];
+
+	test_finished = 0;
+	MyLog(LOGA_INFO, "Starting test 3 - multiple connections");
+
+	for (i = 0; i < num_clients; ++i)
+	{
+		sprintf(clientdata[i].clientid, "async_test3_num_%d", i);
+		sprintf(clientdata[i].test_topic, "async test3 topic num %d", i);
+		clientdata[i].index = i;
+		clientdata[i].message_count = 0;
+
+		rc = MQTTAsync_create(&(clientdata[i].c), options.connection, clientdata[i].clientid,
+			MQTTCLIENT_PERSISTENCE_NONE, NULL);
+		assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+
+		rc = MQTTAsync_setCallbacks(clientdata[i].c, &clientdata[i], NULL, test3_messageArrived, NULL);
+		assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+		opts.keepAliveInterval = 20;
+		opts.cleansession = 1;
+		opts.username = "testuser";
+		opts.password = "testpassword";
+
+		opts.will = &wopts;
+		opts.will->message = "will message";
+		opts.will->qos = 1;
+		opts.will->retained = 0;
+		opts.will->topicName = "will topic";
+		opts.onSuccess = test3_onConnect;
+		opts.onFailure = test3_onFailure;
+		opts.context = &clientdata[i];
+
+		MyLog(LOGA_DEBUG, "Connecting");
+		rc = MQTTAsync_connect(clientdata[i].c, &opts);
+		assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	while (test_finished < num_clients)
+	{
+		MyLog(LOGA_DEBUG, "num_clients %d test_finished %d\n", num_clients, test_finished);
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+	}
+
+	MyLog(LOGA_DEBUG, "TEST3: destroying clients");
+
+	for (i = 0; i < num_clients; ++i)
+		MQTTAsync_destroy(&clientdata[i].c);
+
+/*exit:*/
+	MyLog(LOGA_INFO, "TEST3: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+
+	return failures;
+}
+
+
+void* test4_payload = NULL;
+int test4_payloadlen = 0;
+
+void test4_onPublish(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In publish onSuccess callback, context %p", context);
+}
+
+int test4_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+	int rc, i;
+
+	MyLog(LOGA_DEBUG, "In messageArrived callback %p", c);
+
+	assert("Message size correct", message->payloadlen == test4_payloadlen,
+				 "message size was %d", message->payloadlen);
+
+	for (i = 0; i < options.size; ++i)
+	{
+		if (((char*)test4_payload)[i] != ((char*)message->payload)[i])
+		{
+			assert("Message contents correct", ((char*)test4_payload)[i] != ((char*)message->payload)[i],
+				 "message content was %c", ((char*)message->payload)[i]);
+			break;
+		}
+	}
+
+	if (++message_count == 1)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		pubmsg.payload = test4_payload;
+		pubmsg.payloadlen = test4_payloadlen;
+		pubmsg.qos = 1;
+		pubmsg.retained = 0;
+		opts.onSuccess = test4_onPublish;
+		opts.context = c;
+
+		rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	}
+	else if (message_count == 2)
+	{
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		pubmsg.payload = test4_payload;
+		pubmsg.payloadlen = test4_payloadlen;
+		pubmsg.qos = 0;
+		pubmsg.retained = 0;
+		opts.onSuccess = test4_onPublish;
+		opts.context = c;
+		rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	}
+	else
+	{
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+
+		opts.onSuccess = test1_onUnsubscribe;
+		opts.context = c;
+		rc = MQTTAsync_unsubscribe(c, test_topic, &opts);
+		assert("Unsubscribe successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	}
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+
+void test4_onSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	int rc, i;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback %p", c);
+
+	pubmsg.payload = test4_payload = malloc(options.size);
+	pubmsg.payloadlen = test4_payloadlen = options.size;
+
+	srand(33);
+	for (i = 0; i < options.size; ++i)
+		((char*)pubmsg.payload)[i] = rand() % 256;
+
+	pubmsg.qos = 2;
+	pubmsg.retained = 0;
+
+	rc = MQTTAsync_send(c, test_topic, pubmsg.payloadlen, pubmsg.payload, pubmsg.qos, pubmsg.retained, NULL);
+	assert("Send successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+void test4_onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.onSuccess = test4_onSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribe(c, test_topic, 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+
+/*********************************************************************
+
+Test4: Send and receive big messages
+
+*********************************************************************/
+int test4(struct Options options)
+{
+	int subsqos = 2;
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test4";
+
+	test_finished = failures = 0;
+	MyLog(LOGA_INFO, "Starting test 4 - big messages");
+
+	rc = MQTTAsync_create(&c, options.connection, "async_test_4",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_setCallbacks(c, c, NULL, test4_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+	opts.onSuccess = test4_onConnect;
+	opts.onFailure = NULL;
+	opts.context = c;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(1000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST4: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+
+	return failures;
+}
+
+
+int test5_onConnect_called = 0;
+int test5_onFailure_called = 0;
+
+void test5_onConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+
+	test5_onConnect_called++;
+	test_finished = 1;
+}
+
+void test5_onConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test5_onFailure_called++;
+	test_finished = 1;
+}
+
+/*********************************************************************
+
+Test5a: All HA connections out of service.
+
+*********************************************************************/
+int test5a(struct Options options)
+{
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test5a";
+	char* serverURIs[3] = {"tcp://localhost:1880", "tcp://localhost:1881", "tcp://localhost:1882"};
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 5a - All HA connections out of service");
+
+	rc = MQTTAsync_create(&c, "rubbish", "all_ha_down",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.onSuccess = test5_onConnect;
+	opts.onFailure = test5_onConnectFailure;
+	opts.context = c;
+	opts.serverURIcount = 3;
+	opts.serverURIs = serverURIs;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	assert("Connect onFailure should be called once", test5_onFailure_called == 1,
+			"connect onFailure was called %d times", test5_onFailure_called);
+
+	MyLog(LOGA_INFO, "TEST5a: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+
+	return failures;
+}
+
+/*********************************************************************
+
+Test5b: All HA connections out of service except the last one.
+
+*********************************************************************/
+int test5b(struct Options options)
+{
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test5b";
+	char* serverURIs[3] = {"tcp://localhost:1880", "tcp://localhost:1881", options.connection};
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 5b - All HA connections out of service except the last one");
+
+	rc = MQTTAsync_create(&c, "rubbish", "all_ha_down_except_last_one",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.onSuccess = test5_onConnect;
+	opts.onFailure = test5_onConnectFailure;
+	opts.context = c;
+	opts.serverURIcount = 3;
+	opts.serverURIs = serverURIs;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	assert("Connect onConnect should be called once", test5_onConnect_called == 1,
+			"connect onConnect was called %d times", test5_onConnect_called);
+
+	MyLog(LOGA_INFO, "TEST5b: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+
+	return failures;
+}
+
+/*********************************************************************
+
+Test5c: All HA connections out of service except the first one.
+
+*********************************************************************/
+int test5c(struct Options options)
+{
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test5c";
+	char* serverURIs[3] = {options.connection, "tcp://localhost:1881", "tcp://localhost:1882"};
+
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 5c - All HA connections out of service except the first one");
+
+	rc = MQTTAsync_create(&c, "rubbish", "all_ha_down_except_first_one",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+
+	opts.onSuccess = test5_onConnect;
+	opts.onFailure = test5_onConnectFailure;
+	opts.context = c;
+	opts.serverURIcount = 3;
+	opts.serverURIs = serverURIs;
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	rc = 0;
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	assert("Connect onConnect should be called once", test5_onConnect_called == 1,
+			"connect onConnect was called %d times", test5_onConnect_called);
+
+	MyLog(LOGA_INFO, "TEST5c: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+
+	return failures;
+}
+
+
+void trace_callback(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	if (strstr(message, "onnect") && !strstr(message, "isconnect"))
+		printf("Trace : %d, %s\n", level, message);
+}
+
+
+int main(int argc, char** argv)
+{
+	int rc = 0;
+	int (*tests[])() = {NULL, test1, test2, test3, test4, test5a, test5b, test5c}; /* indexed starting from 1 */
+	MQTTAsync_nameValue* info;
+
+	getopts(argc, argv);
+
+	MQTTAsync_setTraceCallback(trace_callback);
+
+	info = MQTTAsync_getVersionInfo();
+
+	while (info->name)
+	{
+	  MyLog(LOGA_INFO, "%s: %s", info->name, info->value);
+	  info++;
+	}
+
+ 	if (options.test_no == -1)
+	{ /* run all the tests */
+		for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+		{
+			failures = 0;
+			MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+			rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+		}
+	}
+	else
+	{
+		MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+		rc = tests[options.test_no](options); /* run just the selected test */
+	}
+
+	if (failures == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	return rc;
+}
diff --git a/mqtt/src/test/test9.c b/mqtt/src/test/test9.c
new file mode 100644
index 00000000..9bf64011
--- /dev/null
+++ b/mqtt/src/test/test9.c
@@ -0,0 +1,2075 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - correct some compile warnings
+ *    Ian Craggs - add binary will message test
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * Offline buffering and automatic reconnect tests for the Paho Asynchronous MQTT C client
+ *
+ */
+
+
+#include "MQTTAsync.h"
+#include <string.h>
+#include <stdlib.h>
+#include "Thread.h"
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+  #include <sys/socket.h>
+	#include <unistd.h>
+  #include <errno.h>
+#else
+  #include <windows.h>
+#endif
+
+char unique[50]; // unique suffix/prefix to add to clientid/topic etc
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;            /**< connection to system under test. */
+	char* proxy_connection;      /**< connection to proxy */
+	int verbose;
+	int test_no;
+} options =
+{
+	"mqtt.eclipse.org:1883",
+	"localhost:1883",
+	0,
+	0,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+				options.connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--proxy_connection") == 0)
+		{
+			if (++count < argc)
+				options.proxy_connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+			options.verbose = 1;
+		count++;
+	}
+}
+
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+		return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf),
+			format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+void MySleep(long milliseconds)
+{
+#if defined(WIN32) || defined(WIN64)
+	Sleep(milliseconds);
+#else
+	usleep(milliseconds*1000);
+#endif
+}
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec) * 1000 + (res.tv_usec) / 1000;
+}
+#endif
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+#define MAXMSGS 30;
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+void myassert(char* filename, int lineno, char* description, int value,
+		char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		MyLog(LOGA_INFO, "Assertion failed, file %s, line %d, description: %s", filename,
+				lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+	else
+		MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s",
+				filename, lineno, description);
+}
+
+
+void waitForNoPendingTokens(MQTTAsync c)
+{
+	int i = 0, rc = 0, count = 0;
+	MQTTAsync_token *tokens;
+
+	/* acks for outgoing messages could arrive after incoming exchanges are complete */
+	do
+	{
+		rc = MQTTAsync_getPendingTokens(c, &tokens);
+		assert("Good rc from getPendingTokens", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+		i = 0;
+		if (tokens)
+		{
+			while (tokens[i] != -1)
+				++i;
+			MQTTAsync_free(tokens);
+		}
+		if (i > 0)
+			MySleep(100);
+	}
+	while (i > 0 && ++count < 10);
+	assert("Number of getPendingTokens should be 0", i == 0, "i was %d ", i);
+}
+
+
+void assert3PendingTokens(MQTTAsync c)
+{
+	int i = 0, rc = 0;
+	MQTTAsync_token *tokens;
+
+	rc = MQTTAsync_getPendingTokens(c, &tokens);
+	assert("Good rc from getPendingTokens", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	i = 0;
+	if (tokens)
+	{
+		while (tokens[i] != -1)
+			++i;
+		MQTTAsync_free(tokens);
+	}
+	assert("Number of getPendingTokens should be 3", i == 3, "i was %d ", i);
+}
+
+/*********************************************************************
+
+ Tests: offline buffering - sending messages while disconnected
+
+ 1. send some messages while disconnected, check that they are sent
+ 2. repeat test 1 using serverURIs
+ 3. repeat test 1 using auto reconnect
+ 4. repeat test 2 using auto reconnect
+ 5. check max-buffered
+ 6. check auto-reconnect parms alter behaviour as expected
+
+ Tests: automatic reconnect
+
+ - check that connected() is called
+ - check that reconnect() causes reconnect attempt
+ - check that reconnect() fails if no connect has been previously attempted
+
+ *********************************************************************/
+
+
+
+
+/*********************************************************************
+
+ Test1: offline buffering - sending messages while disconnected
+
+ 1. call connect
+ 2. use proxy to disconnect the client
+ 3. while the client is disconnected, send more messages
+ 4. when the client reconnects, check that those messages are sent
+
+ *********************************************************************/
+
+int test1_will_message_received = 0;
+int test1_messages_received = 0;
+
+int test1_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen, message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test1_will_message_received = 1;
+	else
+	  test1_messages_received++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+int test1Finished = 0;
+
+int test1OnFailureCalled = 0;
+
+void test1cOnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test1OnFailureCalled++;
+	test1Finished = 1;
+}
+
+void test1dOnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test1OnFailureCalled++;
+	test1Finished = 1;
+}
+
+void test1cOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client d, context %p\n", context);
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+
+	/* send a message to the proxy to break the connection */
+	pubmsg.payload = "TERMINATE";
+	pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+	pubmsg.qos = 0;
+	pubmsg.retained = 0;
+	rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+	assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test1dReady = 0;
+char willTopic[100];
+char test_topic[50];
+
+void test1donSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c, response->alt.qos);
+	test1dReady = 1;
+}
+
+
+void test1dOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess = test1donSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test1Finished = 1;
+}
+
+int test1c_connected = 0;
+
+void test1cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test1c_connected = 1;
+}
+
+
+int test1(struct Options options)
+{
+	char* testname = "test1";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	MQTTAsync_token *tokens;
+
+	sprintf(willTopic, "paho-test9-1-%s", unique);
+	sprintf(clientidc, "paho-test9-1-c-%s", unique);
+	sprintf(clientidd, "paho-test9-1-d-%s", unique);
+	sprintf(test_topic, "paho-test9-1-test topic %s", unique);
+
+	test1Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 1 - messages while disconnected");
+	fprintf(xml, "<testcase classname=\"test1\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	rc = MQTTAsync_createWithOptions(&c, options.proxy_connection, clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+	      NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_create(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	//opts.username = "testuser";
+	//opts.password = "testpassword";
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess = test1dOnConnect;
+	opts.onFailure = test1dOnFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test1dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test1cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess = test1cOnConnect;
+	opts.onFailure = test1cOnFailure;
+	opts.context = c;
+	opts.cleansession = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for will message */
+	while (!test1_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test1c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 3; ++i)
+	{
+	  char buf[50];
+
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	  sprintf(buf, "QoS %d message", i);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = (int)strlen(pubmsg.payload) + 1;
+	  pubmsg.qos = i;
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	  assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	}
+
+ 	assert3PendingTokens(c);
+
+	rc = MQTTAsync_reconnect(c);
+ 	assert("Good rc from reconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	/* wait for client to be reconnected */
+	while (!test1c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test1_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+ 	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+ Test2: offline buffering - sending messages while disconnected
+
+ 1. call connect
+ 2. use proxy to disconnect the client
+ 3. while the client is disconnected, send more messages
+ 4. when the client reconnects, check that those messages are sent
+
+ *********************************************************************/
+
+int test2_will_message_received = 0;
+int test2_messages_received = 0;
+
+int test2_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen, message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test2_will_message_received = 1;
+	else
+	  test2_messages_received++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+int test2Finished = 0;
+
+int test2OnFailureCalled = 0;
+
+void test2cOnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test2OnFailureCalled++;
+	test2Finished = 1;
+}
+
+void test2dOnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test2OnFailureCalled++;
+	test2Finished = 1;
+}
+
+void test2cOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client d, context %p\n", context);
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+
+	/* send a message to the proxy to break the connection */
+	pubmsg.payload = "TERMINATE";
+	pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+	pubmsg.qos = 0;
+	pubmsg.retained = 0;
+	rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+	assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test2dReady = 0;
+char willTopic[100];
+char test_topic[50];
+
+void test2donSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c, response->alt.qos);
+	test2dReady = 1;
+}
+
+
+void test2dOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess = test2donSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test2Finished = 1;
+}
+
+int test2c_connected = 0;
+
+void test2cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test2c_connected = 1;
+}
+
+
+int test2(struct Options options)
+{
+	char* testname = "test2";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	MQTTAsync_token *tokens;
+	char *URIs[2] = {"rubbish", options.proxy_connection};
+
+	sprintf(willTopic, "paho-test9-2-%s", unique);
+	sprintf(clientidc, "paho-test9-2-c-%s", unique);
+	sprintf(clientidd, "paho-test9-2-d-%s", unique);
+	sprintf(test_topic, "paho-test9-2-test topic %s", unique);
+
+	test2Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 2 - messages while disconnected with serverURIs");
+	fprintf(xml, "<testcase classname=\"test2\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	rc = MQTTAsync_createWithOptions(&c, "not used", clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+	      NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_create(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test2_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess = test2dOnConnect;
+	opts.onFailure = test2dOnFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test2dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test2cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess = test2cOnConnect;
+	opts.onFailure = test2cOnFailure;
+	opts.context = c;
+	opts.cleansession = 0;
+	opts.serverURIs = URIs;
+	opts.serverURIcount = 2;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for will message */
+	while (!test2_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test2c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 3; ++i)
+	{
+	  char buf[50];
+
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	  sprintf(buf, "QoS %d message", i);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = (int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.qos = i;
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	  assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	}
+
+	assert3PendingTokens(c);
+
+	rc = MQTTAsync_reconnect(c);
+ 	assert("Good rc from reconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	/* wait for client to be reconnected */
+	while (!test2c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test2_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ test3: offline buffering - sending messages while disconnected
+
+ 1. call connect
+ 2. use proxy to disconnect the client
+ 3. while the client is disconnected, send more messages
+ 4. when the client auto reconnects, check that those messages are sent
+
+ *********************************************************************/
+
+int test3_will_message_received = 0;
+int test3_messages_received = 0;
+
+int test3_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen, message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test3_will_message_received = 1;
+	else
+	  test3_messages_received++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+int test3Finished = 0;
+
+int test3OnFailureCalled = 0;
+
+void test3cOnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test3OnFailureCalled++;
+	test3Finished = 1;
+}
+
+void test3dOnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test3OnFailureCalled++;
+	test3Finished = 1;
+}
+
+void test3cOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client d, context %p\n", context);
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+
+	/* send a message to the proxy to break the connection */
+	pubmsg.payload = "TERMINATE";
+	pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+	pubmsg.qos = 0;
+	pubmsg.retained = 0;
+	rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+	assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test3dReady = 0;
+char willTopic[100];
+char test_topic[50];
+
+void test3donSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c, response->alt.qos);
+	test3dReady = 1;
+}
+
+
+void test3dOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess = test3donSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test3Finished = 1;
+}
+
+int test3c_connected = 0;
+
+void test3cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test3c_connected = 1;
+}
+
+
+int test3(struct Options options)
+{
+	char* testname = "test3";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	MQTTAsync_token *tokens;
+
+	sprintf(willTopic, "paho-test9-3-%s", unique);
+	sprintf(clientidc, "paho-test9-3-c-%s", unique);
+	sprintf(clientidd, "paho-test9-3-d-%s", unique);
+	sprintf(test_topic, "paho-test9-3-test topic %s", unique);
+
+	test3Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 3 - messages while disconnected");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	rc = MQTTAsync_createWithOptions(&c, options.proxy_connection, clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+	      NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_create(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	//opts.username = "testuser";
+	//opts.password = "testpassword";
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test3_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess = test3dOnConnect;
+	opts.onFailure = test3dOnFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test3dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test3cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess = test3cOnConnect;
+	opts.onFailure = test3cOnFailure;
+	opts.context = c;
+	opts.cleansession = 0;
+	opts.automaticReconnect = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for will message */
+	while (!test3_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test3c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 3; ++i)
+	{
+	  char buf[50];
+
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	  sprintf(buf, "QoS %d message", i);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = (int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.qos = i;
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	  assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	}
+
+	assert3PendingTokens(c);
+
+	/* wait for client to be reconnected */
+	while (!test3c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test3_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ test4: offline buffering - sending messages while disconnected
+
+ 1. call connect
+ 2. use proxy to disconnect the client
+ 3. while the client is disconnected, send more messages
+ 4. when the client auto reconnects, check that those messages are sent
+
+ *********************************************************************/
+
+int test4_will_message_received = 0;
+int test4_messages_received = 0;
+
+int test4_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen, message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test4_will_message_received = 1;
+	else
+	  test4_messages_received++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+int test4Finished = 0;
+
+int test4OnFailureCalled = 0;
+
+void test4cOnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test4OnFailureCalled++;
+	test4Finished = 1;
+}
+
+void test4dOnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test4OnFailureCalled++;
+	test4Finished = 1;
+}
+
+void test4cOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client d, context %p\n", context);
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+
+	/* send a message to the proxy to break the connection */
+	pubmsg.payload = "TERMINATE";
+	pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+	pubmsg.qos = 0;
+	pubmsg.retained = 0;
+	rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+	assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test4dReady = 0;
+char willTopic[100];
+char test_topic[50];
+
+void test4donSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c, response->alt.qos);
+	test4dReady = 1;
+}
+
+
+void test4dOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess = test4donSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test4Finished = 1;
+}
+
+int test4c_connected = 0;
+
+void test4cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test4c_connected = 1;
+}
+
+
+int test4(struct Options options)
+{
+	char* testname = "test4";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	MQTTAsync_token *tokens;
+	char *URIs[2] = {"rubbish", options.proxy_connection};
+
+	sprintf(willTopic, "paho-test9-4-%s", unique);
+	sprintf(clientidc, "paho-test9-4-c-%s", unique);
+	sprintf(clientidd, "paho-test9-4-d-%s", unique);
+	sprintf(test_topic, "paho-test9-4-test topic %s", unique);
+
+	test4Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 4 - messages while disconnected with serverURIs");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	rc = MQTTAsync_createWithOptions(&c, "not used", clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+	      NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_create(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test4_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess = test4dOnConnect;
+	opts.onFailure = test4dOnFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test4dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test4cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess = test4cOnConnect;
+	opts.onFailure = test4cOnFailure;
+	opts.context = c;
+	opts.cleansession = 0;
+	opts.serverURIs = URIs;
+	opts.serverURIcount = 2;
+	opts.automaticReconnect = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for will message */
+	while (!test4_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test4c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 3; ++i)
+	{
+	  char buf[50];
+
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	  sprintf(buf, "QoS %d message", i);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = (int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.qos = i;
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	  assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	}
+
+	assert3PendingTokens(c);
+
+	/* wait for client to be reconnected */
+	while (!test4c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test4_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+ test5: offline buffering - check max buffered
+
+ 1. call connect
+ 2. use proxy to disconnect the client
+ 3. while the client is disconnected, send more messages
+ 4. when the client reconnects, check that those messages are sent
+
+ *********************************************************************/
+
+int test5_will_message_received = 0;
+int test5_messages_received = 0;
+int test5Finished = 0;
+int test5OnFailureCalled = 0;
+int test5c_connected = 0;
+
+int test5_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen, message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test5_will_message_received = 1;
+	else
+	  test5_messages_received++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+void test5cOnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test5OnFailureCalled++;
+	test5Finished = 1;
+}
+
+void test5dOnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test5OnFailureCalled++;
+	test5Finished = 1;
+}
+
+void test5cOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client d, context %p\n", context);
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+
+	/* send a message to the proxy to break the connection */
+	pubmsg.payload = "TERMINATE";
+	pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+	pubmsg.qos = 0;
+	pubmsg.retained = 0;
+	rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+	assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test5dReady = 0;
+char willTopic[100];
+char test_topic[50];
+
+void test5donSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c, response->alt.qos);
+	test5dReady = 1;
+}
+
+
+void test5dOnConnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess = test5donSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test5Finished = 1;
+}
+
+void test5cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test5c_connected = 1;
+}
+
+
+int test5(struct Options options)
+{
+	char* testname = "test5";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	MQTTAsync_token *tokens;
+
+	sprintf(willTopic, "paho-test9-5-%s", unique);
+	sprintf(clientidc, "paho-test9-5-c-%s", unique);
+	sprintf(clientidd, "paho-test9-5-d-%s", unique);
+	sprintf(test_topic, "paho-test9-5-test topic %s", unique);
+
+	test5Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 5 - max buffered");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	createOptions.maxBufferedMessages = 3;
+	rc = MQTTAsync_createWithOptions(&c, options.proxy_connection, clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+	      NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_create(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	//opts.username = "testuser";
+	//opts.password = "testpassword";
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test5_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess = test5dOnConnect;
+	opts.onFailure = test5dOnFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test5dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test5cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess = test5cOnConnect;
+	opts.onFailure = test5cOnFailure;
+	opts.context = c;
+	opts.cleansession = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for will message */
+	while (!test5_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test5c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 5; ++i)
+	{
+	  char buf[50];
+
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	  sprintf(buf, "QoS %d message", i);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = (int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.qos = i % 3;
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	  if (i <= 2)
+	    assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	  else
+	    assert("Bad rc from sendMessage", rc == MQTTASYNC_MAX_BUFFERED_MESSAGES, "rc was %d ", rc);
+	}
+
+	assert3PendingTokens(c);
+
+	rc = MQTTAsync_reconnect(c);
+ 	assert("Good rc from reconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	/* wait for client to be reconnected */
+	while (!test5c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test5_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+int test6(struct Options options)
+{
+	char* testname = "test6";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	MQTTAsync_token *tokens;
+
+	test5_will_message_received = 0;
+	test5_messages_received = 0;
+	test5Finished = 0;
+	test5OnFailureCalled = 0;
+	test5c_connected = 0;
+
+	sprintf(willTopic, "paho-test9-6-%s", unique);
+	sprintf(clientidc, "paho-test9-6-c-%s", unique);
+	sprintf(clientidd, "paho-test9-6-d-%s", unique);
+	sprintf(test_topic, "paho-test9-6-test topic %s", unique);
+
+	test5Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 6 - max buffered with binary will");
+	fprintf(xml, "<testcase classname=\"test6\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	createOptions.maxBufferedMessages = 3;
+	rc = MQTTAsync_createWithOptions(&c, options.proxy_connection, clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+	      NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_create(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	//opts.username = "testuser";
+	//opts.password = "testpassword";
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test5_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess = test5dOnConnect;
+	opts.onFailure = test5dOnFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test5dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test5cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->payload.data = "will message";
+	opts.will->payload.len = (int)strlen(opts.will->payload.data) + 1;
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess = test5cOnConnect;
+	opts.onFailure = test5cOnFailure;
+	opts.context = c;
+	opts.cleansession = 0;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for will message */
+	while (!test5_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test5c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 5; ++i)
+	{
+	  char buf[50];
+
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	  sprintf(buf, "QoS %d message", i);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = (int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.qos = i % 3;
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	  if (i <= 2)
+	    assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	  else
+	    assert("Bad rc from sendMessage", rc == MQTTASYNC_MAX_BUFFERED_MESSAGES, "rc was %d ", rc);
+	}
+
+	assert3PendingTokens(c);
+
+	rc = MQTTAsync_reconnect(c);
+ 	assert("Good rc from reconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	/* wait for client to be reconnected */
+	while (!test5c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test5_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test7: Fill up TCP buffer with QoS 0 messages
+
+*********************************************************************/
+int test7c_connected = 0;
+int test7_will_message_received = 0;
+int test7_messages_received = 0;
+int test7Finished = 0;
+int test7OnFailureCalled = 0;
+int test7dReady = 0;
+
+int test7_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen, message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test7_will_message_received = 1;
+	else
+	  test7_messages_received++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+void test7cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test7c_connected = 1;
+}
+
+void test7cOnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In c connect onFailure callback, context %p", context);
+
+	test7OnFailureCalled++;
+	test7Finished = 1;
+}
+
+void test7cOnConnectSuccess(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+
+	/* send a message to the proxy to break the connection */
+	pubmsg.payload = "TERMINATE";
+	pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+	pubmsg.qos = 0;
+	pubmsg.retained = 0;
+	//rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+	//assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+void test7dOnConnectFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test7OnFailureCalled++;
+	test7Finished = 1;
+}
+
+
+void test7donSubscribe(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c, response->alt.qos);
+	test7dReady = 1;
+}
+
+
+void test7dOnConnectSuccess(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess = test7donSubscribe;
+	opts.context = c;
+
+	//rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	//assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	//if (rc != MQTTASYNC_SUCCESS)
+	//	test5Finished = 1;
+	test7dReady = 1;
+}
+
+
+int test7(struct Options options)
+{
+	char* testname = "test7";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	//MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+
+	test7_will_message_received = 0;
+	test7_messages_received = 0;
+	test7Finished = 0;
+	test7OnFailureCalled = 0;
+	test7c_connected = 0;
+
+	sprintf(willTopic, "paho-test9-7-%s", unique);
+	sprintf(clientidc, "paho-test9-7-c-%s", unique);
+	sprintf(clientidd, "paho-test9-7-d-%s", unique);
+	sprintf(test_topic, "longer paho-test9-7-test topic %s", unique);
+
+	test7Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 7 - fill TCP buffer");
+	fprintf(xml, "<testcase classname=\"test7\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	rc = MQTTAsync_create(&c, options.proxy_connection, clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	rc = MQTTAsync_create(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test7_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess = test7dOnConnectSuccess;
+	opts.onFailure = test7dOnConnectFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test7dReady && ++count < 10000)
+	{
+		if (test7Finished)
+		  goto exit;
+		MySleep(100);
+	}
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test7cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->payload.data = "will message";
+	opts.will->payload.len = (int)strlen(opts.will->payload.data) + 1;
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess = test7cOnConnectSuccess;
+	opts.onFailure = test7cOnConnectFailure;
+	opts.context = c;
+	opts.cleansession = 0;
+	/*opts.automaticReconnect = 1;
+	opts.minRetryInterval = 3;
+	opts.maxRetryInterval = 6;*/
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	count = 0;
+	while (!test7c_connected && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	/* wait for will message */
+	//while (test7_will_message_received == 0 && ++count < 10000)
+	//	MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered by TCP");
+
+	test7c_connected = 0;
+	char buf[5000000];
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 50000; ++i)
+	{
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions pubopts = MQTTAsync_responseOptions_initializer;
+		pubmsg.qos = 0; /*i % 3;*/
+	  sprintf(buf, "QoS %d message", pubmsg.qos);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = 5000000; //(int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &pubopts);
+	  assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+		if (rc != 0)
+		{
+		  //MyLog(LOGA_DEBUG, "Connecting client c");
+		  //rc = MQTTAsync_connect(c, &opts);
+			//MySleep(1000);
+		  break;
+		}
+	}
+
+#if 0
+	assert3PendingTokens(c);
+
+	rc = MQTTAsync_reconnect(c);
+ 	assert("Good rc from reconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	/* wait for client to be reconnected */
+	while (!test5c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test5_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+	waitForNoPendingTokens(c);
+#endif
+
+exit:
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+void handleTrace(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	printf("%s\n", message);
+}
+
+
+int main(int argc, char** argv)
+{
+	int* numtests = &tests;
+	int rc = 0;
+	int (*tests[])() = { NULL, test1, test2, test3, test4, test5, test6 };
+	time_t randtime;
+
+	srand((unsigned) time(&randtime));
+	sprintf(unique, "%u", rand());
+	MyLog(LOGA_INFO, "Random prefix/suffix is %s", unique);
+
+	xml = fopen("TEST-test9.xml", "w");
+	fprintf(xml, "<testsuite name=\"test9\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));
+
+	MQTTAsync_setTraceCallback(handleTrace);
+	getopts(argc, argv);
+
+	if (options.test_no == 0)
+	{ /* run all the tests */
+		for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+		{
+			failures = 0;
+			MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+			rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+		}
+	}
+	else
+	{
+		MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+		rc = tests[options.test_no](options); /* run just the selected test */
+	}
+
+	MyLog(LOGA_INFO, "Total tests run: %d", *numtests);
+	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+
+	return rc;
+}
diff --git a/mqtt/src/test/test95.c b/mqtt/src/test/test95.c
new file mode 100644
index 00000000..472c2aa6
--- /dev/null
+++ b/mqtt/src/test/test95.c
@@ -0,0 +1,2266 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - correct some compile warnings
+ *    Ian Craggs - add binary will message test
+ *    Ian Craggs - MQTT V5 updates
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * Offline buffering and automatic reconnect tests for the Paho Asynchronous MQTT C client
+ *
+ */
+
+
+#include "MQTTAsync.h"
+#include <string.h>
+#include <stdlib.h>
+#include "Thread.h"
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+  #include <sys/socket.h>
+	#include <unistd.h>
+  #include <errno.h>
+#else
+  #include <windows.h>
+#endif
+
+char unique[50]; // unique suffix/prefix to add to clientid/topic etc
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;            /**< connection to system under test. */
+	char* proxy_connection;      /**< connection to proxy */
+	int verbose;
+	int test_no;
+} options =
+{
+	"mqtt.eclipse.org:1883",
+	"localhost:1883",
+	0,
+	0,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+				options.connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--proxy_connection") == 0)
+		{
+			if (++count < argc)
+				options.proxy_connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+			options.verbose = 1;
+		count++;
+	}
+}
+
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+		return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf),
+			format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+void MySleep(long milliseconds)
+{
+#if defined(WIN32) || defined(WIN64)
+	Sleep(milliseconds);
+#else
+	usleep(milliseconds*1000);
+#endif
+}
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec) * 1000 + (res.tv_usec) / 1000;
+}
+#endif
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+#define MAXMSGS 30;
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+void myassert(char* filename, int lineno, char* description, int value,
+		char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		MyLog(LOGA_INFO, "Assertion failed, file %s, line %d, description: %s", filename,
+				lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+	else
+		MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s",
+				filename, lineno, description);
+}
+
+
+void logProperties(MQTTProperties *props)
+{
+	int i = 0;
+
+	for (i = 0; i < props->count; ++i)
+	{
+		int id = props->array[i].identifier;
+		const char* name = MQTTPropertyName(id);
+		char* intformat = "Property name %s value %d";
+
+		switch (MQTTProperty_getType(id))
+		{
+		case MQTTPROPERTY_TYPE_BYTE:
+		  MyLog(LOGA_DEBUG, intformat, name, props->array[i].value.byte);
+		  break;
+		case MQTTPROPERTY_TYPE_TWO_BYTE_INTEGER:
+		  MyLog(LOGA_DEBUG, intformat, name, props->array[i].value.integer2);
+		  break;
+		case MQTTPROPERTY_TYPE_FOUR_BYTE_INTEGER:
+		  MyLog(LOGA_DEBUG, intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_VARIABLE_BYTE_INTEGER:
+		  MyLog(LOGA_DEBUG, intformat, name, props->array[i].value.integer4);
+		  break;
+		case MQTTPROPERTY_TYPE_BINARY_DATA:
+		case MQTTPROPERTY_TYPE_UTF_8_ENCODED_STRING:
+		  MyLog(LOGA_DEBUG, "Property name %s value len %.*s", name,
+				  props->array[i].value.data.len, props->array[i].value.data.data);
+		  break;
+		case MQTTPROPERTY_TYPE_UTF_8_STRING_PAIR:
+		  MyLog(LOGA_DEBUG, "Property name %s key %.*s value %.*s", name,
+			  props->array[i].value.data.len, props->array[i].value.data.data,
+		  	  props->array[i].value.value.len, props->array[i].value.value.data);
+		  break;
+		}
+	}
+}
+
+
+void waitForNoPendingTokens(MQTTAsync c)
+{
+	int i = 0, rc = 0, count = 0;
+	MQTTAsync_token *tokens;
+
+	/* acks for outgoing messages could arrive after incoming exchanges are complete */
+	do
+	{
+		rc = MQTTAsync_getPendingTokens(c, &tokens);
+		assert("Good rc from getPendingTokens", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+		i = 0;
+		if (tokens)
+		{
+			while (tokens[i] != -1)
+				++i;
+			MQTTAsync_free(tokens);
+		}
+		if (i > 0)
+			MySleep(100);
+	}
+	while (i > 0 && ++count < 10);
+	assert("Number of getPendingTokens should be 0", i == 0, "i was %d ", i);
+}
+
+
+void assert3PendingTokens(MQTTAsync c)
+{
+	int i = 0, rc = 0;
+	MQTTAsync_token *tokens;
+
+	rc = MQTTAsync_getPendingTokens(c, &tokens);
+	assert("Good rc from getPendingTokens", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	i = 0;
+	if (tokens)
+	{
+		while (tokens[i] != -1)
+			++i;
+		MQTTAsync_free(tokens);
+	}
+	assert("Number of getPendingTokens should be 3", i == 3, "i was %d ", i);
+}
+
+
+/*********************************************************************
+
+ Tests: offline buffering - sending messages while disconnected
+
+ 1. send some messages while disconnected, check that they are sent
+ 2. repeat test 1 using serverURIs
+ 3. repeat test 1 using auto reconnect
+ 4. repeat test 2 using auto reconnect
+ 5. check max-buffered
+ 6. check auto-reconnect parms alter behaviour as expected
+
+ Tests: automatic reconnect
+
+ - check that connected() is called
+ - check that reconnect() causes reconnect attempt
+ - check that reconnect() fails if no connect has been previously attempted
+
+ *********************************************************************/
+
+
+
+
+/*********************************************************************
+
+ Test1: offline buffering - sending messages while disconnected
+
+ 1. call connect
+ 2. use proxy to disconnect the client
+ 3. while the client is disconnected, send more messages
+ 4. when the client reconnects, check that those messages are sent
+
+ *********************************************************************/
+
+int test1_will_message_received = 0;
+int test1_messages_received = 0;
+
+int test1_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+	static int first = 1;
+
+	if (first == 1)
+	{
+		first = 0;
+		return 0; /* to force queue persistence */
+	}
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen, message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test1_will_message_received = 1;
+	else
+	  test1_messages_received++;
+
+	if (message->struct_version == 1)
+	{
+		assert("Properties count should be > 0", message->properties.count > 0,
+			"Properties count was %d\n", message->properties.count);
+		logProperties(&message->properties);
+	}
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+int test1Finished = 0;
+
+int test1OnFailureCalled = 0;
+
+void test1cOnFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test1OnFailureCalled++;
+	test1Finished = 1;
+}
+
+void test1dOnFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test1OnFailureCalled++;
+	test1Finished = 1;
+}
+
+void test1cOnConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client d, context %p\n", context);
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+	static int done = 0;
+
+	if (done == 0)
+	{
+		/* send a message to the proxy to break the connection */
+		pubmsg.payload = "TERMINATE";
+		pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+		pubmsg.qos = 0;
+		pubmsg.retained = 0;
+		rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+		assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+		done = 1; /* only do this once */
+	}
+}
+
+
+int test1dReady = 0;
+char willTopic[100];
+char test_topic[50];
+
+void test1donSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c,
+			response->reasonCode);
+	test1dReady = 1;
+}
+
+
+void test1dOnConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess5 = test1donSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test1Finished = 1;
+}
+
+int test1c_connected = 0;
+
+void test1cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test1c_connected = 1;
+}
+
+
+int test1(struct Options options)
+{
+	char* testname = "test1";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperties willProps = MQTTProperties_initializer;
+	MQTTProperty property;
+
+	sprintf(willTopic, "paho-test95-1-%s", unique);
+	sprintf(clientidc, "paho-test95-1-c-%s", unique);
+	sprintf(clientidd, "paho-test95-1-d-%s", unique);
+	sprintf(test_topic, "paho-test95-1-test topic %s", unique);
+
+	test1Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 1 - messages while disconnected");
+	fprintf(xml, "<testcase classname=\"test1\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.proxy_connection, clientidc,
+		MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	createOptions.sendWhileDisconnected = 0;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&d, options.connection, clientidd,
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test1_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess5 = test1dOnConnect;
+	opts.onFailure5 = test1dOnFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test1dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test1cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+
+	property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+	property.value.data.data = "test user property";
+	property.value.data.len = (int)strlen(property.value.data.data);
+	property.value.value.data = "test user property value";
+	property.value.value.len = (int)strlen(property.value.value.data);
+	MQTTProperties_add(&willProps, &property);
+	opts.willProperties = &willProps;
+
+	opts.onSuccess5 = test1cOnConnect;
+	opts.onFailure5 = test1cOnFailure;
+	opts.context = c;
+
+	opts.cleanstart = 0;
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&props, &property);
+
+	opts.connectProperties = &props;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	MQTTProperties_free(&props);
+	MQTTProperties_free(&willProps);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for will message */
+	while (!test1_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test1c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 3; ++i)
+	{
+		char buf[50];
+		MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+		MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+		MQTTProperty property;
+		MQTTProperties props = MQTTProperties_initializer;
+
+		sprintf(buf, "QoS %d message", i);
+		pubmsg.payload = buf;
+		pubmsg.payloadlen = (int)strlen(pubmsg.payload) + 1;
+		pubmsg.qos = i;
+		pubmsg.retained = 0;
+	 	MyLog(LOGA_DEBUG, "Sending qos %d message", pubmsg.qos);
+
+		property.identifier = MQTTPROPERTY_CODE_USER_PROPERTY;
+		property.value.data.data = "test user property";
+		property.value.data.len = (int)strlen(property.value.data.data);
+		property.value.value.data = "test user property value";
+		property.value.value.len = (int)strlen(property.value.value.data);
+		MQTTProperties_add(&props, &property);
+		pubmsg.properties = props;
+		rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+		assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+		MQTTProperties_free(&props);
+		MyLog(LOGA_DEBUG, "Sent qos %d message, token %d", pubmsg.qos, opts.token);
+	}
+
+ 	assert3PendingTokens(c);
+
+ 	/* destroy and recreate to read from persistence */
+ 	MyLog(LOGA_DEBUG, "Destroy and recreate client c");
+ 	MQTTAsync_destroy(&c);
+
+	createOptions.sendWhileDisconnected = 1;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.proxy_connection, clientidc,
+		MQTTCLIENT_PERSISTENCE_DEFAULT, NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	assert3PendingTokens(c);
+
+	rc = MQTTAsync_setConnected(c, c, test1cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	opts.will = &wopts;
+	opts.onSuccess5 = test1cOnConnect;
+	opts.onFailure5 = test1cOnFailure;
+	opts.context = c;
+	opts.cleanstart = 0;
+	MyLog(LOGA_DEBUG, "Reconnecting client c");
+	test1c_connected = 0;
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	MQTTProperties_free(&props);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for client to be reconnected */
+	while (!test1c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for messages to be received */
+	while (test1_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+ Test2: offline buffering - sending messages while disconnected
+
+ 1. call connect
+ 2. use proxy to disconnect the client
+ 3. while the client is disconnected, send more messages
+ 4. when the client reconnects, check that those messages are sent
+
+ *********************************************************************/
+
+int test2_will_message_received = 0;
+int test2_messages_received = 0;
+
+int test2_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen, message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test2_will_message_received = 1;
+	else
+	  test2_messages_received++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+int test2Finished = 0;
+
+int test2OnFailureCalled = 0;
+
+void test2cOnFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test2OnFailureCalled++;
+	test2Finished = 1;
+}
+
+void test2dOnFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test2OnFailureCalled++;
+	test2Finished = 1;
+}
+
+void test2cOnConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client d, context %p\n", context);
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+
+	/* send a message to the proxy to break the connection */
+	pubmsg.payload = "TERMINATE";
+	pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+	pubmsg.qos = 0;
+	pubmsg.retained = 0;
+	rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+	assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test2dReady = 0;
+char willTopic[100];
+char test_topic[50];
+
+void test2donSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c,
+			response->reasonCode);
+	test2dReady = 1;
+}
+
+
+void test2dOnConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess5 = test2donSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test2Finished = 1;
+}
+
+int test2c_connected = 0;
+
+void test2cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test2c_connected = 1;
+}
+
+
+int test2(struct Options options)
+{
+	char* testname = "test2";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	char *URIs[2] = {"rubbish", options.proxy_connection};
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperty property;
+
+	sprintf(willTopic, "paho-test95-2-%s", unique);
+	sprintf(clientidc, "paho-test95-2-c-%s", unique);
+	sprintf(clientidd, "paho-test95-2-d-%s", unique);
+	sprintf(test_topic, "paho-test95-2-test topic %s", unique);
+
+	test2Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 2 - messages while disconnected with serverURIs");
+	fprintf(xml, "<testcase classname=\"test2\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, "not used", clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+	      NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	createOptions.sendWhileDisconnected = 0;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = MQTTVERSION_5;
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test2_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess5 = test2dOnConnect;
+	opts.onFailure5 = test2dOnFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test2dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test2cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess5 = test2cOnConnect;
+	opts.onFailure5 = test2cOnFailure;
+	opts.context = c;
+	opts.MQTTVersion = MQTTVERSION_5;
+	opts.cleanstart = 0;
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&props, &property);
+	opts.connectProperties = &props;
+	opts.serverURIs = URIs;
+	opts.serverURIcount = 2;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+	MQTTProperties_free(&props);
+
+	/* wait for will message */
+	while (!test2_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test2c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 3; ++i)
+	{
+	  char buf[50];
+
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	  sprintf(buf, "QoS %d message", i);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = (int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.qos = i;
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	  assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	}
+
+	assert3PendingTokens(c);
+
+	rc = MQTTAsync_reconnect(c);
+ 	assert("Good rc from reconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	/* wait for client to be reconnected */
+	while (!test2c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test2_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+ 	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ test3: offline buffering - sending messages while disconnected
+
+ 1. call connect
+ 2. use proxy to disconnect the client
+ 3. while the client is disconnected, send more messages
+ 4. when the client auto reconnects, check that those messages are sent
+
+ *********************************************************************/
+
+int test3_will_message_received = 0;
+int test3_messages_received = 0;
+
+int test3_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen, message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test3_will_message_received = 1;
+	else
+	  test3_messages_received++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+int test3Finished = 0;
+
+int test3OnFailureCalled = 0;
+
+void test3cOnFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test3OnFailureCalled++;
+	test3Finished = 1;
+}
+
+void test3dOnFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test3OnFailureCalled++;
+	test3Finished = 1;
+}
+
+void test3cOnConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client d, context %p\n", context);
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+
+	/* send a message to the proxy to break the connection */
+	pubmsg.payload = "TERMINATE";
+	pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+	pubmsg.qos = 0;
+	pubmsg.retained = 0;
+	rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+	assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test3dReady = 0;
+char willTopic[100];
+char test_topic[50];
+
+void test3donSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c,
+			response->reasonCode);
+	test3dReady = 1;
+}
+
+
+void test3dOnConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess5 = test3donSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test3Finished = 1;
+}
+
+int test3c_connected = 0;
+
+void test3cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test3c_connected = 1;
+}
+
+
+int test3(struct Options options)
+{
+	char* testname = "test3";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperty property;
+
+	sprintf(willTopic, "paho-test95-3-%s", unique);
+	sprintf(clientidc, "paho-test95-3-c-%s", unique);
+	sprintf(clientidd, "paho-test95-3-d-%s", unique);
+	sprintf(test_topic, "paho-test95-3-test topic %s", unique);
+
+	test3Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 3 - messages while disconnected");
+	fprintf(xml, "<testcase classname=\"test3\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.proxy_connection, clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+	      NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	createOptions.sendWhileDisconnected = 0;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = MQTTVERSION_5;
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test3_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess5 = test3dOnConnect;
+	opts.onFailure5 = test3dOnFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test3dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test3cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess5 = test3cOnConnect;
+	opts.onFailure5 = test3cOnFailure;
+	opts.context = c;
+	opts.cleanstart = 0;
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&props, &property);
+	opts.connectProperties = &props;
+	opts.MQTTVersion = MQTTVERSION_5;
+	opts.automaticReconnect = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	MQTTProperties_free(&props);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for will message */
+	while (!test3_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test3c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 3; ++i)
+	{
+	  char buf[50];
+
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	  sprintf(buf, "QoS %d message", i);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = (int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.qos = i;
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	  assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	}
+
+	assert3PendingTokens(c);
+
+	/* wait for client to be reconnected */
+	while (!test3c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test3_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+ 	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+/*********************************************************************
+
+ test4: offline buffering - sending messages while disconnected
+
+ 1. call connect
+ 2. use proxy to disconnect the client
+ 3. while the client is disconnected, send more messages
+ 4. when the client auto reconnects, check that those messages are sent
+
+ *********************************************************************/
+
+int test4_will_message_received = 0;
+int test4_messages_received = 0;
+
+int test4_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen,
+			message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test4_will_message_received = 1;
+	else
+	  test4_messages_received++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+int test4Finished = 0;
+
+int test4OnFailureCalled = 0;
+
+void test4cOnFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test4OnFailureCalled++;
+	test4Finished = 1;
+}
+
+void test4dOnFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test4OnFailureCalled++;
+	test4Finished = 1;
+}
+
+void test4cOnConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client d, context %p\n", context);
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+
+	/* send a message to the proxy to break the connection */
+	pubmsg.payload = "TERMINATE";
+	pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+	pubmsg.qos = 0;
+	pubmsg.retained = 0;
+	rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+	assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test4dReady = 0;
+char willTopic[100];
+char test_topic[50];
+
+void test4donSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c,
+			response->reasonCode);
+	test4dReady = 1;
+}
+
+
+void test4dOnConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess5 = test4donSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test4Finished = 1;
+}
+
+int test4c_connected = 0;
+
+void test4cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test4c_connected = 1;
+}
+
+
+int test4(struct Options options)
+{
+	char* testname = "test4";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	char *URIs[2] = {"rubbish", options.proxy_connection};
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperty property;
+
+	sprintf(willTopic, "paho-test95-4-%s", unique);
+	sprintf(clientidc, "paho-test95-4-c-%s", unique);
+	sprintf(clientidd, "paho-test95-4-d-%s", unique);
+	sprintf(test_topic, "paho-test95-4-test topic %s", unique);
+
+	test4Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 4 - messages while disconnected with serverURIs");
+	fprintf(xml, "<testcase classname=\"test4\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, "not used", clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+	      NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	createOptions.sendWhileDisconnected = 0;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test4_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess5 = test4dOnConnect;
+	opts.onFailure5 = test4dOnFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test4dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test4cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess5 = test4cOnConnect;
+	opts.onFailure5 = test4cOnFailure;
+	opts.context = c;
+	opts.cleanstart = 0;
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&props, &property);
+	opts.connectProperties = &props;
+	opts.serverURIs = URIs;
+	opts.serverURIcount = 2;
+	opts.automaticReconnect = 1;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	MQTTProperties_free(&props);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for will message */
+	while (!test4_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test4c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 3; ++i)
+	{
+	  char buf[50];
+
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	  sprintf(buf, "QoS %d message", i);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = (int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.qos = i;
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	  assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	}
+
+	assert3PendingTokens(c);
+
+	/* wait for client to be reconnected */
+	while (!test4c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test4_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+ 	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+ test5: offline buffering - check max buffered
+
+ 1. call connect
+ 2. use proxy to disconnect the client
+ 3. while the client is disconnected, send more messages
+ 4. when the client reconnects, check that those messages are sent
+
+ *********************************************************************/
+
+int test5_will_message_received = 0;
+int test5_messages_received = 0;
+int test5Finished = 0;
+int test5OnFailureCalled = 0;
+int test5c_connected = 0;
+
+int test5_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen, message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test5_will_message_received = 1;
+	else
+	  test5_messages_received++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+void test5cOnFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test5OnFailureCalled++;
+	test5Finished = 1;
+}
+
+void test5dOnFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test5OnFailureCalled++;
+	test5Finished = 1;
+}
+
+void test5cOnConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client d, context %p\n", context);
+	MQTTAsync c = (MQTTAsync)context;
+	int rc;
+
+	/* send a message to the proxy to break the connection */
+	pubmsg.payload = "TERMINATE";
+	pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+	pubmsg.qos = 0;
+	pubmsg.retained = 0;
+	rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+	assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+int test5dReady = 0;
+char willTopic[100];
+char test_topic[50];
+
+void test5donSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c,
+			response->reasonCode);
+	test5dReady = 1;
+}
+
+
+void test5dOnConnect(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess5 = test5donSubscribe;
+	opts.context = c;
+
+	rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test5Finished = 1;
+}
+
+void test5cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test5c_connected = 1;
+}
+
+
+int test5(struct Options options)
+{
+	char* testname = "test5";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperty property;
+
+	sprintf(willTopic, "paho-test95-5-%s", unique);
+	sprintf(clientidc, "paho-test95-5-c-%s", unique);
+	sprintf(clientidd, "paho-test95-5-d-%s", unique);
+	sprintf(test_topic, "paho-test95-5-test topic %s", unique);
+
+	test5Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 5 - max buffered");
+	fprintf(xml, "<testcase classname=\"test5\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	createOptions.maxBufferedMessages = 3;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.proxy_connection, clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+	      NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	createOptions.sendWhileDisconnected = 0;
+	createOptions.maxBufferedMessages = 0;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test5_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess5 = test5dOnConnect;
+	opts.onFailure5 = test5dOnFailure;
+	opts.MQTTVersion = MQTTVERSION_5;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test5dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test5cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess5 = test5cOnConnect;
+	opts.onFailure5 = test5cOnFailure;
+	opts.context = c;
+	opts.cleanstart = 0;
+	opts.MQTTVersion = MQTTVERSION_5;
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&props, &property);
+	opts.connectProperties = &props;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	MQTTProperties_free(&props);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for will message */
+	while (!test5_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test5c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 5; ++i)
+	{
+	  char buf[50];
+
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	  sprintf(buf, "QoS %d message", i);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = (int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.qos = i % 3;
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	  if (i <= 2)
+	    assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	  else
+	    assert("Bad rc from sendMessage", rc == MQTTASYNC_MAX_BUFFERED_MESSAGES, "rc was %d ", rc);
+	}
+
+	assert3PendingTokens(c);
+
+	rc = MQTTAsync_reconnect(c);
+ 	assert("Good rc from reconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	/* wait for client to be reconnected */
+	while (!test5c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test5_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+ 	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+int test6(struct Options options)
+{
+	char* testname = "test6";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOptions = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+	MQTTProperties props = MQTTProperties_initializer;
+	MQTTProperty property;
+
+	test5_will_message_received = 0;
+	test5_messages_received = 0;
+	test5Finished = 0;
+	test5OnFailureCalled = 0;
+	test5c_connected = 0;
+
+	sprintf(willTopic, "paho-test95-6-%s", unique);
+	sprintf(clientidc, "paho-test95-6-c-%s", unique);
+	sprintf(clientidd, "paho-test95-6-d-%s", unique);
+	sprintf(test_topic, "paho-test95-6-test topic %s", unique);
+
+	test5Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 6 - max buffered with binary will");
+	fprintf(xml, "<testcase classname=\"test6\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOptions.sendWhileDisconnected = 1;
+	createOptions.maxBufferedMessages = 3;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.proxy_connection, clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+	      NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	createOptions.sendWhileDisconnected = 0;
+	createOptions.maxBufferedMessages = 0;
+	createOptions.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOptions);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleanstart = 1;
+	opts.MQTTVersion = MQTTVERSION_5;
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test5_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess5 = test5dOnConnect;
+	opts.onFailure5 = test5dOnFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test5dReady && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test5cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->payload.data = "will message";
+	opts.will->payload.len = (int)strlen(opts.will->payload.data) + 1;
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess5 = test5cOnConnect;
+	opts.onFailure5 = test5cOnFailure;
+	opts.context = c;
+	opts.cleanstart = 0;
+	opts.MQTTVersion = MQTTVERSION_5;
+	property.identifier = MQTTPROPERTY_CODE_SESSION_EXPIRY_INTERVAL;
+	property.value.integer4 = 30;
+	MQTTProperties_add(&props, &property);
+	opts.connectProperties = &props;
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	MQTTProperties_free(&props);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait for will message */
+	while (!test5_will_message_received && ++count < 10000)
+		MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered");
+
+	test5c_connected = 0;
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 5; ++i)
+	{
+	  char buf[50];
+
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	  sprintf(buf, "QoS %d message", i);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = (int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.qos = i % 3;
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &opts);
+	  if (i <= 2)
+	    assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	  else
+	    assert("Bad rc from sendMessage", rc == MQTTASYNC_MAX_BUFFERED_MESSAGES, "rc was %d ", rc);
+	}
+
+	assert3PendingTokens(c);
+
+	rc = MQTTAsync_reconnect(c);
+ 	assert("Good rc from reconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	/* wait for client to be reconnected */
+	while (!test5c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test5_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+ 	waitForNoPendingTokens(c);
+
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+exit:
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test7: Fill up TCP buffer with QoS 0 messages
+
+*********************************************************************/
+int test7c_connected = 0;
+int test7_will_message_received = 0;
+int test7_messages_received = 0;
+int test7Finished = 0;
+int test7OnFailureCalled = 0;
+int test7dReady = 0;
+
+int test7_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	static int message_count = 0;
+
+	MyLog(LOGA_DEBUG, "Message received on topic %s, \"%.*s\"", topicName, message->payloadlen, message->payload);
+
+	if (memcmp(message->payload, "will message", message->payloadlen) == 0)
+	  test7_will_message_received = 1;
+	else
+	  test7_messages_received++;
+
+	MQTTAsync_freeMessage(&message);
+	MQTTAsync_free(topicName);
+
+	return 1;
+}
+
+void test7cConnected(void* context, char* cause)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In connected callback for client c, context %p\n", context);
+	test7c_connected = 1;
+}
+
+void test7cOnConnectFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In c connect onFailure callback, context %p", context);
+
+	test7OnFailureCalled++;
+	test7Finished = 1;
+}
+
+void test7cOnConnectSuccess(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+
+	/* send a message to the proxy to break the connection */
+	pubmsg.payload = "TERMINATE";
+	pubmsg.payloadlen = (int)strlen(pubmsg.payload);
+	pubmsg.qos = 0;
+	pubmsg.retained = 0;
+	//rc = MQTTAsync_sendMessage(c, "MQTTSAS topic", &pubmsg, NULL);
+	//assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+void test7dOnConnectFailure(void* context, MQTTAsync_failureData5* response)
+{
+	MyLog(LOGA_DEBUG, "In connect onFailure callback, context %p", context);
+
+	test7OnFailureCalled++;
+	test7Finished = 1;
+}
+
+
+void test7donSubscribe(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback for client d, %p granted qos %d", c,
+			response->reasonCode);
+	test7dReady = 1;
+}
+
+
+void test7dOnConnectSuccess(void* context, MQTTAsync_successData5* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int qoss[2] = {2, 2};
+	char* topics[2] = {willTopic, test_topic};
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback for client c, context %p\n", context);
+	opts.onSuccess5 = test7donSubscribe;
+	opts.context = c;
+
+	//rc = MQTTAsync_subscribeMany(c, 2, topics, qoss, &opts);
+	//assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	//if (rc != MQTTASYNC_SUCCESS)
+	//	test5Finished = 1;
+	test7dReady = 1;
+}
+
+
+int test7(struct Options options)
+{
+	char* testname = "test7";
+	int subsqos = 2;
+	MQTTAsync c, d;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer5;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	MQTTAsync_createOptions createOpts = MQTTAsync_createOptions_initializer;
+	int rc = 0;
+	int count = 0;
+	char clientidc[50];
+	char clientidd[50];
+	int i = 0;
+
+	test7_will_message_received = 0;
+	test7_messages_received = 0;
+	test7Finished = 0;
+	test7OnFailureCalled = 0;
+	test7c_connected = 0;
+
+	sprintf(willTopic, "paho-test95-7-%s", unique);
+	sprintf(clientidc, "paho-test9-7-c-%s", unique);
+	sprintf(clientidd, "paho-test9-7-d-%s", unique);
+	sprintf(test_topic, "longer paho-test9-7-test topic %s", unique);
+
+	test7Finished = 0;
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting Offline buffering 7 - fill TCP buffer");
+	fprintf(xml, "<testcase classname=\"test7\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&c, options.proxy_connection, clientidc, MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOpts);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	createOpts.MQTTVersion = MQTTVERSION_5;
+	rc = MQTTAsync_createWithOptions(&d, options.connection, clientidd, MQTTCLIENT_PERSISTENCE_DEFAULT,
+			NULL, &createOpts);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+
+	rc = MQTTAsync_setCallbacks(d, d, NULL, test7_messageArrived, NULL);
+	assert("Good rc from setCallbacks", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	opts.will = NULL; /* don't need will for this client, as it's going to be connected all the time */
+	opts.context = d;
+	opts.onSuccess5 = test7dOnConnectSuccess;
+	opts.onFailure5 = test7dOnConnectFailure;
+	MyLog(LOGA_DEBUG, "Connecting client d");
+	rc = MQTTAsync_connect(d, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	/* wait until d is ready: connected and subscribed */
+	count = 0;
+	while (!test7dReady && ++count < 10000)
+	{
+		if (test7Finished)
+		  goto exit;
+		MySleep(100);
+	}
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	rc = MQTTAsync_setConnected(c, c, test7cConnected);
+	assert("Good rc from setConnectedCallback", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+
+	/* let client c go: connect, and send disconnect command to proxy */
+	opts.will = &wopts;
+	opts.will->payload.data = "will message";
+	opts.will->payload.len = (int)strlen(opts.will->payload.data) + 1;
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = willTopic;
+	opts.onSuccess5 = test7cOnConnectSuccess;
+	opts.onFailure5 = test7cOnConnectFailure;
+	opts.context = c;
+	opts.cleansession = 0;
+	/*opts.automaticReconnect = 1;
+	opts.minRetryInterval = 3;
+	opts.maxRetryInterval = 6;*/
+
+	MyLog(LOGA_DEBUG, "Connecting client c");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		failures++;
+		goto exit;
+	}
+
+	count = 0;
+	while (!test7c_connected && ++count < 10000)
+		MySleep(100);
+	assert("Count should be less than 10000", count < 10000, "count was %d", count); /* wrong */
+
+	/* wait for will message */
+	//while (test7_will_message_received == 0 && ++count < 10000)
+	//	MySleep(100);
+
+	MyLog(LOGA_DEBUG, "Now we can send some messages to be buffered by TCP");
+
+	test7c_connected = 0;
+	char buf[5000000];
+	/* send some messages.  Then reconnect (check connected callback), and check that those messages are received */
+	for (i = 0; i < 50000; ++i)
+	{
+	  MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	  MQTTAsync_responseOptions pubopts = MQTTAsync_responseOptions_initializer;
+		pubmsg.qos = 0; /*i % 3;*/
+	  sprintf(buf, "QoS %d message", pubmsg.qos);
+	  pubmsg.payload = buf;
+	  pubmsg.payloadlen = 5000000; //(int)(strlen(pubmsg.payload) + 1);
+	  pubmsg.retained = 0;
+	  rc = MQTTAsync_sendMessage(c, test_topic, &pubmsg, &pubopts);
+	  assert("Good rc from sendMessage", rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+		if (rc != 0)
+		{
+		  //MyLog(LOGA_DEBUG, "Connecting client c");
+		  //rc = MQTTAsync_connect(c, &opts);
+			//MySleep(1000);
+		  break;
+		}
+	}
+
+#if 0
+	assert3PendingTokens(c);
+
+	rc = MQTTAsync_reconnect(c);
+ 	assert("Good rc from reconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	/* wait for client to be reconnected */
+	while (!test5c_connected && ++count < 10000)
+		MySleep(100);
+
+	/* wait for success or failure callback */
+	while (test5_messages_received < 3 && ++count < 10000)
+		MySleep(100);
+
+ 	waitForNoPendingTokens(c);
+#endif
+
+exit:
+	rc = MQTTAsync_disconnect(c, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	rc = MQTTAsync_disconnect(d, NULL);
+ 	assert("Good rc from disconnect", rc == MQTTASYNC_SUCCESS, "rc was %d ", rc);
+
+	MySleep(200);
+	MQTTAsync_destroy(&c);
+	MQTTAsync_destroy(&d);
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+void handleTrace(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	printf("%s\n", message);
+}
+
+
+int main(int argc, char** argv)
+{
+	int* numtests = &tests;
+	int rc = 0;
+	int (*tests[])() = { NULL, test1, test2, test3, test4, test5, test6 };
+	time_t randtime;
+
+	srand((unsigned) time(&randtime));
+	sprintf(unique, "%u", rand());
+	MyLog(LOGA_INFO, "Random prefix/suffix is %s", unique);
+
+	xml = fopen("TEST-test9.xml", "w");
+	fprintf(xml, "<testsuite name=\"test9\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));
+
+	MQTTAsync_setTraceCallback(handleTrace);
+	getopts(argc, argv);
+
+	if (options.test_no == 0)
+	{ /* run all the tests */
+		for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+		{
+			failures = 0;
+			MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+			rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+		}
+	}
+	else
+	{
+		MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+		rc = tests[options.test_no](options); /* run just the selected test */
+	}
+
+	MyLog(LOGA_INFO, "Total tests run: %d", *numtests);
+	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+
+	return rc;
+}
diff --git a/mqtt/src/test/test_issue373.c b/mqtt/src/test/test_issue373.c
new file mode 100644
index 00000000..87f80e0b
--- /dev/null
+++ b/mqtt/src/test/test_issue373.c
@@ -0,0 +1,423 @@
+/*******************************************************************************
+ * Copyright (c) 2012, 2017 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *******************************************************************************/
+
+/**
+ * @file
+ * Test for issues 373, 385: Memory leak and segmentation fault during connection lost and reconnect
+ *
+ */
+
+#include "MQTTAsync.h"
+#include <string.h>
+#include <stdlib.h>
+#include "Thread.h"
+
+#if !defined(_WINDOWS)
+#include <sys/time.h>
+#include <sys/socket.h>
+#include <unistd.h>
+#include <errno.h>
+#else
+#include <windows.h>
+#endif
+#include "Heap.h" // for Heap_get_info
+// undefine macros from Heap.h:
+#undef malloc
+#undef realloc
+#undef free
+
+char unique[50]; // unique suffix/prefix to add to clientid/topic etc
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;            /**< connection to system under test. */
+	char* proxy_connection;      /**< connection to proxy */
+	int verbose;
+	int test_no;
+	unsigned int QoS;
+	unsigned int iterrations;
+} options =
+{
+	"localhost:1883",
+	"localhost:1884",
+	0,
+	0,
+	0,
+	5
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+				options.connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--proxy_connection") == 0)
+		{
+			if (++count < argc)
+				options.proxy_connection = argv[count];
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+			options.verbose = 1;
+		count++;
+	}
+}
+
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+		return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf),
+		  format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+void MySleep(long milliseconds)
+{
+#if defined(WIN32) || defined(WIN64)
+	Sleep(milliseconds);
+#else
+	usleep(milliseconds*1000);
+#endif
+}
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+
+int tests = 0;
+int failures = 0;
+int connected = 0;
+int pendingMessageCnt = 0; /* counter of messages which are currently queued for publish */
+int pendingMessageCntMax = 0;
+int failedPublishCnt = 0;
+int goodPublishCnt = 0;
+int connectCnt = 0;
+int connecting = 0;
+
+void myassert(char* filename, int lineno, char* description, int value,
+		char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		MyLog(LOGA_INFO, "Assertion failed, file %s, line %d, description: %s", filename,
+				lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+	}
+	else
+		MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s",
+				filename, lineno, description);
+}
+
+
+void test1373OnFailure(void* context, MQTTAsync_failureData* response)
+{
+	MyLog(LOGA_INFO, "In connect onFailure callback, context %p", context);
+	connecting = 0;
+}
+
+void test373OnConnect(void* context, MQTTAsync_successData* response)
+{
+	connected = 1;
+	connecting = 0;
+	connectCnt++;
+	MyLog(LOGA_INFO, "Established MQTT connection to %s",response->alt.connect.serverURI);
+	char MqttVersion[40];
+	switch (response->alt.connect.MQTTVersion)
+	{
+	case MQTTVERSION_3_1:
+		sprintf(MqttVersion," MQTT version 3.1");
+		break;
+	case MQTTVERSION_3_1_1:
+		sprintf(MqttVersion, " MQTT version 3.1.1");
+		break;
+	default:
+		sprintf(MqttVersion, " MQTT version %d",response->alt.connect.MQTTVersion);
+	}
+	MyLog(LOGA_INFO, " %s\n",MqttVersion);
+	MyLog(LOGA_INFO, "connectCnt %d\n",connectCnt);
+}
+
+void test373ConnectionLost(void* context, char* cause)
+{
+	connected = 0;
+	MyLog(LOGA_INFO, "Disconnected from MQTT broker reason %s",cause);
+}
+
+void test373DeliveryComplete(void* context, MQTTAsync_token token)
+{
+}
+
+void test373_onWriteSuccess(void* context, MQTTAsync_successData* response)
+{
+	pendingMessageCnt--;
+	goodPublishCnt++;
+}
+
+void test373_onWriteFailure(void* context, MQTTAsync_failureData* response)
+{
+	pendingMessageCnt--;
+	failedPublishCnt++;
+}
+
+int test373_messageArrived(void* context, char* topicName, int topicLen, MQTTAsync_message* message)
+{
+	return 0;
+}
+
+static char test373Payload[] = "No one is interested in this payload";
+
+int test373SendPublishMessage(MQTTAsync handle,int id, const unsigned int QoS)
+{
+	int rc = 0;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	MQTTAsync_message pubmsg = MQTTAsync_message_initializer;
+	char topic[ sizeof(unique) + 40];
+
+	sprintf(topic,"%s/test373/item_%03d",unique,id);
+	opts.onFailure = test373_onWriteFailure;
+	opts.onSuccess = test373_onWriteSuccess;
+
+	pubmsg.payload = test373Payload;
+	pubmsg.payloadlen = sizeof(test373Payload);
+	pubmsg.qos = QoS;
+	rc = MQTTAsync_sendMessage( handle, topic,&pubmsg,&opts);
+	if (rc == MQTTASYNC_SUCCESS)
+	{
+		pendingMessageCnt++;
+		if (pendingMessageCnt > pendingMessageCntMax) pendingMessageCntMax = pendingMessageCnt;
+	}
+	else
+	{
+		MyLog(LOGA_INFO, "Failed to queue message for send with retvalue %d",rc);
+	}
+	return rc;
+}
+
+int test_373(struct Options options)
+{
+	char* testname = "test373";
+	MQTTAsync mqttasyncContext;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	MQTTAsync_willOptions wopts = MQTTAsync_willOptions_initializer;
+	int rc = 0;
+	char clientid[30 + sizeof(unique)];
+	heap_info* mqtt_mem = 0;
+
+	MyLog(LOGA_INFO, "Running test373 with QoS=%u, iterrations=%u\n",options.QoS,options.iterrations);
+	sprintf(clientid, "paho-test373-%s", unique);
+	connectCnt = 0;
+	rc = MQTTAsync_create(&mqttasyncContext, options.proxy_connection, clientid,
+			      MQTTCLIENT_PERSISTENCE_NONE,
+			      NULL);
+	assert("good rc from create", rc == MQTTASYNC_SUCCESS, "rc was %d \n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		goto exit;
+	}
+	opts.connectTimeout = 2;
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 0;
+	opts.MQTTVersion = MQTTVERSION_DEFAULT;
+	opts.onSuccess = test373OnConnect;
+	opts.onFailure = test1373OnFailure;
+	opts.context = mqttasyncContext;
+
+	rc = MQTTAsync_setCallbacks(mqttasyncContext,mqttasyncContext,
+				    test373ConnectionLost,
+				    test373_messageArrived,
+				    test373DeliveryComplete);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		goto exit;
+	}
+	MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+	while (connectCnt < (int)options.iterrations)
+	{
+		if (!connected)
+		{
+			MyLog(LOGA_INFO, "Connected %d connectCnt %d\n",connected,connectCnt);
+			MyLog(LOGA_INFO, "PublishCnt %d, FailedCnt %d, Pending %d maxPending %d",
+			      goodPublishCnt,failedPublishCnt,pendingMessageCnt,pendingMessageCntMax);
+#if !defined(_WINDOWS)
+			mqtt_mem = Heap_get_info();
+			MyLog(LOGA_INFO, "MQTT mem current %ld, max %ld",mqtt_mem->current_size,mqtt_mem->max_size);
+#endif
+			/* (re)connect to the broker */
+			if (connecting)
+			{
+				MySleep((1+opts.connectTimeout) * 1000); /* but wait for all pending connect attempts to timeout */
+			}
+			else
+			{
+				rc = MQTTAsync_connect(mqttasyncContext, &opts);
+				if (rc != MQTTASYNC_SUCCESS)
+				{
+					failures++;
+					goto exit;
+				}
+				connecting = 1;
+			}
+		}
+		else
+		{
+			/* while connected send 100 message per second */
+			int topicId;
+			for(topicId=0; topicId < 100; topicId++)
+			{
+				rc = test373SendPublishMessage(mqttasyncContext,topicId,options.QoS);
+				if (rc != MQTTASYNC_SUCCESS) break;
+			}
+			MySleep(100);
+		}
+	}
+	MySleep(5000);
+	MyLog(LOGA_INFO, "PublishCnt %d, FailedCnt %d, Pending %d maxPending %d",
+	      goodPublishCnt,failedPublishCnt,pendingMessageCnt,pendingMessageCntMax);
+#if !defined(_WINDOWS)
+	mqtt_mem = Heap_get_info();
+	MyLog(LOGA_INFO, "MQTT mem current %ld, max %ld",mqtt_mem->current_size,mqtt_mem->max_size);
+#endif
+	MQTTAsync_disconnect(mqttasyncContext, NULL);
+	connected = 0;
+	MyLog(LOGA_INFO, "PublishCnt %d, FailedCnt %d, Pending %d maxPending %d",
+	      goodPublishCnt,failedPublishCnt,pendingMessageCnt,pendingMessageCntMax);
+#if !defined(_WINDOWS)
+	mqtt_mem = Heap_get_info();
+	MyLog(LOGA_INFO, "MQTT mem current %ld, max %ld",mqtt_mem->current_size,mqtt_mem->max_size);
+#endif
+exit:
+	MQTTAsync_destroy(&mqttasyncContext);
+#if !defined(_WINDOWS)
+	mqtt_mem = Heap_get_info();
+	MyLog(LOGA_INFO, "MQTT mem current %ld, max %ld",mqtt_mem->current_size,mqtt_mem->max_size);
+	if (mqtt_mem->current_size > 0) failures++; /* consider any not freed memory as failure */
+#endif
+	return failures;
+}
+
+void handleTrace(enum MQTTASYNC_TRACE_LEVELS level, char* message)
+{
+	printf("%s\n", message);
+}
+
+int main(int argc, char** argv)
+{
+	int* numtests = &tests;
+	int rc = 0;
+	int (*tests[])() = { NULL, test_373};
+	unsigned int QoS;
+
+	sprintf(unique, "%u", rand());
+	MyLog(LOGA_INFO, "Random prefix/suffix is %s", unique);
+
+	MQTTAsync_setTraceCallback(handleTrace);
+	getopts(argc, argv);
+
+	if (options.test_no == 0)
+	{ /* run all the tests */
+		for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+		{
+			/* test with QoS 0, 1 and 2 and just 5 iterrations */
+			for (QoS = 0; QoS < 3; QoS++)
+			{
+				failures = 0;
+				options.QoS = QoS;
+				options.iterrations = 5;
+				MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+			}
+			if (rc == 0)
+			{
+				/* Test with much more iterrations for QoS = 0 */
+				failures = 0;
+				options.QoS = 0;
+				options.iterrations = 100;
+				MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+			}
+		}
+	}
+	else
+	{
+		MQTTAsync_setTraceLevel(MQTTASYNC_TRACE_ERROR);
+		rc = tests[options.test_no](options); /* run just the selected test */
+	}
+
+	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	return rc;
+}
+
+
+/* Local Variables: */
+/* indent-tabs-mode: t */
+/* c-basic-offset: 8 */
+/* End: */
diff --git a/mqtt/src/test/test_mqtt4async.c b/mqtt/src/test/test_mqtt4async.c
new file mode 100644
index 00000000..984cc603
--- /dev/null
+++ b/mqtt/src/test/test_mqtt4async.c
@@ -0,0 +1,628 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2014 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - MQTT 3.1.1 support
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * MQTT 3.1.1 Tests for the asynchronous Paho MQTT C client
+ */
+
+
+/*
+#if !defined(_RTSHEADER)
+	#include <rts.h>
+#endif
+*/
+
+#include "MQTTAsync.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+  	#include <sys/socket.h>
+	#include <unistd.h>
+  	#include <errno.h>
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#define MAXHOSTNAMELEN 256
+#define EAGAIN WSAEWOULDBLOCK
+#define EINTR WSAEINTR
+#define EINPROGRESS WSAEINPROGRESS
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define ENOTCONN WSAENOTCONN
+#define ECONNRESET WSAECONNRESET
+#define setenv(a, b, c) _putenv_s(a, b)
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;         /**< connection to system under test. */
+	char** haconnections;
+	int hacount;
+	int verbose;
+	int test_no;
+	int iterations;
+} options =
+{
+	"m2m.eclipse.org:1883",
+	NULL,
+	0,
+	0,
+	0,
+	1,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+	
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+			{
+				options.connection = argv[count];
+				printf("\nSetting connection to %s\n", options.connection);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--haconnections") == 0)
+		{
+			if (++count < argc)
+			{
+				char* tok = strtok(argv[count], " ");
+				options.hacount = 0;
+				options.haconnections = malloc(sizeof(char*) * 5);
+				while (tok)
+				{
+					options.haconnections[options.hacount] = malloc(strlen(tok) + 1);
+					strcpy(options.haconnections[options.hacount], tok);
+					options.hacount++;
+					tok = strtok(NULL, " ");
+				}
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--iterations") == 0)
+		{
+			if (++count < argc)
+				options.iterations = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+		{
+			options.verbose = 1;
+			printf("\nSetting verbose on\n");
+		}
+		count++;
+	}
+}
+
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+	
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+int test_finished = 0;
+
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000); 
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;	
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		MyLog(LOGA_INFO, "Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n", 
+                        description, filename, lineno);
+	}
+    else
+    	MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);  
+}
+
+
+void test1_onDisconnect3(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+	test_finished = 1;
+}
+
+
+void test1_onConnect3(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.onSuccess = test1_onDisconnect3;
+	opts.context = c;
+
+	assert("Correct serverURI returned", strstr(response->alt.connect.serverURI, options.connection) != NULL,
+			"serverURI was %s", response->alt.connect.serverURI);
+	assert("Correct MQTTVersion returned", response->alt.connect.MQTTVersion == 4,
+			"MQTTVersion was %d", response->alt.connect.MQTTVersion);
+	assert("Correct sessionPresent returned", response->alt.connect.sessionPresent == 1,
+			"sessionPresent was %d", response->alt.connect.sessionPresent);
+
+	rc = MQTTAsync_disconnect(c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+void test1_onDisconnect2(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+
+	opts.MQTTVersion = 4;
+	opts.cleansession = 0;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+	opts.onSuccess = test1_onConnect3;
+	opts.onFailure = NULL;
+	opts.context = c;
+
+	opts.cleansession = 0;
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Connect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+void test1_onConnect2(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.onSuccess = test1_onDisconnect2;
+	opts.context = c;
+
+	assert("Correct serverURI returned", strcmp(response->alt.connect.serverURI, options.connection) == 0,
+			"serverURI was %s", response->alt.connect.serverURI);
+	assert("Correct MQTTVersion returned", response->alt.connect.MQTTVersion == 4,
+			"MQTTVersion was %d", response->alt.connect.MQTTVersion);
+	assert("Correct sessionPresent returned", response->alt.connect.sessionPresent == 0,
+			"sessionPresent was %d", response->alt.connect.sessionPresent);
+
+	rc = MQTTAsync_disconnect(c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+void test1_onDisconnect1(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+
+	opts.MQTTVersion = 4;
+	opts.cleansession = 0;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+	opts.onSuccess = test1_onConnect2;
+	opts.onFailure = NULL;
+	opts.context = c;
+
+	opts.cleansession = 0;
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Connect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+void test1_onConnect1(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback 1, context %p", context);
+	opts.onSuccess = test1_onDisconnect1;
+	opts.context = c;
+
+	assert("Correct serverURI returned", strcmp(response->alt.connect.serverURI, options.connection) == 0,
+			"serverURI was %s", response->alt.connect.serverURI);
+	assert("Correct MQTTVersion returned", response->alt.connect.MQTTVersion == 4,
+			"MQTTVersion was %d", response->alt.connect.MQTTVersion);
+	assert("Correct sessionPresent returned", response->alt.connect.sessionPresent == 0,
+			"sessionPresent was %d", response->alt.connect.sessionPresent);
+
+	rc = MQTTAsync_disconnect(c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+/*********************************************************************
+
+Test1: sessionPresent
+
+*********************************************************************/
+int test1(struct Options options)
+{
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"sessionPresent\"");
+	global_start_time = start_clock();
+	test_finished = failures = 0;
+	MyLog(LOGA_INFO, "Starting test 1 - sessionPresent");
+	
+	rc = MQTTAsync_create(&c, options.connection, "sesssionPresent",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);		
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.MQTTVersion = 4;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+	opts.onSuccess = test1_onConnect1;
+	opts.onFailure = NULL;
+	opts.context = c;
+
+	/* Connect cleansession */
+	opts.cleansession = 1;
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST1: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+void test2_onDisconnect(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+
+	MyLog(LOGA_DEBUG, "In onDisconnect callback %p", c);
+	test_finished = 1;
+}
+
+
+void test2_onSubscribe2(void* context, MQTTAsync_failureData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_disconnectOptions opts = MQTTAsync_disconnectOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In subscribe onFailure callback, context %p", context);
+
+	assert("Correct subscribe return code", response->code == MQTT_BAD_SUBSCRIBE,
+			"qos was %d", response->code);
+
+	opts.onSuccess = test2_onDisconnect;
+	rc = MQTTAsync_disconnect(c, &opts);
+	assert("Disconnect successful", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+}
+
+
+void test2_onSubscribe1(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In subscribe onSuccess callback, context %p", context);
+
+	assert("Correct subscribe return code", response->alt.qos == 2,
+			"qos was %d", response->alt.qos);
+}
+
+
+void test2_onConnect1(void* context, MQTTAsync_successData* response)
+{
+	MQTTAsync c = (MQTTAsync)context;
+	MQTTAsync_responseOptions opts = MQTTAsync_responseOptions_initializer;
+	int rc;
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback 1, context %p", context);
+
+	assert("Correct serverURI returned", strcmp(response->alt.connect.serverURI, options.connection) == 0,
+			"serverURI was %s", response->alt.connect.serverURI);
+	assert("Correct MQTTVersion returned", response->alt.connect.MQTTVersion == 4,
+			"MQTTVersion was %d", response->alt.connect.MQTTVersion);
+	assert("Correct sessionPresent returned", response->alt.connect.sessionPresent == 0,
+			"sessionPresent was %d", response->alt.connect.sessionPresent);
+
+	MyLog(LOGA_DEBUG, "In connect onSuccess callback, context %p", context);
+	opts.context = c;
+
+	opts.onSuccess = test2_onSubscribe1;
+	rc = MQTTAsync_subscribe(c, "a topic I can subscribe to", 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+
+	opts.onSuccess = NULL;
+	opts.onFailure = test2_onSubscribe2;
+	rc = MQTTAsync_subscribe(c, "nosubscribe", 2, &opts);
+	assert("Good rc from subscribe", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		test_finished = 1;
+}
+
+
+
+/*********************************************************************
+
+Test1: 0x80 from subscribe
+
+*********************************************************************/
+int test2(struct Options options)
+{
+	MQTTAsync c;
+	MQTTAsync_connectOptions opts = MQTTAsync_connectOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+
+	fprintf(xml, "<testcase classname=\"test2\" name=\"bad subscribe\"");
+	global_start_time = start_clock();
+	test_finished = failures = 0;
+	MyLog(LOGA_INFO, "Starting test 2 - bad subscribe");
+
+	rc = MQTTAsync_create(&c, options.connection, "badSubscribe test",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+	assert("good rc from create",  rc == MQTTASYNC_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+	{
+		MQTTAsync_destroy(&c);
+		goto exit;
+	}
+
+	opts.MQTTVersion = 4;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+	opts.onSuccess = test2_onConnect1;
+	opts.onFailure = NULL;
+	opts.context = c;
+
+	/* Connect cleansession */
+	opts.cleansession = 1;
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTAsync_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTASYNC_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTASYNC_SUCCESS)
+		goto exit;
+
+	while (!test_finished)
+		#if defined(WIN32)
+			Sleep(100);
+		#else
+			usleep(10000L);
+		#endif
+
+	MQTTAsync_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST2: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+
+
+int main(int argc, char** argv)
+{
+	int rc = 0;
+ 	int (*tests[])() = {NULL, test1, test2};
+	int i;
+	
+	xml = fopen("TEST-MQTT4sync.xml", "w");
+	fprintf(xml, "<testsuite name=\"test-mqtt4sync\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));
+
+	setenv("MQTT_C_CLIENT_TRACE", "ON", 1);
+	setenv("MQTT_C_CLIENT_TRACE_LEVEL", "ERROR", 1);
+
+	getopts(argc, argv);
+
+	for (i = 0; i < options.iterations; ++i)
+	{
+	 	if (options.test_no == 0)
+		{ /* run all the tests */
+ 		   	for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+		}
+		else
+ 		   	rc = tests[options.test_no](options); /* run just the selected test */
+	}
+    	
+ 	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);	
+	return rc;
+}
diff --git a/mqtt/src/test/test_mqtt4sync.c b/mqtt/src/test/test_mqtt4sync.c
new file mode 100644
index 00000000..5239dc76
--- /dev/null
+++ b/mqtt/src/test/test_mqtt4sync.c
@@ -0,0 +1,498 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2014 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution. 
+ *
+ * The Eclipse Public License is available at 
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at 
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *    Ian Craggs - MQTT 3.1.1 support
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * MQTT 3.1.1 Tests for the synchronous Paho MQTT C client
+ */
+
+
+/*
+#if !defined(_RTSHEADER)
+	#include <rts.h>
+#endif
+*/
+
+#include "MQTTClient.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+  	#include <sys/socket.h>
+	#include <unistd.h>
+  	#include <errno.h>
+#else
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#define MAXHOSTNAMELEN 256
+#define EAGAIN WSAEWOULDBLOCK
+#define EINTR WSAEINTR
+#define EINPROGRESS WSAEINPROGRESS
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#define ENOTCONN WSAENOTCONN
+#define ECONNRESET WSAECONNRESET
+#define setenv(a, b, c) _putenv_s(a, b)
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	char* connection;         /**< connection to system under test. */
+	char** haconnections;
+	int hacount;
+	int verbose;
+	int test_no;
+	int iterations;
+} options =
+{
+	"tcp://m2m.eclipse.org:1883",
+	NULL,
+	0,
+	0,
+	0,
+	1,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+	
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--connection") == 0)
+		{
+			if (++count < argc)
+			{
+				options.connection = argv[count];
+				printf("\nSetting connection to %s\n", options.connection);
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--haconnections") == 0)
+		{
+			if (++count < argc)
+			{
+				char* tok = strtok(argv[count], " ");
+				options.hacount = 0;
+				options.haconnections = malloc(sizeof(char*) * 5);
+				while (tok)
+				{
+					options.haconnections[options.hacount] = malloc(strlen(tok) + 1);
+					strcpy(options.haconnections[options.hacount], tok);
+					options.hacount++;
+					tok = strtok(NULL, " ");
+				}
+			}
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--iterations") == 0)
+		{
+			if (++count < argc)
+				options.iterations = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+		{
+			options.verbose = 1;
+			printf("\nSetting verbose on\n");
+		}
+		count++;
+	}
+}
+
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+	
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000); 
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;	
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		MyLog(LOGA_INFO, "Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n", 
+                        description, filename, lineno);
+	}
+    else
+    	MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);  
+}
+
+
+/*********************************************************************
+
+Test1: sessionPresent
+
+*********************************************************************/
+int test1(struct Options options)
+{
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	MQTTClient_willOptions wopts = MQTTClient_willOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test1";
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"sessionPresent\"");
+	global_start_time = start_clock();
+	failures = 0;
+	MyLog(LOGA_INFO, "Starting test 1 - sessionPresent");
+	
+	rc = MQTTClient_create(&c, options.connection, "sesssionPresent",
+			MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);		
+	assert("good rc from create",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+	{
+		MQTTClient_destroy(&c);
+		goto exit;
+	}
+
+	opts.keepAliveInterval = 20;
+	opts.username = "testuser";
+	opts.password = "testpassword";
+	opts.MQTTVersion = 4;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	opts.will = &wopts;
+	opts.will->message = "will message";
+	opts.will->qos = 1;
+	opts.will->retained = 0;
+	opts.will->topicName = "will topic";
+	opts.will = NULL;
+
+	/* Connect cleansession */
+	opts.cleansession = 1;
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTClient_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	assert("Correct serverURI returned", strcmp(opts.returned.serverURI, options.connection) == 0, "serverURI was %s",
+		opts.returned.serverURI);
+	assert("Correct MQTTVersion returned", opts.returned.MQTTVersion == 4, "MQTTVersion was %d",
+		opts.returned.MQTTVersion);
+	assert("Correct sessionPresent returned", opts.returned.sessionPresent == 0, "sessionPresent was %d",
+		opts.returned.sessionPresent);
+
+	rc = MQTTClient_disconnect(c, 0);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	/* Connect again, non-cleansession */
+	opts.cleansession = 0;
+	rc = MQTTClient_connect(c, &opts);
+	assert("Connect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	assert("Correct serverURI returned", strcmp(opts.returned.serverURI, options.connection) == 0, "serverURI was %s",
+		opts.returned.serverURI);
+	assert("Correct MQTTVersion returned", opts.returned.MQTTVersion == 4, "MQTTVersion was %d",
+		opts.returned.MQTTVersion);
+	assert("Correct sessionPresent returned", opts.returned.sessionPresent == 0, "sessionPresent was %d",
+		opts.returned.sessionPresent);
+
+	rc = MQTTClient_disconnect(c, 0);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	/* Connect again, non-cleansession */
+	opts.cleansession = 0;
+	rc = MQTTClient_connect(c, &opts);
+	assert("Connect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	assert("Correct serverURI returned", strcmp(opts.returned.serverURI, options.connection) == 0, "serverURI was %s",
+		opts.returned.serverURI);
+	assert("Correct MQTTVersion returned", opts.returned.MQTTVersion == 4, "MQTTVersion was %d",
+		opts.returned.MQTTVersion);
+	assert("Correct sessionPresent returned", opts.returned.sessionPresent == 1, "sessionPresent was %d",
+		opts.returned.sessionPresent);
+	rc = MQTTClient_disconnect(c, 0);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "TEST1: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+/*********************************************************************
+
+Test2: 0x80 return code from subscribe
+
+*********************************************************************/
+volatile int test2_arrivedcount = 0;
+int test2_deliveryCompleted = 0;
+MQTTClient_message test2_pubmsg = MQTTClient_message_initializer;
+
+void test2_deliveryComplete(void* context, MQTTClient_deliveryToken dt)
+{
+	++test2_deliveryCompleted;
+}
+
+int test2_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* m)
+{
+	++test2_arrivedcount;
+	MyLog(LOGA_DEBUG, "Callback: %d message received on topic %s is %.*s.",
+					test2_arrivedcount, topicName, m->payloadlen, (char*)(m->payload));
+	MQTTClient_free(topicName);
+	MQTTClient_freeMessage(&m);
+	return 1;
+}
+
+int test2(struct Options options)
+{
+	char* testname = "test2";
+	int subsqos = 2;
+	MQTTClient c;
+	MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+	int rc = 0;
+	char* test_topic = "C client test2";
+	char* topics[2] = {"test_topic", "nosubscribe"};
+	int qoss[2] = {2, 2};
+
+	fprintf(xml, "<testcase classname=\"test1\" name=\"bad return code from subscribe\"");
+	MyLog(LOGA_INFO, "Starting test 2 - bad return code from subscribe");
+	global_start_time = start_clock();
+	failures = 0;
+
+	MQTTClient_create(&c, options.connection, "multi_threaded_sample", MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+
+	opts.keepAliveInterval = 20;
+	opts.cleansession = 1;
+	opts.MQTTVersion = 4;
+	if (options.haconnections != NULL)
+	{
+		opts.serverURIs = options.haconnections;
+		opts.serverURIcount = options.hacount;
+	}
+
+	rc = MQTTClient_setCallbacks(c, NULL, NULL, test2_messageArrived, test2_deliveryComplete);
+	assert("Good rc from setCallbacks", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Connecting");
+	rc = MQTTClient_connect(c, &opts);
+	assert("Good rc from connect", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	if (rc != MQTTCLIENT_SUCCESS)
+		goto exit;
+
+	assert("Correct serverURI returned", strcmp(opts.returned.serverURI, options.connection) == 0, "serverURI was %s",
+		opts.returned.serverURI);
+	assert("Correct MQTTVersion returned", opts.returned.MQTTVersion == 4, "MQTTVersion was %d",
+		opts.returned.MQTTVersion);
+	assert("Correct sessionPresent returned", opts.returned.sessionPresent == 0, "sessionPresent was %d",
+		opts.returned.sessionPresent);
+
+	rc = MQTTClient_subscribe(c, test_topic, subsqos);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	rc = MQTTClient_subscribe(c, "nosubscribe", 2);
+	assert("0x80 from subscribe", rc == 0x80, "rc was %d", rc);
+
+	rc = MQTTClient_subscribeMany(c, 2, topics, qoss);
+	assert("Good rc from subscribe", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	assert("Correct returned qos from subscribe", qoss[0] == 2, "qos 0 was %d", qoss[0]);
+	assert("Correct returned qos from subscribe", qoss[1] == 0x80, "qos 0 was %d", qoss[0]);
+
+	rc = MQTTClient_unsubscribe(c, test_topic);
+	assert("Unsubscribe successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+	rc = MQTTClient_disconnect(c, 0);
+	assert("Disconnect successful", rc == MQTTCLIENT_SUCCESS, "rc was %d", rc);
+
+	MQTTClient_destroy(&c);
+
+exit:
+	MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+	return failures;
+}
+
+
+int main(int argc, char** argv)
+{
+	int rc = 0;
+ 	int (*tests[])() = {NULL, test1, test2};
+	int i;
+	
+	xml = fopen("TEST-MQTT4sync.xml", "w");
+	fprintf(xml, "<testsuite name=\"test-mqtt4sync\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));
+
+	setenv("MQTT_C_CLIENT_TRACE", "ON", 1);
+	setenv("MQTT_C_CLIENT_TRACE_LEVEL", "ERROR", 1);
+
+	getopts(argc, argv);
+
+	for (i = 0; i < options.iterations; ++i)
+	{
+	 	if (options.test_no == 0)
+		{ /* run all the tests */
+ 		   	for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+		}
+		else
+ 		   	rc = tests[options.test_no](options); /* run just the selected test */
+	}
+    	
+ 	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);	
+	return rc;
+}
diff --git a/mqtt/src/test/test_sync_session_present.c b/mqtt/src/test/test_sync_session_present.c
new file mode 100644
index 00000000..90d9185c
--- /dev/null
+++ b/mqtt/src/test/test_sync_session_present.c
@@ -0,0 +1,491 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2019 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - Test program utilities
+ *    Milan Tucic - Session present test1
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * Tests for the MQ Telemetry MQTT C client
+ */
+
+#include "MQTTClient.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+  #include <sys/time.h>
+  #include <sys/socket.h>
+  #include <unistd.h>
+  #include <errno.h>
+#else
+  #include <windows.h>
+  #define setenv(a, b, c) _putenv_s(a, b)
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+    printf("help!!\n");
+    exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+    char* connection;         /**< connection to system under test. */
+    char** haconnections;
+    char* proxy_connection;
+    char* client_id;
+    char* username;
+    char* password;
+    char* log;
+    int hacount;
+    int verbose;
+    int test_no;
+    int MQTTVersion;
+    int iterations;
+    int reconnect_period;
+} options =
+{
+    "tcp://mqtt.eclipse.org:1883",
+    NULL,
+    "tcp://localhost:1883",
+    "cli/test",
+    NULL,
+    NULL,
+    NULL,
+    0,
+    0,
+    0,
+    MQTTVERSION_DEFAULT,
+    1,
+    3
+};
+
+void getopts(int argc, char** argv)
+{
+    int count = 1;
+
+    while (count < argc)
+    {
+        if (strcmp(argv[count], "--test_no") == 0)
+        {
+            if (++count < argc)
+                options.test_no = atoi(argv[count]);
+            else
+                usage();
+        }
+        else if (strcmp(argv[count], "--connection") == 0)
+        {
+            if (++count < argc)
+            {
+                options.connection = argv[count];
+                printf("\nSetting connection to %s\n", options.connection);
+            }
+            else
+                usage();
+        }
+        else if (strcmp(argv[count], "--haconnections") == 0)
+        {
+            if (++count < argc)
+            {
+                char* tok = strtok(argv[count], " ");
+                options.hacount = 0;
+                options.haconnections = malloc(sizeof(char*) * 5);
+                while (tok)
+                {
+                    options.haconnections[options.hacount] = malloc(strlen(tok) + 1);
+                    strcpy(options.haconnections[options.hacount], tok);
+                    options.hacount++;
+                    tok = strtok(NULL, " ");
+                }
+            }
+            else
+                usage();
+        }
+        else if (strcmp(argv[count], "--proxy_connection") == 0)
+        {
+            if (++count < argc)
+                options.proxy_connection = argv[count];
+            else
+                usage();
+        }
+        else if (strcmp(argv[count], "--client_id") == 0)
+        {
+            if (++count < argc)
+                options.client_id = argv[count];
+            else
+                usage();
+        }
+        else if (strcmp(argv[count], "--username") == 0)
+        {
+            if (++count < argc)
+                options.username = argv[count];
+            else
+                usage();
+        }
+        else if (strcmp(argv[count], "--password") == 0)
+        {
+            if (++count < argc)
+                options.password = argv[count];
+            else
+                usage();
+        }
+        else if (strcmp(argv[count], "--log") == 0)
+        {
+            if (++count < argc)
+                options.log = argv[count];
+            else
+                usage();
+        }
+        else if (strcmp(argv[count], "--MQTTversion") == 0)
+        {
+            if (++count < argc)
+            {
+                options.MQTTVersion = atoi(argv[count]);
+                printf("setting MQTT version to %d\n", options.MQTTVersion);
+            }
+            else
+                usage();
+        }
+        else if (strcmp(argv[count], "--iterations") == 0)
+        {
+            if (++count < argc)
+                options.iterations = atoi(argv[count]);
+            else
+                usage();
+        }
+        else if (strcmp(argv[count], "--reconnection_period") == 0)
+        {
+            if (++count < argc)
+                options.reconnect_period = atoi(argv[count]);
+            else
+                usage();
+        }
+        else if (strcmp(argv[count], "--verbose") == 0)
+        {
+            options.verbose = 1;
+            printf("\nSetting verbose on\n");
+        }
+        count++;
+    }
+}
+
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+    static char msg_buf[256];
+    va_list args;
+    struct timeb ts;
+
+    struct tm *timeinfo;
+
+    if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+      return;
+
+    ftime(&ts);
+    timeinfo = localtime(&ts.time);
+    strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+    sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+    va_start(args, format);
+    vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+    va_end(args);
+
+    printf("%s\n", msg_buf);
+    fflush(stdout);
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mqsleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+    return GetTickCount();
+}
+#elif defined(AIX)
+#define mqsleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+    static struct timespec start;
+    clock_gettime(CLOCK_REALTIME, &start);
+    return start;
+}
+#else
+#define mqsleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+    struct timeval start_time;
+    gettimeofday(&start_time, NULL);
+    return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+    return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+    struct timespec now, res;
+
+    clock_gettime(CLOCK_REALTIME, &now);
+    ntimersub(now, start, res);
+    return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+    struct timeval now, res;
+
+    gettimeofday(&now, NULL);
+    timersub(&now, &start_time, &res);
+    return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+
+void write_test_result(void)
+{
+    long duration = elapsed(global_start_time);
+
+    fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+    if (cur_output != output)
+    {
+        fprintf(xml, "%s", output);
+        cur_output = output;
+    }
+    fprintf(xml, "</testcase>\n");
+}
+
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+    ++tests;
+    if (!value)
+    {
+        va_list args;
+
+        ++failures;
+        MyLog(LOGA_INFO, "Assertion failed, file %s, line %d, description: %s\n", filename, lineno, description);
+
+        va_start(args, format);
+        vprintf(format, args);
+        va_end(args);
+
+        cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+    }
+    else
+        MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+}
+
+void mysleep(int seconds)
+{
+#if defined(WIN32)
+    Sleep(1000L*seconds);
+#else
+    sleep(seconds);
+#endif
+}
+
+/*********************************************************************
+
+Test 1: clean session and reconnect with session present
+
+*********************************************************************/
+MQTTClient test1_c1;
+
+void test1_connectionLost(void* context, char* cause)
+{
+    printf("Callback: connection lost\n");
+}
+
+void test1_deliveryComplete(void* context, MQTTClient_deliveryToken token)
+{
+    printf("Callback: publish complete for token %d\n", token);
+}
+
+int test1_messageArrived(void* context, char* topicName, int topicLen, MQTTClient_message* m)
+{
+    MQTTClient c = (MQTTClient)context;
+    printf("Callback: message received on topic '%s' is '%.*s'.\n", topicName, m->payloadlen, (char*)(m->payload));
+    MQTTClient_free(topicName);
+    MQTTClient_freeMessage(&m);
+    return 1;
+}
+
+int test1(struct Options options)
+{
+    char* testname = "test1";
+    MQTTClient_connectOptions opts = MQTTClient_connectOptions_initializer;
+    int rc;
+
+    failures = 0;
+    MyLog(LOGA_INFO, "Starting test 1 - clean session and reconnect with session present");
+    fprintf(xml, "<testcase classname=\"test1\" name=\"connectionLost and will messages\"");
+    global_start_time = start_clock();
+
+    opts.keepAliveInterval = 60;
+    opts.cleansession = 1;
+    opts.MQTTVersion = MQTTVERSION_3_1_1;
+    if (options.haconnections != NULL)
+    {
+        opts.serverURIs = options.haconnections;
+        opts.serverURIcount = options.hacount;
+    }
+    if (options.username)
+    {
+        opts.username = options.username;
+    }
+    if (options.password)
+    {
+        opts.password = options.password;
+    }
+
+    rc = MQTTClient_create(&test1_c1, options.connection, options.client_id, MQTTCLIENT_PERSISTENCE_DEFAULT, NULL);
+    assert("good rc from create", rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+    if (rc != MQTTCLIENT_SUCCESS)
+        goto exit;
+
+    rc = MQTTClient_setCallbacks(test1_c1, (void*)test1_c1, test1_connectionLost, test1_messageArrived, test1_deliveryComplete);
+    assert("good rc from setCallbacks",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+    if (rc != MQTTCLIENT_SUCCESS)
+        goto exit;
+
+    /* Connect to the broker with clean session = true */
+    rc = MQTTClient_connect(test1_c1, &opts);
+    assert("good rc from connect with clean session = true",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+    if (rc != MQTTCLIENT_SUCCESS)
+        goto exit;
+
+    assert("connected, session cleaned", opts.returned.sessionPresent == 0,
+                     "opts.returned.sessionPresent = %d\n", opts.returned.sessionPresent);
+
+    /* Disconnect */
+    rc = MQTTClient_disconnect(test1_c1, 1000);
+    assert("good rc from disconnect",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+    if (rc != MQTTCLIENT_SUCCESS)
+        goto exit;
+
+    MyLog(LOGA_INFO, "Sleeping after session cleaned %d s ...", options.reconnect_period);
+    mysleep(options.reconnect_period);
+
+    /* Connect to the broker with clean session = false */
+    opts.cleansession = 0;
+    rc = MQTTClient_connect(test1_c1, &opts);
+    assert("good rc from connect with clean session = false",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+    if (rc != MQTTCLIENT_SUCCESS)
+        goto exit;
+
+    assert("connected, session clean", opts.returned.sessionPresent == 0,
+                     "opts.returned.sessionPresent = %d\n", opts.returned.sessionPresent);
+
+    /* Disconnect */
+    rc = MQTTClient_disconnect(test1_c1, 1000);
+    assert("good rc from disconnect",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+    if (rc != MQTTCLIENT_SUCCESS)
+        goto exit;
+
+    MyLog(LOGA_INFO, "Sleeping after session persist %d s ...", options.reconnect_period);
+    mysleep(options.reconnect_period);
+
+    /* Connect to the broker with clean session = false, expected to have session */
+    opts.cleansession = 0;
+    rc = MQTTClient_connect(test1_c1, &opts);
+    assert("good rc from second connect with clean session = false",  rc == MQTTCLIENT_SUCCESS, "rc was %d\n", rc);
+    if (rc != MQTTCLIENT_SUCCESS)
+        goto exit;
+
+    assert("connected, session present", opts.returned.sessionPresent == 1,
+                     "opts.returned.sessionPresent = %d\n", opts.returned.sessionPresent);
+
+    MQTTClient_destroy(&test1_c1);
+
+exit:
+    MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.\n",
+            (failures == 0) ? "passed" : "failed", testname, tests, failures);
+    write_test_result();
+    return failures;
+}
+
+int main(int argc, char** argv)
+{
+    int rc = 0;
+    int (*tests[])() = {NULL, test1};
+    int i;
+    unsigned test_i;
+
+    xml = fopen("TEST-test1.xml", "w");
+    fprintf(xml, "<testsuite name=\"test1\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests) - 1));
+
+    getopts(argc, argv);
+
+    if (options.log)
+    {
+        setenv("MQTT_C_CLIENT_TRACE", "ON", 1);
+        setenv("MQTT_C_CLIENT_TRACE_LEVEL", options.log, 1);
+    }
+
+
+    MyLog(LOGA_INFO, "Running %d iteration(s)", options.iterations);
+
+    for (i = 0; i < options.iterations; ++i)
+    {
+        if (options.test_no == 0)
+        { /* run all the tests */
+            for (test_i = 1; test_i < ARRAY_SIZE(tests); ++test_i)
+                rc += tests[test_i](options); /* return number of failures.  0 = test succeeded */
+        }
+        else
+            rc = tests[options.test_no](options); /* run just the selected test */
+    }
+
+    if (rc == 0)
+        MyLog(LOGA_INFO, "verdict pass");
+    else
+        MyLog(LOGA_INFO, "verdict fail");
+
+    fprintf(xml, "</testsuite>\n");
+    fclose(xml);
+    return rc;
+}
diff --git a/mqtt/src/test/thread.c b/mqtt/src/test/thread.c
new file mode 100644
index 00000000..cbb0fc9f
--- /dev/null
+++ b/mqtt/src/test/thread.c
@@ -0,0 +1,529 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corp.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Eclipse Distribution License v1.0 which accompany this distribution.
+ *
+ * The Eclipse Public License is available at
+ *    http://www.eclipse.org/legal/epl-v10.html
+ * and the Eclipse Distribution License is available at
+ *   http://www.eclipse.org/org/documents/edl-v10.php.
+ *
+ * Contributors:
+ *    Ian Craggs - initial API and implementation and/or initial documentation
+ *******************************************************************************/
+
+
+/**
+ * @file
+ * Unit tests for threading
+ */
+
+
+#include "Thread.h"
+#include <string.h>
+#include <stdlib.h>
+
+#if !defined(_WINDOWS)
+	#include <sys/time.h>
+  #include <sys/socket.h>
+	#include <unistd.h>
+  #include <errno.h>
+  #define WINAPI
+#else
+	#include <windows.h>
+#endif
+
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))
+
+void usage(void)
+{
+	printf("help!!\n");
+	exit(EXIT_FAILURE);
+}
+
+struct Options
+{
+	int verbose;
+	int test_no;
+	int iterations;
+} options =
+{
+	0,
+	-1,
+	1,
+};
+
+void getopts(int argc, char** argv)
+{
+	int count = 1;
+
+	while (count < argc)
+	{
+		if (strcmp(argv[count], "--test_no") == 0)
+		{
+			if (++count < argc)
+				options.test_no = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--iterations") == 0)
+		{
+			if (++count < argc)
+				options.iterations = atoi(argv[count]);
+			else
+				usage();
+		}
+		else if (strcmp(argv[count], "--verbose") == 0)
+			options.verbose = 1;
+		count++;
+	}
+}
+
+#define LOGA_DEBUG 0
+#define LOGA_INFO 1
+#include <stdarg.h>
+#include <time.h>
+#include <sys/timeb.h>
+void MyLog(int LOGA_level, char* format, ...)
+{
+	static char msg_buf[256];
+	va_list args;
+	struct timeb ts;
+
+	struct tm *timeinfo;
+
+	if (LOGA_level == LOGA_DEBUG && options.verbose == 0)
+	  return;
+
+	ftime(&ts);
+	timeinfo = localtime(&ts.time);
+	strftime(msg_buf, 80, "%Y%m%d %H%M%S", timeinfo);
+
+	sprintf(&msg_buf[strlen(msg_buf)], ".%.3hu ", ts.millitm);
+
+	va_start(args, format);
+	vsnprintf(&msg_buf[strlen(msg_buf)], sizeof(msg_buf) - strlen(msg_buf), format, args);
+	va_end(args);
+
+	printf("%s\n", msg_buf);
+	fflush(stdout);
+}
+
+
+#if defined(WIN32) || defined(_WINDOWS)
+#define mysleep(A) Sleep(1000*A)
+#define START_TIME_TYPE DWORD
+static DWORD start_time = 0;
+START_TIME_TYPE start_clock(void)
+{
+	return GetTickCount();
+}
+#elif defined(AIX)
+#define mysleep sleep
+#define START_TIME_TYPE struct timespec
+START_TIME_TYPE start_clock(void)
+{
+	static struct timespec start;
+	clock_gettime(CLOCK_REALTIME, &start);
+	return start;
+}
+#else
+#define mysleep sleep
+#define START_TIME_TYPE struct timeval
+/* TODO - unused - remove? static struct timeval start_time; */
+START_TIME_TYPE start_clock(void)
+{
+	struct timeval start_time;
+	gettimeofday(&start_time, NULL);
+	return start_time;
+}
+#endif
+
+
+#if defined(WIN32)
+long elapsed(START_TIME_TYPE start_time)
+{
+	return GetTickCount() - start_time;
+}
+#elif defined(AIX)
+#define assert(a)
+long elapsed(struct timespec start)
+{
+	struct timespec now, res;
+
+	clock_gettime(CLOCK_REALTIME, &now);
+	ntimersub(now, start, res);
+	return (res.tv_sec)*1000L + (res.tv_nsec)/1000000L;
+}
+#else
+long elapsed(START_TIME_TYPE start_time)
+{
+	struct timeval now, res;
+
+	gettimeofday(&now, NULL);
+	timersub(&now, &start_time, &res);
+	return (res.tv_sec)*1000 + (res.tv_usec)/1000;
+}
+#endif
+
+#define assert(a, b, c, d) myassert(__FILE__, __LINE__, a, b, c, d)
+#define assert1(a, b, c, d, e) myassert(__FILE__, __LINE__, a, b, c, d, e)
+
+int tests = 0;
+int failures = 0;
+FILE* xml;
+START_TIME_TYPE global_start_time;
+char output[3000];
+char* cur_output = output;
+
+void write_test_result(void)
+{
+	long duration = elapsed(global_start_time);
+
+	fprintf(xml, " time=\"%ld.%.3ld\" >\n", duration / 1000, duration % 1000);
+	if (cur_output != output)
+	{
+		fprintf(xml, "%s", output);
+		cur_output = output;
+	}
+	fprintf(xml, "</testcase>\n");
+}
+
+void myassert(char* filename, int lineno, char* description, int value, char* format, ...)
+{
+	++tests;
+	if (!value)
+	{
+		va_list args;
+
+		++failures;
+		printf("Assertion failed, file %s, line %d, description: %s, ", filename, lineno, description);
+
+		va_start(args, format);
+		vprintf(format, args);
+		va_end(args);
+
+		printf("\n");
+
+		cur_output += sprintf(cur_output, "<failure type=\"%s\">file %s, line %d </failure>\n",
+                        description, filename, lineno);
+	}
+    else
+    	MyLog(LOGA_DEBUG, "Assertion succeeded, file %s, line %d, description: %s", filename, lineno, description);
+}
+
+static thread_return_type WINAPI sem_secondary(void* n)
+{
+	int rc = 0;
+	sem_type sem = n;
+	START_TIME_TYPE start;
+	long duration;
+
+	MyLog(LOGA_DEBUG, "Secondary semaphore pointer %p", sem);
+
+	rc = Thread_check_sem(sem);
+	assert("rc 0 from check_sem", rc == 0, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Secondary thread about to wait");
+	start = start_clock();
+	rc = Thread_wait_sem(sem, 99999);
+	duration = elapsed(start);
+	assert("rc 0 from lock mutex", rc == 0, "rc was %d", rc);
+	MyLog(LOGA_INFO, "Lock duration was %ld", duration);
+	assert("duration is 2s", duration >= 2000L, "duration was %ld", duration);
+
+	MyLog(LOGA_DEBUG, "Secondary thread ending");
+	return 0;
+}
+
+
+int test_sem(struct Options options)
+{
+	char* testname = "test_sem";
+	int rc = 0, i = 0;
+	START_TIME_TYPE start;
+	long duration;
+	sem_type sem = Thread_create_sem();
+	thread_type thread;
+
+	MyLog(LOGA_INFO, "Starting semaphore test");
+	fprintf(xml, "<testcase classname=\"test\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	MyLog(LOGA_DEBUG, "Primary semaphore pointer %p\n", sem);
+
+	/* The semaphore should be created non-signaled */
+	rc = Thread_check_sem(sem);
+	assert("rc 0 from check_sem", rc == 0, "rc was %d\n", rc);
+
+	MyLog(LOGA_DEBUG, "Post semaphore so then check should be 1\n");
+	rc = Thread_post_sem(sem);
+	assert("rc 0 from post_sem", rc == 0, "rc was %d\n", rc);
+
+	/* should be 1, and then reset to 0 */
+	rc = Thread_check_sem(sem);
+	assert("rc 1 from check_sem", rc == 1, "rc was %d", rc);
+
+	/* so now it'll be 0 */
+	rc = Thread_check_sem(sem);
+	assert("rc 0 from check_sem", rc == 0, "rc was %d", rc);
+
+	/* multiple posts */
+	for (i = 0; i < 10; ++i)
+	{
+		rc = Thread_post_sem(sem);
+		assert("rc 0 from post_sem", rc == 0, "rc was %d\n", rc);
+	}
+
+	for (i = 0; i < 10; ++i)
+	{
+		rc = Thread_check_sem(sem);
+		assert("rc 1 from check_sem", rc == 1, "rc was %d", rc);
+	}
+	rc = Thread_check_sem(sem);
+	assert("rc 0 from check_sem", rc == 0, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Check timeout");
+	start = start_clock();
+	rc = Thread_wait_sem(sem, 1500);
+	duration = elapsed(start);
+	assert("rc ETIMEDOUT from lock mutex", rc == ETIMEDOUT, "rc was %d", rc);
+	MyLog(LOGA_INFO, "Lock duration was %ld", duration);
+	assert("duration is 2s", duration >= 1500L, "duration was %ld", duration);
+
+	MyLog(LOGA_DEBUG, "Starting secondary thread");
+	thread = Thread_start(sem_secondary, (void*)sem);
+
+	mysleep(2);
+	MyLog(LOGA_DEBUG, "post secondary");
+	rc = Thread_post_sem(sem);
+	assert("rc 1 from post_sem", rc == 1, "rc was %d", rc);
+
+	mysleep(1);
+
+	MyLog(LOGA_DEBUG, "Main thread ending");
+
+	/*exit: */ MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+
+	return failures;
+}
+
+#if !defined(WIN32) && !defined(WIN64)
+thread_return_type cond_secondary(void* n)
+{
+	int rc = 0;
+	cond_type cond = n;
+	START_TIME_TYPE start;
+	long duration;
+
+	MyLog(LOGA_DEBUG, "This will time out");
+	start = start_clock();
+	rc = Thread_wait_cond(cond, 1);
+	duration = elapsed(start);
+	MyLog(LOGA_INFO, "Lock duration was %ld", duration);
+	assert("duration is about 1s", duration >= 1000L && duration <= 1050L, "duration was %ld", duration);
+	assert("rc non 0 from wait_cond", rc == ETIMEDOUT, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "This should hang around a few seconds");
+	start = start_clock();
+	rc = Thread_wait_cond(cond, 99999);
+	duration = elapsed(start);
+	MyLog(LOGA_INFO, "Lock duration was %ld", duration);
+	assert("duration is around 1s", duration >= 990L && duration <= 1010L, "duration was %ld", duration);
+	assert("rc 9 from wait_cond", rc == 0, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Secondary cond thread ending");
+	return 0;
+}
+
+
+int test_cond(struct Options options)
+{
+	char* testname = "test_cond";
+	int rc = 0, i = 0;
+	START_TIME_TYPE start;
+	long duration;
+	cond_type cond = Thread_create_cond();
+	thread_type thread;
+
+	MyLog(LOGA_INFO, "Starting condition variable test");
+	fprintf(xml, "<testcase classname=\"cond\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	/* The semaphore should be created non-signaled */
+	rc = Thread_wait_cond(cond, 0);
+	assert("rc 0 from wait_cond", rc == ETIMEDOUT, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Check timeout");
+	start = start_clock();
+	rc = Thread_wait_cond(cond, 2);
+	duration = elapsed(start);
+	assert("rc ETIMEDOUT from lock mutex", rc == ETIMEDOUT, "rc was %d", rc);
+	MyLog(LOGA_INFO, "Lock duration was %ld", duration);
+	assert("duration is 2s", duration >= 2000L, "duration was %ld", duration);
+
+	/* multiple posts */
+	for (i = 0; i < 10; ++i)
+	{
+		rc = Thread_signal_cond(cond);
+		assert("rc 0 from signal cond", rc == 0, "rc was %d\n", rc);
+	}
+
+	/* the signals are not stored */
+	for (i = 0; i < 10; ++i)
+	{
+		rc = Thread_wait_cond(cond, 0);
+		assert("rc non-zero from wait_cond", rc == ETIMEDOUT, "rc was %d", rc);
+	}
+	rc = Thread_wait_cond(cond, 0);
+	assert("rc non-zero from wait_cond", rc == ETIMEDOUT, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Post secondary but it will time out");
+	rc = Thread_signal_cond(cond);
+	assert("rc 0 from signal cond", rc == 0, "rc was %d", rc);
+
+	MyLog(LOGA_DEBUG, "Starting secondary thread");
+	thread = Thread_start(cond_secondary, (void*)cond);
+
+	MyLog(LOGA_DEBUG, "wait for secondary thread to enter second wait");
+	mysleep(2);
+
+	MyLog(LOGA_DEBUG, "post secondary");
+	rc = Thread_signal_cond(cond);
+	assert("rc 0 from signal cond", rc == 0, "rc was %d", rc);
+
+	mysleep(1);
+
+	MyLog(LOGA_DEBUG, "Main thread ending");
+
+	exit: MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+
+	return failures;
+}
+#endif
+
+
+static thread_return_type WINAPI mutex_secondary(void* n)
+{
+	int rc = 0;
+	mutex_type mutex = n;
+	START_TIME_TYPE start;
+	long duration;
+
+	/* this should take 2s, as there is another lock held */
+	start = start_clock();
+	rc = Thread_lock_mutex(mutex);
+	duration = elapsed(start);
+	assert("rc 0 from lock mutex", rc == 0, "rc was %d", rc);
+	MyLog(LOGA_INFO, "Lock duration was %ld", duration);
+	assert("duration is 2s", duration >= 1000L, "duration was %ld", duration);
+
+	rc = Thread_unlock_mutex(mutex);
+	assert("rc 0 from unlock mutex", rc == 0, "rc was %d", rc);
+	MyLog(LOGA_DEBUG, "Secondary thread ending");
+	return 0;
+}
+
+
+int test_mutex(struct Options options)
+{
+	char* testname = "test_mutex";
+	int rc = 0;
+	mutex_type mutex = Thread_create_mutex();
+	thread_type thread;
+	START_TIME_TYPE start;
+	long duration;
+
+	MyLog(LOGA_INFO, "Starting mutex test");
+	fprintf(xml, "<testcase classname=\"test\" name=\"%s\"", testname);
+	global_start_time = start_clock();
+
+	/* this should happen immediately, as there is no other lock held */
+	start = start_clock();
+	rc = Thread_lock_mutex(mutex);
+	duration = elapsed(start);
+	assert("rc 0 from lock mutex", rc == 0, "rc was %d", rc);
+	MyLog(LOGA_INFO, "Lock duration was %ld", duration);
+	assert("duration is very low", duration < 5L, "duration was %ld", duration);
+
+	MyLog(LOGA_DEBUG, "Starting secondary thread");
+	thread = Thread_start(mutex_secondary, (void*)mutex);
+
+	mysleep(2);
+	rc = Thread_unlock_mutex(mutex); /* let background thread have it */
+	assert("rc 0 from unlock mutex", rc == 0, "rc was %d", rc);
+
+	start = start_clock();
+	rc = Thread_lock_mutex(mutex); /* make sure background thread hasn't locked it */
+	duration = elapsed(start);
+	assert("rc 0 from lock mutex", rc == 0, "rc was %d", rc);
+	MyLog(LOGA_INFO, "Lock duration was %ld", duration);
+	assert("duration is very low", duration < 5L, "duration was %ld", duration);
+
+	Thread_destroy_mutex(mutex);
+
+	MyLog(LOGA_DEBUG, "Main thread ending");
+
+	/*exit:*/ MyLog(LOGA_INFO, "%s: test %s. %d tests run, %d failures.",
+			(failures == 0) ? "passed" : "failed", testname, tests, failures);
+	write_test_result();
+
+	return failures;
+}
+
+
+
+int main(int argc, char** argv)
+{
+	int rc = -1;
+ 	int (*tests[])() = {NULL,
+ 		test_mutex,
+ 		test_sem,
+#if !defined(WIN32) && !defined(WIN64)
+		test_cond
+#endif
+ 	}; /* indexed starting from 1 */
+	int i;
+
+	xml = fopen("TEST-thread.xml", "w");
+	fprintf(xml, "<testsuite name=\"thread\" tests=\"%d\">\n", (int)(ARRAY_SIZE(tests)) - 1);
+
+	getopts(argc, argv);
+
+	for (i = 0; i < options.iterations; ++i)
+	{
+	 	if (options.test_no == -1)
+		{ /* run all the tests */
+			for (options.test_no = 1; options.test_no < ARRAY_SIZE(tests); ++options.test_no)
+			{
+				failures = rc = 0;
+				rc += tests[options.test_no](options); /* return number of failures.  0 = test succeeded */
+			}
+		}
+		else
+		{
+			if (options.test_no >= ARRAY_SIZE(tests))
+				MyLog(LOGA_INFO, "No test number %d", options.test_no);
+			else
+			{
+				rc = tests[options.test_no](options); /* run just the selected test */
+			}
+		}
+	}
+
+	if (rc == 0)
+		MyLog(LOGA_INFO, "verdict pass");
+	else
+		MyLog(LOGA_INFO, "verdict fail");
+
+	fprintf(xml, "</testsuite>\n");
+	fclose(xml);
+
+	return rc;
+}
diff --git a/mqtt/src/test/tls-testing/Dockerfile b/mqtt/src/test/tls-testing/Dockerfile
new file mode 100644
index 00000000..78270fea
--- /dev/null
+++ b/mqtt/src/test/tls-testing/Dockerfile
@@ -0,0 +1,3 @@
+FROM eclipse-mosquitto:latest
+COPY mosquitto-docker.conf /mosquitto/config/mosquitto.conf
+COPY keys /mosquitto/config/keys
diff --git a/mqtt/src/test/tls-testing/keys/all-ca.crt b/mqtt/src/test/tls-testing/keys/all-ca.crt
new file mode 100644
index 00000000..592d8e58
--- /dev/null
+++ b/mqtt/src/test/tls-testing/keys/all-ca.crt
@@ -0,0 +1,74 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, L=Derby, O=Paho Project, OU=Testing, CN=Root CA
+        Validity
+            Not Before: Jul 29 19:21:30 2013 GMT
+            Not After : Jul 28 19:21:30 2018 GMT
+        Subject: C=GB, ST=Derbyshire, O=Paho Project, OU=Testing, CN=Signing CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:dc:26:78:40:ae:b2:ad:2f:26:12:0a:d5:b1:18:
+                    80:16:d8:88:be:0b:42:ce:32:ad:12:d5:f5:78:1b:
+                    35:28:f2:13:1b:05:09:fb:7e:d7:d9:a1:8a:0d:4a:
+                    fe:95:37:d4:16:75:83:e4:6a:44:34:33:57:2e:49:
+                    ba:bc:b4:cf:d0:c0:87:e0:bc:f0:60:76:14:00:d6:
+                    eb:cb:f6:db:b3:43:f1:c8:4d:4a:0a:bb:e0:37:7c:
+                    8e:93:1f:a0:87:68:59:fe:0c:25:40:f3:7c:fd:71:
+                    90:55:ef:de:18:b4:08:86:c9:75:c2:99:2f:ce:12:
+                    bf:c5:5e:cf:5f:f1:06:53:07
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                29:4D:6E:C7:F2:F7:71:72:DA:27:9C:9C:AB:DA:07:1D:47:9C:D8:41
+            X509v3 Authority Key Identifier: 
+                keyid:4A:2B:69:D6:31:1D:A3:68:E8:46:6F:FB:4B:F3:8E:B6:8D:51:0E:BF
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+         48:ec:d7:80:8a:8f:82:a6:42:b1:89:2c:b9:4b:6d:0a:37:b8:
+         72:19:05:de:75:80:0c:d6:41:97:b2:d7:fe:99:cb:7e:c4:0e:
+         77:97:09:a8:9f:87:ff:0b:de:3f:1c:dc:1e:fe:09:36:a7:f5:
+         54:9a:85:4e:fb:6f:27:fe:0f:29:45:61:8d:07:c6:0c:da:37:
+         3d:a3:69:4b:82:71:e6:24:e0:87:a6:ee:d5:87:61:dd:8f:08:
+         fe:33:a6:1f:ae:b2:ae:1f:d8:2c:20:c8:a6:fc:33:0e:82:68:
+         80:23:61:10:ad:5c:1d:80:d6:b1:5f:e4:af:66:6d:63:10:e4:
+         96:e4
+-----BEGIN CERTIFICATE-----
+MIICkzCCAfygAwIBAgIBATANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEOMAwGA1UEBwwFRGVyYnkxFTATBgNVBAoMDFBh
+aG8gUHJvamVjdDEQMA4GA1UECwwHVGVzdGluZzEQMA4GA1UEAwwHUm9vdCBDQTAe
+Fw0xMzA3MjkxOTIxMzBaFw0xODA3MjgxOTIxMzBaMGAxCzAJBgNVBAYTAkdCMRMw
+EQYDVQQIDApEZXJieXNoaXJlMRUwEwYDVQQKDAxQYWhvIFByb2plY3QxEDAOBgNV
+BAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwgZ8wDQYJKoZIhvcNAQEB
+BQADgY0AMIGJAoGBANwmeECusq0vJhIK1bEYgBbYiL4LQs4yrRLV9XgbNSjyExsF
+Cft+19mhig1K/pU31BZ1g+RqRDQzVy5Jury0z9DAh+C88GB2FADW68v227ND8chN
+Sgq74Dd8jpMfoIdoWf4MJUDzfP1xkFXv3hi0CIbJdcKZL84Sv8Vez1/xBlMHAgMB
+AAGjUDBOMB0GA1UdDgQWBBQpTW7H8vdxctonnJyr2gcdR5zYQTAfBgNVHSMEGDAW
+gBRKK2nWMR2jaOhGb/tL8462jVEOvzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
+BQUAA4GBAEjs14CKj4KmQrGJLLlLbQo3uHIZBd51gAzWQZey1/6Zy37EDneXCaif
+h/8L3j8c3B7+CTan9VSahU77byf+DylFYY0HxgzaNz2jaUuCceYk4Iem7tWHYd2P
+CP4zph+usq4f2CwgyKb8Mw6CaIAjYRCtXB2A1rFf5K9mbWMQ5Jbk
+-----END CERTIFICATE-----
+-----BEGIN CERTIFICATE-----
+MIICqDCCAhGgAwIBAgIJAKrzwmdXIUxsMA0GCSqGSIb3DQEBBQUAMG0xCzAJBgNV
+BAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJieTEVMBMG
+A1UECgwMUGFobyBQcm9qZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRAwDgYDVQQDDAdS
+b290IENBMB4XDTEzMDcyOTE5MjEyOVoXDTIzMDcyNzE5MjEyOVowbTELMAkGA1UE
+BhMCR0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxDjAMBgNVBAcMBURlcmJ5MRUwEwYD
+VQQKDAxQYWhvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3RpbmcxEDAOBgNVBAMMB1Jv
+b3QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKbPzEEWCKsjjwjJ787u
+Q32k5EdqoDddMEjSVbZNSNEwUew1L7O8NTbmtCEeVFQjOLAdmdiF3rQbXHV+Zew0
+jt2g4vtPpl1GOG6jA/6YznKAyQdvGCdYfGZUN2tN+mbtVxWqkHZitQDQGaSHnx24
+NX649La2uyFy+7l9o8++xPONAgMBAAGjUDBOMB0GA1UdDgQWBBRKK2nWMR2jaOhG
+b/tL8462jVEOvzAfBgNVHSMEGDAWgBRKK2nWMR2jaOhGb/tL8462jVEOvzAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAEd+gW86/W+fisz5PFHAeEw7zn9q
+dzLHm7+QZgNLZ9h7/ZbhObRUFMRtU2xm4amyh85h7hUE5R2E2uW2OXumic7/D4ZD
+6unjr4m5jwVWDTqTUYIcNSriyoDWAVlPfOWaU5NyUhqS1DM28tvOWVHVLCxmVcZl
+tJQqo5eHbQ/+Hjfx
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/tls-testing/keys/server/server-mitm.crt b/mqtt/src/test/tls-testing/keys/server/server-mitm.crt
new file mode 100644
index 00000000..7f21fd30
--- /dev/null
+++ b/mqtt/src/test/tls-testing/keys/server/server-mitm.crt
@@ -0,0 +1,61 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 2 (0x2)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Paho Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Aug 19 14:03:57 2013 GMT
+            Not After : Aug 18 14:03:57 2018 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=m2m.example.org
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:9f:f2:ee:40:bb:b6:e9:f9:2f:c1:79:ef:9b:a7:
+                    39:27:15:09:bd:48:44:b6:df:1e:92:eb:dd:1d:4e:
+                    36:d9:3a:06:80:d3:d1:33:c3:d7:6b:70:01:76:a0:
+                    53:2b:31:8e:96:6c:72:3a:ae:df:52:19:12:9b:ae:
+                    55:0b:0a:49:f4:52:b4:34:4c:24:39:45:f6:35:89:
+                    42:f8:92:86:82:9f:a4:fb:fd:db:b1:19:60:6f:fc:
+                    1e:22:a7:02:ec:61:07:57:f8:8c:cb:24:64:d7:89:
+                    39:ee:d0:da:40:04:55:16:8c:a0:78:38:7f:df:59:
+                    3e:75:6a:53:01:39:f8:3f:f5
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                22:EC:63:4C:22:BF:83:04:5D:37:AA:46:49:5D:03:39:AE:50:56:95
+            X509v3 Authority Key Identifier: 
+                keyid:29:4D:6E:C7:F2:F7:71:72:DA:27:9C:9C:AB:DA:07:1D:47:9C:D8:41
+
+    Signature Algorithm: sha1WithRSAEncryption
+         b6:b6:65:ec:fe:35:7d:b9:ce:45:2d:be:78:e2:55:79:a0:b0:
+         4c:df:07:43:9f:ce:2f:77:61:b8:a0:43:f4:e4:33:51:a1:2d:
+         f7:d9:cb:1f:b9:ba:a5:33:2e:18:e1:51:29:26:d6:32:93:3d:
+         f9:19:ac:31:1a:90:1c:1a:56:8b:96:d3:a4:0b:ae:0a:e3:00:
+         09:82:81:3f:d7:3a:52:de:9c:84:d7:bb:83:d1:0a:f2:28:be:
+         1d:a2:a8:4b:0d:05:7a:e5:ca:cf:f7:23:7d:b3:65:0a:23:cb:
+         6a:78:a6:8e:4d:29:2c:b2:5d:98:96:10:b7:cc:fd:04:04:d8:
+         7f:7b
+-----BEGIN CERTIFICATE-----
+MIICzTCCAjagAwIBAgIBAjANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEVMBMGA1UECgwMUGFobyBQcm9qZWN0MRAwDgYD
+VQQLDAdUZXN0aW5nMRMwEQYDVQQDDApTaWduaW5nIENBMB4XDTEzMDgxOTE0MDM1
+N1oXDTE4MDgxODE0MDM1N1owfDELMAkGA1UEBhMCR0IxGDAWBgNVBAgMD05vdHRp
+bmdoYW1zaGlyZTETMBEGA1UEBwwKTm90dGluZ2hhbTEPMA0GA1UECgwGU2VydmVy
+MRMwEQYDVQQLDApQcm9kdWN0aW9uMRgwFgYDVQQDDA9tMm0uZXhhbXBsZS5vcmcw
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAJ/y7kC7tun5L8F575unOScVCb1I
+RLbfHpLr3R1ONtk6BoDT0TPD12twAXagUysxjpZscjqu31IZEpuuVQsKSfRStDRM
+JDlF9jWJQviShoKfpPv927EZYG/8HiKnAuxhB1f4jMskZNeJOe7Q2kAEVRaMoHg4
+f99ZPnVqUwE5+D/1AgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQi7GNMIr+D
+BF03qkZJXQM5rlBWlTAfBgNVHSMEGDAWgBQpTW7H8vdxctonnJyr2gcdR5zYQTAN
+BgkqhkiG9w0BAQUFAAOBgQC2tmXs/jV9uc5FLb544lV5oLBM3wdDn84vd2G4oEP0
+5DNRoS332csfubqlMy4Y4VEpJtYykz35GawxGpAcGlaLltOkC64K4wAJgoE/1zpS
+3pyE17uD0QryKL4doqhLDQV65crP9yN9s2UKI8tqeKaOTSkssl2YlhC3zP0EBNh/
+ew==
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/tls-testing/keys/server/server-mitm.key b/mqtt/src/test/tls-testing/keys/server/server-mitm.key
new file mode 100644
index 00000000..cbde8854
--- /dev/null
+++ b/mqtt/src/test/tls-testing/keys/server/server-mitm.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICXQIBAAKBgQCf8u5Au7bp+S/Bee+bpzknFQm9SES23x6S690dTjbZOgaA09Ez
+w9drcAF2oFMrMY6WbHI6rt9SGRKbrlULCkn0UrQ0TCQ5RfY1iUL4koaCn6T7/dux
+GWBv/B4ipwLsYQdX+IzLJGTXiTnu0NpABFUWjKB4OH/fWT51alMBOfg/9QIDAQAB
+AoGBAJq4AOM5MQxOcHV0n+Qu88fsP8mKuH00gnyYDwEkAUZLLLM9MaYjEKPqal/3
+YbvsagLzz+MX+QmPG0LgdX8CatmV+Y1Ot1aSUykB3y4xJ0K4r5UdgXq3VjQHe0Es
+HcFEfd4i+U/TV2XAMi1T70XDE/B1tL7pR8PH1Ut/+jtL4RRBAkEAzwv4zQPcvc5k
+oGt6EHhOZCMtdMNhzmlJM6cqOTkzxtAzPo7f18UZ4xVfnL3RVgzDI9ygxQUq2fGn
+JP2Y6vd1uQJBAMXEPpjMhb9Z6shK9piEs9trhkuO0rGbCrf1lSnYTTdzojtGM0pV
+WiHf61sNq3aB8fvyIBlPkomNhGPjVIdkOh0CQBU1O7n8UEsc7g/Eko9HU3hMZiaU
+sNsMy9O/psKPym7t+qHIzsLyTJGHKfELPHsc+Ywd2FX2Doqehylx1I0U5fkCQQC/
+OjT09r5U+pMFPUcYzyhCgMQIh3+/cJV6r6KeJaL0fYFfI1AxDjrrCmO/VYZ4PspH
+viW/k6u0Cfz7wTNY/1cZAkBGSivOyQ3Hocj/6aWPWgagMeEwdS9/+7xyeQunigV6
+zf+0RkX0jzHv2uvrpVECt97BLBOmKdQFogKw24XQ9+B4
+-----END RSA PRIVATE KEY-----
diff --git a/mqtt/src/test/tls-testing/keys/server/server.crt b/mqtt/src/test/tls-testing/keys/server/server.crt
new file mode 100644
index 00000000..bb02ae1a
--- /dev/null
+++ b/mqtt/src/test/tls-testing/keys/server/server.crt
@@ -0,0 +1,61 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, O=Paho Project, OU=Testing, CN=Signing CA
+        Validity
+            Not Before: Aug 19 14:03:57 2013 GMT
+            Not After : Aug 18 14:03:57 2018 GMT
+        Subject: C=GB, ST=Nottinghamshire, L=Nottingham, O=Server, OU=Production, CN=m2m.eclipse.org
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:a1:17:38:47:00:53:78:7d:b5:28:46:08:76:ed:
+                    df:c0:87:6b:01:7d:5f:40:e6:36:c7:33:bd:e6:c5:
+                    15:0c:55:60:b8:4d:05:2f:19:0b:29:d6:d6:b9:e7:
+                    15:a3:2f:1b:e1:61:49:87:23:db:c1:ad:1d:5c:8a:
+                    4c:2f:1e:60:0b:1f:16:fa:37:a6:e0:76:ff:d2:b2:
+                    84:dd:b1:be:f5:39:7a:bc:40:0d:1b:fb:08:12:31:
+                    d4:97:89:d0:23:3b:6b:24:35:95:72:d4:bb:f9:f6:
+                    b4:8b:3e:98:f5:76:17:0e:11:27:f3:a3:8a:6f:02:
+                    e8:3e:1d:2a:b0:20:62:ac:17
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                10:9A:A2:BA:80:4A:70:31:1B:EB:92:A0:77:FA:1F:56:A1:7C:E7:C8
+            X509v3 Authority Key Identifier: 
+                keyid:29:4D:6E:C7:F2:F7:71:72:DA:27:9C:9C:AB:DA:07:1D:47:9C:D8:41
+
+    Signature Algorithm: sha1WithRSAEncryption
+         6d:33:28:7c:11:50:1c:c9:10:81:61:e1:bd:ff:5f:ec:d6:90:
+         6c:48:7f:a2:30:7c:55:db:f1:11:4e:58:ca:e2:51:b2:91:c3:
+         da:6a:22:48:e6:6f:5e:6d:39:b6:e5:ab:ec:1a:bb:2a:d3:be:
+         a0:06:8b:f6:a2:00:a9:5f:22:8c:54:31:b0:99:c2:6b:b4:92:
+         9b:f1:08:29:e8:93:0a:1d:e3:e5:7e:0e:9d:ce:b6:cc:fd:29:
+         8a:5f:e5:df:54:62:7e:53:d8:65:69:c5:88:a5:26:c2:25:5f:
+         73:9a:79:3c:56:a6:23:fc:8d:60:93:bc:3d:76:f2:cc:18:89:
+         5a:4d
+-----BEGIN CERTIFICATE-----
+MIICzTCCAjagAwIBAgIBATANBgkqhkiG9w0BAQUFADBgMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEVMBMGA1UECgwMUGFobyBQcm9qZWN0MRAwDgYD
+VQQLDAdUZXN0aW5nMRMwEQYDVQQDDApTaWduaW5nIENBMB4XDTEzMDgxOTE0MDM1
+N1oXDTE4MDgxODE0MDM1N1owfDELMAkGA1UEBhMCR0IxGDAWBgNVBAgMD05vdHRp
+bmdoYW1zaGlyZTETMBEGA1UEBwwKTm90dGluZ2hhbTEPMA0GA1UECgwGU2VydmVy
+MRMwEQYDVQQLDApQcm9kdWN0aW9uMRgwFgYDVQQDDA9tMm0uZWNsaXBzZS5vcmcw
+gZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKEXOEcAU3h9tShGCHbt38CHawF9
+X0DmNsczvebFFQxVYLhNBS8ZCynW1rnnFaMvG+FhSYcj28GtHVyKTC8eYAsfFvo3
+puB2/9KyhN2xvvU5erxADRv7CBIx1JeJ0CM7ayQ1lXLUu/n2tIs+mPV2Fw4RJ/Oj
+im8C6D4dKrAgYqwXAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8W
+HU9wZW5TU0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQQmqK6gEpw
+MRvrkqB3+h9WoXznyDAfBgNVHSMEGDAWgBQpTW7H8vdxctonnJyr2gcdR5zYQTAN
+BgkqhkiG9w0BAQUFAAOBgQBtMyh8EVAcyRCBYeG9/1/s1pBsSH+iMHxV2/ERTljK
+4lGykcPaaiJI5m9ebTm25avsGrsq076gBov2ogCpXyKMVDGwmcJrtJKb8Qgp6JMK
+HePlfg6dzrbM/SmKX+XfVGJ+U9hlacWIpSbCJV9zmnk8VqYj/I1gk7w9dvLMGIla
+TQ==
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/tls-testing/keys/server/server.key b/mqtt/src/test/tls-testing/keys/server/server.key
new file mode 100644
index 00000000..86987daa
--- /dev/null
+++ b/mqtt/src/test/tls-testing/keys/server/server.key
@@ -0,0 +1,15 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIICWwIBAAKBgQChFzhHAFN4fbUoRgh27d/Ah2sBfV9A5jbHM73mxRUMVWC4TQUv
+GQsp1ta55xWjLxvhYUmHI9vBrR1cikwvHmALHxb6N6bgdv/SsoTdsb71OXq8QA0b
++wgSMdSXidAjO2skNZVy1Lv59rSLPpj1dhcOESfzo4pvAug+HSqwIGKsFwIDAQAB
+AoGAF+3CD1HuFDzgFw5oHXpyPUAgVgVQi+xmgKqf79KgsMdR6a6PMZLPxLRECzNX
+VHkf9Beme2uJLjjP3rowXONvMptVj2U6IQPic4J7H/xIso4q4eqYz2Z3zH6ou95/
+MzqdlGx5Xrq68eZO4Hjjf440DVBURKTcBen6aiH1+LhNBlkCQQDUA3Uwfj2iylP1
+K92rME5eBT3TDQ+nFCN5gidOlzI3tGJLIYmff9vd5FMZ7+Wq94OPEWFSjOCDRYl1
+QptebqvLAkEAwoMhcoPaf8Ho9FgRQ/67ttea8f2aRWfMJ2TbzkXOzqAkIho0/i2B
+mP17Y/Ut8ABxzi0OWvc5nLzQyJ38IvgPZQJAFJMhVEtr/9hSvYA8StitQkKP9WNX
+GYfCyY/v8JiLrww6XcArcucdlzMJPYMibq0Gf2PYZgJ150dgR5jnKwricQJAcjm7
+bJpNt/TRrpwBF6MB7S/UCAPbkqKP2xp5kjqgZerZDUXClPl4P7Wrvll+7o/0RRVk
+drr0FD01hnpwVMDDmQJAYWRBkvXHx/u6N1VHutwW9KtpC5ONxydDwhjv5DS07gjq
+xir50wrdoaYKwgPxE7jRRASDjJ75aHUhQSC99Q22EQ==
+-----END RSA PRIVATE KEY-----
diff --git a/mqtt/src/test/tls-testing/keys/test-root-ca.crt b/mqtt/src/test/tls-testing/keys/test-root-ca.crt
new file mode 100644
index 00000000..92dd5836
--- /dev/null
+++ b/mqtt/src/test/tls-testing/keys/test-root-ca.crt
@@ -0,0 +1,17 @@
+-----BEGIN CERTIFICATE-----
+MIICqDCCAhGgAwIBAgIJAKrzwmdXIUxsMA0GCSqGSIb3DQEBBQUAMG0xCzAJBgNV
+BAYTAkdCMRMwEQYDVQQIDApEZXJieXNoaXJlMQ4wDAYDVQQHDAVEZXJieTEVMBMG
+A1UECgwMUGFobyBQcm9qZWN0MRAwDgYDVQQLDAdUZXN0aW5nMRAwDgYDVQQDDAdS
+b290IENBMB4XDTEzMDcyOTE5MjEyOVoXDTIzMDcyNzE5MjEyOVowbTELMAkGA1UE
+BhMCR0IxEzARBgNVBAgMCkRlcmJ5c2hpcmUxDjAMBgNVBAcMBURlcmJ5MRUwEwYD
+VQQKDAxQYWhvIFByb2plY3QxEDAOBgNVBAsMB1Rlc3RpbmcxEDAOBgNVBAMMB1Jv
+b3QgQ0EwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAKbPzEEWCKsjjwjJ787u
+Q32k5EdqoDddMEjSVbZNSNEwUew1L7O8NTbmtCEeVFQjOLAdmdiF3rQbXHV+Zew0
+jt2g4vtPpl1GOG6jA/6YznKAyQdvGCdYfGZUN2tN+mbtVxWqkHZitQDQGaSHnx24
+NX649La2uyFy+7l9o8++xPONAgMBAAGjUDBOMB0GA1UdDgQWBBRKK2nWMR2jaOhG
+b/tL8462jVEOvzAfBgNVHSMEGDAWgBRKK2nWMR2jaOhGb/tL8462jVEOvzAMBgNV
+HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAEd+gW86/W+fisz5PFHAeEw7zn9q
+dzLHm7+QZgNLZ9h7/ZbhObRUFMRtU2xm4amyh85h7hUE5R2E2uW2OXumic7/D4ZD
+6unjr4m5jwVWDTqTUYIcNSriyoDWAVlPfOWaU5NyUhqS1DM28tvOWVHVLCxmVcZl
+tJQqo5eHbQ/+Hjfx
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/tls-testing/keys/test-signing-ca.crt b/mqtt/src/test/tls-testing/keys/test-signing-ca.crt
new file mode 100644
index 00000000..3a10151d
--- /dev/null
+++ b/mqtt/src/test/tls-testing/keys/test-signing-ca.crt
@@ -0,0 +1,57 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 1 (0x1)
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=GB, ST=Derbyshire, L=Derby, O=Paho Project, OU=Testing, CN=Root CA
+        Validity
+            Not Before: Jul 29 19:21:30 2013 GMT
+            Not After : Jul 28 19:21:30 2018 GMT
+        Subject: C=GB, ST=Derbyshire, O=Paho Project, OU=Testing, CN=Signing CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (1024 bit)
+                Modulus:
+                    00:dc:26:78:40:ae:b2:ad:2f:26:12:0a:d5:b1:18:
+                    80:16:d8:88:be:0b:42:ce:32:ad:12:d5:f5:78:1b:
+                    35:28:f2:13:1b:05:09:fb:7e:d7:d9:a1:8a:0d:4a:
+                    fe:95:37:d4:16:75:83:e4:6a:44:34:33:57:2e:49:
+                    ba:bc:b4:cf:d0:c0:87:e0:bc:f0:60:76:14:00:d6:
+                    eb:cb:f6:db:b3:43:f1:c8:4d:4a:0a:bb:e0:37:7c:
+                    8e:93:1f:a0:87:68:59:fe:0c:25:40:f3:7c:fd:71:
+                    90:55:ef:de:18:b4:08:86:c9:75:c2:99:2f:ce:12:
+                    bf:c5:5e:cf:5f:f1:06:53:07
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                29:4D:6E:C7:F2:F7:71:72:DA:27:9C:9C:AB:DA:07:1D:47:9C:D8:41
+            X509v3 Authority Key Identifier: 
+                keyid:4A:2B:69:D6:31:1D:A3:68:E8:46:6F:FB:4B:F3:8E:B6:8D:51:0E:BF
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+         48:ec:d7:80:8a:8f:82:a6:42:b1:89:2c:b9:4b:6d:0a:37:b8:
+         72:19:05:de:75:80:0c:d6:41:97:b2:d7:fe:99:cb:7e:c4:0e:
+         77:97:09:a8:9f:87:ff:0b:de:3f:1c:dc:1e:fe:09:36:a7:f5:
+         54:9a:85:4e:fb:6f:27:fe:0f:29:45:61:8d:07:c6:0c:da:37:
+         3d:a3:69:4b:82:71:e6:24:e0:87:a6:ee:d5:87:61:dd:8f:08:
+         fe:33:a6:1f:ae:b2:ae:1f:d8:2c:20:c8:a6:fc:33:0e:82:68:
+         80:23:61:10:ad:5c:1d:80:d6:b1:5f:e4:af:66:6d:63:10:e4:
+         96:e4
+-----BEGIN CERTIFICATE-----
+MIICkzCCAfygAwIBAgIBATANBgkqhkiG9w0BAQUFADBtMQswCQYDVQQGEwJHQjET
+MBEGA1UECAwKRGVyYnlzaGlyZTEOMAwGA1UEBwwFRGVyYnkxFTATBgNVBAoMDFBh
+aG8gUHJvamVjdDEQMA4GA1UECwwHVGVzdGluZzEQMA4GA1UEAwwHUm9vdCBDQTAe
+Fw0xMzA3MjkxOTIxMzBaFw0xODA3MjgxOTIxMzBaMGAxCzAJBgNVBAYTAkdCMRMw
+EQYDVQQIDApEZXJieXNoaXJlMRUwEwYDVQQKDAxQYWhvIFByb2plY3QxEDAOBgNV
+BAsMB1Rlc3RpbmcxEzARBgNVBAMMClNpZ25pbmcgQ0EwgZ8wDQYJKoZIhvcNAQEB
+BQADgY0AMIGJAoGBANwmeECusq0vJhIK1bEYgBbYiL4LQs4yrRLV9XgbNSjyExsF
+Cft+19mhig1K/pU31BZ1g+RqRDQzVy5Jury0z9DAh+C88GB2FADW68v227ND8chN
+Sgq74Dd8jpMfoIdoWf4MJUDzfP1xkFXv3hi0CIbJdcKZL84Sv8Vez1/xBlMHAgMB
+AAGjUDBOMB0GA1UdDgQWBBQpTW7H8vdxctonnJyr2gcdR5zYQTAfBgNVHSMEGDAW
+gBRKK2nWMR2jaOhGb/tL8462jVEOvzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEB
+BQUAA4GBAEjs14CKj4KmQrGJLLlLbQo3uHIZBd51gAzWQZey1/6Zy37EDneXCaif
+h/8L3j8c3B7+CTan9VSahU77byf+DylFYY0HxgzaNz2jaUuCceYk4Iem7tWHYd2P
+CP4zph+usq4f2CwgyKb8Mw6CaIAjYRCtXB2A1rFf5K9mbWMQ5Jbk
+-----END CERTIFICATE-----
diff --git a/mqtt/src/test/tls-testing/mosquitto-docker.conf b/mqtt/src/test/tls-testing/mosquitto-docker.conf
new file mode 100644
index 00000000..ebc2a99f
--- /dev/null
+++ b/mqtt/src/test/tls-testing/mosquitto-docker.conf
@@ -0,0 +1,49 @@
+log_type error
+log_type warning
+log_type notice
+log_type information
+#log_type debug
+
+#log_dest file /var/log/mosquitto/tls-testing.log
+
+allow_anonymous true
+
+#message_size_limit 5000000
+
+# non-SSL listeners
+listener 1883
+listener 18883
+
+# listener for mutual authentication
+listener 18884
+cafile /mosquitto/config/keys/all-ca.crt
+certfile /mosquitto/config/keys/server/server.crt
+keyfile /mosquitto/config/keys/server/server.key
+require_certificate true
+#tls_version tlsv1
+
+# server authentication - no client authentication
+listener 18885
+cafile /mosquitto/config/keys/all-ca.crt
+certfile /mosquitto/config/keys/server/server.crt
+keyfile /mosquitto/config/keys/server/server.key
+require_certificate false
+#tls_version tlsv1
+
+listener 18886
+cafile /mosquitto/config/keys/all-ca.crt
+certfile /mosquitto/config/keys/server/server.crt
+keyfile /mosquitto/config/keys/server/server.key
+require_certificate false
+#ciphers ADH-DES-CBC-SHA
+#tls_version tlsv1
+
+# server authentication - no client authentication - uses fake hostname to
+# simulate mitm attack. Clients should refuse to connect to this listener.
+listener 18887
+#cafile /mosquitto/config/keys/all-ca.crt
+cafile /mosquitto/config/keys/server/server.crt
+certfile /mosquitto/config/keys/server/server-mitm.crt
+keyfile /mosquitto/config/keys/server/server-mitm.key
+require_certificate true
+#tls_version tlsv1
diff --git a/mqtt/src/test/tls-testing/mosquitto.conf b/mqtt/src/test/tls-testing/mosquitto.conf
new file mode 100644
index 00000000..9f9bdbd1
--- /dev/null
+++ b/mqtt/src/test/tls-testing/mosquitto.conf
@@ -0,0 +1,57 @@
+log_type error
+log_type warning
+log_type notice
+log_type information
+#log_type debug
+
+#log_dest file /var/log/mosquitto/tls-testing.log
+
+allow_anonymous true
+password_file test/tls-testing/mosquitto.pw
+
+#message_size_limit 5000000
+
+# non-SSL listeners
+listener 1883
+listener 18883
+
+# listener for mutual authentication
+listener 18884
+cafile test/ssl/all-ca.crt
+certfile test/ssl/server.crt
+keyfile test/ssl/server.key
+require_certificate true
+use_identity_as_username false
+#tls_version tlsv1
+
+# server authentication - no client authentication
+listener 18885
+cafile test/ssl/all-ca.crt
+certfile test/ssl/server.crt
+keyfile test/ssl/server.key
+require_certificate false
+#tls_version tlsv1
+
+listener 18886
+cafile test/tls-testing/keys/all-ca.crt
+certfile test/ssl/server.crt
+keyfile test/ssl/server.key
+require_certificate false
+#ciphers ADH-DES-CBC-SHA
+#tls_version tlsv1
+
+# server authentication - no client authentication - uses fake hostname to
+# simulate mitm attack. Clients should refuse to connect to this listener.
+listener 18887
+#cafile test/tls-testing/keys/all-ca.crt
+cafile test/tls-testing/keys/server/server.crt
+certfile test/tls-testing/keys/server/server-mitm.crt
+keyfile test/tls-testing/keys/server/server-mitm.key
+require_certificate true
+#tls_version tlsv1
+
+# TLS-PSK authentication
+listener 18888
+ciphers PSK-AES128-CBC-SHA
+psk_hint Test
+psk_file test/tls-testing/mosquitto.psk
diff --git a/mqtt/src/test/tls-testing/mosquitto.psk b/mqtt/src/test/tls-testing/mosquitto.psk
new file mode 100644
index 00000000..5767d17c
--- /dev/null
+++ b/mqtt/src/test/tls-testing/mosquitto.psk
@@ -0,0 +1 @@
+id:50534B00
diff --git a/mqtt/src/test/tls-testing/mosquitto.pw b/mqtt/src/test/tls-testing/mosquitto.pw
new file mode 100644
index 00000000..07af45ce
--- /dev/null
+++ b/mqtt/src/test/tls-testing/mosquitto.pw
@@ -0,0 +1,3 @@
+test_user:$6$PY1pf+FdPmONSyhb$gC0yIykOSqj5x2rY7odzhNqLrQJ1S7dpQAgvxK+DXKquw1Yp5whSSgfcv24xTIotm3KCt1D6vcISOq/m3OhGEg==
+testuser:$6$VsVwgoeK2yQI5QTo$2fSqD6qUgMvfSOQQxRm7aQH1sA2oqGmdbNFM86GBbjWja7sN5wxOQHIjk/B8PeOqmMOee5UWX2faXy+X9fPZ4w==
+Admin:$6$OAKIhJgkrZUTDSbN$AmKUUznotPbGl5XaFbs8wqw4OyWFkjOgxJfJ4C/9vaknsouvR4RmsEozCee2SPwFaXSR52QRype/9+iSvU7y5w==
diff --git a/mqtt/src/test_package/CMakeLists.txt b/mqtt/src/test_package/CMakeLists.txt
new file mode 100644
index 00000000..0ca81945
--- /dev/null
+++ b/mqtt/src/test_package/CMakeLists.txt
@@ -0,0 +1,12 @@
+project(test_package C)
+cmake_minimum_required(VERSION 2.8.11)
+
+include(${CMAKE_BINARY_DIR}/conanbuildinfo.cmake)
+conan_basic_setup()
+
+file(GLOB SOURCE_FILES *.c)
+
+message("LIBS: ${CONAN_LIBS}")
+
+add_executable(${PROJECT_NAME} ${SOURCE_FILES})
+target_link_libraries(${PROJECT_NAME} ${CONAN_LIBS})
\ No newline at end of file
diff --git a/mqtt/src/test_package/conanfile.py b/mqtt/src/test_package/conanfile.py
new file mode 100644
index 00000000..97fc2f10
--- /dev/null
+++ b/mqtt/src/test_package/conanfile.py
@@ -0,0 +1,26 @@
+from conans import ConanFile, CMake, tools, RunEnvironment
+import os
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "compiler", "build_type", "arch"
+    generators = "cmake"
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def imports(self):
+        self.copy("*paho*.dll", dst="bin", src="bin")
+        self.copy("*paho*.dylib*", dst="bin", src="lib")
+
+    def test(self):
+        with tools.environment_append(RunEnvironment(self).vars):
+            bin_path = os.path.join("bin", "test_package")
+            if self.settings.os == "Windows":
+                self.run(bin_path)
+            elif self.settings.os == "Macos":
+                self.run("DYLD_LIBRARY_PATH=%s %s" % (os.environ.get('DYLD_LIBRARY_PATH', ''), bin_path))
+            else:
+                self.run("LD_LIBRARY_PATH=%s %s" % (os.environ.get('LD_LIBRARY_PATH', ''), bin_path))
diff --git a/mqtt/src/test_package/test_package.c b/mqtt/src/test_package/test_package.c
new file mode 100644
index 00000000..5576b7eb
--- /dev/null
+++ b/mqtt/src/test_package/test_package.c
@@ -0,0 +1,58 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "MQTTClient.h"
+
+#define ADDRESS "tcp://localhost:1883"
+#define CLIENTID "ExampleClientSub"
+#define TOPIC "MQTT Examples"
+#define PAYLOAD "Hello World!"
+#define QOS 1
+#define TIMEOUT 10000L
+
+volatile MQTTClient_deliveryToken deliveredtoken;
+
+void delivered(void *context, MQTTClient_deliveryToken dt)
+{
+    printf("Message with token value %d delivery confirmed\n", dt);
+    deliveredtoken = dt;
+}
+
+int msgarrvd(void *context, char *topicName, int topicLen, MQTTClient_message *message)
+{
+    int i;
+    char *payloadptr;
+    printf("Message arrived\n");
+    printf("     topic: %s\n", topicName);
+    printf("   message: ");
+    payloadptr = message->payload;
+    for (i = 0; i < message->payloadlen; i++)
+    {
+        putchar(*payloadptr++);
+    }
+    putchar('\n');
+    MQTTClient_freeMessage(&message);
+    MQTTClient_free(topicName);
+    return 1;
+}
+
+void connlost(void *context, char *cause)
+{
+    printf("\nConnection lost\n");
+    printf("     cause: %s\n", cause);
+}
+
+int main(int argc, char *argv[])
+{
+    printf("\nCreating MQTTClient\n");
+    MQTTClient client;
+    MQTTClient_connectOptions conn_opts = MQTTClient_connectOptions_initializer;
+    MQTTClient_create(&client, ADDRESS, CLIENTID,
+                      MQTTCLIENT_PERSISTENCE_NONE, NULL);
+    conn_opts.keepAliveInterval = 20;
+    conn_opts.cleansession = 1;
+    MQTTClient_setCallbacks(client, NULL, connlost, msgarrvd, delivered);
+    MQTTClient_destroy(&client);
+    printf("\nExiting\n");
+    return 0;
+}
\ No newline at end of file
diff --git a/mqtt/src/travis-build.sh b/mqtt/src/travis-build.sh
new file mode 100755
index 00000000..5ac6bfd5
--- /dev/null
+++ b/mqtt/src/travis-build.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+rm -rf build.paho
+mkdir build.paho
+cd build.paho
+echo "travis build dir $TRAVIS_BUILD_DIR pwd $PWD"
+cmake -DCMAKE_BUILD_TYPE=Debug -DPAHO_WITH_SSL=TRUE -DPAHO_BUILD_DOCUMENTATION=FALSE -DPAHO_BUILD_SAMPLES=TRUE ..
+make
+python3 ../test/mqttsas.py &
+ctest -VV --timeout 600
+cpack --verbose
+kill %1
+#killall mosquitto
+
diff --git a/mqtt/src/travis-deploy.sh b/mqtt/src/travis-deploy.sh
new file mode 100644
index 00000000..81b97c79
--- /dev/null
+++ b/mqtt/src/travis-deploy.sh
@@ -0,0 +1 @@
+scp -v -o StrictHostKeyChecking=no build.paho/*.tar.gz icraggs@build.eclipse.org:../../../../shared/technology/paho/C/
diff --git a/mqtt/src/travis-env-vars b/mqtt/src/travis-env-vars
new file mode 100644
index 00000000..2551ccb6
--- /dev/null
+++ b/mqtt/src/travis-env-vars
@@ -0,0 +1,2 @@
+export TRAVIS_OS_NAME=linux
+export TRAVIS_BUILD_DIR=$PWD
diff --git a/mqtt/src/travis-install.sh b/mqtt/src/travis-install.sh
new file mode 100755
index 00000000..a83c443b
--- /dev/null
+++ b/mqtt/src/travis-install.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+	pwd
+	sudo service mosquitto stop
+	# Stop any mosquitto instance which may be still running from previous runs
+	killall mosquitto
+	# mosquitto -h
+	# mosquitto -c test/tls-testing/mosquitto.conf &
+
+	git clone https://github.com/eclipse/paho.mqtt.testing.git
+	cd paho.mqtt.testing/interoperability
+	python3 startbroker.py -c localhost_testing.conf &
+	cd ../..
+fi
+
+if [ "$TRAVIS_OS_NAME" == "osx" ]; then
+	pwd
+	brew update
+	# brew install openssl mosquitto
+	# brew services stop mosquitto
+	# /usr/local/sbin/mosquitto -c test/tls-testing/mosquitto.conf &
+
+	brew upgrade python
+	git clone https://github.com/eclipse/paho.mqtt.testing.git
+	cd paho.mqtt.testing/interoperability
+	python3 startbroker.py -c localhost_testing.conf &
+	cd ../..
+fi
diff --git a/mqtt/src/travis-macos-vars b/mqtt/src/travis-macos-vars
new file mode 100644
index 00000000..bbdbccb5
--- /dev/null
+++ b/mqtt/src/travis-macos-vars
@@ -0,0 +1,2 @@
+export TRAVIS_OS_NAME=osx
+export TRAVIS_BUILD_DIR=$PWD
diff --git a/mqtt/src/travis-setup-deploy.sh b/mqtt/src/travis-setup-deploy.sh
new file mode 100755
index 00000000..0708f200
--- /dev/null
+++ b/mqtt/src/travis-setup-deploy.sh
@@ -0,0 +1,4 @@
+openssl aes-256-cbc -K $encrypted_dcd2b299f7c9_key -iv $encrypted_dcd2b299f7c9_iv -in deploy_rsa.enc -out /tmp/deploy_rsa -d
+eval "$(ssh-agent -s)"
+chmod 600 /tmp/deploy_rsa
+ssh-add /tmp/deploy_rsa
diff --git a/mwan3/Makefile b/mwan3/Makefile
new file mode 100644
index 00000000..fe70b7ec
--- /dev/null
+++ b/mwan3/Makefile
@@ -0,0 +1,74 @@
+#
+# Copyright (C) 2006-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mwan3
+PKG_VERSION:=2.8.15
+PKG_RELEASE:=2
+PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mwan3
+   SECTION:=net
+   CATEGORY:=Network
+   SUBMENU:=Routing and Redirection
+   DEPENDS:= \
+     +rpcd \
+     +ip \
+     +ipset \
+     +iptables \
+     +iptables-mod-conntrack-extra \
+     +iptables-mod-ipopt \
+     +jshn
+   TITLE:=Multiwan hotplug script with connection tracking support
+   MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
+   PKGARCH:=all
+endef
+
+define Package/mwan3/config
+        select BUSYBOX_CUSTOM
+        select BUSYBOX_CONFIG_TIMEOUT
+endef
+
+define Package/mwan3/description
+Hotplug script which makes configuration of multiple WAN interfaces simple
+and manageable. With loadbalancing/failover support for up to 250 wan
+interfaces, connection tracking and an easy to manage traffic ruleset.
+endef
+
+define Package/mwan3/conffiles
+/etc/config/mwan3
+/etc/mwan3.user
+endef
+
+define Build/Compile
+endef
+
+define Package/mwan3/postinst
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/rpcd restart
+fi
+exit 0
+endef
+
+define Package/mwan3/postrm
+#!/bin/sh
+if [ -z "$${IPKG_INSTROOT}" ]; then
+	/etc/init.d/rpcd restart
+fi
+exit 0
+endef
+
+define Package/mwan3/install
+$(CP) ./files/* $(1)
+endef
+
+$(eval $(call BuildPackage,mwan3))
diff --git a/mwan3/files/etc/config/mwan3 b/mwan3/files/etc/config/mwan3
new file mode 100644
index 00000000..2baa6abe
--- /dev/null
+++ b/mwan3/files/etc/config/mwan3
@@ -0,0 +1,170 @@
+config globals 'globals'
+	option enabled '1'
+	option mmx_mask '0x3F00'
+
+config interface 'wan'
+	option enabled '1'
+	list track_ip '1.1.1.1'
+	list track_ip '8.8.8.8'
+	list track_ip '208.67.222.222'
+	list track_ip '208.67.220.220'
+	option family 'ipv4'
+	option reliability '1'
+	option count '1'
+	option timeout '2'
+	option interval '5'
+	option down '3'
+	option up '8'
+
+config interface 'wwan'
+	option enabled '1'
+	list track_ip '1.1.1.1'
+	list track_ip '8.8.8.8'
+	list track_ip '208.67.222.222'
+	list track_ip '208.67.220.220'
+	option family 'ipv4'
+	option reliability '1'
+	option count '1'
+	option timeout '2'
+	option interval '5'
+	option down '3'
+	option up '8'
+
+config interface 'tethering'
+	option enabled '1'
+	list track_ip '1.1.1.1'
+	list track_ip '8.8.8.8'
+	list track_ip '208.67.222.222'
+	list track_ip '208.67.220.220'
+	option family 'ipv4'
+	option reliability '1'
+	option count '1'
+	option timeout '2'
+	option interval '5'
+	option down '3'
+	option up '8'
+
+config member 'wan_only'
+	option interface 'wan'
+	option metric '1'
+	option weight '3'
+
+config member 'wwan_only'
+	option interface 'wwan'
+	option metric '2'
+	option weight '3'
+
+config member 'tethering_only'
+	option interface 'tethering'
+	option metric '3'
+	option weight '3'
+
+config member 'wan_balance'
+	option interface 'wan'
+	option metric '1'
+	option weight '3'
+
+config member 'wwan_balance'
+	option interface 'wwan'
+	option metric '1'
+	option weight '3'
+
+config member 'tethering_balance'
+	option interface 'tethering'
+	option metric '1'
+	option weight '3'
+
+config policy 'default_poli'
+	list use_member 'wan_only'
+	list use_member 'wwan_only'
+	list use_member 'tethering_only'
+	option last_resort 'default'
+
+config rule 'default_rule'
+	option dest_ip '0.0.0.0/0'
+	option use_policy 'default_poli'
+	option family 'ipv4'
+
+config interface 'wan6'
+	option enabled '1'
+	list track_ip '2001:4860:4860::8844'
+	list track_ip '2001:4860:4860::8888'
+	list track_ip '2620:0:ccd::2'
+	list track_ip '2620:0:ccc::2'
+	option family 'ipv6'
+	option reliability '1'
+	option count '1'
+	option timeout '2'
+	option interval '5'
+	option down '3'
+	option up '8'
+
+config interface 'wwan6'
+	option enabled '1'
+	list track_ip '2001:4860:4860::8844'
+	list track_ip '2001:4860:4860::8888'
+	list track_ip '2620:0:ccd::2'
+	list track_ip '2620:0:ccc::2'
+	option family 'ipv6'
+	option reliability '1'
+	option count '1'
+	option timeout '2'
+	option interval '5'
+	option down '3'
+	option up '8'
+
+config interface 'tethering6'
+	option enabled '1'
+	list track_ip '2001:4860:4860::8844'
+	list track_ip '2001:4860:4860::8888'
+	list track_ip '2620:0:ccd::2'
+	list track_ip '2620:0:ccc::2'
+	option family 'ipv6'
+	option reliability '1'
+	option count '1'
+	option timeout '2'
+	option interval '5'
+	option down '3'
+	option up '8'
+
+config member 'wan6_only'
+	option interface 'wan6'
+	option metric '1'
+	option weight '3'
+
+config member 'wwan6_only'
+	option interface 'wwan6'
+	option metric '2'
+	option weight '3'
+
+config member 'tethering6_only'
+	option interface 'tethering6'
+	option metric '3'
+	option weight '3'
+
+config member 'wan6_balance'
+	option interface 'wan6'
+	option metric '1'
+	option weight '3'
+
+config member 'wwan6_balance'
+	option interface 'wwan6'
+	option metric '1'
+	option weight '3'
+
+config member 'tethering6_balance'
+	option interface 'tethering6'
+	option metric '1'
+	option weight '3'
+
+config policy 'default_poli_v6'
+	list use_member 'wan6_only'
+	list use_member 'wwan6_only'
+	list use_member 'tethering6_only'
+	option last_resort 'default'
+
+config rule 'default_rule_v6'
+	option dest_ip '::/0'
+	option family 'ipv6'
+	option use_policy 'default_poli_v6'
+
diff --git a/mwan3/files/etc/hotplug.d/iface/15-mwan3 b/mwan3/files/etc/hotplug.d/iface/15-mwan3
new file mode 100644
index 00000000..a97da9d6
--- /dev/null
+++ b/mwan3/files/etc/hotplug.d/iface/15-mwan3
@@ -0,0 +1,101 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/functions/network.sh
+. /lib/mwan3/mwan3.sh
+. /usr/share/libubox/jshn.sh
+
+[ "$ACTION" == "ifup" -o "$ACTION" == "ifdown" ] || exit 1
+[ -n "$INTERFACE" ] || exit 2
+
+if [ "$ACTION" == "ifup" ]; then
+	[ -n "$DEVICE" ] || exit 3
+fi
+
+mwan3_lock "$ACTION" "$INTERFACE"
+config_load mwan3
+config_get_bool enabled globals 'enabled' '0'
+[ "${enabled}" -gt 0 ] || {
+	mwan3_unlock "$ACTION" "$INTERFACE"
+	exit 0
+}
+
+config_get initial_state $INTERFACE initial_state "online"
+config_get_bool enabled $INTERFACE 'enabled' '0'
+[ -n "${enabled}" ] || {
+	mwan3_unlock "$ACTION" "$INTERFACE"
+	exit 0
+}
+
+mwan3_init
+mwan3_set_connected_iptables
+mwan3_set_custom_ipset
+
+
+if [ "$ACTION" = "ifup" ]; then
+	config_get family $INTERFACE family ipv4
+	if [ "$family" = "ipv4" ]; then
+		ubus call network.interface.${INTERFACE}_4 status &>/dev/null
+		if [ "$?" -eq "0" ]; then
+			network_get_ipaddr src_ip ${INTERFACE}_4
+		else
+			network_get_ipaddr src_ip ${INTERFACE}
+		fi
+		[ -n "$src_ip" ] || src_ip="0.0.0.0"
+	elif [ "$family" = "ipv6" ]; then
+		ubus call network.interface.${INTERFACE}_6 status &>/dev/null
+		if [ "$?" -eq "0" ]; then
+			network_get_ipaddr6 src_ip ${INTERFACE}_6
+		else
+			network_get_ipaddr6 src_ip ${INTERFACE}
+		fi
+		[ -n "$src_ip" ] || src_ip="::"
+	fi
+fi
+
+if [ "$initial_state" = "offline" ]; then
+	json_load "$(ubus call mwan3 status '{"section":"interfaces"}')"
+	json_select "interfaces"
+	json_select "${INTERFACE}"
+	json_get_var running running
+	json_get_var status status
+else
+	status=online
+	running=1
+fi
+
+$LOG notice "Execute "$ACTION" event on interface $INTERFACE (${DEVICE:-unknown})"
+
+case "$ACTION" in
+	ifup)
+		mwan3_set_general_rules
+		mwan3_set_general_iptables
+		mwan3_create_iface_iptables $INTERFACE $DEVICE
+		mwan3_create_iface_rules $INTERFACE $DEVICE
+		mwan3_create_iface_route $INTERFACE $DEVICE
+		if [ "${running}" -eq 1 ] && [ "${status}" = "online" ]; then
+			$LOG notice "Starting tracker on interface $INTERFACE (${DEVICE:-unknown})"
+			mwan3_set_iface_hotplug_state $INTERFACE "online"
+			mwan3_track $INTERFACE $DEVICE "online" "$src_ip"
+		else
+			$LOG notice "Starting tracker on interface $INTERFACE (${DEVICE:-unknown})"
+			mwan3_set_iface_hotplug_state $INTERFACE "offline"
+			mwan3_track $INTERFACE $DEVICE "offline" "$src_ip"
+			mwan3_delete_iface_route_by_ifname $INTERFACE
+		fi
+		mwan3_set_policies_iptables
+		mwan3_set_user_rules
+	;;
+	ifdown)
+		mwan3_set_iface_hotplug_state $INTERFACE "offline"
+		mwan3_delete_iface_ipset_entries $INTERFACE
+		mwan3_track_signal $INTERFACE $DEVICE
+		mwan3_set_policies_iptables
+		mwan3_delete_iface_route_by_ifname $INTERFACE
+		mwan3_set_user_rules
+	;;
+esac
+
+mwan3_unlock "$ACTION" "$INTERFACE"
+
+exit 0
diff --git a/mwan3/files/etc/hotplug.d/iface/16-mwan3 b/mwan3/files/etc/hotplug.d/iface/16-mwan3
new file mode 100644
index 00000000..ef30efc0
--- /dev/null
+++ b/mwan3/files/etc/hotplug.d/iface/16-mwan3
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/functions/network.sh
+. /lib/mwan3/mwan3.sh
+
+
+config_load mwan3
+config_get_bool enabled globals 'enabled' '0'
+[ "${enabled}" -gt 0 ] || {
+	exit 0
+}
+
+if [ "$ACTION" = "ifup" ]; then
+	mwan3_rtmon
+fi
+
+mwan3_lock "$ACTION" "mwan3rtmon"
+
+config_get_bool enabled "$INTERFACE" 'enabled' '0'
+[ "${enabled}" -eq 0 ] || {
+	mwan3_flush_conntrack "$INTERFACE" "$ACTION"
+}
+
+[ "$(uci -q get gl_mwan3.mwan3.flush_track)" = "1" ] && /usr/bin/clean_client_conntrack
+
+mwan3_unlock "$ACTION" "mwan3rtmon"
+
+exit 0
diff --git a/mwan3/files/etc/hotplug.d/iface/16-mwan3-user b/mwan3/files/etc/hotplug.d/iface/16-mwan3-user
new file mode 100644
index 00000000..af28b1f4
--- /dev/null
+++ b/mwan3/files/etc/hotplug.d/iface/16-mwan3-user
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+[ -f "/etc/mwan3.user" ] && {
+	. /lib/functions.sh
+	. /lib/mwan3/mwan3.sh
+
+	mwan3_lock "$ACTION" "user"
+
+	config_load mwan3
+	config_get_bool enabled globals 'enabled' '0'
+	[ "${enabled}" -gt 0 ] || {
+		mwan3_unlock "$ACTION" "user"
+		exit 0
+	}
+
+	config_get_bool enabled "$INTERFACE" enabled 0
+	[ "${enabled}" -eq 1 ] || {
+		mwan3_unlock "$ACTION" "user"
+		exit 0
+	}
+
+	mwan3_unlock "$ACTION" "user"
+
+	env -i ACTION="$ACTION" INTERFACE="$INTERFACE" DEVICE="$DEVICE" \
+		/bin/sh /etc/mwan3.user
+}
+
+exit 0
diff --git a/mwan3/files/etc/init.d/mwan3 b/mwan3/files/etc/init.d/mwan3
new file mode 100755
index 00000000..e0c65889
--- /dev/null
+++ b/mwan3/files/etc/init.d/mwan3
@@ -0,0 +1,33 @@
+#!/bin/sh /etc/rc.common
+
+START=19
+USE_PROCD=1
+
+boot() {
+	. /lib/config/uci.sh
+	uci_toggle_state mwan3 globals enabled "1"
+	mwan3_boot=1
+	rc_procd start_service
+}
+
+# FIXME
+# fd 1000 is an inherited lock file descriptor for preventing concurrent
+# init script executions. Close it here to prevent the mwan3 daemon from
+# inheriting it further to avoid holding the lock indefinitely.
+
+reload_service() {
+	/usr/sbin/mwan3 restart 1000>&-
+}
+
+start_service() {
+	[ -n "${mwan3_boot}" ] && return 0
+	/usr/sbin/mwan3 start 1000>&-
+}
+
+stop_service() {
+	/usr/sbin/mwan3 stop 1000>&-
+}
+
+service_triggers() {
+	procd_add_reload_trigger 'mwan3'
+}
diff --git a/mwan3/files/etc/mwan3.user b/mwan3/files/etc/mwan3.user
new file mode 100644
index 00000000..4f700166
--- /dev/null
+++ b/mwan3/files/etc/mwan3.user
@@ -0,0 +1,30 @@
+#!/bin/sh
+#
+# This file is interpreted as shell script.
+# Put your custom mwan3 action here, they will
+# be executed with each netifd hotplug interface event
+# on interfaces for which mwan3 is enabled.
+#
+# There are three main environment variables that are passed to this script.
+#
+# $ACTION
+#      <ifup>         Is called by netifd and mwan3track
+#      <ifdown>       Is called by netifd and mwan3track
+#      <connected>    Is only called by mwan3track if tracking was successful
+#      <disconnected> Is only called by mwan3track if tracking has failed
+# $INTERFACE	Name of the interface which went up or down (e.g. "wan" or "wwan")
+# $DEVICE	Physical device name which interface went up or down (e.g. "eth0" or "wwan0")
+
+if [ "$ACTION" = "disconnected" ];then
+    proto=`uci -q get network.wan.proto`
+    device=`uci -q get network.wan.ifname`
+    [ -z "$device" ] && device=`uci -q get network.wan.device`
+    [ -z "$device" ] && exit
+    if [ "$proto" == "pppoe" -a "$device" == "$DEVICE" ];then
+        pid="$(pgrep -f "mwan3track $INTERFACE $DEVICE")"
+        [ "${pid}" != "" ] && {
+            kill -TERM "${pid}"
+            logger "kill mwan3track $INTERFACE $DEVICE"
+        }
+    fi
+fi
diff --git a/mwan3/files/etc/uci-defaults/mwan3-migrate-flush_conntrack b/mwan3/files/etc/uci-defaults/mwan3-migrate-flush_conntrack
new file mode 100644
index 00000000..1691efa2
--- /dev/null
+++ b/mwan3/files/etc/uci-defaults/mwan3-migrate-flush_conntrack
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+mwan3_migrate_flush_conntrack() {
+	local iface="$1"
+
+	config_get value "${iface}" flush_conntrack
+	case $value in
+		always)
+			uci_remove mwan3 "$iface" flush_conntrack
+			uci_add_list mwan3 "$iface" flush_conntrack ifup
+			uci_add_list mwan3 "$iface" flush_conntrack ifdown
+			;;
+		never)
+			uci_remove mwan3 "$iface" flush_conntrack
+			;;
+	esac
+
+	uci_commit mwan3
+}
+
+config_load mwan3
+config_foreach mwan3_migrate_flush_conntrack interface
+
+exit 0
diff --git a/mwan3/files/lib/mwan3/common.sh b/mwan3/files/lib/mwan3/common.sh
new file mode 100644
index 00000000..1af12991
--- /dev/null
+++ b/mwan3/files/lib/mwan3/common.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+get_uptime() {
+	local uptime=$(cat /proc/uptime)
+	echo "${uptime%%.*}"
+}
diff --git a/mwan3/files/lib/mwan3/mwan3.sh b/mwan3/files/lib/mwan3/mwan3.sh
new file mode 100644
index 00000000..f6ab75fa
--- /dev/null
+++ b/mwan3/files/lib/mwan3/mwan3.sh
@@ -0,0 +1,1243 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+IP4="ip -4"
+IP6="ip -6"
+IPS="ipset"
+IPT4="iptables -t mangle -w"
+IPT6="ip6tables -t mangle -w"
+LOG="logger -t mwan3[$$] -p"
+CONNTRACK_FILE="/proc/net/nf_conntrack"
+IPv6_REGEX="([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|"
+IPv6_REGEX="${IPv6_REGEX}([0-9a-fA-F]{1,4}:){1,7}:|"
+IPv6_REGEX="${IPv6_REGEX}([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|"
+IPv6_REGEX="${IPv6_REGEX}([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|"
+IPv6_REGEX="${IPv6_REGEX}([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|"
+IPv6_REGEX="${IPv6_REGEX}([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|"
+IPv6_REGEX="${IPv6_REGEX}([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|"
+IPv6_REGEX="${IPv6_REGEX}[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|"
+IPv6_REGEX="${IPv6_REGEX}:((:[0-9a-fA-F]{1,4}){1,7}|:)|"
+IPv6_REGEX="${IPv6_REGEX}fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|"
+IPv6_REGEX="${IPv6_REGEX}::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|"
+IPv6_REGEX="${IPv6_REGEX}([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])"
+
+MWAN3_STATUS_DIR="/var/run/mwan3"
+MWAN3TRACK_STATUS_DIR="/var/run/mwan3track"
+MWAN3_INTERFACE_MAX=""
+DEFAULT_LOWEST_METRIC=256
+MMX_MASK=""
+MMX_DEFAULT=""
+MMX_BLACKHOLE=""
+MM_BLACKHOLE=""
+
+MMX_UNREACHABLE=""
+MM_UNREACHABLE=""
+
+
+type timeout &>/dev/null && {
+	timeout -t 1 pwd &>/dev/null && {
+		TIMEOUT_LOCK="timeout -t 10 -s KILL lock"
+	} || {
+		TIMEOUT_LOCK="timeout -s KILL 10 lock"
+	}
+} || {
+	TIMEOUT_LOCK="lock"
+}
+
+
+command -v ip6tables > /dev/null
+NO_IPV6=$?
+
+# return true(=0) if has any mwan3 interface enabled
+# otherwise return false
+mwan3_rtmon_ipv4()
+{
+	local idx=0
+	local ret=1
+	local tbl=""
+
+	local tid family enabled
+
+	mkdir -p /tmp/mwan3rtmon
+	($IP4 route list table main  | grep -v "^default\|linkdown" | sort -n; echo empty fixup) >/tmp/mwan3rtmon/ipv4.main
+	while uci get mwan3.@interface[$idx] >/dev/null 2>&1 ; do
+		tid=$((idx+1))
+
+		family="$(uci -q get mwan3.@interface[$idx].family)"
+		[ -z "$family" ] && family="ipv4"
+
+		enabled="$(uci -q get mwan3.@interface[$idx].enabled)"
+		[ -z "$enabled" ] && enabled="0"
+
+		[ "$family" = "ipv4" ] && {
+			tbl=$($IP4 route list table $tid 2>/dev/null)
+			if echo "$tbl" | grep -q ^default; then
+				(echo "$tbl"  | grep -v "^default\|linkdown" | sort -n; echo empty fixup) >/tmp/mwan3rtmon/ipv4.$tid
+				cat /tmp/mwan3rtmon/ipv4.$tid | grep -v -x -F -f /tmp/mwan3rtmon/ipv4.main | while read line; do
+					$IP4 route del table $tid $line
+				done
+				cat /tmp/mwan3rtmon/ipv4.main | grep -v -x -F -f /tmp/mwan3rtmon/ipv4.$tid | while read line; do
+					$IP4 route add table $tid $line
+				done
+			fi
+		}
+		if [ "$enabled" = "1" ]; then
+			ret=0
+		fi
+		idx=$((idx+1))
+	done
+	rm -f /tmp/mwan3rtmon/ipv4.*
+	return $ret
+}
+
+# return true(=0) if has any mwan3 interface enabled
+# otherwise return false
+mwan3_rtmon_ipv6()
+{
+	local idx=0
+	local ret=1
+	local tbl=""
+
+	local tid family enabled
+
+	mkdir -p /tmp/mwan3rtmon
+	($IP6 route list table main  | grep -v "^default\|^::/0\|^fe80::/64\|^unreachable" | sort -n; echo empty fixup) >/tmp/mwan3rtmon/ipv6.main
+	while uci get mwan3.@interface[$idx] >/dev/null 2>&1 ; do
+		tid=$((idx+1))
+
+		family="$(uci -q get mwan3.@interface[$idx].family)"
+		# Set default family to ipv4 that is no mistake
+		[ -z "$family" ] && family="ipv4"
+
+		enabled="$(uci -q get mwan3.@interface[$idx].enabled)"
+		[ -z "$enabled" ] && enabled="0"
+
+		[ "$family" = "ipv6" ] && {
+			tbl=$($IP6 route list table $tid 2>/dev/null)
+			if echo "$tbl" | grep -q "^default\|^::/0"; then
+				(echo "$tbl"  | grep -v "^default\|^::/0\|^unreachable" | sort -n; echo empty fixup) >/tmp/mwan3rtmon/ipv6.$tid
+				cat /tmp/mwan3rtmon/ipv6.$tid | grep -v -x -F -f /tmp/mwan3rtmon/ipv6.main | while read line; do
+					addr=`echo $line | awk '{if($3=="br-lan") print $1}'`
+					if [ -n "$addr" ];then
+						local neigh_state=`ip -6 neigh show dev br-lan | awk -v addr=$addr '{if($1==addr) print $4}'`
+						[ "$neigh_state" == "REACHABLE" -o "$neigh_state" == "DELAY" ] && continue
+					fi
+					$IP6 route del table $tid $line
+				done
+				ifname=`ip -6 rule  | grep "iif .* lookup $tid" | sed "s/.*iif \(.*\) lookup $((tid)).*/\1/g"`
+				if [ -n "$ifname" ];then
+					cat /tmp/mwan3rtmon/ipv6.main | grep -v -x -F -f /tmp/mwan3rtmon/ipv6.$tid | grep -e "dev $ifname " -e "dev br-lan " -e "dev br-guest " | while read line; do
+						$IP6 route add table $tid $line 2>/dev/null
+					done
+				else
+					cat /tmp/mwan3rtmon/ipv6.main | grep -v -x -F -f /tmp/mwan3rtmon/ipv6.$tid | while read line; do
+						$IP6 route add table $tid $line 2>/dev/null
+					done
+				fi
+			fi
+		}
+		if [ "$enabled" = "1" ]; then
+			ret=0
+		fi
+		idx=$((idx+1))
+	done
+	rm -f /tmp/mwan3rtmon/ipv6.*
+	return $ret
+}
+
+# counts how many bits are set to 1
+# n&(n-1) clears the lowest bit set to 1
+mwan3_count_one_bits()
+{
+	local count n
+	count=0
+	n=$(($1))
+	while [ "$n" -gt "0" ]; do
+		n=$((n&(n-1)))
+		count=$((count+1))
+	done
+	echo $count
+}
+
+# maps the 1st parameter so it only uses the bits allowed by the bitmask (2nd parameter)
+# which means spreading the bits of the 1st parameter to only use the bits that are set to 1 in the 2nd parameter
+# 0 0 0 0 0 1 0 1 (0x05) 1st parameter
+# 1 0 1 0 1 0 1 0 (0xAA) 2nd parameter
+#     1   0   1          result
+mwan3_id2mask()
+{
+	local bit_msk bit_val result
+	bit_val=0
+	result=0
+	for bit_msk in $(seq 0 31); do
+		if [ $((($2>>bit_msk)&1)) = "1" ]; then
+			if [ $((($1>>bit_val)&1)) = "1" ]; then
+				result=$((result|(1<<bit_msk)))
+			fi
+			bit_val=$((bit_val+1))
+		fi
+	done
+	printf "0x%x" $result
+}
+
+mwan3_init()
+{
+	local bitcnt
+	local mmdefault
+
+	[ -d $MWAN3_STATUS_DIR ] || mkdir -p $MWAN3_STATUS_DIR/iface_state
+
+	# mwan3's MARKing mask (at least 3 bits should be set)
+	if [ -e "${MWAN3_STATUS_DIR}/mmx_mask" ]; then
+		MMX_MASK=$(cat "${MWAN3_STATUS_DIR}/mmx_mask")
+		MWAN3_INTERFACE_MAX=$(uci_get_state mwan3 globals iface_max)
+	else
+		config_load mwan3
+		config_get MMX_MASK globals mmx_mask '0x3F00'
+		echo "$MMX_MASK" > "${MWAN3_STATUS_DIR}/mmx_mask"
+		$LOG notice "Using firewall mask ${MMX_MASK}"
+
+		bitcnt=$(mwan3_count_one_bits MMX_MASK)
+		mmdefault=$(((1<<bitcnt)-1))
+		MWAN3_INTERFACE_MAX=$(($mmdefault-3))
+		uci_toggle_state mwan3 globals iface_max "$MWAN3_INTERFACE_MAX"
+		$LOG notice "Max interface count is ${MWAN3_INTERFACE_MAX}"
+	fi
+
+	# mark mask constants
+	bitcnt=$(mwan3_count_one_bits MMX_MASK)
+	mmdefault=$(((1<<bitcnt)-1))
+	MM_BLACKHOLE=$(($mmdefault-2))
+	MM_UNREACHABLE=$(($mmdefault-1))
+
+	# MMX_DEFAULT should equal MMX_MASK
+	MMX_DEFAULT=$(mwan3_id2mask mmdefault MMX_MASK)
+	MMX_BLACKHOLE=$(mwan3_id2mask MM_BLACKHOLE MMX_MASK)
+	MMX_UNREACHABLE=$(mwan3_id2mask MM_UNREACHABLE MMX_MASK)
+}
+
+mwan3_lock() {
+	$TIMEOUT_LOCK /var/run/mwan3.lock &>/dev/null || lock -u /var/run/mwan3.lock
+#	$LOG debug "$1 $2 (lock)"
+}
+
+mwan3_unlock() {
+#	$LOG debug "$1 $2 (unlock)"
+	lock -u /var/run/mwan3.lock
+}
+
+mwan3_get_iface_id()
+{
+	local _tmp _iface _iface_count
+
+	_iface="$2"
+
+	mwan3_get_id()
+	{
+		let _iface_count++
+		[ "$1" = "$_iface" ] && _tmp=$_iface_count
+	}
+	config_foreach mwan3_get_id interface
+	export "$1=$_tmp"
+}
+
+mwan3_set_custom_ipset_v4()
+{
+	local custom_network_v4
+
+	for custom_network_v4 in $($IP4 route list table "$1" | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do
+		$LOG notice "Adding network $custom_network_v4 from table $1 to mwan3_custom_v4 ipset"
+		$IPS -! add mwan3_custom_v4_temp "$custom_network_v4"
+	done
+}
+
+mwan3_set_custom_ipset_v6()
+{
+	local custom_network_v6
+
+	for custom_network_v6 in $($IP6 route list table "$1" | awk '{print $1}' | egrep "$IPv6_REGEX"); do
+		$LOG notice "Adding network $custom_network_v6 from table $1 to mwan3_custom_v6 ipset"
+		$IPS -! add mwan3_custom_v6_temp "$custom_network_v6"
+	done
+}
+
+mwan3_set_custom_ipset()
+{
+	$IPS -! create mwan3_custom_v4 hash:net
+	$IPS create mwan3_custom_v4_temp hash:net
+	config_list_foreach "globals" "rt_table_lookup" mwan3_set_custom_ipset_v4
+	$IPS swap mwan3_custom_v4_temp mwan3_custom_v4
+	$IPS destroy mwan3_custom_v4_temp
+
+
+	$IPS -! create mwan3_custom_v6 hash:net family inet6
+	$IPS create mwan3_custom_v6_temp hash:net family inet6
+	config_list_foreach "globals" "rt_table_lookup" mwan3_set_custom_ipset_v6
+	$IPS swap mwan3_custom_v6_temp mwan3_custom_v6
+	$IPS destroy mwan3_custom_v6_temp
+
+	$IPS -! create mwan3_connected list:set
+	$IPS -! add mwan3_connected mwan3_custom_v4
+	$IPS -! add mwan3_connected mwan3_custom_v6
+}
+
+
+mwan3_set_connected_ipv4()
+{
+	local connected_network_v4 candidate_list cidr_list
+	candidate_list=""
+	cidr_list=""
+	for connected_network_v4 in $($IP4 route | awk '{print $1}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do
+		[ -z "${connected_network_v4##*/*}" ] &&
+			cidr_list="$cidr_list $connected_network_v4" ||
+				candidate_list="$candidate_list $connected_network_v4"
+	done
+
+	for connected_network_v4 in $($IP4 route list table 0 | awk '{print $2}' | egrep '[0-9]{1,3}(\.[0-9]{1,3}){3}'); do
+		[ -z "${connected_network_v4##*/*}" ] &&
+			cidr_list="$cidr_list $connected_network_v4" ||
+				candidate_list="$candidate_list $connected_network_v4"
+	done
+
+	for connected_network_v4 in $cidr_list; do
+		$IPS -! add mwan3_connected_v4_temp "$connected_network_v4"
+	done
+	for connected_network_v4 in $candidate_list; do
+		ipset -q test mwan3_connected_v4_temp "$connected_network_v4" ||
+			$IPS -! add mwan3_connected_v4_temp "$connected_network_v4"
+	done
+
+	$IPS add mwan3_connected_v4_temp 224.0.0.0/3
+
+	$IPS swap mwan3_connected_v4_temp mwan3_connected_v4
+	$IPS destroy mwan3_connected_v4_temp
+
+}
+
+mwan3_set_connected_iptables()
+{
+	local connected_network_v6 source_network_v6
+
+	$IPS -! create mwan3_connected_v4 hash:net
+	$IPS create mwan3_connected_v4_temp hash:net
+
+	mwan3_set_connected_ipv4
+
+	[ $NO_IPV6 -eq 0 ] && {
+		$IPS -! create mwan3_connected_v6 hash:net family inet6
+		$IPS create mwan3_connected_v6_temp hash:net family inet6
+
+		for connected_network_v6 in $($IP6 route | awk '{print $1}' | egrep "$IPv6_REGEX"); do
+			$IPS -! add mwan3_connected_v6_temp "$connected_network_v6"
+		done
+		$IPS swap mwan3_connected_v6_temp mwan3_connected_v6
+		$IPS destroy mwan3_connected_v6_temp
+
+		$IPS -! create mwan3_source_v6 hash:net family inet6
+		$IPS create mwan3_source_v6_temp hash:net family inet6
+		for source_network_v6 in $($IP6 addr ls  | sed -ne 's/ *inet6 \([^ \/]*\).* scope global.*/\1/p'); do
+			$IPS -! add mwan3_source_v6_temp "$source_network_v6"
+		done
+		$IPS swap mwan3_source_v6_temp mwan3_source_v6
+		$IPS destroy mwan3_source_v6_temp
+	}
+
+	$IPS -! create mwan3_connected list:set
+	$IPS -! add mwan3_connected mwan3_connected_v4
+	[ $NO_IPV6 -eq 0 ] && $IPS -! add mwan3_connected mwan3_connected_v6
+
+	$IPS -! create mwan3_dynamic_v4 hash:net
+	$IPS -! add mwan3_connected mwan3_dynamic_v4
+
+	[ $NO_IPV6 -eq 0 ] && $IPS -! create mwan3_dynamic_v6 hash:net family inet6
+	[ $NO_IPV6 -eq 0 ] && $IPS -! add mwan3_connected mwan3_dynamic_v6
+}
+
+mwan3_set_general_rules()
+{
+	local IP
+
+	for IP in "$IP4" "$IP6"; do
+		[ "$IP" = "$IP6" ] && [ $NO_IPV6 -ne 0 ] && continue
+		RULE_NO=$(($MM_BLACKHOLE+2000))
+		if [ -z "$($IP rule list | awk -v var="$RULE_NO:" '$1 == var')" ]; then
+			$IP rule add pref $RULE_NO fwmark $MMX_BLACKHOLE/$MMX_MASK blackhole
+		fi
+
+		RULE_NO=$(($MM_UNREACHABLE+2000))
+		if [ -z "$($IP rule list | awk -v var="$RULE_NO:" '$1 == var')" ]; then
+			$IP rule add pref $RULE_NO fwmark $MMX_UNREACHABLE/$MMX_MASK unreachable
+		fi
+	done
+}
+
+mwan3_set_general_iptables()
+{
+	local IPT
+
+	for IPT in "$IPT4" "$IPT6"; do
+		[ "$IPT" = "$IPT6" ] && [ $NO_IPV6 -ne 0 ] && continue
+		if ! $IPT -S mwan3_ifaces_in &> /dev/null; then
+			$IPT -N mwan3_ifaces_in
+		fi
+
+		if ! $IPT -S mwan3_connected &> /dev/null; then
+			$IPT -N mwan3_connected
+			$IPS -! create mwan3_connected list:set
+			$IPT -A mwan3_connected \
+				-m set --match-set mwan3_connected dst \
+				-j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK
+		fi
+
+		if ! $IPT -S mwan3_rules &> /dev/null; then
+			$IPT -N mwan3_rules
+		fi
+
+		if ! $IPT -S mwan3_hook &> /dev/null; then
+			$IPT -N mwan3_hook
+			# do not mangle ipv6 ra service
+			if [ "$IPT" = "$IPT6" ]; then
+				$IPT6 -A mwan3_hook \
+					-p ipv6-icmp \
+					-m icmp6 --icmpv6-type 133 \
+					-j RETURN
+				$IPT6 -A mwan3_hook \
+					-p ipv6-icmp \
+					-m icmp6 --icmpv6-type 134 \
+					-j RETURN
+				$IPT6 -A mwan3_hook \
+					-p ipv6-icmp \
+					-m icmp6 --icmpv6-type 135 \
+					-j RETURN
+				$IPT6 -A mwan3_hook \
+					-p ipv6-icmp \
+					-m icmp6 --icmpv6-type 136 \
+					-j RETURN
+				$IPT6 -A mwan3_hook \
+					-p ipv6-icmp \
+					-m icmp6 --icmpv6-type 137 \
+					-j RETURN
+				# do not mangle outgoing echo request
+				$IPT6 -A mwan3_hook \
+					-m set --match-set mwan3_source_v6 src \
+					-p ipv6-icmp \
+					-m icmp6 --icmpv6-type 128 \
+					-j RETURN
+
+			fi
+			$IPT -A mwan3_hook \
+				-j CONNMARK --restore-mark --nfmask "$MMX_MASK" --ctmask "$MMX_MASK"
+			$IPT -A mwan3_hook \
+				-m mark --mark 0x0/$MMX_MASK \
+				-j mwan3_ifaces_in
+			$IPT -A mwan3_hook \
+				-m mark --mark 0x0/$MMX_MASK \
+				-j mwan3_connected
+			$IPT -A mwan3_hook \
+				-m mark --mark 0x0/$MMX_MASK \
+				-j mwan3_rules
+			$IPT -A mwan3_hook \
+				-j CONNMARK --save-mark --nfmask "$MMX_MASK" --ctmask "$MMX_MASK"
+			$IPT -A mwan3_hook \
+				-m mark ! --mark $MMX_DEFAULT/$MMX_MASK \
+				-j mwan3_connected
+		fi
+
+		if ! $IPT -S PREROUTING | grep mwan3_hook &> /dev/null; then
+			$IPT -A PREROUTING -j mwan3_hook
+		fi
+
+		if ! $IPT -S OUTPUT | grep mwan3_hook &> /dev/null; then
+			$IPT -A OUTPUT -j mwan3_hook
+		fi
+	done
+}
+
+mwan3_create_iface_iptables()
+{
+	local id family connected_name IPT
+
+	config_get family "$1" family ipv4
+	mwan3_get_iface_id id "$1"
+
+	[ -n "$id" ] || return 0
+
+	if [ "$family" = "ipv4" ]; then
+		connected_name=mwan3_connected
+		IPT="$IPT4"
+		$IPS -! create $connected_name list:set
+
+	elif [ "$family" = "ipv6" ] && [ $NO_IPV6 -eq 0 ]; then
+		connected_name=mwan3_connected_v6
+		IPT="$IPT6"
+		$IPS -! create $connected_name hash:net family inet6
+	else
+		return
+	fi
+
+	if ! $IPT -S mwan3_ifaces_in &> /dev/null; then
+		$IPT -N mwan3_ifaces_in
+	fi
+
+	if ! $IPT -S "mwan3_iface_in_$1" &> /dev/null; then
+		$IPT -N "mwan3_iface_in_$1"
+	fi
+
+	$IPT -F "mwan3_iface_in_$1"
+	$IPT -A "mwan3_iface_in_$1" \
+	     -i "$2" \
+	     -m set --match-set $connected_name src \
+	     -m mark --mark 0x0/$MMX_MASK \
+	     -m comment --comment "default" \
+	     -j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK
+	$IPT -A "mwan3_iface_in_$1" \
+	     -i "$2" \
+	     -m mark --mark 0x0/$MMX_MASK \
+	     -m comment --comment "$1" \
+	     -j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK
+
+	$IPT -D mwan3_ifaces_in \
+	     -m mark --mark 0x0/$MMX_MASK \
+	     -j "mwan3_iface_in_$1" &> /dev/null
+	$IPT -A mwan3_ifaces_in \
+	     -m mark --mark 0x0/$MMX_MASK \
+	     -j "mwan3_iface_in_$1"
+
+}
+
+mwan3_delete_iface_iptables()
+{
+	local IPT
+	config_get family "$1" family ipv4
+
+	if [ "$family" = "ipv4" ]; then
+		IPT="$IPT4"
+	fi
+
+	if [ "$family" = "ipv6" ]; then
+		[ $NO_IPV6 -ne 0 ] && return
+		IPT="$IPT6"
+	fi
+
+	$IPT -D mwan3_ifaces_in \
+	     -m mark --mark 0x0/$MMX_MASK \
+	     -j "mwan3_iface_in_$1" &> /dev/null
+	$IPT -F "mwan3_iface_in_$1" &> /dev/null
+	$IPT -X "mwan3_iface_in_$1" &> /dev/null
+
+}
+
+mwan3_create_iface_route()
+{
+	local id via metric V V_ IP
+
+	config_get family "$1" family ipv4
+	mwan3_get_iface_id id "$1"
+
+	[ -n "$id" ] || return 0
+
+	if [ "$family" = "ipv4" ]; then
+		V=4
+		V_=""
+		IP="$IP4"
+	elif [ "$family" = "ipv6" ]; then
+		V=6
+		V_=6
+		IP="$IP6"
+	else
+		return
+	fi
+
+	if ubus call network.interface.${1}_${V} status &>/dev/null; then
+		network_get_gateway${V_} via "${1}_${V}"
+	else
+		network_get_gateway${V_} via "$1"
+	fi
+
+	( [ -z "$via" ] || [ "$via" = "0.0.0.0" ] || [ "$via" = "::" ] ) && unset via
+
+	network_get_metric metric "$1"
+
+	$IP route flush table "$id"
+	$IP route add table "$id" default \
+	     ${via:+via} $via \
+	     ${metric:+metric} $metric \
+	     dev "$2"
+	mwan3_rtmon_ipv${V}
+
+}
+
+mwan3_delete_iface_route()
+{
+	local id
+
+	config_get family "$1" family ipv4
+	mwan3_get_iface_id id "$1"
+
+	[ -n "$id" ] || return 0
+
+	if [ "$family" = "ipv4" ]; then
+		$IP4 route flush table "$id"
+	fi
+
+	if [ "$family" = "ipv6" ] && [ $NO_IPV6 -eq 0 ]; then
+		$IP6 route flush table "$id"
+	fi
+}
+
+mwan3_delete_iface_route_by_ifname()
+{
+	config_get family "$1" family ipv4
+
+	if [ "$family" = "ipv6" ] && [ $NO_IPV6 -eq 0 ]; then
+		ifname=$(ifstatus `echo $1 | sed 's/6$//g'` | jsonfilter -e @.device)
+		[ -z "$ifname" ] && return
+		$IP6 route show table main | grep "dev $ifname "  | grep "default via" | sed 's/linkdown.*$//g' | sed 's/expires.*$//g' | while read line; do
+			$IP6 route del table main $line
+		done
+		mwan3_delete_iface_route $1
+	fi
+}
+
+mwan3_create_iface_rules()
+{
+	local id family
+
+	config_get family "$1" family ipv4
+	mwan3_get_iface_id id "$1"
+
+	[ -n "$id" ] || return 0
+
+	if [ "$family" = "ipv4" ]; then
+
+		while [ -n "$($IP4 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do
+			$IP4 rule del pref $(($id+1000))
+		done
+
+		while [ -n "$($IP4 rule list | awk '$1 == "'$(($id+2000)):'"')" ]; do
+			$IP4 rule del pref $(($id+2000))
+		done
+
+		$IP4 rule add pref $(($id+1000)) iif "$2" lookup "$id"
+		$IP4 rule add pref $(($id+2000)) fwmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK lookup "$id"
+	fi
+
+	if [ "$family" = "ipv6" ] && [ $NO_IPV6 -eq 0 ]; then
+
+		while [ -n "$($IP6 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do
+			$IP6 rule del pref $(($id+1000))
+		done
+
+		while [ -n "$($IP6 rule list | awk '$1 == "'$(($id+2000)):'"')" ]; do
+			$IP6 rule del pref $(($id+2000))
+		done
+
+		$IP6 rule add pref $(($id+1000)) iif "$2" lookup "$id"
+		$IP6 rule add pref $(($id+2000)) fwmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK lookup "$id"
+	fi
+}
+
+mwan3_delete_iface_rules()
+{
+	local id family
+
+	config_get family "$1" family ipv4
+	mwan3_get_iface_id id "$1"
+
+	[ -n "$id" ] || return 0
+
+	if [ "$family" = "ipv4" ]; then
+
+		while [ -n "$($IP4 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do
+			$IP4 rule del pref $(($id+1000))
+		done
+
+		while [ -n "$($IP4 rule list | awk '$1 == "'$(($id+2000)):'"')" ]; do
+			$IP4 rule del pref $(($id+2000))
+		done
+	fi
+
+	if [ "$family" = "ipv6" ] && [ $NO_IPV6 -eq 0 ]; then
+
+		while [ -n "$($IP6 rule list | awk '$1 == "'$(($id+1000)):'"')" ]; do
+			$IP6 rule del pref $(($id+1000))
+		done
+
+		while [ -n "$($IP6 rule list | awk '$1 == "'$(($id+2000)):'"')" ]; do
+			$IP6 rule del pref $(($id+2000))
+		done
+	fi
+}
+
+mwan3_delete_iface_ipset_entries()
+{
+	local id setname entry
+
+	mwan3_get_iface_id id "$1"
+
+	[ -n "$id" ] || return 0
+
+	for setname in $(ipset -n list | grep ^mwan3_sticky_); do
+		for entry in $(ipset list "$setname" | grep "$(echo $(mwan3_id2mask id MMX_MASK) | awk '{ printf "0x%08x", $1; }')" | cut -d ' ' -f 1); do
+			$IPS del "$setname" $entry
+		done
+	done
+}
+
+mwan3_rtmon()
+{
+	pid="$(pgrep -f mwan3rtmon)"
+	if [ "${pid}" != "" ]; then
+		kill -USR1 "${pid}"
+	else
+		[ -x /usr/sbin/mwan3rtmon ] && /usr/sbin/mwan3rtmon &
+	fi
+}
+
+mwan3_track()
+{
+	local track_ip track_ips pid
+
+	mwan3_list_track_ips()
+	{
+		track_ips="$track_ips $1"
+	}
+	config_list_foreach "$1" track_ip mwan3_list_track_ips
+
+	for pid in $(pgrep -f "mwan3track $1 $2"); do
+		kill -TERM "$pid" > /dev/null 2>&1
+	done
+	sleep 1
+	for pid in $(pgrep -f "mwan3track $1 $2"); do
+		kill -KILL "$pid" > /dev/null 2>&1
+	done
+	sleep 1
+	for pid in $(pgrep -f "mwan3track $1"); do
+		kill -KILL "$pid" > /dev/null 2>&1
+	done
+	if [ -n "$track_ips" ]; then
+		[ -x /usr/sbin/mwan3track ] && /usr/sbin/mwan3track "$1" "$2" "$3" "$4" $track_ips &
+	fi
+}
+
+mwan3_track_signal()
+{
+	local pid
+
+	pid="$(pgrep -f "mwan3track $1 $2")"
+	[ "${pid}" != "" ] && {
+		kill -USR1 "${pid}"
+	}
+}
+
+mwan3_set_policy()
+{
+	local iface_count id iface family metric probability weight device is_lowest is_offline IPT total_weight
+
+	is_lowest=0
+	config_get iface "$1" interface
+	config_get metric "$1" metric 1
+	config_get weight "$1" weight 1
+
+	[ -n "$iface" ] || return 0
+	network_get_device device "$iface"
+	[ "$metric" -gt $DEFAULT_LOWEST_METRIC ] && $LOG warn "Member interface $iface has >$DEFAULT_LOWEST_METRIC metric. Not appending to policy" && return 0
+
+	mwan3_get_iface_id id "$iface"
+
+	[ "$(mwan3_get_iface_hotplug_state "$iface")" = "online" ]
+	is_offline=$?
+
+	[ -n "$id" ] || return 0
+
+	config_get family "$iface" family ipv4
+
+	if [ "$family" = "ipv4" ]; then
+		IPT="$IPT4"
+	elif [ "$family" = "ipv6" ]; then
+		IPT="$IPT6"
+	fi
+
+	if [ "$family" = "ipv4" ] && [ $is_offline -eq 0 ]; then
+		if [ "$metric" -lt "$lowest_metric_v4" ]; then
+			is_lowest=1
+			total_weight_v4=$weight
+			lowest_metric_v4=$metric
+
+			echo "$iface" > $MWAN3_STATUS_DIR/indicator
+
+		elif [ "$metric" -eq "$lowest_metric_v4" ]; then
+		       	total_weight_v4=$(($total_weight_v4+$weight))
+			total_weight=$total_weight_v4
+		else
+			return
+		fi
+	elif [ "$family" = "ipv6" ] && [ $NO_IPV6 -eq 0 ] && [ $is_offline -eq 0 ]; then
+		if [ "$metric" -lt "$lowest_metric_v6" ]; then
+			is_lowest=1
+			total_weight_v6=$weight
+			lowest_metric_v6=$metric
+		elif [ "$metric" -eq "$lowest_metric_v6" ]; then
+			total_weight_v6=$(($total_weight_v6+$weight))
+			total_weight=$total_weight_v6
+		else
+			return
+		fi
+	fi
+	if [ $is_lowest -eq 1 ]; then
+		$IPT -F "mwan3_policy_$policy"
+		$IPT -A "mwan3_policy_$policy" \
+		     -m mark --mark 0x0/$MMX_MASK \
+		     -m comment --comment "$iface $weight $weight" \
+		     -j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK
+	elif [ $is_offline -eq 0 ]; then
+		probability=$(($weight*1000/$total_weight))
+		if [ "$probability" -lt 10 ]; then
+			probability="0.00$probability"
+		elif [ $probability -lt 100 ]; then
+			probability="0.0$probability"
+		elif [ $probability -lt 1000 ]; then
+			probability="0.$probability"
+		else
+			probability="1"
+		fi
+
+		$IPT -I "mwan3_policy_$policy" \
+			-m mark --mark 0x0/$MMX_MASK \
+			-m statistic \
+			--mode random \
+			--probability "$probability" \
+			-m comment --comment "$iface $weight $total_weight" \
+			-j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK
+	elif [ -n "$device" ]; then
+		$IPT -S "mwan3_policy_$policy" | grep -q '.*--comment ".* [0-9]* [0-9]*"' || \
+			$IPT -I "mwan3_policy_$policy" \
+				-o "$device" \
+				-m mark --mark 0x0/$MMX_MASK \
+				-m comment --comment "out $iface $device" \
+				-j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK
+	fi
+}
+
+mwan3_create_policies_iptables()
+{
+	local last_resort lowest_metric_v4 lowest_metric_v6 total_weight_v4 total_weight_v6 policy IPT
+
+	policy="$1"
+
+	config_get last_resort "$1" last_resort unreachable
+
+	if [ "$1" != "$(echo "$1" | cut -c1-15)" ]; then
+		$LOG warn "Policy $1 exceeds max of 15 chars. Not setting policy" && return 0
+	fi
+
+	for IPT in "$IPT4" "$IPT6"; do
+		[ "$IPT" = "$IPT6" ] && [ $NO_IPV6 -ne 0 ] && continue
+		if ! $IPT -S "mwan3_policy_$1" &> /dev/null; then
+			$IPT -N "mwan3_policy_$1"
+		fi
+
+		$IPT -F "mwan3_policy_$1"
+
+		case "$last_resort" in
+			blackhole)
+				$IPT -A "mwan3_policy_$1" \
+					-m mark --mark 0x0/$MMX_MASK \
+					-m comment --comment "blackhole" \
+					-j MARK --set-xmark $MMX_BLACKHOLE/$MMX_MASK
+			;;
+			default)
+				$IPT -A "mwan3_policy_$1" \
+					-m mark --mark 0x0/$MMX_MASK \
+					-m comment --comment "default" \
+					-j MARK --set-xmark $MMX_DEFAULT/$MMX_MASK
+			;;
+			*)
+				$IPT -A "mwan3_policy_$1" \
+					-m mark --mark 0x0/$MMX_MASK \
+					-m comment --comment "unreachable" \
+					-j MARK --set-xmark $MMX_UNREACHABLE/$MMX_MASK
+			;;
+		esac
+	done
+
+	lowest_metric_v4=$DEFAULT_LOWEST_METRIC
+	total_weight_v4=0
+
+	lowest_metric_v6=$DEFAULT_LOWEST_METRIC
+	total_weight_v6=0
+
+	config_list_foreach "$1" use_member mwan3_set_policy
+}
+
+mwan3_set_policies_iptables()
+{
+	config_foreach mwan3_create_policies_iptables policy
+}
+
+mwan3_set_sticky_iptables()
+{
+	local id iface
+
+	for iface in $($IPT4 -S "$policy" | cut -s -d'"' -f2 | awk '{print $1}'); do
+
+		if [ "$iface" = "$1" ]; then
+
+			mwan3_get_iface_id id "$1"
+
+			[ -n "$id" ] || return 0
+
+			for IPT in "$IPT4" "$IPT6"; do
+				[ "$IPT" = "$IPT6" ] && [ $NO_IPV6 -ne 0 ] && continue
+				if [ -n "$($IPT -S "mwan3_iface_in_$1" 2> /dev/null)" ]; then
+					$IPT -I "mwan3_rule_$rule" \
+						-m mark --mark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK \
+						-m set ! --match-set "mwan3_sticky_$rule" src,src \
+						-j MARK --set-xmark 0x0/$MMX_MASK
+					$IPT -I "mwan3_rule_$rule" \
+						-m mark --mark 0/$MMX_MASK \
+						-j MARK --set-xmark $(mwan3_id2mask id MMX_MASK)/$MMX_MASK
+				fi
+			done
+		fi
+	done
+}
+
+mwan3_set_user_iptables_rule()
+{
+	local ipset family proto policy src_ip src_port src_iface src_dev
+	local sticky dest_ip dest_port use_policy timeout rule policy IPT
+	local global_logging rule_logging loglevel
+
+	rule="$1"
+
+	config_get sticky "$1" sticky 0
+	config_get timeout "$1" timeout 600
+	config_get ipset "$1" ipset
+	config_get proto "$1" proto all
+	config_get src_ip "$1" src_ip
+	config_get src_iface "$1" src_iface
+	network_get_device src_dev "$src_iface"
+	config_get src_port "$1" src_port
+	config_get dest_ip "$1" dest_ip
+	config_get dest_port "$1" dest_port
+	config_get use_policy "$1" use_policy
+	config_get family "$1" family any
+
+	[ -z "$dest_ip" ] && unset dest_ip
+	[ -z "$src_ip" ] && unset src_ip
+	[ -z "$ipset" ] && unset ipset
+	[ -z "$src_port" ]  && unset src_port
+	[ -z "$dest_port" ]  && unset dest_port
+	[ "$proto"  != 'tcp' ]  && [ "$proto" != 'udp' ] && {
+		[ -n "$src_port" ] && {
+			$LOG warn "src_port set to '$src_port' but proto set to '$proto' not tcp or udp. src_port will be ignored"
+		}
+		[ -n "$dest_port" ] && {
+			$LOG warn "dest_port set to '$dest_port' but proto set to '$proto' not tcp or udp. dest_port will be ignored"
+		}
+		unset src_port
+		unset dest_port
+	}
+
+	config_get rule_logging "$1" logging 0
+	config_get global_logging globals logging 0
+	config_get loglevel globals loglevel notice
+
+	if [ "$1" != "$(echo "$1" | cut -c1-15)" ]; then
+		$LOG warn "Rule $1 exceeds max of 15 chars. Not setting rule" && return 0
+	fi
+
+	if [ -n "$ipset" ]; then
+		ipset="-m set --match-set $ipset dst"
+	fi
+
+	if [ -n "$use_policy" ]; then
+		if [ "$use_policy" = "default" ]; then
+			policy="MARK --set-xmark $MMX_DEFAULT/$MMX_MASK"
+		elif [ "$use_policy" = "unreachable" ]; then
+			policy="MARK --set-xmark $MMX_UNREACHABLE/$MMX_MASK"
+		elif [ "$use_policy" = "blackhole" ]; then
+			policy="MARK --set-xmark $MMX_BLACKHOLE/$MMX_MASK"
+		else
+			if [ "$sticky" -eq 1 ]; then
+
+				policy="mwan3_policy_$use_policy"
+
+				for IPT in "$IPT4" "$IPT6"; do
+					[ "$IPT" = "$IPT6" ] && [ $NO_IPV6 -ne 0 ] && continue
+					if ! $IPT -S "$policy" &> /dev/null; then
+						$IPT -N "$policy"
+					fi
+
+					if ! $IPT -S "mwan3_rule_$1" &> /dev/null; then
+						$IPT -N "mwan3_rule_$1"
+					fi
+
+					$IPT -F "mwan3_rule_$1"
+				done
+
+				$IPS -! create "mwan3_sticky_v4_$rule" \
+					hash:ip,mark markmask "$MMX_MASK" \
+					timeout "$timeout"
+				$IPS -! create "mwan3_sticky_v6_$rule" \
+					hash:ip,mark markmask "$MMX_MASK" \
+					timeout "$timeout" family inet6
+				$IPS -! create "mwan3_sticky_$rule" list:set
+				$IPS -! add "mwan3_sticky_$rule" "mwan3_sticky_v4_$rule"
+				$IPS -! add "mwan3_sticky_$rule" "mwan3_sticky_v6_$rule"
+
+				config_foreach mwan3_set_sticky_iptables interface
+
+				for IPT in "$IPT4" "$IPT6"; do
+					[ "$IPT" = "$IPT6" ] && [ $NO_IPV6 -ne 0 ] && continue
+					$IPT -A "mwan3_rule_$1" \
+						-m mark --mark 0/$MMX_MASK \
+						-j "$policy"
+					$IPT -A "mwan3_rule_$1" \
+						-m mark ! --mark 0xfc00/0xfc00 \
+						-j SET --del-set "mwan3_sticky_$rule" src,src
+					$IPT -A "mwan3_rule_$1" \
+						-m mark ! --mark 0xfc00/0xfc00 \
+						-j SET --add-set "mwan3_sticky_$rule" src,src
+				done
+
+				policy="mwan3_rule_$1"
+			else
+				policy="mwan3_policy_$use_policy"
+
+				for IPT in "$IPT4" "$IPT6"; do
+					[ "$IPT" = "$IPT6" ] && [ $NO_IPV6 -ne 0 ] && continue
+					if ! $IPT -S "$policy" &> /dev/null; then
+						$IPT -N "$policy"
+					fi
+				done
+
+			fi
+		fi
+		for IPT in "$IPT4" "$IPT6"; do
+			[ "$IPT" = "$IPT6" ] && [ $NO_IPV6 -ne 0 ] && continue
+			[ "$family" = "ipv4" ] && [ "$IPT" = "$IPT6" ] && continue
+			[ "$family" = "ipv6" ] && [ "$IPT" = "$IPT4" ] && continue
+			[ "$global_logging" = "1" ] && [ "$rule_logging" = "1" ] && {
+				$IPT -A mwan3_rules \
+				     -p "$proto" \
+				     ${src_ip:+-s} $src_ip \
+				     ${src_dev:+-i} $src_dev \
+				     ${dest_ip:+-d} $dest_ip \
+				     $ipset \
+				     ${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \
+				     ${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \
+				     -m mark --mark 0/$MMX_MASK \
+				     -m comment --comment "$1" \
+				     -j LOG --log-level "$loglevel" --log-prefix "MWAN3($1)"
+			}
+
+			$IPT -A mwan3_rules \
+			     -p "$proto" \
+			     ${src_ip:+-s} $src_ip \
+			     ${src_dev:+-i} $src_dev \
+			     ${dest_ip:+-d} $dest_ip \
+			     $ipset \
+			     ${src_port:+-m} ${src_port:+multiport} ${src_port:+--sports} $src_port \
+			     ${dest_port:+-m} ${dest_port:+multiport} ${dest_port:+--dports} $dest_port \
+			     -m mark --mark 0/$MMX_MASK \
+			     -j $policy
+		done
+	fi
+}
+
+mwan3_set_user_rules()
+{
+	local IPT
+
+	for IPT in "$IPT4" "$IPT6"; do
+		[ "$IPT" = "$IPT6" ] && [ $NO_IPV6 -ne 0 ] && continue
+		if ! $IPT -S mwan3_rules &> /dev/null; then
+			$IPT -N mwan3_rules
+		fi
+
+		$IPT -F mwan3_rules
+	done
+
+	config_foreach mwan3_set_user_iptables_rule rule
+}
+
+mwan3_set_iface_hotplug_state() {
+	local iface=$1
+	local state=$2
+
+	echo "$state" > "$MWAN3_STATUS_DIR/iface_state/$iface"
+}
+
+mwan3_get_iface_hotplug_state() {
+	local iface=$1
+
+	cat "$MWAN3_STATUS_DIR/iface_state/$iface" 2>/dev/null || echo "offline"
+}
+
+mwan3_report_iface_status()
+{
+	local device result track_ips tracking IP IPT
+
+	mwan3_get_iface_id id "$1"
+	network_get_device device "$1"
+	config_get enabled "$1" enabled 0
+	config_get family "$1" family ipv4
+
+	if [ "$family" = "ipv4" ]; then
+		IP="$IP4"
+		IPT="$IPT4"
+	fi
+
+	if [ "$family" = "ipv6" ]; then
+		IP="$IP6"
+		IPT="$IPT6"
+	fi
+
+	if [ -z "$id" ] || [ -z "$device" ]; then
+		result="offline"
+	elif [ -n "$($IP rule | awk '$1 == "'$(($id+1000)):'"')" ] && \
+		[ -n "$($IP rule | awk '$1 == "'$(($id+2000)):'"')" ] && \
+		[ -n "$($IPT -S mwan3_iface_in_$1 2> /dev/null)" ] && \
+		[ -n "$($IP route list table $id default dev $device 2> /dev/null)" ]; then
+		json_init
+		json_add_string section interfaces
+		json_add_string interface "$1"
+		json_load "$(ubus call mwan3 status "$(json_dump)")"
+		json_select "interfaces"
+		json_select "$1"
+		json_get_vars online uptime
+		json_select ..
+		json_select ..
+		online="$(printf '%02dh:%02dm:%02ds\n' $(($online/3600)) $(($online%3600/60)) $(($online%60)))"
+		uptime="$(printf '%02dh:%02dm:%02ds\n' $(($uptime/3600)) $(($uptime%3600/60)) $(($uptime%60)))"
+		result="$(mwan3_get_iface_hotplug_state $1) $online, uptime $uptime"
+	elif [ -n "$($IP rule | awk '$1 == "'$(($id+1000)):'"')" ] || \
+		[ -n "$($IP rule | awk '$1 == "'$(($id+2000)):'"')" ] || \
+		[ -n "$($IPT -S mwan3_iface_in_$1 2> /dev/null)" ] || \
+		[ -n "$($IP route list table $id default dev $device 2> /dev/null)" ]; then
+		result="error"
+	elif [ "$enabled" = "1" ]; then
+		result="offline"
+	else
+		result="disabled"
+	fi
+
+	mwan3_list_track_ips()
+	{
+		track_ips="$1 $track_ips"
+	}
+	config_list_foreach "$1" track_ip mwan3_list_track_ips
+
+	if [ -n "$track_ips" ]; then
+		if [ -n "$(pgrep -f "mwan3track $1 $device")" ]; then
+			tracking="active"
+		else
+			tracking="down"
+		fi
+	else
+		tracking="not enabled"
+	fi
+
+	echo " interface $1 is $result and tracking is $tracking"
+}
+
+mwan3_report_policies()
+{
+	local ipt="$1"
+	local policy="$2"
+
+	local percent total_weight weight iface
+
+	total_weight=$($ipt -S "$policy" | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | head -1 | awk '{print $3}')
+
+	if [ ! -z "${total_weight##*[!0-9]*}" ]; then
+		for iface in $($ipt -S "$policy" | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | awk '{print $1}'); do
+			weight=$($ipt -S "$policy" | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | awk '$1 == "'$iface'"' | awk '{print $2}')
+			percent=$(($weight*100/$total_weight))
+			echo " $iface ($percent%)"
+		done
+	else
+		echo " $($ipt -S "$policy" | grep -v '.*--comment "out .*" .*$' | sed '/.*--comment \([^ ]*\) .*$/!d;s//\1/;q')"
+	fi
+}
+
+mwan3_report_policies_v4()
+{
+	local policy
+
+	for policy in $($IPT4 -S | awk '{print $2}' | grep mwan3_policy_ | sort -u); do
+		echo "$policy:" | sed 's/mwan3_policy_//'
+		mwan3_report_policies "$IPT4" "$policy"
+	done
+}
+
+mwan3_report_policies_v6()
+{
+	local policy
+
+	for policy in $($IPT6 -S | awk '{print $2}' | grep mwan3_policy_ | sort -u); do
+		echo "$policy:" | sed 's/mwan3_policy_//'
+		mwan3_report_policies "$IPT6" "$policy"
+	done
+}
+
+mwan3_report_connected_v4()
+{
+	if [ -n "$($IPT4 -S mwan3_connected 2> /dev/null)" ]; then
+		$IPS -o save list mwan3_connected_v4 | grep add | cut -d " " -f 3
+	fi
+}
+
+mwan3_report_connected_v6()
+{
+	if [ -n "$($IPT6 -S mwan3_connected 2> /dev/null)" ]; then
+		$IPS -o save list mwan3_connected_v6 | grep add | cut -d " " -f 3
+	fi
+}
+
+mwan3_report_rules_v4()
+{
+	if [ -n "$($IPT4 -S mwan3_rules 2> /dev/null)" ]; then
+		$IPT4 -L mwan3_rules -n -v 2> /dev/null | tail -n+3 | sed 's/mark.*//' | sed 's/mwan3_policy_/- /' | sed 's/mwan3_rule_/S /'
+	fi
+}
+
+mwan3_report_rules_v6()
+{
+	if [ -n "$($IPT6 -S mwan3_rules 2> /dev/null)" ]; then
+		$IPT6 -L mwan3_rules -n -v 2> /dev/null | tail -n+3 | sed 's/mark.*//' | sed 's/mwan3_policy_/- /' | sed 's/mwan3_rule_/S /'
+	fi
+}
+
+mwan3_flush_conntrack()
+{
+	local interface="$1"
+	local action="$2"
+
+	handle_flush() {
+		local flush_conntrack="$1"
+		local action="$2"
+
+		if [ "$action" = "$flush_conntrack" ]; then
+			echo f > ${CONNTRACK_FILE}
+			$LOG info "Connection tracking flushed for interface '$interface' on action '$action'"
+		fi
+	}
+
+	if [ -e "$CONNTRACK_FILE" ]; then
+		config_list_foreach "$interface" flush_conntrack handle_flush "$action"
+	fi
+}
+
+mwan3_track_clean()
+{
+	rm -rf "$MWAN3_STATUS_DIR/${1}" &> /dev/null
+	[ -d "$MWAN3_STATUS_DIR" ] && {
+		if [ -z "$(ls -A "$MWAN3_STATUS_DIR")" ]; then
+			rm -rf "$MWAN3_STATUS_DIR"
+		fi
+	}
+}
diff --git a/mwan3/files/usr/libexec/rpcd/mwan3 b/mwan3/files/usr/libexec/rpcd/mwan3
new file mode 100755
index 00000000..ba6d4016
--- /dev/null
+++ b/mwan3/files/usr/libexec/rpcd/mwan3
@@ -0,0 +1,375 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/functions/network.sh
+. /usr/share/libubox/jshn.sh
+. /lib/mwan3/common.sh
+. /lib/mwan3/mwan3.sh
+
+MWAN3TRACK_STATUS_DIR="/var/run/mwan3track"
+
+IPS="ipset"
+IPT4="iptables -t mangle -w"
+IPT6="ip6tables -t mangle -w"
+
+report_connected_v4() {
+	local address
+
+	if [ -n "$($IPT4 -S mwan3_connected 2> /dev/null)" ]; then
+		for address in $($IPS -o save list mwan3_connected_v4 | grep add | cut -d " " -f 3); do
+			json_add_string "" "${address}"
+		done
+	fi
+}
+
+report_connected_v6() {
+	local address
+
+	if [ -n "$($IPT6 -S mwan3_connected 2> /dev/null)" ]; then
+		for address in $($IPS -o save list mwan3_connected_v6 | grep add | cut -d " " -f 3); do
+			json_add_string "" "${address}"
+		done
+	fi
+}
+
+report_policies() {
+	local ipt="$1"
+	local policy="$2"
+
+	local percent total_weight weight iface
+
+	total_weight=$($ipt -S $policy | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | head -1 | awk '{print $3}')
+
+	for iface in $($ipt -S $policy | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | awk '{print $1}'); do
+		weight=$($ipt -S $policy | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | awk '$1 == "'$iface'"' | awk '{print $2}')
+		percent=$(($weight*100/$total_weight))
+		json_add_object
+		json_add_string interface "$iface"
+		json_add_int percent "$percent"
+		json_close_object
+	done
+}
+
+
+report_policies_v4() {
+	local policy
+
+	local policies=$($IPT4 -S | awk '{print $2}' | grep mwan3_policy_ | sort -u)
+
+	for policy in $(echo $policies); do
+		json_add_array "${policy##*mwan3_policy_}"
+		report_policies "$IPT4" "$policy"
+		json_close_array
+	done
+}
+
+report_policies_v6() {
+	local policy
+
+	local policies=$($IPT6 -S | awk '{print $2}' | grep mwan3_policy_ | sort -u)
+
+	for policy in $(echo $policies); do
+		json_add_array "${policy##*mwan3_policy_}"
+		report_policies "$IPT6" "$policy"
+		json_close_array
+	done
+}
+
+get_mwan3_status() {
+	local iface="${1}"
+	local iface_select="${2}"
+	local running="0"
+	local age=0
+	local online=0
+	local offline=0
+	local up="0"
+	local enabled pid device time_p time_n time_u time_d
+
+	network_get_device device $1
+
+	if [ "${iface}" = "${iface_select}" ] || [ "${iface_select}" = "" ]; then
+		pid="$(pgrep -f "mwan3track $iface $device")"
+		if [ "${pid}" != "" ]; then
+			running="1"
+		fi
+
+		time_p="$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/TIME")"
+		[ -z "${time_p}" ] || {
+			time_n="$(get_uptime)"
+			let age=time_n-time_p
+		}
+
+		time_u="$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/ONLINE")"
+		[ -z "${time_u}" ] || [ "${time_u}" = "0" ] || {
+			time_n="$(get_uptime)"
+			let online=time_n-time_u
+		}
+
+		time_d="$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/OFFLINE")"
+		[ -z "${time_d}" ] || [ "${time_d}" = "0" ] || {
+			time_n="$(get_uptime)"
+			let offline=time_n-time_d
+		}
+
+		local uptime="0"
+
+		config_get enabled "$iface" enabled 0
+		network_get_uptime uptime "$iface"
+		network_is_up "$iface" && up="1"
+
+		json_add_object "${iface}"
+		json_add_int age "$age"
+		json_add_int online "${online}"
+		json_add_int offline "${offline}"
+		json_add_int uptime "${uptime}"
+		json_add_int "score" "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/SCORE")"
+		json_add_int "lost" "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/LOST")"
+		json_add_int "turn" "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/TURN")"
+		json_add_string "status" "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/STATUS")"
+		json_add_boolean "enabled" "${enabled}"
+		json_add_boolean "running" "${running}"
+		json_add_boolean "up" "${up}"
+		json_add_array "track_ip"
+		for file in $MWAN3TRACK_STATUS_DIR/${iface}/TRACK_*; do
+			[ -z "${file#*/TRACK_OUTPUT}" ] && continue
+			[ -z "${file#*/TRACK_\*}" ] && continue
+			track="${file#*/TRACK_}"
+			json_add_object
+			json_add_string ip "${track}"
+			json_add_string status "$(cat "${file}")"
+			json_add_int latency "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/LATENCY_${track}")"
+			json_add_int packetloss "$(cat "$MWAN3TRACK_STATUS_DIR/${iface}/LOSS_${track}")"
+			json_close_object
+		done
+		json_close_array
+		json_close_object
+	fi
+}
+
+mwan3_get_iface_id() {
+    local _tmp _iface _iface_count
+    _iface="$2"
+    mwan3_get_id() {
+        let _iface_count++
+        [ "$1" = "$_iface" ] && _tmp=$_iface_count
+    }
+    config_foreach mwan3_get_id interface
+    export "$1=$_tmp"
+}
+
+get_mwan3_policies() {
+    local ipt="$1"
+    local policy="$2"
+    local percent total_weight weight iface
+
+    total_weight=$($ipt -S "$policy" | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | head -1 | awk '{print $3}')
+    if [ ! -z "${total_weight##*[!0-9]*}" ]; then
+        for iface in $($ipt -S "$policy" | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | awk '{print $1}'); do
+            weight=$($ipt -S "$policy" | grep -v '.*--comment "out .*" .*$' | cut -s -d'"' -f2 | awk '$1 == "'$iface'"' | awk '{print $2}')
+            [ "$weight" = "0" ] && percent=0 || percent=$(($weight*100/$total_weight))
+            json_add_object interface
+            json_add_string "interface" "$iface"
+            [ -z $(echo $1 | grep 6) ] && json_add_int "percent_v4" "$percent" || json_add_int "percent_v6" "$percent"
+            json_close_object
+        done
+    fi
+}
+
+get_mwan3_state() {
+    local device result state_v4 id enabled iface_v6 device_v6 result_v6 state_v6 id_v6 enabled_v6
+    local IP4="ip -4"
+    local IP6="ip -6"
+
+    if [ -z "$(echo $1 | grep 6)" ]; then
+        mwan3_get_iface_id id "$1"
+        network_get_device device "$1"
+        config_get enabled "$1" enabled 0
+
+        if [ -z "$id" ] || [ -z "$device" ]; then
+            result="offline"
+        elif [ -n "$($IP4 rule | awk '$1 == "'$(($id + 1000)):'"')" ] &&
+            [ -n "$($IP4 rule | awk '$1 == "'$(($id + 2000)):'"')" ]; then
+            result="$(mwan3_get_iface_hotplug_state $1)"
+        elif [ -n "$($IP4 rule | awk '$1 == "'$(($id + 1000)):'"')" ] ||
+            [ -n "$($IP4 rule | awk '$1 == "'$(($id + 2000)):'"')" ] ||
+            [ -n "$($IPT4 -S mwan3_iface_in_$1 2>/dev/null)" ] ||
+            [ -n "$($IP4 route list table $id default dev $device 2>/dev/null)" ]; then
+            result="error"
+        elif [ "$enabled" = "1" ]; then
+            result="offline"
+        else
+            result="disabled"
+        fi
+
+        case "$result" in
+        "online")
+            state_v4=0
+            ;;
+        "offline")
+            state_v4=1
+            ;;
+        "error")
+            state_v4=2
+            ;;
+        "disabled")
+            state_v4=3
+            ;;
+        esac
+
+        [ -z "$(echo $1 | grep modem)" ] && iface_v6=$1"6" || iface_v6=$1"_6"
+        mwan3_get_iface_id id_v6 "$iface_v6"
+        network_get_device device_v6 "$iface_v6"
+        config_get enabled_v6 "$iface_v6" enabled 0
+
+        if [ -z "$id_v6" ] || [ -z "$device_v6" ]; then
+            result_v6="offline"
+        elif [ -n "$($IP6 rule | awk '$1== "'$(($id_v6 + 1000)):'"')" ] &&
+            [ -n "$($IP6 rule | awk '$1== "'$(($id_v6 + 2000)):'"')" ]; then
+            result_v6="$(mwan3_get_iface_hotplug_state $iface_v6)"
+        elif [ -n "$($IP6 rule | awk '$1== "'$(($id_v6 + 1000)):'"')" ] ||
+            [ -n "$($IP6 rule | awk '$1== "'$(($id_v6 + 2000)):'"')" ] ||
+            [ -n "$($IPT6 -S mwan3_iface_in_$iface_v6 2>/dev/null)" ] ||
+            [ -n "$($IP6 route list table $id_v6 default dev $device_v6 2>/dev/null)" ]; then
+            result_v6="error"
+        elif [ "$enabled" = "1" ]; then
+            result_v6="offline"
+        else
+            result_v6="disabled"
+        fi
+
+        case "$result_v6" in
+        "online")
+            state_v6=0
+            ;;
+        "offline")
+            state_v6=1
+            ;;
+        "error")
+            state_v6=2
+            ;;
+        "disabled")
+            state_v6=3
+            ;;
+        esac
+
+        json_add_object interface
+        json_add_string "interface" "$1"
+        json_add_int "state_v4" "$state_v4"
+        json_add_string "status_v4" "$result"
+        json_add_int "state_v6" "$state_v6"
+        json_add_string "status_v6" "$result_v6"
+        json_close_object
+    fi
+
+}
+
+main () {
+
+	case "$1" in
+		list)
+			json_init
+			json_add_object "status"
+			json_add_string "section" "x"
+			json_add_string "interface" "x"
+			json_add_string "policies" "x"
+			json_close_object
+			json_add_object "state"
+			json_add_string "interface" "x"
+			json_add_string "policies" "x"
+			json_close_object
+			json_dump
+			;;
+		call)
+			case "$2" in
+			status)
+				local section iface
+				read input;
+				json_load "$input"
+				json_get_var section section
+				json_get_var iface interface
+
+				config_load mwan3
+				json_init
+				case "$section" in
+					interfaces)
+						json_add_object interfaces
+						config_foreach get_mwan3_status interface "${iface}"
+						json_close_object
+						;;
+					connected)
+						json_add_object connected
+						json_add_array ipv4
+						report_connected_v4
+						json_close_array
+						json_add_array ipv6
+						report_connected_v6
+						json_close_array
+						json_close_object
+						;;
+					policies)
+						json_add_object policies
+						json_add_object ipv4
+						report_policies_v4
+						json_close_object
+						json_add_object ipv6
+						report_policies_v6
+						json_close_object
+						json_close_object
+						;;
+					*)
+						# interfaces
+						json_add_object interfaces
+						config_foreach get_mwan3_status interface
+						json_close_object
+						# connected
+						json_add_object connected
+						json_add_array ipv4
+						report_connected_v4
+						json_close_array
+						json_add_array ipv6
+						report_connected_v6
+						json_close_array
+						json_close_object
+						# policies
+						json_add_object policies
+						json_add_object ipv4
+						report_policies_v4
+						json_close_object
+						json_add_object ipv6
+						report_policies_v6
+						json_close_object
+						json_close_object
+						;;
+				esac
+				json_dump
+				;;
+
+			state)
+				local section iface
+				read input;
+				json_load "$input"
+				json_get_var section section
+				json_get_var iface interface
+
+				config_load mwan3
+				json_init
+				case "$section" in
+					*)
+						json_add_array interfaces
+						config_foreach get_mwan3_state interface
+						json_close_array
+						json_add_array policies
+						get_mwan3_policies "$IPT4" "mwan3_policy_default_poli"
+						get_mwan3_policies "$IPT6" "mwan3_policy_default_poli_v6"
+						json_close_array
+						;;
+				esac
+				json_dump
+				;;
+
+			esac
+			;;
+	esac
+}
+
+main "$@"
diff --git a/mwan3/files/usr/sbin/mwan3 b/mwan3/files/usr/sbin/mwan3
new file mode 100755
index 00000000..3983ed2a
--- /dev/null
+++ b/mwan3/files/usr/sbin/mwan3
@@ -0,0 +1,245 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+. /lib/functions/network.sh
+. /lib/mwan3/mwan3.sh
+
+help()
+{
+	cat <<EOF
+Syntax: mwan3 [command]
+
+Available commands:
+	start           Load iptables rules, ip rules and ip routes
+	stop            Unload iptables rules, ip rules and ip routes
+	restart         Reload iptables rules, ip rules and ip routes
+	ifup <iface>    Load rules and routes for specific interface
+	ifdown <iface>  Unload rules and routes for specific interface
+	interfaces      Show interfaces status
+	policies        Show currently active policy
+	connected       Show directly connected networks
+	rules           Show active rules
+	status          Show all status
+
+EOF
+}
+
+ifdown()
+{
+	if [ -z "$1" ]; then
+		echo "Error: Expecting interface. Usage: mwan3 ifdown <interface>" && exit 0
+	fi
+
+	if [ -n "$2" ]; then
+		echo "Error: Too many arguments. Usage: mwan3 ifdown <interface>" && exit 0
+	fi
+
+	ACTION=ifdown INTERFACE=$1 /sbin/hotplug-call iface
+
+	kill $(pgrep -f "mwan3track $1 $2") &> /dev/null
+	mwan3_track_clean $1
+}
+
+ifup()
+{
+	local device enabled up l3_device status
+
+	mwan3_lock "command" "mwan3"
+
+	config_load mwan3
+	config_get_bool enabled globals 'enabled' 0
+
+	[ ${enabled} -gt 0 ] || {
+		echo "The service mwan3 is global disabled."
+		echo "Please execute \"/etc/init.d/mwan3 start\" first."
+		mwan3_unlock "command" "mwan3"
+		exit 1
+	}
+
+	if [ -z "$1" ]; then
+		echo "Expecting interface. Usage: mwan3 ifup <interface>"
+		mwan3_unlock "command" "mwan3"
+		exit 0
+	fi
+
+	if [ -n "$2" ]; then
+		echo "Too many arguments. Usage: mwan3 ifup <interface>"
+		mwan3_unlock "command" "mwan3"
+		exit 0
+	fi
+
+	config_get enabled "$1" enabled 0
+	mwan3_unlock "command" "mwan3"
+
+	status=$(ubus -S call network.interface.$1 status)
+	[ -n "$status" ] && {
+		json_load "$status"
+		json_get_vars up l3_device
+	}
+
+	if [ "$up" = "1" ] \
+		&& [ -n "$l3_device" ] \
+		&& [ -n "$enabled" ]; then
+		ACTION=ifup INTERFACE=$1 DEVICE=$l3_device /sbin/hotplug-call iface
+	fi
+}
+
+interfaces()
+{
+	config_load mwan3
+
+	echo "Interface status:"
+	config_foreach mwan3_report_iface_status interface
+	echo -e
+}
+
+policies()
+{
+	echo "Current ipv4 policies:"
+	mwan3_report_policies_v4
+	echo -e
+	[ $NO_IPV6 -ne 0 ] && return
+	echo "Current ipv6 policies:"
+	mwan3_report_policies_v6
+	echo -e
+}
+
+connected()
+{
+	echo "Directly connected ipv4 networks:"
+	mwan3_report_connected_v4
+	echo -e
+	[ $NO_IPV6 -ne 0 ] && return
+	echo "Directly connected ipv6 networks:"
+	mwan3_report_connected_v6
+	echo -e
+}
+
+rules()
+{
+	echo "Active ipv4 user rules:"
+	mwan3_report_rules_v4
+	echo -e
+	[ $NO_IPV6 -ne 0 ] && return
+	echo "Active ipv6 user rules:"
+	mwan3_report_rules_v6
+	echo -e
+}
+
+status()
+{
+	interfaces
+	policies
+	connected
+	rules
+}
+
+start()
+{
+	local enabled
+
+	mwan3_lock "command" "mwan3"
+	uci_toggle_state mwan3 globals enabled "1"
+	mwan3_unlock "command" "mwan3"
+
+	config_load mwan3
+	config_foreach ifup interface
+}
+
+stop()
+{
+	local ipset route rule table IP IPT pid
+
+	mwan3_lock "command" "mwan3"
+	uci_toggle_state mwan3 globals enabled "0"
+
+	for pid in $(pgrep -f "mwan3rtmon"); do
+		kill -TERM "$pid" > /dev/null 2>&1
+	done
+
+	for pid in $(pgrep -f "mwan3track"); do
+		kill -TERM "$pid" > /dev/null 2>&1
+	done
+
+	sleep 1
+
+	for pid in $(pgrep -f "mwan3track"); do
+		kill -KILL "$pid" > /dev/null 2>&1
+	done
+
+	config_load mwan3
+	config_foreach mwan3_track_clean interface
+
+	for IP in "$IP4" "$IP6"; do
+		[ "$IP" = "$IP6" ] && [ $NO_IPV6 -ne 0 ] && continue
+		for route in $(seq 1 $MWAN3_INTERFACE_MAX); do
+			$IP route flush table $route &> /dev/null
+		done
+
+		for rule in $($IP rule list | egrep '^[1-2][0-9]{3}\:' | cut -d ':' -f 1); do
+			$IP rule del pref $rule &> /dev/null
+		done
+	done
+
+	for IPT in "$IPT4" "$IPT6"; do
+		[ "$IPT" = "$IPT6" ] && [ $NO_IPV6 -ne 0 ] && continue
+		$IPT -D PREROUTING -j mwan3_hook &> /dev/null
+		$IPT -D OUTPUT -j mwan3_hook &> /dev/null
+
+		for table in $($IPT -S | awk '{print $2}' | grep mwan3 | sort -u); do
+			$IPT -F $table &> /dev/null
+		done
+
+		for table in $($IPT -S | awk '{print $2}' | grep mwan3 | sort -u); do
+			$IPT -X $table &> /dev/null
+		done
+
+		$IPT -S mwan3_hook | grep mwan3_hook &> /dev/null
+		if [ "$?" == "0" ]; then
+			if [ -n "$(which fw4)" ];then
+				local ip="ip"
+				[ "$IPT" = "$IPT6" ] && ip="ip6"
+				nft flush chain $ip mangle PREROUTING | grep mwan3_hook
+				nft flush chain $ip mangle OUTPUT | grep mwan3_hook
+				nft delete chain $ip mangle mwan3_hook
+			else
+				$IPT -D PREROUTING -j mwan3_hook &> /dev/null
+				$IPT -D OUTPUT -j mwan3_hook &> /dev/null
+				$IPT -F mwan3_hook
+				$IPT -X mwan3_hook
+			fi
+		fi
+	done
+
+	iptables -F FORWARD
+
+	for ipset in $($IPS -n list | grep mwan3_); do
+		$IPS -q destroy $ipset
+	done
+
+	for ipset in $($IPS -n list | grep mwan3 | grep -E '_v4|_v6'); do
+		$IPS -q destroy $ipset
+	done
+
+	mwan3_unlock "command" "mwan3"
+
+	rm -rf $MWAN3_STATUS_DIR $MWAN3TRACK_STATUS_DIR
+}
+
+restart() {
+	stop
+	start
+}
+
+case "$1" in
+	ifup|ifdown|interfaces|policies|connected|rules|status|start|stop|restart)
+		mwan3_init
+		$*
+	;;
+	*)
+		help
+	;;
+esac
+
+exit 0
diff --git a/mwan3/files/usr/sbin/mwan3rtmon b/mwan3/files/usr/sbin/mwan3rtmon
new file mode 100755
index 00000000..3ebdd456
--- /dev/null
+++ b/mwan3/files/usr/sbin/mwan3rtmon
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/mwan3/mwan3.sh
+
+LOG="logger -t $(basename "$0")[$$] -p"
+lock_status=0
+
+clean_up() {
+	[ "$lock_status" == "1" ] && mwan3_unlock "service" "mwan3rtmon"
+	$LOG notice "Stopping mwan3rtmon..."
+	exit 0
+}
+
+rtchange() {
+	$LOG info "Detect rtchange event."
+}
+
+main() {
+	local rtmon_interval
+	trap clean_up TERM
+	trap rtchange USR1
+
+	config_load mwan3
+	config_get rtmon_interval globals rtmon_interval '5'
+
+	sleep 3
+	while true; do
+		lock_status=1
+		mwan3_lock "service" "mwan3rtmon"
+		mwan3_rtmon_ipv4
+		ret=$((ret+$?))
+		mwan3_rtmon_ipv6
+		ret=$((ret+$?))
+		mwan3_unlock "service" "mwan3rtmon"
+		lock_status=0
+		[ "$ret" = "0" ] || break
+		[ "$rtmon_interval" = "0" ] && break
+		sleep "$rtmon_interval" &
+		wait
+	done
+}
+
+main "$@"
diff --git a/mwan3/files/usr/sbin/mwan3track b/mwan3/files/usr/sbin/mwan3track
new file mode 100755
index 00000000..c87eeb1d
--- /dev/null
+++ b/mwan3/files/usr/sbin/mwan3track
@@ -0,0 +1,317 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /lib/mwan3/common.sh
+. /usr/share/libubox/jshn.sh
+
+LOG="logger -t $(basename "$0")[$$] -p"
+INTERFACE=""
+DEVICE=""
+PING="/bin/ping"
+
+IFDOWN_EVENT=0
+
+clean_up() {
+	$LOG notice "Stopping mwan3track for interface \"${INTERFACE}\""
+	exit 0
+}
+
+if_down() {
+	$LOG info "Detect ifdown event on interface ${INTERFACE} (${DEVICE})"
+	IFDOWN_EVENT=1
+}
+
+validate_track_method() {
+	case "$1" in
+		ping)
+			which ping 1>/dev/null 2>&1 || {
+				$LOG warn "Missing ping. Please install iputils-ping package or enable ping util and recompile busybox."
+				return 1
+			}
+			;;
+		arping)
+			which arping 1>/dev/null 2>&1 || {
+				$LOG warn "Missing arping. Please install iputils-arping package."
+				return 1
+			}
+			;;
+		httping)
+			which httping 1>/dev/null 2>&1 || {
+				$LOG warn "Missing httping. Please install httping package."
+				return 1
+			}
+			[ -n "$2" -a "$2" != "0.0.0.0" -a "$2" != "::" ] || {
+				$LOG warn "Cannot determine source IP for the interface which is required by httping."
+				return 1
+			}
+			;;
+		nping-*)
+			which nping 1>/dev/null 2>&1 || {
+				$LOG warn "Missing nping. Please install nping package."
+				return 1
+			}
+			;;
+		*)
+			$LOG warn "Unsupported tracking method: $track_method"
+			return 2
+			;;
+	esac
+}
+
+main() {
+	local reliability count timeout interval failure_interval
+	local recovery_interval down up size
+	local keep_failure_interval check_quality failure_latency
+	local recovery_latency failure_loss recovery_loss
+	local max_ttl httping_ssl
+
+	[ -z "$5" ] && echo "Error: should not be started manually" && exit 0
+
+	INTERFACE=$1
+	DEVICE=$2
+	STATUS=$3
+	SRC_IP=$4
+	mkdir -p /var/run/mwan3track/$1
+	trap clean_up TERM
+	trap if_down USR1
+
+	config_load mwan3
+	config_get_bool enabled $INTERFACE 'enabled' '0'
+	config_get track_method $1 track_method ping
+	config_get_bool httping_ssl $1 httping_ssl 0
+	validate_track_method $track_method $SRC_IP || {
+		track_method=ping
+		if validate_track_method $track_method; then
+			$LOG warn "Using ping to track interface $INTERFACE avaliability"
+		else
+			$LOG err "No track method avaliable"
+			exit 1
+		fi
+	}
+	config_get reliability $1 reliability 1
+	config_get count $1 count 1
+	config_get timeout $1 timeout 4
+	config_get interval $1 interval 10
+	config_get down $1 down 5
+	config_get up $1 up 5
+	config_get size $1 size 56
+	config_get max_ttl $1 max_ttl 60
+	config_get failure_interval $1 failure_interval $interval
+	config_get_bool keep_failure_interval $1 keep_failure_interval 0
+	config_get recovery_interval $1 recovery_interval $interval
+	config_get_bool check_quality $1 check_quality 0
+	config_get failure_latency $1 failure_latency 1000
+	config_get recovery_latency $1 recovery_latency 500
+	config_get failure_loss $1 failure_loss 40
+	config_get recovery_loss $1 recovery_loss 10
+
+	local score=$(($down+$up))
+	local track_ips=$(echo $* | cut -d ' ' -f 5-99)
+	local host_up_count=0
+	local lost=0
+	local sleep_time=0
+	local turn=0
+	local result
+	local ping_protocol=4
+	local ping_result
+	local ping_result_raw
+	local ping_status
+	local loss=0
+	local latency=0
+
+	if [ "$STATUS" = "offline" ]; then
+		echo "offline" > /var/run/mwan3track/$1/STATUS
+		echo "0" > /var/run/mwan3track/$1/ONLINE
+		echo "$(get_uptime)" > /var/run/mwan3track/$1/OFFLINE
+		score=0
+	else
+		echo "online" > /var/run/mwan3track/$1/STATUS
+		echo "0" > /var/run/mwan3track/$1/OFFLINE
+		echo "$(get_uptime)" > /var/run/mwan3track/$1/ONLINE
+		env -i ACTION="connected" INTERFACE="$1" DEVICE="$2" /sbin/hotplug-call iface
+	fi
+	while true; do
+
+		sleep_time=$interval
+
+		for track_ip in $track_ips; do
+			if [ $host_up_count -lt $reliability ]; then
+				if [ "${enabled}" -eq 1 ]; then
+					case "$track_method" in
+						ping)
+							if echo $track_ip | grep -q ':'; then
+								ping_protocol=6
+							fi
+							if [ $check_quality -eq 0 ]; then
+								$PING -$ping_protocol -I $DEVICE -c $count -W $timeout -s $size -t $max_ttl -q $track_ip &> /dev/null
+								result=$?
+							else
+								ping_result_raw="$($PING -$ping_protocol -I $DEVICE -c $count -W $timeout -s $size -t $max_ttl -q $track_ip 2>/dev/null)"
+								ping_status=$?
+								ping_result=$(echo "$ping_result_raw" | tail -n2)
+								loss="$(echo "$ping_result" | grep "packet loss" |  cut -d "," -f3 | awk '{print $1}' | sed -e 's/%//')"
+								if [ "$ping_status" -ne 0 ] || [ "$loss" -eq 100 ]; then
+									latency=999999
+									loss=100
+								else
+									latency="$(echo "$ping_result" | grep -E 'rtt|round-trip' | cut -d "=" -f2 | cut -d "/" -f2 | cut -d "." -f1)"
+								fi
+							fi
+						;;
+						arping)
+							arping -I $DEVICE -c $count -w $timeout -q $track_ip &> /dev/null
+							result=$?
+						;;
+						httping)
+							if [ "$httping_ssl" -eq 1 ]; then
+								#httping -y $SRC_IP -c $count -t $timeout -q "https://$track_ip" &> /dev/null
+								httping -O $DEVICE -c $count -t $timeout -q "https://$track_ip" &> /dev/null
+							else
+								#httping -y $SRC_IP -c $count -t $timeout -q "http://$track_ip" &> /dev/null
+								httping -O $DEVICE -c $count -t $timeout -q "http://$track_ip" &> /dev/null
+							fi
+							result=$?
+						;;
+						nping-tcp)
+							result=$(nping -e $DEVICE -c $count $track_ip --tcp | grep Lost | awk '{print $12}')
+						;;
+						nping-udp)
+							result=$(nping -e $DEVICE -c $count $track_ip --udp | grep Lost | awk '{print $12}')
+						;;
+						nping-icmp)
+							result=$(nping -e $DEVICE -c $count $track_ip --icmp | grep Lost | awk '{print $12}')
+						;;
+						nping-arp)
+							result=$(nping -e $DEVICE -c $count $track_ip --arp | grep Lost | awk '{print $12}')
+						;;
+					esac
+				else
+					if [ -n "$(ubus list | grep $INTERFACE)" ]; then
+						json_load "$(ubus call network.interface.$INTERFACE status "$(json_dump)")"
+						json_get_var interface_status up
+					fi
+					[ "${interface_status}" = "1" ] && result=0 || result=1
+				fi
+
+				if [ $check_quality -eq 0 ]; then
+					if [ $result -eq 0 ]; then
+						let host_up_count++
+						echo "up" > /var/run/mwan3track/$1/TRACK_${track_ip}
+						# if [ $score -le $up ]; then
+						# 	$LOG info "Check ($track_method) success for target \"$track_ip\" on interface $1 ($2)"
+						# fi
+					else
+						let lost++
+						echo "down" > /var/run/mwan3track/$1/TRACK_${track_ip}
+						# if [ $score -gt $up ]; then
+						# 	$LOG info "Check ($track_method) failed for target \"$track_ip\" on interface $1 ($2)"
+						# fi
+					fi
+				else
+					if [ "$loss" -ge "$failure_loss" -o "$latency" -ge "$failure_latency" ]; then
+						let lost++
+						echo "down" > /var/run/mwan3track/$1/TRACK_${track_ip}
+						echo "$latency" > /var/run/mwan3track/$1/LATENCY_${track_ip}
+						echo "$loss" > /var/run/mwan3track/$1/LOSS_${track_ip}
+
+						if [ $score -gt $up ]; then
+							$LOG info "Check (${track_method}: latency=${latency}ms loss=${loss}%) failed for target \"$track_ip\" on interface $1 ($2)"
+						fi
+					elif [ "$loss" -le "$recovery_loss" -a "$latency" -le "$recovery_latency" ]; then
+						let host_up_count++
+						echo "up" > /var/run/mwan3track/$1/TRACK_${track_ip}
+						echo "$latency" > /var/run/mwan3track/$1/LATENCY_${track_ip}
+						echo "$loss" > /var/run/mwan3track/$1/LOSS_${track_ip}
+
+						if [ $score -le $up ]; then
+							$LOG info "Check (${track_method}: latency=${latency}ms loss=${loss}%) success for target \"$track_ip\" on interface $1 ($2)"
+						fi
+					else
+						echo "skipped" > /var/run/mwan3track/$1/TRACK_${track_ip}
+					fi
+				fi
+			else
+				echo "skipped" > /var/run/mwan3track/$1/TRACK_${track_ip}
+			fi
+		done
+
+		local proto_flag=0
+		local dual_enable=$(uci -q get glmodem.${INTERFACE}_dual.enable)
+		[ "$(uci -q get network.$INTERFACE.proto)" = "3g" -a -n "$(echo $DEVICE | grep modem | grep 3g)" ] && proto_flag=1
+		[ "$(uci -q get network.$INTERFACE.proto)" != "3g" -a -n "$(echo $INTERFACE | grep modem)" ] && proto_flag=1
+
+		if [ $host_up_count -lt $reliability ]; then
+			let score--
+
+			if [ $score -lt $up ]; then
+				score=0
+				[ ${keep_failure_interval} -eq 1 ] && {
+					sleep_time=$failure_interval
+				}
+				if [ "$dual_enable" = "1" -a $proto_flag -eq 1 -a "$(cat /var/run/dual_sim/$INTERFACE/env_send 2>/dev/null)" != "1" -a -n "$(ip link show $DEVICE | grep 'state UP')" ]; then
+					echo 1 > /var/run/dual_sim/$INTERFACE/env_send
+					$LOG notice "mwan3 dual_sim Detect score zero fail..."
+					env -i ACTION=switch INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface &
+				fi
+			else
+				sleep_time=$failure_interval
+			fi
+
+			if [ $score -eq $up ]; then
+				echo "offline" > /var/run/mwan3track/$1/STATUS
+				score=0
+				env -i ACTION=ifdown INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface
+				if [ "$dual_enable" = "1" -a $proto_flag -eq 1 -a "$(cat /var/run/dual_sim/$INTERFACE/env_send 2>/dev/null)" != "1" ]; then
+					echo 1 > /var/run/dual_sim/$INTERFACE/env_send
+					$LOG notice "mwan3 dual_sim Detect score eq up and ping down fail..."
+					env -i ACTION=switch INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface &
+				fi
+			fi
+		else
+			if [ $score -lt $(($down+$up)) ] && [ $lost -gt 0 ]; then
+				$LOG info "Lost $(($lost*$count)) ping(s) on interface $1 ($2)"
+			fi
+
+			let score++
+			lost=0
+
+			if [ $score -gt $up ]; then
+				echo "online" > /var/run/mwan3track/$1/STATUS
+				echo "online" > /var/run/mwan3/iface_state/$1
+				score=$(($down+$up))
+			elif [ $score -le $up ]; then
+				sleep_time=$recovery_interval
+			fi
+
+			if [ $score -eq $up ]; then
+				$LOG notice "Interface $1 ($2) is online"
+				echo "online" > /var/run/mwan3track/$1/STATUS
+				env -i ACTION=ifup INTERFACE=$1 DEVICE=$2 /sbin/hotplug-call iface
+				exit 0
+			fi
+		fi
+
+		let turn++
+		mkdir -p "/var/run/mwan3track/${1}"
+		echo "${lost}" > /var/run/mwan3track/$1/LOST
+		echo "${score}" > /var/run/mwan3track/$1/SCORE
+		echo "${turn}" > /var/run/mwan3track/$1/TURN
+		echo "$(get_uptime)" > /var/run/mwan3track/$1/TIME
+
+		host_up_count=0
+		sleep "${sleep_time}" &
+		wait
+
+		if [ "${IFDOWN_EVENT}" -eq 1 ]; then
+			echo "offline" > /var/run/mwan3track/$1/STATUS
+			echo "$(get_uptime)" > /var/run/mwan3track/$1/OFFLINE
+			echo "0" > /var/run/mwan3track/$1/ONLINE
+			$LOG notice "Interface $1 ($2) is offline"
+			env -i ACTION="disconnected" INTERFACE="$1" DEVICE="$2" /sbin/hotplug-call iface
+			score=0
+			IFDOWN_EVENT=0
+		fi
+	done
+}
+
+main "$@"
diff --git a/nginx/Config.in b/nginx/Config.in
new file mode 100644
index 00000000..ccb5e240
--- /dev/null
+++ b/nginx/Config.in
@@ -0,0 +1,270 @@
+#
+# Copyright (C) 2010-2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+menu "Configuration"
+        depends on PACKAGE_nginx
+
+config NGINX_SSL
+	bool
+	prompt "Enable SSL module"
+	help
+		Enable HTTPS/SSL support.
+	default n
+
+config NGINX_DAV
+	bool
+	prompt "Enable WebDAV module"
+	help
+		Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE.
+	default n
+
+config NGINX_UBUS
+	bool
+	prompt "Enable UBUS module"
+	help
+		Enable UBUS api support directly from the server.
+	default y
+
+config NGINX_FLV
+	bool
+	prompt "Enable FLV module"
+	help
+		Provides the ability to seek within FLV (Flash) files using time-based offsets.
+	default n
+
+config NGINX_STUB_STATUS
+	bool
+	prompt "Enable stub status module"
+	help
+		Enable the stub status module which gives some status from the server.
+	default n
+
+config NGINX_HTTP_CHARSET
+	bool
+	prompt "Enable HTTP charset module"
+	default y
+
+config NGINX_HTTP_GZIP
+	bool
+	prompt "Enable HTTP gzip module"
+	default y
+
+config NGINX_HTTP_SSI
+	bool
+	prompt "Enable HTTP ssi module"
+	default y
+
+config NGINX_HTTP_USERID
+	bool
+	prompt "Enable HTTP userid module"
+	default y
+
+config NGINX_HTTP_ACCESS
+	bool
+	prompt "Enable HTTP access module"
+	default y
+
+config NGINX_HTTP_AUTH_BASIC
+	bool
+	prompt "Enable HTTP auth basic"
+	default y
+
+config NGINX_HTTP_AUTH_REQUEST
+	bool
+	prompt "Enable HTTP auth request module"
+	default n
+
+config NGINX_HTTP_AUTOINDEX
+	bool
+	prompt "Enable HTTP autoindex module"
+	default y
+
+config NGINX_HTTP_GEO
+	bool
+	prompt "Enable HTTP geo module"
+	default y
+
+config NGINX_HTTP_MAP
+	bool
+	prompt "Enable HTTP map module"
+	default y
+
+config NGINX_HTTP_SPLIT_CLIENTS
+	bool
+	prompt "Enable HTTP split clients"
+	default y
+
+config NGINX_HTTP_REFERER
+	bool
+	prompt "Enable HTTP referer module"
+	default y
+
+config NGINX_HTTP_REWRITE
+	bool
+	prompt "Enable HTTP rewrite module"
+	select NGINX_PCRE
+	default y
+
+config NGINX_HTTP_PROXY
+	bool
+	prompt "Enable HTTP proxy module"
+	default y
+
+config NGINX_HTTP_FASTCGI
+	bool
+	prompt "Enable HTTP fastcgi module"
+	default y
+
+config NGINX_HTTP_UWSGI
+	bool
+	prompt "Enable HTTP uwsgi module"
+	default y
+
+config NGINX_HTTP_SCGI
+	bool
+	prompt "Enable HTTP scgi module"
+	default y
+
+config NGINX_HTTP_MEMCACHED
+	bool
+	prompt "Enable HTTP memcached module"
+	default y
+
+config NGINX_HTTP_LIMIT_CONN
+	bool
+	prompt "Enable HTTP limit conn"
+	default y
+
+config NGINX_HTTP_LIMIT_REQ
+	bool
+	prompt "Enable HTTP limit req"
+	default y
+
+config NGINX_HTTP_EMPTY_GIF
+	bool
+	prompt "Enable HTTP empty gif"
+	default y
+
+config NGINX_HTTP_BROWSER
+	bool
+	prompt "Enable HTTP browser module"
+	default y
+
+config NGINX_HTTP_UPSTREAM_HASH
+	bool
+	prompt "Enable HTTP hash module"
+	default y
+
+config NGINX_HTTP_UPSTREAM_IP_HASH
+	bool
+	prompt "Enable HTTP IP hash module"
+	default y
+
+config NGINX_HTTP_UPSTREAM_LEAST_CONN
+	bool
+	prompt "Enable HTTP least conn module"
+	default y
+
+config NGINX_HTTP_UPSTREAM_KEEPALIVE
+	bool
+	prompt "Enable HTTP keepalive module"
+	default y
+
+config NGINX_HTTP_CACHE
+	bool
+	prompt "Enable HTTP cache"
+	default y
+
+config NGINX_HTTP_V2
+	bool
+	prompt "Enable HTTP_V2 module"
+	default n
+
+config NGINX_PCRE
+	bool
+	prompt "Enable PCRE library usage"
+	default y
+
+config NGINX_NAXSI
+	bool
+	prompt "Enable NAXSI module"
+	default y
+
+config NGINX_LUA
+	bool
+	prompt "Enable Lua module"
+	default n
+
+config NGINX_HTTP_REAL_IP
+	bool
+	prompt "Enable HTTP real ip module"
+	default n
+
+config NGINX_HTTP_SECURE_LINK
+	bool
+	prompt "Enable HTTP secure link module"
+	default n
+	
+config NGINX_HTTP_SUB
+	bool
+	prompt "Enable HTTP sub module"
+	default n
+	
+config NGINX_HEADERS_MORE
+	bool
+	prompt "Enable Headers_more module"
+	help
+		Set and clear input and output headers...more than "add"!
+	default y
+	
+config NGINX_HTTP_BROTLI
+	bool
+	prompt "Enable Brotli compression module"
+	help
+		Add support for brotli compression module.
+	default n
+
+config NGINX_STREAM_CORE_MODULE
+	bool
+	prompt "Enable stream support"
+	help
+		Add support for NGINX request streaming.
+	default n
+
+config NGINX_STREAM_SSL_MODULE
+	bool
+	prompt "Enable stream support with SSL/TLS termination"
+	depends on NGINX_STREAM_CORE_MODULE
+	help
+		Add support for NGINX request streaming with SSL/TLS termination.
+	default n
+
+config NGINX_STREAM_SSL_PREREAD_MODULE
+	bool
+	prompt "Enable stream support with SSL/TLS pre-read"
+	depends on NGINX_STREAM_CORE_MODULE
+	help
+		Add support for NGINX request streaming using information from the ClientHello message without terminating SSL/TLS.
+	default n
+
+config NGINX_RTMP_MODULE
+	bool
+	prompt "Enable RTMP module"
+	depends on NGINX_SSL
+	help
+		Add support for NGINX-based Media Streaming Server module.
+		DASH enhanced - https://github.com/ut0mt8/nginx-rtmp-module
+	default n
+
+config NGINX_TS_MODULE
+	bool
+	prompt "Enable TS module"
+	help
+		Add support for MPEG-TS Live Module module.
+	default n
+
+endmenu
diff --git a/nginx/Config_ssl.in b/nginx/Config_ssl.in
new file mode 100644
index 00000000..050d71fe
--- /dev/null
+++ b/nginx/Config_ssl.in
@@ -0,0 +1,262 @@
+#
+# Copyright (C) 2010-2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+menu "Configuration"
+        depends on PACKAGE_nginx-ssl
+
+config NGINX_DAV
+	bool
+	prompt "Enable WebDAV module"
+	help
+		Enable the HTTP and WebDAV methods PUT, DELETE, MKCOL, COPY and MOVE.
+	default n
+
+config NGINX_UBUS
+	bool
+	prompt "Enable UBUS module"
+	help
+		Enable UBUS api support directly from the server.
+	default y
+
+config NGINX_FLV
+	bool
+	prompt "Enable FLV module"
+	help
+		Provides the ability to seek within FLV (Flash) files using time-based offsets.
+	default n
+
+config NGINX_STUB_STATUS
+	bool
+	prompt "Enable stub status module"
+	help
+		Enable the stub status module which gives some status from the server.
+	default n
+
+config NGINX_HTTP_CHARSET
+	bool
+	prompt "Enable HTTP charset module"
+	default y
+
+config NGINX_HTTP_GZIP
+	bool
+	prompt "Enable HTTP gzip module"
+	default y
+
+config NGINX_HTTP_SSI
+	bool
+	prompt "Enable HTTP ssi module"
+	default y
+
+config NGINX_HTTP_USERID
+	bool
+	prompt "Enable HTTP userid module"
+	default y
+
+config NGINX_HTTP_ACCESS
+	bool
+	prompt "Enable HTTP access module"
+	default y
+
+config NGINX_HTTP_AUTH_BASIC
+	bool
+	prompt "Enable HTTP auth basic"
+	default y
+
+config NGINX_HTTP_AUTH_REQUEST
+	bool
+	prompt "Enable HTTP auth request module"
+	default n
+
+config NGINX_HTTP_AUTOINDEX
+	bool
+	prompt "Enable HTTP autoindex module"
+	default y
+
+config NGINX_HTTP_GEO
+	bool
+	prompt "Enable HTTP geo module"
+	default y
+
+config NGINX_HTTP_MAP
+	bool
+	prompt "Enable HTTP map module"
+	default y
+
+config NGINX_HTTP_SPLIT_CLIENTS
+	bool
+	prompt "Enable HTTP split clients"
+	default y
+
+config NGINX_HTTP_REFERER
+	bool
+	prompt "Enable HTTP referer module"
+	default y
+
+config NGINX_HTTP_REWRITE
+	bool
+	prompt "Enable HTTP rewrite module"
+	select NGINX_PCRE
+	default y
+
+config NGINX_HTTP_PROXY
+	bool
+	prompt "Enable HTTP proxy module"
+	default y
+
+config NGINX_HTTP_FASTCGI
+	bool
+	prompt "Enable HTTP fastcgi module"
+	default y
+
+config NGINX_HTTP_UWSGI
+	bool
+	prompt "Enable HTTP uwsgi module"
+	default y
+
+config NGINX_HTTP_SCGI
+	bool
+	prompt "Enable HTTP scgi module"
+	default y
+
+config NGINX_HTTP_MEMCACHED
+	bool
+	prompt "Enable HTTP memcached module"
+	default y
+
+config NGINX_HTTP_LIMIT_CONN
+	bool
+	prompt "Enable HTTP limit conn"
+	default y
+
+config NGINX_HTTP_LIMIT_REQ
+	bool
+	prompt "Enable HTTP limit req"
+	default y
+
+config NGINX_HTTP_EMPTY_GIF
+	bool
+	prompt "Enable HTTP empty gif"
+	default y
+
+config NGINX_HTTP_BROWSER
+	bool
+	prompt "Enable HTTP browser module"
+	default y
+
+config NGINX_HTTP_UPSTREAM_HASH
+	bool
+	prompt "Enable HTTP hash module"
+	default y
+
+config NGINX_HTTP_UPSTREAM_IP_HASH
+	bool
+	prompt "Enable HTTP IP hash module"
+	default y
+
+config NGINX_HTTP_UPSTREAM_LEAST_CONN
+	bool
+	prompt "Enable HTTP least conn module"
+	default y
+
+config NGINX_HTTP_UPSTREAM_KEEPALIVE
+	bool
+	prompt "Enable HTTP keepalive module"
+	default y
+
+config NGINX_HTTP_CACHE
+	bool
+	prompt "Enable HTTP cache"
+	default y
+
+config NGINX_HTTP_V2
+	bool
+	prompt "Enable HTTP_V2 module"
+	default n
+
+config NGINX_PCRE
+	bool
+	prompt "Enable PCRE library usage"
+	default y
+
+config NGINX_NAXSI
+	bool
+	prompt "Enable NAXSI module"
+	default y
+
+config NGINX_LUA
+	bool
+	prompt "Enable Lua module"
+	default n
+
+config NGINX_HTTP_REAL_IP
+	bool
+	prompt "Enable HTTP real ip module"
+	default n
+
+config NGINX_HTTP_SECURE_LINK
+	bool
+	prompt "Enable HTTP secure link module"
+	default n
+
+config NGINX_HTTP_SUB
+	bool
+	prompt "Enable HTTP sub module"
+	default n
+	
+config NGINX_HEADERS_MORE
+	bool
+	prompt "Enable Headers_more module"
+	help
+		Set and clear input and output headers...more than "add"!
+	default y
+	
+config NGINX_HTTP_BROTLI
+	bool
+	prompt "Enable Brotli compression module"
+	help
+		Add support for brotli compression module.
+	default n
+
+config NGINX_STREAM_CORE_MODULE
+	bool
+	prompt "Enable stream support"
+	help
+		Add support for NGINX request streaming.
+	default n
+
+config NGINX_STREAM_SSL_MODULE
+	bool
+	prompt "Enable stream support with SSL/TLS termination"
+	depends on NGINX_STREAM_CORE_MODULE
+	help
+		Add support for NGINX request streaming with SSL/TLS termination.
+	default n
+
+config NGINX_STREAM_SSL_PREREAD_MODULE
+	bool
+	prompt "Enable stream support with SSL/TLS pre-read"
+	depends on NGINX_STREAM_CORE_MODULE
+	help
+		Add support for NGINX request streaming using information from the ClientHello message without terminating SSL/TLS.
+	default n
+
+config NGINX_RTMP_MODULE
+	bool
+	prompt "Enable RTMP module"
+	help
+		Add support for NGINX-based Media Streaming Server module.
+		DASH enhanced - https://github.com/ut0mt8/nginx-rtmp-module
+	default n
+
+config NGINX_TS_MODULE
+	bool
+	prompt "Enable TS module"
+	help
+		Add support for MPEG-TS Live Module module.
+	default n
+
+endmenu
diff --git a/nginx/Makefile b/nginx/Makefile
new file mode 100644
index 00000000..2671981c
--- /dev/null
+++ b/nginx/Makefile
@@ -0,0 +1,572 @@
+#
+# Copyright (C) 2012-2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=nginx
+PKG_VERSION:=1.17.7
+PKG_RELEASE:=2
+
+PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://nginx.org/download/
+PKG_HASH:=b62756842807e5693b794e5d0ae289bd8ae5b098e66538b2a91eb80f25c591ff
+
+PKG_MAINTAINER:=Thomas Heil <heil@terminal-consulting.de> \
+				Ansuel Smith <ansuelsmth@gmail.com>
+PKG_LICENSE:=2-clause BSD-like license
+PKG_CPE_ID:=cpe:/a:nginx:nginx
+
+PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+PKG_CONFIG_DEPENDS := \
+	CONFIG_NGINX_SSL \
+	CONFIG_NGINX_DAV \
+	CONFIG_NGINX_FLV \
+	CONFIG_NGINX_UBUS \
+	CONFIG_NGINX_STUB_STATUS \
+	CONFIG_NGINX_HTTP_CHARSET \
+	CONFIG_NGINX_HTTP_GZIP \
+	CONFIG_NGINX_HTTP_SSI \
+	CONFIG_NGINX_HTTP_USERID \
+	CONFIG_NGINX_HTTP_ACCESS \
+	CONFIG_NGINX_HTTP_AUTH_BASIC \
+	CONFIG_NGINX_HTTP_AUTH_REQUEST \
+	CONFIG_NGINX_HTTP_AUTOINDEX \
+	CONFIG_NGINX_HTTP_GEO \
+	CONFIG_NGINX_HTTP_MAP \
+	CONFIG_NGINX_HTTP_SPLIT_CLIENTS \
+	CONFIG_NGINX_HTTP_REFERER \
+	CONFIG_NGINX_HTTP_REWRITE \
+	CONFIG_NGINX_HTTP_PROXY \
+	CONFIG_NGINX_HTTP_FASTCGI \
+	CONFIG_NGINX_HTTP_UWSGI \
+	CONFIG_NGINX_HTTP_SCGI \
+	CONFIG_NGINX_HTTP_MEMCACHED \
+	CONFIG_NGINX_HTTP_LIMIT_CONN \
+	CONFIG_NGINX_HTTP_LIMIT_REQ \
+	CONFIG_NGINX_HTTP_EMPTY_GIF \
+	CONFIG_NGINX_HTTP_BROWSER \
+	CONFIG_NGINX_HTTP_UPSTREAM_HASH \
+	CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH \
+	CONFIG_NGINX_HTTP_UPSTREAM_LEAST_CONN \
+	CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE \
+	CONFIG_NGINX_HTTP_UPSTREAM_ZONE \
+	CONFIG_NGINX_HTTP_CACHE \
+	CONFIG_NGINX_HTTP_V2 \
+	CONFIG_NGINX_PCRE \
+	CONFIG_NGINX_NAXSI \
+	CONFIG_NGINX_LUA \
+	CONFIG_NGINX_HTTP_REAL_IP \
+	CONFIG_NGINX_HTTP_SECURE_LINK \
+	CONFIG_NGINX_HTTP_BROTLI \
+	CONFIG_NGINX_HEADERS_MORE \
+	CONFIG_NGINX_STREAM_CORE_MODULE \
+	CONFIG_NGINX_STREAM_SSL_MODULE \
+	CONFIG_NGINX_STREAM_SSL_PREREAD_MODULE \
+	CONFIG_NGINX_RTMP_MODULE \
+	CONFIG_NGINX_TS_MODULE \
+	CONFIG_OPENSSL_ENGINE \
+	CONFIG_OPENSSL_WITH_NPN
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/nginx/default
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
+  TITLE:=Nginx web server
+  URL:=http://nginx.org/
+  DEPENDS:=+NGINX_PCRE:libpcre +NGINX_SSL:libopenssl \
+	+NGINX_HTTP_GZIP:zlib +NGINX_LUA:liblua +libpthread +NGINX_DAV:libxml2 \
+	+NGINX_UBUS:libubus +NGINX_UBUS:libblobmsg-json +NGINX_UBUS:libjson-c
+endef
+
+define Package/nginx/description
+ nginx is an HTTP and reverse proxy server, as well as a mail proxy server, \
+ written by Igor Sysoev. (Some module require SSL module enable to show up in \
+ config menu)
+endef
+
+define Package/nginx
+  $(Package/nginx/default)
+  VARIANT:=no-ssl
+endef
+
+define Package/nginx-ssl
+  $(Package/nginx/default)
+  TITLE += with SSL support
+  DEPENDS +=+libopenssl
+  VARIANT:=ssl
+  PROVIDES:=nginx
+endef
+
+Package/nginx-ssl/description = $(Package/nginx/description) \
+  This variant is compiled with SSL support enabled. To enable additional module \
+  select them in the nginx default configuration menu.
+
+define Package/nginx-all-module
+  $(Package/nginx/default)
+  TITLE += with ALL module selected
+  DEPENDS:=+libpcre +libopenssl +zlib +liblua +libpthread +libxml2 \
+   +libubus +libblobmsg-json +libjson-c
+  VARIANT:=all-module
+  PROVIDES:=nginx
+endef
+
+Package/nginx-all-module/description = $(Package/nginx/description) \
+  This variant is compiled with ALL module selected.
+
+define Package/nginx/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/nginx-ssl/config
+  source "$(SOURCE)/Config_ssl.in"
+endef
+
+config_files=nginx.conf mime.types
+
+define Package/nginx/conffiles
+/etc/nginx/nginx.cer
+/etc/nginx/nginx.key
+endef
+
+Package/nginx-ssl/conffiles = $(Package/nginx/conffiles)
+Package/nginx-all-module/conffiles = $(Package/nginx/conffiles)
+
+
+ADDITIONAL_MODULES:=--with-http_gzip_static_module
+
+ifneq ($(BUILD_VARIANT),all-module)
+  ifneq ($(CONFIG_NGINX_HTTP_CACHE),y)
+    ADDITIONAL_MODULES += --without-http-cache
+  endif
+  ifneq ($(CONFIG_NGINX_PCRE),y)
+    ADDITIONAL_MODULES += --without-pcre
+  else
+    ADDITIONAL_MODULES += --with-pcre
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_CHARSET),y)
+    ADDITIONAL_MODULES += --without-http_charset_module
+  else
+    config_files += koi-utf koi-win win-utf
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_GZIP),y)
+    ADDITIONAL_MODULES += --without-http_gzip_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_SSI),y)
+    ADDITIONAL_MODULES += --without-http_ssi_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_USERID),y)
+    ADDITIONAL_MODULES += --without-http_userid_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_ACCESS),y)
+    ADDITIONAL_MODULES += --without-http_access_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_AUTH_BASIC),y)
+    ADDITIONAL_MODULES += --without-http_auth_basic_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_AUTOINDEX),y)
+    ADDITIONAL_MODULES += --without-http_autoindex_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_GEO),y)
+    ADDITIONAL_MODULES += --without-http_geo_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_MAP),y)
+    ADDITIONAL_MODULES += --without-http_map_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_SPLIT_CLIENTS),y)
+    ADDITIONAL_MODULES += --without-http_split_clients_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_REFERER),y)
+    ADDITIONAL_MODULES += --without-http_referer_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_REWRITE),y)
+    ADDITIONAL_MODULES += --without-http_rewrite_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_PROXY),y)
+    ADDITIONAL_MODULES += --without-http_proxy_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_FASTCGI),y)
+    ADDITIONAL_MODULES += --without-http_fastcgi_module
+  else
+    config_files += fastcgi_params
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_UWSGI),y)
+    ADDITIONAL_MODULES += --without-http_uwsgi_module
+  else
+    config_files += uwsgi_params
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_SCGI),y)
+    ADDITIONAL_MODULES += --without-http_scgi_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_MEMCACHED),y)
+    ADDITIONAL_MODULES += --without-http_memcached_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_LIMIT_CONN),y)
+    ADDITIONAL_MODULES += --without-http_limit_conn_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_LIMIT_REQ),y)
+    ADDITIONAL_MODULES += --without-http_limit_req_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_EMPTY_GIF),y)
+    ADDITIONAL_MODULES += --without-http_empty_gif_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_BROWSER),y)
+    ADDITIONAL_MODULES += --without-http_browser_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_HASH),y)
+    ADDITIONAL_MODULES += --without-http_upstream_hash_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH),y)
+    ADDITIONAL_MODULES += --without-http_upstream_ip_hash_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_LEAST_CONN),y)
+    ADDITIONAL_MODULES += --without-http_upstream_least_conn_module
+  endif
+  ifneq ($(CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE),y)
+    ADDITIONAL_MODULES += --without-http_upstream_keepalive_module
+  endif
+  
+  ifeq ($(BUILD_VARIANT),ssl)
+    ifneq ($(CONFIG_NGINX_SSL),y)
+      ADDITIONAL_MODULES += --with-http_ssl_module
+    endif
+  endif
+  
+  ifeq ($(CONFIG_NGINX_SSL),y)
+    ADDITIONAL_MODULES += --with-http_ssl_module
+  endif
+  ifeq ($(CONFIG_NGINX_NAXSI),y)
+    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src
+  endif
+  ifeq ($(CONFIG_NGINX_LUA),y)
+    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/lua-nginx
+  endif
+  ifeq ($(CONFIG_IPV6),y)
+    ADDITIONAL_MODULES += --with-ipv6
+  endif
+  ifeq ($(CONFIG_NGINX_STUB_STATUS),y)
+    ADDITIONAL_MODULES += --with-http_stub_status_module
+  endif
+  ifeq ($(CONFIG_NGINX_FLV),y)
+    ADDITIONAL_MODULES += --with-http_flv_module
+  endif
+  ifeq ($(CONFIG_NGINX_DAV),y)
+    ADDITIONAL_MODULES += --with-http_dav_module --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module
+  endif
+  ifeq ($(CONFIG_NGINX_UBUS),y)
+    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module
+  endif
+  ifeq ($(CONFIG_NGINX_HTTP_AUTH_REQUEST),y)
+    ADDITIONAL_MODULES += --with-http_auth_request_module
+  endif
+  ifeq ($(CONFIG_NGINX_HTTP_V2),y)
+    ADDITIONAL_MODULES += --with-http_v2_module
+  endif
+  ifeq ($(CONFIG_NGINX_HTTP_REAL_IP),y)
+    ADDITIONAL_MODULES += --with-http_realip_module
+  endif
+  ifeq ($(CONFIG_NGINX_HTTP_SECURE_LINK),y)
+    ADDITIONAL_MODULES += --with-http_secure_link_module
+  endif
+  ifeq ($(CONFIG_NGINX_HTTP_SUB),y)
+	ADDITIONAL_MODULES += --with-http_sub_module
+  endif
+  ifeq ($(CONFIG_NGINX_STREAM_CORE_MODULE),y)
+    ADDITIONAL_MODULES += --with-stream
+  endif
+  ifeq ($(CONFIG_NGINX_STREAM_SSL_MODULE),y)
+    ADDITIONAL_MODULES += --with-stream_ssl_module
+  endif
+  ifeq ($(CONFIG_NGINX_STREAM_SSL_PREREAD_MODULE),y)
+    ADDITIONAL_MODULES += --with-stream_ssl_preread_module
+  endif
+  ifeq ($(CONFIG_NGINX_HEADERS_MORE),y)
+    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-headers-more
+  endif
+  ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
+    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-brotli
+  endif
+  ifeq ($(CONFIG_NGINX_RTMP_MODULE),y)
+    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-rtmp
+  endif
+  ifeq ($(CONFIG_NGINX_TS_MODULE),y)
+    ADDITIONAL_MODULES += --add-module=$(PKG_BUILD_DIR)/nginx-ts
+  endif
+else
+  CONFIG_NGINX_HEADERS_MORE:=y
+  CONFIG_NGINX_HTTP_BROTLI:=y
+  CONFIG_NGINX_RTMP_MODULE:=y
+  CONFIG_NGINX_TS_MODULE:=y
+  CONFIG_NGINX_NAXSI:=y
+  CONFIG_NGINX_LUA:=y
+  CONFIG_NGINX_DAV:=y
+  CONFIG_NGINX_UBUS:=y
+  ADDITIONAL_MODULES += --with-http_ssl_module --add-module=$(PKG_BUILD_DIR)/nginx-naxsi/naxsi_src \
+    --add-module=$(PKG_BUILD_DIR)/lua-nginx --with-ipv6 --with-http_stub_status_module --with-http_flv_module \
+	--with-http_dav_module --add-module=$(PKG_BUILD_DIR)/nginx-dav-ext-module \
+	--with-http_auth_request_module --with-http_v2_module --with-http_realip_module \
+	--with-http_secure_link_module --with-http_sub_module --add-module=$(PKG_BUILD_DIR)/nginx-headers-more \
+	--with-stream --with-stream_ssl_module --with-stream_ssl_preread_module \
+	--add-module=$(PKG_BUILD_DIR)/nginx-brotli --add-module=$(PKG_BUILD_DIR)/nginx-rtmp \
+	--add-module=$(PKG_BUILD_DIR)/nginx-ts --add-module=$(PKG_BUILD_DIR)/nginx-ubus-module
+  config_files += koi-utf koi-win win-utf fastcgi_params 
+endif
+
+define Package/nginx-mod-luci/default
+  TITLE:=Nginx on LuCI
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=Web Servers/Proxies
+  TITLE:=Support file for Nginx
+  URL:=http://nginx.org/
+  DEPENDS:=+uwsgi +uwsgi-luci-support
+endef
+
+define Package/nginx-mod-luci
+  $(Package/nginx-mod-luci/default)
+  DEPENDS += +nginx
+endef
+
+define Package/nginx-mod-luci/description
+ Support file for LuCI in nginx. Include custom nginx configuration, autostart script for uwsgi.
+endef
+
+define Package/nginx-mod-luci-ssl
+  $(Package/nginx-mod-luci/default)
+  TITLE += with HTTPS support
+  DEPENDS += +nginx-ssl
+endef
+
+Package/nginx-mod-luci-ssl/description = $(define Package/nginx-mod-luci/description) \
+  This also include redirect from http to https and cert autogeneration.
+
+TARGET_CFLAGS += -fvisibility=hidden -ffunction-sections -fdata-sections -DNGX_LUA_NO_BY_LUA_BLOCK
+TARGET_LDFLAGS += -Wl,--gc-sections
+
+ifeq ($(CONFIG_NGINX_LUA),y)
+  CONFIGURE_VARS += LUA_INC=$(STAGING_DIR)/usr/include \
+					LUA_LIB=$(STAGING_DIR)/usr/lib
+endif
+
+CONFIGURE_ARGS += \
+			--crossbuild=Linux::$(ARCH) \
+			--prefix=/usr \
+			--conf-path=/etc/nginx/nginx.conf \
+			$(ADDITIONAL_MODULES) \
+			--error-log-path=/var/log/nginx/error.log \
+			--pid-path=/var/run/nginx.pid \
+			--lock-path=/var/lock/nginx.lock \
+			--http-log-path=/var/log/nginx/access.log \
+			--http-client-body-temp-path=/var/lib/nginx/body \
+			--http-proxy-temp-path=/var/lib/nginx/proxy \
+			--http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
+			--with-cc="$(TARGET_CC)" \
+			--with-cc-opt="$(TARGET_CPPFLAGS) $(TARGET_CFLAGS)" \
+			--with-ld-opt="$(TARGET_LDFLAGS)" \
+			--without-http_upstream_zone_module
+
+define Package/nginx-mod-luci/install
+	$(INSTALL_DIR) $(1)/etc/nginx
+	$(INSTALL_BIN) ./files-luci-support/luci_uwsgi.conf $(1)/etc/nginx/luci_uwsgi.conf
+	$(INSTALL_BIN) ./files-luci-support/luci_nginx.conf $(1)/etc/nginx/luci_nginx.conf
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files-luci-support/60_nginx-luci-support $(1)/etc/uci-defaults/60_nginx-luci-support
+endef
+
+define Package/nginx-mod-luci-ssl/install
+	$(Package/nginx-mod-luci/install)
+	$(INSTALL_DIR) $(1)/etc/nginx
+	$(INSTALL_BIN) ./files-luci-support/luci_nginx_ssl.conf $(1)/etc/nginx/luci_nginx_ssl.conf
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files-luci-support/70_nginx-luci-support-ssl $(1)/etc/uci-defaults/70_nginx-luci-support-ssl
+endef
+
+define Package/nginx/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/nginx $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/nginx
+	$(INSTALL_DATA) $(addprefix $(PKG_INSTALL_DIR)/etc/nginx/,$(config_files)) $(1)/etc/nginx/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/nginx.init $(1)/etc/init.d/nginx
+ifeq ($(CONFIG_NGINX_NAXSI),y)
+	$(INSTALL_DIR) $(1)/etc/nginx
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-naxsi/naxsi_config/naxsi_core.rules $(1)/etc/nginx
+	chmod 0640 $(1)/etc/nginx/naxsi_core.rules
+endif
+	$(if $(CONFIG_NGINX_NAXSI),$($(INSTALL_BIN) $(PKG_BUILD_DIR)/nginx-naxsi/naxsi_config/naxsi_core.rules $(1)/etc/nginx))
+	$(if $(CONFIG_NGINX_NAXSI),$(chmod 0640 $(1)/etc/nginx/naxsi_core.rules))
+endef
+
+Package/nginx-ssl/install = $(Package/nginx/install)
+Package/nginx-all-module/install = $(Package/nginx/install)
+
+define Build/Prepare
+	$(Build/Prepare/Default)
+	$(Prepare/nginx-naxsi)
+	$(Prepare/lua-nginx)
+	$(Prepare/nginx-brotli)
+	$(Prepare/nginx-headers-more)
+	$(Prepare/nginx-rtmp)
+	$(Prepare/nginx-ts)
+	$(Prepare/nginx-dav-ext-module)
+	$(Prepare/nginx-ubus-module)
+endef
+
+
+ifeq ($(CONFIG_NGINX_HEADERS_MORE),y)
+  define Download/nginx-headers-more
+    VERSION:=a9f7c7e86cc7441d04e2f11f01c2e3a9c4b0301d
+    SUBDIR:=nginx-headers-more
+    FILE:=headers-more-nginx-module-$$(VERSION).tar.xz
+    URL:=https://github.com/openresty/headers-more-nginx-module.git
+    MIRROR_HASH:=ce0b9996ecb2cff790831644d6ab1adc087aa2771d77d3931c06246d11bc59fd
+    PROTO:=git
+  endef
+  $(eval $(call Download,nginx-headers-more))
+
+  define Prepare/nginx-headers-more
+	$(eval $(Download/nginx-headers-more))
+	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+  endef
+endif
+
+
+ifeq ($(CONFIG_NGINX_HTTP_BROTLI),y)
+  define Download/nginx-brotli
+    VERSION:=dc37f658ccb5a51d090dc09d1a2aca2f24309869
+    SUBDIR:=nginx-brotli
+    FILE:=ngx-brotli-module-$$(VERSION).tar.xz
+    URL:=https://github.com/eustas/ngx_brotli.git
+    MIRROR_HASH:=6bc0c40ff24f6e0ac616dfddc803bdc7fcf54764ba9dc4f9cecb3a68beedcdaf
+    PROTO:=git
+  endef
+  $(eval $(call Download,nginx-brotli))
+
+  define Prepare/nginx-brotli
+	$(eval $(Download/nginx-brotli))
+	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+  endef
+endif
+
+
+ifeq ($(CONFIG_NGINX_RTMP_MODULE),y)
+  define Download/nginx-rtmp
+    VERSION:=f0ea62342a4eca504b311cd5df910d026c3ea4cf
+    SUBDIR:=nginx-rtmp
+    FILE:=ngx-rtmp-module-$$(VERSION).tar.xz
+    URL:=https://github.com/ut0mt8/nginx-rtmp-module.git
+    MIRROR_HASH:=d3f58066f0f858ed79f7f2b0c9b89de2ccc512c94ab3d0625f6dcff3df0b72c1
+    PROTO:=git
+  endef
+  $(eval $(call Download,nginx-rtmp))
+
+  define  Prepare/nginx-rtmp
+	$(eval $(Download/nginx-rtmp))
+	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+  endef
+endif
+
+
+ifeq ($(CONFIG_NGINX_TS_MODULE),y)
+  define Download/nginx-ts
+    VERSION:=ef2f874d95cc75747eb625a292524a702aefb0fd
+    SUBDIR:=nginx-ts
+    FILE:=ngx-ts-module-$$(VERSION).tar.xz
+    URL:=https://github.com/arut/nginx-ts-module.git
+    MIRROR_HASH:=73938950bb286d40d9e54b0994d1a63827340c1156c72eb04d7041b25b20ec18
+    PROTO:=git
+  endef
+  $(eval $(call Download,nginx-ts))
+
+  define  Prepare/nginx-ts
+	$(eval $(Download/nginx-ts))
+	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+  endef
+endif
+
+
+ifeq ($(CONFIG_NGINX_NAXSI),y)
+  define Download/nginx-naxsi
+    VERSION:=951123ad456bdf5ac94e8d8819342fe3d49bc002
+    SUBDIR:=nginx-naxsi
+    FILE:=nginx-naxsi-module-$$(VERSION).tar.xz
+    URL:=https://github.com/nbs-system/naxsi.git
+    MIRROR_HASH:=c734cae19a596affadd62a2df1b58d3df8d1364093a4e80a7cd1ab4555963535
+    PROTO:=git
+  endef
+  $(eval $(call Download,nginx-naxsi))
+
+  define Prepare/nginx-naxsi
+	$(eval $(Download/nginx-naxsi))
+	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+  endef
+endif
+
+
+ifeq ($(CONFIG_NGINX_LUA),y)
+  define Download/lua-nginx
+    VERSION:=e94f2e5d64daa45ff396e262d8dab8e56f5f10e0
+    SUBDIR:=lua-nginx
+    FILE:=lua-nginx-module-$$(VERSION).tar.xz
+    URL:=https://github.com/openresty/lua-nginx-module.git
+    MIRROR_HASH:=27729921964f066d97e99c263da153b34622a2f4b811114e4c3ee61c6fc71395
+    PROTO:=git
+  endef
+  $(eval $(call Download,lua-nginx))
+
+  define Prepare/lua-nginx
+	$(eval $(Download/lua-nginx))
+	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+	$(call PatchDir,$(PKG_BUILD_DIR),./patches-lua-nginx)
+  endef
+endif
+
+
+ifeq ($(CONFIG_NGINX_DAV),y)
+  define Download/nginx-dav-ext-module
+    VERSION:=f5e30888a256136d9c550bf1ada77d6ea78a48af
+    SUBDIR:=nginx-dav-ext-module
+    FILE:=nginx-dav-ext-module-$$(VERSION).tar.xz
+    URL:=https://github.com/arut/nginx-dav-ext-module.git
+    MIRROR_HASH:=70bb4c3907f4b783605500ba494e907aede11f8505702e370012abb3c177dc5b
+    PROTO:=git
+  endef
+  $(eval $(call Download,nginx-dav-ext-module))
+
+  define Prepare/nginx-dav-ext-module
+	$(eval $(Download/nginx-dav-ext-module))
+	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+	$(call PatchDir,$(PKG_BUILD_DIR),./patches-dav-nginx)
+  endef
+endif
+
+ifeq ($(CONFIG_NGINX_UBUS),y)
+  define Download/nginx-ubus-module
+    VERSION:=f30b0167a2cdb40f23bd90928d601bdb0c1b8fad
+    SUBDIR:=nginx-ubus-module
+    FILE:=nginx-ubus-module-$$(VERSION).tar.xz
+    URL:=https://github.com/Ansuel/nginx-ubus-module.git
+    MIRROR_HASH:=02c7d4b0df7f4b69605e71b0fefdc99b5a9470c68cad7ccfb31ebefe4e7e0704
+    PROTO:=git
+  endef
+  $(eval $(call Download,nginx-ubus-module))
+
+  define Prepare/nginx-ubus-module
+	$(eval $(Download/nginx-ubus-module))
+	xzcat $(DL_DIR)/$(FILE) | tar -C $(PKG_BUILD_DIR) $(TAR_OPTIONS)
+  endef
+endif
+
+$(eval $(call BuildPackage,nginx))
+$(eval $(call BuildPackage,nginx-ssl))
+$(eval $(call BuildPackage,nginx-all-module))
+$(eval $(call BuildPackage,nginx-mod-luci))
+$(eval $(call BuildPackage,nginx-mod-luci-ssl))
diff --git a/nginx/files-luci-support/60_nginx-luci-support b/nginx/files-luci-support/60_nginx-luci-support
new file mode 100644
index 00000000..b682a832
--- /dev/null
+++ b/nginx/files-luci-support/60_nginx-luci-support
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+if [ -f "/etc/nginx/luci_nginx.conf" ] && [ -f "/etc/nginx/nginx.conf" ]; then
+	if [ ! "$(cat '/etc/nginx/nginx.conf' | grep 'luci_uwsgi.conf')" ]; then
+		mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf_old
+		mv /etc/nginx/luci_nginx.conf /etc/nginx/nginx.conf
+		core_number=$(grep -c ^processor /proc/cpuinfo)
+		sed -i "3s/.*/worker_processes  "$core_number";/" /etc/nginx/nginx.conf
+		if [ -n "$(pgrep uhttpd)" ]; then
+			/etc/init.d/uhttpd stop
+			/etc/init.d/uhttpd disable
+		fi
+		if [ -n "$(pgrep nginx)" ]; then
+			/etc/init.d/nginx restart
+		else
+			/etc/init.d/nginx start
+		fi
+		if [ -n "$(pgrep uwsgi)" ]; then
+			/etc/init.d/uwsgi restart
+		else
+			/etc/init.d/uwsgi start
+		fi
+	else
+		rm /etc/nginx/luci_nginx.conf
+	fi
+fi
+
+if nginx -V 2>&1 | grep -q ubus; then
+	if [ -z "$(cat /etc/nginx/luci_uwsgi.conf | grep ubus)" ]; then
+		cat <<EOT >> /etc/nginx/luci_uwsgi.conf
+
+location /ubus {
+        ubus_interpreter;
+        ubus_socket_path /var/run/ubus.sock;
+        ubus_parallel_req 2;
+}
+EOT
+	fi
+fi
+
+exit 0
diff --git a/nginx/files-luci-support/70_nginx-luci-support-ssl b/nginx/files-luci-support/70_nginx-luci-support-ssl
new file mode 100644
index 00000000..76ce3a81
--- /dev/null
+++ b/nginx/files-luci-support/70_nginx-luci-support-ssl
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+
+if [ -f "/etc/nginx/luci_nginx_ssl.conf" ] && [ -f "/etc/nginx/nginx.conf" ]; then
+	if [ ! "$(cat '/etc/nginx/nginx.conf' | grep 'return 301 https://$host$request_uri;')" ]; then
+		if [ -f "/etc/nginx/nginx.conf_old" ]; then
+			rm /etc/nginx/nginx.conf
+		else
+			mv /etc/nginx/nginx.conf /etc/nginx/nginx.conf_old
+		fi
+		mv /etc/nginx/luci_nginx_ssl.conf /etc/nginx/nginx.conf
+		core_number=$(grep -c ^processor /proc/cpuinfo)
+		sed -i "3s/.*/worker_processes  "$core_number";/" /etc/nginx/nginx.conf
+		if [ -n "$(pgrep nginx)" ]; then
+			/etc/init.d/nginx restart
+		else
+			/etc/init.d/nginx start
+		fi
+	else
+		rm /etc/nginx/luci_nginx_ssl.conf
+	fi
+fi
+
+
+if [ ! -f "/etc/nginx/nginx.key" ]; then
+	
+	NGINX_KEY=/etc/nginx/nginx.key
+	NGINX_CER=/etc/nginx/nginx.cer
+	OPENSSL_BIN=/usr/bin/openssl
+	PX5G_BIN=/usr/sbin/px5g
+	
+	# Prefer px5g for certificate generation (existence evaluated last)
+	GENKEY_CMD=""
+	UNIQUEID=$(dd if=/dev/urandom bs=1 count=4 | hexdump -e '1/1 "%02x"')
+	[ -x "$OPENSSL_BIN" ] && GENKEY_CMD="$OPENSSL_BIN req -x509 -nodes"
+	[ -x "$PX5G_BIN" ] && GENKEY_CMD="$PX5G_BIN selfsigned"
+	[ -n "$GENKEY_CMD" ] && {
+		$GENKEY_CMD \
+			-days 730 -newkey rsa:2048 -keyout "${NGINX_KEY}.new" -out "${NGINX_CER}.new" \
+			-subj /C="ZZ"/ST="Somewhere"/L="Unknown"/O="OpenWrt""$UNIQUEID"/CN="OpenWrt"
+		sync
+		mv "${NGINX_KEY}.new" "${NGINX_KEY}"
+		mv "${NGINX_CER}.new" "${NGINX_CER}"
+	}
+fi
+
+
+exit 0
diff --git a/nginx/files-luci-support/luci_nginx.conf b/nginx/files-luci-support/luci_nginx.conf
new file mode 100644
index 00000000..75f0f78a
--- /dev/null
+++ b/nginx/files-luci-support/luci_nginx.conf
@@ -0,0 +1,52 @@
+
+user root;
+worker_processes  1;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    sendfile on;
+    keepalive_timeout 0;
+
+    client_body_buffer_size 10K;
+    client_header_buffer_size 1k;
+    client_max_body_size 1G;
+    large_client_header_buffers 2 1k;
+
+    gzip on;
+    gzip_http_version 1.1;
+    gzip_vary on;
+    gzip_comp_level 1;
+    gzip_proxied any;
+    gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/javascript image/svg+xml;
+
+    root /www;
+
+    server {
+        listen 80 default_server;
+        listen [::]:80 default_server;
+        server_name  localhost;
+
+        location ~* .(jpg|jpeg|png|gif|ico|css|js)$ {
+            expires 365d;
+        }
+
+        include luci_uwsgi.conf;
+
+    }
+
+    include /etc/nginx/conf.d/*.conf;
+}
diff --git a/nginx/files-luci-support/luci_nginx_ssl.conf b/nginx/files-luci-support/luci_nginx_ssl.conf
new file mode 100644
index 00000000..db33e554
--- /dev/null
+++ b/nginx/files-luci-support/luci_nginx_ssl.conf
@@ -0,0 +1,67 @@
+
+user  root;
+worker_processes  1;
+
+#error_log  logs/error.log;
+#error_log  logs/error.log  notice;
+#error_log  logs/error.log  info;
+
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       mime.types;
+    default_type  application/octet-stream;
+
+    sendfile on;
+    keepalive_timeout 0;
+
+    client_body_buffer_size 10K;
+    client_header_buffer_size 1k;
+    client_max_body_size 1G;
+    large_client_header_buffers 2 1k;
+
+    gzip on;
+    gzip_http_version 1.1;
+    gzip_vary on;
+    gzip_comp_level 1;
+    gzip_proxied any;
+    gzip_types text/plain text/css application/json application/x-javascript text/xml application/xml application/xml+rss text/javascript application/javascript image/svg+xml;
+
+    root /www;
+
+    server {
+        listen 80 default_server;
+        listen [::]:80 default_server;
+        server_name _;
+        return 301 https://$host$request_uri;
+    }
+
+    server {
+        listen 443 ssl default_server;
+        listen [::]:443 ssl default_server;
+        server_name  localhost;
+
+        ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
+        ssl_prefer_server_ciphers on;
+        ssl_ciphers "EECDH+ECDSA+AESGCM:EECDH+aRSA+AESGCM:EECDH+ECDSA+SHA384:EECDH+ECDSA+SHA256:EECDH+aRSA+SHA384:EECDH+aRSA+SHA256:EECDH:DHE+AESGCM:DHE:!RSA!aNULL:!eNULL:!LOW:!RC4:!3DES:!MD5:!EXP:!PSK:!SRP:!DSS:!CAMELLIA:!SEED";
+        ssl_session_tickets off;
+
+        ssl_certificate /etc/nginx/nginx.cer;
+        ssl_certificate_key /etc/nginx/nginx.key;
+
+        location ~* .(jpg|jpeg|png|gif|ico|css|js)$ {
+            expires 365d;
+        }
+
+        include luci_uwsgi.conf;
+
+    }
+
+    include /etc/nginx/conf.d/*.conf;
+}
diff --git a/nginx/files-luci-support/luci_uwsgi.conf b/nginx/files-luci-support/luci_uwsgi.conf
new file mode 100644
index 00000000..3ea3de91
--- /dev/null
+++ b/nginx/files-luci-support/luci_uwsgi.conf
@@ -0,0 +1,16 @@
+location /cgi-bin/luci {
+		index  index.html;
+		include uwsgi_params;
+		uwsgi_param SERVER_ADDR $server_addr;
+		uwsgi_modifier1 9;
+		uwsgi_pass unix:////var/run/luci-webui.socket;
+}
+location ~ /cgi-bin/cgi-(backup|download|upload|exec) {
+		include uwsgi_params;
+		uwsgi_param SERVER_ADDR $server_addr;
+		uwsgi_modifier1 9;
+		uwsgi_pass unix:////var/run/luci-cgi_io.socket;
+}
+
+location /luci-static {
+}
diff --git a/nginx/files/nginx.init b/nginx/files/nginx.init
new file mode 100644
index 00000000..3ceb718e
--- /dev/null
+++ b/nginx/files/nginx.init
@@ -0,0 +1,39 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2015 OpenWrt.org
+
+START=80
+
+USE_PROCD=1
+
+start_service() {
+	[ -f /etc/init.d/uhttpd ] && {
+		/etc/init.d/uhttpd enabled && {
+			/etc/init.d/uhttpd stop
+			/etc/init.d/uhttpd disable
+		}
+	}
+
+	[ -d /var/log/nginx ] || mkdir -p /var/log/nginx
+	[ -d /var/lib/nginx ] || mkdir -p /var/lib/nginx
+
+	procd_open_instance
+	procd_set_param command /usr/sbin/nginx -c /etc/nginx/nginx.conf -g 'daemon off;'
+	procd_set_param file /etc/nginx/nginx.conf
+	procd_set_param respawn
+	procd_close_instance
+}
+
+boot() {
+	[ -f /etc/init.d/uhttpd ] && {
+		/etc/init.d/uhttpd enabled && {
+			/etc/init.d/uhttpd stop
+			/etc/init.d/uhttpd disable
+		}
+	}
+
+	[ -f /lib/functions/gl_util.sh ] && {
+		. /lib/functions/gl_util.sh
+		wait_for_wifi_ready
+	}
+	/etc/init.d/nginx start
+}
diff --git a/nginx/patches-dav-nginx/100-drop-libxslt-dep.patch b/nginx/patches-dav-nginx/100-drop-libxslt-dep.patch
new file mode 100644
index 00000000..c5941f42
--- /dev/null
+++ b/nginx/patches-dav-nginx/100-drop-libxslt-dep.patch
@@ -0,0 +1,14 @@
+--- a/nginx-dav-ext-module/config	2018-12-17 08:45:12.000000000 +0000
++++ b/nginx-dav-ext-module/config	2019-10-11 13:49:41.446919258 +0000
+@@ -8,9 +8,8 @@ ngx_module_name=ngx_http_dav_ext_module
+ # building nginx with the xslt module, in which case libxslt will
+ # be linked anyway.  In other cases libxslt is just redundant.
+ # If that's a big deal, libxml2 can be linked directly:
+-# ngx_module_libs=-lxml2
++ngx_module_libs=-lxml2
++ngx_module_incs=$(pkg-config --cflags-only-I libxml-2.0 | sed 's/^-I//')
+ 
+-ngx_module_libs=LIBXSLT
+-
+ ngx_module_srcs="$ngx_addon_dir/ngx_http_dav_ext_module.c"
+ 
diff --git a/nginx/patches-lua-nginx/100-no_by_lua_block.patch b/nginx/patches-lua-nginx/100-no_by_lua_block.patch
new file mode 100644
index 00000000..968e12d5
--- /dev/null
+++ b/nginx/patches-lua-nginx/100-no_by_lua_block.patch
@@ -0,0 +1,195 @@
+--- a/lua-nginx/src/ngx_http_lua_module.c
++++ b/lua-nginx/src/ngx_http_lua_module.c
+@@ -165,14 +165,14 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       offsetof(ngx_http_lua_loc_conf_t, log_socket_errors),
+       NULL },
+-
++#ifndef NGX_LUA_NO_BY_LUA_BLOCK
+     { ngx_string("init_by_lua_block"),
+       NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+       ngx_http_lua_init_by_lua_block,
+       NGX_HTTP_MAIN_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_init_by_inline },
+-
++#endif
+     { ngx_string("init_by_lua"),
+       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+       ngx_http_lua_init_by_lua,
+@@ -186,14 +186,14 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_MAIN_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_init_by_file },
+-
++#ifndef NGX_LUA_NO_BY_LUA_BLOCK
+     { ngx_string("init_worker_by_lua_block"),
+       NGX_HTTP_MAIN_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+       ngx_http_lua_init_worker_by_lua_block,
+       NGX_HTTP_MAIN_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_init_worker_by_inline },
+-
++#endif
+     { ngx_string("init_worker_by_lua"),
+       NGX_HTTP_MAIN_CONF|NGX_CONF_TAKE1,
+       ngx_http_lua_init_worker_by_lua,
+@@ -209,6 +209,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       (void *) ngx_http_lua_init_worker_by_file },
+ 
+ #if defined(NDK) && NDK
++#ifndef NGX_LUA_NO_BY_LUA_BLOCK
+     /* set_by_lua $res { inline Lua code } [$arg1 [$arg2 [...]]] */
+     { ngx_string("set_by_lua_block"),
+       NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+@@ -217,7 +218,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_filter_set_by_lua_inline },
+-
++#endif
+     /* set_by_lua $res <inline script> [$arg1 [$arg2 [...]]] */
+     { ngx_string("set_by_lua"),
+       NGX_HTTP_SRV_CONF|NGX_HTTP_SIF_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+@@ -245,7 +246,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_rewrite_handler_inline },
+-
++#ifndef NGX_LUA_NO_BY_LUA_BLOCK
+     /* rewrite_by_lua_block { <inline script> } */
+     { ngx_string("rewrite_by_lua_block"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+@@ -254,7 +255,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_rewrite_handler_inline },
+-
++#endif
+     /* access_by_lua "<inline script>" */
+     { ngx_string("access_by_lua"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+@@ -263,7 +264,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_access_handler_inline },
+-
++#ifndef NGX_LUA_NO_BY_LUA_BLOCK
+     /* access_by_lua_block { <inline script> } */
+     { ngx_string("access_by_lua_block"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+@@ -272,7 +273,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_access_handler_inline },
+-
++#endif
+     /* content_by_lua "<inline script>" */
+     { ngx_string("content_by_lua"),
+       NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_TAKE1,
+@@ -280,7 +281,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_content_handler_inline },
+-
++#ifndef NGX_LUA_NO_BY_LUA_BLOCK
+     /* content_by_lua_block { <inline script> } */
+     { ngx_string("content_by_lua_block"),
+       NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+@@ -288,7 +289,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_content_handler_inline },
+-
++#endif
+     /* log_by_lua <inline script> */
+     { ngx_string("log_by_lua"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+@@ -297,7 +298,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_log_handler_inline },
+-
++#ifndef NGX_LUA_NO_BY_LUA_BLOCK
+     /* log_by_lua_block { <inline script> } */
+     { ngx_string("log_by_lua_block"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+@@ -306,7 +307,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_log_handler_inline },
+-
++#endif
+     { ngx_string("rewrite_by_lua_file"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                         |NGX_CONF_TAKE1,
+@@ -361,7 +362,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_header_filter_inline },
+-
++#ifndef NGX_LUA_NO_BY_LUA_BLOCK
+     /* header_filter_by_lua_block { <inline script> } */
+     { ngx_string("header_filter_by_lua_block"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+@@ -370,7 +371,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_header_filter_inline },
+-
++#endif
+     { ngx_string("header_filter_by_lua_file"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                         |NGX_CONF_TAKE1,
+@@ -386,7 +387,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_body_filter_inline },
+-
++#ifndef NGX_LUA_NO_BY_LUA_BLOCK
+     /* body_filter_by_lua_block { <inline script> } */
+     { ngx_string("body_filter_by_lua_block"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+@@ -395,7 +396,7 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_body_filter_inline },
+-
++#endif
+     { ngx_string("body_filter_by_lua_file"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF
+                         |NGX_CONF_TAKE1,
+@@ -403,14 +404,14 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_body_filter_file },
+-
++#ifndef NGX_LUA_NO_BY_LUA_BLOCK
+     { ngx_string("balancer_by_lua_block"),
+       NGX_HTTP_UPS_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+       ngx_http_lua_balancer_by_lua_block,
+       NGX_HTTP_SRV_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_balancer_handler_inline },
+-
++#endif
+     { ngx_string("balancer_by_lua_file"),
+       NGX_HTTP_UPS_CONF|NGX_CONF_TAKE1,
+       ngx_http_lua_balancer_by_lua,
+@@ -517,14 +518,14 @@ static ngx_command_t ngx_http_lua_cmds[]
+       NGX_HTTP_LOC_CONF_OFFSET,
+       offsetof(ngx_http_lua_loc_conf_t, ssl_ciphers),
+       NULL },
+-
++#ifndef NGX_LUA_NO_BY_LUA_BLOCK
+     { ngx_string("ssl_certificate_by_lua_block"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_BLOCK|NGX_CONF_NOARGS,
+       ngx_http_lua_ssl_cert_by_lua_block,
+       NGX_HTTP_SRV_CONF_OFFSET,
+       0,
+       (void *) ngx_http_lua_ssl_cert_handler_inline },
+-
++#endif
+     { ngx_string("ssl_certificate_by_lua_file"),
+       NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_CONF_TAKE1,
+       ngx_http_lua_ssl_cert_by_lua,
diff --git a/nginx/patches-lua-nginx/101-add-lua-ngx-pipe.patch b/nginx/patches-lua-nginx/101-add-lua-ngx-pipe.patch
new file mode 100644
index 00000000..764c58bf
--- /dev/null
+++ b/nginx/patches-lua-nginx/101-add-lua-ngx-pipe.patch
@@ -0,0 +1,158 @@
+Index: nginx-1.17.7/lua-nginx/config
+===================================================================
+--- nginx-1.17.7.orig/lua-nginx/config
++++ nginx-1.17.7/lua-nginx/config
+@@ -362,6 +362,7 @@ HTTP_LUA_SRCS=" \
+             $ngx_addon_dir/src/ngx_http_lua_ssl.c \
+             $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.c \
+             $ngx_addon_dir/src/ngx_http_lua_input_filters.c \
++            $ngx_addon_dir/src/ngx_http_lua_pipe.c \
+             "
+ 
+ HTTP_LUA_DEPS=" \
+@@ -424,6 +425,7 @@ HTTP_LUA_DEPS=" \
+             $ngx_addon_dir/src/ngx_http_lua_ssl.h \
+             $ngx_addon_dir/src/ngx_http_lua_log_ringbuf.h \
+             $ngx_addon_dir/src/ngx_http_lua_input_filters.h \
++            $ngx_addon_dir/src/ngx_http_lua_pipe.h \
+             "
+ 
+ CFLAGS="$CFLAGS -DNDK_SET_VAR"
+@@ -508,6 +510,51 @@ ngx_feature_test="int rc = malloc_trim((
+ SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
+ CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
+ 
++. auto/feature
++
++CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
++
++# ----------------------------------------
++
++ngx_feature="pipe2"
++ngx_feature_libs=
++ngx_feature_name="NGX_HTTP_LUA_HAVE_PIPE2"
++ngx_feature_run=no
++ngx_feature_incs="#include <fcntl.h>"
++ngx_feature_test="int fd[2]; pipe2(fd, O_CLOEXEC|O_NONBLOCK);"
++SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
++CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
++
++. auto/feature
++
++CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
++
++# ----------------------------------------
++
++ngx_feature="signalfd"
++ngx_feature_libs=
++ngx_feature_name="NGX_HTTP_LUA_HAVE_SIGNALFD"
++ngx_feature_run=no
++ngx_feature_incs="#include <sys/signalfd.h>"
++ngx_feature_test="sigset_t set; signalfd(-1, &set, SFD_NONBLOCK|SFD_CLOEXEC);"
++SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
++CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
++
++. auto/feature
++
++CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
++
++# ----------------------------------------
++
++ngx_feature="execvpe"
++ngx_feature_libs=
++ngx_feature_name="NGX_HTTP_LUA_HAVE_EXECVPE"
++ngx_feature_run=no
++ngx_feature_incs=
++ngx_feature_test='char* argv[] = {"/bin/sh"};execvpe("/bin/sh", argv, NULL);'
++SAVED_CC_TEST_FLAGS="$CC_TEST_FLAGS"
++CC_TEST_FLAGS="-Werror -Wall $CC_TEST_FLAGS"
++
+ . auto/feature
+ 
+ CC_TEST_FLAGS="$SAVED_CC_TEST_FLAGS"
+Index: nginx-1.17.7/lua-nginx/src/ngx_http_lua_initworkerby.c
+===================================================================
+--- nginx-1.17.7.orig/lua-nginx/src/ngx_http_lua_initworkerby.c
++++ nginx-1.17.7/lua-nginx/src/ngx_http_lua_initworkerby.c
+@@ -12,6 +12,7 @@
+ 
+ #include "ngx_http_lua_initworkerby.h"
+ #include "ngx_http_lua_util.h"
++#include "ngx_http_lua_pipe.h"
+ 
+ 
+ static u_char *ngx_http_lua_log_init_worker_error(ngx_log_t *log,
+@@ -65,6 +66,12 @@ ngx_http_lua_init_worker(ngx_cycle_t *cy
+ 
+         return NGX_OK;
+     }
++
++#ifdef HAVE_NGX_LUA_PIPE
++    if (ngx_http_lua_pipe_add_signal_handler(cycle) != NGX_OK) {
++        return NGX_ERROR;
++    }
++#endif
+ #endif  /* NGX_WIN32 */
+ 
+     if (lmcf->init_worker_handler == NULL) {
+Index: nginx-1.17.7/lua-nginx/src/ngx_http_lua_module.c
+===================================================================
+--- nginx-1.17.7.orig/lua-nginx/src/ngx_http_lua_module.c
++++ nginx-1.17.7/lua-nginx/src/ngx_http_lua_module.c
+@@ -29,6 +29,7 @@
+ #include "ngx_http_lua_ssl_session_storeby.h"
+ #include "ngx_http_lua_ssl_session_fetchby.h"
+ #include "ngx_http_lua_headers.h"
++#include "ngx_http_lua_pipe.h"
+ 
+ 
+ static void *ngx_http_lua_create_main_conf(ngx_conf_t *cf);
+@@ -734,6 +735,10 @@ ngx_http_lua_init(ngx_conf_t *cf)
+     cln->handler = ngx_http_lua_sema_mm_cleanup;
+ #endif
+ 
++#ifdef HAVE_NGX_LUA_PIPE
++    ngx_http_lua_pipe_init();
++#endif
++
+ #if nginx_version >= 1011011
+     cln = ngx_pool_cleanup_add(cf->pool, 0);
+     if (cln == NULL) {
+Index: nginx-1.17.7/lua-nginx/src/ngx_http_lua_util.h
+===================================================================
+--- nginx-1.17.7.orig/lua-nginx/src/ngx_http_lua_util.h
++++ nginx-1.17.7/lua-nginx/src/ngx_http_lua_util.h
+@@ -30,6 +30,12 @@ typedef struct {
+  * user code cache table */
+ extern char ngx_http_lua_code_cache_key;
+ 
++#define NGX_HTTP_LUA_CONTEXT_YIELDABLE (NGX_HTTP_LUA_CONTEXT_REWRITE         \
++                                | NGX_HTTP_LUA_CONTEXT_ACCESS                \
++                                | NGX_HTTP_LUA_CONTEXT_CONTENT               \
++                                | NGX_HTTP_LUA_CONTEXT_TIMER                 \
++                                | NGX_HTTP_LUA_CONTEXT_SSL_CERT              \
++                                | NGX_HTTP_LUA_CONTEXT_SSL_SESS_FETCH)
+ 
+ /* key in Lua vm registry for all the "ngx.ctx" tables */
+ #define ngx_http_lua_ctx_tables_key  "ngx_lua_ctx_tables"
+Index: nginx-1.17.7/lua-nginx/src/ngx_http_lua_util.c
+===================================================================
+--- nginx-1.17.7.orig/lua-nginx/src/ngx_http_lua_util.c
++++ nginx-1.17.7/lua-nginx/src/ngx_http_lua_util.c
+@@ -52,6 +52,7 @@
+ #include "ngx_http_lua_ssl_certby.h"
+ #include "ngx_http_lua_ssl.h"
+ #include "ngx_http_lua_log_ringbuf.h"
++#include "ngx_http_lua_pipe.h"
+ 
+ 
+ #if 1
+@@ -744,6 +745,9 @@ ngx_http_lua_inject_ngx_api(lua_State *L
+     ngx_http_lua_inject_timer_api(L);
+     ngx_http_lua_inject_config_api(L);
+     ngx_http_lua_inject_worker_api(L);
++#ifdef HAVE_NGX_LUA_PIPE
++    ngx_http_lua_inject_pipe_api(L);
++#endif
+ 
+     ngx_http_lua_inject_misc_api(L);
diff --git a/nginx/patches/101-feature_test_fix.patch b/nginx/patches/101-feature_test_fix.patch
new file mode 100644
index 00000000..b867c88d
--- /dev/null
+++ b/nginx/patches/101-feature_test_fix.patch
@@ -0,0 +1,116 @@
+--- a/auto/cc/name
++++ b/auto/cc/name
+@@ -7,7 +7,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+ 
+     ngx_feature="C compiler"
+     ngx_feature_name=
+-    ngx_feature_run=yes
++    ngx_feature_run=
+     ngx_feature_incs=
+     ngx_feature_path=
+     ngx_feature_libs=
+--- a/auto/cc/conf
++++ b/auto/cc/conf
+@@ -183,7 +183,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+     else
+         ngx_feature="gcc builtin atomic operations"
+         ngx_feature_name=NGX_HAVE_GCC_ATOMIC
+-        ngx_feature_run=yes
++        ngx_feature_run=no
+         ngx_feature_incs=
+         ngx_feature_path=
+         ngx_feature_libs=
+@@ -204,7 +204,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+     else
+         ngx_feature="C99 variadic macros"
+         ngx_feature_name="NGX_HAVE_C99_VARIADIC_MACROS"
+-        ngx_feature_run=yes
++        ngx_feature_run=no
+         ngx_feature_incs="#include <stdio.h>
+ #define var(dummy, ...)  sprintf(__VA_ARGS__)"
+         ngx_feature_path=
+@@ -218,7 +218,7 @@ if [ "$NGX_PLATFORM" != win32 ]; then
+ 
+     ngx_feature="gcc variadic macros"
+     ngx_feature_name="NGX_HAVE_GCC_VARIADIC_MACROS"
+-    ngx_feature_run=yes
++    ngx_feature_run=no
+     ngx_feature_incs="#include <stdio.h>
+ #define var(dummy, args...)  sprintf(args)"
+     ngx_feature_path=
+--- a/auto/os/linux
++++ b/auto/os/linux
+@@ -36,7 +36,7 @@ fi
+ 
+ ngx_feature="epoll"
+ ngx_feature_name="NGX_HAVE_EPOLL"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/epoll.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
+@@ -110,7 +110,7 @@ ngx_feature_test="int fd; struct stat sb
+ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE"
+ ngx_feature="sendfile()"
+ ngx_feature_name="NGX_HAVE_SENDFILE"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/sendfile.h>
+                   #include <errno.h>"
+ ngx_feature_path=
+@@ -131,7 +131,7 @@ fi
+ CC_AUX_FLAGS="$cc_aux_flags -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64"
+ ngx_feature="sendfile64()"
+ ngx_feature_name="NGX_HAVE_SENDFILE64"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/sendfile.h>
+                   #include <errno.h>"
+ ngx_feature_path=
+@@ -149,7 +149,7 @@ ngx_include="sys/prctl.h"; . auto/includ
+ 
+ ngx_feature="prctl(PR_SET_DUMPABLE)"
+ ngx_feature_name="NGX_HAVE_PR_SET_DUMPABLE"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/prctl.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
+--- a/auto/unix
++++ b/auto/unix
+@@ -840,7 +840,7 @@ ngx_feature_test="void *p; p = memalign(
+ 
+ ngx_feature="mmap(MAP_ANON|MAP_SHARED)"
+ ngx_feature_name="NGX_HAVE_MAP_ANON"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/mman.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
+@@ -853,7 +853,7 @@ ngx_feature_test="void *p;
+ 
+ ngx_feature='mmap("/dev/zero", MAP_SHARED)'
+ ngx_feature_name="NGX_HAVE_MAP_DEVZERO"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/mman.h>
+                   #include <sys/stat.h>
+                   #include <fcntl.h>"
+@@ -868,7 +868,7 @@ ngx_feature_test='void *p; int  fd;
+ 
+ ngx_feature="System V shared memory"
+ ngx_feature_name="NGX_HAVE_SYSVSHM"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <sys/ipc.h>
+                   #include <sys/shm.h>"
+ ngx_feature_path=
+@@ -882,7 +882,7 @@ ngx_feature_test="int  id;
+ 
+ ngx_feature="POSIX semaphores"
+ ngx_feature_name="NGX_HAVE_POSIX_SEM"
+-ngx_feature_run=yes
++ngx_feature_run=no
+ ngx_feature_incs="#include <semaphore.h>"
+ ngx_feature_path=
+ ngx_feature_libs=
diff --git a/nginx/patches/102-sizeof_test_fix.patch b/nginx/patches/102-sizeof_test_fix.patch
new file mode 100644
index 00000000..7d2430ea
--- /dev/null
+++ b/nginx/patches/102-sizeof_test_fix.patch
@@ -0,0 +1,27 @@
+--- a/auto/types/sizeof
++++ b/auto/types/sizeof
+@@ -25,8 +25,14 @@ $NGX_INCLUDE_UNISTD_H
+ $NGX_INCLUDE_INTTYPES_H
+ $NGX_INCLUDE_AUTO_CONFIG_H
+ 
++char object_code_block[] = {
++	'\n', 'e', '4', 'V', 'A',
++	'0', 'x', ('0' + sizeof($ngx_type)),
++	'Y', '3', 'p', 'M', '\n'
++};
++
+ int main(void) {
+-    printf("%d", (int) sizeof($ngx_type));
++    printf("dummy use of object_code_block to avoid gc-section: %c", object_code_block[0]);
+     return 0;
+ }
+ 
+@@ -40,7 +46,7 @@ eval "$ngx_test >> $NGX_AUTOCONF_ERR 2>&
+ 
+ 
+ if [ -x $NGX_AUTOTEST ]; then
+-    ngx_size=`$NGX_AUTOTEST`
++    ngx_size=`sed -ne 's/^e4VA0x\(.\)Y3pM$/\1/p' < $NGX_AUTOTEST`
+     echo " $ngx_size bytes"
+ fi
+ 
diff --git a/nginx/patches/103-sys_nerr.patch b/nginx/patches/103-sys_nerr.patch
new file mode 100644
index 00000000..5f5d106f
--- /dev/null
+++ b/nginx/patches/103-sys_nerr.patch
@@ -0,0 +1,12 @@
+--- a/src/os/unix/ngx_errno.c
++++ b/src/os/unix/ngx_errno.c
+@@ -8,6 +8,9 @@
+ #include <ngx_config.h>
+ #include <ngx_core.h>
+ 
++#ifndef NGX_SYS_NERR
++#define NGX_SYS_NERR  128
++#endif
+ 
+ /*
+  * The strerror() messages are copied because:
diff --git a/nginx/patches/200-config.patch b/nginx/patches/200-config.patch
new file mode 100644
index 00000000..f3500957
--- /dev/null
+++ b/nginx/patches/200-config.patch
@@ -0,0 +1,18 @@
+--- a/conf/nginx.conf
++++ b/conf/nginx.conf
+@@ -1,5 +1,5 @@
+ 
+-#user  nobody;
++user nobody nogroup;
+ worker_processes  1;
+ 
+ #error_log  logs/error.log;
+@@ -16,7 +16,7 @@ events {
+ 
+ http {
+     include       mime.types;
+-    default_type  application/octet-stream;
++    #default_type  application/octet-stream;
+ 
+     #log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+     #                  '$status $body_bytes_sent "$http_referer" '
diff --git a/nginx/patches/201-ignore-invalid-options.patch b/nginx/patches/201-ignore-invalid-options.patch
new file mode 100644
index 00000000..88b52135
--- /dev/null
+++ b/nginx/patches/201-ignore-invalid-options.patch
@@ -0,0 +1,12 @@
+--- a/auto/options
++++ b/auto/options
+@@ -396,8 +396,7 @@ $0: warning: the \"--with-sha1-asm\" opt
+         --test-build-solaris-sendfilev)  NGX_TEST_BUILD_SOLARIS_SENDFILEV=YES ;;
+ 
+         *)
+-            echo "$0: error: invalid option \"$option\""
+-            exit 1
++            echo "$0: error: ignoring invalid option \"$option\""
+         ;;
+     esac
+ done
diff --git a/nginx/patches/300-max-processes.patch b/nginx/patches/300-max-processes.patch
new file mode 100644
index 00000000..f7465d43
--- /dev/null
+++ b/nginx/patches/300-max-processes.patch
@@ -0,0 +1,11 @@
+--- a/src/os/unix/ngx_process.h
++++ b/src/os/unix/ngx_process.h
+@@ -44,7 +44,7 @@ typedef struct {
+ } ngx_exec_ctx_t;
+ 
+ 
+-#define NGX_MAX_PROCESSES         1024
++#define NGX_MAX_PROCESSES         8
+ 
+ #define NGX_PROCESS_NORESPAWN     -1
+ #define NGX_PROCESS_JUST_SPAWN    -2
diff --git a/nginx/patches/400-socket-cloexec.patch b/nginx/patches/400-socket-cloexec.patch
new file mode 100644
index 00000000..96e48b60
--- /dev/null
+++ b/nginx/patches/400-socket-cloexec.patch
@@ -0,0 +1,174 @@
+Index: nginx-1.17.7/auto/unix
+===================================================================
+--- nginx-1.17.7.orig/auto/unix
++++ nginx-1.17.7/auto/unix
+@@ -1037,3 +1037,27 @@ ngx_feature_test='struct addrinfo *res;
+                   if (getaddrinfo("localhost", NULL, NULL, &res) != 0) return 1;
+                   freeaddrinfo(res)'
+ . auto/feature
++
++ngx_feature="SOCK_CLOEXEC support"
++ngx_feature_name="NGX_HAVE_SOCKET_CLOEXEC"
++ngx_feature_run=no
++ngx_feature_incs="#include <sys/types.h>
++                  #include <sys/socket.h>"
++ngx_feature_path=
++ngx_feature_libs=
++ngx_feature_test="int fd;
++                  fd = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0);"
++. auto/feature
++
++ngx_feature="FD_CLOEXEC support"
++ngx_feature_name="NGX_HAVE_FD_CLOEXEC"
++ngx_feature_run=no
++ngx_feature_incs="#include <sys/types.h>
++                  #include <sys/socket.h>
++                  #include <fcntl.h>"
++ngx_feature_path=
++ngx_feature_libs=
++ngx_feature_test="int fd;
++                  fd = socket(AF_INET, SOCK_STREAM, 0);
++                  fcntl(fd, F_SETFD, FD_CLOEXEC);"
++. auto/feature
+Index: nginx-1.17.7/src/core/ngx_resolver.c
+===================================================================
+--- nginx-1.17.7.orig/src/core/ngx_resolver.c
++++ nginx-1.17.7/src/core/ngx_resolver.c
+@@ -4492,7 +4492,11 @@ ngx_tcp_connect(ngx_resolver_connection_
+     ngx_event_t       *rev, *wev;
+     ngx_connection_t  *c;
+ 
++#if (NGX_HAVE_SOCKET_CLOEXEC)
++    s = ngx_socket(rec->sockaddr->sa_family, SOCK_STREAM | SOCK_CLOEXEC, 0);
++#else
+     s = ngx_socket(rec->sockaddr->sa_family, SOCK_STREAM, 0);
++#endif
+ 
+     ngx_log_debug1(NGX_LOG_DEBUG_EVENT, &rec->log, 0, "TCP socket %d", s);
+ 
+@@ -4520,6 +4524,15 @@ ngx_tcp_connect(ngx_resolver_connection_
+         goto failed;
+     }
+ 
++#if (NGX_HAVE_FD_CLOEXEC)
++    if (ngx_cloexec(s) == -1) {
++        ngx_log_error(NGX_LOG_ALERT, &rec->log, ngx_socket_errno,
++                      ngx_cloexec_n " failed");
++
++        goto failed;
++    }
++#endif
++
+     rev = c->read;
+     wev = c->write;
+ 
+Index: nginx-1.17.7/src/event/ngx_event.h
+===================================================================
+--- nginx-1.17.7.orig/src/event/ngx_event.h
++++ nginx-1.17.7/src/event/ngx_event.h
+@@ -73,6 +73,9 @@ struct ngx_event_s {
+     /* to test on worker exit */
+     unsigned         channel:1;
+     unsigned         resolver:1;
++#if (HAVE_SOCKET_CLOEXEC_PATCH)
++    unsigned         skip_socket_leak_check:1;
++#endif
+ 
+     unsigned         cancelable:1;
+ 
+Index: nginx-1.17.7/src/event/ngx_event_accept.c
+===================================================================
+--- nginx-1.17.7.orig/src/event/ngx_event_accept.c
++++ nginx-1.17.7/src/event/ngx_event_accept.c
+@@ -57,7 +57,7 @@ ngx_event_accept(ngx_event_t *ev)
+ 
+ #if (NGX_HAVE_ACCEPT4)
+         if (use_accept4) {
+-            s = accept4(lc->fd, &sa.sockaddr, &socklen, SOCK_NONBLOCK);
++            s = accept4(lc->fd, &sa.sockaddr, &socklen, SOCK_NONBLOCK | SOCK_CLOEXEC);
+         } else {
+             s = accept(lc->fd, &sa.sockaddr, &socklen);
+         }
+@@ -197,6 +197,14 @@ ngx_event_accept(ngx_event_t *ev)
+                     ngx_close_accepted_connection(c);
+                     return;
+                 }
++#if (NGX_HAVE_FD_CLOEXEC)
++                if (ngx_cloexec(s) == -1) {
++                    ngx_log_error(NGX_LOG_ALERT, ev->log, ngx_socket_errno,
++                                  ngx_cloexec_n " failed");
++                    ngx_close_accepted_connection(c);
++                    return;
++                }
++#endif
+             }
+         }
+ 
+Index: nginx-1.17.7/src/event/ngx_event_connect.c
+===================================================================
+--- nginx-1.17.7.orig/src/event/ngx_event_connect.c
++++ nginx-1.17.7/src/event/ngx_event_connect.c
+@@ -38,7 +38,11 @@ ngx_event_connect_peer(ngx_peer_connecti
+ 
+     type = (pc->type ? pc->type : SOCK_STREAM);
+ 
++#if (NGX_HAVE_SOCKET_CLOEXEC)
++    s = ngx_socket(pc->sockaddr->sa_family, type | SOCK_CLOEXEC, 0);
++#else
+     s = ngx_socket(pc->sockaddr->sa_family, type, 0);
++#endif
+ 
+     ngx_log_debug2(NGX_LOG_DEBUG_EVENT, pc->log, 0, "%s socket %d",
+                    (type == SOCK_STREAM) ? "stream" : "dgram", s);
+@@ -92,6 +96,15 @@ ngx_event_connect_peer(ngx_peer_connecti
+         goto failed;
+     }
+ 
++#if (NGX_HAVE_FD_CLOEXEC)
++    if (ngx_cloexec(s) == -1) {
++        ngx_log_error(NGX_LOG_ALERT, pc->log, ngx_socket_errno,
++                      ngx_cloexec_n " failed");
++
++        goto failed;
++    }
++#endif
++
+     if (pc->local) {
+ 
+ #if (NGX_HAVE_TRANSPARENT_PROXY)
+Index: nginx-1.17.7/src/os/unix/ngx_process_cycle.c
+===================================================================
+--- nginx-1.17.7.orig/src/os/unix/ngx_process_cycle.c
++++ nginx-1.17.7/src/os/unix/ngx_process_cycle.c
+@@ -991,6 +991,9 @@ ngx_worker_process_exit(ngx_cycle_t *cyc
+         for (i = 0; i < cycle->connection_n; i++) {
+             if (c[i].fd != -1
+                 && c[i].read
++#if (HAVE_SOCKET_CLOEXEC_PATCH)
++                && !c[i].read->skip_socket_leak_check
++#endif
+                 && !c[i].read->accept
+                 && !c[i].read->channel
+                 && !c[i].read->resolver)
+Index: nginx-1.17.7/src/os/unix/ngx_socket.h
+===================================================================
+--- nginx-1.17.7.orig/src/os/unix/ngx_socket.h
++++ nginx-1.17.7/src/os/unix/ngx_socket.h
+@@ -45,6 +45,17 @@ int ngx_blocking(ngx_socket_t s);
+ 
+ #endif
+ 
++#if (NGX_HAVE_FD_CLOEXEC)
++
++#define ngx_cloexec(s)      fcntl(s, F_SETFD, FD_CLOEXEC)
++#define ngx_cloexec_n       "fcntl(FD_CLOEXEC)"
++
++/* at least FD_CLOEXEC is required to ensure connection fd is closed
++ * after execve */
++#define HAVE_SOCKET_CLOEXEC_PATCH  1
++
++#endif
++
+ int ngx_tcp_nopush(ngx_socket_t s);
+ int ngx_tcp_push(ngx_socket_t s);
+ 
diff --git a/nginx/src/lua-nginx/src/ngx_http_lua_pipe.c b/nginx/src/lua-nginx/src/ngx_http_lua_pipe.c
new file mode 100644
index 00000000..2aba17ac
--- /dev/null
+++ b/nginx/src/lua-nginx/src/ngx_http_lua_pipe.c
@@ -0,0 +1,2857 @@
+
+/*
+ * Copyright (C) by OpenResty Inc.
+ */
+
+
+#ifndef DDEBUG
+#define DDEBUG 0
+#endif
+#include "ddebug.h"
+
+
+#include "ngx_http_lua_common.h"
+#include "ngx_http_lua_input_filters.h"
+#include "ngx_http_lua_util.h"
+#include "ngx_http_lua_pipe.h"
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+#include <sys/signalfd.h>
+#endif
+
+
+#ifdef HAVE_NGX_LUA_PIPE
+static ngx_rbtree_node_t *ngx_http_lua_pipe_lookup_pid(ngx_rbtree_key_t key);
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+static void ngx_http_lua_pipe_sigchld_handler(int signo, siginfo_t *siginfo,
+    void *ucontext);
+#endif
+static void ngx_http_lua_pipe_sigchld_event_handler(ngx_event_t *ev);
+static ssize_t ngx_http_lua_pipe_fd_read(ngx_connection_t *c, u_char *buf,
+    size_t size);
+static ssize_t ngx_http_lua_pipe_fd_write(ngx_connection_t *c, u_char *buf,
+    size_t size);
+static void ngx_http_lua_pipe_close_helper(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx, ngx_event_t *ev);
+static void ngx_http_lua_pipe_close_stdin(ngx_http_lua_pipe_t *pipe);
+static void ngx_http_lua_pipe_close_stdout(ngx_http_lua_pipe_t *pipe);
+static void ngx_http_lua_pipe_close_stderr(ngx_http_lua_pipe_t *pipe);
+static void ngx_http_lua_pipe_proc_finalize(ngx_http_lua_ffi_pipe_proc_t *proc);
+static ngx_int_t ngx_http_lua_pipe_get_lua_ctx(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t **ctx, u_char *errbuf, size_t *errbuf_size);
+static void ngx_http_lua_pipe_put_error(ngx_http_lua_pipe_ctx_t *pipe_ctx,
+    u_char *errbuf, size_t *errbuf_size);
+static void ngx_http_lua_pipe_put_data(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char **buf, size_t *buf_size);
+static ngx_int_t ngx_http_lua_pipe_add_input_buffer(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx);
+static ngx_int_t ngx_http_lua_pipe_read_all(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read_bytes(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read_line(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read_any(void *data, ssize_t bytes);
+static ngx_int_t ngx_http_lua_pipe_read(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx);
+static ngx_int_t ngx_http_lua_pipe_init_ctx(
+    ngx_http_lua_pipe_ctx_t **pipe_ctx_pt, int fd, ngx_pool_t *pool,
+    u_char *errbuf, size_t *errbuf_size);
+static ngx_int_t ngx_http_lua_pipe_write(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx);
+static int ngx_http_lua_pipe_read_stdout_retval(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
+static int ngx_http_lua_pipe_read_stderr_retval(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
+static int ngx_http_lua_pipe_read_retval_helper(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L, int from_stderr);
+static int ngx_http_lua_pipe_write_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L);
+static int ngx_http_lua_pipe_wait_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L);
+static void ngx_http_lua_pipe_resume_helper(ngx_event_t *ev,
+    ngx_http_lua_co_ctx_t *wait_co_ctx);
+static void ngx_http_lua_pipe_resume_read_stdout_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_resume_read_stderr_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_resume_write_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_resume_wait_handler(ngx_event_t *ev);
+static ngx_int_t ngx_http_lua_pipe_resume(ngx_http_request_t *r);
+static void ngx_http_lua_pipe_dummy_event_handler(ngx_event_t *ev);
+static void ngx_http_lua_pipe_clear_event(ngx_event_t *ev);
+static void ngx_http_lua_pipe_proc_read_stdout_cleanup(void *data);
+static void ngx_http_lua_pipe_proc_read_stderr_cleanup(void *data);
+static void ngx_http_lua_pipe_proc_write_cleanup(void *data);
+static void ngx_http_lua_pipe_proc_wait_cleanup(void *data);
+
+
+static ngx_rbtree_t       ngx_http_lua_pipe_rbtree;
+static ngx_rbtree_node_t  ngx_http_lua_pipe_proc_sentinel;
+
+static char ngx_http_lua_proc_metatable_key;
+
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+static int                                ngx_http_lua_signalfd;
+static struct signalfd_siginfo            ngx_http_lua_pipe_notification;
+
+#define ngx_http_lua_read_sigfd           ngx_http_lua_signalfd
+
+#else
+static int                                ngx_http_lua_sigchldfd[2];
+static u_char                             ngx_http_lua_pipe_notification[1];
+
+#define ngx_http_lua_read_sigfd           ngx_http_lua_sigchldfd[0]
+#define ngx_http_lua_write_sigfd          ngx_http_lua_sigchldfd[1]
+#endif
+
+
+static ngx_connection_t                  *ngx_http_lua_sigfd_conn = NULL;
+
+
+/* The below signals are ignored by Nginx.
+ * We need to reset them for the spawned child processes. */
+ngx_http_lua_pipe_signal_t ngx_signals[] = {
+    { SIGSYS, "SIGSYS" },
+    { SIGPIPE, "SIGPIPE" },
+    { 0, NULL }
+};
+
+
+enum {
+    PIPE_ERR_CLOSED = 1,
+    PIPE_ERR_SYSCALL,
+    PIPE_ERR_NOMEM,
+    PIPE_ERR_TIMEOUT,
+    PIPE_ERR_ADD_READ_EV,
+    PIPE_ERR_ADD_WRITE_EV,
+    PIPE_ERR_ABORTED,
+};
+
+
+enum {
+    PIPE_READ_ALL = 0,
+    PIPE_READ_BYTES,
+    PIPE_READ_LINE,
+    PIPE_READ_ANY,
+};
+
+
+#define REASON_EXIT         "exit"
+#define REASON_SIGNAL       "signal"
+#define REASON_UNKNOWN      "unknown"
+
+#define REASON_RUNNING_CODE  0
+#define REASON_EXIT_CODE     1
+#define REASON_SIGNAL_CODE   2
+#define REASON_UNKNOWN_CODE  3
+
+
+void
+ngx_http_lua_pipe_init(void)
+{
+    ngx_rbtree_init(&ngx_http_lua_pipe_rbtree,
+                    &ngx_http_lua_pipe_proc_sentinel, ngx_rbtree_insert_value);
+}
+
+
+ngx_int_t
+ngx_http_lua_pipe_add_signal_handler(ngx_cycle_t *cycle)
+{
+    ngx_event_t         *rev;
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+    sigset_t             set;
+
+#else
+    int                  rc;
+    struct sigaction     sa;
+#endif
+
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+    if (sigemptyset(&set) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe init signal set failed");
+        return NGX_ERROR;
+    }
+
+    if (sigaddset(&set, SIGCHLD) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe add SIGCHLD to signal set failed");
+        return NGX_ERROR;
+    }
+
+    if (sigprocmask(SIG_BLOCK, &set, NULL) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe block SIGCHLD failed");
+        return NGX_ERROR;
+    }
+
+    ngx_http_lua_signalfd = signalfd(-1, &set, SFD_NONBLOCK|SFD_CLOEXEC);
+    if (ngx_http_lua_signalfd < 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe create signalfd instance failed");
+        return NGX_ERROR;
+    }
+
+#else /* !(NGX_HTTP_LUA_HAVE_SIGNALFD) */
+#   if (NGX_HTTP_LUA_HAVE_PIPE2)
+    rc = pipe2(ngx_http_lua_sigchldfd, O_NONBLOCK|O_CLOEXEC);
+#   else
+    rc = pipe(ngx_http_lua_sigchldfd);
+#   endif
+
+    if (rc == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe init SIGCHLD fd failed");
+        return NGX_ERROR;
+    }
+
+#   if !(NGX_HTTP_LUA_HAVE_PIPE2)
+    if (ngx_nonblocking(ngx_http_lua_read_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, "lua pipe "
+                      ngx_nonblocking_n " SIGCHLD read fd failed");
+        goto failed;
+    }
+
+    if (ngx_nonblocking(ngx_http_lua_write_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno, "lua pipe "
+                      ngx_nonblocking_n " SIGCHLD write fd failed");
+        goto failed;
+    }
+
+    /* it's ok not to set the pipe fd with O_CLOEXEC. This requires
+     * extra syscall */
+#   endif /* !(NGX_HTTP_LUA_HAVE_PIPE2) */
+#endif /* NGX_HTTP_LUA_HAVE_SIGNALFD */
+
+    ngx_http_lua_sigfd_conn = ngx_get_connection(ngx_http_lua_read_sigfd,
+                                                 cycle->log);
+    if (ngx_http_lua_sigfd_conn == NULL) {
+        goto failed;
+    }
+
+    ngx_http_lua_sigfd_conn->log = cycle->log;
+    ngx_http_lua_sigfd_conn->recv = ngx_http_lua_pipe_fd_read;
+    rev = ngx_http_lua_sigfd_conn->read;
+    rev->log = ngx_http_lua_sigfd_conn->log;
+    rev->handler = ngx_http_lua_pipe_sigchld_event_handler;
+
+#ifdef HAVE_SOCKET_CLOEXEC_PATCH
+    rev->skip_socket_leak_check = 1;
+#endif
+
+    if (ngx_handle_read_event(rev, 0) == NGX_ERROR) {
+        goto failed;
+    }
+
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+    ngx_memzero(&sa, sizeof(struct sigaction));
+    sa.sa_sigaction = ngx_http_lua_pipe_sigchld_handler;
+    sa.sa_flags = SA_SIGINFO;
+
+    if (sigemptyset(&sa.sa_mask) != 0) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe init signal mask failed");
+        goto failed;
+    }
+
+    if (sigaction(SIGCHLD, &sa, NULL) == -1) {
+        ngx_log_error(NGX_LOG_ERR, cycle->log, ngx_errno,
+                      "lua pipe sigaction(SIGCHLD) failed");
+        goto failed;
+    }
+#endif
+
+    return NGX_OK;
+
+failed:
+
+    if (ngx_http_lua_sigfd_conn != NULL) {
+        ngx_close_connection(ngx_http_lua_sigfd_conn);
+        ngx_http_lua_sigfd_conn = NULL;
+    }
+
+    if (close(ngx_http_lua_read_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                      "lua pipe close the read sigfd failed");
+    }
+
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+    if (close(ngx_http_lua_write_sigfd) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno,
+                      "lua pipe close the write sigfd failed");
+    }
+#endif
+
+    return NGX_ERROR;
+}
+
+
+static ngx_rbtree_node_t *
+ngx_http_lua_pipe_lookup_pid(ngx_rbtree_key_t key)
+{
+    ngx_rbtree_node_t    *node, *sentinel;
+
+    node = ngx_http_lua_pipe_rbtree.root;
+    sentinel = ngx_http_lua_pipe_rbtree.sentinel;
+
+    while (node != sentinel) {
+        if (key < node->key) {
+            node = node->left;
+            continue;
+        }
+
+        if (key > node->key) {
+            node = node->right;
+            continue;
+        }
+
+        return node;
+    }
+
+    return NULL;
+}
+
+
+#if !(NGX_HTTP_LUA_HAVE_SIGNALFD)
+static void
+ngx_http_lua_pipe_sigchld_handler(int signo, siginfo_t *siginfo,
+    void *ucontext)
+{
+    ngx_err_t                        err, saved_err;
+    ngx_int_t                        n;
+
+    saved_err = ngx_errno;
+
+    for ( ;; ) {
+        n = write(ngx_http_lua_write_sigfd, ngx_http_lua_pipe_notification,
+                  sizeof(ngx_http_lua_pipe_notification));
+
+        ngx_log_debug1(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
+                       "lua pipe SIGCHLD fd write siginfo:%p", siginfo);
+
+        if (n >= 0) {
+            break;
+        }
+
+        err = ngx_errno;
+
+        if (err != NGX_EINTR) {
+            if (err != NGX_EAGAIN) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, err,
+                              "lua pipe SIGCHLD fd write failed");
+            }
+
+            break;
+        }
+
+        ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, err,
+                       "lua pipe SIGCHLD fd write was interrupted");
+    }
+
+    ngx_set_errno(saved_err);
+}
+#endif
+
+
+static void
+ngx_http_lua_pipe_sigchld_event_handler(ngx_event_t *ev)
+{
+    int                              n;
+    int                              status;
+    ngx_pid_t                        pid;
+    ngx_connection_t                *c = ev->data;
+    ngx_rbtree_node_t               *node;
+    ngx_http_lua_pipe_node_t        *pipe_node;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ngx_cycle->log, 0,
+                   "lua pipe reaping children");
+
+    for ( ;; ) {
+#if (NGX_HTTP_LUA_HAVE_SIGNALFD)
+        n = c->recv(c, (u_char *) &ngx_http_lua_pipe_notification,
+#else
+        n = c->recv(c, ngx_http_lua_pipe_notification,
+#endif
+                    sizeof(ngx_http_lua_pipe_notification));
+
+        if (n <= 0) {
+            if (n == NGX_ERROR) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe SIGCHLD fd read failed");
+            }
+
+            break;
+        }
+
+        for ( ;; ) {
+            pid = waitpid(-1, &status, WNOHANG);
+
+            if (pid == 0) {
+                break;
+            }
+
+            if (pid < 0) {
+                if (ngx_errno != NGX_ECHILD) {
+                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                                  "lua pipe waitpid failed");
+                }
+
+                break;
+            }
+
+            /* This log is ported from Nginx's signal handler since we override
+             * or block it in this implementation. */
+            ngx_log_error(NGX_LOG_NOTICE, ngx_cycle->log, 0,
+                          "signal %d (SIGCHLD) received from %P",
+                          SIGCHLD, pid);
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                           "lua pipe SIGCHLD fd read pid:%P status:%d", pid,
+                           status);
+
+            node = ngx_http_lua_pipe_lookup_pid(pid);
+            if (node != NULL) {
+                pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+                if (pipe_node->wait_co_ctx != NULL) {
+                    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                                   "lua pipe resume process:%p waiting for %P",
+                                   pipe_node->proc, pid);
+
+                    /*
+                     * We need the extra parentheses around the first argument
+                     * of ngx_post_event() just to work around macro issues in
+                     * nginx cores older than 1.7.12 (exclusive).
+                     */
+                    ngx_post_event((&pipe_node->wait_co_ctx->sleep),
+                                   &ngx_posted_events);
+                }
+
+                pipe_node->proc->pipe->dead = 1;
+
+                if (WIFSIGNALED(status)) {
+                    pipe_node->status = WTERMSIG(status);
+                    pipe_node->reason_code = REASON_SIGNAL_CODE;
+
+                } else if (WIFEXITED(status)) {
+                    pipe_node->status = WEXITSTATUS(status);
+                    pipe_node->reason_code = REASON_EXIT_CODE;
+
+                } else {
+                    ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                                  "lua pipe unknown exit status %d from "
+                                  "process %P", status, pid);
+                    pipe_node->status = status;
+                    pipe_node->reason_code = REASON_UNKNOWN_CODE;
+                }
+            }
+        }
+    }
+}
+
+
+static ssize_t
+ngx_http_lua_pipe_fd_read(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    ssize_t       n;
+    ngx_err_t     err;
+    ngx_event_t  *rev;
+
+    rev = c->read;
+
+    do {
+        n = read(c->fd, buf, size);
+
+        err = ngx_errno;
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "read: fd:%d %z of %uz", c->fd, n, size);
+
+        if (n == 0) {
+            rev->ready = 0;
+            rev->eof = 1;
+            return 0;
+        }
+
+        if (n > 0) {
+            if ((size_t) n < size
+                && !(ngx_event_flags & NGX_USE_GREEDY_EVENT))
+            {
+                rev->ready = 0;
+            }
+
+            return n;
+        }
+
+        if (err == NGX_EAGAIN || err == NGX_EINTR) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "read() not ready");
+            n = NGX_AGAIN;
+
+        } else {
+            n = ngx_connection_error(c, err, "read() failed");
+            break;
+        }
+
+    } while (err == NGX_EINTR);
+
+    rev->ready = 0;
+
+    if (n == NGX_ERROR) {
+        rev->error = 1;
+    }
+
+    return n;
+}
+
+
+static ssize_t
+ngx_http_lua_pipe_fd_write(ngx_connection_t *c, u_char *buf, size_t size)
+{
+    ssize_t       n;
+    ngx_err_t     err;
+    ngx_event_t  *wev;
+
+    wev = c->write;
+
+    do {
+        n = write(c->fd, buf, size);
+
+        ngx_log_debug3(NGX_LOG_DEBUG_EVENT, c->log, 0,
+                       "write: fd:%d %z of %uz", c->fd, n, size);
+
+        if (n >= 0) {
+            if ((size_t) n != size) {
+                wev->ready = 0;
+            }
+
+            return n;
+        }
+
+        err = ngx_errno;
+
+        if (err == NGX_EAGAIN || err == NGX_EINTR) {
+            ngx_log_debug0(NGX_LOG_DEBUG_EVENT, c->log, err,
+                           "write() not ready");
+            n = NGX_AGAIN;
+
+        } else if (err != NGX_EPIPE) {
+            n = ngx_connection_error(c, err, "write() failed");
+            break;
+        }
+
+    } while (err == NGX_EINTR);
+
+    wev->ready = 0;
+
+    if (n == NGX_ERROR) {
+        wev->error = 1;
+    }
+
+    return n;
+}
+
+
+#if !(NGX_HTTP_LUA_HAVE_EXECVPE)
+static int
+ngx_http_lua_execvpe(const char *program, char * const argv[],
+    char * const envp[])
+{
+    int    rc;
+    char **saved = environ;
+
+    environ = (char **) envp;
+    rc = execvp(program, argv);
+    environ = saved;
+    return rc;
+}
+#endif
+
+
+int
+ngx_http_lua_ffi_pipe_spawn(ngx_http_lua_ffi_pipe_proc_t *proc,
+    const char *file, const char **argv, int merge_stderr, size_t buffer_size,
+    const char **environ, u_char *errbuf, size_t *errbuf_size)
+{
+    int                             rc;
+    int                             in[2];
+    int                             out[2];
+    int                             err[2];
+    int                             stdin_fd, stdout_fd, stderr_fd;
+    int                             errlog_fd, temp_errlog_fd;
+    ngx_pid_t                       pid;
+    ssize_t                         pool_size;
+    ngx_pool_t                     *pool;
+    ngx_uint_t                      i;
+    ngx_listening_t                *ls;
+    ngx_http_lua_pipe_t            *pp;
+    ngx_rbtree_node_t              *node;
+    ngx_http_lua_pipe_node_t       *pipe_node;
+    struct sigaction                sa;
+    ngx_http_lua_pipe_signal_t     *sig;
+    sigset_t                        set;
+
+    pool_size = ngx_align(NGX_MIN_POOL_SIZE + buffer_size * 2,
+                          NGX_POOL_ALIGNMENT);
+
+    pool = ngx_create_pool(pool_size, ngx_cycle->log);
+    if (pool == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    pp = ngx_pcalloc(pool, sizeof(ngx_http_lua_pipe_t)
+                     + offsetof(ngx_rbtree_node_t, color)
+                     + sizeof(ngx_http_lua_pipe_node_t));
+    if (pp == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        goto free_pool;
+    }
+
+    rc = pipe(in);
+    if (rc == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto free_pool;
+    }
+
+    rc = pipe(out);
+    if (rc == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_fd;
+    }
+
+    if (!merge_stderr) {
+        rc = pipe(err);
+        if (rc == -1) {
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                        "pipe failed: %s", strerror(errno))
+                           - errbuf;
+            goto close_in_out_fd;
+        }
+    }
+
+    pid = fork();
+    if (pid == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "fork failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_out_err_fd;
+    }
+
+    if (pid == 0) {
+
+#if (NGX_HAVE_CPU_AFFINITY)
+        /* reset the CPU affinity mask */
+        ngx_uint_t     log_level;
+        ngx_cpuset_t   child_cpu_affinity;
+
+        if (ngx_process == NGX_PROCESS_WORKER
+            && ngx_get_cpu_affinity(ngx_worker) != NULL)
+        {
+            CPU_ZERO(&child_cpu_affinity);
+
+            for (i = 0; i < (ngx_uint_t) ngx_min(ngx_ncpu, CPU_SETSIZE); i++) {
+                CPU_SET(i, &child_cpu_affinity);
+            }
+
+            log_level = ngx_cycle->log->log_level;
+            ngx_cycle->log->log_level = NGX_LOG_WARN;
+            ngx_setaffinity(&child_cpu_affinity, ngx_cycle->log);
+            ngx_cycle->log->log_level = log_level;
+        }
+#endif
+
+        /* reset the handler of ignored signals to the default */
+        for (sig = ngx_signals; sig->signo != 0; sig++) {
+            ngx_memzero(&sa, sizeof(struct sigaction));
+            sa.sa_handler = SIG_DFL;
+
+            if (sigemptyset(&sa.sa_mask) != 0) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child init signal mask failed");
+                exit(EXIT_FAILURE);
+            }
+
+            if (sigaction(sig->signo, &sa, NULL) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child reset signal handler for %s "
+                              "failed", sig->signame);
+                exit(EXIT_FAILURE);
+            }
+        }
+
+        /* reset signal mask */
+        if (sigemptyset(&set) != 0) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child init signal set failed");
+            exit(EXIT_FAILURE);
+        }
+
+        if (sigprocmask(SIG_SETMASK, &set, NULL) != 0) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child reset signal mask failed");
+            exit(EXIT_FAILURE);
+        }
+
+        /* close listening socket fd */
+        ls = ngx_cycle->listening.elts;
+        for (i = 0; i < ngx_cycle->listening.nelts; i++) {
+            if (ls[i].fd != (ngx_socket_t) -1 &&
+                ngx_close_socket(ls[i].fd) == -1)
+            {
+                ngx_log_error(NGX_LOG_WARN, ngx_cycle->log, ngx_socket_errno,
+                              "lua pipe child " ngx_close_socket_n
+                              " %V failed", &ls[i].addr_text);
+            }
+        }
+
+        /* close and dup pipefd */
+        if (close(in[1]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "lua pipe child failed to close the in[1] "
+                          "pipe fd");
+        }
+
+        if (close(out[0]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "lua pipe child failed to close the out[0] "
+                          "pipe fd");
+        }
+
+        if (ngx_cycle->log->file && ngx_cycle->log->file->fd == STDERR_FILENO) {
+            errlog_fd = ngx_cycle->log->file->fd;
+            temp_errlog_fd = dup(errlog_fd);
+
+            if (temp_errlog_fd == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child dup errlog fd failed");
+                exit(EXIT_FAILURE);
+            }
+
+            if (ngx_cloexec(temp_errlog_fd) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child new errlog fd " ngx_cloexec_n
+                              " failed");
+            }
+
+            ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                           "lua pipe child dup old errlog fd %d to new fd %d",
+                           ngx_cycle->log->file->fd, temp_errlog_fd);
+
+            ngx_cycle->log->file->fd = temp_errlog_fd;
+        }
+
+        if (dup2(in[0], STDIN_FILENO) == -1) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child dup2 stdin failed");
+            exit(EXIT_FAILURE);
+        }
+
+        if (dup2(out[1], STDOUT_FILENO) == -1) {
+            ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                          "lua pipe child dup2 stdout failed");
+            exit(EXIT_FAILURE);
+        }
+
+        if (merge_stderr) {
+            if (dup2(STDOUT_FILENO, STDERR_FILENO) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child dup2 stderr failed");
+                exit(EXIT_FAILURE);
+            }
+
+        } else {
+            if (close(err[0]) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "lua pipe child failed to close the err[0] "
+                              "pipe fd");
+            }
+
+            if (dup2(err[1], STDERR_FILENO) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child dup2 stderr failed");
+                exit(EXIT_FAILURE);
+            }
+        }
+
+        if (environ != NULL) {
+#if (NGX_HTTP_LUA_HAVE_EXECVPE)
+            if (execvpe(file, (char * const *) argv, (char * const *) environ)
+#else
+            if (ngx_http_lua_execvpe(file, (char * const *) argv,
+                                     (char * const *) environ)
+#endif
+                == -1)
+            {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child execvpe() failed while "
+                              "executing %s", file);
+            }
+
+        } else {
+            if (execvp(file, (char * const *) argv) == -1) {
+                ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, ngx_errno,
+                              "lua pipe child execvp() failed while "
+                              "executing %s", file);
+            }
+        }
+
+        exit(EXIT_FAILURE);
+    }
+
+    /* parent process */
+    if (close(in[0]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "lua pipe: failed to close the in[0] pipe fd");
+    }
+
+    stdin_fd = in[1];
+
+    if (ngx_nonblocking(stdin_fd) == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    ngx_nonblocking_n " failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_out_err_fd;
+    }
+
+    pp->stdin_fd = stdin_fd;
+
+    if (close(out[1]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "lua pipe: failed to close the out[1] pipe fd");
+    }
+
+    stdout_fd = out[0];
+
+    if (ngx_nonblocking(stdout_fd) == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    ngx_nonblocking_n " failed: %s",
+                                    strerror(errno))
+                       - errbuf;
+        goto close_in_out_err_fd;
+    }
+
+    pp->stdout_fd = stdout_fd;
+
+    if (!merge_stderr) {
+        if (close(err[1]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "lua pipe: failed to close the err[1] pipe fd");
+        }
+
+        stderr_fd = err[0];
+
+        if (ngx_nonblocking(stderr_fd) == -1) {
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                        ngx_nonblocking_n " failed: %s",
+                                        strerror(errno))
+                           - errbuf;
+            goto close_in_out_err_fd;
+        }
+
+        pp->stderr_fd = stderr_fd;
+    }
+
+    node = (ngx_rbtree_node_t *) (pp + 1);
+    node->key = pid;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    pipe_node->proc = proc;
+    ngx_rbtree_insert(&ngx_http_lua_pipe_rbtree, node);
+
+    pp->node = node;
+    pp->pool = pool;
+    pp->merge_stderr = merge_stderr;
+    pp->buffer_size = buffer_size;
+
+    proc->_pid = pid;
+    proc->pipe = pp;
+
+    ngx_log_debug4(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe spawn process:%p pid:%P merge_stderr:%d "
+                   "buffer_size:%uz", proc, pid, merge_stderr, buffer_size);
+    return NGX_OK;
+
+close_in_out_err_fd:
+
+    if (!merge_stderr) {
+        if (close(err[0]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "failed to close the err[0] pipe fd");
+        }
+
+        if (close(err[1]) == -1) {
+            ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                          "failed to close the err[1] pipe fd");
+        }
+    }
+
+close_in_out_fd:
+
+    if (close(out[0]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the out[0] pipe fd");
+    }
+
+    if (close(out[1]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the out[1] pipe fd");
+    }
+
+close_in_fd:
+
+    if (close(in[0]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the in[0] pipe fd");
+    }
+
+    if (close(in[1]) == -1) {
+        ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                      "failed to close the in[1] pipe fd");
+    }
+
+free_pool:
+
+    ngx_destroy_pool(pool);
+    return NGX_ERROR;
+}
+
+
+static void
+ngx_http_lua_pipe_close_helper(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx, ngx_event_t *ev)
+{
+    if (ev->handler != ngx_http_lua_pipe_dummy_event_handler) {
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe abort blocking operation pipe_ctx:%p ev:%p",
+                       pipe_ctx, ev);
+
+        if (pipe->dead) {
+            pipe_ctx->err_type = PIPE_ERR_CLOSED;
+
+        } else {
+            pipe_ctx->err_type = PIPE_ERR_ABORTED;
+        }
+
+        ngx_post_event(ev, &ngx_posted_events);
+        return;
+    }
+
+    ngx_close_connection(pipe_ctx->c);
+    pipe_ctx->c = NULL;
+}
+
+
+static void
+ngx_http_lua_pipe_close_stdin(ngx_http_lua_pipe_t *pipe)
+{
+    ngx_event_t                     *wev;
+
+    if (pipe->stdin_ctx == NULL) {
+        if (pipe->stdin_fd != -1) {
+            if (close(pipe->stdin_fd) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "failed to close the stdin pipe fd");
+            }
+
+            pipe->stdin_fd = -1;
+        }
+
+    } else if (pipe->stdin_ctx->c != NULL) {
+        wev = pipe->stdin_ctx->c->write;
+        ngx_http_lua_pipe_close_helper(pipe, pipe->stdin_ctx, wev);
+    }
+}
+
+
+static void
+ngx_http_lua_pipe_close_stdout(ngx_http_lua_pipe_t *pipe)
+{
+    ngx_event_t                     *rev;
+
+    if (pipe->stdout_ctx == NULL) {
+        if (pipe->stdout_fd != -1) {
+            if (close(pipe->stdout_fd) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "failed to close the stdout pipe fd");
+            }
+
+            pipe->stdout_fd = -1;
+        }
+
+    } else if (pipe->stdout_ctx->c != NULL) {
+        rev = pipe->stdout_ctx->c->read;
+        ngx_http_lua_pipe_close_helper(pipe, pipe->stdout_ctx, rev);
+    }
+}
+
+
+static void
+ngx_http_lua_pipe_close_stderr(ngx_http_lua_pipe_t *pipe)
+{
+    ngx_event_t                     *rev;
+
+    if (pipe->stderr_ctx == NULL) {
+        if (pipe->stderr_fd != -1) {
+            if (close(pipe->stderr_fd) == -1) {
+                ngx_log_error(NGX_LOG_EMERG, ngx_cycle->log, ngx_errno,
+                              "failed to close the stderr pipe fd");
+            }
+
+            pipe->stderr_fd = -1;
+        }
+
+    } else if (pipe->stderr_ctx->c != NULL) {
+        rev = pipe->stderr_ctx->c->read;
+        ngx_http_lua_pipe_close_helper(pipe, pipe->stderr_ctx, rev);
+    }
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_shutdown_stdin(ngx_http_lua_ffi_pipe_proc_t *proc,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_http_lua_pipe_t             *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    ngx_http_lua_pipe_close_stdin(pipe);
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_shutdown_stdout(ngx_http_lua_ffi_pipe_proc_t *proc,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_http_lua_pipe_t             *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    ngx_http_lua_pipe_close_stdout(pipe);
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_shutdown_stderr(ngx_http_lua_ffi_pipe_proc_t *proc,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_http_lua_pipe_t             *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe->merge_stderr) {
+        /* stdout is used internally as stderr when merge_stderr is true */
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "merged to stdout")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    ngx_http_lua_pipe_close_stderr(pipe);
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_finalize(ngx_http_lua_ffi_pipe_proc_t *proc)
+{
+    ngx_http_lua_pipe_t          *pipe;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe finalize process:%p pid:%P",
+                   proc, proc->_pid);
+    pipe = proc->pipe;
+
+    if (pipe->node) {
+        ngx_rbtree_delete(&ngx_http_lua_pipe_rbtree, pipe->node);
+        pipe->node = NULL;
+    }
+
+    pipe->dead = 1;
+
+    ngx_http_lua_pipe_close_stdin(pipe);
+    ngx_http_lua_pipe_close_stdout(pipe);
+
+    if (!pipe->merge_stderr) {
+        ngx_http_lua_pipe_close_stderr(pipe);
+    }
+
+    pipe->closed = 1;
+}
+
+static ngx_int_t
+ngx_http_lua_pipe_get_lua_ctx(ngx_http_request_t *r,
+    ngx_http_lua_ctx_t **ctx, u_char *errbuf, size_t *errbuf_size)
+{
+    int                                 rc;
+
+    *ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return NGX_HTTP_LUA_FFI_NO_REQ_CTX;
+    }
+
+    rc = ngx_http_lua_ffi_check_context(*ctx, NGX_HTTP_LUA_CONTEXT_YIELDABLE,
+                                        errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return NGX_HTTP_LUA_FFI_BAD_CONTEXT;
+    }
+
+    return NGX_OK;
+}
+
+
+static void
+ngx_http_lua_pipe_put_error(ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char *errbuf,
+    size_t *errbuf_size)
+{
+    switch (pipe_ctx->err_type) {
+
+    case PIPE_ERR_CLOSED:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        break;
+
+    case PIPE_ERR_SYSCALL:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "%s",
+                                    strerror(pipe_ctx->pipe_errno))
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_NOMEM:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_TIMEOUT:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "timeout")
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_ADD_READ_EV:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "failed to add read event")
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_ADD_WRITE_EV:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size,
+                                    "failed to add write event")
+                       - errbuf;
+        break;
+
+    case PIPE_ERR_ABORTED:
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "aborted") - errbuf;
+        break;
+
+    default:
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                      "unexpected err type: %d", pipe_ctx->err_type);
+        ngx_http_lua_assert(NULL);
+    }
+}
+
+
+static void
+ngx_http_lua_pipe_put_data(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx, u_char **buf, size_t *buf_size)
+{
+    size_t                   size = 0;
+    size_t                   chunk_size;
+    size_t                   nbufs;
+    u_char                  *p;
+    ngx_buf_t               *b;
+    ngx_chain_t             *cl;
+    ngx_chain_t            **ll;
+
+    nbufs = 0;
+    ll = NULL;
+
+    for (cl = pipe_ctx->bufs_in; cl; cl = cl->next) {
+        b = cl->buf;
+        chunk_size = b->last - b->pos;
+
+        if (cl->next) {
+            ll = &cl->next;
+        }
+
+        size += chunk_size;
+
+        nbufs++;
+    }
+
+    if (*buf_size < size) {
+        *buf = NULL;
+        *buf_size = size;
+
+        return;
+    }
+
+    *buf_size = size;
+
+    p = *buf;
+    for (cl = pipe_ctx->bufs_in; cl; cl = cl->next) {
+        b = cl->buf;
+        chunk_size = b->last - b->pos;
+        p = ngx_cpymem(p, b->pos, chunk_size);
+    }
+
+    if (nbufs > 1 && ll) {
+        *ll = pipe->free_bufs;
+        pipe->free_bufs = pipe_ctx->bufs_in;
+        pipe_ctx->bufs_in = pipe_ctx->buf_in;
+    }
+
+    if (pipe_ctx->buffer.pos == pipe_ctx->buffer.last) {
+        pipe_ctx->buffer.pos = pipe_ctx->buffer.start;
+        pipe_ctx->buffer.last = pipe_ctx->buffer.start;
+    }
+
+    if (pipe_ctx->bufs_in) {
+        pipe_ctx->buf_in->buf->last = pipe_ctx->buffer.pos;
+        pipe_ctx->buf_in->buf->pos = pipe_ctx->buffer.pos;
+    }
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_add_input_buffer(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx)
+{
+    ngx_chain_t             *cl;
+
+    cl = ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
+                                         &pipe->free_bufs,
+                                         pipe->buffer_size);
+
+    if (cl == NULL) {
+        pipe_ctx->err_type = PIPE_ERR_NOMEM;
+        return NGX_ERROR;
+    }
+
+    pipe_ctx->buf_in->next = cl;
+    pipe_ctx->buf_in = cl;
+    pipe_ctx->buffer = *cl->buf;
+
+    return NGX_OK;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_all(void *data, ssize_t bytes)
+{
+    ngx_http_lua_pipe_ctx_t      *pipe_ctx = data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "lua pipe read all");
+    return ngx_http_lua_read_all(&pipe_ctx->buffer, pipe_ctx->buf_in, bytes,
+                                 ngx_cycle->log);
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_bytes(void *data, ssize_t bytes)
+{
+    ngx_int_t                          rc;
+    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe read bytes %z", bytes);
+
+    rc = ngx_http_lua_read_bytes(&pipe_ctx->buffer, pipe_ctx->buf_in,
+                                 &pipe_ctx->rest, bytes, ngx_cycle->log);
+    if (rc == NGX_ERROR) {
+        pipe_ctx->err_type = PIPE_ERR_CLOSED;
+        return NGX_ERROR;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_line(void *data, ssize_t bytes)
+{
+    ngx_int_t                          rc;
+    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe read line");
+    rc = ngx_http_lua_read_line(&pipe_ctx->buffer, pipe_ctx->buf_in, bytes,
+                                ngx_cycle->log);
+    if (rc == NGX_ERROR) {
+        pipe_ctx->err_type = PIPE_ERR_CLOSED;
+        return NGX_ERROR;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read_any(void *data, ssize_t bytes)
+{
+    ngx_int_t                          rc;
+    ngx_http_lua_pipe_ctx_t           *pipe_ctx = data;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0, "lua pipe read any");
+    rc = ngx_http_lua_read_any(&pipe_ctx->buffer, pipe_ctx->buf_in,
+                               &pipe_ctx->rest, bytes, ngx_cycle->log);
+    if (rc == NGX_ERROR) {
+        pipe_ctx->err_type = PIPE_ERR_CLOSED;
+        return NGX_ERROR;
+    }
+
+    return rc;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_read(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx)
+{
+    int                                 rc;
+    int                                 read;
+    size_t                              size;
+    ssize_t                             n;
+    ngx_buf_t                          *b;
+    ngx_event_t                        *rev;
+    ngx_connection_t                   *c;
+
+    c = pipe_ctx->c;
+    rev = c->read;
+    b = &pipe_ctx->buffer;
+    read = 0;
+
+    for ( ;; ) {
+        size = b->last - b->pos;
+
+        if (size || pipe_ctx->eof) {
+            rc = pipe_ctx->input_filter(pipe_ctx->input_filter_ctx, size);
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            if (rc == NGX_OK) {
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                               "lua pipe read done pipe:%p", pipe_ctx);
+                return NGX_OK;
+            }
+
+            /* rc == NGX_AGAIN */
+            continue;
+        }
+
+        if (read && !rev->ready) {
+            break;
+        }
+
+        size = b->end - b->last;
+
+        if (size == 0) {
+            rc = ngx_http_lua_pipe_add_input_buffer(pipe, pipe_ctx);
+            if (rc == NGX_ERROR) {
+                return NGX_ERROR;
+            }
+
+            b = &pipe_ctx->buffer;
+            size = (size_t) (b->end - b->last);
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe try to read data %uz pipe:%p",
+                       size, pipe_ctx);
+
+        n = c->recv(c, b->last, size);
+        read = 1;
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe read data returned %z pipe:%p", n, pipe_ctx);
+
+        if (n == NGX_AGAIN) {
+            break;
+        }
+
+        if (n == 0) {
+            pipe_ctx->eof = 1;
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                           "lua pipe closed pipe:%p", pipe_ctx);
+            continue;
+        }
+
+        if (n == NGX_ERROR) {
+            ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, ngx_errno,
+                           "lua pipe read data error pipe:%p", pipe_ctx);
+
+            pipe_ctx->err_type = PIPE_ERR_SYSCALL;
+            pipe_ctx->pipe_errno = ngx_errno;
+            return NGX_ERROR;
+        }
+
+        b->last += n;
+    }
+
+    return NGX_AGAIN;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_init_ctx(ngx_http_lua_pipe_ctx_t **pipe_ctx_pt, int fd,
+    ngx_pool_t *pool, u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_connection_t                   *c;
+
+    if (fd == -1) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    *pipe_ctx_pt = ngx_pcalloc(pool, sizeof(ngx_http_lua_pipe_ctx_t));
+    if (*pipe_ctx_pt == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no memory")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    c = ngx_get_connection(fd, ngx_cycle->log);
+    if (c == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "no connection")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    c->log = ngx_cycle->log;
+    c->recv = ngx_http_lua_pipe_fd_read;
+    c->read->handler = ngx_http_lua_pipe_dummy_event_handler;
+    c->read->log = c->log;
+
+#ifdef HAVE_SOCKET_CLOEXEC_PATCH
+    c->read->skip_socket_leak_check = 1;
+#endif
+
+    c->send = ngx_http_lua_pipe_fd_write;
+    c->write->handler = ngx_http_lua_pipe_dummy_event_handler;
+    c->write->log = c->log;
+    (*pipe_ctx_pt)->c = c;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe init pipe ctx:%p fd:*%d", *pipe_ctx_pt, fd);
+
+    return NGX_OK;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_read(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, int from_stderr, int reader_type,
+    size_t length, u_char **buf, size_t *buf_size, u_char *errbuf,
+    size_t *errbuf_size)
+{
+    int                                 rc;
+    ngx_msec_t                          timeout;
+    ngx_event_t                        *rev;
+    ngx_connection_t                   *c;
+    ngx_http_lua_ctx_t                 *ctx;
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_co_ctx_t              *wait_co_ctx;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe read process:%p pid:%P", proc, proc->_pid);
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe->merge_stderr && from_stderr) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "merged to stdout")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (from_stderr) {
+        if (pipe->stderr_ctx == NULL) {
+            if (ngx_http_lua_pipe_init_ctx(&pipe->stderr_ctx, pipe->stderr_fd,
+                                           pipe->pool, errbuf,
+                                           errbuf_size)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+        } else {
+            pipe->stderr_ctx->err_type = 0;
+        }
+
+        pipe_ctx = pipe->stderr_ctx;
+
+    } else {
+        if (pipe->stdout_ctx == NULL) {
+            if (ngx_http_lua_pipe_init_ctx(&pipe->stdout_ctx, pipe->stdout_fd,
+                                           pipe->pool, errbuf,
+                                           errbuf_size)
+                != NGX_OK)
+            {
+                return NGX_ERROR;
+            }
+
+        } else {
+            pipe->stdout_ctx->err_type = 0;
+        }
+
+        pipe_ctx = pipe->stdout_ctx;
+    }
+
+    c = pipe_ctx->c;
+    if (c == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    rev = c->read;
+    if (rev->handler != ngx_http_lua_pipe_dummy_event_handler) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy reading")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    pipe_ctx->input_filter_ctx = pipe_ctx;
+
+    switch (reader_type) {
+
+    case PIPE_READ_ALL:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_all;
+        break;
+
+    case PIPE_READ_BYTES:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_bytes;
+        break;
+
+    case PIPE_READ_LINE:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_line;
+        break;
+
+    case PIPE_READ_ANY:
+        pipe_ctx->input_filter = ngx_http_lua_pipe_read_any;
+        break;
+
+    default:
+        ngx_log_error(NGX_LOG_ERR, ngx_cycle->log, 0,
+                      "unexpected reader_type: %d", reader_type);
+        ngx_http_lua_assert(NULL);
+    }
+
+    pipe_ctx->rest = length;
+
+    if (pipe_ctx->bufs_in == NULL) {
+        pipe_ctx->bufs_in =
+            ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
+                                            &pipe->free_bufs,
+                                            pipe->buffer_size);
+
+        if (pipe_ctx->bufs_in == NULL) {
+            pipe_ctx->err_type = PIPE_ERR_NOMEM;
+            goto error;
+        }
+
+        pipe_ctx->buf_in = pipe_ctx->bufs_in;
+        pipe_ctx->buffer = *pipe_ctx->buf_in->buf;
+    }
+
+    rc = ngx_http_lua_pipe_read(pipe, pipe_ctx);
+    if (rc == NGX_ERROR) {
+        goto error;
+    }
+
+    if (rc == NGX_OK) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        return NGX_OK;
+    }
+
+    /* rc == NGX_AGAIN */
+    wait_co_ctx = ctx->cur_co_ctx;
+
+    c->data = wait_co_ctx;
+    if (ngx_handle_read_event(rev, 0) != NGX_OK) {
+        pipe_ctx->err_type = PIPE_ERR_ADD_READ_EV;
+        goto error;
+    }
+
+    wait_co_ctx->data = proc;
+
+    if (from_stderr) {
+        rev->handler = ngx_http_lua_pipe_resume_read_stderr_handler;
+        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_read_stderr_cleanup;
+        timeout = proc->stderr_read_timeout;
+
+    } else {
+        rev->handler = ngx_http_lua_pipe_resume_read_stdout_handler;
+        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_read_stdout_cleanup;
+        timeout = proc->stdout_read_timeout;
+    }
+
+    if (timeout > 0) {
+        ngx_add_timer(rev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua pipe add timer for reading: %d(ms) process:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       rev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe read yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+
+error:
+
+    if (pipe_ctx->bufs_in) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+        return NGX_DECLINED;
+    }
+
+    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+
+    return NGX_ERROR;
+}
+
+
+/*
+ * ngx_http_lua_ffi_pipe_get_read_result should only be called just after
+ * ngx_http_lua_ffi_pipe_proc_read, so we omit most of the sanity check already
+ * done in ngx_http_lua_ffi_pipe_proc_read.
+ */
+int
+ngx_http_lua_ffi_pipe_get_read_result(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, int from_stderr, u_char **buf,
+    size_t *buf_size, u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe get read result process:%p pid:%P", proc,
+                   proc->_pid);
+
+    pipe = proc->pipe;
+    pipe_ctx = from_stderr ? pipe->stderr_ctx : pipe->stdout_ctx;
+
+    if (!pipe_ctx->err_type) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        return NGX_OK;
+    }
+
+    if (pipe_ctx->bufs_in) {
+        ngx_http_lua_pipe_put_data(pipe, pipe_ctx, buf, buf_size);
+        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+        return NGX_DECLINED;
+    }
+
+    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+
+    return NGX_ERROR;
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_write(ngx_http_lua_pipe_t *pipe,
+    ngx_http_lua_pipe_ctx_t *pipe_ctx)
+{
+    size_t                       size;
+    ngx_int_t                    n;
+    ngx_buf_t                   *b;
+    ngx_connection_t            *c;
+
+    c = pipe_ctx->c;
+    b = pipe_ctx->buf_in->buf;
+
+    for ( ;; ) {
+        size = b->last - b->pos;
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe try to write data %uz pipe:%p", size,
+                       pipe_ctx);
+
+        n = c->send(c, b->pos, size);
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe write returned %i pipe:%p", n, pipe_ctx);
+
+        if (n >= 0) {
+            b->pos += n;
+
+            if (b->pos == b->last) {
+                b->pos = b->start;
+                b->last = b->start;
+
+                if (!pipe->free_bufs) {
+                    pipe->free_bufs = pipe_ctx->buf_in;
+
+                } else {
+                    pipe->free_bufs->next = pipe_ctx->buf_in;
+                }
+
+                ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                               "lua pipe write done pipe:%p", pipe_ctx);
+                return NGX_OK;
+            }
+
+            continue;
+        }
+
+        /* NGX_ERROR || NGX_AGAIN */
+        break;
+    }
+
+    if (n == NGX_ERROR) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, ngx_errno,
+                       "lua pipe write data error pipe:%p", pipe_ctx);
+
+        if (ngx_errno == NGX_EPIPE) {
+            pipe_ctx->err_type = PIPE_ERR_CLOSED;
+
+        } else {
+            pipe_ctx->err_type = PIPE_ERR_SYSCALL;
+            pipe_ctx->pipe_errno = ngx_errno;
+        }
+
+        return NGX_ERROR;
+    }
+
+    return NGX_AGAIN;
+}
+
+
+ssize_t
+ngx_http_lua_ffi_pipe_proc_write(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, const u_char *data, size_t len,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    int                                 rc;
+    ngx_buf_t                          *b;
+    ngx_msec_t                          timeout;
+    ngx_chain_t                        *cl;
+    ngx_event_t                        *wev;
+    ngx_http_lua_ctx_t                 *ctx;
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_co_ctx_t              *wait_co_ctx;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe write process:%p pid:%P", proc, proc->_pid);
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe->stdin_ctx == NULL) {
+        if (ngx_http_lua_pipe_init_ctx(&pipe->stdin_ctx, pipe->stdin_fd,
+                                       pipe->pool, errbuf,
+                                       errbuf_size)
+            != NGX_OK)
+        {
+            return NGX_ERROR;
+        }
+
+    } else {
+        pipe->stdin_ctx->err_type = 0;
+    }
+
+    pipe_ctx = pipe->stdin_ctx;
+    if (pipe_ctx->c == NULL) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "closed") - errbuf;
+        return NGX_ERROR;
+    }
+
+    wev = pipe_ctx->c->write;
+    if (wev->handler != ngx_http_lua_pipe_dummy_event_handler) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy writing")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    pipe_ctx->rest = len;
+
+    cl = ngx_http_lua_chain_get_free_buf(ngx_cycle->log, pipe->pool,
+                                         &pipe->free_bufs, len);
+    if (cl == NULL) {
+        pipe_ctx->err_type = PIPE_ERR_NOMEM;
+        goto error;
+    }
+
+    pipe_ctx->buf_in = cl;
+    b = pipe_ctx->buf_in->buf;
+    b->last = ngx_copy(b->last, data, len);
+
+    rc = ngx_http_lua_pipe_write(pipe, pipe_ctx);
+    if (rc == NGX_ERROR) {
+        goto error;
+    }
+
+    if (rc == NGX_OK) {
+        return len;
+    }
+
+    /* rc == NGX_AGAIN */
+    wait_co_ctx = ctx->cur_co_ctx;
+    pipe_ctx->c->data = wait_co_ctx;
+
+    wev->handler = ngx_http_lua_pipe_resume_write_handler;
+    if (ngx_handle_write_event(wev, 0) != NGX_OK) {
+        pipe_ctx->err_type = PIPE_ERR_ADD_WRITE_EV;
+        goto error;
+    }
+
+    wait_co_ctx->data = proc;
+    wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_write_cleanup;
+    timeout = proc->write_timeout;
+
+    if (timeout > 0) {
+        ngx_add_timer(wev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua pipe add timer for writing: %d(ms) process:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       wev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe write yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+
+error:
+
+    ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+    return NGX_ERROR;
+}
+
+
+/*
+ * ngx_http_lua_ffi_pipe_get_write_result should only be called just after
+ * ngx_http_lua_ffi_pipe_proc_write, so we omit most of the sanity check
+ * already done in ngx_http_lua_ffi_pipe_proc_write.
+ */
+ssize_t
+ngx_http_lua_ffi_pipe_get_write_result(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_pipe_ctx_t            *pipe_ctx;
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe get write result process:%p pid:%P", proc,
+                   proc->_pid);
+
+    pipe = proc->pipe;
+    pipe_ctx = pipe->stdin_ctx;
+
+    if (pipe_ctx->err_type) {
+        ngx_http_lua_pipe_put_error(pipe_ctx, errbuf, errbuf_size);
+        return NGX_ERROR;
+    }
+
+    return pipe_ctx->rest;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_wait(ngx_http_request_t *r,
+    ngx_http_lua_ffi_pipe_proc_t *proc, char **reason, int *status,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    int                                 rc;
+    ngx_rbtree_node_t                  *node;
+    ngx_http_lua_ctx_t                 *ctx;
+    ngx_http_lua_pipe_t                *pipe;
+    ngx_http_lua_co_ctx_t              *wait_co_ctx;
+    ngx_http_lua_pipe_node_t           *pipe_node;
+
+    rc = ngx_http_lua_pipe_get_lua_ctx(r, &ctx, errbuf, errbuf_size);
+    if (rc != NGX_OK) {
+        return rc;
+    }
+
+    ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua pipe wait process:%p pid:%P", proc, proc->_pid);
+
+    pipe = proc->pipe;
+    if (pipe == NULL || pipe->closed) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited") - errbuf;
+        return NGX_ERROR;
+    }
+
+    node = pipe->node;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    if (pipe_node->wait_co_ctx) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "pipe busy waiting")
+                       - errbuf;
+        return NGX_ERROR;
+    }
+
+    if (pipe_node->reason_code == REASON_RUNNING_CODE) {
+        wait_co_ctx = ctx->cur_co_ctx;
+        wait_co_ctx->data = proc;
+        ngx_memzero(&wait_co_ctx->sleep, sizeof(ngx_event_t));
+        wait_co_ctx->sleep.handler = ngx_http_lua_pipe_resume_wait_handler;
+        wait_co_ctx->sleep.data = wait_co_ctx;
+        wait_co_ctx->sleep.log = r->connection->log;
+        wait_co_ctx->cleanup = ngx_http_lua_pipe_proc_wait_cleanup;
+
+        pipe_node->wait_co_ctx = wait_co_ctx;
+
+        if (proc->wait_timeout > 0) {
+            ngx_add_timer(&wait_co_ctx->sleep, proc->wait_timeout);
+            ngx_log_debug4(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                           "lua pipe add timer for waiting: %d(ms) process:%p "
+                           "pid:%P ev:%p", proc->wait_timeout, proc,
+                           proc->_pid, &wait_co_ctx->sleep);
+        }
+
+        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                       "lua pipe wait yielding process:%p pid:%P", proc,
+                       proc->_pid);
+
+        return NGX_AGAIN;
+    }
+
+    *status = pipe_node->status;
+
+    switch (pipe_node->reason_code) {
+
+    case REASON_EXIT_CODE:
+        *reason = REASON_EXIT;
+        break;
+
+    case REASON_SIGNAL_CODE:
+        *reason = REASON_SIGNAL;
+        break;
+
+    default:
+        *reason = REASON_UNKNOWN;
+    }
+
+    ngx_http_lua_pipe_proc_finalize(proc);
+
+    if (*status == 0) {
+        return NGX_OK;
+    }
+
+    return NGX_DECLINED;
+}
+
+
+int
+ngx_http_lua_ffi_pipe_proc_kill(ngx_http_lua_ffi_pipe_proc_t *proc, int signal,
+    u_char *errbuf, size_t *errbuf_size)
+{
+    ngx_pid_t                           pid;
+    ngx_http_lua_pipe_t                *pipe;
+
+    pipe = proc->pipe;
+
+    if (pipe == NULL || pipe->dead) {
+        *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited") - errbuf;
+        return NGX_ERROR;
+    }
+
+    pid = proc->_pid;
+
+    if (kill(pid, signal) == -1) {
+        switch (ngx_errno) {
+        case EINVAL:
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "invalid signal")
+                           - errbuf;
+            break;
+
+        case ESRCH:
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "exited")
+                           - errbuf;
+            break;
+
+        default:
+            *errbuf_size = ngx_snprintf(errbuf, *errbuf_size, "%s",
+                                        strerror(ngx_errno))
+                           - errbuf;
+        }
+
+        return NGX_ERROR;
+    }
+
+    return NGX_OK;
+}
+
+
+static int
+ngx_http_lua_pipe_read_stdout_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L)
+{
+    return ngx_http_lua_pipe_read_retval_helper(proc, L, 0);
+}
+
+
+static int
+ngx_http_lua_pipe_read_stderr_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L)
+{
+    return ngx_http_lua_pipe_read_retval_helper(proc, L, 1);
+}
+
+
+static int
+ngx_http_lua_pipe_read_retval_helper(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L, int from_stderr)
+{
+    int                              rc;
+    ngx_msec_t                       timeout;
+    ngx_event_t                     *rev;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_pipe_ctx_t         *pipe_ctx;
+
+    pipe = proc->pipe;
+    if (from_stderr) {
+        pipe_ctx = pipe->stderr_ctx;
+
+    } else {
+        pipe_ctx = pipe->stdout_ctx;
+    }
+
+    if (pipe->timeout) {
+        pipe->timeout = 0;
+        pipe_ctx->err_type = PIPE_ERR_TIMEOUT;
+        return 0;
+    }
+
+    if (pipe_ctx->err_type == PIPE_ERR_ABORTED) {
+        ngx_close_connection(pipe_ctx->c);
+        pipe_ctx->c = NULL;
+        return 0;
+    }
+
+    rc = ngx_http_lua_pipe_read(pipe, pipe_ctx);
+    if (rc != NGX_AGAIN) {
+        size_t buf_size = 4096;
+
+        while (1) {
+            u_char *buf, *p;
+
+            buf = ngx_pcalloc(pipe->pool, buf_size);
+            if (!buf) {
+                lua_pushnil(L);
+                lua_pushliteral(L, "no memory");
+                return 2;
+            }
+
+            p = buf;
+
+            ngx_http_lua_pipe_put_data(pipe, pipe_ctx, &p, &buf_size);
+            if (!p) {
+                ngx_pfree(pipe->pool, buf);
+                continue;
+            }
+
+            lua_pushlstring(L, (char *)buf, buf_size);
+            ngx_pfree(pipe->pool, buf);
+            break;
+        }
+        return 1;
+    }
+
+    rev = pipe_ctx->c->read;
+
+    if (from_stderr) {
+        rev->handler = ngx_http_lua_pipe_resume_read_stderr_handler;
+        timeout = proc->stderr_read_timeout;
+
+    } else {
+        rev->handler = ngx_http_lua_pipe_resume_read_stdout_handler;
+        timeout = proc->stdout_read_timeout;
+    }
+
+    if (timeout > 0) {
+        ngx_add_timer(rev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe add timer for reading: %d(ms) proc:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       rev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe read yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+}
+
+
+static int
+ngx_http_lua_pipe_write_retval(ngx_http_lua_ffi_pipe_proc_t *proc,
+    lua_State *L)
+{
+    int                              rc;
+    ngx_msec_t                       timeout;
+    ngx_event_t                     *wev;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_pipe_ctx_t         *pipe_ctx;
+
+    pipe = proc->pipe;
+    pipe_ctx = pipe->stdin_ctx;
+
+    if (pipe->timeout) {
+        pipe->timeout = 0;
+        pipe_ctx->err_type = PIPE_ERR_TIMEOUT;
+        return 0;
+    }
+
+    if (pipe_ctx->err_type == PIPE_ERR_ABORTED) {
+        ngx_close_connection(pipe_ctx->c);
+        pipe_ctx->c = NULL;
+        return 0;
+    }
+
+    rc = ngx_http_lua_pipe_write(pipe, pipe_ctx);
+    if (rc != NGX_AGAIN) {
+        return 0;
+    }
+
+    wev = pipe_ctx->c->write;
+    wev->handler = ngx_http_lua_pipe_resume_write_handler;
+    timeout = proc->write_timeout;
+
+    if (timeout > 0) {
+        ngx_add_timer(wev, timeout);
+        ngx_log_debug5(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                       "lua pipe add timer for writing: %d(ms) proc:%p "
+                       "pid:%P pipe:%p ev:%p", timeout, proc, proc->_pid, pipe,
+                       wev);
+    }
+
+    ngx_log_debug3(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe write yielding process:%p pid:%P pipe:%p", proc,
+                   proc->_pid, pipe);
+
+    return NGX_AGAIN;
+}
+
+
+static int
+ngx_http_lua_pipe_wait_retval(ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L)
+{
+    int                              nret;
+    ngx_rbtree_node_t               *node;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_pipe_node_t        *pipe_node;
+
+    pipe = proc->pipe;
+    node = pipe->node;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    pipe_node->wait_co_ctx = NULL;
+
+    if (pipe->timeout) {
+        pipe->timeout = 0;
+        lua_pushnil(L);
+        lua_pushliteral(L, "timeout");
+        return 2;
+    }
+
+    ngx_http_lua_pipe_proc_finalize(pipe_node->proc);
+
+    if (pipe_node->status == 0) {
+        lua_pushboolean(L, 1);
+        lua_pushliteral(L, REASON_EXIT);
+        lua_pushinteger(L, pipe_node->status);
+        nret = 3;
+
+    } else {
+        lua_pushboolean(L, 0);
+
+        switch (pipe_node->reason_code) {
+
+        case REASON_EXIT_CODE:
+            lua_pushliteral(L, REASON_EXIT);
+            break;
+
+        case REASON_SIGNAL_CODE:
+            lua_pushliteral(L, REASON_SIGNAL);
+            break;
+
+        default:
+            lua_pushliteral(L, REASON_UNKNOWN);
+        }
+
+        lua_pushinteger(L, pipe_node->status);
+        nret = 3;
+    }
+
+    return nret;
+}
+
+
+static void
+ngx_http_lua_pipe_resume_helper(ngx_event_t *ev,
+    ngx_http_lua_co_ctx_t *wait_co_ctx)
+{
+    ngx_connection_t                *c;
+    ngx_http_request_t              *r;
+    ngx_http_lua_ctx_t              *ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    if (ev->timedout) {
+        proc = wait_co_ctx->data;
+        pipe = proc->pipe;
+        pipe->timeout = 1;
+        ev->timedout = 0;
+    }
+
+    ngx_http_lua_pipe_clear_event(ev);
+
+    r = ngx_http_lua_get_req(wait_co_ctx->co);
+    c = r->connection;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    ngx_http_lua_assert(ctx != NULL);
+
+    ctx->cur_co_ctx = wait_co_ctx;
+
+    if (ctx->entered_content_phase) {
+        (void) ngx_http_lua_pipe_resume(r);
+
+    } else {
+        ctx->resume_handler = ngx_http_lua_pipe_resume;
+        ngx_http_core_run_phases(r);
+    }
+
+    ngx_http_run_posted_requests(c);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_read_stdout_handler(ngx_event_t *ev)
+{
+    ngx_connection_t                *c = ev->data;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    wait_co_ctx = c->data;
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_read_stdout_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_read_stderr_handler(ngx_event_t *ev)
+{
+    ngx_connection_t                *c = ev->data;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    wait_co_ctx = c->data;
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_read_stderr_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_write_handler(ngx_event_t *ev)
+{
+    ngx_connection_t                *c = ev->data;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    wait_co_ctx = c->data;
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_write_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static void
+ngx_http_lua_pipe_resume_wait_handler(ngx_event_t *ev)
+{
+    ngx_http_lua_co_ctx_t           *wait_co_ctx = ev->data;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    proc = wait_co_ctx->data;
+    pipe = proc->pipe;
+    pipe->retval_handler = ngx_http_lua_pipe_wait_retval;
+    ngx_http_lua_pipe_resume_helper(ev, wait_co_ctx);
+}
+
+
+static ngx_int_t
+ngx_http_lua_pipe_resume(ngx_http_request_t *r)
+{
+    int                              nret;
+    lua_State                       *vm;
+    ngx_int_t                        rc;
+    ngx_uint_t                       nreqs;
+    ngx_connection_t                *c;
+    ngx_http_lua_ctx_t              *ctx;
+    ngx_http_lua_pipe_t             *pipe;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+
+    ctx = ngx_http_get_module_ctx(r, ngx_http_lua_module);
+    if (ctx == NULL) {
+        return NGX_ERROR;
+    }
+
+    ctx->resume_handler = ngx_http_lua_wev_handler;
+    ctx->cur_co_ctx->cleanup = NULL;
+
+    proc = ctx->cur_co_ctx->data;
+    pipe = proc->pipe;
+    nret = pipe->retval_handler(proc, ctx->cur_co_ctx->co);
+    if (nret == NGX_AGAIN) {
+        return NGX_DONE;
+    }
+
+    c = r->connection;
+    vm = ngx_http_lua_get_lua_vm(r, ctx);
+    nreqs = c->requests;
+
+    rc = ngx_http_lua_run_thread(vm, r, ctx, nret);
+
+    ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
+                   "lua run thread returned %d", rc);
+
+    if (rc == NGX_AGAIN) {
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
+    }
+
+    if (rc == NGX_DONE) {
+        ngx_http_lua_finalize_request(r, NGX_DONE);
+        return ngx_http_lua_run_posted_threads(c, vm, r, ctx, nreqs);
+    }
+
+    /* rc == NGX_ERROR || rc >= NGX_OK */
+
+    if (ctx->entered_content_phase) {
+        ngx_http_lua_finalize_request(r, rc);
+        return NGX_DONE;
+    }
+
+    return rc;
+}
+
+
+static void
+ngx_http_lua_pipe_dummy_event_handler(ngx_event_t *ev)
+{
+    /* do nothing */
+}
+
+
+static void
+ngx_http_lua_pipe_clear_event(ngx_event_t *ev)
+{
+    ev->handler = ngx_http_lua_pipe_dummy_event_handler;
+
+    if (ev->timer_set) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
+                       "lua pipe del timer for ev:%p", ev);
+        ngx_del_timer(ev);
+    }
+
+    if (ev->posted) {
+        ngx_log_debug1(NGX_LOG_DEBUG_HTTP, ev->log, 0,
+                       "lua pipe del posted event for ev:%p", ev);
+        ngx_delete_posted_event(ev);
+    }
+}
+
+
+static void
+ngx_http_lua_pipe_proc_read_stdout_cleanup(void *data)
+{
+    ngx_event_t                    *rev;
+    ngx_connection_t               *c;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc read stdout cleanup");
+
+    proc = wait_co_ctx->data;
+    c = proc->pipe->stdout_ctx->c;
+    if (c) {
+        rev = c->read;
+        ngx_http_lua_pipe_clear_event(rev);
+    }
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_read_stderr_cleanup(void *data)
+{
+    ngx_event_t                    *rev;
+    ngx_connection_t               *c;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc read stderr cleanup");
+
+    proc = wait_co_ctx->data;
+    c = proc->pipe->stderr_ctx->c;
+    if (c) {
+        rev = c->read;
+        ngx_http_lua_pipe_clear_event(rev);
+    }
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_write_cleanup(void *data)
+{
+    ngx_event_t                    *wev;
+    ngx_connection_t               *c;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc write cleanup");
+
+    proc = wait_co_ctx->data;
+    c = proc->pipe->stdin_ctx->c;
+    if (c) {
+        wev = c->write;
+        ngx_http_lua_pipe_clear_event(wev);
+    }
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+
+static void
+ngx_http_lua_pipe_proc_wait_cleanup(void *data)
+{
+    ngx_rbtree_node_t              *node;
+    ngx_http_lua_co_ctx_t          *wait_co_ctx = data;
+    ngx_http_lua_pipe_node_t       *pipe_node;
+    ngx_http_lua_ffi_pipe_proc_t   *proc;
+
+    ngx_log_debug0(NGX_LOG_DEBUG_HTTP, ngx_cycle->log, 0,
+                   "lua pipe proc wait cleanup");
+
+    proc = wait_co_ctx->data;
+    node = proc->pipe->node;
+    pipe_node = (ngx_http_lua_pipe_node_t *) &node->color;
+    pipe_node->wait_co_ctx = NULL;
+
+    ngx_http_lua_pipe_clear_event(&wait_co_ctx->sleep);
+
+    wait_co_ctx->cleanup = NULL;
+}
+
+static int lua_table_array_cnt(lua_State *L, int idx)
+{
+    int n = 0;
+
+    if (idx < 0)
+        idx = lua_gettop(L) + idx + 1;
+
+    if (!lua_istable(L, idx))
+        return 0;
+
+    lua_pushnil(L); /* stack: table key */
+
+    while (lua_next(L, idx)) { /* stack: table key value */
+        if (lua_type(L, -2) == LUA_TNUMBER) {
+            lua_Number idx = lua_tonumber(L, -2);
+            if (floor(idx) != idx || idx != n + 1)
+                goto non_array;
+            n++;
+            lua_pop(L, 1); /* stack: table key */
+            continue;
+        }
+non_array:
+        lua_pop(L, 2);
+        break;
+    }
+
+    return n;
+}
+
+static void ngx_http_lua_ngx_pipe_set_opt(lua_State *L, int idx, const char *name, int *val)
+{
+    lua_getfield(L, idx, name);
+    if (!lua_isnil(L, -1))
+        *val = lua_tointeger(L, -1);
+    lua_pop(L, 1);
+}
+
+static int ngx_http_lua_ngx_pipe_spawn(lua_State *L)
+{
+    ngx_http_lua_ffi_pipe_proc_t *proc;
+    int merge_stderr = 0;
+    int buffer_size = 4096;
+    int write_timeout = 10000;
+    int stdout_read_timeout = 10000;
+    int stderr_read_timeout = 10000;
+    int wait_timeout = 10000;
+    const char **args = NULL, **envs = NULL;
+    u_char errbuf[512] = "";
+    size_t errbuf_size = sizeof(errbuf);
+    ngx_http_request_t *r;
+    int rc = 1;
+
+    r = ngx_http_lua_get_req(L);
+    if (!r)
+        return luaL_error(L, "no request found");
+
+    if (lua_istable(L, 1)) {
+        int nargs = lua_table_array_cnt(L, 1);
+
+        if (nargs == 0)
+            return luaL_error(L, "bad args arg: non-empty table expected");
+
+        args = ngx_pcalloc(r->pool, sizeof(char *) * (nargs + 1));
+
+        for (int i = 0; i < nargs; i++) {
+            lua_rawgeti(L, 1, i + 1);
+            args[i] = lua_tostring(L, -1);
+            lua_pop(L, 1);
+        }
+    } else if (lua_isstring(L, 1)) {
+        args = ngx_pcalloc(r->pool, sizeof(char *) * 4);
+        args[0] = "/bin/sh";
+        args[1] = "-c";
+        args[2] = lua_tostring(L, 1);
+    } else {
+        return luaL_error(L, "bad args arg: table expected, got '%s'", lua_typename(L, lua_type(L, 1)));
+    }
+
+    if (lua_istable(L, 2)) {
+        lua_getfield(L, 2, "merge_stderr");
+        merge_stderr = lua_toboolean(L, -1);
+        lua_pop(L, 1);
+
+        ngx_http_lua_ngx_pipe_set_opt(L, 2, "buffer_size", &buffer_size);
+        ngx_http_lua_ngx_pipe_set_opt(L, 2, "write_timeout", &write_timeout);
+        ngx_http_lua_ngx_pipe_set_opt(L, 2, "stdout_read_timeout", &stdout_read_timeout);
+        ngx_http_lua_ngx_pipe_set_opt(L, 2, "stderr_read_timeout", &stderr_read_timeout);
+        ngx_http_lua_ngx_pipe_set_opt(L, 2, "wait_timeout", &wait_timeout);
+
+        lua_getfield(L, 2, "environ");
+        if (lua_istable(L, -1)) {
+            int nenv = lua_table_array_cnt(L, -1);
+
+            envs = ngx_pcalloc(r->pool, sizeof(char *) * (nenv + 1));
+
+            for (int i = 0; i < nenv; i++) {
+                lua_rawgeti(L, -1, i + 1);
+                envs[i] = lua_tostring(L, -1);
+                lua_pop(L, 1);
+            }
+        }
+        lua_pop(L, 1);
+    }
+
+    proc = lua_newuserdata(L, sizeof(ngx_http_lua_ffi_pipe_proc_t));
+    if (!proc) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "no memory");
+        rc = 2;
+        goto free_mem;
+    }
+
+    proc->write_timeout = write_timeout;
+    proc->stdout_read_timeout = stdout_read_timeout;
+    proc->stderr_read_timeout = stderr_read_timeout;
+    proc->wait_timeout = wait_timeout;
+
+    lua_pushlightuserdata(L, &ngx_http_lua_proc_metatable_key);
+    lua_rawget(L, LUA_REGISTRYINDEX);
+    lua_setmetatable(L, -2);
+
+    rc = ngx_http_lua_ffi_pipe_spawn(proc, args[0], args, merge_stderr, buffer_size, envs,
+            errbuf, &errbuf_size);
+    if (rc != NGX_OK) {
+        lua_pushnil(L);
+        lua_pushlstring(L, (char *)errbuf, errbuf_size);
+        rc = 2;
+    } else {
+        rc = 1;
+    }
+
+free_mem:
+    if (args)
+        ngx_pfree(r->pool, args);
+    if (envs)
+        ngx_pfree(r->pool, envs);
+    return rc;
+}
+
+static int ngx_http_lua_proc_pid(lua_State *L)
+{
+    ngx_http_lua_ffi_pipe_proc_t *proc = lua_touserdata(L, 1);
+
+    lua_pushinteger(L, proc->_pid);
+    return 1;
+}
+
+static int ngx_http_lua_proc_wait(lua_State *L)
+{
+    ngx_http_lua_ffi_pipe_proc_t *proc = lua_touserdata(L, 1);
+    ngx_http_request_t *r;
+    char *reason;
+    int status;
+    u_char errbuf[128] = "";
+    size_t errbuf_size = sizeof(errbuf);
+    int rc;
+
+    r = ngx_http_lua_get_req(L);
+    if (!r)
+        return luaL_error(L, "no request found");
+
+    rc = ngx_http_lua_ffi_pipe_proc_wait(r, proc, &reason, &status, errbuf, &errbuf_size);
+    switch (rc) {
+    case NGX_OK:
+        lua_pushboolean(L, 1);
+        lua_pushstring(L, reason);
+        lua_pushinteger(L, status);
+        return 3;
+    case NGX_DECLINED:
+        lua_pushboolean(L, 0);
+        lua_pushstring(L, reason);
+        lua_pushinteger(L, status);
+        return 3;
+    case NGX_ERROR:
+        lua_pushnil(L);
+        lua_pushlstring(L, (char *)errbuf, errbuf_size);
+        return 2;
+    default:
+        return lua_yield(L, 0);
+    }
+}
+
+static int ngx_http_lua_proc_kill(lua_State *L)
+{
+    ngx_http_lua_ffi_pipe_proc_t *proc = lua_touserdata(L, 1);
+    u_char errbuf[128] = "";
+    size_t errbuf_size = sizeof(errbuf);
+    int signal;
+    int rc;
+
+    signal = luaL_checkinteger(L, 2);
+
+    rc = ngx_http_lua_ffi_pipe_proc_kill(proc, signal, errbuf, &errbuf_size);
+    if (rc == NGX_OK) {
+        lua_pushnil(L);
+        lua_pushlstring(L, (char *)errbuf, errbuf_size);
+        return 2;
+    }
+
+    lua_pushboolean(L, 1);
+    return 1;
+}
+
+static int ngx_http_lua_proc_read(lua_State *L, int from_stderr, int reader_type)
+{
+    ngx_http_lua_ffi_pipe_proc_t *proc = lua_touserdata(L, 1);
+    ssize_t len = lua_tointeger(L, 2);
+    ngx_http_lua_pipe_ctx_t *pipe_ctx;
+    ngx_http_request_t *r;
+    u_char *buf, *p;
+    size_t buf_size = 4096;
+    u_char errbuf[128] = "";
+    size_t errbuf_size = sizeof(errbuf);
+    int rc;
+
+    switch (reader_type) {
+    case PIPE_READ_BYTES:
+        if (len <= 0) {
+            if (len < 0)
+                return luaL_error(L, "bad len argument");
+            lua_pushliteral(L, "");
+            return 1;
+        }
+        break;
+    case PIPE_READ_ANY:
+        if (len <= 0)
+            return luaL_error(L, "bad max argument");
+        break;
+    default:
+        len = 0;
+        break;
+    }
+
+    r = ngx_http_lua_get_req(L);
+    if (!r)
+        return luaL_error(L, "no request found");
+
+    buf = ngx_pcalloc(proc->pipe->pool, buf_size);
+    p = buf;
+
+    if (!p) {
+        lua_pushnil(L);
+        lua_pushliteral(L, "no memory");
+        return 2;
+    }
+
+    rc = ngx_http_lua_ffi_pipe_proc_read(r, proc, from_stderr, reader_type, len, &p,
+                                                    &buf_size, errbuf,
+                                                    &errbuf_size);
+    if (rc == NGX_OK || rc == NGX_DECLINED) {
+        if (!p) {
+            if (from_stderr)
+                pipe_ctx = proc->pipe->stderr_ctx;
+            else
+                pipe_ctx = proc->pipe->stdout_ctx;
+
+            ngx_pfree(proc->pipe->pool, buf);
+
+            buf = ngx_pcalloc(proc->pipe->pool, buf_size);
+            if (!buf) {
+                lua_pushnil(L);
+                lua_pushliteral(L, "no memory");
+                return 2;
+            }
+            ngx_http_lua_pipe_put_data(proc->pipe, pipe_ctx, &buf, &buf_size);
+        }
+
+        if (rc == NGX_OK) {
+            lua_pushlstring(L, (char *)buf, buf_size);
+            ngx_pfree(proc->pipe->pool, buf);
+            return 1;
+        }
+
+        lua_pushnil(L);
+        lua_pushlstring(L, (char *)errbuf, errbuf_size);
+        lua_pushlstring(L, (char *)buf, buf_size);
+        ngx_pfree(proc->pipe->pool, buf);
+        return 3;
+    }
+
+    if (rc == NGX_ERROR) {
+        lua_pushnil(L);
+        lua_pushlstring(L, (char *)errbuf, errbuf_size);
+        ngx_pfree(proc->pipe->pool, buf);
+        return 2;
+    }
+
+    ngx_pfree(proc->pipe->pool, buf);
+
+    return lua_yield(L, 0);
+}
+
+#define NGX_LUA_PIPE_DEF_READ_FUN(name, from_stderr, reader_type)   \
+    static int ngx_http_lua_proc_##name(lua_State *L)               \
+    {                                                               \
+        return ngx_http_lua_proc_read(L, from_stderr, reader_type); \
+    }
+
+NGX_LUA_PIPE_DEF_READ_FUN(stdout_read_all, 0, PIPE_READ_ALL)
+NGX_LUA_PIPE_DEF_READ_FUN(stdout_read_bytes, 0, PIPE_READ_BYTES)
+NGX_LUA_PIPE_DEF_READ_FUN(stdout_read_line, 0, PIPE_READ_LINE)
+NGX_LUA_PIPE_DEF_READ_FUN(stdout_read_any, 0, PIPE_READ_ANY)
+
+NGX_LUA_PIPE_DEF_READ_FUN(stderr_read_all, 1, PIPE_READ_ALL)
+NGX_LUA_PIPE_DEF_READ_FUN(stderr_read_bytes, 1, PIPE_READ_BYTES)
+NGX_LUA_PIPE_DEF_READ_FUN(stderr_read_line, 1, PIPE_READ_LINE)
+NGX_LUA_PIPE_DEF_READ_FUN(stderr_read_any, 1, PIPE_READ_ANY)
+
+#define NGX_LUA_PIPE_ADD_FUN(name)                 \
+    do {                                                \
+        lua_pushcfunction(L, ngx_http_lua_proc_##name); \
+        lua_setfield(L, -2, #name);                      \
+    } while (0)
+
+static void
+ngx_http_lua_ffi_pipe_proc_destroy(lua_State *L)
+{
+    ngx_http_lua_ffi_pipe_proc_t *proc = lua_touserdata(L, 1);
+    ngx_http_lua_pipe_t          *pipe;
+
+    pipe = proc->pipe;
+    if (pipe == NULL) {
+        return;
+    }
+
+    ngx_http_lua_pipe_proc_finalize(proc);
+    ngx_destroy_pool(pipe->pool);
+    proc->pipe = NULL;
+}
+
+void ngx_http_lua_inject_pipe_api(lua_State *L)
+{
+    lua_createtable(L, 0 /* narr */, 1 /* nrec */);    /* ngx.pipe. */
+
+    lua_pushcfunction(L, ngx_http_lua_ngx_pipe_spawn);
+    lua_setfield(L, -2, "spawn");
+
+    lua_setfield(L, -2, "pipe");
+
+    /* {{{proc object metatable */
+    lua_pushlightuserdata(L, &ngx_http_lua_proc_metatable_key);
+
+    lua_createtable(L, 0 /* narr */, 3 /* nrec */); /* mt */
+
+    lua_pushcfunction(L, ngx_http_lua_ffi_pipe_proc_destroy);
+    lua_setfield(L, -2, "__gc");
+
+    lua_createtable(L, 0 /* narr */, 11 /* nrec */); /* __index */
+
+    NGX_LUA_PIPE_ADD_FUN(pid);
+    NGX_LUA_PIPE_ADD_FUN(wait);
+    NGX_LUA_PIPE_ADD_FUN(kill);
+    NGX_LUA_PIPE_ADD_FUN(stdout_read_all);
+    NGX_LUA_PIPE_ADD_FUN(stdout_read_bytes);
+    NGX_LUA_PIPE_ADD_FUN(stdout_read_line);
+    NGX_LUA_PIPE_ADD_FUN(stdout_read_any);
+    NGX_LUA_PIPE_ADD_FUN(stderr_read_all);
+    NGX_LUA_PIPE_ADD_FUN(stderr_read_bytes);
+    NGX_LUA_PIPE_ADD_FUN(stderr_read_line);
+    NGX_LUA_PIPE_ADD_FUN(stderr_read_any);
+
+    lua_setfield(L, -2, "__index");
+
+    lua_rawset(L, LUA_REGISTRYINDEX);
+    /* }}} */
+}
+
+#endif /* HAVE_NGX_LUA_PIPE */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/nginx/src/lua-nginx/src/ngx_http_lua_pipe.h b/nginx/src/lua-nginx/src/ngx_http_lua_pipe.h
new file mode 100644
index 00000000..ecb86c88
--- /dev/null
+++ b/nginx/src/lua-nginx/src/ngx_http_lua_pipe.h
@@ -0,0 +1,94 @@
+
+/*
+ * Copyright (C) by OpenResty Inc.
+ */
+
+
+#ifndef _NGX_HTTP_LUA_PIPE_H_INCLUDED_
+#define _NGX_HTTP_LUA_PIPE_H_INCLUDED_
+
+
+#include "ngx_http_lua_common.h"
+
+
+typedef ngx_int_t (*ngx_http_lua_pipe_input_filter)(void *data, ssize_t bytes);
+
+
+typedef struct {
+    ngx_connection_t                   *c;
+    ngx_http_lua_pipe_input_filter      input_filter;
+    void                               *input_filter_ctx;
+    size_t                              rest;
+    ngx_chain_t                        *buf_in;
+    ngx_chain_t                        *bufs_in;
+    ngx_buf_t                           buffer;
+    ngx_err_t                           pipe_errno;
+    unsigned                            err_type:16;
+    unsigned                            eof:1;
+} ngx_http_lua_pipe_ctx_t;
+
+
+typedef struct ngx_http_lua_pipe_s  ngx_http_lua_pipe_t;
+
+
+typedef struct {
+    ngx_pid_t               _pid;
+    ngx_msec_t              write_timeout;
+    ngx_msec_t              stdout_read_timeout;
+    ngx_msec_t              stderr_read_timeout;
+    ngx_msec_t              wait_timeout;
+    /* pipe hides the implementation from the Lua binding */
+    ngx_http_lua_pipe_t    *pipe;
+} ngx_http_lua_ffi_pipe_proc_t;
+
+
+typedef int (*ngx_http_lua_pipe_retval_handler)(
+    ngx_http_lua_ffi_pipe_proc_t *proc, lua_State *L);
+
+
+struct ngx_http_lua_pipe_s {
+    ngx_pool_t                         *pool;
+    ngx_chain_t                        *free_bufs;
+    ngx_rbtree_node_t                  *node;
+    int                                 stdin_fd;
+    int                                 stdout_fd;
+    int                                 stderr_fd;
+    ngx_http_lua_pipe_ctx_t            *stdin_ctx;
+    ngx_http_lua_pipe_ctx_t            *stdout_ctx;
+    ngx_http_lua_pipe_ctx_t            *stderr_ctx;
+    ngx_http_lua_pipe_retval_handler    retval_handler;
+    size_t                              buffer_size;
+    unsigned                            closed:1;
+    unsigned                            dead:1;
+    unsigned                            timeout:1;
+    unsigned                            merge_stderr:1;
+};
+
+
+typedef struct {
+    u_char                           color;
+    u_char                           reason_code;
+    int                              status;
+    ngx_http_lua_co_ctx_t           *wait_co_ctx;
+    ngx_http_lua_ffi_pipe_proc_t    *proc;
+} ngx_http_lua_pipe_node_t;
+
+
+typedef struct {
+    int     signo;
+    char   *signame;
+} ngx_http_lua_pipe_signal_t;
+
+
+#if !(NGX_WIN32) && defined(HAVE_SOCKET_CLOEXEC_PATCH)
+#define HAVE_NGX_LUA_PIPE   1
+
+
+void ngx_http_lua_pipe_init(void);
+ngx_int_t ngx_http_lua_pipe_add_signal_handler(ngx_cycle_t *cycle);
+#endif
+
+
+#endif /* _NGX_HTTP_LUA_PIPE_H_INCLUDED_ */
+
+/* vi:set ft=c ts=4 sw=4 et fdm=marker: */
diff --git a/ot-br-posix/.gitignore b/ot-br-posix/.gitignore
new file mode 100644
index 00000000..722d5e71
--- /dev/null
+++ b/ot-br-posix/.gitignore
@@ -0,0 +1 @@
+.vscode
diff --git a/ot-br-posix/Makefile b/ot-br-posix/Makefile
new file mode 100644
index 00000000..988de0f5
--- /dev/null
+++ b/ot-br-posix/Makefile
@@ -0,0 +1,171 @@
+#
+#  Copyright (c) 2020, The OpenThread Authors.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of the copyright holder nor the
+#     names of its contributors may be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
+
+include $(TOPDIR)/rules.mk
+include version.mk
+
+PKG_NAME := ot-br-posix
+PKG_LICENSE := BSD-3-Clause
+PKG_LICENSE_FILES := LICENSE
+PKG_SOURCE_VERSION:=2ed96e74f99610d98209c3857b886e683c9f2a56
+PKG_VERSION:=2023-7-12-r4.3.1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/lancersky/ot-br-posix.git
+PKG_MIRROR_HASH:=02b86cb2d007fb9b2f7ee05849ca70214ca8aa8ae38a8b69573083b0ea41369c
+PKG_RELEASE:=$(strip $(call findrev))
+PKG_USE_MIPS16:=0
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_OTBR_WEB \
+	CONFIG_OTBR_TTY_DRIVER_CH343 \
+	CONFIG_OTBR_TTY_DRIVER_CDC_ACM
+	
+TARGET_CFLAGS += \
+	-DOPENTHREAD_POSIX_CONFIG_DAEMON_SOCKET_BASENAME=\\\"/var/run/openthread-%s\\\" \
+	-DOPENTHREAD_CONFIG_COMMISSIONER_MAX_JOINER_ENTRIES=100 \
+	-DOPENTHREAD_CONFIG_PLATFORM_RADIO_SPINEL_RX_FRAME_BUFFER_SIZE=10240 \
+	-DOPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS=8192 \
+	-DOPENTHREAD_CONFIG_MLE_MAX_CHILDREN=100 \
+	-DOPENTHREAD_CONFIG_TMF_ADDRESS_CACHE_ENTRIES=256 \
+	-DOPENTHREAD_CONFIG_TCP_ENABLE=0 \
+	-DOPENTHREAD_CONFIG_OPENWRT_EXTENSION=1
+
+define Package/ot-br-posix
+	SECTION := base
+	CATEGORY := Network
+	TITLE := OpenThread Border Router
+	DEPENDS := +libstdcpp +libjson-c +libubus +libblobmsg-json +libreadline +libuci +mdnsresponder +libnetfilter-queue \
+			   +kmod-ipt-nat6 +kmod-tun +iptables-mod-extra +ipset +kmod-usb-serial \
+			   +OTBR_WEB:jsoncpp +OTBR_WEB:boost +OTBR_WEB:boost-filesystem +OTBR_WEB:boost-system
+	MENU:=1
+endef
+
+define Package/ot-br-posix/config
+menu "Configuration"
+	depends on PACKAGE_$(1)
+
+config OTBR_WEB
+	bool "Enable OTBR_WEB"
+	default n
+
+config OTBR_TTY_DRIVER_CH343
+	bool "USB to UART Converter Driver - CH343"
+	select PACKAGE_kmod-usb-serial-ch343
+
+config OTBR_TTY_DRIVER_CDC_ACM
+	bool "USB to UART Converter Driver - CDC_ACM"
+	select PACKAGE_kmod-usb-acm
+endmenu
+endef
+
+define Package/ot-br-posix/conffiles
+/etc/openthread/
+endef
+
+define Package/ot-br-posix/description
+    A Thread border router for POSIX-based platforms.
+endef
+
+CMAKE_OPTIONS += \
+	-DBUILD_TESTING=OFF \
+	-DOT_PACKAGE_NAME=${PKG_NAME} \
+	-DOT_PACKAGE_VERSION=${PKG_VERSION} \
+	-DCMAKE_INSTALL_PREFIX=/usr \
+	-DCMAKE_INSTALL_FULL_DATADIR=/usr/share \
+	-DOT_POSIX_SETTINGS_PATH=\"/etc/openthread\" \
+	-DOT_THREAD_VERSION=1.3 \
+	-DOTBR_MDNS=mDNSResponder \
+	-DOT_READLINE=readline \
+	-DOTBR_BACKBONE_ROUTER=ON \
+	-DOTBR_BORDER_ROUTING=ON \
+	-DOTBR_DUA_ROUTING=ON \
+	-DOTBR_OPENWRT=ON \
+	-DOTBR_REST=ON \
+	-DOT_FIREWALL=ON \
+	-DOTBR_SRP_ADVERTISING_PROXY=ON \
+	-DOTBR_DNSSD_DISCOVERY_PROXY=ON \
+	-DOT_DNS_CLIENT=ON \
+	-DOT_LOG_LEVEL=INFO \
+	-DOT_RCP_RESTORATION_MAX_COUNT=5 \
+	-DOT_REFERENCE_DEVICE=ON \
+	-DOTBR_NAT64=ON \
+	-DOT_DIAGNOSTIC=OFF
+
+ifdef CONFIG_OTBR_WEB
+	CMAKE_OPTIONS += -DOTBR_WEB=ON -DOTBR_REST=ON
+endif
+
+ifeq ($(CONFIG_TARGET_ath79_nand_DEVICE_glinet_gl-s200-nor-nand),y)
+	CMAKE_OPTIONS += -DOTBR_MESHCOP_SERVICE_INSTANCE_NAME="GL.iNET S200" -DOTBR_VENDOR_NAME="GL.iNET Inc." -DOTBR_PRODUCT_NAME="S200"
+else ifeq ($(CONFIG_TARGET_mediatek_filogic_DEVICE_glinet_gl-mt6000),y)
+	CMAKE_OPTIONS += -DOTBR_MESHCOP_SERVICE_INSTANCE_NAME="GL.iNET MT6000" -DOTBR_VENDOR_NAME="GL.iNET Inc." -DOTBR_PRODUCT_NAME="MT6000"
+endif
+
+define Package/ot-br-posix/install
+	$(INSTALL_DIR) $(1)/etc/openthread
+	$(FIND) files/ -name "*.gbl" -exec $(CP) {} $(1)/etc/openthread \;
+
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/pskc $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/tools/steering-data $(1)/usr/sbin
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) files/etc/init.d/otbr-agent $(1)/etc/init.d/otbr-agent
+	$(INSTALL_BIN) files/etc/init.d/otbr-firewall $(1)/etc/init.d/otbr-firewall
+
+	$(INSTALL_DIR) $(1)/etc/config
+	$(CP) files/etc/config/otbr $(1)/etc/config
+
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults
+	
+ifdef CONFIG_OTBR_WEB
+	# Nest Thread Web
+	$(CP) files/etc/init.d/otbr-web $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/usr/share/otbr-web
+	$(CP) $(PKG_INSTALL_DIR)/usr/share/otbr-web/* $(1)/usr/share/otbr-web/
+endif
+	# LUCI Thread Web
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller/admin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/openwrt/controller/thread.lua $(1)/usr/lib/lua/luci/controller/admin
+
+	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/view
+	$(CP) $(PKG_BUILD_DIR)/src/openwrt/view/admin_thread $(1)/usr/lib/lua/luci/view
+
+	$(INSTALL_DIR) $(1)/www/luci-static/resources
+	$(CP) $(PKG_BUILD_DIR)/src/openwrt/handle_error.js $(1)/www/luci-static/resources
+endef
+
+$(eval $(call BuildPackage,ot-br-posix))
diff --git a/ot-br-posix/README.md b/ot-br-posix/README.md
new file mode 100644
index 00000000..8b85ee1b
--- /dev/null
+++ b/ot-br-posix/README.md
@@ -0,0 +1,26 @@
+# OpenThread Border Router
+
+Platform designs use Radio Co-Processor (RCP),
+
+<img src="https://openthread.io/static/platforms/images/ot-arch-rcp-vert.png" width="240" align='left' />
+
+Confirmed supported targets
+
+- GL.iNET S200 built-in Silicon Labs EFR32MG21 module
+  - `configs/config-21.02.2.yml`
+
+- GL.iNET AR750 + NRF52840 USB Dongle
+  - `configs/config-21.02.2.yml`
+
+
+## Getting started to build your own OTBR with [gl-infra-builder](https://github.com/gl-inet/gl-infra-builder)
+
+```
+$ git clone https://github.com/gl-inet/gl-infra-builder.git
+$ cd gl-infra-builder/
+$ python3 setup.py -c configs/config-21.02.2.yml
+$ cd openwrt-21.02/openwrt-21.02.2/
+$ ./scripts/gen_config.py glinet_s200_clean
+$ make -j9
+```
+
diff --git a/ot-br-posix/files/etc/config/otbr b/ot-br-posix/files/etc/config/otbr
new file mode 100644
index 00000000..4b57a07a
--- /dev/null
+++ b/ot-br-posix/files/etc/config/otbr
@@ -0,0 +1,18 @@
+
+config service 'otbr'
+    option disabled '1'
+    option log_level '3'
+    option txpower '20'
+    option channel '26'
+
+config service 'srp_server'
+    option min_lease '1800'
+    option max_lease '86400'
+    option min_key_lease '86400'
+    option max_key_lease '1209600'
+
+config service 'bbr'
+    option ifname 'br-lan'
+
+config service 'nat64'
+    option disabled '0'
\ No newline at end of file
diff --git a/ot-br-posix/files/etc/init.d/otbr-agent b/ot-br-posix/files/etc/init.d/otbr-agent
new file mode 100644
index 00000000..f977f24d
--- /dev/null
+++ b/ot-br-posix/files/etc/init.d/otbr-agent
@@ -0,0 +1,83 @@
+#!/bin/sh /etc/rc.common
+# Copyright © 2020 GL.iNet. All Rights Reserved.
+
+START=90
+
+USE_PROCD=1
+
+start_uart_interface_daemon() {
+    local uart_tty uart_baudrate uart_fc
+    local ifname
+
+    logger -t otbr-agent "Start otbr-agent on UART interface"
+
+    config_load otbr
+    config_get uart_tty otbr uart_tty
+    config_get uart_baudrate otbr uart_baudrate
+    config_get uart_fc otbr uart_fc
+    config_get gpio_rst otbr gpio_rst
+    config_get gpio_dfu otbr gpio_dfu
+    config_get ifname bbr ifname
+
+    sysctl -w net.ipv6.conf.$ifname.disable_ipv6=0 1>/dev/null 2>/dev/null
+    sysctl -w net.ipv6.conf.$ifname.accept_ra=2 1>/dev/null 2>/dev/null
+    sysctl -w net.ipv6.conf.$ifname.accept_ra_rt_info_max_plen=64 1>/dev/null 2>/dev/null
+
+    # Check if need to upgrade Thread RCP before startup
+    [ -n "$(which gl-ot-rcp-auto-upgrade)" ] && {
+        gl-ot-rcp-auto-upgrade
+    }
+    
+    procd_open_instance
+    procd_set_param command /usr/sbin/otbr-agent -d 7 -B $ifname -I wpan0 "spinel+hdlc+uart://$uart_tty?uart-baudrate=$uart_baudrate$uart_fc" trel://$ifname
+    procd_set_param respawn
+    procd_set_param stdout 1
+    procd_set_param stderr 1
+    procd_close_instance
+}
+
+start_spi_interface_daemon() {
+    local spi_device gpio_sel gpio_int gpio_rst gpio_wake
+    local ifname
+
+	logger -t otbr-agent "Start otbr-agent on SPI interface"
+
+    config_load otbr
+    config_get spi_device otbr spi_device
+    config_get gpio_sel otbr gpio_sel
+    config_get gpio_int otbr gpio_int
+    config_get gpio_rst otbr gpio_rst
+    config_get gpio_wake otbr gpio_wake
+    config_get ifname bbr ifname
+
+    [ ! -e "/sys/class/gpio/gpio$gpio_sel" ] && {
+        echo $gpio_sel >/sys/class/gpio/export
+        echo out >/sys/class/gpio/gpio$gpio_sel/direction
+    }
+
+    procd_open_instance
+    procd_set_param command /usr/sbin/otbr-agent -d 7 -B $ifname -I wpan0 "spinel+spi://$spi_device?gpio-int-device=/dev/gpiochip0&gpio-int-line=$gpio_int&gpio-reset-device=/dev/gpiochip0&gpio-reset-line=$gpio_rst&no-reset=1&spi-speed=1000000"
+	procd_set_param respawn
+    procd_set_param stdout 1
+    procd_set_param stderr 1
+	procd_close_instance
+}
+
+restore_bbr_interface () {
+    local bbr_ifname=$(uci -q get otbr.bbr.ifname)
+    local rp_disabled=$(uci -q get repeater.@main[0].disabled)
+    if [ "$bbr_ifname" = "wlan-sta0" -a "$rp_disabled" = "1" ]; then
+        uci set otbr.bbr.ifname='br-lan'
+        uci commit otbr
+    fi
+}
+
+start_service() {
+    restore_bbr_interface
+    
+    start_uart_interface_daemon
+}
+
+service_triggers() {
+    procd_add_reload_trigger "otbr"
+}
diff --git a/ot-br-posix/files/etc/init.d/otbr-firewall b/ot-br-posix/files/etc/init.d/otbr-firewall
new file mode 100644
index 00000000..ebbbbfe3
--- /dev/null
+++ b/ot-br-posix/files/etc/init.d/otbr-firewall
@@ -0,0 +1,76 @@
+#!/bin/sh /etc/rc.common
+#
+#  Copyright (c) 2022, The OpenThread Authors.
+#  All rights reserved.
+#
+#  Redistribution and use in source and binary forms, with or without
+#  modification, are permitted provided that the following conditions are met:
+#  1. Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#  2. Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#  3. Neither the name of the copyright holder nor the
+#     names of its contributors may be used to endorse or promote products
+#     derived from this software without specific prior written permission.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+#  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+#  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+#  ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+#  LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+#  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+#  SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+#  INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+#  CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+#  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+#  POSSIBILITY OF SUCH DAMAGE.
+#
+
+START=89
+
+USE_PROCD=1
+
+OTBR_FORWARD_INGRESS_CHAIN="OTBR_FORWARD_INGRESS"
+THREAD_IF_NAME="wpan0"
+
+ipset_destroy_if_exist()
+{
+    if ipset list "$1"; then
+        ipset destroy "$1"
+    fi
+}
+
+stop_service()
+{
+    while ip6tables -C FORWARD -o $THREAD_IF_NAME -j $OTBR_FORWARD_INGRESS_CHAIN; do
+        ip6tables -D FORWARD -o $THREAD_IF_NAME -j $OTBR_FORWARD_INGRESS_CHAIN
+    done
+
+    if ip6tables -L $OTBR_FORWARD_INGRESS_CHAIN; then
+        ip6tables -w -F $OTBR_FORWARD_INGRESS_CHAIN
+        ip6tables -w -X $OTBR_FORWARD_INGRESS_CHAIN
+    fi
+
+    ipset_destroy_if_exist otbr-ingress-deny-src
+    ipset_destroy_if_exist otbr-ingress-deny-src-swap
+    ipset_destroy_if_exist otbr-ingress-allow-dst
+    ipset_destroy_if_exist otbr-ingress-allow-dst-swap
+}
+
+start_service()
+{
+    ipset create -exist otbr-ingress-deny-src hash:net family inet6
+    ipset create -exist otbr-ingress-deny-src-swap hash:net family inet6
+    ipset create -exist otbr-ingress-allow-dst hash:net family inet6
+    ipset create -exist otbr-ingress-allow-dst-swap hash:net family inet6
+
+    ip6tables -N $OTBR_FORWARD_INGRESS_CHAIN
+    ip6tables -I FORWARD 1 -o $THREAD_IF_NAME -j $OTBR_FORWARD_INGRESS_CHAIN
+
+    ip6tables -A $OTBR_FORWARD_INGRESS_CHAIN -m pkttype --pkt-type unicast -i $THREAD_IF_NAME -p ip -j DROP
+    ip6tables -A $OTBR_FORWARD_INGRESS_CHAIN -m set --match-set otbr-ingress-deny-src src -p ip -j DROP
+    ip6tables -A $OTBR_FORWARD_INGRESS_CHAIN -m set --match-set otbr-ingress-allow-dst dst -p ip -j ACCEPT
+    ip6tables -A $OTBR_FORWARD_INGRESS_CHAIN -m pkttype --pkt-type unicast -p ip -j DROP
+    ip6tables -A $OTBR_FORWARD_INGRESS_CHAIN -p ip -j ACCEPT
+}
diff --git a/ot-br-posix/files/etc/init.d/otbr-web b/ot-br-posix/files/etc/init.d/otbr-web
new file mode 100644
index 00000000..e2adb142
--- /dev/null
+++ b/ot-br-posix/files/etc/init.d/otbr-web
@@ -0,0 +1,12 @@
+#!/bin/sh /etc/rc.common
+# Copyright © 2020 GL.iNet. All Rights Reserved.
+
+START=99
+
+USE_PROCD=1
+
+start_service() {
+    procd_open_instance
+    procd_set_param command /usr/sbin/otbr-web -d 7 -I wpan0 -p 8080
+    procd_close_instance
+}
\ No newline at end of file
diff --git a/ot-br-posix/files/etc/openthread/GL-EFR32MG21F768-THREADv1.3-RCP-8N1B1000000-2.3.1.0_GitHub-e6df00dd6_v11.gbl b/ot-br-posix/files/etc/openthread/GL-EFR32MG21F768-THREADv1.3-RCP-8N1B1000000-2.3.1.0_GitHub-e6df00dd6_v11.gbl
new file mode 100644
index 00000000..d9b4edc0
Binary files /dev/null and b/ot-br-posix/files/etc/openthread/GL-EFR32MG21F768-THREADv1.3-RCP-8N1B1000000-2.3.1.0_GitHub-e6df00dd6_v11.gbl differ
diff --git a/ot-br-posix/files/etc/uci-defaults/14-ot-ipv6 b/ot-br-posix/files/etc/uci-defaults/14-ot-ipv6
new file mode 100644
index 00000000..efaf3075
--- /dev/null
+++ b/ot-br-posix/files/etc/uci-defaults/14-ot-ipv6
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+[ "$(uci -q get glconfig.general.inited)" = "1" ] && exit 0
+
+echo "88 openthread" >>/etc/iproute2/rt_tables
+echo "# OpenThread configuration" >>/etc/sysctl.conf
+echo "net.core.optmem_max=65536" >>/etc/sysctl.conf
+echo "net.ipv6.conf.all.disable_ipv6=0" >>/etc/sysctl.conf
+echo "net.ipv6.conf.all.accept_ra=1" >>/etc/sysctl.conf
+echo "net.ipv6.conf.default.accept_ra=1" >>/etc/sysctl.conf
+echo "net.ipv6.conf.wpan0.accept_ra=1" >>/etc/sysctl.conf
+echo "net.ipv6.conf.wpan0.disable_ipv6=0" >>/etc/sysctl.conf
+echo "net.ipv6.conf.wpan0.forwarding=1" >>/etc/sysctl.conf
+sysctl -p /etc/sysctl.conf
+
+exit 0
diff --git a/ot-br-posix/files/etc/uci-defaults/15-ot-tty-init b/ot-br-posix/files/etc/uci-defaults/15-ot-tty-init
new file mode 100644
index 00000000..7aee803d
--- /dev/null
+++ b/ot-br-posix/files/etc/uci-defaults/15-ot-tty-init
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+get_model() {
+	local board boardname
+
+	. /lib/functions.sh
+	
+	board=$(board_name)
+	boardname="${board#*-}"
+
+	[ -n "$boardname" ] || {
+		loger "Unsupported model (model not in support-list)"
+		echo ""
+		return
+	}
+	
+	echo "$boardname"
+}
+
+tty=""
+model=$(get_model)
+case "$model" in
+    "s200-nor-nand")
+        tty=$(ls /dev/ttyCH343USB*|awk 'NR==1{print $1}')
+        uci set otbr.otbr.uart_tty="$tty"
+        uci set otbr.otbr.uart_baudrate="1000000"
+        uci set otbr.otbr.uart_fc="&uart-flow-control"
+        uci set otbr.otbr.gpio_rst="2"
+        uci set otbr.otbr.gpio_dfu="17"
+        uci set otbr.otbr.uart_tty='/dev/ttyCH343USB0'
+        ;;
+    "b1300th")
+        tty=$(ls /dev/ttyCH343USB*|awk 'NR==1{print $1}')
+        uci set otbr.otbr.uart_tty="$tty"
+        uci set otbr.otbr.uart_baudrate="1000000"
+        uci set otbr.otbr.uart_fc="&uart-flow-control"
+        uci set otbr.otbr.gpio_rst="0"
+        uci set otbr.otbr.gpio_dfu="1"
+        uci set otbr.otbr.uart_tty='/dev/ttyCH343USB0'
+        ;;
+    *)
+        tty=$(ls /dev/ttyACM* 2>/dev/null)
+        [ -z "$tty" ] && tty=$(ls /dev/ttyUSB0 2>/dev/null)
+        [ -n "$tty" ] && {
+            uci set otbr.otbr.uart_tty="$tty"
+            uci set otbr.otbr.uart_baudrate="1000000"
+        }
+        ;;
+esac
+
+uci commit otbr
+
+[ -f /usr/etc/cpcd.conf ] && sed -i "/uart_device_file:/c\uart_device_file: $tty" /usr/etc/cpcd.conf
+
+exit 0
diff --git a/ot-br-posix/patches/0001-misc-configuration.patch b/ot-br-posix/patches/0001-misc-configuration.patch
new file mode 100644
index 00000000..57642447
--- /dev/null
+++ b/ot-br-posix/patches/0001-misc-configuration.patch
@@ -0,0 +1,13 @@
+Index: ot-br-posix-2022-02-02/third_party/openthread/repo/src/core/thread/topology.hpp
+===================================================================
+--- ot-br-posix-2022-02-02.orig/third_party/openthread/repo/src/core/thread/topology.hpp
++++ ot-br-posix-2022-02-02/third_party/openthread/repo/src/core/thread/topology.hpp
+@@ -1320,7 +1320,7 @@ private:
+     uint16_t mSecondsSinceSupervision; ///< Number of seconds since last supervision of the child.
+ #endif
+ 
+-    static_assert(OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS < 8192, "mQueuedMessageCount cannot fit max required!");
++    static_assert(OPENTHREAD_CONFIG_NUM_MESSAGE_BUFFERS < OPENTHREAD_CONFIG_PLATFORM_RADIO_SPINEL_RX_FRAME_BUFFER_SIZE, "mQueuedMessageCount cannot fit max required!");
+ };
+ 
+ #endif // OPENTHREAD_FTD
diff --git a/ot-br-posix/patches/0002-openwrt-add-uci-function.patch b/ot-br-posix/patches/0002-openwrt-add-uci-function.patch
new file mode 100644
index 00000000..c6ed8fc5
--- /dev/null
+++ b/ot-br-posix/patches/0002-openwrt-add-uci-function.patch
@@ -0,0 +1,330 @@
+Index: ot-br-posix-2022-11-08-r4.2.3/src/utils/CMakeLists.txt
+===================================================================
+--- ot-br-posix-2022-11-08-r4.2.3.orig/src/utils/CMakeLists.txt
++++ ot-br-posix-2022-11-08-r4.2.3/src/utils/CMakeLists.txt
+@@ -38,8 +38,13 @@ add_library(otbr-utils
+     system_utils.cpp
+     thread_helper.cpp
+     thread_helper.hpp
++    uci.cpp
++    uci.hpp
++    uci_config.cpp
++    uci_config.hpp
+ )
+ target_link_libraries(otbr-utils PRIVATE
+     otbr-common
+     mbedtls
++    uci
+ )
+Index: ot-br-posix-2022-11-08-r4.2.3/src/utils/uci.cpp
+===================================================================
+--- /dev/null
++++ ot-br-posix-2022-11-08-r4.2.3/src/utils/uci.cpp
+@@ -0,0 +1,128 @@
++#include "utils/uci.hpp"
++
++#include <string>
++
++#include <stdio.h>
++#include <string.h>
++
++namespace otbr {
++
++namespace Utils {
++
++int UciGet(const char *aPath, char *aOut)
++{
++    struct uci_context *ctx = uci_alloc_context();
++    struct uci_ptr      ptr;
++    struct uci_element *e;
++    char               *p_config = strdup(aPath);
++
++    /* Check if the configuration file exists */
++    if (uci_lookup_ptr(ctx, &ptr, p_config, true) != UCI_OK)
++    {
++        goto err;
++    }
++
++    /* Check if the configuration item exists */
++    if (!(ptr.flags & UCI_LOOKUP_COMPLETE))
++    {
++        ctx->err = UCI_ERR_NOTFOUND;
++        goto err;
++    }
++
++    e = ptr.last;
++    switch (e->type)
++    {
++    case UCI_TYPE_SECTION:
++        strcat(aOut, ptr.s->type);
++        break;
++    case UCI_TYPE_OPTION:
++    {
++        switch (ptr.o->type)
++        {
++        case UCI_TYPE_STRING:
++            strcat(aOut, ptr.o->v.string);
++            break;
++        case UCI_TYPE_LIST:
++        {
++            struct uci_element *e;
++            uci_foreach_element(&ptr.o->v.list, e)
++            {
++                strcat(aOut, e->name);
++                strcat(aOut, " ");
++            }
++            aOut[strlen(aOut) - 1] = '\0'; // remove the last space
++            break;
++        }
++        default:
++            break;
++        }
++        break;
++    }
++    default:
++        break;
++    }
++
++    uci_free_context(ctx);
++    free(p_config);
++    return 0;
++err:
++    free(p_config);
++    return -1;
++}
++
++int UciSet(const char *aPath, char *aValue)
++{
++    char                str[256] = {0};
++    struct uci_ptr      ptr;
++    struct uci_context *ctx = uci_alloc_context();
++
++    sprintf(str, "%s=%s", aPath, aValue);
++
++    if (uci_lookup_ptr(ctx, &ptr, str, true) != UCI_OK)
++    {
++        goto err;
++    }
++
++    if (uci_set(ctx, &ptr) != UCI_OK)
++    {
++        goto err;
++    }
++
++    uci_save(ctx, ptr.p);
++
++    uci_commit(ctx, &ptr.p, false);
++
++    uci_free_context(ctx);
++    return 0;
++
++err:
++    uci_free_context(ctx);
++    return -1;
++}
++
++int UciDel(const char *aPath)
++{
++    char                str[256] = {0};
++    struct uci_ptr      ptr;
++    struct uci_context *ctx = uci_alloc_context();
++
++    sprintf(str, "%s", aPath);
++
++    if (uci_lookup_ptr(ctx, &ptr, str, true) != UCI_OK)
++    {
++        goto err;
++    }
++
++    if (uci_delete(ctx, &ptr) == UCI_OK)
++        uci_save(ctx, ptr.p);
++
++    uci_free_context(ctx);
++    return 0;
++err:
++    uci_free_context(ctx);
++    return -1;
++}
++
++} // namespace Utils
++
++} // namespace otbr
+Index: ot-br-posix-2022-11-08-r4.2.3/src/utils/uci.hpp
+===================================================================
+--- /dev/null
++++ ot-br-posix-2022-11-08-r4.2.3/src/utils/uci.hpp
+@@ -0,0 +1,34 @@
++#ifndef OTBR_UTILS_UCI_HPP_
++#define OTBR_UTILS_UCI_HPP_
++
++#include "openthread-br/config.h"
++
++#include <stddef.h>
++#include <stdint.h>
++
++extern "C" {
++#include <uci.h>
++#ifndef UCI_LOOKUP_DONE
++#define UCI_LOOKUP_DONE (1 << 0)
++#endif
++#ifndef UCI_LOOKUP_COMPLETE
++#define UCI_LOOKUP_COMPLETE (1 << 1)
++#endif
++#ifndef UCI_LOOKUP_EXTENDED
++#define UCI_LOOKUP_EXTENDED (1 << 2)
++#endif
++}
++
++namespace otbr {
++
++namespace Utils {
++
++int UciGet(const char *aPath, char *aOut);
++int UciSet(const char *aPath, char *aValue);
++int UciDel(const char *aPath);
++
++} // namespace Utils
++
++} // namespace otbr
++
++#endif // OTBR_UTILS_UCI_
+Index: ot-br-posix-2022-11-08-r4.2.3/src/utils/uci_config.cpp
+===================================================================
+--- /dev/null
++++ ot-br-posix-2022-11-08-r4.2.3/src/utils/uci_config.cpp
+@@ -0,0 +1,103 @@
++#define OTBR_LOG_TAG "UTILS"
++
++#include "utils/uci_config.hpp"
++
++#include <stdio.h>
++#include <string.h>
++#include <sys/stat.h>
++
++#include <openthread/backbone_router_ftd.h>
++#include <openthread/border_router.h>
++#include <openthread/dataset.h>
++#include <openthread/dataset_ftd.h>
++#include <openthread/instance.h>
++#include <openthread/ip6.h>
++#include <openthread/joiner.h>
++#include <openthread/logging.h>
++#include <openthread/netdata_publisher.h>
++#include <openthread/srp_server.h>
++#include <openthread/thread.h>
++#include <openthread/thread_ftd.h>
++#include "common/code_utils.hpp"
++#include "common/logging.hpp"
++#include "utils/hex.hpp"
++#include "utils/uci.hpp"
++
++namespace otbr {
++
++namespace Utils {
++
++int otConfigInitFromUCI(otInstance *aInstance)
++{
++    otError error                = OT_ERROR_NONE;
++    char    sLogLevel[4]         = {0};
++    char    sTxPower[4]          = {0};
++    char    sRCPVersion[120]     = {0};
++    char    sPosixVersion[120]   = {0};
++    char    sThreadVersion[8]    = {0};
++    char    sThreadAPIVersion[8] = {0};
++    char    sEUI64[32]           = {0};
++
++    const char *aRCPVersion = otPlatRadioGetVersionString(aInstance);
++    otbr::Utils::UciGet("otbr.otbr.rcp_version", sRCPVersion);
++    if (strlen(sRCPVersion) == 0 || strcmp(sRCPVersion, aRCPVersion))
++    {
++        otbr::Utils::UciSet("otbr.otbr.rcp_version", (char *)aRCPVersion);
++    }
++
++    const char *aPosixVersion = otGetVersionString();
++    otbr::Utils::UciGet("otbr.otbr.posix_version", sPosixVersion);
++    if (strlen(sPosixVersion) == 0 || strcmp(sPosixVersion, aPosixVersion))
++    {
++        otbr::Utils::UciSet("otbr.otbr.posix_version", (char *)aPosixVersion);
++    }
++
++    uint16_t aThreadVersion = otThreadGetVersion();
++    otbr::Utils::UciGet("otbr.otbr.thread_version", sThreadVersion);
++    if (strlen(sThreadVersion) == 0 || atoi(sThreadVersion) != aThreadVersion)
++    {
++        sprintf(sThreadVersion, "%d", aThreadVersion);
++        otbr::Utils::UciSet("otbr.otbr.thread_version", (char *)sThreadVersion);
++    }
++
++    otbr::Utils::UciGet("otbr.otbr.thread_api_version", sThreadAPIVersion);
++    if (strlen(sThreadAPIVersion) == 0 || atoi(sThreadAPIVersion) != OPENTHREAD_API_VERSION)
++    {
++        sprintf(sThreadAPIVersion, "%d", OPENTHREAD_API_VERSION);
++        otbr::Utils::UciSet("otbr.otbr.thread_api_version", (char *)sThreadAPIVersion);
++    }
++
++    otbr::Utils::UciGet("otbr.otbr.eui64", sEUI64);
++    if (strlen(sEUI64) == 0)
++    {
++        otExtAddress eui64Address;
++        otLinkGetFactoryAssignedIeeeEui64(aInstance, &eui64Address);
++        sprintf(sEUI64, "%02x%02x%02x%02x%02x%02x%02x%02x", eui64Address.m8[0], eui64Address.m8[1], eui64Address.m8[2],
++                eui64Address.m8[3], eui64Address.m8[4], eui64Address.m8[5], eui64Address.m8[6], eui64Address.m8[7]);
++        otbr::Utils::UciSet("otbr.otbr.eui64", (char *)sEUI64);
++    }
++
++    otbr::Utils::UciGet("otbr.otbr.log_level", sLogLevel);
++    if (strlen(sLogLevel) != 0)
++    {
++        if ((error = otLoggingSetLevel(static_cast<otLogLevel>(atoi(sLogLevel)))) != OT_ERROR_NONE)
++            otbrLogErr("otLoggingSetLevel failed");
++    }
++
++    otbr::Utils::UciGet("otbr.otbr.txpower", sTxPower);
++    if (strlen(sTxPower) != 0)
++    {
++        if ((error = otPlatRadioSetTransmitPower(aInstance, static_cast<int8_t>(atoi(sTxPower)))) != OT_ERROR_NONE)
++            otbrLogErr("otPlatRadioSetTransmitPower failed");
++    }
++
++    if (error != OT_ERROR_NONE)
++    {
++        otbrLogErr("%s", otThreadErrorToString(error));
++    }
++    return error;
++}
++
++} // namespace Utils
++
++} // namespace otbr
+Index: ot-br-posix-2022-11-08-r4.2.3/src/utils/uci_config.hpp
+===================================================================
+--- /dev/null
++++ ot-br-posix-2022-11-08-r4.2.3/src/utils/uci_config.hpp
+@@ -0,0 +1,27 @@
++#ifndef OTBR_UTILS_UCI_CONFIG_HPP_
++#define OTBR_UTILS_UCI_CONFIG_HPP_
++
++#include "openthread-br/config.h"
++
++#include <openthread/instance.h>
++
++#include <stddef.h>
++#include <stdint.h>
++
++namespace otbr {
++namespace Ncp {
++class ControllerOpenThread;
++}
++} // namespace otbr
++
++namespace otbr {
++
++namespace Utils {
++
++int otConfigInitFromUCI(otInstance *aInstance);
++
++} // namespace Utils
++
++} // namespace otbr
++
++#endif // OTBR_UTILS_UCI_CONFIG_
diff --git a/ot-br-posix/patches/0003-improve-diagnostics-output.patch b/ot-br-posix/patches/0003-improve-diagnostics-output.patch
new file mode 100644
index 00000000..5e9be9fb
--- /dev/null
+++ b/ot-br-posix/patches/0003-improve-diagnostics-output.patch
@@ -0,0 +1,13 @@
+Index: ot-br-posix-2022-06-02/src/rest/json.cpp
+===================================================================
+--- ot-br-posix-2022-06-02.orig/src/rest/json.cpp
++++ ot-br-posix-2022-06-02/src/rest/json.cpp
+@@ -79,7 +79,7 @@ std::string Json2String(const cJSON *aJs
+ 
+     VerifyOrExit(aJson != nullptr);
+ 
+-    jsonOut = cJSON_Print(aJson);
++    jsonOut = cJSON_PrintUnformatted(aJson);
+     ret     = jsonOut;
+     if (jsonOut != nullptr)
+     {
diff --git a/ot-br-posix/patches/0004-add-initialize-config.patch b/ot-br-posix/patches/0004-add-initialize-config.patch
new file mode 100644
index 00000000..e431ca18
--- /dev/null
+++ b/ot-br-posix/patches/0004-add-initialize-config.patch
@@ -0,0 +1,21 @@
+Index: ot-br-posix-2022-11-08/src/agent/application.cpp
+===================================================================
+--- ot-br-posix-2022-11-08.orig/src/agent/application.cpp
++++ ot-br-posix-2022-11-08/src/agent/application.cpp
+@@ -41,6 +41,7 @@
+ #include "common/code_utils.hpp"
+ #include "common/mainloop_manager.hpp"
+ #include "utils/infra_link_selector.hpp"
++#include "utils/uci_config.hpp"
+ 
+ namespace otbr {
+ 
+@@ -102,6 +103,8 @@ void Application::Init(void)
+ #if OTBR_ENABLE_VENDOR_SERVER
+     mVendorServer.Init();
+ #endif
++
++    otbr::Utils::otConfigInitFromUCI(mNcp.GetInstance());
+ }
+ 
+ void Application::Deinit(void)
diff --git a/ot-br-posix/patches/0011-openwrt-add-ubus-method.patch b/ot-br-posix/patches/0011-openwrt-add-ubus-method.patch
new file mode 100644
index 00000000..5ee91676
--- /dev/null
+++ b/ot-br-posix/patches/0011-openwrt-add-ubus-method.patch
@@ -0,0 +1,1436 @@
+Index: ot-br-posix-2023-7-12-r4.3.1/src/openwrt/ubus/otubus.cpp
+===================================================================
+--- ot-br-posix-2023-7-12-r4.3.1.orig/src/openwrt/ubus/otubus.cpp
++++ ot-br-posix-2023-7-12-r4.3.1/src/openwrt/ubus/otubus.cpp
+@@ -39,12 +39,18 @@
+ #include <arpa/inet.h>
+ #include <sys/eventfd.h>
+ 
++#include <openthread/border_agent.h>
+ #include <openthread/commissioner.h>
++#include <openthread/logging.h>
++#include <openthread/nat64.h>
++#include <openthread/srp_server.h>
+ #include <openthread/thread.h>
+ #include <openthread/thread_ftd.h>
+ 
+ #include "common/logging.hpp"
+ #include "ncp/ncp_openthread.hpp"
++#include "utils/uci.hpp"
++#include "utils/uci_config.hpp"
+ 
+ namespace otbr {
+ namespace ubus {
+@@ -93,6 +99,7 @@ enum
+ {
+     PSKD,
+     EUI64,
++    TIMEOUT,
+     ADD_JOINER_MAX,
+ };
+ 
+@@ -154,6 +161,7 @@ static const struct blobmsg_policy remov
+ static const struct blobmsg_policy addJoinerPolicy[ADD_JOINER_MAX] = {
+     [PSKD]  = {.name = "pskd", .type = BLOBMSG_TYPE_STRING},
+     [EUI64] = {.name = "eui64", .type = BLOBMSG_TYPE_STRING},
++    [TIMEOUT] = {.name = "timeout", .type = BLOBMSG_TYPE_INT32},
+ };
+ 
+ static const struct blobmsg_policy mgmtsetPolicy[MGMTSET_MAX] = {
+@@ -165,6 +173,110 @@ static const struct blobmsg_policy mgmts
+     [PSKC]        = {.name = "pskc", .type = BLOBMSG_TYPE_STRING},
+ };
+ 
++#if OPENTHREAD_CONFIG_OPENWRT_EXTENSION
++#define OT_EVENT_OTBR_INIT 0
++#define OT_EVENT_OTBR_ENABLED 1
++#define OT_EVENT_OTBR_DISABLED 2
++#define OT_EVENT_OTBR_NEIGHBOR_TABLE_CHANGED 3
++#define OT_EVENT_OTBR_COMMISSIONER_ENABLED 4
++#define OT_EVENT_OTBR_COMMISSIONER_DISABLED 5
++#define OT_EVENT_OTBR_JOINING_START 6
++#define OT_EVENT_OTBR_JOINING_STOP 7
++#define OT_EVENT_OTBR_WATCHDOG 8
++
++enum
++{
++    ENABLE,
++    DOMAINNAME,
++    MINLEASE,
++    MAXLEASE,
++    KEYMINLEASE,
++    KEYMAXLEASE,
++    SEQNUM,
++    SET_SRPSRVCONFIG_MAX,
++};
++
++enum
++{
++    BBR_ENABLE,
++    BBR_SEQNO,
++    BBR_DELAY,
++    BBR_TIMEOUT,
++    BBR_JITTER,
++    SET_BBR_CONFIG_MAX,
++};
++
++enum
++{
++    NAT64_ENABLE,
++    SET_NAT64_MAX,
++};
++
++static const struct blobmsg_policy setLogLevelPolicy[SET_NETWORK_MAX] = {
++    [SETNETWORK] = {.name = "loglevel", .type = BLOBMSG_TYPE_INT32},
++};
++
++static const struct blobmsg_policy setSrpSrvConfigPolicy[SET_SRPSRVCONFIG_MAX] = {
++    [ENABLE]      = {.name = "enable", .type = BLOBMSG_TYPE_BOOL},
++    [DOMAINNAME]  = {.name = "domain", .type = BLOBMSG_TYPE_STRING},
++    [MINLEASE]    = {.name = "minlease", .type = BLOBMSG_TYPE_INT32},
++    [MAXLEASE]    = {.name = "maxlease", .type = BLOBMSG_TYPE_INT32},
++    [KEYMINLEASE] = {.name = "keyminlease", .type = BLOBMSG_TYPE_INT32},
++    [KEYMAXLEASE] = {.name = "keymaxlease", .type = BLOBMSG_TYPE_INT32},
++    [SEQNUM]      = {.name = "seqnum", .type = BLOBMSG_TYPE_INT32},
++};
++
++static const struct blobmsg_policy setBBRConfigPolicy[SET_BBR_CONFIG_MAX] = {
++    [BBR_ENABLE]  = {.name = "enable", .type = BLOBMSG_TYPE_BOOL},
++    [BBR_SEQNO]   = {.name = "seqno", .type = BLOBMSG_TYPE_INT32},
++    [BBR_DELAY]   = {.name = "delay", .type = BLOBMSG_TYPE_INT32},
++    [BBR_TIMEOUT] = {.name = "timeout", .type = BLOBMSG_TYPE_INT32},
++    [BBR_JITTER]  = {.name = "jitter", .type = BLOBMSG_TYPE_INT32},
++};
++
++static const struct blobmsg_policy setNat64ConfigPolicy[SET_NAT64_MAX] = {
++    [NAT64_ENABLE]  = {.name = "enable", .type = BLOBMSG_TYPE_BOOL},
++};
++
++void UbusServer::SendEvent(int aEvent)
++{
++    struct ubus_context   *ctx;
++    const char            *ubus_socket = NULL;
++    static struct blob_buf b;
++    char                   outputKey[NETWORKKEY_LENGTH] = "";
++    otNetworkKey           key;
++    otOperationalDataset   dataset;
++
++    ctx = ubus_connect(ubus_socket);
++    if (!ctx)
++    {
++        otbrLogErr("Ubus connect failed");
++        return;
++    }
++
++    blob_buf_init(&b, 0);
++
++    blobmsg_add_u32(&b, "id", aEvent);
++    if (aEvent != OT_EVENT_OTBR_WATCHDOG)
++    {
++        blobmsg_add_string(&b, "NetworkName", otThreadGetNetworkName(mController->GetInstance()));
++        blobmsg_add_u16(&b, "Channel", otLinkGetChannel(mController->GetInstance()));
++        blobmsg_add_u32(&b, "PanId", otLinkGetPanId(mController->GetInstance()));
++
++        otThreadGetNetworkKey(mController->GetInstance(), &key);
++        OutputBytes(key.m8, OT_NETWORK_KEY_SIZE, outputKey);
++        blobmsg_add_string(&b, "Networkkey", outputKey);
++
++        otDatasetGetActive(mController->GetInstance(), &dataset);
++        blobmsg_add_u64(&b, "ActiveTimestamp", dataset.mActiveTimestamp.mSeconds);
++    }
++
++    ubus_send_event(ctx, "otbr-agent", b.head);
++
++    ubus_free(ctx);
++}
++#endif
++
+ static const struct ubus_method otbrMethods[] = {
+     {"scan", &UbusServer::UbusScanHandler, 0, 0, nullptr, 0},
+     {"channel", &UbusServer::UbusChannelHandler, 0, 0, nullptr, 0},
+@@ -195,7 +307,7 @@ static const struct ubus_method otbrMeth
+     {"networkdata", &UbusServer::UbusNetworkdataHandler, 0, 0, nullptr, 0},
+     {"commissionerstart", &UbusServer::UbusCommissionerStartHandler, 0, 0, nullptr, 0},
+     {"joinernum", &UbusServer::UbusJoinerNumHandler, 0, 0, nullptr, 0},
+-    {"joinerremove", &UbusServer::UbusJoinerRemoveHandler, 0, 0, nullptr, 0},
++    {"joinerremove", &UbusServer::UbusJoinerRemoveHandler, 0, 0, removeJoinerPolicy, ARRAY_SIZE(removeJoinerPolicy)},
+     {"macfiltersetstate", &UbusServer::UbusMacfilterSetStateHandler, 0, 0, macfilterSetStatePolicy,
+      ARRAY_SIZE(macfilterSetStatePolicy)},
+     {"macfilteradd", &UbusServer::UbusMacfilterAddHandler, 0, 0, macfilterAddPolicy, ARRAY_SIZE(macfilterAddPolicy)},
+@@ -207,6 +319,28 @@ static const struct ubus_method otbrMeth
+     {"joineradd", &UbusServer::UbusJoinerAddHandler, 0, 0, addJoinerPolicy, ARRAY_SIZE(addJoinerPolicy)},
+     {"mgmtset", &UbusServer::UbusMgmtsetHandler, 0, 0, mgmtsetPolicy, ARRAY_SIZE(mgmtsetPolicy)},
+     {"interfacename", &UbusServer::UbusInterfaceNameHandler, 0, 0, nullptr, 0},
++#if OPENTHREAD_CONFIG_OPENWRT_EXTENSION
++    {"status", &UbusServer::UbusThreadStatusHandle, 0, 0, nullptr, 0},
++    {"txpower", &UbusServer::UbusTxPowerHandle, 0, 0, nullptr, 0},
++    {"joinerstate", &UbusServer::UbusJoinerStateHandle, 0, 0, nullptr, 0},
++    {"commissionerstop", &UbusServer::UbusCommissionerStopHandler, 0, 0, nullptr, 0},
++    {"commissionerstate", &UbusServer::UbusCommissionerStateHandler, 0, 0, nullptr, 0},
++#if OTBR_ENABLE_BACKBONE_ROUTER
++    {"bbrstatus", &UbusServer::UbusBackboneRouterStatusHandle, 0, 0, nullptr, 0},
++    {"setbbrconfig", &UbusServer::UbusSetBackboneRouterConfigHandler, 0, 0, setBBRConfigPolicy, ARRAY_SIZE(setBBRConfigPolicy)},
++#endif
++    {"setloglevel", &UbusServer::UbusSetLogLevelHandler, 0, 0, setLogLevelPolicy, ARRAY_SIZE(setLogLevelPolicy)},
++    {"srpsrvconfig", &UbusServer::UbusSrpServerConfigHandler, 0, 0, nullptr, 0},
++    {"srpsrvservice", &UbusServer::UbusSrpServerServiceHandler, 0, 0, nullptr, 0},
++    {"setsrpsrvconfig", &UbusServer::UbusSetSrpServerConfigHandler, 0, 0, setSrpSrvConfigPolicy, ARRAY_SIZE(setSrpSrvConfigPolicy)},
++    {"localaddr", &UbusServer::UbusLocalAddrHandler, 0, 0, nullptr, 0},
++    {"activetimestamp", &UbusServer::UbusActiveTimestampHandler, 0, 0, nullptr, 0},
++    {"bufferinfo", &UbusServer::UbusBufferInfoHandler, 0, 0, nullptr, 0},
++    {"services", &UbusServer::UbusServicesInfoHandler, 0, 0, nullptr, 0},
++    {"neighbortable", &UbusServer::UbusNeighborTableHandler, 0, 0, nullptr, 0},
++    {"nat64status", &UbusServer::UbusNat64StatusHandler, 0, 0, nullptr, 0},
++    {"setnat64config", &UbusServer::UbusSetNat64ConfigHandler, 0, 0, setNat64ConfigPolicy, ARRAY_SIZE(setNat64ConfigPolicy)},
++#endif
+ };
+ 
+ static struct ubus_object_type otbrObjType = {"otbr_prog", 0, otbrMethods, ARRAY_SIZE(otbrMethods)};
+@@ -665,6 +799,172 @@ int UbusServer::UbusMacfilterClearHandle
+     return GetInstance().UbusSetInformation(aContext, aObj, aRequest, aMethod, aMsg, "macfilterclear");
+ }
+ 
++#if OPENTHREAD_CONFIG_OPENWRT_EXTENSION
++int UbusServer::UbusThreadStatusHandle(struct ubus_context      *aContext,
++                                       struct ubus_object       *aObj,
++                                       struct ubus_request_data *aRequest,
++                                       const char               *aMethod,
++                                       struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "status");
++}
++
++int UbusServer::UbusTxPowerHandle(struct ubus_context      *aContext,
++                                  struct ubus_object       *aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char               *aMethod,
++                                  struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "txpower");
++}
++
++int UbusServer::UbusJoinerStateHandle(struct ubus_context      *aContext,
++                                      struct ubus_object       *aObj,
++                                      struct ubus_request_data *aRequest,
++                                      const char               *aMethod,
++                                      struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "joinerstate");
++}
++
++int UbusServer::UbusCommissionerStopHandler(struct ubus_context      *aContext,
++                                            struct ubus_object       *aObj,
++                                            struct ubus_request_data *aRequest,
++                                            const char               *aMethod,
++                                            struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusCommissioner(aContext, aObj, aRequest, aMethod, aMsg, "stop");
++}
++
++int UbusServer::UbusCommissionerStateHandler(struct ubus_context      *aContext,
++                                             struct ubus_object       *aObj,
++                                             struct ubus_request_data *aRequest,
++                                             const char               *aMethod,
++                                             struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusCommissioner(aContext, aObj, aRequest, aMethod, aMsg, "state");
++}
++
++#if OTBR_ENABLE_BACKBONE_ROUTER
++int UbusServer::UbusBackboneRouterStatusHandle(struct ubus_context      *aContext,
++                                               struct ubus_object       *aObj,
++                                               struct ubus_request_data *aRequest,
++                                               const char               *aMethod,
++                                               struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "bbrstatus");
++}
++
++int UbusServer::UbusSetBackboneRouterConfigHandler(struct ubus_context      *aContext,
++                                                   struct ubus_object       *aObj,
++                                                   struct ubus_request_data *aRequest,
++                                                   const char               *aMethod,
++                                                   struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusSetInformation(aContext, aObj, aRequest, aMethod, aMsg, "setbbrconfig");
++}
++#endif
++
++int UbusServer::UbusSetLogLevelHandler(struct ubus_context      *aContext,
++                                       struct ubus_object       *aObj,
++                                       struct ubus_request_data *aRequest,
++                                       const char               *aMethod,
++                                       struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusSetInformation(aContext, aObj, aRequest, aMethod, aMsg, "setloglevel");
++}
++
++int UbusServer::UbusSrpServerConfigHandler(struct ubus_context      *aContext,
++                                           struct ubus_object       *aObj,
++                                           struct ubus_request_data *aRequest,
++                                           const char               *aMethod,
++                                           struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "srpsrvconfig");
++}
++
++int UbusServer::UbusSrpServerServiceHandler(struct ubus_context      *aContext,
++                                            struct ubus_object       *aObj,
++                                            struct ubus_request_data *aRequest,
++                                            const char               *aMethod,
++                                            struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "srpsrvservice");
++}
++
++int UbusServer::UbusSetSrpServerConfigHandler(struct ubus_context      *aContext,
++                                              struct ubus_object       *aObj,
++                                              struct ubus_request_data *aRequest,
++                                              const char               *aMethod,
++                                              struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusSetInformation(aContext, aObj, aRequest, aMethod, aMsg, "setsrpsrvconfig");
++}
++
++int UbusServer::UbusLocalAddrHandler(struct ubus_context      *aContext,
++                                     struct ubus_object       *aObj,
++                                     struct ubus_request_data *aRequest,
++                                     const char               *aMethod,
++                                     struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "localaddr");
++}
++
++int UbusServer::UbusActiveTimestampHandler(struct ubus_context      *aContext,
++                                           struct ubus_object       *aObj,
++                                           struct ubus_request_data *aRequest,
++                                           const char               *aMethod,
++                                           struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "activetimestamp");
++}
++
++int UbusServer::UbusBufferInfoHandler(struct ubus_context      *aContext,
++                                      struct ubus_object       *aObj,
++                                      struct ubus_request_data *aRequest,
++                                      const char               *aMethod,
++                                      struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "bufferinfo");
++}
++
++int UbusServer::UbusServicesInfoHandler(struct ubus_context      *aContext,
++                                        struct ubus_object       *aObj,
++                                        struct ubus_request_data *aRequest,
++                                        const char               *aMethod,
++                                        struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "services");
++}
++
++int UbusServer::UbusNeighborTableHandler(struct ubus_context      *aContext,
++                                         struct ubus_object       *aObj,
++                                         struct ubus_request_data *aRequest,
++                                         const char               *aMethod,
++                                         struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "neighbortable");
++}
++
++int UbusServer::UbusNat64StatusHandler(struct ubus_context      *aContext,
++                                         struct ubus_object       *aObj,
++                                         struct ubus_request_data *aRequest,
++                                         const char               *aMethod,
++                                         struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusGetInformation(aContext, aObj, aRequest, aMethod, aMsg, "nat64status");
++}
++
++int UbusServer::UbusSetNat64ConfigHandler(struct ubus_context      *aContext,
++                                         struct ubus_object       *aObj,
++                                         struct ubus_request_data *aRequest,
++                                         const char               *aMethod,
++                                         struct blob_attr         *aMsg)
++{
++    return GetInstance().UbusSetInformation(aContext, aObj, aRequest, aMethod, aMsg, "setnat64config");
++}
++#endif
++
+ int UbusServer::UbusLeaveHandlerDetail(struct ubus_context      *aContext,
+                                        struct ubus_object       *aObj,
+                                        struct ubus_request_data *aRequest,
+@@ -710,17 +1010,17 @@ int UbusServer::UbusThreadHandler(struct
+ 
+     otError error = OT_ERROR_NONE;
+ 
++    mNcpThreadMutex->lock();
++
+     blob_buf_init(&mBuf, 0);
+ 
+     if (!strcmp(aAction, "start"))
+     {
+-        mNcpThreadMutex->lock();
+         SuccessOrExit(error = otIp6SetEnabled(mController->GetInstance(), true));
+         SuccessOrExit(error = otThreadSetEnabled(mController->GetInstance(), true));
+     }
+     else if (!strcmp(aAction, "stop"))
+     {
+-        mNcpThreadMutex->lock();
+         SuccessOrExit(error = otThreadSetEnabled(mController->GetInstance(), false));
+         SuccessOrExit(error = otIp6SetEnabled(mController->GetInstance(), false));
+     }
+@@ -748,9 +1048,10 @@ int UbusServer::UbusParentHandlerDetail(
+     void        *jsonList                  = nullptr;
+     void        *jsonArray                 = nullptr;
+ 
++    mNcpThreadMutex->lock();
++
+     blob_buf_init(&mBuf, 0);
+ 
+-    mNcpThreadMutex->lock();
+     SuccessOrExit(error = otThreadGetParentInfo(mController->GetInstance(), &parentInfo));
+ 
+     jsonArray = blobmsg_open_array(&mBuf, "parent_list");
+@@ -795,11 +1096,12 @@ int UbusServer::UbusNeighborHandlerDetai
+     char                   mode[5]                   = "";
+     char                   extAddress[XPANID_LENGTH] = "";
+ 
++    mNcpThreadMutex->lock();
++
+     blob_buf_init(&mBuf, 0);
+ 
+     sJsonUri = blobmsg_open_array(&mBuf, "neighbor_list");
+ 
+-    mNcpThreadMutex->lock();
+     while (otThreadGetNextNeighborInfo(mController->GetInstance(), &iterator, &neighborInfo) == OT_ERROR_NONE)
+     {
+         jsonList = blobmsg_open_table(&mBuf, nullptr);
+@@ -870,6 +1172,10 @@ int UbusServer::UbusMgmtset(struct ubus_
+     long                 value;
+     int                  length = 0;
+ 
++    mNcpThreadMutex->lock();
++
++    blob_buf_init(&mBuf, 0);
++
+     SuccessOrExit(error = otDatasetGetActive(mController->GetInstance(), &dataset));
+ 
+     blobmsg_parse(mgmtsetPolicy, MGMTSET_MAX, tb, blob_data(aMsg), blob_len(aMsg));
+@@ -927,6 +1233,7 @@ int UbusServer::UbusMgmtset(struct ubus_
+                                                      static_cast<uint8_t>(length), /* aCallback */ nullptr,
+                                                      /* aContext */ nullptr));
+ exit:
++    mNcpThreadMutex->unlock();
+     AppendResult(error, aContext, aRequest);
+     return 0;
+ }
+@@ -946,8 +1253,13 @@ int UbusServer::UbusCommissioner(struct
+ 
+     mNcpThreadMutex->lock();
+ 
++    blob_buf_init(&mBuf, 0);
++
+     if (!strcmp(aAction, "start"))
+     {
++        VerifyOrExit(!(otThreadGetDeviceRole(mController->GetInstance()) == OT_DEVICE_ROLE_DISABLED),
++                     error = OT_ERROR_INVALID_STATE);
++
+         if (otCommissionerGetState(mController->GetInstance()) == OT_COMMISSIONER_STATE_DISABLED)
+         {
+             error = otCommissionerStart(mController->GetInstance(), &UbusServer::HandleStateChanged,
+@@ -960,6 +1272,7 @@ int UbusServer::UbusCommissioner(struct
+         otExtAddress        addr;
+         const otExtAddress *addrPtr = nullptr;
+         char               *pskd    = nullptr;
++        unsigned long       timeout = 0;
+ 
+         blobmsg_parse(addJoinerPolicy, ADD_JOINER_MAX, tb, blob_data(aMsg), blob_len(aMsg));
+         if (tb[PSKD] != nullptr)
+@@ -981,7 +1294,15 @@ int UbusServer::UbusCommissioner(struct
+             }
+         }
+ 
+-        unsigned long timeout = kDefaultJoinerTimeout;
++        if (tb[TIMEOUT] != nullptr)
++        {
++            timeout = blobmsg_get_u32(tb[TIMEOUT]);
++        }
++        else
++        {
++            timeout = kDefaultJoinerTimeout;
++        }
++
+         SuccessOrExit(
+             error = otCommissionerAddJoiner(mController->GetInstance(), addrPtr, pskd, static_cast<uint32_t>(timeout)));
+     }
+@@ -1008,10 +1329,19 @@ int UbusServer::UbusCommissioner(struct
+ 
+         SuccessOrExit(error = otCommissionerRemoveJoiner(mController->GetInstance(), addrPtr));
+     }
++    else if (!strcmp(aAction, "stop"))
++    {
++        error = otCommissionerStop(mController->GetInstance());
++        if (error == OT_ERROR_ALREADY)
++            error = OT_ERROR_NONE;
++    }
++    else if (!strcmp(aAction, "state"))
++    {
++        blobmsg_add_u32(&mBuf, "State", otCommissionerGetState(mController->GetInstance()));
++    }
+ 
+ exit:
+     mNcpThreadMutex->unlock();
+-    blob_buf_init(&mBuf, 0);
+     AppendResult(error, aContext, aRequest);
+     return 0;
+ }
+@@ -1027,9 +1357,11 @@ void UbusServer::HandleStateChanged(otCo
+     {
+     case OT_COMMISSIONER_STATE_DISABLED:
+         otbrLogInfo("Commissioner state disabled");
++        otbr::ubus::UbusServer::GetInstance().SendEvent(OT_EVENT_OTBR_COMMISSIONER_DISABLED);
+         break;
+     case OT_COMMISSIONER_STATE_ACTIVE:
+         otbrLogInfo("Commissioner state active");
++        otbr::ubus::UbusServer::GetInstance().SendEvent(OT_EVENT_OTBR_COMMISSIONER_ENABLED);
+         break;
+     case OT_COMMISSIONER_STATE_PETITION:
+         otbrLogInfo("Commissioner state petition");
+@@ -1052,6 +1384,11 @@ void UbusServer::HandleJoinerEvent(otCom
+     OT_UNUSED_VARIABLE(aJoinerInfo);
+     OT_UNUSED_VARIABLE(aJoinerId);
+ 
++    char sEUI64[17]    = {0};
++    char sUciPath[128] = {0};
++    if (aJoinerInfo->mType == OT_JOINER_INFO_TYPE_EUI64)
++        OutputBytes(aJoinerInfo->mSharedId.mEui64.m8, OT_EXT_ADDRESS_SIZE, sEUI64);
++
+     switch (aEvent)
+     {
+     case OT_COMMISSIONER_JOINER_START:
+@@ -1062,12 +1399,22 @@ void UbusServer::HandleJoinerEvent(otCom
+         break;
+     case OT_COMMISSIONER_JOINER_FINALIZE:
+         otbrLogInfo("Joiner finalize");
++        if (aJoinerInfo->mType == OT_JOINER_INFO_TYPE_EUI64)
++        {
++            sprintf(sUciPath, "thread_devices.%s.Joined", sEUI64);
++            otbr::Utils::UciSet(sUciPath, (char *)"1");
++        }
+         break;
+     case OT_COMMISSIONER_JOINER_END:
+         otbrLogInfo("Joiner end");
+         break;
+     case OT_COMMISSIONER_JOINER_REMOVED:
+         otbrLogInfo("Joiner remove");
++        if (aJoinerInfo->mType == OT_JOINER_INFO_TYPE_EUI64)
++        {
++            sprintf(sUciPath, "thread_devices.%s.status", sEUI64);
++            otbr::Utils::UciDel(sUciPath);
++        }
+         break;
+     }
+ }
+@@ -1085,9 +1432,10 @@ int UbusServer::UbusGetInformation(struc
+ 
+     otError error = OT_ERROR_NONE;
+ 
++    mNcpThreadMutex->lock();
++
+     blob_buf_init(&mBuf, 0);
+ 
+-    mNcpThreadMutex->lock();
+     if (!strcmp(aAction, "networkname"))
+         blobmsg_add_string(&mBuf, "NetworkName", otThreadGetNetworkName(mController->GetInstance()));
+     else if (!strcmp(aAction, "interfacename"))
+@@ -1216,18 +1564,24 @@ int UbusServer::UbusGetInformation(struc
+         otJoinerInfo joinerInfo;
+         uint16_t     iterator        = 0;
+         int          joinerNum       = 0;
+-        char         eui64[EXTPANID] = "";
++        char         eui64[17]       = "";
+ 
+         blob_buf_init(&mBuf, 0);
+ 
+         jsonArray = blobmsg_open_array(&mBuf, "joinerList");
+         while (otCommissionerGetNextJoinerInfo(mController->GetInstance(), &iterator, &joinerInfo) == OT_ERROR_NONE)
+         {
++            if (joinerInfo.mExpirationTime > 86400 * 1000)
++            {
++                continue;
++            }
++
+             memset(eui64, 0, sizeof(eui64));
+ 
+             jsonTable = blobmsg_open_table(&mBuf, nullptr);
+ 
+             blobmsg_add_string(&mBuf, "pskd", joinerInfo.mPskd.m8);
++            blobmsg_add_u64(&mBuf, "expiration_time", joinerInfo.mExpirationTime);
+ 
+             switch (joinerInfo.mType)
+             {
+@@ -1252,6 +1606,7 @@ int UbusServer::UbusGetInformation(struc
+         }
+         blobmsg_close_array(&mBuf, jsonArray);
+ 
++        blobmsg_add_u32(&mBuf, "joinernum_max", OPENTHREAD_CONFIG_COMMISSIONER_MAX_JOINER_ENTRIES);
+         blobmsg_add_u32(&mBuf, "joinernum", joinerNum);
+     }
+     else if (!strcmp(aAction, "macfilterstate"))
+@@ -1295,6 +1650,536 @@ int UbusServer::UbusGetInformation(struc
+ 
+         blobmsg_close_array(&mBuf, sJsonUri);
+     }
++#if OPENTHREAD_CONFIG_OPENWRT_EXTENSION
++    else if (!strcmp(aAction, "status"))
++    {
++        blobmsg_add_u16(&mBuf, "OpenThreadVersionAPI", OPENTHREAD_API_VERSION);
++        blobmsg_add_string(&mBuf, "OTBRVersion", otGetVersionString());
++        if (otThreadGetVersion() == 4)
++            blobmsg_add_string(&mBuf, "ThreadVersion", "v1.3");
++        else if (otThreadGetVersion() == 3)
++            blobmsg_add_string(&mBuf, "ThreadVersion", "v1.2");
++        else if (otThreadGetVersion() == 2)
++            blobmsg_add_string(&mBuf, "ThreadVersion", "v1.1");
++        else
++            blobmsg_add_string(&mBuf, "ThreadVersion", "unknown");
++
++        char extPanId[17]    = {0};
++        char networkKey[33]  = {0};
++        char PSKc[33]        = {0};
++        char extAddress[17]  = {0};
++        char passphrase[256] = {0};
++
++        char activeDataset[OT_OPERATIONAL_DATASET_MAX_LENGTH] = {0};
++
++        uint8_t rloc = otThreadGetDeviceRole(mController->GetInstance());
++
++        /* Network Item */
++        void *pNetwork = NULL;
++        pNetwork       = blobmsg_open_table(&mBuf, "Network");
++        blobmsg_add_u16(&mBuf, "Channel", otLinkGetChannel(mController->GetInstance()));
++
++        const uint8_t *pExtPanId =
++            reinterpret_cast<const uint8_t *>(otThreadGetExtendedPanId(mController->GetInstance()));
++        OutputBytes(pExtPanId, OT_EXT_PAN_ID_SIZE, extPanId);
++        blobmsg_add_string(&mBuf, "ExtPanId", extPanId);
++
++        otNetworkKey t_networkKey;
++        otThreadGetNetworkKey(mController->GetInstance(), &t_networkKey);
++        const uint8_t *pNetworkKey = reinterpret_cast<const uint8_t *>(t_networkKey.m8);
++        OutputBytes(pNetworkKey, OT_NETWORK_KEY_SIZE, networkKey);
++        blobmsg_add_string(&mBuf, "NetworkKey", networkKey);
++
++        blobmsg_add_string(&mBuf, "NetworkName", otThreadGetNetworkName(mController->GetInstance()));
++        blobmsg_add_u32(&mBuf, "PanId", otLinkGetPanId(mController->GetInstance()));
++
++        otPskc t_pskc;
++        otThreadGetPskc(mController->GetInstance(), &t_pskc);
++        const uint8_t *pPSKc = reinterpret_cast<const uint8_t *>(t_pskc.m8);
++        OutputBytes(pPSKc, OT_PSKC_MAX_SIZE, PSKc);
++        blobmsg_add_string(&mBuf, "PSKc", PSKc);
++
++        otbr::Utils::UciGet("otbr.otbr.passphrase", passphrase);
++        if (strlen(passphrase) != 0)
++            blobmsg_add_string(&mBuf, "Passphrase", passphrase);
++        // DefaultRouter
++        void *pOnMeshPrefix = nullptr;
++        pOnMeshPrefix       = blobmsg_open_array(&mBuf, "OnMeshPrefix");
++        if (pOnMeshPrefix)
++        {
++            otNetworkDataIterator iterator = OT_NETWORK_DATA_ITERATOR_INIT;
++            otBorderRouterConfig  config;
++            while (otNetDataGetNextOnMeshPrefix(mController->GetInstance(), &iterator, &config) == OT_ERROR_NONE)
++            {
++                char str[OT_IP6_ADDRESS_STRING_SIZE] = {0};
++                otIp6PrefixToString(&config.mPrefix, str, sizeof(str));
++                blobmsg_add_string(&mBuf, nullptr, str);
++            }
++            blobmsg_close_array(&mBuf, pOnMeshPrefix);
++        }
++
++        if (rloc != OT_DEVICE_ROLE_DISABLED && rloc != OT_DEVICE_ROLE_DETACHED)
++        {
++            void        *pLeaderdata = NULL;
++            otLeaderData leaderData;
++
++            pLeaderdata = blobmsg_open_table(&mBuf, "LeaderData");
++            if (pLeaderdata)
++            {
++                otThreadGetLeaderData(mController->GetInstance(), &leaderData);
++                blobmsg_add_u32(&mBuf, "PartitionId", leaderData.mPartitionId);
++                blobmsg_add_u32(&mBuf, "Weighting", leaderData.mWeighting);
++                blobmsg_add_u32(&mBuf, "DataVersion", leaderData.mDataVersion);
++                blobmsg_add_u32(&mBuf, "StableDataVersion", leaderData.mStableDataVersion);
++                blobmsg_add_u32(&mBuf, "LeaderRouterId", leaderData.mLeaderRouterId);
++                blobmsg_close_table(&mBuf, pLeaderdata);
++            }
++        }
++
++        char                     meshLocalPrefix[32] = {0};
++        const otMeshLocalPrefix *aPrefix             = otThreadGetMeshLocalPrefix(mController->GetInstance());
++        if (aPrefix != NULL)
++        {
++            sprintf(meshLocalPrefix, "%x:%x:%x:%x:", (aPrefix->m8[0] << 8) | aPrefix->m8[1],
++                    (aPrefix->m8[2] << 8) | aPrefix->m8[3], (aPrefix->m8[4] << 8) | aPrefix->m8[5],
++                    (aPrefix->m8[6] << 8) | aPrefix->m8[7]);
++            blobmsg_add_string(&mBuf, "MeshLocalPrefix", meshLocalPrefix);
++        }
++
++        void *pIPv6 = NULL;
++        pIPv6       = blobmsg_open_table(&mBuf, "IPv6");
++        if (pIPv6)
++        {
++            const otNetifAddress *unicastAddrs = otIp6GetUnicastAddresses(mController->GetInstance());
++            for (const otNetifAddress *addr = unicastAddrs; addr; addr = addr->mNext)
++            {
++                char string[OT_IP6_ADDRESS_STRING_SIZE];
++                otIp6AddressToString(&addr->mAddress, string, sizeof(string));
++                blobmsg_add_string(&mBuf, nullptr, string);
++            }
++            blobmsg_close_table(&mBuf, pIPv6);
++        }
++
++        otOperationalDatasetTlvs dataset;
++        otDatasetGetActiveTlvs(mController->GetInstance(), &dataset);
++        OutputBytes(dataset.mTlvs, dataset.mLength, activeDataset);
++        blobmsg_add_string(&mBuf, "ActiveDataset", activeDataset);
++
++        char borderAgentIdString[OT_BORDER_AGENT_ID_LENGTH * 2 + 1] = {0};
++        otBorderAgentId id;
++        otBorderAgentGetId(mController->GetInstance(), &id);
++        OutputBytes(id.mId, OT_BORDER_AGENT_ID_LENGTH, borderAgentIdString);
++        blobmsg_add_string(&mBuf, "BorderAgentID", borderAgentIdString);
++
++        blobmsg_close_table(&mBuf, pNetwork);
++
++        /* RCP Item */
++        void *pRCP = NULL;
++        pRCP       = blobmsg_open_table(&mBuf, "RCP");
++        if (pRCP)
++        {
++            if (rloc == OT_DEVICE_ROLE_DISABLED)
++                blobmsg_add_u16(&mBuf, "State", 0);
++            else if (rloc == OT_DEVICE_ROLE_DETACHED)
++                blobmsg_add_u16(&mBuf, "State", 1);
++            else if (rloc == OT_DEVICE_ROLE_CHILD)
++                blobmsg_add_u16(&mBuf, "State", 2);
++            else if (rloc == OT_DEVICE_ROLE_ROUTER)
++                blobmsg_add_u16(&mBuf, "State", 3);
++            else if (rloc == OT_DEVICE_ROLE_LEADER)
++                blobmsg_add_u16(&mBuf, "State", 4);
++            const uint8_t *pExtAddress =
++                reinterpret_cast<const uint8_t *>(otLinkGetExtendedAddress(mController->GetInstance()));
++            OutputBytes(pExtAddress, OT_EXT_ADDRESS_SIZE, extAddress);
++            blobmsg_add_string(&mBuf, "ExtAddress", extAddress);
++            blobmsg_add_u32(&mBuf, "Rloc16", otThreadGetRloc16(mController->GetInstance()));
++            blobmsg_close_table(&mBuf, pRCP);
++        }
++
++        /* SRP Item */
++        void *pSRP = NULL;
++        pSRP       = blobmsg_open_table(&mBuf, "SRP");
++        if (pSRP)
++        {
++            blobmsg_add_u32(&mBuf, "ServerState", otSrpServerGetState(mController->GetInstance()));
++            blobmsg_add_string(&mBuf, "ServerDomain", otSrpServerGetDomain(mController->GetInstance()));
++            blobmsg_close_table(&mBuf, pSRP);
++        }
++
++        /* Commissioner Item*/
++        void *pCommissioner = NULL;
++        pCommissioner       = blobmsg_open_table(&mBuf, "Commissioner");
++        if (pCommissioner)
++        {
++            blobmsg_add_u32(&mBuf, "State", otCommissionerGetState(mController->GetInstance()));
++            blobmsg_close_table(&mBuf, pCommissioner);
++        }
++    }
++    else if (!strcmp(aAction, "txpower"))
++    {
++        int8_t power;
++        otPlatRadioGetTransmitPower(mController->GetInstance(), &power);
++        blobmsg_add_u32(&mBuf, "TXPower", power);
++    }
++    else if (!strcmp(aAction, "joinerstate"))
++    {
++        blobmsg_add_u32(&mBuf, "State", otJoinerGetState(mController->GetInstance()));
++    }
++#if OTBR_ENABLE_BACKBONE_ROUTER
++    else if (!strcmp(aAction, "bbrstatus"))
++    {
++        switch (otBackboneRouterGetState(mController->GetInstance()))
++        {
++        case OT_BACKBONE_ROUTER_STATE_DISABLED:
++            blobmsg_add_string(&mBuf, "State", "Disabled");
++            break;
++        case OT_BACKBONE_ROUTER_STATE_SECONDARY:
++            blobmsg_add_string(&mBuf, "State", "Secondary");
++            break;
++        case OT_BACKBONE_ROUTER_STATE_PRIMARY:
++            blobmsg_add_string(&mBuf, "State", "Primary");
++            break;
++        default:
++            blobmsg_add_string(&mBuf, "State", "Disabled");
++            break;
++        }
++
++        otBackboneRouterConfig config;
++        if (otBackboneRouterGetPrimary(mController->GetInstance(), &config) == OT_ERROR_NONE)
++        {
++            blobmsg_add_u32(&mBuf, "MlrTimeout", config.mMlrTimeout);
++            blobmsg_add_u32(&mBuf, "SequenceNumber", config.mReregistrationDelay);
++            blobmsg_add_u32(&mBuf, "ReregistrationDelay", config.mReregistrationDelay);
++            blobmsg_add_u32(&mBuf, "Jitter", otBackboneRouterGetRegistrationJitter(mController->GetInstance()));
++        }
++    }
++#endif
++    else if (!strcmp(aAction, "srpsrvconfig"))
++    {
++        otSrpServerLeaseConfig leaseConfig;
++        otSrpServerGetLeaseConfig(mController->GetInstance(), &leaseConfig);
++        blobmsg_add_u32(&mBuf, "MinLease", leaseConfig.mMinLease);
++        blobmsg_add_u32(&mBuf, "MaxLease", leaseConfig.mMaxLease);
++        blobmsg_add_u32(&mBuf, "MinKeyLease", leaseConfig.mMinKeyLease);
++        blobmsg_add_u32(&mBuf, "MaxKeyLease", leaseConfig.mMaxKeyLease);
++        blobmsg_add_u8(&mBuf, "Enable", (otSrpServerGetState(mController->GetInstance()) == 1) ? true : false);
++        blobmsg_add_string(&mBuf, "DomainName", otSrpServerGetDomain(mController->GetInstance()));
++        blobmsg_add_u32(&mBuf, "SeqNum", otSrpServerGetAnycastModeSequenceNumber(mController->GetInstance()));
++    }
++    else if (!strcmp(aAction, "srpsrvservice"))
++    {
++        static constexpr char *kAnyServiceName  = nullptr;
++        static constexpr char *kAnyInstanceName = nullptr;
++
++        const otSrpServerHost *host = nullptr;
++
++        void *pServices = nullptr;
++        pServices       = blobmsg_open_array(&mBuf, "Services");
++
++        while ((host = otSrpServerGetNextHost(mController->GetInstance(), host)) != nullptr)
++        {
++            const otSrpServerService *service = nullptr;
++
++            while ((service = otSrpServerHostFindNextService(host, service, OT_SRP_SERVER_FLAGS_BASE_TYPE_SERVICE_ONLY,
++                                                             kAnyServiceName, kAnyInstanceName)) != nullptr)
++            {
++                bool                      isDeleted    = otSrpServerServiceIsDeleted(service);
++                const char               *instanceName = otSrpServerServiceGetInstanceName(service);
++                const otSrpServerService *subService   = nullptr;
++                const uint8_t            *txtData;
++                uint16_t                  txtDataLength;
++                bool                      hasSubType = false;
++                otSrpServerLeaseInfo      leaseInfo;
++
++                void *pService = blobmsg_open_table(&mBuf, nullptr);
++                if (pService)
++                {
++                    blobmsg_add_string(&mBuf, "InstanceName", instanceName);
++                    blobmsg_add_u8(&mBuf, "Deleted", isDeleted);
++
++                    if (isDeleted)
++                    {
++                        blobmsg_close_table(&mBuf, pService);
++                        continue;
++                    }
++
++                    otSrpServerServiceGetLeaseInfo(service, &leaseInfo);
++                    blobmsg_add_u32(&mBuf, "Lease", leaseInfo.mLease / 1000);
++                    blobmsg_add_u32(&mBuf, "KeyLease", leaseInfo.mKeyLease / 1000);
++
++                    char subtypes[256] = {0};
++                    while ((subService = otSrpServerHostFindNextService(
++                                host, subService,
++                                (OT_SRP_SERVER_SERVICE_FLAG_SUB_TYPE | OT_SRP_SERVER_SERVICE_FLAG_ACTIVE),
++                                kAnyServiceName, instanceName)) != nullptr)
++                    {
++                        char subLabel[OT_DNS_MAX_LABEL_SIZE];
++                        otSrpServerServiceGetServiceSubTypeLabel(subService, subLabel, sizeof(subLabel));
++                        if (!hasSubType)
++                        {
++                            strcat(subtypes, subLabel);
++                        }
++                        else
++                        {
++                            strcat(subtypes, ",");
++                            strcat(subtypes, subLabel);
++                        }
++                        hasSubType = true;
++                    }
++                    blobmsg_add_string(&mBuf, "Subtypes", subtypes);
++
++                    blobmsg_add_u32(&mBuf, "Port", otSrpServerServiceGetPort(service));
++                    blobmsg_add_u32(&mBuf, "Priority", otSrpServerServiceGetPriority(service));
++                    blobmsg_add_u32(&mBuf, "Weight", otSrpServerServiceGetWeight(service));
++                    blobmsg_add_u32(&mBuf, "Ttl", otSrpServerServiceGetTtl(service));
++
++                    txtData = otSrpServerServiceGetTxtData(service, &txtDataLength);
++                    if (txtDataLength > 0)
++                    {
++                        otDnsTxtEntry         entry;
++                        otDnsTxtEntryIterator iterator;
++
++                        void *pTXT = blobmsg_open_array(&mBuf, "TXT");
++                        if (pTXT)
++                        {
++                            otDnsInitTxtEntryIterator(&iterator, txtData, txtDataLength);
++
++                            while (otDnsGetNextTxtEntry(&iterator, &entry) == OT_ERROR_NONE)
++                            {
++                                char item[256] = {0};
++                                if (entry.mKey == nullptr)
++                                {
++                                    OutputBytes(entry.mValue, entry.mValueLength, item);
++                                }
++                                else
++                                {
++                                    strcat(item, entry.mKey);
++
++                                    if (entry.mValue != nullptr)
++                                    {
++                                        char value[256] = {0};
++                                        strcat(item, "=");
++                                        snprintf(value, entry.mValueLength + 1, "%s", entry.mValue);
++                                        strcat(item, value);
++                                    }
++                                }
++                                blobmsg_add_string(&mBuf, nullptr, item);
++                            }
++                            blobmsg_close_array(&mBuf, pTXT);
++                        }
++                    }
++
++                    blobmsg_add_string(&mBuf, "Host", otSrpServerHostGetFullName(host));
++
++                    void *pAddress = NULL;
++                    pAddress       = blobmsg_open_array(&mBuf, "Address");
++                    if (pAddress)
++                    {
++                        const otIp6Address *addresses;
++                        uint8_t             addressesNum;
++
++                        addresses = otSrpServerHostGetAddresses(host, &addressesNum);
++
++                        for (uint8_t i = 0; i < addressesNum; ++i)
++                        {
++                            char string[OT_IP6_ADDRESS_STRING_SIZE];
++                            otIp6AddressToString(&addresses[i], string, sizeof(string));
++                            blobmsg_add_string(&mBuf, nullptr, string);
++                        }
++                        blobmsg_close_array(&mBuf, pAddress);
++                    }
++                    blobmsg_close_table(&mBuf, pService);
++                }
++            }
++        }
++        blobmsg_close_array(&mBuf, pServices);
++    }
++    else if (!strcmp(aAction, "localaddr"))
++    {
++        char address[OT_IP6_ADDRESS_STRING_SIZE];
++
++        memset(address, 0, sizeof(address));
++
++        const otNetifAddress *unicastAddrs = otIp6GetUnicastAddresses(mController->GetInstance());
++        for (const otNetifAddress *addr = unicastAddrs; addr; addr = addr->mNext)
++        {
++            if (addr->mAddressOrigin == OT_ADDRESS_ORIGIN_SLAAC)
++            {
++                otIp6AddressToString(&addr->mAddress, address, sizeof(address));
++                break;
++            }
++        }
++
++        blobmsg_add_string(&mBuf, "localaddr", address);
++    }
++    else if (!strcmp(aAction, "activetimestamp"))
++    {
++        otOperationalDataset dataset;
++        SuccessOrExit(error = otDatasetGetActive(mController->GetInstance(), &dataset));
++        blobmsg_add_u64(&mBuf, "ActiveTimestamp", dataset.mActiveTimestamp.mSeconds);
++    }
++    else if (!strcmp(aAction, "bufferinfo"))
++    {
++        otBufferInfo bufferInfo;
++        otMessageGetBufferInfo(mController->GetInstance(), &bufferInfo);
++
++        blobmsg_add_u32(&mBuf, "TotalBuffers", bufferInfo.mTotalBuffers);
++        blobmsg_add_u32(&mBuf, "FreeBuffers", bufferInfo.mFreeBuffers);
++
++        blobmsg_add_u32(&mBuf, "6loSendQueue.NumMessages", bufferInfo.m6loSendQueue.mNumMessages);
++        blobmsg_add_u32(&mBuf, "6loSendQueue.NumBuffers", bufferInfo.m6loSendQueue.mNumBuffers);
++        blobmsg_add_u32(&mBuf, "6loSendQueue.TotalBytes", bufferInfo.m6loSendQueue.mTotalBytes);
++
++        blobmsg_add_u32(&mBuf, "6loReassemblyQueue.NumMessages", bufferInfo.m6loReassemblyQueue.mNumMessages);
++        blobmsg_add_u32(&mBuf, "6loReassemblyQueue.NumBuffers", bufferInfo.m6loReassemblyQueue.mNumBuffers);
++        blobmsg_add_u32(&mBuf, "6loReassemblyQueue.TotalBytes", bufferInfo.m6loReassemblyQueue.mTotalBytes);
++
++        blobmsg_add_u32(&mBuf, "Ip6Queue.NumMessages", bufferInfo.mIp6Queue.mNumMessages);
++        blobmsg_add_u32(&mBuf, "Ip6Queue.NumBuffers", bufferInfo.mIp6Queue.mNumBuffers);
++        blobmsg_add_u32(&mBuf, "Ip6Queue.TotalBytes", bufferInfo.mIp6Queue.mTotalBytes);
++
++        blobmsg_add_u32(&mBuf, "MplQueue.NumMessages", bufferInfo.mMplQueue.mNumMessages);
++        blobmsg_add_u32(&mBuf, "MplQueue.NumBuffers", bufferInfo.mMplQueue.mNumBuffers);
++        blobmsg_add_u32(&mBuf, "MplQueue.TotalBytes", bufferInfo.mMplQueue.mTotalBytes);
++
++        blobmsg_add_u32(&mBuf, "MleQueue.NumMessages", bufferInfo.mMleQueue.mNumMessages);
++        blobmsg_add_u32(&mBuf, "MleQueue.NumBuffers", bufferInfo.mMleQueue.mNumBuffers);
++        blobmsg_add_u32(&mBuf, "MleQueue.TotalBytes", bufferInfo.mMleQueue.mTotalBytes);
++
++        blobmsg_add_u32(&mBuf, "CoapQueue.NumMessages", bufferInfo.mCoapQueue.mNumMessages);
++        blobmsg_add_u32(&mBuf, "CoapQueue.NumBuffers", bufferInfo.mCoapQueue.mNumBuffers);
++        blobmsg_add_u32(&mBuf, "CoapQueue.TotalBytes", bufferInfo.mCoapQueue.mTotalBytes);
++
++        blobmsg_add_u32(&mBuf, "CoapSecureQueue.NumMessages", bufferInfo.mCoapSecureQueue.mNumMessages);
++        blobmsg_add_u32(&mBuf, "CoapSecureQueue.NumBuffers", bufferInfo.mCoapSecureQueue.mNumBuffers);
++        blobmsg_add_u32(&mBuf, "CoapSecureQueue.TotalBytes", bufferInfo.mCoapSecureQueue.mTotalBytes);
++
++        blobmsg_add_u32(&mBuf, "ApplicationCoapQueue.NumMessages", bufferInfo.mApplicationCoapQueue.mNumMessages);
++        blobmsg_add_u32(&mBuf, "ApplicationCoapQueue.NumBuffers", bufferInfo.mApplicationCoapQueue.mNumBuffers);
++        blobmsg_add_u32(&mBuf, "ApplicationCoapQueue.TotalBytes", bufferInfo.mApplicationCoapQueue.mTotalBytes);
++    }
++    else if (!strcmp(aAction, "services"))
++    {
++        otNetworkDataIterator iterator = OT_NETWORK_DATA_ITERATOR_INIT;
++        otServiceConfig       config;
++
++        void *pServices = nullptr;
++        pServices       = blobmsg_open_array(&mBuf, "Services");
++        if (pServices)
++        {
++            while (otNetDataGetNextService(mController->GetInstance(), &iterator, &config) == OT_ERROR_NONE)
++            {
++                void *pService = blobmsg_open_table(&mBuf, nullptr);
++                if (pService)
++                {
++                    char aServicesData[64] = {0};
++                    char aServerData[64]   = {0};
++
++                    blobmsg_add_u16(&mBuf, "ServiceId", config.mServiceId);
++                    blobmsg_add_u32(&mBuf, "EnterpriseNumber", config.mEnterpriseNumber);
++                    blobmsg_add_u16(&mBuf, "ServiceDataLength", config.mServiceDataLength);
++                    OutputBytes(config.mServiceData, config.mServiceDataLength, aServicesData);
++                    blobmsg_add_string(&mBuf, "ServicesData", aServicesData);
++                    if (!strcmp(aServicesData, "01"))
++                    {
++                        blobmsg_add_string(&mBuf, "ServicesName", "BBR");
++                    }
++                    else if (!strcmp(aServicesData, "5d"))
++                    {
++                        blobmsg_add_string(&mBuf, "ServicesName", "SRP server");
++                    }
++
++                    blobmsg_add_u16(&mBuf, "ServerDataLength", config.mServerConfig.mServerDataLength);
++                    OutputBytes(config.mServerConfig.mServerData, config.mServerConfig.mServerDataLength, aServerData);
++                    blobmsg_add_string(&mBuf, "ServerData", aServerData);
++                    blobmsg_add_u8(&mBuf, "Stable", config.mServerConfig.mStable);
++                    blobmsg_add_u32(&mBuf, "Rloc16", config.mServerConfig.mRloc16);
++                    blobmsg_close_table(&mBuf, pService);
++                }
++            }
++            blobmsg_close_table(&mBuf, pServices);
++        }
++    }
++    else if (!strcmp(aAction, "neighbortable"))
++    {
++        otNeighborInfo         neighborInfo;
++        otNeighborInfoIterator iterator                  = OT_NEIGHBOR_INFO_ITERATOR_INIT;
++        void                  *jsonList                  = nullptr;
++        char                   extAddress[XPANID_LENGTH] = "";
++        void                  *pMode                     = nullptr;
++        uint16_t               NeighborNumber            = 0;
++        void                  *pNeighborList             = nullptr;
++
++        pNeighborList = blobmsg_open_array(&mBuf, "NeighborList");
++        while (otThreadGetNextNeighborInfo(mController->GetInstance(), &iterator, &neighborInfo) == OT_ERROR_NONE)
++        {
++            jsonList = blobmsg_open_table(&mBuf, nullptr);
++
++            blobmsg_add_string(&mBuf, "Role", neighborInfo.mIsChild ? "C" : "R");
++
++            blobmsg_add_u32(&mBuf, "Rloc16", neighborInfo.mRloc16);
++
++            blobmsg_add_u32(&mBuf, "Age", neighborInfo.mAge);
++
++            blobmsg_add_u32(&mBuf, "AvgRssi", neighborInfo.mAverageRssi);
++
++            blobmsg_add_u32(&mBuf, "LastRssi", neighborInfo.mLastRssi);
++
++            pMode = blobmsg_open_table(&mBuf, "Mode");
++            if (pMode)
++            {
++                blobmsg_add_u32(&mBuf, "RxOnWhenIdle", neighborInfo.mRxOnWhenIdle);
++                blobmsg_add_u32(&mBuf, "DeviceType", neighborInfo.mFullThreadDevice);
++                blobmsg_add_u32(&mBuf, "NetworkData", neighborInfo.mFullNetworkData);
++                blobmsg_close_table(&mBuf, pMode);
++            }
++
++            OutputBytes(neighborInfo.mExtAddress.m8, sizeof(neighborInfo.mExtAddress.m8), extAddress);
++            blobmsg_add_string(&mBuf, "ExtAddress", extAddress);
++
++            blobmsg_add_u16(&mBuf, "LinkQualityIn", neighborInfo.mLinkQualityIn);
++
++            blobmsg_close_table(&mBuf, jsonList);
++
++            memset(extAddress, 0, sizeof(extAddress));
++            NeighborNumber++;
++        }
++        blobmsg_close_array(&mBuf, pNeighborList);
++        blobmsg_add_u32(&mBuf, "NeighborNumber", NeighborNumber);
++    }
++    else if (!strcmp(aAction, "nat64status"))
++    {
++        static const char *const kNat64State[] = {"Disabled", "NotRunning", "Idle", "Active"};
++        blobmsg_add_string(&mBuf, "PrefixManager", kNat64State[otNat64GetPrefixManagerState(mController->GetInstance())]);
++        blobmsg_add_string(&mBuf, "Translator", kNat64State[otNat64GetTranslatorState(mController->GetInstance())]);
++
++        otIp4Cidr cidr;
++        char cidrString[OT_IP4_CIDR_STRING_SIZE];
++        otNat64GetCidr(mController->GetInstance(), &cidr);
++        otIp4CidrToString(&cidr, cidrString, sizeof(cidrString));
++        blobmsg_add_string(&mBuf, "Cidr", cidrString);
++
++        void *pMappings = nullptr;
++        otNat64AddressMappingIterator iterator;
++        otNat64AddressMapping         mapping;
++        pMappings = blobmsg_open_array(&mBuf, "Mappings");
++        otNat64InitAddressMappingIterator(mController->GetInstance(), &iterator);
++        while (otNat64GetNextAddressMapping(mController->GetInstance(), &iterator, &mapping) == OT_ERROR_NONE)
++        {
++            char ip4AddressString[OT_IP4_ADDRESS_STRING_SIZE];
++            char ip6AddressString[OT_IP6_PREFIX_STRING_SIZE];
++            otIp6AddressToString(&mapping.mIp6, ip6AddressString, sizeof(ip6AddressString));
++            otIp4AddressToString(&mapping.mIp4, ip4AddressString, sizeof(ip4AddressString));
++
++            void *item = nullptr;
++            item = blobmsg_open_table(&mBuf, nullptr);
++            blobmsg_add_string(&mBuf, "ipv4", ip4AddressString);
++            blobmsg_add_string(&mBuf, "ipv6", ip6AddressString);
++            blobmsg_close_table(&mBuf, item);
++        }
++        blobmsg_close_array(&mBuf, pMappings);
++    }
++#endif
+     else
+     {
+         perror("invalid argument in get information ubus\n");
+@@ -1436,9 +2321,10 @@ int UbusServer::UbusSetInformation(struc
+ 
+     otError error = OT_ERROR_NONE;
+ 
++    mNcpThreadMutex->lock();
++
+     blob_buf_init(&mBuf, 0);
+ 
+-    mNcpThreadMutex->lock();
+     if (!strcmp(aAction, "networkname"))
+     {
+         struct blob_attr *tb[SET_NETWORK_MAX];
+@@ -1471,6 +2357,7 @@ int UbusServer::UbusSetInformation(struc
+             long  value;
+             char *panid = blobmsg_get_string(tb[SETNETWORK]);
+             SuccessOrExit(error = ParseLong(panid, value));
++            SuccessOrExit(error = (value > 65535) ? OT_ERROR_INVALID_ARGS : OT_ERROR_NONE);
+             error = otLinkSetPanId(mController->GetInstance(), static_cast<otPanId>(value));
+         }
+     }
+@@ -1606,6 +2493,81 @@ int UbusServer::UbusSetInformation(struc
+     {
+         otLinkFilterClearAddresses(mController->GetInstance());
+     }
++    else if (!strcmp(aAction, "loglevel"))
++    {
++        struct blob_attr *tb[SET_NETWORK_MAX];
++        blobmsg_parse(setLogLevelPolicy, SET_NETWORK_MAX, tb, blob_data(aMsg), blob_len(aMsg));
++        if (tb[SETNETWORK] != nullptr)
++        {
++            uint8_t level = blobmsg_get_u32(tb[SETNETWORK]);
++            SuccessOrExit(error = otLoggingSetLevel(static_cast<otLogLevel>(level)));
++        }
++    }
++    else if (!strcmp(aAction, "setsrpsrvconfig"))
++    {
++        struct blob_attr *tb[SET_SRPSRVCONFIG_MAX];
++        blobmsg_parse(setSrpSrvConfigPolicy, SET_SRPSRVCONFIG_MAX, tb, blob_data(aMsg), blob_len(aMsg));
++
++        otSrpServerSetEnabled(mController->GetInstance(), false);
++
++        if ((tb[MINLEASE] != nullptr) && (tb[MAXLEASE] != nullptr) && (tb[KEYMINLEASE] != nullptr) &&
++            (tb[KEYMAXLEASE] != nullptr))
++        {
++            otSrpServerLeaseConfig leaseConfig;
++            leaseConfig.mMinLease    = blobmsg_get_u32(tb[MINLEASE]);
++            leaseConfig.mMaxLease    = blobmsg_get_u32(tb[MAXLEASE]);
++            leaseConfig.mMinKeyLease = blobmsg_get_u32(tb[KEYMINLEASE]);
++            leaseConfig.mMaxKeyLease = blobmsg_get_u32(tb[KEYMAXLEASE]);
++            SuccessOrExit(error = otSrpServerSetLeaseConfig(mController->GetInstance(), &leaseConfig));
++        }
++        if (tb[DOMAINNAME] != nullptr)
++        {
++            otSrpServerSetDomain(mController->GetInstance(), blobmsg_get_string(tb[DOMAINNAME]));
++        }
++        if (tb[SEQNUM] != nullptr)
++        {
++            SuccessOrExit(error = otSrpServerSetAnycastModeSequenceNumber(mController->GetInstance(),
++                                                                          blobmsg_get_u16(tb[SEQNUM])));
++        }
++        if (tb[ENABLE] != nullptr)
++        {
++            otSrpServerSetEnabled(mController->GetInstance(), blobmsg_get_bool(tb[ENABLE]));
++        }
++    }
++#if OTBR_ENABLE_BACKBONE_ROUTER
++    else if (!strcmp(aAction, "setbbrconfig"))
++    {
++        struct blob_attr *tb[SET_BBR_CONFIG_MAX];
++        blobmsg_parse(setBBRConfigPolicy, SET_BBR_CONFIG_MAX, tb, blob_data(aMsg), blob_len(aMsg));
++        if (tb[BBR_ENABLE] != nullptr)
++        {
++            otBackboneRouterSetEnabled(mController->GetInstance(), blobmsg_get_bool(tb[BBR_ENABLE]));
++        }
++        if ((tb[BBR_SEQNO] != nullptr) || (tb[BBR_DELAY] != nullptr) || (tb[BBR_TIMEOUT] != nullptr))
++        {
++            otBackboneRouterConfig config;
++            otBackboneRouterGetConfig(mController->GetInstance(), &config);
++            config.mSequenceNumber      = blobmsg_get_u32(tb[BBR_SEQNO]);
++            config.mReregistrationDelay = blobmsg_get_u32(tb[BBR_DELAY]);
++            config.mMlrTimeout          = blobmsg_get_u32(tb[BBR_TIMEOUT]);
++            SuccessOrExit(error = otBackboneRouterSetConfig(mController->GetInstance(), &config));
++        }
++        if (tb[BBR_JITTER] != nullptr)
++        {
++            otBackboneRouterSetRegistrationJitter(mController->GetInstance(), blobmsg_get_u32(tb[BBR_JITTER]));
++        }
++    }
++#endif
++    else if (!strcmp(aAction, "setnat64config"))
++    {
++        struct blob_attr *tb[SET_NAT64_MAX];
++        blobmsg_parse(setNat64ConfigPolicy, SET_NAT64_MAX, tb, blob_data(aMsg), blob_len(aMsg));
++
++        if (tb[NAT64_ENABLE] != nullptr)
++        {
++            otNat64SetEnabled(mController->GetInstance(), blobmsg_get_bool(tb[NAT64_ENABLE]));
++        }
++    }
+     else
+     {
+         perror("invalid argument in get information ubus\n");
+@@ -1689,6 +2651,63 @@ void UbusServer::UbusConnectionLost(stru
+     UbusReconnTimer(nullptr);
+ }
+ 
++#if OPENTHREAD_CONFIG_OPENWRT_EXTENSION
++void UbusServer::UbusWatchdogTimer(struct uloop_timeout *aTimeout)
++{
++    GetInstance().UbusWatchdogTimerDetail(aTimeout);
++}
++
++void UbusServer::UbusWatchdogTimerDetail(struct uloop_timeout *aTimeout)
++{
++    OT_UNUSED_VARIABLE(aTimeout);
++
++    static struct uloop_timeout retry = {
++        list : {},
++        pending : false,
++        cb : UbusWatchdogTimer,
++        time : {},
++    };
++    int time = 30;
++
++    otbr::ubus::UbusServer::GetInstance().SendEvent(OT_EVENT_OTBR_WATCHDOG);
++
++    uloop_timeout_set(&retry, time * 1000);
++}
++
++void UbusServer::HandleNetifStateChanged(uint32_t aFlags, void *aContext)
++{
++    OT_UNUSED_VARIABLE(aFlags);
++    if ((aFlags & OT_CHANGED_THREAD_ROLE) != 0)
++    {
++        switch (otThreadGetDeviceRole(static_cast<otInstance *>(aContext)))
++        {
++        case OT_DEVICE_ROLE_DISABLED:
++            otbr::ubus::UbusServer::GetInstance().SendEvent(OT_EVENT_OTBR_DISABLED);
++            break;
++        case OT_DEVICE_ROLE_CHILD:
++        case OT_DEVICE_ROLE_ROUTER:
++        case OT_DEVICE_ROLE_LEADER:
++            otbr::ubus::UbusServer::GetInstance().SendEvent(OT_EVENT_OTBR_ENABLED);
++            break;
++        default:
++            break;
++        }
++    }
++}
++
++void UbusServer::HandleNeighborTableChanged(otNeighborTableEvent aEvent, const otNeighborTableEntryInfo *aEntry)
++{
++    GetInstance().HandleNeighborTableChanged(aEvent, *aEntry);
++}
++
++void UbusServer::HandleNeighborTableChanged(otNeighborTableEvent aEvent, const otNeighborTableEntryInfo &aEntry)
++{
++    OT_UNUSED_VARIABLE(aEvent);
++    OT_UNUSED_VARIABLE(aEntry);
++    otbr::ubus::UbusServer::GetInstance().SendEvent(OT_EVENT_OTBR_NEIGHBOR_TABLE_CHANGED);
++}
++#endif
++
+ int UbusServer::DisplayUbusInit(const char *aPath)
+ {
+     uloop_init();
+@@ -1738,6 +2757,15 @@ void UbusServer::InstallUbusObject(void)
+         return;
+     }
+ 
++#if OPENTHREAD_CONFIG_OPENWRT_EXTENSION
++    otSetStateChangedCallback(mController->GetInstance(), &UbusServer::HandleNetifStateChanged,
++                              mController->GetInstance());
++    otThreadRegisterNeighborTableCallback(mController->GetInstance(), &UbusServer::HandleNeighborTableChanged);
++    otbr::ubus::UbusServer::GetInstance().SendEvent(OT_EVENT_OTBR_INIT);
++
++    UbusWatchdogTimer(nullptr);
++#endif
++
+     otbrLogInfo("Uloop run");
+     uloop_run();
+ 
+Index: ot-br-posix-2023-7-12-r4.3.1/src/openwrt/ubus/otubus.hpp
+===================================================================
+--- ot-br-posix-2023-7-12-r4.3.1.orig/src/openwrt/ubus/otubus.hpp
++++ ot-br-posix-2023-7-12-r4.3.1/src/openwrt/ubus/otubus.hpp
+@@ -42,6 +42,7 @@
+ #include <openthread/ip6.h>
+ #include <openthread/link.h>
+ #include <openthread/netdiag.h>
++#include <openthread/thread_ftd.h>
+ #include <openthread/udp.h>
+ 
+ #include "common/code_utils.hpp"
+@@ -786,6 +787,108 @@ public:
+      */
+     void HandleDiagnosticGetResponse(otError aError, otMessage *aMessage, const otMessageInfo *aMessageInfo);
+ 
++#if OPENTHREAD_CONFIG_OPENWRT_EXTENSION
++    void SendEvent(int aEvent);
++
++    static int UbusThreadStatusHandle(struct ubus_context *     aContext,
++                                      struct ubus_object *      aObj,
++                                      struct ubus_request_data *aRequest,
++                                      const char *              aMethod,
++                                      struct blob_attr *        aMsg);
++    static int UbusThreadGraphHandle(struct ubus_context *     aContext,
++                                     struct ubus_object *      aObj,
++                                     struct ubus_request_data *aRequest,
++                                     const char *              aMethod,
++                                     struct blob_attr *        aMsg);
++    static int UbusTxPowerHandle(struct ubus_context *     aContext,
++                                 struct ubus_object *      aObj,
++                                 struct ubus_request_data *aRequest,
++                                 const char *              aMethod,
++                                 struct blob_attr *        aMsg);
++    static int UbusJoinerStateHandle(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusCommissionerStopHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusCommissionerStateHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++#if OTBR_ENABLE_BACKBONE_ROUTER
++    static int UbusBackboneRouterStatusHandle(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusSetBackboneRouterConfigHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++#endif
++    static int UbusSetLogLevelHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusSrpServerConfigHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusSrpServerServiceHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusSetSrpServerConfigHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusLocalAddrHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusActiveTimestampHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusBufferInfoHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusServicesInfoHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusNeighborTableHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusNat64StatusHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++    static int UbusSetNat64ConfigHandler(struct ubus_context *     aContext,
++                                  struct ubus_object *      aObj,
++                                  struct ubus_request_data *aRequest,
++                                  const char *              aMethod,
++                                  struct blob_attr *        aMsg);
++#endif
++
+ private:
+     bool                       mIfFinishScan;
+     struct ubus_context       *mContext;
+@@ -1141,6 +1244,16 @@ private:
+      *
+      */
+     void AppendResult(otError aError, struct ubus_context *aContext, struct ubus_request_data *aRequest);
++
++#if OPENTHREAD_CONFIG_OPENWRT_EXTENSION
++    static void UbusWatchdogTimer(struct uloop_timeout *aTimeout);
++    void UbusWatchdogTimerDetail(struct uloop_timeout *aTimeout);
++
++    static void HandleNetifStateChanged(uint32_t aFlags, void *aContext);
++
++    static void HandleNeighborTableChanged(otNeighborTableEvent aEvent, const otNeighborTableEntryInfo *aEntry);
++    void        HandleNeighborTableChanged(otNeighborTableEvent aEvent, const otNeighborTableEntryInfo &aEntry);
++#endif
+ };
+ 
+ class UBusAgent : public MainloopProcessor
diff --git a/ot-br-posix/patches/0012-improve-agent.patch b/ot-br-posix/patches/0012-improve-agent.patch
new file mode 100644
index 00000000..07f57d00
--- /dev/null
+++ b/ot-br-posix/patches/0012-improve-agent.patch
@@ -0,0 +1,128 @@
+Index: ot-br-posix-2023-5-17-r4.3.0/src/agent/main.cpp
+===================================================================
+--- ot-br-posix-2023-5-17-r4.3.0.orig/src/agent/main.cpp
++++ ot-br-posix-2023-5-17-r4.3.0/src/agent/main.cpp
+@@ -77,6 +77,7 @@ enum
+     OTBR_OPT_AUTO_ATTACH,
+     OTBR_OPT_REST_LISTEN_ADDR,
+     OTBR_OPT_REST_LISTEN_PORT,
++    OTBR_OPT_RADIO_EUI64,
+ };
+ 
+ static jmp_buf            sResetJump;
+@@ -94,6 +95,7 @@ static const struct option kOptions[] =
+     {"auto-attach", optional_argument, nullptr, OTBR_OPT_AUTO_ATTACH},
+     {"rest-listen-address", required_argument, nullptr, OTBR_OPT_REST_LISTEN_ADDR},
+     {"rest-listen-port", required_argument, nullptr, OTBR_OPT_REST_LISTEN_PORT},
++    {"radio-eui64", no_argument, nullptr, OTBR_OPT_RADIO_EUI64},
+     {0, 0, 0, 0}};
+ 
+ static bool ParseInteger(const char *aStr, long &aOutResult)
+@@ -187,6 +189,58 @@ static void PrintRadioVersionAndExit(con
+     exit(EXIT_SUCCESS);
+ }
+ 
++static void PrintRadioEUI64AndExit(const std::vector<const char *> &aRadioUrls)
++{
++    otbr::Ncp::ControllerOpenThread ncpOpenThread{/* aInterfaceName */ "", aRadioUrls, /* aBackboneInterfaceName */ "",
++                                                  /* aDryRun */ true, /* aEnableAutoAttach */ false};
++
++    ncpOpenThread.Init();
++
++    char sEUI64[32] = {0};
++    otExtAddress eui64Address;
++    otLinkGetFactoryAssignedIeeeEui64(ncpOpenThread.GetInstance(), &eui64Address);
++    sprintf(sEUI64, "%02x%02x%02x%02x%02x%02x%02x%02x", eui64Address.m8[0], eui64Address.m8[1], eui64Address.m8[2],
++        eui64Address.m8[3], eui64Address.m8[4], eui64Address.m8[5], eui64Address.m8[6], eui64Address.m8[7]);
++    printf("%s\n", sEUI64);
++
++    ncpOpenThread.Deinit();
++
++    exit(EXIT_SUCCESS);
++}
++
++static void signal_critical(int sig, siginfo_t *info, void *ucontext)
++{
++    (void)info;
++    (void)ucontext;
++    fprintf(stderr, " *** FATAL ERROR: Caught signal %d (%s):\n", sig, strsignal(sig));
++    uloop_end();
++    exit(EXIT_FAILURE);
++}
++
++static void HandleSignalRegister(void)
++{
++    struct sigaction sigact;
++    sigact.sa_sigaction = &signal_critical;
++    sigact.sa_flags     = SA_RESTART | SA_SIGINFO | SA_NOCLDWAIT;
++
++    sigaction(SIGSEGV, &sigact, (struct sigaction *)NULL);
++    sigaction(SIGBUS, &sigact, (struct sigaction *)NULL);
++    sigaction(SIGILL, &sigact, (struct sigaction *)NULL);
++    sigaction(SIGABRT, &sigact, (struct sigaction *)NULL);
++}
++
++static void HandleRadioReset(void)
++{
++    char radioResetCmd[32] = "/usr/bin/gl-ot-rcp-reset";
++
++    struct stat st;
++    if (stat(radioResetCmd, &st) == 0)
++    {
++        system("/usr/bin/gl-ot-rcp-reset");
++        printf("RCP reset done.\n");
++    }
++}
++
+ static int realmain(int argc, char *argv[])
+ {
+     otbrLogLevel              logLevel = GetDefaultLogLevel();
+@@ -196,12 +250,15 @@ static int realmain(int argc, char *argv
+     bool                      verbose           = false;
+     bool                      printRadioVersion = false;
+     bool                      enableAutoAttach  = true;
++    bool                      printRadioEUI64   = false;
+     const char               *restListenAddress = "";
+     int                       restListenPort    = kPortNumber;
+     std::vector<const char *> radioUrls;
+     std::vector<const char *> backboneInterfaceNames;
+     long                      parseResult;
+ 
++    HandleSignalRegister();
++
+     std::set_new_handler(OnAllocateFailed);
+ 
+     while ((opt = getopt_long(argc, argv, "B:d:hI:Vv", kOptions, nullptr)) != -1)
+@@ -261,6 +318,10 @@ static int realmain(int argc, char *argv
+             restListenPort = parseResult;
+             break;
+ 
++        case OTBR_OPT_RADIO_EUI64:
++            printRadioEUI64 = true;
++            break;
++
+         default:
+             PrintHelp(argv[0]);
+             ExitNow(ret = EXIT_FAILURE);
+@@ -268,6 +329,8 @@ static int realmain(int argc, char *argv
+         }
+     }
+ 
++    HandleRadioReset();
++
+     otbrLogInit(kSyslogIdent, logLevel, verbose);
+     otbrLogNotice("Running %s", OTBR_PACKAGE_VERSION);
+     otbrLogNotice("Thread version: %s", otbr::Ncp::ControllerOpenThread::GetThreadVersion());
+@@ -290,6 +353,12 @@ static int realmain(int argc, char *argv
+         assert(false);
+     }
+ 
++    if (printRadioEUI64)
++    {
++        PrintRadioEUI64AndExit(radioUrls);
++        assert(false);
++    }
++
+     {
+         otbr::Application app(interfaceName, backboneInterfaceNames, radioUrls, enableAutoAttach, restListenAddress,
+                               restListenPort);
diff --git a/ot-br-posix/patches/0015-abort-after-udp6-bind-error-due-to-EINVAL.patch b/ot-br-posix/patches/0015-abort-after-udp6-bind-error-due-to-EINVAL.patch
new file mode 100644
index 00000000..766285e5
--- /dev/null
+++ b/ot-br-posix/patches/0015-abort-after-udp6-bind-error-due-to-EINVAL.patch
@@ -0,0 +1,18 @@
+Index: ot-br-posix-2022-11-08-r4.2.3/third_party/openthread/repo/src/posix/platform/udp.cpp
+===================================================================
+--- ot-br-posix-2022-11-08-r4.2.3.orig/third_party/openthread/repo/src/posix/platform/udp.cpp
++++ ot-br-posix-2022-11-08-r4.2.3/third_party/openthread/repo/src/posix/platform/udp.cpp
+@@ -296,6 +296,13 @@ exit:
+     if (error == OT_ERROR_FAILED)
+     {
+         otLogCritPlat("Failed to bind UDP socket: %s", strerror(errno));
++        if (errno == EINVAL)
++        {
++            char str[INET6_ADDRSTRLEN];
++            inet_ntop(AF_INET6, &(aUdpSocket->mSockName.mAddress), str, INET6_ADDRSTRLEN);
++            otLogCritPlat("Got Invalid argument, addr=%s, port=%d", str, htons(aUdpSocket->mSockName.mPort));
++            abort();
++        }
+     }
+ 
+     return error;
diff --git a/ot-br-posix/version.mk b/ot-br-posix/version.mk
new file mode 100644
index 00000000..3467a94c
--- /dev/null
+++ b/ot-br-posix/version.mk
@@ -0,0 +1,42 @@
+#
+# Copyright (C) 2020 Jianhui Zhao <zhaojh329@gmail.com>
+#
+# This is free software, licensed under the MIT.
+#
+
+define findrev
+  $(shell \
+    if git log -1 >/dev/null 2>/dev/null; then \
+      set -- $$(git log -1 --format="%ct %h" --abbrev=7 -- .); \
+      if [ -n "$$1" ]; then
+        secs="$$(($$1 % 86400))"; \
+        yday="$$(date --utc --date="@$$1" "+%Y.%j")"; \
+        printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2"; \
+      else \
+        echo "unknown"; \
+      fi; \
+    else \
+      ts=$$(find . -type f -printf '%T@\n' 2>/dev/null | sort -rn | head -n1 | cut -d. -f1); \
+      if [ -n "$$ts" ]; then \
+        secs="$$(($$ts % 86400))"; \
+        date="$$(date --utc --date="@$$ts" "+%Y%m%d")"; \
+        printf '%s.%05d' "$$date" "$$secs"; \
+      else \
+        echo "unknown"; \
+      fi; \
+    fi \
+  )
+endef
+
+define findcid
+  $(shell \
+    if git log -1 >/dev/null 2>/dev/null; then \
+      set -- $$(git log -1 --format="%ct %h" --abbrev=7 -- .); \
+      if [ -n "$$1" ]; then
+        printf '%s' "$$2"; \
+      else \
+        echo "unknown"; \
+      fi; \
+    fi \
+  )
+endef
diff --git a/rtty/Makefile b/rtty/Makefile
new file mode 100644
index 00000000..7f8ca1a5
--- /dev/null
+++ b/rtty/Makefile
@@ -0,0 +1,72 @@
+#
+# Copyright (C) 2018 Jianhui Zhao
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=rtty
+PKG_VERSION:=8.0.1
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL=https://github.com/zhaojh329/rtty/releases/download/v$(PKG_VERSION)
+PKG_HASH:=b1a21819c2256b3364b8c64dfcc56583b9647409ab8b39ff54e00e242e44028e
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+CMAKE_INSTALL:=1
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_MAINTAINER:=Jianhui Zhao <zhaojh329@gmail.com>
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/rtty/Default
+  TITLE:=Access your terminals from anywhere via the web
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Terminal
+  URL:=https://github.com/zhaojh329/rtty
+  DEPENDS:=+libev +libuci $(2)
+  VARIANT:=$(1)
+  PROVIDES:=rtty
+endef
+
+Package/rtty-openssl=$(call Package/rtty/Default,openssl,+PACKAGE_rtty-openssl:libopenssl)
+Package/rtty-wolfssl=$(call Package/rtty/Default,wolfssl,+PACKAGE_rtty-wolfssl:libwolfssl)
+Package/rtty-mbedtls=$(call Package/rtty/Default,mbedtls,+PACKAGE_rtty-mbedtls:libmbedtls +PACKAGE_rtty-mbedtls:zlib)
+Package/rtty-nossl=$(call Package/rtty/Default,nossl)
+
+define Package/rtty-openssl/conffiles
+/etc/config/rtty
+endef
+
+Package/rtty-wolfssl/conffiles = $(Package/rtty-openssl/conffiles)
+Package/rtty-mbedtls/conffiles = $(Package/rtty-openssl/conffiles)
+Package/rtty-nossl/conffiles = $(Package/rtty-openssl/conffiles)
+
+ifeq ($(BUILD_VARIANT),openssl)
+  CMAKE_OPTIONS += -DUSE_OPENSSL=ON
+else ifeq ($(BUILD_VARIANT),wolfssl)
+  CMAKE_OPTIONS += -DUSE_WOLFSSL=ON
+else ifeq ($(BUILD_VARIANT),mbedtls)
+  CMAKE_OPTIONS += -DUSE_MBEDTLS=ON
+else
+  CMAKE_OPTIONS += -DSSL_SUPPORT=OFF
+endif
+
+define Package/rtty-$(BUILD_VARIANT)/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/rtty $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/rtty.init $(1)/etc/init.d/rtty
+	$(INSTALL_CONF) ./files/rtty.config $(1)/etc/config/rtty
+endef
+
+$(eval $(call BuildPackage,rtty-openssl))
+$(eval $(call BuildPackage,rtty-wolfssl))
+$(eval $(call BuildPackage,rtty-mbedtls))
+$(eval $(call BuildPackage,rtty-nossl))
diff --git a/rtty/files/rtty.config b/rtty/files/rtty.config
new file mode 100644
index 00000000..b9952ce1
--- /dev/null
+++ b/rtty/files/rtty.config
@@ -0,0 +1,14 @@
+# You must specify an interface or id,
+# If the id is not specified, RTTY will uses the MAC address
+# of the interface you specify as its ID, otherwise the id
+# you specify is used as its ID
+
+#config rtty
+#   option  interface   'lan'
+#   option  id          'My-Device'
+#   option  description 'Description of my device'
+#   option  host        'your-server-host'  # Server host
+#   option  port        '5912'              # Server Port
+#   option  ssl         1                   # Whether to use ssl
+#   option  token       'your-token'        # generated by rttys
+#   option  verbose     '1'                 # verbose log
diff --git a/rtty/files/rtty.init b/rtty/files/rtty.init
new file mode 100644
index 00000000..94b4c364
--- /dev/null
+++ b/rtty/files/rtty.init
@@ -0,0 +1,65 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+START=99
+
+BIN=/usr/sbin/rtty
+
+validate_rtty_section() {
+	uci_load_validate rtty rtty "$1" "$2" \
+		'interface:uci("network", "@interface"):lan' \
+		'id:maxlength(63)' \
+		'description:maxlength(126)' \
+		'host:host' \
+		'port:port' \
+		'ssl:bool:0' \
+		'token:maxlength(32)' \
+		'verbose:bool:0'
+}
+
+start_rtty() {
+	. /lib/functions/network.sh
+
+	local ifname
+
+	[ "$2" = 0 ] || {
+		echo "validation failed" >&2
+		return 1
+	}
+
+	[ -n "$interface" ] && network_get_device ifname "$interface"
+
+	[ -z "$ifname" -a -z "$id" ] && {
+		echo "You must specify an interface or ID" >&2
+		return 1
+	}
+
+	[ -z "$host" ] && {
+		echo "host required" >&2
+		return 1
+	}
+
+	[ -z "$id" ] && {
+		id=$(sed 's/://g' /sys/class/net/$ifname/address | tr 'a-z' 'A-Z')
+	}
+
+	procd_open_instance
+	procd_set_param command $BIN -h $host -I "$id" -a
+	[ -n "$port" ] && procd_append_param command -p "$port"
+	[ -n "$description" ] && procd_append_param command -d "$description"
+	[ "$ssl" = "1" ] && procd_append_param command -s
+	[ -n "$token" ] && procd_append_param command -t "$token"
+	[ "$verbose" = "1" ] && procd_append_param command -v
+	procd_set_param respawn
+	procd_close_instance
+}
+
+start_service() {
+	config_load rtty
+	config_foreach validate_rtty_section rtty start_rtty
+}
+
+service_triggers() {
+	procd_add_reload_trigger "rtty"
+	procd_add_validation validate_rtty_section
+}
diff --git a/rtty/patches/001-increase-http-timeout.patch b/rtty/patches/001-increase-http-timeout.patch
new file mode 100644
index 00000000..145491d5
--- /dev/null
+++ b/rtty/patches/001-increase-http-timeout.patch
@@ -0,0 +1,13 @@
+Index: rtty-8.0.1/src/http.c
+===================================================================
+--- rtty-8.0.1.orig/src/http.c
++++ rtty-8.0.1/src/http.c
+@@ -111,7 +111,7 @@ static void on_timer_cb(struct ev_loop *
+     struct http_connection *conn = container_of(w, struct http_connection, tmr);
+     ev_tstamp now = ev_now(loop);
+ 
+-    if (now - conn->active < 30)
++    if (now - conn->active < 120)
+         return;
+ 
+     http_conn_free(conn);
diff --git a/rtty/patches/002-bind-lan-ip.patch b/rtty/patches/002-bind-lan-ip.patch
new file mode 100644
index 00000000..d1c69297
--- /dev/null
+++ b/rtty/patches/002-bind-lan-ip.patch
@@ -0,0 +1,65 @@
+Index: rtty-8.0.0/src/net.c
+===================================================================
+--- rtty-8.0.0.orig/src/net.c
++++ rtty-8.0.0/src/net.c
+@@ -22,6 +22,8 @@
+  * SOFTWARE.
+  */
+ 
++#include <sys/ioctl.h>
++#include <linux/if.h>
+ #include <stdbool.h>
+ #include <unistd.h>
+ #include <stdlib.h>
+@@ -115,10 +117,39 @@ static void wait_connect(struct ev_loop
+     ev_io_start(loop, &ctx->iow);
+ }
+
++static int get_iface_ipaddr(const char *name, struct sockaddr *addr)
++{
++    struct ifreq ifr;
++    int sockfd;
++
++    if ((sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {
++        log_err("create socket failed: %s\n", strerror(errno));
++        return -1;
++    }
++
++    strcpy(ifr.ifr_name, name);
++
++    if (ioctl(sockfd, SIOCGIFADDR, &ifr) < 0) {
++        close(sockfd);
++        log_err("ioctl SIOCGIFADDR failed: %s\n", strerror(errno));
++        return -1;
++    }
++
++    close(sockfd);
++
++    memcpy(addr, &ifr.ifr_dstaddr, sizeof(struct sockaddr_in));
++
++    return 0;
++}
++
+ int tcp_connect_sockaddr(struct ev_loop *loop, const struct sockaddr *addr, socklen_t addrlen,
+                 void (*on_connected)(int sock, void *arg), void *arg)
+ {
++    struct sockaddr laddr;
+     int sock;
++    
++    if (get_iface_ipaddr("br-lan", &laddr))
++        return -1;
+ 
+     sock = socket(AF_INET, SOCK_STREAM | SOCK_NONBLOCK | SOCK_CLOEXEC, 0);
+     if (sock < 0) {
+@@ -126,6 +157,11 @@ int tcp_connect_sockaddr(struct ev_loop
+         return -1;
+     }
+ 
++    if (bind(sock, &laddr, sizeof(struct sockaddr_in))) {
++        log_err("bind socket failed: %s\n", strerror(errno));
++        goto err;
++    }
++
+     if (connect(sock, addr, addrlen) < 0) {
+         if (errno != EINPROGRESS) {
+             log_err("connect failed: %s\n", strerror(errno));
diff --git a/rtty/patches/003-configurable-for-term-and-http.patch b/rtty/patches/003-configurable-for-term-and-http.patch
new file mode 100644
index 00000000..dc4d9630
--- /dev/null
+++ b/rtty/patches/003-configurable-for-term-and-http.patch
@@ -0,0 +1,165 @@
+Index: rtty-8.0.1/src/main.c
+===================================================================
+--- rtty-8.0.1.orig/src/main.c
++++ rtty-8.0.1/src/main.c
+@@ -27,6 +27,7 @@
+ #include <stdlib.h>
+ #include <getopt.h>
+ #include <glob.h>
++#include <uci.h>
+ 
+ #include "log/log.h"
+ #include "rtty.h"
+@@ -35,6 +36,12 @@ enum {
+     LONG_OPT_HELP = 1
+ };
+ 
++static struct rtty rtty = {
++    .host = "localhost",
++    .port = 5912,
++    .sock = -1
++};
++
+ #ifdef SSL_SUPPORT
+ static void load_default_ca_cert(struct ssl_context *ctx)
+ {
+@@ -104,6 +111,49 @@ static void usage(const char *prog)
+     exit(1);
+ }
+ 
++static void load_config()
++{
++    struct uci_context *ctx;
++    struct uci_element *e;
++    struct uci_ptr ptr = {
++        .package = "rtty",
++        .section = "general"
++    };
++
++    rtty.no_term = true;
++    rtty.no_http = true;
++
++    ctx = uci_alloc_context();
++
++    if (uci_lookup_ptr(ctx, &ptr, NULL, false) != UCI_OK)
++        goto err;
++
++    uci_foreach_element(&ptr.s->options, e) {
++        struct uci_option *o = uci_to_option(e);
++        if (o->type != UCI_TYPE_STRING)
++            continue;
++
++        if (!strcmp(o->e.name, "ssh_en"))
++            rtty.no_term = atoi(o->v.string) == 0;
++        else if (!strcmp(o->e.name, "web_en"))
++            rtty.no_http = atoi(o->v.string) == 0;
++    }
++
++err:
++    uci_free_context(ctx);
++
++    log_info("config: term %s\n", rtty.no_term ? "Disabled" : "Enabled");
++    log_info("config: http %s\n", rtty.no_http ? "Disabled" : "Enabled");
++}
++
++static void signal_handler(int signum)
++{
++    if (signum != SIGUSR1)
++        return;
++
++    load_config();
++}
++
+ int main(int argc, char **argv)
+ {
+     char shortopts[32] = "I:h:p:d:aDt:f:RS:vV";
+@@ -111,18 +161,14 @@ int main(int argc, char **argv)
+     struct ev_signal signal_watcher;
+     bool background = false;
+     bool verbose = false;
+-    struct rtty rtty = {
+-        .host = "localhost",
+-        .port = 5912,
+-        .loop = loop,
+-        .sock = -1
+-    };
+ #ifdef SSL_SUPPORT
+     bool has_cacert = false;
+ #endif
+     int option_index;
+     int c;
+ 
++    rtty.loop = loop;
++
+     log_level(LOG_DEBUG);
+ 
+ #ifdef SSL_SUPPORT
+@@ -217,6 +263,7 @@ int main(int argc, char **argv)
+     }
+ 
+     signal(SIGPIPE, SIG_IGN);
++    signal(SIGUSR1, signal_handler);
+ 
+     if (background && daemon(0, 0))
+         log_err("Can't run in the background: %s\n", strerror(errno));
+@@ -241,6 +288,8 @@ int main(int argc, char **argv)
+         load_default_ca_cert(rtty.ssl_ctx);
+ #endif
+ 
++    load_config();
++
+     if (rtty_start(&rtty) < 0)
+         return -1;
+ 
+Index: rtty-8.0.1/src/rtty.c
+===================================================================
+--- rtty-8.0.1.orig/src/rtty.c
++++ rtty-8.0.1/src/rtty.c
+@@ -435,6 +435,10 @@ static int parse_msg(struct rtty *rtty)
+             break;
+ 
+         case MSG_TYPE_LOGIN:
++            if (rtty->no_term) {
++                buffer_pull(rb, NULL, msglen);
++                break;
++            }
+         case MSG_TYPE_LOGOUT:
+         case MSG_TYPE_TERMDATA:
+         case MSG_TYPE_WINSIZE:
+@@ -452,6 +456,10 @@ static int parse_msg(struct rtty *rtty)
+             break;
+ 
+         case MSG_TYPE_HTTP:
++            if (rtty->no_http) {
++                buffer_pull(rb, NULL, msglen);
++                break;
++            }
+             http_request(rtty, msglen);
+             break;
+ 
+Index: rtty-8.0.1/src/CMakeLists.txt
+===================================================================
+--- rtty-8.0.1.orig/src/CMakeLists.txt
++++ rtty-8.0.1/src/CMakeLists.txt
+@@ -14,7 +14,7 @@ add_executable(rtty ${SRCS})
+ target_compile_definitions(rtty PRIVATE _GNU_SOURCE)
+ target_compile_options(rtty PRIVATE -O -Wall -Werror --std=gnu99)
+ target_include_directories(rtty PRIVATE ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/buffer ${LIBEV_INCLUDE_DIR})
+-target_link_libraries(rtty PRIVATE ${LIBEV_LIBRARY} util crypt m)
++target_link_libraries(rtty PRIVATE ${LIBEV_LIBRARY} util crypt m uci)
+ 
+ add_subdirectory(ssl)
+ 
+Index: rtty-8.0.1/src/rtty.h
+===================================================================
+--- rtty-8.0.1.orig/src/rtty.h
++++ rtty-8.0.1/src/rtty.h
+@@ -108,6 +108,8 @@ struct rtty {
+     int ntty;   /* tty number */
+     struct list_head ttys;
+     struct list_head http_conns;
++    bool no_term;
++    bool no_http;
+ };
+ 
+ int rtty_start(struct rtty *rtty);
diff --git a/rtty/patches/004-auto-exit-for-long-inactive.patch b/rtty/patches/004-auto-exit-for-long-inactive.patch
new file mode 100644
index 00000000..71177246
--- /dev/null
+++ b/rtty/patches/004-auto-exit-for-long-inactive.patch
@@ -0,0 +1,53 @@
+Index: rtty-8.0.1/src/rtty.c
+===================================================================
+--- rtty-8.0.1.orig/src/rtty.c
++++ rtty-8.0.1/src/rtty.c
+@@ -444,6 +444,7 @@ static int parse_msg(struct rtty *rtty)
+         case MSG_TYPE_WINSIZE:
+         case MSG_TYPE_FILE:
+         case MSG_TYPE_ACK:
++            rtty->user_active = ev_now(rtty->loop);
+             parse_tty_msg(rtty, msgtype, msglen);
+             break;
+ 
+@@ -460,6 +461,7 @@ static int parse_msg(struct rtty *rtty)
+                 buffer_pull(rb, NULL, msglen);
+                 break;
+             }
++            rtty->user_active = ev_now(rtty->loop);
+             http_request(rtty, msglen);
+             break;
+ 
+@@ -654,6 +656,12 @@ static void rtty_timer_cb(struct ev_loop
+     struct rtty *rtty = container_of(w, struct rtty, tmr);
+     ev_tstamp now = ev_now(loop);
+ 
++    if (now - rtty->user_active > 10 * 60) {
++        log_err("long long inactive for 10 minutes, now exit.\n");
++        rtty_exit(rtty);
++        return;
++    }
++
+     if (rtty->sock < 0) {
+         if (now - rtty->active < 5)
+             return;
+@@ -718,6 +726,7 @@ int rtty_start(struct rtty *rtty)
+     INIT_LIST_HEAD(&rtty->http_conns);
+ 
+     rtty->active = ev_now(rtty->loop);
++    rtty->user_active = ev_now(rtty->loop);
+ 
+     return 0;
+ }
+Index: rtty-8.0.1/src/rtty.h
+===================================================================
+--- rtty-8.0.1.orig/src/rtty.h
++++ rtty-8.0.1/src/rtty.h
+@@ -110,6 +110,7 @@ struct rtty {
+     struct list_head http_conns;
+     bool no_term;
+     bool no_http;
++    ev_tstamp user_active;
+ };
+ 
+ int rtty_start(struct rtty *rtty);
diff --git a/rtty/patches/005-Support-POSIX-basename-from-musl-libc.patch b/rtty/patches/005-Support-POSIX-basename-from-musl-libc.patch
new file mode 100644
index 00000000..8493557e
--- /dev/null
+++ b/rtty/patches/005-Support-POSIX-basename-from-musl-libc.patch
@@ -0,0 +1,91 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Hauke Mehrtens <hauke@hauke-m.de>
+Date: Sun, 14 Apr 2024 16:06:15 +0200
+Subject: Support POSIX basename() from musl libc
+
+Musl libc 1.2.5 removed the definition of the basename() function from
+string.h and only provides it in libgen.h as the POSIX standard
+defines it.
+
+This change fixes compilation with musl libc 1.2.5.
+````
+build_dir/target-mips_24kc_musl/rtty-mbedtls/rtty-8.1.1/src/file.c:156:24: error: implicit declaration of function 'basename' [-Werror=implicit-function-declaration]
+  156 |     const char *name = basename(path);
+      |                        ^~~~~~~~
+````
+
+basename() modifies the input string, copy it first with strdup(), If
+strdup() returns NULL the code will handle it.
+
+Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
+---
+ src/file.c    | 8 +++++++-
+ src/filectl.c | 6 +++++-
+ 2 files changed, 12 insertions(+), 2 deletions(-)
+
+--- a/src/file.c
++++ b/src/file.c
+@@ -29,6 +29,7 @@
+ #include <unistd.h>
+ #include <mntent.h>
+ #include <inttypes.h>
++#include <libgen.h>
+ #include <sys/statvfs.h>
+ #include <linux/limits.h>
+ #include <sys/sysinfo.h>
+@@ -153,13 +154,17 @@ static int start_upload_file(struct file
+ {
+     struct tty *tty = container_of(ctx, struct tty, file);
+     struct rtty *rtty = tty->rtty;
+-    const char *name = basename(path);
++    const char *name;
+     struct stat st;
+     int fd;
++    char *dirc;
+ 
++    dirc = strdup(path);
++    name = basename(dirc);
+     fd = open(path, O_RDONLY);
+     if (fd < 0) {
+         log_err("open '%s' fail: %s\n", path, strerror(errno));
++        free(dirc);
+         return -1;
+     }
+ 
+@@ -177,6 +182,7 @@ static int start_upload_file(struct file
+     ctx->remain_size = st.st_size;
+ 
+     log_info("upload file: %s, size: %" PRIu64 "\n", path, (uint64_t)st.st_size);
++    free(dirc);
+ 
+     return 0;
+ }
+--- a/src/filectl.c
++++ b/src/filectl.c
+@@ -30,6 +30,7 @@
+ #include <errno.h>
+ #include <stdio.h>
+ #include <fcntl.h>
++#include <libgen.h>
+ 
+ #include "utils.h"
+ #include "file.h"
+@@ -75,6 +76,7 @@ static void handle_file_control_msg(int
+ {
+     struct file_control_msg msg;
+     struct buffer b = {};
++    char *dirc;
+ 
+     while (true) {
+         if (buffer_put_fd(&b, fd, -1, NULL) < 0)
+@@ -90,7 +92,9 @@ static void handle_file_control_msg(int
+             if (sfd > -1) {
+                 close(sfd);
+                 gettimeofday(&start_time, NULL);
+-                printf("Transferring '%s'...Press Ctrl+C to cancel\n", basename(path));
++                dirc = strdup(path);
++                printf("Transferring '%s'...Press Ctrl+C to cancel\n", basename(dirc));
++                free(dirc);
+ 
+                 if (total_size == 0) {
+                     printf("  100%%    0 B     0s\n");
diff --git a/smstools3/Makefile b/smstools3/Makefile
new file mode 100644
index 00000000..70563cc0
--- /dev/null
+++ b/smstools3/Makefile
@@ -0,0 +1,66 @@
+#
+# Copyright (C) 2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=smstools3
+PKG_VERSION:=3.1.21
+PKG_RELEASE:=2
+
+PKG_MAINTAINER:=Harald Geyer <harald@ccbib.org>
+PKG_LICENSE:=GPL-2.0
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_PARALLEL:=0
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://smstools3.kekekasvi.com/packages/
+PKG_HASH:=a26ba4c02b16f6cf13177bffca6c9230dc5fefaeba8e3030cd4e4905f6a92084
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/smstools3
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=SMS Server Tools 3
+  DEPENDS:=$(ICONV_DEPENDS)
+  URL:=http://smstools3.kekekasvi.com/
+endef
+
+define Package/smstools3/description
+ The SMS Server Tools 3 is a SMS Gateway software which can send and receive
+ short messages through GSM modems and mobile phones.
+endef
+
+TARGET_CFLAGS += -D NUMBER_OF_MODEMS=1
+TARGET_CFLAGS += $(if $(ICONV_FULL),-D USE_ICONV)
+#TARGET_CFLAGS += -D DISABLE_INET_SOCKET
+TARGET_CFLAGS += -W -Wall
+TARGET_CFLAGS += -D_FILE_OFFSET_BITS=64
+TARGET_CFLAGS += -fcommon
+
+MAKE_VARS += LFLAGS="$(TARGET_LDFLAGS) $(if $(ICONV_FULL),-liconv)"
+
+define Package/smstools3/configure
+endef
+
+define Package/smstools3/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/src/smsd \
+		$(PKG_BUILD_DIR)/scripts/sendsms \
+		$(1)/usr/bin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/smstools3.init $(1)/etc/init.d/smstools3
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_CONF) ./files/smstools3.conf $(1)/etc/smsd.conf
+endef
+
+$(eval $(call BuildPackage,smstools3))
diff --git a/smstools3/files/smstools3.conf b/smstools3/files/smstools3.conf
new file mode 100644
index 00000000..cd01e1f5
--- /dev/null
+++ b/smstools3/files/smstools3.conf
@@ -0,0 +1,24 @@
+#
+# Description: Main configuration file for the smsd
+#
+
+devices = GSM1
+incoming = /etc/spool/sms/incoming
+outgoing = /etc/spool/sms/outgoing
+checked = /etc/spool/sms/checked
+failed = /etc/spool/sms/failed
+sent = /etc/spool/sms/sent
+receive_before_send = no
+autosplit = 3
+logfile = 1
+loglevel = 1
+
+# Uncomment (and edit) this section to allow smsd to start:
+#
+[GSM1]
+init = AT+CPMS="ME","ME","ME"
+device = /dev/ttyUSB3
+incoming = yes
+pin = ignore
+baudrate = 115200
+
diff --git a/smstools3/files/smstools3.init b/smstools3/files/smstools3.init
new file mode 100755
index 00000000..701ea2f9
--- /dev/null
+++ b/smstools3/files/smstools3.init
@@ -0,0 +1,48 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2014-2018 OpenWrt.org
+
+START=94
+
+USE_PROCD=1
+
+# If an unpriviledged user is selected, make sure that next two
+# files are writable by that user:
+PIDFILE="/var/run/smsd.pid"
+INFOFILE="/var/run/smsd.working"
+
+DAEMON=/usr/bin/smsd
+
+# Set/edit this before starting service !!!!!
+WRT_SPOOL=/etc/spool
+CFG=/tmp/smstools.cfg
+
+start_service() {
+	if [ -e "/lib/functions/modem.sh" ]; then
+		. /lib/functions/modem.sh
+		bus=$(get_modem_bus)
+	fi
+	gl_modem -B $bus sms-config > $CFG
+	dirs="$(cat $CFG|grep $WRT_SPOOL/sms)"
+	[ -z "$dirs" ] && exit 0
+
+	echo "Creating minimum spool directories"
+	mkdir -p $WRT_SPOOL
+	mkdir -p $WRT_SPOOL/sms
+	IFS_sav=$IFS
+	IFS=$'\n\n'
+	for dir in $dirs;do
+		dir="$(echo $dir|cut -d ' ' -f3)"
+		mkdir -p $dir
+	done
+	IFS=$IFS_sav
+
+	procd_open_instance
+
+	procd_set_param command $DAEMON -n MAINPROCESS -p$PIDFILE -i$INFOFILE -c$CFG
+	procd_set_param respawn
+	procd_set_param stdout 1
+
+	procd_close_instance
+}
+
+
diff --git a/smstools3/patches/002-Makefile.patch b/smstools3/patches/002-Makefile.patch
new file mode 100644
index 00000000..a52aee4f
--- /dev/null
+++ b/smstools3/patches/002-Makefile.patch
@@ -0,0 +1,11 @@
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,7 +1,7 @@
+ # In case of windows, use os_cygwin=yes setting in the configuration file (smsd.conf).
+ 
+ # Select your setup size:
+-CFLAGS = -D NUMBER_OF_MODEMS=64
++CFLAGS ?= -D NUMBER_OF_MODEMS=64
+ 
+ # Uncomment for Solaris
+ # CFLAGS += -D SOLARIS
diff --git a/smstools3/patches/003-bash-ash.patch b/smstools3/patches/003-bash-ash.patch
new file mode 100644
index 00000000..4ad16636
--- /dev/null
+++ b/smstools3/patches/003-bash-ash.patch
@@ -0,0 +1,8 @@
+--- a/scripts/sendsms
++++ b/scripts/sendsms
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/ash
+ # This script send a text sms at the command line by creating
+ # a sms file in the outgoing queue.
+ 
diff --git a/smstools3/patches/004-modem-processes.patch b/smstools3/patches/004-modem-processes.patch
new file mode 100644
index 00000000..95de7ba0
--- /dev/null
+++ b/smstools3/patches/004-modem-processes.patch
@@ -0,0 +1,26 @@
+commit 3790bd05ed86b1692719df22857ef76c1293b01c
+Author: Harald Geyer <harald@ccbib.org>
+Date:   Sun Feb 18 19:24:48 2018 +0100
+
+    Make modem processes terminate when main process dies
+
+diff --git a/src/smsd.c b/src/smsd.c
+index fdfa193..37b2e4d 100755
+--- a/src/smsd.c
++++ b/src/smsd.c
+@@ -34,6 +34,7 @@ Either version 2 of the License, or (at your option) any later version.
+ #ifndef DISABLE_INOTIFY
+ #include <sys/inotify.h>
+ #endif
++#include <sys/prctl.h>
+ 
+ #include "extras.h"
+ #include "locking.h"
+@@ -8100,6 +8101,7 @@ int main(int argc,char** argv)
+ 
+       if (pid == 0)
+       {
++        prctl(PR_SET_PDEATHSIG, SIGTERM, 0, 0, 0);
+         process_id = i;
+         strcpy(process_title, DEVICE.name);
+         apply_process_name(argc, argv, process_title);
diff --git a/smstools3/patches/005-fix-sendsms.patch b/smstools3/patches/005-fix-sendsms.patch
new file mode 100644
index 00000000..6e8ee4df
--- /dev/null
+++ b/smstools3/patches/005-fix-sendsms.patch
@@ -0,0 +1,13 @@
+Index: smstools3/scripts/sendsms
+===================================================================
+--- smstools3.orig/scripts/sendsms
++++ smstools3/scripts/sendsms
+@@ -99,6 +99,8 @@ do
+   TMPFILE=`mktemp /tmp/smsd_XXXXXX`
+ 
+   $ECHO "To: $destination" >> $TMPFILE
++  #No country code
++  [ -z "$(echo "$destination"|grep +)" ] && $ECHO "To_TOA: National" >> $TMPFILE
+   [ -n "$ALPHABET" ] && $ECHO "$ALPHABET" >> $TMPFILE
+   $ECHO "" >> $TMPFILE
+   if [ -z "$ALPHABET" ]; then
diff --git a/ssmtp/Makefile b/ssmtp/Makefile
new file mode 100644
index 00000000..0b430cb2
--- /dev/null
+++ b/ssmtp/Makefile
@@ -0,0 +1,60 @@
+#
+# Copyright (C) 2007-2016 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ssmtp
+PKG_VERSION:=2.64
+PKG_RELEASE:=7
+PKG_MAINTAINER:=Dirk Brenken <dev@brenken.org>
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_CPE_ID:=cpe:/a:ssmtp:ssmtp
+
+PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.bz2
+PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp
+PKG_HASH:=22c37dc90c871e8e052b2cab0ad219d010fa938608cd66b21c8f3c759046fa36
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += $(TARGET_CPPFLAGS)
+
+define Package/ssmtp
+	SECTION:=mail
+	CATEGORY:=Mail
+	DEPENDS:=+libopenssl
+	TITLE:=A minimal and secure mail sender with ssl support
+	URL:=http://packages.debian.org/ssmtp
+endef
+
+define Package/ssmtp/description
+A secure, effective and simple way of getting mail off a system to your mail hub.
+Mail is simply forwarded to the configured mailhost, no daemons running in the background.
+Extremely easy configuration.
+
+endef
+
+define Package/ssmtp/conffiles
+/etc/ssmtp/ssmtp.conf
+/etc/ssmtp/revaliases
+endef
+
+CONFIGURE_VARS += \
+	LIBS="$(TARGET_LDFLAGS) -lcrypto -lssl"
+
+CONFIGURE_ARGS += \
+	--enable-ssl
+
+define Package/ssmtp/install
+	$(INSTALL_DIR) $(1)/etc/ssmtp
+	$(INSTALL_CONF) $(PKG_BUILD_DIR)/ssmtp.conf $(1)/etc/ssmtp/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/revaliases $(1)/etc/ssmtp/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ssmtp $(1)/usr/sbin/
+	ln -s /usr/sbin/ssmtp $(1)/usr/sbin/sendmail
+endef
+
+$(eval $(call BuildPackage,ssmtp))
diff --git a/ssmtp/patches/002-fix_pointer.patch b/ssmtp/patches/002-fix_pointer.patch
new file mode 100644
index 00000000..f22e3d61
--- /dev/null
+++ b/ssmtp/patches/002-fix_pointer.patch
@@ -0,0 +1,466 @@
+--- a/ssmtp.c
++++ b/ssmtp.c
+@@ -55,21 +55,21 @@ bool_t use_oldauth = False;		/* use old
+ 
+ #define ARPADATE_LENGTH 32		/* Current date in RFC format */
+ char arpadate[ARPADATE_LENGTH];
+-char *auth_user = (char)NULL;
+-char *auth_pass = (char)NULL;
+-char *auth_method = (char)NULL;		/* Mechanism for SMTP authentication */
+-char *mail_domain = (char)NULL;
+-char *from = (char)NULL;		/* Use this as the From: address */
++char *auth_user = NULL;
++char *auth_pass = NULL;
++char *auth_method = NULL;		/* Mechanism for SMTP authentication */
++char *mail_domain = NULL;
++char *from = NULL;		/* Use this as the From: address */
+ char *hostname;
+ char *mailhost = "mailhub";
+-char *minus_f = (char)NULL;
+-char *minus_F = (char)NULL;
++char *minus_f = NULL;
++char *minus_F = NULL;
+ char *gecos;
+-char *prog = (char)NULL;
++char *prog = NULL;
+ char *root = NULL;
+ char *tls_cert = "/etc/ssl/certs/ssmtp.pem";	/* Default Certificate */
+-char *uad = (char)NULL;
+-char *config_file = (char)NULL;		/* alternate configuration file */
++char *uad = NULL;
++char *config_file = NULL;		/* alternate configuration file */
+ 
+ headers_t headers, *ht;
+ 
+@@ -261,7 +261,7 @@ char *strip_post_ws(char *str)
+ 
+ 	p = (str + strlen(str));
+ 	while(isspace(*--p)) {
+-		*p = (char)NULL;
++		*p = '\0';
+ 	}
+ 
+ 	return(p);
+@@ -279,7 +279,7 @@ char *addr_parse(char *str)
+ #endif
+ 
+ 	/* Simple case with email address enclosed in <> */
+-	if((p = strdup(str)) == (char *)NULL) {
++	if((p = strdup(str)) == NULL) {
+ 		die("addr_parse(): strdup()");
+ 	}
+ 
+@@ -287,7 +287,7 @@ char *addr_parse(char *str)
+ 		q++;
+ 
+ 		if((p = strchr(q, '>'))) {
+-			*p = (char)NULL;
++			*p = '\0';
+ 		}
+ 
+ #if 0
+@@ -310,7 +310,7 @@ char *addr_parse(char *str)
+ 	q = strip_post_ws(p);
+ 	if(*q == ')') {
+ 		while((*--q != '('));
+-		*q = (char)NULL;
++		*q = '\0';
+ 	}
+ 	(void)strip_post_ws(p);
+ 
+@@ -349,7 +349,6 @@ standardise() -- Trim off '\n's and doub
+ */
+ bool_t standardise(char *str, bool_t *linestart)
+ {
+-	size_t sl;
+ 	char *p;
+ 	bool_t leadingdot = False;
+ 
+@@ -363,7 +362,7 @@ bool_t standardise(char *str, bool_t *li
+ 	*linestart = False;
+ 
+ 	if((p = strchr(str, '\n'))) {
+-		*p = (char)NULL;
++		*p = '\0';
+ 		*linestart = True;
+ 	}
+ 	return(leadingdot);
+@@ -384,7 +383,7 @@ void revaliases(struct passwd *pw)
+ 		while(fgets(buf, sizeof(buf), fp)) {
+ 			/* Make comments invisible */
+ 			if((p = strchr(buf, '#'))) {
+-				*p = (char)NULL;
++				*p = '\0';
+ 			}
+ 
+ 			/* Ignore malformed lines and comments */
+@@ -519,11 +518,11 @@ void rcpt_save(char *str)
+ #endif
+ 
+ 	/* Ignore missing usernames */
+-	if(*str == (char)NULL) {
++	if(*str == '\0') {
+ 		return;
+ 	}
+ 
+-	if((rt->string = strdup(str)) == (char *)NULL) {
++	if((rt->string = strdup(str)) == NULL) {
+ 		die("rcpt_save() -- strdup() failed");
+ 	}
+ 
+@@ -548,7 +547,7 @@ void rcpt_parse(char *str)
+ 	(void)fprintf(stderr, "*** rcpt_parse(): str = [%s]\n", str);
+ #endif
+ 
+-	if((p = strdup(str)) == (char *)NULL) {
++	if((p = strdup(str)) == NULL) {
+ 		die("rcpt_parse(): strdup() failed");
+ 	}
+ 	q = p;
+@@ -576,7 +575,7 @@ void rcpt_parse(char *str)
+ 		}
+ 
+ 		/* End of string? */
+-		if(*(q + 1) == (char)NULL) {
++		if(*(q + 1) == '\0') {
+ 			got_addr = True;
+ 		}
+ 
+@@ -584,7 +583,7 @@ void rcpt_parse(char *str)
+ 		if((*q == ',') && (in_quotes == False)) {
+ 			got_addr = True;
+ 
+-			*q = (char)NULL;
++			*q = '\0';
+ 		}
+ 
+ 		if(got_addr) {
+@@ -668,7 +667,7 @@ void header_save(char *str)
+ 	(void)fprintf(stderr, "header_save(): str = [%s]\n", str);
+ #endif
+ 
+-	if((p = strdup(str)) == (char *)NULL) {
++	if((p = strdup(str)) == NULL) {
+ 		die("header_save() -- strdup() failed");
+ 	}
+ 	ht->string = p;
+@@ -676,7 +675,7 @@ void header_save(char *str)
+ 	if(strncasecmp(ht->string, "From:", 5) == 0) {
+ #if 1
+ 		/* Hack check for NULL From: line */
+-		if(*(p + 6) == (char)NULL) {
++		if(*(p + 6) == '\0') {
+ 			return;
+ 		}
+ #endif
+@@ -739,19 +738,19 @@ header_parse() -- Break headers into sep
+ void header_parse(FILE *stream)
+ {
+ 	size_t size = BUF_SZ, len = 0;
+-	char *p = (char *)NULL, *q;
++	char *p = NULL, *q;
+ 	bool_t in_header = True;
+-	char l = (char)NULL;
++	char l = '\0';
+ 	int c;
+ 
+ 	while(in_header && ((c = fgetc(stream)) != EOF)) {
+ 		/* Must have space for up to two more characters, since we
+ 			may need to insert a '\r' */
+-		if((p == (char *)NULL) || (len >= (size - 1))) {
++		if((p == NULL) || (len >= (size - 1))) {
+ 			size += BUF_SZ;
+ 
+ 			p = (char *)realloc(p, (size * sizeof(char)));
+-			if(p == (char *)NULL) {
++			if(p == NULL) {
+ 				die("header_parse() -- realloc() failed");
+ 			}
+ 			q = (p + len);
+@@ -776,9 +775,9 @@ void header_parse(FILE *stream)
+ 						in_header = False;
+ 
+ 				default:
+-						*q = (char)NULL;
++						*q = '\0';
+ 						if((q = strrchr(p, '\n'))) {
+-							*q = (char)NULL;
++							*q = '\0';
+ 						}
+ 						header_save(p);
+ 
+@@ -809,9 +808,9 @@ void header_parse(FILE *stream)
+ 						in_header = False;
+ 
+ 				default:
+-						*q = (char)NULL;
++						*q = '\0';
+ 						if((q = strrchr(p, '\n'))) {
+-							*q = (char)NULL;
++							*q = '\0';
+ 						}
+ 						header_save(p);
+ 
+@@ -876,11 +875,11 @@ bool_t read_config()
+ 		char *rightside;
+ 		/* Make comments invisible */
+ 		if((p = strchr(buf, '#'))) {
+-			*p = (char)NULL;
++			*p = '\0';
+ 		}
+ 
+ 		/* Ignore malformed lines and comments */
+-		if(strchr(buf, '=') == (char *)NULL) continue;
++		if(strchr(buf, '=') == NULL) continue;
+ 
+ 		/* Parse out keywords */
+ 		p=firsttok(&begin, "= \t\n");
+@@ -890,7 +889,7 @@ bool_t read_config()
+ 		}
+ 		if(p && q) {
+ 			if(strcasecmp(p, "Root") == 0) {
+-				if((root = strdup(q)) == (char *)NULL) {
++				if((root = strdup(q)) == NULL) {
+ 					die("parse_config() -- strdup() failed");
+ 				}
+ 
+@@ -904,7 +903,7 @@ bool_t read_config()
+ 					port = atoi(r);
+ 				}
+ 
+-				if((mailhost = strdup(q)) == (char *)NULL) {
++				if((mailhost = strdup(q)) == NULL) {
+ 					die("parse_config() -- strdup() failed");
+ 				}
+ 
+@@ -949,7 +948,7 @@ bool_t read_config()
+ 					mail_domain = strdup(q);
+ 				}
+ 
+-				if(mail_domain == (char *)NULL) {
++				if(mail_domain == NULL) {
+ 					die("parse_config() -- strdup() failed");
+ 				}
+ 				rewrite_domain = True;
+@@ -1025,7 +1024,7 @@ bool_t read_config()
+ 				}
+ 			}
+ 			else if(strcasecmp(p, "TLSCert") == 0) {
+-				if((tls_cert = strdup(q)) == (char *)NULL) {
++				if((tls_cert = strdup(q)) == NULL) {
+ 					die("parse_config() -- strdup() failed");
+ 				}
+ 
+@@ -1036,7 +1035,7 @@ bool_t read_config()
+ #endif
+ 			/* Command-line overrides these */
+ 			else if(strcasecmp(p, "AuthUser") == 0 && !auth_user) {
+-				if((auth_user = strdup(q)) == (char *)NULL) {
++				if((auth_user = strdup(q)) == NULL) {
+ 					die("parse_config() -- strdup() failed");
+ 				}
+ 
+@@ -1045,7 +1044,7 @@ bool_t read_config()
+ 				}
+ 			}
+ 			else if(strcasecmp(p, "AuthPass") == 0 && !auth_pass) {
+-				if((auth_pass = strdup(q)) == (char *)NULL) {
++				if((auth_pass = strdup(q)) == NULL) {
+ 					die("parse_config() -- strdup() failed");
+ 				}
+ 
+@@ -1054,7 +1053,7 @@ bool_t read_config()
+ 				}
+ 			}
+ 			else if(strcasecmp(p, "AuthMethod") == 0 && !auth_method) {
+-				if((auth_method = strdup(q)) == (char *)NULL) {
++				if((auth_method = strdup(q)) == NULL) {
+ 					die("parse_config() -- strdup() failed");
+ 				}
+ 
+@@ -1119,14 +1118,11 @@ int smtp_open(char *host, int port)
+ 	char buf[(BUF_SZ + 1)];
+ 
+ 	/* Init SSL stuff */
+-	SSL_CTX *ctx;
+-	SSL_METHOD *meth;
++	SSL_CTX *ctx = NULL;
+ 	X509 *server_cert;
+-
+ 	SSL_load_error_strings();
+ 	SSLeay_add_ssl_algorithms();
+-	meth=SSLv23_client_method();
+-	ctx = SSL_CTX_new(meth);
++	ctx = SSL_CTX_new(SSLv23_client_method());
+ 	if(!ctx) {
+ 		log_event(LOG_ERR, "No SSL support initiated\n");
+ 		return(-1);
+@@ -1310,7 +1306,7 @@ char *fd_gets(char *buf, int size, int f
+ 			buf[i++] = c;
+ 		}
+ 	}
+-	buf[i] = (char)NULL;
++	buf[i] = '\0';
+ 
+ 	return(buf);
+ }
+@@ -1434,14 +1430,14 @@ int ssmtp(char *argv[])
+ 	}
+ 
+ 	if((p = strtok(pw->pw_gecos, ";,"))) {
+-		if((gecos = strdup(p)) == (char *)NULL) {
++		if((gecos = strdup(p)) == NULL) {
+ 			die("ssmtp() -- strdup() failed");
+ 		}
+ 	}
+ 	revaliases(pw);
+ 
+ 	/* revaliases() may have defined this */
+-	if(uad == (char *)NULL) {
++	if(uad == NULL) {
+ 		uad = append_domain(pw->pw_name);
+ 	}
+ 
+@@ -1489,7 +1485,7 @@ int ssmtp(char *argv[])
+ 	/* Try to log in if username was supplied */
+ 	if(auth_user) {
+ #ifdef MD5AUTH
+-		if(auth_pass == (char *)NULL) {
++		if(auth_pass == NULL) {
+ 			auth_pass = strdup("");
+ 		}
+ 
+@@ -1508,7 +1504,7 @@ int ssmtp(char *argv[])
+ 		else {
+ #endif
+ 		memset(buf, 0, bufsize);
+-		to64frombits(buf, auth_user, strlen(auth_user));
++		to64frombits(buf, (unsigned char *)auth_user, strlen(auth_user));
+ 		if (use_oldauth) {
+ 			outbytes += smtp_write(sock, "AUTH LOGIN %s", buf);
+ 		}
+@@ -1520,7 +1516,7 @@ int ssmtp(char *argv[])
+ 			}
+ 			/* we assume server asked us for Username */
+ 			memset(buf, 0, bufsize);
+-			to64frombits(buf, auth_user, strlen(auth_user));
++			to64frombits(buf, (unsigned char *)auth_user, strlen(auth_user));
+ 			outbytes += smtp_write(sock, buf);
+ 		}
+ 
+@@ -1530,7 +1526,7 @@ int ssmtp(char *argv[])
+ 		}
+ 		memset(buf, 0, bufsize);
+ 
+-		to64frombits(buf, auth_pass, strlen(auth_pass));
++		to64frombits(buf, (unsigned char *)auth_pass, strlen(auth_pass));
+ #ifdef MD5AUTH
+ 		}
+ #endif
+@@ -1737,7 +1733,7 @@ char **parse_options(int argc, char *arg
+ 		j = 0;
+ 
+ 		add = 1;
+-		while(argv[i][++j] != (char)NULL) {
++		while(argv[i][++j] != '\0') {
+ 			switch(argv[i][j]) {
+ #ifdef INET6
+ 			case '6':
+@@ -1755,14 +1751,14 @@ char **parse_options(int argc, char *arg
+ 					if((!argv[i][(j + 1)])
+ 						&& argv[(i + 1)]) {
+ 						auth_user = strdup(argv[i+1]);
+-						if(auth_user == (char *)NULL) {
++						if(auth_user == NULL) {
+ 							die("parse_options() -- strdup() failed");
+ 						}
+ 						add++;
+ 					}
+ 					else {
+ 						auth_user = strdup(argv[i]+j+1);
+-						if(auth_user == (char *)NULL) {
++						if(auth_user == NULL) {
+ 							die("parse_options() -- strdup() failed");
+ 						}
+ 					}
+@@ -1772,14 +1768,14 @@ char **parse_options(int argc, char *arg
+ 					if((!argv[i][(j + 1)])
+ 						&& argv[(i + 1)]) {
+ 						auth_pass = strdup(argv[i+1]);
+-						if(auth_pass == (char *)NULL) {
++						if(auth_pass == NULL) {
+ 							die("parse_options() -- strdup() failed");
+ 						}
+ 						add++;
+ 					}
+ 					else {
+ 						auth_pass = strdup(argv[i]+j+1);
+-						if(auth_pass == (char *)NULL) {
++						if(auth_pass == NULL) {
+ 							die("parse_options() -- strdup() failed");
+ 						}
+ 					}
+@@ -1870,14 +1866,14 @@ char **parse_options(int argc, char *arg
+ 			case 'F':
+ 				if((!argv[i][(j + 1)]) && argv[(i + 1)]) {
+ 					minus_F = strdup(argv[(i + 1)]);
+-					if(minus_F == (char *)NULL) {
++					if(minus_F == NULL) {
+ 						die("parse_options() -- strdup() failed");
+ 					}
+ 					add++;
+ 				}
+ 				else {
+ 					minus_F = strdup(argv[i]+j+1);
+-					if(minus_F == (char *)NULL) {
++					if(minus_F == NULL) {
+ 						die("parse_options() -- strdup() failed");
+ 					}
+ 				}
+@@ -1889,14 +1885,14 @@ char **parse_options(int argc, char *arg
+ 			case 'r':
+ 				if((!argv[i][(j + 1)]) && argv[(i + 1)]) {
+ 					minus_f = strdup(argv[(i + 1)]);
+-					if(minus_f == (char *)NULL) {
++					if(minus_f == NULL) {
+ 						die("parse_options() -- strdup() failed");
+ 					}
+ 					add++;
+ 				}
+ 				else {
+ 					minus_f = strdup(argv[i]+j+1);
+-					if(minus_f == (char *)NULL) {
++					if(minus_f == NULL) {
+ 						die("parse_options() -- strdup() failed");
+ 					}
+ 				}
+--- a/base64.c
++++ b/base64.c
+@@ -31,7 +31,7 @@ static const char base64val[] = {
+ };
+ #define DECODE64(c)  (isascii(c) ? base64val[c] : BAD)
+ 
+-void to64frombits(unsigned char *out, const unsigned char *in, int inlen)
++void to64frombits(char *out, const unsigned char *in, int inlen)
+ /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */
+ {
+     for (; inlen >= 3; inlen -= 3)
+@@ -57,7 +57,7 @@ void to64frombits(unsigned char *out, co
+     *out = '\0';
+ }
+ 
+-int from64tobits(char *out, const char *in)
++int from64tobits(unsigned char *out, const char *in)
+ /* base 64 to raw bytes in quasi-big-endian order, returning count of bytes */
+ {
+     int len = 0;
+--- a/ssmtp.h
++++ b/ssmtp.h
+@@ -41,5 +41,5 @@ typedef struct string_list rcpt_t;
+ void get_arpadate(char *);
+ 
+ /* base64.c */
+-void to64frombits(unsigned char *, const unsigned char *, int);
+-int from64tobits(char *, const char *);
++void to64frombits(char *, const unsigned char *, int);
++int from64tobits(unsigned char *, const char *);
diff --git a/ssmtp/patches/004-remove_dead-letter.patch b/ssmtp/patches/004-remove_dead-letter.patch
new file mode 100644
index 00000000..5e8b2d92
--- /dev/null
+++ b/ssmtp/patches/004-remove_dead-letter.patch
@@ -0,0 +1,94 @@
+--- a/ssmtp.c
++++ b/ssmtp.c
+@@ -138,71 +138,7 @@ int smtp_read_all(int fd, char *response
+ int smtp_okay(int fd, char *response);
+ 
+ /*
+-dead_letter() -- Save stdin to ~/dead.letter if possible
+-*/
+-void dead_letter(void)
+-{
+-	char *path;
+-	char buf[(BUF_SZ + 1)];
+-	struct passwd *pw;
+-	uid_t uid;
+-	FILE *fp;
+-
+-	uid = getuid();
+-	pw = getpwuid(uid);
+-
+-	if(isatty(fileno(stdin))) {
+-		if(log_level > 0) {
+-			log_event(LOG_ERR,
+-				"stdin is a TTY - not saving to %s/dead.letter", pw->pw_dir);
+-		}
+-		return;
+-	}
+-
+-	if(pw == (struct passwd *)NULL) {
+-		/* Far to early to save things */
+-		if(log_level > 0) {
+-			log_event(LOG_ERR, "No sender failing horribly!");
+-		}
+-		return;
+-	}
+-
+-#define DEAD_LETTER "/dead.letter"
+-	path = malloc (strlen (pw->pw_dir) + sizeof (DEAD_LETTER));
+-	if (!path) {
+-		/* Can't use die() here since dead_letter() is called from die() */
+-		exit(1);
+-	}
+-	memcpy (path, pw->pw_dir, strlen (pw->pw_dir));
+-	memcpy (path + strlen (pw->pw_dir), DEAD_LETTER, sizeof (DEAD_LETTER));
+-	
+-	if((fp = fopen(path, "a")) == (FILE *)NULL) {
+-		/* Perhaps the person doesn't have a homedir... */
+-		if(log_level > 0) {
+-			log_event(LOG_ERR, "Can't open %s failing horribly!", path);
+-		}
+-		free(path);
+-		return;
+-	}
+-
+-	/* We start on a new line with a blank line separating messages */
+-	(void)fprintf(fp, "\n\n");
+-
+-	while(fgets(buf, sizeof(buf), stdin)) {
+-		(void)fputs(buf, fp);
+-	}
+-
+-	if(fclose(fp) == -1) {
+-		if(log_level > 0) {
+-			log_event(LOG_ERR,
+-				"Can't close %s/dead.letter, possibly truncated", pw->pw_dir);
+-		}
+-	}
+-	free(path);
+-}
+-
+-/*
+-die() -- Write error message, dead.letter and exit
++die() -- Write error message and exit
+ */
+ void die(char *format, ...)
+ {
+@@ -216,9 +152,6 @@ void die(char *format, ...)
+ 	(void)fprintf(stderr, "%s: %s\n", prog, buf);
+ 	log_event(LOG_ERR, "%s", buf);
+ 
+-	/* Send message to dead.letter */
+-	(void)dead_letter();
+-
+ 	exit(1);
+ }
+ 
+@@ -1640,7 +1573,7 @@ int ssmtp(char *argv[])
+ 			sleep(1);
+ 			/* don't hang forever when reading from stdin */
+ 			if (++timeout >= MEDWAIT) {
+-				log_event(LOG_ERR, "killed: timeout on stdin while reading body -- message saved to dead.letter.");
++				log_event(LOG_ERR, "killed: timeout on stdin while reading body.");
+ 				die("Timeout on stdin while reading body");
+ 			}
+ 			continue;
diff --git a/ssmtp/patches/006-add_ip-header.patch b/ssmtp/patches/006-add_ip-header.patch
new file mode 100644
index 00000000..e142e40b
--- /dev/null
+++ b/ssmtp/patches/006-add_ip-header.patch
@@ -0,0 +1,21 @@
+--- a/ssmtp.c
++++ b/ssmtp.c
+@@ -1338,6 +1338,7 @@ ssmtp() -- send the message (exactly one
+ int ssmtp(char *argv[])
+ {
+ 	char b[(BUF_SZ + 2)], *buf = b+1, *p, *q;
++	char *remote_addr;
+ #ifdef MD5AUTH
+ 	char challenge[(BUF_SZ + 1)];
+ #endif
+@@ -1541,6 +1542,10 @@ int ssmtp(char *argv[])
+ 		outbytes += smtp_write(sock, "From: %s", from);
+ 	}
+ 
++	if(remote_addr=getenv("REMOTE_ADDR")) {
++		outbytes += smtp_write(sock, "X-Originating-IP: %s", remote_addr);
++	}
++
+ 	if(have_date == False) {
+ 		outbytes += smtp_write(sock, "Date: %s", arpadate);
+ 	}
diff --git a/ssmtp/patches/008-remove_garbage.patch b/ssmtp/patches/008-remove_garbage.patch
new file mode 100644
index 00000000..d72f6350
--- /dev/null
+++ b/ssmtp/patches/008-remove_garbage.patch
@@ -0,0 +1,18 @@
+--- a/ssmtp.c
++++ b/ssmtp.c
+@@ -1591,12 +1591,12 @@ int ssmtp(char *argv[])
+ 			outbytes += smtp_write(sock, "%s", leadingdot ? b : buf);
+ 		} else {
+ 			if (log_level > 0) {
+-				log_event(LOG_INFO, "Sent a very long line in chunks");
++				log_event(LOG_INFO, "Sending a partial line");
+ 			}
+ 			if (leadingdot) {
+-				outbytes += fd_puts(sock, b, sizeof(b));
++				outbytes += fd_puts(sock, b, strlen(b));
+ 			} else {
+-				outbytes += fd_puts(sock, buf, bufsize);
++				outbytes += fd_puts(sock, buf, strlen(buf));
+ 			}
+ 		}
+ 		(void)alarm((unsigned) MEDWAIT);
diff --git a/ssmtp/patches/010-fix_message-header.patch b/ssmtp/patches/010-fix_message-header.patch
new file mode 100644
index 00000000..3fc9fad5
--- /dev/null
+++ b/ssmtp/patches/010-fix_message-header.patch
@@ -0,0 +1,92 @@
+--- a/ssmtp.c
++++ b/ssmtp.c
+@@ -282,6 +282,7 @@ standardise() -- Trim off '\n's and doub
+ */
+ bool_t standardise(char *str, bool_t *linestart)
+ {
++	size_t sl;
+ 	char *p;
+ 	bool_t leadingdot = False;
+ 
+@@ -297,6 +298,12 @@ bool_t standardise(char *str, bool_t *li
+ 	if((p = strchr(str, '\n'))) {
+ 		*p = '\0';
+ 		*linestart = True;
++
++		/* If the line ended in "\r\n", then drop the '\r' too */
++		sl = strlen(str);
++		if(sl >= 1 && str[sl - 1] == '\r') {
++			str[sl - 1] = '\0';
++		}
+ 	}
+ 	return(leadingdot);
+ }
+@@ -690,6 +697,14 @@ void header_parse(FILE *stream)
+ 		}
+ 		len++;
+ 
++		if(l == '\r' && c == '\n') {
++			/* Properly handle input that already has "\r\n"
++			   line endings; see https://bugs.debian.org/584162 */
++			l = (len >= 2 ? *(q - 2) : '\n');
++			q--;
++			len--;
++		}
++
+ 		if(l == '\n') {
+ 			switch(c) {
+ 				case ' ':
+@@ -712,8 +727,9 @@ void header_parse(FILE *stream)
+ 						if((q = strrchr(p, '\n'))) {
+ 							*q = '\0';
+ 						}
+-						header_save(p);
+-
++						if(len > 0) {
++							header_save(p);
++						}
+ 						q = p;
+ 						len = 0;
+ 			}
+@@ -722,35 +738,12 @@ void header_parse(FILE *stream)
+ 
+ 		l = c;
+ 	}
+-	if(in_header) {
+-		if(l == '\n') {
+-			switch(c) {
+-				case ' ':
+-				case '\t':
+-						/* Must insert '\r' before '\n's embedded in header
+-						   fields otherwise qmail won't accept our mail
+-						   because a bare '\n' violates some RFC */
+-						
+-						*(q - 1) = '\r';	/* Replace previous \n with \r */
+-						*q++ = '\n';		/* Insert \n */
+-						len++;
+-						
+-						break;
+-
+-				case '\n':
+-						in_header = False;
+-
+-				default:
+-						*q = '\0';
+-						if((q = strrchr(p, '\n'))) {
+-							*q = '\0';
+-						}
+-						header_save(p);
+-
+-						q = p;
+-						len = 0;
+-			}
+-		}
++	if(in_header && l == '\n') {
++		/* Got EOF while reading the header */
++		if((q = strrchr(p, '\n'))) {
++			*q = '\0';
++ 		}
++		header_save(p);
+ 	}
+ 	(void)free(p);
+ }
diff --git a/ssmtp/patches/020-openssl-deprecated.patch b/ssmtp/patches/020-openssl-deprecated.patch
new file mode 100644
index 00000000..c4cc6b2e
--- /dev/null
+++ b/ssmtp/patches/020-openssl-deprecated.patch
@@ -0,0 +1,13 @@
+--- a/ssmtp.c
++++ b/ssmtp.c
+@@ -1046,8 +1046,10 @@ int smtp_open(char *host, int port)
+ 	/* Init SSL stuff */
+ 	SSL_CTX *ctx = NULL;
+ 	X509 *server_cert;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+ 	SSL_load_error_strings();
+ 	SSLeay_add_ssl_algorithms();
++#endif
+ 	ctx = SSL_CTX_new(SSLv23_client_method());
+ 	if(!ctx) {
+ 		log_event(LOG_ERR, "No SSL support initiated\n");
diff --git a/stubby/Makefile b/stubby/Makefile
new file mode 100644
index 00000000..79d5ebc6
--- /dev/null
+++ b/stubby/Makefile
@@ -0,0 +1,65 @@
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=stubby
+PKG_VERSION:=0.4.0
+PKG_RELEASE:=3
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/getdnsapi/$(PKG_NAME)
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=bc5f604da1b70287a6c3d89eac2e13ce8bca52840e7b72ab098a3deeb9935082
+
+PKG_MAINTAINER:=
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/stubby/Default
+  TITLE:=stubby
+  URL:=https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby
+endef
+
+define Package/stubby
+  $(call Package/stubby/Default)
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=IP Addresses and Names
+  TITLE+= - (daemon that uses getdns)
+  USERID:=stubby=410:stubby=410
+  DEPENDS:= +libyaml +getdns +ca-certs
+endef
+
+define Package/stubby/description
+  This package contains the Stubby daemon (which utilizes the getdns library).
+  See https://github.com/openwrt/packages/blob/master/net/stubby/files/README.md for more details.
+endef
+
+define Package/stubby/conffiles
+/etc/stubby/stubby.yml
+/etc/config/stubby
+endef
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	rm $(PKG_BUILD_DIR)/cmake/modules/FindLibidn2.cmake $(PKG_BUILD_DIR)/cmake/modules/FindLibunbound.cmake
+endef
+
+define Package/stubby/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/stubby $(1)/usr/sbin/stubby
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN)  ./files/stubby.init $(1)/etc/init.d/stubby
+	$(INSTALL_DIR) $(1)/etc/stubby
+	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/stubby/stubby.yml $(1)/etc/stubby/stubby.yml.default
+	$(INSTALL_DATA) ./files/stubby.yml $(1)/etc/stubby/stubby.yml
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_CONF) ./files/stubby.conf $(1)/etc/config/stubby
+endef
+
+$(eval $(call BuildPackage,stubby))
diff --git a/stubby/files/README.md b/stubby/files/README.md
new file mode 100644
index 00000000..92021b3b
--- /dev/null
+++ b/stubby/files/README.md
@@ -0,0 +1,454 @@
+
+# Stubby for OpenWRT
+
+## Stubby Description
+
+[Stubby](https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Daemon+-+Stubby) is
+an application that acts as a local DNS Privacy stub resolver (using
+DNS-over-TLS). Stubby encrypts DNS queries sent from a client machine to a DNS
+Privacy resolver increasing end user privacy.
+
+Stubby is useful on an OpenWRT device, because it can sit between the usual DNS
+resolver (dnsmasq by default) and the upstream DNS resolver and be used to
+ensure that DNS traffic is encrypted between the OpenWRT device and the
+resolver.
+
+Stubby is developed by the [getdns](http://getdnsapi.net/) project.
+
+For more background and FAQ see the [About
+Stubby](https://dnsprivacy.org/wiki/display/DP/About+Stubby) page.
+
+
+## Installation
+
+Installation of this package can be achieved at the command line using `opkg
+install stubby`, or via the LUCI Web Interface. Installing the stubby package
+will also install the required dependency packages, including the
+`ca-bundle` package.
+
+## Configuration
+
+The default configuration of the package has been chosen to ensure that stubby
+should work after installation.
+
+By default, configuration of stubby is integrated with the OpenWRT UCI system
+using the file `/etc/config/stubby`. The configuration options available are
+also documented in that file. If for some reason you wish to configure stubby
+using the `/etc/stubby/stubby.yml` file, then you simply need to set `option
+manual '1'` in `/etc/config/stubby` and all other settings in
+`/etc/config/stubby` will be ignored.
+
+### Stubby port and addresses
+
+The default configuration ensures that stubby listens on port 5453 on the
+loopback interfaces for IPv4 and IPv6. As such, by default, stubby will respond
+only to lookups from the OpenWRT device itself.
+
+By setting the listening ports to non-standard values, this allows users to keep
+the main name server daemon in place (dnsmasq/unbound/etc.) and have that name
+server forward to stubby.
+
+### Upstream resolvers
+
+The default package configuration uses the CloudFlare resolvers, configured for
+both IPv4 and IPv6. 
+
+CloudFlare have not published SPKI pinsets, and even though they are available,
+they have made no commitment to maintaining them. Using the currently known SPKI
+pinsets for CloudFlare brings the risk that in the future they may be changed by
+CloudFlare, and DNS would stop working. The default configuration has those SPKI
+entries commented out for this reason.
+
+[CloudFlare's privacy
+statement](https://developers.cloudflare.com/1.1.1.1/commitment-to-privacy/)
+details how they treat data from DNS requests.
+
+More resolvers are available in the [upstream stubby example
+configuration](https://github.com/getdnsapi/stubby/blob/develop/stubby.yml.example)
+and the [DNS Privacy
+list](https://dnsprivacy.org/wiki/display/DP/DNS+Privacy+Test+Servers).
+
+## Integration of stubby with dnsmasq
+
+The recommended way to use stubby on an OpenWRT device is to integrate it with a
+caching resolver. The default caching resolver in OpenWRT is dnsmasq.
+
+### Set dnsmasq to send DNS requests to stubby
+
+Since dnsmasq responds to LAN DNS requests on port 53 of the OpenWRT device by
+default, all that is required is to have dnsmasq forward those requests to
+stubby which is listening on port 5453 of the OpenWRT device. To achieve this,
+we need to set the `server` option in the dnsmasq configuration in the
+`/etc/config/dhcp` file to `'127.0.0.1#5453'`. We also need to tell dnsmasq not
+to use resolvers found in `/etc/resolv.conf` by setting the dnsmasq option
+`noresolv` to `1` in the same file. This can be achieved by editing the
+`/etc/config/dhcp` file directly or executing the following commands at the
+command line:
+
+    uci add_list dhcp.@dnsmasq[-1].server='127.0.0.1#5453'
+    uci set dhcp.@dnsmasq[-1].noresolv=1
+    uci commit && reload_config
+
+The same outcome can be achieved in the LUCI web interface as follows:
+
+1. Select the Network->DHCP and DNS menu entry.
+2. In the "General Settings" tab, enter the address `127.0.0.1#5453` as the only
+   entry in the "DNS Forwardings" dialogue.
+3. In the "Resolv and Host files" tab tick the "Ignore resolve file" checkbox.
+
+### Disable sending DNS requests to ISP provided DNS servers
+
+The configuration changes in the previous section ensure that DNS queries are
+sent over TLS encrypted connections *once dnsmasq and stubby are started*. When
+the OpenWRT device is first brought up, there is a possibility that DNS queries
+can go to ISP provided DNS servers ahead of dnsmasq and stubby being active. In
+order to mitigate this leakage, it's necessary to ensure that upstream resolvers
+aren't available, and the only DNS resolver used by the system is
+dnsmasq+stubby. 
+
+This requires setting the option `peerdns` to `0` and the option `dns` to the
+loopback address for both the `wan` and `wan6` interfaces in the
+`/etc/config/network` file. This can be achieved by editing the
+`/etc/config/network` file directly, or by executing the following commands:
+
+    uci set network.wan.peerdns='0'
+    uci set network.wan.dns='127.0.0.1'
+    uci set network.wan6.peerdns='0'
+    uci set network.wan6.dns='0::1'
+    uci commit && reload_config
+
+The same outcome can also be achieved using the LUCI web interface as follows:
+
+1. Select the Network->Interfaces menu entry.
+2. Click on Edit for the WAN interfaces.
+3. Choose the Advanced Settings tab.
+4. Unselect the "Use DNS servers advertised by peer" checkbox
+5. Enter `127.0.0.1` in the "Use custom DNS servers" dialogue box.
+6. Repeat the above steps for the WAN6 interface, but use the address `0::1`
+   instead of `127.0.0.1`.
+   
+### Enabling DNSSEC
+
+The configuration described above ensures that DNS queries are executed over TLS
+encrypted links. However, the responses themselves are not validated; DNSSEC
+provides the ability to validate returned DNS responses, and mitigate against
+DNS poisoning risks.
+
+With the combination of stubby+dnsmasq there are two possible ways to enable
+DNSSEC:
+
+1. Configure stubby to perform DNSSEC validation, and configure dnsmasq to proxy
+   the DNSSEC data to clients.
+2. Configure stubby not to perform DNSSEC validation and configure dnsmasq to
+   require DNSSEC validation.
+
+Either option achieves the same outcome, and there appears to be little reason
+for choosing one over the other other than that the second option is easier to
+configure in the LUCI web interface. Both options are detailed below, and both
+require that the `dnsmasq` package on the OpenWRT device is replaced with the
+`dnsmasq-full` package. That can be achieved by running the following command:
+
+    opkg install dnsmasq-full --download-only && opkg remove dnsmasq && opkg install dnsmasq-full --cache . && rm *.ipk
+
+#### DNSSEC by stubby
+
+Configuring stubby to perform DNSSEC validation requires setting the stubby
+configuration option `dnssec_return_status` to `'1'` in `/etc/config/stubby`,
+which can be done by editing the file directly or by executing the commands:
+
+    uci set stubby.global.dnssec_return_status=1
+    uci commit && reload_config
+    
+With stubby performing DNSSEC validation, dnsmasq needs to be configured to
+proxy the DNSSEC data to clients. This requires setting the option `proxydnssec`
+to 1 in the dnsmasq configuration in `/etc/config/dhcp`. That can be achieved by
+the following commands:
+
+    uci set dhcp.@dnsmasq[-1].proxydnssec=1
+    uci commit && reload_config
+
+#### DNSSEC by dnsmasq
+
+Configuring dnsmasq to perform DNSSEC validation requires setting the dnsmasq
+option `dnssec` to `1` in the `/etc/config/dhcp` file. In addition, it is
+advisable to also set the dnsmasq option `dnsseccheckunsigned` to `1`. this can
+be achieved by editing the file `/etc/config/dhcp` or by executing the following
+commands:
+
+    uci set dhcp.@dnsmasq[-1].dnssec=1
+    uci set dhcp.@dnsmasq[-1].dnsseccheckunsigned=1
+    uci commit && reload_config
+
+The same options can be set in the LUCI web interface as follows:
+
+1. Select the "Network->DHCP and DNS" menu entry.
+2. Select the "Advanced Settings" tab.
+3. Ensure both the "DNSSEC" and "DNSSEC check unsigned" check boxes are ticked.
+
+#### Validating DNSSEC operation
+
+Having configured DNSSEC validation using one of the two approaches above, it's
+important to check it's actually working. The following command can be used:
+
+    dig dnssectest.sidn.nl +dnssec +multi @192.168.1.1
+    
+This command should return output like the following:
+
+    ; <<>> DiG 9.11.4-P1-RedHat-9.11.4-5.P1.fc28 <<>> dnssectest.sidn.nl +dnssec +multi @192.168.1.1
+    ;; global options: +cmd
+    ;; Got answer:
+    ;; ->>HEADER<<- opcode: QUERY, status: NOERROR, id: 26579
+    ;; flags: qr rd ra ad; QUERY: 1, ANSWER: 2, AUTHORITY: 0, ADDITIONAL: 1
+
+    ;; OPT PSEUDOSECTION:
+    ; EDNS: version: 0, flags: do; udp: 512
+    ;; QUESTION SECTION:
+    ;dnssectest.sidn.nl.	IN A
+
+    ;; ANSWER SECTION:
+    dnssectest.sidn.nl.	14399 IN A 213.136.9.12
+    dnssectest.sidn.nl.	14399 IN RRSIG A 8 3 14400 (
+				20181104071058 20181005071058 42033 sidn.nl.
+				YAQl3tef36M9EQUOmCneHKCCkxox3csLpfUOql5i/6ND
+				zPrQFsNr3g32HPoxOsi+hD2BE5+bEsnARayDSVLyx0qU
+				6Hpi2rzQ0zGNZZkCJhCsdp3wnM1BWlMgPrCD0iIsJDok
+				+DH5zu+yYufVUdSLQrMqA3MZDFUIqDUqSZuYDF4= )
+
+    ;; Query time: 77 msec
+    ;; SERVER: 192.168.1.1#53(192.168.1.1)
+    ;; WHEN: Sat Oct 06 20:36:25 BST 2018
+    ;; MSG SIZE  rcvd: 230
+
+The key thing to note is the `flags: qr rd ra ad` part - the `ad` flag signifies
+that DNSSEC validation is working. If that flag is absent DNSSEC validation is
+not working.
+
+## Appendix: stubby configuration options
+
+This section details the options available for use in the `/etc/config/stubby`
+file. The `global` configuration section specifies the configuration parameters
+for the stubby daemon. One or more `resolver` sections are used to configure
+upstream resolvers for the stubby daemon to use.
+
+### `global` section options
+
+#### `option manual`
+
+Specify whether to use this file to configure the stubby service. If this is set
+to `'1'` stubby will be configured using the file `/etc/stubby/stubby.yml`. If this
+is set to `'0'`, configuration options will be taken from this file, and the service
+will be managed through UCI.
+
+#### `option trigger`
+
+This specifies an interface to trigger stubby start up on; stubby startup will
+be triggered by a procd signal associated with this interface being ready. If
+this interface is restarted, stubby will also be restarted. 
+
+This option can also be set to `'timed'`, in which case a time, specified by the
+option `triggerdelay`, will be waited before starting stubby.
+
+
+#### `option triggerdelay`
+
+If the `trigger` option specifies an interface, this option sets the time that
+is waited after the procd signal is received before starting stubby. 
+
+If `trigger` is set to `'timed'` then this is the delay before starting stubby.
+This option is specified in seconds and defaults to the value `'2'`.
+
+#### `list dns_transport`
+
+The `dns_transport` list specifies the allowed transports. Allowed values are:
+`GETDNS_TRANSPORT_UDP`, `GETDNS_TRANSPORT_TCP` and `GETDNS_TRANSPORT_TLS`. The
+transports are tried in the order listed.
+
+#### `option tls_authentication`
+
+This option specifies whether TLS authentication is mandatory. A value of `'1'`
+mandates TLS authentication, and is the default.
+
+If this is set to `'0'`, and `GETDNS_TRANSPORT_TCP` or `GETDNS_TRANSPORT_UDP`
+appears in the `dns_transport` list, stubby is allowed to fall back to non-TLS
+authenticated lookups. You probably don't want this though.
+
+#### `option tls_query_padding_blocksize`
+
+This option specifies the block size to pad DNS queries to. You shouldn't need
+to set this to anything but `'128'` (the default), as recommended by
+https://tools.ietf.org/html/draft-ietf-dprive-padding-policy-03
+
+#### `option tls_connection_retries`
+
+This option specifies the number of connection failures stubby permits before
+Stubby backs-off from using an individual upstream resolver. You shouldn't need
+to change this from the default value of `'2'`.
+
+#### `option tls_backoff_time`
+
+This option specifies the maximum time in seconds Stubby will back-off from
+using an individual upstream after failures. You shouldn't need to change this
+from the default value of `'3600'`.
+
+#### `option timeout`
+
+This option specifies the timeout on getting a response to an individual
+request. This is specified in milliseconds. You shouldn't need to change this
+from the default value of ` '5000'`.
+
+#### `option dnssec_return_status`
+
+This option specifies whether stubby should require DNSSEC validation. Specify
+to `'1'` to turn on validation, and `'0'` to turn it off. By default it is off.
+
+#### `option appdata_dir`
+
+This option specifies the location for storing stubby runtime data. In
+particular, if DNSSEC is turned on, stubby will store its automatically
+retrieved trust anchor data here. The default value is `'/var/lib/stubby'`.
+
+#### `option trust_anchors_backoff_time`
+
+When Zero configuration DNSSEC failed, because of network unavailability or
+failure to write to the appdata directory, stubby will backoff trying to refetch
+the DNSSEC trust-anchor for a specified amount of time expressed in milliseconds
+(which defaults to two and a half seconds).
+
+#### `option dnssec_trust_anchors`
+
+This option sets the location of the file containing the trust anchor data used
+for DNSSEC validation. If this is not specified, stubby will automatically
+retrieve a trust anchor at startup. It's unlikely you'll want to manage the
+trust anchor data manually, so in most cases this is not needed. By default,
+this is unset.
+
+#### `option edns_client_subnet_private`
+
+This option specifies whether to enforce ECS client privacy. The default is
+`'1'`. Set to `'0'` to disable client privacy.
+
+For more details see Section 7.1.2 [here](https://tools.ietf.org/html/rfc7871).
+
+#### `option idle_timeout`
+
+This option specifies the time (in milliseconds) to hold TLS connections open to
+avoid the overhead of opening a new connection for every query. You should not
+normally need to change this from the default value (currently `'10000'`).
+
+See [here](https://tools.ietf.org/html/rfc7828) for more details.
+
+#### `option round_robin_upstreams`
+
+This option specifies how stubby will use the upstream DNS resolvers. Set to
+`'1'` (the default) to instruct stubby to distribute queries across all
+available name servers - this will use multiple simultaneous connections which
+can give better performance in most (but not all) cases. Set to `'0'` to treat
+the upstream resolvers as an ordered list and use a single upstream resolver
+until it becomes unavailable, then use the next one.
+
+#### `list listen_address`
+
+This list sets the addresses and ports for the stubby daemon to listen for
+requests on. the default configuration configures stubby to listen on port 5453
+on the loopback interface for both IPv4 and IPv6.
+
+#### `option log_level`
+
+If set, this option specifies the level of logging from the stubby
+daemon. By default, this option is not set.
+
+The possible levels are:
+
+    '0': EMERG  - System is unusable
+    '1': ALERT  - Action must be taken immediately
+    '2': CRIT   - Critical conditions
+    '3': ERROR  - Error conditions
+    '4': WARN   - Warning conditions
+    '5': NOTICE - Normal, but significant, condition
+    '6': INFO   - Informational message
+    '7': DEBUG  - Debug-level message
+
+#### `option command_line_arguments`
+
+This option specifies additional command line arguments for
+stubby daemon. By default, this is an empty string.
+
+#### `option tls_cipher_list`
+
+If set, this specifies the acceptable ciphers for DNS over TLS. With OpenSSL
+1.1.1 this list is for TLS1.2 and older only. Ciphers for TLS1.3 should be set
+with the `tls_ciphersuites` option. This option can also be given per upstream
+resolver. By default, this option is not set.
+
+#### `option tls_ciphersuites`
+
+If set, this specifies the acceptable cipher for DNS over TLS1.3. OpenSSL
+version 1.1.1 or greater is required for this option. This option can also be
+given per upstream resolver. By default, this option is not set.
+
+#### `option tls_min_version`
+
+If set, this specifies the minimum acceptable TLS version. Works with OpenSSL
+1.1.1 or greater only. This option can also be given per upstream resolver. By
+default, this option is not set.
+
+#### `option tls_max_version`
+
+If set, this specifies the maximum acceptable TLS version. Works with OpenSSL
+1.1.1 or greater only. This option can also be given per upstream resolver. By
+default, this option is not set.
+
+
+### `resolver` section options
+
+#### `option address`
+
+This option specifies the resolver IP address, and can either be an IPv4 or an
+IPv6 address.
+
+#### `option tls_auth_name`
+
+This option specifies the upstream domain name used for TLS authentication with
+the supplied server certificate
+
+#### `option tls_port`
+
+This option specifies the TLS port for the upstream resolver. If not specified,
+this defaults to 853.
+
+#### `option tls_cipher_list`
+
+If set, this specifies the acceptable ciphers for DNS over TLS. With OpenSSL
+1.1.1 this list is for TLS1.2 and older only. Ciphers for TLS1.3 should be set
+with the `tls_ciphersuites` option. By default, this option is not set. If set,
+this overrides the global value.
+
+#### `option tls_ciphersuites`
+
+If set, this specifies the acceptable cipher for DNS over TLS1.3. OpenSSL
+version 1.1.1 or greater is required for this option. By default, this option is
+not set. If set, this overrides the global value.
+
+#### `option tls_min_version`
+
+If set, this specifies the minimum acceptable TLS version. Works with OpenSSL
+1.1.1 or greater only. By default, this option is not set. If set, this
+overrides the global value.
+
+#### `option tls_max_version`
+
+If set, this specifies the maximum acceptable TLS version. Works with OpenSSL
+1.1.1 or greater only. By default, this options is not set. If set, this
+overrides the global value.
+
+#### `list spki`
+
+This list specifies the SPKI pinset which is verified against the keys in the
+server certificate. The value takes the form `'<digest type>/value>'`, where
+the `digest type` is the hashing algorithm used, and the value is the Base64
+encoded hash of the public key. At present, only `sha256` is
+supported for the digest type.
+
+This should ONLY be used if the upstream resolver has committed to maintaining
+the pinset. CloudFlare have made no such commitment, and so we do not specify
+the SPKI values in the default configuration, even though they are available.
diff --git a/stubby/files/stubby.conf b/stubby/files/stubby.conf
new file mode 100644
index 00000000..f722a430
--- /dev/null
+++ b/stubby/files/stubby.conf
@@ -0,0 +1,66 @@
+config stubby 'global'
+       option manual '0'
+       option trigger 'wan'
+       # option triggerdelay '2'
+       list dns_transport 'GETDNS_TRANSPORT_TLS'
+       option tls_authentication '1'
+       option tls_query_padding_blocksize '128'
+       # option tls_connection_retries '2'
+       # option tls_backoff_time '3600'
+       # option timeout '5000'
+       # option dnssec_return_status '0'
+       option appdata_dir '/var/lib/stubby'
+       # option trust_anchors_backoff_time 2500
+       # option dnssec_trust_anchors '/var/lib/stubby/getdns-root.key'
+       option edns_client_subnet_private '1'
+       option idle_timeout '10000'
+       option round_robin_upstreams '1'
+       list listen_address '127.0.0.1@5453'
+       list listen_address '0::1@5453'
+       # option log_level '7'
+       # option command_line_arguments ''
+       # option tls_cipher_list 'EECDH+AESGCM:EECDH+CHACHA20'
+       # option tls_ciphersuites 'TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256'
+       # option tls_min_version '1.2'
+       # option tls_max_version '1.3'
+
+# Upstream resolvers are specified using 'resolver' sections.
+config resolver
+       option address '2606:4700:4700::1111'
+       option tls_auth_name 'cloudflare-dns.com'
+       # option tls_port 853
+       # list spki 'sha256/yioEpqeR4WtDwE9YxNVnCEkTxIjx6EEIwFSQW+lJsbc='
+       # option tls_cipher_list 'EECDH+AESGCM:EECDH+CHACHA20'
+       # option tls_ciphersuites 'TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256'
+       # option tls_min_version '1.2'
+       # option tls_max_version '1.3'
+
+config resolver
+       option address '2606:4700:4700::1001'
+       option tls_auth_name 'cloudflare-dns.com'
+       # option tls_port 853
+       # list spki 'sha256/yioEpqeR4WtDwE9YxNVnCEkTxIjx6EEIwFSQW+lJsbc='
+       # option tls_cipher_list 'EECDH+AESGCM:EECDH+CHACHA20'
+       # option tls_ciphersuites 'TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256'
+       # option tls_min_version '1.2'
+       # option tls_max_version '1.3'
+
+config resolver
+       option address '1.1.1.1'
+       option tls_auth_name 'cloudflare-dns.com'
+       # option tls_port 853
+       # list spki 'sha256/yioEpqeR4WtDwE9YxNVnCEkTxIjx6EEIwFSQW+lJsbc='
+       # option tls_cipher_list 'EECDH+AESGCM:EECDH+CHACHA20'
+       # option tls_ciphersuites 'TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256'
+       # option tls_min_version '1.2'
+       # option tls_max_version '1.3'
+
+config resolver
+       option address '1.0.0.1'
+       option tls_auth_name 'cloudflare-dns.com'
+       # option tls_port 853
+       # list spki 'sha256/yioEpqeR4WtDwE9YxNVnCEkTxIjx6EEIwFSQW+lJsbc='
+       # option tls_cipher_list 'EECDH+AESGCM:EECDH+CHACHA20'
+       # option tls_ciphersuites 'TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256'
+       # option tls_min_version '1.2'
+       # option tls_max_version '1.3'
diff --git a/stubby/files/stubby.init b/stubby/files/stubby.init
new file mode 100755
index 00000000..a14df68f
--- /dev/null
+++ b/stubby/files/stubby.init
@@ -0,0 +1,275 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+
+START=30
+STOP=51
+
+stubby="/usr/sbin/stubby"
+stubby_init="/etc/init.d/stubby"
+stubby_config_dir="/var/etc/stubby"
+stubby_config="$stubby_config_dir/stubby.yml"
+stubby_pid_file="/var/run/stubby.pid"
+stubby_manual_config="/etc/stubby/stubby.yml"
+
+generate_config()
+{
+    local round_robin
+    local tls_authentication
+    local tls_query_padding_blocksize
+    local edns_client_subnet_private
+    local idle_timeout
+    local appdata_dir
+    local trust_anchors_backoff_time
+    local tls_connection_retries
+    local tls_backoff_time
+    local timeout
+    local dnssec_return_status
+    local dnssec_trust_anchors
+    local listen_addresses_section=0
+    local dns_transport_list_section=0
+    local upstream_recursive_servers_section=0
+    local command_line_arguments
+    local log_level
+    local tls_cipher_list
+    local tls_ciphersuites
+    local tls_min_version
+    local tls_max_version
+
+    # Generate configuration. See: https://github.com/getdnsapi/stubby/blob/develop/stubby.yml.example
+    echo "# Autogenerated configuration from uci data"
+    echo "resolution_type: GETDNS_RESOLUTION_STUB"
+
+    config_get round_robin "global" round_robin_upstreams "1"
+    echo "round_robin_upstreams: $round_robin"
+
+    config_get appdata_dir "global" appdata_dir "/var/lib/stubby"
+    echo "appdata_dir: \"$appdata_dir\""
+
+    config_get trust_anchors_backoff_time "global" trust_anchors_backoff_time "2500"
+    echo "trust_anchors_backoff_time: $trust_anchors_backoff_time"
+
+    config_get tls_connection_retries "global" tls_connection_retries ""
+    if [ -n "$tls_connection_retries" ]; then
+        echo "tls_connection_retries: $tls_connection_retries"
+    fi
+
+    config_get tls_backoff_time "global" tls_backoff_time ""
+    if [ -n "$tls_backoff_time" ]; then
+        echo "tls_backoff_time: $tls_backoff_time"
+    fi
+
+    config_get timeout "global" timeout ""
+    if [ -n "$timeout" ]; then
+        echo "timeout: $timeout"
+    fi
+
+    config_get_bool tls_authentication "global" tls_authentication "1"
+    if [ "$tls_authentication" = "1" ]; then
+        echo "tls_authentication: GETDNS_AUTHENTICATION_REQUIRED"
+    else
+        echo "tls_authentication: GETDNS_AUTHENTICATION_NONE"
+    fi
+
+    config_get_bool dnssec_return_status "global" dnssec_return_status "0"
+    if [ "$dnssec_return_status" = "1" ]; then
+        echo "dnssec_return_status: GETDNS_EXTENSION_TRUE"
+    fi
+
+    config_get dnssec_trust_anchors "global" dnssec_trust_anchors ""
+    if [ -n "$dnssec_trust_anchors" ]; then
+        echo "dnssec_trust_anchors: \"$dnssec_trust_anchors\""
+    fi
+
+    config_get tls_query_padding_blocksize "global" tls_query_padding_blocksize "128"
+    echo "tls_query_padding_blocksize: $tls_query_padding_blocksize"
+
+    config_get_bool edns_client_subnet_private "global" edns_client_subnet_private "1"
+    echo "edns_client_subnet_private: $edns_client_subnet_private"
+
+    config_get idle_timeout "global" idle_timeout "10000"
+    echo "idle_timeout: $idle_timeout"
+
+    config_get tls_cipher_list "global" tls_cipher_list ""
+    if [ -n "$tls_cipher_list" ]; then
+        echo "tls_cipher_list: \"$tls_cipher_list\""
+    fi
+
+    config_get tls_ciphersuites "global" tls_ciphersuites ""
+    if [ -n "$tls_ciphersuites" ]; then
+        echo "tls_ciphersuites: \"$tls_ciphersuites\""
+    fi
+
+    config_get tls_min_version "global" tls_min_version ""
+    if [ -n "$tls_min_version" ]; then
+        echo "tls_min_version: GETDNS_TLS${tls_min_version/\./_}"
+    fi
+
+    config_get tls_max_version "global" tls_max_version ""
+    if [ -n "$tls_max_version" ]; then
+        echo "tls_max_version: GETDNS_TLS${tls_max_version/\./_}"
+    fi
+
+    handle_listen_address_value()
+    {
+        local value="$1"
+
+        if [ "$listen_addresses_section" = 0 ]; then
+            echo "listen_addresses:"
+            listen_addresses_section=1
+        fi
+        echo "  - $value"
+    }
+    config_list_foreach "global" listen_address handle_listen_address_value
+
+    handle_dns_transport_list_value()
+    {
+        local value="$1"
+
+        if [ "$dns_transport_list_section" = 0 ]; then
+            echo "dns_transport_list:"
+            dns_transport_list_section=1
+        fi
+        echo "  - $value"
+    }
+    config_list_foreach "global" dns_transport handle_dns_transport_list_value
+
+    handle_resolver()
+    {
+        local config=$1
+        local address
+        local tls_auth_name
+        local tls_port
+        local tls_pubkey_pinset_section=0
+        local tls_cipher_list
+        local tls_ciphersuites
+        local tls_min_version
+        local tls_max_version
+
+        if [ "$upstream_recursive_servers_section" = 0 ]; then
+            echo "upstream_recursive_servers:"
+            upstream_recursive_servers_section=1
+        fi
+        config_get address "$config" address
+        echo "  - address_data: $address"
+
+        config_get tls_auth_name "$config" tls_auth_name
+        echo "    tls_auth_name: \"$tls_auth_name\""
+
+        config_get tls_port "$config" tls_port ""
+        if [ -n "$tls_port" ]; then
+            echo "    tls_port: $tls_port"
+        fi
+
+        config_get tls_cipher_list "$config" tls_cipher_list ""
+        if [ -n "$tls_cipher_list" ]; then
+            echo "    tls_cipher_list: \"$tls_cipher_list\""
+        fi
+
+        config_get tls_ciphersuites "$config" tls_ciphersuites ""
+        if [ -n "$tls_ciphersuites" ]; then
+            echo "    tls_ciphersuites: \"$tls_ciphersuites\""
+        fi
+
+        config_get tls_min_version "$config" tls_min_version ""
+        if [ -n "$tls_min_version" ]; then
+            echo "    tls_min_version: GETDNS_TLS${tls_min_version/\./_}"
+        fi
+
+        config_get tls_max_version "$config" tls_max_version ""
+        if [ -n "$tls_max_version" ]; then
+            echo "    tls_max_version: GETDNS_TLS${tls_max_version/\./_}"
+        fi
+
+        handle_resolver_spki()
+        {
+            local val="$1"
+            local digest="${val%%/*}"
+            local value="${val#*/}"
+
+            if [ "$tls_pubkey_pinset_section" = 0 ]; then
+                echo "    tls_pubkey_pinset:"
+                tls_pubkey_pinset_section=1
+            fi
+            echo "      - digest: \"$digest\""
+            echo "        value: $value"
+        }
+        config_list_foreach "$config" spki handle_resolver_spki
+    }
+
+    config_foreach handle_resolver resolver
+} > "$config_file_tmp"
+
+start_service() {
+    local config_file_tmp
+    local manual
+    local log_level
+    local command_line_arguments
+
+    mkdir -p "$stubby_config_dir"
+
+    config_load "stubby"
+
+    config_get_bool enabled "global" enabled "0"
+
+    [ $enabled -eq 0 ] && exit 0
+
+    config_get_bool manual "global" manual "0"
+
+    if [ "$manual" = "1" ]; then
+        cp "$stubby_manual_config" "$stubby_config"
+    else
+        config_file_tmp="$stubby_config.$$"
+        generate_config
+        mv "$config_file_tmp" "$stubby_config"
+    fi
+    chown stubby:stubby "$stubby_config"
+    chmod 0400 "$stubby_config"
+
+    config_get command_line_arguments "global" command_line_arguments ""
+
+    config_get log_level "global" log_level ""
+
+    if [ "$("$stubby_init" enabled; printf "%u" $?)" -eq 0 ]; then
+        if [ -n "$stubby_boot" ]; then
+            local trigger
+            trigger="$(uci_get stubby global trigger)"
+            if [ "$trigger" != "timed" ]; then
+                return 0
+            fi
+        fi
+        procd_open_instance "stubby"
+        procd_set_param command "$stubby" -C "$stubby_config"
+        if [ -n "$log_level" ]; then
+            procd_append_param command -v "$log_level"
+        fi
+        if [ -n "$command_line_arguments" ]; then
+            procd_append_param command "$command_line_arguments"
+        fi
+        procd_set_param respawn
+        procd_set_param file "$stubby_config"
+        procd_set_param stdout 1
+        procd_set_param stderr 1
+        procd_set_param pidfile "$stubby_pid_file"
+        procd_set_param user stubby
+        procd_close_instance
+    fi
+}
+
+service_triggers()
+{
+    local trigger
+    local delay
+
+    trigger="$(uci_get stubby global trigger)"
+    delay="$(uci_get stubby global triggerdelay "2")"
+
+    PROCD_RELOAD_DELAY=$((${delay:-2} * 1000))
+
+    for trigger_item in $trigger
+    do
+        procd_add_interface_trigger "interface.*.up" "$trigger_item" "$stubby_init" start
+    done
+
+    procd_add_reload_trigger "stubby"
+}
diff --git a/stubby/files/stubby.yml b/stubby/files/stubby.yml
new file mode 100644
index 00000000..b935f316
--- /dev/null
+++ b/stubby/files/stubby.yml
@@ -0,0 +1,25 @@
+# Note: by default on OpenWRT stubby configuration is handled via
+# the UCI system and the file /etc/config/stubby. If you want to
+# use this file to configure stubby, then set "option manual '1'"
+# in /etc/config/stubby.
+resolution_type: GETDNS_RESOLUTION_STUB
+round_robin_upstreams: 1
+appdata_dir: "/var/lib/stubby"
+tls_authentication: GETDNS_AUTHENTICATION_REQUIRED
+tls_query_padding_blocksize: 128
+edns_client_subnet_private: 1
+idle_timeout: 10000
+listen_addresses:
+  - 127.0.0.1@5453
+  - 0::1@5453
+dns_transport_list:
+  - GETDNS_TRANSPORT_TLS
+upstream_recursive_servers:
+  - address_data: 2606:4700:4700::1111
+    tls_auth_name: "cloudflare-dns.com"
+  - address_data: 2606:4700:4700::1001
+    tls_auth_name: "cloudflare-dns.com"
+  - address_data: 1.1.1.1
+    tls_auth_name: "cloudflare-dns.com"
+  - address_data: 1.0.0.1
+    tls_auth_name: "cloudflare-dns.com"
diff --git a/tailscale/Makefile b/tailscale/Makefile
new file mode 100644
index 00000000..a64a914a
--- /dev/null
+++ b/tailscale/Makefile
@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2021 CZ.NIC, z. s. p. o. (https://www.nic.cz/)
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=tailscale
+PKG_VERSION:=1.58.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/tailscale/tailscale/tar.gz/v$(PKG_VERSION)?
+PKG_HASH:=452f355408e4e2179872387a863387e06346fc8a6f9887821f9b8a072c6a5b0a
+
+PKG_MAINTAINER:=Jan Pavlinec <jan.pavlinec1@gmail.com>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/tailscale-$(PKG_VERSION)
+PKG_BUILD_DEPENDS:=golang/host
+PKG_BUILD_PARALLEL:=1
+PKG_BUILD_FLAGS:=no-mips16
+
+GO_PKG:=\
+	tailscale.com/cmd/tailscaled
+GO_PKG_LDFLAGS:=-X 'tailscale.com/version.longStamp=$(PKG_VERSION)-$(PKG_RELEASE) (OpenWrt)'
+GO_PKG_LDFLAGS_X:=tailscale.com/version.shortStamp=$(PKG_VERSION)
+GO_PKG_TAGS:=ts_include_cli
+
+include $(INCLUDE_DIR)/package.mk
+include ../golang/golang-package.mk
+
+define Package/tailscale
+  SECTION:=net
+  CATEGORY:=Network
+  SUBMENU:=VPN
+  TITLE:=Zero config VPN
+  URL:=https://tailscale.com
+  DEPENDS:=$(GO_ARCH_DEPENDS) +ca-bundle +kmod-tun
+  PROVIDES:=tailscaled
+endef
+
+define Package/tailscale/description
+  It creates a secure network between your servers, computers,
+  and cloud instances. Even when separated by firewalls or subnets.
+endef
+
+define Package/tailscale/conffiles
+/etc/config/tailscale
+/etc/tailscale/
+endef
+
+define Package/tailscale/install
+	$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config
+	$(INSTALL_BIN) $(GO_PKG_BUILD_BIN_DIR)/tailscaled $(1)/usr/sbin
+	$(LN) tailscaled $(1)/usr/sbin/tailscale
+endef
+
+$(eval $(call BuildPackage,tailscale))
diff --git a/tailscale/README.md b/tailscale/README.md
new file mode 100644
index 00000000..7bad0a3c
--- /dev/null
+++ b/tailscale/README.md
@@ -0,0 +1,30 @@
+# Tailscale
+This readme should help you with tailscale client setup.
+
+## Install
+There are two packages related to tailscale. Tailscaled (daemon which has to run every time you want to be connected to VPN) and tailscale (package with a utility which is necessary for registering device).
+
+To install them run
+```
+opkg install tailscale tailscaled
+```
+> [!NOTE]
+> By default this package will use nftables. If you wish to use iptables, the config file `/etc/config/tailscale` can be modfied, changing the line `fw_mode 'nftables'` to `fw_mode 'iptables'`. You can then run `/etc/init.d/tailscale restart` to restart tailscale using your chosen method
+
+## First setup
+
+First, enable and run daemon
+
+```
+/etc/init.d/tailscale enable
+/etc/init.d/tailscale start
+```
+
+Then you should use tailscale utility to get a login link for your device.
+
+Run command and finish device registration with the given URL.
+```
+tailscale up
+```
+
+See the [OpenWrt wiki](https://openwrt.org/docs/guide-user/services/vpn/tailscale/start) for more detailed setup instructions
diff --git a/tailscale/patches/001-fix-timeout.patch b/tailscale/patches/001-fix-timeout.patch
new file mode 100755
index 00000000..b4727259
--- /dev/null
+++ b/tailscale/patches/001-fix-timeout.patch
@@ -0,0 +1,12 @@
+Index: b/client/tailscale/localclient.go
+===================================================================
+--- a/client/tailscale/localclient.go	2024-04-18 00:54:58.972495576 -0700
++++ b/client/tailscale/localclient.go	2024-04-18 00:55:49.136069962 -0700
+@@ -121,6 +121,7 @@ func (lc *LocalClient) DoLocalRequest(re
+ 			Transport: &http.Transport{
+ 				DialContext: lc.dialer(),
+ 			},
++			Timeout: time.Second * 5,
+ 		}
+ 	})
+ 	if _, token, err := safesocket.LocalTCPPortAndToken(); err == nil {
diff --git a/tailscale/patches/002-no-log.patch b/tailscale/patches/002-no-log.patch
new file mode 100755
index 00000000..da118767
--- /dev/null
+++ b/tailscale/patches/002-no-log.patch
@@ -0,0 +1,66 @@
+Index: b/logtail/logtail.go
+===================================================================
+--- a/logtail/logtail.go	2024-05-06 20:52:31.648249569 -0700
++++ b/logtail/logtail.go	2024-05-06 20:53:23.059512824 -0700
+@@ -737,33 +737,34 @@ var obscureIPs = envknob.RegisterBool("T
+ //
+ // This is intended as an interface for the stdlib "log" package.
+ func (l *Logger) Write(buf []byte) (int, error) {
+-	if len(buf) == 0 {
+-		return 0, nil
+-	}
+-	inLen := len(buf) // length as provided to us, before modifications to downstream writers
+-
+-	level, buf := parseAndRemoveLogLevel(buf)
+-	if l.stderr != nil && l.stderr != io.Discard && int64(level) <= atomic.LoadInt64(&l.stderrLevel) {
+-		if buf[len(buf)-1] == '\n' {
+-			l.stderr.Write(buf)
+-		} else {
+-			// The log package always line-terminates logs,
+-			// so this is an uncommon path.
+-			withNL := append(buf[:len(buf):len(buf)], '\n')
+-			l.stderr.Write(withNL)
+-		}
+-	}
+-
+-	if obscureIPs() {
+-		buf = redactIPs(buf)
+-	}
+-
+-	l.writeLock.Lock()
+-	defer l.writeLock.Unlock()
+-
+-	b := l.encodeLocked(buf, level)
+-	_, err := l.sendLocked(b)
+-	return inLen, err
++	return 0, nil
++	//if len(buf) == 0 {
++	//	return 0, nil
++	//}
++	//inLen := len(buf) // length as provided to us, before modifications to downstream writers
++	//
++	//level, buf := parseAndRemoveLogLevel(buf)
++	//if l.stderr != nil && l.stderr != io.Discard && int64(level) <= atomic.LoadInt64(&l.stderrLevel) {
++	//	if buf[len(buf)-1] == '\n' {
++	//		l.stderr.Write(buf)
++	//	} else {
++	//		// The log package always line-terminates logs,
++	//		// so this is an uncommon path.
++	//		withNL := append(buf[:len(buf):len(buf)], '\n')
++	//		l.stderr.Write(withNL)
++	//	}
++	//}
++	//
++	//if obscureIPs() {
++	//	buf = redactIPs(buf)
++	//}
++	//
++	//l.writeLock.Lock()
++	//defer l.writeLock.Unlock()
++	//
++	//b := l.encodeLocked(buf, level)
++	//_, err := l.sendLocked(b)
++	//return inLen, err
+ }
+ 
+ var (
diff --git a/tor/Makefile b/tor/Makefile
new file mode 100644
index 00000000..ed7d2a2b
--- /dev/null
+++ b/tor/Makefile
@@ -0,0 +1,149 @@
+#
+# Copyright (C) 2008-2019 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=tor
+PKG_VERSION:=0.4.6.8
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://dist.torproject.org/ \
+	https://archive.torproject.org/tor-package-archive
+PKG_HASH:=15ce1a37b4cc175b07761e00acdcfa2c08f0d23d6c3ab9c97c464bd38cc5476a
+PKG_MAINTAINER:=Hauke Mehrtens <hauke@hauke-m.de> \
+		Peter Wagner <tripolar@gmx.at>
+PKG_LICENSE_FILES:=LICENSE
+PKG_CPE_ID:=cpe:/a:torproject:tor
+
+PKG_INSTALL:=1
+PKG_FIXUP:=autoreconf
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/tor/Default
+  SECTION:=net
+  CATEGORY:=Network
+  URL:=https://www.torproject.org/
+  USERID:=tor=52:tor=52
+endef
+
+define Package/tor/Default/description
+ Tor is a toolset for a wide range of organizations and people that want to
+ improve their safety and security on the Internet. Using Tor can help you
+ anonymize web browsing and publishing, instant messaging, IRC, SSH, and
+ more. Tor also provides a platform on which software developers can build
+ new applications with built-in anonymity, safety, and privacy features.
+endef
+
+define Package/tor
+$(call Package/tor/Default)
+  TITLE:=An anonymous Internet communication system
+  DEPENDS:=+libevent2 +libopenssl +libpthread +librt +zlib +libcap
+endef
+
+define Package/tor/description
+$(call Package/tor/Default/description)
+ This package contains the tor daemon.
+endef
+
+define Package/tor-gencert
+$(call Package/tor/Default)
+  TITLE:=Tor certificate generation
+  DEPENDS:=+tor
+endef
+
+define Package/tor-gencert/description
+$(call Package/tor/Default/description)
+ Generate certs and keys for Tor directory authorities
+endef
+
+define Package/tor-resolve
+$(call Package/tor/Default)
+  TITLE:=tor hostname resolve
+  DEPENDS:=+tor
+endef
+
+define Package/tor-resolve/description
+$(call Package/tor/Default/description)
+ Resolve a hostname to an IP address via tor
+endef
+
+define Package/tor-geoip
+$(call Package/tor/Default)
+  TITLE:=GeoIP db for tor
+  DEPENDS:=+tor
+endef
+
+define Package/tor-geoip/description
+$(call Package/tor/Default/description)
+ This package contains a GeoIP database mapping IP addresses to countries.
+endef
+
+define Package/tor/conffiles
+/etc/tor/torrc
+/var/lib/tor/fingerprint
+/var/lib/tor/keys/*
+endef
+
+CONFIGURE_ARGS += \
+	--with-libevent-dir="$(STAGING_DIR)/usr" \
+	--with-openssl-dir="$(STAGING_DIR)/usr" \
+	--with-zlib-dir="$(STAGING_DIR)/usr" \
+	--disable-asciidoc \
+	--disable-seccomp \
+	--disable-libscrypt \
+	--disable-unittests \
+	--disable-lzma \
+	--disable-zstd \
+	--with-tor-user=tor \
+	--with-tor-group=tor
+
+TARGET_CFLAGS += -ffunction-sections -fdata-sections -flto
+TARGET_LDFLAGS += -Wl,--gc-sections -flto
+
+ifneq ($(CONFIG_SSP_SUPPORT),y)
+	CONFIGURE_ARGS += \
+		--disable-gcc-hardening
+else
+	EXTRA_CFLAGS += $(FPIC)
+endif
+
+CONFIGURE_VARS += \
+	CROSS_COMPILE="yes"
+
+define Package/tor/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/tor.init $(1)/etc/init.d/tor
+	$(INSTALL_DIR) $(1)/etc/tor
+	$(INSTALL_BIN) ./files/torrc $(1)/etc/tor/torrc
+endef
+
+define Package/tor-gencert/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor-gencert $(1)/usr/sbin/
+endef
+
+define Package/tor-resolve/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tor-resolve $(1)/usr/sbin/
+endef
+
+define Package/tor-geoip/install
+	$(INSTALL_DIR) $(1)/usr/share/tor
+	$(INSTALL_DATA) \
+	  $(PKG_INSTALL_DIR)/usr/share/tor/geoip \
+	$(1)/usr/share/tor/
+endef
+
+$(eval $(call BuildPackage,tor))
+$(eval $(call BuildPackage,tor-gencert))
+$(eval $(call BuildPackage,tor-resolve))
+$(eval $(call BuildPackage,tor-geoip))
diff --git a/tor/files/tor.init b/tor/files/tor.init
new file mode 100644
index 00000000..36138851
--- /dev/null
+++ b/tor/files/tor.init
@@ -0,0 +1,37 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
+
+START=50
+STOP=50
+
+USE_PROCD=1
+
+start_service() {
+	local enable=$(uci get tor.global.enable)
+	[ $enable != "1" ] && exit 0
+
+	rm -rf /var/lib/tor/*
+
+	[ -f /var/run/tor.pid ] || {
+		touch /var/run/tor.pid
+		chown root:root /var/run/tor.pid
+	}
+	[ -d /var/lib/tor ] || {
+		mkdir -m 0755 -p /var/lib/tor
+		chmod 0700 /var/lib/tor
+		chown root:root /var/lib/tor
+	}
+	[ -d /var/log/tor ] || {
+		mkdir -m 0755 -p /var/log/tor
+		chown root:root /var/log/tor
+	}
+	[ -f  /var/lib/tor/control.log  ] && {
+		rm /var/lib/tor/control.log
+	}
+	procd_open_instance
+	procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-0}
+	procd_set_param stderr 1
+	procd_set_param command /usr/sbin/tor --runasdaemon 0
+	procd_close_instance
+}
+
diff --git a/tor/files/torrc b/tor/files/torrc
new file mode 100644
index 00000000..43483673
--- /dev/null
+++ b/tor/files/torrc
@@ -0,0 +1,20 @@
+RunAsDaemon 1
+AllowUnverifiedNodes middle,rendezvous
+Log notice stdout
+#Log notice syslog
+## Only run as a client, never a relay or exit
+ClientOnly 1
+#DataDirectory /var/lib/tor
+GeoIPFile /rom/usr/share/tor/geoip
+User root
+SocksPort 9050
+SocksPort 192.168.8.1:9050
+#AutomapHostsSuffixes .exit,.onion
+AutomapHostsSuffixes "."
+AutomapHostsOnResolve 1
+VirtualAddrNetworkIPv4 10.192.0.0/10
+TransPort 192.168.8.1:9040
+DNSPort 192.168.8.1:9053
+TruncateLogFile 1
+LogMessageDomains 1
+Log [control]notice  file /var/lib/tor/control.log
diff --git a/tor/patches/001-torrc.patch b/tor/patches/001-torrc.patch
new file mode 100644
index 00000000..16cae040
--- /dev/null
+++ b/tor/patches/001-torrc.patch
@@ -0,0 +1,25 @@
+--- a/src/config/torrc.sample.in
++++ b/src/config/torrc.sample.in
+@@ -39,7 +39,7 @@
+ ## Send every possible message to @LOCALSTATEDIR@/log/tor/debug.log
+ #Log debug file @LOCALSTATEDIR@/log/tor/debug.log
+ ## Use the system log instead of Tor's logfiles
+-#Log notice syslog
++Log notice syslog
+ ## To send all messages to stderr:
+ #Log debug stderr
+ 
+@@ -50,7 +50,7 @@
+ 
+ ## The directory for keeping all the keys/etc. By default, we store
+ ## things in $HOME/.tor on Unix, and in Application Data\tor on Windows.
+-#DataDirectory @LOCALSTATEDIR@/lib/tor
++DataDirectory @LOCALSTATEDIR@/lib/tor
+ 
+ ## The port on which Tor will listen for local connections from Tor
+ ## controller applications, as documented in control-spec.txt.
+@@ -238,3 +238,4 @@
+ #%include /etc/torrc.d/
+ #%include /etc/torrc.custom
+ 
++User tor
diff --git a/usb-serial-ch343/Makefile b/usb-serial-ch343/Makefile
new file mode 100644
index 00000000..832ccee5
--- /dev/null
+++ b/usb-serial-ch343/Makefile
@@ -0,0 +1,50 @@
+#
+# Copyright (C) 2019 Jianhui Zhao <zhaojh329@gmail.com>
+#
+# This is free software, licensed under the MIT.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+include ./version.mk
+
+PKG_NAME:=usb-serial-ch343
+PKG_VERSION:=2024-4-8
+
+PKG_SOURCE_VERSION:=05b4e1f442233a92a39295a66460f3e789c4e444
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/WCHSoftGroup/ch343ser_linux.git
+PKG_MIRROR_HASH:=29acd2261dc75c923408a76427d0affa1e10cdeb54b09730bdd08e485d221b07
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/usb-serial-ch343
+  CATEGORY:=gl-sdk4
+  SUBMENU:=Kernel modules
+  TITLE:=usb-serial-ch343 linux serial driver
+  DEPENDS:=+kmod-usb-core
+  FILES:=$(PKG_BUILD_DIR)/driver/ch343.ko
+  AUTOLOAD:=$(call AutoLoad,10,ch343,1)
+  $(call AddDepends/usb-serial)
+endef
+
+KERNEL_MAKE_FLAGS?= \
+	ARCH="$(LINUX_KARCH)" \
+	CROSS_COMPILE="$(TARGET_CROSS)"
+
+MAKE_OPTS:= \
+	$(KERNEL_MAKE_FLAGS) \
+	M="$(PKG_BUILD_DIR)"
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		$(MAKE_OPTS)/driver \
+		modules
+endef
+
+define KernelPackage/usb-serial-ch343/install
+endef
+
+$(eval $(call KernelPackage,usb-serial-ch343))
diff --git a/usb-serial-ch343/README.md b/usb-serial-ch343/README.md
new file mode 100644
index 00000000..7daf5e69
--- /dev/null
+++ b/usb-serial-ch343/README.md
@@ -0,0 +1,29 @@
+# ch343 linux serial driver
+
+## Description
+
+​	USB to UART(s) chip ch342/ch343/ch344/ch347/ch9101/ch9102/ch9103/ch9143 are fully compliant to the  Communications Device Class (CDC) standard, they will work with a standard CDC-ACM driver (CDC - Abstract Control Model). Linux operating systems supply a default CDC-ACM driver that can be used with these USB UART devices. In Linux, this driver file name is cdc-acm.
+
+​	The CDC-ACM driver has limited capabilities to control specific devices. This generic driver does not have any knowledge about specific device protocols. Because of this, device manufacturers can create an alternate, or custom driver that is capable of accessing the device specific function sets, such as hardware flow control or GPIO functions.
+
+​	If you use this VCP driver, please check that the CDC-ACM driver was not installed for the USB UART devices mentioned above. You can use command "ls /dev/ttyACM*" to confirm that, to remove the CDC-ACM driver, use command "rmmod cdc-acm".
+
+​	This driver supports USB to single serial port chip ch343/ch9101/ch9102/ch9143, USB to dual serial ports chip ch342/ch347/ch9103, USB to quad serial ports chip ch344, etc.
+
+1. Open "Terminal"
+2. Switch to "driver" directory
+3. Compile the driver using "make", you will see the module "ch343.ko" if successful
+4. Type "sudo make load" or "sudo insmod ch343.ko" to load the driver dynamically
+5. Type "sudo make unload" or "sudo rmmod ch343.ko" to unload the driver
+6. Type "sudo make install" to make the driver work permanently
+7. Type "sudo make uninstall" to remove the driver
+8. You can refer to the link below to acquire uart application, you can use gcc or Cross-compile with cross-gcc
+   https://github.com/WCHSoftGroup/tty_uart
+
+​	Before the driver works, you should make sure that the usb device has been plugged in and is working properly, you can use shell command "lsusb" or "dmesg" to confirm that, USB VID of these devices are [1A86], you can view all IDs from the id table which defined in "ch343.c".
+
+​	If the device works well, the driver will created tty devices named "ttyCH343USBx" in /dev directory.
+
+## Note
+
+​	Any question, you can send feedback to mail: tech@wch.cn
\ No newline at end of file
diff --git a/usb-serial-ch343/version.mk b/usb-serial-ch343/version.mk
new file mode 100644
index 00000000..e6f9e472
--- /dev/null
+++ b/usb-serial-ch343/version.mk
@@ -0,0 +1,29 @@
+#
+# Copyright (C) 2020 Jianhui Zhao <zhaojh329@gmail.com>
+#
+# This is free software, licensed under the MIT.
+#
+
+define findrev
+  $(shell \
+    if git log -1 >/dev/null 2>/dev/null; then \
+      set -- $$(git log -1 --format="%ct %h" --abbrev=7 -- .); \
+      if [ -n "$$1" ]; then
+        secs="$$(($$1 % 86400))"; \
+        yday="$$(date --utc --date="@$$1" "+%Y.%j")"; \
+        printf 'git-%s.%05d-%s' "$$yday" "$$secs" "$$2"; \
+      else \
+        echo "unknown"; \
+      fi; \
+    else \
+      ts=$$(find . -type f -printf '%T@\n' 2>/dev/null | sort -rn | head -n1 | cut -d. -f1); \
+      if [ -n "$$ts" ]; then \
+        secs="$$(($$ts % 86400))"; \
+        date="$$(date --utc --date="@$$ts" "+%Y%m%d")"; \
+        printf '%s.%05d' "$$date" "$$secs"; \
+      else \
+        echo "unknown"; \
+      fi; \
+    fi \
+  )
+endef
\ No newline at end of file
diff --git a/vsftpd/Makefile b/vsftpd/Makefile
new file mode 100644
index 00000000..4e75f75b
--- /dev/null
+++ b/vsftpd/Makefile
@@ -0,0 +1,100 @@
+#
+# Copyright (C) 2006-2015 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=vsftpd
+PKG_VERSION:=3.0.3
+PKG_RELEASE:=3
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://security.appspot.com/downloads/
+PKG_HASH:=9d4d2bf6e6e2884852ba4e69e157a2cecd68c5a7635d66a3a8cf8d898c955ef7
+
+PKG_MAINTAINER:=Cezary Jackiewicz <cezary@eko.one.pl>
+PKG_LICENSE:=GPLv2
+PKG_CPE_ID:=cpe:/a:beasts:vsftpd
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/vsftpd/Default
+  SUBMENU:=File Transfer
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Fast and secure FTP server
+  URL:=https://security.appspot.com/vsftpd.html
+endef
+
+
+define Package/vsftpd
+$(call Package/vsftpd/Default)
+  VARIANT:=notls
+  TITLE+= (no TLS)
+endef
+
+define Package/vsftpd-tls
+$(call Package/vsftpd/Default)
+  VARIANT:=tls
+  TITLE+= (TLS)
+  DEPENDS+=+libopenssl
+endef
+
+define Package/vsftpd/conffiles
+/etc/vsftpd.conf
+/etc/vsftpd
+endef
+
+Package/vsftpd-tls/conffiles=$(Package/vsftpd/conffiles)
+
+ifneq ($(CONFIG_USE_MUSL),)
+  NLSSTRING:=-lcrypt
+else ifneq ($(CONFIG_USE_GLIBC),)
+  NLSSTRING:=-lcrypt
+else
+  NLSSTRING:=-lcrypt -lnsl
+endif
+
+TARGET_CFLAGS += -D_GNU_SOURCE -include fcntl.h
+
+ifeq ($(BUILD_VARIANT),notls)
+ define Build/Compile
+	$(SED) 's/-lcrypt -lnsl/$(NLSSTRING)/' $(PKG_BUILD_DIR)/Makefile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		vsftpd
+ endef
+endif
+
+ifeq ($(BUILD_VARIANT),tls)
+ define Build/Compile
+	$(SED) 's/#undef VSF_BUILD_SSL/#define VSF_BUILD_SSL/' $(PKG_BUILD_DIR)/builddefs.h
+	$(SED) 's/-lcrypt -lnsl/-lcrypt -lnsl -lssl -lcrypto/' $(PKG_BUILD_DIR)/Makefile
+	$(SED) 's/-lcrypt -lnsl/$(NLSSTRING)/' $(PKG_BUILD_DIR)/Makefile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		vsftpd
+ endef
+endif
+
+define Package/vsftpd/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/$(PKG_NAME) $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_CONF) ./files/$(PKG_NAME).conf $(1)/etc/$(PKG_NAME).conf
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME)
+	$(INSTALL_DIR) $(1)/etc/vsftpd
+endef
+
+Package/vsftpd-tls/install=$(Package/vsftpd/install)
+
+$(eval $(call BuildPackage,vsftpd))
+$(eval $(call BuildPackage,vsftpd-tls))
diff --git a/vsftpd/files/vsftpd.conf b/vsftpd/files/vsftpd.conf
new file mode 100644
index 00000000..e06ac354
--- /dev/null
+++ b/vsftpd/files/vsftpd.conf
@@ -0,0 +1,30 @@
+background=YES
+listen=YES
+anonymous_enable=NO
+local_enable=YES
+write_enable=YES
+local_umask=022
+check_shell=NO
+#dirmessage_enable=YES
+#ftpd_banner=Welcome to blah FTP service.
+session_support=NO
+#syslog_enable=YES
+#userlist_enable=YES
+#userlist_deny=NO
+#userlist_file=/etc/vsftpd/vsftpd.users
+#xferlog_enable=YES
+#xferlog_file=/var/log/vsftpd.log
+#xferlog_std_format=YES
+###
+### TLS/SSL options
+### example key generation: openssl req -x509 -nodes -days 365 -newkey rsa:2048 -keyout /etc/vsftpd/vsftpd_privkey.pem -out /etc/vsftpd/vsftpd_cert.pem -subj /C="DE"/ST="Saxony"/L="Leipzig"/CN="OpenWrt"
+#ssl_enable=YES
+#allow_anon_ssl=NO
+#force_local_data_ssl=NO
+#force_local_logins_ssl=NO
+#ssl_tlsv1=YES
+#ssl_sslv2=NO
+#ssl_sslv3=NO
+#rsa_cert_file=/etc/vsftpd/vsftpd_cert.pem
+#rsa_private_key_file=/etc/vsftpd/vsftpd_privkey.pem
+
diff --git a/vsftpd/files/vsftpd.init b/vsftpd/files/vsftpd.init
new file mode 100644
index 00000000..ad3e23da
--- /dev/null
+++ b/vsftpd/files/vsftpd.init
@@ -0,0 +1,13 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
+
+START=50
+
+start() {
+	mkdir -m 0755 -p /var/run/vsftpd
+	service_start /usr/sbin/vsftpd
+}
+
+stop() {
+	service_stop /usr/sbin/vsftpd
+}
diff --git a/vsftpd/patches/001-destdir.patch b/vsftpd/patches/001-destdir.patch
new file mode 100644
index 00000000..b0274ac8
--- /dev/null
+++ b/vsftpd/patches/001-destdir.patch
@@ -0,0 +1,47 @@
+--- a/Makefile
++++ b/Makefile
+@@ -22,6 +22,8 @@ OBJS	=	main.o utility.o prelogin.o ftpcm
+     seccompsandbox.o
+ 
+ 
++DESTDIR =
++
+ .c.o:
+ 	$(CC) -c $*.c $(CFLAGS) $(IFLAGS)
+ 
+@@ -29,21 +31,20 @@ vsftpd: $(OBJS)
+ 	$(CC) -o vsftpd $(OBJS) $(LINK) $(LDFLAGS) $(LIBS)
+ 
+ install:
+-	if [ -x /usr/local/sbin ]; then \
+-		$(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \
+-	else \
+-		$(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi
+-	if [ -x /usr/local/man ]; then \
+-		$(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \
+-		$(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \
+-	elif [ -x /usr/share/man ]; then \
+-		$(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \
+-		$(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \
+-	else \
+-		$(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \
+-		$(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi
+-	if [ -x /etc/xinetd.d ]; then \
+-		$(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi
++	mkdir -p $(DESTDIR)/usr/sbin
++	$(INSTALL) -m 755 vsftpd $(DESTDIR)/usr/sbin/
++	mkdir -p $(DESTDIR)/usr/share/man/man8
++	$(INSTALL) -m 644 vsftpd.8 $(DESTDIR)/usr/share/man/man8/
++	mkdir -p $(DESTDIR)/usr/share/man/man5
++	$(INSTALL) -m 644 vsftpd.conf.5 $(DESTDIR)/usr/share/man/man5/
++	mkdir -p $(DESTDIR)/etc/xinetd.d
++	$(INSTALL) -m 644 xinetd.d/vsftpd $(DESTDIR)/etc/xinetd.d/
++
++uninstall:
++	rm -f $(DESTDIR)/usr/sbin/vsftpd
++	rm -f $(DESTDIR)/usr/share/man/man8/vsftpd.8
++	rm -f $(DESTDIR)/usr/share/man/man5/vsftpd.conf.5
++	rm -f $(DESTDIR)/etc/xinetd.d/vsftpd
+ 
+ clean:
+ 	rm -f *.o *.swp vsftpd
diff --git a/vsftpd/patches/002-find_libs.patch b/vsftpd/patches/002-find_libs.patch
new file mode 100644
index 00000000..daf83efa
--- /dev/null
+++ b/vsftpd/patches/002-find_libs.patch
@@ -0,0 +1,13 @@
+--- a/Makefile
++++ b/Makefile
+@@ -8,8 +8,8 @@ CFLAGS	=	-O2 -fPIE -fstack-protector --p
+ 	-D_FORTIFY_SOURCE=2 \
+ 	#-pedantic -Wconversion
+ 
+-LIBS	=	`./vsf_findlibs.sh`
+-LINK	=	-Wl,-s
++LIBS	=	-lcrypt -lnsl
++LINK	=
+ LDFLAGS	=	-fPIE -pie -Wl,-z,relro -Wl,-z,now
+ 
+ OBJS	=	main.o utility.o prelogin.o ftpcmdio.o postlogin.o privsock.o \
diff --git a/vsftpd/patches/003-chroot.patch b/vsftpd/patches/003-chroot.patch
new file mode 100644
index 00000000..8965da41
--- /dev/null
+++ b/vsftpd/patches/003-chroot.patch
@@ -0,0 +1,11 @@
+--- a/tunables.c
++++ b/tunables.c
+@@ -254,7 +254,7 @@ tunables_load_defaults()
+   /* -rw------- */
+   tunable_chown_upload_mode = 0600;
+ 
+-  install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
++  install_str_setting("/var/run/vsftpd", &tunable_secure_chroot_dir);
+   install_str_setting("ftp", &tunable_ftp_username);
+   install_str_setting("root", &tunable_chown_username);
+   install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
diff --git a/vsftpd/patches/004-disable-capabilities.patch b/vsftpd/patches/004-disable-capabilities.patch
new file mode 100644
index 00000000..7aa6330b
--- /dev/null
+++ b/vsftpd/patches/004-disable-capabilities.patch
@@ -0,0 +1,12 @@
+--- a/sysdeputil.c
++++ b/sysdeputil.c
+@@ -165,6 +165,9 @@
+ #endif
+ /* END config */
+ 
++#undef VSF_SYSDEP_HAVE_CAPABILITIES
++#undef VSF_SYSDEP_HAVE_LIBCAP
++
+ /* PAM support - we include our own dummy version if the system lacks this */
+ #include <security/pam_appl.h>
+ 
diff --git a/vsftpd/patches/005-disable-pam.patch b/vsftpd/patches/005-disable-pam.patch
new file mode 100644
index 00000000..ebb72447
--- /dev/null
+++ b/vsftpd/patches/005-disable-pam.patch
@@ -0,0 +1,11 @@
+--- a/builddefs.h
++++ b/builddefs.h
+@@ -2,7 +2,7 @@
+ #define VSF_BUILDDEFS_H
+ 
+ #undef VSF_BUILD_TCPWRAPPERS
+-#define VSF_BUILD_PAM
++#undef VSF_BUILD_PAM
+ #undef VSF_BUILD_SSL
+ 
+ #endif /* VSF_BUILDDEFS_H */
diff --git a/vsftpd/patches/006-musl-compatibility.patch b/vsftpd/patches/006-musl-compatibility.patch
new file mode 100644
index 00000000..9eefec79
--- /dev/null
+++ b/vsftpd/patches/006-musl-compatibility.patch
@@ -0,0 +1,13 @@
+--- a/sysdeputil.c
++++ b/sysdeputil.c
+@@ -58,7 +58,9 @@
+ #define VSF_SYSDEP_HAVE_SHADOW
+ #define VSF_SYSDEP_HAVE_USERSHELL
+ #define VSF_SYSDEP_HAVE_LIBCAP
+-#define VSF_SYSDEP_HAVE_UTMPX
++#if defined(__GLIBC__) || defined(__UCLIBC__)
++  #define VSF_SYSDEP_HAVE_UTMPX
++#endif
+ 
+ #define __USE_GNU
+ #include <utmpx.h>
diff --git a/vsftpd/patches/007-CVE-2015-1419.patch b/vsftpd/patches/007-CVE-2015-1419.patch
new file mode 100644
index 00000000..173027a1
--- /dev/null
+++ b/vsftpd/patches/007-CVE-2015-1419.patch
@@ -0,0 +1,98 @@
+Description: CVE-2015-1419: config option deny_file is not handled correctly
+Author: Marcus Meissner <meissner@suse.com>
+Origin: https://bugzilla.novell.com/show_bug.cgi?id=CVE-2015-1419
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=776922
+Last-Update: 2015-02-24
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/ls.c
++++ b/ls.c
+@@ -7,6 +7,7 @@
+  * Would you believe, code to handle directory listing.
+  */
+ 
++#include <stdlib.h>
+ #include "ls.h"
+ #include "access.h"
+ #include "defs.h"
+@@ -243,11 +244,42 @@ vsf_filename_passes_filter(const struct
+   struct mystr temp_str = INIT_MYSTR;
+   struct mystr brace_list_str = INIT_MYSTR;
+   struct mystr new_filter_str = INIT_MYSTR;
++  struct mystr normalize_filename_str = INIT_MYSTR;
++  const char *normname;
++  const char *path;
+   int ret = 0;
+   char last_token = 0;
+   int must_match_at_current_pos = 1;
++
+   str_copy(&filter_remain_str, p_filter_str);
+-  str_copy(&name_remain_str, p_filename_str);
++
++  /* normalize filepath */
++  path = str_strdup(p_filename_str);
++  normname = realpath(path, NULL);
++  if (normname == NULL)
++     goto out;
++  str_alloc_text(&normalize_filename_str, normname);
++
++  if (!str_isempty (&filter_remain_str) && !str_isempty(&normalize_filename_str)) {
++    if (str_get_char_at(p_filter_str, 0) == '/') {
++      if (str_get_char_at(&normalize_filename_str, 0) != '/') {
++        str_getcwd (&name_remain_str);
++
++        if (str_getlen(&name_remain_str) > 1) /* cwd != root dir */
++          str_append_char (&name_remain_str, '/');
++
++        str_append_str (&name_remain_str, &normalize_filename_str);
++      }
++      else
++       str_copy (&name_remain_str, &normalize_filename_str);
++    } else {
++      if (str_get_char_at(p_filter_str, 0) != '{')
++        str_basename (&name_remain_str, &normalize_filename_str);
++      else
++        str_copy (&name_remain_str, &normalize_filename_str);
++    }
++  } else
++    str_copy(&name_remain_str, &normalize_filename_str);
+ 
+   while (!str_isempty(&filter_remain_str) && *iters < VSFTP_MATCHITERS_MAX)
+   {
+@@ -360,6 +392,9 @@ vsf_filename_passes_filter(const struct
+     ret = 0;
+   }
+ out:
++  free(normname);
++  free(path);
++  str_free(&normalize_filename_str);
+   str_free(&filter_remain_str);
+   str_free(&name_remain_str);
+   str_free(&temp_str);
+--- a/str.c
++++ b/str.c
+@@ -711,3 +711,14 @@ str_replace_unprintable(struct mystr* p_
+   }
+ }
+ 
++void
++str_basename (struct mystr* d_str, const struct mystr* path)
++{
++  static struct mystr tmp;
++
++  str_copy (&tmp, path);
++  str_split_char_reverse(&tmp, d_str, '/');
++
++  if (str_isempty(d_str))
++   str_copy (d_str, path);
++}
+--- a/str.h
++++ b/str.h
+@@ -100,6 +100,7 @@ void str_replace_unprintable(struct myst
+ int str_atoi(const struct mystr* p_str);
+ filesize_t str_a_to_filesize_t(const struct mystr* p_str);
+ unsigned int str_octal_to_uint(const struct mystr* p_str);
++void str_basename (struct mystr* d_str, const struct mystr* path);
+ 
+ /* PURPOSE: Extract a line of text (delimited by \n or EOF) from a string
+  * buffer, starting at character position 'p_pos'. The extracted line will
diff --git a/vsftpd/patches/010-openssl-deprecated.patch b/vsftpd/patches/010-openssl-deprecated.patch
new file mode 100644
index 00000000..0db80b97
--- /dev/null
+++ b/vsftpd/patches/010-openssl-deprecated.patch
@@ -0,0 +1,61 @@
+From 0ea55455703eb69d7617968424e4bede59f39b83 Mon Sep 17 00:00:00 2001
+From: Rosen Penev <rosenp@gmail.com>
+Date: Fri, 23 Nov 2018 18:03:32 -0800
+Subject: [PATCH] ssl: Fix compile without Deprecated APIs and no ECC support
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+---
+ ssl.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+--- a/ssl.c
++++ b/ssl.c
+@@ -28,6 +28,9 @@
+ #include <openssl/err.h>
+ #include <openssl/rand.h>
+ #include <openssl/bio.h>
++#ifndef OPENSSL_NO_EC
++#include <openssl/ec.h>
++#endif
+ #include <errno.h>
+ #include <limits.h>
+ 
+@@ -59,8 +62,12 @@ ssl_init(struct vsf_session* p_sess)
+     SSL_CTX* p_ctx;
+     long options;
+     int verify_option = 0;
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+     SSL_library_init();
+     p_ctx = SSL_CTX_new(SSLv23_server_method());
++#else
++    p_ctx = SSL_CTX_new(TLS_server_method());
++#endif
+     if (p_ctx == NULL)
+     {
+       die("SSL: could not allocate SSL context");
+@@ -120,6 +127,7 @@ ssl_init(struct vsf_session* p_sess)
+     {
+       die("SSL: RNG is not seeded");
+     }
++#ifndef OPENSSL_NO_EC
+     {
+       EC_KEY* key = EC_KEY_new_by_curve_name(NID_X9_62_prime256v1);
+       if (key == NULL)
+@@ -129,6 +137,7 @@ ssl_init(struct vsf_session* p_sess)
+       SSL_CTX_set_tmp_ecdh(p_ctx, key);
+       EC_KEY_free(key);
+     }
++#endif
+     if (tunable_ssl_request_cert)
+     {
+       verify_option |= SSL_VERIFY_PEER;
+@@ -660,7 +669,9 @@ ssl_cert_digest(SSL* p_ssl, struct vsf_s
+ static char*
+ get_ssl_error()
+ {
++#if OPENSSL_VERSION_NUMBER < 0x10100000L
+   SSL_load_error_strings();
++#endif
+   return ERR_error_string(ERR_get_error(), NULL);
+ }
+ 
diff --git a/vsftpd/patches/100-allow_writeable_chroot-for-anonymous.patch b/vsftpd/patches/100-allow_writeable_chroot-for-anonymous.patch
new file mode 100644
index 00000000..c1c6b013
--- /dev/null
+++ b/vsftpd/patches/100-allow_writeable_chroot-for-anonymous.patch
@@ -0,0 +1,13 @@
+Index: vsftpd-3.0.3/twoprocess.c
+===================================================================
+--- vsftpd-3.0.3.orig/twoprocess.c
++++ vsftpd-3.0.3/twoprocess.c
+@@ -449,7 +449,7 @@ common_do_login(struct vsf_session* p_se
+     {
+       secutil_option |= VSF_SECUTIL_OPTION_CHANGE_EUID;
+     }
+-    if (!was_anon && tunable_allow_writeable_chroot)
++    if (tunable_allow_writeable_chroot)
+     {
+       secutil_option |= VSF_SECUTIL_OPTION_ALLOW_WRITEABLE_ROOT;
+     }
diff --git a/zerotier/Config.in b/zerotier/Config.in
new file mode 100644
index 00000000..e08ec757
--- /dev/null
+++ b/zerotier/Config.in
@@ -0,0 +1,14 @@
+menu "Configuration"
+	depends on PACKAGE_zerotier
+
+config ZEROTIER_ENABLE_DEBUG
+	bool "Build in debug mode"
+	depends on PACKAGE_zerotier
+	default n
+
+config ZEROTIER_ENABLE_SELFTEST
+	bool "Build a self test program"
+	depends on PACKAGE_zerotier
+	default n
+
+endmenu
diff --git a/zerotier/Makefile b/zerotier/Makefile
new file mode 100644
index 00000000..05c14ef4
--- /dev/null
+++ b/zerotier/Makefile
@@ -0,0 +1,81 @@
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=zerotier
+PKG_VERSION:=1.10.3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://codeload.github.com/zerotier/ZeroTierOne/tar.gz/$(PKG_VERSION)?
+PKG_HASH:=f2ce8a63a459a5fab129fb398e379b8c0875bdfeccb7bf15f9683ad22e43e629
+PKG_BUILD_DIR:=$(BUILD_DIR)/ZeroTierOne-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Moritz Warning <moritzwarning@web.de>
+PKG_LICENSE:=BSL 1.1
+PKG_LICENSE_FILES:=LICENSE.txt
+
+PKG_ASLR_PIE:=0
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/zerotier
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libpthread +libstdcpp +kmod-tun +ip +libminiupnpc +libnatpmp
+  TITLE:=Create flat virtual Ethernet networks of almost unlimited size
+  URL:=https://www.zerotier.com
+  SUBMENU:=VPN
+endef
+
+define Package/zerotier/description
+	ZeroTier creates a global provider-independent virtual private cloud network.
+endef
+
+define Package/zerotier/config
+	source "$(SOURCE)/Config.in"
+endef
+
+ifeq ($(CONFIG_ZEROTIER_ENABLE_DEBUG),y)
+MAKE_FLAGS += ZT_DEBUG=1
+endif
+
+MAKE_FLAGS += \
+	ZT_EMBEDDED=1 \
+	ZT_SSO_SUPPORTED=0 \
+	DEFS="" \
+	OSTYPE="Linux" \
+
+define Build/Compile
+	$(call Build/Compile/Default,one)
+ifeq ($(CONFIG_ZEROTIER_ENABLE_SELFTEST),y)
+	$(call Build/Compile/Default,selftest)
+endif
+endef
+
+# Make binary smaller
+TARGET_CFLAGS += -ffunction-sections -fdata-sections
+TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
+
+define Package/zerotier/conffiles
+/etc/config/zerotier
+endef
+
+define Package/zerotier/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/zerotier-one $(1)/usr/bin/
+	$(LN) zerotier-one $(1)/usr/bin/zerotier-cli
+	$(LN) zerotier-one $(1)/usr/bin/zerotier-idtool
+
+ifeq ($(CONFIG_ZEROTIER_ENABLE_SELFTEST),y)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/zerotier-selftest $(1)/usr/bin/
+endif
+
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,zerotier))
diff --git a/zerotier/files/etc/config/zerotier b/zerotier/files/etc/config/zerotier
new file mode 100644
index 00000000..34b1ad34
--- /dev/null
+++ b/zerotier/files/etc/config/zerotier
@@ -0,0 +1,20 @@
+
+config zerotier sample_config
+	option enabled 0
+
+	# persistent configuration folder (for ZT controller mode)
+	#option config_path '/etc/zerotier'
+	# copy <config_path> to RAM to prevent writing to flash (for ZT controller mode)
+	#option copy_config_path '1'
+
+	#option port '9993'
+
+	# path to the local.conf
+	#option local_conf '/etc/zerotier.conf'
+
+	# Generate secret on first start
+	option secret ''
+
+	# Join a public network called Earth
+	list join '8056c2e21c000001'
+	#list join '<other_network>'
diff --git a/zerotier/files/etc/init.d/zerotier b/zerotier/files/etc/init.d/zerotier
new file mode 100755
index 00000000..f7ba8e91
--- /dev/null
+++ b/zerotier/files/etc/init.d/zerotier
@@ -0,0 +1,126 @@
+#!/bin/sh /etc/rc.common
+
+START=90
+
+USE_PROCD=1
+
+PROG=/usr/bin/zerotier-one
+CONFIG_PATH=/var/lib/zerotier-one
+
+section_enabled() {
+	config_get_bool enabled "$1" 'enabled' 0
+	[ $enabled -ne 0 ]
+}
+
+start_instance() {
+	local cfg="$1"
+	local port secret config_path local_conf copy_config_path path
+	local args=""
+
+	if ! section_enabled "$cfg"; then
+		echo "disabled in config"
+		return 1
+	fi
+
+	config_get config_path $cfg 'config_path'
+	config_get port $cfg 'port'
+	config_get secret $cfg 'secret'
+	config_get local_conf $cfg 'local_conf'
+	config_get_bool copy_config_path $cfg 'copy_config_path' 0
+
+	path=${CONFIG_PATH}_$cfg
+
+	# Remove existing link or folder
+	rm -rf $path
+
+	# Create link or copy files from CONFIG_PATH to config_path
+	if [ -n "$config_path" -a "$config_path" != "$path" ]; then
+		if [ ! -d "$config_path" ]; then
+			echo "ZeroTier config_path does not exist: $config_path" 1>&2
+			return
+		fi
+
+		# ensure that the target exists
+		mkdir -p $(dirname $path)
+
+		if [ "$copy_config_path" = "1" ]; then
+			cp -r $config_path $path
+		else
+			ln -s $config_path $path
+		fi
+	fi
+
+	mkdir -p $path/networks.d
+
+	# link latest default config path to latest config path
+	rm -f $CONFIG_PATH
+	ln -s $path $CONFIG_PATH
+
+	if [ -n "$port" ]; then
+		args="$args -p${port}"
+	fi
+
+	if [ -z "$secret" ]; then
+		echo "Generate secret - please wait..."
+		local sf="/tmp/zt.$cfg.secret"
+
+		zerotier-idtool generate "$sf" > /dev/null
+		[ $? -ne 0 ] && return 1
+
+		secret="$(cat $sf)"
+		rm "$sf"
+
+		uci set zerotier.$cfg.secret="$secret"
+		uci commit zerotier
+	fi
+
+	if [ -n "$secret" ]; then
+		echo "$secret" > $path/identity.secret
+		# make sure there is not previous identity.public
+		rm -f $path/identity.public
+	fi
+
+	if [ -f "$local_conf" ]; then
+		ln -s "$local_conf" $path/local.conf
+	fi
+
+	add_join() {
+		# an (empty) config file will cause ZT to join a network
+		touch $path/networks.d/$1.conf
+	}
+
+	config_list_foreach $cfg 'join' add_join
+
+	procd_open_instance
+	procd_set_param command $PROG $args $path
+	procd_set_param stderr 1
+	procd_set_param respawn
+	procd_close_instance
+}
+
+start_service() {
+	config_load 'zerotier'
+	config_foreach start_instance 'zerotier'
+}
+
+stop_instance() {
+	local cfg="$1"
+
+	# Remove existing link or folder
+	rm -rf ${CONFIG_PATH}_${cfg}
+}
+
+stop_service() {
+	config_load 'zerotier'
+	config_foreach stop_instance 'zerotier'
+	rm -f ${CONFIG_PATH}
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger 'zerotier'
+}
diff --git a/zerotier/patches/0001-fix-makefile.patch b/zerotier/patches/0001-fix-makefile.patch
new file mode 100644
index 00000000..fd8d05e2
--- /dev/null
+++ b/zerotier/patches/0001-fix-makefile.patch
@@ -0,0 +1,60 @@
+From 2c513f0db50eaee5623d58ac024d62142f4ac782 Mon Sep 17 00:00:00 2001
+From: Moritz Warning <moritzwarning@web.de>
+Date: Mon, 4 Jul 2022 00:09:24 +0200
+Subject: [PATCH 1/2] fix makefile
+
+---
+ make-linux.mk | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+--- a/make-linux.mk
++++ b/make-linux.mk
+@@ -25,8 +25,8 @@ TIMESTAMP=$(shell date +"%Y%m%d%H%M")
+ # otherwise build into binary as done on Mac and Windows.
+ ONE_OBJS+=osdep/PortMapper.o
+ override DEFS+=-DZT_USE_MINIUPNPC
+-MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2..*"' /usr/include/miniupnpc/miniupnpc.h && echo 1)
+-#MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' /usr/include/miniupnpc/miniupnpc.h && echo 1)
++MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2..*"' $(STAGING_DIR)/usr/include/miniupnpc/miniupnpc.h && echo 1)
++#MINIUPNPC_IS_NEW_ENOUGH=$(shell grep -sqr '.*define.*MINIUPNPC_VERSION.*"2.."' $(STAGING_DIR)/usr/include/miniupnpc/miniupnpc.h && echo 1)
+ ifeq ($(MINIUPNPC_IS_NEW_ENOUGH),1)
+ 	override DEFS+=-DZT_USE_SYSTEM_MINIUPNPC
+ 	LDLIBS+=-lminiupnpc
+@@ -34,7 +34,7 @@ else
+ 	override DEFS+=-DMINIUPNP_STATICLIB -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600 -DOS_STRING="\"Linux\"" -DMINIUPNPC_VERSION_STRING="\"2.0\"" -DUPNP_VERSION_STRING="\"UPnP/1.1\"" -DENABLE_STRNATPMPERR
+ 	ONE_OBJS+=ext/miniupnpc/connecthostport.o ext/miniupnpc/igd_desc_parse.o ext/miniupnpc/minisoap.o ext/miniupnpc/minissdpc.o ext/miniupnpc/miniupnpc.o ext/miniupnpc/miniwget.o ext/miniupnpc/minixml.o ext/miniupnpc/portlistingparse.o ext/miniupnpc/receivedata.o ext/miniupnpc/upnpcommands.o ext/miniupnpc/upnpdev.o ext/miniupnpc/upnperrors.o ext/miniupnpc/upnpreplyparse.o
+ endif
+-ifeq ($(wildcard /usr/include/natpmp.h),)
++ifeq ($(wildcard $(STAGING_DIR)/usr/include/natpmp.h),)
+ 	ONE_OBJS+=ext/libnatpmp/natpmp.o ext/libnatpmp/getgateway.o
+ else
+ 	LDLIBS+=-lnatpmp
+@@ -70,7 +70,7 @@ else
+ 	override CFLAGS+=-Wall -Wno-deprecated -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+ 	CXXFLAGS?=-O3 -fstack-protector
+ 	override CXXFLAGS+=-Wall -Wno-deprecated -std=c++17 -pthread $(INCLUDES) -DNDEBUG $(DEFS)
+-	LDFLAGS=-pie -Wl,-z,relro,-z,now
++	LDFLAGS=-Wl,-z,relro,-z,now
+ 	RUSTFLAGS=--release
+ endif
+ 
+@@ -313,7 +313,7 @@ ifeq ($(ZT_CONTROLLER),1)
+ endif
+ 
+ # ARM32 hell -- use conservative CFLAGS
+-ifeq ($(ZT_ARCHITECTURE),3)
++ifeq (0,3)
+ 	ifeq ($(shell if [ -e /usr/bin/dpkg ]; then dpkg --print-architecture; fi),armel)
+ 		override CFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
+ 		override CXXFLAGS+=-march=armv5t -mfloat-abi=soft -msoft-float -mno-unaligned-access -marm
+@@ -340,8 +340,8 @@ ifeq ($(ZT_USE_ARM32_NEON_ASM_CRYPTO),1)
+ endif
+ 
+ # Position Independence
+-override CFLAGS+=-fPIC -fPIE
+-override CXXFLAGS+=-fPIC -fPIE
++#override CFLAGS+=-fPIC -fPIE
++#override CXXFLAGS+=-fPIC -fPIE
+ 
+ .PHONY: all
+ all:	one
diff --git a/zerotier/patches/0002-fix-compilation-for-arm_cortex-a7-neon.patch b/zerotier/patches/0002-fix-compilation-for-arm_cortex-a7-neon.patch
new file mode 100644
index 00000000..00fef6eb
--- /dev/null
+++ b/zerotier/patches/0002-fix-compilation-for-arm_cortex-a7-neon.patch
@@ -0,0 +1,23 @@
+From 819232a2b5a09d7aa3cacb8dcf7c2e28afde1b06 Mon Sep 17 00:00:00 2001
+From: Moritz Warning <moritzwarning@web.de>
+Date: Mon, 4 Jul 2022 00:10:52 +0200
+Subject: [PATCH 2/2] fix compilation for arm_cortex-a7+neon
+
+Fixes "error: 'vrbitq_u8' was not declared in this scope"
+
+Signed-off-by: Rosen Penev <rosenp@gmail.com>
+---
+ node/Constants.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/node/Constants.hpp
++++ b/node/Constants.hpp
+@@ -123,7 +123,7 @@
+ #include <immintrin.h>
+ #endif
+ 
+-#if (defined(__ARM_NEON) || defined(__ARM_NEON__) || defined(ZT_ARCH_ARM_HAS_NEON))
++#if (defined(__aarch64__) || defined(ZT_ARCH_ARM_HAS_NEON))
+ #if (defined(__APPLE__) && !defined(__LP64__)) || (defined(__ANDROID__) && defined(__arm__))
+ #ifdef ZT_ARCH_ARM_HAS_NEON
+ #undef ZT_ARCH_ARM_HAS_NEON