Changeset 87e5658c in mainline

Timestamp:

2012-02-27T00:03:26Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

962f03b

Parents:

081971b

Message:

Prototype ARP responder.

Location:

uspace/srv/ethip

Files:

• Makefile (modified) (1 diff)
• arp.c (added)
• arp.h (added)
• ethip.c (modified) (2 diffs)
• ethip.h (modified) (1 diff)
• pdu.c (modified) (1 diff)
• pdu.h (modified) (1 diff)
• std.h (modified) (1 diff)

uspace/srv/ethip/Makefile

@@ -31 +31 @@
 
 SOURCES = \
+        arp.c \
         ethip.c \
         ethip_nic.c \

uspace/srv/ethip/ethip.c

@@ -45 +45 @@
 #include <stdlib.h>
 
+#include "arp.h"
 #include "ethip.h"
 #include "ethip_nic.h"
@@ -204 +205 @@
         }
 
-        log_msg(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");
-        rc = iplink_ev_recv(&nic->iplink, &sdu);
+        switch (frame.etype_len) {
+        case ETYPE_ARP:
+                arp_received(nic, &frame);
+                break;
+        case ETYPE_IP:
+                log_msg(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");
+                rc = iplink_ev_recv(&nic->iplink, &sdu);
+                break;
+        default:
+                log_msg(LVL_DEBUG, "Unknown ethertype %" PRIu16,
+                    frame.etype_len);
+        }
 
         free(frame.data);

uspace/srv/ethip/ethip.h

@@ -74 +74 @@
 } eth_frame_t;
 
+/** ARP opcode */
+typedef enum {
+        /** Request */
+        aop_request,
+        /** Reply */
+        aop_reply
+} arp_opcode_t;
+
+/** ARP packet (for 48-bit MAC addresses and IPv4)
+ *
+ * Internal representation
+ */
+typedef struct {
+        /** Opcode */
+        arp_opcode_t opcode;
+        /** Sender hardware address */
+        mac48_addr_t sender_hw_addr;
+        /** Sender protocol address */
+        iplink_srv_addr_t sender_proto_addr;
+        /** Target hardware address */
+        mac48_addr_t target_hw_addr;
+        /** Target protocol address */
+        iplink_srv_addr_t target_proto_addr;
+} arp_eth_packet_t;
+
 extern int ethip_iplink_init(ethip_nic_t *);
 extern int ethip_received(iplink_srv_t *, void *, size_t);
-
 
 #endif

uspace/srv/ethip/pdu.c

@@ -140 +140 @@
 }
 
