diff options
| author | Bob Halley <halley@dnspython.org> | 2021-10-17 13:36:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-17 13:36:20 -0700 |
| commit | eeb566672f29c6f3e73fea0d38554fe58bbaaa28 (patch) | |
| tree | 8cbb6618ee7d77c4e948f0d9260a17b485610dd9 | |
| parent | fd830f71579f8337d0f9a0c3c40e7b5683957cc4 (diff) | |
| parent | 4eb5dc951ebe26f0b8b909d241607a19ac49fdc6 (diff) | |
| download | dnspython-eeb566672f29c6f3e73fea0d38554fe58bbaaa28.tar.gz | |
Merge pull request #712 from bwelling/make-query-id
Add id to dns.message.make_query().
| -rw-r--r-- | dns/message.py | 8 | ||||
| -rw-r--r-- | tests/test_message.py | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/dns/message.py b/dns/message.py index baa1116..75faee2 100644 --- a/dns/message.py +++ b/dns/message.py @@ -1383,7 +1383,8 @@ def from_file(f, idna_codec=None, one_rr_per_rrset=False): def make_query(qname, rdtype, rdclass=dns.rdataclass.IN, use_edns=None, want_dnssec=False, ednsflags=None, payload=None, - request_payload=None, options=None, idna_codec=None): + request_payload=None, options=None, idna_codec=None, + id=None): """Make a query message. The query name, type, and class may all be specified either @@ -1425,6 +1426,9 @@ def make_query(qname, rdtype, rdclass=dns.rdataclass.IN, use_edns=None, encoder/decoder. If ``None``, the default IDNA 2003 encoder/decoder is used. + *id*, an ``int`` or ``None``, the desired query id. The default is + ``None``, which generates a random query id. + Returns a ``dns.message.QueryMessage`` """ @@ -1432,7 +1436,7 @@ def make_query(qname, rdtype, rdclass=dns.rdataclass.IN, use_edns=None, qname = dns.name.from_text(qname, idna_codec=idna_codec) rdtype = dns.rdatatype.RdataType.make(rdtype) rdclass = dns.rdataclass.RdataClass.make(rdclass) - m = QueryMessage() + m = QueryMessage(id=id) m.flags |= dns.flags.RD m.find_rrset(m.question, qname, rdclass, rdtype, create=True, force_unique=True) diff --git a/tests/test_message.py b/tests/test_message.py index 19738e6..8fcc674 100644 --- a/tests/test_message.py +++ b/tests/test_message.py @@ -437,6 +437,10 @@ class MessageTestCase(unittest.TestCase): self.assertEqual(q.payload, 4096) self.assertEqual(q.options, ()) + def test_setting_id(self): + q = dns.message.make_query('www.dnspython.org.', 'a', id=12345) + self.assertEqual(q.id, 12345) + def test_generic_message_class(self): q1 = dns.message.Message(id=1) q1.set_opcode(dns.opcode.NOTIFY) |