From ce694e7051dca90cdb5700e3865315d16931c3c1 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 13 Sep 2004 14:17:41 +0000
Subject: r2328: add the start of a new system and protocol independent socket
 library.

this is not used, but compiled currently

there're maybe some api changes later...

metze
(This used to be commit de4447d7a57c614b80d0ac00dca900ea7e1c21ea)
---
 source4/lib/socket/socket.h | 93 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 93 insertions(+)
 create mode 100644 source4/lib/socket/socket.h

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
new file mode 100644
index 0000000000..dfc964b741
--- /dev/null
+++ b/source4/lib/socket/socket.h
@@ -0,0 +1,93 @@
+/* 
+   Unix SMB/CIFS implementation.
+   Socket functions
+   Copyright (C) Stefan Metzmacher 2004
+   
+   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
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+   
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+   
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef _SAMBA_SOCKET_H
+#define _SAMBA_SOCKET_H
+
+struct socket_context;
+
+enum socket_type {
+	SOCKET_TYPE_STREAM
+};
+
+struct socket_ops {
+	const char *name;
+	enum socket_type type;
+
+	NTSTATUS (*init)(struct socket_context *sock);
+
+	/* client ops */
+	NTSTATUS (*connect)(struct socket_context *sock,
+				const char *my_address, int my_port,
+				const char *server_address, int server_port,
+				uint32_t flags);
+
+	/* server ops */
+	NTSTATUS (*listen)(struct socket_context *sock,
+				const char *my_address, int port, int queue_size, uint32_t flags);
+	NTSTATUS (*accept)(struct socket_context *sock,
+				struct socket_context **new_sock, uint32_t flags);
+
+	/* general ops */
+	NTSTATUS (*recv)(struct socket_context *sock, TALLOC_CTX *mem_ctx, 
+				DATA_BLOB *blob, size_t wantlen, uint32_t flags);
+	NTSTATUS (*send)(struct socket_context *sock, TALLOC_CTX *mem_ctx,
+				const DATA_BLOB *blob, size_t *sendlen, uint32_t flags);
+
+	void (*close)(struct socket_context *sock);
+
+	NTSTATUS (*set_option)(struct socket_context *sock, const char *option, const char *val);
+
+	const char *(*get_peer_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+	int (*get_peer_port)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+	const char *(*get_my_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+	int (*get_my_port)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+
+	int (*get_fd)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+};
+
+enum socket_state {
+	SOCKET_STATE_UNDEFINED,
+
+	SOCKET_STATE_CLIENT_START,
+	SOCKET_STATE_CLIENT_CONNECTED,
+	SOCKET_STATE_CLIENT_STARTTLS,
+	SOCKET_STATE_CLIENT_ERROR,
+	
+	SOCKET_STATE_SERVER_LISTEN,
+	SOCKET_STATE_SERVER_CONNECTED,
+	SOCKET_STATE_SERVER_STARTTLS,
+	SOCKET_STATE_SERVER_ERROR
+};
+
+#define SOCKET_OPTION_BLOCK 0x00000001
+
+struct socket_context {
+	enum socket_type type;
+	enum socket_state state;
+	uint32_t flags;
+
+	int fd;
+
+	void *private_data;
+	const struct socket_ops *ops;
+};
+
+#endif /* _SAMBA_SOCKET_H */
-- 
cgit 


From 498ea8485f8763a1c4e39bf49cd0b68004b2f8c3 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 15 Sep 2004 12:14:47 +0000
Subject: r2343: - make socket_get_*_addr() return char * not const char * -
 add some error mappings - use some flags SOCKET_FLAG_PEEK ans
 SOCKET_FLAG_BLOCK

metze
(This used to be commit a375c6b0b1ec4d63251f63993f7798c1f2e7c717)
---
 source4/lib/socket/socket.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index dfc964b741..10e937c4e2 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -55,9 +55,9 @@ struct socket_ops {
 
 	NTSTATUS (*set_option)(struct socket_context *sock, const char *option, const char *val);
 
-	const char *(*get_peer_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+	char *(*get_peer_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
 	int (*get_peer_port)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-	const char *(*get_my_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+	char *(*get_my_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
 	int (*get_my_port)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
 
 	int (*get_fd)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
@@ -77,7 +77,8 @@ enum socket_state {
 	SOCKET_STATE_SERVER_ERROR
 };
 
-#define SOCKET_OPTION_BLOCK 0x00000001
+#define SOCKET_FLAG_BLOCK 0x00000001
+#define SOCKET_FLAG_PEEK  0x00000002
 
 struct socket_context {
 	enum socket_type type;
-- 
cgit 


From be61c9d8773eb3d0dd97bcd5e9ccd3f1aabcd1d6 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 20 Sep 2004 09:13:17 +0000
Subject: r2439: - function that return just an int don't need a TALLOC_CTX -
 fix some return and state bugs

metze
(This used to be commit 2757c593ab746b9dd7090f2cf5fcc31686adf67f)
---
 source4/lib/socket/socket.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 10e937c4e2..ea4de1d291 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -56,11 +56,11 @@ struct socket_ops {
 	NTSTATUS (*set_option)(struct socket_context *sock, const char *option, const char *val);
 
 	char *(*get_peer_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-	int (*get_peer_port)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+	int (*get_peer_port)(struct socket_context *sock);
 	char *(*get_my_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-	int (*get_my_port)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+	int (*get_my_port)(struct socket_context *sock);
 
-	int (*get_fd)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
+	int (*get_fd)(struct socket_context *sock);
 };
 
 enum socket_state {
-- 
cgit 


From fe45888e228d1452b8301b3b074794bd443a7fa5 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 24 Sep 2004 03:34:55 +0000
Subject: r2581: added "hosts allow" and "hosts deny" checking in smbd. I
 needed this as my box keeps getting hit by viruses spreading on my companies
 internal network, which screws up my debug log badly (sigh).

metze, I'm not sure if you think access.c should go in the socket
library or not. It is closely tied to the socket functions, but you
may prefer it separate.

The access.c code is a port from Samba3, but with some cleanups to
make it (slighly) less ugly.
(This used to be commit 058b2fd99e3957d7d2a9544fd27071f1122eab68)
---
 source4/lib/socket/socket.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index ea4de1d291..a089a1b78a 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -55,6 +55,7 @@ struct socket_ops {
 
 	NTSTATUS (*set_option)(struct socket_context *sock, const char *option, const char *val);
 
+	char *(*get_peer_name)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
 	char *(*get_peer_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
 	int (*get_peer_port)(struct socket_context *sock);
 	char *(*get_my_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-- 
cgit 


From c6888da1487ab301292c3d4d05d0464833f3ce57 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 28 Oct 2004 04:00:43 +0000
Subject: r3304: changed the API to lib/socket/ a little.

The main change is to make socket_recv() take a pre-allocated buffer,
rather than allocating one itself. This allows non-blocking users of
this API to avoid a memcpy(). As a result our messaging code is now
about 10% faster, and the ncacn_ip_tcp and ncalrpc code is also
faster.

The second change was to remove the unused mem_ctx argument from
socket_send(). Having it there implied that memory could be allocated,
which meant the caller had to worry about freeing that memory (if for
example it is sending in a tight loop using the same memory
context). Removing that unused argument keeps life simpler for users.
(This used to be commit a16e4756cd68ca8aab4ffc59d4d9db0b6e44dbd1)
---
 source4/lib/socket/socket.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index a089a1b78a..6562bb376b 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -46,10 +46,10 @@ struct socket_ops {
 				struct socket_context **new_sock, uint32_t flags);
 
 	/* general ops */
-	NTSTATUS (*recv)(struct socket_context *sock, TALLOC_CTX *mem_ctx, 
-				DATA_BLOB *blob, size_t wantlen, uint32_t flags);
-	NTSTATUS (*send)(struct socket_context *sock, TALLOC_CTX *mem_ctx,
-				const DATA_BLOB *blob, size_t *sendlen, uint32_t flags);
+	NTSTATUS (*recv)(struct socket_context *sock, void *buf,
+			 size_t wantlen, size_t *nread, uint32_t flags);
+	NTSTATUS (*send)(struct socket_context *sock, 
+			 const DATA_BLOB *blob, size_t *sendlen, uint32_t flags);
 
 	void (*close)(struct socket_context *sock);
 
-- 
cgit 


From 990d76f7cbd4339c30f650781c40463234fc47e1 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 28 Oct 2004 07:55:33 +0000
Subject: r3314: added a option "socket:testnonblock" to the generic socket
 code. If you set this option (either on the command line using --option or in
 smb.conf) then every socket recv or send will return short by random amounts.
 This allows you to test that the non-blocking socket logic in your code works
 correctly.

I also removed the flags argument to socket_accept(), and instead made
the new socket inherit the flags of the old socket, which makes more
sense to me.
(This used to be commit 406d356e698da01c84e8aa5b7894752b4403f63c)
---
 source4/lib/socket/socket.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 6562bb376b..6e54a37b80 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -42,8 +42,7 @@ struct socket_ops {
 	/* server ops */
 	NTSTATUS (*listen)(struct socket_context *sock,
 				const char *my_address, int port, int queue_size, uint32_t flags);
-	NTSTATUS (*accept)(struct socket_context *sock,
-				struct socket_context **new_sock, uint32_t flags);
+	NTSTATUS (*accept)(struct socket_context *sock,	struct socket_context **new_sock);
 
 	/* general ops */
 	NTSTATUS (*recv)(struct socket_context *sock, void *buf,
@@ -78,8 +77,9 @@ enum socket_state {
 	SOCKET_STATE_SERVER_ERROR
 };
 
-#define SOCKET_FLAG_BLOCK 0x00000001
-#define SOCKET_FLAG_PEEK  0x00000002
+#define SOCKET_FLAG_BLOCK        0x00000001
+#define SOCKET_FLAG_PEEK         0x00000002
+#define SOCKET_FLAG_TESTNONBLOCK 0x00000004
 
 struct socket_context {
 	enum socket_type type;
-- 
cgit 


From 452ddd94ba22bebe0fda5ee6a7ddceae2057fe40 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 2 Nov 2004 02:01:04 +0000
Subject: r3450: portability fixes

 - fix rep_inet_ntoa() for IRIX
 - lib/signal.c needs system/wait.h
 - some systems define a macro "accept", which breaks the lib/socket/ structures.
   use fn_ as a prefix for the structure elements to avoid the problem
(This used to be commit ced1a0fcdc8d8e47755ce4391c19f8b12862eb60)
---
 source4/lib/socket/socket.h | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 6e54a37b80..7a8d335962 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -31,36 +31,36 @@ struct socket_ops {
 	const char *name;
 	enum socket_type type;
 
-	NTSTATUS (*init)(struct socket_context *sock);
+	NTSTATUS (*fn_init)(struct socket_context *sock);
 
 	/* client ops */
-	NTSTATUS (*connect)(struct socket_context *sock,
+	NTSTATUS (*fn_connect)(struct socket_context *sock,
 				const char *my_address, int my_port,
 				const char *server_address, int server_port,
 				uint32_t flags);
 
 	/* server ops */
-	NTSTATUS (*listen)(struct socket_context *sock,
+	NTSTATUS (*fn_listen)(struct socket_context *sock,
 				const char *my_address, int port, int queue_size, uint32_t flags);
-	NTSTATUS (*accept)(struct socket_context *sock,	struct socket_context **new_sock);
+	NTSTATUS (*fn_accept)(struct socket_context *sock,	struct socket_context **new_sock);
 
 	/* general ops */
-	NTSTATUS (*recv)(struct socket_context *sock, void *buf,
+	NTSTATUS (*fn_recv)(struct socket_context *sock, void *buf,
 			 size_t wantlen, size_t *nread, uint32_t flags);
-	NTSTATUS (*send)(struct socket_context *sock, 
+	NTSTATUS (*fn_send)(struct socket_context *sock, 
 			 const DATA_BLOB *blob, size_t *sendlen, uint32_t flags);
 
-	void (*close)(struct socket_context *sock);
+	void (*fn_close)(struct socket_context *sock);
 
-	NTSTATUS (*set_option)(struct socket_context *sock, const char *option, const char *val);
+	NTSTATUS (*fn_set_option)(struct socket_context *sock, const char *option, const char *val);
 
-	char *(*get_peer_name)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-	char *(*get_peer_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-	int (*get_peer_port)(struct socket_context *sock);
-	char *(*get_my_addr)(struct socket_context *sock, TALLOC_CTX *mem_ctx);
-	int (*get_my_port)(struct socket_context *sock);
+	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);
 
-	int (*get_fd)(struct socket_context *sock);
+	int (*fn_get_fd)(struct socket_context *sock);
 };
 
 enum socket_state {
-- 
cgit 


From 21aafc3536cb8a172805f0dd5d23b100f1ecb493 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sat, 15 Jan 2005 10:28:08 +0000
Subject: r4753: added the ability for the generic socket library to handle
 async connect(). This required a small API change (the addition of a
 socket_connect_complete() method) (This used to be commit
 b787dd166f5cca82b3710802eefb41e0a8851fc3)

---
 source4/lib/socket/socket.h | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 7a8d335962..7dd8c0ae17 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -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);
-- 
cgit 


From 8783aa8ea57c3a6989e0722d5184e98d543352d4 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Wed, 19 Jan 2005 03:20:20 +0000
Subject: r4831: added udp support to our generic sockets library.

I decided to incorporate the udp support into the socket_ipv4.c
backend (and later in socket_ipv6.c) rather than doing a separate
backend, as so much of the code is shareable. Basically this adds a
socket_sendto() and a socket_recvfrom() call and not much all.

For udp servers, I decided to keep the call as socket_listen(), even
though dgram servers don't actually call listen(). This keeps the API
consistent.

I also added a simple local sockets testsuite in smbtorture,
LOCAL-SOCKET
(This used to be commit 9f12a45a05c5c447fb4ec18c8dd28f70e90e32a5)
---
 source4/lib/socket/socket.h | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 7dd8c0ae17..162a05cb40 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -24,12 +24,12 @@
 struct socket_context;
 
 enum socket_type {
-	SOCKET_TYPE_STREAM
+	SOCKET_TYPE_STREAM,
+	SOCKET_TYPE_DGRAM
 };
 
 struct socket_ops {
 	const char *name;
-	enum socket_type type;
 
 	NTSTATUS (*fn_init)(struct socket_context *sock);
 
@@ -50,9 +50,16 @@ struct socket_ops {
 
 	/* general ops */
 	NTSTATUS (*fn_recv)(struct socket_context *sock, void *buf,
-			 size_t wantlen, size_t *nread, uint32_t flags);
+			    size_t wantlen, size_t *nread, uint32_t flags);
 	NTSTATUS (*fn_send)(struct socket_context *sock, 
-			 const DATA_BLOB *blob, size_t *sendlen, uint32_t flags);
+			    const DATA_BLOB *blob, size_t *sendlen, uint32_t flags);
+
+	NTSTATUS (*fn_sendto)(struct socket_context *sock, 
+			      const DATA_BLOB *blob, size_t *sendlen, uint32_t flags,
+			      const char *dest_addr, int dest_port);
+	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);
 
 	void (*fn_close)(struct socket_context *sock);
 
-- 
cgit 


From bed7c9ec32b7d4083ba4ed2abbf3b6126bee7a25 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 10 Feb 2005 06:59:29 +0000
Subject: r5304: removed lib/socket/socket.h from includes.h (This used to be
 commit b902ea546d2d1327b23f40ddaeeaa8e7e3662454)

---
 source4/lib/socket/socket.h | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 162a05cb40..b1fae9ac56 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -103,4 +103,39 @@ struct socket_context {
 	const struct socket_ops *ops;
 };
 
+
+/* prototypes */
+NTSTATUS socket_create(const char *name, enum socket_type type, 
+		       struct socket_context **new_sock, uint32_t flags);
+void socket_destroy(struct socket_context *sock);
+NTSTATUS socket_connect(struct socket_context *sock,
+			const char *my_address, int my_port,
+			const char *server_address, int server_port,
+			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_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);
+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);
+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);
+int socket_get_fd(struct socket_context *sock);
+NTSTATUS socket_dup(struct socket_context *sock);
+const struct socket_ops *socket_getops_byname(const char *name, enum socket_type type);
+BOOL socket_check_access(struct socket_context *sock, 
+			 const char *service_name,
+			 const char **allow_list, const char **deny_list);
+
 #endif /* _SAMBA_SOCKET_H */
-- 
cgit 


From 5b18cf22680c76abb1262a6b75a30b8a37899467 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 15 May 2005 20:16:26 +0000
Subject: r6795: Make some functions static and remove some unused ones. (This
 used to be commit 46509eb89980bfe6dabd71264d570ea356ee5a22)

---
 source4/lib/socket/socket.h | 1 -
 1 file changed, 1 deletion(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index b1fae9ac56..bce64f9f6c 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -107,7 +107,6 @@ struct socket_context {
 /* prototypes */
 NTSTATUS socket_create(const char *name, enum socket_type type, 
 		       struct socket_context **new_sock, uint32_t flags);
-void socket_destroy(struct socket_context *sock);
 NTSTATUS socket_connect(struct socket_context *sock,
 			const char *my_address, int my_port,
 			const char *server_address, int server_port,
-- 
cgit 


From 1692bbf2e267eabd7099f0b6153da0c7cf209d1d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Fri, 3 Jun 2005 13:20:08 +0000
Subject: r7227: added a socket_pending() call to abstract away the FIONREAD
 ioctl. It will be interesting to see if this causes any portability problems,
 as it is a less commonly used call. (This used to be commit
 f6993db31d93059c70b44a23005ba444e205870f)

---
 source4/lib/socket/socket.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index bce64f9f6c..e2879e5247 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -60,6 +60,7 @@ struct socket_ops {
 	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);
+	NTSTATUS (*fn_pending)(struct socket_context *sock, size_t *npending);      
 
 	void (*fn_close)(struct socket_context *sock);
 
@@ -124,6 +125,7 @@ NTSTATUS socket_send(struct socket_context *sock,
 NTSTATUS socket_sendto(struct socket_context *sock, 
 		       const DATA_BLOB *blob, size_t *sendlen, uint32_t flags,
 		       const char *dest_addr, int dest_port);
+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);
-- 
cgit 


From bab977dad76e9204278c7afe0bb905cda064f488 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 16 Jun 2005 05:39:40 +0000
Subject: r7626: a new ldap client library. Main features are:

 - hooked into events system, so requests can be truly async and won't
   interfere with other processing happening at the same time

 - uses NTSTATUS codes for errors (previously errors were mostly
   ignored). In a similar fashion to the DOS error handling, I have
   reserved a range of the NTSTATUS code 32 bit space for LDAP error
   codes, so a function can return a LDAP error code in a NTSTATUS

 - much cleaner packet handling
(This used to be commit 2e3c660b2fc20e046d82bf1cc296422b6e7dfad0)
---
 source4/lib/socket/socket.h | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index e2879e5247..8645ba28bc 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -139,4 +139,9 @@ BOOL socket_check_access(struct socket_context *sock,
 			 const char *service_name,
 			 const char **allow_list, const char **deny_list);
 
+NTSTATUS socket_connect_ev(struct socket_context *sock,
+			   const char *my_address, int my_port,
+			   const char *server_address, int server_port,
+			   uint32_t flags, struct event_context *ev);
+
 #endif /* _SAMBA_SOCKET_H */
-- 
cgit 


From 75c29073ce12723598e4e204ccb616cd52fa2c13 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Sun, 28 Aug 2005 02:37:38 +0000
Subject: r9704:  r9684@blu:  tridge | 2005-08-27 19:38:31 +1000  don't try to
 call the name resolver on non-ipv4 names! (This used to be commit
 4bb3d36fe6705bc625fe4122500f681ab7f2dc53)

---
 source4/lib/socket/socket.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 8645ba28bc..27a1dfe041 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -102,6 +102,7 @@ struct socket_context {
 
 	void *private_data;
 	const struct socket_ops *ops;
+	const char *backend_name;
 };
 
 
-- 
cgit 


From d6e070b74af8891c5e6ee15d57f8c0db3aac2f14 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Mon, 24 Oct 2005 09:34:12 +0000
Subject: r11274: Start a connection attempt to the DC's port 389. To do this
 properly, make socket_connect and ldap_connect properly async.

Volker
(This used to be commit bcc71fc1deeed443d7cf00220ce264011ddf588d)
---
 source4/lib/socket/socket.h | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 27a1dfe041..8b109a3a42 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -140,6 +140,14 @@ BOOL socket_check_access(struct socket_context *sock,
 			 const char *service_name,
 			 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,
+					      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,
-- 
cgit 


From 134b2488c82ae13392121f71e4960178a38f3e01 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vlendec@samba.org>
Date: Fri, 28 Oct 2005 11:02:42 +0000
Subject: r11369: Implement socket_connect_multi: Connect to multiple ipv4 tcp
 ports in sequence, with a 2-millisecond timeout between firing the syn
 packets. Build smbcli_sock_connect_send upon that.

Volker
(This used to be commit 5718df44d90d113304c5deed1e2e7f82ff9e928f)
---
 source4/lib/socket/socket.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 8b109a3a42..a79d698716 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -153,4 +153,19 @@ NTSTATUS socket_connect_ev(struct socket_context *sock,
 			   const char *server_address, int server_port,
 			   uint32_t flags, struct event_context *ev);
 
+struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx,
+						    const char *server_address,
+						    int num_server_ports,
+						    uint16_t *server_ports,
+						    struct event_context *event_ctx);
+NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
+				   TALLOC_CTX *mem_ctx,
+				   struct socket_context **result,
+				   uint16_t *port);
+NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, const char *server_address,
+			      int num_server_ports, uint16_t *server_ports,
+			      struct event_context *event_ctx,
+			      struct socket_context **result,
+			      uint16_t *port);
+
 #endif /* _SAMBA_SOCKET_H */
-- 
cgit 


From 37bc6b5f813d5c2ace7486a38331748dd86f121d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 6 Jan 2006 00:46:35 +0000
Subject: r12728: Revive testparm.

It needs work to not dump defaults from loadparm.c, but otherwise it works.

Andrew Bartlett
(This used to be commit 1260fcf46579d708a406625f548add9be9fdc6fb)
---
 source4/lib/socket/socket.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index a79d698716..165fbb6377 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -136,6 +136,9 @@ int socket_get_my_port(struct socket_context *sock);
 int socket_get_fd(struct socket_context *sock);
 NTSTATUS socket_dup(struct socket_context *sock);
 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,
+		  const char *cname, const char *caddr);
 BOOL socket_check_access(struct socket_context *sock, 
 			 const char *service_name,
 			 const char **allow_list, const char **deny_list);
-- 
cgit 


From f55ea8bb3dca868e21663cd90eaea7a35cd7886c Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 9 Jan 2006 22:12:53 +0000
Subject: r12804: This patch reworks the Samba4 sockets layer to use a
 socket_address structure that is more generic than just 'IP/port'.

It now passes make test, and has been reviewed and updated by
metze. (Thankyou *very* much).

This passes 'make test' as well as kerberos use (not currently in the
testsuite).

The original purpose of this patch was to have Samba able to pass a
socket address stucture from the BSD layer into the kerberos routines
and back again.   It also removes nbt_peer_addr, which was being used
for a similar purpose.

It is a large change, but worthwhile I feel.

Andrew Bartlett
(This used to be commit 88198c4881d8620a37086f80e4da5a5b71c5bbb2)
---
 source4/lib/socket/socket.h | 65 +++++++++++++++++++++++++++------------------
 1 file changed, 39 insertions(+), 26 deletions(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 165fbb6377..f3e3ba8341 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/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,
-- 
cgit 


From 35349a58df5b69446607fbd742a05f57f3515319 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 18 Mar 2006 15:42:57 +0000
Subject: r14542: Remove librpc, libndr and libnbt from includes.h (This used
 to be commit 51b4270513752d2eafbe77f9de598de16ef84a1f)

---
 source4/lib/socket/socket.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index f3e3ba8341..a50fb87619 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -21,6 +21,8 @@
 #ifndef _SAMBA_SOCKET_H
 #define _SAMBA_SOCKET_H
 
+#include "lib/events/events.h"
+
 struct socket_context;
 
 enum socket_type {
-- 
cgit 


From f4e403440a08f5da3328bbbe5601967bf8705137 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 30 Apr 2006 01:32:59 +0000
Subject: r15349: Integrate set_socket_options() into the socket library (This
 used to be commit 598ea173cd718dad0df24505796ca50cb728a2e9)

---
 source4/lib/socket/socket.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index a50fb87619..31dadb2f89 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -185,5 +185,6 @@ NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, const char *server_address,
 			      struct event_context *event_ctx,
 			      struct socket_context **result,
 			      uint16_t *port);
+void set_socket_options(int fd, const char *options);
 
 #endif /* _SAMBA_SOCKET_H */
-- 
cgit 


From c2cc10c7869221c7f43cbbb151feb4c4db173cb9 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 30 Apr 2006 05:58:31 +0000
Subject: r15356: Remove unused 'flags' argument from socket_send() and
 friends.

This is in preperation for making TLS a socket library.

Andrew Bartlett
(This used to be commit a312812b92f5ac7e6bd2c4af725dbbbc900d4452)
---
 source4/lib/socket/socket.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 31dadb2f89..04ae53e464 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -62,15 +62,15 @@ struct socket_ops {
 
 	/* general ops */
 	NTSTATUS (*fn_recv)(struct socket_context *sock, void *buf,
-			    size_t wantlen, size_t *nread, uint32_t flags);
+			    size_t wantlen, size_t *nread);
 	NTSTATUS (*fn_send)(struct socket_context *sock, 
-			    const DATA_BLOB *blob, size_t *sendlen, uint32_t flags);
+			    const DATA_BLOB *blob, size_t *sendlen);
 
 	NTSTATUS (*fn_sendto)(struct socket_context *sock, 
-			      const DATA_BLOB *blob, size_t *sendlen, uint32_t flags,
+			      const DATA_BLOB *blob, size_t *sendlen,
 			      const struct socket_address *dest_addr);
 	NTSTATUS (*fn_recvfrom)(struct socket_context *sock, 
-				void *buf, size_t wantlen, size_t *nread, uint32_t flags,
+				void *buf, size_t wantlen, size_t *nread,
 				TALLOC_CTX *addr_ctx, struct socket_address **src_addr);
 	NTSTATUS (*fn_pending)(struct socket_context *sock, size_t *npending);      
 
@@ -129,14 +129,14 @@ NTSTATUS socket_listen(struct socket_context *sock,
 		       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);
+		     size_t wantlen, size_t *nread);
 NTSTATUS socket_recvfrom(struct socket_context *sock, void *buf, 
-			 size_t wantlen, size_t *nread, uint32_t flags,
+			 size_t wantlen, size_t *nread, 
 			 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);
+		     const DATA_BLOB *blob, size_t *sendlen);
 NTSTATUS socket_sendto(struct socket_context *sock, 
-		       const DATA_BLOB *blob, size_t *sendlen, uint32_t flags,
+		       const DATA_BLOB *blob, size_t *sendlen,
 		       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);
-- 
cgit 


From 742c110cd67f4995639822981e8bfcb1f652f2c4 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Tue, 2 May 2006 20:15:47 +0000
Subject: r15400: Move the TLS code behind the socket interface.

This reduces caller complexity, because the TLS code is now called
just like any other socket.  (A new socket context is returned by the
tls_init_server and tls_init_client routines).

When TLS is not available, the original socket is returned.

Andrew Bartlett
(This used to be commit 09b2f30dfa7a640f5187b4933204e9680be61497)
---
 source4/lib/socket/socket.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 04ae53e464..fefa999e08 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -117,6 +117,9 @@ struct socket_context {
 
 
 /* prototypes */
+NTSTATUS socket_create_with_ops(TALLOC_CTX *mem_ctx, const struct socket_ops *ops,
+				struct socket_context **new_sock, 
+				enum socket_type type, uint32_t flags);
 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,
-- 
cgit 


From a1a842eb44b5bbb59af445af7a2c4a00e8c0188a Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 21 Jul 2006 01:34:56 +0000
Subject: r17168: Now that TLS (and soon SASL) is below the socket layer, we
 need to make the testnonblock skip some things.  The socket *under* the tls
 socket is still tested.

Andrew Bartlett
(This used to be commit 9c33c6a20a77e3f15eac3d62488117517afad940)
---
 source4/lib/socket/socket.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index fefa999e08..c0cf429887 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -102,6 +102,7 @@ enum socket_state {
 #define SOCKET_FLAG_BLOCK        0x00000001
 #define SOCKET_FLAG_PEEK         0x00000002
 #define SOCKET_FLAG_TESTNONBLOCK 0x00000004
+#define SOCKET_FLAG_FAKE         0x00000008 /* This is an implementation not directly on top of a real socket */
 
 struct socket_context {
 	enum socket_type type;
-- 
cgit 


From ba07fa43d0b0090f5e686d8c1822468049f52416 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 23 Jul 2006 02:50:08 +0000
Subject: r17197: This patch moves the encryption of bulk data on SASL
 negotiated security contexts from the application layer into the socket
 layer.

This improves a number of correctness aspects, as we now allow LDAP
packets to cross multiple SASL packets.  It should also make it much
easier to write async LDAP tests from windows clients, as they use SASL
by default.  It is also vital to allowing OpenLDAP clients to use GSSAPI
against Samba4, as it negotiates a rather small SASL buffer size.

This patch mirrors the earlier work done to move TLS into the socket
layer.

Unusual in this pstch is the extra read callback argument I take.  As
SASL is a layer on top of a socket, it is entirely possible for the
SASL layer to drain a socket dry, but for the caller not to have read
all the decrypted data.  This would leave the system without an event
to restart the read (as the socket is dry).

As such, I re-invoke the read handler from a timed callback, which
should trigger on the next running of the event loop.  I believe that
the TLS code does require a similar callback.

In trying to understand why this is required, imagine a SASL-encrypted
LDAP packet in the following formation:

+-----------------+---------------------+
| SASL  Packet #1 | SASL Packet #2      |
----------------------------------------+
| LDAP Packet #1       | LDAP Packet #2 |
----------------------------------------+

In the old code, this was illegal, but it is perfectly standard
SASL-encrypted LDAP.  Without the callback, we would read and process
the first LDAP packet, and the SASL code would have read the second SASL
packet (to decrypt enough data for the LDAP packet), and no data would
remain on the socket.

Without data on the socket, read events stop.  That is why I add timed
events, until the SASL buffer is drained.

Another approach would be to add a hack to the event system, to have it
pretend there remained data to read off the network (but that is ugly).

In improving the code, to handle more real-world cases, I've been able
to remove almost all the special-cases in the testnonblock code.  The
only special case is that we must use a deterministic partial packet
when calling send, rather than a random length.  (1 + n/2).  This is
needed because of the way the SASL and TLS code works, and the 'resend
on failure' requirements.

Andrew Bartlett
(This used to be commit 5d7c9c12cb2b39673172a357092b80cd814850b0)
---
 source4/lib/socket/socket.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index c0cf429887..025fc7e13d 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -102,7 +102,13 @@ enum socket_state {
 #define SOCKET_FLAG_BLOCK        0x00000001
 #define SOCKET_FLAG_PEEK         0x00000002
 #define SOCKET_FLAG_TESTNONBLOCK 0x00000004
-#define SOCKET_FLAG_FAKE         0x00000008 /* This is an implementation not directly on top of a real socket */
+#define SOCKET_FLAG_ENCRYPT      0x00000008 /* This socket
+					     * implementation requires
+					     * that re-sends be
+					     * consistant, because it
+					     * is encrypting data.
+					     * This modifies the
+					     * TESTNONBLOCK case */
 
 struct socket_context {
 	enum socket_type type;
-- 
cgit 


From 59d1a2b30ef3a57536876d2c58c108b6da19e4fa Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Thu, 17 May 2007 02:19:28 +0000
Subject: r22960: added a SOCKET_FLAG_NOCLOSE to allow us to tell the socket
 layer that we will handle the close of the socket (This used to be commit
 d57aaf5ba60464e5e782353a0879a84f8c70dd32)

---
 source4/lib/socket/socket.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 025fc7e13d..161f112ca6 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -109,6 +109,8 @@ enum socket_state {
 					     * is encrypting data.
 					     * This modifies the
 					     * TESTNONBLOCK case */
+#define SOCKET_FLAG_NOCLOSE      0x00000010 /* don't auto-close on free */
+
 
 struct socket_context {
 	enum socket_type type;
@@ -196,5 +198,6 @@ NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, const char *server_address,
 			      struct socket_context **result,
 			      uint16_t *port);
 void set_socket_options(int fd, const char *options);
+void socket_set_flags(struct socket_context *socket, unsigned flags);
 
 #endif /* _SAMBA_SOCKET_H */
-- 
cgit 


From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 02:07:03 +0000
Subject: r23792: convert Samba4 to GPLv3

There are still a few tidyups of old FSF addresses to come (in both s3
and s4). More commits soon.
(This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa)
---
 source4/lib/socket/socket.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 161f112ca6..6bc03188a5 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -5,7 +5,7 @@
    
    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
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifndef _SAMBA_SOCKET_H
-- 
cgit 


From 61ffa08f4c95e29d301de9fbabd6e71c2dbc1056 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 27 Aug 2007 18:10:19 +0000
Subject: r24712: No longer expose the 'BOOL' data type in any interfaces.
 (This used to be commit 1ce32673d960c8b05b6c1b1b99e1976a402417ae)

---
 source4/lib/socket/socket.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 6bc03188a5..0c4fc0bb95 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -164,10 +164,10 @@ 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,
+bool allow_access(TALLOC_CTX *mem_ctx,
 		  const char **deny_list, const char **allow_list,
 		  const char *cname, const char *caddr);
-BOOL socket_check_access(struct socket_context *sock, 
+bool socket_check_access(struct socket_context *sock, 
 			 const char *service_name,
 			 const char **allow_list, const char **deny_list);
 
-- 
cgit 


From 6bc52259aa668666f2f40abfd8da181d5aaf8b6e Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 6 Oct 2007 21:31:00 +0000
Subject: r25545: Use inet_ntop for ipv4 code as well - should make it easier
 to share code between IPv4 and IPv6 later on. (This used to be commit
 e3df90927b2878917f0f555772a875f05bf609e8)

---
 source4/lib/socket/socket.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 0c4fc0bb95..7679db08a1 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -121,6 +121,9 @@ struct socket_context {
 	void *private_data;
 	const struct socket_ops *ops;
 	const char *backend_name;
+
+	/* specific to the ip backend */
+	int family;
 };
 
 
-- 
cgit 


From 01d2acfdb4c4c0349a28a18c5c0da5b960b02791 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Fri, 7 Dec 2007 16:04:17 +0100
Subject: r26335: Specify name_resolve_order to socket code. (This used to be
 commit b03e5d00110be3f1fe5809dad4eb6ca5cea7463d)

---
 source4/lib/socket/socket.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 7679db08a1..24bc5f1aac 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -178,17 +178,21 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 					      struct socket_address *my_address,
 					      struct socket_address *server_address, 
 					      uint32_t flags,
+			                      const char **name_resolve_order,
 					      struct event_context *event_ctx);
 NTSTATUS socket_connect_recv(struct composite_context *ctx);
 NTSTATUS socket_connect_ev(struct socket_context *sock,
 			   struct socket_address *my_address,
 			   struct socket_address *server_address, 
-			   uint32_t flags, struct event_context *ev);
+			   uint32_t flags, 
+			   const char **name_resolve_order,
+			   struct event_context *ev);
 
 struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx,
 						    const char *server_address,
 						    int num_server_ports,
 						    uint16_t *server_ports,
+						    const char **name_resolve_order,
 						    struct event_context *event_ctx);
 NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
 				   TALLOC_CTX *mem_ctx,
@@ -196,6 +200,7 @@ NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
 				   uint16_t *port);
 NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, const char *server_address,
 			      int num_server_ports, uint16_t *server_ports,
+			      const char **name_resolve_order,
 			      struct event_context *event_ctx,
 			      struct socket_context **result,
 			      uint16_t *port);
-- 
cgit 


From 5f4842cf65ce64bfdf577cd549565da20ca818cf Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 10 Dec 2007 18:41:19 +0100
Subject: r26376: Add context for libcli_resolve. (This used to be commit
 459e1466a411d6f83b7372e248566e6e71c745fc)

---
 source4/lib/socket/socket.h | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'source4/lib/socket/socket.h')

diff --git a/source4/lib/socket/socket.h b/source4/lib/socket/socket.h
index 24bc5f1aac..4baa0cfbb1 100644
--- a/source4/lib/socket/socket.h
+++ b/source4/lib/socket/socket.h
@@ -126,6 +126,7 @@ struct socket_context {
 	int family;
 };
 
+struct resolve_context;
 
 /* prototypes */
 NTSTATUS socket_create_with_ops(TALLOC_CTX *mem_ctx, const struct socket_ops *ops,
@@ -178,21 +179,21 @@ struct composite_context *socket_connect_send(struct socket_context *sock,
 					      struct socket_address *my_address,
 					      struct socket_address *server_address, 
 					      uint32_t flags,
-			                      const char **name_resolve_order,
+				              struct resolve_context *resolve_ctx,
 					      struct event_context *event_ctx);
 NTSTATUS socket_connect_recv(struct composite_context *ctx);
 NTSTATUS socket_connect_ev(struct socket_context *sock,
 			   struct socket_address *my_address,
 			   struct socket_address *server_address, 
 			   uint32_t flags, 
-			   const char **name_resolve_order,
+			   struct resolve_context *resolve_ctx,
 			   struct event_context *ev);
 
 struct composite_context *socket_connect_multi_send(TALLOC_CTX *mem_ctx,
 						    const char *server_address,
 						    int num_server_ports,
 						    uint16_t *server_ports,
-						    const char **name_resolve_order,
+						    struct resolve_context *resolve_ctx,
 						    struct event_context *event_ctx);
 NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
 				   TALLOC_CTX *mem_ctx,
@@ -200,7 +201,7 @@ NTSTATUS socket_connect_multi_recv(struct composite_context *ctx,
 				   uint16_t *port);
 NTSTATUS socket_connect_multi(TALLOC_CTX *mem_ctx, const char *server_address,
 			      int num_server_ports, uint16_t *server_ports,
-			      const char **name_resolve_order,
+			      struct resolve_context *resolve_ctx,
 			      struct event_context *event_ctx,
 			      struct socket_context **result,
 			      uint16_t *port);
-- 
cgit