From 3742edaf0766abcb0479aee70d1dbf3f29b3355a Mon Sep 17 00:00:00 2001
From: Willem Toorop <willem@nlnetlabs.nl>
Date: Wed, 1 Oct 2014 13:08:36 +0200
Subject: [PATCH] Get rid of the address_string attribute

Not in the spec, and had internal usage only (but not anymore)
---
 src/context.c        | 58 --------------------------------------------
 src/types-internal.h |  1 -
 2 files changed, 59 deletions(-)

diff --git a/src/context.c b/src/context.c
index 74bb545d..99830056 100755
--- a/src/context.c
+++ b/src/context.c
@@ -63,7 +63,6 @@ getdns_return_t create_default_namespaces(struct getdns_context *context);
 getdns_return_t create_local_hosts(struct getdns_context *context);
 getdns_return_t destroy_local_hosts(struct getdns_context *context);
 static struct getdns_list *create_default_root_servers(void);
-static getdns_return_t add_ip_str(struct getdns_dict *);
 static getdns_return_t set_os_defaults(struct getdns_context *);
 static int transaction_id_cmp(const void *, const void *);
 static int timeout_cmp(const void *, const void *);
@@ -185,61 +184,6 @@ create_default_root_servers()
     return NULL;
 }
 
-#define IP_STR_BUFF_LEN 512
-
-static getdns_return_t
-add_ip_str(struct getdns_dict * ip)
-{
-    struct sockaddr_storage storage;
-    uint32_t port = 0;
-    char buff[IP_STR_BUFF_LEN];
-    memset(buff, 0, IP_STR_BUFF_LEN);
-    getdns_return_t r = dict_to_sockaddr(ip, &storage);
-    if (r != GETDNS_RETURN_GOOD) {
-        return r;
-    }
-    if (storage.ss_family == AF_INET) {
-        struct sockaddr_in *addr = (struct sockaddr_in *) &storage;
-        const char *ipStr =
-        inet_ntop(AF_INET, &(addr->sin_addr), buff, IP_STR_BUFF_LEN);
-        if (!ipStr) {
-            return GETDNS_RETURN_GENERIC_ERROR;
-        }
-        r = getdns_dict_get_int(ip, GETDNS_STR_PORT, &port);
-        if (r == GETDNS_RETURN_GOOD && port > 0) {
-            size_t addrLen = strlen(ipStr);
-            /* append @ and port */
-            buff[addrLen] = '@';
-            ++addrLen;
-            snprintf(buff + addrLen, IP_STR_BUFF_LEN - addrLen, "%d", port);
-        }
-        getdns_dict_util_set_string(ip, GETDNS_STR_ADDRESS_STRING,
-            ipStr);
-    } else if (storage.ss_family == AF_INET6) {
-        struct sockaddr_in6 *addr = (struct sockaddr_in6 *) &storage;
-        const char *ipStr =
-            inet_ntop(AF_INET6, &(addr->sin6_addr), buff, IP_STR_BUFF_LEN);
-        if (!ipStr) {
-            return GETDNS_RETURN_GENERIC_ERROR;
-        }
-        r = getdns_dict_get_int(ip, GETDNS_STR_PORT, &port);
-        if (r == GETDNS_RETURN_GOOD && port > 0) {
-            size_t addrLen = strlen(ipStr);
-            /* append @ and port */
-            buff[addrLen] = '@';
-            ++addrLen;
-            snprintf(buff + addrLen, IP_STR_BUFF_LEN - addrLen, "%d", port);
-        }
-
-        getdns_dict_util_set_string(ip, GETDNS_STR_ADDRESS_STRING,
-            ipStr);
-    } else {
-        /* unknown */
-        return GETDNS_RETURN_GENERIC_ERROR;
-    }
-    return GETDNS_RETURN_GOOD;
-}
-
 /**
  * check a file for changes since the last check
  * and refresh the current data if changes are detected
@@ -1129,7 +1073,6 @@ getdns_context_set_dns_root_servers(struct getdns_context *context,
             for (i = 0; i < count; ++i) {
                 struct getdns_dict *dict = NULL;
                 getdns_list_get_dict(addresses, i, &dict);
-                r = add_ip_str(dict);
                 if (r != GETDNS_RETURN_GOOD) {
                     break;
                 }
@@ -1275,7 +1218,6 @@ getdns_context_set_upstream_recursive_servers(struct getdns_context *context,
     for (i = 0; i < count; ++i) {
         struct getdns_dict *dict = NULL;
         getdns_list_get_dict(upstream_list, i, &dict);
-        r = add_ip_str(dict);
         if (r != GETDNS_RETURN_GOOD) {
             break;
         }
diff --git a/src/types-internal.h b/src/types-internal.h
index c2e020e6..eea0779e 100644
--- a/src/types-internal.h
+++ b/src/types-internal.h
@@ -49,7 +49,6 @@ struct getdns_context;
 #define GETDNS_STR_IPV6 "IPv6"
 #define GETDNS_STR_ADDRESS_TYPE "address_type"
 #define GETDNS_STR_ADDRESS_DATA "address_data"
-#define GETDNS_STR_ADDRESS_STRING "address_string"
 #define GETDNS_STR_PORT "port"
 #define GETDNS_STR_EXTENSION_RETURN_BOTH_V4_AND_V6 "return_both_v4_and_v6"