r6247: added the server side code for receiving mailslot requests, and

parsing incoming netlogon requests. No replies are sent yet.
(This used to be commit 3b34df6a674cd2aeddc354cdadae3f0e1c000d45)

5 files changed, 224 insertions, 39 deletions

diff --git a/source4/nbt_server/config.mk b/source4/nbt_server/config.mk
index bda10b2deb..04a9dde1b0 100644
--- a/source4/nbt_server/config.mk
+++ b/source4/nbt_server/config.mk
@@ -14,6 +14,18 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 
 #######################
+# Start SUBSYSTEM NBTD_DGRAM
+[SUBSYSTEM::NBTD_DGRAM]
+ADD_OBJ_FILES = \
+		nbt_server/dgram/request.o \
+		nbt_server/dgram/netlogon.o \
+		nbt_server/dgram/browse.o
+REQUIRED_SUBSYSTEMS = \
+		LIBCLI_DGRAM
+# End SUBSYSTEM NBTD_DGRAM
+#######################
+
+#######################
 # Start SUBSYSTEM NBTD
 [SUBSYSTEM::NBTD]
 INIT_OBJ_FILES = \
@@ -26,6 +38,6 @@ ADD_OBJ_FILES = \
 		nbt_server/defense.o \
 		nbt_server/packet.o
 REQUIRED_SUBSYSTEMS = \
-		LIBCLI_NBT NBTD_WINS
+		LIBCLI_NBT NBTD_WINS NBTD_DGRAM
 # End SUBSYSTEM NBTD
 #######################
