From f55ea8bb3dca868e21663cd90eaea7a35cd7886c Mon Sep 17 00:00:00 2001 From: Andrew Bartlett 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/nbt_server/dgram/browse.c | 3 ++- source4/nbt_server/dgram/netlogon.c | 13 +++++++++---- source4/nbt_server/dgram/ntlogon.c | 6 +++--- source4/nbt_server/dgram/request.c | 39 ++++++++++++++++++++++++++++++------- 4 files changed, 46 insertions(+), 15 deletions(-) (limited to 'source4/nbt_server/dgram') diff --git a/source4/nbt_server/dgram/browse.c b/source4/nbt_server/dgram/browse.c index 49e43eeb68..2486354052 100644 --- a/source4/nbt_server/dgram/browse.c +++ b/source4/nbt_server/dgram/browse.c @@ -22,13 +22,14 @@ #include "includes.h" #include "nbt_server/nbt_server.h" +#include "lib/socket/socket.h" /* handle incoming browse mailslot requests */ void nbtd_mailslot_browse_handler(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const struct nbt_peer_socket *src) + struct socket_address *src) { DEBUG(2,("Browse request on '%s' from %s:%d\n", dgmslot->mailslot_name, src->addr, src->port)); diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c index 858b290957..5ba826cc33 100644 --- a/source4/nbt_server/dgram/netlogon.c +++ b/source4/nbt_server/dgram/netlogon.c @@ -32,7 +32,7 @@ */ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const struct nbt_peer_socket *src, + const struct socket_address *src, struct nbt_netlogon_packet *netlogon) { struct nbt_name *name = &packet->data.msg.dest_name; @@ -90,7 +90,7 @@ static void nbtd_netlogon_getdc(struct dgram_mailslot_handler *dgmslot, */ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const struct nbt_peer_socket *src, + const struct socket_address *src, struct nbt_netlogon_packet *netlogon) { struct nbt_name *name = &packet->data.msg.dest_name; @@ -102,6 +102,11 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot, struct ldb_message **ref_res, **dom_res; int ret; const char **services = lp_server_services(); + struct socket_address *my_ip = socket_get_my_addr(dgmslot->dgmsock->sock, packet); + if (!my_ip) { + DEBUG(0, ("Could not obtain own IP address for datagram socket\n")); + return; + } /* only answer getdc requests on the PDC or LOGON names */ if (name->type != NBT_NAME_PDC && name->type != NBT_NAME_LOGON) { @@ -181,7 +186,7 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot, pdc->site_name2 = "Default-First-Site-Name"; pdc->unknown = 0x10; /* what is this? */ pdc->unknown2 = 2; /* and this ... */ - pdc->pdc_ip = socket_get_my_addr(dgmslot->dgmsock->sock, packet); + pdc->pdc_ip = my_ip->addr; pdc->nt_version = 13; pdc->lmnt_token = 0xFFFF; pdc->lm20_token = 0xFFFF; @@ -200,7 +205,7 @@ static void nbtd_netlogon_getdc2(struct dgram_mailslot_handler *dgmslot, */ void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const struct nbt_peer_socket *src) + struct socket_address *src) { NTSTATUS status = NT_STATUS_NO_MEMORY; struct nbtd_interface *iface = diff --git a/source4/nbt_server/dgram/ntlogon.c b/source4/nbt_server/dgram/ntlogon.c index 191bac8a54..dad80fbe7d 100644 --- a/source4/nbt_server/dgram/ntlogon.c +++ b/source4/nbt_server/dgram/ntlogon.c @@ -22,14 +22,14 @@ #include "includes.h" #include "nbt_server/nbt_server.h" - +#include "lib/socket/socket.h" /* reply to a SAM LOGON request */ static void nbtd_ntlogon_sam_logon(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const struct nbt_peer_socket *src, + const struct socket_address *src, struct nbt_ntlogon_packet *ntlogon) { struct nbt_name *name = &packet->data.msg.dest_name; @@ -66,7 +66,7 @@ static void nbtd_ntlogon_sam_logon(struct dgram_mailslot_handler *dgmslot, */ void nbtd_mailslot_ntlogon_handler(struct dgram_mailslot_handler *dgmslot, struct nbt_dgram_packet *packet, - const struct nbt_peer_socket *src) + struct socket_address *src) { NTSTATUS status = NT_STATUS_NO_MEMORY; struct nbtd_interface *iface = diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c index 25b08eb5cf..7a1f7c42d8 100644 --- a/source4/nbt_server/dgram/request.c +++ b/source4/nbt_server/dgram/request.c @@ -44,7 +44,7 @@ static const struct { */ void dgram_request_handler(struct nbt_dgram_socket *dgmsock, struct nbt_dgram_packet *packet, - const struct nbt_peer_socket *src) + struct socket_address *src) { DEBUG(0,("General datagram request from %s:%d\n", src->addr, src->port)); NDR_PRINT_DEBUG(nbt_dgram_packet, packet); @@ -58,37 +58,62 @@ NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address { struct nbt_dgram_socket *bcast_dgmsock; struct nbtd_server *nbtsrv = iface->nbtsrv; + struct socket_address *bcast_addr, *bind_addr; NTSTATUS status; + TALLOC_CTX *tmp_ctx = talloc_new(iface); /* the list of mailslots that we are interested in */ int i; + if (!tmp_ctx) { + return NT_STATUS_NO_MEMORY; + } + /* listen for broadcasts on port 138 */ bcast_dgmsock = nbt_dgram_socket_init(iface, nbtsrv->task->event_ctx); - NT_STATUS_HAVE_NO_MEMORY(bcast_dgmsock); + if (!bcast_dgmsock) { + talloc_free(tmp_ctx); + return NT_STATUS_NO_MEMORY; + } - status = socket_listen(bcast_dgmsock->sock, iface->bcast_address, - lp_dgram_port(), 0, 0); + bcast_addr = socket_address_from_strings(tmp_ctx, bcast_dgmsock->sock->backend_name, + iface->bcast_address, + lp_dgram_port()); + + status = socket_listen(bcast_dgmsock->sock, bcast_addr, 0, 0); if (!NT_STATUS_IS_OK(status)) { + talloc_free(tmp_ctx); DEBUG(0,("Failed to bind to %s:%d - %s\n", iface->bcast_address, lp_dgram_port(), nt_errstr(status))); return status; } + talloc_free(bcast_addr); dgram_set_incoming_handler(bcast_dgmsock, dgram_request_handler, iface); + bind_addr = socket_address_from_strings(tmp_ctx, bcast_dgmsock->sock->backend_name, + bind_address, + lp_dgram_port()); + /* listen for unicasts on port 138 */ iface->dgmsock = nbt_dgram_socket_init(iface, nbtsrv->task->event_ctx); - NT_STATUS_HAVE_NO_MEMORY(iface->dgmsock); + if (!iface->dgmsock) { + talloc_free(tmp_ctx); + return NT_STATUS_NO_MEMORY; + } - status = socket_listen(iface->dgmsock->sock, bind_address, - lp_dgram_port(), 0, 0); + status = socket_listen(iface->dgmsock->sock, bind_addr, 0, 0); if (!NT_STATUS_IS_OK(status)) { + talloc_free(tmp_ctx); DEBUG(0,("Failed to bind to %s:%d - %s\n", bind_address, lp_dgram_port(), nt_errstr(status))); return status; } + talloc_free(bind_addr); + dgram_set_incoming_handler(iface->dgmsock, dgram_request_handler, iface); + talloc_free(tmp_ctx); + for (i=0;i