From 86ff8cf227c759189080ade0deb4f5b184bb14f7 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Thu, 23 Dec 2010 15:20:22 +0100 Subject: s3: Allow more control over smbsock_[any_]connect Autobuild-User: Volker Lendecke Autobuild-Date: Wed Dec 29 23:30:44 CET 2010 on sn-devel-104 --- source3/include/proto.h | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) (limited to 'source3/include') diff --git a/source3/include/proto.h b/source3/include/proto.h index c469888940..385a5371be 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -5621,24 +5621,37 @@ int fncall_recv(struct tevent_req *req, int *perr); struct tevent_req *smbsock_connect_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, const struct sockaddr_storage *addr, + uint16_t port, const char *called_name, - const char *calling_name); + int called_type, + const char *calling_name, + int calling_type); NTSTATUS smbsock_connect_recv(struct tevent_req *req, int *sock, - uint16_t *port); -NTSTATUS smbsock_connect(const struct sockaddr_storage *addr, - const char *called_name, const char *calling_name, - int *pfd, uint16_t *port); + uint16_t *ret_port); +NTSTATUS smbsock_connect(const struct sockaddr_storage *addr, uint16_t port, + const char *called_name, int called_type, + const char *calling_name, int calling_type, + int *pfd, uint16_t *ret_port); struct tevent_req *smbsock_any_connect_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev, const struct sockaddr_storage *addrs, const char **called_names, - size_t num_addrs); + int *called_types, + const char **calling_names, + int *calling_types, + size_t num_addrs, uint16_t port); NTSTATUS smbsock_any_connect_recv(struct tevent_req *req, int *pfd, - size_t *chosen_index, uint16_t *port); + size_t *chosen_index, uint16_t *chosen_port); NTSTATUS smbsock_any_connect(const struct sockaddr_storage *addrs, - const char **called_names, size_t num_addrs, - int *pfd, size_t *chosen_index, uint16_t *port); + const char **called_names, + int *called_types, + const char **calling_names, + int *calling_types, + size_t num_addrs, + uint16_t port, + int *pfd, size_t *chosen_index, + uint16_t *chosen_port); /* The following definitions come from rpc_server/srv_samr_nt.c */ NTSTATUS access_check_object( struct security_descriptor *psd, struct security_token *token, -- cgit