Changes in uspace/srv/net/ethip/pdu.c [f0a2720:9ae6fc7] in mainline

File:

• uspace/srv/net/ethip/pdu.c (modified) (14 diffs)

uspace/srv/net/ethip/pdu.c

@@ -46 +46 @@
 #include "pdu.h"
 
-#define MAC48_BYTES 6
-
 /** Encode Ethernet PDU. */
 int eth_pdu_encode(eth_frame_t *frame, void **rdata, size_t *rsize)
@@ -62 +60 @@
 
         hdr = (eth_header_t *)data;
-        mac48_encode(&frame->src, hdr->src);
-        mac48_encode(&frame->dest, hdr->dest);
+        addr48(frame->src, hdr->src);
+        addr48(frame->dest, hdr->dest);
         hdr->etype_len = host2uint16_t_be(frame->etype_len);
 
@@ -69 +67 @@
             frame->size);
 
-        log_msg(LVL_DEBUG, "Encoding Ethernet frame "
-            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
-            frame->src.addr, frame->dest.addr, frame->etype_len);
-        log_msg(LVL_DEBUG, "Encoded Ethernet frame (%zu bytes)", size);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Encoded Ethernet frame (%zu bytes)", size);
 
         *rdata = data;
@@ -84 +79 @@
         eth_header_t *hdr;
 
-        log_msg(LVL_DEBUG, "eth_pdu_decode()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "eth_pdu_decode()");
 
         if (size < sizeof(eth_header_t)) {
-                log_msg(LVL_DEBUG, "PDU too short (%zu)", size);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "PDU too short (%zu)", size);
                 return EINVAL;
         }
@@ -98 +93 @@
                 return ENOMEM;
 
-        mac48_decode(hdr->src, &frame->src);
-        mac48_decode(hdr->dest, &frame->dest);
+        addr48(hdr->src, frame->src);
+        addr48(hdr->dest, frame->dest);
         frame->etype_len = uint16_t_be2host(hdr->etype_len);
 
@@ -105 +100 @@
             frame->size);
 
-        log_msg(LVL_DEBUG, "Decoding Ethernet frame "
-            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
-            frame->src.addr, frame->dest.addr, frame->etype_len);
-        log_msg(LVL_DEBUG, "Decoded Ethernet frame payload (%zu bytes)", frame->size);
-
-        return EOK;
-}
-
-void mac48_encode(mac48_addr_t *addr, void *buf)
-{
-        uint64_t val;
-        uint8_t *bbuf = (uint8_t *)buf;
-        int i;
-
-        val = addr->addr;
-        for (i = 0; i < MAC48_BYTES; i++)
-                bbuf[i] = (val >> (8 * (MAC48_BYTES - i - 1))) & 0xff;
-}
-
-void mac48_decode(void *data, mac48_addr_t *addr)
-{
-        uint64_t val;
-        uint8_t *bdata = (uint8_t *)data;
-        int i;
-
-        val = 0;
-        for (i = 0; i < MAC48_BYTES; i++)
-                val |= (uint64_t)bdata[i] << (8 * (MAC48_BYTES - i - 1));
-
-        addr->addr = val;
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "Decoded Ethernet frame payload (%zu bytes)", frame->size);
+
+        return EOK;
 }
 
@@ -145 +113 @@
         uint16_t fopcode;
 
-        log_msg(LVL_DEBUG, "arp_pdu_encode()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_pdu_encode()");
 
         size = sizeof(arp_eth_packet_fmt_t);
@@ -168 +136 @@
         pfmt->proto_addr_size = IPV4_ADDR_SIZE;
         pfmt->opcode = host2uint16_t_be(fopcode);
-        mac48_encode(&packet->sender_hw_addr, pfmt->sender_hw_addr);
+        addr48(packet->sender_hw_addr, pfmt->sender_hw_addr);
         pfmt->sender_proto_addr =
-            host2uint32_t_be(packet->sender_proto_addr.ipv4);
-        mac48_encode(&packet->target_hw_addr, pfmt->target_hw_addr);
+            host2uint32_t_be(packet->sender_proto_addr);
+        addr48(packet->target_hw_addr, pfmt->target_hw_addr);
         pfmt->target_proto_addr =
-            host2uint32_t_be(packet->target_proto_addr.ipv4);
+            host2uint32_t_be(packet->target_proto_addr);
 
         *rdata = data;
@@ -185 +153 @@
         arp_eth_packet_fmt_t *pfmt;
 
-        log_msg(LVL_DEBUG, "arp_pdu_decode()");
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "arp_pdu_decode()");
 
         if (size < sizeof(arp_eth_packet_fmt_t)) {
-                log_msg(LVL_DEBUG, "ARP PDU too short (%zu)", size);
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "ARP PDU too short (%zu)", size);
                 return EINVAL;
         }
@@ -195 +163 @@
 
         if (uint16_t_be2host(pfmt->hw_addr_space) != AHRD_ETHERNET) {
-                log_msg(LVL_DEBUG, "HW address space != %u (%" PRIu16 ")",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "HW address space != %u (%" PRIu16 ")",
                     AHRD_ETHERNET, uint16_t_be2host(pfmt->hw_addr_space));
                 return EINVAL;
@@ -201 +169 @@
 
         if (uint16_t_be2host(pfmt->proto_addr_space) != 0x0800) {
-                log_msg(LVL_DEBUG, "Proto address space != %u (%" PRIu16 ")",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Proto address space != %u (%" PRIu16 ")",
                     ETYPE_IP, uint16_t_be2host(pfmt->proto_addr_space));
                 return EINVAL;
@@ -207 +175 @@
 
         if (pfmt->hw_addr_size != ETH_ADDR_SIZE) {
-                log_msg(LVL_DEBUG, "HW address size != %zu (%zu)",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "HW address size != %zu (%zu)",
                     (size_t)ETH_ADDR_SIZE, (size_t)pfmt->hw_addr_size);
                 return EINVAL;
@@ -213 +181 @@
 
         if (pfmt->proto_addr_size != IPV4_ADDR_SIZE) {
-                log_msg(LVL_DEBUG, "Proto address size != %zu (%zu)",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Proto address size != %zu (%zu)",
                     (size_t)IPV4_ADDR_SIZE, (size_t)pfmt->proto_addr_size);
                 return EINVAL;
@@ -222 +190 @@
         case AOP_REPLY: packet->opcode = aop_reply; break;
         default:
-                log_msg(LVL_DEBUG, "Invalid ARP opcode (%" PRIu16 ")",
+                log_msg(LOG_DEFAULT, LVL_DEBUG, "Invalid ARP opcode (%" PRIu16 ")",
                     uint16_t_be2host(pfmt->opcode));
                 return EINVAL;
         }
 
-        mac48_decode(pfmt->sender_hw_addr, &packet->sender_hw_addr);
-        packet->sender_proto_addr.ipv4 =
+        addr48(pfmt->sender_hw_addr, packet->sender_hw_addr);
+        packet->sender_proto_addr =
             uint32_t_be2host(pfmt->sender_proto_addr);
-        mac48_decode(pfmt->target_hw_addr, &packet->target_hw_addr);
-        packet->target_proto_addr.ipv4 =
+        addr48(pfmt->target_hw_addr, packet->target_hw_addr);
+        packet->target_proto_addr =
             uint32_t_be2host(pfmt->target_proto_addr);
-        log_msg(LVL_DEBUG, "packet->tpa = %x\n", pfmt->target_proto_addr);
-
-        return EOK;
-}
-
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "packet->tpa = %x\n", pfmt->target_proto_addr);
+
+        return EOK;
+}
 
 /** @}