Changeset bd88bee in mainline for uspace/srv/net/nconfsrv

Timestamp:

2013-09-21T22:51:06Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

66ec63a

Parents:

7af0cc5

Message:

Automatically start DHCP on ethernet links.

Location:

uspace/srv/net/nconfsrv

Files:

• iplink.c (modified) (3 diffs)
• nconfsrv.c (modified) (2 diffs)

uspace/srv/net/nconfsrv/iplink.c

@@ -38 +38 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <inet/dhcp.h>
 #include <inet/inetcfg.h>
 #include <io/log.h>
 #include <loc.h>
 #include <stdlib.h>
+#include <str.h>
 
 #include "iplink.h"
@@ -139 +141 @@
         }
 
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Configure link %s", nlink->svc_name);
         rc = inetcfg_link_add(sid);
         if (rc != EOK) {
@@ -144 +147 @@
                     "'%s'.\n", nlink->svc_name);
                 goto error;
+        }
+
+        if (str_lcmp(nlink->svc_name, "net/eth", str_length("net/eth")) == 0) {
+                rc = dhcp_link_add(sid);
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Failed configuring DHCP on "
+                            " link '%s'.\n", nlink->svc_name);
+                        goto error;
+                }
         }
 

uspace/srv/net/nconfsrv/nconfsrv.c

@@ -39 +39 @@
 #include <errno.h>
 #include <fibril_synch.h>
+#include <inet/dhcp.h>
 #include <inet/inetcfg.h>
 #include <io/log.h>
@@ -65 +66 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Error contacting inet "
+                    "configuration service.");
+                return EIO;
+        }
+
+        rc = dhcp_init();
+        if (rc != EOK) {
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Error contacting dhcp "
                     "configuration service.");
                 return EIO;