From c1dc067207774c1f8372999a7d497feadd87bf02 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 1 Nov 2004 05:56:26 +0000 Subject: r3426: removed 2 unused files, and some unused variables (This used to be commit dd0618d5950ca052b57715cb8451af23e4622049) --- source4/include/nameserv.h | 3 - source4/torture/basic/dfstest.c | 459 ------------------------------- source4/torture/vfstest.c | 589 ---------------------------------------- 3 files changed, 1051 deletions(-) delete mode 100644 source4/torture/basic/dfstest.c delete mode 100644 source4/torture/vfstest.c (limited to 'source4') diff --git a/source4/include/nameserv.h b/source4/include/nameserv.h index 96d8d1359f..33ee8f99e6 100644 --- a/source4/include/nameserv.h +++ b/source4/include/nameserv.h @@ -629,9 +629,6 @@ struct packet_struct the UNICAST subnet. */ extern struct subnet_record *subnetlist; -extern struct subnet_record *unicast_subnet; -extern struct subnet_record *wins_server_subnet; -extern struct subnet_record *remote_broadcast_subnet; #define FIRST_SUBNET subnetlist #define NEXT_SUBNET_EXCLUDING_UNICAST(x) ((x)->next) diff --git a/source4/torture/basic/dfstest.c b/source4/torture/basic/dfstest.c deleted file mode 100644 index 078aa00512..0000000000 --- a/source4/torture/basic/dfstest.c +++ /dev/null @@ -1,459 +0,0 @@ -/* - Unix SMB/CIFS implementation. - SMB torture tester - DFS tests - Copyright (C) James J Myers 2003 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include "includes.h" - -#define DFS_SERVER_COUNT 6 -#define DFS_FILE_COUNT 8 -extern char *host, *share, *password, *username; -static struct smbcli_client context; -static const char *sockops="TCP_NODELAY"; - -/* - checks for correct DFS cluster support - */ -BOOL torture_dfs_basic(void) -{ - int current_server = 0; - char *fname[DFS_FILE_COUNT]; - int file_server[DFS_FILE_COUNT]; - int fnum[DFS_FILE_COUNT]; - int i; - const char *template = "\\\\%s\\%s\\dfstest%d.tmp"; - char *filedata; - int server_count = 0; - int connection_flags = SMBCLI_FULL_CONNECTION_USE_KERBEROS - | SMBCLI_FULL_CONNECTION_USE_DFS - ; - - printf("starting dfs_basic_test\n"); - smbcli_client_initialize(&context, sockops, username, password, lp_workgroup(), connection_flags); - - if ((current_server = smbcli_dfs_open_connection(&context, host, share, connection_flags) < 0)) - return False; - - for (i=0; i < DFS_FILE_COUNT ; i++) { - file_server[i] = 0; - DEBUG(4,("host=%s share=%s cli host=%s cli share=%s\n", - host, share, smbcli_state_get_host(context.cli[file_server[i]]), - smbcli_state_get_share(context.cli[file_server[i]]))); - host = smbcli_state_get_host(context.cli[file_server[i]]); - share = smbcli_state_get_share(context.cli[file_server[i]]); - asprintf(&fname[i], template, host, share, i); - DEBUG(3,("unlinking %s\n", fname[i])); - smbcli_nt_unlink(&context, &file_server[i], fname[i], 0); - } - - for (i=0; i < DFS_FILE_COUNT ; i++) { - host = smbcli_state_get_host(context.cli[file_server[i]]); - share = smbcli_state_get_share(context.cli[file_server[i]]); - asprintf(&fname[i], template, host, share, i); - DEBUG(3,("open %s on server %s(%d)\n", - fname[i], host, file_server[i])); - fnum[i] = smbcli_dfs_open(&context, &file_server[i], fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - if (fnum[i] == -1) - { - printf("open of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); - return False; - } - asprintf(&filedata, "%s %d", fname[i], fnum[i]); - DEBUG(3,("write %d bytes (%s) to %s (fid %d) on server %s(%d)\n", - strlen(filedata), filedata, fname[i], fnum[i], - host, file_server[i])); - if (smbcli_write(context.cli[file_server[i]], fnum[i], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) - { - printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[i]])); - return False; - } - - if (!smbcli_close(context.cli[file_server[i]], fnum[i])) { - printf("close of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); - return False; - } - } - DEBUG(3,("used Dfs servers:")); - for (i=0; i < DFS_SERVER_COUNT ; i++) { - server_count++; - DEBUG(3,(" %s(%d)", smbcli_state_get_host(context.cli[file_server[i]]), i)); - if (!torture_close_connection(context.cli[i])) - return False; - } - DEBUG(3,("\n")); - - printf("Passed dfstest, found and used %d Dfs servers\n", server_count); - return True; -} - -/* - Check for correct DFS rename support. - First test is simple rename, a la command line, explorer. - Second test is simulation of MS Word edit/save file. - */ -BOOL torture_dfs_rename(int dummy) -{ - int current_server = -1; - char *fname[DFS_FILE_COUNT]; - int file_server[DFS_FILE_COUNT]; - int fnum[DFS_FILE_COUNT]; - int i; - const char *template = "\\\\%s\\%s\\dfstest%d.tmp"; - const char *template2orig = "\\\\%s\\%s\\dfstestorig.txt"; - const char *template2old = "\\\\%s\\%s\\~dfstestold.txt"; - const char *template2new = "\\\\%s\\%s\\~dfstestnew.txt"; - char *filedata, *newdata; - int server_count = 0; - int connection_flags = SMBCLI_FULL_CONNECTION_USE_KERBEROS - | SMBCLI_FULL_CONNECTION_USE_DFS - ; - - printf("starting dfs_rename_test\n"); - smbcli_client_initialize(&context, sockops, username, password, - lp_workgroup(), connection_flags); - - if ((current_server = smbcli_dfs_open_connection(&context, host, share, connection_flags)) < 0) - return False; - - for (i=0; i < DFS_FILE_COUNT ; i++) { - file_server[i] = 0; - slprintf(fname[i],sizeof(fstring)-1,template, host, share, i); - DEBUG(3,("unlinking %s\n", fname[i])); - smbcli_nt_unlink(&context, &file_server[i], fname[i], 0); - } - /* Simple rename test */ - for (i=0; i < 1 ; i++) { - slprintf(fname[i],sizeof(fstring)-1,template, - smbcli_state_get_host(context.cli[file_server[i]]), - smbcli_state_get_share(context.cli[file_server[i]]), i); - DEBUG(3,("open %s on server %s(%d)\n", - fname[i], smbcli_state_get_host(context.cli[file_server[i]]), file_server[i])); - - fnum[i] = smbcli_dfs_open(&context, &file_server[i], fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - if (fnum[i] == -1) { - printf("open of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); - return False; - } - asprintf(&filedata, "%s %d", fname[i], (int)getpid()); - DEBUG(3,("write %d bytes (%s) to %s (fid %d) on server %s(%d)\n", - strlen(filedata), filedata, fname[i], fnum[i], - smbcli_state_get_host(context.cli[file_server[i]]), file_server[i])); - if (smbcli_write(context.cli[file_server[i]], fnum[i], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) - { - printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[i]])); - return False; - } - - if (!smbcli_close(context.cli[file_server[i]], fnum[i])) { - printf("close of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); - return False; - } - } - // now attempt to rename the file - DEBUG(3,("rename %s to %s on server %s(%d)\n", - fname[0], fname[1], smbcli_state_get_host(context.cli[file_server[i]]), file_server[0])); - if (!smbcli_dfs_rename(&context, &file_server[0], fname[0], fname[1])) { - printf("rename of %s to %s failed (%s)\n", fname[0], fname[1], smbcli_errstr(context.cli[file_server[0]])); - return False; - } - // clean up - DEBUG(3,("used Dfs servers:")); - for (i=0; i < DFS_SERVER_COUNT ; i++) { - server_count++; - DEBUG(3,(" %s(%d)", smbcli_state_get_host(context.cli[file_server[i]]), i)); - if (!torture_close_connection(context.cli[i])) - return False; - } - DEBUG(3,("\n")); - printf("Dfstest: passed simple rename test\n"); - - /* Now try more complicated test, a la MS Word. - * Open existing file (x) and read file and close. - * Then open, write to new temp name file (~x.new), close. - * Then rename old file name to old temp name file (~x.old). - * Then rename new temp name file to oroginal name (x). */ - smbcli_client_initialize(&context, sockops, username, password, - lp_workgroup(), connection_flags); - - if ((current_server = smbcli_dfs_open_connection(&context, host, share, connection_flags)) < 0) - return False; - slprintf(fname[0],sizeof(fname[0])-1,template2orig, host, share); - slprintf(fname[1],sizeof(fname[1])-1,template2old, host, share); - slprintf(fname[2],sizeof(fname[2])-1,template2new, host, share); - for (i=0; i < DFS_FILE_COUNT ; i++) { - file_server[i] = 0; - fnum[i] = 0; - DEBUG(3,("unlinking %s\n", fname[i])); - smbcli_nt_unlink(&context, &file_server[i], fname[i], 0); - } - asprintf(&fname[0],template2orig, - smbcli_state_get_host(context.cli[0]), - smbcli_state_get_share(context.cli[0]), 0); - asprintf(&fname[1],template2old, - smbcli_state_get_host(context.cli[1]), - smbcli_state_get_share(context.cli[1]), 1); - asprintf(&fname[2],template2new, - smbcli_state_get_host(context.cli[2]), - smbcli_state_get_share(context.cli[2]), 2); - DEBUG(3,("edit(MS Word) %s on server %s(%d)\n", - fname[0], smbcli_state_get_host(context.cli[0]), file_server[0])); - DEBUG(3,("open %s on server %s(%d)\n", - fname[0], smbcli_state_get_host(context.cli[0]), file_server[0])); - - fnum[0] = smbcli_dfs_open(&context, &file_server[0], fname[0], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - if (fnum[0] == -1) - { - printf("open of %s failed (%s)\n", fname[0], smbcli_errstr(context.cli[file_server[0]])); - return False; - } - slprintf(filedata, sizeof(fstring)-1, "%s %d", fname[0], (int)getpid()); - DEBUG(3,("write %d bytes (%s) to %s (fid %d) on server %s(%d)\n", - strlen(filedata), filedata, fname[0], fnum[0], - smbcli_state_get_host(context.cli[0]), file_server[0])); - if (smbcli_write(context.cli[file_server[0]], fnum[0], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) - { - printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[0]])); - return False; - } - // read data from original file - DEBUG(3,("read %s (fid %d) on server %s(%d)\n", - fname[0], fnum[0], smbcli_state_get_host(context.cli[0]), file_server[0])); - if (smbcli_read(context.cli[file_server[0]], fnum[0], filedata, 0, strlen(filedata)) != strlen(filedata)) - { - printf("read failed (%s)", smbcli_errstr(context.cli[file_server[0]])); - return False; - } - DEBUG(3,("close %s on server %s(%d)\n", - fname[0], smbcli_state_get_host(context.cli[0]), file_server[0])); - if (!smbcli_close(context.cli[file_server[0]], fnum[0])) { - printf("close of %s failed (%s)\n", fname[0], smbcli_errstr(context.cli[file_server[0]])); - return False; - } - // open new temp file, write data - DEBUG(3,("open %s on server %s(%d)\n", - fname[2], smbcli_state_get_host(context.cli[2]), file_server[2])); - fnum[2] = smbcli_dfs_open(&context, &file_server[2], fname[2], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - if (fnum[2] == -1) - { - printf("open of %s failed (%s)\n", fname[2], smbcli_errstr(context.cli[file_server[2]])); - return False; - } - DEBUG(3,("write %d bytes (%s) to %s (fid %d) on server %s(%d)\n", - strlen(filedata), filedata, fname[2], fnum[2], - smbcli_state_get_host(context.cli[2]), file_server[2])); - if (smbcli_write(context.cli[file_server[2]], fnum[2], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) - { - printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[2]])); - return False; - } - slprintf(newdata, sizeof(fstring)-1, "new data: %s %d", fname[0], (int)getpid()); - DEBUG(3,("write new data %d bytes (%s) to %s (fid %d) on server %s(%d)\n", - strlen(newdata), newdata, fname[2], fnum[2], - smbcli_state_get_host(context.cli[2]), file_server[2])); - if (smbcli_write(context.cli[file_server[2]], fnum[2], 0, newdata, strlen(filedata), strlen(newdata)) != strlen(newdata)) - { - printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[2]])); - return False; - } - DEBUG(3,("close %s on server %s(%d)\n", - fname[2], smbcli_state_get_host(context.cli[2]), file_server[2])); - if (!smbcli_close(context.cli[file_server[2]], fnum[2])) { - printf("close of %s failed (%s)\n", fname[2], smbcli_errstr(context.cli[file_server[2]])); - return False; - } - DEBUG(3,("close successful %s on server %s(%d)\n", - fname[2], smbcli_state_get_host(context.cli[2]), file_server[2])); - // rename original file to temp - DEBUG(4,("file_server[0]=%d\n", file_server[0])); - DEBUG(4,("context.cli[file_server[0]].desthost=%s\n", smbcli_state_get_host(context.cli[0]))); - DEBUG(3,("rename %s to %s on server %s(%d)\n", - fname[0], fname[1], smbcli_state_get_host(context.cli[0]), file_server[0])); - if (!smbcli_dfs_rename(&context, &file_server[0], fname[0], fname[1])) { - printf("rename of %s to %s failed (%s)\n", fname[0], fname[1], smbcli_errstr(context.cli[file_server[0]])); - return False; - } - // name new temp file to original - DEBUG(3,("rename %s to %s on server %s(%d)\n", - fname[2], fname[0], smbcli_state_get_host(context.cli[2]), file_server[2])); - if (!smbcli_dfs_rename(&context, &file_server[2], fname[2], fname[0])) { - printf("rename of %s to %s failed (%s)\n", fname[2], fname[0], smbcli_errstr(context.cli[file_server[2]])); - return False; - } - printf("Dfstest: passed MS Word rename test\n"); - // clean up - DEBUG(3,("used Dfs servers:")); - for (i=0; i < DFS_SERVER_COUNT ; i++) { - server_count++; - DEBUG(3,(" %s(%d)", smbcli_state_get_host(context.cli[i]), i)); - if (!torture_close_connection(context.cli[i])) - return False; - } - DEBUG(3,("\n")); - - printf("Passed dfs_rename_test\n"); - return True; -} -struct list_fn_parms { - struct smbcli_client *context; - char* rname; -} list_fn_parms; - -void dfs_list_fn(file_info *finfo, const char *rname, void* parmsp); -void delete_file(file_info *finfo, const char *rname) -{ - int server = 0; - char *fname; - - DEBUG(3,("deleting file %s in %s\n", finfo->name, rname)); - asprintf(&fname, "%s\\%s", rname, finfo->name); - smbcli_nt_unlink(&context, &server, fname, 0); -} -void delete_directory(file_info *finfo, const char *rname) -{ - int server = 0; - char *dname, *rname2; - - DEBUG(3,("deleting directory %s in %s\n", finfo->name, rname)); - asprintf(&dname, "%s%s\\*", rname, finfo->name); - smbcli_nt_unlink(&context, &server, dname, 0); - asprintf(&dname, "%s%s\\*", rname, finfo->name); - asprintf(&rname2, "%s%s", rname, finfo->name); - smbcli_search(context.cli[0], dname, FILE_ATTRIBUTE_DIRECTORY, - dfs_list_fn, (void*)rname2); - smbcli_dfs_rmdir(&context, &server, rname2); -} - -void dfs_list_fn(file_info *finfo, const char *name, void* parmsp) -{ - struct list_fn_parms *parms = (struct list_fn_parms*)parmsp; - - DEBUG(4,("processing %s in %s\n", finfo->name, parms->rname)); - if (finfo->mode & FILE_ATTRIBUTE_DIRECTORY) { - delete_directory(finfo, parms->rname); - } - else { - delete_file(finfo, parms->rname); - } -} - -/* - checks for correct DFS cluster support creating random dirs/files. - */ -#define DFS_RANDOM_FILE_COUNT 10 -#define DFS_RANDOM_DIR_COUNT 3 -#define DFS_RANDOM_DIR_LEVELS 2 -BOOL torture_dfs_random(void) -{ - char *fname[DFS_RANDOM_FILE_COUNT]; - int file_server[DFS_RANDOM_FILE_COUNT]; - char *dname[DFS_RANDOM_DIR_COUNT]; - int dir_server[DFS_RANDOM_DIR_COUNT]; - char *rname; - int fnum[DFS_FILE_COUNT]; - int i; - const char *ftemplate = "%s\\dfsfile%d.tmp"; - const char *alltemplate = "\\\\%s\\%s\\dfs*.tmp"; - char *filedata; - int server_count = 0; - int file_count; - int connection_flags = SMBCLI_FULL_CONNECTION_USE_KERBEROS - | SMBCLI_FULL_CONNECTION_USE_DFS - ; - - printf("starting dfs_random_test\n"); - smbcli_client_initialize(&context, sockops, username, password, - lp_workgroup(), connection_flags); - - if ((dir_server[0] = smbcli_dfs_open_connection(&context, host, share, connection_flags)) < 0) - return False; - - // get list of directories named dfsdir*. - // delete all files in these directories using wild card, - // then delete directory. - asprintf(&rname, "\\\\%s\\%s\\", - smbcli_state_get_host(context.cli[0]), - smbcli_state_get_share(context.cli[0])); - asprintf(&fname[0], alltemplate, - smbcli_state_get_host(context.cli[0]), - smbcli_state_get_share(context.cli[0])); - DEBUG(3,("deleting files %s in %s on server %s(%d)\n", - fname[0], rname, smbcli_state_get_host(context.cli[0]), dir_server[0])); - file_count = smbcli_search(context.cli[0], fname[0], FILE_ATTRIBUTE_DIRECTORY, dfs_list_fn, (void*)rname); - - // create random directory names with 0-n levels - asprintf(&dname[0], "\\\\%s\\%s\\", - smbcli_state_get_host(context.cli[0]), - smbcli_state_get_share(context.cli[0])); - DEBUG(3,("creating directories in %s on server %s(%d)\n", - rname, smbcli_state_get_host(context.cli[0]), dir_server[0])); - for (i=1; i < DFS_RANDOM_DIR_COUNT; i++) { - dir_server[i] = 0; - asprintf(&dname[i], - "\\\\%s\\%s\\dfsdir%d.tmp", - smbcli_state_get_host(context.cli[dir_server[i]]), - smbcli_state_get_share(context.cli[dir_server[i]]), - (int)sys_random()%10000); - DEBUG(3,("mkdir %s on server %s(%d)\n", - dname[i], smbcli_state_get_host(context.cli[dir_server[i]]), dir_server[i])); - if (!smbcli_dfs_mkdir(&context, &dir_server[i], dname[i])) { - printf("mkdir of %s failed (%s)\n", dname[i], smbcli_errstr(context.cli[dir_server[i]])); - return False; - } - } - - for (i=0; i < DFS_RANDOM_FILE_COUNT ; i++) { - // select a directory randomly, create a file in it. - int dn = (int)sys_random()%DFS_RANDOM_DIR_COUNT; - file_server[i] = dir_server[dn]; - asprintf(&fname[i], ftemplate, dname[dn], i); - DEBUG(3,("open %s on server %s(%d)\n", - fname[i], smbcli_state_get_host(context.cli[dir_server[i]]), file_server[i])); - fnum[i] = smbcli_dfs_open(&context, &file_server[i], fname[i], O_RDWR|O_CREAT|O_EXCL, DENY_NONE); - if (fnum[i] == -1) - { - printf("open of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); - return False; - } - - asprintf(&filedata, "%s %d", fname[i], fnum[i]); - DEBUG(3,("write %d bytes (%s) to %s (fid %d) on server %s(%d)\n", - strlen(filedata), filedata, fname[i], fnum[i], - smbcli_state_get_host(context.cli[dir_server[i]]), file_server[i])); - if (smbcli_write(context.cli[file_server[i]], fnum[i], 0, filedata, 0, strlen(filedata)) != strlen(filedata)) - { - printf("write failed (%s)\n", smbcli_errstr(context.cli[file_server[i]])); - return False; - } - - if (!smbcli_close(context.cli[file_server[i]], fnum[i])) { - printf("close of %s failed (%s)\n", fname[i], smbcli_errstr(context.cli[file_server[i]])); - return False; - } - } - DEBUG(3,("used Dfs servers:")); - for (i=0; i < DFS_SERVER_COUNT ; i++) { - server_count++; - DEBUG(3,(" %s(%d)", smbcli_state_get_host(context.cli[i]), i)); - if (!torture_close_connection(context.cli[i])) - return False; - } - DEBUG(3,("\n")); - - printf("Passed dfs_random_test\n"); - return True; -} diff --git a/source4/torture/vfstest.c b/source4/torture/vfstest.c deleted file mode 100644 index eb2acd3481..0000000000 --- a/source4/torture/vfstest.c +++ /dev/null @@ -1,589 +0,0 @@ -/* - Unix SMB/CIFS implementation. - VFS module tester - - Copyright (C) Simo Sorce 2002 - Copyright (C) Eric Lorimer 2002 - Copyright (C) Jelmer Vernooij 2002 - - Most of this code was ripped off of rpcclient. - Copyright (C) Tim Potter 2000-2001 - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -*/ - -#include "includes.h" -#include "vfstest.h" - -/* List to hold groups of commands */ -static struct cmd_list { - struct cmd_list *prev, *next; - struct cmd_set *cmd_set; -} *cmd_list; - -/**************************************************************************** -handle completion of commands for readline -****************************************************************************/ -static char **completion_fn(char *text, int start, int end) -{ -#define MAX_COMPLETIONS 100 - char **matches; - int i, count=0; - struct cmd_list *commands = cmd_list; - - if (start) - return NULL; - - /* make sure we have a list of valid commands */ - if (!commands) - return NULL; - - matches = (char **)malloc(sizeof(matches[0])*MAX_COMPLETIONS); - if (!matches) return NULL; - - matches[count++] = strdup(text); - if (!matches[0]) return NULL; - - while (commands && count < MAX_COMPLETIONS-1) - { - if (!commands->cmd_set) - break; - - for (i=0; commands->cmd_set[i].name; i++) - { - if ((strncmp(text, commands->cmd_set[i].name, strlen(text)) == 0) && - commands->cmd_set[i].fn) - { - matches[count] = strdup(commands->cmd_set[i].name); - if (!matches[count]) - return NULL; - count++; - } - } - - commands = commands->next; - - } - - if (count == 2) { - SAFE_FREE(matches[0]); - matches[0] = strdup(matches[1]); - } - matches[count] = NULL; - return matches; -} - -static char* next_command(char** cmdstr) -{ - static pstring command; - char *p; - - if (!cmdstr || !(*cmdstr)) - return NULL; - - p = strchr_m(*cmdstr, ';'); - if (p) - *p = '\0'; - pstrcpy(command, *cmdstr); - *cmdstr = p; - - return command; -} - -/* Load specified configuration file */ -static NTSTATUS cmd_conf(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, - int argc, char **argv) -{ - if (argc != 2) { - printf("Usage: %s \n", argv[0]); - return NT_STATUS_OK; - } - - if (!lp_load(argv[1], False, True, False)) { - printf("Error loading \"%s\"\n", argv[1]); - return NT_STATUS_OK; - } - - printf("\"%s\" successfully loaded\n", argv[1]); - return NT_STATUS_OK; -} - -/* Display help on commands */ -static NTSTATUS cmd_help(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, - int argc, const char **argv) -{ - struct cmd_list *tmp; - struct cmd_set *tmp_set; - - /* Usage */ - if (argc > 2) { - printf("Usage: %s [command]\n", argv[0]); - return NT_STATUS_OK; - } - - /* Help on one command */ - - if (argc == 2) { - for (tmp = cmd_list; tmp; tmp = tmp->next) { - - tmp_set = tmp->cmd_set; - - while(tmp_set->name) { - if (strequal(argv[1], tmp_set->name)) { - if (tmp_set->usage && - tmp_set->usage[0]) - printf("%s\n", tmp_set->usage); - else - printf("No help for %s\n", tmp_set->name); - - return NT_STATUS_OK; - } - - tmp_set++; - } - } - - printf("No such command: %s\n", argv[1]); - return NT_STATUS_OK; - } - - /* List all commands */ - - for (tmp = cmd_list; tmp; tmp = tmp->next) { - - tmp_set = tmp->cmd_set; - - while(tmp_set->name) { - - printf("%15s\t\t%s\n", tmp_set->name, - tmp_set->description ? tmp_set->description: - ""); - - tmp_set++; - } - } - - return NT_STATUS_OK; -} - -/* Change the debug level */ -static NTSTATUS cmd_debuglevel(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, char **argv) -{ - if (argc > 2) { - printf("Usage: %s [debuglevel]\n", argv[0]); - return NT_STATUS_OK; - } - - if (argc == 2) { - DEBUGLEVEL = atoi(argv[1]); - } - - printf("debuglevel is %d\n", DEBUGLEVEL); - - return NT_STATUS_OK; -} - -static NTSTATUS cmd_freemem(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, char **argv) -{ - /* Cleanup */ - talloc_destroy(mem_ctx); - mem_ctx = NULL; - vfs->data = NULL; - vfs->data_size = 0; - return NT_STATUS_OK; -} - -static NTSTATUS cmd_quit(struct vfs_state *vfs, TALLOC_CTX *mem_ctx, int argc, char **argv) -{ - /* Cleanup */ - talloc_destroy(mem_ctx); - - exit(0); - return NT_STATUS_OK; /* NOTREACHED */ -} - -static struct cmd_set vfstest_commands[] = { - - { "GENERAL OPTIONS" }, - - { "conf", cmd_conf, "Load smb configuration file", "conf " }, - { "help", cmd_help, "Get help on commands", "" }, - { "?", cmd_help, "Get help on commands", "" }, - { "debuglevel", cmd_debuglevel, "Set debug level", "" }, - { "freemem", cmd_freemem, "Free currently allocated buffers", "" }, - { "exit", cmd_quit, "Exit program", "" }, - { "quit", cmd_quit, "Exit program", "" }, - - { NULL } -}; - -static struct cmd_set separator_command[] = { - { "---------------", NULL, "----------------------" }, - { NULL } -}; - - -extern struct cmd_set vfs_commands[]; -static struct cmd_set *vfstest_command_list[] = { - vfstest_commands, - vfs_commands, - NULL -}; - -static void add_command_set(struct cmd_set *cmd_set) -{ - struct cmd_list *entry; - - if (!(entry = (struct cmd_list *)malloc(sizeof(struct cmd_list)))) { - DEBUG(0, ("out of memory\n")); - return; - } - - ZERO_STRUCTP(entry); - - entry->cmd_set = cmd_set; - DLIST_ADD(cmd_list, entry); -} - -static NTSTATUS do_cmd(struct vfs_state *vfs, struct cmd_set *cmd_entry, char *cmd) -{ - char *p = cmd, **argv = NULL; - NTSTATUS result = NT_STATUS_UNSUCCESSFUL; - pstring buf; - TALLOC_CTX *mem_ctx = NULL; - int argc = 0, i; - - /* Count number of arguments first time through the loop then - allocate memory and strdup them. */ - - again: - while(next_token(&p, buf, " ", sizeof(buf))) { - if (argv) { - argv[argc] = strdup(buf); - } - - argc++; - } - - if (!argv) { - - /* Create argument list */ - - argv = (char **)malloc(sizeof(char *) * argc); - memset(argv, 0, sizeof(char *) * argc); - - if (!argv) { - fprintf(stderr, "out of memory\n"); - result = NT_STATUS_NO_MEMORY; - goto done; - } - - p = cmd; - argc = 0; - - goto again; - } - - /* Call the function */ - - if (cmd_entry->fn) { - - if (mem_ctx == NULL) { - /* Create mem_ctx */ - if (!(mem_ctx = talloc_init("do_cmd"))) { - DEBUG(0, ("talloc_init() failed\n")); - goto done; - } - } - - /* Run command */ - result = cmd_entry->fn(vfs, mem_ctx, argc, argv); - - } else { - fprintf (stderr, "Invalid command\n"); - goto done; - } - - done: - - /* Cleanup */ - - if (argv) { - for (i = 0; i < argc; i++) - SAFE_FREE(argv[i]); - - SAFE_FREE(argv); - } - - return result; -} - -/* Process a command entered at the prompt or as part of -c */ -static NTSTATUS process_cmd(struct vfs_state *vfs, char *cmd) -{ - struct cmd_list *temp_list; - BOOL found = False; - pstring buf; - char *p = cmd; - NTSTATUS result = NT_STATUS_OK; - int len = 0; - - if (cmd[strlen(cmd) - 1] == '\n') - cmd[strlen(cmd) - 1] = '\0'; - - if (!next_token(&p, buf, " ", sizeof(buf))) { - return NT_STATUS_OK; - } - - /* strip the trainly \n if it exsists */ - len = strlen(buf); - if (buf[len-1] == '\n') - buf[len-1] = '\0'; - - /* Search for matching commands */ - - for (temp_list = cmd_list; temp_list; temp_list = temp_list->next) { - struct cmd_set *temp_set = temp_list->cmd_set; - - while(temp_set->name) { - if (strequal(buf, temp_set->name)) { - found = True; - result = do_cmd(vfs, temp_set, cmd); - - goto done; - } - temp_set++; - } - } - - done: - if (!found && buf[0]) { - printf("command not found: %s\n", buf); - return NT_STATUS_OK; - } - - if (!NT_STATUS_IS_OK(result)) { - printf("result was %s\n", nt_errstr(result)); - } - - return result; -} - -static void process_file(struct vfs_state *pvfs, char *filename) { - FILE *file; - char command[3 * PATH_MAX]; - - if (*filename == '-') { - file = stdin; - } else { - file = fopen(filename, "r"); - if (file == NULL) { - printf("vfstest: error reading file (%s)!", filename); - printf("errno n.%d: %s", errno, strerror(errno)); - exit(-1); - } - } - - while (fgets(command, 3 * PATH_MAX, file) != NULL) { - process_cmd(pvfs, command); - } -} - -void exit_server(const char *reason) -{ - DEBUG(3,("Server exit (%s)\n", (reason ? reason : ""))); - exit(0); -} - -static int server_fd = -1; -int last_message = -1; - -int smbd_server_fd(void) -{ - return server_fd; -} - -/**************************************************************************** - Reload the services file. -**************************************************************************/ - -BOOL reload_services(BOOL test) -{ - BOOL ret; - - if (lp_loaded()) { - pstring fname; - pstrcpy(fname,lp_configfile()); - if (file_exist(fname, NULL) && - !strcsequal(fname, dyn_CONFIGFILE)) { - pstrcpy(dyn_CONFIGFILE, fname); - test = False; - } - } - - reopen_logs(); - - if (test && !lp_file_list_changed()) - return(True); - - ret = lp_load(dyn_CONFIGFILE, False, False, True); - - load_printers(); - - /* perhaps the config filename is now set */ - if (!test) - reload_services(True); - - reopen_logs(); - - load_interfaces(); - - if (smbd_server_fd() != -1) { - set_socket_options(smbd_server_fd(),"SO_KEEPALIVE"); - set_socket_options(smbd_server_fd(), lp_socket_options()); - } - - mangle_reset_cache(); - reset_stat_cache(); - - /* this forces service parameters to be flushed */ - set_current_service(NULL,True); - - return (ret); -} - -/* Main function */ - -int main(int argc, char *argv[]) -{ - BOOL interactive = True; - int opt; - static char *cmdstr = ""; - static char *opt_logfile=NULL; - static int opt_debuglevel; - pstring logfile; - struct cmd_set **cmd_set; - extern BOOL AllowDebugChange; - static struct vfs_state vfs; - int i; - static const char *filename = ""; - - /* make sure the vars that get altered (4th field) are in - a fixed location or certain compilers complain */ - poptContext pc; - struct poptOption long_options[] = { - POPT_AUTOHELP - {"file", 'f', POPT_ARG_STRING, &filename, 0, }, - {"command", 'c', POPT_ARG_STRING, &cmdstr, 0, "Execute specified list of commands" }, - {"logfile", 'l', POPT_ARG_STRING, &opt_logfile, 'l', "Write output to specified logfile" }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_debug }, - { NULL, 0, POPT_ARG_INCLUDE_TABLE, popt_common_version}, - { 0, 0, 0, 0} - }; - - - setlinebuf(stdout); - - DEBUGLEVEL = 1; - AllowDebugChange = False; - - pc = poptGetContext("vfstest", argc, (const char **) argv, - long_options, 0); - - while((opt = poptGetNextOpt(pc)) != -1) { - switch (opt) { - case 'l': - slprintf(logfile, sizeof(logfile) - 1, "%s.client", - opt_logfile); - lp_set_logfile(logfile); - interactive = False; - break; - - case 'd': - DEBUGLEVEL = opt_debuglevel; - break; - } - } - - - poptFreeContext(pc); - - /* TODO: check output */ - reload_services(False); - - /* the following functions are part of the Samba debugging - facilities. See lib/debug.c */ - setup_logging("vfstest", interactive); - if (!interactive) - reopen_logs(); - - /* Load command lists */ - - cmd_set = vfstest_command_list; - - while(*cmd_set) { - add_command_set(*cmd_set); - add_command_set(separator_command); - cmd_set++; - } - - /* some basic initialization stuff */ - conn_init(); - vfs.conn = conn_new(); - vfs.conn->user = "vfstest"; - for (i=0; i < 1024; i++) - vfs.files[i] = NULL; - - /* some advanced initiliazation stuff */ - smbd_vfs_init(vfs.conn); - - /* Do we have a file input? */ - if (filename[0]) { - process_file(&vfs, filename); - return 0; - } - - /* Do anything specified with -c */ - if (cmdstr[0]) { - char *cmd; - char *p = cmdstr; - - while((cmd=next_command(&p)) != NULL) { - process_cmd(&vfs, cmd); - } - - return 0; - } - - /* Loop around accepting commands */ - - while(1) { - pstring prompt; - char *line; - - slprintf(prompt, sizeof(prompt) - 1, "vfstest $> "); - - line = smb_readline(prompt, NULL, completion_fn); - - if (line == NULL) - break; - - if (line[0] != '\n') - process_cmd(&vfs, line); - } - - free(vfs.conn); - return 0; -} -- cgit