fix protocol

CMakeLists.txt

@@ -8,6 +8,8 @@ if("${TARS_CPP_COMMON}" STREQUAL "")
 
     set(TARS_CPP_COMMON "1")
 
+    include("${PROJECT_SOURCE_DIR}/cmake/GenVersion.cmake")
+
     include("${PROJECT_SOURCE_DIR}/cmake/Common.cmake")
 
     include("${PROJECT_SOURCE_DIR}/cmake/BuildTarsCpp.cmake")
@@ -18,6 +20,17 @@ if("${TARS_CPP_COMMON}" STREQUAL "")
 
 endif()
 
+set(major "")
+set(minor "")
+set(patch "")
+get_version(major minor patch)
+
+set(TARS_VERSION ${major}.${minor}.${patch})
+
+add_definitions(-DTARS_VERSION="${TARS_VERSION}")
+
+message("TARS_VERSION:              ${TARS_VERSION}")
+
 set(CLEAR_INCLUDE "clear-install.cmake")
 FILE(WRITE ${CLEAR_INCLUDE} "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_INSTALL_PREFIX}/include)\n")
 install(SCRIPT ${CLEAR_INCLUDE})

cmake/Common.cmake

@@ -1,6 +1,7 @@
 
-set(TARS_VERSION "2.4.16")
-add_definitions(-DTARS_VERSION="${TARS_VERSION}")
+
+# set(TARS_VERSION "2.4.16")
+# add_definitions(-DTARS_VERSION="${TARS_VERSION}")
 
 set(CMAKE_VERBOSE_MAKEFILE off)
 
@@ -88,7 +89,6 @@ ENDIF (UNIX)
 set(TARS2CPP "${CMAKE_BINARY_DIR}/bin/tars2cpp")
 
 message("----------------------------------------------------")
-
 message("CMAKE_SOURCE_DIR:          ${CMAKE_SOURCE_DIR}")
 message("CMAKE_BINARY_DIR:          ${CMAKE_BINARY_DIR}")
 message("PROJECT_SOURCE_DIR:        ${PROJECT_SOURCE_DIR}")

servant/protocol

@@ -1 +1 @@
-Subproject commit 6ee6d98e732ccb9ad20b67285cc4f5b54a783399
+Subproject commit bd9ae7a4baa81004e4343a5f24cb87f095d029d4

util/src/tc_socket.cpp

@@ -71,7 +71,7 @@ void TC_Socket::init(int fd, bool bOwner, int iDomain)
 
 void TC_Socket::createSocket(int iSocketType, int iDomain)
 {
-    assert(iSocketType == SOCK_STREAM || iSocketType == SOCK_DGRAM);
+    // assert(iSocketType == SOCK_STREAM || iSocketType == SOCK_DGRAM);
     close();
 
     _iDomain    = iDomain;