r12804: This patch reworks the Samba4 sockets layer to use a socket_address

[samba.git] / source / lib / socket / socket.h

diff --git a/source/lib/socket/socket.h b/source/lib/socket/socket.h
index 165fbb63777ecb31dec6920518ef9f3c4c9d181b..f3e3ba83418f0814865e5a86bb06746e755330e8 100644 (file)
--- a/source/lib/socket/socket.h
+++ b/source/lib/socket/socket.h
@@ -28,6 +28,14 @@ enum socket_type {
        SOCKET_TYPE_DGRAM
 };
 
+struct socket_address {
+       const char *family;
+       char *addr;
+       int port;
+       struct sockaddr *sockaddr;
+       size_t sockaddrlen;
+};
+
 struct socket_ops {
        const char *name;
 
@@ -35,9 +43,9 @@ struct socket_ops {
 
        /* client ops */
        NTSTATUS (*fn_connect)(struct socket_context *sock,
-                               const char *my_address, int my_port,
-                               const char *server_address, int server_port,
-                               uint32_t flags);
+                              const struct socket_address *my_address,
+                              const struct socket_address *server_address,
+                              uint32_t flags);
 
        /* complete a non-blocking connect */
        NTSTATUS (*fn_connect_complete)(struct socket_context *sock,
@@ -45,8 +53,10 @@ struct socket_ops {
 
        /* server ops */
        NTSTATUS (*fn_listen)(struct socket_context *sock,
-                               const char *my_address, int port, int queue_size, uint32_t flags);
-       NTSTATUS (*fn_accept)(struct socket_context *sock,      struct socket_context **new_sock);
+                             const struct socket_address *my_address, 
+                             int queue_size, uint32_t flags);
+       NTSTATUS (*fn_accept)(struct socket_context *sock,      
+                             struct socket_context **new_sock);
 
        /* general ops */
        NTSTATUS (*fn_recv)(struct socket_context *sock, void *buf,
@@ -56,10 +66,10 @@ struct socket_ops {
 
        NTSTATUS (*fn_sendto)(struct socket_context *sock, 
                              const DATA_BLOB *blob, size_t *sendlen, uint32_t flags,
-                             const char *dest_addr, int dest_port);
+                             const struct socket_address *dest_addr);
        NTSTATUS (*fn_recvfrom)(struct socket_context *sock, 
                                void *buf, size_t wantlen, size_t *nread, uint32_t flags,
-                               const char **src_addr, int *src_port);
+                               TALLOC_CTX *addr_ctx, struct socket_address **src_addr);
        NTSTATUS (*fn_pending)(struct socket_context *sock, size_t *npending);      
 
        void (*fn_close)(struct socket_context *sock);
@@ -67,10 +77,8 @@ struct socket_ops {
        NTSTATUS (*fn_set_option)(struct socket_context *sock, const char *option, const char *val);
 
        char *(*fn_get_peer_name)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-       char *(*fn_get_peer_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-       int (*fn_get_peer_port)(struct socket_context *sock);
-       char *(*fn_get_my_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-       int (*fn_get_my_port)(struct socket_context *sock);
+       struct socket_address *(*fn_get_peer_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+       struct socket_address *(*fn_get_my_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
 
        int (*fn_get_fd)(struct socket_context *sock);
 };
@@ -110,31 +118,38 @@ struct socket_context {
 NTSTATUS socket_create(const char *name, enum socket_type type, 
                       struct socket_context **new_sock, uint32_t flags);
 NTSTATUS socket_connect(struct socket_context *sock,
-                       const char *my_address, int my_port,
-                       const char *server_address, int server_port,
+                       const struct socket_address *my_address, 
+                       const struct socket_address *server_address,
                        uint32_t flags);
 NTSTATUS socket_connect_complete(struct socket_context *sock, uint32_t flags);
-NTSTATUS socket_listen(struct socket_context *sock, const char *my_address, int port, int queue_size, uint32_t flags);
+NTSTATUS socket_listen(struct socket_context *sock, 
+                      const struct socket_address *my_address, 
+                      int queue_size, uint32_t flags);
 NTSTATUS socket_accept(struct socket_context *sock, struct socket_context **new_sock);
 NTSTATUS socket_recv(struct socket_context *sock, void *buf, 
                     size_t wantlen, size_t *nread, uint32_t flags);
 NTSTATUS socket_recvfrom(struct socket_context *sock, void *buf, 
                         size_t wantlen, size_t *nread, uint32_t flags,
-                        const char **src_addr, int *src_port);
+                        TALLOC_CTX *addr_ctx, struct socket_address **src_addr);
 NTSTATUS socket_send(struct socket_context *sock, 
                     const DATA_BLOB *blob, size_t *sendlen, uint32_t flags);
 NTSTATUS socket_sendto(struct socket_context *sock, 
                       const DATA_BLOB *blob, size_t *sendlen, uint32_t flags,
-                      const char *dest_addr, int dest_port);
+                      const struct socket_address *dest_addr);
 NTSTATUS socket_pending(struct socket_context *sock, size_t *npending);
 NTSTATUS socket_set_option(struct socket_context *sock, const char *option, const char *val);
 char *socket_get_peer_name(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-char *socket_get_peer_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-int socket_get_peer_port(struct socket_context *sock);
-char *socket_get_my_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-int socket_get_my_port(struct socket_context *sock);
+struct socket_address *socket_get_peer_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+struct socket_address *socket_get_my_addr(struct socket_context *sock, TALLOC_CTX *mem_ctx);
 int socket_get_fd(struct socket_context *sock);
 NTSTATUS socket_dup(struct socket_context *sock);
+struct socket_address *socket_address_from_strings(TALLOC_CTX *mem_ctx,
+                                                  const char *type, 
+                                                  const char *host,
+                                                  int port);
+struct socket_address *socket_address_from_sockaddr(TALLOC_CTX *mem_ctx, 
+                                                   struct sockaddr *sockaddr, 
+                                                   size_t addrlen);
 const struct socket_ops *socket_getops_byname(const char *name, enum socket_type type);
 BOOL allow_access(TALLOC_CTX *mem_ctx,
                  const char **deny_list, const char **allow_list,
@@ -144,16 +159,14 @@ BOOL socket_check_access(struct socket_context *sock,
                         const char **allow_list, const char **deny_list);
 
 struct composite_context *socket_connect_send(struct socket_context *sock,
-                                             const char *my_address,
-                                             int my_port,
-                                             const char *server_address,
-                                             int server_port,
+                                             struct socket_address *my_address,
+                                             struct socket_address *server_address, 
                                              uint32_t flags,
                                              struct event_context *event_ctx);
 NTSTATUS socket_connect_recv(struct composite_context *ctx);
 NTSTATUS socket_connect_ev(struct socket_context *sock,
-                          const char *my_address, int my_port,
-                          const char *server_address, int server_port,
+                          struct socket_address *my_address,
+                          struct socket_address *server_address, 
                           uint32_t flags, struct event_context *ev);
 
 struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx,