Changeset efdfebc in mainline for uspace/srv/net/inetsrv/sroute.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/sroute.c (modified) (8 diffs)

uspace/srv/net/inetsrv/sroute.c

@@ -57 +57 @@
 
         if (sroute == NULL) {
-                log_msg(LVL_ERROR, "Failed allocating static route object. "
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed allocating static route object. "
                     "Out of memory.");
                 return NULL;
@@ -100 +100 @@
         inet_sroute_t *best;
 
-        log_msg(LVL_DEBUG, "inet_sroute_find(%x)", (unsigned)addr->ipv4);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find(%x)", (unsigned)addr->ipv4);
 
         fibril_mutex_lock(&sroute_list_lock);
@@ -117 +117 @@
                 if ((sroute->dest.ipv4 & mask) == (addr->ipv4 & mask)) {
                         fibril_mutex_unlock(&sroute_list_lock);
-                        log_msg(LVL_DEBUG, "inet_sroute_find: found %p",
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: found %p",
                             sroute);
                         return sroute;
@@ -123 +123 @@
         }
 
-        log_msg(LVL_DEBUG, "inet_sroute_find: Not found");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find: Not found");
         fibril_mutex_unlock(&sroute_list_lock);
 
@@ -136 +136 @@
 inet_sroute_t *inet_sroute_find_by_name(const char *name)
 {
-        log_msg(LVL_DEBUG, "inet_sroute_find_by_name('%s')",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find_by_name('%s')",
             name);
 
@@ -147 +147 @@
                 if (str_cmp(sroute->name, name) == 0) {
                         fibril_mutex_unlock(&sroute_list_lock);
-                        log_msg(LVL_DEBUG, "inet_sroute_find_by_name: found %p",
+                        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find_by_name: found %p",
                             sroute);
                         return sroute;
@@ -153 +153 @@
         }
 
-        log_msg(LVL_DEBUG, "inet_sroute_find_by_name: Not found");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_find_by_name: Not found");
         fibril_mutex_unlock(&sroute_list_lock);
 
@@ -166 +166 @@
 inet_sroute_t *inet_sroute_get_by_id(sysarg_t id)
 {
-        log_msg(LVL_DEBUG, "inet_sroute_get_by_id(%zu)", (size_t)id);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_sroute_get_by_id(%zu)", (size_t)id);
 
         fibril_mutex_lock(&sroute_list_lock);