Remove query type from SendHandshakeData event matcher (#237)

* Remove query type from SendHandshakeData event matcher Also change response to proper query type
smartdevicelink · Aug 27, 2021 · 4bb40a7 · 4bb40a7
1 parent 8370d4b
commit 4bb40a7
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 4 deletions.
diff --git a/modules/atf_logger.lua b/modules/atf_logger.lua
@@ -61,7 +61,6 @@ local function get_function_name(message)
 
   if message.frameType ~= ford_constants.FRAME_TYPE.CONTROL_FRAME then
     if message.serviceType == ford_constants.SERVICE_TYPE.CONTROL
-        and message.rpcType == ford_constants.BINARY_RPC_TYPE.NOTIFICATION
         and message.rpcFunctionId == ford_constants.BINARY_RPC_FUNCTION_ID.HANDSHAKE then
       return "SSL: Handshake"
     end

diff --git a/modules/protocol_handler/protocol_handler.lua b/modules/protocol_handler/protocol_handler.lua
@@ -142,7 +142,6 @@ end
 -- @treturn boolean True if binary data is handshake data
 local function isHandshakeBinaryData(serviceType, rpcType, rpcFunctionId, rpcJsonSize)
   return serviceType == constants.SERVICE_TYPE.CONTROL
-    and rpcType == constants.BINARY_RPC_TYPE.NOTIFICATION
     and rpcFunctionId == constants.BINARY_RPC_FUNCTION_ID.HANDSHAKE
     and rpcJsonSize == 0
 end

diff --git a/modules/services/control_service.lua b/modules/services/control_service.lua
@@ -33,7 +33,6 @@ local function performStartServiceHandshake(controlService)
         return data.frameType ~= constants.FRAME_TYPE.CONTROL_FRAME
           and data.serviceType == constants.SERVICE_TYPE.CONTROL
           and data.sessionId == controlService.session.sessionId.get()
-          and data.rpcType == constants.BINARY_RPC_TYPE.NOTIFICATION
           and data.rpcFunctionId == constants.BINARY_RPC_FUNCTION_ID.HANDSHAKE
       end
 
@@ -46,7 +45,7 @@ local function performStartServiceHandshake(controlService)
             frameInfo = 0,
             serviceType = constants.SERVICE_TYPE.CONTROL,
             encryption = false,
-            rpcType = constants.BINARY_RPC_TYPE.NOTIFICATION,
+            rpcType = constants.BINARY_RPC_TYPE.RESPONSE,
             rpcFunctionId = constants.BINARY_RPC_FUNCTION_ID.HANDSHAKE,
             rpcCorrelationId = data.rpcCorrelationId,
             binaryData = dataToSend