Skip to content
Merged
Show file tree
Hide file tree
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
3 changes: 1 addition & 2 deletions lib/rex/socket/udp.rb
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ def timed_recvfrom(maxlen = 65535, timeout = def_read_timeout)

data, saddr = recvfrom_nonblock(maxlen)
[ data, sender_addr_info(saddr) ]
rescue ::Timeout::Error, ::Errno::ECONNREFUSED
rescue ::Timeout::Error, ::Errno::ECONNREFUSED, ::Errno::ECONNRESET
nil
end

Expand Down Expand Up @@ -203,4 +203,3 @@ def type?
end

end

12 changes: 12 additions & 0 deletions spec/rex/socket/udp_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -106,5 +106,17 @@ def make_client(port)
ensure
server&.close
end

[::Errno::ECONNREFUSED, ::Errno::ECONNRESET].each do |error_class|
it "returns nil when recvfrom_nonblock raises #{error_class}" do
server = make_server
allow(::IO).to receive(:select).with([server], nil, nil, 0.1).and_return([[server], [], []])
allow(server).to receive(:recvfrom_nonblock).and_raise(error_class)

expect(server.timed_recvfrom(65535, 0.1)).to be_nil
ensure
server&.close
end
end
end
end
Loading