Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove query type from SendHandshakeData event matcher #237

Merged
merged 2 commits into from
Aug 27, 2021
Merged

Remove query type from SendHandshakeData event matcher #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a13988
Remove query type from SendHandshakeData event matcher
jacobkeeler Aug 23, 2021
81398af
Remove expectation for NOTIFICATION query type
jacobkeeler Aug 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion modules/atf_logger.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion modules/protocol_handler/protocol_handler.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions modules/services/control_service.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down