use nodename/servname instead of node/service

diff --git a/backends/any.c b/backends/any.c
index c9d1642db04de4209bf6a0b0976c39bd4b879246..514228c614d456a0aad893c403360dd9449bc980 100644 (file)
--- a/backends/any.c
+++ b/backends/any.c
@@ -30,7 +30,7 @@ static struct in_addr inaddr_any = { 0 };
 void
 start(netresolve_query_t query, char **settings)
 {
-       const char *node = netresolve_backend_get_node(query);
+       const char *node = netresolve_backend_get_nodename(query);
 
        /* Fail for non-NULL node name and when defaulting to loopback is requested. */
        if (netresolve_backend_get_default_loopback(query) || (node && *node)) {

diff --git a/backends/dns.c b/backends/dns.c
index ab28630ab416b9a422e87e90525245027bef6179..decd968e34fe9aad1dff66790032849e79f3a037 100644 (file)
--- a/backends/dns.c
+++ b/backends/dns.c
@@ -119,7 +119,7 @@ start_address_lookup(netresolve_query_t query, struct ares_srv_reply *srv)
 {
        struct priv_dns *priv = netresolve_backend_get_priv(query);
        int family = netresolve_backend_get_family(query);
-       const char *node = netresolve_backend_get_node(query);
+       const char *node = netresolve_backend_get_nodename(query);
        struct priv_address_lookup *lookup_data = calloc(1, sizeof *lookup_data);
 
        if (!lookup_data) {
@@ -188,9 +188,9 @@ start_srv_lookup(netresolve_query_t query)
        char *name;
 
        if (asprintf(&name, "_%s._%s.%s",
-                       netresolve_backend_get_service(query),
+                       netresolve_backend_get_servname(query),
                        protocol_to_string(netresolve_backend_get_protocol(query)),
-                       netresolve_backend_get_node(query)) == -1) {
+                       netresolve_backend_get_nodename(query)) == -1) {
                netresolve_backend_failed(query);
                return;
        }

diff --git a/backends/getaddrinfo.c b/backends/getaddrinfo.c
index 38c26203617e97b10f4dc1b16b2cd7aebdaa2e53..e4a29d2af5d9353fa414fd118ff34838f7663362 100644 (file)
--- a/backends/getaddrinfo.c
+++ b/backends/getaddrinfo.c
@@ -66,8 +66,8 @@ add_addresses(netresolve_query_t query, const struct addrinfo *first)
 void
 start(netresolve_query_t query, char **settings)
 {
-       const char *node = netresolve_backend_get_node(query);
-       const char *service = netresolve_backend_get_service(query);
+       const char *node = netresolve_backend_get_nodename(query);
+       const char *service = netresolve_backend_get_servname(query);
        struct addrinfo hints = {
                .ai_family = netresolve_backend_get_family(query),
                .ai_socktype = netresolve_backend_get_socktype(query),

diff --git a/backends/hosts.c b/backends/hosts.c
index a2678a94d146c7091db2449eda0236adf1622fea..b449b9866352c45aa11ea3d4eac5423db3fddbc0 100644 (file)
--- a/backends/hosts.c
+++ b/backends/hosts.c
@@ -142,7 +142,7 @@ out:
 void
 start(netresolve_query_t query, char **settings)
 {
-       const char *request_node = netresolve_backend_get_node(query);
+       const char *request_node = netresolve_backend_get_nodename(query);
        const Node *node;
        int count = 0;
 

diff --git a/backends/loopback.c b/backends/loopback.c
index 9dd58b3d3c2d1f1bd8d042228ef99aff4d9b740d..29d33cc3569f9ce1db2b2aa6d15bebf7622103d4 100644 (file)
--- a/backends/loopback.c
+++ b/backends/loopback.c
@@ -37,7 +37,7 @@ static const struct in_addr inaddr_loopback = { 0x0100007f };
 void
 start(netresolve_query_t query, char **settings)
 {
-       const char *node = netresolve_backend_get_node(query);
+       const char *node = netresolve_backend_get_nodename(query);
        bool ipv4 = !node || !*node || !strcmp(node, "localhost") || !strcmp(node, "localhost4");
        bool ipv6 = !node || !*node || !strcmp(node, "localhost") || !strcmp(node, "localhost6");
 

diff --git a/backends/nss.c b/backends/nss.c
index df3dc870beaffcc51f955417f95855a18f88fc0a..332a70bf674739c85ef4caf11ac76e2e2bcee7c3 100644 (file)
--- a/backends/nss.c
+++ b/backends/nss.c
@@ -114,7 +114,7 @@ void
 start(netresolve_query_t query, char **settings)
 {
        struct priv_nss *priv = netresolve_backend_new_priv(query, sizeof *priv);
-       const char *node = netresolve_backend_get_node(query);
+       const char *node = netresolve_backend_get_nodename(query);
        int family = netresolve_backend_get_family(query);
        int status = NSS_STATUS_UNAVAIL;
 

diff --git a/backends/numerichost.c b/backends/numerichost.c
index c7c1121e7ae4a2ecb1dd384d5e0ebcce55b202fd..f1dbf44c53582c68e8024f84e52500d30f2a6689 100644 (file)
--- a/backends/numerichost.c
+++ b/backends/numerichost.c
@@ -26,7 +26,7 @@
 void
 start(netresolve_query_t query, char **settings)
 {
-       const char *request_node = netresolve_backend_get_node(query);
+       const char *request_node = netresolve_backend_get_nodename(query);
        Address address;
        int family;
        int ifindex;

diff --git a/backends/unix.c b/backends/unix.c
index 2ec9e017c5f0a2d4dce9d8bb7c1b263b8aa1ddf8..afd0ec12505d6a49a76d811e321fae3a330cf067 100644 (file)
--- a/backends/unix.c
+++ b/backends/unix.c
@@ -29,7 +29,7 @@
 void
 start(netresolve_query_t query, char **settings)
 {
-       const char *node = netresolve_backend_get_node(query);
+       const char *node = netresolve_backend_get_nodename(query);
        int family = netresolve_backend_get_family(query);
        int socktype = netresolve_backend_get_socktype(query);
 

diff --git a/lib/backend.c b/lib/backend.c
index b6621234b63420654f75b438e76861e204784b8d..0e07c7f8025cc19f0a5e6f56420032ccdd756bc0 100644 (file)
--- a/lib/backend.c
+++ b/lib/backend.c
@@ -34,15 +34,15 @@
 #include "netresolve-private.h"
 
 const char *
-netresolve_backend_get_node(netresolve_query_t query)
+netresolve_backend_get_nodename(netresolve_query_t query)
 {
-       return query->request.node;
+       return query->request.nodename;
 }
 
 const char *
-netresolve_backend_get_service(netresolve_query_t query)
+netresolve_backend_get_servname(netresolve_query_t query)
 {
-       return query->request.service;
+       return query->request.servname;
 }
 
 int
@@ -141,7 +141,7 @@ netresolve_backend_add_path(netresolve_query_t query,
                        .ifindex = ifindex,
                };
 
-               netresolve_get_service_info(path_callback, &data, query->request.service,
+               netresolve_get_service_info(path_callback, &data, query->request.servname,
                                query->request.socktype, query->request.protocol);
                return;
        }

diff --git a/lib/channel.c b/lib/channel.c
index a5bd9bba75a3345c1a75714fd0ef6a2279e34d28..228950bdab6faa18417434091e7afe445819e682 100644 (file)
--- a/lib/channel.c
+++ b/lib/channel.c
@@ -273,8 +273,8 @@ netresolve_query(netresolve_t channel, const char *node, const char *service)
        channel->query->backend = channel->backends;
 
        memcpy(&channel->query->request, &channel->request, sizeof channel->request);
-       channel->query->request.node = node;
-       channel->query->request.service = service;
+       channel->query->request.nodename = node;
+       channel->query->request.servname = service;
 
        netresolve_query_set_state(channel->query, NETRESOLVE_STATE_WAITING);
 

diff --git a/lib/netresolve-backend.h b/lib/netresolve-backend.h
index 52d30115f8072836ecb3fbe6c1a8161342836644..ca21b93ff495114ead9981bc501461dfd4053bdb 100644 (file)
--- a/lib/netresolve-backend.h
+++ b/lib/netresolve-backend.h
@@ -36,8 +36,8 @@
 typedef struct netresolve_query *netresolve_query_t;
 
 /* Input */
-const char *netresolve_backend_get_node(netresolve_query_t query);
-const char *netresolve_backend_get_service(netresolve_query_t query);
+const char *netresolve_backend_get_nodename(netresolve_query_t query);
+const char *netresolve_backend_get_servname(netresolve_query_t query);
 int netresolve_backend_get_family(netresolve_query_t query);
 int netresolve_backend_get_protocol(netresolve_query_t query);
 int netresolve_backend_get_socktype(netresolve_query_t query);

diff --git a/lib/netresolve-private.h b/lib/netresolve-private.h
index b4679be8a9f8be81676b132b198e39fa6ecac8ab..d605f9e61c98ff791dbac1c679b77662afe1a6a4 100644 (file)
--- a/lib/netresolve-private.h
+++ b/lib/netresolve-private.h
@@ -89,18 +89,18 @@ struct netresolve_channel {
                void *user_data_sock;
        } callbacks;
        struct netresolve_request {
-               /* Perform L3 address resolution using 'node' if not NULL. Use
+               /* Perform L3 address resolution using 'nodename' if not NULL. Use
                 * 'family' to chose between IPv4, IPv6 and mixed IPv4/IPv6
-                * resolution and additional flags to further tweak node name
+                * resolution and additional flags to further tweak nodename name
                 * resolution.
                 */
-               const char *node;
+               const char *nodename;
                int family;
-               /* Perform L4 port resolution using 'service' if not NULL. Use
+               /* Perform L4 port resolution using 'servname' if not NULL. Use
                 * 'socktype' and 'protocol' to limit the possible options and
-                * additional flags to further tweak service name resolution.
+                * additional flags to further tweak servname name resolution.
                 */
-               const char *service;
+               const char *servname;
                int socktype;
                int protocol;
                /* Advanced configuration */

diff --git a/lib/string.c b/lib/string.c
index 2516397343353eec237cea9c05e6cf88d902a05f..518ed7929520b4c32e0b02597fc7fbf40e4606f2 100644 (file)
--- a/lib/string.c
+++ b/lib/string.c
@@ -116,8 +116,8 @@ add_path(char **start, char *end, netresolve_query_t query, int i)
 const char *
 netresolve_get_request_string(netresolve_query_t query)
 {
-       const char *node = netresolve_backend_get_node(query);
-       const char *service = netresolve_backend_get_service(query);
+       const char *node = netresolve_backend_get_nodename(query);
+       const char *service = netresolve_backend_get_servname(query);
        char *start = query->buffer;
        char *end = query->buffer + sizeof query->buffer;