From dc7db6fc4bfddae4c2e35e661d57397fe3343d36 Mon Sep 17 00:00:00 2001
From: holmes1412 <liyingxin1412@gmail.com>
Date: Mon, 21 Jun 2021 14:00:38 +0800
Subject: [PATCH] fix conflict with master

---
 CMakeLists_Headers.txt      | 18 ++++++++----------
 src/protocol/CMakeLists.txt |  8 ++++++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/CMakeLists_Headers.txt b/CMakeLists_Headers.txt
index 8008699f..a7680d56 100644
--- a/CMakeLists_Headers.txt
+++ b/CMakeLists_Headers.txt
@@ -7,7 +7,6 @@ set(COMMON_KERNEL_HEADERS
 	src/kernel/SleepRequest.h
 	src/kernel/ExecRequest.h
 	src/kernel/IORequest.h
-	src/kernel/TransRequest.h
 	src/kernel/Executor.h
 	src/kernel/list.h
 	src/kernel/mpoller.h
@@ -37,7 +36,7 @@ else ()
 endif ()
 
 set(INCLUDE_HEADERS
-	src/algorithm/DNSRoutine.h
+	src/algorithm/DnsRoutine.h
 	src/algorithm/MapReduce.h
 	src/algorithm/MapReduce.inl
 	src/protocol/ProtocolMessage.h
@@ -55,15 +54,17 @@ set(INCLUDE_HEADERS
 	src/protocol/mysql_types.h
 	src/protocol/mysql_byteorder.h
 	src/protocol/SSLWrapper.h
-	src/protocol/WebSocketMessage.h
-	src/protocol/websocket_parser.h
+	src/protocol/dns_parser.h
+	src/protocol/DnsMessage.h
+	src/protocol/DnsUtil.h
 	src/server/WFServer.h
+	src/server/WFDnsServer.h
 	src/server/WFHttpServer.h
 	src/server/WFRedisServer.h
 	src/server/WFMySQLServer.h
 	src/client/WFMySQLConnection.h
-	src/client/WFWebSocketClient.h
-	src/manager/DNSCache.h
+	src/client/WFDnsClient.h
+	src/manager/DnsCache.h
 	src/manager/WFGlobal.h
 	src/manager/UpstreamManager.h
 	src/manager/RouteManager.h
@@ -71,7 +72,6 @@ set(INCLUDE_HEADERS
 	src/manager/WFFuture.h
 	src/manager/WFFacilities.h
 	src/manager/WFFacilities.inl
-	src/manager/WFCondition.h
 	src/util/EncodeStream.h
 	src/util/LRUCache.h
 	src/util/StringUtil.h
@@ -88,10 +88,8 @@ set(INCLUDE_HEADERS
 	src/factory/WFAlgoTaskFactory.inl
 	src/factory/Workflow.h
 	src/factory/WFOperator.h
-	src/factory/WFChannel.h
-	src/factory/WFChannel.inl
 	src/nameservice/WFNameService.h
-	src/nameservice/WFDNSResolver.h
+	src/nameservice/WFDnsResolver.h
 	src/nameservice/WFServiceGovernance.h
 	src/nameservice/UpstreamPolicies.h
 )
diff --git a/src/protocol/CMakeLists.txt b/src/protocol/CMakeLists.txt
index a92effc1..8830cc4a 100644
--- a/src/protocol/CMakeLists.txt
+++ b/src/protocol/CMakeLists.txt
@@ -2,17 +2,18 @@ cmake_minimum_required(VERSION 3.6)
 project(protocol)
 
 set(SRC
+	dns_parser.c
 	http_parser.c
 	redis_parser.c
 	mysql_stream.c
 	mysql_parser.c
 	mysql_byteorder.c
-	websocket_parser.c
+	DnsMessage.cc
+	DnsUtil.cc
 	MySQLMessage.cc
 	MySQLResult.cc
 	HttpMessage.cc
 	RedisMessage.cc
-	WebSocketMessage.cc
 	HttpUtil.cc
 	SSLWrapper.cc
 )
@@ -27,5 +28,8 @@ if (KAFKA STREQUAL "y")
 		KafkaResult.cc
 	)
 	add_library("protocol_kafka" OBJECT ${SRC})
+	set_property(SOURCE KafkaMessage.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
+	set_property(SOURCE KafkaDataTypes.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
+	set_property(SOURCE KafkaResult.cc APPEND PROPERTY COMPILE_OPTIONS "-fno-rtti")
 endif ()