sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

r20394: This is a *VERY* early start of my work on notify.

Browse Source 
Checking in because Jeremy was bugging me. Potentially this becomes quite
intrusive, I'm not sure if I should open a temporary branch for this.

Jeremy, Jerry, do you think 3_0 is the right place for this?

Volker
(This used to be commit bcf5c751cb)
This commit is contained in:
Volker Lendecke
2006-12-28 21:50:31 +00:00
committed by Gerald (Jerry) Carter
parent 143a364d62
commit 98c082489b
8 changed files with 409 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source3/include/messages.h
View File

@ -71,6 +71,7 @@
#define MSG_SMB_FILE_RENAME 3011
#define MSG_SMB_INJECT_FAULT 3012
#define MSG_SMB_BLOCKING_LOCK_CANCEL 3013
#define MSG_SMB_NOTIFY 3014
/* winbind messages */
#define MSG_WINBIND_FINISHED 4001

26
source3/include/smb.h
View File

@ -428,6 +428,16 @@ struct vfs_fsp_data {
*/
};
struct notify_change {
uint32_t action;
char *name;
};
struct notify_changes {
uint32_t num_changes;
struct notify_change *changes;
};
typedef struct files_struct {
struct files_struct *next, *prev;
int fnum;
@ -470,6 +480,8 @@ typedef struct files_struct {
struct vfs_fsp_data *vfs_extension;
FAKE_FILE_HANDLE *fake_file_handle;
struct notify_changes *notify;
} files_struct;
#include "ntquotas.h"
@ -1343,6 +1355,20 @@ struct bitmap {
#define FILE_NOTIFY_CHANGE_SECURITY 0x100
#define FILE_NOTIFY_CHANGE_FILE_NAME 0x200
#define FILE_NOTIFY_CHANGE_NAME \
(FILE_NOTIFY_CHANGE_FILE_NAME|FILE_NOTIFY_CHANGE_DIR_NAME)
/* change notify action results */
#define NOTIFY_ACTION_ADDED 1
#define NOTIFY_ACTION_REMOVED 2
#define NOTIFY_ACTION_MODIFIED 3
#define NOTIFY_ACTION_OLD_NAME 4
#define NOTIFY_ACTION_NEW_NAME 5
#define NOTIFY_ACTION_ADDED_STREAM 6
#define NOTIFY_ACTION_REMOVED_STREAM 7
#define NOTIFY_ACTION_MODIFIED_STREAM 8
/* where to find the base of the SMB packet proper */
#define smb_base(buf) (((char *)(buf))+4)

31
source3/lib/util.c
View File

@ -2620,6 +2620,37 @@ char *parent_dirname(const char *path)
return dirpath;
}
BOOL parent_dirname_talloc(TALLOC_CTX *mem_ctx, const char *dir,
char **parent, const char **name)
{
char *p;
ptrdiff_t len;
p = strrchr_m(dir, '/'); /* Find final '/', if any */
if (p == NULL) {
if (!(*parent = talloc_strdup(mem_ctx, "."))) {
return False;
}
if (name) {
*name = "";
}
return True;
}
len = p-dir;
if (!(*parent = TALLOC_ARRAY(mem_ctx, char, len+1))) {
return False;
}
memcpy(*parent, dir, len);
(*parent)[len] = '\0';
if (name) {
*name = p+1;
}
return True;
}
/*******************************************************************
Determine if a pattern contains any Microsoft wildcard characters.

37
source3/smbd/files.c
View File

@ -100,6 +100,12 @@ NTSTATUS file_new(connection_struct *conn, files_struct **result)
ZERO_STRUCTP(fsp->fh);
if (!(fsp->notify = TALLOC_ZERO_P(NULL, struct notify_changes))) {
SAFE_FREE(fsp->fh);
SAFE_FREE(fsp);
return NT_STATUS_NO_MEMORY;
}
fsp->fh->ref_count = 1;
fsp->fh->fd = -1;
@ -361,6 +367,35 @@ files_struct *file_find_di_next(files_struct *start_fsp)
return NULL;
}
/****************************************************************************
Find the directory fsp given a device and inode with the lowest
file_id. First use is for notify actions.
****************************************************************************/
files_struct *file_find_dir_lowest_id(SMB_DEV_T dev, SMB_INO_T inode)
{
files_struct *fsp;
files_struct *min_fsp = NULL;
for (fsp = Files; fsp; fsp = fsp->next) {
if (!fsp->is_directory
|| fsp->dev != dev || fsp->inode != inode) {
continue;
}
if (min_fsp == NULL) {
min_fsp = fsp;
continue;
}
if (fsp->fh->file_id < min_fsp->fh->file_id) {
min_fsp = fsp;
}
}
return min_fsp;
}
/****************************************************************************
Find a fsp that is open for printing.
****************************************************************************/
@ -439,6 +474,8 @@ void file_free(files_struct *fsp)
fsp->fh->ref_count--;
}
TALLOC_FREE(fsp->notify);
bitmap_clear(file_bmap, fsp->fnum - FILE_HANDLE_OFFSET);
files_used--;

