Ticket #5636: netserver_resolver_conf.patch

src/servers/net/DHCPClient.cpp

@@ -11 +11 @@
 #include "DHCPClient.h"
 #include "NetServer.h"
 
-#include <FindDirectory.h>
 #include <Message.h>
 #include <MessageRunner.h>
-#include <Path.h>
 
 #include <arpa/inet.h>
 #include <errno.h>
@@ -336 +334 @@
 DHCPClient::DHCPClient(BMessenger target, const char* device)
     : AutoconfigClient("dhcp", target, device),
     fConfiguration(kMsgConfigureInterface),
+    fResolverConfiguration(kMsgConfigureResolver),
     fRunner(NULL),
     fLeaseTime(0)
 {
@@ -519 +518 @@
                 BMessage address;
                 address.AddString("family", "inet");
                 address.AddString("address", _ToString(fAssignedAddress));
-                _ParseOptions(*message, address);
+                fResolverConfiguration.MakeEmpty();
+                _ParseOptions(*message, address, fResolverConfiguration);
 
                 fConfiguration.AddMessage("address", &address);
 
@@ -543 +543 @@
 
                 // TODO: we might want to configure the stuff, don't we?
                 BMessage address;
-                _ParseOptions(*message, address);
+                fResolverConfiguration.MakeEmpty();
+                _ParseOptions(*message, address, fResolverConfiguration);
                     // TODO: currently, only lease time and DNS is updated this way
 
                 // our address request has been acknowledged
@@ -554 +555 @@
                 status = Target().SendMessage(&fConfiguration, &reply);
                 if (status == B_OK)
                     status = reply.FindInt32("status", &fStatus);
+                    
+                // configure resolver
+                reply.MakeEmpty();
+                status = Target().SendMessage(&fResolverConfiguration, &reply);
+                if (status == B_OK)
+                    status = reply.FindInt32("status", &fStatus);
                 break;
             }
 
@@ -609 +616 @@
 
 
 void
-DHCPClient::_ParseOptions(dhcp_message& message, BMessage& address)
+DHCPClient::_ParseOptions(dhcp_message& message, BMessage& address,
+    BMessage& resolverConfiguration)
 {
     dhcp_option_cookie cookie;
     message_option option;
     const uint8* data;
     size_t size;
-    // TODO: resolv.conf should be parsed, all information should be
-    // maintained and it should be distinguished between user entered
-    // and auto-generated parts of the file, with this method only re-writing
-    // the auto-generated parts of course.
-    // TODO: We write resolv.conf once per _ParseOptions invokation, there
-    // is the first DHCP_OFFER message and the final DHCP_ACK message
-    // from the same server, which should contain all the final data.
-    bool resolvConfCreated = false;
     while (message.NextOption(cookie, option, data, size)) {
         // iterate through all options
         switch (option) {
@@ -637 +637 @@
                 break;
             case OPTION_DOMAIN_NAME_SERVER:
             {
-                BPath path;
-                if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) != B_OK
-                    || path.Append("network/resolv.conf") != B_OK) {
-                    break;
-                }
-
-                const char* openMode = resolvConfCreated ? "a" : "w";
-                FILE* file = fopen(path.Path(), openMode);
                 for (uint32 i = 0; i < size / 4; i++) {
                     syslog(LOG_INFO, "DNS: %s\n",
                         _ToString(&data[i * 4]).String());
-                    if (file != NULL) {
-                        resolvConfCreated = true;
-                        fprintf(file, "nameserver %s\n",
-                            _ToString(&data[i * 4]).String());
-                    }
+                    resolverConfiguration.AddString("nameserver",
+                        _ToString(&data[i * 4]).String());
                 }
-                fclose(file);
+                resolverConfiguration.AddInt32("nameserver_count",
+                    size / 4);
                 break;
             }
             case OPTION_SERVER_ADDRESS:
@@ -684 +674 @@
 
             case OPTION_DOMAIN_NAME:
             {
-                syslog(LOG_INFO, "DHCP domain name: \"%.*s\"\n",
-                    (int)size, (const char*)data);
-
-                BPath path;
-                if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) != B_OK
-                    || path.Append("network/resolv.conf") != B_OK) {
-                    break;
-                }
-
-                const char* openMode = resolvConfCreated ? "a" : "w";
-                FILE* file = fopen(path.Path(), openMode);
-                if (file != NULL) {
-                    resolvConfCreated = true;
-                    fprintf(file, "domain %.*s\n", (int)size,
-                        (const char*)data);
-                    fclose(file);
-                }
+                char domain[size+1];
+                memcpy(domain, data, size);
+                domain[size] = '\0';
+                
+                syslog(LOG_INFO, "DHCP domain name: \"%s\"\n",
+                    domain);
+                
+                resolverConfiguration.AddString("domain", domain);  
                 break;
             }
 

