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)

1 files changed, 12 insertions, 12 deletions

diff --git a/source4/libcli/dgram/libdgram.h b/source4/libcli/dgram/libdgram.h
index f913e90d88..d5e28ed03d 100644
--- a/source4/libcli/dgram/libdgram.h
+++ b/source4/libcli/dgram/libdgram.h
@@ -29,7 +29,7 @@ struct nbt_dgram_request {
 	struct nbt_dgram_request *next, *prev;
 
 	/* where to send the request */
-	struct nbt_peer_socket dest;
+	struct socket_address *dest;
 
 	/* the encoded request */
 	DATA_BLOB encoded;
@@ -54,7 +54,7 @@ struct nbt_dgram_socket {
 	/* what to do with incoming request packets */
 	struct {
 		void (*handler)(struct nbt_dgram_socket *, struct nbt_dgram_packet *, 
-				const struct nbt_peer_socket *src);
+				struct socket_address *src);
 		void *private;
 	} incoming;
 };
@@ -70,7 +70,7 @@ struct nbt_dgram_socket {
 
 typedef void (*dgram_mailslot_handler_t)(struct dgram_mailslot_handler *, 
 					 struct nbt_dgram_packet *, 
-					 const struct nbt_peer_socket *src);
+					 struct socket_address *src);
 
 struct dgram_mailslot_handler {
 	struct dgram_mailslot_handler *next, *prev;
@@ -86,11 +86,11 @@ struct dgram_mailslot_handler {
 /* prototypes */
 NTSTATUS nbt_dgram_send(struct nbt_dgram_socket *dgmsock,
 			struct nbt_dgram_packet *packet,
-			const struct nbt_peer_socket *dest);
+			struct socket_address *dest);
 NTSTATUS dgram_set_incoming_handler(struct nbt_dgram_socket *dgmsock,
 				    void (*handler)(struct nbt_dgram_socket *, 
 						    struct nbt_dgram_packet *, 
-						    const struct nbt_peer_socket *),
+						    struct socket_address *),
 				    void *private);
 struct nbt_dgram_socket *nbt_dgram_socket_init(TALLOC_CTX *mem_ctx, 
 					       struct event_context *event_ctx);
@@ -113,13 +113,13 @@ NTSTATUS dgram_mailslot_send(struct nbt_dgram_socket *dgmsock,
 			     enum dgram_msg_type msg_type,
 			     const char *mailslot_name,
 			     struct nbt_name *dest_name,
-			     const struct nbt_peer_socket *dest,
+			     struct socket_address *dest,
 			     struct nbt_name *src_name,
 			     DATA_BLOB *request);
 
 NTSTATUS dgram_mailslot_netlogon_send(struct nbt_dgram_socket *dgmsock,
 				      struct nbt_name *dest_name,
-				      const struct nbt_peer_socket *dest,
+				      struct socket_address *dest,
 				      struct nbt_name *src_name,
 				      struct nbt_netlogon_packet *request);
 NTSTATUS dgram_mailslot_netlogon_reply(struct nbt_dgram_socket *dgmsock,
@@ -132,11 +132,11 @@ NTSTATUS dgram_mailslot_netlogon_parse(struct dgram_mailslot_handler *dgmslot,
 				       struct nbt_netlogon_packet *netlogon);
 
 NTSTATUS dgram_mailslot_ntlogon_send(struct nbt_dgram_socket *dgmsock,
-				      enum dgram_msg_type msg_type,
-				      struct nbt_name *dest_name,
-				      const struct nbt_peer_socket *dest,
-				      struct nbt_name *src_name,
-				      struct nbt_ntlogon_packet *request);
+				     enum dgram_msg_type msg_type,
+				     struct nbt_name *dest_name,
+				     struct socket_address *dest,
+				     struct nbt_name *src_name,
+				     struct nbt_ntlogon_packet *request);
 NTSTATUS dgram_mailslot_ntlogon_reply(struct nbt_dgram_socket *dgmsock,
 				       struct nbt_dgram_packet *request,
 				       const char *mailslot_name,