Index: src/OFDNSQuery.h ================================================================== --- src/OFDNSQuery.h +++ src/OFDNSQuery.h @@ -29,11 +29,11 @@ */ @interface OFDNSQuery: OFObject { OFString *_domainName; of_dns_class_t _DNSClass; - of_dns_resource_record_type_t _recordType; + of_dns_record_type_t _recordType; OF_RESERVE_IVARS(4) } /*! * @brief The domain name of the query. @@ -46,11 +46,11 @@ @property (readonly, nonatomic) of_dns_class_t DNSClass; /*! * @brief The record type of the query. */ -@property (readonly, nonatomic) of_dns_resource_record_type_t recordType; +@property (readonly, nonatomic) of_dns_record_type_t recordType; /*! * @brief Creates a new, autoreleased OFDNSQuery. * * @param domainName The domain name to query @@ -58,11 +58,11 @@ * @param recordType The record type of the query * @return A new, autoreleased OFDNSQuery */ + (instancetype)queryWithDomainName: (OFString *)domainName DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType; + recordType: (of_dns_record_type_t)recordType; /*! * @brief Initializes an already allocated OFDNSQuery. * * @param domainName The domain name to query @@ -70,12 +70,12 @@ * @param recordType The record type of the query * @return An initialized OFDNSQuery */ - (instancetype)initWithDomainName: (OFString *)domainName DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType OF_DESIGNATED_INITIALIZER; - (instancetype)init OF_UNAVAILABLE; @end OF_ASSUME_NONNULL_END Index: src/OFDNSQuery.m ================================================================== --- src/OFDNSQuery.m +++ src/OFDNSQuery.m @@ -24,20 +24,20 @@ @synthesize domainName = _domainName, DNSClass = _DNSClass; @synthesize recordType = _recordType; + (instancetype)queryWithDomainName: (OFString *)domainName DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType { return [[[self alloc] initWithDomainName: domainName DNSClass: DNSClass recordType: recordType] autorelease]; } - (instancetype)initWithDomainName: (OFString *)domainName DNSClass: (of_dns_class_t)DNSClass - recordType: (of_dns_resource_record_type_t)recordType + recordType: (of_dns_record_type_t)recordType { self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); @@ -110,8 +110,8 @@ - (OFString *)description { return [OFString stringWithFormat: @"<%@ %@ %@ %@>", self.className, _domainName, of_dns_class_to_string(_DNSClass), - of_dns_resource_record_type_to_string(_recordType)]; + of_dns_record_type_to_string(_recordType)]; } @end Index: src/OFDNSResolver.m ================================================================== --- src/OFDNSResolver.m +++ src/OFDNSResolver.m @@ -168,15 +168,14 @@ return [components componentsJoinedByString: @"."]; } static OF_KINDOF(OFDNSResourceRecord *) parseResourceRecord(OFString *name, of_dns_class_t DNSClass, - of_dns_resource_record_type_t recordType, uint32_t TTL, - const unsigned char *buffer, size_t length, size_t i, uint16_t dataLength) + of_dns_record_type_t recordType, uint32_t TTL, const unsigned char *buffer, + size_t length, size_t i, uint16_t dataLength) { - if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_A && - DNSClass == OF_DNS_CLASS_IN) { + if (recordType == OF_DNS_RECORD_TYPE_A && DNSClass == OF_DNS_CLASS_IN) { of_socket_address_t address; if (dataLength != 4) @throw [OFInvalidServerReplyException exception]; @@ -189,11 +188,11 @@ return [[[OFADNSResourceRecord alloc] initWithName: name address: &address TTL: TTL] autorelease]; - } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_NS) { + } else if (recordType == OF_DNS_RECORD_TYPE_NS) { size_t j = i; OFString *authoritativeHost = parseName(buffer, length, &j, MAX_ALLOWED_POINTERS); if (j != i + dataLength) @@ -202,11 +201,11 @@ return [[[OFNSDNSResourceRecord alloc] initWithName: name DNSClass: DNSClass authoritativeHost: authoritativeHost TTL: TTL] autorelease]; - } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_CNAME) { + } else if (recordType == OF_DNS_RECORD_TYPE_CNAME) { size_t j = i; OFString *alias = parseName(buffer, length, &j, MAX_ALLOWED_POINTERS); if (j != i + dataLength) @@ -215,11 +214,11 @@ return [[[OFCNAMEDNSResourceRecord alloc] initWithName: name DNSClass: DNSClass alias: alias TTL: TTL] autorelease]; - } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_SOA) { + } else if (recordType == OF_DNS_RECORD_TYPE_SOA) { size_t j = i; OFString *primaryNameServer = parseName(buffer, length, &j, MAX_ALLOWED_POINTERS); OFString *responsiblePerson; uint32_t serialNumber, refreshInterval, retryInterval; @@ -256,11 +255,11 @@ refreshInterval: refreshInterval retryInterval: retryInterval expirationInterval: expirationInterval minTTL: minTTL TTL: TTL] autorelease]; - } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_PTR) { + } else if (recordType == OF_DNS_RECORD_TYPE_PTR) { size_t j = i; OFString *domainName = parseName(buffer, length, &j, MAX_ALLOWED_POINTERS); if (j != i + dataLength) @@ -269,11 +268,11 @@ return [[[OFPTRDNSResourceRecord alloc] initWithName: name DNSClass: DNSClass domainName: domainName TTL: TTL] autorelease]; - } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_HINFO) { + } else if (recordType == OF_DNS_RECORD_TYPE_HINFO) { size_t j = i; OFString *CPU = parseString(buffer, length, &j); OFString *OS; if (j > i + dataLength) @@ -288,11 +287,11 @@ initWithName: name DNSClass: DNSClass CPU: CPU OS: OS TTL: TTL] autorelease]; - } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_MX) { + } else if (recordType == OF_DNS_RECORD_TYPE_MX) { uint16_t preference; size_t j; OFString *mailExchange; if (dataLength < 2) @@ -311,20 +310,20 @@ initWithName: name DNSClass: DNSClass preference: preference mailExchange: mailExchange TTL: TTL] autorelease]; - } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_TXT) { + } else if (recordType == OF_DNS_RECORD_TYPE_TXT) { OFData *textData = [OFData dataWithItems: &buffer[i] count: dataLength]; return [[[OFTXTDNSResourceRecord alloc] initWithName: name DNSClass: DNSClass textData: textData TTL: TTL] autorelease]; - } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_RP) { + } else if (recordType == OF_DNS_RECORD_TYPE_RP) { size_t j = i; OFString *mailbox = parseName(buffer, length, &j, MAX_ALLOWED_POINTERS); OFString *TXTDomainName; @@ -341,11 +340,11 @@ initWithName: name DNSClass: DNSClass mailbox: mailbox TXTDomainName: TXTDomainName TTL: TTL] autorelease]; - } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_AAAA && + } else if (recordType == OF_DNS_RECORD_TYPE_AAAA && DNSClass == OF_DNS_CLASS_IN) { of_socket_address_t address; if (dataLength != 16) @throw [OFInvalidServerReplyException exception]; @@ -363,11 +362,11 @@ return [[[OFAAAADNSResourceRecord alloc] initWithName: name address: &address TTL: TTL] autorelease]; - } else if (recordType == OF_DNS_RESOURCE_RECORD_TYPE_SRV && + } else if (recordType == OF_DNS_RECORD_TYPE_SRV && DNSClass == OF_DNS_CLASS_IN) { uint16_t priority, weight, port; size_t j; OFString *target; @@ -409,11 +408,11 @@ for (uint_fast16_t j = 0; j < count; j++) { OFString *name = parseName(buffer, length, i, MAX_ALLOWED_POINTERS); of_dns_class_t DNSClass; - of_dns_resource_record_type_t recordType; + of_dns_record_type_t recordType; uint32_t TTL; uint16_t dataLength; OFDNSResourceRecord *record; if (*i + 10 > length) Index: src/OFDNSResourceRecord.h ================================================================== --- src/OFDNSResourceRecord.h +++ src/OFDNSResourceRecord.h @@ -39,34 +39,34 @@ /*! * @brief The type of a DNS resource record. */ typedef enum { /*! A */ - OF_DNS_RESOURCE_RECORD_TYPE_A = 1, + OF_DNS_RECORD_TYPE_A = 1, /*! NS */ - OF_DNS_RESOURCE_RECORD_TYPE_NS = 2, + OF_DNS_RECORD_TYPE_NS = 2, /*! CNAME */ - OF_DNS_RESOURCE_RECORD_TYPE_CNAME = 5, + OF_DNS_RECORD_TYPE_CNAME = 5, /*! SOA */ - OF_DNS_RESOURCE_RECORD_TYPE_SOA = 6, + OF_DNS_RECORD_TYPE_SOA = 6, /*! PTR */ - OF_DNS_RESOURCE_RECORD_TYPE_PTR = 12, + OF_DNS_RECORD_TYPE_PTR = 12, /*! HINFO */ - OF_DNS_RESOURCE_RECORD_TYPE_HINFO = 13, + OF_DNS_RECORD_TYPE_HINFO = 13, /*! MX */ - OF_DNS_RESOURCE_RECORD_TYPE_MX = 15, + OF_DNS_RECORD_TYPE_MX = 15, /*! TXT */ - OF_DNS_RESOURCE_RECORD_TYPE_TXT = 16, + OF_DNS_RECORD_TYPE_TXT = 16, /*! RP */ - OF_DNS_RESOURCE_RECORD_TYPE_RP = 17, + OF_DNS_RECORD_TYPE_RP = 17, /*! AAAA */ - OF_DNS_RESOURCE_RECORD_TYPE_AAAA = 28, + OF_DNS_RECORD_TYPE_AAAA = 28, /*! SRV */ - OF_DNS_RESOURCE_RECORD_TYPE_SRV = 33, + OF_DNS_RECORD_TYPE_SRV = 33, /*! All types. Only for queries. */ - OF_DNS_RESOURCE_RECORD_TYPE_ALL = 255, -} of_dns_resource_record_type_t; + OF_DNS_RECORD_TYPE_ALL = 255, +} of_dns_record_type_t; /*! * @class OFDNSResourceRecord OFDNSResourceRecord.h ObjFW/OFDNSResourceRecord.h * * @brief A class representing a DNS resource record. @@ -73,11 +73,11 @@ */ @interface OFDNSResourceRecord: OFObject { OFString *_name; of_dns_class_t _DNSClass; - of_dns_resource_record_type_t _recordType; + of_dns_record_type_t _recordType; uint32_t _TTL; OF_RESERVE_IVARS(4) } /** @@ -91,11 +91,11 @@ @property (readonly, nonatomic) of_dns_class_t DNSClass; /*! * @brief The resource record type code. */ -@property (readonly, nonatomic) of_dns_resource_record_type_t recordType; +@property (readonly, nonatomic) of_dns_record_type_t recordType; /*! * @brief The number of seconds after which the resource record should be * discarded from the cache. */ @@ -111,11 +111,11 @@ * @param TTL The time to live for the resource record * @return An initialized OFDNSResourceRecord */ - (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_DESIGNATED_INITIALIZER; @end /*! * @class OFADNSResourceRecord OFDNSResourceRecord.h ObjFW/OFDNSResourceRecord.h @@ -133,11 +133,11 @@ */ @property (readonly, nonatomic) const of_socket_address_t *address; - (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_UNAVAILABLE; /*! * @brief Initializes an already allocated OFADNSResourceRecord with the * specified name, class, address and time to live. @@ -169,11 +169,11 @@ */ @property (readonly, nonatomic) const of_socket_address_t *address; - (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_UNAVAILABLE; /*! * @brief Initializes an already allocated OFAAAADNSResourceRecord with the * specified name, class, address and time to live. @@ -205,11 +205,11 @@ */ @property (readonly, nonatomic) OFString *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_UNAVAILABLE; /*! * @brief Initializes an already allocated OFCNAMEDNSResourceRecord with the * specified name, class, alias and time to live. @@ -248,11 +248,11 @@ */ @property (readonly, nonatomic) OFString *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_UNAVAILABLE; /*! * @brief Initializes an already allocated OFHINFODNSResourceRecord with the * specified name, class, domain name and time to live. @@ -294,11 +294,11 @@ */ @property (readonly, nonatomic) OFString *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_UNAVAILABLE; /*! * @brief Initializes an already allocated OFMXDNSResourceRecord with the * specified name, class, preference, mail exchange and time to live. @@ -334,11 +334,11 @@ */ @property (readonly, nonatomic) OFString *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_UNAVAILABLE; /*! * @brief Initializes an already allocated OFNSDNSResourceRecord with the * specified name, class, authoritative host and time to live. @@ -372,11 +372,11 @@ */ @property (readonly, nonatomic) OFString *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_UNAVAILABLE; /*! * @brief Initializes an already allocated OFPTRDNSResourceRecord with the * specified name, class, domain name and time to live. @@ -416,11 +416,11 @@ */ @property (readonly, nonatomic) OFString *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_UNAVAILABLE; /*! * @brief Initializes an already allocated OFRPDNSResourceRecord with the * specified name, class, alias and time to live. @@ -489,11 +489,11 @@ */ @property (readonly, nonatomic) uint32_t 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_UNAVAILABLE; /*! * @brief Initializes an already allocated OFSOADNSResourceRecord with the * specified name, class, text data and time to live. @@ -556,11 +556,11 @@ */ @property (readonly, nonatomic) uint16_t 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_UNAVAILABLE; /*! * @brief Initializes an already allocated OFSRVDNSResourceRecord with the * specified name, class, preference, mail exchange and time to live. @@ -598,11 +598,11 @@ */ @property (readonly, nonatomic) OFData *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_UNAVAILABLE; /*! * @brief Initializes an already allocated OFTXTDNSResourceRecord with the * specified name, class, text data and time to live. @@ -621,15 +621,14 @@ #ifdef __cplusplus extern "C" { #endif extern OFString *_Nonnull of_dns_class_to_string(of_dns_class_t DNSClass); -extern OFString *_Nonnull of_dns_resource_record_type_to_string( - of_dns_resource_record_type_t recordType); +extern OFString *_Nonnull of_dns_record_type_to_string( + of_dns_record_type_t recordType); extern of_dns_class_t of_dns_class_parse(OFString *_Nonnull string); -extern of_dns_resource_record_type_t of_dns_resource_record_type_parse( - OFString *_Nonnull string); +extern of_dns_record_type_t of_dns_record_type_parse(OFString *_Nonnull string); #ifdef __cplusplus } #endif OF_ASSUME_NONNULL_END Index: src/OFDNSResourceRecord.m ================================================================== --- src/OFDNSResourceRecord.m +++ src/OFDNSResourceRecord.m @@ -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) { Index: src/OFHostAddressResolver.m ================================================================== --- src/OFHostAddressResolver.m +++ src/OFHostAddressResolver.m @@ -71,17 +71,17 @@ const of_socket_address_t **address, of_socket_address_family_t addressFamily) { switch ([record recordType]) { #ifdef OF_HAVE_IPV6 - case OF_DNS_RESOURCE_RECORD_TYPE_AAAA: + case OF_DNS_RECORD_TYPE_AAAA: if (addressFamily != OF_SOCKET_ADDRESS_FAMILY_IPV6 && addressFamily != OF_SOCKET_ADDRESS_FAMILY_ANY) return false; break; #endif - case OF_DNS_RESOURCE_RECORD_TYPE_A: + case OF_DNS_RECORD_TYPE_A: if (addressFamily != OF_SOCKET_ADDRESS_FAMILY_IPV4 && addressFamily != OF_SOCKET_ADDRESS_FAMILY_ANY) return false; break; default: @@ -168,11 +168,11 @@ if (_addressFamily == OF_SOCKET_ADDRESS_FAMILY_IPV6 || _addressFamily == OF_SOCKET_ADDRESS_FAMILY_ANY) { OFDNSQuery *query = [OFDNSQuery queryWithDomainName: domainName DNSClass: OF_DNS_CLASS_IN - recordType: OF_DNS_RESOURCE_RECORD_TYPE_AAAA]; + recordType: OF_DNS_RECORD_TYPE_AAAA]; _numExpectedResponses++; [_resolver asyncPerformQuery: query runLoopMode: _runLoopMode delegate: self]; } @@ -181,11 +181,11 @@ if (_addressFamily == OF_SOCKET_ADDRESS_FAMILY_IPV4 || _addressFamily == OF_SOCKET_ADDRESS_FAMILY_ANY) { OFDNSQuery *query = [OFDNSQuery queryWithDomainName: domainName DNSClass: OF_DNS_CLASS_IN - recordType: OF_DNS_RESOURCE_RECORD_TYPE_A]; + recordType: OF_DNS_RECORD_TYPE_A]; _numExpectedResponses++; [_resolver asyncPerformQuery: query runLoopMode: _runLoopMode delegate: self]; } @@ -218,11 +218,11 @@ if (addressForRecord(record, &address, _addressFamily)) { [_addresses addItem: address]; continue; } - if ([record recordType] != OF_DNS_RESOURCE_RECORD_TYPE_CNAME) + if ([record recordType] != OF_DNS_RECORD_TYPE_CNAME) continue; /* FIXME: Check if it's already in answers */ CNAMEQuery = [OFDNSQuery queryWithDomainName: [record alias] DNSClass: OF_DNS_CLASS_IN Index: utils/ofdns/OFDNS.m ================================================================== --- utils/ofdns/OFDNS.m +++ utils/ofdns/OFDNS.m @@ -46,12 +46,11 @@ - (void)applicationDidFinishLaunching { OFArray OF_GENERIC(OFString *) *arguments = [OFApplication arguments]; of_dns_class_t DNSClass = OF_DNS_CLASS_ANY; - of_dns_resource_record_type_t recordType = - OF_DNS_RESOURCE_RECORD_TYPE_ALL; + of_dns_record_type_t recordType = OF_DNS_RECORD_TYPE_ALL; OFDNSQuery *query; OFDNSResolver *resolver; #ifdef OF_HAVE_SANDBOX OFSandbox *sandbox = [[OFSandbox alloc] init]; @@ -73,11 +72,11 @@ } resolver = [OFDNSResolver resolver]; if (arguments.count >= 2) - recordType = of_dns_resource_record_type_parse( + recordType = of_dns_record_type_parse( [arguments objectAtIndex: 1]); if (arguments.count >= 3) DNSClass = of_dns_class_parse([arguments objectAtIndex: 2]);