Changeset a1e2df13 in mainline for uspace/srv/net/inetsrv/inet_link.c

Timestamp:

2012-11-11T21:31:03Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

25eec4e

Parents:

141a20d (diff), d1538a1 (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/inet_link.c (modified) (13 diffs)

uspace/srv/net/inetsrv/inet_link.c

@@ -64 +64 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inet_iplink_recv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_iplink_recv()");
         rc = inet_pdu_decode(sdu->data, sdu->size, &packet);
         if (rc != EOK) {
-                log_msg(LVL_DEBUG, "failed decoding PDU");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "failed decoding PDU");
                 return rc;
         }
 
-        log_msg(LVL_DEBUG, "call inet_recv_packet()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "call inet_recv_packet()");
         rc = inet_recv_packet(&packet);
-        log_msg(LVL_DEBUG, "call inet_recv_packet -> %d", rc);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "call inet_recv_packet -> %d", rc);
         free(packet.data);
 
@@ -91 +91 @@
         rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed resolving category 'iplink'.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'iplink'.");
                 fibril_mutex_unlock(&inet_discovery_lock);
                 return ENOENT;
@@ -98 +98 @@
         rc = loc_category_get_svcs(iplink_cat, &svcs, &count);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed getting list of IP links.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting list of IP links.");
                 fibril_mutex_unlock(&inet_discovery_lock);
                 return EIO;
@@ -116 +116 @@
 
                 if (!already_known) {
-                        log_msg(LVL_DEBUG, "Found IP link '%lu'",
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "Found IP link '%lu'",
                             (unsigned long) svcs[i]);
                         rc = inet_link_open(svcs[i]);
                         if (rc != EOK)
-                                log_msg(LVL_ERROR, "Could not open IP link.");
+                                log_msg(LOG_DEFAULT, LVL_ERROR, "Could not open IP link.");
                 }
         }
@@ -133 +133 @@
 
         if (ilink == NULL) {
-                log_msg(LVL_ERROR, "Failed allocating link structure. "
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating link structure. "
                     "Out of memory.");
                 return NULL;
@@ -156 +156 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inet_link_open()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_link_open()");
         ilink = inet_link_new();
         if (ilink == NULL)
@@ -166 +166 @@
         rc = loc_service_get_name(sid, &ilink->svc_name);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed getting service name.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed getting service name.");
                 goto error;
         }
@@ -172 +172 @@
         ilink->sess = loc_service_connect(EXCHANGE_SERIALIZE, sid, 0);
         if (ilink->sess == NULL) {
-                log_msg(LVL_ERROR, "Failed connecting '%s'", ilink->svc_name);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed connecting '%s'", ilink->svc_name);
                 goto error;
         }
@@ -178 +178 @@
         rc = iplink_open(ilink->sess, &inet_iplink_ev_ops, &ilink->iplink);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed opening IP link '%s'",
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed opening IP link '%s'",
                     ilink->svc_name);
                 goto error;
@@ -185 +185 @@
         rc = iplink_get_mtu(ilink->iplink, &ilink->def_mtu);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed determinning MTU of link '%s'",
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed determinning MTU of link '%s'",
                     ilink->svc_name);
                 goto error;
         }
 
-        log_msg(LVL_DEBUG, "Opened IP link '%s'", ilink->svc_name);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Opened IP link '%s'", ilink->svc_name);
         list_append(&ilink->link_list, &inet_link_list);
 
@@ -209 +209 @@
         rc = inet_addrobj_add(addr);
         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_delete(addr);
                 /* XXX Roll back */
@@ -218 +218 @@
         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);
@@ -245 +245 @@
         rc = loc_register_cat_change_cb(inet_link_cat_change_cb);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed registering callback for IP link "
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering callback for IP link "
                     "discovery (%d).", rc);
                 return rc;