Skip to content
Open
Changes from all commits
Commits
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
48 changes: 36 additions & 12 deletions lib/tortoise311/connection.ex
Original file line number Diff line number Diff line change
Expand Up @@ -660,23 +660,47 @@ defmodule Tortoise311.Connection do
defp do_connect(server, %Connect{} = connect) do
%Transport{type: transport, host: host, port: port, opts: opts} = server

with {:ok, socket} <- transport.connect(host, port, opts, 10000),
:ok = transport.send(socket, Package.encode(connect)),
{:ok, packet} <- transport.recv(socket, 4, 5000) do
try do
case Package.decode(packet) do
%Connack{status: :accepted} = connack ->
case transport.connect(host, port, opts, 10000) do
{:ok, socket} ->
result =
with :ok <- transport.send(socket, Package.encode(connect)),
{:ok, packet} <- transport.recv(socket, 4, 5000) do
try do
case Package.decode(packet) do
%Connack{status: :accepted} = connack ->
{connack, socket}

%Connack{status: {:refused, _reason}} = connack ->
connack
end
catch
:error, {:badmatch, _unexpected} ->
violation = %{expected: Connect, got: packet}
{:error, {:protocol_violation, violation}}
end
end

case result do
{%Connack{} = connack, ^socket} ->
{connack, socket}

%Connack{status: {:refused, _reason}} = connack ->
:ok = transport.close(socket)
connack

{:error, :timeout} ->
:ok = transport.close(socket)
{:error, :connection_timeout}

Comment thread
FlorianGerhardt marked this conversation as resolved.
{:error, :closed} ->
:ok = transport.close(socket)
{:error, :server_closed_connection}

{:error, _reason} = error ->
:ok = transport.close(socket)
error
Comment on lines 687 to +701
Comment on lines +691 to +701
Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@copilot apply changes based on this feedback

end
catch
:error, {:badmatch, _unexpected} ->
violation = %{expected: Connect, got: packet}
{:error, {:protocol_violation, violation}}
end
else

{:error, :econnrefused} ->
{:error, {:connection_refused, host, port}}

Expand Down
Loading