Changeset fb4d788 in mainline for uspace/srv/net/udp/assoc.h

Timestamp:

2015-07-28T11:28:14Z (9 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

6accc5cf

Parents:

df2bce3 (diff), 47726b5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from the mainline

File:

• uspace/srv/net/udp/assoc.h (modified) (2 diffs)

uspace/srv/net/udp/assoc.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2012 Jiri Svoboda
+ * Copyright (c) 2015 Jiri Svoboda
  * All rights reserved.
  *
@@ -36 +36 @@
 #define ASSOC_H
 
+#include <inet/endpoint.h>
 #include <ipc/loc.h>
 #include <sys/types.h>
 #include "udp_type.h"
 
-extern udp_assoc_t *udp_assoc_new(udp_sock_t *, udp_sock_t *);
+extern int udp_assocs_init(void);
+extern udp_assoc_t *udp_assoc_new(inet_ep2_t *, udp_assoc_cb_t *, void *);
 extern void udp_assoc_delete(udp_assoc_t *);
-extern void udp_assoc_add(udp_assoc_t *);
+extern int udp_assoc_add(udp_assoc_t *);
 extern void udp_assoc_remove(udp_assoc_t *);
 extern void udp_assoc_addref(udp_assoc_t *);
 extern void udp_assoc_delref(udp_assoc_t *);
 extern void udp_assoc_set_iplink(udp_assoc_t *, service_id_t);
-extern void udp_assoc_set_foreign(udp_assoc_t *, udp_sock_t *);
-extern void udp_assoc_set_local(udp_assoc_t *, udp_sock_t *);
-extern void udp_assoc_set_local_port(udp_assoc_t *, uint16_t);
-extern int udp_assoc_send(udp_assoc_t *, udp_sock_t *, udp_msg_t *);
-extern int udp_assoc_recv(udp_assoc_t *, udp_msg_t **, udp_sock_t *);
-extern void udp_assoc_received(udp_sockpair_t *, udp_msg_t *);
+extern int udp_assoc_send(udp_assoc_t *, inet_ep_t *, udp_msg_t *);
+extern int udp_assoc_recv(udp_assoc_t *, udp_msg_t **, inet_ep_t *);
+extern void udp_assoc_received(inet_ep2_t *, udp_msg_t *);
 extern void udp_assoc_reset(udp_assoc_t *);