#include <afsconfig.h>
#include <afs/param.h>
-RCSID
- ("$Header$");
#include <stdio.h>
#include <stdlib.h>
#include <afs/ptuser.h>
#include <afs/audit.h>
#include <afs/partition.h>
+#include <afs/dir.h>
#ifndef AFS_NT40_ENV
#include <afs/netutils.h>
#endif
#include "sys/lock.h"
#endif
#include <rx/rx_globals.h>
+#include <rx/rxstat_prototypes.h>
#ifdef O_LARGEFILE
#define afs_stat stat64
#define afs_fopen fopen
#endif /* !O_LARGEFILE */
-extern int BreakVolumeCallBacks(), InitCallBack();
-extern int BreakVolumeCallBacks(), InitCallBack(), BreakLaterCallBacks();
-extern int BreakVolumeCallBacksLater();
-extern int LogLevel, etext;
-extern afs_int32 BlocksSpare, PctSpare;
-
-int ShutDown(void);
-static void ClearXStatValues(), NewParms(), PrintCounters();
-static void ResetCheckDescriptors(void), ResetCheckSignal(void);
-static int CheckSignal(void);
-extern int GetKeysFromToken();
-extern int RXAFS_ExecuteRequest();
-extern int RXSTATS_ExecuteRequest();
-afs_int32 Do_VLRegisterRPC();
+extern int etext;
+
+void *ShutDown(void *);
+static void ClearXStatValues(void);
+static void NewParms(int);
+static void PrintCounters(void);
+static void ResetCheckDescriptors(void);
+static void ResetCheckSignal(void);
+static void *CheckSignal(void *);
+
+extern int RXAFS_ExecuteRequest(struct rx_call *);
+extern int RXSTATS_ExecuteRequest(struct rx_call *);
+
+static afs_int32 Do_VLRegisterRPC(void);
int eventlog = 0, rxlog = 0;
FILE *debugFile;
int SawPctSpare;
int debuglevel = 0;
int printBanner = 0;
-int rxJumbograms = 1; /* default is to send and receive jumbograms. */
+int rxJumbograms = 0; /* default is to not send and receive jumbograms. */
int rxBind = 0; /* don't bind */
+int rxkadDisableDotCheck = 0; /* disable check for dot in principal name */
int rxMaxMTU = -1;
afs_int32 implicitAdminRights = PRSFS_LOOKUP; /* The ADMINISTER right is
* already implied */
/* All addresses in FS_HostAddrs are in NBO */
afsUUID FS_HostUUID;
-static void FlagMsg();
+static void FlagMsg(void);
#ifdef AFS_DEMAND_ATTACH_FS
/*
*/
/* DEBUG HACK */
-static int
-CheckDescriptors()
+static void *
+CheckDescriptors(void *unused)
{
#ifndef AFS_NT40_ENV
struct afs_stat status;
for (i = 0; i < tsize; i++) {
if (afs_fstat(i, &status) != -1) {
printf("%d: dev %x, inode %u, length %u, type/mode %x\n", i,
- status.st_dev, status.st_ino, status.st_size,
+ status.st_dev, status.st_ino,
+ (unsigned int) status.st_size,
status.st_mode);
}
}
fflush(stdout);
ResetCheckDescriptors();
- return 0;
#endif
+ return 0;
} /*CheckDescriptors */
#ifdef AFS_PTHREAD_ENV
void
-CheckSignal_Signal(x)
+CheckSignal_Signal(int x)
{
- CheckSignal();
+ CheckSignal(NULL);
}
void
-ShutDown_Signal(x)
+ShutDown_Signal(int x)
{
- ShutDown();
+ ShutDown(NULL);
}
void
-CheckDescriptors_Signal(x)
+CheckDescriptors_Signal(int x)
{
- CheckDescriptors();
+ CheckDescriptors(NULL);
}
#else /* AFS_PTHREAD_ENV */
void
-CheckSignal_Signal(x)
+CheckSignal_Signal(int x)
{
IOMGR_SoftSig(CheckSignal, 0);
}
void
-ShutDown_Signal(x)
+ShutDown_Signal(int x)
{
IOMGR_SoftSig(ShutDown, 0);
}
void
-CheckDescriptors_Signal(x)
+CheckDescriptors_Signal(int x)
{
IOMGR_SoftSig(CheckDescriptors, 0);
}
}
#if defined(AFS_PTHREAD_ENV)
-char *
+int
threadNum(void)
{
- return pthread_getspecific(rx_thread_id_key);
+ return (int)pthread_getspecific(rx_thread_id_key);
}
#endif
/* proc called by rxkad module to get a key */
static int
-get_key(char *arock, register afs_int32 akvno, char *akey)
+get_key(void *arock, register afs_int32 akvno, struct ktc_encryptionKey *akey)
{
/* find the key */
static struct afsconf_key tkey;
ViceLog(0, ("conf dir not open\n"));
return 1;
}
- code = afsconf_GetKey(confDir, akvno, tkey.key);
+ code = afsconf_GetKey(confDir, akvno, (struct ktc_encryptionKey *)tkey.key);
if (code) {
ViceLog(0, ("afsconf_GetKey failure: kvno %d code %d\n", akvno, code));
return code;
}
memcpy(akey, tkey.key, sizeof(tkey.key));
return 0;
-
} /*get_key */
#ifndef AFS_NT40_ENV
viced_syscall(afs_uint32 a3, afs_uint32 a4, void *a5)
{
afs_uint32 rcode;
- void (*old) ();
-
#ifndef AFS_LINUX20_ENV
- old = (void (*)())signal(SIGSYS, SIG_IGN);
+ void (*old) (int);
+
+ old = (void (*)(int))signal(SIGSYS, SIG_IGN);
#endif
rcode = syscall(AFS_SYSCALL, 28 /* AFSCALL_CALL */ , a3, a4, a5);
#ifndef AFS_LINUX20_ENV
char adminName[MAXADMINNAME];
static void
-CheckAdminName()
+CheckAdminName(void)
{
int fd = 0;
struct afs_stat status;
}
/* This LWP does things roughly every 5 minutes */
-static void
-FiveMinuteCheckLWP()
+static void *
+FiveMinuteCheckLWP(void *unused)
{
static int msg = 0;
char tbuffer[32];
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
+ return NULL;
} /*FiveMinuteCheckLWP */
* it probes the workstations
*/
-static void
-HostCheckLWP()
+static void *
+HostCheckLWP(void *unused)
{
ViceLog(1, ("Starting Host check process\n"));
setThreadId("HostCheckLWP");
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif
+ return NULL;
} /*HostCheckLWP */
/* This LWP does fsync checks every 5 minutes: it should not be used for
* other 5 minute activities because it may be delayed by timeouts when
* it probes the workstations
*/
-static void
-FsyncCheckLWP()
+static void *
+FsyncCheckLWP(void *unused)
{
afs_int32 code;
#ifdef AFS_PTHREAD_ENV
setThreadId("FsyncCheckLWP");
-#ifdef AFS_PTHREAD_ENV
- assert(pthread_cond_init(&fsync_cond, NULL) == 0);
- assert(pthread_mutex_init(&fsync_glock_mutex, NULL) == 0);
-#endif
-
#ifdef AFS_DEMAND_ATTACH_FS
FS_STATE_WRLOCK;
while (fs_state.mode == FS_MODE_NORMAL) {
FS_UNLOCK;
FS_STATE_UNLOCK;
#endif /* AFS_DEMAND_ATTACH_FS */
+ return NULL;
}
/*------------------------------------------------------------------------
*------------------------------------------------------------------------*/
static void
-ClearXStatValues()
+ClearXStatValues(void)
{ /*ClearXStatValues */
struct fs_stats_opTimingData *opTimeP; /*Ptr to timing struct */
} /*ClearXStatValues */
+int CopyOnWrite_calls = 0, CopyOnWrite_off0 = 0, CopyOnWrite_size0 = 0;
+afs_fsize_t CopyOnWrite_maxsize = 0;
static void
-PrintCounters()
+PrintCounters(void)
{
int dirbuff, dircall, dirio;
struct timeval tpl;
int processSize = 0;
char tbuffer[32];
- TM_GetTimeOfDay(&tpl, 0);
+ FT_GetTimeOfDay(&tpl, 0);
Statistics = 1;
ViceLog(0,
("Vice was last started at %s\n",
("With %d directory buffers; %d reads resulted in %d read I/Os\n",
dirbuff, dircall, dirio));
rx_PrintStats(stderr);
+ audit_PrintStats(stderr);
h_PrintStats();
PrintCallBackStats();
#ifdef AFS_NT40_ENV
ViceLog(0,
("There are %d workstations, %d are active (req in < 15 mins), %d marked \"down\"\n",
workstations, activeworkstations, delworkstations));
+ ViceLog(0, ("CopyOnWrite: calls %d off0 %d size0 %d maxsize 0x%llx\n",
+ CopyOnWrite_calls, CopyOnWrite_off0, CopyOnWrite_size0, CopyOnWrite_maxsize));
+
Statistics = 0;
} /*PrintCounters */
-static int
-CheckSignal()
+static void *
+CheckSignal(void *unused)
{
if (FS_registered > 0) {
/*
exit(0);
}
-int
-ShutDown(void)
+void *
+ShutDown(void *unused)
{ /* backward compatibility */
ShutDownAndCore(DONTPANIC);
return 0;
static void
-FlagMsg()
+FlagMsg(void)
{
/* default supports help flag */
fputs("Usage: fileserver ", stdout);
fputs("[-auditlog <log path>] ", stdout);
+ fputs("[-audit-interface <file|sysvmq> (default is file)] ", stdout);
fputs("[-d <debug level>] ", stdout);
fputs("[-p <number of processes>] ", stdout);
fputs("[-spare <number of spare blocks>] ", stdout);
fputs("[-rxdbge (enable rxevent debugging)] ", stdout);
fputs("[-rxmaxmtu <bytes>] ", stdout);
fputs("[-rxbind (bind the Rx socket to one address)] ", stdout);
+ fputs("[-allow-dotted-principals (disable the rxkad principal name dot check)] ", stdout);
#ifdef AFS_DEMAND_ATTACH_FS
fputs("[-fs-state-dont-save (disable state save during shutdown)] ", stdout);
fputs("[-fs-state-dont-restore (disable state restore during startup)] ", stdout);
fputs("[-udpsize <size of socket buffer in bytes>] ", stdout);
fputs("[-sendsize <size of send buffer in bytes>] ", stdout);
fputs("[-abortthreshold <abort threshold>] ", stdout);
+ fputs("[-nojumbo (disable jumbogram network packets - deprecated)] ", stdout);
+ fputs("[-jumbo (enable jumbogram network packets)] ", stdout);
/* fputs("[-enable_peer_stats] ", stdout); */
/* fputs("[-enable_process_stats] ", stdout); */
fputs("[-help]\n", stdout);
int Sawbusy = 0;
int i;
int bufSize = 0; /* temp variable to read in udp socket buf size */
+ char *auditFileName = NULL;
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "-d")) {
#endif
else if (!strcmp(argv[i], "-nojumbo")) {
rxJumbograms = 0;
+ } else if (!strcmp(argv[i], "-jumbo")) {
+ rxJumbograms = 1;
} else if (!strcmp(argv[i], "-rxbind")) {
rxBind = 1;
+ } else if (!strcmp(argv[i], "-allow-dotted-principals")) {
+ rxkadDisableDotCheck = 1;
} else if (!strcmp(argv[i], "-rxmaxmtu")) {
if ((i + 1) >= argc) {
fprintf(stderr, "missing argument for -rxmaxmtu\n");
rxMaxMTU = atoi(argv[++i]);
if ((rxMaxMTU < RX_MIN_PACKET_SIZE) ||
(rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) {
- printf("rxMaxMTU %d%% invalid; must be between %d-%d\n",
+ printf("rxMaxMTU %d%% invalid; must be between %d-%lu\n",
rxMaxMTU, RX_MIN_PACKET_SIZE,
RX_MAX_PACKET_DATA_SIZE);
return -1;
- }
+ }
} else if (!strcmp(argv[i], "-realm")) {
extern char local_realms[AFS_NUM_LREALMS][AFS_REALM_SZ];
extern int num_lrealms;
rx_enableProcessRPCStats();
}
else if (strcmp(argv[i], "-auditlog") == 0) {
- int tempfd, flags;
- FILE *auditout;
- char oldName[MAXPATHLEN];
- char *fileName = argv[++i];
-
-#ifndef AFS_NT40_ENV
- struct stat statbuf;
-
- if ((lstat(fileName, &statbuf) == 0)
- && (S_ISFIFO(statbuf.st_mode))) {
- flags = O_WRONLY | O_NONBLOCK;
- } else
-#endif
- {
- strcpy(oldName, fileName);
- strcat(oldName, ".old");
- renamefile(fileName, oldName);
- flags = O_WRONLY | O_TRUNC | O_CREAT;
+ auditFileName = argv[++i];
+ }
+ else if (strcmp(argv[i], "-audit-interface") == 0) {
+ char *interface = argv[++i];
+
+ if (osi_audit_interface(interface)) {
+ printf("Invalid audit interface '%s'\n", interface);
+ return -1;
}
- tempfd = open(fileName, flags, 0666);
- if (tempfd > -1) {
- auditout = fdopen(tempfd, "a");
- if (auditout) {
- osi_audit_file(auditout);
- } else
- printf("Warning: auditlog %s not writable, ignored.\n", fileName);
- } else
- printf("Warning: auditlog %s not writable, ignored.\n", fileName);
}
#ifndef AFS_NT40_ENV
else if (strcmp(argv[i], "-syslog") == 0) {
if (!Sawcbs)
numberofcbs = 64000;
if (!Sawlwps)
- lwps = 12;
+ lwps = 128;
if (!Sawbufs)
buffs = 120;
if (!SawVC)
}
if (!Sawbusy)
busy_threshold = 3 * rxpackets / 2;
+ if (auditFileName)
+ osi_audit_file(auditFileName);
return (0);
afs_int32
-InitPR()
+InitPR(void)
{
int code;
#define SYSIDVERSION 1
afs_int32
-ReadSysIdFile()
+ReadSysIdFile(void)
{
afs_int32 fd, nentries, i;
struct versionStamp vsn;
}
afs_int32
-WriteSysIdFile()
+WriteSysIdFile(void)
{
afs_int32 fd, i;
struct versionStamp vsn;
* and so we need to convert each of them into HBO which is what the extra
* array called FS_HostAddrs_HBO is used here.
*/
-afs_int32
-Do_VLRegisterRPC()
+static afs_int32
+Do_VLRegisterRPC(void)
{
register int code;
bulkaddrs addrs;
- extern int VL_RegisterAddrs();
afs_uint32 FS_HostAddrs_HBO[ADDRSPERSITE];
int i = 0;
}
afs_int32
-SetupVL()
+SetupVL(void)
{
afs_int32 code;
- extern int rxi_numNetAddrs;
- extern afs_uint32 rxi_NetAddrs[];
-#ifndef AFS_NT40_ENV
if (AFSDIR_SERVER_NETRESTRICT_FILEPATH || AFSDIR_SERVER_NETINFO_FILEPATH) {
/*
* Find addresses we are supposed to register as per the netrestrict
}
FS_HostAddr_cnt = (afs_uint32) code;
} else
-#endif
{
FS_HostAddr_cnt = rx_getAllAddr(FS_HostAddrs, ADDRSPERSITE);
}
}
afs_int32
-InitVL()
+InitVL(void)
{
afs_int32 code;
("Failed to initialize RX, probably two servers running.\n"));
exit(-1);
}
+ if (rxkadDisableDotCheck) {
+ rx_SetSecurityConfiguration(tservice, RXS_CONFIG_FLAGS,
+ (void *)RXS_CONFIG_FLAGS_DISABLE_DOTCHECK);
+ }
rx_SetMinProcs(tservice, 3);
rx_SetMaxProcs(tservice, lwps);
rx_SetCheckReach(tservice, 1);
+ rx_SetServerIdleDeadErr(tservice, VNOSERVICE);
tservice =
rx_NewService(0, RX_STATS_SERVICE_ID, "rpcstats", sc, 4,
/* allow super users to manage RX statistics */
rx_SetRxStatUserOk(fs_rxstat_userok);
+#ifdef AFS_PTHREAD_ENV
+ assert(pthread_cond_init(&fsync_cond, NULL) == 0);
+ assert(pthread_mutex_init(&fsync_glock_mutex, NULL) == 0);
+#endif
+
#if !defined(AFS_DEMAND_ATTACH_FS)
/*
* For DAFS, we do not start the Rx server threads until after
assert(pthread_attr_setdetachstate(&tattr, PTHREAD_CREATE_DETACHED) == 0);
assert(pthread_create
- (&serverPid, &tattr, (void *)FiveMinuteCheckLWP,
+ (&serverPid, &tattr, FiveMinuteCheckLWP,
&fiveminutes) == 0);
assert(pthread_create
- (&serverPid, &tattr, (void *)HostCheckLWP, &fiveminutes) == 0);
+ (&serverPid, &tattr, HostCheckLWP, &fiveminutes) == 0);
assert(pthread_create
- (&serverPid, &tattr, (void *)FsyncCheckLWP, &fiveminutes) == 0);
+ (&serverPid, &tattr, FsyncCheckLWP, &fiveminutes) == 0);
#else /* AFS_PTHREAD_ENV */
ViceLog(5, ("Starting LWP\n"));
assert(LWP_CreateProcess
(void *)&fiveminutes, "FsyncCheck", &serverPid) == LWP_SUCCESS);
#endif /* AFS_PTHREAD_ENV */
- TM_GetTimeOfDay(&tp, 0);
+ FT_GetTimeOfDay(&tp, 0);
#ifndef AFS_QUIETFS_ENV
if (console != NULL) {
git://git.openafs.org / openafs.git / blobdiff