Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema

[ira/wip.git] / lib / tsocket / tsocket.h

diff --git a/lib/tsocket/tsocket.h b/lib/tsocket/tsocket.h
index 077fd1ef35fd39f400c8492a9374c873ffcbbbf2..8f69490012e223ea33c7642ba5780a0795bc0f1e 100644 (file)
--- a/lib/tsocket/tsocket.h
+++ b/lib/tsocket/tsocket.h
@@ -34,7 +34,6 @@ struct iovec;
 
 enum tsocket_type {
        TSOCKET_TYPE_STREAM = 1,
-       TSOCKET_TYPE_DGRAM,
        TSOCKET_TYPE_MESSAGE
 };
 
@@ -68,14 +67,6 @@ int tsocket_readv(struct tsocket_context *sock,
 int tsocket_writev(struct tsocket_context *sock,
                   const struct iovec *vector, size_t count);
 
-ssize_t tsocket_recvfrom(struct tsocket_context *sock,
-                        uint8_t *data, size_t len,
-                        TALLOC_CTX *addr_ctx,
-                        struct tsocket_address **src_addr);
-ssize_t tsocket_sendto(struct tsocket_context *sock,
-                      const uint8_t *data, size_t len,
-                      const struct tsocket_address *dest_addr);
-
 int tsocket_get_status(const struct tsocket_context *sock);
 
 int _tsocket_get_local_address(const struct tsocket_context *sock,
@@ -207,29 +198,6 @@ int _tdgram_unix_dgram_socket(const struct tsocket_address *local,
  * Async helpers
  */
 
-struct tevent_req *tsocket_recvfrom_send(struct tsocket_context *sock,
-                                        TALLOC_CTX *mem_ctx);
-ssize_t tsocket_recvfrom_recv(struct tevent_req *req,
-                             int *perrno,
-                             TALLOC_CTX *mem_ctx,
-                             uint8_t **buf,
-                             struct tsocket_address **src);
-
-struct tevent_req *tsocket_sendto_send(struct tsocket_context *sock,
-                                      TALLOC_CTX *mem_ctx,
-                                      const uint8_t *buf,
-                                      size_t len,
-                                      const struct tsocket_address *dst);
-ssize_t tsocket_sendto_recv(struct tevent_req *req, int *perrno);
-
-struct tevent_req *tsocket_sendto_queue_send(TALLOC_CTX *mem_ctx,
-                                            struct tsocket_context *sock,
-                                            struct tevent_queue *queue,
-                                            const uint8_t *buf,
-                                            size_t len,
-                                            struct tsocket_address *dst);
-ssize_t tsocket_sendto_queue_recv(struct tevent_req *req, int *perrno);
-
 struct tevent_req *tsocket_connect_send(struct tsocket_context *sock,
                                        TALLOC_CTX *mem_ctx,
                                        const struct tsocket_address *dst);
@@ -259,5 +227,18 @@ struct tevent_req *tsocket_readv_send(struct tsocket_context *sock,
                                      void *private_data);
 int tsocket_readv_recv(struct tevent_req *req, int *perrno);
 
+/*
+ * Queue helpers
+ */
+
+struct tevent_req *tdgram_sendto_queue_send(TALLOC_CTX *mem_ctx,
+                                           struct tevent_context *ev,
+                                           struct tdgram_context *dgram,
+                                           struct tevent_queue *queue,
+                                           const uint8_t *buf,
+                                           size_t len,
+                                           struct tsocket_address *dst);
+ssize_t tdgram_sendto_queue_recv(struct tevent_req *req, int *perrno);
+
 #endif /* _TSOCKET_H */