Changeset 1493811 in mainline

Timestamp:

2012-02-11T19:11:08Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4f64a523

Parents:

e767dbf

Message:

Ethernet PDU encoding and decoding.

Location:

uspace/srv/ethip

Files:

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

uspace/srv/ethip/Makefile

@@ -32 +32 @@
 SOURCES = \
         ethip.c \
-        ethip_nic.c
+        ethip_nic.c \
+        pdu.c
 
 include $(USPACE_PREFIX)/Makefile.common

uspace/srv/ethip/ethip.c

@@ -27 +27 @@
  */
 
-/** @addtogroup inet
+/** @addtogroup ethip
  * @{
  */
@@ -33 +33 @@
  * @file
  * @brief IP link provider for Ethernet
+ *
+ * Based on the IETF RFC 894 standard.
  */
 
@@ -45 +47 @@
 #include "ethip.h"
 #include "ethip_nic.h"
+#include "pdu.h"
+#include "std.h"
 
 #define NAME "eth"
@@ -158 +162 @@
 static int ethip_send(iplink_conn_t *conn, iplink_srv_sdu_t *sdu)
 {
+        ethip_nic_t *nic = (ethip_nic_t *)conn->srv->arg;
+        eth_frame_t frame;
+        void *data;
+        size_t size;
+        int rc;
+
         log_msg(LVL_DEBUG, "ethip_send()");
-        return EOK;
+
+        frame.dest.addr = 0xdeeedeeedeee;
+        frame.src.addr =  0xaafeedfaceee;
+        frame.etype_len = ETYPE_IP;
+        frame.data = sdu->data;
+        frame.size = sdu->size;
+
+        rc = eth_pdu_encode(&frame, &data, &size);
+        if (rc != EOK)
+                return rc;
+
+        rc = ethip_nic_send(nic, data, size);
+        free(data);
+
+        return rc;
+}
+
+int ethip_received(iplink_srv_t *srv, void *data, size_t size)
+{
+        eth_frame_t frame;
+        iplink_srv_sdu_t sdu;
+        int rc;
+
+        rc = eth_pdu_decode(data, size, &frame);
+        if (rc != EOK)
+                return rc;
+
+        sdu.data = frame.data;
+        sdu.size = frame.size;
+        (void) sdu;
+        //rc = iplink_ev_recv(conn, &sdu);
+
+        free(frame.data);
+        return rc;
 }
 

uspace/srv/ethip/ethip.h

@@ -27 +27 @@
  */
 
-/** @addtogroup inet
+/** @addtogroup ethip
  * @{
  */
@@ -37 +37 @@
 #ifndef ETHIP_H_
 #define ETHIP_H_
+
+#include <adt/list.h>
+#include <async.h>
+#include <inet/iplink_srv.h>
+#include <loc.h>
+#include <sys/types.h>
 
 typedef struct ethip_nic {
@@ -48 +54 @@
 } ethip_nic_t;
 
+/** IEEE MAC-48 identifier */
+typedef struct {
+        /** MAC Address (in lowest 48 bits) */
+        uint64_t addr;
+} mac48_addr_t;
+
+/** Ethernet frame */
+typedef struct {
+        /** Destination Address */
+        mac48_addr_t dest;
+        /** Source Address */
+        mac48_addr_t src;
+        /** Ethertype or Length */
+        uint16_t etype_len;
+        /** Payload */
+        void *data;
+        /** Payload size */
+        size_t size;
+} eth_frame_t;
+
 extern int ethip_iplink_init(ethip_nic_t *);
+extern int ethip_received(iplink_srv_t *, void *, size_t);
+
 
 #endif

uspace/srv/ethip/ethip_nic.c

@@ -27 +27 @@
  */
 
-/** @addtogroup inet
+/** @addtogroup ethip
  * @{
  */
@@ -201 +201 @@
     ipc_call_t *call)
 {
+        int rc;
+        void *data;
+        size_t size;
+
         log_msg(LVL_DEBUG, "ethip_nic_received()");
-        async_answer_0(callid, ENOTSUP);
+
+        rc = async_data_write_accept(&data, false, 0, 0, 0, &size);
+        if (rc != EOK) {
+                log_msg(LVL_DEBUG, "data_write_accept() failed");
+                return;
+        }
+
+        rc = ethip_received(&nic->iplink, data, size);
+        free(data);
+
+        async_answer_0(callid, rc);
 }
 
@@ -277 +291 @@
 }
 
+int ethip_nic_send(ethip_nic_t *nic, void *data, size_t size)
+{
+        return nic_send_frame(nic->sess, data, size);
+}
+
 /** @}
  */

uspace/srv/ethip/ethip_nic.h

@@ -27 +27 @@
  */
 
-/** @addtogroup inet
+/** @addtogroup ethip
  * @{
  */
@@ -42 +42 @@
 extern int ethip_nic_discovery_start(void);
 extern ethip_nic_t *ethip_nic_find_by_iplink_sid(service_id_t);
+extern int ethip_nic_send(ethip_nic_t *, void *, size_t);
+
 
 #endif