From 26ecaa32266e0c8699f280dd190811c310f2939c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 3 Feb 2004 05:47:36 +0000 Subject: - move all SMB server stuff to smb_server/* and create the SMB server subsystem - remove unused XML and MYSQL configure tests metze (This used to be commit 956d212c83d8ebd8e31ec109f17dc2105ca72c30) --- source4/smb_server/smb_server.c | 769 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 769 insertions(+) create mode 100644 source4/smb_server/smb_server.c (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c new file mode 100644 index 0000000000..b8e1e032e2 --- /dev/null +++ b/source4/smb_server/smb_server.c @@ -0,0 +1,769 @@ +/* + Unix SMB/CIFS implementation. + process incoming packets - main loop + Copyright (C) Andrew Tridgell 1992-2003 + Copyright (C) James J Myers 2003 + + 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" + + +/* + send an oplock break request to a client +*/ +BOOL req_send_oplock_break(struct tcon_context *conn, uint16 fnum, uint8 level) +{ + struct request_context *req; + + req = init_smb_request(conn->smb); + + req_setup_reply(req, 8, 0); + + SCVAL(req->out.hdr,HDR_COM,SMBlockingX); + SSVAL(req->out.hdr,HDR_TID,conn->cnum); + SSVAL(req->out.hdr,HDR_PID,0xFFFF); + SSVAL(req->out.hdr,HDR_UID,0); + SSVAL(req->out.hdr,HDR_MID,0xFFFF); + SCVAL(req->out.hdr,HDR_FLG,0); + SSVAL(req->out.hdr,HDR_FLG2,0); + + SSVAL(req->out.vwv, VWV(0), SMB_CHAIN_NONE); + SSVAL(req->out.vwv, VWV(1), 0); + SSVAL(req->out.vwv, VWV(2), fnum); + SSVAL(req->out.vwv, VWV(3), level); + SIVAL(req->out.vwv, VWV(4), 0); + SSVAL(req->out.vwv, VWV(6), 0); + SSVAL(req->out.vwv, VWV(7), 0); + + req_send_reply(req); + return True; +} + +/**************************************************************************** +receive a SMB request from the wire, forming a request_context from the result +****************************************************************************/ +static struct request_context *receive_smb_request(struct server_context *smb) +{ + ssize_t len, len2; + char header[4]; + struct request_context *req; + + len = read_data(smb->socket.fd, header, 4); + if (len != 4) { + return NULL; + } + + len = smb_len(header); + + req = init_smb_request(smb); + + GetTimeOfDay(&req->request_time); + req->chained_fnum = -1; + + /* allocate the incoming buffer at the right size */ + req->in.buffer = talloc(req->mem_ctx, len + NBT_HDR_SIZE); + + /* fill in the already received header */ + memcpy(req->in.buffer, header, 4); + + len2 = read_data(smb->socket.fd, req->in.buffer + NBT_HDR_SIZE, len); + if (len2 != len) { + return NULL; + } + + /* fill in the rest of the req->in structure */ + req->in.size = len + NBT_HDR_SIZE; + req->in.allocated = req->in.size; + req->in.hdr = req->in.buffer + NBT_HDR_SIZE; + req->in.vwv = req->in.hdr + HDR_VWV; + req->in.wct = CVAL(req->in.hdr, HDR_WCT); + if (req->in.vwv + VWV(req->in.wct) <= req->in.buffer + req->in.size) { + req->in.data = req->in.vwv + VWV(req->in.wct) + 2; + req->in.data_size = SVAL(req->in.vwv, VWV(req->in.wct)); + + /* the bcc length is only 16 bits, but some packets + (such as SMBwriteX) can be much larger than 64k. We + detect this by looking for a large non-chained NBT + packet (at least 64k bigger than what is + specified). If it is detected then the NBT size is + used instead of the bcc size */ + if (req->in.data_size + 0x10000 <= + req->in.size - PTR_DIFF(req->in.data, req->in.buffer) && + (req->in.wct < 1 || SVAL(req->in.vwv, VWV(0)) == SMB_CHAIN_NONE)) { + /* its an oversized packet! fun for all the family */ + req->in.data_size = req->in.size - PTR_DIFF(req->in.data,req->in.buffer); + } + } + + return req; +} + +/* + setup the user_ctx element of a request +*/ +static void setup_user_context(struct request_context *req) +{ + struct user_context *ctx; + + ctx = talloc(req->mem_ctx, sizeof(*ctx)); + ctx->vuid = SVAL(req->in.hdr, HDR_UID); + ctx->vuser = get_valid_user_struct(req->smb, ctx->vuid); + + req->user_ctx = ctx; +} + + +/* +These flags determine some of the permissions required to do an operation + +Note that I don't set NEED_WRITE on some write operations because they +are used by some brain-dead clients when printing, and I don't want to +force write permissions on print services. +*/ +#define AS_USER (1<<0) +#define NEED_WRITE (1<<1) +#define TIME_INIT (1<<2) +#define CAN_IPC (1<<3) +#define AS_GUEST (1<<5) +#define USE_MUTEX (1<<7) + +/* + define a list of possible SMB messages and their corresponding + functions. Any message that has a NULL function is unimplemented - + please feel free to contribute implementations! +*/ +static const struct smb_message_struct +{ + const char *name; + void (*fn)(struct request_context *); + int flags; +} + smb_messages[256] = { +/* 0x00 */ { "SMBmkdir",reply_mkdir,AS_USER | NEED_WRITE}, +/* 0x01 */ { "SMBrmdir",reply_rmdir,AS_USER | NEED_WRITE}, +/* 0x02 */ { "SMBopen",reply_open,AS_USER }, +/* 0x03 */ { "SMBcreate",reply_mknew,AS_USER}, +/* 0x04 */ { "SMBclose",reply_close,AS_USER | CAN_IPC }, +/* 0x05 */ { "SMBflush",reply_flush,AS_USER}, +/* 0x06 */ { "SMBunlink",reply_unlink,AS_USER | NEED_WRITE }, +/* 0x07 */ { "SMBmv",reply_mv,AS_USER | NEED_WRITE }, +/* 0x08 */ { "SMBgetatr",reply_getatr,AS_USER}, +/* 0x09 */ { "SMBsetatr",reply_setatr,AS_USER | NEED_WRITE}, +/* 0x0a */ { "SMBread",reply_read,AS_USER}, +/* 0x0b */ { "SMBwrite",reply_write,AS_USER | CAN_IPC }, +/* 0x0c */ { "SMBlock",reply_lock,AS_USER}, +/* 0x0d */ { "SMBunlock",reply_unlock,AS_USER}, +/* 0x0e */ { "SMBctemp",reply_ctemp,AS_USER }, +/* 0x0f */ { "SMBmknew",reply_mknew,AS_USER}, +/* 0x10 */ { "SMBchkpth",reply_chkpth,AS_USER}, +/* 0x11 */ { "SMBexit",reply_exit,0}, +/* 0x12 */ { "SMBlseek",reply_lseek,AS_USER}, +/* 0x13 */ { "SMBlockread",reply_lockread,AS_USER}, +/* 0x14 */ { "SMBwriteunlock",reply_writeunlock,AS_USER}, +/* 0x15 */ { NULL, NULL, 0 }, +/* 0x16 */ { NULL, NULL, 0 }, +/* 0x17 */ { NULL, NULL, 0 }, +/* 0x18 */ { NULL, NULL, 0 }, +/* 0x19 */ { NULL, NULL, 0 }, +/* 0x1a */ { "SMBreadbraw",reply_readbraw,AS_USER}, +/* 0x1b */ { "SMBreadBmpx",reply_readbmpx,AS_USER}, +/* 0x1c */ { "SMBreadBs",NULL,0 }, +/* 0x1d */ { "SMBwritebraw",reply_writebraw,AS_USER}, +/* 0x1e */ { "SMBwriteBmpx",reply_writebmpx,AS_USER}, +/* 0x1f */ { "SMBwriteBs",reply_writebs,AS_USER}, +/* 0x20 */ { "SMBwritec",NULL,0}, +/* 0x21 */ { NULL, NULL, 0 }, +/* 0x22 */ { "SMBsetattrE",reply_setattrE,AS_USER | NEED_WRITE }, +/* 0x23 */ { "SMBgetattrE",reply_getattrE,AS_USER }, +/* 0x24 */ { "SMBlockingX",reply_lockingX,AS_USER }, +/* 0x25 */ { "SMBtrans",reply_trans,AS_USER | CAN_IPC }, +/* 0x26 */ { "SMBtranss",NULL,AS_USER | CAN_IPC}, +/* 0x27 */ { "SMBioctl",reply_ioctl,0}, +/* 0x28 */ { "SMBioctls",NULL,AS_USER}, +/* 0x29 */ { "SMBcopy",reply_copy,AS_USER | NEED_WRITE }, +/* 0x2a */ { "SMBmove",NULL,AS_USER | NEED_WRITE }, +/* 0x2b */ { "SMBecho",reply_echo,0}, +/* 0x2c */ { "SMBwriteclose",reply_writeclose,AS_USER}, +/* 0x2d */ { "SMBopenX",reply_open_and_X,AS_USER | CAN_IPC }, +/* 0x2e */ { "SMBreadX",reply_read_and_X,AS_USER | CAN_IPC }, +/* 0x2f */ { "SMBwriteX",reply_write_and_X,AS_USER | CAN_IPC }, +/* 0x30 */ { NULL, NULL, 0 }, +/* 0x31 */ { NULL, NULL, 0 }, +/* 0x32 */ { "SMBtrans2", reply_trans2, AS_USER | CAN_IPC }, +/* 0x33 */ { "SMBtranss2", reply_transs2, AS_USER}, +/* 0x34 */ { "SMBfindclose", reply_findclose,AS_USER}, +/* 0x35 */ { "SMBfindnclose", reply_findnclose, AS_USER}, +/* 0x36 */ { NULL, NULL, 0 }, +/* 0x37 */ { NULL, NULL, 0 }, +/* 0x38 */ { NULL, NULL, 0 }, +/* 0x39 */ { NULL, NULL, 0 }, +/* 0x3a */ { NULL, NULL, 0 }, +/* 0x3b */ { NULL, NULL, 0 }, +/* 0x3c */ { NULL, NULL, 0 }, +/* 0x3d */ { NULL, NULL, 0 }, +/* 0x3e */ { NULL, NULL, 0 }, +/* 0x3f */ { NULL, NULL, 0 }, +/* 0x40 */ { NULL, NULL, 0 }, +/* 0x41 */ { NULL, NULL, 0 }, +/* 0x42 */ { NULL, NULL, 0 }, +/* 0x43 */ { NULL, NULL, 0 }, +/* 0x44 */ { NULL, NULL, 0 }, +/* 0x45 */ { NULL, NULL, 0 }, +/* 0x46 */ { NULL, NULL, 0 }, +/* 0x47 */ { NULL, NULL, 0 }, +/* 0x48 */ { NULL, NULL, 0 }, +/* 0x49 */ { NULL, NULL, 0 }, +/* 0x4a */ { NULL, NULL, 0 }, +/* 0x4b */ { NULL, NULL, 0 }, +/* 0x4c */ { NULL, NULL, 0 }, +/* 0x4d */ { NULL, NULL, 0 }, +/* 0x4e */ { NULL, NULL, 0 }, +/* 0x4f */ { NULL, NULL, 0 }, +/* 0x50 */ { NULL, NULL, 0 }, +/* 0x51 */ { NULL, NULL, 0 }, +/* 0x52 */ { NULL, NULL, 0 }, +/* 0x53 */ { NULL, NULL, 0 }, +/* 0x54 */ { NULL, NULL, 0 }, +/* 0x55 */ { NULL, NULL, 0 }, +/* 0x56 */ { NULL, NULL, 0 }, +/* 0x57 */ { NULL, NULL, 0 }, +/* 0x58 */ { NULL, NULL, 0 }, +/* 0x59 */ { NULL, NULL, 0 }, +/* 0x5a */ { NULL, NULL, 0 }, +/* 0x5b */ { NULL, NULL, 0 }, +/* 0x5c */ { NULL, NULL, 0 }, +/* 0x5d */ { NULL, NULL, 0 }, +/* 0x5e */ { NULL, NULL, 0 }, +/* 0x5f */ { NULL, NULL, 0 }, +/* 0x60 */ { NULL, NULL, 0 }, +/* 0x61 */ { NULL, NULL, 0 }, +/* 0x62 */ { NULL, NULL, 0 }, +/* 0x63 */ { NULL, NULL, 0 }, +/* 0x64 */ { NULL, NULL, 0 }, +/* 0x65 */ { NULL, NULL, 0 }, +/* 0x66 */ { NULL, NULL, 0 }, +/* 0x67 */ { NULL, NULL, 0 }, +/* 0x68 */ { NULL, NULL, 0 }, +/* 0x69 */ { NULL, NULL, 0 }, +/* 0x6a */ { NULL, NULL, 0 }, +/* 0x6b */ { NULL, NULL, 0 }, +/* 0x6c */ { NULL, NULL, 0 }, +/* 0x6d */ { NULL, NULL, 0 }, +/* 0x6e */ { NULL, NULL, 0 }, +/* 0x6f */ { NULL, NULL, 0 }, +/* 0x70 */ { "SMBtcon",reply_tcon,USE_MUTEX}, +/* 0x71 */ { "SMBtdis",reply_tdis,0}, +/* 0x72 */ { "SMBnegprot",reply_negprot,USE_MUTEX}, +/* 0x73 */ { "SMBsesssetupX",reply_sesssetup,USE_MUTEX}, +/* 0x74 */ { "SMBulogoffX", reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */ +/* 0x75 */ { "SMBtconX",reply_tcon_and_X,USE_MUTEX}, +/* 0x76 */ { NULL, NULL, 0 }, +/* 0x77 */ { NULL, NULL, 0 }, +/* 0x78 */ { NULL, NULL, 0 }, +/* 0x79 */ { NULL, NULL, 0 }, +/* 0x7a */ { NULL, NULL, 0 }, +/* 0x7b */ { NULL, NULL, 0 }, +/* 0x7c */ { NULL, NULL, 0 }, +/* 0x7d */ { NULL, NULL, 0 }, +/* 0x7e */ { NULL, NULL, 0 }, +/* 0x7f */ { NULL, NULL, 0 }, +/* 0x80 */ { "SMBdskattr",reply_dskattr,AS_USER}, +/* 0x81 */ { "SMBsearch",reply_search,AS_USER}, +/* 0x82 */ { "SMBffirst",reply_search,AS_USER}, +/* 0x83 */ { "SMBfunique",reply_search,AS_USER}, +/* 0x84 */ { "SMBfclose",reply_fclose,AS_USER}, +/* 0x85 */ { NULL, NULL, 0 }, +/* 0x86 */ { NULL, NULL, 0 }, +/* 0x87 */ { NULL, NULL, 0 }, +/* 0x88 */ { NULL, NULL, 0 }, +/* 0x89 */ { NULL, NULL, 0 }, +/* 0x8a */ { NULL, NULL, 0 }, +/* 0x8b */ { NULL, NULL, 0 }, +/* 0x8c */ { NULL, NULL, 0 }, +/* 0x8d */ { NULL, NULL, 0 }, +/* 0x8e */ { NULL, NULL, 0 }, +/* 0x8f */ { NULL, NULL, 0 }, +/* 0x90 */ { NULL, NULL, 0 }, +/* 0x91 */ { NULL, NULL, 0 }, +/* 0x92 */ { NULL, NULL, 0 }, +/* 0x93 */ { NULL, NULL, 0 }, +/* 0x94 */ { NULL, NULL, 0 }, +/* 0x95 */ { NULL, NULL, 0 }, +/* 0x96 */ { NULL, NULL, 0 }, +/* 0x97 */ { NULL, NULL, 0 }, +/* 0x98 */ { NULL, NULL, 0 }, +/* 0x99 */ { NULL, NULL, 0 }, +/* 0x9a */ { NULL, NULL, 0 }, +/* 0x9b */ { NULL, NULL, 0 }, +/* 0x9c */ { NULL, NULL, 0 }, +/* 0x9d */ { NULL, NULL, 0 }, +/* 0x9e */ { NULL, NULL, 0 }, +/* 0x9f */ { NULL, NULL, 0 }, +/* 0xa0 */ { "SMBnttrans", reply_nttrans, AS_USER | CAN_IPC }, +/* 0xa1 */ { "SMBnttranss", reply_nttranss, AS_USER | CAN_IPC }, +/* 0xa2 */ { "SMBntcreateX", reply_ntcreate_and_X, AS_USER | CAN_IPC }, +/* 0xa3 */ { NULL, NULL, 0 }, +/* 0xa4 */ { "SMBntcancel", reply_ntcancel, 0 }, +/* 0xa5 */ { "SMBntrename", reply_ntrename, 0 }, +/* 0xa6 */ { NULL, NULL, 0 }, +/* 0xa7 */ { NULL, NULL, 0 }, +/* 0xa8 */ { NULL, NULL, 0 }, +/* 0xa9 */ { NULL, NULL, 0 }, +/* 0xaa */ { NULL, NULL, 0 }, +/* 0xab */ { NULL, NULL, 0 }, +/* 0xac */ { NULL, NULL, 0 }, +/* 0xad */ { NULL, NULL, 0 }, +/* 0xae */ { NULL, NULL, 0 }, +/* 0xaf */ { NULL, NULL, 0 }, +/* 0xb0 */ { NULL, NULL, 0 }, +/* 0xb1 */ { NULL, NULL, 0 }, +/* 0xb2 */ { NULL, NULL, 0 }, +/* 0xb3 */ { NULL, NULL, 0 }, +/* 0xb4 */ { NULL, NULL, 0 }, +/* 0xb5 */ { NULL, NULL, 0 }, +/* 0xb6 */ { NULL, NULL, 0 }, +/* 0xb7 */ { NULL, NULL, 0 }, +/* 0xb8 */ { NULL, NULL, 0 }, +/* 0xb9 */ { NULL, NULL, 0 }, +/* 0xba */ { NULL, NULL, 0 }, +/* 0xbb */ { NULL, NULL, 0 }, +/* 0xbc */ { NULL, NULL, 0 }, +/* 0xbd */ { NULL, NULL, 0 }, +/* 0xbe */ { NULL, NULL, 0 }, +/* 0xbf */ { NULL, NULL, 0 }, +/* 0xc0 */ { "SMBsplopen",reply_printopen,AS_USER }, +/* 0xc1 */ { "SMBsplwr",reply_printwrite,AS_USER}, +/* 0xc2 */ { "SMBsplclose",reply_printclose,AS_USER}, +/* 0xc3 */ { "SMBsplretq",reply_printqueue,AS_USER}, +/* 0xc4 */ { NULL, NULL, 0 }, +/* 0xc5 */ { NULL, NULL, 0 }, +/* 0xc6 */ { NULL, NULL, 0 }, +/* 0xc7 */ { NULL, NULL, 0 }, +/* 0xc8 */ { NULL, NULL, 0 }, +/* 0xc9 */ { NULL, NULL, 0 }, +/* 0xca */ { NULL, NULL, 0 }, +/* 0xcb */ { NULL, NULL, 0 }, +/* 0xcc */ { NULL, NULL, 0 }, +/* 0xcd */ { NULL, NULL, 0 }, +/* 0xce */ { NULL, NULL, 0 }, +/* 0xcf */ { NULL, NULL, 0 }, +/* 0xd0 */ { "SMBsends",reply_sends,AS_GUEST}, +/* 0xd1 */ { "SMBsendb",NULL,AS_GUEST}, +/* 0xd2 */ { "SMBfwdname",NULL,AS_GUEST}, +/* 0xd3 */ { "SMBcancelf",NULL,AS_GUEST}, +/* 0xd4 */ { "SMBgetmac",NULL,AS_GUEST}, +/* 0xd5 */ { "SMBsendstrt",reply_sendstrt,AS_GUEST}, +/* 0xd6 */ { "SMBsendend",reply_sendend,AS_GUEST}, +/* 0xd7 */ { "SMBsendtxt",reply_sendtxt,AS_GUEST}, +/* 0xd8 */ { NULL, NULL, 0 }, +/* 0xd9 */ { NULL, NULL, 0 }, +/* 0xda */ { NULL, NULL, 0 }, +/* 0xdb */ { NULL, NULL, 0 }, +/* 0xdc */ { NULL, NULL, 0 }, +/* 0xdd */ { NULL, NULL, 0 }, +/* 0xde */ { NULL, NULL, 0 }, +/* 0xdf */ { NULL, NULL, 0 }, +/* 0xe0 */ { NULL, NULL, 0 }, +/* 0xe1 */ { NULL, NULL, 0 }, +/* 0xe2 */ { NULL, NULL, 0 }, +/* 0xe3 */ { NULL, NULL, 0 }, +/* 0xe4 */ { NULL, NULL, 0 }, +/* 0xe5 */ { NULL, NULL, 0 }, +/* 0xe6 */ { NULL, NULL, 0 }, +/* 0xe7 */ { NULL, NULL, 0 }, +/* 0xe8 */ { NULL, NULL, 0 }, +/* 0xe9 */ { NULL, NULL, 0 }, +/* 0xea */ { NULL, NULL, 0 }, +/* 0xeb */ { NULL, NULL, 0 }, +/* 0xec */ { NULL, NULL, 0 }, +/* 0xed */ { NULL, NULL, 0 }, +/* 0xee */ { NULL, NULL, 0 }, +/* 0xef */ { NULL, NULL, 0 }, +/* 0xf0 */ { NULL, NULL, 0 }, +/* 0xf1 */ { NULL, NULL, 0 }, +/* 0xf2 */ { NULL, NULL, 0 }, +/* 0xf3 */ { NULL, NULL, 0 }, +/* 0xf4 */ { NULL, NULL, 0 }, +/* 0xf5 */ { NULL, NULL, 0 }, +/* 0xf6 */ { NULL, NULL, 0 }, +/* 0xf7 */ { NULL, NULL, 0 }, +/* 0xf8 */ { NULL, NULL, 0 }, +/* 0xf9 */ { NULL, NULL, 0 }, +/* 0xfa */ { NULL, NULL, 0 }, +/* 0xfb */ { NULL, NULL, 0 }, +/* 0xfc */ { NULL, NULL, 0 }, +/* 0xfd */ { NULL, NULL, 0 }, +/* 0xfe */ { NULL, NULL, 0 }, +/* 0xff */ { NULL, NULL, 0 } +}; + +/**************************************************************************** +return a string containing the function name of a SMB command +****************************************************************************/ +static const char *smb_fn_name(uint8 type) +{ + const char *unknown_name = "SMBunknown"; + + if (smb_messages[type].name == NULL) + return unknown_name; + + return smb_messages[type].name; +} + + +/**************************************************************************** + Do a switch on the message type and call the specific reply function for this +message. Unlike earlier versions of Samba the reply functions are responsible +for sending the reply themselves, rather than returning a size to this function +The reply functions may also choose to delay the processing by pushing the message +onto the message queue +****************************************************************************/ +static void switch_message(int type, struct request_context *req) +{ + int flags; + uint16 session_tag; + struct server_context *smb = req->smb; + + type &= 0xff; + + errno = 0; + + if (smb_messages[type].fn == NULL) { + DEBUG(0,("Unknown message type %d!\n",type)); + reply_unknown(req); + return; + } + + flags = smb_messages[type].flags; + + /* In share mode security we must ignore the vuid. */ + session_tag = (lp_security() == SEC_SHARE) ? + UID_FIELD_INVALID : + SVAL(req->in.hdr,HDR_UID); + + req->conn = conn_find(req->smb, SVAL(req->in.hdr,HDR_TID)); + + /* setup the user context for this request */ + setup_user_context(req); + + /* Ensure this value is replaced in the incoming packet. */ + SSVAL(req->in.hdr,HDR_UID,session_tag); + + if (req->user_ctx) { + req->user_ctx->vuid = session_tag; + } + DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), smb->model_ops->get_id(req))); + + /* does this protocol need to be run as root? */ + if (!(flags & AS_USER)) { + change_to_root_user(); + } + + /* does this protocol need a valid tree connection? */ + if ((flags & AS_USER) && !req->conn) { + req_reply_error(req, NT_STATUS_NETWORK_NAME_DELETED); + return; + } + + /* does this protocol need to be run as the connected user? */ +#if HACK_REWRITE + if ((flags & AS_USER) && !change_to_user(req->conn,session_tag)) { + if (!(flags & AS_GUEST)) { + req_reply_error(req, NT_STATUS_ACCESS_DENIED); + return; + } + + /* we'll run it as guest */ + flags &= ~AS_USER; + } +#endif + + /* this code is to work around a bug is MS client 3 without + introducing a security hole - it needs to be able to do + print queue checks as guest if it isn't logged in properly */ + if (flags & AS_USER) { + flags &= ~AS_GUEST; + } + + /* does it need write permission? */ + if ((flags & NEED_WRITE) && !CAN_WRITE(req->conn)) { + req_reply_error(req, NT_STATUS_ACCESS_DENIED); + return; + } + + /* ipc services are limited */ + if (req->conn && req->conn->type == NTVFS_IPC && (flags & AS_USER) && !(flags & CAN_IPC)) { + req_reply_error(req, NT_STATUS_ACCESS_DENIED); + return; + } + + /* load service specific parameters */ + if (req->conn && !set_current_service(req->conn,(flags & AS_USER)?True:False)) { + req_reply_error(req, NT_STATUS_ACCESS_DENIED); + return; + } + + /* does this protocol need to be run as guest? */ +#if HACK_REWRITE + if ((flags & AS_GUEST) && + !change_to_guest()) { + req_reply_error(req, NT_STATUS_ACCESS_DENIED); + return; + } +#endif + /* THREAD TESTING: use mutex to serialize calls to critical functions with global state */ + if (flags & USE_MUTEX) { + MUTEX_LOCK_BY_ID(MUTEX_SMBD); + } + smb_messages[type].fn(req); + if (flags & USE_MUTEX) { + MUTEX_UNLOCK_BY_ID(MUTEX_SMBD); + } +} + + +/**************************************************************************** + Construct a reply to the incoming packet. +****************************************************************************/ +static void construct_reply(struct request_context *req) +{ + uint8 type = CVAL(req->in.hdr,HDR_COM); + + /* see if its a special NBT packet */ + if (CVAL(req->in.buffer,0) != 0) { + reply_special(req); + return; + } + + + /* Make sure this is an SMB packet */ + if (memcmp(req->in.hdr,"\377SMB",4) != 0) { + DEBUG(2,("Non-SMB packet of length %d. Terminating connection\n", + req->in.size)); + exit_server(req->smb, "Non-SMB packet"); + return; + } + + if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct > req->in.size) { + DEBUG(2,("Invalid SMB word count %d\n", req->in.wct)); + exit_server(req->smb, "Invalid SMB packet"); + return; + } + + if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct + req->in.data_size > req->in.size) { + DEBUG(2,("Invalid SMB buffer length count %d\n", req->in.data_size)); + exit_server(req->smb, "Invalid SMB packet"); + return; + } + + + req->smbpid = SVAL(req->in.hdr,HDR_PID); + req->flags = CVAL(req->in.hdr, HDR_FLG); + req->flags2 = SVAL(req->in.hdr, HDR_FLG2); + + switch_message(type, req); +} + + +/* + we call this when first first part of a possibly chained request has been completed + and we need to call the 2nd part, if any +*/ +void chain_reply(struct request_context *req) +{ + uint16 chain_cmd, chain_offset; + char *vwv, *data; + uint16 wct; + uint16 data_size; + + if (req->in.wct < 2 || req->out.wct < 2) { + req_reply_dos_error(req, ERRSRV, ERRerror); + return; + } + + chain_cmd = CVAL(req->in.vwv, VWV(0)); + chain_offset = SVAL(req->in.vwv, VWV(1)); + + if (chain_cmd == SMB_CHAIN_NONE) { + /* end of chain */ + SSVAL(req->out.vwv, VWV(0), SMB_CHAIN_NONE); + SSVAL(req->out.vwv, VWV(1), 0); + req_send_reply(req); + return; + } + + if (chain_offset + req->in.hdr >= req->in.buffer + req->in.size) { + goto error; + } + + wct = CVAL(req->in.hdr, chain_offset); + vwv = req->in.hdr + chain_offset + 1; + + if (vwv + VWV(wct) + 2 > req->in.buffer + req->in.size) { + goto error; + } + + data_size = SVAL(vwv, VWV(wct)); + data = vwv + VWV(wct) + 2; + + if (data + data_size > req->in.buffer + req->in.size) { + goto error; + } + + /* all seems legit */ + req->in.vwv = vwv; + req->in.wct = wct; + req->in.data = data; + req->in.data_size = data_size; + req->in.ptr = data; + + req->chain_count++; + + SSVAL(req->out.vwv, VWV(0), chain_cmd); + SSVAL(req->out.vwv, VWV(1), req->out.size - NBT_HDR_SIZE); + + /* the current request in the chain might have used an async reply, + but that doesn't mean the next element needs to */ + ZERO_STRUCT(req->async); + req->control_flags &= ~REQ_CONTROL_ASYNC; + + switch_message(chain_cmd, req); + return; + +error: + SSVAL(req->out.vwv, VWV(0), SMB_CHAIN_NONE); + SSVAL(req->out.vwv, VWV(1), 0); + req_reply_dos_error(req, ERRSRV, ERRerror); +} + + +/* + close the socket and shutdown a server_context +*/ +void server_terminate(struct server_context *smb) +{ + close(smb->socket.fd); + event_remove_fd_all(smb->events, smb->socket.fd); + + conn_close_all(smb); + + talloc_destroy(smb->mem_ctx); +} + + +/* + called when a SMB socket becomes readable +*/ +void smbd_read_handler(struct event_context *ev, struct fd_event *fde, + time_t t, uint16 flags) +{ + struct request_context *req; + struct server_context *smb = fde->private; + + req = receive_smb_request(smb); + if (!req) { + smb->model_ops->terminate_connection(smb, "receive error"); + return; + } + + construct_reply(req); + + /* free up temporary memory */ + lp_talloc_free(); +} + + +/* + process a message from an SMB socket while still processing a + previous message this is used by backends who need to ensure that + new messages from clients are still processed while they are + performing long operations +*/ +void smbd_process_async(struct server_context *smb) +{ + struct request_context *req; + + req = receive_smb_request(smb); + if (!req) { + smb->model_ops->terminate_connection(smb, "receive error"); + return; + } + + construct_reply(req); +} + + +/* + initialise a server_context from a open socket and register a event handler + for reading from that socket +*/ +void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int fd, + void (*read_handler)(struct event_context *, struct fd_event *, time_t, uint16)) +{ + struct server_context *smb; + TALLOC_CTX *mem_ctx; + struct fd_event fde; + char *socket_addr; + + set_socket_options(fd,"SO_KEEPALIVE"); + set_socket_options(fd, lp_socket_options()); + + mem_ctx = talloc_init("server_context"); + + smb = (struct server_context *)talloc(mem_ctx, sizeof(*smb)); + if (!smb) return; + + ZERO_STRUCTP(smb); + + smb->mem_ctx = mem_ctx; + smb->socket.fd = fd; + smb->pid = getpid(); + + sub_set_context(&smb->substitute); + + /* set an initial client name based on its IP address. This will be replaced with + the netbios name later if it gives us one */ + socket_addr = get_socket_addr(smb->mem_ctx, fd); + sub_set_remote_machine(socket_addr); + smb->socket.client_addr = socket_addr; + + /* now initialise a few default values associated with this smb socket */ + smb->negotiate.max_send = 0xFFFF; + + /* this is the size that w2k uses, and it appears to be important for + good performance */ + smb->negotiate.max_recv = 4356; + + smb->users.next_vuid = VUID_OFFSET; + + smb->events = ev; + smb->model_ops = model_ops; + + conn_init(smb); + + /* setup a event handler for this socket. We are initially + only interested in reading from the socket */ + fde.fd = fd; + fde.handler = read_handler; + fde.private = smb; + fde.flags = EVENT_FD_READ; + + event_add_fd(ev, &fde); + + /* setup the DCERPC server subsystem */ + dcesrv_init_context(&smb->dcesrv); +} -- cgit From 0340fec0c1a01339d459c9505614d69ac6a62e9b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 23 Mar 2004 03:17:38 +0000 Subject: put the "max xmit" option back into Samba4 (This used to be commit 82e50a1ce8904c72c90b1e771f232acaad2c835e) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index b8e1e032e2..8769a6f3f1 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -746,7 +746,7 @@ void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int /* this is the size that w2k uses, and it appears to be important for good performance */ - smb->negotiate.max_recv = 4356; + smb->negotiate.max_recv = lp_max_xmit(); smb->users.next_vuid = VUID_OFFSET; -- cgit From f169d83a8b707d6d480c456bf4e4ca7c85dadbae Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 25 Mar 2004 02:41:19 +0000 Subject: fixed the handling of level II oplocks in samba4, especially when acting as a cifs redirectory (using the cifs backend) (This used to be commit 06a8100e6a2f3f079af5b6ec32d87d1d25f56c3c) --- source4/smb_server/smb_server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 8769a6f3f1..f798accc3f 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -44,7 +44,8 @@ BOOL req_send_oplock_break(struct tcon_context *conn, uint16 fnum, uint8 level) SSVAL(req->out.vwv, VWV(0), SMB_CHAIN_NONE); SSVAL(req->out.vwv, VWV(1), 0); SSVAL(req->out.vwv, VWV(2), fnum); - SSVAL(req->out.vwv, VWV(3), level); + SCVAL(req->out.vwv, VWV(3), LOCKING_ANDX_OPLOCK_RELEASE); + SCVAL(req->out.vwv, VWV(3)+1, level); SIVAL(req->out.vwv, VWV(4), 0); SSVAL(req->out.vwv, VWV(6), 0); SSVAL(req->out.vwv, VWV(7), 0); -- cgit From ac193579e7db00c7a2ea0aadaaf0d34c10dcf1a5 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 10 Apr 2004 20:18:22 +0000 Subject: r152: a quick airport commit .... added ldbedit, a _really_ useful command added ldbadd, ldbdel, ldbsearch and ldbmodify to build solved lots of timezone issues, we now pass the torture tests with client and server in different zones fixed several build issues I know this breaks the no-LDAP build. Wait till I arrive in San Jose for that fix. (This used to be commit af34710d4da1841653624fe304b1c8d812c0fdd9) --- source4/smb_server/smb_server.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index f798accc3f..84209d8670 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -749,6 +749,8 @@ void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int good performance */ smb->negotiate.max_recv = lp_max_xmit(); + smb->negotiate.zone_offset = get_time_zone(time(NULL)); + smb->users.next_vuid = VUID_OFFSET; smb->events = ev; -- cgit From 7e921fb96d9310e649a7d73972a0a87af8cb1233 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 7 May 2004 11:56:13 +0000 Subject: r549: added support for DOS error codes in NTSTATUS returns. This uses a range of NTSTATUS codes that are normally invalid to prevent conflicts with real error codes. use the new DOS facility to fix the ERRbaduid return that volker found (This used to be commit 10fdfb52398857b604fff9684ee65a96d970bdaa) --- source4/smb_server/smb_server.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 84209d8670..aceae08ad8 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -480,6 +480,14 @@ static void switch_message(int type, struct request_context *req) return; } + /* see if the vuid is valid */ + if ((flags & AS_USER) && !req->user_ctx->vuser) { + if (!(flags & AS_GUEST)) { + req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRbaduid)); + return; + } + } + /* does this protocol need to be run as the connected user? */ #if HACK_REWRITE if ((flags & AS_USER) && !change_to_user(req->conn,session_tag)) { -- cgit From c5e11daa8bb00665efabbf7939062e7e60112ced Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 22 May 2004 11:16:21 +0000 Subject: r818: added server side SMB signing to Samba4 (This used to be commit 8e5ddf5e8eb74f667897f90baa2d00f02ca5818b) --- source4/smb_server/smb_server.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index aceae08ad8..ce50df04c3 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -558,7 +558,6 @@ static void construct_reply(struct request_context *req) return; } - /* Make sure this is an SMB packet */ if (memcmp(req->in.hdr,"\377SMB",4) != 0) { DEBUG(2,("Non-SMB packet of length %d. Terminating connection\n", @@ -584,6 +583,11 @@ static void construct_reply(struct request_context *req) req->flags = CVAL(req->in.hdr, HDR_FLG); req->flags2 = SVAL(req->in.hdr, HDR_FLG2); + if (!req_signing_check_incoming(req)) { + req_reply_error(req, NT_STATUS_ACCESS_DENIED); + return; + } + switch_message(type, req); } @@ -733,7 +737,7 @@ void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int mem_ctx = talloc_init("server_context"); - smb = (struct server_context *)talloc(mem_ctx, sizeof(*smb)); + smb = talloc_p(mem_ctx, struct server_context); if (!smb) return; ZERO_STRUCTP(smb); -- cgit From f88bf54c7f6d1c2ef833047eb8327953c304b5ff Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 25 May 2004 17:24:24 +0000 Subject: r889: convert samba4 to use [u]int16_t instead of [u]int16 metze (This used to be commit af6f1f8a01bebbecd99bc8c066519e89966e65e3) --- source4/smb_server/smb_server.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index ce50df04c3..9d971383b5 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -25,7 +25,7 @@ /* send an oplock break request to a client */ -BOOL req_send_oplock_break(struct tcon_context *conn, uint16 fnum, uint8 level) +BOOL req_send_oplock_break(struct tcon_context *conn, uint16_t fnum, uint8 level) { struct request_context *req; @@ -436,7 +436,7 @@ onto the message queue static void switch_message(int type, struct request_context *req) { int flags; - uint16 session_tag; + uint16_t session_tag; struct server_context *smb = req->smb; type &= 0xff; @@ -598,10 +598,10 @@ static void construct_reply(struct request_context *req) */ void chain_reply(struct request_context *req) { - uint16 chain_cmd, chain_offset; + uint16_t chain_cmd, chain_offset; char *vwv, *data; - uint16 wct; - uint16 data_size; + uint16_t wct; + uint16_t data_size; if (req->in.wct < 2 || req->out.wct < 2) { req_reply_dos_error(req, ERRSRV, ERRerror); @@ -682,7 +682,7 @@ void server_terminate(struct server_context *smb) called when a SMB socket becomes readable */ void smbd_read_handler(struct event_context *ev, struct fd_event *fde, - time_t t, uint16 flags) + time_t t, uint16_t flags) { struct request_context *req; struct server_context *smb = fde->private; @@ -725,7 +725,7 @@ void smbd_process_async(struct server_context *smb) for reading from that socket */ void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int fd, - void (*read_handler)(struct event_context *, struct fd_event *, time_t, uint16)) + void (*read_handler)(struct event_context *, struct fd_event *, time_t, uint16_t)) { struct server_context *smb; TALLOC_CTX *mem_ctx; -- cgit From fcd718c7d8a6850ae8719f23ed044b06b57501cd Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 25 May 2004 17:50:17 +0000 Subject: r890: convert samba4 to use [u]int8_t instead of [u]int8 metze (This used to be commit 2986c5f08c8f0c26a2ea7b6ce20aae025183109f) --- source4/smb_server/smb_server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 9d971383b5..5eded2b85b 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -25,7 +25,7 @@ /* send an oplock break request to a client */ -BOOL req_send_oplock_break(struct tcon_context *conn, uint16_t fnum, uint8 level) +BOOL req_send_oplock_break(struct tcon_context *conn, uint16_t fnum, uint8_t level) { struct request_context *req; @@ -415,7 +415,7 @@ static const struct smb_message_struct /**************************************************************************** return a string containing the function name of a SMB command ****************************************************************************/ -static const char *smb_fn_name(uint8 type) +static const char *smb_fn_name(uint8_t type) { const char *unknown_name = "SMBunknown"; @@ -550,7 +550,7 @@ static void switch_message(int type, struct request_context *req) ****************************************************************************/ static void construct_reply(struct request_context *req) { - uint8 type = CVAL(req->in.hdr,HDR_COM); + uint8_t type = CVAL(req->in.hdr,HDR_COM); /* see if its a special NBT packet */ if (CVAL(req->in.buffer,0) != 0) { -- cgit From f89a67e3452b0613f659c4ba26c6ed79843c33de Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 23 Jun 2004 23:44:50 +0000 Subject: r1233: -move smb related code to smb_server/* -move process_model code to smbd/process_model.c -remove some used code metze (This used to be commit 10dd8487290a2876253ce69033e374d23b42e704) --- source4/smb_server/smb_server.c | 98 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 98 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 5eded2b85b..e2ce4182a1 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -677,6 +677,104 @@ void server_terminate(struct server_context *smb) talloc_destroy(smb->mem_ctx); } +/* + called on a fatal error that should cause this server to terminate +*/ +void exit_server(struct server_context *smb, const char *reason) +{ + smb->model_ops->terminate_connection(smb, reason); +} + +/* + setup a single listener of any type + */ +static void setup_listen(struct event_context *events, + const struct model_ops *model_ops, + void (*accept_handler)(struct event_context *,struct fd_event *,time_t,uint16_t), + struct in_addr *ifip, uint_t port) +{ + struct fd_event fde; + fde.fd = open_socket_in(SOCK_STREAM, port, 0, ifip->s_addr, True); + if (fde.fd == -1) { + DEBUG(0,("Failed to open socket on %s:%u - %s\n", + inet_ntoa(*ifip), port, strerror(errno))); + return; + } + + /* ready to listen */ + set_socket_options(fde.fd, "SO_KEEPALIVE"); + set_socket_options(fde.fd, lp_socket_options()); + + if (listen(fde.fd, SMBD_LISTEN_BACKLOG) == -1) { + DEBUG(0,("Failed to listen on %s:%d - %s\n", + inet_ntoa(*ifip), port, strerror(errno))); + close(fde.fd); + return; + } + + /* we are only interested in read events on the listen socket */ + fde.flags = EVENT_FD_READ; + fde.private = model_ops; + fde.handler = accept_handler; + + event_add_fd(events, &fde); +} + +/* + add a socket address to the list of events, one event per port +*/ +static void add_socket(struct event_context *events, + const struct model_ops *model_ops, + struct in_addr *ifip) +{ + char *ptr, *tok; + const char *delim = ", "; + + for (tok=strtok_r(lp_smb_ports(), delim, &ptr); + tok; + tok=strtok_r(NULL, delim, &ptr)) { + uint_t port = atoi(tok); + if (port == 0) continue; + setup_listen(events, model_ops, model_ops->accept_connection, ifip, port); + } +} + +/**************************************************************************** + Open the socket communication. +****************************************************************************/ +void open_sockets_smbd(struct event_context *events, + const struct model_ops *model_ops) +{ + if (lp_interfaces() && lp_bind_interfaces_only()) { + int num_interfaces = iface_count(); + int i; + + /* We have been given an interfaces line, and been + told to only bind to those interfaces. Create a + socket per interface and bind to only these. + */ + for(i = 0; i < num_interfaces; i++) { + struct in_addr *ifip = iface_n_ip(i); + + if (ifip == NULL) { + DEBUG(0,("open_sockets_smbd: interface %d has NULL IP address !\n", i)); + continue; + } + + add_socket(events, model_ops, ifip); + } + } else { + TALLOC_CTX *mem_ctx = talloc_init("open_sockets_smbd"); + + struct in_addr *ifip = interpret_addr2(mem_ctx, lp_socket_address()); + /* Just bind to lp_socket_address() (usually 0.0.0.0) */ + if (!mem_ctx) { + smb_panic("No memory"); + } + add_socket(events, model_ops, ifip); + talloc_destroy(mem_ctx); + } +} /* called when a SMB socket becomes readable -- cgit From d4ae6ae74d712b74800e360590052d318d2fd101 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 28 Jun 2004 07:41:15 +0000 Subject: r1277: rename struct server_context to smbsrv_ontext because I need server_context fot the generic server infastructure metze (This used to be commit 0712f9f30797e65362c99423c0cf158a2f539000) --- source4/smb_server/smb_server.c | 88 ++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index e2ce4182a1..a89007d68d 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -29,7 +29,7 @@ BOOL req_send_oplock_break(struct tcon_context *conn, uint16_t fnum, uint8_t lev { struct request_context *req; - req = init_smb_request(conn->smb); + req = init_smb_request(conn->smb_ctx); req_setup_reply(req, 8, 0); @@ -57,20 +57,20 @@ BOOL req_send_oplock_break(struct tcon_context *conn, uint16_t fnum, uint8_t lev /**************************************************************************** receive a SMB request from the wire, forming a request_context from the result ****************************************************************************/ -static struct request_context *receive_smb_request(struct server_context *smb) +static struct request_context *receive_smb_request(struct smbsrv_context *smb_ctx) { ssize_t len, len2; char header[4]; struct request_context *req; - len = read_data(smb->socket.fd, header, 4); + len = read_data(smb_ctx->socket.fd, header, 4); if (len != 4) { return NULL; } len = smb_len(header); - req = init_smb_request(smb); + req = init_smb_request(smb_ctx); GetTimeOfDay(&req->request_time); req->chained_fnum = -1; @@ -81,7 +81,7 @@ static struct request_context *receive_smb_request(struct server_context *smb) /* fill in the already received header */ memcpy(req->in.buffer, header, 4); - len2 = read_data(smb->socket.fd, req->in.buffer + NBT_HDR_SIZE, len); + len2 = read_data(smb_ctx->socket.fd, req->in.buffer + NBT_HDR_SIZE, len); if (len2 != len) { return NULL; } @@ -122,7 +122,7 @@ static void setup_user_context(struct request_context *req) ctx = talloc(req->mem_ctx, sizeof(*ctx)); ctx->vuid = SVAL(req->in.hdr, HDR_UID); - ctx->vuser = get_valid_user_struct(req->smb, ctx->vuid); + ctx->vuser = get_valid_user_struct(req->smb_ctx, ctx->vuid); req->user_ctx = ctx; } @@ -437,7 +437,7 @@ static void switch_message(int type, struct request_context *req) { int flags; uint16_t session_tag; - struct server_context *smb = req->smb; + struct smbsrv_context *smb_ctx = req->smb_ctx; type &= 0xff; @@ -456,7 +456,7 @@ static void switch_message(int type, struct request_context *req) UID_FIELD_INVALID : SVAL(req->in.hdr,HDR_UID); - req->conn = conn_find(req->smb, SVAL(req->in.hdr,HDR_TID)); + req->conn = conn_find(smb_ctx, SVAL(req->in.hdr,HDR_TID)); /* setup the user context for this request */ setup_user_context(req); @@ -467,7 +467,7 @@ static void switch_message(int type, struct request_context *req) if (req->user_ctx) { req->user_ctx->vuid = session_tag; } - DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), smb->model_ops->get_id(req))); + DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), smb_ctx->model_ops->get_id(req))); /* does this protocol need to be run as root? */ if (!(flags & AS_USER)) { @@ -562,19 +562,19 @@ static void construct_reply(struct request_context *req) if (memcmp(req->in.hdr,"\377SMB",4) != 0) { DEBUG(2,("Non-SMB packet of length %d. Terminating connection\n", req->in.size)); - exit_server(req->smb, "Non-SMB packet"); + exit_server(req->smb_ctx, "Non-SMB packet"); return; } if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct > req->in.size) { DEBUG(2,("Invalid SMB word count %d\n", req->in.wct)); - exit_server(req->smb, "Invalid SMB packet"); + exit_server(req->smb_ctx, "Invalid SMB packet"); return; } if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct + req->in.data_size > req->in.size) { DEBUG(2,("Invalid SMB buffer length count %d\n", req->in.data_size)); - exit_server(req->smb, "Invalid SMB packet"); + exit_server(req->smb_ctx, "Invalid SMB packet"); return; } @@ -667,22 +667,22 @@ error: /* close the socket and shutdown a server_context */ -void server_terminate(struct server_context *smb) +void server_terminate(struct smbsrv_context *smb_ctx) { - close(smb->socket.fd); - event_remove_fd_all(smb->events, smb->socket.fd); + close(smb_ctx->socket.fd); + event_remove_fd_all(smb_ctx->events, smb_ctx->socket.fd); - conn_close_all(smb); + conn_close_all(smb_ctx); - talloc_destroy(smb->mem_ctx); + talloc_destroy(smb_ctx->mem_ctx); } /* called on a fatal error that should cause this server to terminate */ -void exit_server(struct server_context *smb, const char *reason) +void exit_server(struct smbsrv_context *smb_ctx, const char *reason) { - smb->model_ops->terminate_connection(smb, reason); + smb_ctx->model_ops->terminate_connection(smb_ctx, reason); } /* @@ -783,11 +783,11 @@ void smbd_read_handler(struct event_context *ev, struct fd_event *fde, time_t t, uint16_t flags) { struct request_context *req; - struct server_context *smb = fde->private; + struct smbsrv_context *smb_ctx = fde->private; - req = receive_smb_request(smb); + req = receive_smb_request(smb_ctx); if (!req) { - smb->model_ops->terminate_connection(smb, "receive error"); + smb_ctx->model_ops->terminate_connection(smb_ctx, "receive error"); return; } @@ -804,13 +804,13 @@ void smbd_read_handler(struct event_context *ev, struct fd_event *fde, new messages from clients are still processed while they are performing long operations */ -void smbd_process_async(struct server_context *smb) +void smbd_process_async(struct smbsrv_context *smb_ctx) { struct request_context *req; - req = receive_smb_request(smb); + req = receive_smb_request(smb_ctx); if (!req) { - smb->model_ops->terminate_connection(smb, "receive error"); + smb_ctx->model_ops->terminate_connection(smb_ctx, "receive error"); return; } @@ -825,7 +825,7 @@ void smbd_process_async(struct server_context *smb) void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int fd, void (*read_handler)(struct event_context *, struct fd_event *, time_t, uint16_t)) { - struct server_context *smb; + struct smbsrv_context *smb_ctx; TALLOC_CTX *mem_ctx; struct fd_event fde; char *socket_addr; @@ -835,48 +835,48 @@ void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int mem_ctx = talloc_init("server_context"); - smb = talloc_p(mem_ctx, struct server_context); - if (!smb) return; + smb_ctx = talloc_p(mem_ctx, struct smbsrv_context); + if (!smb_ctx) return; - ZERO_STRUCTP(smb); + ZERO_STRUCTP(smb_ctx); - smb->mem_ctx = mem_ctx; - smb->socket.fd = fd; - smb->pid = getpid(); + smb_ctx->mem_ctx = mem_ctx; + smb_ctx->socket.fd = fd; + smb_ctx->pid = getpid(); - sub_set_context(&smb->substitute); + sub_set_context(&smb_ctx->substitute); /* set an initial client name based on its IP address. This will be replaced with the netbios name later if it gives us one */ - socket_addr = get_socket_addr(smb->mem_ctx, fd); + socket_addr = get_socket_addr(smb_ctx->mem_ctx, fd); sub_set_remote_machine(socket_addr); - smb->socket.client_addr = socket_addr; + smb_ctx->socket.client_addr = socket_addr; /* now initialise a few default values associated with this smb socket */ - smb->negotiate.max_send = 0xFFFF; + smb_ctx->negotiate.max_send = 0xFFFF; /* this is the size that w2k uses, and it appears to be important for good performance */ - smb->negotiate.max_recv = lp_max_xmit(); + smb_ctx->negotiate.max_recv = lp_max_xmit(); - smb->negotiate.zone_offset = get_time_zone(time(NULL)); + smb_ctx->negotiate.zone_offset = get_time_zone(time(NULL)); - smb->users.next_vuid = VUID_OFFSET; + smb_ctx->users.next_vuid = VUID_OFFSET; - smb->events = ev; - smb->model_ops = model_ops; + smb_ctx->events = ev; + smb_ctx->model_ops = model_ops; - conn_init(smb); + conn_init(smb_ctx); /* setup a event handler for this socket. We are initially only interested in reading from the socket */ fde.fd = fd; fde.handler = read_handler; - fde.private = smb; + fde.private = smb_ctx; fde.flags = EVENT_FD_READ; event_add_fd(ev, &fde); /* setup the DCERPC server subsystem */ - dcesrv_init_context(&smb->dcesrv); + dcesrv_init_context(&smb_ctx->dcesrv); } -- cgit From 0aba9a2e3fc222625f31cc6fd12f1c7c7021c660 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 28 Jun 2004 07:54:32 +0000 Subject: r1278: rename struct user_context to smbsrv_user metze (This used to be commit a9ba29e00fc818e798079c42888da3f20f3d1634) --- source4/smb_server/smb_server.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index a89007d68d..823757ff3b 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -118,13 +118,13 @@ static struct request_context *receive_smb_request(struct smbsrv_context *smb_ct */ static void setup_user_context(struct request_context *req) { - struct user_context *ctx; + struct smbsrv_user *user_ctx; - ctx = talloc(req->mem_ctx, sizeof(*ctx)); - ctx->vuid = SVAL(req->in.hdr, HDR_UID); - ctx->vuser = get_valid_user_struct(req->smb_ctx, ctx->vuid); + user_ctx = talloc(req->mem_ctx, sizeof(*user_ctx)); + user_ctx->vuid = SVAL(req->in.hdr, HDR_UID); + user_ctx->vuser = get_valid_user_struct(req->smb_ctx, user_ctx->vuid); - req->user_ctx = ctx; + req->user_ctx = user_ctx; } -- cgit From 4ddb2d347d86818a13d71d0eb2f0f8983c2cc41f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 28 Jun 2004 08:27:36 +0000 Subject: r1279: rename struct tcon_context to smbsrv_tcon metze (This used to be commit 99473fab4b1ff87a795f3c08f4c521d9beb504c0) --- source4/smb_server/smb_server.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 823757ff3b..6fdfdb6097 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -25,16 +25,16 @@ /* send an oplock break request to a client */ -BOOL req_send_oplock_break(struct tcon_context *conn, uint16_t fnum, uint8_t level) +BOOL req_send_oplock_break(struct smbsrv_tcon *tcon, uint16_t fnum, uint8_t level) { struct request_context *req; - req = init_smb_request(conn->smb_ctx); + req = init_smb_request(tcon->smb_ctx); req_setup_reply(req, 8, 0); SCVAL(req->out.hdr,HDR_COM,SMBlockingX); - SSVAL(req->out.hdr,HDR_TID,conn->cnum); + SSVAL(req->out.hdr,HDR_TID,tcon->cnum); SSVAL(req->out.hdr,HDR_PID,0xFFFF); SSVAL(req->out.hdr,HDR_UID,0); SSVAL(req->out.hdr,HDR_MID,0xFFFF); @@ -456,7 +456,7 @@ static void switch_message(int type, struct request_context *req) UID_FIELD_INVALID : SVAL(req->in.hdr,HDR_UID); - req->conn = conn_find(smb_ctx, SVAL(req->in.hdr,HDR_TID)); + req->tcon = conn_find(smb_ctx, SVAL(req->in.hdr,HDR_TID)); /* setup the user context for this request */ setup_user_context(req); @@ -475,7 +475,7 @@ static void switch_message(int type, struct request_context *req) } /* does this protocol need a valid tree connection? */ - if ((flags & AS_USER) && !req->conn) { + if ((flags & AS_USER) && !req->tcon) { req_reply_error(req, NT_STATUS_NETWORK_NAME_DELETED); return; } @@ -490,7 +490,7 @@ static void switch_message(int type, struct request_context *req) /* does this protocol need to be run as the connected user? */ #if HACK_REWRITE - if ((flags & AS_USER) && !change_to_user(req->conn,session_tag)) { + if ((flags & AS_USER) && !change_to_user(req->tcon,session_tag)) { if (!(flags & AS_GUEST)) { req_reply_error(req, NT_STATUS_ACCESS_DENIED); return; @@ -509,19 +509,19 @@ static void switch_message(int type, struct request_context *req) } /* does it need write permission? */ - if ((flags & NEED_WRITE) && !CAN_WRITE(req->conn)) { + if ((flags & NEED_WRITE) && !CAN_WRITE(req->tcon)) { req_reply_error(req, NT_STATUS_ACCESS_DENIED); return; } /* ipc services are limited */ - if (req->conn && req->conn->type == NTVFS_IPC && (flags & AS_USER) && !(flags & CAN_IPC)) { + if (req->tcon && req->tcon->type == NTVFS_IPC && (flags & AS_USER) && !(flags & CAN_IPC)) { req_reply_error(req, NT_STATUS_ACCESS_DENIED); return; } /* load service specific parameters */ - if (req->conn && !set_current_service(req->conn,(flags & AS_USER)?True:False)) { + if (req->tcon && !set_current_service(req->tcon,(flags & AS_USER)?True:False)) { req_reply_error(req, NT_STATUS_ACCESS_DENIED); return; } -- cgit From 8bf537d119be3e1823ad41b8b8af0d163251b1c5 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 28 Jun 2004 08:39:00 +0000 Subject: r1280: rename struct request_context to smbsrv_request metze (This used to be commit a85d2db5826a84b812ea5162a11f54edd25f74e3) --- source4/smb_server/smb_server.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 6fdfdb6097..b32cf5b7af 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -27,7 +27,7 @@ */ BOOL req_send_oplock_break(struct smbsrv_tcon *tcon, uint16_t fnum, uint8_t level) { - struct request_context *req; + struct smbsrv_request *req; req = init_smb_request(tcon->smb_ctx); @@ -57,11 +57,11 @@ BOOL req_send_oplock_break(struct smbsrv_tcon *tcon, uint16_t fnum, uint8_t leve /**************************************************************************** receive a SMB request from the wire, forming a request_context from the result ****************************************************************************/ -static struct request_context *receive_smb_request(struct smbsrv_context *smb_ctx) +static struct smbsrv_request *receive_smb_request(struct smbsrv_context *smb_ctx) { ssize_t len, len2; char header[4]; - struct request_context *req; + struct smbsrv_request *req; len = read_data(smb_ctx->socket.fd, header, 4); if (len != 4) { @@ -116,7 +116,7 @@ static struct request_context *receive_smb_request(struct smbsrv_context *smb_ct /* setup the user_ctx element of a request */ -static void setup_user_context(struct request_context *req) +static void setup_user_context(struct smbsrv_request *req) { struct smbsrv_user *user_ctx; @@ -150,7 +150,7 @@ force write permissions on print services. static const struct smb_message_struct { const char *name; - void (*fn)(struct request_context *); + void (*fn)(struct smbsrv_request *); int flags; } smb_messages[256] = { @@ -433,7 +433,7 @@ for sending the reply themselves, rather than returning a size to this function The reply functions may also choose to delay the processing by pushing the message onto the message queue ****************************************************************************/ -static void switch_message(int type, struct request_context *req) +static void switch_message(int type, struct smbsrv_request *req) { int flags; uint16_t session_tag; @@ -548,7 +548,7 @@ static void switch_message(int type, struct request_context *req) /**************************************************************************** Construct a reply to the incoming packet. ****************************************************************************/ -static void construct_reply(struct request_context *req) +static void construct_reply(struct smbsrv_request *req) { uint8_t type = CVAL(req->in.hdr,HDR_COM); @@ -596,7 +596,7 @@ static void construct_reply(struct request_context *req) we call this when first first part of a possibly chained request has been completed and we need to call the 2nd part, if any */ -void chain_reply(struct request_context *req) +void chain_reply(struct smbsrv_request *req) { uint16_t chain_cmd, chain_offset; char *vwv, *data; @@ -782,7 +782,7 @@ void open_sockets_smbd(struct event_context *events, void smbd_read_handler(struct event_context *ev, struct fd_event *fde, time_t t, uint16_t flags) { - struct request_context *req; + struct smbsrv_request *req; struct smbsrv_context *smb_ctx = fde->private; req = receive_smb_request(smb_ctx); @@ -806,7 +806,7 @@ void smbd_read_handler(struct event_context *ev, struct fd_event *fde, */ void smbd_process_async(struct smbsrv_context *smb_ctx) { - struct request_context *req; + struct smbsrv_request *req; req = receive_smb_request(smb_ctx); if (!req) { -- cgit From 118f3edd27f5adacc1da636ed05b33f04999584f Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 29 Jun 2004 07:40:14 +0000 Subject: r1291: rename struct smbsrv_context to smbsrv_connection because this is the connection state per transport layer (tcp) connection I also moved the substructs directly into smbsrv_connection, because they don't need a struct name and we should allway pass the complete smbsrv_connection struct into functions metze (This used to be commit 60f823f201fcedf5473008e8453a6351e73a92c7) --- source4/smb_server/smb_server.c | 88 ++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 44 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index b32cf5b7af..16d1d774c0 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -29,7 +29,7 @@ BOOL req_send_oplock_break(struct smbsrv_tcon *tcon, uint16_t fnum, uint8_t leve { struct smbsrv_request *req; - req = init_smb_request(tcon->smb_ctx); + req = init_smb_request(tcon->smb_conn); req_setup_reply(req, 8, 0); @@ -57,20 +57,20 @@ BOOL req_send_oplock_break(struct smbsrv_tcon *tcon, uint16_t fnum, uint8_t leve /**************************************************************************** receive a SMB request from the wire, forming a request_context from the result ****************************************************************************/ -static struct smbsrv_request *receive_smb_request(struct smbsrv_context *smb_ctx) +static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_conn) { ssize_t len, len2; char header[4]; struct smbsrv_request *req; - len = read_data(smb_ctx->socket.fd, header, 4); + len = read_data(smb_conn->socket.fd, header, 4); if (len != 4) { return NULL; } len = smb_len(header); - req = init_smb_request(smb_ctx); + req = init_smb_request(smb_conn); GetTimeOfDay(&req->request_time); req->chained_fnum = -1; @@ -81,7 +81,7 @@ static struct smbsrv_request *receive_smb_request(struct smbsrv_context *smb_ctx /* fill in the already received header */ memcpy(req->in.buffer, header, 4); - len2 = read_data(smb_ctx->socket.fd, req->in.buffer + NBT_HDR_SIZE, len); + len2 = read_data(smb_conn->socket.fd, req->in.buffer + NBT_HDR_SIZE, len); if (len2 != len) { return NULL; } @@ -122,7 +122,7 @@ static void setup_user_context(struct smbsrv_request *req) user_ctx = talloc(req->mem_ctx, sizeof(*user_ctx)); user_ctx->vuid = SVAL(req->in.hdr, HDR_UID); - user_ctx->vuser = get_valid_user_struct(req->smb_ctx, user_ctx->vuid); + user_ctx->vuser = get_valid_user_struct(req->smb_conn, user_ctx->vuid); req->user_ctx = user_ctx; } @@ -437,7 +437,7 @@ static void switch_message(int type, struct smbsrv_request *req) { int flags; uint16_t session_tag; - struct smbsrv_context *smb_ctx = req->smb_ctx; + struct smbsrv_connection *smb_conn = req->smb_conn; type &= 0xff; @@ -456,7 +456,7 @@ static void switch_message(int type, struct smbsrv_request *req) UID_FIELD_INVALID : SVAL(req->in.hdr,HDR_UID); - req->tcon = conn_find(smb_ctx, SVAL(req->in.hdr,HDR_TID)); + req->tcon = conn_find(smb_conn, SVAL(req->in.hdr,HDR_TID)); /* setup the user context for this request */ setup_user_context(req); @@ -467,7 +467,7 @@ static void switch_message(int type, struct smbsrv_request *req) if (req->user_ctx) { req->user_ctx->vuid = session_tag; } - DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), smb_ctx->model_ops->get_id(req))); + DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), smb_conn->model_ops->get_id(req))); /* does this protocol need to be run as root? */ if (!(flags & AS_USER)) { @@ -562,19 +562,19 @@ static void construct_reply(struct smbsrv_request *req) if (memcmp(req->in.hdr,"\377SMB",4) != 0) { DEBUG(2,("Non-SMB packet of length %d. Terminating connection\n", req->in.size)); - exit_server(req->smb_ctx, "Non-SMB packet"); + exit_server(req->smb_conn, "Non-SMB packet"); return; } if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct > req->in.size) { DEBUG(2,("Invalid SMB word count %d\n", req->in.wct)); - exit_server(req->smb_ctx, "Invalid SMB packet"); + exit_server(req->smb_conn, "Invalid SMB packet"); return; } if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct + req->in.data_size > req->in.size) { DEBUG(2,("Invalid SMB buffer length count %d\n", req->in.data_size)); - exit_server(req->smb_ctx, "Invalid SMB packet"); + exit_server(req->smb_conn, "Invalid SMB packet"); return; } @@ -667,22 +667,22 @@ error: /* close the socket and shutdown a server_context */ -void server_terminate(struct smbsrv_context *smb_ctx) +void server_terminate(struct smbsrv_connection *smb_conn) { - close(smb_ctx->socket.fd); - event_remove_fd_all(smb_ctx->events, smb_ctx->socket.fd); + close(smb_conn->socket.fd); + event_remove_fd_all(smb_conn->events, smb_conn->socket.fd); - conn_close_all(smb_ctx); + conn_close_all(smb_conn); - talloc_destroy(smb_ctx->mem_ctx); + talloc_destroy(smb_conn->mem_ctx); } /* called on a fatal error that should cause this server to terminate */ -void exit_server(struct smbsrv_context *smb_ctx, const char *reason) +void exit_server(struct smbsrv_connection *smb_conn, const char *reason) { - smb_ctx->model_ops->terminate_connection(smb_ctx, reason); + smb_conn->model_ops->terminate_connection(smb_conn, reason); } /* @@ -783,11 +783,11 @@ void smbd_read_handler(struct event_context *ev, struct fd_event *fde, time_t t, uint16_t flags) { struct smbsrv_request *req; - struct smbsrv_context *smb_ctx = fde->private; + struct smbsrv_connection *smb_conn = fde->private; - req = receive_smb_request(smb_ctx); + req = receive_smb_request(smb_conn); if (!req) { - smb_ctx->model_ops->terminate_connection(smb_ctx, "receive error"); + smb_conn->model_ops->terminate_connection(smb_conn, "receive error"); return; } @@ -804,13 +804,13 @@ void smbd_read_handler(struct event_context *ev, struct fd_event *fde, new messages from clients are still processed while they are performing long operations */ -void smbd_process_async(struct smbsrv_context *smb_ctx) +void smbd_process_async(struct smbsrv_connection *smb_conn) { struct smbsrv_request *req; - req = receive_smb_request(smb_ctx); + req = receive_smb_request(smb_conn); if (!req) { - smb_ctx->model_ops->terminate_connection(smb_ctx, "receive error"); + smb_conn->model_ops->terminate_connection(smb_conn, "receive error"); return; } @@ -825,7 +825,7 @@ void smbd_process_async(struct smbsrv_context *smb_ctx) void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int fd, void (*read_handler)(struct event_context *, struct fd_event *, time_t, uint16_t)) { - struct smbsrv_context *smb_ctx; + struct smbsrv_connection *smb_conn; TALLOC_CTX *mem_ctx; struct fd_event fde; char *socket_addr; @@ -835,48 +835,48 @@ void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int mem_ctx = talloc_init("server_context"); - smb_ctx = talloc_p(mem_ctx, struct smbsrv_context); - if (!smb_ctx) return; + smb_conn = talloc_p(mem_ctx, struct smbsrv_connection); + if (!smb_conn) return; - ZERO_STRUCTP(smb_ctx); + ZERO_STRUCTP(smb_conn); - smb_ctx->mem_ctx = mem_ctx; - smb_ctx->socket.fd = fd; - smb_ctx->pid = getpid(); + smb_conn->mem_ctx = mem_ctx; + smb_conn->socket.fd = fd; + smb_conn->pid = getpid(); - sub_set_context(&smb_ctx->substitute); + sub_set_context(&smb_conn->substitute); /* set an initial client name based on its IP address. This will be replaced with the netbios name later if it gives us one */ - socket_addr = get_socket_addr(smb_ctx->mem_ctx, fd); + socket_addr = get_socket_addr(smb_conn->mem_ctx, fd); sub_set_remote_machine(socket_addr); - smb_ctx->socket.client_addr = socket_addr; + smb_conn->socket.client_addr = socket_addr; /* now initialise a few default values associated with this smb socket */ - smb_ctx->negotiate.max_send = 0xFFFF; + smb_conn->negotiate.max_send = 0xFFFF; /* this is the size that w2k uses, and it appears to be important for good performance */ - smb_ctx->negotiate.max_recv = lp_max_xmit(); + smb_conn->negotiate.max_recv = lp_max_xmit(); - smb_ctx->negotiate.zone_offset = get_time_zone(time(NULL)); + smb_conn->negotiate.zone_offset = get_time_zone(time(NULL)); - smb_ctx->users.next_vuid = VUID_OFFSET; + smb_conn->users.next_vuid = VUID_OFFSET; - smb_ctx->events = ev; - smb_ctx->model_ops = model_ops; + smb_conn->events = ev; + smb_conn->model_ops = model_ops; - conn_init(smb_ctx); + conn_init(smb_conn); /* setup a event handler for this socket. We are initially only interested in reading from the socket */ fde.fd = fd; fde.handler = read_handler; - fde.private = smb_ctx; + fde.private = smb_conn; fde.flags = EVENT_FD_READ; event_add_fd(ev, &fde); /* setup the DCERPC server subsystem */ - dcesrv_init_context(&smb_ctx->dcesrv); + dcesrv_init_context(&smb_conn->dcesrv); } -- cgit From 45a85bdd353418828df8017a9d7eb7c14f6f0cd3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 13 Jul 2004 21:04:56 +0000 Subject: r1486: commit the start of the generic server infastructure the idea is to have services as modules (smb, dcerpc, swat, ...) the process_model don't know about the service it self anymore. TODO: - the smbsrv should use the smbsrv_send function - the service subsystem init should be done like for other modules - we need to have a generic socket subsystem, which handle stream, datagram, and virtuell other sockets( e.g. for the ntvfs_ipc module to connect to the dcerpc server , or for smb or dcerpc or whatever to connect to a server wide auth service) - and other fixes... NOTE: process model pthread seems to be broken( but also before this patch!) metze (This used to be commit bbe5e00715ca4013ff0dbc345aa97adc6b5c2458) --- source4/smb_server/smb_server.c | 191 +++++++++++++++++++++------------------- 1 file changed, 102 insertions(+), 89 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 16d1d774c0..351d9ddf4e 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -63,7 +63,7 @@ static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_ char header[4]; struct smbsrv_request *req; - len = read_data(smb_conn->socket.fd, header, 4); + len = read_data(smb_conn->connection->socket->fde->fd, header, 4); if (len != 4) { return NULL; } @@ -81,7 +81,7 @@ static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_ /* fill in the already received header */ memcpy(req->in.buffer, header, 4); - len2 = read_data(smb_conn->socket.fd, req->in.buffer + NBT_HDR_SIZE, len); + len2 = read_data(smb_conn->connection->socket->fde->fd, req->in.buffer + NBT_HDR_SIZE, len); if (len2 != len) { return NULL; } @@ -467,7 +467,7 @@ static void switch_message(int type, struct smbsrv_request *req) if (req->user_ctx) { req->user_ctx->vuid = session_tag; } - DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), smb_conn->model_ops->get_id(req))); + DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), smb_conn->connection->service->model_ops->get_id(req))); /* does this protocol need to be run as root? */ if (!(flags & AS_USER)) { @@ -562,19 +562,19 @@ static void construct_reply(struct smbsrv_request *req) if (memcmp(req->in.hdr,"\377SMB",4) != 0) { DEBUG(2,("Non-SMB packet of length %d. Terminating connection\n", req->in.size)); - exit_server(req->smb_conn, "Non-SMB packet"); + smbsrv_terminate_connection(req->smb_conn, "Non-SMB packet"); return; } if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct > req->in.size) { DEBUG(2,("Invalid SMB word count %d\n", req->in.wct)); - exit_server(req->smb_conn, "Invalid SMB packet"); + smbsrv_terminate_connection(req->smb_conn, "Invalid SMB packet"); return; } if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct + req->in.data_size > req->in.size) { DEBUG(2,("Invalid SMB buffer length count %d\n", req->in.data_size)); - exit_server(req->smb_conn, "Invalid SMB packet"); + smbsrv_terminate_connection(req->smb_conn, "Invalid SMB packet"); return; } @@ -667,64 +667,26 @@ error: /* close the socket and shutdown a server_context */ -void server_terminate(struct smbsrv_connection *smb_conn) +void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char *reason) { - close(smb_conn->socket.fd); - event_remove_fd_all(smb_conn->events, smb_conn->socket.fd); - - conn_close_all(smb_conn); - - talloc_destroy(smb_conn->mem_ctx); + server_terminate_connection(smb_conn->connection, reason); } /* called on a fatal error that should cause this server to terminate */ -void exit_server(struct smbsrv_connection *smb_conn, const char *reason) -{ - smb_conn->model_ops->terminate_connection(smb_conn, reason); -} - -/* - setup a single listener of any type - */ -static void setup_listen(struct event_context *events, - const struct model_ops *model_ops, - void (*accept_handler)(struct event_context *,struct fd_event *,time_t,uint16_t), - struct in_addr *ifip, uint_t port) +static void smbsrv_exit(struct server_service *service, const char *reason) { - struct fd_event fde; - fde.fd = open_socket_in(SOCK_STREAM, port, 0, ifip->s_addr, True); - if (fde.fd == -1) { - DEBUG(0,("Failed to open socket on %s:%u - %s\n", - inet_ntoa(*ifip), port, strerror(errno))); - return; - } - - /* ready to listen */ - set_socket_options(fde.fd, "SO_KEEPALIVE"); - set_socket_options(fde.fd, lp_socket_options()); - - if (listen(fde.fd, SMBD_LISTEN_BACKLOG) == -1) { - DEBUG(0,("Failed to listen on %s:%d - %s\n", - inet_ntoa(*ifip), port, strerror(errno))); - close(fde.fd); - return; - } - - /* we are only interested in read events on the listen socket */ - fde.flags = EVENT_FD_READ; - fde.private = model_ops; - fde.handler = accept_handler; - - event_add_fd(events, &fde); + DEBUG(1,("smbsrv_exit\n")); + return; } /* add a socket address to the list of events, one event per port */ -static void add_socket(struct event_context *events, - const struct model_ops *model_ops, +static void add_socket(struct server_service *service, + const struct model_ops *model_ops, + struct socket_context *socket_ctx, struct in_addr *ifip) { char *ptr, *tok; @@ -733,18 +695,19 @@ static void add_socket(struct event_context *events, for (tok=strtok_r(lp_smb_ports(), delim, &ptr); tok; tok=strtok_r(NULL, delim, &ptr)) { - uint_t port = atoi(tok); + uint16_t port = atoi(tok); if (port == 0) continue; - setup_listen(events, model_ops, model_ops->accept_connection, ifip, port); + service_setup_socket(service, model_ops, socket_ctx, ifip, &port); } } /**************************************************************************** Open the socket communication. ****************************************************************************/ -void open_sockets_smbd(struct event_context *events, - const struct model_ops *model_ops) -{ +static void smbsrv_init(struct server_service *service, const struct model_ops *model_ops) +{ + DEBUG(1,("smbsrv_init\n")); + if (lp_interfaces() && lp_bind_interfaces_only()) { int num_interfaces = iface_count(); int i; @@ -761,33 +724,37 @@ void open_sockets_smbd(struct event_context *events, continue; } - add_socket(events, model_ops, ifip); + add_socket(service, model_ops, NULL, ifip); } } else { + struct in_addr *ifip; TALLOC_CTX *mem_ctx = talloc_init("open_sockets_smbd"); - - struct in_addr *ifip = interpret_addr2(mem_ctx, lp_socket_address()); - /* Just bind to lp_socket_address() (usually 0.0.0.0) */ + if (!mem_ctx) { smb_panic("No memory"); - } - add_socket(events, model_ops, ifip); + } + + /* Just bind to lp_socket_address() (usually 0.0.0.0) */ + ifip = interpret_addr2(mem_ctx, lp_socket_address()); + add_socket(service, model_ops, NULL, ifip); + talloc_destroy(mem_ctx); - } + } } /* called when a SMB socket becomes readable */ -void smbd_read_handler(struct event_context *ev, struct fd_event *fde, - time_t t, uint16_t flags) +static void smbsrv_recv(struct server_connection *conn, time_t t, uint16_t flags) { struct smbsrv_request *req; - struct smbsrv_connection *smb_conn = fde->private; - + struct smbsrv_connection *smb_conn = conn->private_data; + + DEBUG(10,("smbsrv_recv\n")); + req = receive_smb_request(smb_conn); if (!req) { - smb_conn->model_ops->terminate_connection(smb_conn, "receive error"); + smbsrv_terminate_connection(smb_conn, "receive error"); return; } @@ -795,8 +762,44 @@ void smbd_read_handler(struct event_context *ev, struct fd_event *fde, /* free up temporary memory */ lp_talloc_free(); + return; +} + +/* + called when a SMB socket becomes writable +*/ +static void smbsrv_send(struct server_connection *conn, time_t t, uint16_t flags) +{ + DEBUG(10,("smbsrv_send\n")); + return; +} + +/* + called when connection is idle +*/ +static void smbsrv_idle(struct server_connection *conn, time_t t) +{ + DEBUG(10,("smbsrv_idle: not implemented!\n")); + conn->event.idle->next_event = t + 5; + + return; } +static void smbsrv_close(struct server_connection *conn, const char *reason) +{ + struct smbsrv_connection *smb_conn = conn->private_data; + + DEBUG(5,("smbsrv_close: %s\n",reason)); + + close(conn->event.fde->fd); + event_remove_fd_all(conn->event.ctx, conn->socket->fde->fd); + event_remove_timed(conn->event.ctx, conn->event.idle); + + conn_close_all(smb_conn); + + talloc_destroy(smb_conn->mem_ctx); + return; +} /* process a message from an SMB socket while still processing a @@ -810,7 +813,7 @@ void smbd_process_async(struct smbsrv_connection *smb_conn) req = receive_smb_request(smb_conn); if (!req) { - smb_conn->model_ops->terminate_connection(smb_conn, "receive error"); + smbsrv_terminate_connection(smb_conn, "receive error"); return; } @@ -822,18 +825,15 @@ void smbd_process_async(struct smbsrv_connection *smb_conn) initialise a server_context from a open socket and register a event handler for reading from that socket */ -void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int fd, - void (*read_handler)(struct event_context *, struct fd_event *, time_t, uint16_t)) +void smbsrv_accept(struct server_connection *conn) { struct smbsrv_connection *smb_conn; TALLOC_CTX *mem_ctx; - struct fd_event fde; char *socket_addr; - set_socket_options(fd,"SO_KEEPALIVE"); - set_socket_options(fd, lp_socket_options()); + DEBUG(5,("smbsrv_accept\n")); - mem_ctx = talloc_init("server_context"); + mem_ctx = talloc_init("smbsrv_context"); smb_conn = talloc_p(mem_ctx, struct smbsrv_connection); if (!smb_conn) return; @@ -841,16 +841,14 @@ void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int ZERO_STRUCTP(smb_conn); smb_conn->mem_ctx = mem_ctx; - smb_conn->socket.fd = fd; smb_conn->pid = getpid(); sub_set_context(&smb_conn->substitute); /* set an initial client name based on its IP address. This will be replaced with the netbios name later if it gives us one */ - socket_addr = get_socket_addr(smb_conn->mem_ctx, fd); + socket_addr = get_socket_addr(smb_conn->mem_ctx, conn->socket->fde->fd); sub_set_remote_machine(socket_addr); - smb_conn->socket.client_addr = socket_addr; /* now initialise a few default values associated with this smb socket */ smb_conn->negotiate.max_send = 0xFFFF; @@ -862,21 +860,36 @@ void init_smbsession(struct event_context *ev, struct model_ops *model_ops, int smb_conn->negotiate.zone_offset = get_time_zone(time(NULL)); smb_conn->users.next_vuid = VUID_OFFSET; - - smb_conn->events = ev; - smb_conn->model_ops = model_ops; conn_init(smb_conn); - /* setup a event handler for this socket. We are initially - only interested in reading from the socket */ - fde.fd = fd; - fde.handler = read_handler; - fde.private = smb_conn; - fde.flags = EVENT_FD_READ; + smb_conn->connection = conn; - event_add_fd(ev, &fde); + conn->private_data = smb_conn; /* setup the DCERPC server subsystem */ dcesrv_init_context(&smb_conn->dcesrv); + + return; +} + +static const struct server_service_ops smb_server_ops = { + .name = "smb", + .service_init = smbsrv_init, + .accept_connection = smbsrv_accept, + .recv_handler = smbsrv_recv, + .send_handler = smbsrv_send, + .idle_handler = smbsrv_idle, + .close_connection = smbsrv_close, + .service_exit = smbsrv_exit, +}; + +const struct server_service_ops *smbsrv_get_ops(void) +{ + return &smb_server_ops; +} + +NTSTATUS server_service_smb_init(void) +{ + return NT_STATUS_OK; } -- cgit From 5779a7da9aecb7329eb47e93000dc8b9de96d9ae Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 14 Jul 2004 12:44:31 +0000 Subject: r1499: combine struct user_struct and struct smbsrv_user to a struct smbsrv_session that the same as cli_session for the client we need a gensec_security pointer there (spnego support will follow) prefix some related functions with smbsrv_ metze (This used to be commit f276378157bb9994c4c91ce46150a510de5c33f8) --- source4/smb_server/smb_server.c | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 351d9ddf4e..94bf6302c1 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -113,21 +113,6 @@ static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_ return req; } -/* - setup the user_ctx element of a request -*/ -static void setup_user_context(struct smbsrv_request *req) -{ - struct smbsrv_user *user_ctx; - - user_ctx = talloc(req->mem_ctx, sizeof(*user_ctx)); - user_ctx->vuid = SVAL(req->in.hdr, HDR_UID); - user_ctx->vuser = get_valid_user_struct(req->smb_conn, user_ctx->vuid); - - req->user_ctx = user_ctx; -} - - /* These flags determine some of the permissions required to do an operation @@ -459,13 +444,13 @@ static void switch_message(int type, struct smbsrv_request *req) req->tcon = conn_find(smb_conn, SVAL(req->in.hdr,HDR_TID)); /* setup the user context for this request */ - setup_user_context(req); + req->session = smbsrv_session_find(req->smb_conn, session_tag); /* Ensure this value is replaced in the incoming packet. */ SSVAL(req->in.hdr,HDR_UID,session_tag); - if (req->user_ctx) { - req->user_ctx->vuid = session_tag; + if (req->session) { + req->session->vuid = session_tag; } DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), smb_conn->connection->service->model_ops->get_id(req))); @@ -481,7 +466,7 @@ static void switch_message(int type, struct smbsrv_request *req) } /* see if the vuid is valid */ - if ((flags & AS_USER) && !req->user_ctx->vuser) { + if ((flags & AS_USER) && !req->session) { if (!(flags & AS_GUEST)) { req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRbaduid)); return; @@ -859,7 +844,7 @@ void smbsrv_accept(struct server_connection *conn) smb_conn->negotiate.zone_offset = get_time_zone(time(NULL)); - smb_conn->users.next_vuid = VUID_OFFSET; + smb_conn->sessions.next_vuid = VUID_OFFSET; conn_init(smb_conn); -- cgit From a02809e28e0becb201350b7edc72418f49ea2a4e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 15 Jul 2004 02:11:03 +0000 Subject: r1507: fixed the handling of SMB chaining with the new server structure. You must think carefully about packet chaining when dealing with any authentication or SMB parsing issues. The particular problem here was that a chained tconX didn't get the req->session setup after an initial sesstion setup call, so the tconx used a bogus VUID. (This used to be commit 6f2a335cd623211071b01d982d4e7c69b49a5602) --- source4/smb_server/smb_server.c | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 94bf6302c1..7d793bdf02 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -421,8 +421,8 @@ onto the message queue static void switch_message(int type, struct smbsrv_request *req) { int flags; - uint16_t session_tag; struct smbsrv_connection *smb_conn = req->smb_conn; + uint16_t session_tag; type &= 0xff; @@ -436,22 +436,28 @@ static void switch_message(int type, struct smbsrv_request *req) flags = smb_messages[type].flags; - /* In share mode security we must ignore the vuid. */ - session_tag = (lp_security() == SEC_SHARE) ? - UID_FIELD_INVALID : - SVAL(req->in.hdr,HDR_UID); - req->tcon = conn_find(smb_conn, SVAL(req->in.hdr,HDR_TID)); - /* setup the user context for this request */ - req->session = smbsrv_session_find(req->smb_conn, session_tag); + if (req->session == NULL) { + /* setup the user context for this request if it + hasn't already been initialised (to cope with SMB + chaining) */ - /* Ensure this value is replaced in the incoming packet. */ - SSVAL(req->in.hdr,HDR_UID,session_tag); + /* In share mode security we must ignore the vuid. */ + if (lp_security() == SEC_SHARE) { + session_tag = UID_FIELD_INVALID; + } else { + session_tag = SVAL(req->in.hdr,HDR_UID); + } - if (req->session) { - req->session->vuid = session_tag; + req->session = smbsrv_session_find(req->smb_conn, session_tag); + if (req->session) { + req->session->vuid = session_tag; + } + } else { + session_tag = req->session->vuid; } + DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), smb_conn->connection->service->model_ops->get_id(req))); /* does this protocol need to be run as root? */ -- cgit From a1748ef743b3d2e2af0880a91f948062d314b5ee Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 15 Jul 2004 08:28:19 +0000 Subject: r1514: close stuff from the server_connection not in the close_connection fn of a specific service metze (This used to be commit 0e1f5e66d37deb7a77ae9f545e60685428fd9d21) --- source4/smb_server/smb_server.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 7d793bdf02..fd9e35074d 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -782,13 +782,10 @@ static void smbsrv_close(struct server_connection *conn, const char *reason) DEBUG(5,("smbsrv_close: %s\n",reason)); - close(conn->event.fde->fd); - event_remove_fd_all(conn->event.ctx, conn->socket->fde->fd); - event_remove_timed(conn->event.ctx, conn->event.idle); - conn_close_all(smb_conn); talloc_destroy(smb_conn->mem_ctx); + return; } -- cgit From 5ddf678e0113f81aa2b5f99134cda4fe8c01afb7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 23 Jul 2004 06:40:49 +0000 Subject: r1578: the first stage of the async client rewrite. Up to now the client code has had an async API, and operated asynchronously at the packet level, but was not truly async in that it assumed that it could always write to the socket and when a partial packet came in that it could block waiting for the rest of the packet. This change makes the SMB client library full async, by adding a separate outgoing packet queue, using non-blocking socket IO and having a input buffer that can fill asynchonously until the full packet has arrived. The main complexity was in dealing with the events structure when using the CIFS proxy backend. In that case the same events structure needs to be used in both the client library and the main smbd server, so that when the client library is waiting for a reply that the main server keeps processing packets. This required some changes in the events library code. Next step is to make the generated rpc client code use these new capabilities. (This used to be commit 96bf4da3edc4d64b0f58ef520269f3b385b8da02) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index fd9e35074d..ca36dc3aa9 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -745,6 +745,7 @@ static void smbsrv_recv(struct server_connection *conn, time_t t, uint16_t flags req = receive_smb_request(smb_conn); if (!req) { + conn->event.fde->flags = 0; smbsrv_terminate_connection(smb_conn, "receive error"); return; } -- cgit From 7b088a8f654f34911928dcdf320ca3cf79592aed Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 13 Aug 2004 00:16:57 +0000 Subject: r1796: Enable server-side SPNEGO, now that I have fixed the server-side SMB signing code to be able to cope. Andrew Bartlett (This used to be commit cb74d52b563730a50e33c92d868c45ee96a598e8) --- source4/smb_server/smb_server.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index ca36dc3aa9..f679a65287 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -850,6 +850,8 @@ void smbsrv_accept(struct server_connection *conn) smb_conn->sessions.next_vuid = VUID_OFFSET; + srv_init_signing(smb_conn); + conn_init(smb_conn); smb_conn->connection = conn; -- cgit From 64082214337e2ab50f0a69ca7f9bcf56762129cc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 14 Aug 2004 05:56:12 +0000 Subject: r1819: changed "smb ports" to be a LIST parameter type in loadparm (its a classic case for a list) (This used to be commit e53d32c65ab0751b3e01f4f699f5d0e1892369ae) --- source4/smb_server/smb_server.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index f679a65287..513011216f 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -681,12 +681,11 @@ static void add_socket(struct server_service *service, struct in_addr *ifip) { char *ptr, *tok; - const char *delim = ", "; + char **ports = lp_smb_ports(); + int i; - for (tok=strtok_r(lp_smb_ports(), delim, &ptr); - tok; - tok=strtok_r(NULL, delim, &ptr)) { - uint16_t port = atoi(tok); + for (i=0;ports[i];i++) { + uint16_t port = atoi(ports[i]); if (port == 0) continue; service_setup_socket(service, model_ops, socket_ctx, ifip, &port); } -- cgit From 38188de793fb49867b0f595a20298ee4cf8e4983 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 23 Aug 2004 08:49:55 +0000 Subject: r1998: fix compiler warning metze (This used to be commit bf06f476dbdfbcb38ccbd8606e622097015c2b3d) --- source4/smb_server/smb_server.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 513011216f..961cd927ec 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -680,8 +680,7 @@ static void add_socket(struct server_service *service, struct socket_context *socket_ctx, struct in_addr *ifip) { - char *ptr, *tok; - char **ports = lp_smb_ports(); + const char **ports = lp_smb_ports(); int i; for (i=0;ports[i];i++) { -- cgit From 8293df91bcec574fb4a2b290cc11dd83353264ae Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 8 Sep 2004 00:00:56 +0000 Subject: r2247: talloc_destroy -> talloc_free (This used to be commit 6c1a72c5d667245b1eec94f58e68acd22dd720ce) --- source4/smb_server/smb_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 961cd927ec..d12915957e 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -727,7 +727,7 @@ static void smbsrv_init(struct server_service *service, const struct model_ops * ifip = interpret_addr2(mem_ctx, lp_socket_address()); add_socket(service, model_ops, NULL, ifip); - talloc_destroy(mem_ctx); + talloc_free(mem_ctx); } } @@ -783,7 +783,7 @@ static void smbsrv_close(struct server_connection *conn, const char *reason) conn_close_all(smb_conn); - talloc_destroy(smb_conn->mem_ctx); + talloc_free(smb_conn->mem_ctx); return; } -- cgit From 893c62d38388b20c52cf3c45069d836c46f42bd3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 8 Sep 2004 05:39:06 +0000 Subject: r2249: got rid of some more mem_ctx elements in structures (This used to be commit 21ef338cbbe96acc8594ffc550ef60c6a40fb951) --- source4/smb_server/smb_server.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index d12915957e..a413a7dd4b 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -76,7 +76,7 @@ static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_ req->chained_fnum = -1; /* allocate the incoming buffer at the right size */ - req->in.buffer = talloc(req->mem_ctx, len + NBT_HDR_SIZE); + req->in.buffer = talloc(req, len + NBT_HDR_SIZE); /* fill in the already received header */ memcpy(req->in.buffer, header, 4); @@ -783,7 +783,7 @@ static void smbsrv_close(struct server_connection *conn, const char *reason) conn_close_all(smb_conn); - talloc_free(smb_conn->mem_ctx); + talloc_free(smb_conn); return; } @@ -822,19 +822,18 @@ void smbsrv_accept(struct server_connection *conn) mem_ctx = talloc_init("smbsrv_context"); - smb_conn = talloc_p(mem_ctx, struct smbsrv_connection); + smb_conn = talloc_p(conn, struct smbsrv_connection); if (!smb_conn) return; ZERO_STRUCTP(smb_conn); - smb_conn->mem_ctx = mem_ctx; smb_conn->pid = getpid(); sub_set_context(&smb_conn->substitute); /* set an initial client name based on its IP address. This will be replaced with the netbios name later if it gives us one */ - socket_addr = get_socket_addr(smb_conn->mem_ctx, conn->socket->fde->fd); + socket_addr = get_socket_addr(smb_conn, conn->socket->fde->fd); sub_set_remote_machine(socket_addr); /* now initialise a few default values associated with this smb socket */ -- cgit From 24f972a071e21cae80a2bd02b15928f9dad486d2 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 8 Sep 2004 07:48:55 +0000 Subject: r2250: removed unnecessary mem_ctx (This used to be commit c455a3a61d587f5126236d8c11ba84e19d4f038a) --- source4/smb_server/smb_server.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index a413a7dd4b..69b0b35346 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -815,13 +815,10 @@ void smbd_process_async(struct smbsrv_connection *smb_conn) void smbsrv_accept(struct server_connection *conn) { struct smbsrv_connection *smb_conn; - TALLOC_CTX *mem_ctx; char *socket_addr; DEBUG(5,("smbsrv_accept\n")); - mem_ctx = talloc_init("smbsrv_context"); - smb_conn = talloc_p(conn, struct smbsrv_connection); if (!smb_conn) return; -- cgit From 17bdcc9056c77bcecd8078863ca7a7bd7f7e478e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 13 Sep 2004 10:33:07 +0000 Subject: r2320: add my copyright metze (This used to be commit 45b77064bfeae1d4db2fa83c5513bdafa0c237e4) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 69b0b35346..cc43af8124 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -3,6 +3,7 @@ process incoming packets - main loop Copyright (C) Andrew Tridgell 1992-2003 Copyright (C) James J Myers 2003 + 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 -- cgit From 360f125f255fd7d5a172d012c00b3cfbff5a6989 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 13 Sep 2004 13:13:21 +0000 Subject: r2326: remove definition and usage of struct socket_context metze (This used to be commit 1854907da8d577db41de9aa14573d5c8c0092f47) --- source4/smb_server/smb_server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index cc43af8124..228ff4f4a3 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -64,7 +64,7 @@ static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_ char header[4]; struct smbsrv_request *req; - len = read_data(smb_conn->connection->socket->fde->fd, header, 4); + len = read_data(smb_conn->connection->event.fde->fd, header, 4); if (len != 4) { return NULL; } @@ -82,7 +82,7 @@ static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_ /* fill in the already received header */ memcpy(req->in.buffer, header, 4); - len2 = read_data(smb_conn->connection->socket->fde->fd, req->in.buffer + NBT_HDR_SIZE, len); + len2 = read_data(smb_conn->connection->event.fde->fd, req->in.buffer + NBT_HDR_SIZE, len); if (len2 != len) { return NULL; } @@ -831,7 +831,7 @@ void smbsrv_accept(struct server_connection *conn) /* set an initial client name based on its IP address. This will be replaced with the netbios name later if it gives us one */ - socket_addr = get_socket_addr(smb_conn, conn->socket->fde->fd); + socket_addr = get_socket_addr(smb_conn, conn->event.fde->fd); sub_set_remote_machine(socket_addr); /* now initialise a few default values associated with this smb socket */ -- cgit From 7d06a06584e5163b69f712e38dc46afc2668389c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 20 Sep 2004 12:31:07 +0000 Subject: r2447: let the server code use the new lib/socket/ stuff metze (This used to be commit 2fd577d2417e117a7e8c1a56feb147eae805df34) --- source4/smb_server/smb_server.c | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 228ff4f4a3..516babf4b7 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -60,35 +60,40 @@ receive a SMB request from the wire, forming a request_context from the result ****************************************************************************/ static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_conn) { + NTSTATUS status; ssize_t len, len2; - char header[4]; + DATA_BLOB tmp_blob; struct smbsrv_request *req; - len = read_data(smb_conn->connection->event.fde->fd, header, 4); - if (len != 4) { + status = socket_recv(smb_conn->connection->socket, smb_conn, &tmp_blob, 4, SOCKET_FLAG_BLOCK|SOCKET_FLAG_PEEK); + if (!NT_STATUS_IS_OK(status)) { + return NULL; + } + if (tmp_blob.length != 4) { return NULL; } - len = smb_len(header); + len = smb_len(tmp_blob.data); + talloc_free(tmp_blob.data); req = init_smb_request(smb_conn); GetTimeOfDay(&req->request_time); req->chained_fnum = -1; - - /* allocate the incoming buffer at the right size */ - req->in.buffer = talloc(req, len + NBT_HDR_SIZE); - /* fill in the already received header */ - memcpy(req->in.buffer, header, 4); + len2 = len + NBT_HDR_SIZE; - len2 = read_data(smb_conn->connection->event.fde->fd, req->in.buffer + NBT_HDR_SIZE, len); - if (len2 != len) { + status = socket_recv(smb_conn->connection->socket, req, &tmp_blob, len2, SOCKET_FLAG_BLOCK); + if (!NT_STATUS_IS_OK(status)) { + return NULL; + } + if (tmp_blob.length != len2) { return NULL; } /* fill in the rest of the req->in structure */ - req->in.size = len + NBT_HDR_SIZE; + req->in.buffer = tmp_blob.data; + req->in.size = len2; req->in.allocated = req->in.size; req->in.hdr = req->in.buffer + NBT_HDR_SIZE; req->in.vwv = req->in.hdr + HDR_VWV; @@ -683,12 +688,15 @@ static void add_socket(struct server_service *service, { const char **ports = lp_smb_ports(); int i; + char *ip_str = talloc_strdup(service->mem_ctx, inet_ntoa(*ifip)); for (i=0;ports[i];i++) { uint16_t port = atoi(ports[i]); if (port == 0) continue; - service_setup_socket(service, model_ops, socket_ctx, ifip, &port); + service_setup_socket(service, model_ops, ip_str, &port); } + + talloc_free(ip_str); } /**************************************************************************** @@ -831,8 +839,10 @@ void smbsrv_accept(struct server_connection *conn) /* set an initial client name based on its IP address. This will be replaced with the netbios name later if it gives us one */ - socket_addr = get_socket_addr(smb_conn, conn->event.fde->fd); - sub_set_remote_machine(socket_addr); + socket_addr = socket_get_peer_addr(conn->socket, smb_conn); + if (socket_addr) { + sub_set_remote_machine(socket_addr); + } /* now initialise a few default values associated with this smb socket */ smb_conn->negotiate.max_send = 0xFFFF; -- cgit From 65c3b46d0222df9c1bb49416a632913b4906b391 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 20 Sep 2004 13:17:51 +0000 Subject: r2449: use a blocking fd for smbsrv code metze (This used to be commit fba1637710138b0f2fae148e88b91a9cd1665465) --- source4/smb_server/smb_server.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 516babf4b7..13c0a9770f 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -825,6 +825,7 @@ void smbsrv_accept(struct server_connection *conn) { struct smbsrv_connection *smb_conn; char *socket_addr; + int fd; DEBUG(5,("smbsrv_accept\n")); @@ -863,6 +864,9 @@ void smbsrv_accept(struct server_connection *conn) conn->private_data = smb_conn; + fd = socket_get_fd(conn->socket); + set_blocking(fd, True); + /* setup the DCERPC server subsystem */ dcesrv_init_context(&smb_conn->dcesrv); -- cgit From 79ae828819193dd9ed5e060f78a88752e30bd1c3 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 22 Sep 2004 23:50:28 +0000 Subject: r2542: I really don't like the 'substitute' code, and I particularly don't like it in the mainline code (outside the smb.conf magic). We will need to have a more useful 'helper' routine for this, but for now we at least get a reliable IP address. Also remove the unused 'socket' structure in the smb server - it seems to have been replaced by the socket library. Andrew Bartlett (This used to be commit d8fd19a2020da6cce691c0db2b00f42e31d672cc) --- source4/smb_server/smb_server.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 13c0a9770f..35c552c825 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -838,13 +838,6 @@ void smbsrv_accept(struct server_connection *conn) sub_set_context(&smb_conn->substitute); - /* set an initial client name based on its IP address. This will be replaced with - the netbios name later if it gives us one */ - socket_addr = socket_get_peer_addr(conn->socket, smb_conn); - if (socket_addr) { - sub_set_remote_machine(socket_addr); - } - /* now initialise a few default values associated with this smb socket */ smb_conn->negotiate.max_send = 0xFFFF; -- cgit From d79c7d41da373dea7f95506c178b18f0dd896043 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 25 Sep 2004 11:24:10 +0000 Subject: r2627: use the new talloc capabilities in a bunch more places in the rpc server code. This fixes a number of memory leaks I found when testing with valgrind and smbtorture, as the cascading effect of a talloc_free() ensures that anything derived from the top level object is destroyed on disconnect. (This used to be commit 76d0b8206ce64d6ff4a192979c43dddbec726d6e) --- source4/smb_server/smb_server.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 35c552c825..8eb799cdb1 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -824,7 +824,6 @@ void smbd_process_async(struct smbsrv_connection *smb_conn) void smbsrv_accept(struct server_connection *conn) { struct smbsrv_connection *smb_conn; - char *socket_addr; int fd; DEBUG(5,("smbsrv_accept\n")); @@ -861,7 +860,7 @@ void smbsrv_accept(struct server_connection *conn) set_blocking(fd, True); /* setup the DCERPC server subsystem */ - dcesrv_init_context(&smb_conn->dcesrv); + dcesrv_init_context(smb_conn, &smb_conn->dcesrv); return; } -- cgit From 764eddb69647681f784f343a122251ca1ecf62df Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 26 Sep 2004 03:05:04 +0000 Subject: r2646: - use a talloc destructor to ensure that sockets from the new socket library are closed on abnormal termination - convert the service.h structures to the new talloc methods (This used to be commit 2dc334a3284858eb1c7190f9687c9b6c879ecc9d) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 8eb799cdb1..c3c5a6c456 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -688,7 +688,7 @@ static void add_socket(struct server_service *service, { const char **ports = lp_smb_ports(); int i; - char *ip_str = talloc_strdup(service->mem_ctx, inet_ntoa(*ifip)); + char *ip_str = talloc_strdup(service, inet_ntoa(*ifip)); for (i=0;ports[i];i++) { uint16_t port = atoi(ports[i]); -- cgit From 5a830d062676eb4cc1a20773b461b5a1073d1d33 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 26 Sep 2004 11:25:33 +0000 Subject: r2658: fixed a couple of error codes found with RAW-CONTEXT (This used to be commit 18632ec56524f294655d881406c10beb659ddee1) --- source4/smb_server/smb_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index c3c5a6c456..883be01b41 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -473,14 +473,14 @@ static void switch_message(int type, struct smbsrv_request *req) /* does this protocol need a valid tree connection? */ if ((flags & AS_USER) && !req->tcon) { - req_reply_error(req, NT_STATUS_NETWORK_NAME_DELETED); + req_reply_error(req, NT_STATUS_INVALID_HANDLE); return; } /* see if the vuid is valid */ if ((flags & AS_USER) && !req->session) { if (!(flags & AS_GUEST)) { - req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRbaduid)); + req_reply_error(req, NT_STATUS_INVALID_HANDLE); return; } } -- cgit From dcad0f6fd492506efd9a69b4e32c7bbfa5da90e5 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 29 Sep 2004 13:17:09 +0000 Subject: r2751: this is a new ntvfs design which tries to solve: - the stacking of modules - finding the modules private data - hide the ntvfs details from the calling layer - I set NTVFS_INTERFACE_VERSION 0 till we are closer to release (because we need to solve some async problems with the module stacking) metze (This used to be commit 3ff03b5cb21bb79afdd3b1609be9635f6688a539) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 883be01b41..28ca4d880a 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -512,7 +512,7 @@ static void switch_message(int type, struct smbsrv_request *req) } /* ipc services are limited */ - if (req->tcon && req->tcon->type == NTVFS_IPC && (flags & AS_USER) && !(flags & CAN_IPC)) { + if (req->tcon && req->tcon->ntvfs_ctx->type == NTVFS_IPC && (flags & AS_USER) && !(flags & CAN_IPC)) { req_reply_error(req, NT_STATUS_ACCESS_DENIED); return; } -- cgit From 8debe5a6b88c9625826e191b04244ae3e4b42590 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 22 Oct 2004 10:52:57 +0000 Subject: r3136: - Allow specifying socket type when adding smbd service - Make sure a epm_tower struct is completely initialized - Some more minor fixes (This used to be commit d560dcbdb85cb2c6915bdb9e2f82f1872b0f5a52) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 28ca4d880a..97df603517 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -693,7 +693,7 @@ static void add_socket(struct server_service *service, for (i=0;ports[i];i++) { uint16_t port = atoi(ports[i]); if (port == 0) continue; - service_setup_socket(service, model_ops, ip_str, &port); + service_setup_socket(service, model_ops, "ipv4", ip_str, &port); } talloc_free(ip_str); -- cgit From 611e9e601c4bcfa7e871bfd6b53bc8b5bb1c6ad4 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 25 Oct 2004 07:11:12 +0000 Subject: r3202: return a old DOS error code ERRSRV:ERRbaduid for a bad vuid. This means we now pass the BASE-VUID test. (This used to be commit 560300c0025940d84c9be41447145f4b441e7105) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 97df603517..920f56d334 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -480,7 +480,7 @@ static void switch_message(int type, struct smbsrv_request *req) /* see if the vuid is valid */ if ((flags & AS_USER) && !req->session) { if (!(flags & AS_GUEST)) { - req_reply_error(req, NT_STATUS_INVALID_HANDLE); + req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRbaduid)); return; } } -- cgit From 9d055846f225bea4953822f40fab1d2f1a2e2d07 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 27 Oct 2004 03:15:42 +0000 Subject: r3278: - rewrote the client side rpc connection code to use lib/socket/ rather than doing everything itself. This greatly simplifies the code, although I really don't like the socket_recv() interface (it always allocates memory for you, which means an extra memcpy in this code) - fixed several bugs in the socket_ipv4.c code, in particular client side code used a non-blocking connect but didn't handle EINPROGRESS, so it had no chance of working. Also fixed the error codes, using map_nt_error_from_unix() - cleaned up and expanded map_nt_error_from_unix() - changed interpret_addr2() to not take a mem_ctx. It makes absolutely no sense to allocate a fixed size 4 byte structure like this. Dozens of places in the code were also using interpret_addr2() incorrectly (precisely because the allocation made no sense) (This used to be commit 7f2c771b0e0e98c5c9e5cf662592d64d34ff1205) --- source4/smb_server/smb_server.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 920f56d334..b7d54c8dee 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -725,18 +725,10 @@ static void smbsrv_init(struct server_service *service, const struct model_ops * add_socket(service, model_ops, NULL, ifip); } } else { - struct in_addr *ifip; - TALLOC_CTX *mem_ctx = talloc_init("open_sockets_smbd"); - - if (!mem_ctx) { - smb_panic("No memory"); - } - + struct in_addr ifip; /* Just bind to lp_socket_address() (usually 0.0.0.0) */ - ifip = interpret_addr2(mem_ctx, lp_socket_address()); - add_socket(service, model_ops, NULL, ifip); - - talloc_free(mem_ctx); + ifip = interpret_addr2(lp_socket_address()); + add_socket(service, model_ops, NULL, &ifip); } } -- cgit From c6888da1487ab301292c3d4d05d0464833f3ce57 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell 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/smb_server/smb_server.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index b7d54c8dee..d6022ef63e 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -64,17 +64,19 @@ static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_ ssize_t len, len2; DATA_BLOB tmp_blob; struct smbsrv_request *req; + char hdr[4]; + size_t nread; - status = socket_recv(smb_conn->connection->socket, smb_conn, &tmp_blob, 4, SOCKET_FLAG_BLOCK|SOCKET_FLAG_PEEK); + status = socket_recv(smb_conn->connection->socket, hdr, + 4, &nread, SOCKET_FLAG_BLOCK|SOCKET_FLAG_PEEK); if (!NT_STATUS_IS_OK(status)) { return NULL; } - if (tmp_blob.length != 4) { + if (nread != 4) { return NULL; } - len = smb_len(tmp_blob.data); - talloc_free(tmp_blob.data); + len = smb_len(hdr); req = init_smb_request(smb_conn); @@ -83,11 +85,18 @@ static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_ len2 = len + NBT_HDR_SIZE; - status = socket_recv(smb_conn->connection->socket, req, &tmp_blob, len2, SOCKET_FLAG_BLOCK); + tmp_blob = data_blob_talloc(req, NULL, len2); + if (tmp_blob.data == NULL) { + return NULL; + } + + status = socket_recv(smb_conn->connection->socket, + tmp_blob.data, len2, + &nread, SOCKET_FLAG_BLOCK); if (!NT_STATUS_IS_OK(status)) { return NULL; } - if (tmp_blob.length != len2) { + if (nread != len2) { return NULL; } -- cgit From d668ec53b355de04f45279f14906ab5af116183e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 28 Oct 2004 04:36:12 +0000 Subject: r3306: the main smb server code now handles non-blocking socket receives. I haven't marked the socket non-blocking yet as I haven't checked that the send path is OK for non-blocking. (This used to be commit bda978cc2a921a888534054135b9325427425dd2) --- source4/smb_server/smb_server.c | 125 +++++++++++++++++++++++++--------------- 1 file changed, 78 insertions(+), 47 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index d6022ef63e..91de20bb31 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -55,54 +55,87 @@ BOOL req_send_oplock_break(struct smbsrv_tcon *tcon, uint16_t fnum, uint8_t leve return True; } + +static void construct_reply(struct smbsrv_request *req); + /**************************************************************************** -receive a SMB request from the wire, forming a request_context from the result +receive a SMB request header from the wire, forming a request_context +from the result ****************************************************************************/ -static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_conn) +static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn) { NTSTATUS status; - ssize_t len, len2; - DATA_BLOB tmp_blob; + ssize_t len; struct smbsrv_request *req; - char hdr[4]; size_t nread; - status = socket_recv(smb_conn->connection->socket, hdr, - 4, &nread, SOCKET_FLAG_BLOCK|SOCKET_FLAG_PEEK); - if (!NT_STATUS_IS_OK(status)) { - return NULL; - } - if (nread != 4) { - return NULL; - } - - len = smb_len(hdr); - - req = init_smb_request(smb_conn); + /* allocate the request if needed */ + if (smb_conn->partial_req == NULL) { + req = init_smb_request(smb_conn); + if (req == NULL) { + return NT_STATUS_NO_MEMORY; + } - GetTimeOfDay(&req->request_time); - req->chained_fnum = -1; + req->in.buffer = talloc_array_p(req, char, NBT_HDR_SIZE); + if (req->in.buffer == NULL) { + talloc_free(req); + return NT_STATUS_NO_MEMORY; + } + req->in.size = 0; + smb_conn->partial_req = req; + } - len2 = len + NBT_HDR_SIZE; + req = smb_conn->partial_req; - tmp_blob = data_blob_talloc(req, NULL, len2); - if (tmp_blob.data == NULL) { - return NULL; + /* read in the header */ + if (req->in.size < NBT_HDR_SIZE) { + status = socket_recv(smb_conn->connection->socket, + req->in.buffer + req->in.size, + NBT_HDR_SIZE - req->in.size, + &nread, 0); + if (NT_STATUS_IS_ERR(status)) { + return status; + } + if (nread == 0) { + return NT_STATUS_OK; + } + req->in.size += nread; + + /* when we have a full NBT header, then allocate the packet */ + if (req->in.size == NBT_HDR_SIZE) { + len = smb_len(req->in.buffer) + NBT_HDR_SIZE; + req->in.buffer = talloc_realloc(req, req->in.buffer, len); + if (req->in.buffer == NULL) { + return NT_STATUS_NO_MEMORY; + } + } else { + return NT_STATUS_OK; + } } + /* read in the main packet */ + len = smb_len(req->in.buffer) + NBT_HDR_SIZE; + status = socket_recv(smb_conn->connection->socket, - tmp_blob.data, len2, - &nread, SOCKET_FLAG_BLOCK); - if (!NT_STATUS_IS_OK(status)) { - return NULL; + req->in.buffer + req->in.size, + len - req->in.size, + &nread, 0); + if (NT_STATUS_IS_ERR(status)) { + return status; } - if (nread != len2) { - return NULL; + if (nread == 0) { + return NT_STATUS_OK; } - /* fill in the rest of the req->in structure */ - req->in.buffer = tmp_blob.data; - req->in.size = len2; + req->in.size += nread; + + if (req->in.size != len) { + return NT_STATUS_OK; + } + + /* we have a full packet */ + GetTimeOfDay(&req->request_time); + req->chained_fnum = -1; req->in.allocated = req->in.size; req->in.hdr = req->in.buffer + NBT_HDR_SIZE; req->in.vwv = req->in.hdr + HDR_VWV; @@ -125,7 +158,11 @@ static struct smbsrv_request *receive_smb_request(struct smbsrv_connection *smb_ } } - return req; + smb_conn->partial_req = NULL; + + construct_reply(req); + + return NT_STATUS_OK; } /* @@ -746,23 +783,20 @@ static void smbsrv_init(struct server_service *service, const struct model_ops * */ static void smbsrv_recv(struct server_connection *conn, time_t t, uint16_t flags) { - struct smbsrv_request *req; struct smbsrv_connection *smb_conn = conn->private_data; + NTSTATUS status; DEBUG(10,("smbsrv_recv\n")); - req = receive_smb_request(smb_conn); - if (!req) { + status = receive_smb_request(smb_conn); + if (NT_STATUS_IS_ERR(status)) { conn->event.fde->flags = 0; - smbsrv_terminate_connection(smb_conn, "receive error"); + smbsrv_terminate_connection(smb_conn, nt_errstr(status)); return; } - construct_reply(req); - /* free up temporary memory */ lp_talloc_free(); - return; } /* @@ -806,15 +840,12 @@ static void smbsrv_close(struct server_connection *conn, const char *reason) */ void smbd_process_async(struct smbsrv_connection *smb_conn) { - struct smbsrv_request *req; + NTSTATUS status; - req = receive_smb_request(smb_conn); - if (!req) { - smbsrv_terminate_connection(smb_conn, "receive error"); - return; + status = receive_smb_request(smb_conn); + if (NT_STATUS_IS_ERR(status)) { + smbsrv_terminate_connection(smb_conn, nt_errstr(status)); } - - construct_reply(req); } -- cgit From aa19318fd513fb4d6a36793b96fb7ffa66622d6f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 28 Oct 2004 05:09:42 +0000 Subject: r3307: fixed the send side of the smb_server code to be non-blocking. This means the whole of the SMB handling code is now non-blocking. (This used to be commit 30acedb943f0170d30e7b08925280d0dffc7873e) --- source4/smb_server/smb_server.c | 42 ++++++++++++++++++++++++++++++++++++----- 1 file changed, 37 insertions(+), 5 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 91de20bb31..ff83bfc80c 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -804,8 +804,42 @@ static void smbsrv_recv(struct server_connection *conn, time_t t, uint16_t flags */ static void smbsrv_send(struct server_connection *conn, time_t t, uint16_t flags) { - DEBUG(10,("smbsrv_send\n")); - return; + struct smbsrv_connection *smb_conn = conn->private_data; + + while (smb_conn->pending_send) { + struct smbsrv_request *req = smb_conn->pending_send; + DATA_BLOB blob; + NTSTATUS status; + size_t sendlen; + + blob.data = req->out.buffer; + blob.length = req->out.size; + + /* send as much of this request as we can */ + status = socket_send(conn->socket, &blob, &sendlen, 0); + if (NT_STATUS_IS_ERR(status)) { + smbsrv_terminate_connection(req->smb_conn, nt_errstr(status)); + return; + } + if (sendlen == 0) { + break; + } + + req->out.buffer += sendlen; + req->out.size -= sendlen; + + /* is the whole request gone? */ + if (req->out.size == 0) { + DLIST_REMOVE(smb_conn->pending_send, req); + req_destroy(req); + } + } + + /* if no more requests are pending to be sent then + we should stop select for write */ + if (smb_conn->pending_send == NULL) { + conn->event.fde->flags &= ~EVENT_FD_WRITE; + } } /* @@ -860,11 +894,9 @@ void smbsrv_accept(struct server_connection *conn) DEBUG(5,("smbsrv_accept\n")); - smb_conn = talloc_p(conn, struct smbsrv_connection); + smb_conn = talloc_zero_p(conn, struct smbsrv_connection); if (!smb_conn) return; - ZERO_STRUCTP(smb_conn); - smb_conn->pid = getpid(); sub_set_context(&smb_conn->substitute); -- cgit From 019719595778e0bd0a00781b33407554d1943985 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 28 Oct 2004 21:48:53 +0000 Subject: r3336: use a struct ntvfs_async_state to be able to do async chaning of ntvfs modules the idea is that a passthru module can use ntvfs_async_state_push() before calling ntvfs_next_*() and in the _send function it calls ntvfs_async_state_pop() and then call the upper layer send_fn itself - ntvfs_nbench is now fully async - the ntvfs_map_*() functions and the trans(2) mapping functions are not converted yet metze (This used to be commit fde64c0dc142b53d128c8ba09af048dc58d8ef3a) --- source4/smb_server/smb_server.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index ff83bfc80c..86a876554f 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -621,10 +621,10 @@ static void construct_reply(struct smbsrv_request *req) return; } - - req->smbpid = SVAL(req->in.hdr,HDR_PID); req->flags = CVAL(req->in.hdr, HDR_FLG); req->flags2 = SVAL(req->in.hdr, HDR_FLG2); + req->smbpid = SVAL(req->in.hdr,HDR_PID); + req->mid = SVAL(req->in.hdr,HDR_MID); if (!req_signing_check_incoming(req)) { req_reply_error(req, NT_STATUS_ACCESS_DENIED); @@ -694,8 +694,7 @@ void chain_reply(struct smbsrv_request *req) /* the current request in the chain might have used an async reply, but that doesn't mean the next element needs to */ - ZERO_STRUCT(req->async); - req->control_flags &= ~REQ_CONTROL_ASYNC; + ZERO_STRUCTP(req->async_states); switch_message(chain_cmd, req); return; -- cgit From 42c4dd18322452b6ab709eac8ba6724daf93ed36 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 28 Oct 2004 23:09:40 +0000 Subject: r3341: - don't zero the async structure (makes valgrind more useful) - get rid of req->mid, as it isn't a safe value to use to match requests in the server (it is safe in the client code, as we choose the mid, but in the server we can't rely on other clients to choose the mid carefully) (This used to be commit 938fb44351e12a515073ea94cd306988d5ca7340) --- source4/smb_server/smb_server.c | 1 - 1 file changed, 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 86a876554f..de3d60a6bd 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -624,7 +624,6 @@ static void construct_reply(struct smbsrv_request *req) req->flags = CVAL(req->in.hdr, HDR_FLG); req->flags2 = SVAL(req->in.hdr, HDR_FLG2); req->smbpid = SVAL(req->in.hdr,HDR_PID); - req->mid = SVAL(req->in.hdr,HDR_MID); if (!req_signing_check_incoming(req)) { req_reply_error(req, NT_STATUS_ACCESS_DENIED); -- cgit From 284349482f5293a9a23d0f72d7c2aab46b55843b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 1 Nov 2004 22:48:25 +0000 Subject: r3443: the next stage in the include files re-organisation. I have created the include/system/ directory, which will contain the wrappers for the system includes for logical subsystems. So far I have created include/system/kerberos.h and include/system/network.h, which contain all the system includes for kerberos code and networking code. These are the included in subsystems that need kerberos or networking respectively. Note that this method avoids the mess of #ifdef HAVE_XXX_H in every C file, instead each C module includes the include/system/XXX.h file for the logical system support it needs, and the details are kept isolated in include/system/ This patch also creates a "struct ipv4_addr" which replaces "struct in_addr" in our code. That avoids every C file needing to import all the system networking headers. (This used to be commit 2e25c71853f8996f73755277e448e7d670810349) --- source4/smb_server/smb_server.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index de3d60a6bd..a1a90852a1 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -728,11 +728,11 @@ static void smbsrv_exit(struct server_service *service, const char *reason) static void add_socket(struct server_service *service, const struct model_ops *model_ops, struct socket_context *socket_ctx, - struct in_addr *ifip) + struct ipv4_addr *ifip) { const char **ports = lp_smb_ports(); int i; - char *ip_str = talloc_strdup(service, inet_ntoa(*ifip)); + char *ip_str = talloc_strdup(service, sys_inet_ntoa(*ifip)); for (i=0;ports[i];i++) { uint16_t port = atoi(ports[i]); @@ -759,7 +759,7 @@ static void smbsrv_init(struct server_service *service, const struct model_ops * socket per interface and bind to only these. */ for(i = 0; i < num_interfaces; i++) { - struct in_addr *ifip = iface_n_ip(i); + struct ipv4_addr *ifip = iface_n_ip(i); if (ifip == NULL) { DEBUG(0,("open_sockets_smbd: interface %d has NULL IP address !\n", i)); @@ -769,7 +769,7 @@ static void smbsrv_init(struct server_service *service, const struct model_ops * add_socket(service, model_ops, NULL, ifip); } } else { - struct in_addr ifip; + struct ipv4_addr ifip; /* Just bind to lp_socket_address() (usually 0.0.0.0) */ ifip = interpret_addr2(lp_socket_address()); add_socket(service, model_ops, NULL, &ifip); -- cgit From ead3508ac81ff3ed2a48753f3b5e23537ba6ec73 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Nov 2004 00:24:21 +0000 Subject: r3447: more include/system/XXX.h include files (This used to be commit 264ce9181089922547e8f6f67116f2d7277a5105) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index a1a90852a1..521cfd7de9 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "system/time.h" /* -- cgit From 3643fb11092e28a9538ef32cedce8ff21ad86a28 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Nov 2004 06:42:15 +0000 Subject: r3463: separated out some more headers (asn_1.h, messages.h, dlinklist.h and ioctl.h) (This used to be commit b97e395c814762024336c1cf4d7c25be8da5813a) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 521cfd7de9..a42ec3c82b 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -22,6 +22,7 @@ #include "includes.h" #include "system/time.h" +#include "dlinklist.h" /* -- cgit From aa34fcebf8aa0660574a7c6976b33b3f37985e27 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Nov 2004 07:18:24 +0000 Subject: r3466: split out request.h, signing.h, and smb_server.h (This used to be commit 7c4e6ebf05790dd6e29896dd316db0fff613aa4e) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index a42ec3c82b..aa3a2a794c 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -23,6 +23,7 @@ #include "includes.h" #include "system/time.h" #include "dlinklist.h" +#include "smb_server/smb_server.h" /* -- cgit From a99b6219a810a1cd10bd62a6716780602808f0cd Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 2 Nov 2004 12:15:17 +0000 Subject: r3481: split out client.h and events.h (This used to be commit c6f486574470a311e0d336c026103f131451e21e) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index aa3a2a794c..39dc73096c 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -21,6 +21,7 @@ */ #include "includes.h" +#include "events.h" #include "system/time.h" #include "dlinklist.h" #include "smb_server/smb_server.h" -- cgit From d685e56a772973d74a53421aa118ecc49d74fab0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 3 Nov 2004 01:50:49 +0000 Subject: r3500: cleaned up the AS_USER/AS_GUEST stuff in the core smb packet processing (This used to be commit 8fa456afc9be113f292a1952119b533e4dc04fc1) --- source4/smb_server/smb_server.c | 132 +++++++++++----------------------------- 1 file changed, 36 insertions(+), 96 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 39dc73096c..e1eb4e3179 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -170,18 +170,10 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn) } /* -These flags determine some of the permissions required to do an operation - -Note that I don't set NEED_WRITE on some write operations because they -are used by some brain-dead clients when printing, and I don't want to -force write permissions on print services. + These flags determine some of the permissions required to do an operation */ #define AS_USER (1<<0) -#define NEED_WRITE (1<<1) -#define TIME_INIT (1<<2) -#define CAN_IPC (1<<3) -#define AS_GUEST (1<<5) -#define USE_MUTEX (1<<7) +#define USE_MUTEX (1<<1) /* define a list of possible SMB messages and their corresponding @@ -195,18 +187,18 @@ static const struct smb_message_struct int flags; } smb_messages[256] = { -/* 0x00 */ { "SMBmkdir",reply_mkdir,AS_USER | NEED_WRITE}, -/* 0x01 */ { "SMBrmdir",reply_rmdir,AS_USER | NEED_WRITE}, -/* 0x02 */ { "SMBopen",reply_open,AS_USER }, +/* 0x00 */ { "SMBmkdir",reply_mkdir,AS_USER}, +/* 0x01 */ { "SMBrmdir",reply_rmdir,AS_USER}, +/* 0x02 */ { "SMBopen",reply_open,AS_USER}, /* 0x03 */ { "SMBcreate",reply_mknew,AS_USER}, -/* 0x04 */ { "SMBclose",reply_close,AS_USER | CAN_IPC }, +/* 0x04 */ { "SMBclose",reply_close,AS_USER}, /* 0x05 */ { "SMBflush",reply_flush,AS_USER}, -/* 0x06 */ { "SMBunlink",reply_unlink,AS_USER | NEED_WRITE }, -/* 0x07 */ { "SMBmv",reply_mv,AS_USER | NEED_WRITE }, +/* 0x06 */ { "SMBunlink",reply_unlink,AS_USER}, +/* 0x07 */ { "SMBmv",reply_mv,AS_USER}, /* 0x08 */ { "SMBgetatr",reply_getatr,AS_USER}, -/* 0x09 */ { "SMBsetatr",reply_setatr,AS_USER | NEED_WRITE}, +/* 0x09 */ { "SMBsetatr",reply_setatr,AS_USER}, /* 0x0a */ { "SMBread",reply_read,AS_USER}, -/* 0x0b */ { "SMBwrite",reply_write,AS_USER | CAN_IPC }, +/* 0x0b */ { "SMBwrite",reply_write,AS_USER}, /* 0x0c */ { "SMBlock",reply_lock,AS_USER}, /* 0x0d */ { "SMBunlock",reply_unlock,AS_USER}, /* 0x0e */ { "SMBctemp",reply_ctemp,AS_USER }, @@ -229,23 +221,23 @@ static const struct smb_message_struct /* 0x1f */ { "SMBwriteBs",reply_writebs,AS_USER}, /* 0x20 */ { "SMBwritec",NULL,0}, /* 0x21 */ { NULL, NULL, 0 }, -/* 0x22 */ { "SMBsetattrE",reply_setattrE,AS_USER | NEED_WRITE }, -/* 0x23 */ { "SMBgetattrE",reply_getattrE,AS_USER }, -/* 0x24 */ { "SMBlockingX",reply_lockingX,AS_USER }, -/* 0x25 */ { "SMBtrans",reply_trans,AS_USER | CAN_IPC }, -/* 0x26 */ { "SMBtranss",NULL,AS_USER | CAN_IPC}, +/* 0x22 */ { "SMBsetattrE",reply_setattrE,AS_USER}, +/* 0x23 */ { "SMBgetattrE",reply_getattrE,AS_USER}, +/* 0x24 */ { "SMBlockingX",reply_lockingX,AS_USER}, +/* 0x25 */ { "SMBtrans",reply_trans,AS_USER}, +/* 0x26 */ { "SMBtranss",NULL,AS_USER}, /* 0x27 */ { "SMBioctl",reply_ioctl,0}, /* 0x28 */ { "SMBioctls",NULL,AS_USER}, -/* 0x29 */ { "SMBcopy",reply_copy,AS_USER | NEED_WRITE }, -/* 0x2a */ { "SMBmove",NULL,AS_USER | NEED_WRITE }, +/* 0x29 */ { "SMBcopy",reply_copy,AS_USER}, +/* 0x2a */ { "SMBmove",NULL,AS_USER}, /* 0x2b */ { "SMBecho",reply_echo,0}, /* 0x2c */ { "SMBwriteclose",reply_writeclose,AS_USER}, -/* 0x2d */ { "SMBopenX",reply_open_and_X,AS_USER | CAN_IPC }, -/* 0x2e */ { "SMBreadX",reply_read_and_X,AS_USER | CAN_IPC }, -/* 0x2f */ { "SMBwriteX",reply_write_and_X,AS_USER | CAN_IPC }, +/* 0x2d */ { "SMBopenX",reply_open_and_X,AS_USER}, +/* 0x2e */ { "SMBreadX",reply_read_and_X,AS_USER}, +/* 0x2f */ { "SMBwriteX",reply_write_and_X,AS_USER}, /* 0x30 */ { NULL, NULL, 0 }, /* 0x31 */ { NULL, NULL, 0 }, -/* 0x32 */ { "SMBtrans2", reply_trans2, AS_USER | CAN_IPC }, +/* 0x32 */ { "SMBtrans2", reply_trans2, AS_USER}, /* 0x33 */ { "SMBtranss2", reply_transs2, AS_USER}, /* 0x34 */ { "SMBfindclose", reply_findclose,AS_USER}, /* 0x35 */ { "SMBfindnclose", reply_findnclose, AS_USER}, @@ -355,9 +347,9 @@ static const struct smb_message_struct /* 0x9d */ { NULL, NULL, 0 }, /* 0x9e */ { NULL, NULL, 0 }, /* 0x9f */ { NULL, NULL, 0 }, -/* 0xa0 */ { "SMBnttrans", reply_nttrans, AS_USER | CAN_IPC }, -/* 0xa1 */ { "SMBnttranss", reply_nttranss, AS_USER | CAN_IPC }, -/* 0xa2 */ { "SMBntcreateX", reply_ntcreate_and_X, AS_USER | CAN_IPC }, +/* 0xa0 */ { "SMBnttrans", reply_nttrans, AS_USER}, +/* 0xa1 */ { "SMBnttranss", reply_nttranss, AS_USER}, +/* 0xa2 */ { "SMBntcreateX", reply_ntcreate_and_X, AS_USER}, /* 0xa3 */ { NULL, NULL, 0 }, /* 0xa4 */ { "SMBntcancel", reply_ntcancel, 0 }, /* 0xa5 */ { "SMBntrename", reply_ntrename, 0 }, @@ -403,14 +395,14 @@ static const struct smb_message_struct /* 0xcd */ { NULL, NULL, 0 }, /* 0xce */ { NULL, NULL, 0 }, /* 0xcf */ { NULL, NULL, 0 }, -/* 0xd0 */ { "SMBsends",reply_sends,AS_GUEST}, -/* 0xd1 */ { "SMBsendb",NULL,AS_GUEST}, -/* 0xd2 */ { "SMBfwdname",NULL,AS_GUEST}, -/* 0xd3 */ { "SMBcancelf",NULL,AS_GUEST}, -/* 0xd4 */ { "SMBgetmac",NULL,AS_GUEST}, -/* 0xd5 */ { "SMBsendstrt",reply_sendstrt,AS_GUEST}, -/* 0xd6 */ { "SMBsendend",reply_sendend,AS_GUEST}, -/* 0xd7 */ { "SMBsendtxt",reply_sendtxt,AS_GUEST}, +/* 0xd0 */ { "SMBsends",reply_sends,0}, +/* 0xd1 */ { "SMBsendb",NULL,0}, +/* 0xd2 */ { "SMBfwdname",NULL,0}, +/* 0xd3 */ { "SMBcancelf",NULL,0}, +/* 0xd4 */ { "SMBgetmac",NULL,0}, +/* 0xd5 */ { "SMBsendstrt",reply_sendstrt,0}, +/* 0xd6 */ { "SMBsendend",reply_sendend,0}, +/* 0xd7 */ { "SMBsendtxt",reply_sendtxt,0}, /* 0xd8 */ { NULL, NULL, 0 }, /* 0xd9 */ { NULL, NULL, 0 }, /* 0xda */ { NULL, NULL, 0 }, @@ -516,11 +508,6 @@ static void switch_message(int type, struct smbsrv_request *req) DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), smb_conn->connection->service->model_ops->get_id(req))); - /* does this protocol need to be run as root? */ - if (!(flags & AS_USER)) { - change_to_root_user(); - } - /* does this protocol need a valid tree connection? */ if ((flags & AS_USER) && !req->tcon) { req_reply_error(req, NT_STATUS_INVALID_HANDLE); @@ -529,59 +516,12 @@ static void switch_message(int type, struct smbsrv_request *req) /* see if the vuid is valid */ if ((flags & AS_USER) && !req->session) { - if (!(flags & AS_GUEST)) { - req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRbaduid)); - return; - } - } - - /* does this protocol need to be run as the connected user? */ -#if HACK_REWRITE - if ((flags & AS_USER) && !change_to_user(req->tcon,session_tag)) { - if (!(flags & AS_GUEST)) { - req_reply_error(req, NT_STATUS_ACCESS_DENIED); - return; - } - - /* we'll run it as guest */ - flags &= ~AS_USER; - } -#endif - - /* this code is to work around a bug is MS client 3 without - introducing a security hole - it needs to be able to do - print queue checks as guest if it isn't logged in properly */ - if (flags & AS_USER) { - flags &= ~AS_GUEST; - } - - /* does it need write permission? */ - if ((flags & NEED_WRITE) && !CAN_WRITE(req->tcon)) { - req_reply_error(req, NT_STATUS_ACCESS_DENIED); - return; - } - - /* ipc services are limited */ - if (req->tcon && req->tcon->ntvfs_ctx->type == NTVFS_IPC && (flags & AS_USER) && !(flags & CAN_IPC)) { - req_reply_error(req, NT_STATUS_ACCESS_DENIED); - return; - } - - /* load service specific parameters */ - if (req->tcon && !set_current_service(req->tcon,(flags & AS_USER)?True:False)) { - req_reply_error(req, NT_STATUS_ACCESS_DENIED); + req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRbaduid)); return; } - - /* does this protocol need to be run as guest? */ -#if HACK_REWRITE - if ((flags & AS_GUEST) && - !change_to_guest()) { - req_reply_error(req, NT_STATUS_ACCESS_DENIED); - return; - } -#endif - /* THREAD TESTING: use mutex to serialize calls to critical functions with global state */ + + /* THREAD TESTING: use mutex to serialize calls to critical + functions with global state */ if (flags & USE_MUTEX) { MUTEX_LOCK_BY_ID(MUTEX_SMBD); } -- cgit From dde07058075d357cfdc63624c8dcaa67ebd40add Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 3 Nov 2004 10:09:48 +0000 Subject: r3507: - added deferred replies on sharing violation in pvfs open. The deferred reply is short-circuited immediately when the file is closed by another user, allowing it to be opened by the waiting user. - added a sane set of timeval manipulation routines - converted all the events code and code that uses it to use struct timeval instead of time_t, which allows for microsecond resolution instead of 1 second resolution. This was needed for doing the pvfs deferred open code, and is why the patch is so big. (This used to be commit 0d51511d408d91eb5f68a35e980e0875299b1831) --- source4/smb_server/smb_server.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index e1eb4e3179..861186a8d7 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -723,7 +723,7 @@ static void smbsrv_init(struct server_service *service, const struct model_ops * /* called when a SMB socket becomes readable */ -static void smbsrv_recv(struct server_connection *conn, time_t t, uint16_t flags) +static void smbsrv_recv(struct server_connection *conn, struct timeval t, uint16_t flags) { struct smbsrv_connection *smb_conn = conn->private_data; NTSTATUS status; @@ -744,7 +744,7 @@ static void smbsrv_recv(struct server_connection *conn, time_t t, uint16_t flags /* called when a SMB socket becomes writable */ -static void smbsrv_send(struct server_connection *conn, time_t t, uint16_t flags) +static void smbsrv_send(struct server_connection *conn, struct timeval t, uint16_t flags) { struct smbsrv_connection *smb_conn = conn->private_data; @@ -787,11 +787,10 @@ static void smbsrv_send(struct server_connection *conn, time_t t, uint16_t flags /* called when connection is idle */ -static void smbsrv_idle(struct server_connection *conn, time_t t) +static void smbsrv_idle(struct server_connection *conn, struct timeval t) { DEBUG(10,("smbsrv_idle: not implemented!\n")); - conn->event.idle->next_event = t + 5; - + conn->event.idle->next_event = timeval_add(&t, 5, 0); return; } -- cgit From a9c00f35f9d7d59b36c286abb2e72613b32ba775 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 4 Nov 2004 02:19:25 +0000 Subject: r3518: fixed some includes to be consistent. - use #include for operating system includes - use includes relative to include/ for things like system/wait.h also fixed the thread backend to work somewhat. To fix it properly we need to do this: - add a configure test for support for thread local storage (the __thread keyword) - refuse to do pthreads if tls doesn't work - refuse to do pthreads if seteuid() affects process instead of thread - defined THREAD_LOCAL as __thread when WITH_PTHREADS - add THREAD_LOCAL to all the global data structures that should be thread local (there are quite a few) right now the thread backend falls over when you hit it with several connections at once, due to the lack of __thread on some critical structures. (This used to be commit 0dc1deabd0b53bc7a6f6cee2ed99e2cbbe422262) --- source4/smb_server/smb_server.c | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 861186a8d7..3c17abe6fb 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -173,7 +173,6 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn) These flags determine some of the permissions required to do an operation */ #define AS_USER (1<<0) -#define USE_MUTEX (1<<1) /* define a list of possible SMB messages and their corresponding @@ -299,12 +298,12 @@ static const struct smb_message_struct /* 0x6d */ { NULL, NULL, 0 }, /* 0x6e */ { NULL, NULL, 0 }, /* 0x6f */ { NULL, NULL, 0 }, -/* 0x70 */ { "SMBtcon",reply_tcon,USE_MUTEX}, +/* 0x70 */ { "SMBtcon",reply_tcon,0}, /* 0x71 */ { "SMBtdis",reply_tdis,0}, -/* 0x72 */ { "SMBnegprot",reply_negprot,USE_MUTEX}, -/* 0x73 */ { "SMBsesssetupX",reply_sesssetup,USE_MUTEX}, +/* 0x72 */ { "SMBnegprot",reply_negprot,0}, +/* 0x73 */ { "SMBsesssetupX",reply_sesssetup,0}, /* 0x74 */ { "SMBulogoffX", reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */ -/* 0x75 */ { "SMBtconX",reply_tcon_and_X,USE_MUTEX}, +/* 0x75 */ { "SMBtconX",reply_tcon_and_X,0}, /* 0x76 */ { NULL, NULL, 0 }, /* 0x77 */ { NULL, NULL, 0 }, /* 0x78 */ { NULL, NULL, 0 }, @@ -520,15 +519,7 @@ static void switch_message(int type, struct smbsrv_request *req) return; } - /* THREAD TESTING: use mutex to serialize calls to critical - functions with global state */ - if (flags & USE_MUTEX) { - MUTEX_LOCK_BY_ID(MUTEX_SMBD); - } smb_messages[type].fn(req); - if (flags & USE_MUTEX) { - MUTEX_UNLOCK_BY_ID(MUTEX_SMBD); - } } -- cgit From 80eef3ea6647a9f8600466b2b468d38bd2eb0664 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 5 Nov 2004 01:14:06 +0000 Subject: r3539: much nicer async open delay code. The previous code didn't handle the case where the file got renamed or deleted while waiting for the sharing violation delay. To handle this we need to make the 2nd open a full open call, including the name resolve call etc. Luckily this simplifies the logic. I also expanded the RAW-MUX test to include the case where we do open/open/open/close/close, with the 3rd open async, and that open gets retried after both the first close and the 2nd close, with the first retry failing and the 2nd retry working. The tests the "async reply after a async reply" logic in pvfs_open(). (This used to be commit eded2ad9c91f5ba587ef4f7f5f5a6dceb4b51ff3) --- source4/smb_server/smb_server.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 3c17abe6fb..24d1c7eeb6 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -66,7 +66,7 @@ static void construct_reply(struct smbsrv_request *req); receive a SMB request header from the wire, forming a request_context from the result ****************************************************************************/ -static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn) +static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn, struct timeval t) { NTSTATUS status; ssize_t len; @@ -138,7 +138,7 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn) } /* we have a full packet */ - GetTimeOfDay(&req->request_time); + req->request_time = t; req->chained_fnum = -1; req->in.allocated = req->in.size; req->in.hdr = req->in.buffer + NBT_HDR_SIZE; @@ -721,7 +721,7 @@ static void smbsrv_recv(struct server_connection *conn, struct timeval t, uint16 DEBUG(10,("smbsrv_recv\n")); - status = receive_smb_request(smb_conn); + status = receive_smb_request(smb_conn, t); if (NT_STATUS_IS_ERR(status)) { conn->event.fde->flags = 0; smbsrv_terminate_connection(smb_conn, nt_errstr(status)); @@ -808,7 +808,7 @@ void smbd_process_async(struct smbsrv_connection *smb_conn) { NTSTATUS status; - status = receive_smb_request(smb_conn); + status = receive_smb_request(smb_conn, timeval_current()); if (NT_STATUS_IS_ERR(status)) { smbsrv_terminate_connection(smb_conn, nt_errstr(status)); } -- cgit From 9112a632f6791ffc3c3c1aadd214cbaba8fe816e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 4 Dec 2004 13:56:25 +0000 Subject: r4063: - change char * -> uint8_t in struct request_buffer - change smbcli_read/write to take void * for the buffers to match read(2)/write(2) all this fixes a lot of gcc-4 warnings metze (This used to be commit b94f92bc6637f748d6f7049f4f9a30b0b8d18a7a) --- source4/smb_server/smb_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 24d1c7eeb6..d9fa226c8b 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -80,7 +80,7 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn, struct t return NT_STATUS_NO_MEMORY; } - req->in.buffer = talloc_array_p(req, char, NBT_HDR_SIZE); + req->in.buffer = talloc_array_p(req, uint8_t, NBT_HDR_SIZE); if (req->in.buffer == NULL) { talloc_free(req); return NT_STATUS_NO_MEMORY; @@ -576,7 +576,7 @@ static void construct_reply(struct smbsrv_request *req) void chain_reply(struct smbsrv_request *req) { uint16_t chain_cmd, chain_offset; - char *vwv, *data; + uint8_t *vwv, *data; uint16_t wct; uint16_t data_size; -- cgit From cf5cb51bfc7f7c23f366fcb902946d6f4feb2d3b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 16 Dec 2004 12:31:34 +0000 Subject: r4232: added server support for multi-part SMBtrans requests, while maintaining the async nature of the server. This is done with a SMBtrans request queue for partially completed requests. The smb signing issues with this get a little tricky, but it now seems to work fine (This used to be commit bc0209058b76a947ad27673aeb096d11a168996b) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index d9fa226c8b..2ebb927f1e 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -224,7 +224,7 @@ static const struct smb_message_struct /* 0x23 */ { "SMBgetattrE",reply_getattrE,AS_USER}, /* 0x24 */ { "SMBlockingX",reply_lockingX,AS_USER}, /* 0x25 */ { "SMBtrans",reply_trans,AS_USER}, -/* 0x26 */ { "SMBtranss",NULL,AS_USER}, +/* 0x26 */ { "SMBtranss",reply_transs,AS_USER}, /* 0x27 */ { "SMBioctl",reply_ioctl,0}, /* 0x28 */ { "SMBioctls",NULL,AS_USER}, /* 0x29 */ { "SMBcopy",reply_copy,AS_USER}, -- cgit From 11ce2cfd70df264c5c91b4daaa9a01c5abc673b0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 7 Jan 2005 04:39:16 +0000 Subject: r4591: - converted the other _p talloc functions to not need _p - added #if TALLOC_DEPRECATED around the _p functions - fixes the code that broke from the above while doing this I fixed quite a number of places that were incorrectly using the non type-safe talloc functions to use the type safe ones. Some were even doing multiplies for array allocation, which is potentially unsafe. (This used to be commit 6e7754abd0c225527fb38363996a6e241b87b37e) --- source4/smb_server/smb_server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 2ebb927f1e..0e845b9697 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -108,7 +108,8 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn, struct t /* when we have a full NBT header, then allocate the packet */ if (req->in.size == NBT_HDR_SIZE) { len = smb_len(req->in.buffer) + NBT_HDR_SIZE; - req->in.buffer = talloc_realloc(req, req->in.buffer, len); + req->in.buffer = talloc_realloc(req, req->in.buffer, + uint8_t, len); if (req->in.buffer == NULL) { return NT_STATUS_NO_MEMORY; } -- cgit From 770c65affdefe289d89238ee90834bac90acf46b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 9 Jan 2005 04:18:14 +0000 Subject: r4611: - renamed add_socket() to smb_add_socket() as that is less confusing - removed the spurious call to set_blocking() in the smb server setup. (This used to be commit 76d905d12e6f65a3670e4167ec79d8876b772ca6) --- source4/smb_server/smb_server.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 0e845b9697..e6201c077e 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -661,10 +661,10 @@ static void smbsrv_exit(struct server_service *service, const char *reason) /* add a socket address to the list of events, one event per port */ -static void add_socket(struct server_service *service, - const struct model_ops *model_ops, - struct socket_context *socket_ctx, - struct ipv4_addr *ifip) +static void smb_add_socket(struct server_service *service, + const struct model_ops *model_ops, + struct socket_context *socket_ctx, + struct ipv4_addr *ifip) { const char **ports = lp_smb_ports(); int i; @@ -702,13 +702,13 @@ static void smbsrv_init(struct server_service *service, const struct model_ops * continue; } - add_socket(service, model_ops, NULL, ifip); + smb_add_socket(service, model_ops, NULL, ifip); } } else { struct ipv4_addr ifip; /* Just bind to lp_socket_address() (usually 0.0.0.0) */ ifip = interpret_addr2(lp_socket_address()); - add_socket(service, model_ops, NULL, &ifip); + smb_add_socket(service, model_ops, NULL, &ifip); } } @@ -823,7 +823,6 @@ void smbd_process_async(struct smbsrv_connection *smb_conn) void smbsrv_accept(struct server_connection *conn) { struct smbsrv_connection *smb_conn; - int fd; DEBUG(5,("smbsrv_accept\n")); @@ -853,9 +852,6 @@ void smbsrv_accept(struct server_connection *conn) conn->private_data = smb_conn; - fd = socket_get_fd(conn->socket); - set_blocking(fd, True); - /* setup the DCERPC server subsystem */ dcesrv_init_context(smb_conn, &smb_conn->dcesrv); -- cgit From 91e9cf6d1a53cc63410e1535907a2ad015e80c82 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 11 Jan 2005 14:32:15 +0000 Subject: r4684: the smbsrv code should not know about rpc stuff just vfs_ipc metze (This used to be commit f85ebd1e8e19f5ff271dd7d79190fea16d6a98c4) --- source4/smb_server/smb_server.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index e6201c077e..0b2fe668af 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -852,9 +852,6 @@ void smbsrv_accept(struct server_connection *conn) conn->private_data = smb_conn; - /* setup the DCERPC server subsystem */ - dcesrv_init_context(smb_conn, &smb_conn->dcesrv); - return; } -- cgit From 592fce7fb149ca5e82b14d9c8f13a4da1babe2b7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 13 Jan 2005 18:49:10 +0000 Subject: r4726: - use the name tcon and tid instead of conn and cnum - make use of talloc destructors metze (This used to be commit 8308da6ce4a95f8c10e22949ef00e9e64f2dbb85) --- source4/smb_server/smb_server.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 0b2fe668af..ddbaf43cc9 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -39,7 +39,7 @@ BOOL req_send_oplock_break(struct smbsrv_tcon *tcon, uint16_t fnum, uint8_t leve req_setup_reply(req, 8, 0); SCVAL(req->out.hdr,HDR_COM,SMBlockingX); - SSVAL(req->out.hdr,HDR_TID,tcon->cnum); + SSVAL(req->out.hdr,HDR_TID,tcon->tid); SSVAL(req->out.hdr,HDR_PID,0xFFFF); SSVAL(req->out.hdr,HDR_UID,0); SSVAL(req->out.hdr,HDR_MID,0xFFFF); @@ -484,7 +484,7 @@ static void switch_message(int type, struct smbsrv_request *req) flags = smb_messages[type].flags; - req->tcon = conn_find(smb_conn, SVAL(req->in.hdr,HDR_TID)); + req->tcon = smbsrv_tcon_find(smb_conn, SVAL(req->in.hdr,HDR_TID)); if (req->session == NULL) { /* setup the user context for this request if it @@ -792,8 +792,6 @@ static void smbsrv_close(struct server_connection *conn, const char *reason) DEBUG(5,("smbsrv_close: %s\n",reason)); - conn_close_all(smb_conn); - talloc_free(smb_conn); return; @@ -846,7 +844,7 @@ void smbsrv_accept(struct server_connection *conn) srv_init_signing(smb_conn); - conn_init(smb_conn); + smbsrv_tcon_init(smb_conn); smb_conn->connection = conn; -- cgit From 9327ec51d11855ec0ceac3ce1f4e0a75c8b57081 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 14 Jan 2005 01:32:56 +0000 Subject: r4728: split up server_services into: - stream_socket services the smb, ldap and rpc service which sets up a srtam socket end then waits for connections and - task services which this you can create a seperate task that do something (this is also going through the process_model subsystem so with -M standard a new process for this created with -M thread a new thread ... I'll add datagram services later when we whave support for datagram sockets in lib/socket/ see the next commit as an example for service_task's metze (This used to be commit d5fa02746c6569b09b6e05785642da2fad3ba3e0) --- source4/smb_server/smb_server.c | 66 ++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 40 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index ddbaf43cc9..1cbc831a17 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -506,7 +506,7 @@ static void switch_message(int type, struct smbsrv_request *req) session_tag = req->session->vuid; } - DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), smb_conn->connection->service->model_ops->get_id(req))); + DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), req->smb_conn->connection->connection.id)); /* does this protocol need a valid tree connection? */ if ((flags & AS_USER) && !req->tcon) { @@ -649,21 +649,12 @@ void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char server_terminate_connection(smb_conn->connection, reason); } -/* - called on a fatal error that should cause this server to terminate -*/ -static void smbsrv_exit(struct server_service *service, const char *reason) -{ - DEBUG(1,("smbsrv_exit\n")); - return; -} +static const struct server_stream_ops *smbsrv_stream_ops(void); /* add a socket address to the list of events, one event per port */ -static void smb_add_socket(struct server_service *service, - const struct model_ops *model_ops, - struct socket_context *socket_ctx, +static void smb_add_socket(struct server_service *service, struct ipv4_addr *ifip) { const char **ports = lp_smb_ports(); @@ -673,7 +664,7 @@ static void smb_add_socket(struct server_service *service, for (i=0;ports[i];i++) { uint16_t port = atoi(ports[i]); if (port == 0) continue; - service_setup_socket(service, model_ops, "ipv4", ip_str, &port); + service_setup_stream_socket(service, smbsrv_stream_ops(), "ipv4", ip_str, &port); } talloc_free(ip_str); @@ -682,7 +673,7 @@ static void smb_add_socket(struct server_service *service, /**************************************************************************** Open the socket communication. ****************************************************************************/ -static void smbsrv_init(struct server_service *service, const struct model_ops *model_ops) +static void smbsrv_init(struct server_service *service) { DEBUG(1,("smbsrv_init\n")); @@ -702,13 +693,13 @@ static void smbsrv_init(struct server_service *service, const struct model_ops * continue; } - smb_add_socket(service, model_ops, NULL, ifip); + smb_add_socket(service, ifip); } } else { struct ipv4_addr ifip; /* Just bind to lp_socket_address() (usually 0.0.0.0) */ ifip = interpret_addr2(lp_socket_address()); - smb_add_socket(service, model_ops, NULL, &ifip); + smb_add_socket(service, &ifip); } } @@ -717,7 +708,7 @@ static void smbsrv_init(struct server_service *service, const struct model_ops * */ static void smbsrv_recv(struct server_connection *conn, struct timeval t, uint16_t flags) { - struct smbsrv_connection *smb_conn = conn->private_data; + struct smbsrv_connection *smb_conn = conn->connection.private_data; NTSTATUS status; DEBUG(10,("smbsrv_recv\n")); @@ -738,7 +729,7 @@ static void smbsrv_recv(struct server_connection *conn, struct timeval t, uint16 */ static void smbsrv_send(struct server_connection *conn, struct timeval t, uint16_t flags) { - struct smbsrv_connection *smb_conn = conn->private_data; + struct smbsrv_connection *smb_conn = conn->connection.private_data; while (smb_conn->pending_send) { struct smbsrv_request *req = smb_conn->pending_send; @@ -776,19 +767,9 @@ static void smbsrv_send(struct server_connection *conn, struct timeval t, uint16 } } -/* - called when connection is idle -*/ -static void smbsrv_idle(struct server_connection *conn, struct timeval t) -{ - DEBUG(10,("smbsrv_idle: not implemented!\n")); - conn->event.idle->next_event = timeval_add(&t, 5, 0); - return; -} - static void smbsrv_close(struct server_connection *conn, const char *reason) { - struct smbsrv_connection *smb_conn = conn->private_data; + struct smbsrv_connection *smb_conn = conn->connection.private_data; DEBUG(5,("smbsrv_close: %s\n",reason)); @@ -818,7 +799,7 @@ void smbd_process_async(struct smbsrv_connection *smb_conn) initialise a server_context from a open socket and register a event handler for reading from that socket */ -void smbsrv_accept(struct server_connection *conn) +static void smbsrv_accept(struct server_connection *conn) { struct smbsrv_connection *smb_conn; @@ -827,10 +808,6 @@ void smbsrv_accept(struct server_connection *conn) smb_conn = talloc_zero_p(conn, struct smbsrv_connection); if (!smb_conn) return; - smb_conn->pid = getpid(); - - sub_set_context(&smb_conn->substitute); - /* now initialise a few default values associated with this smb socket */ smb_conn->negotiate.max_send = 0xFFFF; @@ -848,20 +825,29 @@ void smbsrv_accept(struct server_connection *conn) smb_conn->connection = conn; - conn->private_data = smb_conn; + conn->connection.private_data = smb_conn; return; } -static const struct server_service_ops smb_server_ops = { +static const struct server_stream_ops smb_stream_ops = { .name = "smb", - .service_init = smbsrv_init, + .socket_init = NULL, .accept_connection = smbsrv_accept, .recv_handler = smbsrv_recv, .send_handler = smbsrv_send, - .idle_handler = smbsrv_idle, - .close_connection = smbsrv_close, - .service_exit = smbsrv_exit, + .idle_handler = NULL, + .close_connection = smbsrv_close +}; + +static const struct server_stream_ops *smbsrv_stream_ops(void) +{ + return &smb_stream_ops; +} + +static const struct server_service_ops smb_server_ops = { + .name = "smb", + .service_init = smbsrv_init, }; const struct server_service_ops *smbsrv_get_ops(void) -- cgit From 759da3b915e2006d4c87b5ace47f399accd9ce91 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 27 Jan 2005 07:08:20 +0000 Subject: r5037: got rid of all of the TALLOC_DEPRECATED stuff. My apologies for the large commit. I thought this was worthwhile to get done for consistency. (This used to be commit ec32b22ed5ec224f6324f5e069d15e92e38e15c0) --- source4/smb_server/smb_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 1cbc831a17..394923635d 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -80,7 +80,7 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn, struct t return NT_STATUS_NO_MEMORY; } - req->in.buffer = talloc_array_p(req, uint8_t, NBT_HDR_SIZE); + req->in.buffer = talloc_array(req, uint8_t, NBT_HDR_SIZE); if (req->in.buffer == NULL) { talloc_free(req); return NT_STATUS_NO_MEMORY; @@ -805,7 +805,7 @@ static void smbsrv_accept(struct server_connection *conn) DEBUG(5,("smbsrv_accept\n")); - smb_conn = talloc_zero_p(conn, struct smbsrv_connection); + smb_conn = talloc_zero(conn, struct smbsrv_connection); if (!smb_conn) return; /* now initialise a few default values associated with this smb socket */ -- cgit From 55d4d36993293fee914a009f1d8f05810e347f2b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 30 Jan 2005 00:54:57 +0000 Subject: r5102: This is a major simplification of the logic for controlling top level servers in smbd. The old code still contained a fairly bit of legacy from the time when smbd was only handling SMB connection. The new code gets rid of all of the smb_server specific code in smbd/, and creates a much simpler infrastructures for new server code. Major changes include: - simplified the process model code a lot. - got rid of the top level server and service structures completely. The top level context is now the event_context. This got rid of service.h and server.h completely (they were the most confusing parts of the old code) - added service_stream.[ch] for the helper functions that are specific to stream type services (services that handle streams, and use a logically separate process per connection) - got rid of the builtin idle_handler code in the service logic, as none of the servers were using it, and it can easily be handled by a server in future by adding its own timed_event to the event context. - fixed some major memory leaks in the rpc server code. - added registration of servers, rather than hard coding our list of possible servers. This allows for servers as modules in the future. - temporarily disabled the winbind code until I add the helper functions for that type of server - added error checking on service startup. If a configured server fails to startup then smbd doesn't startup. - cleaned up the command line handling in smbd, removing unused options (This used to be commit cf6a46c3cbde7b1eb1b86bd3882b953a2de3a42e) --- source4/smb_server/smb_server.c | 165 ++++++++++++++-------------------------- 1 file changed, 59 insertions(+), 106 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 394923635d..1537bf6a47 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -24,6 +24,7 @@ #include "events.h" #include "system/time.h" #include "dlinklist.h" +#include "smbd/service_stream.h" #include "smb_server/smb_server.h" @@ -506,7 +507,7 @@ static void switch_message(int type, struct smbsrv_request *req) session_tag = req->session->vuid; } - DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), req->smb_conn->connection->connection.id)); + DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), req->smb_conn->connection->server_id)); /* does this protocol need a valid tree connection? */ if ((flags & AS_USER) && !req->tcon) { @@ -646,69 +647,15 @@ error: */ void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char *reason) { - server_terminate_connection(smb_conn->connection, reason); -} - -static const struct server_stream_ops *smbsrv_stream_ops(void); - -/* - add a socket address to the list of events, one event per port -*/ -static void smb_add_socket(struct server_service *service, - struct ipv4_addr *ifip) -{ - const char **ports = lp_smb_ports(); - int i; - char *ip_str = talloc_strdup(service, sys_inet_ntoa(*ifip)); - - for (i=0;ports[i];i++) { - uint16_t port = atoi(ports[i]); - if (port == 0) continue; - service_setup_stream_socket(service, smbsrv_stream_ops(), "ipv4", ip_str, &port); - } - - talloc_free(ip_str); -} - -/**************************************************************************** - Open the socket communication. -****************************************************************************/ -static void smbsrv_init(struct server_service *service) -{ - DEBUG(1,("smbsrv_init\n")); - - if (lp_interfaces() && lp_bind_interfaces_only()) { - int num_interfaces = iface_count(); - int i; - - /* We have been given an interfaces line, and been - told to only bind to those interfaces. Create a - socket per interface and bind to only these. - */ - for(i = 0; i < num_interfaces; i++) { - struct ipv4_addr *ifip = iface_n_ip(i); - - if (ifip == NULL) { - DEBUG(0,("open_sockets_smbd: interface %d has NULL IP address !\n", i)); - continue; - } - - smb_add_socket(service, ifip); - } - } else { - struct ipv4_addr ifip; - /* Just bind to lp_socket_address() (usually 0.0.0.0) */ - ifip = interpret_addr2(lp_socket_address()); - smb_add_socket(service, &ifip); - } + stream_terminate_connection(smb_conn->connection, reason); } /* called when a SMB socket becomes readable */ -static void smbsrv_recv(struct server_connection *conn, struct timeval t, uint16_t flags) +static void smbsrv_recv(struct stream_connection *conn, struct timeval t, uint16_t flags) { - struct smbsrv_connection *smb_conn = conn->connection.private_data; + struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, struct smbsrv_connection); NTSTATUS status; DEBUG(10,("smbsrv_recv\n")); @@ -727,9 +674,9 @@ static void smbsrv_recv(struct server_connection *conn, struct timeval t, uint16 /* called when a SMB socket becomes writable */ -static void smbsrv_send(struct server_connection *conn, struct timeval t, uint16_t flags) +static void smbsrv_send(struct stream_connection *conn, struct timeval t, uint16_t flags) { - struct smbsrv_connection *smb_conn = conn->connection.private_data; + struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, struct smbsrv_connection); while (smb_conn->pending_send) { struct smbsrv_request *req = smb_conn->pending_send; @@ -767,39 +714,11 @@ static void smbsrv_send(struct server_connection *conn, struct timeval t, uint16 } } -static void smbsrv_close(struct server_connection *conn, const char *reason) -{ - struct smbsrv_connection *smb_conn = conn->connection.private_data; - - DEBUG(5,("smbsrv_close: %s\n",reason)); - - talloc_free(smb_conn); - - return; -} - -/* - process a message from an SMB socket while still processing a - previous message this is used by backends who need to ensure that - new messages from clients are still processed while they are - performing long operations -*/ -void smbd_process_async(struct smbsrv_connection *smb_conn) -{ - NTSTATUS status; - - status = receive_smb_request(smb_conn, timeval_current()); - if (NT_STATUS_IS_ERR(status)) { - smbsrv_terminate_connection(smb_conn, nt_errstr(status)); - } -} - - /* initialise a server_context from a open socket and register a event handler for reading from that socket */ -static void smbsrv_accept(struct server_connection *conn) +static void smbsrv_accept(struct stream_connection *conn) { struct smbsrv_connection *smb_conn; @@ -825,37 +744,71 @@ static void smbsrv_accept(struct server_connection *conn) smb_conn->connection = conn; - conn->connection.private_data = smb_conn; - - return; + conn->private = smb_conn; } -static const struct server_stream_ops smb_stream_ops = { + +static const struct stream_server_ops smb_stream_ops = { .name = "smb", - .socket_init = NULL, .accept_connection = smbsrv_accept, .recv_handler = smbsrv_recv, .send_handler = smbsrv_send, - .idle_handler = NULL, - .close_connection = smbsrv_close }; -static const struct server_stream_ops *smbsrv_stream_ops(void) +/* + setup a listening socket on all the SMB ports for a particular address +*/ +static NTSTATUS smb_add_socket(struct event_context *event_context, + const struct model_ops *model_ops, + const char *address) { - return &smb_stream_ops; + const char **ports = lp_smb_ports(); + int i; + NTSTATUS status; + + for (i=0;ports[i];i++) { + uint16_t port = atoi(ports[i]); + if (port == 0) continue; + status = stream_setup_socket(event_context, model_ops, &smb_stream_ops, + "ipv4", address, &port, NULL); + NT_STATUS_NOT_OK_RETURN(status); + } + + return NT_STATUS_OK; } -static const struct server_service_ops smb_server_ops = { - .name = "smb", - .service_init = smbsrv_init, -}; +/* + called on startup of the smb server service It's job is to start + listening on all configured SMB server sockets +*/ +static NTSTATUS smbsrv_init(struct event_context *event_context, const struct model_ops *model_ops) +{ + NTSTATUS status; -const struct server_service_ops *smbsrv_get_ops(void) -{ - return &smb_server_ops; + if (lp_interfaces() && lp_bind_interfaces_only()) { + int num_interfaces = iface_count(); + int i; + + /* We have been given an interfaces line, and been + told to only bind to those interfaces. Create a + socket per interface and bind to only these. + */ + for(i = 0; i < num_interfaces; i++) { + const char *address = sys_inet_ntoa(*iface_n_ip(i)); + status = smb_add_socket(event_context, model_ops, address); + NT_STATUS_NOT_OK_RETURN(status); + } + } else { + /* Just bind to lp_socket_address() (usually 0.0.0.0) */ + status = smb_add_socket(event_context, model_ops, lp_socket_address()); + NT_STATUS_NOT_OK_RETURN(status); + } + + return NT_STATUS_OK; } +/* called at smbd startup - register ourselves as a server service */ NTSTATUS server_service_smb_init(void) { - return NT_STATUS_OK; + return register_server_service("smb", smbsrv_init); } -- cgit From 66170ef8b36b499aa5b44ef10c1bd362a50f2636 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 3 Feb 2005 02:35:52 +0000 Subject: r5185: make all the events data structures private to events.c. This will make it possible to add optimisations to the events code such as keeping the next timed event in a sorted list, and using epoll for file descriptor events. I also removed the loop events code, as it wasn't being used anywhere, and changed timed events to always be one-shot (as adding a new timed event in the event handler is so easy to do if needed) (This used to be commit d7b4b6de51342a65bf46fce772d313f92f8d73d3) --- source4/smb_server/smb_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 1537bf6a47..5220df034c 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -662,7 +662,7 @@ static void smbsrv_recv(struct stream_connection *conn, struct timeval t, uint16 status = receive_smb_request(smb_conn, t); if (NT_STATUS_IS_ERR(status)) { - conn->event.fde->flags = 0; + talloc_free(conn->event.fde); smbsrv_terminate_connection(smb_conn, nt_errstr(status)); return; } @@ -710,7 +710,7 @@ static void smbsrv_send(struct stream_connection *conn, struct timeval t, uint16 /* if no more requests are pending to be sent then we should stop select for write */ if (smb_conn->pending_send == NULL) { - conn->event.fde->flags &= ~EVENT_FD_WRITE; + EVENT_FD_NOT_WRITEABLE(conn->event.fde); } } -- cgit From a097414ed25873cbcbee48f0a888d36a6b60c10c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 3 Feb 2005 08:20:31 +0000 Subject: r5193: make sure we mark the event dead when we free it on a dead connection (This used to be commit 90535bab957ddaa7bfcdf43e199581f3352bdc8a) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 5220df034c..f1f73014f1 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -663,6 +663,7 @@ static void smbsrv_recv(struct stream_connection *conn, struct timeval t, uint16 status = receive_smb_request(smb_conn, t); if (NT_STATUS_IS_ERR(status)) { talloc_free(conn->event.fde); + conn->event.fde = NULL; smbsrv_terminate_connection(smb_conn, nt_errstr(status)); return; } -- cgit From 0798d54b4fc28be881e2c4012663b1461bc85ba7 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 3 Feb 2005 11:25:52 +0000 Subject: r5195: most events don't need the time of the event, so save a gettimeofday() call and just use timeval_current() when its actually needed (This used to be commit 236403cc4dc2924ed6a898acae0bb44cc1688dcc) --- source4/smb_server/smb_server.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index f1f73014f1..3946e9ab13 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -67,7 +67,7 @@ static void construct_reply(struct smbsrv_request *req); receive a SMB request header from the wire, forming a request_context from the result ****************************************************************************/ -static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn, struct timeval t) +static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn) { NTSTATUS status; ssize_t len; @@ -140,7 +140,7 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn, struct t } /* we have a full packet */ - req->request_time = t; + req->request_time = timeval_current(); req->chained_fnum = -1; req->in.allocated = req->in.size; req->in.hdr = req->in.buffer + NBT_HDR_SIZE; @@ -653,14 +653,14 @@ void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char /* called when a SMB socket becomes readable */ -static void smbsrv_recv(struct stream_connection *conn, struct timeval t, uint16_t flags) +static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) { struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, struct smbsrv_connection); NTSTATUS status; DEBUG(10,("smbsrv_recv\n")); - status = receive_smb_request(smb_conn, t); + status = receive_smb_request(smb_conn); if (NT_STATUS_IS_ERR(status)) { talloc_free(conn->event.fde); conn->event.fde = NULL; @@ -675,7 +675,7 @@ static void smbsrv_recv(struct stream_connection *conn, struct timeval t, uint16 /* called when a SMB socket becomes writable */ -static void smbsrv_send(struct stream_connection *conn, struct timeval t, uint16_t flags) +static void smbsrv_send(struct stream_connection *conn, uint16_t flags) { struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, struct smbsrv_connection); -- cgit From 131dc76d56df40b3511c47e54f15412a25b491f8 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 3 Feb 2005 11:56:03 +0000 Subject: r5197: moved events code to lib/events/ (suggestion from metze) (This used to be commit 7f54c8a339f36aa43c9340be70ab7f0067593ef2) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 3946e9ab13..10635f739d 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "events.h" +#include "lib/events/events.h" #include "system/time.h" #include "dlinklist.h" #include "smbd/service_stream.h" -- cgit From b9bb7f596de51496c18580863efbb8ac17c78970 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 10 Feb 2005 03:22:47 +0000 Subject: r5294: - added a separate NBT-WINS test for WINS operations (register, refresh, release and query) - change the iface_n_*() functions to return a "const char *" instead of a "struct ipv4_addr" I think that in general we should move towards "const char *" for all IP addresses, as this makes IPv6 much easier, and is also easier to debug. Andrew, when you get a chance, could you fix some of the auth code to use strings for IPs ? - return a NTSTATUS error on bad name queries and node status instead of using rcode. This makes the calling code simpler. - added low level name release code in libcli/nbt/ - use a real IP in the register and wins nbt torture tests, as w2k3 WINS server silently rejects some operations that don't come from the IP being used (eg. it says "yes" to a release, but does not in fact release the name) (This used to be commit bb1ab11d8e0ea0bd9ae34aebeb565d36fe4b495f) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 10635f739d..11fe965a92 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -795,7 +795,7 @@ static NTSTATUS smbsrv_init(struct event_context *event_context, const struct mo socket per interface and bind to only these. */ for(i = 0; i < num_interfaces; i++) { - const char *address = sys_inet_ntoa(*iface_n_ip(i)); + const char *address = iface_n_ip(i); status = smb_add_socket(event_context, model_ops, address); NT_STATUS_NOT_OK_RETURN(status); } -- cgit From 20841a25ad2a45ec920d9ad41f1279cbe2aa196f Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Sun, 10 Apr 2005 07:39:51 +0000 Subject: r6270: Move the VUID handling to a IDR tree. This should avoid O(n) behaviour on session setups, and because we no longer need do deal with the linked list as much, the code is much simpiler too. We may be able to compleatly remove the tid and vuid linked lists, but I need to check. This patch also tries to clean up the VUID handling and session setups in general. To avoid security issues, we now have a distinction between VUIDs allocated for the session setup (to tie togeather the multiple round trips) and those used after authentication. Andrew Bartlett (This used to be commit 3e5775146d9ce6f0ac43aecae7e899b5324399ad) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 11fe965a92..6261621886 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -737,7 +737,7 @@ static void smbsrv_accept(struct stream_connection *conn) smb_conn->negotiate.zone_offset = get_time_zone(time(NULL)); - smb_conn->sessions.next_vuid = VUID_OFFSET; + smbsrv_vuid_init(smb_conn); srv_init_signing(smb_conn); -- cgit From 76d3439c4b23d58e0ee57f8f3394c28ed343f5bc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 12 Jun 2005 12:24:54 +0000 Subject: r7510: fixed error code for using a bad tid. amazingly, I have seen w2k do a session setup followed by an immediate attempted opening of \netlogon, with no tconx to ipc$ first. So this error code can matter. (This used to be commit 79112d81cb9ea3fc7e94be1af282ab4247170532) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 6261621886..86aa46ba9a 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -511,7 +511,7 @@ static void switch_message(int type, struct smbsrv_request *req) /* does this protocol need a valid tree connection? */ if ((flags & AS_USER) && !req->tcon) { - req_reply_error(req, NT_STATUS_INVALID_HANDLE); + req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRinvnid)); return; } -- cgit From 8f31f8c57e9147a3b073347153f5724e2267b1bc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 13 Jun 2005 07:11:29 +0000 Subject: r7523: blergh the error code for an invalid tid depends on the command (This used to be commit 9dab036fbe50d84cb79d7a103c454a1c0c90a48a) --- source4/smb_server/smb_server.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 86aa46ba9a..3b4d06f3b2 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -511,7 +511,12 @@ static void switch_message(int type, struct smbsrv_request *req) /* does this protocol need a valid tree connection? */ if ((flags & AS_USER) && !req->tcon) { - req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRinvnid)); + if (type == SMBntcreateX) { + /* amazingly, the error code depends on the command */ + req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRinvnid)); + } else { + req_reply_error(req, NT_STATUS_INVALID_HANDLE); + } return; } -- cgit From 3dd67b97468e86a88bc151a8b4f206c1722a8d8b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 20 Jun 2005 08:47:52 +0000 Subject: r7782: fixed an ordering problem with smb requests. I found this when I had "sam database" set to the internal ldap server over loopback. The following happened: - DCERPC_AUTH3 request - auth requests calls ldb - ldb calls ldap - ldap calls our internal ldap server, triggering events - samrConnect from client - connect refused - SMBclose from client - causes dcerpc_pipe to be destroyed - AUTH3 continues - dies on freed pipe I chose this solution as it provides a guarantee that backends only have to think about async issues when they mark a request async. When they don't, this code guarantees that a second request won't happen on the same connection while processing the first one (This used to be commit 45487e8a1402c64d1c314befe8bd9f65587fd0d6) --- source4/smb_server/smb_server.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 3b4d06f3b2..7e0aa2c0cb 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -665,7 +665,18 @@ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) DEBUG(10,("smbsrv_recv\n")); + /* our backends are designed to process one request at a time, + unless they deliberately mark the request as async and + process it later on a timer or other event. This enforces + that ordering. */ + if (smb_conn->processing) { + EVENT_FD_NOT_READABLE(conn->event.fde); + return; + } + + smb_conn->processing = True; status = receive_smb_request(smb_conn); + smb_conn->processing = False; if (NT_STATUS_IS_ERR(status)) { talloc_free(conn->event.fde); conn->event.fde = NULL; @@ -673,6 +684,8 @@ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) return; } + EVENT_FD_READABLE(conn->event.fde); + /* free up temporary memory */ lp_talloc_free(); } @@ -749,6 +762,7 @@ static void smbsrv_accept(struct stream_connection *conn) smbsrv_tcon_init(smb_conn); smb_conn->connection = conn; + smb_conn->processing = False; conn->private = smb_conn; } -- cgit From f39440e060ffa94fd572568a717284fa0f8f3fca Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 24 Jun 2005 00:05:41 +0000 Subject: r7857: improved the handling of end-of-file on sockets in the smb server (This used to be commit 6ee98c5f6505824826955f9d60a7964471fa6c26) --- source4/smb_server/smb_server.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 7e0aa2c0cb..f891fd892c 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -101,9 +101,12 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn) if (NT_STATUS_IS_ERR(status)) { return status; } - if (nread == 0) { + if (!NT_STATUS_IS_OK(status)) { return NT_STATUS_OK; } + if (nread == 0) { + return NT_STATUS_END_OF_FILE; + } req->in.size += nread; /* when we have a full NBT header, then allocate the packet */ @@ -129,9 +132,12 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn) if (NT_STATUS_IS_ERR(status)) { return status; } - if (nread == 0) { + if (!NT_STATUS_IS_OK(status)) { return NT_STATUS_OK; } + if (nread == 0) { + return NT_STATUS_END_OF_FILE; + } req->in.size += nread; -- cgit From 8086371dbfe232bc3c3752f9aa9b7d2ad2de45bf Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 4 Jul 2005 05:07:18 +0000 Subject: r8119: fixed two error code returns in the smb server now that we have torture code that can tell the difference between dos and ntstatus codes without mapping (This used to be commit 5521060c089c2181a2f3c7aeabd2f3ba813c6e60) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index f891fd892c..550234e1da 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -528,7 +528,7 @@ static void switch_message(int type, struct smbsrv_request *req) /* see if the vuid is valid */ if ((flags & AS_USER) && !req->session) { - req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRbaduid)); + req_reply_error(req, NT_STATUS_INVALID_HANDLE); return; } -- cgit From c6881d1e650fd284a366af76f5a214a5de05cc0c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 10 Jul 2005 01:08:10 +0000 Subject: r8272: added the hooks for adding a name to a messaging context, so we will be able to send a message to the "ldap_server" task without having to know its task ID. (This used to be commit 8f69867867857e0c9a9246c2dec9612ccc234724) --- source4/smb_server/smb_server.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 550234e1da..539627f361 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -26,6 +26,7 @@ #include "dlinklist.h" #include "smbd/service_stream.h" #include "smb_server/smb_server.h" +#include "lib/messaging/irpc.h" /* @@ -771,6 +772,8 @@ static void smbsrv_accept(struct stream_connection *conn) smb_conn->processing = False; conn->private = smb_conn; + + irpc_add_name(conn->msg_ctx, "smb_server"); } -- cgit From 25428433e3e279491f0b6f73e2489140517ae454 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 19 Jul 2005 03:58:44 +0000 Subject: r8574: added server side irpc calls for listing the current sessions (This used to be commit 391cfe3c9645a19f8f5ff5c11b1ac03ee0b10f8f) --- source4/smb_server/smb_server.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 539627f361..86e31f7fd8 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -774,6 +774,8 @@ static void smbsrv_accept(struct stream_connection *conn) conn->private = smb_conn; irpc_add_name(conn->msg_ctx, "smb_server"); + + smbsrv_management_init(smb_conn); } -- cgit From 4327a3f1ba274d111ec4ffe4989abc879803a714 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 21 Jul 2005 01:43:26 +0000 Subject: r8658: move use of lp_security() and lp_nt_status_support() into the connection structure. This massively reduces the number of lp_*() calls made (This used to be commit b1d577f48d31c0c17ad0b6abd78120087408e58d) --- source4/smb_server/smb_server.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 86e31f7fd8..b632bfefd2 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -500,7 +500,7 @@ static void switch_message(int type, struct smbsrv_request *req) chaining) */ /* In share mode security we must ignore the vuid. */ - if (lp_security() == SEC_SHARE) { + if (smb_conn->config.security == SEC_SHARE) { session_tag = UID_FIELD_INVALID; } else { session_tag = SVAL(req->in.hdr,HDR_UID); @@ -770,6 +770,8 @@ static void smbsrv_accept(struct stream_connection *conn) smb_conn->connection = conn; smb_conn->processing = False; + smb_conn->config.security = lp_security(); + smb_conn->config.nt_status_support = lp_nt_status_support(); conn->private = smb_conn; -- cgit From 1f467c50d945a24d2885e5bb894676a26f94b86e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 1 Aug 2005 19:48:16 +0000 Subject: r8893: fixed the valgrind error on stream termination due to prototol errors (This used to be commit cf1a7bbe96e8e40ac4df3eaa3e5922a944b45579) --- source4/smb_server/smb_server.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index b632bfefd2..d1fdd2b116 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -659,7 +659,7 @@ error: */ void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char *reason) { - stream_terminate_connection(smb_conn->connection, reason); + smb_conn->terminate = True; } /* @@ -684,10 +684,10 @@ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) smb_conn->processing = True; status = receive_smb_request(smb_conn); smb_conn->processing = False; - if (NT_STATUS_IS_ERR(status)) { + if (NT_STATUS_IS_ERR(status) || smb_conn->terminate) { talloc_free(conn->event.fde); conn->event.fde = NULL; - smbsrv_terminate_connection(smb_conn, nt_errstr(status)); + stream_terminate_connection(smb_conn->connection, nt_errstr(status)); return; } @@ -717,7 +717,7 @@ static void smbsrv_send(struct stream_connection *conn, uint16_t flags) status = socket_send(conn->socket, &blob, &sendlen, 0); if (NT_STATUS_IS_ERR(status)) { smbsrv_terminate_connection(req->smb_conn, nt_errstr(status)); - return; + break; } if (sendlen == 0) { break; @@ -733,6 +733,11 @@ static void smbsrv_send(struct stream_connection *conn, uint16_t flags) } } + if (smb_conn->terminate) { + stream_terminate_connection(smb_conn->connection, "send termination"); + return; + } + /* if no more requests are pending to be sent then we should stop select for write */ if (smb_conn->pending_send == NULL) { -- cgit From 18bb363537cf486002ce83a12c824b32adbb6470 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 12 Oct 2005 22:25:51 +0000 Subject: r10946: Use the right name for the remote workstation, and always initialise it. Should fix a valgrind error volker is seeing. Andrew Bartlett (This used to be commit 11957c5f37fe0a0be465a9ce9d6d256724c5951c) --- source4/smb_server/smb_server.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index d1fdd2b116..ccfc6c9c7b 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -767,6 +767,9 @@ static void smbsrv_accept(struct stream_connection *conn) smb_conn->negotiate.zone_offset = get_time_zone(time(NULL)); + smb_conn->negotiate.called_name = NULL; + smb_conn->negotiate.calling_name = NULL; + smbsrv_vuid_init(smb_conn); srv_init_signing(smb_conn); -- cgit From 7e963eb6e7a06d0b45609a3fb7ab3e757e5920a0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Nov 2005 10:51:26 +0000 Subject: r11603: converted the smb server to use the new generic packet code (This used to be commit 0fc496bb6f520ddf6d85cc2f3df80f93b871cfe9) --- source4/smb_server/smb_server.c | 129 ++++++++++------------------------------ 1 file changed, 33 insertions(+), 96 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index ccfc6c9c7b..0cdc2dc7e4 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -27,6 +27,7 @@ #include "smbd/service_stream.h" #include "smb_server/smb_server.h" #include "lib/messaging/irpc.h" +#include "lib/stream/packet.h" /* @@ -68,85 +69,18 @@ static void construct_reply(struct smbsrv_request *req); receive a SMB request header from the wire, forming a request_context from the result ****************************************************************************/ -static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn) +static NTSTATUS receive_smb_request(void *private, DATA_BLOB blob) { - NTSTATUS status; - ssize_t len; + struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection); struct smbsrv_request *req; - size_t nread; - - /* allocate the request if needed */ - if (smb_conn->partial_req == NULL) { - req = init_smb_request(smb_conn); - if (req == NULL) { - return NT_STATUS_NO_MEMORY; - } - - req->in.buffer = talloc_array(req, uint8_t, NBT_HDR_SIZE); - if (req->in.buffer == NULL) { - talloc_free(req); - return NT_STATUS_NO_MEMORY; - } - req->in.size = 0; - smb_conn->partial_req = req; - } - - req = smb_conn->partial_req; - - /* read in the header */ - if (req->in.size < NBT_HDR_SIZE) { - status = socket_recv(smb_conn->connection->socket, - req->in.buffer + req->in.size, - NBT_HDR_SIZE - req->in.size, - &nread, 0); - if (NT_STATUS_IS_ERR(status)) { - return status; - } - if (!NT_STATUS_IS_OK(status)) { - return NT_STATUS_OK; - } - if (nread == 0) { - return NT_STATUS_END_OF_FILE; - } - req->in.size += nread; - - /* when we have a full NBT header, then allocate the packet */ - if (req->in.size == NBT_HDR_SIZE) { - len = smb_len(req->in.buffer) + NBT_HDR_SIZE; - req->in.buffer = talloc_realloc(req, req->in.buffer, - uint8_t, len); - if (req->in.buffer == NULL) { - return NT_STATUS_NO_MEMORY; - } - } else { - return NT_STATUS_OK; - } - } - - /* read in the main packet */ - len = smb_len(req->in.buffer) + NBT_HDR_SIZE; - - status = socket_recv(smb_conn->connection->socket, - req->in.buffer + req->in.size, - len - req->in.size, - &nread, 0); - if (NT_STATUS_IS_ERR(status)) { - return status; - } - if (!NT_STATUS_IS_OK(status)) { - return NT_STATUS_OK; - } - if (nread == 0) { - return NT_STATUS_END_OF_FILE; - } - - req->in.size += nread; - if (req->in.size != len) { - return NT_STATUS_OK; + req = init_smb_request(smb_conn); + if (req == NULL) { + return NT_STATUS_NO_MEMORY; } - /* we have a full packet */ + req->in.buffer = talloc_steal(req, blob.data); + req->in.size = blob.length; req->request_time = timeval_current(); req->chained_fnum = -1; req->in.allocated = req->in.size; @@ -171,8 +105,6 @@ static NTSTATUS receive_smb_request(struct smbsrv_connection *smb_conn) } } - smb_conn->partial_req = NULL; - construct_reply(req); return NT_STATUS_OK; @@ -659,7 +591,7 @@ error: */ void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char *reason) { - smb_conn->terminate = True; + smb_conn->terminate = reason; } /* @@ -668,31 +600,17 @@ void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) { struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, struct smbsrv_connection); - NTSTATUS status; DEBUG(10,("smbsrv_recv\n")); - /* our backends are designed to process one request at a time, - unless they deliberately mark the request as async and - process it later on a timer or other event. This enforces - that ordering. */ - if (smb_conn->processing) { - EVENT_FD_NOT_READABLE(conn->event.fde); - return; - } - - smb_conn->processing = True; - status = receive_smb_request(smb_conn); - smb_conn->processing = False; - if (NT_STATUS_IS_ERR(status) || smb_conn->terminate) { + packet_recv(smb_conn->packet); + if (smb_conn->terminate) { talloc_free(conn->event.fde); conn->event.fde = NULL; - stream_terminate_connection(smb_conn->connection, nt_errstr(status)); + stream_terminate_connection(smb_conn->connection, smb_conn->terminate); return; } - EVENT_FD_READABLE(conn->event.fde); - /* free up temporary memory */ lp_talloc_free(); } @@ -734,7 +652,7 @@ static void smbsrv_send(struct stream_connection *conn, uint16_t flags) } if (smb_conn->terminate) { - stream_terminate_connection(smb_conn->connection, "send termination"); + stream_terminate_connection(smb_conn->connection, smb_conn->terminate); return; } @@ -745,6 +663,17 @@ static void smbsrv_send(struct stream_connection *conn, uint16_t flags) } } + +/* + handle socket recv errors +*/ +static void smbsrv_recv_error(void *private, NTSTATUS status) +{ + struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection); + + smbsrv_terminate_connection(smb_conn, nt_errstr(status)); +} + /* initialise a server_context from a open socket and register a event handler for reading from that socket @@ -770,6 +699,15 @@ static void smbsrv_accept(struct stream_connection *conn) smb_conn->negotiate.called_name = NULL; smb_conn->negotiate.calling_name = NULL; + smb_conn->packet = packet_init(smb_conn); + packet_set_private(smb_conn->packet, smb_conn); + packet_set_socket(smb_conn->packet, conn->socket); + packet_set_callback(smb_conn->packet, receive_smb_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_serialise(smb_conn->packet, conn->event.fde); + smbsrv_vuid_init(smb_conn); srv_init_signing(smb_conn); @@ -777,7 +715,6 @@ static void smbsrv_accept(struct stream_connection *conn) smbsrv_tcon_init(smb_conn); smb_conn->connection = conn; - smb_conn->processing = False; smb_conn->config.security = lp_security(); smb_conn->config.nt_status_support = lp_nt_status_support(); -- cgit From 5c620048e30e1820d688084a83163f2fe6d1a63a Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 9 Nov 2005 13:42:56 +0000 Subject: r11607: switched the smb server to use the generic packet send code (This used to be commit 9eee7bafa12553a894536db8ce5cc2d268e09ae6) --- source4/smb_server/smb_server.c | 44 +++-------------------------------------- 1 file changed, 3 insertions(+), 41 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 0cdc2dc7e4..6d2ffc0274 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -620,47 +620,9 @@ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) */ static void smbsrv_send(struct stream_connection *conn, uint16_t flags) { - struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, struct smbsrv_connection); - - while (smb_conn->pending_send) { - struct smbsrv_request *req = smb_conn->pending_send; - DATA_BLOB blob; - NTSTATUS status; - size_t sendlen; - - blob.data = req->out.buffer; - blob.length = req->out.size; - - /* send as much of this request as we can */ - status = socket_send(conn->socket, &blob, &sendlen, 0); - if (NT_STATUS_IS_ERR(status)) { - smbsrv_terminate_connection(req->smb_conn, nt_errstr(status)); - break; - } - if (sendlen == 0) { - break; - } - - req->out.buffer += sendlen; - req->out.size -= sendlen; - - /* is the whole request gone? */ - if (req->out.size == 0) { - DLIST_REMOVE(smb_conn->pending_send, req); - req_destroy(req); - } - } - - if (smb_conn->terminate) { - stream_terminate_connection(smb_conn->connection, smb_conn->terminate); - return; - } - - /* if no more requests are pending to be sent then - we should stop select for write */ - if (smb_conn->pending_send == NULL) { - EVENT_FD_NOT_WRITEABLE(conn->event.fde); - } + struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, + struct smbsrv_connection); + packet_queue_run(smb_conn->packet); } -- cgit From b8f4d22ab5f5b93a6cf36d82d70843bfd106968b Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 10 Nov 2005 00:36:53 +0000 Subject: r11621: some minor fixes from comments by metze (This used to be commit 6ab808223475ba7c52dbe4d639af9a8e7f64b202) --- source4/smb_server/smb_server.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 6d2ffc0274..0ec15aea56 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -662,6 +662,10 @@ static void smbsrv_accept(struct stream_connection *conn) 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"); + return; + } packet_set_private(smb_conn->packet, smb_conn); packet_set_socket(smb_conn->packet, conn->socket); packet_set_callback(smb_conn->packet, receive_smb_request); -- cgit From a2d2128b8a555f3434324ccd93ff72d918825bd3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 10 Nov 2005 12:25:46 +0000 Subject: r11637: we need a session and a tcon for ntioctl() and ntrename() metze (This used to be commit 3389544c2b14a044aed4a6d0ff966c0a2d92a61a) --- source4/smb_server/smb_server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 0ec15aea56..c8d411af16 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -166,7 +166,7 @@ static const struct smb_message_struct /* 0x24 */ { "SMBlockingX",reply_lockingX,AS_USER}, /* 0x25 */ { "SMBtrans",reply_trans,AS_USER}, /* 0x26 */ { "SMBtranss",reply_transs,AS_USER}, -/* 0x27 */ { "SMBioctl",reply_ioctl,0}, +/* 0x27 */ { "SMBioctl",reply_ioctl,AS_USER}, /* 0x28 */ { "SMBioctls",NULL,AS_USER}, /* 0x29 */ { "SMBcopy",reply_copy,AS_USER}, /* 0x2a */ { "SMBmove",NULL,AS_USER}, @@ -291,8 +291,8 @@ static const struct smb_message_struct /* 0xa1 */ { "SMBnttranss", reply_nttranss, AS_USER}, /* 0xa2 */ { "SMBntcreateX", reply_ntcreate_and_X, AS_USER}, /* 0xa3 */ { NULL, NULL, 0 }, -/* 0xa4 */ { "SMBntcancel", reply_ntcancel, 0 }, -/* 0xa5 */ { "SMBntrename", reply_ntrename, 0 }, +/* 0xa4 */ { "SMBntcancel", reply_ntcancel, 0}, +/* 0xa5 */ { "SMBntrename", reply_ntrename, AS_USER}, /* 0xa6 */ { NULL, NULL, 0 }, /* 0xa7 */ { NULL, NULL, 0 }, /* 0xa8 */ { NULL, NULL, 0 }, -- cgit From 389f9dff294310757c8d7bf71bbd403b9ed07b8a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 10 Nov 2005 12:59:15 +0000 Subject: r11640: just a nicer format, and make adding more special cases easier metze (This used to be commit 5fb5d1a864d9df0ac82fca145b51fdb27406bc97) --- source4/smb_server/smb_server.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index c8d411af16..0a28023e46 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -450,11 +450,14 @@ static void switch_message(int type, struct smbsrv_request *req) /* does this protocol need a valid tree connection? */ if ((flags & AS_USER) && !req->tcon) { - if (type == SMBntcreateX) { - /* amazingly, the error code depends on the command */ - req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRinvnid)); - } else { - req_reply_error(req, NT_STATUS_INVALID_HANDLE); + /* amazingly, the error code depends on the command */ + switch (type) { + case SMBntcreateX: + req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRinvnid)); + break; + default: + req_reply_error(req, NT_STATUS_INVALID_HANDLE); + break; } return; } -- cgit From 92b9b83b70aef5ec77f3944f495205c107c6921a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 10 Nov 2005 16:16:09 +0000 Subject: r11650: - as every call that goes down to the ntvfs layer need a valid tcon and session ntcancel also needs to have AS_USER - move the SIGNING_NO_REPLY logic as global option, because this needs to be set for the error replies too. - as we currently don't know how to generate signatures for ntcancel replies we just skip the sending of the reply - w2k3 first checks the VUID and then the TID, so we do now - ntcreateX also uses ERRbaduid when getting a wrong VUID metze (This used to be commit d677ebf43d0d7e679ff11862683c993d887d9441) --- source4/smb_server/smb_server.c | 59 +++++++++++++++++++++++++++++++++++------ 1 file changed, 51 insertions(+), 8 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 0a28023e46..1467beccac 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -114,6 +114,7 @@ static NTSTATUS receive_smb_request(void *private, DATA_BLOB blob) These flags determine some of the permissions required to do an operation */ #define AS_USER (1<<0) +#define SIGNING_NO_REPLY (1<<1) /* define a list of possible SMB messages and their corresponding @@ -291,7 +292,7 @@ static const struct smb_message_struct /* 0xa1 */ { "SMBnttranss", reply_nttranss, AS_USER}, /* 0xa2 */ { "SMBntcreateX", reply_ntcreate_and_X, AS_USER}, /* 0xa3 */ { NULL, NULL, 0 }, -/* 0xa4 */ { "SMBntcancel", reply_ntcancel, 0}, +/* 0xa4 */ { "SMBntcancel", reply_ntcancel, AS_USER|SIGNING_NO_REPLY}, /* 0xa5 */ { "SMBntrename", reply_ntrename, AS_USER}, /* 0xa6 */ { NULL, NULL, 0 }, /* 0xa7 */ { NULL, NULL, 0 }, @@ -411,6 +412,7 @@ static void switch_message(int type, struct smbsrv_request *req) int flags; struct smbsrv_connection *smb_conn = req->smb_conn; uint16_t session_tag; + NTSTATUS status; type &= 0xff; @@ -448,23 +450,64 @@ static void switch_message(int type, struct smbsrv_request *req) DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), req->smb_conn->connection->server_id)); - /* does this protocol need a valid tree connection? */ - if ((flags & AS_USER) && !req->tcon) { + /* this must be called before we do any reply */ + if (flags & SIGNING_NO_REPLY) { + req_signing_no_reply(req); + } + + /* see if the vuid is valid */ + if ((flags & AS_USER) && !req->session) { /* amazingly, the error code depends on the command */ switch (type) { case SMBntcreateX: - req_reply_error(req, NT_STATUS_DOS(ERRSRV, ERRinvnid)); + case SMBntcancel: + status = NT_STATUS_DOS(ERRSRV, ERRbaduid); break; default: - req_reply_error(req, NT_STATUS_INVALID_HANDLE); + status = NT_STATUS_INVALID_HANDLE; break; } + /* + * TODO: + * don't know how to handle smb signing for this case + * so just skip the reply + */ + if ((flags & SIGNING_NO_REPLY) && + (req->smb_conn->signing.signing_state != SMB_SIGNING_ENGINE_OFF)) { + DEBUG(1,("SKIP ERROR REPLY: %s %s because of unknown smb signing case\n", + smb_fn_name(type), nt_errstr(status))); + req_destroy(req); + return; + } + req_reply_error(req, status); return; } - /* see if the vuid is valid */ - if ((flags & AS_USER) && !req->session) { - req_reply_error(req, NT_STATUS_INVALID_HANDLE); + /* does this protocol need a valid tree connection? */ + if ((flags & AS_USER) && !req->tcon) { + /* amazingly, the error code depends on the command */ + switch (type) { + case SMBntcreateX: + case SMBntcancel: + status = NT_STATUS_DOS(ERRSRV, ERRinvnid); + break; + default: + status = NT_STATUS_INVALID_HANDLE; + break; + } + /* + * TODO: + * don't know how to handle smb signing for this case + * so just skip the reply + */ + if ((flags & SIGNING_NO_REPLY) && + (req->smb_conn->signing.signing_state != SMB_SIGNING_ENGINE_OFF)) { + DEBUG(1,("SKIP ERROR REPLY: %s %s because of unknown smb signing case\n", + smb_fn_name(type), nt_errstr(status))); + req_destroy(req); + return; + } + req_reply_error(req, status); return; } -- cgit From 614950aed35353854019db5cccec5b3154643ca3 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 14 Nov 2005 03:45:57 +0000 Subject: r11713: separate out the setting of the fde in the packet context from the enabling of packet serialisation (This used to be commit 6a47cd65a8b588f9ddd375c57caaba08281e7cbb) --- source4/smb_server/smb_server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 1467beccac..8f6accb370 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -718,7 +718,8 @@ static void smbsrv_accept(struct stream_connection *conn) 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_serialise(smb_conn->packet, conn->event.fde); + packet_set_fde(smb_conn->packet, conn->event.fde); + packet_set_serialise(smb_conn->packet); smbsrv_vuid_init(smb_conn); -- cgit From 7dd6e5fe9250b0e8653dd40cc3a84a23f2f71d5a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 14 Nov 2005 13:50:56 +0000 Subject: r11724: - move checks packet size and protocol version, before we create the request structure - move code into one function metze (This used to be commit 96345b1c465c6cdf480f6e49d3c437cfe4d93c2c) --- source4/smb_server/smb_server.c | 107 ++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 53 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 8f6accb370..340674b8df 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -62,8 +62,7 @@ BOOL req_send_oplock_break(struct smbsrv_tcon *tcon, uint16_t fnum, uint8_t leve return True; } - -static void construct_reply(struct smbsrv_request *req); +static void switch_message(int type, struct smbsrv_request *req); /**************************************************************************** receive a SMB request header from the wire, forming a request_context @@ -73,12 +72,40 @@ static NTSTATUS receive_smb_request(void *private, DATA_BLOB blob) { struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection); struct smbsrv_request *req; + uint8_t command; - req = init_smb_request(smb_conn); - if (req == NULL) { - return NT_STATUS_NO_MEMORY; + /* see if its a special NBT packet */ + if (CVAL(blob.data, 0) != 0) { + req = init_smb_request(smb_conn); + NT_STATUS_HAVE_NO_MEMORY(req); + + ZERO_STRUCT(req->in); + + req->in.buffer = talloc_steal(req, blob.data); + req->in.size = blob.length; + req->request_time = timeval_current(); + + reply_special(req); + return NT_STATUS_OK; } + if ((NBT_HDR_SIZE + MIN_SMB_SIZE) > blob.length) { + DEBUG(2,("Invalid SMB packet: length %d\n", blob.length)); + smbsrv_terminate_connection(smb_conn, "Invalid SMB packet"); + return NT_STATUS_OK; + } + + /* Make sure this is an SMB packet */ + if (IVAL(blob.data, NBT_HDR_SIZE) != SMB_MAGIC) { + DEBUG(2,("Non-SMB packet of length %d. Terminating connection\n", + blob.length)); + smbsrv_terminate_connection(smb_conn, "Non-SMB packet"); + return NT_STATUS_OK; + } + + req = init_smb_request(smb_conn); + NT_STATUS_HAVE_NO_MEMORY(req); + req->in.buffer = talloc_steal(req, blob.data); req->in.size = blob.length; req->request_time = timeval_current(); @@ -105,8 +132,29 @@ static NTSTATUS receive_smb_request(void *private, DATA_BLOB blob) } } - construct_reply(req); + if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct > req->in.size) { + DEBUG(2,("Invalid SMB word count %d\n", req->in.wct)); + smbsrv_terminate_connection(req->smb_conn, "Invalid SMB packet"); + return NT_STATUS_OK; + } + + if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct + req->in.data_size > req->in.size) { + DEBUG(2,("Invalid SMB buffer length count %d\n", req->in.data_size)); + smbsrv_terminate_connection(req->smb_conn, "Invalid SMB packet"); + return NT_STATUS_OK; + } + + req->flags = CVAL(req->in.hdr, HDR_FLG); + req->flags2 = SVAL(req->in.hdr, HDR_FLG2); + req->smbpid = SVAL(req->in.hdr, HDR_PID); + if (!req_signing_check_incoming(req)) { + req_reply_error(req, NT_STATUS_ACCESS_DENIED); + return NT_STATUS_OK; + } + + command = CVAL(req->in.hdr, HDR_COM); + switch_message(command, req); return NT_STATUS_OK; } @@ -514,53 +562,6 @@ static void switch_message(int type, struct smbsrv_request *req) smb_messages[type].fn(req); } - -/**************************************************************************** - Construct a reply to the incoming packet. -****************************************************************************/ -static void construct_reply(struct smbsrv_request *req) -{ - uint8_t type = CVAL(req->in.hdr,HDR_COM); - - /* see if its a special NBT packet */ - if (CVAL(req->in.buffer,0) != 0) { - reply_special(req); - return; - } - - /* Make sure this is an SMB packet */ - if (memcmp(req->in.hdr,"\377SMB",4) != 0) { - DEBUG(2,("Non-SMB packet of length %d. Terminating connection\n", - req->in.size)); - smbsrv_terminate_connection(req->smb_conn, "Non-SMB packet"); - return; - } - - if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct > req->in.size) { - DEBUG(2,("Invalid SMB word count %d\n", req->in.wct)); - smbsrv_terminate_connection(req->smb_conn, "Invalid SMB packet"); - return; - } - - if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct + req->in.data_size > req->in.size) { - DEBUG(2,("Invalid SMB buffer length count %d\n", req->in.data_size)); - smbsrv_terminate_connection(req->smb_conn, "Invalid SMB packet"); - return; - } - - req->flags = CVAL(req->in.hdr, HDR_FLG); - req->flags2 = SVAL(req->in.hdr, HDR_FLG2); - req->smbpid = SVAL(req->in.hdr,HDR_PID); - - if (!req_signing_check_incoming(req)) { - req_reply_error(req, NT_STATUS_ACCESS_DENIED); - return; - } - - switch_message(type, req); -} - - /* we call this when first first part of a possibly chained request has been completed and we need to call the 2nd part, if any -- cgit From dae30e5b50066d21617dabae4752559dd956c09a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 16 Nov 2005 17:14:16 +0000 Subject: r11744: make sure the session is completed authenticated!!! metze (This used to be commit 0383218a00a8e744b70a3fa5056467a43fbe3a42) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 340674b8df..7e1e8a8f4e 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -504,7 +504,7 @@ static void switch_message(int type, struct smbsrv_request *req) } /* see if the vuid is valid */ - if ((flags & AS_USER) && !req->session) { + if ((flags & AS_USER) && (!req->session || !req->session->finished_sesssetup)) { /* amazingly, the error code depends on the command */ switch (type) { case SMBntcreateX: -- cgit From 27b9d5652ed212fc46ade4339ee167152bd870b3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 16 Nov 2005 18:40:37 +0000 Subject: r11746: revert my last commits, I now understand how we decide between finished and non-finished sessions metze (This used to be commit 7cf6b307bc820b87663e4b9d1aeb5e730729b24e) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 7e1e8a8f4e..340674b8df 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -504,7 +504,7 @@ static void switch_message(int type, struct smbsrv_request *req) } /* see if the vuid is valid */ - if ((flags & AS_USER) && (!req->session || !req->session->finished_sesssetup)) { + if ((flags & AS_USER) && !req->session) { /* amazingly, the error code depends on the command */ switch (type) { case SMBntcreateX: -- cgit From ace255a54b46e04a453f955b72bca4313150eaa7 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 17 Nov 2005 08:00:48 +0000 Subject: r11757: make smb_server.c independent from the protocol metze (This used to be commit b606d5664dde64412dc29c1499322c5de4c262d5) --- source4/smb_server/smb_server.c | 611 +--------------------------------------- 1 file changed, 3 insertions(+), 608 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 340674b8df..060be4eaea 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -1,9 +1,8 @@ /* Unix SMB/CIFS implementation. process incoming packets - main loop - Copyright (C) Andrew Tridgell 1992-2003 - Copyright (C) James J Myers 2003 - Copyright (C) Stefan Metzmacher 2004 + Copyright (C) Andrew Tridgell 2004-2005 + Copyright (C) Stefan Metzmacher 2004-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 @@ -29,610 +28,6 @@ #include "lib/messaging/irpc.h" #include "lib/stream/packet.h" - -/* - send an oplock break request to a client -*/ -BOOL req_send_oplock_break(struct smbsrv_tcon *tcon, uint16_t fnum, uint8_t level) -{ - struct smbsrv_request *req; - - req = init_smb_request(tcon->smb_conn); - - req_setup_reply(req, 8, 0); - - SCVAL(req->out.hdr,HDR_COM,SMBlockingX); - SSVAL(req->out.hdr,HDR_TID,tcon->tid); - SSVAL(req->out.hdr,HDR_PID,0xFFFF); - SSVAL(req->out.hdr,HDR_UID,0); - SSVAL(req->out.hdr,HDR_MID,0xFFFF); - SCVAL(req->out.hdr,HDR_FLG,0); - SSVAL(req->out.hdr,HDR_FLG2,0); - - SSVAL(req->out.vwv, VWV(0), SMB_CHAIN_NONE); - SSVAL(req->out.vwv, VWV(1), 0); - SSVAL(req->out.vwv, VWV(2), fnum); - SCVAL(req->out.vwv, VWV(3), LOCKING_ANDX_OPLOCK_RELEASE); - SCVAL(req->out.vwv, VWV(3)+1, level); - SIVAL(req->out.vwv, VWV(4), 0); - SSVAL(req->out.vwv, VWV(6), 0); - SSVAL(req->out.vwv, VWV(7), 0); - - req_send_reply(req); - return True; -} - -static void switch_message(int type, struct smbsrv_request *req); - -/**************************************************************************** -receive a SMB request header from the wire, forming a request_context -from the result -****************************************************************************/ -static NTSTATUS receive_smb_request(void *private, DATA_BLOB blob) -{ - struct smbsrv_connection *smb_conn = talloc_get_type(private, struct smbsrv_connection); - struct smbsrv_request *req; - uint8_t command; - - /* see if its a special NBT packet */ - if (CVAL(blob.data, 0) != 0) { - req = init_smb_request(smb_conn); - NT_STATUS_HAVE_NO_MEMORY(req); - - ZERO_STRUCT(req->in); - - req->in.buffer = talloc_steal(req, blob.data); - req->in.size = blob.length; - req->request_time = timeval_current(); - - reply_special(req); - return NT_STATUS_OK; - } - - if ((NBT_HDR_SIZE + MIN_SMB_SIZE) > blob.length) { - DEBUG(2,("Invalid SMB packet: length %d\n", blob.length)); - smbsrv_terminate_connection(smb_conn, "Invalid SMB packet"); - return NT_STATUS_OK; - } - - /* Make sure this is an SMB packet */ - if (IVAL(blob.data, NBT_HDR_SIZE) != SMB_MAGIC) { - DEBUG(2,("Non-SMB packet of length %d. Terminating connection\n", - blob.length)); - smbsrv_terminate_connection(smb_conn, "Non-SMB packet"); - return NT_STATUS_OK; - } - - req = init_smb_request(smb_conn); - NT_STATUS_HAVE_NO_MEMORY(req); - - req->in.buffer = talloc_steal(req, blob.data); - req->in.size = blob.length; - req->request_time = timeval_current(); - req->chained_fnum = -1; - req->in.allocated = req->in.size; - req->in.hdr = req->in.buffer + NBT_HDR_SIZE; - req->in.vwv = req->in.hdr + HDR_VWV; - req->in.wct = CVAL(req->in.hdr, HDR_WCT); - if (req->in.vwv + VWV(req->in.wct) <= req->in.buffer + req->in.size) { - req->in.data = req->in.vwv + VWV(req->in.wct) + 2; - req->in.data_size = SVAL(req->in.vwv, VWV(req->in.wct)); - - /* the bcc length is only 16 bits, but some packets - (such as SMBwriteX) can be much larger than 64k. We - detect this by looking for a large non-chained NBT - packet (at least 64k bigger than what is - specified). If it is detected then the NBT size is - used instead of the bcc size */ - if (req->in.data_size + 0x10000 <= - req->in.size - PTR_DIFF(req->in.data, req->in.buffer) && - (req->in.wct < 1 || SVAL(req->in.vwv, VWV(0)) == SMB_CHAIN_NONE)) { - /* its an oversized packet! fun for all the family */ - req->in.data_size = req->in.size - PTR_DIFF(req->in.data,req->in.buffer); - } - } - - if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct > req->in.size) { - DEBUG(2,("Invalid SMB word count %d\n", req->in.wct)); - smbsrv_terminate_connection(req->smb_conn, "Invalid SMB packet"); - return NT_STATUS_OK; - } - - if (NBT_HDR_SIZE + MIN_SMB_SIZE + 2*req->in.wct + req->in.data_size > req->in.size) { - DEBUG(2,("Invalid SMB buffer length count %d\n", req->in.data_size)); - smbsrv_terminate_connection(req->smb_conn, "Invalid SMB packet"); - return NT_STATUS_OK; - } - - req->flags = CVAL(req->in.hdr, HDR_FLG); - req->flags2 = SVAL(req->in.hdr, HDR_FLG2); - req->smbpid = SVAL(req->in.hdr, HDR_PID); - - if (!req_signing_check_incoming(req)) { - req_reply_error(req, NT_STATUS_ACCESS_DENIED); - return NT_STATUS_OK; - } - - command = CVAL(req->in.hdr, HDR_COM); - switch_message(command, req); - return NT_STATUS_OK; -} - -/* - These flags determine some of the permissions required to do an operation -*/ -#define AS_USER (1<<0) -#define SIGNING_NO_REPLY (1<<1) - -/* - define a list of possible SMB messages and their corresponding - functions. Any message that has a NULL function is unimplemented - - please feel free to contribute implementations! -*/ -static const struct smb_message_struct -{ - const char *name; - void (*fn)(struct smbsrv_request *); - int flags; -} - smb_messages[256] = { -/* 0x00 */ { "SMBmkdir",reply_mkdir,AS_USER}, -/* 0x01 */ { "SMBrmdir",reply_rmdir,AS_USER}, -/* 0x02 */ { "SMBopen",reply_open,AS_USER}, -/* 0x03 */ { "SMBcreate",reply_mknew,AS_USER}, -/* 0x04 */ { "SMBclose",reply_close,AS_USER}, -/* 0x05 */ { "SMBflush",reply_flush,AS_USER}, -/* 0x06 */ { "SMBunlink",reply_unlink,AS_USER}, -/* 0x07 */ { "SMBmv",reply_mv,AS_USER}, -/* 0x08 */ { "SMBgetatr",reply_getatr,AS_USER}, -/* 0x09 */ { "SMBsetatr",reply_setatr,AS_USER}, -/* 0x0a */ { "SMBread",reply_read,AS_USER}, -/* 0x0b */ { "SMBwrite",reply_write,AS_USER}, -/* 0x0c */ { "SMBlock",reply_lock,AS_USER}, -/* 0x0d */ { "SMBunlock",reply_unlock,AS_USER}, -/* 0x0e */ { "SMBctemp",reply_ctemp,AS_USER }, -/* 0x0f */ { "SMBmknew",reply_mknew,AS_USER}, -/* 0x10 */ { "SMBchkpth",reply_chkpth,AS_USER}, -/* 0x11 */ { "SMBexit",reply_exit,0}, -/* 0x12 */ { "SMBlseek",reply_lseek,AS_USER}, -/* 0x13 */ { "SMBlockread",reply_lockread,AS_USER}, -/* 0x14 */ { "SMBwriteunlock",reply_writeunlock,AS_USER}, -/* 0x15 */ { NULL, NULL, 0 }, -/* 0x16 */ { NULL, NULL, 0 }, -/* 0x17 */ { NULL, NULL, 0 }, -/* 0x18 */ { NULL, NULL, 0 }, -/* 0x19 */ { NULL, NULL, 0 }, -/* 0x1a */ { "SMBreadbraw",reply_readbraw,AS_USER}, -/* 0x1b */ { "SMBreadBmpx",reply_readbmpx,AS_USER}, -/* 0x1c */ { "SMBreadBs",NULL,0 }, -/* 0x1d */ { "SMBwritebraw",reply_writebraw,AS_USER}, -/* 0x1e */ { "SMBwriteBmpx",reply_writebmpx,AS_USER}, -/* 0x1f */ { "SMBwriteBs",reply_writebs,AS_USER}, -/* 0x20 */ { "SMBwritec",NULL,0}, -/* 0x21 */ { NULL, NULL, 0 }, -/* 0x22 */ { "SMBsetattrE",reply_setattrE,AS_USER}, -/* 0x23 */ { "SMBgetattrE",reply_getattrE,AS_USER}, -/* 0x24 */ { "SMBlockingX",reply_lockingX,AS_USER}, -/* 0x25 */ { "SMBtrans",reply_trans,AS_USER}, -/* 0x26 */ { "SMBtranss",reply_transs,AS_USER}, -/* 0x27 */ { "SMBioctl",reply_ioctl,AS_USER}, -/* 0x28 */ { "SMBioctls",NULL,AS_USER}, -/* 0x29 */ { "SMBcopy",reply_copy,AS_USER}, -/* 0x2a */ { "SMBmove",NULL,AS_USER}, -/* 0x2b */ { "SMBecho",reply_echo,0}, -/* 0x2c */ { "SMBwriteclose",reply_writeclose,AS_USER}, -/* 0x2d */ { "SMBopenX",reply_open_and_X,AS_USER}, -/* 0x2e */ { "SMBreadX",reply_read_and_X,AS_USER}, -/* 0x2f */ { "SMBwriteX",reply_write_and_X,AS_USER}, -/* 0x30 */ { NULL, NULL, 0 }, -/* 0x31 */ { NULL, NULL, 0 }, -/* 0x32 */ { "SMBtrans2", reply_trans2, AS_USER}, -/* 0x33 */ { "SMBtranss2", reply_transs2, AS_USER}, -/* 0x34 */ { "SMBfindclose", reply_findclose,AS_USER}, -/* 0x35 */ { "SMBfindnclose", reply_findnclose, AS_USER}, -/* 0x36 */ { NULL, NULL, 0 }, -/* 0x37 */ { NULL, NULL, 0 }, -/* 0x38 */ { NULL, NULL, 0 }, -/* 0x39 */ { NULL, NULL, 0 }, -/* 0x3a */ { NULL, NULL, 0 }, -/* 0x3b */ { NULL, NULL, 0 }, -/* 0x3c */ { NULL, NULL, 0 }, -/* 0x3d */ { NULL, NULL, 0 }, -/* 0x3e */ { NULL, NULL, 0 }, -/* 0x3f */ { NULL, NULL, 0 }, -/* 0x40 */ { NULL, NULL, 0 }, -/* 0x41 */ { NULL, NULL, 0 }, -/* 0x42 */ { NULL, NULL, 0 }, -/* 0x43 */ { NULL, NULL, 0 }, -/* 0x44 */ { NULL, NULL, 0 }, -/* 0x45 */ { NULL, NULL, 0 }, -/* 0x46 */ { NULL, NULL, 0 }, -/* 0x47 */ { NULL, NULL, 0 }, -/* 0x48 */ { NULL, NULL, 0 }, -/* 0x49 */ { NULL, NULL, 0 }, -/* 0x4a */ { NULL, NULL, 0 }, -/* 0x4b */ { NULL, NULL, 0 }, -/* 0x4c */ { NULL, NULL, 0 }, -/* 0x4d */ { NULL, NULL, 0 }, -/* 0x4e */ { NULL, NULL, 0 }, -/* 0x4f */ { NULL, NULL, 0 }, -/* 0x50 */ { NULL, NULL, 0 }, -/* 0x51 */ { NULL, NULL, 0 }, -/* 0x52 */ { NULL, NULL, 0 }, -/* 0x53 */ { NULL, NULL, 0 }, -/* 0x54 */ { NULL, NULL, 0 }, -/* 0x55 */ { NULL, NULL, 0 }, -/* 0x56 */ { NULL, NULL, 0 }, -/* 0x57 */ { NULL, NULL, 0 }, -/* 0x58 */ { NULL, NULL, 0 }, -/* 0x59 */ { NULL, NULL, 0 }, -/* 0x5a */ { NULL, NULL, 0 }, -/* 0x5b */ { NULL, NULL, 0 }, -/* 0x5c */ { NULL, NULL, 0 }, -/* 0x5d */ { NULL, NULL, 0 }, -/* 0x5e */ { NULL, NULL, 0 }, -/* 0x5f */ { NULL, NULL, 0 }, -/* 0x60 */ { NULL, NULL, 0 }, -/* 0x61 */ { NULL, NULL, 0 }, -/* 0x62 */ { NULL, NULL, 0 }, -/* 0x63 */ { NULL, NULL, 0 }, -/* 0x64 */ { NULL, NULL, 0 }, -/* 0x65 */ { NULL, NULL, 0 }, -/* 0x66 */ { NULL, NULL, 0 }, -/* 0x67 */ { NULL, NULL, 0 }, -/* 0x68 */ { NULL, NULL, 0 }, -/* 0x69 */ { NULL, NULL, 0 }, -/* 0x6a */ { NULL, NULL, 0 }, -/* 0x6b */ { NULL, NULL, 0 }, -/* 0x6c */ { NULL, NULL, 0 }, -/* 0x6d */ { NULL, NULL, 0 }, -/* 0x6e */ { NULL, NULL, 0 }, -/* 0x6f */ { NULL, NULL, 0 }, -/* 0x70 */ { "SMBtcon",reply_tcon,0}, -/* 0x71 */ { "SMBtdis",reply_tdis,0}, -/* 0x72 */ { "SMBnegprot",reply_negprot,0}, -/* 0x73 */ { "SMBsesssetupX",reply_sesssetup,0}, -/* 0x74 */ { "SMBulogoffX", reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */ -/* 0x75 */ { "SMBtconX",reply_tcon_and_X,0}, -/* 0x76 */ { NULL, NULL, 0 }, -/* 0x77 */ { NULL, NULL, 0 }, -/* 0x78 */ { NULL, NULL, 0 }, -/* 0x79 */ { NULL, NULL, 0 }, -/* 0x7a */ { NULL, NULL, 0 }, -/* 0x7b */ { NULL, NULL, 0 }, -/* 0x7c */ { NULL, NULL, 0 }, -/* 0x7d */ { NULL, NULL, 0 }, -/* 0x7e */ { NULL, NULL, 0 }, -/* 0x7f */ { NULL, NULL, 0 }, -/* 0x80 */ { "SMBdskattr",reply_dskattr,AS_USER}, -/* 0x81 */ { "SMBsearch",reply_search,AS_USER}, -/* 0x82 */ { "SMBffirst",reply_search,AS_USER}, -/* 0x83 */ { "SMBfunique",reply_search,AS_USER}, -/* 0x84 */ { "SMBfclose",reply_fclose,AS_USER}, -/* 0x85 */ { NULL, NULL, 0 }, -/* 0x86 */ { NULL, NULL, 0 }, -/* 0x87 */ { NULL, NULL, 0 }, -/* 0x88 */ { NULL, NULL, 0 }, -/* 0x89 */ { NULL, NULL, 0 }, -/* 0x8a */ { NULL, NULL, 0 }, -/* 0x8b */ { NULL, NULL, 0 }, -/* 0x8c */ { NULL, NULL, 0 }, -/* 0x8d */ { NULL, NULL, 0 }, -/* 0x8e */ { NULL, NULL, 0 }, -/* 0x8f */ { NULL, NULL, 0 }, -/* 0x90 */ { NULL, NULL, 0 }, -/* 0x91 */ { NULL, NULL, 0 }, -/* 0x92 */ { NULL, NULL, 0 }, -/* 0x93 */ { NULL, NULL, 0 }, -/* 0x94 */ { NULL, NULL, 0 }, -/* 0x95 */ { NULL, NULL, 0 }, -/* 0x96 */ { NULL, NULL, 0 }, -/* 0x97 */ { NULL, NULL, 0 }, -/* 0x98 */ { NULL, NULL, 0 }, -/* 0x99 */ { NULL, NULL, 0 }, -/* 0x9a */ { NULL, NULL, 0 }, -/* 0x9b */ { NULL, NULL, 0 }, -/* 0x9c */ { NULL, NULL, 0 }, -/* 0x9d */ { NULL, NULL, 0 }, -/* 0x9e */ { NULL, NULL, 0 }, -/* 0x9f */ { NULL, NULL, 0 }, -/* 0xa0 */ { "SMBnttrans", reply_nttrans, AS_USER}, -/* 0xa1 */ { "SMBnttranss", reply_nttranss, AS_USER}, -/* 0xa2 */ { "SMBntcreateX", reply_ntcreate_and_X, AS_USER}, -/* 0xa3 */ { NULL, NULL, 0 }, -/* 0xa4 */ { "SMBntcancel", reply_ntcancel, AS_USER|SIGNING_NO_REPLY}, -/* 0xa5 */ { "SMBntrename", reply_ntrename, AS_USER}, -/* 0xa6 */ { NULL, NULL, 0 }, -/* 0xa7 */ { NULL, NULL, 0 }, -/* 0xa8 */ { NULL, NULL, 0 }, -/* 0xa9 */ { NULL, NULL, 0 }, -/* 0xaa */ { NULL, NULL, 0 }, -/* 0xab */ { NULL, NULL, 0 }, -/* 0xac */ { NULL, NULL, 0 }, -/* 0xad */ { NULL, NULL, 0 }, -/* 0xae */ { NULL, NULL, 0 }, -/* 0xaf */ { NULL, NULL, 0 }, -/* 0xb0 */ { NULL, NULL, 0 }, -/* 0xb1 */ { NULL, NULL, 0 }, -/* 0xb2 */ { NULL, NULL, 0 }, -/* 0xb3 */ { NULL, NULL, 0 }, -/* 0xb4 */ { NULL, NULL, 0 }, -/* 0xb5 */ { NULL, NULL, 0 }, -/* 0xb6 */ { NULL, NULL, 0 }, -/* 0xb7 */ { NULL, NULL, 0 }, -/* 0xb8 */ { NULL, NULL, 0 }, -/* 0xb9 */ { NULL, NULL, 0 }, -/* 0xba */ { NULL, NULL, 0 }, -/* 0xbb */ { NULL, NULL, 0 }, -/* 0xbc */ { NULL, NULL, 0 }, -/* 0xbd */ { NULL, NULL, 0 }, -/* 0xbe */ { NULL, NULL, 0 }, -/* 0xbf */ { NULL, NULL, 0 }, -/* 0xc0 */ { "SMBsplopen",reply_printopen,AS_USER }, -/* 0xc1 */ { "SMBsplwr",reply_printwrite,AS_USER}, -/* 0xc2 */ { "SMBsplclose",reply_printclose,AS_USER}, -/* 0xc3 */ { "SMBsplretq",reply_printqueue,AS_USER}, -/* 0xc4 */ { NULL, NULL, 0 }, -/* 0xc5 */ { NULL, NULL, 0 }, -/* 0xc6 */ { NULL, NULL, 0 }, -/* 0xc7 */ { NULL, NULL, 0 }, -/* 0xc8 */ { NULL, NULL, 0 }, -/* 0xc9 */ { NULL, NULL, 0 }, -/* 0xca */ { NULL, NULL, 0 }, -/* 0xcb */ { NULL, NULL, 0 }, -/* 0xcc */ { NULL, NULL, 0 }, -/* 0xcd */ { NULL, NULL, 0 }, -/* 0xce */ { NULL, NULL, 0 }, -/* 0xcf */ { NULL, NULL, 0 }, -/* 0xd0 */ { "SMBsends",reply_sends,0}, -/* 0xd1 */ { "SMBsendb",NULL,0}, -/* 0xd2 */ { "SMBfwdname",NULL,0}, -/* 0xd3 */ { "SMBcancelf",NULL,0}, -/* 0xd4 */ { "SMBgetmac",NULL,0}, -/* 0xd5 */ { "SMBsendstrt",reply_sendstrt,0}, -/* 0xd6 */ { "SMBsendend",reply_sendend,0}, -/* 0xd7 */ { "SMBsendtxt",reply_sendtxt,0}, -/* 0xd8 */ { NULL, NULL, 0 }, -/* 0xd9 */ { NULL, NULL, 0 }, -/* 0xda */ { NULL, NULL, 0 }, -/* 0xdb */ { NULL, NULL, 0 }, -/* 0xdc */ { NULL, NULL, 0 }, -/* 0xdd */ { NULL, NULL, 0 }, -/* 0xde */ { NULL, NULL, 0 }, -/* 0xdf */ { NULL, NULL, 0 }, -/* 0xe0 */ { NULL, NULL, 0 }, -/* 0xe1 */ { NULL, NULL, 0 }, -/* 0xe2 */ { NULL, NULL, 0 }, -/* 0xe3 */ { NULL, NULL, 0 }, -/* 0xe4 */ { NULL, NULL, 0 }, -/* 0xe5 */ { NULL, NULL, 0 }, -/* 0xe6 */ { NULL, NULL, 0 }, -/* 0xe7 */ { NULL, NULL, 0 }, -/* 0xe8 */ { NULL, NULL, 0 }, -/* 0xe9 */ { NULL, NULL, 0 }, -/* 0xea */ { NULL, NULL, 0 }, -/* 0xeb */ { NULL, NULL, 0 }, -/* 0xec */ { NULL, NULL, 0 }, -/* 0xed */ { NULL, NULL, 0 }, -/* 0xee */ { NULL, NULL, 0 }, -/* 0xef */ { NULL, NULL, 0 }, -/* 0xf0 */ { NULL, NULL, 0 }, -/* 0xf1 */ { NULL, NULL, 0 }, -/* 0xf2 */ { NULL, NULL, 0 }, -/* 0xf3 */ { NULL, NULL, 0 }, -/* 0xf4 */ { NULL, NULL, 0 }, -/* 0xf5 */ { NULL, NULL, 0 }, -/* 0xf6 */ { NULL, NULL, 0 }, -/* 0xf7 */ { NULL, NULL, 0 }, -/* 0xf8 */ { NULL, NULL, 0 }, -/* 0xf9 */ { NULL, NULL, 0 }, -/* 0xfa */ { NULL, NULL, 0 }, -/* 0xfb */ { NULL, NULL, 0 }, -/* 0xfc */ { NULL, NULL, 0 }, -/* 0xfd */ { NULL, NULL, 0 }, -/* 0xfe */ { NULL, NULL, 0 }, -/* 0xff */ { NULL, NULL, 0 } -}; - -/**************************************************************************** -return a string containing the function name of a SMB command -****************************************************************************/ -static const char *smb_fn_name(uint8_t type) -{ - const char *unknown_name = "SMBunknown"; - - if (smb_messages[type].name == NULL) - return unknown_name; - - return smb_messages[type].name; -} - - -/**************************************************************************** - Do a switch on the message type and call the specific reply function for this -message. Unlike earlier versions of Samba the reply functions are responsible -for sending the reply themselves, rather than returning a size to this function -The reply functions may also choose to delay the processing by pushing the message -onto the message queue -****************************************************************************/ -static void switch_message(int type, struct smbsrv_request *req) -{ - int flags; - struct smbsrv_connection *smb_conn = req->smb_conn; - uint16_t session_tag; - NTSTATUS status; - - type &= 0xff; - - errno = 0; - - if (smb_messages[type].fn == NULL) { - DEBUG(0,("Unknown message type %d!\n",type)); - reply_unknown(req); - return; - } - - flags = smb_messages[type].flags; - - req->tcon = smbsrv_tcon_find(smb_conn, SVAL(req->in.hdr,HDR_TID)); - - if (req->session == NULL) { - /* setup the user context for this request if it - hasn't already been initialised (to cope with SMB - chaining) */ - - /* In share mode security we must ignore the vuid. */ - if (smb_conn->config.security == SEC_SHARE) { - session_tag = UID_FIELD_INVALID; - } else { - session_tag = SVAL(req->in.hdr,HDR_UID); - } - - req->session = smbsrv_session_find(req->smb_conn, session_tag); - if (req->session) { - req->session->vuid = session_tag; - } - } else { - session_tag = req->session->vuid; - } - - DEBUG(3,("switch message %s (task_id %d)\n",smb_fn_name(type), req->smb_conn->connection->server_id)); - - /* this must be called before we do any reply */ - if (flags & SIGNING_NO_REPLY) { - req_signing_no_reply(req); - } - - /* see if the vuid is valid */ - if ((flags & AS_USER) && !req->session) { - /* amazingly, the error code depends on the command */ - switch (type) { - case SMBntcreateX: - case SMBntcancel: - status = NT_STATUS_DOS(ERRSRV, ERRbaduid); - break; - default: - status = NT_STATUS_INVALID_HANDLE; - break; - } - /* - * TODO: - * don't know how to handle smb signing for this case - * so just skip the reply - */ - if ((flags & SIGNING_NO_REPLY) && - (req->smb_conn->signing.signing_state != SMB_SIGNING_ENGINE_OFF)) { - DEBUG(1,("SKIP ERROR REPLY: %s %s because of unknown smb signing case\n", - smb_fn_name(type), nt_errstr(status))); - req_destroy(req); - return; - } - req_reply_error(req, status); - return; - } - - /* does this protocol need a valid tree connection? */ - if ((flags & AS_USER) && !req->tcon) { - /* amazingly, the error code depends on the command */ - switch (type) { - case SMBntcreateX: - case SMBntcancel: - status = NT_STATUS_DOS(ERRSRV, ERRinvnid); - break; - default: - status = NT_STATUS_INVALID_HANDLE; - break; - } - /* - * TODO: - * don't know how to handle smb signing for this case - * so just skip the reply - */ - if ((flags & SIGNING_NO_REPLY) && - (req->smb_conn->signing.signing_state != SMB_SIGNING_ENGINE_OFF)) { - DEBUG(1,("SKIP ERROR REPLY: %s %s because of unknown smb signing case\n", - smb_fn_name(type), nt_errstr(status))); - req_destroy(req); - return; - } - req_reply_error(req, status); - return; - } - - smb_messages[type].fn(req); -} - -/* - we call this when first first part of a possibly chained request has been completed - and we need to call the 2nd part, if any -*/ -void chain_reply(struct smbsrv_request *req) -{ - uint16_t chain_cmd, chain_offset; - uint8_t *vwv, *data; - uint16_t wct; - uint16_t data_size; - - if (req->in.wct < 2 || req->out.wct < 2) { - req_reply_dos_error(req, ERRSRV, ERRerror); - return; - } - - chain_cmd = CVAL(req->in.vwv, VWV(0)); - chain_offset = SVAL(req->in.vwv, VWV(1)); - - if (chain_cmd == SMB_CHAIN_NONE) { - /* end of chain */ - SSVAL(req->out.vwv, VWV(0), SMB_CHAIN_NONE); - SSVAL(req->out.vwv, VWV(1), 0); - req_send_reply(req); - return; - } - - if (chain_offset + req->in.hdr >= req->in.buffer + req->in.size) { - goto error; - } - - wct = CVAL(req->in.hdr, chain_offset); - vwv = req->in.hdr + chain_offset + 1; - - if (vwv + VWV(wct) + 2 > req->in.buffer + req->in.size) { - goto error; - } - - data_size = SVAL(vwv, VWV(wct)); - data = vwv + VWV(wct) + 2; - - if (data + data_size > req->in.buffer + req->in.size) { - goto error; - } - - /* all seems legit */ - req->in.vwv = vwv; - req->in.wct = wct; - req->in.data = data; - req->in.data_size = data_size; - req->in.ptr = data; - - req->chain_count++; - - SSVAL(req->out.vwv, VWV(0), chain_cmd); - SSVAL(req->out.vwv, VWV(1), req->out.size - NBT_HDR_SIZE); - - /* the current request in the chain might have used an async reply, - but that doesn't mean the next element needs to */ - ZERO_STRUCTP(req->async_states); - - switch_message(chain_cmd, req); - return; - -error: - SSVAL(req->out.vwv, VWV(0), SMB_CHAIN_NONE); - SSVAL(req->out.vwv, VWV(1), 0); - req_reply_dos_error(req, ERRSRV, ERRerror); -} - - /* close the socket and shutdown a server_context */ @@ -715,7 +110,7 @@ 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, receive_smb_request); + packet_set_callback(smb_conn->packet, smbsrv_recv_smb_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); -- cgit 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/smb_server.c | 59 +++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 23 deletions(-) (limited to 'source4/smb_server/smb_server.c') 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 From 910d61bcd1fbfc6fc406d4384f305f5210e92d56 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 18 Nov 2005 14:13:49 +0000 Subject: r11789: - add the start of a SMB2 server - it does Negprot and SessionSetup yet the rest returns NT_STATUS_NOT_IMPLEMENTED - it's off by default, enable with: smbsrv:enable smb2 = yes - negotition in the SMB Negprot isn't supported yet - it's only tested with smbtorture SMB2-CONNECT not with vista as client metze (This used to be commit 08b31d5f618d2e416cb9812ad3a49754cd7212b8) --- source4/smb_server/smb_server.c | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 3385e88d4a..f439bce061 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -27,6 +27,7 @@ #include "smb_server/smb_server.h" #include "lib/messaging/irpc.h" #include "lib/stream/packet.h" +#include "libcli/smb2/smb2.h" static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) { @@ -56,6 +57,12 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); return smbsrv_recv_smb_request(smb_conn, blob); + case SMB2_MAGIC: + if (!lp_parm_bool(-1, "smbsrv", "enable smb2", False)) break; + status = smbsrv_init_smb2_connection(smb_conn); + NT_STATUS_NOT_OK_RETURN(status); + packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request); + return smbsrv_recv_smb2_request(smb_conn, blob); } DEBUG(2,("Invalid SMB packet: protocl prefix: 0x%08X\n", protocol_version)); -- cgit From 03d301ead5f702872b8cb948b8cd01b0fa0db5f7 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Wed, 30 Nov 2005 02:08:15 +0000 Subject: r11967: Fix more 64-bit warnings. (This used to be commit 9c4436a124f874ae240feaf590141d48c33a635f) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index f439bce061..d51dec8db4 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -44,7 +44,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) } if (blob.length < (NBT_HDR_SIZE + MIN_SMB_SIZE)) { - DEBUG(2,("Invalid SMB packet length count %d\n", blob.length)); + DEBUG(2,("Invalid SMB packet length count %ld\n", (long)blob.length)); smbsrv_terminate_connection(smb_conn, "Invalid SMB packet"); return NT_STATUS_OK; } -- cgit From e246a067515b1fdb725ca1f8e7b406cc84a89e81 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 8 Dec 2005 10:23:56 +0000 Subject: r12126: get rid of the local ->terminate hacks, we do that genericly now metze (This used to be commit a7baf165c10c00096265b790d5362905c527806a) --- source4/smb_server/smb_server.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index d51dec8db4..bffc19fc72 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -75,7 +75,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) */ void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char *reason) { - smb_conn->terminate = reason; + stream_terminate_connection(smb_conn->connection, reason); } /* @@ -83,17 +83,12 @@ void smbsrv_terminate_connection(struct smbsrv_connection *smb_conn, const char */ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) { - struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, struct smbsrv_connection); + struct smbsrv_connection *smb_conn = talloc_get_type(conn->private, + struct smbsrv_connection); DEBUG(10,("smbsrv_recv\n")); packet_recv(smb_conn->packet); - if (smb_conn->terminate) { - talloc_free(conn->event.fde); - conn->event.fde = NULL; - stream_terminate_connection(smb_conn->connection, smb_conn->terminate); - return; - } /* free up temporary memory */ lp_talloc_free(); @@ -109,7 +104,6 @@ static void smbsrv_send(struct stream_connection *conn, uint16_t flags) packet_queue_run(smb_conn->packet); } - /* handle socket recv errors */ @@ -131,11 +125,14 @@ static void smbsrv_accept(struct stream_connection *conn) DEBUG(5,("smbsrv_accept\n")); smb_conn = talloc_zero(conn, struct smbsrv_connection); - if (!smb_conn) return; + if (!smb_conn) { + stream_terminate_connection(conn, "out of memory"); + return; + } smb_conn->packet = packet_init(smb_conn); - if (smb_conn->packet == NULL) { - stream_terminate_connection(conn, "out of memory"); + if (!smb_conn->packet) { + smbsrv_terminate_connection(smb_conn, "out of memory"); return; } packet_set_private(smb_conn->packet, smb_conn); -- cgit From 2cd5ca7d25f12aa9198bf8c2deb6aea282f573ee Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 28 Dec 2005 15:38:36 +0000 Subject: r12542: Move some more prototypes out to seperate headers (This used to be commit 0aca5fd5130d980d07398f3291d294202aefe3c2) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index bffc19fc72..e4b9a227d4 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -28,6 +28,7 @@ #include "lib/messaging/irpc.h" #include "lib/stream/packet.h" #include "libcli/smb2/smb2.h" +#include "smb_server/smb2/smb2_server.h" static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) { -- cgit From d4de4c2d210d2e8c9b5aedf70695594809ad6a0b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 30 Dec 2005 13:16:54 +0000 Subject: r12608: Remove some unused #include lines. (This used to be commit 70e7449318aa0e9d2639c76730a7d1683b2f4981) --- source4/smb_server/smb_server.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index e4b9a227d4..6740db4923 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -20,9 +20,6 @@ */ #include "includes.h" -#include "lib/events/events.h" -#include "system/time.h" -#include "dlinklist.h" #include "smbd/service_stream.h" #include "smb_server/smb_server.h" #include "lib/messaging/irpc.h" -- cgit From d8503c6ba120172e9aae737c5510e547e8dea4a5 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 6 Mar 2006 14:19:11 +0000 Subject: r13860: - add support for SMB2 ("SMB 2.001") negotiation in SMB negprot requests - the default max protocol is still NT1 metze (This used to be commit d1bae931b327dda28e648efc473e0462cf036f7c) --- source4/smb_server/smb_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 6740db4923..6e517cd386 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -56,14 +56,14 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); return smbsrv_recv_smb_request(smb_conn, blob); case SMB2_MAGIC: - if (!lp_parm_bool(-1, "smbsrv", "enable smb2", False)) break; + if (lp_maxprotocol() < PROTOCOL_SMB2) break; status = smbsrv_init_smb2_connection(smb_conn); NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request); return smbsrv_recv_smb2_request(smb_conn, blob); } - DEBUG(2,("Invalid SMB packet: protocl prefix: 0x%08X\n", protocol_version)); + DEBUG(2,("Invalid SMB packet: protocol prefix: 0x%08X\n", protocol_version)); smbsrv_terminate_connection(smb_conn, "NON-SMB packet"); return NT_STATUS_OK; } -- cgit From 4ac2be99588b48b0652a524bf12fb1aa9c3f5fbb Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 7 Mar 2006 11:07:23 +0000 Subject: r13924: Split more prototypes out of include/proto.h + initial work on header file dependencies (This used to be commit 122835876748a3eaf5e8d31ad1abddab9acb8781) --- source4/smb_server/smb_server.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 6e517cd386..469f937219 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -26,6 +26,8 @@ #include "lib/stream/packet.h" #include "libcli/smb2/smb2.h" #include "smb_server/smb2/smb2_server.h" +#include "system/network.h" +#include "netif/netif.h" static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) { -- cgit From 9bd7dd912124d8ffda6f9967d6ba358c16be2aa0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 7 Mar 2006 12:08:58 +0000 Subject: r13926: More header splitups. (This used to be commit 930daa9f416ecba1d75b8ad46bb42e336545672f) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 469f937219..dc2eb52a17 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -21,6 +21,7 @@ #include "includes.h" #include "smbd/service_stream.h" +#include "smbd/proto.h" #include "smb_server/smb_server.h" #include "lib/messaging/irpc.h" #include "lib/stream/packet.h" -- cgit From 0de1ad5ae621ad99d507b38d3eb2e2015b2fbd71 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 7 Mar 2006 13:22:00 +0000 Subject: r13937: fix the build metze (This used to be commit 7aabff829836580be8816f38a6e0ef5b7c3bb565) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index dc2eb52a17..2b12e9fda2 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -21,7 +21,7 @@ #include "includes.h" #include "smbd/service_stream.h" -#include "smbd/proto.h" +#include "smbd/service.h" #include "smb_server/smb_server.h" #include "lib/messaging/irpc.h" #include "lib/stream/packet.h" -- cgit From 651ca6553edadb2b97339fd3c112fdb6ef6c08bc Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 9 Mar 2006 17:48:41 +0000 Subject: r14079: I just found the setproctitle library from alt linux:-) - add set_title hook to the process models - use setproctitle library in process_model standard if available - the the title for the task servers and on connections metze (This used to be commit 526f20bbecc9bbd607595637c15fc4001d3f0c70) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 2b12e9fda2..ac87cc14e0 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -154,7 +154,7 @@ static void smbsrv_accept(struct stream_connection *conn) } static const struct stream_server_ops smb_stream_ops = { - .name = "smb", + .name = "smbsrv", .accept_connection = smbsrv_accept, .recv_handler = smbsrv_recv, .send_handler = smbsrv_send, -- cgit From bfcaa4000e11c84fb31abe11a1631ea3c4ca4c31 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 9 Mar 2006 20:36:01 +0000 Subject: r14096: setup a service task for smbsrv and dcesrv metze (This used to be commit 7ad522c7acfe276d08bf59e851697fe93fa622db) --- source4/smb_server/smb_server.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index ac87cc14e0..f47063f945 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -20,6 +20,7 @@ */ #include "includes.h" +#include "smbd/service_task.h" #include "smbd/service_stream.h" #include "smbd/service.h" #include "smb_server/smb_server.h" @@ -183,13 +184,14 @@ static NTSTATUS smb_add_socket(struct event_context *event_context, } /* - called on startup of the smb server service It's job is to start - listening on all configured SMB server sockets + open the smb server sockets */ -static NTSTATUS smbsrv_init(struct event_context *event_context, const struct model_ops *model_ops) +static void smbsrv_task_init(struct task_server *task) { NTSTATUS status; + task_server_set_title(task, "task[smbsrv]"); + if (lp_interfaces() && lp_bind_interfaces_only()) { int num_interfaces = iface_count(); int i; @@ -200,16 +202,28 @@ static NTSTATUS smbsrv_init(struct event_context *event_context, const struct mo */ for(i = 0; i < num_interfaces; i++) { const char *address = iface_n_ip(i); - status = smb_add_socket(event_context, model_ops, address); - NT_STATUS_NOT_OK_RETURN(status); + status = smb_add_socket(task->event_ctx, task->model_ops, address); + if (!NT_STATUS_IS_OK(status)) goto failed; } } else { /* Just bind to lp_socket_address() (usually 0.0.0.0) */ - status = smb_add_socket(event_context, model_ops, lp_socket_address()); - NT_STATUS_NOT_OK_RETURN(status); + status = smb_add_socket(task->event_ctx, task->model_ops, lp_socket_address()); + if (!NT_STATUS_IS_OK(status)) goto failed; } - return NT_STATUS_OK; + return; +failed: + task_server_terminate(task, "Failed to startup smb server task"); +} + +/* + called on startup of the smb server service It's job is to start + listening on all configured sockets +*/ +static NTSTATUS smbsrv_init(struct event_context *event_context, + const struct model_ops *model_ops) +{ + return task_server_startup(event_context, model_ops, smbsrv_task_init); } /* called at smbd startup - register ourselves as a server service */ -- cgit From 316269a07523a421755158540d2f4e22fa312866 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 26 Mar 2006 11:32:27 +0000 Subject: r14739: keep the last request time for the smbsrv_connection, smbsrv_session and smbsrv_tcon for management tools metze (This used to be commit 2c87f210e9e68de42dc45ca6532f3f33f4b6ce95) --- source4/smb_server/smb_server.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index f47063f945..927609226b 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -151,6 +151,8 @@ static void smbsrv_accept(struct stream_connection *conn) irpc_add_name(conn->msg_ctx, "smb_server"); + smb_conn->statistics.connect_time = timeval_current(); + smbsrv_management_init(smb_conn); } -- cgit From bc141c795767cc765731c607f1fb047811da6e03 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 28 Apr 2006 01:55:17 +0000 Subject: r15304: Fix smbd build, more updates on getting --enable-dso to build again (This used to be commit 3ef9326386ba1c210166302cbcf02d2ed3f19944) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 927609226b..ef8967f0b2 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -24,6 +24,7 @@ #include "smbd/service_stream.h" #include "smbd/service.h" #include "smb_server/smb_server.h" +#include "smb_server/service_smb_proto.h" #include "lib/messaging/irpc.h" #include "lib/stream/packet.h" #include "libcli/smb2/smb2.h" -- cgit From 7bf085571eba5f321d35ff449d68da39ec303dab Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 22 Jun 2006 17:06:36 +0000 Subject: r16464: split client and server min/max protocol settings metze (This used to be commit 6164d1e22e0545f558315591d49f862de06ea945) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index ef8967f0b2..6df48f3df6 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -61,7 +61,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); return smbsrv_recv_smb_request(smb_conn, blob); case SMB2_MAGIC: - if (lp_maxprotocol() < PROTOCOL_SMB2) break; + if (lp_srv_maxprotocol() < PROTOCOL_SMB2) break; status = smbsrv_init_smb2_connection(smb_conn); NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request); -- cgit From 9c66f601f1520a99b9236c32bc9f03a33bd4b2aa Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Sun, 23 Jul 2006 18:43:07 +0000 Subject: r17206: Add a modular API for share configuration. Commit the classic backwards compatible module which is the default one (This used to be commit a89cc346b9296cb49929898d257a064a6c2bae86) --- source4/smb_server/smb_server.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 6df48f3df6..56ca686baf 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -31,6 +31,7 @@ #include "smb_server/smb2/smb2_server.h" #include "system/network.h" #include "netif/netif.h" +#include "param/share.h" static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) { @@ -155,6 +156,11 @@ static void smbsrv_accept(struct stream_connection *conn) smb_conn->statistics.connect_time = timeval_current(); smbsrv_management_init(smb_conn); + + if (!NT_STATUS_IS_OK(share_get_context(smb_conn, &(smb_conn->share_context)))) { + smbsrv_terminate_connection(smb_conn, "share_init failed!"); + return; + } } static const struct stream_server_ops smb_stream_ops = { -- cgit From a2eca9174c7803732658a1e6f7e8ed873c4fb6fd Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 17 Aug 2006 13:37:04 +0000 Subject: r17586: merge lib/netif into lib/socket and use -lnsl -lsocket on the configure check for the interfaces. should fix the build on some old sun boxes metze (This used to be commit f20e251bfd9f1eb7ce5c00739631b1625a2aa467) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 56ca686baf..4fbc428a42 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -30,7 +30,7 @@ #include "libcli/smb2/smb2.h" #include "smb_server/smb2/smb2_server.h" #include "system/network.h" -#include "netif/netif.h" +#include "lib/socket/netif.h" #include "param/share.h" static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) -- cgit From 2a8f9213a4d945834271f23da538bd20310f90a1 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 4 Jul 2007 05:16:19 +0000 Subject: r23700: pre-open the sam in the parent smbd. This has the effect of loading the schema. That stops us loading the schema for each new connection. In future I would prefer to share a lot more of our ldb contexts with children. That will require a larger piece of surgery. (This used to be commit ff41bdc350cf05c70c63effe30fe69e63181f088) --- source4/smb_server/smb_server.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 4fbc428a42..33b2fc77a4 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -32,6 +32,7 @@ #include "system/network.h" #include "lib/socket/netif.h" #include "param/share.h" +#include "dsdb/samdb/samdb.h" static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) { @@ -192,6 +193,19 @@ static NTSTATUS smb_add_socket(struct event_context *event_context, return NT_STATUS_OK; } + +/* + pre-open some of our ldb databases, to prevent an explosion of memory usage + when we fork + */ +static void smbsrv_preopen_ldb(struct task_server *task) +{ + /* yes, this looks strange. It is a hack to preload the + schema. I'd like to share most of the ldb context with the + child too. That will come later */ + talloc_free(samdb_connect(task, NULL)); +} + /* open the smb server sockets */ @@ -220,6 +234,8 @@ static void smbsrv_task_init(struct task_server *task) if (!NT_STATUS_IS_OK(status)) goto failed; } + smbsrv_preopen_ldb(task); + return; failed: task_server_terminate(task, "Failed to startup smb server task"); -- cgit From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell 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/smb_server/smb_server.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 33b2fc77a4..30c78eb3a7 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -6,7 +6,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, @@ -15,8 +15,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 . */ #include "includes.h" -- cgit From 8e2d624a588552f5d06f21fe37281615f3ec6296 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 3 Sep 2007 13:13:25 +0000 Subject: r24937: Merge tests spoolss RPC callbacks. (This used to be commit 9b256a0ca232ea6e89771bf73a1adf877273a752) --- source4/smb_server/smb_server.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 30c78eb3a7..e4a9f982cd 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -173,7 +173,7 @@ static const struct stream_server_ops smb_stream_ops = { /* setup a listening socket on all the SMB ports for a particular address */ -static NTSTATUS smb_add_socket(struct event_context *event_context, +_PUBLIC_ NTSTATUS smbsrv_add_socket(struct event_context *event_context, const struct model_ops *model_ops, const char *address) { @@ -224,12 +224,12 @@ static void smbsrv_task_init(struct task_server *task) */ for(i = 0; i < num_interfaces; i++) { const char *address = iface_n_ip(i); - status = smb_add_socket(task->event_ctx, task->model_ops, address); + status = smbsrv_add_socket(task->event_ctx, task->model_ops, address); if (!NT_STATUS_IS_OK(status)) goto failed; } } else { /* Just bind to lp_socket_address() (usually 0.0.0.0) */ - status = smb_add_socket(task->event_ctx, task->model_ops, lp_socket_address()); + status = smbsrv_add_socket(task->event_ctx, task->model_ops, lp_socket_address()); if (!NT_STATUS_IS_OK(status)) goto failed; } -- cgit From ffeee68e4b72dd94fee57366bd8d38b8c284c3d4 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 8 Sep 2007 12:42:09 +0000 Subject: r25026: Move param/param.h out of includes.h (This used to be commit abe8349f9b4387961ff3665d8c589d61cd2edf31) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index e4a9f982cd..3ac7ca5ede 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -32,6 +32,7 @@ #include "lib/socket/netif.h" #include "param/share.h" #include "dsdb/samdb/samdb.h" +#include "param/param.h" static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) { -- cgit From 37d53832a4623653f706e77985a79d84bd7c6694 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 28 Sep 2007 01:17:46 +0000 Subject: r25398: Parse loadparm context to all lp_*() functions. (This used to be commit 3fcc960839c6e5ca4de2c3c042f12f369ac5f238) --- source4/smb_server/smb_server.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 3ac7ca5ede..691934f71c 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -63,7 +63,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); return smbsrv_recv_smb_request(smb_conn, blob); case SMB2_MAGIC: - if (lp_srv_maxprotocol() < PROTOCOL_SMB2) break; + if (lp_srv_maxprotocol(global_loadparm) < PROTOCOL_SMB2) break; status = smbsrv_init_smb2_connection(smb_conn); NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request); @@ -178,7 +178,7 @@ _PUBLIC_ NTSTATUS smbsrv_add_socket(struct event_context *event_context, const struct model_ops *model_ops, const char *address) { - const char **ports = lp_smb_ports(); + const char **ports = lp_smb_ports(global_loadparm); int i; NTSTATUS status; @@ -215,7 +215,7 @@ static void smbsrv_task_init(struct task_server *task) task_server_set_title(task, "task[smbsrv]"); - if (lp_interfaces() && lp_bind_interfaces_only()) { + if (lp_interfaces(global_loadparm) && lp_bind_interfaces_only(global_loadparm)) { int num_interfaces = iface_count(); int i; @@ -230,7 +230,8 @@ static void smbsrv_task_init(struct task_server *task) } } else { /* Just bind to lp_socket_address() (usually 0.0.0.0) */ - status = smbsrv_add_socket(task->event_ctx, task->model_ops, lp_socket_address()); + status = smbsrv_add_socket(task->event_ctx, task->model_ops, + lp_socket_address(global_loadparm)); if (!NT_STATUS_IS_OK(status)) goto failed; } -- cgit From f4a1083cf9f64b4d2b65b68942e93861409ea90f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 2 Dec 2007 17:09:52 +0100 Subject: r26227: Make loadparm_context part of a server task, move loadparm_contexts further up the call stack. (This used to be commit 0721a07aada6a1fae6dcbd610b8783df57d7bbad) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 691934f71c..9242fb1a12 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -203,7 +203,7 @@ static void smbsrv_preopen_ldb(struct task_server *task) /* yes, this looks strange. It is a hack to preload the schema. I'd like to share most of the ldb context with the child too. That will come later */ - talloc_free(samdb_connect(task, NULL)); + talloc_free(samdb_connect(task, global_loadparm, NULL)); } /* -- cgit From 6c999cd12344f2bb8b1d2941210b4c205b3e0aad Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 2 Dec 2007 22:32:11 +0100 Subject: r26236: Remove more uses of global_loadparm or specify loadparm_context explicitly. (This used to be commit 5b29ef7c03d9ae76b0ca909e9f03a58e1bad3521) --- source4/smb_server/smb_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 9242fb1a12..923c1bdfe5 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -42,7 +42,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) /* see if its a special NBT packet */ if (CVAL(blob.data,0) != 0) { - status = smbsrv_init_smb_connection(smb_conn); + status = smbsrv_init_smb_connection(smb_conn, global_loadparm); NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); return smbsrv_recv_smb_request(smb_conn, blob); @@ -58,7 +58,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) switch (protocol_version) { case SMB_MAGIC: - status = smbsrv_init_smb_connection(smb_conn); + status = smbsrv_init_smb_connection(smb_conn, global_loadparm); NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); return smbsrv_recv_smb_request(smb_conn, blob); -- cgit From 291ddf433685ee5c25e172885045a4b60d7bb1ee Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 3 Dec 2007 00:28:07 +0100 Subject: r26237: Add loadparm context to the server service interface. (This used to be commit 1386c5c92505a950c65411b8af74d703ce023f95) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 923c1bdfe5..ac5c589932 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -247,6 +247,7 @@ failed: listening on all configured sockets */ static NTSTATUS smbsrv_init(struct event_context *event_context, + struct loadparm_context *lp_ctx, const struct model_ops *model_ops) { return task_server_startup(event_context, model_ops, smbsrv_task_init); -- cgit From bbdfbf8d9d486aee51117976b8f825759a4c4a37 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 3 Dec 2007 00:28:22 +0100 Subject: r26238: Add a loadparm context parameter to torture_context, remove more uses of global_loadparm. (This used to be commit a33a5530545086b81a3b205aa109dff11c546926) --- source4/smb_server/smb_server.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index ac5c589932..57a6e8ea11 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -175,10 +175,11 @@ static const struct stream_server_ops smb_stream_ops = { setup a listening socket on all the SMB ports for a particular address */ _PUBLIC_ NTSTATUS smbsrv_add_socket(struct event_context *event_context, + struct loadparm_context *lp_ctx, const struct model_ops *model_ops, const char *address) { - const char **ports = lp_smb_ports(global_loadparm); + const char **ports = lp_smb_ports(lp_ctx); int i; NTSTATUS status; @@ -215,7 +216,7 @@ static void smbsrv_task_init(struct task_server *task) task_server_set_title(task, "task[smbsrv]"); - if (lp_interfaces(global_loadparm) && lp_bind_interfaces_only(global_loadparm)) { + if (lp_interfaces(task->lp_ctx) && lp_bind_interfaces_only(task->lp_ctx)) { int num_interfaces = iface_count(); int i; @@ -225,13 +226,13 @@ static void smbsrv_task_init(struct task_server *task) */ for(i = 0; i < num_interfaces; i++) { const char *address = iface_n_ip(i); - status = smbsrv_add_socket(task->event_ctx, task->model_ops, address); + status = smbsrv_add_socket(task->event_ctx, task->lp_ctx, task->model_ops, address); if (!NT_STATUS_IS_OK(status)) goto failed; } } else { /* Just bind to lp_socket_address() (usually 0.0.0.0) */ - status = smbsrv_add_socket(task->event_ctx, task->model_ops, - lp_socket_address(global_loadparm)); + status = smbsrv_add_socket(task->event_ctx, task->lp_ctx, task->model_ops, + lp_socket_address(task->lp_ctx)); if (!NT_STATUS_IS_OK(status)) goto failed; } -- cgit From ab69eb8d8901d23794c6a298718e67656ef4820e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 3 Dec 2007 15:53:17 +0100 Subject: r26250: Avoid global_loadparm in a couple more places. (This used to be commit 2c6b755309fdf685cd0b0564272bf83038574a43) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 57a6e8ea11..8ba93b9a59 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -204,7 +204,7 @@ static void smbsrv_preopen_ldb(struct task_server *task) /* yes, this looks strange. It is a hack to preload the schema. I'd like to share most of the ldb context with the child too. That will come later */ - talloc_free(samdb_connect(task, global_loadparm, NULL)); + talloc_free(samdb_connect(task, task->lp_ctx, NULL)); } /* -- cgit From b83a7a135f3247f553cb04173646b2d871b97235 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 3 Dec 2007 21:25:17 +0100 Subject: r26268: Avoid more use of global_loadparm - put lp_ctx in smb_server and wbsrv_connection. (This used to be commit 7c008664238ed966cb82adf5b25b22157bb50730) --- source4/smb_server/smb_server.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 8ba93b9a59..59d9e8f7b3 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -42,7 +42,7 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) /* see if its a special NBT packet */ if (CVAL(blob.data,0) != 0) { - status = smbsrv_init_smb_connection(smb_conn, global_loadparm); + status = smbsrv_init_smb_connection(smb_conn, smb_conn->lp_ctx); NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); return smbsrv_recv_smb_request(smb_conn, blob); @@ -58,12 +58,12 @@ static NTSTATUS smbsrv_recv_generic_request(void *private, DATA_BLOB blob) switch (protocol_version) { case SMB_MAGIC: - status = smbsrv_init_smb_connection(smb_conn, global_loadparm); + status = smbsrv_init_smb_connection(smb_conn, smb_conn->lp_ctx); NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb_request); return smbsrv_recv_smb_request(smb_conn, blob); case SMB2_MAGIC: - if (lp_srv_maxprotocol(global_loadparm) < PROTOCOL_SMB2) break; + if (lp_srv_maxprotocol(smb_conn->lp_ctx) < PROTOCOL_SMB2) break; status = smbsrv_init_smb2_connection(smb_conn); NT_STATUS_NOT_OK_RETURN(status); packet_set_callback(smb_conn->packet, smbsrv_recv_smb2_request); @@ -149,6 +149,7 @@ static void smbsrv_accept(struct stream_connection *conn) packet_set_fde(smb_conn->packet, conn->event.fde); packet_set_serialise(smb_conn->packet); + smb_conn->lp_ctx = global_loadparm; smb_conn->connection = conn; conn->private = smb_conn; -- cgit From 2f5ca872a80ad872ab864061f0c6982d8605393f Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 6 Dec 2007 16:54:34 +0100 Subject: r26313: Fix more uses of static loadparm. (This used to be commit 6fd0d9d3b75546d08c24c513e05b1843d5777608) --- source4/smb_server/smb_server.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 59d9e8f7b3..9c693b772a 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -188,7 +188,9 @@ _PUBLIC_ NTSTATUS smbsrv_add_socket(struct event_context *event_context, uint16_t port = atoi(ports[i]); if (port == 0) continue; status = stream_setup_socket(event_context, model_ops, &smb_stream_ops, - "ipv4", address, &port, NULL); + "ipv4", address, &port, + lp_socket_options(lp_ctx), + NULL); NT_STATUS_NOT_OK_RETURN(status); } -- cgit From c5bf20c5fe7eaa04cd11a7ce4f365aa6ffd7b124 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 6 Dec 2007 23:57:22 +0100 Subject: r26325: Remove use of global_loadparm in netif. (This used to be commit e452cb28594f23add7c00247ed39e8323aea78a6) --- source4/smb_server/smb_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 9c693b772a..e7006a2cee 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -220,7 +220,7 @@ static void smbsrv_task_init(struct task_server *task) task_server_set_title(task, "task[smbsrv]"); if (lp_interfaces(task->lp_ctx) && lp_bind_interfaces_only(task->lp_ctx)) { - int num_interfaces = iface_count(); + int num_interfaces = iface_count(task->lp_ctx); int i; /* We have been given an interfaces line, and been @@ -228,7 +228,7 @@ static void smbsrv_task_init(struct task_server *task) socket per interface and bind to only these. */ for(i = 0; i < num_interfaces; i++) { - const char *address = iface_n_ip(i); + const char *address = iface_n_ip(task->lp_ctx, i); status = smbsrv_add_socket(task->event_ctx, task->lp_ctx, task->model_ops, address); if (!NT_STATUS_IS_OK(status)) goto failed; } -- cgit From 5f9aeca0d66c55896a0ab20cf73dda4ca4b22a39 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 8 Dec 2007 23:32:13 +0100 Subject: r26347: More tests. (This used to be commit 5d927b5ca792c2c9da4a1c4f5c3ae880637895e3) --- source4/smb_server/smb_server.c | 3 --- 1 file changed, 3 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index e7006a2cee..c91566e244 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -94,9 +94,6 @@ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) DEBUG(10,("smbsrv_recv\n")); packet_recv(smb_conn->packet); - - /* free up temporary memory */ - lp_talloc_free(); } /* -- cgit From f055893ca571fbeac3675c02344c7cc53106bea1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 10 Dec 2007 18:41:55 +0100 Subject: r26382: Remove more uses of global_loadparm. (This used to be commit 6d4c59853481855c232e7cf97264a391f40af2b5) --- source4/smb_server/smb_server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index c91566e244..c1581f8842 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -156,7 +156,8 @@ static void smbsrv_accept(struct stream_connection *conn) smbsrv_management_init(smb_conn); - if (!NT_STATUS_IS_OK(share_get_context(smb_conn, &(smb_conn->share_context)))) { + if (!NT_STATUS_IS_OK(share_get_context_by_name(smb_conn, lp_share_backend(smb_conn->lp_ctx), + &(smb_conn->share_context)))) { smbsrv_terminate_connection(smb_conn, "share_init failed!"); return; } -- cgit From 6f2252dace1629d7b5c5637b103caa28d2c89b07 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 11 Dec 2007 22:23:14 +0100 Subject: r26401: Don't cache interfaces context in libnetif. (This used to be commit 9f975417cc66bfd4589da38bfd23731dbe0e6153) --- source4/smb_server/smb_server.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index c1581f8842..1dd022405a 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -218,15 +218,20 @@ static void smbsrv_task_init(struct task_server *task) task_server_set_title(task, "task[smbsrv]"); if (lp_interfaces(task->lp_ctx) && lp_bind_interfaces_only(task->lp_ctx)) { - int num_interfaces = iface_count(task->lp_ctx); + int num_interfaces; int i; + struct interface *ifaces; + + load_interfaces(lp_interfaces(task->lp_ctx), &ifaces); + + num_interfaces = iface_count(ifaces); /* We have been given an interfaces line, and been told to only bind to those interfaces. Create a socket per interface and bind to only these. */ for(i = 0; i < num_interfaces; i++) { - const char *address = iface_n_ip(task->lp_ctx, i); + const char *address = iface_n_ip(ifaces, i); status = smbsrv_add_socket(task->event_ctx, task->lp_ctx, task->model_ops, address); if (!NT_STATUS_IS_OK(status)) goto failed; } -- cgit From 70f1f33af8e6e82506d0ee9ff6cc7e0923a7d0a1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 11 Dec 2007 22:23:20 +0100 Subject: r26402: Require a talloc context in libnetif. (This used to be commit a35e51871bbf1ab33fc316fa59e597b722769c50) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 1dd022405a..bc17d100c5 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -222,7 +222,7 @@ static void smbsrv_task_init(struct task_server *task) int i; struct interface *ifaces; - load_interfaces(lp_interfaces(task->lp_ctx), &ifaces); + load_interfaces(task, lp_interfaces(task->lp_ctx), &ifaces); num_interfaces = iface_count(ifaces); -- cgit From e31abef15f7696cf39e9e81307f153da93568e02 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 13 Dec 2007 22:46:55 +0100 Subject: r26440: Remove more uses of global_loadparm. (This used to be commit 8858cf39722f192865e531164c72039fd18d7a8d) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index bc17d100c5..082de6540b 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -157,7 +157,7 @@ static void smbsrv_accept(struct stream_connection *conn) smbsrv_management_init(smb_conn); if (!NT_STATUS_IS_OK(share_get_context_by_name(smb_conn, lp_share_backend(smb_conn->lp_ctx), - &(smb_conn->share_context)))) { + smb_conn->lp_ctx, &(smb_conn->share_context)))) { smbsrv_terminate_connection(smb_conn, "share_init failed!"); return; } -- cgit From df408d056ec03f2abe08ce0ea487e1875b90e7bf Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 5 Jan 2008 19:03:43 -0600 Subject: r26672: Janitorial: Remove uses of global_loadparm. (This used to be commit 18cd08623eaad7d2cd63b82ea5275d4dfd21cf00) --- source4/smb_server/smb_server.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 082de6540b..cbff585e21 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -185,7 +185,8 @@ _PUBLIC_ NTSTATUS smbsrv_add_socket(struct event_context *event_context, for (i=0;ports[i];i++) { uint16_t port = atoi(ports[i]); if (port == 0) continue; - status = stream_setup_socket(event_context, model_ops, &smb_stream_ops, + status = stream_setup_socket(event_context, lp_ctx, + model_ops, &smb_stream_ops, "ipv4", address, &port, lp_socket_options(lp_ctx), NULL); @@ -257,7 +258,8 @@ static NTSTATUS smbsrv_init(struct event_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops) { - return task_server_startup(event_context, model_ops, smbsrv_task_init); + return task_server_startup(event_context, lp_ctx, + model_ops, smbsrv_task_init); } /* called at smbd startup - register ourselves as a server service */ -- cgit From 23d681caf9c1186999ac676d70a1eb0e8a43e358 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 4 Feb 2008 17:48:51 +1100 Subject: Rework service init functions to pass down service name. This is needed to change prefork behaviour based on what service is being started. Andrew Bartlett and David Disseldorp (This used to be commit 0d830580e3539c96da3aa6c72fafe6eacd7a74a0) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index cbff585e21..866ae26fa4 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -258,7 +258,7 @@ static NTSTATUS smbsrv_init(struct event_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops) { - return task_server_startup(event_context, lp_ctx, + return task_server_startup(event_context, lp_ctx, "smb", model_ops, smbsrv_task_init); } -- cgit From 0f8eeb81ec109cde681961614fb690f8373fa9c6 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 4 Feb 2008 21:58:29 +1100 Subject: Remove useless layer of indirection, where every service called task_service_init() manually. Now this is called from service.c for all services. Andrew Bartlett (This used to be commit 9c9a4731cafd0dcf6c8523a7b06759cd4f14e4db) --- source4/smb_server/smb_server.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 866ae26fa4..9a8a8cf5c4 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -250,20 +250,8 @@ failed: task_server_terminate(task, "Failed to startup smb server task"); } -/* - called on startup of the smb server service It's job is to start - listening on all configured sockets -*/ -static NTSTATUS smbsrv_init(struct event_context *event_context, - struct loadparm_context *lp_ctx, - const struct model_ops *model_ops) -{ - return task_server_startup(event_context, lp_ctx, "smb", - model_ops, smbsrv_task_init); -} - /* called at smbd startup - register ourselves as a server service */ NTSTATUS server_service_smb_init(void) { - return register_server_service("smb", smbsrv_init); + return register_server_service("smb", smbsrv_task_init); } -- cgit From 9e3e0f9d3946d3866a7a2557a06fe91378ad0f04 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 21 Feb 2008 16:21:32 +0100 Subject: More share_init to more apprioriate place. (This used to be commit b84f19f6783cbeaa8d04848fdc0b6f21b5e379a3) --- source4/smb_server/smb_server.c | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 9a8a8cf5c4..c031b5bd65 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -253,5 +253,6 @@ failed: /* called at smbd startup - register ourselves as a server service */ NTSTATUS server_service_smb_init(void) { + share_init(); return register_server_service("smb", smbsrv_task_init); } -- cgit From 299265d47b5b2faac39fbf908c738f336ea21e67 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 21 Feb 2008 18:09:47 +0100 Subject: Remove yet more global_loadparm instances. (This used to be commit 5de88728ac5c567d3711d1ac6862bbdaced84b75) --- source4/smb_server/smb_server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index c031b5bd65..4f8e628f74 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -146,7 +146,7 @@ static void smbsrv_accept(struct stream_connection *conn) packet_set_fde(smb_conn->packet, conn->event.fde); packet_set_serialise(smb_conn->packet); - smb_conn->lp_ctx = global_loadparm; + smb_conn->lp_ctx = conn->lp_ctx; smb_conn->connection = conn; conn->private = smb_conn; -- cgit From 21fc7673780aa1d7c0caab7b17ff9171238913ba Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Thu, 17 Apr 2008 12:23:44 +0200 Subject: Specify event_context to ldb_wrap_connect explicitly. (This used to be commit b4e1ae07a284c044704322446c94351c2decff91) --- source4/smb_server/smb_server.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 4f8e628f74..367557dbb7 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -157,6 +157,7 @@ static void smbsrv_accept(struct stream_connection *conn) smbsrv_management_init(smb_conn); if (!NT_STATUS_IS_OK(share_get_context_by_name(smb_conn, lp_share_backend(smb_conn->lp_ctx), + smb_conn->connection->event.ctx, smb_conn->lp_ctx, &(smb_conn->share_context)))) { smbsrv_terminate_connection(smb_conn, "share_init failed!"); return; @@ -206,7 +207,7 @@ static void smbsrv_preopen_ldb(struct task_server *task) /* yes, this looks strange. It is a hack to preload the schema. I'd like to share most of the ldb context with the child too. That will come later */ - talloc_free(samdb_connect(task, task->lp_ctx, NULL)); + talloc_free(samdb_connect(task, task->event_ctx, task->lp_ctx, NULL)); } /* -- cgit From 575f1243856f52f87ccb09f1235f1263b7c54b9b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 26 May 2008 05:12:31 +0200 Subject: Cope with no server being active. (This used to be commit 893119bb4c9c297966d43d37fe73faa747b7c86e) --- source4/smb_server/smb_server.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/smb_server/smb_server.c') diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 367557dbb7..6eccb836d6 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -150,12 +150,12 @@ static void smbsrv_accept(struct stream_connection *conn) smb_conn->connection = conn; conn->private = smb_conn; - irpc_add_name(conn->msg_ctx, "smb_server"); - smb_conn->statistics.connect_time = timeval_current(); smbsrv_management_init(smb_conn); + irpc_add_name(conn->msg_ctx, "smb_server"); + if (!NT_STATUS_IS_OK(share_get_context_by_name(smb_conn, lp_share_backend(smb_conn->lp_ctx), smb_conn->connection->event.ctx, smb_conn->lp_ctx, &(smb_conn->share_context)))) { -- cgit