Changeset 02a09ed in mainline for uspace/srv/net/ethip/pdu.c

Timestamp:

2013-06-28T20:20:03Z (11 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1d24ad3

Parents:

edf0d27

Message:

add basic infrastructure for IPv6 (inactive)
make inet_addr_t a universal address type

File:

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

uspace/srv/net/ethip/pdu.c

@@ -62 +62 @@
 
         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 +69 @@
             frame->size);
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Encoding Ethernet frame "
-            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
-            frame->src.addr, frame->dest.addr, frame->etype_len);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "Encoded Ethernet frame (%zu bytes)", size);
 
@@ -98 +95 @@
                 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 +102 @@
             frame->size);
 
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "Decoding Ethernet frame "
-            "src=%" PRIx64 " dest=%" PRIx64 " etype=%x",
-            frame->src.addr, frame->dest.addr, frame->etype_len);
         log_msg(LOG_DEFAULT, 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;
 }
 
@@ -168 +138 @@
         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);
-        mac48_encode(&packet->target_hw_addr, pfmt->target_hw_addr);
+        addr48(packet->target_hw_addr, pfmt->target_hw_addr);
         pfmt->target_proto_addr =
             host2uint32_t_be(packet->target_proto_addr);
@@ -227 +197 @@
         }
 
-        mac48_decode(pfmt->sender_hw_addr, &packet->sender_hw_addr);
+        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);
+        addr48(pfmt->target_hw_addr, packet->target_hw_addr);
         packet->target_proto_addr =
             uint32_t_be2host(pfmt->target_proto_addr);