Changeset b800b0e in mainline for uspace/srv/net/inetsrv/inetcfg.c

Timestamp:

2012-10-23T13:16:49Z (12 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

6ecf5b8

Parents:

32b3a12 (diff), b2ac3998 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes

File:

• uspace/srv/net/inetsrv/inetcfg.c (modified) (19 diffs)

uspace/srv/net/inetsrv/inetcfg.c

@@ -61 +61 @@
         ilink = inet_link_get_by_id(link_id);
         if (ilink == NULL) {
-                log_msg(LVL_DEBUG, "Link %lu not found.",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Link %lu not found.",
                     (unsigned long) link_id);
                 return ENOENT;
@@ -77 +77 @@
         rc = inet_addrobj_add(addr);
         if (rc != EOK) {
-                log_msg(LVL_DEBUG, "Duplicate address name '%s'.", addr->name);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Duplicate address name '%s'.", addr->name);
                 inet_addrobj_delete(addr);
                 return rc;
@@ -85 +85 @@
         rc = iplink_addr_add(ilink->iplink, &iaddr);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed setting IP address on internet link.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed setting IP address on internet link.");
                 inet_addrobj_remove(addr);
                 inet_addrobj_delete(addr);
@@ -130 +130 @@
         ilink = inet_link_get_by_id(link_id);
         if (ilink == NULL) {
-                log_msg(LVL_DEBUG, "Link %zu not found.", (size_t) link_id);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Link %zu not found.", (size_t) link_id);
                 return ENOENT;
         }
@@ -136 +136 @@
         addr = inet_addrobj_find_by_name(name, ilink);
         if (addr == NULL) {
-                log_msg(LVL_DEBUG, "Address '%s' not found.", name);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Address '%s' not found.", name);
                 return ENOENT;
         }
@@ -228 +228 @@
         sroute = inet_sroute_find_by_name(name);
         if (sroute == NULL) {
-                log_msg(LVL_DEBUG, "Static route '%s' not found.", name);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Static route '%s' not found.", name);
                 return ENOENT;
         }
@@ -245 +245 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetcfg_addr_create_static_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_create_static_srv()");
 
         rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN,
@@ -269 +269 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetcfg_addr_delete_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_delete_srv()");
 
         addr_id = IPC_GET_ARG1(*call);
@@ -287 +287 @@
 
         addr_id = IPC_GET_ARG1(*call);
-        log_msg(LVL_DEBUG, "inetcfg_addr_get_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_srv()");
 
         ainfo.naddr.ipv4 = 0;
@@ -321 +321 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetcfg_addr_get_id_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_addr_get_id_srv()");
 
         link_id = IPC_GET_ARG1(*call);
@@ -348 +348 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetcfg_get_addr_list_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_addr_list_srv()");
 
         if (!async_data_read_receive(&rcallid, &max_size)) {
@@ -382 +382 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetcfg_get_link_list_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_link_list_srv()");
 
         if (!async_data_read_receive(&rcallid, &max_size)) {
@@ -415 +415 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetcfg_get_sroute_list_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_get_sroute_list_srv()");
 
         if (!async_data_read_receive(&rcallid, &max_size)) {
@@ -449 +449 @@
 
         link_id = IPC_GET_ARG1(*call);
-        log_msg(LVL_DEBUG, "inetcfg_link_get_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_link_get_srv()");
 
         linfo.name = NULL;
@@ -482 +482 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetcfg_sroute_create_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_create_srv()");
 
         rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN,
@@ -506 +506 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetcfg_sroute_delete_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_delete_srv()");
 
         sroute_id = IPC_GET_ARG1(*call);
@@ -524 +524 @@
 
         sroute_id = IPC_GET_ARG1(*call);
-        log_msg(LVL_DEBUG, "inetcfg_sroute_get_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_get_srv()");
 
         srinfo.dest.ipv4 = 0;
@@ -557 +557 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetcfg_sroute_get_id_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetcfg_sroute_get_id_srv()");
 
         rc = async_data_write_accept((void **) &name, true, 0, LOC_NAME_MAXLEN,
@@ -574 +574 @@
 void inet_cfg_conn(ipc_callid_t iid, ipc_call_t *icall, void *arg)
 {
-        log_msg(LVL_DEBUG, "inet_cfg_conn()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_cfg_conn()");
 
         /* Accept the connection */