Overview
| Comment: | Merge support for URI DNS resource records |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
e051d7d487ba9a080e84e412bb0a43b4 |
| User & Date: | js on 2024-01-15 02:26:24 |
| Other Links: | manifest | tags |
References
|
2024-01-15
| ||
| 02:28 | • Fixed ticket [8c3fa1596f]: OFDNSResolver Support for URI records plus 5 other changes artifact: e386c66c75 user: js | |
Context
|
2024-01-15
| ||
| 20:17 | Update ChangeLog check-in: ed45dbf46a user: js tags: trunk | |
| 02:26 | Merge support for URI DNS resource records check-in: e051d7d487 user: js tags: trunk | |
| 02:24 | Fix parsing of URI resource records Closed-Leaf check-in: 2b7bc4c106 user: js tags: uri-resource-record | |
| 02:07 | OFDNSResolver: Fix wrong shifts check-in: 328252420b user: js tags: trunk | |
Changes
Modified src/Makefile from [7b5ccc8dac] to [ff67b028ce].
| ︙ | ︙ | |||
139 140 141 142 143 144 145 | OFSOADNSResourceRecord.m \ OFSRVDNSResourceRecord.m \ OFSequencedPacketSocket.m \ OFSocket.m \ OFStreamSocket.m \ OFSystemInfo+NetworkInterfaces.m \ OFTCPSocket.m \ | < > > | 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 |
OFSOADNSResourceRecord.m \
OFSRVDNSResourceRecord.m \
OFSequencedPacketSocket.m \
OFSocket.m \
OFStreamSocket.m \
OFSystemInfo+NetworkInterfaces.m \
OFTCPSocket.m \
OFTLSStream.m \
OFTXTDNSResourceRecord.m \
OFUDPSocket.m \
OFURIDNSResourceRecord.m \
${USE_SRCS_APPLETALK} \
${USE_SRCS_IPX} \
${USE_SRCS_UNIX_SOCKETS}
SRCS_APPLETALK = OFDDPSocket.m
SRCS_IPX = OFIPXSocket.m \
OFSPXSocket.m \
OFSPXStreamSocket.m
|
| ︙ | ︙ |
Modified src/OFDNSResolver.m from [c017e2232c] to [1cf3f921a3].
| ︙ | ︙ | |||
400 401 402 403 404 405 406 407 408 409 410 411 412 413 | return [[[OFSRVDNSResourceRecord alloc] initWithName: name priority: priority weight: weight target: target port: port TTL: TTL] autorelease]; } else return [[[OFDNSResourceRecord alloc] initWithName: name DNSClass: DNSClass recordType: recordType TTL: TTL] autorelease]; | > > > > > > > > > > > > > > > > > > > > | 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 |
return [[[OFSRVDNSResourceRecord alloc]
initWithName: name
priority: priority
weight: weight
target: target
port: port
TTL: TTL] autorelease];
} else if (recordType == OFDNSRecordTypeURI) {
uint16_t priority, weight;
OFString *target;
if (dataLength < 4)
@throw [OFInvalidServerResponseException exception];
priority = (buffer[i] << 8) | buffer[i + 1];
weight = (buffer[i + 2] << 8) | buffer[i + 3];
target = [OFString stringWithUTF8String: (char *)buffer + i + 4
length: dataLength - 4];
return [[[OFURIDNSResourceRecord alloc]
initWithName: name
DNSClass: DNSClass
priority: priority
weight: weight
target: target
TTL: TTL] autorelease];
} else
return [[[OFDNSResourceRecord alloc]
initWithName: name
DNSClass: DNSClass
recordType: recordType
TTL: TTL] autorelease];
|
| ︙ | ︙ |
Modified src/OFDNSResourceRecord.h from [f961d0d6c9] to [22c9db5136].
| ︙ | ︙ | |||
58 59 60 61 62 63 64 65 66 67 68 69 70 71 | OFDNSRecordTypeRP = 17, /** AAAA */ OFDNSRecordTypeAAAA = 28, /** SRV */ OFDNSRecordTypeSRV = 33, /** All types. Only for queries. */ OFDNSRecordTypeAll = 255, } OFDNSRecordType; /** * @class OFDNSResourceRecord OFDNSResourceRecord.h ObjFW/OFDNSResourceRecord.h * * @brief A class representing a DNS resource record. */ | > > | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | OFDNSRecordTypeRP = 17, /** AAAA */ OFDNSRecordTypeAAAA = 28, /** SRV */ OFDNSRecordTypeSRV = 33, /** All types. Only for queries. */ OFDNSRecordTypeAll = 255, /** URI */ OFDNSRecordTypeURI = 256, } OFDNSRecordType; /** * @class OFDNSResourceRecord OFDNSResourceRecord.h ObjFW/OFDNSResourceRecord.h * * @brief A class representing a DNS resource record. */ |
| ︙ | ︙ | |||
164 165 166 167 168 169 170 | #import "OFMXDNSResourceRecord.h" #import "OFNSDNSResourceRecord.h" #import "OFPTRDNSResourceRecord.h" #import "OFRPDNSResourceRecord.h" #import "OFSOADNSResourceRecord.h" #import "OFSRVDNSResourceRecord.h" #import "OFTXTDNSResourceRecord.h" | > | 166 167 168 169 170 171 172 173 | #import "OFMXDNSResourceRecord.h" #import "OFNSDNSResourceRecord.h" #import "OFPTRDNSResourceRecord.h" #import "OFRPDNSResourceRecord.h" #import "OFSOADNSResourceRecord.h" #import "OFSRVDNSResourceRecord.h" #import "OFTXTDNSResourceRecord.h" #import "OFURIDNSResourceRecord.h" |
Modified src/OFDNSResourceRecord.m from [e70c025f87] to [2231be948e].
| ︙ | ︙ | |||
58 59 60 61 62 63 64 65 66 67 68 69 70 71 | return @"RP"; case OFDNSRecordTypeAAAA: return @"AAAA"; case OFDNSRecordTypeSRV: return @"SRV"; case OFDNSRecordTypeAll: return @"all"; default: return [OFString stringWithFormat: @"%u", recordType]; } } OFDNSClass OFDNSClassParseName(OFString *string) | > > | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | return @"RP"; case OFDNSRecordTypeAAAA: return @"AAAA"; case OFDNSRecordTypeSRV: return @"SRV"; case OFDNSRecordTypeAll: return @"all"; case OFDNSRecordTypeURI: return @"URI"; default: return [OFString stringWithFormat: @"%u", recordType]; } } OFDNSClass OFDNSClassParseName(OFString *string) |
| ︙ | ︙ | |||
115 116 117 118 119 120 121 122 123 124 125 126 127 128 |
recordType = OFDNSRecordTypeRP;
else if ([string isEqual: @"AAAA"])
recordType = OFDNSRecordTypeAAAA;
else if ([string isEqual: @"SRV"])
recordType = OFDNSRecordTypeSRV;
else if ([string isEqual: @"ALL"])
recordType = OFDNSRecordTypeAll;
else {
recordType =
(OFDNSRecordType)[string unsignedLongLongValueWithBase: 0];
}
objc_autoreleasePoolPop(pool);
| > > | 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 |
recordType = OFDNSRecordTypeRP;
else if ([string isEqual: @"AAAA"])
recordType = OFDNSRecordTypeAAAA;
else if ([string isEqual: @"SRV"])
recordType = OFDNSRecordTypeSRV;
else if ([string isEqual: @"ALL"])
recordType = OFDNSRecordTypeAll;
else if ([string isEqual: @"URI"])
recordType = OFDNSRecordTypeURI;
else {
recordType =
(OFDNSRecordType)[string unsignedLongLongValueWithBase: 0];
}
objc_autoreleasePoolPop(pool);
|
| ︙ | ︙ |
Modified src/OFSRVDNSResourceRecord.h from [872e9a519e] to [d5575ff367].
| ︙ | ︙ | |||
54 55 56 57 58 59 60 | - (instancetype)initWithName: (OFString *)name DNSClass: (OFDNSClass)DNSClass recordType: (OFDNSRecordType)recordType TTL: (uint32_t)TTL OF_UNAVAILABLE; /** * @brief Initializes an already allocated OFSRVDNSResourceRecord with the | | | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | - (instancetype)initWithName: (OFString *)name DNSClass: (OFDNSClass)DNSClass recordType: (OFDNSRecordType)recordType TTL: (uint32_t)TTL OF_UNAVAILABLE; /** * @brief Initializes an already allocated OFSRVDNSResourceRecord with the * specified name, priority, weight, target, port and time to live. * * @param name The name for the resource record * @param priority The priority for the resource record * @param weight The weight for the resource record * @param target The target for the resource record * @param port The port on the target for the resource record * @param TTL The time to live for the resource record |
| ︙ | ︙ |
Added src/OFURIDNSResourceRecord.h version [5d24916d2f].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 |
/*
* Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im>
*
* All rights reserved.
*
* This file is part of ObjFW. It may be distributed under the terms of the
* Q Public License 1.0, which can be found in the file LICENSE.QPL included in
* the packaging of this file.
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFDNSResourceRecord.h"
OF_ASSUME_NONNULL_BEGIN
/**
* @class OFURIDNSResourceRecord \
* OFDNSResourceRecord.h ObjFW/OFDNSResourceRecord.h
*
* @brief A class representing an URI DNS resource record.
*/
OF_SUBCLASSING_RESTRICTED
@interface OFURIDNSResourceRecord: OFDNSResourceRecord
{
uint16_t _priority, _weight;
OFString *_target;
}
/**
* @brief The priority of the resource record.
*/
@property (readonly, nonatomic) uint16_t priority;
/**
* @brief The weight of the resource record.
*/
@property (readonly, nonatomic) uint16_t weight;
/**
* @brief The target of the resource record.
*/
@property (readonly, nonatomic) OFString *target;
- (instancetype)initWithName: (OFString *)name
DNSClass: (OFDNSClass)DNSClass
recordType: (OFDNSRecordType)recordType
TTL: (uint32_t)TTL OF_UNAVAILABLE;
/**
* @brief Initializes an already allocated OFURIDNSResourceRecord with the
* specified name, class, priority, weight, target and time to live.
*
* @param name The name for the resource record
* @param DNSClass The class code for the resource record
* @param priority The priority for the resource record
* @param weight The weight for the resource record
* @param target The target for the resource record
* @param TTL The time to live for the resource record
* @return An initialized OFURIDNSResourceRecord
*/
- (instancetype)initWithName: (OFString *)name
DNSClass: (OFDNSClass)DNSClass
priority: (uint16_t)priority
weight: (uint16_t)weight
target: (OFString *)target
TTL: (uint32_t)TTL OF_DESIGNATED_INITIALIZER;
@end
OF_ASSUME_NONNULL_END
|
Added src/OFURIDNSResourceRecord.m version [8d859480dd].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 |
/*
* Copyright (c) 2008-2024 Jonathan Schleifer <js@nil.im>
*
* All rights reserved.
*
* This file is part of ObjFW. It may be distributed under the terms of the
* Q Public License 1.0, which can be found in the file LICENSE.QPL included in
* the packaging of this file.
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFURIDNSResourceRecord.h"
@implementation OFURIDNSResourceRecord
@synthesize priority = _priority, weight = _weight, target = _target;
- (instancetype)initWithName: (OFString *)name
DNSClass: (OFDNSClass)DNSClass
recordType: (OFDNSRecordType)recordType
TTL: (uint32_t)TTL
{
OF_INVALID_INIT_METHOD
}
- (instancetype)initWithName: (OFString *)name
DNSClass: (OFDNSClass)DNSClass
priority: (uint16_t)priority
weight: (uint16_t)weight
target: (OFString *)target
TTL: (uint32_t)TTL
{
self = [super initWithName: name
DNSClass: DNSClass
recordType: OFDNSRecordTypeURI
TTL: TTL];
@try {
_priority = priority;
_weight = weight;
_target = [target copy];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
[_target release];
[super dealloc];
}
- (bool)isEqual: (id)object
{
OFURIDNSResourceRecord *record;
if (object == self)
return true;
if (![object isKindOfClass: [OFURIDNSResourceRecord class]])
return false;
record = object;
if (record->_name != _name && ![record->_name isEqual: _name])
return false;
if (record->_DNSClass != _DNSClass)
return false;
if (record->_recordType != _recordType)
return false;
if (record->_priority != _priority)
return false;
if (record->_weight != _weight)
return false;
if (record->_target != _target && ![record->_target isEqual: _target])
return false;
return true;
}
- (unsigned long)hash
{
unsigned long hash;
OFHashInit(&hash);
OFHashAddHash(&hash, _name.hash);
OFHashAddByte(&hash, _DNSClass >> 8);
OFHashAddByte(&hash, _DNSClass);
OFHashAddByte(&hash, _recordType >> 8);
OFHashAddByte(&hash, _recordType);
OFHashAddByte(&hash, _priority >> 8);
OFHashAddByte(&hash, _priority);
OFHashAddByte(&hash, _weight >> 8);
OFHashAddByte(&hash, _weight);
OFHashAddHash(&hash, _target.hash);
OFHashFinalize(&hash);
return hash;
}
- (OFString *)description
{
return [OFString stringWithFormat:
@"<%@:\n"
@"\tName = %@\n"
@"\tClass = %@\n"
@"\tPriority = %" PRIu16 "\n"
@"\tWeight = %" PRIu16 "\n"
@"\tTarget = %@\n"
@"\tTTL = %" PRIu32 "\n"
@">",
self.className, _name, OFDNSClassName(_DNSClass), _priority,
_weight, _target, _TTL];
}
@end
|