1
0
ithewei 4 жил өмнө
parent
commit
2670d46aed

+ 1 - 1
CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.6)
 cmake_minimum_required(VERSION 3.6)
 
 
-project(hv VERSION 1.2.3)
+project(hv VERSION 1.2.4)
 
 
 option(BUILD_SHARED "build shared library" ON)
 option(BUILD_SHARED "build shared library" ON)
 option(BUILD_STATIC "build static library" ON)
 option(BUILD_STATIC "build static library" ON)

+ 2 - 1
base/README.md

@@ -22,6 +22,7 @@
 ├── htime.h         时间
 ├── htime.h         时间
 ├── hversion.h      版本
 ├── hversion.h      版本
 ├── list.h          链表
 ├── list.h          链表
-└── queue.h         队列
+├── queue.h         队列
+└── rbtree.h        红黑树
 
 
 ```
 ```

+ 1 - 1
base/hversion.h

@@ -8,7 +8,7 @@ BEGIN_EXTERN_C
 
 
 #define HV_VERSION_MAJOR    1
 #define HV_VERSION_MAJOR    1
 #define HV_VERSION_MINOR    2
 #define HV_VERSION_MINOR    2
-#define HV_VERSION_PATCH    3
+#define HV_VERSION_PATCH    4
 
 
 #define HV_VERSION_STRING   STRINGIFY(HV_VERSION_MAJOR) "." \
 #define HV_VERSION_STRING   STRINGIFY(HV_VERSION_MAJOR) "." \
                             STRINGIFY(HV_VERSION_MINOR) "." \
                             STRINGIFY(HV_VERSION_MINOR) "." \

+ 1 - 0
docs/PLAN.md

@@ -17,6 +17,7 @@
 
 
 - mqtt client
 - mqtt client
 - redis client
 - redis client
+- async DNS
 - lua binding
 - lua binding
 - js binding
 - js binding
 - hrpc = libhv + protobuf
 - hrpc = libhv + protobuf

+ 3 - 4
event/hloop.h

@@ -418,20 +418,19 @@ HV_EXPORT void   hio_close_upstream(hio_t* io);
 
 
 // io1->upstream_io = io2;
 // io1->upstream_io = io2;
 // io2->upstream_io = io1;
 // io2->upstream_io = io1;
-// hio_setcb_read(io1, hio_write_upstream);
-// hio_setcb_read(io2, hio_write_upstream);
+// @see examples/socks5_proxy_server.c
 HV_EXPORT void   hio_setup_upstream(hio_t* io1, hio_t* io2);
 HV_EXPORT void   hio_setup_upstream(hio_t* io1, hio_t* io2);
 
 
 // @return io->upstream_io
 // @return io->upstream_io
 HV_EXPORT hio_t* hio_get_upstream(hio_t* io);
 HV_EXPORT hio_t* hio_get_upstream(hio_t* io);
 
 
-// @tcp_upstream: hio_create -> hio_setup_upstream -> hio_setcb_close(hio_close_upstream) -> hconnect -> on_connect -> hio_read_upstream
+// @tcp_upstream: hio_create_socket -> hio_setup_upstream -> hio_connect -> on_connect -> hio_read_upstream
 // @return upstream_io
 // @return upstream_io
 // @see examples/tcp_proxy_server.c
 // @see examples/tcp_proxy_server.c
 HV_EXPORT hio_t* hio_setup_tcp_upstream(hio_t* io, const char* host, int port, int ssl DEFAULT(0));
 HV_EXPORT hio_t* hio_setup_tcp_upstream(hio_t* io, const char* host, int port, int ssl DEFAULT(0));
 #define hio_setup_ssl_upstream(io, host, port) hio_setup_tcp_upstream(io, host, port, 1)
 #define hio_setup_ssl_upstream(io, host, port) hio_setup_tcp_upstream(io, host, port, 1)
 
 
-// @udp_upstream: hio_create -> hio_setup_upstream -> hio_read_upstream
+// @udp_upstream: hio_create_socket -> hio_setup_upstream -> hio_read_upstream
 // @return upstream_io
 // @return upstream_io
 // @see examples/udp_proxy_server.c
 // @see examples/udp_proxy_server.c
 HV_EXPORT hio_t* hio_setup_udp_upstream(hio_t* io, const char* host, int port);
 HV_EXPORT hio_t* hio_setup_udp_upstream(hio_t* io, const char* host, int port);