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

uspace/srv/net/inetsrv/pdu.c

@@ -204 +204 @@
         uint16_t foff;
 
-        log_msg(LVL_DEBUG, "inet_pdu_decode()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "inet_pdu_decode()");
 
         if (size < sizeof(ip_header_t)) {
-                log_msg(LVL_DEBUG, "PDU too short (%zu)", size);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "PDU too short (%zu)", size);
                 return EINVAL;
         }
@@ -216 +216 @@
             hdr->ver_ihl);
         if (version != 4) {
-                log_msg(LVL_DEBUG, "Version (%d) != 4", version);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Version (%d) != 4", version);
                 return EINVAL;
         }
@@ -222 +222 @@
         tot_len = uint16_t_be2host(hdr->tot_len);
         if (tot_len < sizeof(ip_header_t)) {
-                log_msg(LVL_DEBUG, "Total Length too small (%zu)", tot_len);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Total Length too small (%zu)", tot_len);
                 return EINVAL;
         }
 
         if (tot_len > size) {
-                log_msg(LVL_DEBUG, "Total Length = %zu > PDU size = %zu",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Total Length = %zu > PDU size = %zu",
                         tot_len, size);
                 return EINVAL;
@@ -256 +256 @@
         packet->data = calloc(packet->size, 1);
         if (packet->data == NULL) {
-                log_msg(LVL_WARN, "Out of memory.");
+                log_msg(LOG_DEFAULT, LVL_WARN, "Out of memory.");
                 return ENOMEM;
         }