refact: split connet to client and daemon

Signed-off-by: Nlifeng68 <lifeng68@huawei.com>

CMakeLists.txt

@@ -83,7 +83,7 @@ install(FILES ${CMAKE_BINARY_DIR}/conf/isulad.pc
   DESTINATION ${LIB_INSTALL_DIR_DEFAULT}/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ GROUP_WRITE)
 install(FILES src/libisula.h
 	DESTINATION include/isulad)
-install(FILES src/connect/client/isula_connect.h
+install(FILES src/client/connect/isula_connect.h
 	DESTINATION include/isulad)
 install(FILES src/container_def.h
 	DESTINATION include/isulad)

iSulad.spec

@@ -73,7 +73,7 @@ install -m 0755 ./src/isulad                  %{buildroot}/%{_bindir}/isulad
 
 install -d $RPM_BUILD_ROOT/%{_includedir}/isulad
 install -m 0644 ../src/libisula.h			%{buildroot}/%{_includedir}/isulad/libisula.h
-install -m 0644 ../src/connect/client/isula_connect.h	%{buildroot}/%{_includedir}/isulad/isula_connect.h
+install -m 0644 ../src/client/connect/isula_connect.h	%{buildroot}/%{_includedir}/isulad/isula_connect.h
 install -m 0644 ../src/container_def.h			%{buildroot}/%{_includedir}/isulad/container_def.h
 install -m 0644 ../src/cutils/types_def.h		%{buildroot}/%{_includedir}/isulad/types_def.h
 install -m 0644 ../src/cutils/error.h			%{buildroot}/%{_includedir}/isulad/error.h

src/CMakeLists.txt

@@ -25,9 +25,14 @@ else()
 endif()
 list(REMOVE_DUPLICATES CHECKED_INCLUDE_DIRS)
 
+add_subdirectory(tar)
+add_subdirectory(sha256)
+add_subdirectory(cutils)
+add_subdirectory(console)
+
 set(SHARED_INCS
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_SOURCE_DIR}/cutils 
+    ${CMAKE_CURRENT_SOURCE_DIR}/cutils
     ${CMAKE_CURRENT_SOURCE_DIR}/cutils/map
     ${CMAKE_CURRENT_SOURCE_DIR}/sha256
     ${CMAKE_CURRENT_SOURCE_DIR}/tar
@@ -36,11 +41,6 @@ set(SHARED_INCS
     ${CHECKED_INCLUDE_DIRS}
     )
 
-add_subdirectory(tar)
-add_subdirectory(sha256)
-add_subdirectory(cutils)
-add_subdirectory(console)
-
 set(SHARED_SRCS
     ${TAR_SRCS}
     ${SHA256_SRCS}
@@ -49,55 +49,38 @@ set(SHARED_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/container_def.c
     )
 
-# get all c and header files
-add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/connect)
-
 if (GRPC_CONNECTOR)
-    # GRPC
-    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/types CONNECT_API_TYPES)
-    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/services/containers CONNECT_API_CONTAINERS)
-    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/services/images CONNECT_API_IMAGES)
-    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/services/cri CONNECT_API_CRI)
-    set(CONNECT_API ${CONNECT_API_TYPES} ${CONNECT_API_CONTAINERS} ${CONNECT_API_IMAGES} ${CONNECT_API_CRI})
-
-    list(APPEND SHARED_INCS
-        ${CMAKE_BINARY_DIR}/grpc/src/api/types
-        ${CMAKE_BINARY_DIR}/grpc/src/api/services/containers
-        ${CMAKE_BINARY_DIR}/grpc/src/api/services/images
-        ${CMAKE_BINARY_DIR}/grpc/src/api/services/cri
-        ${CMAKE_CURRENT_SOURCE_DIR}/cpputils
-        )
-
-    add_subdirectory(cpputils)
-
-    list(APPEND SHARED_SRCS ${CPPUTILS_SRCS})
+	add_subdirectory(cpputils)
+	list(APPEND SHARED_SRCS ${CPPUTILS_SRCS})
+	list(APPEND SHARED_INCS ${CPPUTILS_INCS})
 else()
-    list(APPEND SHARED_INCS
-         ${CMAKE_CURRENT_SOURCE_DIR}/api/services/containers/rest
-         ${CMAKE_CURRENT_SOURCE_DIR}/api/services/images/rest
-         )
+        list(APPEND SHARED_INCS ${CMAKE_CURRENT_SOURCE_DIR}/api/services/containers/rest
+                ${CMAKE_CURRENT_SOURCE_DIR}/api/services/images/rest)
+
 endif()
 
