ver1.4.5.b

GNBDEV · GNBDEV · commit 0e81d2981dba · 2023-12-31T22:35:06.000+08:00
diff --git a/Makefile.Darwin b/Makefile.Darwin
@@ -33,8 +33,8 @@ ${GNB_ES}: ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
 	strip ${GNB_ES}
 
 
-${GNB_CRYPTO}: ${CRYPTO_OBJS} ./src/gnb_crypto.o
-	${CC} -o ${GNB_CRYPTO}  ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
+${GNB_CRYPTO}: ${CRYPTO_OBJS} ./src/cli/gnb_crypto.o
+	${CC} -o ${GNB_CRYPTO}  ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
 	strip ${GNB_CRYPTO}
 
 
diff --git a/Makefile.freebsd b/Makefile.freebsd
@@ -39,8 +39,8 @@ $(GNB_ES): $(GNB_ES_OBJS) ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
 	${CC} -o ${GNB_ES} ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS} ${GNB_ES_LDFLAGS}
 
 
-$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/gnb_crypto.o
-	${CC} -o ${GNB_CRYPTO} ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
+$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/cli/gnb_crypto.o
+	${CC} -o ${GNB_CRYPTO} ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
 
 
 $(GNB_CLI): $(GNB_OBJS) $(GNB_CLI_OBJS) $(GNB_PF_OBJS) ${CRYPTO_OBJS} ${ZLIB_OBJS}
diff --git a/Makefile.linux b/Makefile.linux
@@ -40,8 +40,8 @@ $(GNB_ES): $(GNB_ES_OBJS) ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
 	${CC} -o ${GNB_ES} ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS} ${GNB_ES_LDFLAGS}
 
 
-$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/gnb_crypto.o
-	${CC} -o ${GNB_CRYPTO} ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
+$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/cli/gnb_crypto.o
+	${CC} -o ${GNB_CRYPTO} ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
 
 
 $(GNB_CLI): $(GNB_OBJS) $(GNB_CLI_OBJS) $(GNB_PF_OBJS) ${CRYPTO_OBJS} ${ZLIB_OBJS}
diff --git a/Makefile.mingw_x86_64 b/Makefile.mingw_x86_64
@@ -34,8 +34,8 @@ ${GNB_ES}: ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
 	${CC} -o ${GNB_ES} ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS} ./src/mingw/gnb_res.o ${GNB_ES_LDFLAGS}
 
 
-$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/gnb_crypto.o
-	${CC} -o ${GNB_CRYPTO} ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
+$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/cli/gnb_crypto.o
+	${CC} -o ${GNB_CRYPTO} ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
 
 
 ${GNB_CLI}: ${GNB_OBJS} ${GNB_CLI_OBJS} ${GNB_PF_OBJS} ${CRYPTO_OBJS} ${ZLIB_OBJS}
diff --git a/Makefile.openbsd b/Makefile.openbsd
@@ -30,8 +30,8 @@ $(GNB_ES): $(GNB_ES_OBJS) ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
 	${CC} -o ${GNB_ES} ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS} ${GNB_ES_LDFLAGS}
 
 
-$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/gnb_crypto.o
-	${CC} -o ${GNB_CRYPTO} ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
+$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/cli/gnb_crypto.o
+	${CC} -o ${GNB_CRYPTO} ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
 
 
 $(GNB_CLI): $(GNB_OBJS) $(GNB_CLI_OBJS) $(GNB_PF_OBJS) ${CRYPTO_OBJS} ${ZLIB_OBJS}
diff --git a/Makefile.openwrt b/Makefile.openwrt
@@ -39,8 +39,8 @@ $(GNB_ES): $(GNB_ES_OBJS) ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
 	${CC} -o ${GNB_ES} ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS} ${GNB_ES_LDFLAGS}
 
 
-$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/gnb_crypto.o
-	${CC} -o ${GNB_CRYPTO} ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
+$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/cli/gnb_crypto.o
+	${CC} -o ${GNB_CRYPTO} ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
 
 
 $(GNB_CLI): $(GNB_OBJS) $(GNB_CLI_OBJS) $(GNB_PF_OBJS) ${CRYPTO_OBJS} ${ZLIB_OBJS}
diff --git a/src/cli/gnb.c b/src/cli/gnb.c
@@ -34,7 +34,6 @@
 #endif
 
 
-
 #ifndef GNB_SKIP_BUILD_TIME
 #define GNB_BUILD_STRING  "Build Time ["__DATE__","__TIME__"]"
 #else
diff --git a/src/cli/gnb_crypto.c b/src/cli/gnb_crypto.c
@@ -33,9 +33,17 @@
 #include "crypto/random/gnb_random.h"
 #include "ed25519/ed25519.h"
 
