Changeset 31e9fe0 in mainline for uspace/app/dnsres

Timestamp:

2013-04-23T22:05:01Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c55cbbf

Parents:

dc95342

Message:

Dnsrsrv server and dnsres utility.

Location:

uspace/app/dnsres

Files:

• Makefile (added)
• dnsres.c (moved) (moved from uspace/srv/net/dnsres/dnsres.c ) (3 diffs)

uspace/app/dnsres/dnsres.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2013 Jiri Svoboda
  * All rights reserved.
  *
@@ -30 +30 @@
  * @{
  */
-/**
- * @file
+/** @file DNS query utility.
  */
 
+#include <errno.h>
+#include <inet/dnsr.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <errno.h>
 
-#include "dns_msg.h"
-#include "dns_std.h"
-#include "query.h"
+#define NAME "dnsres"
 
-#define NAME  "dnsres"
+static void print_syntax(void)
+{
+        printf("syntax: " NAME " <host-name>\n");
+}
 
 static int addr_format(inet_addr_t *addr, char **bufp)
@@ -60 +61 @@
 int main(int argc, char *argv[])
 {
-        dns_host_info_t *hinfo;
-        char *astr;
         int rc;
+        dnsr_hostinfo_t *hinfo;
+        char *saddr;
 
-        printf("%s: DNS Resolution Service\n", NAME);
-        rc = dns_name2host(argc < 2 ? "helenos.org" : argv[1], &hinfo);
-        printf("dns_name2host() -> rc = %d\n", rc);
+        rc = dnsr_init();
+        if (rc != EOK) {
+                printf(NAME ": Failed connecting to DNS resolution service "
+                    "(%d).\n", rc);
+                return 1;
+        }
 
-        if (rc == EOK) {
-                rc = addr_format(&hinfo->addr, &astr);
-                if (rc != EOK) {
-                        dns_hostinfo_destroy(hinfo);
-                        printf("Out of memory\n");
-                        return ENOMEM;
-                }
+        if (argc != 2) {
+                print_syntax();
+                return 1;
+        }
 
-                printf("hostname: %s\n", hinfo->name);
-                printf("IPv4 address: %s\n", astr);
-                free(astr);
-                dns_hostinfo_destroy(hinfo);
+        rc = dnsr_name2host(argv[1], &hinfo);
+        if (rc != EOK) {
+                printf(NAME ": Error resolving '%s'.\n", argv[1]);
+                return 1;
         }
+
+        rc = addr_format(&hinfo->addr, &saddr);
+        if (rc != EOK) {
+                dnsr_hostinfo_destroy(hinfo);
+                printf(NAME ": Out of memory.\n");
+                return 1;
+        }
+
+        printf("Host name: %s address: %s\n", hinfo->name, saddr);
+        dnsr_hostinfo_destroy(hinfo);
+        free(saddr);
 
         return 0;