Changeset 92b42442 in mainline for uspace/srv/udp/udp_inet.c

Timestamp:

2012-04-05T21:16:00Z (12 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7094e196

Parents:

ee603c4

Message:

UDP datagram reception plus fixes.

File:

• uspace/srv/udp/udp_inet.c (modified) (5 diffs)

uspace/srv/udp/udp_inet.c

@@ -43 +43 @@
 #include <task.h>
 
+#include "assoc.h"
+#include "pdu.h"
 #include "std.h"
 #include "udp_inet.h"
@@ -48 +50 @@
 
 static int udp_inet_ev_recv(inet_dgram_t *dgram);
-//static void tcp_received_pdu(tcp_pdu_t *pdu);
+static void udp_received_pdu(udp_pdu_t *pdu);
 
 static inet_ev_ops_t udp_inet_ev_ops = {
@@ -57 +59 @@
 static int udp_inet_ev_recv(inet_dgram_t *dgram)
 {
-        uint8_t *pdu_raw;
-        size_t pdu_raw_size;
+        udp_pdu_t *pdu;
 
         log_msg(LVL_DEBUG, "udp_inet_ev_recv()");
 
-        pdu_raw = dgram->data;
-        pdu_raw_size = dgram->size;
+        pdu = udp_pdu_new();
+        pdu->data = dgram->data;
+        pdu->data_size = dgram->size;
 
-        (void)pdu_raw;
-        (void)pdu_raw_size;
-        /* Split into header and payload. */
-/*
-        log_msg(LVL_DEBUG, "tcp_inet_ev_recv() - split header/payload");
+        pdu->src.ipv4 = dgram->src.ipv4;
+        pdu->dest.ipv4 = dgram->dest.ipv4;
+        log_msg(LVL_DEBUG, "src: 0x%08x, dest: 0x%08x",
+            pdu->src.ipv4, pdu->dest.ipv4);
 
-        tcp_pdu_t *pdu;
-        size_t hdr_size;
-        tcp_header_t *hdr;
-        uint32_t data_offset;
+        udp_received_pdu(pdu);
+        udp_pdu_delete(pdu);
 
-        if (pdu_raw_size < sizeof(tcp_header_t)) {
-                log_msg(LVL_WARN, "pdu_raw_size = %zu < sizeof(tcp_header_t) = %zu",
-                    pdu_raw_size, sizeof(tcp_header_t));
-                return EINVAL;
-        }
-
-        hdr = (tcp_header_t *)pdu_raw;
-        data_offset = BIT_RANGE_EXTRACT(uint32_t, DF_DATA_OFFSET_h, DF_DATA_OFFSET_l,
-            uint16_t_be2host(hdr->doff_flags));
-
-        hdr_size = sizeof(uint32_t) * data_offset;
-
-        if (pdu_raw_size < hdr_size) {
-                log_msg(LVL_WARN, "pdu_raw_size = %zu < hdr_size = %zu",
-                    pdu_raw_size, hdr_size);
-                return EINVAL;
-        }
-
-        if (hdr_size < sizeof(tcp_header_t)) {
-                log_msg(LVL_WARN, "hdr_size = %zu < sizeof(tcp_header_t) = %zu",
-                    hdr_size, sizeof(tcp_header_t));            return EINVAL;
-        }
-
-        log_msg(LVL_DEBUG, "pdu_raw_size=%zu, hdr_size=%zu",
-            pdu_raw_size, hdr_size);
-        pdu = tcp_pdu_create(pdu_raw, hdr_size, pdu_raw + hdr_size,
-            pdu_raw_size - hdr_size);
-        if (pdu == NULL) {
-                log_msg(LVL_WARN, "Failed creating PDU. Dropped.");
-                return ENOMEM;
-        }
-
-        pdu->src_addr.ipv4 = dgram->src.ipv4;
-        pdu->dest_addr.ipv4 = dgram->dest.ipv4;
-        log_msg(LVL_DEBUG, "src: 0x%08x, dest: 0x%08x",
-            pdu->src_addr.ipv4, pdu->dest_addr.ipv4);
-
-        tcp_received_pdu(pdu);
-        tcp_pdu_delete(pdu);
-*/
         return EOK;
 }
@@ -124 +83 @@
         int rc;
         inet_dgram_t dgram;
+
+        log_msg(LVL_DEBUG, "udp_transmit_pdu()");
 
         dgram.src.ipv4 = pdu->src.ipv4;
@@ -139 +100 @@
 
 /** Process received PDU. */
-/*
-static void tcp_received_pdu(tcp_pdu_t *pdu)
+static void udp_received_pdu(udp_pdu_t *pdu)
 {
-        tcp_segment_t *dseg;
-        tcp_sockpair_t rident;
+        udp_msg_t *dmsg;
+        udp_sockpair_t rident;
 
-        log_msg(LVL_DEBUG, "tcp_received_pdu()");
+        log_msg(LVL_DEBUG, "udp_received_pdu()");
 
-        if (tcp_pdu_decode(pdu, &rident, &dseg) != EOK) {
+        if (udp_pdu_decode(pdu, &rident, &dmsg) != EOK) {
                 log_msg(LVL_WARN, "Not enough memory. PDU dropped.");
                 return;
         }
-*/
-        /* Insert decoded segment into rqueue */
-/*      tcp_rqueue_insert_seg(&rident, dseg);
+
+        /*
+         * Insert decoded message into appropriate receive queue.
+         * This transfers ownership of dmsg to the callee, we do not
+         * free it.
+         */
+        udp_assoc_received(&rident, dmsg);
 }
-*/
+
 int udp_inet_init(void)
 {