+
+#ifndef GNB_SKIP_BUILD_TIME
+#define GNB_BUILD_STRING  "Build Time ["__DATE__","__TIME__"]"
+#else
+#define GNB_BUILD_STRING  "Build Time [Hidden]"
+#endif
+
+
 static void show_useage(int argc,char *argv[]){
 
-    printf("Build[%s %s]\n", __DATE__, __TIME__);
+    printf("%s\n", GNB_BUILD_STRING);
 
     printf("usage: %s -c -p private_key_file -k public_key_file\n",argv[0]);
     printf("example:\n");
@@ -68,13 +76,14 @@ static void create_keypair(uint32_t uuid32, const char *private_key_file, const
     public_file_fd = open(public_key_file, O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR);
 
     if ( -1 == public_file_fd ) {
+        perror("create public key file");
         exit(0);
     }
 
     wlen = write(public_file_fd,hex_string,64);
 
     if ( -1 == wlen ) {
-        perror("write public_file");
+        perror("write public key file");
     }
 
     close(public_file_fd);
@@ -84,13 +93,14 @@ static void create_keypair(uint32_t uuid32, const char *private_key_file, const
     private_file_fd = open(private_key_file, O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR);
 
     if ( -1 == private_file_fd ) {
+        perror("create private key file");
         exit(0);
     }
 
     wlen = write(private_file_fd,hex_string,128);
 
     if ( -1 == wlen ) {
-        perror("write private_file");
+        perror("write private key file");
     }
 
     close(private_file_fd);
@@ -159,7 +169,3 @@ int main (int argc,char *argv[]){
     return 0;
 
 }
-
-/*
-./gnb_crypto -c -p 1010.private -k 1010.public
-*/
diff --git a/src/cli/gnb_ctl.c b/src/cli/gnb_ctl.c
@@ -31,13 +31,22 @@
 #include "gnb_conf_type.h"
 #include "gnb_ctl_block.h"
 
+
+#ifndef GNB_SKIP_BUILD_TIME
+#define GNB_BUILD_STRING  "Build Time ["__DATE__","__TIME__"]"
+#else
+#define GNB_BUILD_STRING  "Build Time [Hidden]"
+#endif
+
+
 void gnb_ctl_dump_status(gnb_ctl_block_t *ctl_block, uint32_t in_nodeid, uint8_t online_opt);
 void gnb_ctl_dump_address_list(gnb_ctl_block_t *ctl_block, uint32_t in_nodeid);
 
 static void show_useage(int argc,char *argv[]){
 
-    printf("GNB Ctl version 1.4.5.a protocol version 1.2.6\n");
-    printf("Build[%s %s]\n", __DATE__, __TIME__);
+    printf("GNB Ctl version 1.4.5.b protocol version 1.4.5\n");
+
+    printf("%s\n", GNB_BUILD_STRING);
 
     printf("Copyright (C) 2019 gnbdev\n");
     printf("Usage: %s -b CTL_BLOCK [OPTION]\n", argv[0]);
diff --git a/src/cli/gnb_es.c b/src/cli/gnb_es.c
@@ -37,6 +37,14 @@
 #include "gnb_core_frame_type_defs.h"
 #include "es/gnb_es_type.h"
 
+
+#ifndef GNB_SKIP_BUILD_TIME
+#define GNB_BUILD_STRING  "Build Time ["__DATE__","__TIME__"]"
+#else
+#define GNB_BUILD_STRING  "Build Time [Hidden]"
+#endif
+
+
 gnb_es_ctx* gnb_es_ctx_create(int is_service, char *ctl_block_file,gnb_log_ctx_t *log);
 void gnb_es_ctx_init(gnb_es_ctx *es_ctx);
 
@@ -67,9 +75,9 @@ void gnb_start_environment_service(gnb_es_ctx *es_ctx);
 
 static void show_useage(int argc,char *argv[]){
 
-    printf("GNB Environment Service version 1.3.0.b protocol version 1.1.3\n");
+    printf("GNB Environment Service version 1.4.5.b protocol version 1.4.5\n");
 
-    printf("Build[%s %s]\n", __DATE__, __TIME__);
+    printf("%s\n", GNB_BUILD_STRING);
 
     printf("Copyright (C) 2019 gnbdev<gnbdev@qq.com>\n");
 
diff --git a/src/gnb.h b/src/gnb.h
@@ -169,7 +169,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 1.4.5.a protocol version 1.4.5"
+#define GNB_VERSION_STRING    "GNB version 1.4.5.b protocol version 1.4.5"
 #define GNB_COPYRIGHT_STRING  "Copyright (C) 2019 gnbdev<gnbdev@qq.com>"
 #define GNB_URL_STRING        "https://github.com/gnbdev/opengnb"
 
diff --git a/src/gnb_node.c b/src/gnb_node.c
@@ -201,6 +201,10 @@ gnb_node_t* gnb_select_forward_node(gnb_core_t *gnb_core){
         return gnb_core->fwd_node_ring.nodes[0];
     }
 
+    if ( gnb_core->conf->pf_worker_num > 0 ) {
+        return gnb_core->fwd_node_ring.nodes[0];
+    }
+
     if ( GNB_MULTI_ADDRESS_TYPE_SIMPLE_FAULT_TOLERANT == gnb_core->conf->multi_forward_type ) {
         goto SIMPLE_FAULT_TOLERANT;
     }
diff --git a/version b/version
@@ -1 +1 @@
-1.4.5.a
+1.4.5.b
