Overview
Comment: | OFDNSResolver: Add support for parsing CNAMEs |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
3826822733823abd5a8f785baa4cb59d |
User & Date: | js on 2018-07-29 18:38:58 |
Other Links: | manifest | tags |
Context
2018-07-29
| ||
19:13 | OFDNSResolver: Allow specifying query class & type check-in: af30016cfb user: js tags: trunk | |
18:38 | OFDNSResolver: Add support for parsing CNAMEs check-in: 3826822733 user: js tags: trunk | |
16:16 | macros.h: Fix a typo check-in: 9383a4cf4a user: js tags: trunk | |
Changes
Modified src/OFDNSResolver.m from [f68c605682] to [f87770019a].
︙ | |||
180 181 182 183 184 185 186 187 188 189 190 191 192 193 | 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 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | [components addObject: component]; } while (componentLength > 0); *idx = i; return [components componentsJoinedByString: @"."]; } static id parseData(const unsigned char *buffer, size_t length, size_t i, size_t dataLength, of_dns_resource_record_class_t recordClass, of_dns_resource_record_type_t recordType) { id data; if (recordClass == OF_DNS_RESOURCE_RECORD_CLASS_IN) { size_t j; switch (recordType) { case OF_DNS_RESOURCE_RECORD_TYPE_A: if (dataLength != 4) @throw [OFInvalidServerReplyException exception]; data = [OFString stringWithFormat: @"%u.%u.%u.%u", buffer[i], buffer[i + 1], buffer[i + 2], buffer[i + 3]]; break; case OF_DNS_RESOURCE_RECORD_TYPE_CNAME: j = i; data = parseName(buffer, length, &j, ALLOWED_POINTER_LEVELS); if (j != i + dataLength) @throw [OFInvalidServerReplyException exception]; break; default: data = [OFData dataWithItems: &buffer[i] count: dataLength]; break; } } else data = [OFData dataWithItems: &buffer[i] count: dataLength]; return data; } @implementation OFDNSResolver_context @synthesize host = _host, nameServers = _nameServers; @synthesize searchDomains = _searchDomains; @synthesize nameServersIndex = _nameServersIndex; @synthesize searchDomainsIndex = _searchDomainsIndex, queryData = _queryData; @synthesize target = _target, selector = _selector, userContext = _userContext; |
︙ | |||
615 616 617 618 619 620 621 | 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 | - - + + - + - - + + - - + + - - + + | } numQuestions = (buffer[4] << 8) | buffer[5]; numAnswers = (buffer[6] << 8) | buffer[7]; answers = [OFMutableArray arrayWithCapacity: numAnswers]; |
︙ | |||
758 759 760 761 762 763 764 | 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 | - + - + | length8 = (uint8_t)length; [data addItem: &length8]; [data addItems: [component UTF8String] count: length]; } /* QTYPE */ |
︙ |
Modified src/OFDNSResourceRecord.h from [f3a43148a0] to [1e61fb86ab].
︙ | |||
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | 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 | + + + + + + + + + + + + + + + + + + + + + + + - - - + + + - + - + - + - + - + + + + + - + - - - - - - - - - + + + + + + + + + + + + + + | * file. */ #import "OFObject.h" #import "OFString.h" OF_ASSUME_NONNULL_BEGIN /*! @file */ @class OFData; /*! * @brief The class of a DNS resource record. */ typedef enum { OF_DNS_RESOURCE_RECORD_CLASS_IN = 1 } of_dns_resource_record_class_t; /*! * @brief The type of a DNS resource record. */ typedef enum { OF_DNS_RESOURCE_RECORD_TYPE_A = 1, OF_DNS_RESOURCE_RECORD_TYPE_NS = 2, OF_DNS_RESOURCE_RECORD_TYPE_CNAME = 5, OF_DNS_RESOURCE_RECORD_TYPE_SOA = 6, OF_DNS_RESOURCE_RECORD_TYPE_PTR = 12, OF_DNS_RESOURCE_RECORD_TYPE_MX = 15, OF_DNS_RESOURCE_RECORD_TYPE_TXT = 16, OF_DNS_RESOURCE_RECORD_TYPE_AAAA = 28 } of_dns_resource_record_type_t; /*! * @class OFDNSResourceRecord OFDNSResourceRecord.h ObjFW/OFDNSResourceRecord.h * * @brief A class represenging a DNS resource record. */ @interface OFDNSResourceRecord: OFObject { OFString *_name; |
Modified src/OFDNSResourceRecord.m from [ceee6d54ef] to [1fb8ff8a93].
︙ | |||
17 18 19 20 21 22 23 24 25 | 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 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - + + + - - + + | #include "config.h" #import "OFDNSResourceRecord.h" #import "OFData.h" #import "OFInvalidFormatException.h" OFString * of_dns_resource_record_class_to_string( of_dns_resource_record_class_t recordClass) { switch (recordClass) { case OF_DNS_RESOURCE_RECORD_CLASS_IN: return @"IN"; default: return [OFString stringWithFormat: @"%u", recordClass]; } } OFString * of_dns_resource_record_type_to_string(of_dns_resource_record_type_t recordType) { switch (recordType) { case OF_DNS_RESOURCE_RECORD_TYPE_A: return @"A"; case OF_DNS_RESOURCE_RECORD_TYPE_NS: return @"NS"; case OF_DNS_RESOURCE_RECORD_TYPE_CNAME: return @"CNAME"; case OF_DNS_RESOURCE_RECORD_TYPE_SOA: return @"SOA"; case OF_DNS_RESOURCE_RECORD_TYPE_PTR: return @"PTR"; case OF_DNS_RESOURCE_RECORD_TYPE_MX: return @"MX"; case OF_DNS_RESOURCE_RECORD_TYPE_TXT: return @"TXT"; case OF_DNS_RESOURCE_RECORD_TYPE_AAAA: return @"AAAA"; default: return [OFString stringWithFormat: @"%u", recordType]; } } @implementation OFDNSResourceRecord |
︙ | |||
64 65 66 67 68 69 70 | 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 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 | - + - + - - - - + + + + - - - - - + - + - - - - + - - - - + - - - + - - - - - - - - - - - - - - - - - - | return false; otherRecord = otherObject; if (otherRecord->_name != _name && ![otherRecord->_name isEqual: _name]) return false; |