Differences From Artifact [b6b9a8e515]:
- File src/OFDNSResourceRecord.m — part of check-in [462cb8a108] at 2018-08-04 15:27:47 on branch trunk — OFDNSResolver: Add support for parsing SRV records (user: js, size: 29663) [annotate] [blame] [check-ins using]
To Artifact [9a69d6e130]:
- File
src/OFDNSResourceRecord.m
— part of check-in
[75d2d3ba01]
at
2018-08-11 14:29:25
on branch trunk
— OFDNSResourceRecord: Use of_socket_address_t
This avoids unnecessary string construction and parsing and removes
duplicate code to convert an address into a string. (user: js, size: 29569) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
169 170 171 172 173 174 175 | [self className], _name, of_dns_resource_record_class_to_string(_recordClass), of_dns_resource_record_type_to_string(_recordType), _TTL]; } @end @implementation OFADNSResourceRecord | < < | < | < < < < | | < < < | | | > < < | < | < < < < | | < < < | | | > | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 |
[self className], _name,
of_dns_resource_record_class_to_string(_recordClass),
of_dns_resource_record_type_to_string(_recordType), _TTL];
}
@end
@implementation OFADNSResourceRecord
- (instancetype)initWithName: (OFString *)name
recordClass: (of_dns_resource_record_class_t)recordClass
recordType: (of_dns_resource_record_type_t)recordType
TTL: (uint32_t)TTL
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithName: (OFString *)name
address: (const of_socket_address_t *)address
TTL: (uint32_t)TTL
{
self = [super initWithName: name
recordClass: OF_DNS_RESOURCE_RECORD_CLASS_IN
recordType: OF_DNS_RESOURCE_RECORD_TYPE_A
TTL: TTL];
_address = *address;
return self;
}
- (const of_socket_address_t *)address
{
return &_address;
}
- (bool)isEqual: (id)otherObject
{
OFADNSResourceRecord *otherRecord;
if (![otherObject isKindOfClass: [OFADNSResourceRecord class]])
return false;
otherRecord = otherObject;
if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
return false;
if (otherRecord->_recordClass != _recordClass)
return false;
if (otherRecord->_recordType != _recordType)
return false;
if (!of_socket_address_equal(&otherRecord->_address, &_address))
return false;
return true;
}
- (uint32_t)hash
{
uint32_t hash;
OF_HASH_INIT(hash);
OF_HASH_ADD_HASH(hash, [_name hash]);
OF_HASH_ADD(hash, _recordClass >> 8);
OF_HASH_ADD(hash, _recordClass);
OF_HASH_ADD(hash, _recordType >> 8);
OF_HASH_ADD(hash, _recordType);
OF_HASH_ADD_HASH(hash, of_socket_address_hash(&_address));
OF_HASH_FINALIZE(hash);
return hash;
}
- (OFString *)description
{
return [OFString stringWithFormat:
@"<%@:\n"
@"\tName = %@\n"
@"\tAddress = %@\n"
@"\tTTL = %" PRIu32 "\n"
@">",
[self className], _name,
of_socket_address_ip_string(&_address, NULL), _TTL];
}
@end
@implementation OFAAAADNSResourceRecord
- (instancetype)initWithName: (OFString *)name
recordClass: (of_dns_resource_record_class_t)recordClass
recordType: (of_dns_resource_record_type_t)recordType
TTL: (uint32_t)TTL
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithName: (OFString *)name
address: (const of_socket_address_t *)address
TTL: (uint32_t)TTL
{
self = [super initWithName: name
recordClass: OF_DNS_RESOURCE_RECORD_CLASS_IN
recordType: OF_DNS_RESOURCE_RECORD_TYPE_AAAA
TTL: TTL];
_address = *address;
return self;
}
- (const of_socket_address_t *)address
{
return &_address;
}
- (bool)isEqual: (id)otherObject
{
OFAAAADNSResourceRecord *otherRecord;
if (![otherObject isKindOfClass: [OFAAAADNSResourceRecord class]])
return false;
otherRecord = otherObject;
if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name])
return false;
if (otherRecord->_recordClass != _recordClass)
return false;
if (otherRecord->_recordType != _recordType)
return false;
if (!of_socket_address_equal(&otherRecord->_address, &_address))
return false;
return true;
}
- (uint32_t)hash
{
uint32_t hash;
OF_HASH_INIT(hash);
OF_HASH_ADD_HASH(hash, [_name hash]);
OF_HASH_ADD(hash, _recordClass >> 8);
OF_HASH_ADD(hash, _recordClass);
OF_HASH_ADD(hash, _recordType >> 8);
OF_HASH_ADD(hash, _recordType);
OF_HASH_ADD_HASH(hash, of_socket_address_hash(&_address));
OF_HASH_FINALIZE(hash);
return hash;
}
- (OFString *)description
{
return [OFString stringWithFormat:
@"<%@:\n"
@"\tName = %@\n"
@"\tAddress = %@\n"
@"\tTTL = %" PRIu32 "\n"
@">",
[self className], _name,
of_socket_address_ip_string(&_address, NULL), _TTL];
}
@end
@implementation OFCNAMEDNSResourceRecord
@synthesize alias = _alias;
- (instancetype)initWithName: (OFString *)name
|
| ︙ | ︙ |