X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd%2Fsd-resolve%2Ftest-resolve.c;h=354a4071b7efe4fa3fe1e9a3431ef026daae0354;hp=2e4981df7f6902153d0ee5264c2e38ad3c1f91ba;hb=3b1c524154c876aecebc98787975cc2943100210;hpb=968d3d242cc9256eaca9a18155a744b575159cbd diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c index 2e4981df7..354a4071b 100644 --- a/src/libsystemd/sd-resolve/test-resolve.c +++ b/src/libsystemd/sd-resolve/test-resolve.c @@ -4,6 +4,7 @@ This file is part of systemd. Copyright 2005-2008 Lennart Poettering + Copyright 2014 Daniel Buch systemd is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -20,144 +21,151 @@ ***/ #include -#include #include #include #include #include -#include #include -#include -#include #include +#include "socket-util.h" #include "sd-resolve.h" #include "resolve-util.h" #include "macro.h" -int main(int argc, char *argv[]) { - int r = 1; - _cleanup_resolve_unref_ sd_resolve *resolve = NULL; - _cleanup_resolve_addrinfo_free_ struct addrinfo *ai = NULL; - _cleanup_free_ unsigned char *srv = NULL; - sd_resolve_query *q1 = NULL, *q2 = NULL, *q3 = NULL; - struct addrinfo hints = {}; - struct sockaddr_in sa = {}; - _cleanup_free_ char *host = NULL, *serv = NULL; +static int getaddrinfo_handler(sd_resolve_query *q, int ret, const struct addrinfo *ai, void *userdata) { + const struct addrinfo *i; - assert_se(sd_resolve_new(&resolve) >= 0); + assert_se(q); - /* Make a name -> address query */ - hints.ai_family = PF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - hints.ai_flags = AI_CANONNAME; + if (ret != 0) { + log_error("getaddrinfo error: %s %i", gai_strerror(ret), ret); + return 0; + } - r = sd_resolve_getaddrinfo(resolve, argc >= 2 ? argv[1] : "www.heise.de", NULL, &hints, &q1); - if (r < 0) - log_error("sd_resolve_getaddrinfo(): %s\n", strerror(-r)); + for (i = ai; i; i = i->ai_next) { + _cleanup_free_ char *addr = NULL; - /* Make an address -> name query */ - sa.sin_family = AF_INET; - sa.sin_addr.s_addr = inet_addr(argc >= 3 ? argv[2] : "193.99.144.71"); - sa.sin_port = htons(80); + assert_se(sockaddr_pretty(i->ai_addr, i->ai_addrlen, false, true, &addr) == 0); + puts(addr); + } - r = sd_resolve_getnameinfo(resolve, (struct sockaddr*) &sa, sizeof(sa), 0, true, true, &q2); - if (r < 0) - log_error("sd_resolve_getnameinfo(): %s\n", strerror(-r)); + printf("canonical name: %s\n", strna(ai->ai_canonname)); - /* Make a res_query() call */ - r = sd_resolve_res_query(resolve, "_xmpp-client._tcp.gmail.com", C_IN, T_SRV, &q3); - if (r < 0) - log_error("sd_resolve_res_query(): %s\n", strerror(-r)); + return 0; +} - /* Wait until the three queries are completed */ - while (sd_resolve_is_done(q1) == 0 || - sd_resolve_is_done(q2) == 0 || - sd_resolve_is_done(q3) == 0) { +static int getnameinfo_handler(sd_resolve_query *q, int ret, const char *host, const char *serv, void *userdata) { + assert_se(q); - r = sd_resolve_wait(resolve, (uint64_t) -1); - if (r < 0) { - log_error("sd_resolve_wait(): %s\n", strerror(-r)); - assert_not_reached("sd_resolve_wait() failed"); - } + if (ret != 0) { + log_error("getnameinfo error: %s %i", gai_strerror(ret), ret); + return 0; } - /* Interpret the result of the name -> addr query */ - r = sd_resolve_getaddrinfo_done(q1, &ai); - if (r != 0) - log_error("error: %s %i\n", gai_strerror(r), r); - else { - struct addrinfo *i; + printf("Host: %s -- Serv: %s\n", strna(host), strna(serv)); + return 0; +} + +static int res_handler(sd_resolve_query *q, int ret, unsigned char *answer, void *userdata) { + int qdcount, ancount, len; + const unsigned char *pos = answer + sizeof(HEADER); + unsigned char *end = answer + ret; + HEADER *head = (HEADER *) answer; + char name[256]; + assert_se(q); + + if (ret < 0) { + log_error("res_query() error: %s %i", strerror(errno), errno); + return 0; + } - for (i = ai; i; i = i->ai_next) { - char t[256]; - const char *p = NULL; + if (ret == 0) { + log_error("No reply for SRV lookup"); + return 0; + } - if (i->ai_family == PF_INET) - p = inet_ntop(AF_INET, &((struct sockaddr_in*) i->ai_addr)->sin_addr, t, sizeof(t)); - else if (i->ai_family == PF_INET6) - p = inet_ntop(AF_INET6, &((struct sockaddr_in6*) i->ai_addr)->sin6_addr, t, sizeof(t)); + qdcount = ntohs(head->qdcount); + ancount = ntohs(head->ancount); - printf("%s\n", p); - } + printf("%d answers for srv lookup:\n", ancount); - printf("canonical name: %s\n", strna(ai->ai_canonname)); + /* Ignore the questions */ + while (qdcount-- > 0 && (len = dn_expand(answer, end, pos, name, 255)) >= 0) { + assert_se(len >= 0); + pos += len + QFIXEDSZ; } - /* Interpret the result of the addr -> name query */ - r = sd_resolve_getnameinfo_done(q2, &host, &serv); - if (r) - log_error("error: %s %i\n", gai_strerror(r), r); - else - printf("%s -- %s\n", host, serv); + /* Parse the answers */ + while (ancount-- > 0 && (len = dn_expand(answer, end, pos, name, 255)) >= 0) { + /* Ignore the initial string */ + uint16_t pref, weight, port; + assert_se(len >= 0); + pos += len; + /* Ignore type, ttl, class and dlen */ + pos += 10; + + GETSHORT(pref, pos); + GETSHORT(weight, pos); + GETSHORT(port, pos); + len = dn_expand(answer, end, pos, name, 255); + printf("\tpreference: %2d weight: %2d port: %d host: %s\n", + pref, weight, port, name); + + pos += len; + } - /* Interpret the result of the SRV lookup */ - r = sd_resolve_res_done(q3, &srv); + return 0; +} + +int main(int argc, char *argv[]) { + _cleanup_resolve_query_unref_ sd_resolve_query *q1 = NULL, *q2 = NULL, *q3 = NULL; + _cleanup_resolve_unref_ sd_resolve *resolve = NULL; + int r = 0; + + struct addrinfo hints = { + .ai_family = PF_UNSPEC, + .ai_socktype = SOCK_STREAM, + .ai_flags = AI_CANONNAME + }; + + struct sockaddr_in sa = { + .sin_family = AF_INET, + .sin_port = htons(80) + }; + + assert_se(sd_resolve_default(&resolve) >= 0); + + /* Test a floating resolver query */ + sd_resolve_getaddrinfo(resolve, NULL, "redhat.com", "http", NULL, getaddrinfo_handler, NULL); + + /* Make a name -> address query */ + r = sd_resolve_getaddrinfo(resolve, &q1, argc >= 2 ? argv[1] : "www.heise.de", NULL, &hints, getaddrinfo_handler, NULL); if (r < 0) - log_error("error: %s %i\n", strerror(-r), r); - else if (r == 0) - log_error("No reply for SRV lookup\n"); - else { - int qdcount; - int ancount; - int len; - const unsigned char *pos = srv + sizeof(HEADER); - unsigned char *end = srv + r; - HEADER *head = (HEADER *)srv; - char name[256]; - - qdcount = ntohs(head->qdcount); - ancount = ntohs(head->ancount); - - printf("%d answers for srv lookup:\n", ancount); - - /* Ignore the questions */ - while (qdcount-- > 0 && (len = dn_expand(srv, end, pos, name, 255)) >= 0) { - assert(len >= 0); - pos += len + QFIXEDSZ; - } + log_error_errno(r, "sd_resolve_getaddrinfo(): %m"); - /* Parse the answers */ - while (ancount-- > 0 && (len = dn_expand(srv, end, pos, name, 255)) >= 0) { - /* Ignore the initial string */ - uint16_t pref, weight, port; - assert(len >= 0); - pos += len; - /* Ignore type, ttl, class and dlen */ - pos += 10; - - GETSHORT(pref, pos); - GETSHORT(weight, pos); - GETSHORT(port, pos); - len = dn_expand(srv, end, pos, name, 255); - printf("\tpreference: %2d weight: %2d port: %d host: %s\n", - pref, weight, port, name); - - pos += len; + /* Make an address -> name query */ + sa.sin_addr.s_addr = inet_addr(argc >= 3 ? argv[2] : "193.99.144.71"); + r = sd_resolve_getnameinfo(resolve, &q2, (struct sockaddr*) &sa, sizeof(sa), 0, SD_RESOLVE_GET_BOTH, getnameinfo_handler, NULL); + if (r < 0) + log_error_errno(r, "sd_resolve_getnameinfo(): %m"); + + /* Make a res_query() call */ + r = sd_resolve_res_query(resolve, &q3, "_xmpp-client._tcp.gmail.com", C_IN, T_SRV, res_handler, NULL); + if (r < 0) + log_error_errno(r, "sd_resolve_res_query(): %m"); + + /* Wait until the three queries are completed */ + while (sd_resolve_query_is_done(q1) == 0 || + sd_resolve_query_is_done(q2) == 0 || + sd_resolve_query_is_done(q3) == 0) { + + r = sd_resolve_wait(resolve, (uint64_t) -1); + if (r < 0) { + log_error_errno(r, "sd_resolve_wait(): %m"); + assert_not_reached("sd_resolve_wait() failed"); } } - r = 0; - - return r; + return 0; }