Skip to content

Commit 0e81d29

Browse files
author
GNBDEV
committed
ver1.4.5.b
1 parent 25ff341 commit 0e81d29

13 files changed

+52
-26
lines changed

‎Makefile.Darwin

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ ${GNB_ES}: ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
3333
strip ${GNB_ES}
3434

3535

36-
${GNB_CRYPTO}: ${CRYPTO_OBJS} ./src/gnb_crypto.o
37-
${CC} -o ${GNB_CRYPTO} ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
36+
${GNB_CRYPTO}: ${CRYPTO_OBJS} ./src/cli/gnb_crypto.o
37+
${CC} -o ${GNB_CRYPTO} ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
3838
strip ${GNB_CRYPTO}
3939

4040

‎Makefile.freebsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ $(GNB_ES): $(GNB_ES_OBJS) ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
3939
${CC} -o ${GNB_ES} ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS} ${GNB_ES_LDFLAGS}
4040

4141

42-
$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/gnb_crypto.o
43-
${CC} -o ${GNB_CRYPTO} ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
42+
$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/cli/gnb_crypto.o
43+
${CC} -o ${GNB_CRYPTO} ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
4444

4545

4646
$(GNB_CLI): $(GNB_OBJS) $(GNB_CLI_OBJS) $(GNB_PF_OBJS) ${CRYPTO_OBJS} ${ZLIB_OBJS}

‎Makefile.linux

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ $(GNB_ES): $(GNB_ES_OBJS) ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
4040
${CC} -o ${GNB_ES} ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS} ${GNB_ES_LDFLAGS}
4141

4242

43-
$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/gnb_crypto.o
44-
${CC} -o ${GNB_CRYPTO} ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
43+
$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/cli/gnb_crypto.o
44+
${CC} -o ${GNB_CRYPTO} ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
4545

4646

4747
$(GNB_CLI): $(GNB_OBJS) $(GNB_CLI_OBJS) $(GNB_PF_OBJS) ${CRYPTO_OBJS} ${ZLIB_OBJS}

‎Makefile.mingw_x86_64

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ ${GNB_ES}: ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
3434
${CC} -o ${GNB_ES} ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS} ./src/mingw/gnb_res.o ${GNB_ES_LDFLAGS}
3535

3636

37-
$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/gnb_crypto.o
38-
${CC} -o ${GNB_CRYPTO} ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
37+
$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/cli/gnb_crypto.o
38+
${CC} -o ${GNB_CRYPTO} ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
3939

4040

4141
${GNB_CLI}: ${GNB_OBJS} ${GNB_CLI_OBJS} ${GNB_PF_OBJS} ${CRYPTO_OBJS} ${ZLIB_OBJS}

‎Makefile.openbsd

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ $(GNB_ES): $(GNB_ES_OBJS) ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
3030
${CC} -o ${GNB_ES} ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS} ${GNB_ES_LDFLAGS}
3131

3232

33-
$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/gnb_crypto.o
34-
${CC} -o ${GNB_CRYPTO} ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
33+
$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/cli/gnb_crypto.o
34+
${CC} -o ${GNB_CRYPTO} ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
3535

3636

3737
$(GNB_CLI): $(GNB_OBJS) $(GNB_CLI_OBJS) $(GNB_PF_OBJS) ${CRYPTO_OBJS} ${ZLIB_OBJS}

‎Makefile.openwrt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ $(GNB_ES): $(GNB_ES_OBJS) ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS}
3939
${CC} -o ${GNB_ES} ${GNB_ES_OBJS} ${CRYPTO_OBJS} ${MINIUPNP_OBJS} ${LIBNATPMP_OBJS} ${GNB_ES_LDFLAGS}
4040

4141

42-
$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/gnb_crypto.o
43-
${CC} -o ${GNB_CRYPTO} ./src/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
42+
$(GNB_CRYPTO): $(CRYPTO_OBJS) ./src/cli/gnb_crypto.o
43+
${CC} -o ${GNB_CRYPTO} ./src/cli/gnb_crypto.o ${CRYPTO_OBJS} ${CLI_LDFLAGS}
4444

4545

4646
$(GNB_CLI): $(GNB_OBJS) $(GNB_CLI_OBJS) $(GNB_PF_OBJS) ${CRYPTO_OBJS} ${ZLIB_OBJS}

‎src/cli/gnb.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#endif
3535

3636

37-
3837
#ifndef GNB_SKIP_BUILD_TIME
3938
#define GNB_BUILD_STRING "Build Time ["__DATE__","__TIME__"]"
4039
#else

‎src/gnb_crypto.c renamed to ‎src/cli/gnb_crypto.c

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,17 @@
3333
#include "crypto/random/gnb_random.h"
3434
#include "ed25519/ed25519.h"
3535

