summaryrefslogtreecommitdiff
path: root/source3/smbd/globals.h
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2010-04-09 19:26:34 -0700
committerJeremy Allison <jra@samba.org>2010-04-09 19:26:34 -0700
commite15939b4561b84eda283a9df233e2a3a0ed42621 (patch)
tree6475d00552b99dc4b17fc887f93c2f8210e29b1c /source3/smbd/globals.h
parentb253385611ac4934bb46390ef519c547bba87eb3 (diff)
downloadsamba-e15939b4561b84eda283a9df233e2a3a0ed42621.tar.gz
samba-e15939b4561b84eda283a9df233e2a3a0ed42621.tar.bz2
samba-e15939b4561b84eda283a9df233e2a3a0ed42621.zip
Plumb SMB2 stubs into all the places we defer SMB1 operations.
Rename functions to be internally consistent. Next step is to cope queueing single (non-compounded) SMB2 requests to put some code inside the stubs. Jeremy.
Diffstat (limited to 'source3/smbd/globals.h')
-rw-r--r--source3/smbd/globals.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/source3/smbd/globals.h b/source3/smbd/globals.h
index 5eea0ce311..f08da7b9a3 100644
--- a/source3/smbd/globals.h
+++ b/source3/smbd/globals.h
@@ -319,9 +319,9 @@ NTSTATUS smbd_smb2_request_process_getinfo(struct smbd_smb2_request *req);
NTSTATUS smbd_smb2_request_process_setinfo(struct smbd_smb2_request *req);
NTSTATUS smbd_smb2_request_process_break(struct smbd_smb2_request *req);
-void send_smb2_break_message(files_struct *fsp, uint8_t level);
-void schedule_deferred_open_smb2_message(uint16 mid);
-bool smb2_push_blocking_lock_request( struct byte_range_lock *br_lck,
+/* SMB1 -> SMB2 glue. */
+void send_break_message_smb2(files_struct *fsp, uint8_t level);
+bool push_blocking_lock_request_smb2( struct byte_range_lock *br_lck,
struct smb_request *req,
files_struct *fsp,
int lock_timeout,
@@ -332,6 +332,17 @@ bool smb2_push_blocking_lock_request( struct byte_range_lock *br_lck,
uint64_t offset,
uint64_t count,
uint32_t blocking_pid);
+void remove_deferred_open_message_smb2(uint16_t mid);
+void schedule_deferred_open_message_smb2(uint16_t mid);
+bool open_was_deferred_smb2(uint16_t mid);
+bool get_deferred_open_message_state_smb2(uint16_t mid,
+ struct timeval *p_request_time,
+ void **pp_state);
+bool push_deferred_open_message_smb2(struct smb_request *req,
+ struct timeval request_time,
+ struct timeval timeout,
+ char *private_data,
+ size_t priv_len);
struct smbd_smb2_request {
struct smbd_smb2_request *prev, *next;