diff options
| author | Volker Lendecke <vl@samba.org> | 2010-10-03 18:13:39 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2010-10-14 13:53:07 +0200 |
| commit | 63e08ef8854bd9bde940fee774e94a6749825008 (patch) | |
| tree | de36574f70d24ffba773ed712922e64b0a9b7d13 /source3 | |
| parent | a2db154caa104c9606e343391ff9ffe33f1610a7 (diff) | |
| download | samba-63e08ef8854bd9bde940fee774e94a6749825008.tar.gz samba-63e08ef8854bd9bde940fee774e94a6749825008.tar.bz2 samba-63e08ef8854bd9bde940fee774e94a6749825008.zip | |
s3: Lift smbd_server_conn from receive_smb_talloc
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbd/process.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/source3/smbd/process.c b/source3/smbd/process.c index d776ff0377..17491bea4c 100644 --- a/source3/smbd/process.c +++ b/source3/smbd/process.c @@ -412,7 +412,8 @@ static NTSTATUS receive_smb_raw_talloc(TALLOC_CTX *mem_ctx, return NT_STATUS_OK; } -static NTSTATUS receive_smb_talloc(TALLOC_CTX *mem_ctx, int fd, +static NTSTATUS receive_smb_talloc(TALLOC_CTX *mem_ctx, + struct smbd_server_connection *sconn, char **buffer, unsigned int timeout, size_t *p_unread, bool *p_encrypted, size_t *p_len, @@ -424,14 +425,12 @@ static NTSTATUS receive_smb_talloc(TALLOC_CTX *mem_ctx, int fd, *p_encrypted = false; - status = receive_smb_raw_talloc(mem_ctx, smbd_server_conn, buffer, - timeout, p_unread, &len); + status = receive_smb_raw_talloc(mem_ctx, sconn, buffer, timeout, + p_unread, &len); if (!NT_STATUS_IS_OK(status)) { - char addr[INET6_ADDRSTRLEN]; DEBUG(1, ("read_smb_length_return_keepalive failed for " "client %s read error = %s.\n", - get_peer_addr(fd, addr, sizeof(addr)), - nt_errstr(status))); + sconn->client_id.addr, nt_errstr(status))); return status; } @@ -447,7 +446,7 @@ static NTSTATUS receive_smb_talloc(TALLOC_CTX *mem_ctx, int fd, } /* Check the incoming SMB signature. */ - if (!srv_check_sign_mac(smbd_server_conn, *buffer, seqnum, trusted_channel)) { + if (!srv_check_sign_mac(sconn, *buffer, seqnum, trusted_channel)) { DEBUG(0, ("receive_smb: SMB Signature verification failed on " "incoming packet!\n")); return NT_STATUS_INVALID_NETWORK_RESPONSE; @@ -2303,7 +2302,7 @@ static void smbd_server_connection_read_handler( } /* TODO: make this completely nonblocking */ - status = receive_smb_talloc(mem_ctx, fd, + status = receive_smb_talloc(mem_ctx, conn, (char **)(void *)&inbuf, 0, /* timeout */ &unread_bytes, @@ -2313,7 +2312,7 @@ static void smbd_server_connection_read_handler( smbd_unlock_socket(conn); } else { /* TODO: make this completely nonblocking */ - status = receive_smb_talloc(mem_ctx, fd, + status = receive_smb_talloc(mem_ctx, conn, (char **)(void *)&inbuf, 0, /* timeout */ &unread_bytes, @@ -2735,7 +2734,7 @@ static void smbd_echo_reader(struct tevent_context *ev, DEBUG(10,("echo_handler[%d]: reading pdu\n", (int)sys_getpid())); - status = receive_smb_talloc(state->pending, sconn->sock, + status = receive_smb_talloc(state->pending, sconn, (char **)(void *)&state->pending[num_pending].iov_base, 0 /* timeout */, &unread, |