Various header file fixes... also fix compilation errors when HTTP is disabled.v2.0.0-alpha.6

Also, some instances nni_aio are changed to nng_aio.  We think we want to harmonize
some of these types going forward as it will reduce the need to include headers
hopefully letting us get away with just "defs.h" in more places.

10 files changed, 27 insertions, 25 deletions

diff --git a/src/supplemental/tls/mbedtls/mbedtls.c b/src/supplemental/tls/mbedtls/mbedtls.c
index 71393360..bbfc5763 100644
--- a/src/supplemental/tls/mbedtls/mbedtls.c
+++ b/src/supplemental/tls/mbedtls/mbedtls.c
@@ -14,31 +14,31 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "mbedtls/version.h" // Must be first in order to pick up version
+#include "nng/nng.h"
+
+#include "../../../core/nng_impl.h"
+
+#include "../tls_engine.h"
+
+#include <mbedtls/version.h> // Must be first in order to pick up version
 
-#include "mbedtls/error.h"
+#include <mbedtls/error.h>
 #ifdef MBEDTLS_PSA_CRYPTO_C
-#include "psa/crypto.h"
+#include <psa/crypto.h>
 #endif
 
-#include "nng/nng.h"
-
 // We use a common cookie for our application.
-#include "mbedtls/ssl_cookie.h"
-
-#include "../tls_engine.h"
+#include <mbedtls/ssl_cookie.h>
 
 // mbedTLS renamed this header for 2.4.0.
 #if MBEDTLS_VERSION_MAJOR > 2 || MBEDTLS_VERSION_MINOR >= 4
-#include "mbedtls/net_sockets.h"
+#include <mbedtls/net_sockets.h>
 #else
-#include "mbedtls/net.h"
+#include <mbedtls/net.h>
 #endif
 
-#include "mbedtls/debug.h"
-#include "mbedtls/ssl.h"
-
-#include "core/nng_impl.h"
+#include <mbedtls/debug.h>
+#include <mbedtls/ssl.h>
 
 // pair holds a private key and the associated certificate.
 typedef struct {
diff --git a/src/supplemental/tls/tls_api.h b/src/supplemental/tls/tls_api.h
index 1cea7914..4f8264a3 100644
--- a/src/supplemental/tls/tls_api.h
+++ b/src/supplemental/tls/tls_api.h
@@ -12,7 +12,7 @@
 #ifndef NNG_SUPPLEMENTAL_TLS_TLS_API_H
 #define NNG_SUPPLEMENTAL_TLS_TLS_API_H
 
-#include "core/stream.h"
+#include "../../core/stream.h"
 
 // The implementation supplies this function to create the TLS connection
 // object.  All fields will be zeroed.
diff --git a/src/supplemental/tls/tls_common.c b/src/supplemental/tls/tls_common.c
index a293b283..543b7563 100644
--- a/src/supplemental/tls/tls_common.c
+++ b/src/supplemental/tls/tls_common.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "core/nng_impl.h"
+#include "../../core/nng_impl.h"
 
 #include "tls_common.h"
 #include "tls_engine.h"
diff --git a/src/supplemental/tls/tls_common.h b/src/supplemental/tls/tls_common.h
index 79d7cc90..693948c2 100644
--- a/src/supplemental/tls/tls_common.h
+++ b/src/supplemental/tls/tls_common.h
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "core/nng_impl.h"
+#include "../../core/nng_impl.h"
 
 #include "tls_engine.h"
 
diff --git a/src/supplemental/tls/tls_engine.h b/src/supplemental/tls/tls_engine.h
index 65488907..048e35a7 100644
--- a/src/supplemental/tls/tls_engine.h
+++ b/src/supplemental/tls/tls_engine.h
@@ -13,7 +13,7 @@
 #ifndef NNG_SUPPLEMENTAL_TLS_TLS_ENGINE_H
 #define NNG_SUPPLEMENTAL_TLS_TLS_ENGINE_H
 
-#include "core/defs.h"
+#include "../../core/defs.h"
 
 // Locking theory statement for TLS engines.  The engine is assumed
 // operate only from the context of threads called by the common
diff --git a/src/supplemental/tls/tls_stream.c b/src/supplemental/tls/tls_stream.c
index cd248686..4a033887 100644
--- a/src/supplemental/tls/tls_stream.c
+++ b/src/supplemental/tls/tls_stream.c
@@ -13,7 +13,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "core/nng_impl.h"
+#include "../../core/nng_impl.h"
 
 #include "tls_common.h"
 #include "tls_engine.h"
diff --git a/src/supplemental/tls/tls_stream.h b/src/supplemental/tls/tls_stream.h
index dca439af..4ea4912b 100644
--- a/src/supplemental/tls/tls_stream.h
+++ b/src/supplemental/tls/tls_stream.h
@@ -12,15 +12,15 @@
 #ifndef NNG_TLS_TLS_STREAM_H
 #define NNG_TLS_TLS_STREAM_H
 
-#include "core/nng_impl.h"
+#include "../../core/nng_impl.h"
 #include "tls_common.h"
 
 typedef struct tls_stream_s {
 	nng_stream    stream;
 	size_t        size;
 	nni_reap_node reap;
-	nni_aio       conn_aio;
-	nni_aio      *user_aio;
+	nng_aio       conn_aio;
+	nng_aio      *user_aio;
 	nni_tls_conn  conn; // NB: must be last!
 } tls_stream;
 
diff --git a/src/supplemental/tls/tls_stubs.c b/src/supplemental/tls/tls_stubs.c
index fc16afb5..5e21aca6 100644
--- a/src/supplemental/tls/tls_stubs.c
+++ b/src/supplemental/tls/tls_stubs.c
@@ -9,7 +9,7 @@
 // found online at https://opensource.org/licenses/MIT.
 //
 
-#include "core/nng_impl.h"
+#include "../../core/nng_impl.h"
 #include "tls_engine.h"
 
 // Provide stubs for the case where TLS is not enabled.
diff --git a/src/supplemental/tls/tls_test.c b/src/supplemental/tls/tls_test.c
index 494c748c..cbe9c0b9 100644
--- a/src/supplemental/tls/tls_test.c
+++ b/src/supplemental/tls/tls_test.c
@@ -8,7 +8,8 @@
 //
 
 #include "nng/nng.h"
-#include <nuts.h>
+
+#include "../../testing/nuts.h"
 
 void
 test_tls_config_version(void)
diff --git a/src/supplemental/tls/wolfssl/wolfssl.c b/src/supplemental/tls/wolfssl/wolfssl.c
index a009ed38..a18c1605 100644
--- a/src/supplemental/tls/wolfssl/wolfssl.c
+++ b/src/supplemental/tls/wolfssl/wolfssl.c
@@ -31,7 +31,7 @@
 
 #include <wolfssl/ssl.h>
 
-#include "core/nng_impl.h"
+#include "../../../core/nng_impl.h"
 #include "nng/nng.h"
 
 #include "../tls_engine.h"
@@ -490,6 +490,7 @@ wolf_config_psk(nng_tls_engine_config *cfg, const char *identity,
 	NNI_ARG_UNUSED(identity);
 	NNI_ARG_UNUSED(key);
 	NNI_ARG_UNUSED(key_len);
+	return (NNG_ENOTSUP);
 #else
 	psk *psk, *srch;