src/servers/net/NetServer.cpp

@@ -1 +1 @@
 /*
- * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2010, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
  *      Axel Dörfler, axeld@pinc-software.de
+ *      Vegard Wærp, vegarwa@online.no
  */
 
 
@@ -33 +34 @@
 #include <Roster.h>
 #include <Server.h>
 #include <TextView.h>
+#include <FindDirectory.h>
 
 #include "AutoconfigLooper.h"
 #include "Services.h"
@@ -57 +59 @@
         bool _TestForInterface(int socket, const char* name);
         status_t _ConfigureInterface(int socket, BMessage& interface,
             bool fromMessage = false);
+        status_t _ConfigureResolver(BMessage& resolverConfiguration);
         bool _QuitLooperForDevice(const char* device);
         AutoconfigLooper* _LooperForDevice(const char* device);
         status_t _ConfigureDevice(int socket, const char* path);
@@ -344 +347 @@
             close(socket);
             break;
         }
+        case kMsgConfigureResolver:
+        {
+            status_t status = _ConfigureResolver(*message);
+            
+            BMessage reply(B_REPLY);
+            reply.AddInt32("status", status);
+            message->SendReply(&reply);
+            
+            break;
+        }
 
         default:
             BApplication::MessageReceived(message);
@@ -720 +733 @@
 }
 
 
+status_t
+NetServer::_ConfigureResolver(BMessage& resolverConfiguration)
+{
+    bool addDomain = false;
+    int32 nameserverCount;
+    
+    const char* domain;
+    if (resolverConfiguration.FindString("domain", &domain) == B_OK)
+        addDomain = true;
+        
+    if (resolverConfiguration.FindInt32("nameserver_count",
+            &nameserverCount) != B_OK)
+        nameserverCount = 0;
+        
+    // TODO: resolv.conf should be parsed, all information should be
+    // maintained and it should be distinguished between user entered
+    // and auto-generated parts of the file, with this method only re-writing
+    // the auto-generated parts of course.
+    BPath path;
+    if (find_directory(B_COMMON_SETTINGS_DIRECTORY, &path) != B_OK
+        || path.Append("network/resolv.conf") != B_OK) {
+        return B_ERROR;
+    }
+    FILE* file = fopen(path.Path(), "w");
+    if (file != NULL) {
+        for (int32 i=0; i < nameserverCount; ++i) {
+            const char* nameserver;
+            if (resolverConfiguration.FindString("nameserver", i, &nameserver) == B_OK)
+                fprintf(file, "nameserver %s\n", nameserver);
+        }
+        
+        if (addDomain) {
+            fprintf(file, "domain %s\n", domain);
+        }
+        
+        fclose(file);
+    }
+    return B_OK;
+}
+
+
 bool
 NetServer::_QuitLooperForDevice(const char* device)
 {

src/servers/net/DHCPClient.h

@@ -39 +39 @@
 private:
             status_t            _Negotiate(dhcp_state state);
             void                _ParseOptions(dhcp_message& message,
-                                    BMessage& address);
+                                    BMessage& address,
+                                    BMessage& resolverConfiguration);
             void                _PrepareMessage(dhcp_message& message,
                                     dhcp_state state);
             status_t            _SendMessage(int socket, dhcp_message& message,
@@ -55 +56 @@
 
 private:
             BMessage            fConfiguration;
+            BMessage            fResolverConfiguration;
             BMessageRunner*     fRunner;
             uint8               fMAC[6];
             uint32              fTransactionID;

src/servers/net/NetServer.h

@@ -1 +1 @@
 /*
- * Copyright 2006-2009, Haiku, Inc. All Rights Reserved.
+ * Copyright 2006-2010, Haiku, Inc. All Rights Reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -15 +15 @@
 
 
 // NOTE: this header is used by other applications (such as ifconfig,
-// and Network) because of these two defines
+// and Network) because of these three defines
 #define kNetServerSignature     "application/x-vnd.haiku-net_server"
 #define kMsgConfigureInterface  'COif'
+#define kMsgConfigureResolver   'COrs'
 
 
 extern bool get_family_index(const char* name, int32& familyIndex);