mirror of
https://github.com/samba-team/samba.git
synced 2024-12-27 03:21:53 +03:00
s3: Move "trans_num" to smbd_server_connection
This commit is contained in:
parent
1808dd0a85
commit
2d81721a3f
@ -71,7 +71,6 @@ struct msg_state *smbd_msg_state = NULL;
|
|||||||
|
|
||||||
bool logged_ioctl_message = false;
|
bool logged_ioctl_message = false;
|
||||||
|
|
||||||
int trans_num = 0;
|
|
||||||
pid_t mypid = 0;
|
pid_t mypid = 0;
|
||||||
time_t last_smb_conf_reload_time = 0;
|
time_t last_smb_conf_reload_time = 0;
|
||||||
time_t last_printer_reload_time = 0;
|
time_t last_printer_reload_time = 0;
|
||||||
|
@ -466,6 +466,7 @@ struct smbd_server_connection {
|
|||||||
bool got_session;
|
bool got_session;
|
||||||
} nbt;
|
} nbt;
|
||||||
bool using_smb2;
|
bool using_smb2;
|
||||||
|
int trans_num;
|
||||||
struct {
|
struct {
|
||||||
struct fd_event *fde;
|
struct fd_event *fde;
|
||||||
|
|
||||||
|
@ -1647,9 +1647,8 @@ static void process_smb(struct smbd_server_connection *conn,
|
|||||||
|
|
||||||
DEBUG( 6, ( "got message type 0x%x of len 0x%x\n", msg_type,
|
DEBUG( 6, ( "got message type 0x%x of len 0x%x\n", msg_type,
|
||||||
smb_len(inbuf) ) );
|
smb_len(inbuf) ) );
|
||||||
DEBUG( 3, ( "Transaction %d of length %d (%u toread)\n", trans_num,
|
DEBUG(3, ("Transaction %d of length %d (%u toread)\n",
|
||||||
(int)nread,
|
conn->trans_num, (int)nread, (unsigned int)unread_bytes));
|
||||||
(unsigned int)unread_bytes ));
|
|
||||||
|
|
||||||
if (msg_type != 0) {
|
if (msg_type != 0) {
|
||||||
/*
|
/*
|
||||||
@ -1676,7 +1675,7 @@ static void process_smb(struct smbd_server_connection *conn,
|
|||||||
show_msg((char *)inbuf);
|
show_msg((char *)inbuf);
|
||||||
|
|
||||||
construct_reply((char *)inbuf,nread,unread_bytes,seqnum,encrypted,deferred_pcd);
|
construct_reply((char *)inbuf,nread,unread_bytes,seqnum,encrypted,deferred_pcd);
|
||||||
trans_num++;
|
conn->trans_num++;
|
||||||
|
|
||||||
done:
|
done:
|
||||||
conn->smb1.num_requests++;
|
conn->smb1.num_requests++;
|
||||||
|
Loading…
Reference in New Issue
Block a user