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

uspace/srv/net/ethip/ethip.c

@@ -77 +77 @@
         int rc = loc_server_register(NAME);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed registering server.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering server.");
                 return rc;
         }
@@ -96 +96 @@
         char *svc_name = NULL;
 
-        log_msg(LVL_DEBUG, "ethip_iplink_init()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_iplink_init()");
 
         iplink_srv_init(&nic->iplink);
@@ -104 +104 @@
         rc = asprintf(&svc_name, "net/eth%u", ++link_num);
         if (rc < 0) {
-                log_msg(LVL_ERROR, "Out of memory.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Out of memory.");
                 goto error;
         }
@@ -110 +110 @@
         rc = loc_service_register(svc_name, &sid);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed registering service %s.", svc_name);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed registering service %s.", svc_name);
                 goto error;
         }
@@ -118 +118 @@
         rc = loc_category_get_id("iplink", &iplink_cat, IPC_FLAG_BLOCKING);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed resolving category 'iplink'.");
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed resolving category 'iplink'.");
                 goto error;
         }
@@ -124 +124 @@
         rc = loc_service_add_to_cat(sid, iplink_cat);
         if (rc != EOK) {
-                log_msg(LVL_ERROR, "Failed adding %s to category.", svc_name);
+                log_msg(LOG_DEFAULT, LVL_ERROR, "Failed adding %s to category.", svc_name);
                 goto error;
         }
@@ -142 +142 @@
 
         sid = (service_id_t)IPC_GET_ARG1(*icall);
-        log_msg(LVL_DEBUG, "ethip_client_conn(%u)", (unsigned)sid);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_client_conn(%u)", (unsigned)sid);
         nic = ethip_nic_find_by_iplink_sid(sid);
         if (nic == NULL) {
-                log_msg(LVL_WARN, "Uknown service ID.");
+                log_msg(LOG_DEFAULT, LVL_WARN, "Uknown service ID.");
                 return;
         }
@@ -154 +154 @@
 static int ethip_open(iplink_srv_t *srv)
 {
-        log_msg(LVL_DEBUG, "ethip_open()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_open()");
         return EOK;
 }
@@ -160 +160 @@
 static int ethip_close(iplink_srv_t *srv)
 {
-        log_msg(LVL_DEBUG, "ethip_close()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_close()");
         return EOK;
 }
@@ -173 +173 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "ethip_send()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_send()");
 
         rc = arp_translate(nic, &sdu->lsrc, &sdu->ldest, &dest_mac_addr);
         if (rc != EOK) {
-                log_msg(LVL_WARN, "Failed to look up IP address 0x%" PRIx32,
+                log_msg(LOG_DEFAULT, LVL_WARN, "Failed to look up IP address 0x%" PRIx32,
                     sdu->ldest.ipv4);
                 return rc;
@@ -200 +200 @@
 int ethip_received(iplink_srv_t *srv, void *data, size_t size)
 {
-        log_msg(LVL_DEBUG, "ethip_received(): srv=%p", srv);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_received(): srv=%p", srv);
         ethip_nic_t *nic = (ethip_nic_t *)srv->arg;
         eth_frame_t frame;
@@ -206 +206 @@
         int rc;
 
-        log_msg(LVL_DEBUG, "ethip_received()");
-
-        log_msg(LVL_DEBUG, " - eth_pdu_decode");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_received()");
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, " - eth_pdu_decode");
         rc = eth_pdu_decode(data, size, &frame);
         if (rc != EOK) {
-                log_msg(LVL_DEBUG, " - eth_pdu_decode failed");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, " - eth_pdu_decode failed");
                 return rc;
         }
@@ -220 +220 @@
                 break;
         case ETYPE_IP:
-                log_msg(LVL_DEBUG, " - construct SDU");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, " - construct SDU");
                 sdu.lsrc.ipv4 = (192 << 24) | (168 << 16) | (0 << 8) | 1;
                 sdu.ldest.ipv4 = (192 << 24) | (168 << 16) | (0 << 8) | 4;
                 sdu.data = frame.data;
                 sdu.size = frame.size;
-                log_msg(LVL_DEBUG, " - call iplink_ev_recv");
+                log_msg(LOG_DEFAULT, LVL_DEBUG, " - call iplink_ev_recv");
                 rc = iplink_ev_recv(&nic->iplink, &sdu);
                 break;
         default:
-                log_msg(LVL_DEBUG, "Unknown ethertype 0x%" PRIx16,
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Unknown ethertype 0x%" PRIx16,
                     frame.etype_len);
         }
@@ -239 +239 @@
 static int ethip_get_mtu(iplink_srv_t *srv, size_t *mtu)
 {
-        log_msg(LVL_DEBUG, "ethip_get_mtu()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_get_mtu()");
         *mtu = 1500;
         return EOK;
@@ -248 +248 @@
         ethip_nic_t *nic = (ethip_nic_t *)srv->arg;
 
-        log_msg(LVL_DEBUG, "ethip_addr_add(0x%" PRIx32 ")", addr->ipv4);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_addr_add(0x%" PRIx32 ")", addr->ipv4);
         return ethip_nic_addr_add(nic, addr);
 }
@@ -256 +256 @@
         ethip_nic_t *nic = (ethip_nic_t *)srv->arg;
 
-        log_msg(LVL_DEBUG, "ethip_addr_remove(0x%" PRIx32 ")", addr->ipv4);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "ethip_addr_remove(0x%" PRIx32 ")", addr->ipv4);
         return ethip_nic_addr_add(nic, addr);
 }
@@ -266 +266 @@
         printf(NAME ": HelenOS IP over Ethernet service\n");
 
-        if (log_init(NAME, LVL_WARN) != EOK) {
+        if (log_init(NAME) != EOK) {
                 printf(NAME ": Failed to initialize logging.\n");
                 return 1;