@@ -35,36 +35,36 @@ return [OFString stringWithFormat: @"%u", DNSClass]; } } OFString * -of_dns_resource_record_type_to_string(of_dns_resource_record_type_t recordType) +of_dns_record_type_to_string(of_dns_record_type_t recordType) { switch (recordType) { - case OF_DNS_RESOURCE_RECORD_TYPE_A: + case OF_DNS_RECORD_TYPE_A: return @"A"; - case OF_DNS_RESOURCE_RECORD_TYPE_NS: + case OF_DNS_RECORD_TYPE_NS: return @"NS"; - case OF_DNS_RESOURCE_RECORD_TYPE_CNAME: + case OF_DNS_RECORD_TYPE_CNAME: return @"CNAME"; - case OF_DNS_RESOURCE_RECORD_TYPE_SOA: + case OF_DNS_RECORD_TYPE_SOA: return @"SOA"; - case OF_DNS_RESOURCE_RECORD_TYPE_PTR: + case OF_DNS_RECORD_TYPE_PTR: return @"PTR"; - case OF_DNS_RESOURCE_RECORD_TYPE_HINFO: + case OF_DNS_RECORD_TYPE_HINFO: return @"HINFO"; - case OF_DNS_RESOURCE_RECORD_TYPE_MX: + case OF_DNS_RECORD_TYPE_MX: return @"MX"; - case OF_DNS_RESOURCE_RECORD_TYPE_TXT: + case OF_DNS_RECORD_TYPE_TXT: return @"TXT"; - case OF_DNS_RESOURCE_RECORD_TYPE_RP: + case OF_DNS_RECORD_TYPE_RP: return @"RP"; - case OF_DNS_RESOURCE_RECORD_TYPE_AAAA: + case OF_DNS_RECORD_TYPE_AAAA: return @"AAAA"; - case OF_DNS_RESOURCE_RECORD_TYPE_SRV: + case OF_DNS_RECORD_TYPE_SRV: return @"SRV"; - case OF_DNS_RESOURCE_RECORD_TYPE_ALL: + case OF_DNS_RECORD_TYPE_ALL: return @"all"; default: return [OFString stringWithFormat: @"%u", recordType]; } } @@ -84,40 +84,39 @@ objc_autoreleasePoolPop(pool); return DNSClass; } -of_dns_resource_record_type_t of_dns_resource_record_type_parse( - OFString *string) +of_dns_record_type_t of_dns_record_type_parse(OFString *string) { void *pool = objc_autoreleasePoolPush(); - of_dns_resource_record_type_t recordType; + of_dns_record_type_t recordType; string = string.uppercaseString; if ([string isEqual: @"A"]) - recordType = OF_DNS_RESOURCE_RECORD_TYPE_A; + recordType = OF_DNS_RECORD_TYPE_A; else if ([string isEqual: @"NS"]) - recordType = OF_DNS_RESOURCE_RECORD_TYPE_NS; + recordType = OF_DNS_RECORD_TYPE_NS; else if ([string isEqual: @"CNAME"]) - recordType = OF_DNS_RESOURCE_RECORD_TYPE_CNAME; + recordType = OF_DNS_RECORD_TYPE_CNAME; else if ([string isEqual: @"SOA"]) - recordType = OF_DNS_RESOURCE_RECORD_TYPE_SOA; + recordType = OF_DNS_RECORD_TYPE_SOA; else if ([string isEqual: @"PTR"]) - recordType = OF_DNS_RESOURCE_RECORD_TYPE_PTR; + recordType = OF_DNS_RECORD_TYPE_PTR; else if ([string isEqual: @"HINFO"]) - recordType = OF_DNS_RESOURCE_RECORD_TYPE_HINFO; + recordType = OF_DNS_RECORD_TYPE_HINFO; else if ([string isEqual: @"MX"]) - recordType = OF_DNS_RESOURCE_RECORD_TYPE_MX; + recordType = OF_DNS_RECORD_TYPE_MX; else if ([string isEqual: @"TXT"]) - recordType = OF_DNS_RESOURCE_RECORD_TYPE_TXT; + recordType = OF_DNS_RECORD_TYPE_TXT; else if ([string isEqual: @"RP"]) - recordType = OF_DNS_RESOURCE_RECORD_TYPE_RP; + recordType = OF_DNS_RECORD_TYPE_RP; else if ([string isEqual: @"AAAA"]) - recordType = OF_DNS_RESOURCE_RECORD_TYPE_AAAA; + recordType = OF_DNS_RECORD_TYPE_AAAA; else if ([string isEqual: @"SRV"]) - recordType = OF_DNS_RESOURCE_RECORD_TYPE_SRV; + recordType = OF_DNS_RECORD_TYPE_SRV; else @throw [OFInvalidArgumentException exception]; objc_autoreleasePoolPop(pool); @@ -128,11 +127,11 @@ @synthesize name = _name, DNSClass = _DNSClass, recordType = _recordType; @synthesize TTL = _TTL; - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { self = [super init]; @try { @@ -168,18 +167,18 @@ @"\tClass = %@\n" @"\tType = %@\n" @"\tTTL = %" PRIu32 "\n" @">", self.className, _name, of_dns_class_to_string(_DNSClass), - of_dns_resource_record_type_to_string(_recordType), _TTL]; + of_dns_record_type_to_string(_recordType), _TTL]; } @end @implementation OFADNSResourceRecord - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { OF_INVALID_INIT_METHOD } @@ -187,11 +186,11 @@ address: (const of_socket_address_t *)address TTL: (uint32_t)TTL { self = [super initWithName: name DNSClass: OF_DNS_CLASS_IN - recordType: OF_DNS_RESOURCE_RECORD_TYPE_A + recordType: OF_DNS_RECORD_TYPE_A TTL: TTL]; _address = *address; return self; @@ -258,11 +257,11 @@ @end @implementation OFAAAADNSResourceRecord - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { OF_INVALID_INIT_METHOD } @@ -270,11 +269,11 @@ address: (const of_socket_address_t *)address TTL: (uint32_t)TTL { self = [super initWithName: name DNSClass: OF_DNS_CLASS_IN - recordType: OF_DNS_RESOURCE_RECORD_TYPE_AAAA + recordType: OF_DNS_RECORD_TYPE_AAAA TTL: TTL]; _address = *address; return self; @@ -343,11 +342,11 @@ @implementation OFCNAMEDNSResourceRecord @synthesize alias = _alias; - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { OF_INVALID_INIT_METHOD } @@ -356,11 +355,11 @@ alias: (OFString *)alias TTL: (uint32_t)TTL { self = [super initWithName: name DNSClass: DNSClass - recordType: OF_DNS_RESOURCE_RECORD_TYPE_CNAME + recordType: OF_DNS_RECORD_TYPE_CNAME TTL: TTL]; @try { _alias = [alias copy]; } @catch (id e) { @@ -438,11 +437,11 @@ @implementation OFHINFODNSResourceRecord @synthesize CPU = _CPU, OS = _OS; - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { OF_INVALID_INIT_METHOD } @@ -452,11 +451,11 @@ OS: (OFString *)OS TTL: (uint32_t)TTL { self = [super initWithName: name DNSClass: DNSClass - recordType: OF_DNS_RESOURCE_RECORD_TYPE_HINFO + recordType: OF_DNS_RECORD_TYPE_HINFO TTL: TTL]; @try { _CPU = [CPU copy]; _OS = [OS copy]; @@ -540,11 +539,11 @@ @implementation OFMXDNSResourceRecord @synthesize preference = _preference, mailExchange = _mailExchange; - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { OF_INVALID_INIT_METHOD } @@ -554,11 +553,11 @@ mailExchange: (OFString *)mailExchange TTL: (uint32_t)TTL { self = [super initWithName: name DNSClass: DNSClass - recordType: OF_DNS_RESOURCE_RECORD_TYPE_MX + recordType: OF_DNS_RECORD_TYPE_MX TTL: TTL]; @try { _preference = preference; _mailExchange = [mailExchange copy]; @@ -643,11 +642,11 @@ @implementation OFNSDNSResourceRecord @synthesize authoritativeHost = _authoritativeHost; - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { OF_INVALID_INIT_METHOD } @@ -656,11 +655,11 @@ authoritativeHost: (OFString *)authoritativeHost TTL: (uint32_t)TTL { self = [super initWithName: name DNSClass: DNSClass - recordType: OF_DNS_RESOURCE_RECORD_TYPE_NS + recordType: OF_DNS_RECORD_TYPE_NS TTL: TTL]; @try { _authoritativeHost = [authoritativeHost copy]; } @catch (id e) { @@ -738,11 +737,11 @@ @implementation OFPTRDNSResourceRecord @synthesize domainName = _domainName; - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { OF_INVALID_INIT_METHOD } @@ -751,11 +750,11 @@ domainName: (OFString *)domainName TTL: (uint32_t)TTL { self = [super initWithName: name DNSClass: DNSClass - recordType: OF_DNS_RESOURCE_RECORD_TYPE_PTR + recordType: OF_DNS_RECORD_TYPE_PTR TTL: TTL]; @try { _domainName = [domainName copy]; } @catch (id e) { @@ -833,11 +832,11 @@ @implementation OFRPDNSResourceRecord @synthesize mailbox = _mailbox, TXTDomainName = _TXTDomainName; - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { OF_INVALID_INIT_METHOD } @@ -847,11 +846,11 @@ TXTDomainName: (OFString *)TXTDomainName TTL: (uint32_t)TTL { self = [super initWithName: name DNSClass: DNSClass - recordType: OF_DNS_RESOURCE_RECORD_TYPE_RP + recordType: OF_DNS_RECORD_TYPE_RP TTL: TTL]; @try { _mailbox = [mailbox copy]; _TXTDomainName = [TXTDomainName copy]; @@ -941,11 +940,11 @@ @synthesize retryInterval = _retryInterval; @synthesize expirationInterval = _expirationInterval, minTTL = _minTTL; - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { OF_INVALID_INIT_METHOD } @@ -960,11 +959,11 @@ minTTL: (uint32_t)minTTL TTL: (uint32_t)TTL { self = [super initWithName: name DNSClass: DNSClass - recordType: OF_DNS_RESOURCE_RECORD_TYPE_SOA + recordType: OF_DNS_RECORD_TYPE_SOA TTL: TTL]; @try { _primaryNameServer = [primaryNameServer copy]; _responsiblePerson = [responsiblePerson copy]; @@ -1098,11 +1097,11 @@ @synthesize priority = _priority, weight = _weight, target = _target; @synthesize port = _port; - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { OF_INVALID_INIT_METHOD } @@ -1113,11 +1112,11 @@ port: (uint16_t)port TTL: (uint32_t)TTL { self = [super initWithName: name DNSClass: OF_DNS_CLASS_IN - recordType: OF_DNS_RESOURCE_RECORD_TYPE_SRV + recordType: OF_DNS_RECORD_TYPE_SRV TTL: TTL]; @try { _priority = priority; _weight = weight; @@ -1214,11 +1213,11 @@ @implementation OFTXTDNSResourceRecord @synthesize textData = _textData; - (instancetype)initWithName: (OFString *)name DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType TTL: (uint32_t)TTL { OF_INVALID_INIT_METHOD } @@ -1227,11 +1226,11 @@ textData: (OFData *)textData TTL: (uint32_t)TTL { self = [super initWithName: name DNSClass: DNSClass - recordType: OF_DNS_RESOURCE_RECORD_TYPE_TXT + recordType: OF_DNS_RECORD_TYPE_TXT TTL: TTL]; @try { _textData = [textData copy]; } @catch (id e) {