-list(APPEND SHARED_SRCS ${CONNECT_API} ${CPPUTILS_SRCS})
+# get all c and header files
 list(REMOVE_DUPLICATES SHARED_INCS)
 list(REMOVE_DUPLICATES SHARED_SRCS)
 
 add_subdirectory(http)
 
 # ------ build libisula ------
+
+add_subdirectory(client)
 if (OPENSSL_VERIFY)
-    list(APPEND CONNECTOR ${CMAKE_CURRENT_SOURCE_DIR}/http/certificate.c)
+    list(APPEND CLIENT_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/http/certificate.c)
 endif()
 
 add_library(libisula ${LIBTYPE}
     ${CMAKE_CURRENT_SOURCE_DIR}/libisula.c
-    ${CONNECTOR}
+    ${CLIENT_SRCS}
     ${SHARED_SRCS}
     )
 
 target_include_directories(libisula PUBLIC
     ${SHARED_INCS}
-    ${CONNECTOR_INCS}
+    ${CLIENT_INCS}
     ${CMAKE_CURRENT_SOURCE_DIR}/http
     )
 
@@ -137,7 +120,7 @@ add_subdirectory(daemon)
 
 add_executable(isulad
     ${DAEMON_SRCS}
-    ${CONNECT_SOCKET} ${SHARED_SRCS}
+    ${SHARED_SRCS}
     ${ISULAD_SRCS}
     ${HTTP_SRCS}
     ${CMAKE_CURRENT_SOURCE_DIR}/libisulad.c

src/client/CMakeLists.txt

+# get current directory sources files
+
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} client_top_srcs)
+add_subdirectory(connect)
+
+set(local_client_srcs
+    ${client_top_srcs}
+    ${CLIENT_CONNECT_SRCS}
+    )
+
+set(local_client_incs
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CLIENT_CONNECT_INCS}
+    )
+
+set(CLIENT_SRCS
+    ${local_client_srcs}
+    PARENT_SCOPE
+    )
+set(CLIENT_INCS
+    ${local_client_incs}
+    PARENT_SCOPE
+    )

src/client/connect/CMakeLists.txt

+set(local_client_connect_srcs
+    ${CMAKE_CURRENT_SOURCE_DIR}/isula_connect.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/pack_config.c
+    )
+
+set(local_client_connect_incs ${CMAKE_CURRENT_SOURCE_DIR})
+
+add_subdirectory(grpc)
+
+if (GRPC_CONNECTOR)
+    list(APPEND local_client_connect_srcs ${CLIENT_GRPC_SRCS})
+    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/types CONNECT_API_TYPES)
+    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/services/containers CONNECT_API_CONTAINERS)
+    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/services/images CONNECT_API_IMAGES)
+    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/services/cri CONNECT_API_CRI)
+    set(CONNECT_API ${CONNECT_API_TYPES} ${CONNECT_API_CONTAINERS} ${CONNECT_API_IMAGES} ${CONNECT_API_CRI})
+    list(APPEND local_client_connect_srcs ${CONNECT_API})
+
+    list(APPEND local_client_connect_incs ${CMAKE_CURRENT_SOURCE_DIR}/grpc)
+    list(APPEND local_client_connect_incs
+	    ${CMAKE_BINARY_DIR}/grpc/src/api/types
+	    ${CMAKE_BINARY_DIR}/grpc/src/api/services/containers
+	    ${CMAKE_BINARY_DIR}/grpc/src/api/services/images
+	    ${CMAKE_BINARY_DIR}/grpc/src/api/services/cri
+        )
+
+else()
+    add_subdirectory(rest)
+    list(APPEND local_client_connect_srcs ${CLIENT_REST_SRCS})
+    list(APPEND local_client_connect_incs ${CMAKE_CURRENT_SOURCE_DIR}/rest)
+endif()
+
+set(CLIENT_CONNECT_SRCS ${local_client_connect_srcs} PARENT_SCOPE)
+set(CLIENT_CONNECT_INCS ${local_client_connect_incs} PARENT_SCOPE)

src/connect/CMakeLists.txt

-# get current directory sources files
-add_subdirectory(client)
-set(CONNECTOR ${CONNECT_CLIENT_SRCS} PARENT_SCOPE)
-set(CONNECTOR_INCS ${CONNECT_CLIENT_INCS} PARENT_SCOPE)
-
-add_subdirectory(service)
-set(CONNECT_SOCKET ${CONNECT_SERVICE_SRCS} PARENT_SCOPE)
-set(CONNECT_SOCKET_INCS ${CONNECT_SERVICE_INCS} PARENT_SCOPE)

src/connect/client/CMakeLists.txt

