Changeset 2f19103 in mainline for uspace/srv/net/udp/service.c

Timestamp:

2015-05-22T07:21:37Z (9 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

58e9dec

Parents:

bf7587b0

Message:

TCP and UDP servers can make use of inet/endpoint.h types internally.

File:

• uspace/srv/net/udp/service.c (modified) (10 diffs)

uspace/srv/net/udp/service.c

@@ -54 +54 @@
 #define MAX_MSG_SIZE DATA_XFER_LIMIT
 
-static void udp_cassoc_recv_msg(void *, udp_sockpair_t *, udp_msg_t *);
+static void udp_cassoc_recv_msg(void *, inet_ep2_t *, udp_msg_t *);
 
 static udp_assoc_cb_t udp_cassoc_cb = {
@@ -60 +60 @@
 };
 
-static int udp_cassoc_queue_msg(udp_cassoc_t *cassoc, udp_sockpair_t *sp,
+static int udp_cassoc_queue_msg(udp_cassoc_t *cassoc, inet_ep2_t *epp,
     udp_msg_t *msg)
 {
@@ -66 +66 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_cassoc_queue_msg(%p, %p, %p)",
-            cassoc, sp, msg);
+            cassoc, epp, msg);
 
         rqe = calloc(1, sizeof(udp_crcv_queue_entry_t));
@@ -73 +73 @@
 
         link_initialize(&rqe->link);
-        rqe->sp = *sp;
+        rqe->epp = *epp;
         rqe->msg = msg;
         rqe->cassoc = cassoc;
@@ -144 +144 @@
 }
 
-static void udp_cassoc_recv_msg(void *arg, udp_sockpair_t *sp, udp_msg_t *msg)
+static void udp_cassoc_recv_msg(void *arg, inet_ep2_t *epp, udp_msg_t *msg)
 {
         udp_cassoc_t *cassoc = (udp_cassoc_t *) arg;
 
-        udp_cassoc_queue_msg(cassoc, sp, msg);
+        udp_cassoc_queue_msg(cassoc, epp, msg);
         udp_ev_data(cassoc->client);
 }
@@ -157 +157 @@
         udp_assoc_t *assoc;
         udp_cassoc_t *cassoc;
-        udp_sock_t local;
-        udp_sock_t remote;
         int rc;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_create_impl");
 
-        local.addr = epp->local.addr;
-        local.port = epp->local.port;
-        remote.addr = epp->remote.addr;
-        remote.port = epp->remote.port;
-
-        assoc = udp_assoc_new(&local, &remote, NULL, NULL);
+        assoc = udp_assoc_new(epp, NULL, NULL);
         if (assoc == NULL)
                 return EIO;
@@ -213 +206 @@
 {
         udp_msg_t msg;
-        udp_sock_t remote;
         udp_cassoc_t *cassoc;
         int rc;
@@ -221 +213 @@
                 return rc;
 
-        remote.addr = dest->addr;
-        remote.port = dest->port;
-
         msg.data = data;
         msg.data_size = size;
-        rc = udp_assoc_send(cassoc->assoc, &remote, &msg);
+        rc = udp_assoc_send(cassoc->assoc, dest, &msg);
         if (rc != EOK)
                 return rc;
@@ -390 +379 @@
         ipc_callid_t callid;
         size_t size;
-        inet_ep_t ep;
         udp_crcv_queue_entry_t *enext;
         sysarg_t assoc_id;
@@ -410 +398 @@
         }
 
-        inet_ep_init(&ep);
-        ep.addr = enext->sp.foreign.addr;
-        ep.port = enext->sp.foreign.port;
-
-        rc = async_data_read_finalize(callid, &ep, max(size, (ssize_t)sizeof(ep)));
+        rc = async_data_read_finalize(callid, &enext->epp.remote,
+            max(size, (ssize_t)sizeof(inet_ep_t)));
         if (rc != EOK) {
                 async_answer_0(iid, rc);