diff --git a/common/src/tfe_ctrl_packet.cpp b/common/src/tfe_ctrl_packet.cpp index 67a1aae..1b470d1 100644 --- a/common/src/tfe_ctrl_packet.cpp +++ b/common/src/tfe_ctrl_packet.cpp @@ -410,21 +410,19 @@ void ctrl_packet_parser_dump(struct ctrl_pkt_parser *handler, void *logger) { if (handler) { - TFE_LOG_INFO(logger, "%s: tsync : %s", LOG_TAG_POLICY, handler->tsync); - TFE_LOG_INFO(logger, "%s: session_id : %lu", LOG_TAG_POLICY, handler->session_id); - TFE_LOG_INFO(logger, "%s: state : %s", LOG_TAG_POLICY, session_state_to_string(handler->state)); - TFE_LOG_INFO(logger, "%s: method : %s", LOG_TAG_POLICY, handler->method); - TFE_LOG_INFO(logger, "%s: tfe policy_id_num : %d", LOG_TAG_POLICY, handler->tfe_policy_id_num); - - for (int i = 0; i < handler->tfe_policy_id_num; i++) - { - TFE_LOG_INFO(logger, "%s: %d tfe policy_ids[%03lu]", LOG_TAG_POLICY, i, handler->tfe_policy_ids[i]); - } - TFE_LOG_INFO(logger, "%s: sce policy_id_num : %d", LOG_TAG_POLICY, handler->sce_policy_id_num); + TFE_LOG_INFO(logger, "%s: tsync: %s, session_id: %lu, state: %s, method: %s, tfe policy_id_num: %d, tfe policy_ids[%03lu], sce policy_id_num: %d", + LOG_TAG_POLICY, + handler->tsync, + handler->session_id, + session_state_to_string(handler->state), + handler->method, + handler->tfe_policy_id_num, + handler->tfe_policy_ids[0], + handler->sce_policy_id_num); for (int i = 0; i < handler->sce_policy_id_num; i++) { - TFE_LOG_INFO(logger, "%s: %d sce policy_ids[%03lu]", LOG_TAG_POLICY, i, handler->sce_policy_ids[i]); + TFE_LOG_INFO(logger, "%s: %d session %lu sce policy_ids[%03lu]", LOG_TAG_POLICY, i, handler->session_id, handler->sce_policy_ids[i]); } } } diff --git a/common/src/tfe_packet_io.cpp b/common/src/tfe_packet_io.cpp index 8744862..6d40c9f 100644 --- a/common/src/tfe_packet_io.cpp +++ b/common/src/tfe_packet_io.cpp @@ -1177,7 +1177,7 @@ static void set_passthrough_reason(struct tfe_cmsg *cmsg, char *reason) { uint8_t ssl_intercept_status = SSL_ACTION_PASSTHROUGH; - tfe_cmsg_set(cmsg, TFE_CMSG_SSL_PASSTHROUGH_REASON, (const unsigned char *)&reason, strlen(reason)); + tfe_cmsg_set(cmsg, TFE_CMSG_SSL_PASSTHROUGH_REASON, (const unsigned char *)reason, strlen(reason)); tfe_cmsg_set(cmsg, TFE_CMSG_SSL_INTERCEPT_STATE, (const unsigned char *)&ssl_intercept_status, (uint16_t)sizeof(ssl_intercept_status)); tfe_cmsg_set_flag(cmsg, TFE_CMSG_FLAG_USER0); } @@ -1816,7 +1816,7 @@ struct packet_io *packet_io_create(const char *profile, int thread_num, cpu_set_ { if (handle->config.bpf_hash_mode != 2 && handle->config.bpf_hash_mode != 4) { - TFE_LOG_ERROR(logger, "%s: under mutilthread mode, bpf_hash_mode[%d] invalid.", LOG_TAG_PKTIO, handle->config.bpf_hash_mode); + TFE_LOG_ERROR(logger, "%s: bpf_hash_mode[%d] invalid.", LOG_TAG_PKTIO, handle->config.bpf_hash_mode); goto error_out; }