From 067caad399deb58eac9aefee85011ab9aff32f54 Mon Sep 17 00:00:00 2001 From: wujing Date: Mon, 28 Feb 2022 20:30:08 +0800 Subject: [PATCH 12/16] fix coding irregularities of entry module Signed-off-by: wujing --- .../connect/grpc/grpc_containers_service.cc | 31 +++++++++---------- .../connect/grpc/grpc_containers_service.h | 3 +- .../entry/connect/grpc/grpc_images_service.cc | 24 ++++++-------- .../entry/connect/grpc/grpc_images_service.h | 3 +- .../connect/grpc/grpc_server_tls_auth.cc | 5 ++- .../entry/connect/grpc/grpc_server_tls_auth.h | 5 ++- .../connect/grpc/grpc_volumes_service.cc | 12 +++---- src/daemon/entry/cri/cri_constants.cc | 4 +-- src/daemon/entry/cri/errors.cc | 2 +- src/daemon/entry/cri/errors.h | 2 +- src/daemon/entry/cri/network_plugin.cc | 9 +++--- src/daemon/entry/cri/request_cache.cc | 2 +- .../entry/cri/websocket/service/exec_serve.cc | 2 +- .../entry/cri/websocket/service/ws_server.h | 1 + 14 files changed, 48 insertions(+), 57 deletions(-) diff --git a/src/daemon/entry/connect/grpc/grpc_containers_service.cc b/src/daemon/entry/connect/grpc/grpc_containers_service.cc index 54529998..f3066af4 100644 --- a/src/daemon/entry/connect/grpc/grpc_containers_service.cc +++ b/src/daemon/entry/connect/grpc/grpc_containers_service.cc @@ -99,8 +99,8 @@ bool grpc_add_initial_metadata(void *context, const char *header, const char *va bool grpc_event_write_function(void *writer, void *data) { - struct isulad_events_format *event = (struct isulad_events_format *)data; - ServerWriter *gwriter = (ServerWriter *)writer; + auto *event = (struct isulad_events_format *)data; + auto *gwriter = (ServerWriter *)writer; Event gevent; if (event_to_grpc(event, &gevent) != 0) { return false; @@ -110,8 +110,8 @@ bool grpc_event_write_function(void *writer, void *data) bool grpc_copy_from_container_write_function(void *writer, void *data) { - struct isulad_copy_from_container_response *copy = (struct isulad_copy_from_container_response *)data; - ServerWriter *gwriter = (ServerWriter *)writer; + auto *copy = (struct isulad_copy_from_container_response *)data; + auto *gwriter = (ServerWriter *)writer; CopyFromContainerResponse gcopy; copy_from_container_response_to_grpc(copy, &gcopy); return gwriter->Write(gcopy); @@ -137,9 +137,8 @@ static bool copy_to_container_data_from_grpc(struct isulad_copy_to_container_dat bool grpc_copy_to_container_read_function(void *reader, void *data) { - struct isulad_copy_to_container_data *copy = (struct isulad_copy_to_container_data *)data; - ServerReaderWriter *stream = - (ServerReaderWriter *)reader; + auto *copy = (struct isulad_copy_to_container_data *)data; + auto *stream = (ServerReaderWriter *)reader; CopyToContainerRequest gcopy; if (!stream->Read(&gcopy)) { return false; @@ -287,7 +286,7 @@ ssize_t WriteStartResponseToRemoteClient(void *context, const void *data, size_t return 0; } - struct RemoteStartContext *ctx = (struct RemoteStartContext *)context; + auto *ctx = (struct RemoteStartContext *)context; RemoteStartResponse response; if (ctx->isStdout) { response.set_stdout((char *)data, len); @@ -306,7 +305,7 @@ int grpc_start_stream_close(void *context, char **err) { int ret = 0; (void)err; - struct RemoteStartContext *ctx = (struct RemoteStartContext *)context; + auto *ctx = (struct RemoteStartContext *)context; RemoteStartResponse finish_response; finish_response.set_finish(true); if (!ctx->stream->Write(finish_response)) { @@ -374,7 +373,7 @@ Status ContainerServiceImpl::RemoteStart(ServerContext *context, if (request.finish()) { break; } - std::string command = request.stdin(); + const std::string &command = request.stdin(); if (write(read_pipe_fd[1], (void *)(command.c_str()), command.length()) < 0) { ERROR("sub write over!"); break; @@ -593,7 +592,7 @@ ssize_t WriteExecStdoutResponseToRemoteClient(void *context, const void *data, s if (context == nullptr || data == nullptr || len == 0) { return 0; } - auto stream = static_cast *>(context); + auto *stream = static_cast *>(context); RemoteExecResponse response; response.set_stdout((char *)data, len); if (!stream->Write(response)) { @@ -608,7 +607,7 @@ ssize_t WriteExecStderrResponseToRemoteClient(void *context, const void *data, s if (context == nullptr || data == nullptr || len == 0) { return 0; } - auto stream = static_cast *>(context); + auto *stream = static_cast *>(context); RemoteExecResponse response; response.set_stderr((char *)data, len); if (!stream->Write(response)) { @@ -809,7 +808,7 @@ ssize_t WriteAttachResponseToRemoteClient(void *context, const void *data, size_ if (context == nullptr || data == nullptr || len == 0) { return 0; } - struct AttachContext *ctx = (struct AttachContext *)context; + auto *ctx = (struct AttachContext *)context; AttachResponse response; if (ctx->isStdout) { response.set_stdout((char *)data, len); @@ -828,7 +827,7 @@ int grpc_attach_stream_close(void *context, char **err) { int ret = 0; (void)err; - struct AttachContext *ctx = (struct AttachContext *)context; + auto *ctx = (struct AttachContext *)context; AttachResponse finish_response; finish_response.set_finish(true); if (!ctx->stream->Write(finish_response)) { @@ -1372,8 +1371,8 @@ int ContainerServiceImpl::logs_request_from_grpc(const LogsRequest *grequest, st bool grpc_logs_write_function(void *writer, void *data) { - logger_json_file *log = static_cast(data); - ServerWriter *gwriter = static_cast *>(writer); + auto *log = static_cast(data); + auto *gwriter = static_cast *>(writer); LogsResponse gresponse; log_to_grpc(log, &gresponse); return gwriter->Write(gresponse); diff --git a/src/daemon/entry/connect/grpc/grpc_containers_service.h b/src/daemon/entry/connect/grpc/grpc_containers_service.h index 4865c41e..d87e7e9f 100644 --- a/src/daemon/entry/connect/grpc/grpc_containers_service.h +++ b/src/daemon/entry/connect/grpc/grpc_containers_service.h @@ -112,11 +112,12 @@ private: gresponse->set_cc(ISULAD_ERR_MEMOUT); return; } + gresponse->set_cc(response->cc); + if (response->errmsg != nullptr) { gresponse->set_errmsg(response->errmsg); } - return; } int version_request_from_grpc(const VersionRequest *grequest, container_version_request **request); diff --git a/src/daemon/entry/connect/grpc/grpc_images_service.cc b/src/daemon/entry/connect/grpc/grpc_images_service.cc index 57a51ee0..dff07b39 100644 --- a/src/daemon/entry/connect/grpc/grpc_images_service.cc +++ b/src/daemon/entry/connect/grpc/grpc_images_service.cc @@ -29,8 +29,7 @@ int ImagesServiceImpl::image_list_request_from_grpc(const ListImagesRequest *gre image_list_images_request **request) { size_t len = 0; - image_list_images_request *tmpreq = - (image_list_images_request *)util_common_calloc_s(sizeof(image_list_images_request)); + auto *tmpreq = (image_list_images_request *)util_common_calloc_s(sizeof(image_list_images_request)); if (tmpreq == nullptr) { ERROR("Out of memory"); return -1; @@ -63,7 +62,7 @@ int ImagesServiceImpl::image_list_request_from_grpc(const ListImagesRequest *gre goto cleanup; } - for (auto &iter : grequest->filters()) { + for (const auto &iter : grequest->filters()) { tmpreq->filters->values[tmpreq->filters->len] = (json_map_string_bool *)util_common_calloc_s(sizeof(json_map_string_bool)); if (tmpreq->filters->values[tmpreq->filters->len] == nullptr) { @@ -71,7 +70,7 @@ int ImagesServiceImpl::image_list_request_from_grpc(const ListImagesRequest *gre goto cleanup; } if (append_json_map_string_bool(tmpreq->filters->values[tmpreq->filters->len], - iter.second.empty() ? "" : iter.second.c_str(), true)) { + iter.second.empty() ? "" : iter.second.c_str(), true) != 0) { free(tmpreq->filters->values[tmpreq->filters->len]); tmpreq->filters->values[tmpreq->filters->len] = nullptr; ERROR("Append failed"); @@ -129,15 +128,12 @@ void ImagesServiceImpl::image_list_response_to_grpc(image_list_images_response * target->set_size(response->images[i]->target->size); image->set_allocated_target(target); } - - return; } int ImagesServiceImpl::image_remove_request_from_grpc(const DeleteImageRequest *grequest, image_delete_image_request **request) { - image_delete_image_request *tmpreq = - (image_delete_image_request *)util_common_calloc_s(sizeof(image_delete_image_request)); + auto *tmpreq = (image_delete_image_request *)util_common_calloc_s(sizeof(image_delete_image_request)); if (tmpreq == nullptr) { ERROR("Out of memory"); return -1; @@ -154,7 +150,7 @@ int ImagesServiceImpl::image_remove_request_from_grpc(const DeleteImageRequest * int ImagesServiceImpl::image_tag_request_from_grpc(const TagImageRequest *grequest, image_tag_image_request **request) { - image_tag_image_request *tmpreq = (image_tag_image_request *)util_common_calloc_s(sizeof(image_tag_image_request)); + auto *tmpreq = (image_tag_image_request *)util_common_calloc_s(sizeof(image_tag_image_request)); if (tmpreq == nullptr) { ERROR("Out of memory"); return -1; @@ -193,8 +189,7 @@ int ImagesServiceImpl::image_import_request_from_grpc(const ImportRequest *grequ int ImagesServiceImpl::image_load_request_from_grpc(const LoadImageRequest *grequest, image_load_image_request **request) { - image_load_image_request *tmpreq = - (image_load_image_request *)util_common_calloc_s(sizeof(image_load_image_request)); + auto *tmpreq = (image_load_image_request *)util_common_calloc_s(sizeof(image_load_image_request)); if (tmpreq == nullptr) { ERROR("Out of memory"); return -1; @@ -216,7 +211,7 @@ int ImagesServiceImpl::image_load_request_from_grpc(const LoadImageRequest *greq int ImagesServiceImpl::inspect_request_from_grpc(const InspectImageRequest *grequest, image_inspect_request **request) { - image_inspect_request *tmpreq = (image_inspect_request *)util_common_calloc_s(sizeof(image_inspect_request)); + auto *tmpreq = (image_inspect_request *)util_common_calloc_s(sizeof(image_inspect_request)); if (tmpreq == nullptr) { ERROR("Out of memory"); return -1; @@ -352,7 +347,6 @@ void ImagesServiceImpl::import_response_to_grpc(const image_import_response *res if (response->errmsg != nullptr) { gresponse->set_errmsg(response->errmsg); } - return; } Status ImagesServiceImpl::Import(ServerContext *context, const ImportRequest *request, ImportResponse *reply) @@ -449,7 +443,7 @@ Status ImagesServiceImpl::Inspect(ServerContext *context, const InspectImageRequ int ImagesServiceImpl::image_login_request_from_grpc(const LoginRequest *grequest, image_login_request **request) { - image_login_request *tmpreq = (image_login_request *)util_common_calloc_s(sizeof(image_login_request)); + auto *tmpreq = (image_login_request *)util_common_calloc_s(sizeof(image_login_request)); if (tmpreq == nullptr) { ERROR("Out of memory"); return -1; @@ -474,7 +468,7 @@ int ImagesServiceImpl::image_login_request_from_grpc(const LoginRequest *greques int ImagesServiceImpl::image_logout_request_from_grpc(const LogoutRequest *grequest, image_logout_request **request) { - image_logout_request *tmpreq = (image_logout_request *)util_common_calloc_s(sizeof(image_logout_request)); + auto *tmpreq = (image_logout_request *)util_common_calloc_s(sizeof(image_logout_request)); if (tmpreq == nullptr) { ERROR("Out of memory"); return -1; diff --git a/src/daemon/entry/connect/grpc/grpc_images_service.h b/src/daemon/entry/connect/grpc/grpc_images_service.h index 92334b52..8ad486fd 100644 --- a/src/daemon/entry/connect/grpc/grpc_images_service.h +++ b/src/daemon/entry/connect/grpc/grpc_images_service.h @@ -66,11 +66,12 @@ private: gresponse->set_cc(ISULAD_ERR_MEMOUT); return; } + gresponse->set_cc(response->cc); + if (response->errmsg != nullptr) { gresponse->set_errmsg(response->errmsg); } - return; } int image_list_request_from_grpc(const ListImagesRequest *grequest, image_list_images_request **request); diff --git a/src/daemon/entry/connect/grpc/grpc_server_tls_auth.cc b/src/daemon/entry/connect/grpc/grpc_server_tls_auth.cc index 1bb1b928..6e958e23 100644 --- a/src/daemon/entry/connect/grpc/grpc_server_tls_auth.cc +++ b/src/daemon/entry/connect/grpc/grpc_server_tls_auth.cc @@ -20,12 +20,12 @@ namespace AuthorizationPluginConfig { std::string auth_plugin = ""; -}; +} // namespace AuthorizationPluginConfig namespace GrpcServerTlsAuth { Status auth(ServerContext *context, std::string action) { - const std::multimap init_metadata = context->client_metadata(); + const std::multimap &init_metadata = context->client_metadata(); auto tls_mode_kv = init_metadata.find("tls_mode"); if (tls_mode_kv == init_metadata.end()) { return Status(StatusCode::UNKNOWN, "unknown error"); @@ -58,4 +58,3 @@ Status auth(ServerContext *context, std::string action) return Status::OK; } } // namespace GrpcServerTlsAuth - diff --git a/src/daemon/entry/connect/grpc/grpc_server_tls_auth.h b/src/daemon/entry/connect/grpc/grpc_server_tls_auth.h index f490ef86..ee66529f 100644 --- a/src/daemon/entry/connect/grpc/grpc_server_tls_auth.h +++ b/src/daemon/entry/connect/grpc/grpc_server_tls_auth.h @@ -24,11 +24,10 @@ using grpc::StatusCode; namespace AuthorizationPluginConfig { extern std::string auth_plugin; -}; +}; // namespace AuthorizationPluginConfig namespace GrpcServerTlsAuth { Status auth(ServerContext *context, std::string action); -}; +}; // namespace GrpcServerTlsAuth #endif // DAEMON_ENTRY_CONNECT_GRPC_GRPC_SERVER_TLS_AUTH_H - diff --git a/src/daemon/entry/connect/grpc/grpc_volumes_service.cc b/src/daemon/entry/connect/grpc/grpc_volumes_service.cc index fcc7210e..8b090486 100644 --- a/src/daemon/entry/connect/grpc/grpc_volumes_service.cc +++ b/src/daemon/entry/connect/grpc/grpc_volumes_service.cc @@ -28,8 +28,7 @@ int VolumeServiceImpl::volume_list_request_from_grpc(const ListVolumeRequest *grequest, volume_list_volume_request **request) { - volume_list_volume_request *tmpreq = - static_cast(util_common_calloc_s(sizeof(volume_list_volume_request))); + auto *tmpreq = static_cast(util_common_calloc_s(sizeof(volume_list_volume_request))); if (tmpreq == nullptr) { ERROR("Out of memory"); return -1; @@ -53,7 +52,7 @@ int VolumeServiceImpl::volume_list_response_to_grpc(volume_list_volume_response } for (size_t i {}; i < response->volumes_len; i++) { - auto volume = gresponse->add_volumes(); + auto *volume = gresponse->add_volumes(); if (response->volumes[i]->driver != nullptr) { volume->set_driver(response->volumes[i]->driver); } @@ -68,7 +67,7 @@ int VolumeServiceImpl::volume_list_response_to_grpc(volume_list_volume_response int VolumeServiceImpl::volume_remove_request_from_grpc(const RemoveVolumeRequest *grequest, volume_remove_volume_request **request) { - volume_remove_volume_request *tmpreq = + auto *tmpreq = static_cast(util_common_calloc_s(sizeof(volume_remove_volume_request))); if (tmpreq == nullptr) { ERROR("Out of memory"); @@ -86,7 +85,7 @@ int VolumeServiceImpl::volume_remove_request_from_grpc(const RemoveVolumeRequest int VolumeServiceImpl::volume_prune_request_from_grpc(const PruneVolumeRequest *grequest, volume_prune_volume_request **request) { - volume_prune_volume_request *tmpreq = + auto *tmpreq = static_cast(util_common_calloc_s(sizeof(volume_prune_volume_request))); if (tmpreq == nullptr) { ERROR("Out of memory"); @@ -117,14 +116,13 @@ int VolumeServiceImpl::volume_prune_response_to_grpc(volume_prune_volume_respons return 0; } - Status VolumeServiceImpl::List(ServerContext *context, const ListVolumeRequest *request, ListVolumeResponse *reply) { auto status = GrpcServerTlsAuth::auth(context, "volume_list"); if (!status.ok()) { return status; } - auto cb = get_service_executor(); + auto *cb = get_service_executor(); if (cb == nullptr || cb->volume.list == nullptr) { return Status(StatusCode::UNIMPLEMENTED, "Unimplemented callback"); } diff --git a/src/daemon/entry/cri/cri_constants.cc b/src/daemon/entry/cri/cri_constants.cc index 265e38e5..86cc2bb6 100644 --- a/src/daemon/entry/cri/cri_constants.cc +++ b/src/daemon/entry/cri/cri_constants.cc @@ -12,7 +12,7 @@ * Create: 2020-12-21 * Description: provide cri constants definition *********************************************************************************/ -# include "cri_constants.h" +#include "cri_constants.h" namespace CRI { const std::string Constants::namespaceModeHost { "host" }; @@ -22,4 +22,4 @@ const std::string Constants::kubePrefix { "k8s" }; const std::string Constants::sandboxContainerName { "POD" }; const std::string Constants::kubeAPIVersion { "0.1.0" }; const std::string Constants::iSulaRuntimeName { "iSulad" }; -} \ No newline at end of file +} // namespace CRI diff --git a/src/daemon/entry/cri/errors.cc b/src/daemon/entry/cri/errors.cc index 0dbee4a7..a80ca433 100644 --- a/src/daemon/entry/cri/errors.cc +++ b/src/daemon/entry/cri/errors.cc @@ -90,7 +90,7 @@ void Errors::SetAggregate(const std::vector &msgs) std::string result; size_t size = msgs.size(); - if (!size) { + if (size == 0) { return; } diff --git a/src/daemon/entry/cri/errors.h b/src/daemon/entry/cri/errors.h index 81e82ad2..193a9523 100644 --- a/src/daemon/entry/cri/errors.h +++ b/src/daemon/entry/cri/errors.h @@ -44,7 +44,7 @@ public: private: std::string m_message; - int m_code; + int m_code{0}; }; #endif // DAEMON_ENTRY_CRI_ERRORS_H diff --git a/src/daemon/entry/cri/network_plugin.cc b/src/daemon/entry/cri/network_plugin.cc index 2fa6ac26..00be975e 100644 --- a/src/daemon/entry/cri/network_plugin.cc +++ b/src/daemon/entry/cri/network_plugin.cc @@ -27,7 +27,7 @@ #include "cri_runtime_service.h" namespace Network { -static void run_modprobe(void *args) +static void run_modprobe(void * /*args*/) { execlp("modprobe", "modprobe", "br-netfilter", nullptr); } @@ -190,7 +190,7 @@ void InitNetworkPlugin(std::vector> *plugins, std std::string hairpinMode, std::string nonMasqueradeCIDR, int mtu, std::shared_ptr *result, Errors &err) { - std::string allErr { "" }; + std::string allErr; if (networkPluginName.empty()) { DEBUG("network plugin name empty"); @@ -233,7 +233,6 @@ void InitNetworkPlugin(std::vector> *plugins, std } pluginMap.clear(); - return; } const std::string &NetworkPluginConf::GetDockershimRootDirectory() const @@ -485,8 +484,8 @@ unlock: Unlock(fullName, error); } -void NoopNetworkPlugin::Init(const std::string &hairpinMode, - const std::string &nonMasqueradeCIDR, int mtu, Errors &error) +void NoopNetworkPlugin::Init(const std::string &hairpinMode, const std::string &nonMasqueradeCIDR, int mtu, + Errors &error) { char *stderr_str { nullptr }; char *stdout_str { nullptr }; diff --git a/src/daemon/entry/cri/request_cache.cc b/src/daemon/entry/cri/request_cache.cc index 312a8071..36a2f3dc 100644 --- a/src/daemon/entry/cri/request_cache.cc +++ b/src/daemon/entry/cri/request_cache.cc @@ -94,7 +94,7 @@ std::string RequestCache::UniqueToken() for (int i {}; i < maxTries; ++i) { char rawToken[rawTokenSize + 1]; (void)memset(rawToken, 0, sizeof(rawToken)); - if (util_generate_random_str(rawToken, (size_t)rawTokenSize)) { + if (util_generate_random_str(rawToken, (size_t)rawTokenSize) != 0) { ERROR("Generate rawToken failed"); continue; } diff --git a/src/daemon/entry/cri/websocket/service/exec_serve.cc b/src/daemon/entry/cri/websocket/service/exec_serve.cc index bf41cb74..7b7d36b5 100644 --- a/src/daemon/entry/cri/websocket/service/exec_serve.cc +++ b/src/daemon/entry/cri/websocket/service/exec_serve.cc @@ -88,7 +88,7 @@ int ExecServe::ExecuteStreamCommand(SessionData *lwsCtx, void *request) int ret = cb->container.exec(m_request, &m_response, m_request->attach_stdin ? lwsCtx->pipes.at(0) : -1, m_request->attach_stdout ? &StdoutstringWriter : nullptr, m_request->attach_stderr ? &StderrstringWriter : nullptr); - + if (ret != 0) { std::string message; if (m_response != nullptr && m_response->errmsg != nullptr) { diff --git a/src/daemon/entry/cri/websocket/service/ws_server.h b/src/daemon/entry/cri/websocket/service/ws_server.h index 2d3bb4a7..4af54067 100644 --- a/src/daemon/entry/cri/websocket/service/ws_server.h +++ b/src/daemon/entry/cri/websocket/service/ws_server.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include "route_callback_register.h" #include "url.h" -- 2.20.1