Changeset 2f19103 in mainline for uspace/srv/net/udp/ucall.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/ucall.c (modified) (7 diffs)

uspace/srv/net/udp/ucall.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -50 +50 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_create()");
-        nassoc = udp_assoc_new(NULL, NULL, NULL, NULL);
+        nassoc = udp_assoc_new(NULL, NULL, NULL);
         if (nassoc == NULL)
                 return UDP_ENORES;
@@ -67 +67 @@
 }
 
-udp_error_t udp_uc_set_foreign(udp_assoc_t *assoc, udp_sock_t *fsock)
+udp_error_t udp_uc_set_remote(udp_assoc_t *assoc, inet_ep_t *ep)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_foreign(%p, %p)", assoc, fsock);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_remote(%p, %p)", assoc, ep);
 
-        udp_assoc_set_foreign(assoc, fsock);
+        udp_assoc_set_remote(assoc, ep);
         return UDP_EOK;
 }
 
-udp_error_t udp_uc_set_local(udp_assoc_t *assoc, udp_sock_t *lsock)
+udp_error_t udp_uc_set_local(udp_assoc_t *assoc, inet_ep_t *ep)
 {
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_local(%p, %p)", assoc, lsock);
-        
-        udp_assoc_set_local(assoc, lsock);
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_local(%p, %p)", assoc, ep);
+
+        udp_assoc_set_local(assoc, ep);
         return UDP_EOK;
 }
@@ -86 +86 @@
 {
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_uc_set_local(%p, %" PRIu16 ")", assoc, lport);
-        
+
         udp_assoc_set_local_port(assoc, lport);
         return UDP_EOK;
 }
 
-udp_error_t udp_uc_send(udp_assoc_t *assoc, udp_sock_t *fsock, void *data,
+udp_error_t udp_uc_send(udp_assoc_t *assoc, inet_ep_t *remote, void *data,
     size_t size, xflags_t flags)
 {
@@ -102 +102 @@
         msg.data_size = size;
 
-        rc = udp_assoc_send(assoc, fsock, &msg);
+        rc = udp_assoc_send(assoc, remote, &msg);
         switch (rc) {
         case ENOMEM:
@@ -115 +115 @@
 
 udp_error_t udp_uc_receive(udp_assoc_t *assoc, void *buf, size_t size,
-    size_t *rcvd, xflags_t *xflags, udp_sock_t *fsock)
+    size_t *rcvd, xflags_t *xflags, inet_ep_t *remote)
 {
         size_t xfer_size;
@@ -122 +122 @@
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "%s: udp_uc_receive()", assoc->name);
-        rc = udp_assoc_recv(assoc, &msg, fsock);
+        rc = udp_assoc_recv(assoc, &msg, remote);
         log_msg(LOG_DEFAULT, LVL_DEBUG, "udp_assoc_recv -> %d", rc);
         switch (rc) {