From 799724aae7f431ef721b15745a89f01b12b10d9c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 18 Nov 2005 08:44:36 +0000 Subject: r11774: - move SMB specific initialisation of the smbsrv_connection out of smb_server.c - add a generic incoming packet handler, which handles the first incoming packet and passes to the protocol specifc packet handler metze (This used to be commit f89deac1cb8a7e5651116d96b9a94d5cc8293076) --- source4/smb_server/conn.c | 4 ++- source4/smb_server/receive.c | 30 +++++++++++++++++++++ source4/smb_server/session.c | 7 ++--- source4/smb_server/smb_server.c | 59 +++++++++++++++++++++++++---------------- 4 files changed, 73 insertions(+), 27 deletions(-) diff --git a/source4/smb_server/conn.c b/source4/smb_server/conn.c index a9cd71e801..31bdd6de98 100644 --- a/source4/smb_server/conn.c +++ b/source4/smb_server/conn.c @@ -29,9 +29,11 @@ /**************************************************************************** init the tcon structures ****************************************************************************/ -void smbsrv_tcon_init(struct smbsrv_connection *smb_conn) +NTSTATUS smbsrv_init_tcons(struct smbsrv_connection *smb_conn) { smb_conn->tree.idtree_tid = idr_init(smb_conn); + NT_STATUS_HAVE_NO_MEMORY(smb_conn->tree.idtree_tid); + return NT_STATUS_OK; } /**************************************************************************** diff --git a/source4/smb_server/receive.c b/source4/smb_server/receive.c index 371333b647..aa54d9867e 100644 --- a/source4/smb_server/receive.c +++ b/source4/smb_server/receive.c @@ -625,3 +625,33 @@ error: SSVAL(req->out.vwv, VWV(1), 0); req_reply_dos_error(req, ERRSRV, ERRerror); } + +/* + * init the SMB protocol related stuff + */ +NTSTATUS smbsrv_init_smb_connection(struct smbsrv_connection *smb_conn) +{ + NTSTATUS status; + + /* now initialise a few default values associated with this smb socket */ + smb_conn->negotiate.max_send = 0xFFFF; + + /* this is the size that w2k uses, and it appears to be important for + good performance */ + smb_conn->negotiate.max_recv = lp_max_xmit(); + + smb_conn->negotiate.zone_offset = get_time_zone(time(NULL)); + + smb_conn->config.security = lp_security(); + smb_conn->config.nt_status_support = lp_nt_status_support(); + + status = smbsrv_init_sessions(smb_conn); + NT_STATUS_NOT_OK_RETURN(status); + + status = smbsrv_init_tcons(smb_conn); + NT_STATUS_NOT_OK_RETURN(status); + + srv_init_signing(smb_conn); + + return NT_STATUS_OK; +} diff --git a/source4/smb_server/session.c b/source4/smb_server/session.c index 50bea16ee2..ba141f96ec 100644 --- a/source4/smb_server/session.c +++ b/source4/smb_server/session.c @@ -25,14 +25,15 @@ /**************************************************************************** -init the tcon structures +init the session structures ****************************************************************************/ -void smbsrv_vuid_init(struct smbsrv_connection *smb_conn) +NTSTATUS smbsrv_init_sessions(struct smbsrv_connection *smb_conn) { smb_conn->sessions.idtree_vuid = idr_init(smb_conn); + NT_STATUS_HAVE_NO_MEMORY(smb_conn->sessions.idtree_vuid); + return NT_STATUS_OK; } - /**************************************************************************** Find the session structure assoicated with a VUID (not one from an in-progress session setup) ****************************************************************************/ diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 060be4eaea..3385e88d4a 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -28,6 +28,41 @@ #include "lib/messaging/irpc.h" #include "lib/stream/packet.h" +static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) +{ + NTSTATUS status; + struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection); + uint32_t protocol_version; + + /* see if its a special NBT packet */ + if (CVAL(blob.data,0) != 0) { + status = smbsrv_init_smb_connection(smb_conn); + NT_STATUS_NOT_OK_RETURN(status); + packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); + return smbsrv_recv_smb_request(smb_conn, blob); + } + + if (blob.length < (NBT_HDR_SIZE + MIN_SMB_SIZE)) { + DEBUG(2,("Invalid SMB packet length count %d\n", blob.length)); + smbsrv_terminate_connection(smb_conn, "Invalid SMB packet"); + return NT_STATUS_OK; + } + + protocol_version = IVAL(blob.data, NBT_HDR_SIZE); + + switch (protocol_version) { + case SMB_MAGIC: + status = smbsrv_init_smb_connection(smb_conn); + NT_STATUS_NOT_OK_RETURN(status); + packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); + return smbsrv_recv_smb_request(smb_conn, blob); + } + + DEBUG(2,("Invalid SMB packet: protocl prefix: 0x%08X\n", protocol_version)); + smbsrv_terminate_connection(smb_conn, "NON-SMB packet"); + return NT_STATUS_OK; +} + /* close the socket and shutdown a server_context */ @@ -91,18 +126,6 @@ static void smbsrv_accept(struct stream_connection *conn) smb_conn = talloc_zero(conn, struct smbsrv_connection); if (!smb_conn) return; - /* now initialise a few default values associated with this smb socket */ - smb_conn->negotiate.max_send = 0xFFFF; - - /* this is the size that w2k uses, and it appears to be important for - good performance */ - smb_conn->negotiate.max_recv = lp_max_xmit(); - - smb_conn->negotiate.zone_offset = get_time_zone(time(NULL)); - - smb_conn->negotiate.called_name = NULL; - smb_conn->negotiate.calling_name = NULL; - smb_conn->packet = packet_init(smb_conn); if (smb_conn->packet == NULL) { stream_terminate_connection(conn, "out of memory"); @@ -110,23 +133,14 @@ static void smbsrv_accept(struct stream_connection *conn) } packet_set_private(smb_conn->packet, smb_conn); packet_set_socket(smb_conn->packet, conn->socket); - packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); + packet_set_callback(smb_conn->packet, smbsrv_recv_generic_request); packet_set_full_request(smb_conn->packet, packet_full_request_nbt); packet_set_error_handler(smb_conn->packet, smbsrv_recv_error); packet_set_event_context(smb_conn->packet, conn->event.ctx); packet_set_fde(smb_conn->packet, conn->event.fde); packet_set_serialise(smb_conn->packet); - smbsrv_vuid_init(smb_conn); - - srv_init_signing(smb_conn); - - smbsrv_tcon_init(smb_conn); - smb_conn->connection = conn; - smb_conn->config.security = lp_security(); - smb_conn->config.nt_status_support = lp_nt_status_support(); - conn->private = smb_conn; irpc_add_name(conn->msg_ctx, "smb_server"); @@ -134,7 +148,6 @@ static void smbsrv_accept(struct stream_connection *conn) smbsrv_management_init(smb_conn); } - static const struct stream_server_ops smb_stream_ops = { .name = "smb", .accept_connection = smbsrv_accept, -- cgit