colin/hickory-dns
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change internal usage from set_rr_type to set_record_type

Browse Source
This commit is contained in:
Benjamin Fry 2023-10-26 17:10:15 -07:00
parent c0c2b2fa89
commit e2c82f6991
15 changed files with 117 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/proto/src/op/edns.rs
View File

@ -186,7 +186,7 @@ impl<'a> From<&'a Edns> for Record {
let mut record = Self::new();
record.set_name(Name::root());
record.set_rr_type(RecordType::OPT);
record.set_record_type(RecordType::OPT);
record.set_dns_class(DNSClass::for_opt(value.max_payload()));
// rebuild the TTL field

20
crates/proto/src/rr/dnssec/signer.rs
View File

@ -546,7 +546,7 @@ impl MessageFinalizer for SigSigner {
let expiration_time: u32 = current_time + (5 * 60); // +5 minutes in seconds
sig0.set_rr_type(RecordType::SIG);
sig0.set_record_type(RecordType::SIG);
let pre_sig0 = SIG::new(
// type covered in SIG(0) is 0 which is what makes this SIG0 vs a standard SIG
RecordType::ZERO,
@ -695,7 +695,7 @@ mod tests {
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"a.iana-servers.net.",
@ -706,7 +706,7 @@ mod tests {
Record::new()
.set_name(origin)
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"b.iana-servers.net.",
@ -832,7 +832,7 @@ MC0CAQACBQC+L6pNAgMBAAECBQCYj0ZNAgMA9CsCAwDHZwICeEUCAnE/AgMA3u0=
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"a.iana-servers.net.",
@ -843,7 +843,7 @@ MC0CAQACBQC+L6pNAgMBAAECBQCYj0ZNAgMA9CsCAwDHZwICeEUCAnE/AgMA3u0=
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"b.iana-servers.net.",
@ -860,7 +860,7 @@ MC0CAQACBQC+L6pNAgMBAAECBQCYj0ZNAgMA9CsCAwDHZwICeEUCAnE/AgMA3u0=
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::CNAME)
.set_record_type(RecordType::CNAME)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::CNAME(CNAME(
Name::parse("a.iana-servers.net.", None).unwrap(),
@ -869,7 +869,7 @@ MC0CAQACBQC+L6pNAgMBAAECBQCYj0ZNAgMA9CsCAwDHZwICeEUCAnE/AgMA3u0=
Record::new()
.set_name(Name::parse("www.example.com.", None).unwrap())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"a.iana-servers.net.",
@ -880,7 +880,7 @@ MC0CAQACBQC+L6pNAgMBAAECBQCYj0ZNAgMA9CsCAwDHZwICeEUCAnE/AgMA3u0=
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::CH)
.set_data(Some(RData::NS(NS(Name::parse(
"a.iana-servers.net.",
@ -891,7 +891,7 @@ MC0CAQACBQC+L6pNAgMBAAECBQCYj0ZNAgMA9CsCAwDHZwICeEUCAnE/AgMA3u0=
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"a.iana-servers.net.",
@ -902,7 +902,7 @@ MC0CAQACBQC+L6pNAgMBAAECBQCYj0ZNAgMA9CsCAwDHZwICeEUCAnE/AgMA3u0=
Record::new()
.set_name(origin)
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"b.iana-servers.net.",

2
crates/proto/src/rr/resource.rs
View File

@ -860,7 +860,7 @@ mod tests {
let mut record = Record::new();
record
.set_name(Name::from_str("www.example.com").unwrap())
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_ttl(5)
.set_data(Some(RData::A(A::new(192, 168, 0, 1))));

34
crates/proto/src/rr/rr_set.rs
View File

@ -629,7 +629,7 @@ mod test {
let insert = Record::new()
.set_name(name.clone())
.set_ttl(86400)
.set_rr_type(record_type)
.set_record_type(record_type)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 24).into())))
.clone();
@ -647,7 +647,7 @@ mod test {
let insert1 = Record::new()
.set_name(name)
.set_ttl(86400)
.set_rr_type(record_type)
.set_record_type(record_type)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 25).into())))
.clone();
@ -667,7 +667,7 @@ mod test {
let insert = Record::new()
.set_name(name.clone())
.set_ttl(3600)
.set_rr_type(RecordType::SOA)
.set_record_type(RecordType::SOA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::SOA(SOA::new(
Name::from_str("sns.dns.icann.org.").unwrap(),
@ -682,7 +682,7 @@ mod test {
let same_serial = Record::new()
.set_name(name.clone())
.set_ttl(3600)
.set_rr_type(RecordType::SOA)
.set_record_type(RecordType::SOA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::SOA(SOA::new(
Name::from_str("sns.dns.icann.net.").unwrap(),
@ -697,7 +697,7 @@ mod test {
let new_serial = Record::new()
.set_name(name)
.set_ttl(3600)
.set_rr_type(RecordType::SOA)
.set_record_type(RecordType::SOA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::SOA(SOA::new(
Name::from_str("sns.dns.icann.net.").unwrap(),
@ -744,14 +744,14 @@ mod test {
let insert = Record::new()
.set_name(name.clone())
.set_ttl(3600)
.set_rr_type(RecordType::CNAME)
.set_record_type(RecordType::CNAME)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::CNAME(CNAME(cname))))
.clone();
let new_record = Record::new()
.set_name(name)
.set_ttl(3600)
.set_rr_type(RecordType::CNAME)
.set_record_type(RecordType::CNAME)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::CNAME(CNAME(new_cname))))
.clone();
@ -776,14 +776,14 @@ mod test {
let insert = Record::new()
.set_name(name.clone())
.set_ttl(86400)
.set_rr_type(record_type)
.set_record_type(record_type)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 24).into())))
.clone();
let insert1 = Record::new()
.set_name(name)
.set_ttl(86400)
.set_rr_type(record_type)
.set_record_type(record_type)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 25).into())))
.clone();
@ -807,7 +807,7 @@ mod test {
let insert = Record::new()
.set_name(name)
.set_ttl(3600)
.set_rr_type(RecordType::SOA)
.set_record_type(RecordType::SOA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::SOA(SOA::new(
Name::from_str("sns.dns.icann.org.").unwrap(),
@ -834,7 +834,7 @@ mod test {
let ns1 = Record::new()
.set_name(name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(
Name::from_str("a.iana-servers.net.").unwrap()
@ -843,7 +843,7 @@ mod test {
let ns2 = Record::new()
.set_name(name)
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(
Name::from_str("b.iana-servers.net.").unwrap()
@ -921,28 +921,28 @@ mod test {
let rrsig_rsa = Record::new()
.set_name(name.clone())
.set_ttl(3600)
.set_rr_type(RecordType::RRSIG)
.set_record_type(RecordType::RRSIG)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::DNSSEC(DNSSECRData::RRSIG(rsasha256))))
.clone();
let rrsig_ecp256 = Record::new()
.set_name(name.clone())
.set_ttl(3600)
.set_rr_type(RecordType::RRSIG)
.set_record_type(RecordType::RRSIG)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::DNSSEC(DNSSECRData::RRSIG(ecp256))))
.clone();
let rrsig_ecp384 = Record::new()
.set_name(name.clone())
.set_ttl(3600)
.set_rr_type(RecordType::RRSIG)
.set_record_type(RecordType::RRSIG)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::DNSSEC(DNSSECRData::RRSIG(ecp384))))
.clone();
let rrsig_ed25519 = Record::new()
.set_name(name.clone())
.set_ttl(3600)
.set_rr_type(RecordType::RRSIG)
.set_record_type(RecordType::RRSIG)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::DNSSEC(DNSSECRData::RRSIG(ed25519))))
.clone();
@ -950,7 +950,7 @@ mod test {
let a = Record::new()
.set_name(name)
.set_ttl(3600)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 24).into())))
.clone();

2
crates/proto/src/serialize/txt/zone.rs
View File

@ -376,7 +376,7 @@ impl<'a> Parser<'a> {
record.set_name(current_name.clone().ok_or_else(|| {
ParseError::from(ParseErrorKind::Message("record name not specified"))
})?);
record.set_rr_type(rtype);
record.set_record_type(rtype);
record.set_dns_class(class);
// slightly annoying, need to grab the TTL, then move rdata into the record,

12
crates/proto/src/xfer/dns_multiplexer.rs
View File

@ -551,7 +551,7 @@ mod test {
Record::new()
.set_name(name)
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 34).into())))
.clone(),
@ -583,7 +583,7 @@ mod test {
let soa = Record::new()
.set_name(origin.clone())
.set_ttl(3600)
.set_rr_type(RecordType::SOA)
.set_record_type(RecordType::SOA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::SOA(SOA::new(
Name::parse("sns.dns.icann.org.", None).unwrap(),
@ -601,7 +601,7 @@ mod test {
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"a.iana-servers.net.",
@ -612,7 +612,7 @@ mod test {
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"b.iana-servers.net.",
@ -623,14 +623,14 @@ mod test {
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(Ipv4Addr::new(93, 184, 216, 34).into())))
.clone(),
Record::new()
.set_name(origin)
.set_ttl(86400)
.set_rr_type(RecordType::AAAA)
.set_record_type(RecordType::AAAA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::AAAA(
Ipv6Addr::new(0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946).into(),

2
crates/server/src/store/sqlite/authority.rs
View File

@ -185,7 +185,7 @@ impl SqliteAuthority {
info!("persisting zone to journal at SOA.serial: {}", serial);
// TODO: THIS NEEDS TO BE IN A TRANSACTION!!!
journal.insert_record(serial, Record::new().set_rr_type(RecordType::AXFR))?;
journal.insert_record(serial, Record::new().set_record_type(RecordType::AXFR))?;
for rr_set in self.in_memory.records().await.values() {
// TODO: should we preserve rr_sets or not?

2
crates/server/tests/authority_battery/dynamic_update.rs
View File

@ -726,7 +726,7 @@ pub fn test_delete_all<A: Authority<Lookup = AuthLookup>>(mut authority: A, keys
assert!(update_authority(message, key, &mut authority).expect("create failed"));
let mut record = record.clone();
record.set_rr_type(RecordType::AAAA);
record.set_record_type(RecordType::AAAA);
record.set_data(Some(RData::AAAA(AAAA::new(1, 2, 3, 4, 5, 6, 7, 8))));
let message = update_message::create(
record.clone().into(),

2
crates/server/tests/sqlite_tests.rs
View File

@ -34,7 +34,7 @@ fn create_test_journal() -> (Record, Journal) {
let mut record = Record::new();
record.set_name(www);
record.set_rr_type(RecordType::A);
record.set_record_type(RecordType::A);
record.set_data(Some(RData::A(A::from_str("127.0.0.1").unwrap())));
// test that this message can be inserted

22
tests/integration-tests/src/example_authority.rs
View File

@ -19,7 +19,7 @@ pub fn create_example() -> InMemoryAuthority {
Record::new()
.set_name(origin.clone())
.set_ttl(3600)
.set_rr_type(RecordType::SOA)
.set_record_type(RecordType::SOA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::SOA(SOA::new(
Name::parse("sns.dns.icann.org.", None).unwrap(),
@ -38,7 +38,7 @@ pub fn create_example() -> InMemoryAuthority {
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"a.iana-servers.net.",
@ -52,7 +52,7 @@ pub fn create_example() -> InMemoryAuthority {
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"b.iana-servers.net.",
@ -70,7 +70,7 @@ pub fn create_example() -> InMemoryAuthority {
Record::new()
.set_name(origin.clone())
.set_ttl(60)
.set_rr_type(RecordType::TXT)
.set_record_type(RecordType::TXT)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::TXT(TXT::new(vec![
"$Id: example.com 4415 2015-08-24 \
@ -86,7 +86,7 @@ pub fn create_example() -> InMemoryAuthority {
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(93, 184, 216, 34))))
.clone(),
@ -98,7 +98,7 @@ pub fn create_example() -> InMemoryAuthority {
Record::new()
.set_name(origin)
.set_ttl(86400)
.set_rr_type(RecordType::AAAA)
.set_record_type(RecordType::AAAA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::AAAA(AAAA::new(
0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946,
@ -129,7 +129,7 @@ pub fn create_example() -> InMemoryAuthority {
Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::TXT)
.set_record_type(RecordType::TXT)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::TXT(TXT::new(vec!["v=spf1 -all".to_string()]))))
.clone(),
@ -141,7 +141,7 @@ pub fn create_example() -> InMemoryAuthority {
Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(93, 184, 216, 34))))
.clone(),
@ -153,7 +153,7 @@ pub fn create_example() -> InMemoryAuthority {
Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::AAAA)
.set_record_type(RecordType::AAAA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::AAAA(AAAA::new(
0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946,
@ -167,7 +167,7 @@ pub fn create_example() -> InMemoryAuthority {
Record::new()
.set_name(Name::from_str("alias.example.com.").unwrap())
.set_ttl(86400)
.set_rr_type(RecordType::CNAME)
.set_record_type(RecordType::CNAME)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::CNAME(CNAME(www_name))))
.clone(),
@ -179,7 +179,7 @@ pub fn create_example() -> InMemoryAuthority {
Record::new()
.set_name(Name::from_str("alias2.example.com.").unwrap())
.set_ttl(86400)
.set_rr_type(RecordType::CNAME)
.set_record_type(RecordType::CNAME)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::CNAME(CNAME(
Name::from_str("alias.example.com.").unwrap(),

32
tests/integration-tests/tests/catalog_tests.rs
View File

@ -24,7 +24,7 @@ pub fn create_test() -> InMemoryAuthority {
Record::new()
.set_name(origin.clone())
.set_ttl(3600)
.set_rr_type(RecordType::SOA)
.set_record_type(RecordType::SOA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::SOA(SOA::new(
Name::parse("sns.dns.icann.org.", None).unwrap(),
@ -43,7 +43,7 @@ pub fn create_test() -> InMemoryAuthority {
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"a.iana-servers.net.",
@ -57,7 +57,7 @@ pub fn create_test() -> InMemoryAuthority {
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"b.iana-servers.net.",
@ -72,7 +72,7 @@ pub fn create_test() -> InMemoryAuthority {
Record::new()
.set_name(origin.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(94, 184, 216, 34))))
.clone(),
@ -82,7 +82,7 @@ pub fn create_test() -> InMemoryAuthority {
Record::new()
.set_name(origin)
.set_ttl(86400)
.set_rr_type(RecordType::AAAA)
.set_record_type(RecordType::AAAA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::AAAA(AAAA::new(
0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946,
@ -96,7 +96,7 @@ pub fn create_test() -> InMemoryAuthority {
Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(94, 184, 216, 34))))
.clone(),
@ -106,7 +106,7 @@ pub fn create_test() -> InMemoryAuthority {
Record::new()
.set_name(www_name)
.set_ttl(86400)
.set_rr_type(RecordType::AAAA)
.set_record_type(RecordType::AAAA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::AAAA(AAAA::new(
0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946,
@ -358,7 +358,7 @@ async fn test_axfr() {
let soa = Record::new()
.set_name(origin.clone().into())
.set_ttl(3600)
.set_rr_type(RecordType::SOA)
.set_record_type(RecordType::SOA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::SOA(SOA::new(
Name::parse("sns.dns.icann.org.", None).unwrap(),
@ -404,7 +404,7 @@ async fn test_axfr() {
Record::new()
.set_name(origin.clone().into())
.set_ttl(3600)
.set_rr_type(RecordType::SOA)
.set_record_type(RecordType::SOA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::SOA(SOA::new(
Name::parse("sns.dns.icann.org.", None).unwrap(),
@ -419,7 +419,7 @@ async fn test_axfr() {
Record::new()
.set_name(origin.clone().into())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"a.iana-servers.net.",
@ -430,7 +430,7 @@ async fn test_axfr() {
Record::new()
.set_name(origin.clone().into())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"b.iana-servers.net.",
@ -441,14 +441,14 @@ async fn test_axfr() {
Record::new()
.set_name(origin.clone().into())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(94, 184, 216, 34))))
.clone(),
Record::new()
.set_name(origin.clone().into())
.set_ttl(86400)
.set_rr_type(RecordType::AAAA)
.set_record_type(RecordType::AAAA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::AAAA(AAAA::new(
0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946,
@ -457,14 +457,14 @@ async fn test_axfr() {
Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(94, 184, 216, 34))))
.clone(),
Record::new()
.set_name(www_name)
.set_ttl(86400)
.set_rr_type(RecordType::AAAA)
.set_record_type(RecordType::AAAA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::AAAA(AAAA::new(
0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946,
@ -473,7 +473,7 @@ async fn test_axfr() {
Record::new()
.set_name(origin.into())
.set_ttl(3600)
.set_rr_type(RecordType::SOA)
.set_record_type(RecordType::SOA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::SOA(SOA::new(
Name::parse("sns.dns.icann.org.", None).unwrap(),

2
tests/integration-tests/tests/client_future_tests.rs
View File

@ -940,7 +940,7 @@ fn test_delete_all() {
.expect("create failed");
assert_eq!(result.response_code(), ResponseCode::NoError);
record.set_rr_type(RecordType::AAAA);
record.set_record_type(RecordType::AAAA);
record.set_data(Some(RData::AAAA(AAAA::new(1, 2, 3, 4, 5, 6, 7, 8))));
let result = io_loop
.block_on(client.create(record.clone(), origin.clone()))

2
tests/integration-tests/tests/client_tests.rs
View File

@ -791,7 +791,7 @@ fn test_delete_all() {
.expect("create failed");
assert_eq!(result.response_code(), ResponseCode::NoError);
record.set_rr_type(RecordType::AAAA);
record.set_record_type(RecordType::AAAA);
record.set_data(Some(RData::AAAA(AAAA::new(1, 2, 3, 4, 5, 6, 7, 8))));
let result = client
.create(record.clone(), origin.clone())

2
tests/integration-tests/tests/lookup_tests.rs
View File

@ -102,7 +102,7 @@ fn create_ip_like_example() -> InMemoryAuthority {
Record::new()
.set_name(Name::from_str("1.2.3.4.example.com.").unwrap())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(198, 51, 100, 35))))
.clone(),

96
tests/integration-tests/tests/sqlite_authority_tests.rs
View File

@ -124,7 +124,7 @@ async fn test_authority() {
Record::new()
.set_name(authority.origin().clone().into())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"a.iana-servers.net.",
@ -138,7 +138,7 @@ async fn test_authority() {
Record::new()
.set_name(authority.origin().clone().into())
.set_ttl(86400)
.set_rr_type(RecordType::NS)
.set_record_type(RecordType::NS)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NS(NS(Name::parse(
"b.iana-servers.net.",
@ -176,7 +176,7 @@ async fn test_authority() {
Record::new()
.set_name(authority.origin().clone().into())
.set_ttl(60)
.set_rr_type(RecordType::TXT)
.set_record_type(RecordType::TXT)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::TXT(TXT::new(vec![
"$Id: example.com 4415 2015-08-24 \
@ -197,7 +197,7 @@ async fn test_authority() {
Record::new()
.set_name(authority.origin().clone().into())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(93, 184, 216, 34))))
.clone()
@ -246,7 +246,7 @@ async fn test_prerequisites() {
.verify_prerequisites(&[Record::new()
.set_name(not_in_zone.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -258,7 +258,7 @@ async fn test_prerequisites() {
.verify_prerequisites(&[Record::new()
.set_name(not_zone)
.set_ttl(0)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -272,7 +272,7 @@ async fn test_prerequisites() {
.set_name(authority.origin().clone().into())
.set_ttl(0)
.set_dns_class(DNSClass::ANY)
.set_rr_type(RecordType::ANY)
.set_record_type(RecordType::ANY)
.set_data(Some(RData::NULL(NULL::new())))
.clone()])
.await
@ -283,7 +283,7 @@ async fn test_prerequisites() {
.set_name(not_in_zone.clone())
.set_ttl(0)
.set_dns_class(DNSClass::ANY)
.set_rr_type(RecordType::ANY)
.set_record_type(RecordType::ANY)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
.await,
@ -296,7 +296,7 @@ async fn test_prerequisites() {
.set_name(authority.origin().clone().into())
.set_ttl(0)
.set_dns_class(DNSClass::ANY)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_data(Some(RData::NULL(NULL::new())))
.clone()])
.await
@ -307,7 +307,7 @@ async fn test_prerequisites() {
.set_name(not_in_zone.clone())
.set_ttl(0)
.set_dns_class(DNSClass::ANY)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
.await,
@ -320,7 +320,7 @@ async fn test_prerequisites() {
.set_name(not_in_zone.clone())
.set_ttl(0)
.set_dns_class(DNSClass::NONE)
.set_rr_type(RecordType::ANY)
.set_record_type(RecordType::ANY)
.set_data(Some(RData::NULL(NULL::new())))
.clone()])
.await
@ -331,7 +331,7 @@ async fn test_prerequisites() {
.set_name(authority.origin().clone().into())
.set_ttl(0)
.set_dns_class(DNSClass::NONE)
.set_rr_type(RecordType::ANY)
.set_record_type(RecordType::ANY)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
.await,
@ -344,7 +344,7 @@ async fn test_prerequisites() {
.set_name(not_in_zone.clone())
.set_ttl(0)
.set_dns_class(DNSClass::NONE)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_data(Some(RData::NULL(NULL::new())))
.clone()])
.await
@ -355,7 +355,7 @@ async fn test_prerequisites() {
.set_name(authority.origin().clone().into())
.set_ttl(0)
.set_dns_class(DNSClass::NONE)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
.await,
@ -368,7 +368,7 @@ async fn test_prerequisites() {
.set_name(authority.origin().clone().into())
.set_ttl(0)
.set_dns_class(DNSClass::IN)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_data(Some(RData::A(A::new(93, 184, 216, 34))))
.clone()])
.await
@ -380,7 +380,7 @@ async fn test_prerequisites() {
.set_name(authority.origin().clone().into())
.set_ttl(0)
.set_dns_class(DNSClass::CH)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_data(Some(RData::A(A::new(93, 184, 216, 34))))
.clone()],)
.await,
@ -393,7 +393,7 @@ async fn test_prerequisites() {
.set_name(not_in_zone)
.set_ttl(0)
.set_dns_class(DNSClass::IN)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_data(Some(RData::A(A::new(93, 184, 216, 24))))
.clone()],)
.await,
@ -406,7 +406,7 @@ async fn test_prerequisites() {
.set_name(authority.origin().clone().into())
.set_ttl(0)
.set_dns_class(DNSClass::IN)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_data(Some(RData::A(A::new(93, 184, 216, 24))))
.clone()],)
.await,
@ -426,7 +426,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(not_zone)
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(93, 184, 216, 24))))
.clone()],)
@ -439,7 +439,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::ANY)
.set_record_type(RecordType::ANY)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -451,7 +451,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::AXFR)
.set_record_type(RecordType::AXFR)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -463,7 +463,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::IXFR)
.set_record_type(RecordType::IXFR)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -474,7 +474,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(93, 184, 216, 24))))
.clone()])
@ -484,7 +484,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::NULL(NULL::new())))
.clone()])
@ -496,7 +496,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::ANY)
.set_data(Some(RData::A(A::new(93, 184, 216, 24))))
.clone()],)
@ -508,7 +508,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(0)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::ANY)
.set_data(Some(RData::A(A::new(93, 184, 216, 24))))
.clone()],)
@ -520,7 +520,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(0)
.set_rr_type(RecordType::AXFR)
.set_record_type(RecordType::AXFR)
.set_dns_class(DNSClass::ANY)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -532,7 +532,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(0)
.set_rr_type(RecordType::IXFR)
.set_record_type(RecordType::IXFR)
.set_dns_class(DNSClass::ANY)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -543,7 +543,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(0)
.set_rr_type(RecordType::ANY)
.set_record_type(RecordType::ANY)
.set_dns_class(DNSClass::ANY)
.set_data(Some(RData::NULL(NULL::new())))
.clone()])
@ -553,7 +553,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(0)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::ANY)
.set_data(Some(RData::NULL(NULL::new())))
.clone()])
@ -565,7 +565,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::NONE)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -577,7 +577,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(0)
.set_rr_type(RecordType::ANY)
.set_record_type(RecordType::ANY)
.set_dns_class(DNSClass::NONE)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -589,7 +589,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(0)
.set_rr_type(RecordType::AXFR)
.set_record_type(RecordType::AXFR)
.set_dns_class(DNSClass::NONE)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -601,7 +601,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(0)
.set_rr_type(RecordType::IXFR)
.set_record_type(RecordType::IXFR)
.set_dns_class(DNSClass::NONE)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -612,7 +612,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(0)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::NONE)
.set_data(Some(RData::NULL(NULL::new())))
.clone()])
@ -622,7 +622,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name.clone())
.set_ttl(0)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::NONE)
.set_data(Some(RData::A(A::new(93, 184, 216, 24))))
.clone()])
@ -634,7 +634,7 @@ async fn test_pre_scan() {
.pre_scan(&[Record::new()
.set_name(up_name)
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::CH)
.set_data(Some(RData::NULL(NULL::new())))
.clone()],)
@ -656,21 +656,21 @@ async fn test_update() {
Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::TXT)
.set_record_type(RecordType::TXT)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::TXT(TXT::new(vec!["v=spf1 -all".to_string()]))))
.clone(),
Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(93, 184, 216, 34))))
.clone(),
Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::AAAA)
.set_record_type(RecordType::AAAA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::AAAA(AAAA::new(
0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946,
@ -714,7 +714,7 @@ async fn test_update() {
let add_record = &[Record::new()
.set_name(new_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(93, 184, 216, 24))))
.clone()];
@ -740,7 +740,7 @@ async fn test_update() {
let add_www_record = &[Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::A(A::new(10, 0, 0, 1))))
.clone()];
@ -775,7 +775,7 @@ async fn test_update() {
let del_record = &[Record::new()
.set_name(new_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::NONE)
.set_data(Some(RData::A(A::new(93, 184, 216, 24))))
.clone()];
@ -798,7 +798,7 @@ async fn test_update() {
let del_record = &[Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::NONE)
.set_data(Some(RData::A(A::new(10, 0, 0, 1))))
.clone()];
@ -829,7 +829,7 @@ async fn test_update() {
let del_record = &[Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::A)
.set_record_type(RecordType::A)
.set_dns_class(DNSClass::ANY)
.set_data(Some(RData::NULL(NULL::new())))
.clone()];
@ -842,14 +842,14 @@ async fn test_update() {
Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::TXT)
.set_record_type(RecordType::TXT)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::TXT(TXT::new(vec!["v=spf1 -all".to_string()]))))
.clone(),
Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::AAAA)
.set_record_type(RecordType::AAAA)
.set_dns_class(DNSClass::IN)
.set_data(Some(RData::AAAA(AAAA::new(
0x2606, 0x2800, 0x220, 0x1, 0x248, 0x1893, 0x25c8, 0x1946,
@ -881,7 +881,7 @@ async fn test_update() {
let del_record = &[Record::new()
.set_name(www_name.clone())
.set_ttl(86400)
.set_rr_type(RecordType::ANY)
.set_record_type(RecordType::ANY)
.set_dns_class(DNSClass::ANY)
.set_data(Some(RData::NULL(NULL::new())))
.clone()];