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

Author: apps

Makefile.Darwin

@@ -1,4 +1,6 @@
-CFLAGS=-O2 -I./src  -I./libs -I./libs/miniupnpc -I./libs/libnatpmp -I./libs/zlib -D NO_GZIP=1
+CFLAGS=-O2 -I./src  -I./libs -I./libs/miniupnpc -I./libs/libnatpmp -I./libs/zlib -D NO_GZIP=1 -Wno-deprecated-non-prototype
+
+#-D Z_SOLO=0
 CLI_LDFLAGS=-L/usr/lib -pthread
 GNB_ES_LDFLAGS=-L/usr/lib -pthread
 

Makefile.inc

@@ -43,6 +43,7 @@ CRYPTO_OBJS =                                    \
        ./libs/ed25519/verify.o                   \
        ./src/gnb_binary.o                        \
        ./src/crypto/arc4/arc4.o                  \
+       ./src/crypto/xor/xor.o                    \
        ./src/crypto/random/gnb_random.o
 
 

Makefile.linux

@@ -60,9 +60,8 @@ install:${GNB_CLI} ${GNB_CRYPTO} ${GNB_ES} ${GNB_CTL}
 	cp ${GNB_ES}     ./bin/
 
 
-clean:	
+clean:
 	find . -name "*.o" -exec rm -f {} \;
 	rm -f ${GNB_CLI} ${GNB_CRYPTO} ${GNB_ES} ${GNB_CTL}
 	rm -f core core.*
 	rm -f *.exe
-

README.md

@@ -1,5 +1,5 @@
 # OpenGNB
-The communication protocol of opengnb version 1.5.0 has been upgraded and is not compatible  
+The communication protocol of opengnb version 1.6.0 has been upgraded and is not compatible  
 [Chinese](/README_CN.md) [English](/README.md)
 
 *Note: Most of the content of this article is translated by Google translate from the Chinese version of the "OpenGNB User Manual", the content of this article is subject to the Chinese version.*

README_CN.md

@@ -1,6 +1,5 @@
 # OpenGNB
-opengnb 1.5.0 版本的通信协议已升级，不向后兼容  
-version 1.3.0.0  protocol version 1.2.0
+opengnb 1.6.0 版本的通信协议已升级，不向后兼容  
 
 [Chinese](/README_CN.md)  [English](/README.md)
 

examples/node_config_example/address.conf

@@ -1,6 +1,3 @@
 i|0|101.32.178.3|9001
-i|0|47.93.29.76|9001
-i|0|45.78.14.231|9001
-i|0|110.238.106.225|9001
-i|0|usa.homedns.net|9001
+
 

libs/zlib/adler32.c

@@ -7,8 +7,6 @@
 
 #include "zutil.h"
 
-local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
-
 #define BASE 65521U     /* largest prime smaller than 65536 */
 #define NMAX 5552
 /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
@@ -60,11 +58,7 @@ local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
 #endif
 
 /* ========================================================================= */
-uLong ZEXPORT adler32_z(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    z_size_t len;
-{
+uLong ZEXPORT adler32_z(uLong adler, const Bytef *buf, z_size_t len) {
     unsigned long sum2;
     unsigned n;
 
@@ -131,20 +125,12 @@ uLong ZEXPORT adler32_z(adler, buf, len)
 }
 
 /* ========================================================================= */
-uLong ZEXPORT adler32(adler, buf, len)
-    uLong adler;
-    const Bytef *buf;
-    uInt len;
-{
+uLong ZEXPORT adler32(uLong adler, const Bytef *buf, uInt len) {
     return adler32_z(adler, buf, len);
 }
 
 /* ========================================================================= */
-local uLong adler32_combine_(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
+local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2) {
     unsigned long sum1;
     unsigned long sum2;
     unsigned rem;
@@ -169,18 +155,10 @@ local uLong adler32_combine_(adler1, adler2, len2)
 }
 
 /* ========================================================================= */
-uLong ZEXPORT adler32_combine(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off_t len2;
-{
+uLong ZEXPORT adler32_combine(uLong adler1, uLong adler2, z_off_t len2) {
     return adler32_combine_(adler1, adler2, len2);
 }
 
-uLong ZEXPORT adler32_combine64(adler1, adler2, len2)
-    uLong adler1;
-    uLong adler2;
-    z_off64_t len2;
-{
+uLong ZEXPORT adler32_combine64(uLong adler1, uLong adler2, z_off64_t len2) {
     return adler32_combine_(adler1, adler2, len2);
 }