Changeset ee20e8a in mainline for uspace/srv/net/dhcp/dhcp.c

Timestamp:

2013-09-24T21:27:59Z (11 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c6bf6be

Parents:

1b0602a3

Message:

More useful log messages.

File:

• uspace/srv/net/dhcp/dhcp.c (modified) (8 diffs)

uspace/srv/net/dhcp/dhcp.c

@@ -418 +418 @@
 }
 
+static void dhcp_link_set_failed(dhcp_link_t *dlink)
+{
+        log_msg(LOG_DEFAULT, LVL_NOTE, "Giving up on link %s",
+            dlink->link_info.name);
+        dlink->state = ds_fail;
+}
+
 int dhcpsrv_link_add(service_id_t link_id)
 {
@@ -464 +471 @@
         rc = dhcp_send_discover(dlink);
         if (rc != EOK) {
-                dlink->state = ds_fail;
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Error sending DHCPDISCOVER.");
+                dhcp_link_set_failed(dlink);
                 rc = EIO;
                 goto error;
@@ -533 +541 @@
                 return;
         }
+
+        log_msg(LOG_DEFAULT, LVL_NOTE, "%s: Successfully configured.",
+            dlink->link_info.name);
 }
 
@@ -541 +552 @@
         int rc;
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_recv() %zu bytes", size);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: dhcpsrv_recv() %zu bytes",
+            dlink->link_info.name, size);
 
         rc = dhcp_parse_reply(msg, size, &offer);
@@ -569 +581 @@
 
         assert(dlink->state == ds_selecting);
-        log_msg(LOG_DEFAULT, LVL_NOTE, "dcpsrv_discover_timeout");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "%s: dcpsrv_discover_timeout",
+            dlink->link_info.name);
 
         if (dlink->retries_left == 0) {
                 log_msg(LOG_DEFAULT, LVL_NOTE, "Retries exhausted");
-                dlink->state = ds_fail;
+                dhcp_link_set_failed(dlink);
                 return;
         }
@@ -582 +595 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_ERROR, "Error sending DHCPDISCOVER");
-                dlink->state = ds_fail;
+                dhcp_link_set_failed(dlink);
                 return;
         }
@@ -596 +609 @@
 
         assert(dlink->state == ds_requesting);
-        log_msg(LOG_DEFAULT, LVL_NOTE, "dcpsrv_request_timeout");
+        log_msg(LOG_DEFAULT, LVL_NOTE, "%s: dcpsrv_request_timeout",
+            dlink->link_info.name);
 
         if (dlink->retries_left == 0) {
                 log_msg(LOG_DEFAULT, LVL_NOTE, "Retries exhausted");
-                dlink->state = ds_fail;
+                dhcp_link_set_failed(dlink);
                 return;
         }
@@ -609 +623 @@
         if (rc != EOK) {
                 log_msg(LOG_DEFAULT, LVL_DEBUG, "Error sending request.");
-                dlink->state = ds_fail;
+                dhcp_link_set_failed(dlink);
                 return;
         }