Changeset 5d1cb8a in mainline

Timestamp:

2013-05-03T21:11:23Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4e716180

Parents:

8fdb18e

Message:

DNS configuration utility.

Files:

• boot/Makefile.common (modified) (1 diff)
• uspace/Makefile (modified) (1 diff)
• uspace/app/dnscfg/Makefile (added)
• uspace/app/dnscfg/dnscfg.c (added)
• uspace/srv/net/dnsrsrv/dnsrsrv.c (modified) (4 diffs)
• uspace/srv/net/dnsrsrv/transport.c (modified) (3 diffs)
• uspace/srv/net/dnsrsrv/transport.h (modified) (2 diffs)

boot/Makefile.common

@@ -166 +166 @@
         $(USPACE_PATH)/app/dltest2/dltest2 \
         $(USPACE_PATH)/app/dload/dload \
+        $(USPACE_PATH)/app/dnscfg/dnscfg \
         $(USPACE_PATH)/app/dnsres/dnsres \
         $(USPACE_PATH)/app/edit/edit \

uspace/Makefile

@@ -39 +39 @@
         app/bnchmark \
         app/devctl \
+        app/dnscfg \
         app/dnsres \
         app/edit \

uspace/srv/net/dnsrsrv/dnsrsrv.c

@@ -114 +114 @@
     ipc_call_t *call)
 {
-//      inet_addr_t remote;
-//      uint8_t tos;
-//      inet_addr_t local;
-//      int rc;
-
         log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_get_srvaddr_srv()");
-
-/*      remote.ipv4 = IPC_GET_ARG1(*call);
-        tos = IPC_GET_ARG2(*call);
-        local.ipv4 = 0;
-
-        rc = inet_get_srcaddr(&remote, tos, &local);*/
-        async_answer_1(callid, EOK, 0x01020304);
+        async_answer_1(callid, EOK, dns_server_addr.ipv4);
 }
 
@@ -132 +121 @@
     ipc_call_t *call)
 {
-//      inet_addr_t naddr;
-//      int rc;
-
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dnsr_set_srvaddr_srv()");
 
-//      naddr.ipv4 = IPC_GET_ARG1(*call);
+        dns_server_addr.ipv4 = IPC_GET_ARG1(*call);
 
-        /*rc = inet_get_srcaddr(&remote, tos, &local);*/
         async_answer_0(callid, EOK);
 }
@@ -151 +136 @@
         /* Accept the connection */
         async_answer_0(iid, EOK);
-
-//      inet_client_init(&client);
 
         while (true) {
@@ -179 +162 @@
                 }
         }
-
-//      inet_client_fini(&client);
 }
 

uspace/srv/net/dnsrsrv/transport.c

@@ -49 +49 @@
 
 #define RECV_BUF_SIZE 4096
+#define DNS_SERVER_PORT 53
 
 /** Request timeout (microseconds) */
@@ -68 +69 @@
 static fid_t recv_fid;
 static int transport_fd = -1;
+inet_addr_t dns_server_addr;
 
 /** Outstanding requests */
@@ -187 +189 @@
 
         addr.sin_family = AF_INET;
-        addr.sin_port = htons(53);
-        addr.sin_addr.s_addr = htonl((10 << 24) | (0 << 16) | (0 << 8) | 138);
+        addr.sin_port = htons(DNS_SERVER_PORT);
+        addr.sin_addr.s_addr = host2uint32_t_be(dns_server_addr.ipv4);
 
         rc = dns_message_encode(req, &req_data, &req_size);

uspace/srv/net/dnsrsrv/transport.h

@@ -37 +37 @@
 #define TRANSPORT_H
 
+#include <inet/addr.h>
 #include "dns_type.h"
 
@@ -43 +44 @@
 extern int dns_request(dns_message_t *, dns_message_t **);
 
+extern inet_addr_t dns_server_addr;
+
+
 #endif