From: David Mulder Date: Thu, 17 Mar 2022 18:59:22 +0000 (-0600) Subject: smbd: Move reply.c -> smb1_reply.c X-Git-Tag: tevent-0.12.0~97 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3daa70d7a717c2f55c685547da395a587db83186;p=thirdparty%2Fsamba.git smbd: Move reply.c -> smb1_reply.c Signed-off-by: David Mulder Reviewed-by: Jeremy Allison --- diff --git a/source3/smbd/proto.h b/source3/smbd/proto.h index 53f5cc1e60a..d4c43edd5e0 100644 --- a/source3/smbd/proto.h +++ b/source3/smbd/proto.h @@ -910,65 +910,6 @@ bool fork_echo_handler(struct smbXsrv_connection *xconn); bool disk_quotas(connection_struct *conn, struct smb_filename *fname, uint64_t *bsize, uint64_t *dfree, uint64_t *dsize); -/* The following definitions come from smbd/reply.c */ - -void reply_tcon(struct smb_request *req); -void reply_tcon_and_X(struct smb_request *req); -void reply_unknown_new(struct smb_request *req, uint8_t type); -void reply_ioctl(struct smb_request *req); -void reply_checkpath(struct smb_request *req); -void reply_getatr(struct smb_request *req); -void reply_setatr(struct smb_request *req); -void reply_dskattr(struct smb_request *req); -void reply_search(struct smb_request *req); -void reply_fclose(struct smb_request *req); -void reply_open(struct smb_request *req); -void reply_open_and_X(struct smb_request *req); -void reply_ulogoffX(struct smb_request *req); -void reply_mknew(struct smb_request *req); -void reply_ctemp(struct smb_request *req); -void reply_unlink(struct smb_request *req); -void reply_readbraw(struct smb_request *req); -void reply_lockread(struct smb_request *req); -size_t setup_readX_header(char *outbuf, size_t smb_maxcnt); -void reply_read(struct smb_request *req); -void reply_read_and_X(struct smb_request *req); -void error_to_writebrawerr(struct smb_request *req); -void reply_writebraw(struct smb_request *req); -void reply_writeunlock(struct smb_request *req); -void reply_write(struct smb_request *req); -bool is_valid_writeX_buffer(struct smbXsrv_connection *xconn, - const uint8_t *inbuf); -void reply_write_and_X(struct smb_request *req); -void reply_lseek(struct smb_request *req); -void reply_flush(struct smb_request *req); -void reply_exit(struct smb_request *req); -void reply_close(struct smb_request *req); -void reply_writeclose(struct smb_request *req); -void reply_lock(struct smb_request *req); -void reply_unlock(struct smb_request *req); -void reply_tdis(struct smb_request *req); -void reply_echo(struct smb_request *req); -void reply_printopen(struct smb_request *req); -void reply_printclose(struct smb_request *req); -void reply_printqueue(struct smb_request *req); -void reply_printwrite(struct smb_request *req); -void reply_mkdir(struct smb_request *req); -void reply_rmdir(struct smb_request *req); -void reply_mv(struct smb_request *req); -void reply_copy(struct smb_request *req); -uint64_t get_lock_pid(const uint8_t *data, int data_offset, - bool large_file_format); -uint64_t get_lock_count(const uint8_t *data, int data_offset, - bool large_file_format); -void reply_lockingX(struct smb_request *req); -void reply_readbmpx(struct smb_request *req); -void reply_readbs(struct smb_request *req); -void reply_setattrE(struct smb_request *req); -void reply_writebmpx(struct smb_request *req); -void reply_writebs(struct smb_request *req); -void reply_getattrE(struct smb_request *req); - /* The following definitions come from smbd/smb2_reply.c */ NTSTATUS check_path_syntax(char *path); diff --git a/source3/smbd/reply.c b/source3/smbd/smb1_reply.c similarity index 100% rename from source3/smbd/reply.c rename to source3/smbd/smb1_reply.c diff --git a/source3/smbd/smb1_reply.h b/source3/smbd/smb1_reply.h new file mode 100644 index 00000000000..c306d1d726a --- /dev/null +++ b/source3/smbd/smb1_reply.h @@ -0,0 +1,78 @@ +/* + Unix SMB/CIFS implementation. + Main SMB reply routines + Copyright (C) Andrew Tridgell 1992-1998 + Copyright (C) Andrew Bartlett 2001 + Copyright (C) Jeremy Allison 1992-2007. + Copyright (C) Volker Lendecke 2007 + + 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 3 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, see . +*/ + +void reply_tcon(struct smb_request *req); +void reply_tcon_and_X(struct smb_request *req); +void reply_unknown_new(struct smb_request *req, uint8_t type); +void reply_ioctl(struct smb_request *req); +void reply_checkpath(struct smb_request *req); +void reply_getatr(struct smb_request *req); +void reply_setatr(struct smb_request *req); +void reply_dskattr(struct smb_request *req); +void reply_search(struct smb_request *req); +void reply_fclose(struct smb_request *req); +void reply_open(struct smb_request *req); +void reply_open_and_X(struct smb_request *req); +void reply_ulogoffX(struct smb_request *req); +void reply_mknew(struct smb_request *req); +void reply_ctemp(struct smb_request *req); +void reply_unlink(struct smb_request *req); +void reply_readbraw(struct smb_request *req); +void reply_lockread(struct smb_request *req); +size_t setup_readX_header(char *outbuf, size_t smb_maxcnt); +void reply_read(struct smb_request *req); +void reply_read_and_X(struct smb_request *req); +void error_to_writebrawerr(struct smb_request *req); +void reply_writebraw(struct smb_request *req); +void reply_writeunlock(struct smb_request *req); +void reply_write(struct smb_request *req); +bool is_valid_writeX_buffer(struct smbXsrv_connection *xconn, + const uint8_t *inbuf); +void reply_write_and_X(struct smb_request *req); +void reply_lseek(struct smb_request *req); +void reply_flush(struct smb_request *req); +void reply_exit(struct smb_request *req); +void reply_close(struct smb_request *req); +void reply_writeclose(struct smb_request *req); +void reply_lock(struct smb_request *req); +void reply_unlock(struct smb_request *req); +void reply_tdis(struct smb_request *req); +void reply_echo(struct smb_request *req); +void reply_printopen(struct smb_request *req); +void reply_printclose(struct smb_request *req); +void reply_printqueue(struct smb_request *req); +void reply_printwrite(struct smb_request *req); +void reply_mkdir(struct smb_request *req); +void reply_rmdir(struct smb_request *req); +void reply_mv(struct smb_request *req); +void reply_copy(struct smb_request *req); +uint64_t get_lock_pid(const uint8_t *data, int data_offset, + bool large_file_format); +uint64_t get_lock_count(const uint8_t *data, int data_offset, + bool large_file_format); +void reply_lockingX(struct smb_request *req); +void reply_readbmpx(struct smb_request *req); +void reply_readbs(struct smb_request *req); +void reply_setattrE(struct smb_request *req); +void reply_writebmpx(struct smb_request *req); +void reply_writebs(struct smb_request *req); +void reply_getattrE(struct smb_request *req); diff --git a/source3/smbd/smbd.h b/source3/smbd/smbd.h index 16c55f6f5b9..a7439825d6b 100644 --- a/source3/smbd/smbd.h +++ b/source3/smbd/smbd.h @@ -36,6 +36,7 @@ struct dptr_struct; #include "smbd/smb1_nttrans.h" #include "smbd/smb1_oplock.h" #include "smbd/smb1_pipes.h" +#include "smbd/smb1_reply.h" #endif struct trans_state { diff --git a/source3/wscript_build b/source3/wscript_build index 8b64cbe8e3c..a30bf959196 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -609,6 +609,7 @@ if bld.CONFIG_SET('WITH_SMB1SERVER'): smbd/smb1_nttrans.c smbd/smb1_oplock.c smbd/smb1_pipes.c + smbd/smb1_reply.c ''' else: SMB1_SOURCES = '' @@ -630,7 +631,6 @@ bld.SAMBA3_LIBRARY('smbd_base', smbd/smb2_ipc.c smbd/smb2_nttrans.c smbd/smb2_pipes.c - smbd/reply.c smbd/smb2_reply.c smbd/trans2.c smbd/uid.c