From 2670d46aedbcf11ae3a40f99be6f5fa5712c1788 Mon Sep 17 00:00:00 2001
From: ithewei <hewei.it@bytedance.com>
Date: Fri, 24 Dec 2021 23:05:48 +0800
Subject: [PATCH] v1.2.4

---
 CMakeLists.txt  | 2 +-
 base/README.md  | 3 ++-
 base/hversion.h | 2 +-
 docs/PLAN.md    | 1 +
 event/hloop.h   | 7 +++----
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b16c4dfe..15e57dc24 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,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_STATIC "build static library" ON)
diff --git a/base/README.md b/base/README.md
index 24b5b9398..399dc5059 100644
--- a/base/README.md
+++ b/base/README.md
@@ -22,6 +22,7 @@
 ├── htime.h         时间
 ├── hversion.h      版本
 ├── list.h          链表
-└── queue.h         队列
+├── queue.h         队列
+└── rbtree.h        红黑树
 
 ```
diff --git a/base/hversion.h b/base/hversion.h
index d88954c03..63a7503d5 100644
--- a/base/hversion.h
+++ b/base/hversion.h
@@ -8,7 +8,7 @@ BEGIN_EXTERN_C
 
 #define HV_VERSION_MAJOR    1
 #define HV_VERSION_MINOR    2
-#define HV_VERSION_PATCH    3
+#define HV_VERSION_PATCH    4
 
 #define HV_VERSION_STRING   STRINGIFY(HV_VERSION_MAJOR) "." \
                             STRINGIFY(HV_VERSION_MINOR) "." \
diff --git a/docs/PLAN.md b/docs/PLAN.md
index b855953d2..c3475e5a4 100644
--- a/docs/PLAN.md
+++ b/docs/PLAN.md
@@ -17,6 +17,7 @@
 
 - mqtt client
 - redis client
+- async DNS
 - lua binding
 - js binding
 - hrpc = libhv + protobuf
diff --git a/event/hloop.h b/event/hloop.h
index 41159a0a2..3dada453c 100644
--- a/event/hloop.h
+++ b/event/hloop.h
@@ -418,20 +418,19 @@ HV_EXPORT void   hio_close_upstream(hio_t* io);
 
 // io1->upstream_io = io2;
 // 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);
 
 // @return io->upstream_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
 // @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));
 #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
 // @see examples/udp_proxy_server.c
 HV_EXPORT hio_t* hio_setup_udp_upstream(hio_t* io, const char* host, int port);