From 5a12f4f892685adcbbeecbdc406a297152d0dad1 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 5 Dec 2004 17:36:46 +0000 Subject: rename some stuff git-svn-id: file:///home/lennart/svn/public/nss-mdns/trunk@53 0ee8848e-81ea-0310-a63a-f631d1a40d77 --- src/Makefile | 8 ++++---- src/main.c | 41 ----------------------------------------- src/mdns-test.c | 41 +++++++++++++++++++++++++++++++++++++++++ src/nss-test.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ src/nsstest.c | 48 ------------------------------------------------ 5 files changed, 93 insertions(+), 93 deletions(-) delete mode 100644 src/main.c create mode 100644 src/mdns-test.c create mode 100644 src/nss-test.c delete mode 100644 src/nsstest.c diff --git a/src/Makefile b/src/Makefile index 4c1d3a0..1b70117 100644 --- a/src/Makefile +++ b/src/Makefile @@ -1,11 +1,11 @@ CFLAGS=-Wall -fPIC -g -O0 -W -pipe '-DDEBUG_TRAP=__asm__("int $$3")' -all: query nsstest libnss_mdns.so.2 libnss_mdns6.so.2 libnss_mdns4.so.2 +all: mdns-test nss-test libnss_mdns.so.2 libnss_mdns6.so.2 libnss_mdns4.so.2 -query: query.o dns.o util.o main.o +mdns-test: query.o dns.o util.o mdns-test.o $(CC) $(CFLAGS) -o $@ $^ $(LIBS) -nsstest: nsstest.o +nss-test: nss-test.o libnss_mdns.so.2: query.o dns.o util.o nss.o $(CC) -shared -o $@ -Wl,-soname,$@ $^ @@ -25,4 +25,4 @@ nss4.o: nss.c *.o: *.h clean: - rm -f *.o query *.so.2 nsstest + rm -f *.o mdns-test *.so.2 nss-test diff --git a/src/main.c b/src/main.c deleted file mode 100644 index 5681204..0000000 --- a/src/main.c +++ /dev/null @@ -1,41 +0,0 @@ -#include -#include -#include - -#include "query.h" - -static void ipv4_func(const ipv4_address_t *ipv4, void *userdata) { - fprintf(stderr, "IPV4: %s\n", inet_ntoa(*(struct in_addr*) &ipv4->address)); -} - -static void ipv6_func(const ipv6_address_t *ipv6, void *userdata) { -} - -static void name_func(const char *name, void *userdata) { - fprintf(stderr, "NAME: %s\n", name); -} - -int main(int argc, char *argv[]) { - int ret = 1, fd = -1; - ipv4_address_t ipv4; - - if ((fd = mdns_open_socket()) < 0) - goto finish; - -/* if (mdns_query_name(fd, argc > 1 ? argv[1] : "ecstasy.local", &ipv4_func, &ipv6_func, NULL) < 0) */ -/* goto finish; */ - - ipv4.address = inet_addr(argc > 1 ? argv[1] : "192.168.100.1"); - - if (mdns_query_ipv4(fd, &ipv4, name_func, NULL) < 0) - goto finish; - - ret = 0; - -finish: - - if (fd >= 0) - close(fd); - - return ret; -} diff --git a/src/mdns-test.c b/src/mdns-test.c new file mode 100644 index 0000000..5681204 --- /dev/null +++ b/src/mdns-test.c @@ -0,0 +1,41 @@ +#include +#include +#include + +#include "query.h" + +static void ipv4_func(const ipv4_address_t *ipv4, void *userdata) { + fprintf(stderr, "IPV4: %s\n", inet_ntoa(*(struct in_addr*) &ipv4->address)); +} + +static void ipv6_func(const ipv6_address_t *ipv6, void *userdata) { +} + +static void name_func(const char *name, void *userdata) { + fprintf(stderr, "NAME: %s\n", name); +} + +int main(int argc, char *argv[]) { + int ret = 1, fd = -1; + ipv4_address_t ipv4; + + if ((fd = mdns_open_socket()) < 0) + goto finish; + +/* if (mdns_query_name(fd, argc > 1 ? argv[1] : "ecstasy.local", &ipv4_func, &ipv6_func, NULL) < 0) */ +/* goto finish; */ + + ipv4.address = inet_addr(argc > 1 ? argv[1] : "192.168.100.1"); + + if (mdns_query_ipv4(fd, &ipv4, name_func, NULL) < 0) + goto finish; + + ret = 0; + +finish: + + if (fd >= 0) + close(fd); + + return ret; +} diff --git a/src/nss-test.c b/src/nss-test.c new file mode 100644 index 0000000..d4f1c4c --- /dev/null +++ b/src/nss-test.c @@ -0,0 +1,48 @@ +#include +#include +#include +#include +#include + +int main(int argc, char *argv[]) { + struct hostent *he; + in_addr_t **a; + char *arg= argc > 1 ? argv[1] : "whiskey.local"; + uint8_t t[256]; + + if (inet_pton(AF_INET, arg, &t) > 0) + he = gethostbyaddr(t, 4, AF_INET); + else if (inet_pton(AF_INET6, arg, &t) > 0) + he = gethostbyaddr(t, 16, AF_INET6); + else + he = gethostbyname(arg); + + if (!he) { + fprintf(stderr, "lookup failed\n"); + return 1; + } + + fprintf(stderr, "official name: %s\n", he->h_name); + + if (!he->h_aliases || !he->h_aliases[0]) + fprintf(stderr, "no aliases\n"); + else { + char **h; + fprintf(stderr, "aliases:"); + for (h = he->h_aliases; *h; h++) + fprintf(stderr, " %s", *h); + fprintf(stderr, "\n"); + } + + fprintf(stderr, "addr type: %s\n", he->h_addrtype == AF_INET ? "inet" : (he->h_addrtype == AF_INET6 ? "inet6" : NULL)); + fprintf(stderr, "addr length: %i\n", he->h_length); + + fprintf(stderr, "addresses:"); + for (a = (in_addr_t**) he->h_addr_list; *a; a++) { + char t[256]; + fprintf(stderr, " %s", inet_ntop(he->h_addrtype, *a, t, sizeof(t))); + } + fprintf(stderr, "\n"); + + return 0; +} diff --git a/src/nsstest.c b/src/nsstest.c deleted file mode 100644 index d4f1c4c..0000000 --- a/src/nsstest.c +++ /dev/null @@ -1,48 +0,0 @@ -#include -#include -#include -#include -#include - -int main(int argc, char *argv[]) { - struct hostent *he; - in_addr_t **a; - char *arg= argc > 1 ? argv[1] : "whiskey.local"; - uint8_t t[256]; - - if (inet_pton(AF_INET, arg, &t) > 0) - he = gethostbyaddr(t, 4, AF_INET); - else if (inet_pton(AF_INET6, arg, &t) > 0) - he = gethostbyaddr(t, 16, AF_INET6); - else - he = gethostbyname(arg); - - if (!he) { - fprintf(stderr, "lookup failed\n"); - return 1; - } - - fprintf(stderr, "official name: %s\n", he->h_name); - - if (!he->h_aliases || !he->h_aliases[0]) - fprintf(stderr, "no aliases\n"); - else { - char **h; - fprintf(stderr, "aliases:"); - for (h = he->h_aliases; *h; h++) - fprintf(stderr, " %s", *h); - fprintf(stderr, "\n"); - } - - fprintf(stderr, "addr type: %s\n", he->h_addrtype == AF_INET ? "inet" : (he->h_addrtype == AF_INET6 ? "inet6" : NULL)); - fprintf(stderr, "addr length: %i\n", he->h_length); - - fprintf(stderr, "addresses:"); - for (a = (in_addr_t**) he->h_addr_list; *a; a++) { - char t[256]; - fprintf(stderr, " %s", inet_ntop(he->h_addrtype, *a, t, sizeof(t))); - } - fprintf(stderr, "\n"); - - return 0; -} -- cgit