Skip to content

Fix receive method to enforce total timeout, preventing excessive wait #88

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.

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
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
12 changes: 7 additions & 5 deletions icmplib/sockets.py
Original file line number Diff line number Diff line change
Expand Up @@ -317,20 +317,22 @@ def receive(self, request=None, timeout=2):
if not self._sock:
raise SocketUnavailableError

self._sock.settimeout(timeout)
time_limit = time() + timeout
start_time = time()
time_limit = start_time + timeout

try:
while True:
remaining_time = time_limit - time()
if remaining_time <= 0:
raise socket.timeout

self._sock.settimeout(remaining_time)
response = self._sock.recvfrom(1024)
current_time = time()

packet = response[0]
source = response[1][0]

if current_time > time_limit:
raise socket.timeout

reply = self._parse_reply(
packet=packet,
source=source,
Expand Down