From: Bob Halley Date: Mon, 16 Jan 2017 15:18:18 +0000 (-0800) Subject: fix breakage from receive_udp cleanup X-Git-Tag: v1.16.0~56 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07271f3f7a3ab2915493e24fa90a875234c6aeef;p=thirdparty%2Fdnspython.git fix breakage from receive_udp cleanup --- diff --git a/dns/query.py b/dns/query.py index 49711106..daf36dea 100644 --- a/dns/query.py +++ b/dns/query.py @@ -242,7 +242,7 @@ def receive_udp(sock, destination, expiration=None, while 1: _wait_for_readable(sock, expiration) (wire, from_address) = sock.recvfrom(65535) - if _addresses_equal(socket.family, from_address, destination) or \ + if _addresses_equal(sock.family, from_address, destination) or \ (dns.inet.is_multicast(destination[0]) and from_address[1:] == destination[1:]): break @@ -301,7 +301,7 @@ def udp(q, where, timeout=None, port=53, af=None, source=None, source_port=0, if source is not None: s.bind(source) (_, sent_time) = send_udp(s, wire, destination, expiration) - (r, received_time) = receive_udp(s, destination, expiration, af, + (r, received_time) = receive_udp(s, destination, expiration, ignore_unexpected, one_rr_per_rrset, q.keyring, q.request_mac) finally: