Changeset ee603c4 in mainline

Timestamp:

2012-04-04T21:10:22Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

92b42442

Parents:

4794417

Message:

UDP associations, sending datagrams.

Location:

uspace/srv/udp

Files:

• Makefile (modified) (1 diff)
• assoc.c (added)
• assoc.h (added)
• ucall.c (modified) (6 diffs)
• udp_inet.c (modified) (2 diffs)
• udp_inet.h (modified) (1 diff)
• udp_type.h (modified) (2 diffs)

uspace/srv/udp/Makefile

@@ -33 +33 @@
 
 SOURCES = \
+        assoc.c \
         msg.c \
         sock.c \

uspace/srv/udp/ucall.c

@@ -37 +37 @@
 #include <io/log.h>
 
-//#include "conn.h"
+#include "assoc.h"
 #include "udp_type.h"
 #include "ucall.h"
@@ -43 +43 @@
 udp_error_t udp_uc_create(udp_assoc_t **assoc)
 {
-//      udo_assoc_t *nassoc;
+        udp_assoc_t *nassoc;
 
         log_msg(LVL_DEBUG, "udp_uc_create()");
+        nassoc = udp_assoc_new(NULL, NULL);
+        if (nassoc == NULL)
+                return UDP_ENORES;
 
+        udp_assoc_add(nassoc);
+        *assoc = nassoc;
         return UDP_EOK;
 }
@@ -52 +57 @@
 udp_error_t udp_uc_set_foreign(udp_assoc_t *assoc, udp_sock_t *fsock)
 {
-//      udo_assoc_t *nconn;
-
         log_msg(LVL_DEBUG, "udp_uc_set_foreign(%p, %p)", assoc, fsock);
 
+        udp_assoc_set_foreign(assoc, fsock);
         return UDP_EOK;
 }
@@ -61 +65 @@
 udp_error_t udp_uc_set_local(udp_assoc_t *assoc, udp_sock_t *lsock)
 {
-//      udo_assoc_t *nconn;
-
         log_msg(LVL_DEBUG, "udp_uc_set_local(%p, %p)", assoc, lsock);
 
+        udp_assoc_set_local(assoc, lsock);
         return UDP_EOK;
 }
@@ -71 +74 @@
     size_t size, xflags_t flags)
 {
+        int rc;
+        udp_msg_t msg;
+
         log_msg(LVL_DEBUG, "%s: udp_uc_send()", assoc->name);
+
+        msg.data = data;
+        msg.data_size = size;
+
+        rc = udp_assoc_send(assoc, fsock, &msg);
+        switch (rc) {
+        case ENOMEM:
+                return UDP_ENORES;
+        case EINVAL:
+                return UDP_EUNSPEC;
+        case EIO:
+                return UDP_ENOROUTE;
+        }
         return UDP_EOK;
 }
@@ -92 +111 @@
 void udp_uc_destroy(udp_assoc_t *assoc)
 {
-        log_msg(LVL_DEBUG, "udp_uc_delete()");
-//      udp_assoc_destroy(assoc);
+        log_msg(LVL_DEBUG, "udp_uc_destroy()");
+        udp_assoc_remove(assoc);
+        udp_assoc_delete(assoc);
 }
 

uspace/srv/udp/udp_inet.c

@@ -43 +43 @@
 #include <task.h>
 
-/*
-#include "pdu.h"
-#include "rqueue.h"
-*/
 #include "std.h"
 #include "udp_inet.h"
+#include "udp_type.h"
 
 static int udp_inet_ev_recv(inet_dgram_t *dgram);
@@ -123 +120 @@
 
 /** Transmit PDU over network layer. */
-/*void tcp_transmit_pdu(tcp_pdu_t *pdu)
+int udp_transmit_pdu(udp_pdu_t *pdu)
 {
         int rc;
-        uint8_t *pdu_raw;
-        size_t pdu_raw_size;
         inet_dgram_t dgram;
 
-        pdu_raw_size = pdu->header_size + pdu->text_size;
-        pdu_raw = malloc(pdu_raw_size);
-        if (pdu_raw == NULL) {
-                log_msg(LVL_ERROR, "Failed to transmit PDU. Out of memory.");
-                return;
-        }
-
-        memcpy(pdu_raw, pdu->header, pdu->header_size);
-        memcpy(pdu_raw + pdu->header_size, pdu->text,
-            pdu->text_size);
-
-        dgram.src.ipv4 = pdu->src_addr.ipv4;
-        dgram.dest.ipv4 = pdu->dest_addr.ipv4;
+        dgram.src.ipv4 = pdu->src.ipv4;
+        dgram.dest.ipv4 = pdu->dest.ipv4;
         dgram.tos = 0;
-        dgram.data = pdu_raw;
-        dgram.size = pdu_raw_size;
+        dgram.data = pdu->data;
+        dgram.size = pdu->data_size;
 
         rc = inet_send(&dgram, INET_TTL_MAX, 0);
         if (rc != EOK)
                 log_msg(LVL_ERROR, "Failed to transmit PDU.");
+
+        return rc;
 }
-*/
+
 /** Process received PDU. */
 /*

uspace/srv/udp/udp_inet.h

@@ -36 +36 @@
 #define UDP_INET_H
 
+#include "udp_type.h"
+
 extern int udp_inet_init(void);
+extern int udp_transmit_pdu(udp_pdu_t *);
 
 #endif

uspace/srv/udp/udp_type.h

@@ -41 +41 @@
 
 typedef enum {
-        UDP_EOK
+        UDP_EOK,
+        /* Insufficient resources */
+        UDP_ENORES,
+        /* Foreign socket unspecified */
+        UDP_EUNSPEC,
+        /* No route to destination */
+        UDP_ENOROUTE
 } udp_error_t;
 
@@ -92 +98 @@
 } udp_client_t;
 
+/** UDP association
+ *
+ * This is a rough equivalent of a TCP connection endpoint. It allows
+ * sending and receiving UDP datagrams and it is uniquely identified
+ * by a socket pair.
+ */
 typedef struct {
         char *name;
+        link_t link;
+
+        /** Association identification (local and foreign socket) */
         udp_sockpair_t ident;
+
+        /** True if association was deleted by user */
+        bool deleted;
+
+        /** Protects access to association structure */
+        fibril_mutex_t lock;
+        /** Reference count */
+        atomic_t refcnt;
+
+        /** Receive queue */
+        list_t rcv_queue;
+        /** Receive queue CV. Broadcast when new datagram is inserted */
+        fibril_condvar_t rcv_queue_cv;
 } udp_assoc_t;