Changeset efdfebc in mainline for uspace/srv/net/inetsrv/inetping.c

Timestamp:

2012-11-06T21:03:44Z (11 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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/inetping.c (modified) (4 diffs)

uspace/srv/net/inetsrv/inetping.c

@@ -76 +76 @@
         client = inetping_client_find(ident);
         if (client == NULL) {
-                log_msg(LVL_DEBUG, "Unknown ICMP ident. Dropping.");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Unknown ICMP ident. Dropping.");
                 return ENOENT;
         }
@@ -107 +107 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetping_send_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_send_srv()");
 
         rc = async_data_write_accept((void **) &sdu.data, false, 0, 0, 0,
@@ -133 +133 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetping_get_srcaddr_srv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_get_srcaddr_srv()");
 
         remote.ipv4 = IPC_GET_ARG1(*call);
@@ -192 +192 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "inetping_conn()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inetping_conn()");
 
         /* Accept the connection */