/*
* Copyright 2000, International Business Machines Corporation and others.
* All Rights Reserved.
- *
+ *
* This software has been released under the terms of the IBM Public
* License. For details, see the LICENSE file in the top-level source
* directory or online at http://www.openafs.org/dl/license10.html
#include <afsconfig.h>
#include <afs/param.h>
+#include <afs/stds.h>
+#include <roken.h>
-#include <afs/stds.h>
-#include <sys/types.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <string.h>
-#ifdef HAVE_FCNTL_H
-#include <fcntl.h>
-#endif
#ifdef AFS_NT40_ENV
-#include <winsock2.h>
#include <WINNT/afsevent.h>
#endif
+
#ifdef HAVE_SYS_FILE_H
#include <sys/file.h>
#endif
-#include <time.h>
-#ifdef HAVE_NETDB_H
-#include <netdb.h>
-#endif
-#ifdef HAVE_NETINET_IN_H
-#include <netinet/in.h>
-#endif
-#include <stdio.h>
#include <rx/xdr.h>
#include <rx/rx.h>
#include <rx/rx_globals.h>
#include <rx/rxstat.h>
-#include <rx/rxstat_prototypes.h>
#include <afs/cellconfig.h>
#include <afs/keys.h>
#include <afs/auth.h>
#include <afs/audit.h>
+#include <afs/com_err.h>
#include <lock.h>
#include <ubik.h>
#include <afs/afsutil.h>
+
#include "vlserver.h"
#include "vlserver_internal.h"
#define MAXLWP 16
-const char *vl_dbaseName;
struct afsconf_dir *vldb_confdir = 0; /* vldb configuration dir */
int lwps = 9;
struct vldstats dynamic_statistics;
struct ubik_dbase *VL_dbase;
-afs_uint32 HostAddress[MAXSERVERID + 1];
+afs_uint32 rd_HostAddress[MAXSERVERID + 1];
+afs_uint32 wr_HostAddress[MAXSERVERID + 1];
static void *CheckSignal(void*);
int LogLevel = 0;
static void *
CheckSignal(void *unused)
{
- register int i, errorcode;
- struct ubik_trans *trans;
+ int i, errorcode;
+ struct vl_ctx ctx;
if ((errorcode =
- Init_VLdbase(&trans, LOCKREAD, VLGETSTATS - VL_LOWEST_OPCODE)))
- return (void *)errorcode;
+ Init_VLdbase(&ctx, LOCKREAD, VLGETSTATS - VL_LOWEST_OPCODE)))
+ return (void *)(intptr_t)errorcode;
VLog(0, ("Dump name hash table out\n"));
for (i = 0; i < HASHSIZE; i++) {
- HashNDump(trans, i);
+ HashNDump(&ctx, i);
}
VLog(0, ("Dump id hash table out\n"));
for (i = 0; i < HASHSIZE; i++) {
- HashIdDump(trans, i);
+ HashIdDump(&ctx, i);
}
- return ((void *)ubik_EndTrans(trans));
+ return ((void *)(intptr_t)ubik_EndTrans(ctx.trans));
} /*CheckSignal */
int
main(int argc, char **argv)
{
- register afs_int32 code;
- afs_int32 myHost;
+ afs_int32 code;
+ afs_uint32 myHost;
struct rx_service *tservice;
- struct rx_securityClass *sc[3];
+ struct rx_securityClass **securityClasses;
+ afs_int32 numClasses;
struct afsconf_dir *tdir;
struct ktc_encryptionKey tkey;
struct afsconf_cell info;
struct hostent *th;
char hostname[VL_MAXNAMELEN];
- int noAuth = 0, index, i;
- char commandLine[150];
+ int noAuth = 0, index;
char clones[MAXHOSTSPERCELL];
char *auditFileName = NULL;
afs_uint32 host = ntohl(INADDR_ANY);
+ const char *vl_dbaseName;
+ const char *configDir;
+ const char *logFile;
+
#ifdef AFS_AIX32_ENV
/*
- * The following signal action for AIX is necessary so that in case of a
- * crash (i.e. core is generated) we can include the user's data section
+ * The following signal action for AIX is necessary so that in case of a
+ * crash (i.e. core is generated) we can include the user's data section
* in the core dump. Unfortunately, by default, only a partial core is
* generated which, in many cases, isn't too useful.
*/
#endif
osi_audit_init();
+ /* Initialize dirpaths */
+ if (!(initAFSDirPath() & AFSDIR_SERVER_PATHS_OK)) {
+#ifdef AFS_NT40_ENV
+ ReportErrorEventAlt(AFSEVT_SVR_NO_INSTALL_DIR, 0, argv[0], 0);
+#endif
+ fprintf(stderr, "%s: Unable to obtain AFS server directory.\n",
+ argv[0]);
+ exit(2);
+ }
+
+ vl_dbaseName = AFSDIR_SERVER_VLDB_FILEPATH;
+ configDir = AFSDIR_SERVER_ETC_DIRPATH;
+ logFile = AFSDIR_SERVER_PTLOG_FILEPATH;
+
/* Parse command line */
for (index = 1; index < argc; index++) {
if (strcmp(argv[index], "-noauth") == 0) {
}
} else if (strcmp(argv[index], "-d") == 0) {
if ((index + 1) >= argc) {
- fprintf(stderr, "missing argument for -d\n");
- return -1;
+ fprintf(stderr, "missing argument for -d\n");
+ return -1;
}
debuglevel = atoi(argv[++index]);
LogLevel = debuglevel;
rxkadDisableDotCheck = 1;
} else if (!strcmp(argv[index], "-rxmaxmtu")) {
if ((index + 1) >= argc) {
- fprintf(stderr, "missing argument for -rxmaxmtu\n");
- return -1;
+ fprintf(stderr, "missing argument for -rxmaxmtu\n");
+ return -1;
}
rxMaxMTU = atoi(argv[++index]);
- if ((rxMaxMTU < RX_MIN_PACKET_SIZE) ||
+ if ((rxMaxMTU < RX_MIN_PACKET_SIZE) ||
(rxMaxMTU > RX_MAX_PACKET_DATA_SIZE)) {
- printf("rxMaxMTU %d invalid; must be between %d-%lu\n",
- rxMaxMTU, RX_MIN_PACKET_SIZE,
+ printf("rxMaxMTU %d invalid; must be between %d-%" AFS_SIZET_FMT "\n",
+ rxMaxMTU, RX_MIN_PACKET_SIZE,
RX_MAX_PACKET_DATA_SIZE);
return -1;
}
serverLogSyslog = 1;
serverLogSyslogFacility = atoi(argv[index] + 8);
#endif
+ } else if ((strcmp(argv[index], "-database") == 0)
+ || (strcmp(argv[index], "-db") == 0)) {
+ vl_dbaseName = argv[++index];
+ } else if (strcmp(argv[index], "-config") == 0) {
+ if ((index + 1) > argc) {
+ fprintf(stderr, "missing argument for -config\n");
+ return -1;
+ }
+ configDir = argv[++index];
+ } else if (strcmp(argv[index], "-logfile") == 0) {
+ if ((index + 1) > argc) {
+ fprintf(stderr, "missing argument for -logfile\n");
+ return -1;
+ }
+ logFile = argv[++index];
} else {
/* support help flag */
-#ifndef AFS_NT40_ENV
- printf("Usage: vlserver [-p <number of processes>] [-nojumbo] "
- "[-rxmaxmtu <bytes>] [-rxbind] [-allow-dotted-principals] "
- "[-auditlog <log path>] [-jumbo] [-d <debug level>] "
- "[-syslog[=FACILITY]] "
- "[-enable_peer_stats] [-enable_process_stats] "
- "[-help]\n");
-#else
- printf("Usage: vlserver [-p <number of processes>] [-nojumbo] "
+ printf("Usage: vlserver [-database <db path] "
+ "[-p <number of processes>] [-nojumbo] "
"[-rxmaxmtu <bytes>] [-rxbind] [-allow-dotted-principals] "
"[-auditlog <log path>] [-jumbo] [-d <debug level>] "
- "[-enable_peer_stats] [-enable_process_stats] "
- "[-help]\n");
+ "[-config <config directory path>] "
+ "[-logfile <log file path>] ");
+#ifndef AFS_NT40_ENV
+ printf("[-syslog[=FACILITY]] ");
#endif
+ printf("[-enable_peer_stats] [-enable_process_stats] "
+ "[-help]\n");
fflush(stdout);
exit(0);
}
osi_audit_file(auditFileName);
}
- /* Initialize dirpaths */
- if (!(initAFSDirPath() & AFSDIR_SERVER_PATHS_OK)) {
-#ifdef AFS_NT40_ENV
- ReportErrorEventAlt(AFSEVT_SVR_NO_INSTALL_DIR, 0, argv[0], 0);
-#endif
- fprintf(stderr, "%s: Unable to obtain AFS server directory.\n",
- argv[0]);
- exit(2);
- }
- vl_dbaseName = AFSDIR_SERVER_VLDB_FILEPATH;
-
#ifndef AFS_NT40_ENV
serverLogSyslogTag = "vlserver";
#endif
- OpenLog(AFSDIR_SERVER_VLOG_FILEPATH); /* set up logging */
+ OpenLog(logFile); /* set up logging */
SetupLogSignals();
- tdir = afsconf_Open(AFSDIR_SERVER_ETC_DIRPATH);
+ tdir = afsconf_Open(configDir);
if (!tdir) {
printf
("vlserver: can't open configuration files in dir %s, giving up.\n",
- AFSDIR_SERVER_ETC_DIRPATH);
+ configDir);
exit(1);
}
#ifdef AFS_NT40_ENV
hostname);
exit(1);
}
- memcpy(&myHost, th->h_addr, sizeof(afs_int32));
+ memcpy(&myHost, th->h_addr, sizeof(afs_uint32));
#if !defined(AFS_HPUX_ENV) && !defined(AFS_NT40_ENV)
signal(SIGXCPU, CheckSignal_Signal);
/* get list of servers */
code =
afsconf_GetExtendedCellInfo(tdir, NULL, AFSCONF_VLDBSERVICE, &info,
- &clones);
+ clones);
if (code) {
printf("vlserver: Couldn't get cell server list for 'afsvldb'.\n");
exit(2);
if (rxBind) {
afs_int32 ccode;
#ifndef AFS_NT40_ENV
- if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
+ if (AFSDIR_SERVER_NETRESTRICT_FILEPATH ||
AFSDIR_SERVER_NETINFO_FILEPATH) {
char reason[1024];
ccode = parseNetFiles(SHostAddrs, NULL, NULL,
ADDRSPERSITE, reason,
AFSDIR_SERVER_NETINFO_FILEPATH,
AFSDIR_SERVER_NETRESTRICT_FILEPATH);
- } else
-#endif
+ } else
+#endif
{
ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
}
}
ubik_nBuffers = 512;
- ubik_CRXSecurityProc = afsconf_ClientAuth;
- ubik_CRXSecurityRock = (char *)tdir;
- ubik_SRXSecurityProc = afsconf_ServerAuth;
- ubik_SRXSecurityRock = (char *)tdir;
- ubik_CheckRXSecurityProc = afsconf_CheckAuth;
- ubik_CheckRXSecurityRock = (char *)tdir;
+ ubik_SetClientSecurityProcs(afsconf_ClientAuth, afsconf_UpToDate, tdir);
+ ubik_SetServerSecurityProcs(afsconf_BuildServerSecurityObjects,
+ afsconf_CheckAuth, tdir);
+
+ ubik_SyncWriterCacheProc = vlsynccache;
code =
ubik_ServerInitByInfo(myHost, htons(AFSCONF_VLDBPORT), &info, clones,
vl_dbaseName, &VL_dbase);
if (code) {
- printf("vlserver: Ubik init failed with code %d\n", code);
+ printf("vlserver: Ubik init failed: %s\n", afs_error_message(code));
exit(2);
}
if (!rxJumbograms) {
}
rx_SetRxDeadTime(50);
- memset(HostAddress, 0, sizeof(HostAddress));
+ memset(rd_HostAddress, 0, sizeof(rd_HostAddress));
+ memset(wr_HostAddress, 0, sizeof(wr_HostAddress));
initialize_dstats();
- sc[0] = rxnull_NewServerSecurityObject();
- sc[1] = (struct rx_securityClass *)0;
- sc[2] = rxkad_NewServerSecurityObject(0, tdir, afsconf_GetKey, NULL);
+ afsconf_BuildServerSecurityObjects(tdir, &securityClasses, &numClasses);
tservice =
- rx_NewServiceHost(host, 0, USER_SERVICE_ID, "Vldb server", sc, 3,
- VL_ExecuteRequest);
+ rx_NewServiceHost(host, 0, USER_SERVICE_ID, "Vldb server",
+ securityClasses, numClasses,
+ VL_ExecuteRequest);
if (tservice == (struct rx_service *)0) {
printf("vlserver: Could not create VLDB_SERVICE rx service\n");
exit(3);
}
tservice =
- rx_NewServiceHost(host, 0, RX_STATS_SERVICE_ID, "rpcstats", sc, 3,
- RXSTATS_ExecuteRequest);
+ rx_NewServiceHost(host, 0, RX_STATS_SERVICE_ID, "rpcstats",
+ securityClasses, numClasses,
+ RXSTATS_ExecuteRequest);
if (tservice == (struct rx_service *)0) {
printf("vlserver: Could not create rpc stats rx service\n");
exit(3);
rx_SetMinProcs(tservice, 2);
rx_SetMaxProcs(tservice, 4);
- for (commandLine[0] = '\0', i = 0; i < argc; i++) {
- if (i > 0)
- strcat(commandLine, " ");
- strcat(commandLine, argv[i]);
- }
- ViceLog(0,
- ("Starting AFS vlserver %d (%s)\n", VLDBVERSION_4, commandLine));
+ LogCommandLine(argc, argv, "vlserver", VldbVersion, "Starting AFS", FSLog);
printf("%s\n", cml_version_number); /* Goes to the log */
/* allow super users to manage RX statistics */