diff options
Diffstat (limited to 'src/components/application_manager/src/mobile_message_handler.cc')
| -rw-r--r-- | src/components/application_manager/src/mobile_message_handler.cc | 97 |
1 files changed, 49 insertions, 48 deletions
diff --git a/src/components/application_manager/src/mobile_message_handler.cc b/src/components/application_manager/src/mobile_message_handler.cc index 09d9512b19..b635cb1f84 100644 --- a/src/components/application_manager/src/mobile_message_handler.cc +++ b/src/components/application_manager/src/mobile_message_handler.cc @@ -55,9 +55,9 @@ using protocol_handler::Extract; namespace { typedef std::map<MessageType, std::string> MessageTypeMap; -MessageTypeMap messageTypes = {std::make_pair(kRequest, "Request"), - std::make_pair(kResponse, "Response"), - std::make_pair(kNotification, "Notification")}; +MessageTypeMap message_types = {std::make_pair(kRequest, "Request"), + std::make_pair(kResponse, "Response"), + std::make_pair(kNotification, "Notification")}; } CREATE_LOGGERPTR_GLOBAL(logger_, "ApplicationManager") @@ -99,7 +99,7 @@ MobileMessageHandler::HandleIncomingMessageProtocol( LOG4CXX_DEBUG(logger_, "Incoming RPC_INFO: " << (out_message->connection_key() >> 16) << ", " - << messageTypes[out_message->type()] + << message_types[out_message->type()] << ", " << out_message->function_id() << ", " << out_message->correlation_id() << ", " << out_message->json_message()); @@ -111,7 +111,7 @@ MobileMessageHandler::HandleOutgoingMessageProtocol( const MobileMessage& message) { LOG4CXX_DEBUG(logger_, "Outgoing RPC_INFO: " << (message->connection_key() >> 16) - << ", " << messageTypes[message->type()] + << ", " << message_types[message->type()] << ", " << message->function_id() << ", " << message->correlation_id() << ", " << message->json_message()); @@ -200,19 +200,20 @@ protocol_handler::RawMessage* MobileMessageHandler::HandleOutgoingMessageProtocolV1( const MobileMessage& message) { LOG4CXX_AUTO_TRACE(logger_); - std::string messageString = message->json_message(); - if (messageString.length() == 0) { + std::string message_string = message->json_message(); + if (message_string.length() == 0) { LOG4CXX_WARN(logger_, "Drop ill-formed message from mobile"); return NULL; } - uint8_t* rawMessage = new uint8_t[messageString.length() + 1]; - memcpy(rawMessage, messageString.c_str(), messageString.length() + 1); + BinaryData raw_message(message_string.length() + 1); + memcpy(&raw_message[0], message_string.c_str(), message_string.length() + 1); - protocol_handler::RawMessage* result = new protocol_handler::RawMessage( - message->connection_key(), 1, rawMessage, messageString.length() + 1); - - delete[] rawMessage; + protocol_handler::RawMessage* result = + new protocol_handler::RawMessage(message->connection_key(), + 1, + &raw_message[0], + message_string.length() + 1); return result; } @@ -224,51 +225,52 @@ MobileMessageHandler::HandleOutgoingMessageProtocolV2( if (message->json_message().length() == 0) { LOG4CXX_ERROR(logger_, "json string is empty."); } - uint32_t jsonSize = message->json_message().length(); - uint32_t binarySize = 0; + uint32_t json_size = message->json_message().length(); + uint32_t binary_size = 0; if (message->has_binary_data()) { - binarySize = message->binary_data()->size(); + binary_size = message->binary_data()->size(); } - const size_t dataForSendingSize = - protocol_handler::PROTOCOL_HEADER_V2_SIZE + jsonSize + binarySize; - uint8_t* dataForSending = new uint8_t[dataForSendingSize]; + const size_t data_for_sending_size = + protocol_handler::PROTOCOL_HEADER_V2_SIZE + json_size + binary_size; + BinaryData data_for_sending(data_for_sending_size); uint8_t offset = 0; - uint8_t rpcTypeFlag = 0; + uint8_t rpc_type_flag = 0; switch (message->type()) { case application_manager::kRequest: - rpcTypeFlag = kRequest; + rpc_type_flag = kRequest; break; case application_manager::kResponse: - rpcTypeFlag = kResponse; + rpc_type_flag = kResponse; break; case application_manager::kNotification: - rpcTypeFlag = kNotification; + rpc_type_flag = kNotification; break; default: NOTREACHED(); break; } - uint32_t functionId = message->function_id(); - dataForSending[offset++] = ((rpcTypeFlag << 4) & 0xF0) | (functionId >> 24); - dataForSending[offset++] = functionId >> 16; - dataForSending[offset++] = functionId >> 8; - dataForSending[offset++] = functionId; + uint32_t function_id = message->function_id(); + data_for_sending[offset++] = + ((rpc_type_flag << 4) & 0xF0) | (function_id >> 24); + data_for_sending[offset++] = function_id >> 16; + data_for_sending[offset++] = function_id >> 8; + data_for_sending[offset++] = function_id; - uint32_t correlationId = message->correlation_id(); - dataForSending[offset++] = correlationId >> 24; - dataForSending[offset++] = correlationId >> 16; - dataForSending[offset++] = correlationId >> 8; - dataForSending[offset++] = correlationId; + uint32_t correlation_id = message->correlation_id(); + data_for_sending[offset++] = correlation_id >> 24; + data_for_sending[offset++] = correlation_id >> 16; + data_for_sending[offset++] = correlation_id >> 8; + data_for_sending[offset++] = correlation_id; - dataForSending[offset++] = jsonSize >> 24; - dataForSending[offset++] = jsonSize >> 16; - dataForSending[offset++] = jsonSize >> 8; - dataForSending[offset++] = jsonSize; + data_for_sending[offset++] = json_size >> 24; + data_for_sending[offset++] = json_size >> 16; + data_for_sending[offset++] = json_size >> 8; + data_for_sending[offset++] = json_size; - memcpy(dataForSending + offset, message->json_message().c_str(), jsonSize); + memcpy(&data_for_sending[offset], message->json_message().c_str(), json_size); // Default the service type to RPC Service uint8_t type = 0x07; @@ -276,22 +278,21 @@ MobileMessageHandler::HandleOutgoingMessageProtocolV2( if (message->has_binary_data()) { // Change the service type to Hybrid Service type = 0x0F; - const std::vector<uint8_t>& binaryData = *(message->binary_data()); - uint8_t* currentPointer = dataForSending + offset + jsonSize; - for (uint32_t i = 0; i < binarySize; ++i) { - currentPointer[i] = binaryData[i]; + const BinaryData& binary_data = *(message->binary_data()); + BinaryData::value_type* current_pointer = + &data_for_sending[offset + json_size]; + for (uint32_t i = 0; i < binary_size; ++i) { + current_pointer[i] = binary_data[i]; } } - protocol_handler::RawMessage* msgToProtocolHandler = + protocol_handler::RawMessage* msg_to_protocol_handler = new protocol_handler::RawMessage(message->connection_key(), message->protocol_version(), - dataForSending, - dataForSendingSize, + &data_for_sending[0], + data_for_sending_size, type); - delete[] dataForSending; - - return msgToProtocolHandler; + return msg_to_protocol_handler; } } // namespace application_manager |