Changeset 03c971f in mainline for uspace/srv/net/ethip/pdu.c

Timestamp:

2013-08-15T14:20:16Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

bb2a5b2

Parents:

f2c19b0 (diff), 2921602 (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:

Mainline changes.

File:

• uspace/srv/net/ethip/pdu.c (modified) (8 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(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 +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(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 +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;
@@ -227 +195 @@
         }
 
-        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(LOG_DEFAULT, LVL_DEBUG, "packet->tpa = %x\n", pfmt->target_proto_addr);
@@ -238 +206 @@
 }
 
-
 /** @}
  */