* NEW [nng] Add new log system.

.clang-format

@@ -5,7 +5,7 @@ ColumnLimit: 79
 AlignConsecutiveAssignments: true
 AlignConsecutiveDeclarations: true
 AlignTrailingComments: true
-AlignEscapedNewlinesLeft: true
+AlignEscapedNewlines: Left
 PointerAlignment: Right
 ForEachMacros: ['NNI_LIST_FOREACH']
 AlwaysBreakAfterReturnType: TopLevelDefinitions

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "extern/nng-wolfssl"]
-	path = extern/nng-wolfssl
-	url = https://github.com/staysail/nng-wolfssl
+path = extern/nng-wolfssl
+url = https://github.com/staysail/nng-wolfssl

CMakeLists.txt

@@ -5,6 +5,7 @@
 #   Copyright (c) 2015-2016 Jack R. Dunaway. All rights reserved.
 #   Copyright 2016 Franklin "Snaipe" Mathieu <[email protected]>
 #   Copyright 2018 Capitar IT Group BV <[email protected]>
+#   Copyright 2020 EMQX. All rights reserved.
 #
 #   Permission is hereby granted, free of charge, to any person obtaining a copy
 #   of this software and associated documentation files (the "Software"),
@@ -252,12 +253,15 @@ endif ()
 add_subdirectory(src)
 
 if (NNG_TESTS)
-    add_subdirectory(tests)
+#    add_subdirectory(tests)
 endif ()
 
 #  Build the tools
 
-add_subdirectory(docs/man)
+# add_subdirectory(docs/man)
+
+include_directories(${CMAKE_SOURCE_DIR}/nanolib/include)
+include_directories(${CMAKE_SOURCE_DIR}/nanomq/include)
 
 set(CPACK_PACKAGE_NAME ${PROJECT_NAME})
 set(CPACK_PACKAGE_VERSION ${NNG_PACKAGE_VERSION})

README.adoc

@@ -1,3 +1,8 @@
+This is NNG repo of NanoMQ project. I have updated it to support MQTT protocol.
+
+
+
+
 ifdef::env-github[]
 :note-caption: :information_source:
 :important-caption: :heavy_exclamation_mark:

cmake/CheckSanitizer.cmake

@@ -22,6 +22,9 @@ macro (CheckSanitizer)
     set (NNG_SANITIZER none CACHE STRING "Sanitizer to use (clang or gcc).")
     set_property(CACHE NNG_SANITIZER PROPERTY STRINGS ${NNG_SAN_LIST})
     mark_as_advanced (NNG_SANITIZER)
+    if (DEBUG AND ASAN)
+        set (NNG_SANITIZER address)
+	endif (DEBUG AND ASAN)
 
     if (NOT NNG_SANITIZER STREQUAL "none")
         set (NNG_C_FLAG_SANITIZER "-fsanitize=${NNG_SANITIZER}")

cmake/NNGOptions.cmake

@@ -76,6 +76,12 @@ mark_as_advanced(NNG_PROTO_RESPONDENT0)
 option (NNG_PROTO_SURVEYOR0 "Enable SURVEYORv0 protocol." ON)
 mark_as_advanced(NNG_PROTO_SURVEYOR0)
 
+option (NNG_PROTO_MQTT_CLIENT "Enable MQTT Client protocol." ON)
+mark_as_advanced(NNG_PROTO_MQTT_CLIENT)
+
+option (NNG_PROTO_MQTT_BROKER "Enable MQTT Broker protocol." ON)
+mark_as_advanced(NNG_PROTO_MQTT_BROKER)
+
 # TLS support.
 
 # Enabling TLS is required to enable support for the TLS transport
@@ -115,14 +121,32 @@ mark_as_advanced(NNG_TRANSPORT_IPC)
 option (NNG_TRANSPORT_TCP "Enable TCP transport." ON)
 mark_as_advanced(NNG_TRANSPORT_TCP)
 