293
source3/smbd/notify.c
View File

@ -35,22 +35,75 @@ struct change_notify {
files_struct *fsp;
connection_struct *conn;
uint32 flags;
uint32 max_param_count;
char request_buf[smb_size];
void *change_data;
};
static struct change_notify *change_notify_list;
static BOOL notify_marshall_changes(struct notify_changes *changes,
prs_struct *ps)
{
int i;
UNISTR uni_name;
for (i=0; i<changes->num_changes; i++) {
struct notify_change *c = &changes->changes[i];
size_t namelen;
uint32 u32_tmp; /* Temp arg to prs_uint32 to avoid
* signed/unsigned issues */
namelen = convert_string_allocate(
NULL, CH_UNIX, CH_UTF16LE, c->name, strlen(c->name)+1,
&uni_name.buffer, True);
if ((namelen == -1) || (uni_name.buffer == NULL)) {
goto fail;
}
namelen -= 2; /* Dump NULL termination */
/*
* Offset to next entry, only if there is one
*/
u32_tmp = (i == changes->num_changes-1) ? 0 : namelen + 12;
if (!prs_uint32("offset", ps, 1, &u32_tmp)) goto fail;
u32_tmp = c->action;
if (!prs_uint32("action", ps, 1, &u32_tmp)) goto fail;
u32_tmp = namelen;
if (!prs_uint32("namelen", ps, 1, &u32_tmp)) goto fail;
if (!prs_unistr("name", ps, 1, &uni_name)) goto fail;
/*
* Not NULL terminated, decrease by the 2 UCS2 \0 chars
*/
prs_set_offset(ps, prs_offset(ps)-2);
SAFE_FREE(uni_name.buffer);
}
return True;
fail:
SAFE_FREE(uni_name.buffer);
return False;
}
/****************************************************************************
Setup the common parts of the return packet and send it.
*****************************************************************************/
static void change_notify_reply_packet(char *inbuf, NTSTATUS error_code)
static void change_notify_reply_packet(struct change_notify *notify,
NTSTATUS error_code)
{
char outbuf[smb_size+38];
memset(outbuf, '\0', sizeof(outbuf));
construct_reply_common(inbuf, outbuf);
construct_reply_common(notify->request_buf, outbuf);
ERROR_NT(error_code);
@ -65,6 +118,47 @@ static void change_notify_reply_packet(char *inbuf, NTSTATUS error_code)
exit_server_cleanly("change_notify_reply_packet: send_smb failed.");
}
static void change_notify_reply(struct change_notify *notify)
{
char *outbuf = NULL;
prs_struct ps;
size_t buflen = smb_size+38+notify->max_param_count;
if (!prs_init(&ps, 0, NULL, False)
|| !notify_marshall_changes(notify->fsp->notify, &ps)) {
change_notify_reply_packet(notify, NT_STATUS_NO_MEMORY);
goto done;
}
if (prs_offset(&ps) > notify->max_param_count) {
/*
* We exceed what the client is willing to accept. Send
* nothing.
*/
change_notify_reply_packet(notify, NT_STATUS_OK);
goto done;
}
if (!(outbuf = SMB_MALLOC_ARRAY(char, buflen))) {
change_notify_reply_packet(notify, NT_STATUS_NO_MEMORY);
goto done;
}
memset(outbuf, '\0', sizeof(outbuf));
construct_reply_common(notify->request_buf, outbuf);
if (send_nt_replies(outbuf, buflen, NT_STATUS_OK, prs_data_p(&ps),
prs_offset(&ps), NULL, 0) == -1) {
exit_server("change_notify_reply_packet: send_smb failed.");
}
done:
SAFE_FREE(outbuf);
prs_mem_free(&ps);
notify->fsp->notify->num_changes = 0;
TALLOC_FREE(notify->fsp->notify->changes);
}
/****************************************************************************
Remove an entry from the list and free it, also closing any
directory handle if necessary.
@ -89,7 +183,7 @@ void remove_pending_change_notify_requests_by_fid(files_struct *fsp, NTSTATUS st
for (cnbp=change_notify_list; cnbp; cnbp=next) {
next=cnbp->next;
if (cnbp->fsp->fnum == fsp->fnum) {
change_notify_reply_packet(cnbp->request_buf,status);
change_notify_reply_packet(cnbp, status);
change_notify_remove(cnbp);
}
}
@ -106,7 +200,7 @@ void remove_pending_change_notify_requests_by_mid(int mid)
for (cnbp=change_notify_list; cnbp; cnbp=next) {
next=cnbp->next;
if(SVAL(cnbp->request_buf,smb_mid) == mid) {
change_notify_reply_packet(cnbp->request_buf,NT_STATUS_CANCELLED);
change_notify_reply_packet(cnbp, NT_STATUS_CANCELLED);
change_notify_remove(cnbp);
}
}
@ -128,7 +222,7 @@ void remove_pending_change_notify_requests_by_filename(files_struct *fsp, NTSTAT
* the filename are identical.
*/
if((cnbp->fsp->conn == fsp->conn) && strequal(cnbp->fsp->fsp_name,fsp->fsp_name)) {
change_notify_reply_packet(cnbp->request_buf,status);
change_notify_reply_packet(cnbp, status);
change_notify_remove(cnbp);
}
}
@ -171,9 +265,13 @@ BOOL process_pending_change_notify_queue(time_t t)
vuid = (lp_security() == SEC_SHARE) ? UID_FIELD_INVALID : SVAL(cnbp->request_buf,smb_uid);
if (cnotify->check_notify(cnbp->conn, vuid, cnbp->fsp->fsp_name, cnbp->flags, cnbp->change_data, t)) {
DEBUG(10,("process_pending_change_notify_queue: dir %s changed !\n", cnbp->fsp->fsp_name ));
change_notify_reply_packet(cnbp->request_buf,STATUS_NOTIFY_ENUM_DIR);
if ((cnbp->fsp->notify->num_changes != 0)
|| cnotify->check_notify(cnbp->conn, vuid,
cnbp->fsp->fsp_name, cnbp->flags,
cnbp->change_data, t)) {
DEBUG(10,("process_pending_change_notify_queue: dir "
"%s changed !\n", cnbp->fsp->fsp_name ));
change_notify_reply(cnbp);
change_notify_remove(cnbp);
}
}
@ -188,13 +286,14 @@ BOOL process_pending_change_notify_queue(time_t t)
error.
****************************************************************************/
BOOL change_notify_set(char *inbuf, files_struct *fsp, connection_struct *conn, uint32 flags)
BOOL change_notify_set(char *inbuf, files_struct *fsp, connection_struct *conn,
uint32 flags, uint32 max_param_count)
{
struct change_notify *cnbp;
if((cnbp = SMB_MALLOC_P(struct change_notify)) == NULL) {
DEBUG(0,("change_notify_set: malloc fail !\n" ));
return -1;
return False;
}
ZERO_STRUCTP(cnbp);
@ -203,7 +302,9 @@ BOOL change_notify_set(char *inbuf, files_struct *fsp, connection_struct *conn,
cnbp->fsp = fsp;
cnbp->conn = conn;
cnbp->flags = flags;
cnbp->change_data = cnotify->register_notify(conn, fsp->fsp_name, flags);
cnbp->max_param_count = max_param_count;
cnbp->change_data = cnotify->register_notify(conn, fsp->fsp_name,
flags);
if (!cnbp->change_data) {
SAFE_FREE(cnbp);
@ -227,6 +328,174 @@ int change_notify_fd(void)
return -1;
}
/* notify message definition
Offset Data length.
0 SMB_DEV_T dev 8
8 SMB_INO_T inode 8
16 uint32 action 4
20.. name
*/
#define MSG_NOTIFY_MESSAGE_SIZE 21 /* Includes at least the '\0' terminator */
struct notify_message {
SMB_DEV_T dev;
SMB_INO_T inode;
uint32_t action;
char *name;
};
static DATA_BLOB notify_message_to_buf(const struct notify_message *msg)
{
DATA_BLOB result;
size_t len;
len = strlen(msg->name);
result = data_blob(NULL, MSG_NOTIFY_MESSAGE_SIZE + len);
if (!result.data) {
return result;
}
SDEV_T_VAL(result.data, 0, msg->dev);
SINO_T_VAL(result.data, 8, msg->inode);
SIVAL(result.data, 16, msg->action);
memcpy(result.data+20, msg->name, len+1);
return result;
}
static BOOL buf_to_notify_message(void *buf, size_t len,
struct notify_message *msg)
{
if (len < MSG_NOTIFY_MESSAGE_SIZE) {
DEBUG(0, ("Got invalid notify message of len %d\n", len));
return False;
}
msg->dev = DEV_T_VAL(buf, 0);
msg->inode = INO_T_VAL(buf, 8);
msg->action = IVAL(buf, 16);
msg->name = ((char *)buf)+20;
return True;
}
void notify_action(connection_struct *conn, const char *parent,
const char *name, uint32_t action)
{
struct share_mode_lock *lck;
SMB_STRUCT_STAT sbuf;
int i;
struct notify_message msg;
DATA_BLOB blob;
struct process_id *pids;
int num_pids;
if (SMB_VFS_STAT(conn, parent, &sbuf) != 0) {
/*
* Not 100% critical, ignore failure
*/
return;
}
if (!(lck = get_share_mode_lock(NULL, sbuf.st_dev, sbuf.st_ino,
NULL, NULL))) {
return;
}
msg.dev = sbuf.st_dev;
msg.inode = sbuf.st_ino;
msg.action = action;
msg.name = CONST_DISCARD(char *, name);
blob = notify_message_to_buf(&msg);
if (blob.data == NULL) {
DEBUG(0, ("notify_message_to_buf failed\n"));
return;
}
pids = NULL;
num_pids = 0;
become_root_uid_only();
for (i=0; i<lck->num_share_modes; i++) {
struct share_mode_entry *e = &lck->share_modes[i];
int j;
struct process_id *tmp;
for (j=0; j<num_pids; j++) {
if (procid_equal(&e->pid, &pids[j])) {
break;
}
}
if (j < num_pids) {
/*
* Already sent to that process, skip it
*/
continue;
}
message_send_pid(lck->share_modes[i].pid, MSG_SMB_NOTIFY,
blob.data, blob.length, True);
if (!(tmp = TALLOC_REALLOC_ARRAY(lck, pids, struct process_id,
num_pids+1))) {
DEBUG(0, ("realloc failed\n"));
break;
}
pids = tmp;
pids[num_pids] = e->pid;
num_pids += 1;
}
unbecome_root_uid_only();
data_blob_free(&blob);
TALLOC_FREE(lck);
}
static void notify_message(int msgtype, struct process_id pid,
void *buf, size_t len)
{
struct notify_message msg;
files_struct *fsp;
struct notify_change *changes, *change;
if (!buf_to_notify_message(buf, len, &msg)) {
return;
}
DEBUG(10, ("Received notify_message for 0x%x/%.0f: %d\n",
(unsigned)msg.dev, (double)msg.inode, msg.action));
if (!(fsp = file_find_dir_lowest_id(msg.dev, msg.inode))) {
DEBUG(10, ("notify_message: did not find fsp\n"));
return;
}
if (!(changes = TALLOC_REALLOC_ARRAY(
fsp->notify, fsp->notify->changes,
struct notify_change, fsp->notify->num_changes+1))) {
DEBUG(0, ("talloc_realloc failed\n"));
return;
}
fsp->notify->changes = changes;
change = &(fsp->notify->changes[fsp->notify->num_changes]);
if (!(change->name = talloc_strdup(changes, msg.name))) {
DEBUG(0, ("talloc_strdup failed\n"));
return;
}
change->action = msg.action;
fsp->notify->num_changes += 1;
}
/****************************************************************************
Initialise the change notify subsystem.
****************************************************************************/
@ -250,5 +519,7 @@ BOOL init_change_notify(void)
return False;
}
message_register(MSG_SMB_NOTIFY, notify_message);
return True;
}

