FILE *fp = fopen(fname, "wb");
if(fp) {
- fprintf(stderr, "Writing cache to %s\n", fname);
fwrite(&cache->data, sizeof(cache->data), 1, fp);
fclose(fp);
}
if(cache->ai) {
if(cache->aip) {
sockaddr_t *sa = (sockaddr_t *)cache->aip->ai_addr;
+ cache->aip = cache->aip->ai_next;
if(find_cached(cache, sa) != NOT_CACHED) {
continue;
}
- cache->aip = cache->aip->ai_next;
return sa;
} else {
free_known_addresses(cache->ai);
cache->cfg = lookup_config(cache->config_tree, "Address");
}
- while(cache->cfg && !cache->ai) {
+ while(cache->cfg && !cache->aip) {
char *address, *port;
get_config_string(cache->cfg, &address);
}
}
+ if(cache->ai) {
+ free_known_addresses(cache->ai);
+ }
+
cache->aip = cache->ai = str2addrinfo(address, port, SOCK_STREAM);
+
+ if(cache->ai) {
+ struct addrinfo *ai = NULL;
+
+ for(; cache->aip; cache->aip = cache->aip->ai_next) {
+ struct addrinfo *oai = ai;
+
+ ai = xzalloc(sizeof(*ai));
+ ai->ai_family = cache->aip->ai_family;
+ ai->ai_socktype = cache->aip->ai_socktype;
+ ai->ai_protocol = cache->aip->ai_protocol;
+ ai->ai_addrlen = cache->aip->ai_addrlen;
+ ai->ai_addr = xmalloc(ai->ai_addrlen);
+ memcpy(ai->ai_addr, cache->aip->ai_addr, ai->ai_addrlen);
+ ai->ai_next = oai;
+ }
+
+ freeaddrinfo(cache->ai);
+ cache->aip = cache->ai = ai;
+ }
+
free(address);
free(port);
cache->aip = cache->aip->ai_next;
return sa;
} else {
- freeaddrinfo(cache->ai);
+ free_known_addresses(cache->ai);
cache->ai = NULL;
}
}
}
if(cache->ai) {
- if(cache->tried == cache->data.used) {
- free_known_addresses(cache->ai);
- } else {
- freeaddrinfo(cache->ai);
- }
+ free_known_addresses(cache->ai);
}
cache->config_tree = NULL;
}
if(cache->ai) {
- if(cache->tried == cache->data.used) {
- free_known_addresses(cache->ai);
- } else {
- freeaddrinfo(cache->ai);
- }
+ free_known_addresses(cache->ai);
}
free(cache);