+# MQTT TCP transport
+option (NNG_TRANSPORT_MQTT_TCP "Enable MQTT TCP transport." ON)
+mark_as_advanced(NNG_TRANSPORT_MQTT_TCP)
+
 # TLS transport
 option (NNG_TRANSPORT_TLS "Enable TLS transport." ON)
 mark_as_advanced(NNG_TRANSPORT_TLS)
 
+# MQTT TLS transport
+option (NNG_TRANSPORT_MQTT_TLS "Enable MQTT TLS transport." ON )
+mark_as_advanced(NNG_TRANSPORT_MQTT_TLS)
+
 # WebSocket
 option (NNG_TRANSPORT_WS "Enable WebSocket transport." ON)
 mark_as_advanced(NNG_TRANSPORT_WS)
 
+# MQTT Client
+option (NNG_TRANSPORT_MQTT_TCP "Enable MQTT TCP transport." ON)
+mark_as_advanced(NNG_TRANSPORT_MQTT_TCP)
+
+#MQTT Broker
+option (NNG_TRANSPORT_MQTT_BROKER_TCP "Enable MQTT BROKER TCP transport." ON)
+mark_as_advanced(NNG_TRANSPORT_MQTT_BROKER_TCP)
+
+
+
 CMAKE_DEPENDENT_OPTION(NNG_TRANSPORT_WSS "Enable WSS transport." ON
         "NNG_ENABLE_TLS" OFF)
 mark_as_advanced(NNG_TRANSPORT_WSS)

demo/async/CMakeLists.txt

@@ -7,18 +7,22 @@
 # file was obtained (LICENSE.txt).  A copy of the license may also be
 # found online at https://opensource.org/licenses/MIT.
 
-cmake_minimum_required (VERSION 2.8.7)
+cmake_minimum_required (VERSION 2.8.12)
 
 project(nng-asyncdemo)
 
 set(PARALLEL 128 CACHE STRING "Parallelism (min 4, max 1000)")
 
 # Call this from your own project's makefile.
 find_package(nng CONFIG REQUIRED)
+find_package(Threads)
+
+find_package(Threads)
 
 add_executable(server server.c)
 target_link_libraries(server nng::nng)
-target_compile_definitions(server PRIVATE -DPARALLEL=${PARALLEL})
+target_compile_definitions(server PRIVATE NNG_ELIDE_DEPRECATED PARALLEL=${PARALLEL})
 
 add_executable(client client.c)
+target_compile_definitions(client PRIVATE NNG_ELIDE_DEPRECATED)
 target_link_libraries(client nng::nng)

demo/async/run.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 ADDR=ipc:///tmp/async_demo
 COUNT=10

demo/http_client/CMakeLists.txt

@@ -7,12 +7,15 @@
 # file was obtained (LICENSE.txt).  A copy of the license may also be
 # found online at https://opensource.org/licenses/MIT.
 
-cmake_minimum_required (VERSION 2.8.7)
+cmake_minimum_required (VERSION 2.8.12)
 
 project(http_client)
 
 # Call this from your own project's makefile.
 find_package(nng CONFIG REQUIRED)
 
+find_package(Threads)
+
 add_executable(http_client http_client.c)
 target_link_libraries(http_client nng::nng)
+target_compile_definitions(http_client PRIVATE NNG_ELIDE_DEPRECATED)

demo/mqtt/CMakeLists.txt

@@ -0,0 +1,17 @@
+#
+# This software is supplied under the terms of the MIT License, a
+# copy of which should be located in the distribution where this
+# file was obtained (LICENSE.txt).  A copy of the license may also be
+# found online at https://opensource.org/licenses/MIT.
+
+cmake_minimum_required (VERSION 2.8.7)
+
+project(mqtt_client)
+
+find_package(nng CONFIG REQUIRED)
+
+find_package(Threads)
+
+add_executable(mqtt_client mqtt_client.c)
+target_link_libraries(mqtt_client nng)
+target_link_libraries(mqtt_client ${CMAKE_THREAD_LIBS_INIT})