/*
* 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 <netinet/in.h>
#endif
#include <stdio.h>
+#ifdef HAVE_STDINT_H
+# include <stdint.h>
+#endif
#include <rx/xdr.h>
#include <rx/rx.h>
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)))
+ 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 *)(intptr_t)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);
#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.
*/
}
} 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-%" AFS_SIZET_FMT "\n",
- rxMaxMTU, RX_MIN_PACKET_SIZE,
+ rxMaxMTU, RX_MIN_PACKET_SIZE,
RX_MAX_PACKET_DATA_SIZE);
return -1;
}
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_SRXSecurityRock = (char *)tdir;
ubik_CheckRXSecurityProc = afsconf_CheckAuth;
ubik_CheckRXSecurityRock = (char *)tdir;
+ ubik_SyncWriterCacheProc = vlsynccache;
code =
ubik_ServerInitByInfo(myHost, htons(AFSCONF_VLDBPORT), &info, clones,
vl_dbaseName, &VL_dbase);
}
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, 0, &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 */
git://git.openafs.org / openafs.git / blobdiff