7
source3/smbd/nttrans.c
View File

@ -68,9 +68,8 @@ static char *nttrans_realloc(char **ptr, size_t size)
HACK ! Always assumes smb_setup field is zero.
****************************************************************************/
static int send_nt_replies(char *outbuf, int bufsize, NTSTATUS nt_error,
char *params, int paramsize, char *pdata,
int datasize)
int send_nt_replies(char *outbuf, int bufsize, NTSTATUS nt_error,
char *params, int paramsize, char *pdata, int datasize)
{
int data_to_send = datasize;
int params_to_send = paramsize;
@ -1848,7 +1847,7 @@ static int call_nt_transact_notify_change(connection_struct *conn, char *inbuf,
return ERROR_DOS(ERRDOS,ERRbadfid);
}
if (!change_notify_set(inbuf, fsp, conn, flags)) {
if (!change_notify_set(inbuf, fsp, conn, flags, max_param_count)) {
return(UNIXERROR(ERRDOS,ERRbadfid));
}

16
source3/smbd/open.c
View File

@ -1127,7 +1127,8 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
uint32 open_access_mask = access_mask;
NTSTATUS status;
int ret_flock;
const char *parent_dir;
char *parent_dir;
const char *newname;
if (conn->printer) {
/*
@ -1144,8 +1145,8 @@ NTSTATUS open_file_ntcreate(connection_struct *conn,
return print_fsp_open(conn, fname, result);
}
if (!(parent_dir = talloc_strdup(tmp_talloc_ctx(),
parent_dirname(fname)))) {
if (!parent_dirname_talloc(tmp_talloc_ctx(), fname, &parent_dir,
&newname)) {
return NT_STATUS_NO_MEMORY;
}
@ -1878,7 +1879,8 @@ static NTSTATUS mkdir_internal(connection_struct *conn, const char *name,
{
int ret= -1;
mode_t mode;
const char *parent_dir;
char *parent_dir;
const char *dirname;
if(!CAN_WRITE(conn)) {
DEBUG(5,("mkdir_internal: failing create on read-only share "
@ -1890,8 +1892,8 @@ static NTSTATUS mkdir_internal(connection_struct *conn, const char *name,
return map_nt_error_from_unix(errno);
}
if (!(parent_dir = talloc_strdup(tmp_talloc_ctx(),
parent_dirname(name)))) {
if (!parent_dirname_talloc(tmp_talloc_ctx(), name, &parent_dir,
&dirname)) {
return NT_STATUS_NO_MEMORY;
}
@ -1936,6 +1938,8 @@ static NTSTATUS mkdir_internal(connection_struct *conn, const char *name,
change_dir_owner_to_parent(conn, parent_dir, name, psbuf);
}
notify_action(conn, parent_dir, dirname, NOTIFY_ACTION_ADDED);
return NT_STATUS_OK;
}

23
source3/smbd/reply.c
View File

@ -3860,7 +3860,7 @@ static BOOL recursive_rmdir(connection_struct *conn, char *directory)
The internals of the rmdir code - called elsewhere.
****************************************************************************/
BOOL rmdir_internals(connection_struct *conn, char *directory)
BOOL rmdir_internals(connection_struct *conn, const char *directory)
{
BOOL ok;
SMB_STRUCT_STAT st;
@ -3933,10 +3933,25 @@ BOOL rmdir_internals(connection_struct *conn, char *directory)
}
}
if (!ok)
DEBUG(3,("rmdir_internals: couldn't remove directory %s : %s\n", directory,strerror(errno)));
if (!ok) {
DEBUG(3,("rmdir_internals: couldn't remove directory %s : "
"%s\n", directory,strerror(errno)));
return False;
}
return ok;
{
char *parent_dir;
const char *dirname;
if (parent_dirname_talloc(tmp_talloc_ctx(), directory,
&parent_dir, &dirname)) {
notify_action(conn, parent_dir, dirname,
NOTIFY_ACTION_REMOVED);
TALLOC_FREE(parent_dir); /* Not strictly necessary */
}
}
return True;
}
/****************************************************************************