+/** Encode ARP PDU. */
+int arp_pdu_encode(arp_eth_packet_t *packet, void **rdata, size_t *rsize)
+{
+        void *data;
+        size_t size;
+        arp_eth_packet_fmt_t *pfmt;
+        uint16_t fopcode;
+
+        log_msg(LVL_DEBUG, "arp_pdu_encode()");
+
+        size = sizeof(arp_eth_packet_fmt_t);
+
+        data = calloc(size, 1);
+        if (data == NULL)
+                return ENOMEM;
+
+        pfmt = (arp_eth_packet_fmt_t *)data;
+
+        switch (packet->opcode) {
+        case aop_request: fopcode = AOP_REQUEST; break;
+        case aop_reply: fopcode = AOP_REPLY; break;
+        default:
+                assert(false);
+                fopcode = 0;
+        }
+
+        pfmt->hw_addr_space = host2uint16_t_be(AHRD_ETHERNET);
+        pfmt->proto_addr_space = host2uint16_t_be(ETYPE_IP);
+        pfmt->hw_addr_size = ETH_ADDR_SIZE;
+        pfmt->proto_addr_size = IPV4_ADDR_SIZE;
+        pfmt->opcode = host2uint16_t_be(fopcode);
+        mac48_encode(&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);
+        pfmt->target_proto_addr =
+            host2uint32_t_be(packet->target_proto_addr.ipv4);
+
+        *rdata = data;
+        *rsize = size;
+        return EOK;
+}
+
+/** Decode ARP PDU. */
+int arp_pdu_decode(void *data, size_t size, arp_eth_packet_t *packet)
+{
+        arp_eth_packet_fmt_t *pfmt;
+
+        log_msg(LVL_DEBUG, "arp_pdu_decode()");
+
+        if (size < sizeof(arp_eth_packet_fmt_t)) {
+                log_msg(LVL_DEBUG, "ARP PDU too short (%zu)", size);
+                return EINVAL;
+        }
+
+        pfmt = (arp_eth_packet_fmt_t *)data;
+
+        if (uint16_t_be2host(pfmt->hw_addr_space) != AHRD_ETHERNET) {
+                log_msg(LVL_DEBUG, "HW address space != %u (%" PRIu16 ")",
+                    AHRD_ETHERNET, uint16_t_be2host(pfmt->hw_addr_space));
+                return EINVAL;
+        }
+
+        if (uint16_t_be2host(pfmt->proto_addr_space) != ETYPE_IP) {
+                log_msg(LVL_DEBUG, "Proto address space != %u (%" PRIu16 ")",
+                    ETYPE_IP, uint16_t_be2host(pfmt->proto_addr_space));
+                return EINVAL;
+        }
+
+        if (pfmt->hw_addr_size != ETH_ADDR_SIZE) {
+                log_msg(LVL_DEBUG, "HW address size != %zu (%zu)",
+                    (size_t)ETH_ADDR_SIZE, (size_t)pfmt->hw_addr_size);
+                return EINVAL;
+        }
+
+        if (pfmt->proto_addr_size != IPV4_ADDR_SIZE) {
+                log_msg(LVL_DEBUG, "Proto address size != %zu (%zu)",
+                    (size_t)IPV4_ADDR_SIZE, (size_t)pfmt->proto_addr_size);
+                return EINVAL;
+        }
+
+        switch (uint16_t_be2host(pfmt->opcode)) {
+        case AOP_REQUEST: packet->opcode = aop_request; break;
+        case AOP_REPLY: packet->opcode = aop_reply; break;
+        default:
+                log_msg(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 =
+            uint32_t_be2host(pfmt->sender_proto_addr);
+        mac48_decode(pfmt->target_hw_addr, &packet->target_hw_addr);
+        packet->target_proto_addr.ipv4 =
+            uint32_t_be2host(pfmt->target_proto_addr);
+        log_msg(LVL_DEBUG, "packet->tpa = %x\n", pfmt->target_proto_addr);
+
+        return EOK;
+}
+
+
 /** @}
  */

uspace/srv/ethip/pdu.h

@@ -40 +40 @@
 #include "ethip.h"
 
-int eth_pdu_encode(eth_frame_t *frame, void **rdata, size_t *rsize);
-int eth_pdu_decode(void *data, size_t size, eth_frame_t *frame);
+extern int eth_pdu_encode(eth_frame_t *, void **, size_t *);
+extern int eth_pdu_decode(void *, size_t, eth_frame_t *);
+extern int arp_pdu_encode(arp_eth_packet_t *, void **, size_t *);
+extern int arp_pdu_decode(void *, size_t, arp_eth_packet_t *);
 
 #endif

uspace/srv/ethip/std.h

@@ -40 +40 @@
 #include <sys/types.h>
 
+#define ETH_ADDR_SIZE 6
+#define IPV4_ADDR_SIZE 4
+#define ETH_FRAME_MIN_SIZE 60
+
 /** Ethernet frame header */
 typedef struct {
         /** Destination Address */
-        uint8_t dest[6];
+        uint8_t dest[ETH_ADDR_SIZE];
         /** Source Address */
-        uint8_t src[6];
+        uint8_t src[ETH_ADDR_SIZE];
         /** Ethertype or Length */
         uint16_t etype_len;
 } eth_header_t;
 
+/** ARP packet format (for 48-bit MAC addresses and IPv4) */
+typedef struct {
+        /** Hardware address space */
+        uint16_t hw_addr_space;
+        /** Protocol address space */
+        uint16_t proto_addr_space;
+        /** Hardware address size */
+        uint8_t hw_addr_size;
+        /** Protocol address size */
+        uint8_t proto_addr_size;
+        /** Opcode */
+        uint16_t opcode;
+        /** Sender hardware address */
+        uint8_t sender_hw_addr[ETH_ADDR_SIZE];
+        /** Sender protocol address */
+        uint32_t sender_proto_addr;
+        /** Target hardware address */
+        uint8_t target_hw_addr[ETH_ADDR_SIZE];
+        /** Target protocol address */
+        uint32_t target_proto_addr;
+} __attribute__((packed)) arp_eth_packet_fmt_t;
+
+enum arp_opcode_fmt {
+        AOP_REQUEST = 1,
+        AOP_REPLY   = 2
+};
+
+enum arp_hw_addr_space {
+        AHRD_ETHERNET = 1
+};
+
 /** IP Ethertype */
-#define ETYPE_IP        0x0800
+enum ether_type {
+        ETYPE_ARP = 0x0806,
+        ETYPE_IP  = 0x0800
+};
 
-#define ETH_FRAME_MIN_SIZE 60
 
 #endif