sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-09 08:58:35 +03:00
Code

smbd: Move srv_set_message to smb2_process.c

Browse Source 
Signed-off-by: David Mulder <dmulder@suse.com>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
David Mulder 2022-03-17 15:23:33 -06:00 committed by Jeremy Allison
parent 08aa1619c6
commit e287f7c27b
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source3/smbd/process.c
View File

@ -281,24 +281,6 @@ out:
return (ret > 0);
}
/*******************************************************************
Setup the word count and byte count for a smb message.
********************************************************************/
size_t srv_set_message(char *buf,
size_t num_words,
size_t num_bytes,
bool zero)
{
if (zero && (num_words || num_bytes)) {
memset(buf + smb_size,'\0',num_words*2 + num_bytes);
}
SCVAL(buf,smb_wct,num_words);
SSVAL(buf,smb_vwv + num_words*SIZEOFWORD,num_bytes);
smb_setlen(buf,(smb_size + num_words*2 + num_bytes - 4));
return (smb_size + num_words*2 + num_bytes);
}
static bool valid_smb_header(const uint8_t *inbuf)
{
if (is_encrypted_packet(inbuf)) {

8
source3/smbd/proto.h
View File

@ -852,10 +852,6 @@ bool smb1_srv_send(struct smbXsrv_connection *xconn, char *buffer,
bool do_signing, uint32_t seqnum,
bool do_encrypt,
struct smb_perfcount_data *pcd);
size_t srv_set_message(char *buf,
size_t num_words,
size_t num_bytes,
bool zero);
void remove_deferred_open_message_smb(struct smbXsrv_connection *xconn,
uint64_t mid);
bool schedule_deferred_open_message_smb(struct smbXsrv_connection *xconn,
@ -900,6 +896,10 @@ bool srv_send_smb(struct smbXsrv_connection *xconn, char *buffer,
bool no_signing, uint32_t seqnum,
bool do_encrypt,
struct smb_perfcount_data *pcd);
size_t srv_set_message(char *buf,
size_t num_words,
size_t num_bytes,
bool zero);
/* The following definitions come from smbd/quotas.c */

18
source3/smbd/smb2_process.c
View File

@ -107,3 +107,21 @@ bool srv_send_smb(struct smbXsrv_connection *xconn, char *buffer,
do_encrypt, pcd);
#endif
}
/*******************************************************************
Setup the word count and byte count for a smb message.
********************************************************************/
size_t srv_set_message(char *buf,
size_t num_words,
size_t num_bytes,
bool zero)
{
if (zero && (num_words || num_bytes)) {
memset(buf + smb_size,'\0',num_words*2 + num_bytes);
}
SCVAL(buf,smb_wct,num_words);
SSVAL(buf,smb_vwv + num_words*SIZEOFWORD,num_bytes);
smb_setlen(buf,(smb_size + num_words*2 + num_bytes - 4));
return (smb_size + num_words*2 + num_bytes);
}