Changeset b800b0e in mainline for uspace/srv/net/udp/udp_inet.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/udp/udp_inet.c (modified) (6 diffs)

uspace/srv/net/udp/udp_inet.c

@@ -61 +61 @@
         udp_pdu_t *pdu;
 
-        log_msg(LVL_DEBUG, "udp_inet_ev_recv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_inet_ev_recv()");
 
         pdu = udp_pdu_new();
@@ -69 +69 @@
         pdu->src.ipv4 = dgram->src.ipv4;
         pdu->dest.ipv4 = dgram->dest.ipv4;
-        log_msg(LVL_DEBUG, "src: 0x%08x, dest: 0x%08x",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "src: 0x%08x, dest: 0x%08x",
             pdu->src.ipv4, pdu->dest.ipv4);
 
@@ -84 +84 @@
         inet_dgram_t dgram;
 
-        log_msg(LVL_DEBUG, "udp_transmit_pdu()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_transmit_pdu()");
 
         dgram.src.ipv4 = pdu->src.ipv4;
@@ -94 +94 @@
         rc = inet_send(&dgram, INET_TTL_MAX, 0);
         if (rc != EOK)
-                log_msg(LVL_ERROR, "Failed to transmit PDU.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to transmit PDU.");
 
         return rc;
@@ -105 +105 @@
         udp_sockpair_t rident;
 
-        log_msg(LVL_DEBUG, "udp_received_pdu()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_received_pdu()");
 
         if (udp_pdu_decode(pdu, &rident, &dmsg) != EOK) {
-                log_msg(LVL_WARN, "Not enough memory. PDU dropped.");
+                log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. PDU dropped.");
                 return;
         }
@@ -124 +124 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "udp_inet_init()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_inet_init()");
 
         rc = inet_init(IP_PROTO_UDP, &udp_inet_ev_ops);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed connecting to internet service.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed connecting to internet service.");
                 return ENOENT;
         }