36+
37+
#ifndef GNB_SKIP_BUILD_TIME
38+
#define GNB_BUILD_STRING "Build Time ["__DATE__","__TIME__"]"
39+
#else
40+
#define GNB_BUILD_STRING "Build Time [Hidden]"
41+
#endif
42+
43+
3644
static void show_useage(int argc,char *argv[]){
3745

38-
printf("Build[%s %s]\n", __DATE__, __TIME__);
46+
printf("%s\n", GNB_BUILD_STRING);
3947

4048
printf("usage: %s -c -p private_key_file -k public_key_file\n",argv[0]);
4149
printf("example:\n");
@@ -68,13 +76,14 @@ static void create_keypair(uint32_t uuid32, const char *private_key_file, const
6876
public_file_fd = open(public_key_file, O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR);
6977

7078
if ( -1 == public_file_fd ) {
79+
perror("create public key file");
7180
exit(0);
7281
}
7382

7483
wlen = write(public_file_fd,hex_string,64);
7584

7685
if ( -1 == wlen ) {
77-
perror("write public_file");
86+
perror("write public key file");
7887
}
7988

8089
close(public_file_fd);
@@ -84,13 +93,14 @@ static void create_keypair(uint32_t uuid32, const char *private_key_file, const
8493
private_file_fd = open(private_key_file, O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR);
8594

8695
if ( -1 == private_file_fd ) {
96+
perror("create private key file");
8797
exit(0);
8898
}
8999

90100
wlen = write(private_file_fd,hex_string,128);
91101

92102
if ( -1 == wlen ) {
93-
perror("write private_file");
103+
perror("write private key file");
94104
}
95105

96106
close(private_file_fd);
@@ -159,7 +169,3 @@ int main (int argc,char *argv[]){
159169
return 0;
160170

161171
}
162-
163-
/*
164-
./gnb_crypto -c -p 1010.private -k 1010.public
165-
*/

‎src/cli/gnb_ctl.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,22 @@
3131
#include "gnb_conf_type.h"
3232
#include "gnb_ctl_block.h"
3333

34+
35+
#ifndef GNB_SKIP_BUILD_TIME
36+
#define GNB_BUILD_STRING "Build Time ["__DATE__","__TIME__"]"
37+
#else
38+
#define GNB_BUILD_STRING "Build Time [Hidden]"
39+
#endif
40+
41+
3442
void gnb_ctl_dump_status(gnb_ctl_block_t *ctl_block, uint32_t in_nodeid, uint8_t online_opt);
3543
void gnb_ctl_dump_address_list(gnb_ctl_block_t *ctl_block, uint32_t in_nodeid);
3644

3745
static void show_useage(int argc,char *argv[]){
3846

39-
printf("GNB Ctl version 1.4.5.a protocol version 1.2.6\n");
40-
printf("Build[%s %s]\n", __DATE__, __TIME__);
47+
printf("GNB Ctl version 1.4.5.b protocol version 1.4.5\n");
48+
49+
printf("%s\n", GNB_BUILD_STRING);
4150

4251
printf("Copyright (C) 2019 gnbdev\n");
4352
printf("Usage: %s -b CTL_BLOCK [OPTION]\n", argv[0]);

‎src/cli/gnb_es.c

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,14 @@
3737
#include "gnb_core_frame_type_defs.h"
3838
#include "es/gnb_es_type.h"
3939

40+
41+
#ifndef GNB_SKIP_BUILD_TIME
42+
#define GNB_BUILD_STRING "Build Time ["__DATE__","__TIME__"]"
43+
#else
44+
#define GNB_BUILD_STRING "Build Time [Hidden]"
45+
#endif
46+
47+
4048
gnb_es_ctx* gnb_es_ctx_create(int is_service, char *ctl_block_file,gnb_log_ctx_t *log);
4149
void gnb_es_ctx_init(gnb_es_ctx *es_ctx);
4250

@@ -67,9 +75,9 @@ void gnb_start_environment_service(gnb_es_ctx *es_ctx);
6775

6876
static void show_useage(int argc,char *argv[]){
6977

70-
printf("GNB Environment Service version 1.3.0.b protocol version 1.1.3\n");
78+
printf("GNB Environment Service version 1.4.5.b protocol version 1.4.5\n");
7179

72-
printf("Build[%s %s]\n", __DATE__, __TIME__);
80+
printf("%s\n", GNB_BUILD_STRING);
7381

7482
printf("Copyright (C) 2019 gnbdev<gnbdev@qq.com>\n");
7583

‎src/gnb.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ typedef struct _gnb_core_t{
169169
#define GNB_LOG_ID_INDEX_SERVICE_WORKER 5
170170
#define GNB_LOG_ID_DETECT_WORKER 6
171171

172-
#define GNB_VERSION_STRING "GNB version 1.4.5.a protocol version 1.4.5"
172+
#define GNB_VERSION_STRING "GNB version 1.4.5.b protocol version 1.4.5"
173173
#define GNB_COPYRIGHT_STRING "Copyright (C) 2019 gnbdev<gnbdev@qq.com>"
174174
#define GNB_URL_STRING "https://github.com/gnbdev/opengnb"
175175

‎src/gnb_node.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,10 @@ gnb_node_t* gnb_select_forward_node(gnb_core_t *gnb_core){
201201
return gnb_core->fwd_node_ring.nodes[0];
202202
}
203203

204+
if ( gnb_core->conf->pf_worker_num > 0 ) {
205+
return gnb_core->fwd_node_ring.nodes[0];
206+
}
207+
204208
if ( GNB_MULTI_ADDRESS_TYPE_SIMPLE_FAULT_TOLERANT == gnb_core->conf->multi_forward_type ) {
205209
goto SIMPLE_FAULT_TOLERANT;
206210
}

‎version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.5.a
1+
1.4.5.b

0 commit comments

Comments
 (0)