/*
* 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>
-RCSID("$Header$");
+#include <roken.h>
+#include <fcntl.h>
+#include <sys/stat.h>
#ifdef AFS_NT40_ENV
#include <winsock2.h>
-#include <fcntl.h>
#include <WINNT/afsevent.h>
#else
#include <netinet/in.h>
#include <sys/time.h>
#include <netdb.h>
#endif
+#include <string.h>
#include <afs/stds.h>
#include <sys/types.h>
#include <time.h>
#include <rx/rxkad.h>
#include <rx/rx_globals.h>
#include <afs/cellconfig.h>
-#include <afs/auth.h>
#include <afs/bubasics.h>
#include <afs/afsutil.h>
#include <afs/com_err.h>
#include "budb_errs.h"
#include "database.h"
#include "error_macros.h"
+#include "budb_internal.h"
#include "globals.h"
#include "afs/audit.h"
+struct ubik_dbase *BU_dbase;
+struct afsconf_dir *BU_conf; /* for getting cell info */
-extern afs_int32 ubik_lastYesTime;
-extern afs_int32 ubik_nBuffers;
-
-struct ubik_dbase *BU_dbase;
-struct afsconf_dir *BU_conf; /* for getting cell info */
+int argHandler(struct cmd_syndesc *, void *);
+int truncateDatabase(void);
+int parseServerList(struct cmd_item *);
char lcell[MAXKTCREALMLEN];
-afs_int32 myHost = 0;
-int helpOption;
+afs_uint32 myHost = 0;
+int helpOption;
/* server's global configuration information. This is exported to other
* files/routines
*/
-buServerConfT globalConf;
-buServerConfP globalConfPtr = &globalConf;
+buServerConfT globalConf;
+buServerConfP globalConfPtr = &globalConf;
char dbDir[AFSDIR_PATH_MAX], cellConfDir[AFSDIR_PATH_MAX];
/* debugging control */
int debugging = 0;
+int rxBind = 0;
+int lwps = 3;
+
+#define MINLWP 3
+#define MAXLWP 16
+
+#define ADDRSPERSITE 16 /* Same global is in rx/rx_user.c */
+afs_uint32 SHostAddrs[ADDRSPERSITE];
+
+#if defined(AFS_PTHREAD_ENV)
+static int
+threadNum(void)
+{
+ return (intptr_t)pthread_getspecific(rx_thread_id_key);
+}
+#endif
+
/* check whether caller is authorized to manage RX statistics */
-int BU_rxstat_userok(call)
- struct rx_call *call;
+int
+BU_rxstat_userok(struct rx_call *call)
{
- return afsconf_SuperUser(BU_conf, call, (char *)0);
+ return afsconf_SuperUser(BU_conf, call, NULL);
}
int
-convert_cell_to_ubik (cellinfo, myHost, serverList)
- struct afsconf_cell *cellinfo;
- afs_int32 *myHost;
- afs_int32 *serverList;
-{
- int i;
+convert_cell_to_ubik(struct afsconf_cell *cellinfo, afs_uint32 *myHost,
+ afs_uint32 *serverList)
+{
+ int i;
char hostname[64];
struct hostent *th;
/* get this host */
- gethostname(hostname,sizeof(hostname));
+ gethostname(hostname, sizeof(hostname));
th = gethostbyname(hostname);
- if (!th)
- {
+ if (!th) {
printf("prserver: couldn't get address of this host.\n");
BUDB_EXIT(1);
}
- memcpy(myHost, th->h_addr, sizeof(afs_int32));
+ memcpy(myHost, th->h_addr, sizeof(afs_uint32));
- for (i=0; i<cellinfo->numServers; i++)
+ for (i = 0; i < cellinfo->numServers; i++)
/* omit my host from serverList */
- if (cellinfo->hostAddr[i].sin_addr.s_addr != *myHost)
+ if (cellinfo->hostAddr[i].sin_addr.s_addr != *myHost)
*serverList++ = cellinfo->hostAddr[i].sin_addr.s_addr;
- *serverList = 0; /* terminate list */
+ *serverList = 0; /* terminate list */
return 0;
}
* if the -help option was not within the command line.
* If it were, this routine would never have been called.
*/
-static int MyBeforeProc(as)
- register struct cmd_syndesc *as;
+static int
+MyBeforeProc(struct cmd_syndesc *as, void *arock)
{
- helpOption = 0;
- return 0;
+ helpOption = 0;
+ return 0;
}
/* initializeCommands
* initialize all the supported commands and their arguments
*/
-initializeArgHandler()
+void
+initializeArgHandler(void)
{
struct cmd_syndesc *cptr;
- int argHandler();
+ cmd_SetBeforeProc(MyBeforeProc, NULL);
- cmd_SetBeforeProc(MyBeforeProc, (char *)0);
-
- cptr = cmd_CreateSyntax((char *) 0, argHandler, (char *) 0,
- "Backup database server");
+ cptr = cmd_CreateSyntax(NULL, argHandler, NULL, "Backup database server");
cmd_AddParm(cptr, "-database", CMD_SINGLE, CMD_OPTIONAL,
- "database directory");
+ "database directory");
cmd_AddParm(cptr, "-cellservdb", CMD_SINGLE, CMD_OPTIONAL,
- "cell configuration directory");
+ "cell configuration directory");
cmd_AddParm(cptr, "-resetdb", CMD_FLAG, CMD_OPTIONAL,
- "truncate the database");
+ "truncate the database");
cmd_AddParm(cptr, "-noauth", CMD_FLAG, CMD_OPTIONAL,
- "run without authentication");
+ "run without authentication");
cmd_AddParm(cptr, "-smallht", CMD_FLAG, CMD_OPTIONAL,
- "use small hash tables");
+ "use small hash tables");
cmd_AddParm(cptr, "-servers", CMD_LIST, CMD_OPTIONAL,
- "list of ubik database servers");
+ "list of ubik database servers");
+
+ cmd_AddParm(cptr, "-ubikbuffers", CMD_SINGLE, CMD_OPTIONAL,
+ "the number of ubik buffers");
+
+ cmd_AddParm(cptr, "-auditlog", CMD_SINGLE, CMD_OPTIONAL,
+ "audit log path");
+
+ cmd_AddParm(cptr, "-p", CMD_SINGLE, CMD_OPTIONAL,
+ "number of processes");
+
+ cmd_AddParm(cptr, "-rxbind", CMD_FLAG, CMD_OPTIONAL,
+ "bind the Rx socket (primary interface only)");
+
+ cmd_AddParm(cptr, "-audit-interface", CMD_SINGLE, CMD_OPTIONAL,
+ "audit interface (file or sysvmq)");
}
int
-argHandler(as, arock)
- struct cmd_syndesc *as;
- char *arock;
+argHandler(struct cmd_syndesc *as, void *arock)
{
/* globalConfPtr provides the handle for the configuration information */
/* database directory */
- if ( as->parms[0].items != 0 )
- {
- globalConfPtr->databaseDirectory =
- (char *) malloc(strlen(as->parms[0].items->data)+1);
- if ( globalConfPtr->databaseDirectory == 0 )
+ if (as->parms[0].items != 0) {
+ globalConfPtr->databaseDirectory =
+ (char *)malloc(strlen(as->parms[0].items->data) + 1);
+ if (globalConfPtr->databaseDirectory == 0)
BUDB_EXIT(-1);
strcpy(globalConfPtr->databaseDirectory, as->parms[0].items->data);
}
/* -cellservdb, cell configuration directory */
- if ( as->parms[1].items != 0 )
- {
- globalConfPtr->cellConfigdir =
- (char *) malloc(strlen(as->parms[1].items->data)+1);
- if ( globalConfPtr->cellConfigdir == 0 )
+ if (as->parms[1].items != 0) {
+ globalConfPtr->cellConfigdir =
+ (char *)malloc(strlen(as->parms[1].items->data) + 1);
+ if (globalConfPtr->cellConfigdir == 0)
BUDB_EXIT(-1);
strcpy(globalConfPtr->cellConfigdir, as->parms[1].items->data);
}
/* truncate the database */
- if ( as->parms[2].items != 0 )
+ if (as->parms[2].items != 0)
truncateDatabase();
/* run without authentication */
- if ( as->parms[3].items != 0 )
+ if (as->parms[3].items != 0)
globalConfPtr->debugFlags |= DF_NOAUTH;
/* use small hash tables */
- if ( as->parms[4].items != 0 )
+ if (as->parms[4].items != 0)
globalConfPtr->debugFlags |= DF_SMALLHT;
/* user provided list of ubik database servers */
- if ( as->parms[5].items != 0 )
+ if (as->parms[5].items != 0)
parseServerList(as->parms[5].items);
+ /* user provided the number of ubik buffers */
+ if (as->parms[6].items != 0)
+ ubik_nBuffers = atoi(as->parms[6].items->data);
+ else
+ ubik_nBuffers = 0;
+
+ /* param 7 (-auditlog) handled below */
+
+ /* user provided the number of threads */
+ if (as->parms[8].items != 0) {
+ lwps = atoi(as->parms[8].items->data);
+ if (lwps > MAXLWP) {
+ printf ("Warning: '-p %d' is too big; using %d instead\n",
+ lwps, MAXLWP);
+ lwps = MAXLWP;
+ }
+ if (lwps < MINLWP) {
+ printf ("Warning: '-p %d' is too small; using %d instead\n",
+ lwps, MINLWP);
+ lwps = MINLWP;
+ }
+ }
+
+ /* user provided rxbind option */
+ if (as->parms[9].items != 0) {
+ rxBind = 1;
+ }
+
+ /* -audit-interface */
+ if (as->parms[10].items != 0) {
+ char *interface = as->parms[10].items->data;
+
+ if (osi_audit_interface(interface)) {
+ printf("Invalid audit interface '%s'\n", interface);
+ BUDB_EXIT(-1);
+ }
+ }
+
+ /* -auditlog */
+ /* needs to be after -audit-interface, so we osi_audit_interface
+ * before we osi_audit_file */
+ if (as->parms[7].items != 0) {
+ char *fileName = as->parms[7].items->data;
+
+ osi_audit_file(fileName);
+ }
+
return 0;
}
/* --- */
-parseServerList(itemPtr)
- struct cmd_item *itemPtr;
+int
+parseServerList(struct cmd_item *itemPtr)
{
struct cmd_item *save;
char **serverArgs;
save = itemPtr;
/* compute number of servers in the list */
- while ( itemPtr )
- {
+ while (itemPtr) {
nservers++;
itemPtr = itemPtr->next;
}
LogDebug(3, "%d servers\n", nservers);
-
+
/* now can allocate the space for the server arguments */
- serverArgs = (char **) malloc( (nservers+2) * sizeof(char *) );
- if ( serverArgs == 0 )
+ serverArgs = (char **)malloc((nservers + 2) * sizeof(char *));
+ if (serverArgs == 0)
ERROR(-1);
ptr = serverArgs;
/* now go through and construct the list of servers */
itemPtr = save;
- while ( itemPtr )
- {
+ while (itemPtr) {
*ptr++ = itemPtr->data;
itemPtr = itemPtr->next;
}
- code = ubik_ParseServerList(nservers+2, serverArgs,
- &globalConfPtr->myHost,
- globalConfPtr->serverList);
- if ( code )
+ code =
+ ubik_ParseServerList(nservers + 2, serverArgs, &globalConfPtr->myHost,
+ globalConfPtr->serverList);
+ if (code)
ERROR(code);
-
+
/* free space for the server args */
- free( (char *) serverArgs);
-
-error_exit:
- return(code);
+ free((char *)serverArgs);
+
+ error_exit:
+ return (code);
}
/* truncateDatabase
* truncates just the database file.
*/
-truncateDatabase()
+int
+truncateDatabase(void)
{
char *path;
afs_int32 code = 0;
int fd;
- path = (char *) malloc(strlen(globalConfPtr->databaseDirectory) +
- strlen(globalConfPtr->databaseName) +
- strlen(globalConfPtr->databaseExtension) + 1);
- if ( path == 0 )
+ path =
+ (char *)malloc(strlen(globalConfPtr->databaseDirectory) +
+ strlen(globalConfPtr->databaseName) +
+ strlen(globalConfPtr->databaseExtension) + 1);
+ if (path == 0)
ERROR(-1);
/* construct the database name */
if (!fd) {
code = errno;
} else {
- if (ftruncate(fd, 0) != 0 ) {
+ if (ftruncate(fd, 0) != 0) {
code = errno;
} else
close(fd);
}
-error_exit:
- return(code);
+ error_exit:
+ return (code);
}
#include "AFS_component_version_number.c"
-main(argc, argv)
- int argc;
- char *argv[];
+int
+main(int argc, char **argv)
{
char *whoami = argv[0];
char *dbNamePtr = 0;
- struct afsconf_cell cellinfo;
- time_t currentTime;
- afs_int32 code = 0;
+ struct afsconf_cell cellinfo;
+ time_t currentTime;
+ afs_int32 code = 0;
+ afs_uint32 host = ntohl(INADDR_ANY);
+
+ char clones[MAXHOSTSPERCELL];
struct rx_service *tservice;
- struct rx_securityClass *sca[3];
-
- extern int afsconf_ServerAuth();
- extern int afsconf_CheckAuth();
+ struct rx_securityClass **securityClasses;
+ afs_int32 numClasses;
extern int rx_stackSize;
- extern struct rx_securityClass *rxnull_NewServerSecurityObject();
- extern int BUDB_ExecuteRequest();
-
+
#ifdef AFS_NT40_ENV
/* initialize winsock */
- if (afs_winsockInit()<0) {
- ReportErrorEventAlt(AFSEVT_SVR_WINSOCK_INIT_FAILED, 0, argv[0],0);
- fprintf(stderr, "%s: Couldn't initialize winsock.\n", whoami);
- exit(1);
+ if (afs_winsockInit() < 0) {
+ ReportErrorEventAlt(AFSEVT_SVR_WINSOCK_INIT_FAILED, 0, argv[0], 0);
+ fprintf(stderr, "%s: Couldn't initialize winsock.\n", whoami);
+ exit(1);
}
#endif
#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.
*/
struct sigaction nsa;
-
+
sigemptyset(&nsa.sa_mask);
nsa.sa_handler = SIG_DFL;
nsa.sa_flags = SA_FULLDUMP;
sigaction(SIGSEGV, &nsa, NULL);
sigaction(SIGABRT, &nsa, NULL);
#endif
+ osi_audit_init();
osi_audit(BUDB_StartEvent, 0, AUD_END);
- initialize_budb_error_table();
+ initialize_BUDB_error_table();
initializeArgHandler();
/* Initialize dirpaths */
#ifdef AFS_NT40_ENV
ReportErrorEventAlt(AFSEVT_SVR_NO_INSTALL_DIR, 0, argv[0], 0);
#endif
- com_err(whoami,errno,"; Unable to obtain AFS server directory.");
+ afs_com_err(whoami, errno, "; Unable to obtain AFS server directory.");
exit(2);
}
/*
globalConfPtr->log = fopen(DEFAULT_LOGNAME,"a");
if ( globalConfPtr->log == NULL )
- {
+ {
printf("Can't open log file %s - aborting\n", DEFAULT_LOGNAME);
BUDB_EXIT(-1);
}
*/
-
- srandom (1);
+
+ srandom(1);
+
+#ifdef AFS_PTHREAD_ENV
+ SetLogThreadNumProgram( threadNum );
+#endif
/* process the user supplied args */
helpOption = 1;
code = cmd_Dispatch(argc, argv);
- if ( code )
+ if (code)
ERROR(code);
/* exit if there was a help option */
if (helpOption)
- BUDB_EXIT(0);
+ BUDB_EXIT(0);
/* open the log file */
globalConfPtr->log = fopen(AFSDIR_SERVER_BUDBLOG_FILEPATH, "a");
- if ( globalConfPtr->log == NULL )
- {
- printf("Can't open log file %s - aborting\n",
+ if (globalConfPtr->log == NULL) {
+ printf("Can't open log file %s - aborting\n",
AFSDIR_SERVER_BUDBLOG_FILEPATH);
BUDB_EXIT(-1);
}
- /* keep log closed so can remove it */
+ /* keep log closed so can remove it */
- fclose(globalConfPtr->log);
+ fclose(globalConfPtr->log);
/* open the cell's configuration directory */
LogDebug(4, "opening %s\n", globalConfPtr->cellConfigdir);
BU_conf = afsconf_Open(globalConfPtr->cellConfigdir);
- if ( BU_conf == 0 )
- {
+ if (BU_conf == 0) {
LogError(code, "Failed getting cell info\n");
- com_err(whoami, code, "Failed getting cell info");
+ afs_com_err(whoami, code, "Failed getting cell info");
ERROR(BUDB_NOCELLS);
}
code = afsconf_GetLocalCell(BU_conf, lcell, sizeof(lcell));
- if ( code )
- {
+ if (code) {
LogError(0, "** Can't determine local cell name!\n");
ERROR(code);
}
- if ( globalConfPtr->myHost == 0 )
- {
+ if (globalConfPtr->myHost == 0) {
/* if user hasn't supplied a list of servers, extract server
* list from the cell's database
*/
LogDebug(1, "Using server list from %s cell database.\n", lcell);
- code = afsconf_GetCellInfo (BU_conf, lcell, 0, &cellinfo);
- code = convert_cell_to_ubik (&cellinfo,
- &globalConfPtr->myHost,
- globalConfPtr->serverList);
- if ( code )
+ code = afsconf_GetExtendedCellInfo (BU_conf, lcell, 0, &cellinfo,
+ clones);
+ code =
+ convert_cell_to_ubik(&cellinfo, &globalConfPtr->myHost,
+ globalConfPtr->serverList);
+ if (code)
ERROR(code);
}
/* initialize ubik */
ubik_CRXSecurityProc = afsconf_ClientAuth;
- ubik_CRXSecurityRock = (char *)BU_conf;
+ ubik_CRXSecurityRock = BU_conf;
ubik_SRXSecurityProc = afsconf_ServerAuth;
- ubik_SRXSecurityRock = (char *)BU_conf;
+ ubik_SRXSecurityRock = BU_conf;
ubik_CheckRXSecurityProc = afsconf_CheckAuth;
- ubik_CheckRXSecurityRock = (char *)BU_conf;
+ ubik_CheckRXSecurityRock = BU_conf;
- ubik_nBuffers = 400;
+ if (ubik_nBuffers == 0)
+ ubik_nBuffers = 400;
- dbNamePtr = (char *) malloc(strlen(globalConfPtr->databaseDirectory) +
- strlen(globalConfPtr->databaseName) + 1);
- if ( dbNamePtr == 0 )
- ERROR(-1);
+ LogError(0, "Will allocate %d ubik buffers\n", ubik_nBuffers);
+
+ dbNamePtr =
+ (char *)malloc(strlen(globalConfPtr->databaseDirectory) +
+ strlen(globalConfPtr->databaseName) + 1);
+ if (dbNamePtr == 0)
+ ERROR(-1);
/* construct the database name */
strcpy(dbNamePtr, globalConfPtr->databaseDirectory);
strcat(dbNamePtr, globalConfPtr->databaseName); /* name prefix */
- rx_SetRxDeadTime(60); /* 60 seconds inactive before timeout */
+ rx_SetRxDeadTime(60); /* 60 seconds inactive before timeout */
+
+ if (rxBind) {
+ afs_int32 ccode;
+ 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
+ {
+ ccode = rx_getAllAddr(SHostAddrs, ADDRSPERSITE);
+ }
+ if (ccode == 1) {
+ host = SHostAddrs[0];
+ rx_InitHost(host, htons(AFSCONF_BUDBPORT));
+ }
+ }
- code = ubik_ServerInit(globalConfPtr->myHost,
- htons(AFSCONF_BUDBPORT),
- globalConfPtr->serverList,
- dbNamePtr, /* name prefix */
- &BU_dbase);
- if (code)
- {
+ code = ubik_ServerInitByInfo (globalConfPtr->myHost,
+ htons(AFSCONF_BUDBPORT),
+ &cellinfo,
+ clones,
+ dbNamePtr, /* name prefix */
+ &BU_dbase);
+
+ if (code) {
LogError(code, "Ubik init failed\n");
- com_err(whoami, code, "Ubik init failed");
+ afs_com_err(whoami, code, "Ubik init failed");
ERROR(code);
}
- sca[RX_SCINDEX_NULL] = rxnull_NewServerSecurityObject();
- sca[RX_SCINDEX_VAB] = 0;
- sca[RX_SCINDEX_KAD] = rxkad_NewServerSecurityObject(rxkad_clear,
- BU_conf,
- afsconf_GetKey,
- (char *) 0);
+ afsconf_BuildServerSecurityObjects(BU_conf, 0,
+ &securityClasses, &numClasses);
- /* These two lines disallow jumbograms */
- rx_maxReceiveSize = OLD_MAX_PACKET_SIZE;
- rxi_nSendFrags = rxi_nRecvFrags = 1;
+ /* Disable jumbograms */
+ rx_SetNoJumbo();
- tservice = rx_NewService(0, BUDB_SERVICE, "BackupDatabase",
- sca, 3, BUDB_ExecuteRequest);
- if (tservice == (struct rx_service *)0)
- {
+ tservice =
+ rx_NewServiceHost(host, 0, BUDB_SERVICE, "BackupDatabase",
+ securityClasses, numClasses, BUDB_ExecuteRequest);
+
+ if (tservice == (struct rx_service *)0) {
LogError(0, "Could not create backup database rx service\n");
printf("Could not create backup database rx service\n");
BUDB_EXIT(3);
}
rx_SetMinProcs(tservice, 1);
- rx_SetMaxProcs(tservice, 3);
+ rx_SetMaxProcs(tservice, lwps);
rx_SetStackSize(tservice, 10000);
/* allow super users to manage RX statistics */
memset(dumpSyncPtr, 0, sizeof(*dumpSyncPtr));
Lock_Init(&dumpSyncPtr->ds_lock);
- rx_StartServer(0); /* start handling requests */
+ rx_StartServer(0); /* start handling requests */
code = InitProcs();
- if ( code )
+ if (code)
ERROR(code);
currentTime = time(0);
LogError(0, "Ready to process requests at %s\n", ctime(¤tTime));
- rx_ServerProc(); /* donate this LWP */
+ rx_ServerProc(NULL); /* donate this LWP */
-error_exit:
+ error_exit:
osi_audit(BUDB_FinishEvent, code, AUD_END);
- return(code);
+ return (code);
}
-
-consistencyCheckDb()
+void
+consistencyCheckDb(void)
{
/* do consistency checks on structure sizes */
- if ( (sizeof(struct htBlock) > BLOCKSIZE)
- || (sizeof(struct vfBlock) > BLOCKSIZE)
- || (sizeof(struct viBlock) > BLOCKSIZE)
- || (sizeof(struct dBlock) > BLOCKSIZE)
- || (sizeof(struct tBlock) > BLOCKSIZE)
- )
- {
- fprintf (stderr, "Block layout error!\n");
- BUDB_EXIT (99);
+ if ((sizeof(struct htBlock) > BLOCKSIZE)
+ || (sizeof(struct vfBlock) > BLOCKSIZE)
+ || (sizeof(struct viBlock) > BLOCKSIZE)
+ || (sizeof(struct dBlock) > BLOCKSIZE)
+ || (sizeof(struct tBlock) > BLOCKSIZE)
+ ) {
+ fprintf(stderr, "Block layout error!\n");
+ BUDB_EXIT(99);
}
}
-/*VARARGS*/
-LogDebug(level, a,b,c,d,e,f,g,h,i)
- int level;
- char *a, *b, *c, *d, *e, *f, *g, *h, *i;
+void
+LogDebug(int level, char *fmt, ... )
{
+ va_list ap;
- if ( debugging >= level)
- {
+ va_start(ap, fmt);
+
+ if (debugging >= level) {
/* log normally closed so can remove it */
- globalConfPtr->log = fopen(AFSDIR_SERVER_BUDBLOG_FILEPATH, "a");
- if ( globalConfPtr->log != NULL )
- {
- fprintf(globalConfPtr->log, a, b, c, d, e, f, g, h, i);
- fflush(globalConfPtr->log);
- fclose(globalConfPtr->log);
+ globalConfPtr->log = fopen(AFSDIR_SERVER_BUDBLOG_FILEPATH, "a");
+ if (globalConfPtr->log != NULL) {
+ vfprintf(globalConfPtr->log, fmt, ap);
+ fflush(globalConfPtr->log);
+ fclose(globalConfPtr->log);
}
}
+ va_end(ap);
}
-static char *TimeStamp(time_t t)
+static char *
+TimeStamp(time_t t)
{
- struct tm *lt;
- static char timestamp[20];
+ struct tm *lt;
+ static char timestamp[20];
- lt = localtime(&t);
- strftime (timestamp, 20, "%m/%d/%Y %T", lt);
- return timestamp;
+ lt = localtime(&t);
+ strftime(timestamp, 20, "%m/%d/%Y %H:%M:%S", lt);
+ return timestamp;
}
-/*VARARGS*/
-Log(a,b,c,d,e,f,g,h,i)
- char *a, *b, *c, *d, *e, *f, *g, *h, *i;
+void
+Log(char *fmt, ...)
{
+ va_list ap;
time_t now;
+ va_start(ap, fmt);
globalConfPtr->log = fopen(AFSDIR_SERVER_BUDBLOG_FILEPATH, "a");
- if ( globalConfPtr->log != NULL )
- {
- now = time(0);
+ if (globalConfPtr->log != NULL) {
+ now = time(0);
fprintf(globalConfPtr->log, "%s ", TimeStamp(now));
- fprintf(globalConfPtr->log, a, b, c, d, e, f, g, h, i);
+ vfprintf(globalConfPtr->log, fmt, ap);
fflush(globalConfPtr->log);
fclose(globalConfPtr->log);
}
+ va_end(ap);
}
-/*VARARGS*/
-LogError(code, a,b,c,d,e,f,g,h,i)
-long code;
-char *a, *b, *c, *d, *e, *f, *g, *h, *i;
+void
+LogError(long code, char *fmt, ... )
{
+ va_list ap;
time_t now;
+ va_start(ap, fmt);
globalConfPtr->log = fopen(AFSDIR_SERVER_BUDBLOG_FILEPATH, "a");
- if ( globalConfPtr->log != NULL )
- {
- now = time(0);
+ if (globalConfPtr->log != NULL) {
+ now = time(0);
fprintf(globalConfPtr->log, "%s ", TimeStamp(now));
- if ( code )
- fprintf(globalConfPtr->log, "%s: %s\n", error_table_name(code),
- error_message(code));
- fprintf(globalConfPtr->log, a, b, c, d, e, f, g, h, i);
+ if (code)
+ fprintf(globalConfPtr->log, "%s: %s\n", afs_error_table_name(code),
+ afs_error_message(code));
+ vfprintf(globalConfPtr->log, fmt, ap );
fflush(globalConfPtr->log);
fclose(globalConfPtr->log);
}
* ----------------
*/
-
-LogNetDump(dumpPtr)
- struct dump *dumpPtr;
+void
+LogNetDump(struct dump *dumpPtr)
{
struct dump hostDump;
extern buServerConfP globalConfPtr;
-
+
dump_ntoh(dumpPtr, &hostDump);
globalConfPtr->log = fopen(AFSDIR_SERVER_BUDBLOG_FILEPATH, "a");
- if ( globalConfPtr->log != NULL )
- {
+ if (globalConfPtr->log != NULL) {
printDump(globalConfPtr->log, &hostDump);
fclose(globalConfPtr->log);
}
}
+
git://git.openafs.org / openafs.git / blobdiff