Update Github Actions

.github/workflows/cmake.yml

@@ -0,0 +1,22 @@
+name: CMake Build and Test
+
+on:
+  push:
+    branches: [ master, develop ]
+  pull_request:
+    branches: [ master, develop ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Setup
+        run: |
+          sudo apt update
+          sudo apt install build-essential cmake
+          sudo apt install libgtest-dev libgmock-dev libmosquitto-dev
+      - uses: actions/checkout@v3
+      - name: Build
+        run: cmake -B build && cmake --build build
+      - name: Test
+        run: find ./build -name *_test -exec {} \;

.github/workflows/build.yml → .github/workflows/make.yml

@@ -1,4 +1,4 @@
-name: Build
+name: Make Build and Test
 
 on:
   push:
@@ -10,11 +10,13 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: setup
+      - name: Setup
         run: |
           sudo apt update
           sudo apt install build-essential
           sudo apt install libgtest-dev libgmock-dev libmosquitto-dev
-      - uses: actions/checkout@v2
-      - name: build
-        run: make 3rd-party modules RELEASE=1 STAGING_DIR=$HOME/.tbox
+      - uses: actions/checkout@v3
+      - name: Build
+        run: make
+      - name: Test
+        run: find .build -name test -exec {} \;

CMakeLists.txt

@@ -78,12 +78,12 @@ option(TBOX_ENABLE_NETWORK "build network" ON)
 option(TBOX_ENABLE_TERMINAL "build terminal" ON)
 option(TBOX_ENABLE_MAIN "build main" ON)
 
-option(TBOX_ENABLE_COROUTINE "build coroutine" OFF)
-option(TBOX_ENABLE_HTTP "build http" OFF)
-option(TBOX_ENABLE_MQTT "build mqtt" OFF)
-option(TBOX_ENABLE_FLOW "build flow" OFF)
-option(TBOX_ENABLE_ALARM "build alarm" OFF)
-option(TBOX_ENABLE_CRYPTO "build crypto" OFF)
+option(TBOX_ENABLE_COROUTINE "build coroutine" ON)
+option(TBOX_ENABLE_HTTP "build http" ON)
+option(TBOX_ENABLE_MQTT "build mqtt" ON)
+option(TBOX_ENABLE_FLOW "build flow" ON)
+option(TBOX_ENABLE_ALARM "build alarm" ON)
+option(TBOX_ENABLE_CRYPTO "build crypto" ON)
 
 #
 # 3rd-party libraries
@@ -226,4 +226,3 @@ install(
     "${CMAKE_CURRENT_BINARY_DIR}/tboxConfigVersion.cmake"
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/tbox
 )
-

CONTRIBUTORS.md

@@ -4,3 +4,4 @@ _If we have forgotten your name, please contact us_
 
  * Hevake Lee
  * Lucas Law
+ * Gwill

config.mk

@@ -10,12 +10,12 @@ MODULES += main
 MODULES += run
 
 ## 非核心模块，请根据需要选择
-#MODULES += coroutine
-#MODULES += http
-#MODULES += mqtt
-#MODULES += flow
-#MODULES += alarm
-#MODULES += crypto
+MODULES += coroutine
+MODULES += http
+MODULES += mqtt
+MODULES += flow
+MODULES += alarm
+MODULES += crypto
 
 ## 第三方库依赖
 THIRDPARTY += nlohmann

modules/terminal/impl/service/telnetd.cpp

@@ -172,7 +172,7 @@ void Telnetd::Impl::sendNego(const TcpServer::ConnToken &ct, Cmd cmd, Opt o)
 
 void Telnetd::Impl::sendCmd(const TcpServer::ConnToken &ct, Cmd cmd)
 {
-    const uint8_t tmp[] = { Cmd::kIAC, cmd};
+    const uint8_t tmp[] = { Cmd::kIAC, cmd };
     send(ct, tmp, sizeof(tmp));
 }
 
@@ -182,7 +182,7 @@ void Telnetd::Impl::sendSub(const TcpServer::ConnToken &ct, Opt o, const uint8_t
     uint8_t tmp[size];
     tmp[0] = Cmd::kIAC;
     tmp[1] = Cmd::kSB;
-    tmp[2] = 0;
+    tmp[2] = o;
     memcpy(tmp + 3, p, s);
     tmp[size-2] = Cmd::kIAC;
     tmp[size-1] = Cmd::kSE;

version.mk

@@ -1,4 +1,4 @@
 # TBOX版本号
 TBOX_VERSION_MAJOR := 1
 TBOX_VERSION_MINOR := 5
-TBOX_VERSION_REVISION := 14
+TBOX_VERSION_REVISION := 15