Differences From Artifact [1a84838633]:
- File src/OFDNSResolverSettings.m — part of check-in [0ceb5bb869] at 2022-11-06 20:20:25 on branch trunk — OFDNSResolverSettings: Use native encoding (user: js, size: 16671) [annotate] [blame] [check-ins using] [more...]
To Artifact [179fc83ef4]:
- File
src/OFDNSResolverSettings.m
— part of check-in
[ce2b268163]
at
2023-04-17 11:56:02
on branch trunk
— Always make DNS names lowercase
This avoids problems when comparing them. (user: js, size: 17103) [annotate] [blame] [check-ins using] [more...]
1 | /* | | | 1 2 3 4 5 6 7 8 9 | /* * Copyright (c) 2008-2023 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. * |
| ︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | #import "OFString.h" #ifdef OF_WINDOWS # import "OFWindowsRegistryKey.h" #endif #import "OFInvalidFormatException.h" #import "OFOpenItemFailedException.h" #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #ifdef OF_WINDOWS # define interface struct # include <iphlpapi.h> # undef interface #endif | > > > > | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | #import "OFString.h" #ifdef OF_WINDOWS # import "OFWindowsRegistryKey.h" #endif #import "OFInvalidFormatException.h" #import "OFOpenItemFailedException.h" #ifdef OF_WINDOWS # import "OFOpenWindowsRegistryKeyFailedException.h" #endif #import "OFOutOfMemoryException.h" #import "OFOutOfRangeException.h" #import "OFUndefinedKeyException.h" #ifdef OF_WINDOWS # define interface struct # include <iphlpapi.h> # undef interface #endif |
| ︙ | ︙ | |||
209 210 211 212 213 214 215 | copy->_nameServers = [_nameServers copy]; copy->_localDomain = [_localDomain copy]; copy->_searchDomains = [_searchDomains copy]; copy->_timeout = _timeout; copy->_maxAttempts = _maxAttempts; copy->_minNumberOfDotsInAbsoluteName = _minNumberOfDotsInAbsoluteName; | | | 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 |
copy->_nameServers = [_nameServers copy];
copy->_localDomain = [_localDomain copy];
copy->_searchDomains = [_searchDomains copy];
copy->_timeout = _timeout;
copy->_maxAttempts = _maxAttempts;
copy->_minNumberOfDotsInAbsoluteName =
_minNumberOfDotsInAbsoluteName;
copy->_forcesTCP = _forcesTCP;
copy->_configReloadInterval = _configReloadInterval;
copy->_lastConfigReload = [_lastConfigReload copy];
} @catch (id e) {
[copy release];
@throw e;
}
|
| ︙ | ︙ | |||
237 238 239 240 241 242 243 | [_searchDomains release]; _searchDomains = nil; _timeout = 2; _maxAttempts = 3; _minNumberOfDotsInAbsoluteName = 1; | | | 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 | [_searchDomains release]; _searchDomains = nil; _timeout = 2; _maxAttempts = 3; _minNumberOfDotsInAbsoluteName = 1; _forcesTCP = false; #ifndef OF_NINTENDO_3DS _configReloadInterval = 2; #else _configReloadInterval = 0; #endif } |
| ︙ | ︙ | |||
286 287 288 289 290 291 292 |
continue;
address = components.firstObject;
hosts = [components objectsInRange:
OFMakeRange(1, components.count - 1)];
for (OFString *host in hosts) {
| | > > | | 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 |
continue;
address = components.firstObject;
hosts = [components objectsInRange:
OFMakeRange(1, components.count - 1)];
for (OFString *host in hosts) {
OFMutableArray *addresses;
host = host.lowercaseString;
addresses = [staticHosts objectForKey: host];
if (addresses == nil) {
addresses = [OFMutableArray array];
[staticHosts setObject: addresses forKey: host];
}
[addresses addObject: address];
|
| ︙ | ︙ | |||
339 340 341 342 343 344 345 |
_maxAttempts = (unsigned int)number;
} else if ([option hasPrefix: @"reload-period:"]) {
option = [option substringFromIndex: 14];
_configReloadInterval = option.unsignedLongLongValue;
} else if ([option isEqual: @"tcp"])
| | | 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 |
_maxAttempts = (unsigned int)number;
} else if ([option hasPrefix: @"reload-period:"]) {
option = [option substringFromIndex: 14];
_configReloadInterval = option.unsignedLongLongValue;
} else if ([option isEqual: @"tcp"])
_forcesTCP = true;
} @catch (OFInvalidFormatException *e) {
}
}
- (void)parseResolvConf: (OFString *)path
{
void *pool = objc_autoreleasePoolPush();
|
| ︙ | ︙ | |||
443 444 445 446 447 448 449 | PIP_ADDR_STRING iter; if (GetNetworkParams(fixedInfo, &length) != ERROR_SUCCESS) return; nameServers = [OFMutableArray array]; | | > | | > > > > | 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 |
PIP_ADDR_STRING iter;
if (GetNetworkParams(fixedInfo, &length) != ERROR_SUCCESS)
return;
nameServers = [OFMutableArray array];
for (iter = &fixedInfo->DnsServerList; iter != NULL;
iter = iter->Next) {
OFString *nameServer =
[OFString stringWithCString: iter->IpAddress.String
encoding: encoding];
if (nameServer.length > 0)
[nameServers addObject: nameServer];
}
if (nameServers.count > 0) {
[nameServers makeImmutable];
_nameServers = [nameServers copy];
}
if (fixedInfo->DomainName[0] != '\0')
|
| ︙ | ︙ | |||
489 490 491 492 493 494 495 |
continue;
address = components.firstObject;
hosts = [components objectsInRange:
OFMakeRange(1, components.count - 1)];
for (OFString *host in hosts) {
| | > > | | 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 |
continue;
address = components.firstObject;
hosts = [components objectsInRange:
OFMakeRange(1, components.count - 1)];
for (OFString *host in hosts) {
OFMutableArray *addresses;
host = host.lowercaseString;
addresses = [staticHosts objectForKey: host];
if (addresses == nil) {
addresses = [OFMutableArray array];
[staticHosts setObject: addresses forKey: host];
}
[addresses addObject: address];
|
| ︙ | ︙ | |||
598 599 600 601 602 603 604 |
_nameServers = [nameServers copy];
}
}
#endif
- (void)reload
{
| < | > > | > > | | | | | | | > > > > > | 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 |
_nameServers = [nameServers copy];
}
}
#endif
- (void)reload
{
#ifdef OF_WINDOWS
OFString *path = nil;
#endif
void *pool;
/*
* TODO: Rather than reparsing every time, check what actually changed
* (mtime) and only reset those.
*/
if (_lastConfigReload != nil && _configReloadInterval > 0 &&
_lastConfigReload.timeIntervalSinceNow < _configReloadInterval)
return;
pool = objc_autoreleasePoolPush();
[self setDefaults];
#if defined(OF_WINDOWS)
# ifdef OF_HAVE_FILES
@try {
OFWindowsRegistryKey *key;
key = [[OFWindowsRegistryKey localMachineKey]
openSubkeyAtPath: @"SYSTEM\\CurrentControlSet\\Services\\"
@"Tcpip\\Parameters"
accessRights: KEY_QUERY_VALUE
options: 0];
path = [[[key stringForValueNamed: @"DataBasePath"]
stringByAppendingPathComponent: @"hosts"]
stringByExpandingWindowsEnvironmentStrings];
} @catch (OFOpenWindowsRegistryKeyFailedException *e) {
/* Ignore */
} @catch (OFUndefinedKeyException *e) {
/* Ignore */
}
if (path != nil)
[self parseHosts: path];
# endif
[self obtainWindowsSystemConfig];
#elif defined(OF_MORPHOS)
|
| ︙ | ︙ |