sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

r4753: added the ability for the generic socket library to handle async

Browse Source 
connect(). This required a small API change (the addition of
a socket_connect_complete() method)
(This used to be commit b787dd166f)
This commit is contained in:
Andrew Tridgell 2005-01-15 10:28:08 +00:00 committed by Gerald (Jerry) Carter
parent f4e29ae1e9
commit 21aafc3536
5 changed files with 104 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source4/lib/socket/socket.c
View File

@ -107,6 +107,14 @@ NTSTATUS socket_connect(struct socket_context *sock,
return sock->ops->fn_connect(sock, my_address, my_port, server_address, server_port, flags);
}
NTSTATUS socket_connect_complete(struct socket_context *sock, uint32_t flags)
{
if (!sock->ops->fn_connect_complete) {
return NT_STATUS_NOT_IMPLEMENTED;
}
return sock->ops->fn_connect_complete(sock, flags);
}
NTSTATUS socket_listen(struct socket_context *sock, const char *my_address, int port, int queue_size, uint32_t flags)
{
if (sock->type != SOCKET_TYPE_STREAM) {

4
source4/lib/socket/socket.h
View File

@ -39,6 +39,10 @@ struct socket_ops {
const char *server_address, int server_port,
uint32_t flags);
/* complete a non-blocking connect */
NTSTATUS (*fn_connect_complete)(struct socket_context *sock,
uint32_t flags);
/* server ops */
NTSTATUS (*fn_listen)(struct socket_context *sock,
const char *my_address, int port, int queue_size, uint32_t flags);

44
source4/lib/socket/socket_ipv4.c
View File

@ -1,7 +1,10 @@
/*
Unix SMB/CIFS implementation.
Socket IPv4 functions
Copyright (C) Stefan Metzmacher 2004
Copyright (C) Andrew Tridgell 2004-2005
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -36,6 +39,34 @@ static void ipv4_tcp_close(struct socket_context *sock)
close(sock->fd);
}
static NTSTATUS ipv4_tcp_connect_complete(struct socket_context *sock, uint32_t flags)
{
int error=0, ret;
socklen_t len = sizeof(error);
/* check for any errors that may have occurred - this is needed
for non-blocking connect */
ret = getsockopt(sock->fd, SOL_SOCKET, SO_ERROR, &error, &len);
if (ret == -1) {
return map_nt_error_from_unix(errno);
}
if (error != 0) {
return map_nt_error_from_unix(error);
}
if (!(flags & SOCKET_FLAG_BLOCK)) {
ret = set_blocking(sock->fd, False);
if (ret == -1) {
return map_nt_error_from_unix(errno);
}
}
sock->state = SOCKET_STATE_CLIENT_CONNECTED;
return NT_STATUS_OK;
}
static NTSTATUS ipv4_tcp_connect(struct socket_context *sock,
const char *my_address, int my_port,
const char *srv_address, int srv_port,
@ -79,18 +110,10 @@ static NTSTATUS ipv4_tcp_connect(struct socket_context *sock,
return map_nt_error_from_unix(errno);
}
if (!(flags & SOCKET_FLAG_BLOCK)) {
ret = set_blocking(sock->fd, False);
if (ret == -1) {
return map_nt_error_from_unix(errno);
}
}
sock->state = SOCKET_STATE_CLIENT_CONNECTED;
return NT_STATUS_OK;
return ipv4_tcp_connect_complete(sock, flags);
}
static NTSTATUS ipv4_tcp_listen(struct socket_context *sock,
const char *my_address, int port,
int queue_size, uint32_t flags)
@ -315,6 +338,7 @@ static const struct socket_ops ipv4_tcp_ops = {
.fn_init = ipv4_tcp_init,
.fn_connect = ipv4_tcp_connect,
.fn_connect_complete = ipv4_tcp_connect_complete,
.fn_listen = ipv4_tcp_listen,
.fn_accept = ipv4_tcp_accept,
.fn_recv = ipv4_tcp_recv,

39
source4/lib/socket/socket_ipv6.c
View File

@ -50,6 +50,33 @@ static void ipv6_tcp_close(struct socket_context *sock)
close(sock->fd);
}
static NTSTATUS ipv6_tcp_connect_complete(struct socket_context *sock, uint32_t flags)
{
int error=0, ret;
socklen_t len = sizeof(error);
/* check for any errors that may have occurred - this is needed
for non-blocking connect */
ret = getsockopt(sock->fd, SOL_SOCKET, SO_ERROR, &error, &len);
if (ret == -1) {
return map_nt_error_from_unix(errno);
}
if (error != 0) {
return map_nt_error_from_unix(error);
}
if (!(flags & SOCKET_FLAG_BLOCK)) {
ret = set_blocking(sock->fd, False);
if (ret == -1) {
return map_nt_error_from_unix(errno);
}
}
sock->state = SOCKET_STATE_CLIENT_CONNECTED;
return NT_STATUS_OK;
}
static NTSTATUS ipv6_tcp_connect(struct socket_context *sock,
const char *my_address, int my_port,
const char *srv_address, int srv_port,
@ -87,16 +114,7 @@ static NTSTATUS ipv6_tcp_connect(struct socket_context *sock,
return map_nt_error_from_unix(errno);
}
if (!(flags & SOCKET_FLAG_BLOCK)) {
ret = set_blocking(sock->fd, False);
if (ret == -1) {
return map_nt_error_from_unix(errno);
}
}
sock->state = SOCKET_STATE_CLIENT_CONNECTED;
return NT_STATUS_OK;
return ipv6_tcp_connect_complete(sock, flags);
}
static NTSTATUS ipv6_tcp_listen(struct socket_context *sock,
@ -333,6 +351,7 @@ static const struct socket_ops ipv6_tcp_ops = {
.fn_init = ipv6_tcp_init,
.fn_connect = ipv6_tcp_connect,
.fn_connect_complete = ipv6_tcp_connect_complete,
.fn_listen = ipv6_tcp_listen,
.fn_accept = ipv6_tcp_accept,
.fn_recv = ipv6_tcp_recv,

39
source4/lib/socket/socket_unix.c
View File

@ -50,6 +50,33 @@ static void unixdom_close(struct socket_context *sock)
close(sock->fd);
}
static NTSTATUS unixdom_connect_complete(struct socket_context *sock, uint32_t flags)
{
int error=0, ret;
socklen_t len = sizeof(error);
/* check for any errors that may have occurred - this is needed
for non-blocking connect */
ret = getsockopt(sock->fd, SOL_SOCKET, SO_ERROR, &error, &len);
if (ret == -1) {
return map_nt_error_from_unix(errno);
}
if (error != 0) {
return map_nt_error_from_unix(error);
}
if (!(flags & SOCKET_FLAG_BLOCK)) {
ret = set_blocking(sock->fd, False);
if (ret == -1) {
return map_nt_error_from_unix(errno);
}
}
sock->state = SOCKET_STATE_CLIENT_CONNECTED;
return NT_STATUS_OK;
}
static NTSTATUS unixdom_connect(struct socket_context *sock,
const char *my_address, int my_port,
const char *srv_address, int srv_port,
@ -66,21 +93,12 @@ static NTSTATUS unixdom_connect(struct socket_context *sock,
srv_addr.sun_family = AF_UNIX;
strncpy(srv_addr.sun_path, srv_address, sizeof(srv_addr.sun_path));
if (!(flags & SOCKET_FLAG_BLOCK)) {
ret = set_blocking(sock->fd, False);
if (ret == -1) {
return NT_STATUS_INVALID_PARAMETER;
}
}
ret = connect(sock->fd, (const struct sockaddr *)&srv_addr, sizeof(srv_addr));
if (ret == -1) {
return unixdom_error(errno);
}
sock->state = SOCKET_STATE_CLIENT_CONNECTED;
return NT_STATUS_OK;
return unixdom_connect_complete(sock, flags);
}
static NTSTATUS unixdom_listen(struct socket_context *sock,
@ -252,6 +270,7 @@ static const struct socket_ops unixdom_ops = {
.fn_init = unixdom_init,
.fn_connect = unixdom_connect,
.fn_connect_complete = unixdom_connect_complete,
.fn_listen = unixdom_listen,
.fn_accept = unixdom_accept,
.fn_recv = unixdom_recv,