From 17df313db42199e26d7d2044f6a1d845aacd1a90 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Mon, 27 Aug 2007 12:04:09 +0000 Subject: [PATCH] r24702: Remove the old API pointers --- source/smbd/blocking.c | 4 +- source/smbd/nttrans.c | 6 +- source/smbd/open.c | 32 +- source/smbd/pipes.c | 6 +- source/smbd/process.c | 804 +++++++++++++++------------------------- source/smbd/reply.c | 15 +- source/smbd/server.c | 5 - source/smbd/sesssetup.c | 2 +- 8 files changed, 337 insertions(+), 537 deletions(-) diff --git a/source/smbd/blocking.c b/source/smbd/blocking.c index 8bdc992910d..86cf3159306 100644 --- a/source/smbd/blocking.c +++ b/source/smbd/blocking.c @@ -21,8 +21,6 @@ #undef DBGC_CLASS #define DBGC_CLASS DBGC_LOCKING -extern int max_send; - /**************************************************************************** This is the structure to queue to implement blocking locks. notify. It consists of the requesting SMB and the expiry time. @@ -272,7 +270,7 @@ static void reply_lockingX_success(blocking_lock_record *blr) * that here and must set up the chain info manually. */ - chain_reply_new(req); + chain_reply(req); if (!send_smb(smbd_server_fd(),(char *)req->outbuf)) { exit_server_cleanly("send_blocking_reply: send_smb failed."); diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c index 5e200023394..f5c5db72a0e 100644 --- a/source/smbd/nttrans.c +++ b/source/smbd/nttrans.c @@ -444,7 +444,7 @@ static void do_ntcreate_pipe_open(connection_struct *conn, DEBUG(5,("do_ntcreate_pipe_open: open pipe = %s\n", fname)); - chain_reply_new(req); + chain_reply(req); } /**************************************************************************** @@ -479,7 +479,7 @@ static void reply_ntcreate_and_X_quota(connection_struct *conn, DEBUG(5,("reply_ntcreate_and_X_quota: fnum = %d, open name = %s\n", fsp->fnum, fsp->fsp_name)); - chain_reply_new(req); + chain_reply(req); } /**************************************************************************** @@ -1008,7 +1008,7 @@ void reply_ntcreate_and_X(connection_struct *conn, DEBUG(5,("reply_ntcreate_and_X: fnum = %d, open name = %s\n", fsp->fnum, fsp->fsp_name)); - chain_reply_new(req); + chain_reply(req); END_PROFILE(SMBntcreateX); return; } diff --git a/source/smbd/open.c b/source/smbd/open.c index bff445bf61d..725d72b2841 100644 --- a/source/smbd/open.c +++ b/source/smbd/open.c @@ -768,7 +768,7 @@ static BOOL request_timed_out(struct timeval request_time, static void defer_open(struct share_mode_lock *lck, struct timeval request_time, struct timeval timeout, - uint16 mid, + struct smb_request *req, struct deferred_open_record *state) { int i; @@ -782,9 +782,9 @@ static void defer_open(struct share_mode_lock *lck, continue; } - if (procid_is_me(&e->pid) && (e->op_mid == mid)) { + if (procid_is_me(&e->pid) && (e->op_mid == req->mid)) { DEBUG(0, ("Trying to defer an already deferred " - "request: mid=%d, exiting\n", mid)); + "request: mid=%d, exiting\n", req->mid)); exit_server("attempt to defer a deferred request"); } } @@ -795,13 +795,13 @@ static void defer_open(struct share_mode_lock *lck, "open entry for mid %u\n", (unsigned int)request_time.tv_sec, (unsigned int)request_time.tv_usec, - (unsigned int)mid)); + (unsigned int)req->mid)); - if (!push_deferred_smb_message(mid, request_time, timeout, + if (!push_deferred_smb_message(req, request_time, timeout, (char *)state, sizeof(*state))) { exit_server("push_deferred_smb_message failed"); } - add_deferred_open(lck, mid, request_time, state->id); + add_deferred_open(lck, req->mid, request_time, state->id); /* * Push the MID of this packet on the signing queue. @@ -810,7 +810,7 @@ static void defer_open(struct share_mode_lock *lck, * of incrementing the response sequence number. */ - srv_defer_sign_response(mid); + srv_defer_sign_response(req->mid); } @@ -1067,7 +1067,7 @@ BOOL map_open_params_to_ntcreate(const char *fname, int deny_mode, int open_func static void schedule_defer_open(struct share_mode_lock *lck, struct timeval request_time, - uint16 mid) + struct smb_request *req) { struct deferred_open_record state; @@ -1098,7 +1098,7 @@ static void schedule_defer_open(struct share_mode_lock *lck, state.id = lck->id; if (!request_timed_out(request_time, timeout)) { - defer_open(lck, request_time, timeout, mid, &state); + defer_open(lck, request_time, timeout, req, &state); } } @@ -1448,7 +1448,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn, if ((req != NULL) && delay_for_oplocks(lck, fsp, req->mid, 1, oplock_request)) { - schedule_defer_open(lck, request_time, req->mid); + schedule_defer_open(lck, request_time, req); TALLOC_FREE(lck); file_free(fsp); return NT_STATUS_SHARING_VIOLATION; @@ -1468,8 +1468,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn, if ((req != NULL) && delay_for_oplocks(lck, fsp, req->mid, 2, oplock_request)) { - schedule_defer_open(lck, request_time, - req->mid); + schedule_defer_open(lck, request_time, req); TALLOC_FREE(lck); file_free(fsp); return NT_STATUS_SHARING_VIOLATION; @@ -1587,7 +1586,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn, && !request_timed_out(request_time, timeout)) { defer_open(lck, request_time, timeout, - req->mid, &state); + req, &state); } } @@ -1678,7 +1677,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn, if ((req != NULL) && delay_for_oplocks(lck, fsp, req->mid, 1, oplock_request)) { - schedule_defer_open(lck, request_time, req->mid); + schedule_defer_open(lck, request_time, req); TALLOC_FREE(lck); fd_close(conn, fsp); file_free(fsp); @@ -1697,8 +1696,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn, if ((req != NULL) && delay_for_oplocks(lck, fsp, req->mid, 2, oplock_request)) { - schedule_defer_open(lck, request_time, - req->mid); + schedule_defer_open(lck, request_time, req); TALLOC_FREE(lck); fd_close(conn, fsp); file_free(fsp); @@ -1724,7 +1722,7 @@ NTSTATUS open_file_ntcreate(connection_struct *conn, if (req != NULL) { defer_open(lck, request_time, timeval_zero(), - req->mid, &state); + req, &state); } TALLOC_FREE(lck); return status; diff --git a/source/smbd/pipes.c b/source/smbd/pipes.c index e8a496ffa78..f43e243453c 100644 --- a/source/smbd/pipes.c +++ b/source/smbd/pipes.c @@ -130,7 +130,7 @@ void reply_open_pipe_and_X(connection_struct *conn, struct smb_request *req) SSVAL(req->outbuf,smb_vwv8,rmode); SSVAL(req->outbuf,smb_vwv11,0x0001); - chain_reply_new(req); + chain_reply(req); return; } @@ -244,7 +244,7 @@ void reply_pipe_write_and_X(struct smb_request *req) DEBUG(3,("writeX-IPC pnum=%04x nwritten=%d\n", p->pnum, nwritten)); - chain_reply_new(req); + chain_reply(req); } /**************************************************************************** @@ -294,7 +294,7 @@ void reply_pipe_read_and_X(struct smb_request *req) DEBUG(3,("readX-IPC pnum=%04x min=%d max=%d nread=%d\n", p->pnum, smb_mincnt, smb_maxcnt, nread)); - chain_reply_new(req); + chain_reply(req); } /**************************************************************************** diff --git a/source/smbd/process.c b/source/smbd/process.c index 35f1d6fb3ca..99898141db9 100644 --- a/source/smbd/process.c +++ b/source/smbd/process.c @@ -25,13 +25,6 @@ extern int smb_echo_count; const int total_buffer_size = (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE + SAFETY_MARGIN); -static char *InBuffer = NULL; -static char *OutBuffer = NULL; -static const char *current_inbuf = NULL; - -static char *NewInBuffer(char **old_inbuf); -static char *NewOutBuffer(char **old_outbuf); - /* * Size of data we can send to client. Set * by the client for all protocols above CORE. @@ -90,62 +83,6 @@ void init_smb_request(struct smb_request *req, const uint8 *inbuf) req->outbuf = NULL; } -/* - * From within a converted call you might have to call non-converted - * subroutines that still take the old inbuf/outbuf/lenght/bufsize - * parameters. This takes a struct smb_request and prepares the legacy - * parameters. - */ - -BOOL reply_prep_legacy(struct smb_request *req, - char **pinbuf, char **poutbuf, - int *psize, int *pbufsize) -{ - const int bufsize = (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE - + SAFETY_MARGIN); - char *inbuf, *outbuf; - - DEBUG(1, ("reply_prep_legacy called\n")); - - if (!(inbuf = TALLOC_ARRAY(req, char, bufsize))) { - DEBUG(0, ("Could not allocate legacy inbuf\n")); - return False; - } - memcpy(inbuf, req->inbuf, MIN(smb_len(req->inbuf)+4, bufsize)); - req->inbuf = (uint8 *)inbuf; - - if (!(outbuf = TALLOC_ARRAY(req, char, bufsize))) { - DEBUG(0, ("Could not allocate legacy outbuf\n")); - return False; - } - req->outbuf = (uint8 *)outbuf; - - construct_reply_common(inbuf, outbuf); - - *pinbuf = inbuf; - *poutbuf = outbuf; - *psize = smb_len(inbuf)+4; - *pbufsize = bufsize; - - return True; -} - -/* - * Post-process the output of the legacy routine so that the result fits into - * the new reply_xxx API - */ - -void reply_post_legacy(struct smb_request *req, int outsize) -{ - if (outsize > 0) { - smb_setlen((char *)req->inbuf, (char *)req->outbuf, - outsize); - } - else { - TALLOC_FREE(req->outbuf); - } -} - /**************************************************************************** structure to hold a linked list of queued messages. for processing. @@ -158,11 +95,12 @@ static struct pending_message_list *deferred_open_queue; ready for processing. ****************************************************************************/ -static BOOL push_queued_message(const char *buf, int msg_len, +static BOOL push_queued_message(struct smb_request *req, struct timeval request_time, struct timeval end_time, char *private_data, size_t private_len) { + int msg_len = smb_len(req->inbuf) + 4; struct pending_message_list *msg; msg = TALLOC_ZERO_P(NULL, struct pending_message_list); @@ -172,7 +110,7 @@ static BOOL push_queued_message(const char *buf, int msg_len, return False; } - msg->buf = data_blob_talloc(msg, buf, msg_len); + msg->buf = data_blob_talloc(msg, req->inbuf, msg_len); if(msg->buf.data == NULL) { DEBUG(0,("push_message: malloc fail (2)\n")); TALLOC_FREE(msg); @@ -286,7 +224,7 @@ struct pending_message_list *get_open_deferred_message(uint16 mid) messages ready for processing. ****************************************************************************/ -BOOL push_deferred_smb_message(uint16 mid, +BOOL push_deferred_smb_message(struct smb_request *req, struct timeval request_time, struct timeval timeout, char *private_data, size_t priv_len) @@ -297,12 +235,11 @@ BOOL push_deferred_smb_message(uint16 mid, DEBUG(10,("push_deferred_open_smb_message: pushing message len %u mid %u " "timeout time [%u.%06u]\n", - (unsigned int) smb_len(current_inbuf)+4, (unsigned int)mid, + (unsigned int) smb_len(req->inbuf)+4, (unsigned int)req->mid, (unsigned int)end_time.tv_sec, (unsigned int)end_time.tv_usec)); - return push_queued_message(current_inbuf, smb_len(current_inbuf)+4, - request_time, end_time, + return push_queued_message(req, request_time, end_time, private_data, priv_len); } @@ -708,267 +645,266 @@ force write permissions on print services. */ static const struct smb_message_struct { const char *name; - int (*fn)(connection_struct *conn, char *, char *, int, int); void (*fn_new)(connection_struct *conn, struct smb_request *req); int flags; } smb_messages[256] = { -/* 0x00 */ { "SMBmkdir",NULL,reply_mkdir,AS_USER | NEED_WRITE}, -/* 0x01 */ { "SMBrmdir",NULL,reply_rmdir,AS_USER | NEED_WRITE}, -/* 0x02 */ { "SMBopen",NULL,reply_open,AS_USER }, -/* 0x03 */ { "SMBcreate",NULL,reply_mknew,AS_USER}, -/* 0x04 */ { "SMBclose",NULL,reply_close,AS_USER | CAN_IPC }, -/* 0x05 */ { "SMBflush",NULL,reply_flush,AS_USER}, -/* 0x06 */ { "SMBunlink",NULL,reply_unlink,AS_USER | NEED_WRITE }, -/* 0x07 */ { "SMBmv",NULL,reply_mv,AS_USER | NEED_WRITE }, -/* 0x08 */ { "SMBgetatr",NULL,reply_getatr,AS_USER}, -/* 0x09 */ { "SMBsetatr",NULL,reply_setatr,AS_USER | NEED_WRITE}, -/* 0x0a */ { "SMBread",NULL,reply_read,AS_USER}, -/* 0x0b */ { "SMBwrite",NULL,reply_write,AS_USER | CAN_IPC }, -/* 0x0c */ { "SMBlock",NULL,reply_lock,AS_USER}, -/* 0x0d */ { "SMBunlock",NULL,reply_unlock,AS_USER}, -/* 0x0e */ { "SMBctemp",NULL,reply_ctemp,AS_USER }, -/* 0x0f */ { "SMBmknew",NULL,reply_mknew,AS_USER}, -/* 0x10 */ { "SMBcheckpath",NULL,reply_checkpath,AS_USER}, -/* 0x11 */ { "SMBexit",NULL,reply_exit,DO_CHDIR}, -/* 0x12 */ { "SMBlseek",NULL,reply_lseek,AS_USER}, -/* 0x13 */ { "SMBlockread",NULL,reply_lockread,AS_USER}, -/* 0x14 */ { "SMBwriteunlock",NULL,reply_writeunlock,AS_USER}, -/* 0x15 */ { NULL, NULL, NULL, 0 }, -/* 0x16 */ { NULL, NULL, NULL, 0 }, -/* 0x17 */ { NULL, NULL, NULL, 0 }, -/* 0x18 */ { NULL, NULL, NULL, 0 }, -/* 0x19 */ { NULL, NULL, NULL, 0 }, -/* 0x1a */ { "SMBreadbraw",NULL,reply_readbraw,AS_USER}, -/* 0x1b */ { "SMBreadBmpx",NULL,reply_readbmpx,AS_USER}, -/* 0x1c */ { "SMBreadBs",NULL,reply_readbs,AS_USER }, -/* 0x1d */ { "SMBwritebraw",NULL,reply_writebraw,AS_USER}, -/* 0x1e */ { "SMBwriteBmpx",NULL,reply_writebmpx,AS_USER}, -/* 0x1f */ { "SMBwriteBs",NULL,reply_writebs,AS_USER}, -/* 0x20 */ { "SMBwritec",NULL, NULL,0}, -/* 0x21 */ { NULL, NULL, NULL, 0 }, -/* 0x22 */ { "SMBsetattrE",NULL,reply_setattrE,AS_USER | NEED_WRITE }, -/* 0x23 */ { "SMBgetattrE",NULL,reply_getattrE,AS_USER }, -/* 0x24 */ { "SMBlockingX",NULL,reply_lockingX,AS_USER }, -/* 0x25 */ { "SMBtrans",NULL,reply_trans,AS_USER | CAN_IPC }, -/* 0x26 */ { "SMBtranss",NULL,reply_transs,AS_USER | CAN_IPC}, -/* 0x27 */ { "SMBioctl",NULL,reply_ioctl,0}, -/* 0x28 */ { "SMBioctls",NULL, NULL,AS_USER}, -/* 0x29 */ { "SMBcopy",NULL,reply_copy,AS_USER | NEED_WRITE }, -/* 0x2a */ { "SMBmove",NULL, NULL,AS_USER | NEED_WRITE }, -/* 0x2b */ { "SMBecho",NULL,reply_echo,0}, -/* 0x2c */ { "SMBwriteclose",NULL,reply_writeclose,AS_USER}, -/* 0x2d */ { "SMBopenX",NULL,reply_open_and_X,AS_USER | CAN_IPC }, -/* 0x2e */ { "SMBreadX",NULL,reply_read_and_X,AS_USER | CAN_IPC }, -/* 0x2f */ { "SMBwriteX",NULL,reply_write_and_X,AS_USER | CAN_IPC }, -/* 0x30 */ { NULL, NULL, NULL, 0 }, -/* 0x31 */ { NULL, NULL, NULL, 0 }, -/* 0x32 */ { "SMBtrans2", NULL,reply_trans2, AS_USER | CAN_IPC }, -/* 0x33 */ { "SMBtranss2", NULL,reply_transs2, AS_USER}, -/* 0x34 */ { "SMBfindclose", NULL,reply_findclose,AS_USER}, -/* 0x35 */ { "SMBfindnclose", NULL,reply_findnclose,AS_USER}, -/* 0x36 */ { NULL, NULL, NULL, 0 }, -/* 0x37 */ { NULL, NULL, NULL, 0 }, -/* 0x38 */ { NULL, NULL, NULL, 0 }, -/* 0x39 */ { NULL, NULL, NULL, 0 }, -/* 0x3a */ { NULL, NULL, NULL, 0 }, -/* 0x3b */ { NULL, NULL, NULL, 0 }, -/* 0x3c */ { NULL, NULL, NULL, 0 }, -/* 0x3d */ { NULL, NULL, NULL, 0 }, -/* 0x3e */ { NULL, NULL, NULL, 0 }, -/* 0x3f */ { NULL, NULL, NULL, 0 }, -/* 0x40 */ { NULL, NULL, NULL, 0 }, -/* 0x41 */ { NULL, NULL, NULL, 0 }, -/* 0x42 */ { NULL, NULL, NULL, 0 }, -/* 0x43 */ { NULL, NULL, NULL, 0 }, -/* 0x44 */ { NULL, NULL, NULL, 0 }, -/* 0x45 */ { NULL, NULL, NULL, 0 }, -/* 0x46 */ { NULL, NULL, NULL, 0 }, -/* 0x47 */ { NULL, NULL, NULL, 0 }, -/* 0x48 */ { NULL, NULL, NULL, 0 }, -/* 0x49 */ { NULL, NULL, NULL, 0 }, -/* 0x4a */ { NULL, NULL, NULL, 0 }, -/* 0x4b */ { NULL, NULL, NULL, 0 }, -/* 0x4c */ { NULL, NULL, NULL, 0 }, -/* 0x4d */ { NULL, NULL, NULL, 0 }, -/* 0x4e */ { NULL, NULL, NULL, 0 }, -/* 0x4f */ { NULL, NULL, NULL, 0 }, -/* 0x50 */ { NULL, NULL, NULL, 0 }, -/* 0x51 */ { NULL, NULL, NULL, 0 }, -/* 0x52 */ { NULL, NULL, NULL, 0 }, -/* 0x53 */ { NULL, NULL, NULL, 0 }, -/* 0x54 */ { NULL, NULL, NULL, 0 }, -/* 0x55 */ { NULL, NULL, NULL, 0 }, -/* 0x56 */ { NULL, NULL, NULL, 0 }, -/* 0x57 */ { NULL, NULL, NULL, 0 }, -/* 0x58 */ { NULL, NULL, NULL, 0 }, -/* 0x59 */ { NULL, NULL, NULL, 0 }, -/* 0x5a */ { NULL, NULL, NULL, 0 }, -/* 0x5b */ { NULL, NULL, NULL, 0 }, -/* 0x5c */ { NULL, NULL, NULL, 0 }, -/* 0x5d */ { NULL, NULL, NULL, 0 }, -/* 0x5e */ { NULL, NULL, NULL, 0 }, -/* 0x5f */ { NULL, NULL, NULL, 0 }, -/* 0x60 */ { NULL, NULL, NULL, 0 }, -/* 0x61 */ { NULL, NULL, NULL, 0 }, -/* 0x62 */ { NULL, NULL, NULL, 0 }, -/* 0x63 */ { NULL, NULL, NULL, 0 }, -/* 0x64 */ { NULL, NULL, NULL, 0 }, -/* 0x65 */ { NULL, NULL, NULL, 0 }, -/* 0x66 */ { NULL, NULL, NULL, 0 }, -/* 0x67 */ { NULL, NULL, NULL, 0 }, -/* 0x68 */ { NULL, NULL, NULL, 0 }, -/* 0x69 */ { NULL, NULL, NULL, 0 }, -/* 0x6a */ { NULL, NULL, NULL, 0 }, -/* 0x6b */ { NULL, NULL, NULL, 0 }, -/* 0x6c */ { NULL, NULL, NULL, 0 }, -/* 0x6d */ { NULL, NULL, NULL, 0 }, -/* 0x6e */ { NULL, NULL, NULL, 0 }, -/* 0x6f */ { NULL, NULL, NULL, 0 }, -/* 0x70 */ { "SMBtcon",NULL,reply_tcon,0}, -/* 0x71 */ { "SMBtdis",NULL,reply_tdis,DO_CHDIR}, -/* 0x72 */ { "SMBnegprot",NULL,reply_negprot,0}, -/* 0x73 */ { "SMBsesssetupX",NULL,reply_sesssetup_and_X,0}, -/* 0x74 */ { "SMBulogoffX", NULL,reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */ -/* 0x75 */ { "SMBtconX",NULL,reply_tcon_and_X,0}, -/* 0x76 */ { NULL, NULL, NULL, 0 }, -/* 0x77 */ { NULL, NULL, NULL, 0 }, -/* 0x78 */ { NULL, NULL, NULL, 0 }, -/* 0x79 */ { NULL, NULL, NULL, 0 }, -/* 0x7a */ { NULL, NULL, NULL, 0 }, -/* 0x7b */ { NULL, NULL, NULL, 0 }, -/* 0x7c */ { NULL, NULL, NULL, 0 }, -/* 0x7d */ { NULL, NULL, NULL, 0 }, -/* 0x7e */ { NULL, NULL, NULL, 0 }, -/* 0x7f */ { NULL, NULL, NULL, 0 }, -/* 0x80 */ { "SMBdskattr",NULL,reply_dskattr,AS_USER}, -/* 0x81 */ { "SMBsearch",NULL,reply_search,AS_USER}, -/* 0x82 */ { "SMBffirst",NULL,reply_search,AS_USER}, -/* 0x83 */ { "SMBfunique",NULL,reply_search,AS_USER}, -/* 0x84 */ { "SMBfclose",NULL,reply_fclose,AS_USER}, -/* 0x85 */ { NULL, NULL, NULL, 0 }, -/* 0x86 */ { NULL, NULL, NULL, 0 }, -/* 0x87 */ { NULL, NULL, NULL, 0 }, -/* 0x88 */ { NULL, NULL, NULL, 0 }, -/* 0x89 */ { NULL, NULL, NULL, 0 }, -/* 0x8a */ { NULL, NULL, NULL, 0 }, -/* 0x8b */ { NULL, NULL, NULL, 0 }, -/* 0x8c */ { NULL, NULL, NULL, 0 }, -/* 0x8d */ { NULL, NULL, NULL, 0 }, -/* 0x8e */ { NULL, NULL, NULL, 0 }, -/* 0x8f */ { NULL, NULL, NULL, 0 }, -/* 0x90 */ { NULL, NULL, NULL, 0 }, -/* 0x91 */ { NULL, NULL, NULL, 0 }, -/* 0x92 */ { NULL, NULL, NULL, 0 }, -/* 0x93 */ { NULL, NULL, NULL, 0 }, -/* 0x94 */ { NULL, NULL, NULL, 0 }, -/* 0x95 */ { NULL, NULL, NULL, 0 }, -/* 0x96 */ { NULL, NULL, NULL, 0 }, -/* 0x97 */ { NULL, NULL, NULL, 0 }, -/* 0x98 */ { NULL, NULL, NULL, 0 }, -/* 0x99 */ { NULL, NULL, NULL, 0 }, -/* 0x9a */ { NULL, NULL, NULL, 0 }, -/* 0x9b */ { NULL, NULL, NULL, 0 }, -/* 0x9c */ { NULL, NULL, NULL, 0 }, -/* 0x9d */ { NULL, NULL, NULL, 0 }, -/* 0x9e */ { NULL, NULL, NULL, 0 }, -/* 0x9f */ { NULL, NULL, NULL, 0 }, -/* 0xa0 */ { "SMBnttrans", NULL,reply_nttrans, AS_USER | CAN_IPC }, -/* 0xa1 */ { "SMBnttranss", NULL,reply_nttranss, AS_USER | CAN_IPC }, -/* 0xa2 */ { "SMBntcreateX", NULL,reply_ntcreate_and_X, AS_USER | CAN_IPC }, -/* 0xa3 */ { NULL, NULL, NULL, 0 }, -/* 0xa4 */ { "SMBntcancel", NULL,reply_ntcancel, 0 }, -/* 0xa5 */ { "SMBntrename", NULL,reply_ntrename, AS_USER | NEED_WRITE }, -/* 0xa6 */ { NULL, NULL, NULL, 0 }, -/* 0xa7 */ { NULL, NULL, NULL, 0 }, -/* 0xa8 */ { NULL, NULL, NULL, 0 }, -/* 0xa9 */ { NULL, NULL, NULL, 0 }, -/* 0xaa */ { NULL, NULL, NULL, 0 }, -/* 0xab */ { NULL, NULL, NULL, 0 }, -/* 0xac */ { NULL, NULL, NULL, 0 }, -/* 0xad */ { NULL, NULL, NULL, 0 }, -/* 0xae */ { NULL, NULL, NULL, 0 }, -/* 0xaf */ { NULL, NULL, NULL, 0 }, -/* 0xb0 */ { NULL, NULL, NULL, 0 }, -/* 0xb1 */ { NULL, NULL, NULL, 0 }, -/* 0xb2 */ { NULL, NULL, NULL, 0 }, -/* 0xb3 */ { NULL, NULL, NULL, 0 }, -/* 0xb4 */ { NULL, NULL, NULL, 0 }, -/* 0xb5 */ { NULL, NULL, NULL, 0 }, -/* 0xb6 */ { NULL, NULL, NULL, 0 }, -/* 0xb7 */ { NULL, NULL, NULL, 0 }, -/* 0xb8 */ { NULL, NULL, NULL, 0 }, -/* 0xb9 */ { NULL, NULL, NULL, 0 }, -/* 0xba */ { NULL, NULL, NULL, 0 }, -/* 0xbb */ { NULL, NULL, NULL, 0 }, -/* 0xbc */ { NULL, NULL, NULL, 0 }, -/* 0xbd */ { NULL, NULL, NULL, 0 }, -/* 0xbe */ { NULL, NULL, NULL, 0 }, -/* 0xbf */ { NULL, NULL, NULL, 0 }, -/* 0xc0 */ { "SMBsplopen",NULL,reply_printopen,AS_USER}, -/* 0xc1 */ { "SMBsplwr",NULL,reply_printwrite,AS_USER}, -/* 0xc2 */ { "SMBsplclose",NULL,reply_printclose,AS_USER}, -/* 0xc3 */ { "SMBsplretq",NULL,reply_printqueue,AS_USER}, -/* 0xc4 */ { NULL, NULL, NULL, 0 }, -/* 0xc5 */ { NULL, NULL, NULL, 0 }, -/* 0xc6 */ { NULL, NULL, NULL, 0 }, -/* 0xc7 */ { NULL, NULL, NULL, 0 }, -/* 0xc8 */ { NULL, NULL, NULL, 0 }, -/* 0xc9 */ { NULL, NULL, NULL, 0 }, -/* 0xca */ { NULL, NULL, NULL, 0 }, -/* 0xcb */ { NULL, NULL, NULL, 0 }, -/* 0xcc */ { NULL, NULL, NULL, 0 }, -/* 0xcd */ { NULL, NULL, NULL, 0 }, -/* 0xce */ { NULL, NULL, NULL, 0 }, -/* 0xcf */ { NULL, NULL, NULL, 0 }, -/* 0xd0 */ { "SMBsends",NULL,reply_sends,AS_GUEST}, -/* 0xd1 */ { "SMBsendb",NULL, NULL,AS_GUEST}, -/* 0xd2 */ { "SMBfwdname",NULL, NULL,AS_GUEST}, -/* 0xd3 */ { "SMBcancelf",NULL, NULL,AS_GUEST}, -/* 0xd4 */ { "SMBgetmac",NULL, NULL,AS_GUEST}, -/* 0xd5 */ { "SMBsendstrt",NULL,reply_sendstrt,AS_GUEST}, -/* 0xd6 */ { "SMBsendend",NULL,reply_sendend,AS_GUEST}, -/* 0xd7 */ { "SMBsendtxt",NULL,reply_sendtxt,AS_GUEST}, -/* 0xd8 */ { NULL, NULL, NULL, 0 }, -/* 0xd9 */ { NULL, NULL, NULL, 0 }, -/* 0xda */ { NULL, NULL, NULL, 0 }, -/* 0xdb */ { NULL, NULL, NULL, 0 }, -/* 0xdc */ { NULL, NULL, NULL, 0 }, -/* 0xdd */ { NULL, NULL, NULL, 0 }, -/* 0xde */ { NULL, NULL, NULL, 0 }, -/* 0xdf */ { NULL, NULL, NULL, 0 }, -/* 0xe0 */ { NULL, NULL, NULL, 0 }, -/* 0xe1 */ { NULL, NULL, NULL, 0 }, -/* 0xe2 */ { NULL, NULL, NULL, 0 }, -/* 0xe3 */ { NULL, NULL, NULL, 0 }, -/* 0xe4 */ { NULL, NULL, NULL, 0 }, -/* 0xe5 */ { NULL, NULL, NULL, 0 }, -/* 0xe6 */ { NULL, NULL, NULL, 0 }, -/* 0xe7 */ { NULL, NULL, NULL, 0 }, -/* 0xe8 */ { NULL, NULL, NULL, 0 }, -/* 0xe9 */ { NULL, NULL, NULL, 0 }, -/* 0xea */ { NULL, NULL, NULL, 0 }, -/* 0xeb */ { NULL, NULL, NULL, 0 }, -/* 0xec */ { NULL, NULL, NULL, 0 }, -/* 0xed */ { NULL, NULL, NULL, 0 }, -/* 0xee */ { NULL, NULL, NULL, 0 }, -/* 0xef */ { NULL, NULL, NULL, 0 }, -/* 0xf0 */ { NULL, NULL, NULL, 0 }, -/* 0xf1 */ { NULL, NULL, NULL, 0 }, -/* 0xf2 */ { NULL, NULL, NULL, 0 }, -/* 0xf3 */ { NULL, NULL, NULL, 0 }, -/* 0xf4 */ { NULL, NULL, NULL, 0 }, -/* 0xf5 */ { NULL, NULL, NULL, 0 }, -/* 0xf6 */ { NULL, NULL, NULL, 0 }, -/* 0xf7 */ { NULL, NULL, NULL, 0 }, -/* 0xf8 */ { NULL, NULL, NULL, 0 }, -/* 0xf9 */ { NULL, NULL, NULL, 0 }, -/* 0xfa */ { NULL, NULL, NULL, 0 }, -/* 0xfb */ { NULL, NULL, NULL, 0 }, -/* 0xfc */ { NULL, NULL, NULL, 0 }, -/* 0xfd */ { NULL, NULL, NULL, 0 }, -/* 0xfe */ { NULL, NULL, NULL, 0 }, -/* 0xff */ { NULL, NULL, NULL, 0 } +/* 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 */ { "SMBcheckpath",reply_checkpath,AS_USER}, +/* 0x11 */ { "SMBexit",reply_exit,DO_CHDIR}, +/* 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",reply_readbs,AS_USER }, +/* 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",reply_transs,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,0}, +/* 0x71 */ { "SMBtdis",reply_tdis,DO_CHDIR}, +/* 0x72 */ { "SMBnegprot",reply_negprot,0}, +/* 0x73 */ { "SMBsesssetupX",reply_sesssetup_and_X,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 | 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, AS_USER | NEED_WRITE }, +/* 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 } }; @@ -1049,8 +985,7 @@ static void smb_dump(const char *name, int type, const char *data, ssize_t len) find. ****************************************************************************/ -static BOOL switch_message_new(uint8 type, struct smb_request *req, int size, - connection_struct **pconn) +static void switch_message(uint8 type, struct smb_request *req, int size) { int flags; uint16 session_tag; @@ -1069,15 +1004,13 @@ static BOOL switch_message_new(uint8 type, struct smb_request *req, int size, DEBUG(2,("Non-SMB packet of length %d. Terminating server\n", smb_len(req->inbuf))); exit_server_cleanly("Non-SMB packet"); - return True; } - if ((smb_messages[type].fn == NULL) - && (smb_messages[type].fn_new == NULL)) { + if (smb_messages[type].fn_new == NULL) { DEBUG(0,("Unknown message type %d!\n",type)); smb_dump("Unknown", 1, (char *)req->inbuf, size); reply_unknown_new(req, type); - goto done; + return; } flags = smb_messages[type].flags; @@ -1130,12 +1063,12 @@ static BOOL switch_message_new(uint8 type, struct smb_request *req, int size, } else { reply_doserror(req, ERRSRV, ERRinvnid); } - goto done; + return; } if (!change_to_user(conn,session_tag)) { reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRbaduid)); - goto done; + return; } /* All NEED_WRITE and CAN_IPC flags must also have AS_USER. */ @@ -1143,13 +1076,13 @@ static BOOL switch_message_new(uint8 type, struct smb_request *req, int size, /* Does it need write permission? */ if ((flags & NEED_WRITE) && !CAN_WRITE(conn)) { reply_nterror(req, NT_STATUS_MEDIA_WRITE_PROTECTED); - goto done; + return; } /* IPC services are limited */ if (IS_IPC(conn) && !(flags & CAN_IPC)) { reply_doserror(req, ERRSRV,ERRaccess); - goto done; + return; } } else { /* This call needs to be run as root */ @@ -1162,7 +1095,7 @@ static BOOL switch_message_new(uint8 type, struct smb_request *req, int size, (flags & (AS_USER|DO_CHDIR) ?True:False))) { reply_doserror(req, ERRSRV, ERRaccess); - goto done; + return; } conn->num_smb_operations++; } @@ -1173,73 +1106,10 @@ static BOOL switch_message_new(uint8 type, struct smb_request *req, int size, !check_access(smbd_server_fd(), lp_hostsallow(-1), lp_hostsdeny(-1)))) { reply_doserror(req, ERRSRV, ERRaccess); - goto done; + return; } - current_inbuf = (char *)req->inbuf; /* In case we need to defer this - * message in open... */ - - if (smb_messages[type].fn_new != NULL) { - smb_messages[type].fn_new(conn, req); - goto done; - } - - /* - * Indicate the upper layer that there's still work. - */ - *pconn = conn; - return False; - - done: - return True; -} - - -/**************************************************************************** - Do a switch on the message type, and return the response size -****************************************************************************/ - -static int switch_message(uint8 type, struct smb_request *req, char **outbuf, - int size, int bufsize) -{ - int outsize = 0; - connection_struct *conn = NULL; - - if (switch_message_new(type, req, size, &conn)) { - if (req->outbuf != NULL) { - *outbuf = (char *)req->outbuf; - return smb_len(req->outbuf)+4; - } - return -1; - } - - if (InBuffer == NULL) { - DEBUG(1, ("have to alloc InBuffer for %s\n", - smb_fn_name(type))); - if (NewInBuffer(NULL) == NULL) { - smb_panic("Could not allocate InBuffer"); - } - } - - if ((OutBuffer == NULL) && (NewOutBuffer(NULL) == NULL)) { - smb_panic("Could not allocate OutBuffer"); - } - - clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, OutBuffer, - total_buffer_size); - - memcpy(InBuffer, req->inbuf, MIN(size, total_buffer_size)); - - construct_reply_common(InBuffer, OutBuffer); - - outsize = smb_messages[type].fn(conn, InBuffer, OutBuffer, size, - bufsize); - - smb_dump(smb_fn_name(type), 0, OutBuffer, outsize); - - *outbuf = OutBuffer; - - return(outsize); + smb_messages[type].fn_new(conn, req); } /**************************************************************************** @@ -1249,9 +1119,7 @@ static int switch_message(uint8 type, struct smb_request *req, char **outbuf, static void construct_reply(char *inbuf, int size) { uint8 type = CVAL(inbuf,smb_com); - int outsize = 0; struct smb_request *req; - char *outbuf; chain_size = 0; file_chain_reset(); @@ -1262,23 +1130,18 @@ static void construct_reply(char *inbuf, int size) } init_smb_request(req, (uint8 *)inbuf); - outsize = switch_message(type, req, &outbuf, size, max_send); + switch_message(type, req, size); - if (outsize > 4) { - smb_setlen(inbuf,outbuf,outsize - 4); + if (req->outbuf == NULL) { + return; } - if (outsize > 0) { - if (CVAL(outbuf,0) == 0) - show_msg(outbuf); + if (CVAL(req->outbuf,0) == 0) { + show_msg((char *)req->outbuf); + } - if (outsize != smb_len(outbuf) + 4) { - DEBUG(0,("ERROR: Invalid message response size! " - "%d %d\n", outsize, smb_len(outbuf))); - } else if (!send_smb(smbd_server_fd(),outbuf)) { - exit_server_cleanly("construct_reply: send_smb " - "failed."); - } + if (!send_smb(smbd_server_fd(), (char *)req->outbuf)) { + exit_server_cleanly("construct_reply: send_smb failed."); } TALLOC_FREE(req); @@ -1383,29 +1246,37 @@ void construct_reply_common(const char *inbuf, char *outbuf) Construct a chained reply and add it to the already made reply ****************************************************************************/ -int chain_reply(char *inbuf,char **poutbuf,int size,int bufsize) +void chain_reply(struct smb_request *req) { static char *orig_inbuf; + + /* + * Dirty little const_discard: We mess with req->inbuf, which is + * declared as const. If maybe at some point this routine gets + * rewritten, this const_discard could go away. + */ + char *inbuf = CONST_DISCARD(char *, req->inbuf); + int size = smb_len(req->inbuf)+4; + int smb_com1, smb_com2 = CVAL(inbuf,smb_vwv0); unsigned smb_off2 = SVAL(inbuf,smb_vwv1); char *inbuf2; - char *outbuf2 = NULL; int outsize2; int new_size; char inbuf_saved[smb_wct]; - char *outbuf = *poutbuf; + char *outbuf = (char *)req->outbuf; size_t outsize = smb_len(outbuf) + 4; size_t outsize_padded; size_t ofs, to_move; - struct smb_request *req; + struct smb_request *req2; size_t caller_outputlen; char *caller_output; /* Maybe its not chained, or it's an error packet. */ if (smb_com2 == 0xFF || SVAL(outbuf,smb_rcls) != 0) { SCVAL(outbuf,smb_vwv0,0xFF); - return outsize; + return; } if (chain_size == 0) { @@ -1466,7 +1337,7 @@ int chain_reply(char *inbuf,char **poutbuf,int size,int bufsize) "(orig size = %d, offset = %d)\n", size, (int)(inbuf2 - inbuf) )); exit_server_cleanly("Bad chained packet"); - return(-1); + return; } /* And set it in the header. */ @@ -1475,19 +1346,19 @@ int chain_reply(char *inbuf,char **poutbuf,int size,int bufsize) DEBUG(3,("Chained message\n")); show_msg(inbuf2); - if (!(req = talloc(tmp_talloc_ctx(), struct smb_request))) { + if (!(req2 = talloc(tmp_talloc_ctx(), struct smb_request))) { smb_panic("could not allocate smb_request"); } - init_smb_request(req, (uint8 *)inbuf2); + init_smb_request(req2, (uint8 *)inbuf2); /* process the request */ - outsize2 = switch_message(smb_com2, req, &outbuf2, new_size, - bufsize-chain_size); + switch_message(smb_com2, req2, new_size); /* * We don't accept deferred operations in chained requests. */ - SMB_ASSERT(outsize2 >= smb_wct); + SMB_ASSERT(req2->outbuf != NULL); + outsize2 = smb_len(req2->outbuf)+4; /* * Move away the new command output so that caller_output fits in, @@ -1520,24 +1391,22 @@ int chain_reply(char *inbuf,char **poutbuf,int size,int bufsize) * which is always large enough. */ - if (outbuf != OutBuffer) { - outbuf = TALLOC_REALLOC_ARRAY(NULL, outbuf, char, - to_move + ofs + smb_wct); - if (outbuf == NULL) { - smb_panic("could not realloc outbuf"); - } + outbuf = TALLOC_REALLOC_ARRAY(NULL, outbuf, char, + to_move + ofs + smb_wct); + if (outbuf == NULL) { + smb_panic("could not realloc outbuf"); } - *poutbuf = outbuf; + req->outbuf = (uint8 *)outbuf; - memmove(outbuf + smb_wct + ofs, outbuf2 + smb_wct, to_move); + memmove(outbuf + smb_wct + ofs, req2->outbuf + smb_wct, to_move); memcpy(outbuf + smb_wct, caller_output, caller_outputlen); /* * copy the new reply header over the old one but preserve the smb_com * field */ - memmove(outbuf,outbuf2,smb_wct); + memmove(outbuf, req2->outbuf, smb_wct); SCVAL(outbuf, smb_com, smb_com1); /* @@ -1568,17 +1437,9 @@ int chain_reply(char *inbuf,char **poutbuf,int size,int bufsize) memcpy(inbuf2,inbuf_saved,smb_wct); SAFE_FREE(caller_output); - TALLOC_FREE(req); + TALLOC_FREE(req2); - return outsize2 + chain_size; -} - -void chain_reply_new(struct smb_request *req) -{ - chain_reply(CONST_DISCARD(char *, req->inbuf), - (char **)(void *)&req->outbuf, - smb_len(req->inbuf)+4, - smb_len(req->outbuf)+4); + return; } /**************************************************************************** @@ -1757,55 +1618,6 @@ machine %s in domain %s.\n", global_myname(), lp_workgroup())); return True; } -/**************************************************************************** - Accessor functions for InBuffer, OutBuffer. -****************************************************************************/ - -char *get_InBuffer(void) -{ - return InBuffer; -} - -/**************************************************************************** - Allocate a new InBuffer. Returns the new and old ones. -****************************************************************************/ - -static char *NewInBuffer(char **old_inbuf) -{ - char *new_inbuf = (char *)SMB_MALLOC(total_buffer_size); - if (!new_inbuf) { - return NULL; - } - if (old_inbuf) { - *old_inbuf = InBuffer; - } - InBuffer = new_inbuf; -#if defined(DEVELOPER) - clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, InBuffer, total_buffer_size); -#endif - return InBuffer; -} - -/**************************************************************************** - Allocate a new OutBuffer. Returns the new and old ones. -****************************************************************************/ - -static char *NewOutBuffer(char **old_outbuf) -{ - char *new_outbuf = (char *)SMB_MALLOC(total_buffer_size); - if (!new_outbuf) { - return NULL; - } - if (old_outbuf) { - *old_outbuf = OutBuffer; - } - OutBuffer = new_outbuf; -#if defined(DEVELOPER) - clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, OutBuffer, total_buffer_size); -#endif - return OutBuffer; -} - /**************************************************************************** Process commands from the client ****************************************************************************/ diff --git a/source/smbd/reply.c b/source/smbd/reply.c index c3ae4ef61f6..2694176ca75 100644 --- a/source/smbd/reply.c +++ b/source/smbd/reply.c @@ -687,7 +687,7 @@ void reply_tcon_and_X(connection_struct *conn, struct smb_request *req) TALLOC_FREE(ctx); END_PROFILE(SMBtconX); - chain_reply_new(req); + chain_reply(req); return; } @@ -1802,7 +1802,7 @@ void reply_open_and_X(connection_struct *conn, struct smb_request *req) } END_PROFILE(SMBopenX); - chain_reply_new(req); + chain_reply(req); return; } @@ -1837,7 +1837,7 @@ void reply_ulogoffX(connection_struct *conn, struct smb_request *req) DEBUG( 3, ( "ulogoffX vuid=%d\n", req->vuid ) ); END_PROFILE(SMBulogoffX); - chain_reply_new(req); + chain_reply(req); } /**************************************************************************** @@ -3129,7 +3129,7 @@ normal_read: DEBUG( 3, ( "send_file_readX fnum=%d max=%d nread=%d\n", fsp->fnum, (int)smb_maxcnt, (int)nread ) ); - chain_reply_new(req); + chain_reply(req); return; } @@ -3241,7 +3241,6 @@ void reply_read_and_X(connection_struct *conn, struct smb_request *req) if (!big_readX && schedule_aio_read_and_X(conn, req, fsp, startpos, smb_maxcnt)) { END_PROFILE(SMBreadX); - reply_post_legacy(req, -1); return; } @@ -3842,7 +3841,7 @@ void reply_write_and_X(connection_struct *conn, struct smb_request *req) } END_PROFILE(SMBwriteX); - chain_reply_new(req); + chain_reply(req); return; } @@ -6252,7 +6251,6 @@ void reply_lockingX(connection_struct *conn, struct smb_request *req) * send a reply */ if (num_locks == 0 && num_ulocks == 0) { END_PROFILE(SMBlockingX); - reply_post_legacy(req, -1); return; } else { END_PROFILE(SMBlockingX); @@ -6459,7 +6457,6 @@ void reply_lockingX(connection_struct *conn, struct smb_request *req) block_smbpid)) { TALLOC_FREE(br_lck); END_PROFILE(SMBlockingX); - reply_post_legacy(req, -1); return; } } @@ -6519,7 +6516,7 @@ void reply_lockingX(connection_struct *conn, struct smb_request *req) fsp->fnum, (unsigned int)locktype, num_locks, num_ulocks)); END_PROFILE(SMBlockingX); - chain_reply_new(req); + chain_reply(req); } #undef DBGC_CLASS diff --git a/source/smbd/server.c b/source/smbd/server.c index 8f6d9a38ac4..7e55d3c0865 100644 --- a/source/smbd/server.c +++ b/source/smbd/server.c @@ -701,7 +701,6 @@ static void exit_server_common(enum server_exit_reason how, if (how != SERVER_EXIT_NORMAL) { int oldlevel = DEBUGLEVEL; - char *last_inbuf = get_InBuffer(); DEBUGLEVEL = 10; @@ -711,10 +710,6 @@ static void exit_server_common(enum server_exit_reason how, DEBUGSEP(0); log_stack_trace(); - if (last_inbuf) { - DEBUG(0,("Last message was %s\n", LAST_MESSAGE())); - show_msg(last_inbuf); - } DEBUGLEVEL = oldlevel; dump_core(); diff --git a/source/smbd/sesssetup.c b/source/smbd/sesssetup.c index 0cfe672a822..520835bef70 100644 --- a/source/smbd/sesssetup.c +++ b/source/smbd/sesssetup.c @@ -1760,6 +1760,6 @@ void reply_sesssetup_and_X(connection_struct *conn, struct smb_request *req) done_sesssetup = True; END_PROFILE(SMBsesssetupX); - chain_reply_new(req); + chain_reply(req); return; }