s3:rpc_server: Rename create_tcpip_socket

Additionally move function declaration from proto.h to rpc_server.h

Signed-off-by: Samuel Cabrero <scabrero@suse.de>
Reviewed-by: Stefan Metzmacher <metze@samba.org>

diff --git a/source3/include/proto.h b/source3/include/proto.h
index 8b387f7c56327c921b75999970f3e1ccf73d6c8d..04fab2cd9286b1a99c04cb832e76475cdfb1a8c9 100644 (file)
--- a/source3/include/proto.h
+++ b/source3/include/proto.h
@@ -562,7 +562,6 @@ int get_remote_hostname(const struct tsocket_address *remote_address,
 int create_pipe_sock(const char *socket_dir,
                     const char *socket_name,
                     mode_t dir_perms);
-int create_tcpip_socket(const struct sockaddr_storage *ifss, uint16_t *port);
 const char *get_mydnsfullname(void);
 bool is_myname_or_ipaddr(const char *s);
 int poll_one_fd(int fd, int events, int timeout, int *revents);

diff --git a/source3/rpc_server/rpc_server.c b/source3/rpc_server/rpc_server.c
index 4757a529b31c9c149461fdc5b2bc70179cfd2b8f..9a90157d9b5b66366c66a64118fb5093cca0925d 100644 (file)
--- a/source3/rpc_server/rpc_server.c
+++ b/source3/rpc_server/rpc_server.c
@@ -613,7 +613,8 @@ static void dcerpc_ncacn_tcpip_listener(struct tevent_context *ev,
                                        uint16_t flags,
                                        void *private_data);
 
-int create_tcpip_socket(const struct sockaddr_storage *ifss, uint16_t *port)
+int dcesrv_create_ncacn_ip_tcp_socket(const struct sockaddr_storage *ifss,
+                                     uint16_t *port)
 {
        int fd = -1;
 
@@ -667,7 +668,7 @@ uint16_t setup_dcerpc_ncacn_tcpip_socket(struct tevent_context *ev_ctx,
        state->ep.port = port;
        state->disconnect_fn = NULL;
 
-       state->fd = create_tcpip_socket(ifss, &state->ep.port);
+       state->fd = dcesrv_create_ncacn_ip_tcp_socket(ifss, &state->ep.port);
        if (state->fd == -1) {
                goto out;
        }

diff --git a/source3/rpc_server/rpc_server.h b/source3/rpc_server/rpc_server.h
index c67291bb44561d53864b0c84946336501d0f9d66..06750a14781339970a432273c8faa8fecc66fb9c 100644 (file)
--- a/source3/rpc_server/rpc_server.h
+++ b/source3/rpc_server/rpc_server.h
@@ -90,6 +90,8 @@ void named_pipe_accept_function(struct tevent_context *ev_ctx,
                                void *private_data);
 void named_pipe_packet_process(struct tevent_req *subreq);
 
+int dcesrv_create_ncacn_ip_tcp_socket(const struct sockaddr_storage *ifss,
+                                     uint16_t *port);
 uint16_t setup_dcerpc_ncacn_tcpip_socket(struct tevent_context *ev_ctx,
                                         struct messaging_context *msg_ctx,
                                         const struct sockaddr_storage *ifss,

diff --git a/source3/rpc_server/rpc_sock_helper.c b/source3/rpc_server/rpc_sock_helper.c
index d575e2ea1dc7f6005ad38d4d2bb7ac8f01c31548..f093111b3c9735d0fd5d732de74ab290db445fda 100644 (file)
--- a/source3/rpc_server/rpc_sock_helper.c
+++ b/source3/rpc_server/rpc_sock_helper.c
@@ -60,7 +60,7 @@ NTSTATUS rpc_create_tcpip_sockets(const struct ndr_interface_table *iface,
                        const char *addr;
                        int fd;
 
-                       fd = create_tcpip_socket(ifss, &p);
+                       fd = dcesrv_create_ncacn_ip_tcp_socket(ifss, &p);
                        if (fd < 0) {
                                status = NT_STATUS_UNSUCCESSFUL;
                                goto done;
@@ -121,7 +121,7 @@ NTSTATUS rpc_create_tcpip_sockets(const struct ndr_interface_table *iface,
                                continue;
                        }
 
-                       fd = create_tcpip_socket(&ss, &p);
+                       fd = dcesrv_create_ncacn_ip_tcp_socket(&ss, &p);
                        if (fd < 0) {
                                status = NT_STATUS_UNSUCCESSFUL;
                                goto done;