-set(client_srcs
-    ${CMAKE_CURRENT_SOURCE_DIR}/isula_connect.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/pack_config.c
-    )
-
-set(incs ${CMAKE_CURRENT_SOURCE_DIR})
-
-add_subdirectory(grpc)
-
-if (GRPC_CONNECTOR)
-    list(APPEND client_srcs ${CLIENT_GRPC_SRCS})
-    list(APPEND incs ${CMAKE_CURRENT_SOURCE_DIR}/grpc)
-else()
-    add_subdirectory(rest)
-    list(APPEND client_srcs ${CLIENT_REST_SRCS})
-    list(APPEND incs ${CMAKE_CURRENT_SOURCE_DIR}/rest)
-endif()
-
-set(CONNECT_CLIENT_SRCS ${client_srcs} PARENT_SCOPE)
-set(CONNECT_CLIENT_INCS ${incs} PARENT_SCOPE)

src/connect/service/CMakeLists.txt

-# get current directory sources files
-aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} service_srcs)
-
-set(incs ${CMAKE_CURRENT_SOURCE_DIR})
-
-if (GRPC_CONNECTOR)
-    add_subdirectory(grpc)
-    list(APPEND service_srcs ${SERVICE_GRPC_SRCS})
-    list(APPEND incs ${CMAKE_CURRENT_SOURCE_DIR}/grpc)
-else()
-    add_subdirectory(rest)
-    list(APPEND service_srcs ${SERVICE_REST_SRCS})
-    list(APPEND incs ${CMAKE_CURRENT_SOURCE_DIR}/rest)
-endif()
-
-set(CONNECT_SERVICE_SRCS ${service_srcs} PARENT_SCOPE)
-set(CONNECT_SERVICE_INCS ${incs} PARENT_SCOPE)

src/cpputils/CMakeLists.txt

@@ -5,3 +5,8 @@ set(CPPUTILS_SRCS
     ${local_cpputils_srcs}
     PARENT_SCOPE
     )
+set(CPPUTILS_INCS
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    PARENT_SCOPE
+    )
+

src/daemon/CMakeLists.txt

@@ -6,6 +6,7 @@ add_subdirectory(runtime)
 add_subdirectory(image)
 add_subdirectory(plugin)
 add_subdirectory(services)
+add_subdirectory(connect)
 
 set(local_daemon_srcs
     ${daemon_top_srcs}
@@ -14,6 +15,7 @@ set(local_daemon_srcs
     ${IMAGE_SRCS}
     ${PLUGIN_SRCS}
     ${SERVICES_SRCS}
+    ${SERVER_CONNECT_SRCS}
     )
 
 set(local_daemon_incs
@@ -23,6 +25,7 @@ set(local_daemon_incs
     ${IMAGE_INCS}
     ${PLUGIN_INCS}
     ${SERVICES_INCS}
+    ${SERVER_CONNECT_INCS}
     )
 
 set(DAEMON_SRCS

src/daemon/connect/CMakeLists.txt

+# get current directory sources files
+aux_source_directory(${CMAKE_CURRENT_SOURCE_DIR} local_server_connect_srcs)
+
+set(local_server_connect_incs ${CMAKE_CURRENT_SOURCE_DIR})
+
+if (GRPC_CONNECTOR)
+    add_subdirectory(grpc)
+    list(APPEND local_server_connect_srcs ${SERVICE_GRPC_SRCS})
+    list(APPEND local_server_connect_incs ${CMAKE_CURRENT_SOURCE_DIR}/grpc)
+else()
+    add_subdirectory(rest)
+    list(APPEND local_server_connect_srcs ${SERVICE_REST_SRCS})
+    list(APPEND local_server_connect_incs ${CMAKE_CURRENT_SOURCE_DIR}/rest)
+endif()
+
+if (GRPC_CONNECTOR)
+     # GRPC
+    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/types CONNECT_API_TYPES)
+    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/services/containers CONNECT_API_CONTAINERS)
+    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/services/images CONNECT_API_IMAGES)
+    aux_source_directory(${CMAKE_BINARY_DIR}/grpc/src/api/services/cri CONNECT_API_CRI)
+    set(CONNECT_API ${CONNECT_API_TYPES} ${CONNECT_API_CONTAINERS} ${CONNECT_API_IMAGES} ${CONNECT_API_CRI})
+    list(APPEND local_server_connect_srcs ${CONNECT_API})
+
+    list(APPEND local_server_connect_incs
+        ${CMAKE_BINARY_DIR}/grpc/src/api/types
+        ${CMAKE_BINARY_DIR}/grpc/src/api/services/containers
+        ${CMAKE_BINARY_DIR}/grpc/src/api/services/images
+        ${CMAKE_BINARY_DIR}/grpc/src/api/services/cri
+        )
+endif()
+
+
+set(SERVER_CONNECT_SRCS ${local_server_connect_srcs} PARENT_SCOPE)
+set(SERVER_CONNECT_INCS ${local_server_connect_incs} PARENT_SCOPE)