mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
resolver: the system's name servers and hosts file by default
Without nserver (or fakeresolve) names were resolved by the C library. 3proxy's own resolver is now the default, with the system's name servers: up to 3 from /etc/resolv.conf, on Windows from the registry (set for the system, set for an interface with an address, Tcpip6 interfaces, then those DHCP gave). With none found, the C library as before. nserver takes up to 3 as well (MAXNSERVERS), a fourth is warned about. The name servers in force belong to the process, not a configuration: nserver lines are kept aside while a configuration is read and replace them only once it is committed, so a reload resolves with those in force until then. Resolutions and dnspr read a copy of them. The system's are read at start, before the configuration and a chroot in it, and are in force while it is read, so its host names resolve with them; read again at a commit, and checked every 5 seconds from the main loop while the default is in force. What cannot be read then (within a chroot) stays as last read. The hosts file, read with them, is imported into tables of its own while the default is in force: its first address of a family for a name. A name is looked up as one nsrecord made first, then the hosts file, then the name cache, then name servers. A changed file replaces what was imported. No name cache is made for it: without nscache nothing is cached, as before. The name cache's keys are host names of any case now: DNS names are. Tests: sysdns, a name of the hosts file answered by dnspr without nserver, in any case, and not with one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
8517a5675b
commit
d5e78a0900
11 files changed
+589
-45
No files matched your search
+18
-2
@@ -19,6 +19,19 @@ static void char_index2hash(const struct hashtable *ht, void *index, uint8_t *ha
|
||||
}
|
||||
}
|
||||
|
||||
/* A host name, whose case does not matter: hashed as lower case */
|
||||
static void dns_index2hash(const struct hashtable *ht, void *index, uint8_t *hash){
|
||||
char low[1024];
|
||||
size_t i, len = strlen((const char *)index);
|
||||
|
||||
if(len >= sizeof(low)) {
|
||||
char_index2hash(ht, index, hash);
|
||||
return;
|
||||
}
|
||||
for(i = 0; i <= len; i++) low[i] = (char)tolower(((unsigned char *)index)[i]);
|
||||
char_index2hash(ht, low, hash);
|
||||
}
|
||||
|
||||
static void param2hash_add(const struct hashtable *ht, void *index, uint8_t *hash){
|
||||
struct clientparam *param = (struct clientparam *)index;
|
||||
|
||||
@@ -76,8 +89,11 @@ void param2hash_search(const struct hashtable *ht, void *index, uint8_t *hash){
|
||||
memcpy(param->hash, hash, ht->hash_size);
|
||||
}
|
||||
|
||||
struct hashtable dns_table = {char_index2hash, char_index2hash, 4, 32};
|
||||
struct hashtable dns6_table = {char_index2hash, char_index2hash, 16, 32};
|
||||
struct hashtable dns_table = {dns_index2hash, dns_index2hash, 4, 32};
|
||||
struct hashtable dns6_table = {dns_index2hash, dns_index2hash, 16, 32};
|
||||
/* the hosts file, while the system's resolver is the default */
|
||||
struct hashtable hosts_table = {dns_index2hash, dns_index2hash, 4, 32};
|
||||
struct hashtable hosts6_table = {dns_index2hash, dns_index2hash, 16, 32};
|
||||
struct hashtable auth_table = {param2hash_add, param2hash_search, sizeof(struct authcache), 64};
|
||||
/* users: each configuration has a table of its own, made from this one */
|
||||
const struct hashtable pwl_template = {char_index2hash, char_index2hash, 64, 64};
|
||||
Reference in new issue
Block a user