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

uspace/srv/net/tcp/tcp.c

@@ -69 +69 @@
         size_t pdu_raw_size;
 
-        log_msg(LVL_DEBUG, "tcp_inet_ev_recv()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_inet_ev_recv()");
 
         pdu_raw = dgram->data;
@@ -76 +76 @@
         /* Split into header and payload. */
 
-        log_msg(LVL_DEBUG, "tcp_inet_ev_recv() - split header/payload");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_inet_ev_recv() - split header/payload");
 
         tcp_pdu_t *pdu;
@@ -84 +84 @@
 
         if (pdu_raw_size < sizeof(tcp_header_t)) {
-                log_msg(LVL_WARN, "pdu_raw_size = %zu < sizeof(tcp_header_t) = %zu",
+                log_msg(LOG_DEFAULT, LVL_WARN, "pdu_raw_size = %zu < sizeof(tcp_header_t) = %zu",
                     pdu_raw_size, sizeof(tcp_header_t));
                 return EINVAL;
@@ -96 +96 @@
 
         if (pdu_raw_size < hdr_size) {
-                log_msg(LVL_WARN, "pdu_raw_size = %zu < hdr_size = %zu",
+                log_msg(LOG_DEFAULT, LVL_WARN, "pdu_raw_size = %zu < hdr_size = %zu",
                     pdu_raw_size, hdr_size);
                 return EINVAL;
@@ -102 +102 @@
 
         if (hdr_size < sizeof(tcp_header_t)) {
-                log_msg(LVL_WARN, "hdr_size = %zu < sizeof(tcp_header_t) = %zu",
+                log_msg(LOG_DEFAULT, LVL_WARN, "hdr_size = %zu < sizeof(tcp_header_t) = %zu",
                     hdr_size, sizeof(tcp_header_t));            return EINVAL;
         }
 
-        log_msg(LVL_DEBUG, "pdu_raw_size=%zu, hdr_size=%zu",
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "pdu_raw_size=%zu, hdr_size=%zu",
             pdu_raw_size, hdr_size);
         pdu = tcp_pdu_create(pdu_raw, hdr_size, pdu_raw + hdr_size,
             pdu_raw_size - hdr_size);
         if (pdu == NULL) {
-                log_msg(LVL_WARN, "Failed creating PDU. Dropped.");
+                log_msg(LOG_DEFAULT, LVL_WARN, "Failed creating PDU. Dropped.");
                 return ENOMEM;
         }
@@ -117 +117 @@
         pdu->src_addr.ipv4 = dgram->src.ipv4;
         pdu->dest_addr.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_addr.ipv4, pdu->dest_addr.ipv4);
 
@@ -137 +137 @@
         pdu_raw = malloc(pdu_raw_size);
         if (pdu_raw == NULL) {
-                log_msg(LVL_ERROR, "Failed to transmit PDU. Out of memory.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed to transmit PDU. Out of memory.");
                 return;
         }
@@ -153 +153 @@
         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.");
 }
 
@@ -162 +162 @@
         tcp_sockpair_t rident;
 
-        log_msg(LVL_DEBUG, "tcp_received_pdu()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_received_pdu()");
 
         if (tcp_pdu_decode(pdu, &rident, &dseg) != EOK) {
-                log_msg(LVL_WARN, "Not enough memory. PDU dropped.");
+                log_msg(LOG_DEFAULT, LVL_WARN, "Not enough memory. PDU dropped.");
                 return;
         }
@@ -177 +177 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "tcp_init()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "tcp_init()");
 
         tcp_rqueue_init();
@@ -189 +189 @@
         rc = inet_init(IP_PROTO_TCP, &tcp_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;
         }
@@ -195 +195 @@
         rc = tcp_sock_init();
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed initializing socket service.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed initializing socket service.");
                 return ENOENT;
         }
@@ -208 +208 @@
         printf(NAME ": TCP (Transmission Control Protocol) network module\n");
 
-        rc = log_init(NAME, LVL_WARN);
+        rc = log_init(NAME);
         if (rc != EOK) {
                 printf(NAME ": Failed to initialize log.\n");