1.6.0.a更新说明:

1、全新 packet filter 流水线,提升IP分组处理效率,修复加密模块和流量压缩模块冲突的问题.

2、新增与 index 节点通讯支持加密.

3、减少内存使用,可以在内存紧张的 OpenWRT 路上运行.

4、适配在macOS Sequoia 15.4 上编译,为此更新libs中的第三方代码zlib.

5、调整节点探测的频率,减少对网络带宽的占用.

6、修复在一些要求整型字节地址对齐CPU在下崩溃的问题.

7、支持全新 ur1 转发,默认启动是禁用

Author: O-O111

README.md

@@ -320,4 +320,8 @@ For details, please visit [https://aur.archlinux.org/packages/opengnb/](https://
 [gnb_udp_over_tcp](https://github.com/gnbdev/gnb_udp_over_tcp "gnb_udp_over_tcp") is a service developed for GNB that forwards UDP packets through tcp link, and can also forward data for other services based on UDP protocol.
 
 ---
-[Disclaimer](docs/disclaimer_cn.md) 
+[Disclaimer](docs/disclaimer_cn.md)   
+
+Any organization or individual is free to use GNB's source code under the GPL V3 license, this also include any commercial projects. Commercial projects that utilize GNB's source code under closed-source conditions must obtain authorization from us.   
+
+

README_CN.md

@@ -320,4 +320,6 @@ apt install opengnb
 [gnb_udp_over_tcp](https://github.com/gnbdev/gnb_udp_over_tcp "gnb_udp_over_tcp") 是一个为 GNB 开发的通过 tcp 链路中转 UDP 分组转发的服务，也可以为其他基于 UDP 协议的服务中转数据。
 
 ---
-[免责声明](docs/disclaimer_cn.md)
+[免责声明](docs/disclaimer_cn.md)  
+
+个人和商业可以免费自由使用gnb的源码，但是必须遵循gplv3许可，把使用的gnb源码的项目开源，如果想闭源，需要取得我们的商业授权

src/Darwin/gnb_drv_darwin.c

@@ -156,24 +156,16 @@ static void self_test(){
 
     GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST zip_level=%d\n", gnb_core->conf->zip_level);
 
-
-    switch (gnb_core->conf->pf_bits) {
-    
-    case GNB_PF_BITS_CRYPTO_XOR:
-        GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST crypto xor\n");
-        break;
-    case GNB_PF_BITS_CRYPTO_ARC4:
-        GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST crypto arc4\n");
-        break;
-
-    case GNB_PF_BITS_NONE:
+    if ( GNB_PF_BITS_NONE == gnb_core->conf->pf_bits ) {
         GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST crypto none\n");
-        break;
+    }
 
-    default:
-        GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST crypto config error\n");
-        break;
+    if ( gnb_core->conf->pf_bits & GNB_PF_BITS_CRYPTO_XOR ) {
+        GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST crypto xor\n");
+    }
 
+    if ( gnb_core->conf->pf_bits & GNB_PF_BITS_CRYPTO_ARC4 ) {
+        GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST crypto arc4\n");
     }
 
     switch (gnb_core->conf->unified_forwarding) {
@@ -201,9 +193,11 @@ static void self_test(){
 
     }
 
-
     GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST activate tun=%d\n", gnb_core->conf->activate_tun);
 
+    GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST universal relay0 ur0=%d\n", gnb_core->conf->universal_relay0);
+    GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST universal relay1 ur1=%d\n", gnb_core->conf->universal_relay1);
+
     GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST console_log_level=%d\n", gnb_core->conf->console_log_level);
     GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST file_log_level=%d\n",    gnb_core->conf->file_log_level);
     GNB_LOG1(gnb_core->log, GNB_LOG_ID_CORE, "SELF-TEST udp_log_level=%d\n",     gnb_core->conf->udp_log_level);

src/cli/gnb.c

@@ -44,7 +44,7 @@ void gnb_ctl_dump_address_list(gnb_ctl_block_t *ctl_block, gnb_uuid_t in_nodeid,
 
 static void show_useage(int argc,char *argv[]){
 
-    printf("GNB Ctl version 1.5.0.a protocol version 1.5.0\n");
+    printf("GNB Ctl version 1.6.0.a protocol version 1.6.0\n");
 
     printf("%s\n", GNB_BUILD_STRING);
 

src/cli/gnb_crypto.c

@@ -75,7 +75,7 @@ void gnb_start_environment_service(gnb_es_ctx *es_ctx);
 
 static void show_useage(int argc,char *argv[]){
 
-    printf("GNB Environment Service version 1.5.0.a protocol version 1.5.0\n");
+    printf("GNB Environment Service version 1.6.0.a protocol version 1.6.0\n");
 
     printf("%s\n", GNB_BUILD_STRING);
 

src/cli/gnb_ctl.c

@@ -0,0 +1,60 @@
+/*
+   Copyright (C) gnbdev
+
+   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 3 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, see <http://www.gnu.org/licenses/>.
+*/
+
+void xor_crypto(unsigned char *crypto_key, unsigned char *data, unsigned int len) {
+
+    int i;
+    int j = 0;
+
+    for ( i=0; i<len; i++ ) {
+
+        *data = *data ^ crypto_key[j];
+
+        data++;
+
+        j++;
+
+        if ( j >= 64 ) {
+            j = 0;
+        }
+
+    }
+
+}
+
+
+void xor_crypto_copy(unsigned char *crypto_key, unsigned char *dest, unsigned char *src, unsigned int len) {
+
+    int i;
+    int j = 0;
+
+    for ( i=0; i<len; i++ ) {
+
+        *dest = *src ^ crypto_key[j];
+
+        src++;
+        dest++;
+
+        j++;
+
+        if ( j >= 64 ) {
+            j = 0;
+        }
+
+    }
+
+}

src/cli/gnb_es.c

@@ -0,0 +1,24 @@
+/*
+   Copyright (C) gnbdev
+
+   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 3 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, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef XOR_H
+#define XOR_H
+
+void xor_crypto(unsigned char *crypto_key, unsigned char *data, unsigned int len);
+void xor_crypto_copy(unsigned char *crypto_key, unsigned char *dest, unsigned char *src, unsigned int len);
+
+#endif

src/crypto/random/gnb_random.c

@@ -361,7 +361,7 @@ static int open_tun_freebsd(gnb_core_t *gnb_core){
 static int read_tun_freebsd(gnb_core_t *gnb_core, void *buf, size_t buf_size){
 
     ssize_t rlen;
-    rlen = read(gnb_core->tun_fd, buf, GNB_MAX_PAYLOAD_SIZE);
+    rlen = read(gnb_core->tun_fd, buf, buf_size);
     return rlen;
 
 }

src/crypto/random/gnb_random.h

@@ -171,7 +171,7 @@ typedef struct _gnb_core_t{
 #define GNB_LOG_ID_INDEX_SERVICE_WORKER  5
 #define GNB_LOG_ID_DETECT_WORKER         6
 
-#define GNB_VERSION_STRING    "GNB version Dev 1.5.0.c  protocol version 1.5.0"
+#define GNB_VERSION_STRING    "GNB version Dev 1.6.0.a  protocol version 1.6.0"
 #define GNB_COPYRIGHT_STRING  "Copyright (C) 2019 gnbdev<gnbdev@qq.com>"
 #define GNB_URL_STRING        "https://github.com/gnbdev/opengnb"
 

src/crypto/xor/xor.c

@@ -15,8 +15,8 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "stdlib.h"
-#include "string.h"
+#include <stdlib.h>
+#include <string.h>
 
 #include "gnb_alloc.h"