diff --git a/source4/nbt_server/dgram/browse.c b/source4/nbt_server/dgram/browse.c
new file mode 100644
index 0000000000..ca9618f510
--- /dev/null
+++ b/source4/nbt_server/dgram/browse.c
@@ -0,0 +1,38 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   NBT datagram browse server
+
+   Copyright (C) Andrew Tridgell	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
+   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.
+*/
+
+#include "includes.h"
+#include "dlinklist.h"
+#include "nbt_server/nbt_server.h"
+#include "smbd/service_task.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 char *src_address, int src_port)
+{
+	DEBUG(2,("Browse request on '%s' from %s:%d\n", 
+		  dgmslot->mailslot_name, src_address, src_port));
+}
diff --git a/source4/nbt_server/dgram/netlogon.c b/source4/nbt_server/dgram/netlogon.c
new file mode 100644
index 0000000000..471145c4ac
--- /dev/null
+++ b/source4/nbt_server/dgram/netlogon.c
@@ -0,0 +1,54 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   NBT datagram netlogon server
+
+   Copyright (C) Andrew Tridgell	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
+   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.
+*/
+
+#include "includes.h"
+#include "dlinklist.h"
+#include "nbt_server/nbt_server.h"
+#include "smbd/service_task.h"
+#include "lib/socket/socket.h"
+
+/*
+  handle incoming netlogon mailslot requests
+*/
+void nbtd_mailslot_netlogon_handler(struct dgram_mailslot_handler *dgmslot, 
+				    struct nbt_dgram_packet *packet, 
+				    const char *src_address, int src_port)
+{
+	NTSTATUS status = NT_STATUS_NO_MEMORY;
+	struct nbt_netlogon_packet *netlogon = 
+		talloc(dgmslot, struct nbt_netlogon_packet);
+	if (netlogon == NULL) goto failed;
+
+	DEBUG(2,("netlogon request from %s:%d\n", src_address, src_port));
+	status = dgram_mailslot_netlogon_parse(dgmslot, netlogon, packet, netlogon);
+	if (!NT_STATUS_IS_OK(status)) goto failed;
+
+	NDR_PRINT_DEBUG(nbt_netlogon_packet, netlogon);
+
+	talloc_free(netlogon);
+	return;
+
+failed:
+	DEBUG(2,("nbtd netlogon handler failed from %s:%d - %s\n",
+		 src_address, src_port, nt_errstr(status)));
+	talloc_free(netlogon);
+}
diff --git a/source4/nbt_server/dgram/request.c b/source4/nbt_server/dgram/request.c
new file mode 100644
index 0000000000..59b94bcecb
--- /dev/null
+++ b/source4/nbt_server/dgram/request.c
@@ -0,0 +1,113 @@
+/* 
+   Unix SMB/CIFS implementation.
+
+   NBT datagram server
+
+   Copyright (C) Andrew Tridgell	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
+   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.
+*/
+
+#include "includes.h"
+#include "dlinklist.h"
+#include "nbt_server/nbt_server.h"
+#include "smbd/service_task.h"
+#include "lib/socket/socket.h"
+
+/*
+  a list of mailslots that we have static handlers for
+*/
+static const struct {
+	const char *mailslot_name;
+	dgram_mailslot_handler_t handler;
+} mailslot_handlers[] = {
+	{ NBT_MAILSLOT_NETLOGON, nbtd_mailslot_netlogon_handler },
+	{ NBT_MAILSLOT_BROWSE,   nbtd_mailslot_browse_handler }
+};
+
+/*
+  receive an incoming dgram request. This is used for general datagram
+  requests. Mailslot requests for our listening mailslots
+  are handled in the specific mailslot handlers
+*/
+void dgram_request_handler(struct nbt_dgram_socket *dgmsock, 
+			   struct nbt_dgram_packet *packet, 
+			   const char *src_address, int src_port)
+{
+	DEBUG(0,("General datagram request from %s:%d\n", src_address, src_port));
+	NDR_PRINT_DEBUG(nbt_dgram_packet, packet);
+}
+
+
+/*
+  setup the port 138 datagram listener for a given interface
+*/
+NTSTATUS nbtd_dgram_setup(struct nbtd_interface *iface, const char *bind_address)
+{
+	struct nbt_dgram_socket *bcast_dgmsock;
+	struct nbtd_server *nbtsrv = iface->nbtsrv;
+	NTSTATUS status;
+	/* the list of mailslots that we are interested in */
+	int i;
+
+	/* listen for broadcasts on port 138 */
+	bcast_dgmsock = nbt_dgram_socket_init(iface, nbtsrv->task->event_ctx);
+	NT_STATUS_HAVE_NO_MEMORY(bcast_dgmsock);
+	
+	status = socket_listen(bcast_dgmsock->sock, iface->bcast_address, 
+			       lp_dgram_port(), 0, 0);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(0,("Failed to bind to %s:%d - %s\n", 
+			 iface->bcast_address, lp_dgram_port(), nt_errstr(status)));
+		talloc_free(iface);
+		return status;
+	}
+	
+	dgram_set_incoming_handler(bcast_dgmsock, dgram_request_handler, iface);
+
+	/* listen for unicasts on port 138 */
+	iface->dgmsock = nbt_dgram_socket_init(iface, nbtsrv->task->event_ctx);
+	NT_STATUS_HAVE_NO_MEMORY(iface->dgmsock);
+
+	status = socket_listen(iface->dgmsock->sock, bind_address, 
+			       lp_dgram_port(), 0, 0);
+	if (!NT_STATUS_IS_OK(status)) {
+		DEBUG(0,("Failed to bind to %s:%d - %s\n", 
+			 bind_address, lp_dgram_port(), nt_errstr(status)));
+		talloc_free(iface);
+		return status;
+	}
+	dgram_set_incoming_handler(iface->dgmsock, dgram_request_handler, iface);
+
+
+	for (i=0;i<ARRAY_SIZE(mailslot_handlers);i++) {
+		/* note that we don't need to keep the pointer
+		   to the dgmslot around - the callback is all
+		   we need */
+		struct dgram_mailslot_handler *dgmslot;
+
+		dgmslot = dgram_mailslot_listen(bcast_dgmsock, 
+						mailslot_handlers[i].mailslot_name,
+						mailslot_handlers[i].handler, iface);
+		NT_STATUS_HAVE_NO_MEMORY(dgmslot);
+
+		dgmslot = dgram_mailslot_listen(iface->dgmsock, 
+						mailslot_handlers[i].mailslot_name,
+						mailslot_handlers[i].handler, iface);
+		NT_STATUS_HAVE_NO_MEMORY(dgmslot);
+	}
+
+	return NT_STATUS_OK;
+}
diff --git a/source4/nbt_server/interfaces.c b/source4/nbt_server/interfaces.c
index dfd4538321..b77e692e10 100644
--- a/source4/nbt_server/interfaces.c
+++ b/source4/nbt_server/interfaces.c
@@ -64,17 +64,6 @@ static void nbtd_request_handler(struct nbt_name_socket *nbtsock,
 
 
 /*
-  receive an incoming dgram request
-*/
-static void dgram_request_handler(struct nbt_dgram_socket *dgmsock, 
-				  struct nbt_dgram_packet *packet, 
-				  const char *src_address, int src_port)
-{
-}
-
-
-
-/*
   find a registered name on an interface
 */
 struct nbtd_iface_name *nbtd_find_iname(struct nbtd_interface *iface, 
@@ -123,7 +112,6 @@ static NTSTATUS nbtd_add_socket(struct nbtd_server *nbtsrv,
 
 	if (strcmp(netmask, "0.0.0.0") != 0) {
 		struct nbt_name_socket *bcast_nbtsock;
-		struct nbt_dgram_socket *bcast_dgmsock;
 
 		/* listen for broadcasts on port 137 */
 		bcast_nbtsock = nbt_name_socket_init(iface, nbtsrv->task->event_ctx);
@@ -138,21 +126,6 @@ static NTSTATUS nbtd_add_socket(struct nbtd_server *nbtsrv,
 		}
 
 		nbt_set_incoming_handler(bcast_nbtsock, nbtd_request_handler, iface);
-
-
-		/* listen for broadcasts on port 138 */
-		bcast_dgmsock = nbt_dgram_socket_init(iface, nbtsrv->task->event_ctx);
-		NT_STATUS_HAVE_NO_MEMORY(bcast_dgmsock);
-
-		status = socket_listen(bcast_dgmsock->sock, bcast, lp_dgram_port(), 0, 0);
-		if (!NT_STATUS_IS_OK(status)) {
-			DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-				 bcast, lp_dgram_port(), nt_errstr(status)));
-			talloc_free(iface);
-			return status;
-		}
-
-		dgram_set_incoming_handler(bcast_dgmsock, dgram_request_handler, iface);
 	}
 
 	/* listen for unicasts on port 137 */
@@ -162,26 +135,21 @@ static NTSTATUS nbtd_add_socket(struct nbtd_server *nbtsrv,
 	status = socket_listen(iface->nbtsock->sock, bind_address, lp_nbt_port(), 0, 0);
 	if (!NT_STATUS_IS_OK(status)) {
 		DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-			 address, lp_nbt_port(), nt_errstr(status)));
+			 bind_address, lp_nbt_port(), nt_errstr(status)));
 		talloc_free(iface);
 		return status;
 	}
 	nbt_set_incoming_handler(iface->nbtsock, nbtd_request_handler, iface);
 
-
-	/* listen for unicasts on port 138 */
-	iface->dgmsock = nbt_dgram_socket_init(iface, nbtsrv->task->event_ctx);
-	NT_STATUS_HAVE_NO_MEMORY(iface->dgmsock);
-
-	status = socket_listen(iface->dgmsock->sock, bind_address, lp_dgram_port(), 0, 0);
+	/* also setup the datagram listeners */
+	status = nbtd_dgram_setup(iface, bind_address);
 	if (!NT_STATUS_IS_OK(status)) {
-		DEBUG(0,("Failed to bind to %s:%d - %s\n", 
-			 address, lp_dgram_port(), nt_errstr(status)));
+		DEBUG(0,("Failed to setup dgram listen on %s - %s\n", 
+			 bind_address, nt_errstr(status)));
 		talloc_free(iface);
 		return status;
 	}
-	dgram_set_incoming_handler(iface->dgmsock, dgram_request_handler, iface);
-
+	
 	if (strcmp(netmask, "0.0.0.0") == 0) {
 		DLIST_ADD(nbtsrv->bcast_interface, iface);
 	} else {