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

Factor out create_outbuf, creating an outbuf just given an inbuf

Browse Source 
(This used to be commit 50427cbf6345d3f671e9ea321089c4b4244df972)
This commit is contained in:
Volker Lendecke 2008-04-02 15:34:29 +02:00
parent 3353565faf
commit 5cd8a42720
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/include/proto.h
View File

@ -10066,6 +10066,8 @@ struct idle_event *event_add_idle(struct event_context *event_ctx,
void *private_data);
NTSTATUS allow_new_trans(struct trans_state *list, int mid);
void respond_to_all_remaining_local_messages(void);
bool create_outbuf(TALLOC_CTX *mem_ctx, const char *inbuf, char **outbuf,
uint8_t num_words, uint32_t num_bytes);
void reply_outbuf(struct smb_request *req, uint8 num_words, uint32 num_bytes);
const char *smb_fn_name(int type);
void add_to_common_flags2(uint32 v);

29
source3/smbd/process.c
View File

@ -1245,7 +1245,8 @@ static const struct smb_message_struct {
allocate and initialize a reply packet
********************************************************************/
void reply_outbuf(struct smb_request *req, uint8 num_words, uint32 num_bytes)
bool create_outbuf(TALLOC_CTX *mem_ctx, const char *inbuf, char **outbuf,
uint8_t num_words, uint32_t num_bytes)
{
/*
* Protect against integer wrap
@ -1260,23 +1261,33 @@ void reply_outbuf(struct smb_request *req, uint8 num_words, uint32 num_bytes)
smb_panic(msg);
}
if (!(req->outbuf = TALLOC_ARRAY(
req, uint8,
smb_size + num_words*2 + num_bytes))) {
smb_panic("could not allocate output buffer\n");
*outbuf = TALLOC_ARRAY(mem_ctx, char,
smb_size + num_words*2 + num_bytes);
if (*outbuf == NULL) {
return false;
}
construct_reply_common((char *)req->inbuf, (char *)req->outbuf);
srv_set_message((char *)req->outbuf, num_words, num_bytes, false);
construct_reply_common(inbuf, *outbuf);
srv_set_message(*outbuf, num_words, num_bytes, false);
/*
* Zero out the word area, the caller has to take care of the bcc area
* himself
*/
if (num_words != 0) {
memset(req->outbuf + smb_vwv0, 0, num_words*2);
memset(*outbuf + smb_vwv0, 0, num_words*2);
}
return;
return true;
}
void reply_outbuf(struct smb_request *req, uint8 num_words, uint32 num_bytes)
{
char *outbuf;
if (!create_outbuf(req, (char *)req->inbuf, &outbuf, num_words,
num_bytes)) {
smb_panic("could not allocate output buffer\n");
}
req->outbuf = (uint8_t *)outbuf;
}